From 7430b316970c57bc014caab43bf182bd4917b086 Mon Sep 17 00:00:00 2001
From: Vjacheslav Murashkin <vmurashkin@gmail.com>
Date: Thu, 4 Sep 2014 16:54:23 +0400
Subject: [PATCH 0001/1519] handle None from model __str__; Fixes #753

---
 AUTHORS                      |  1 +
 mongoengine/base/document.py |  2 +-
 tests/document/instance.py   | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index ffd63227e..484ab0865 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -210,3 +210,4 @@ that much better:
  * Jay Shirley (https://github.com/jshirley)
  * DavidBord (https://github.com/DavidBord)
  * Axel Haustant (https://github.com/noirbizarre)
+ * Vyacheslav Murashkin (https://github.com/a4tunado)
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 869449f93..c3802e1f2 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -229,7 +229,7 @@ def __repr__(self):
             u = self.__str__()
         except (UnicodeEncodeError, UnicodeDecodeError):
             u = '[Bad Unicode data]'
-        repr_type = type(u)
+        repr_type = str if u is None else type(u)
         return repr_type('<%s: %s>' % (self.__class__.__name__, u))
 
     def __str__(self):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index f925aeeba..3233304e1 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -103,6 +103,19 @@ def __unicode__(self):
 
         self.assertEqual('<Article: привет мир>', repr(doc))
 
+    def test_repr_none(self):
+        """Ensure None values handled correctly
+        """
+        class Article(Document):
+            title = StringField()
+
+            def __str__(self):
+                return None
+
+        doc = Article(title=u'привет мир')
+
+        self.assertEqual('<Article: None>', repr(doc))
+
     def test_queryset_resurrects_dropped_collection(self):
         self.Person.drop_collection()
 

From aec06183e7303f3960fff1768227ed0a3aa7bd5e Mon Sep 17 00:00:00 2001
From: yjaaidi <yjaaidi@gmail.com>
Date: Sun, 28 Sep 2014 10:09:36 +0200
Subject: [PATCH 0002/1519] Version bump 0.8.7 => 0.9.0

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index ac33ad2b1..b215181ad 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -15,7 +15,7 @@
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
 
-VERSION = (0, 8, 7)
+VERSION = (0, 9, 0)
 
 
 def get_version():

From 025d3a03d66df269ead0cbed81735c7555965298 Mon Sep 17 00:00:00 2001
From: Shuuji TAKAHASHI <shuuji3@gmail.com>
Date: Tue, 30 Sep 2014 02:31:48 +0900
Subject: [PATCH 0003/1519] Marked up the last line as preformatted text.

---
 docs/guide/text-indexes.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guide/text-indexes.rst b/docs/guide/text-indexes.rst
index b597d9572..695159c62 100644
--- a/docs/guide/text-indexes.rst
+++ b/docs/guide/text-indexes.rst
@@ -46,4 +46,6 @@ Next, start a text search using :attr:`QuerySet.search_text` method::
 Ordering by text score
 ======================
 
+::
+
   objects = News.objects.search('mongo').order_by('$text_score')

From 4752f9aa3734897815b2b11396f9bc583e35eb0b Mon Sep 17 00:00:00 2001
From: Dmitry Konishchev <konishchev@gmail.com>
Date: Tue, 30 Sep 2014 15:15:11 +0400
Subject: [PATCH 0004/1519] Add Document.modify() method

---
 mongoengine/document.py    | 40 +++++++++++++++++++++-
 tests/document/instance.py | 70 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 106 insertions(+), 4 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 34bbb9f67..2eab83ef3 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -12,7 +12,7 @@
 from mongoengine.base import (DocumentMetaclass, TopLevelDocumentMetaclass,
                               BaseDocument, BaseDict, BaseList,
                               ALLOW_INHERITANCE, get_document)
-from mongoengine.errors import ValidationError
+from mongoengine.errors import ValidationError, InvalidQueryError, InvalidDocumentError
 from mongoengine.queryset import (OperationError, NotUniqueError,
                                   QuerySet, transform)
 from mongoengine.connection import get_db, DEFAULT_CONNECTION_NAME
@@ -192,6 +192,44 @@ def _get_collection(cls):
                 cls.ensure_indexes()
         return cls._collection
 
+    def modify(self, query={}, **update):
+        """Perform an atomic update of the document in the database and reload
+        the document object using updated version.
+
+        Returns True if the document has been updated or False if the document
+        in the database doesn't match the query.
+
+        .. note:: All unsaved changes that has been made to the document are
+        rejected if the method returns True.
+
+        :param query: the update will be performed only if the document in the
+            database matches the query
+        :param update: Django-style update keyword arguments
+        """
+
+        if self.pk is None:
+            raise InvalidDocumentError("The document does not have a primary key.")
+
+        id_field = self._meta["id_field"]
+        query = query.copy() if isinstance(query, dict) else query.to_query(self)
+
+        if id_field not in query:
+            query[id_field] = self.pk
+        elif query[id_field] != self.pk:
+            raise InvalidQueryError("Invalid document modify query: it must modify only this document.")
+
+        updated = self._qs(**query).modify(new=True, **update)
+        if updated is None:
+            return False
+
+        for field in self._fields_ordered:
+            setattr(self, field, self._reload(field, updated[field]))
+
+        self._changed_fields = updated._changed_fields
+        self._created = False
+
+        return True
+
     def save(self, force_insert=False, validate=True, clean=True,
              write_concern=None,  cascade=None, cascade_kwargs=None,
              _refs=None, save_condition=None, **kwargs):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index f925aeeba..d5add95b2 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -9,7 +9,7 @@
 import uuid
 
 from datetime import datetime
-from bson import DBRef
+from bson import DBRef, ObjectId
 from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
                             PickleDyanmicEmbedded, PickleDynamicTest)
 
@@ -34,15 +34,21 @@ def setUp(self):
         connect(db='mongoenginetest')
         self.db = get_db()
 
+        class Job(EmbeddedDocument):
+            name = StringField()
+            years = IntField()
+
         class Person(Document):
             name = StringField()
             age = IntField()
+            job = EmbeddedDocumentField(Job)
 
             non_field = True
 
             meta = {"allow_inheritance": True}
 
         self.Person = Person
+        self.Job = Job
 
     def tearDown(self):
         for collection in self.db.collection_names():
@@ -50,6 +56,9 @@ def tearDown(self):
                 continue
             self.db.drop_collection(collection)
 
+    def assertDbEqual(self, docs):
+        self.assertEqual(list(self.Person._get_collection().find().sort("id")), sorted(docs, key=lambda doc: doc["_id"]))
+
     def test_capped_collection(self):
         """Ensure that capped collections work properly.
         """
@@ -452,7 +461,7 @@ class Foo(Document):
     def test_dictionary_access(self):
         """Ensure that dictionary-style field access works properly.
         """
-        person = self.Person(name='Test User', age=30)
+        person = self.Person(name='Test User', age=30, job=self.Job())
         self.assertEqual(person['name'], 'Test User')
 
         self.assertRaises(KeyError, person.__getitem__, 'salary')
@@ -462,7 +471,7 @@ def test_dictionary_access(self):
         self.assertEqual(person['name'], 'Another User')
 
         # Length = length(assigned fields + id)
-        self.assertEqual(len(person), 4)
+        self.assertEqual(len(person), 5)
 
         self.assertTrue('age' in person)
         person.age = None
@@ -617,6 +626,61 @@ class TestDocument(Document):
         t = TestDocument(doc=TestEmbeddedDocument(x=15, y=35, z=5))
         t.save(clean=False)
 
+    def test_modify_empty(self):
+        doc = self.Person(id=ObjectId(), name="bob", age=10).save()
+        self.assertRaises(InvalidDocumentError, lambda: self.Person().modify(set__age=10))
+        self.assertDbEqual([dict(doc.to_mongo())])
+
+    def test_modify_invalid_query(self):
+        doc1 = self.Person(id=ObjectId(), name="bob", age=10).save()
+        doc2 = self.Person(id=ObjectId(), name="jim", age=20).save()
+        docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
+
+        self.assertRaises(InvalidQueryError, lambda:
+            doc1.modify(dict(id=doc2.id), set__value=20))
+
+        self.assertDbEqual(docs)
+
+    def test_modify_match_another_document(self):
+        doc1 = self.Person(id=ObjectId(), name="bob", age=10).save()
+        doc2 = self.Person(id=ObjectId(), name="jim", age=20).save()
+        docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
+
+        assert not doc1.modify(dict(name=doc2.name), set__age=100)
+
+        self.assertDbEqual(docs)
+
+    def test_modify_not_exists(self):
+        doc1 = self.Person(id=ObjectId(), name="bob", age=10).save()
+        doc2 = self.Person(id=ObjectId(), name="jim", age=20)
+        docs = [dict(doc1.to_mongo())]
+
+        assert not doc2.modify(dict(name=doc2.name), set__age=100)
+
+        self.assertDbEqual(docs)
+
+    def test_modify_update(self):
+        other_doc = self.Person(id=ObjectId(), name="bob", age=10).save()
+        doc = self.Person(id=ObjectId(), name="jim", age=20,
+                          job=self.Job(name="10gen", years=3)).save()
+
+        doc_copy = doc._from_son(doc.to_mongo())
+
+        # these changes must go away
+        doc.name = "liza"
+        doc.job.name = "Google"
+        doc.job.years = 3
+
+        assert doc.modify(set__age=21, set__job__name="MongoDB", unset__job__years=True)
+        doc_copy.age = 21
+        doc_copy.job.name = "MongoDB"
+        del doc_copy.job.years
+
+        assert doc.to_json() == doc_copy.to_json()
+        assert doc._get_changed_fields() == []
+
+        self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
+
     def test_save(self):
         """Ensure that a document may be saved in the database.
         """

From 5d2ca6493de3bb273763fd77296c760ddddfbc8f Mon Sep 17 00:00:00 2001
From: Dmitry Konishchev <konishchev@gmail.com>
Date: Tue, 30 Sep 2014 19:22:29 +0400
Subject: [PATCH 0005/1519] Drop unnecessary id=ObjectId() in document creation

---
 tests/document/instance.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index d5add95b2..0982a5273 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -627,13 +627,13 @@ class TestDocument(Document):
         t.save(clean=False)
 
     def test_modify_empty(self):
-        doc = self.Person(id=ObjectId(), name="bob", age=10).save()
+        doc = self.Person(name="bob", age=10).save()
         self.assertRaises(InvalidDocumentError, lambda: self.Person().modify(set__age=10))
         self.assertDbEqual([dict(doc.to_mongo())])
 
     def test_modify_invalid_query(self):
-        doc1 = self.Person(id=ObjectId(), name="bob", age=10).save()
-        doc2 = self.Person(id=ObjectId(), name="jim", age=20).save()
+        doc1 = self.Person(name="bob", age=10).save()
+        doc2 = self.Person(name="jim", age=20).save()
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
         self.assertRaises(InvalidQueryError, lambda:
@@ -642,8 +642,8 @@ def test_modify_invalid_query(self):
         self.assertDbEqual(docs)
 
     def test_modify_match_another_document(self):
-        doc1 = self.Person(id=ObjectId(), name="bob", age=10).save()
-        doc2 = self.Person(id=ObjectId(), name="jim", age=20).save()
+        doc1 = self.Person(name="bob", age=10).save()
+        doc2 = self.Person(name="jim", age=20).save()
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
         assert not doc1.modify(dict(name=doc2.name), set__age=100)
@@ -651,7 +651,7 @@ def test_modify_match_another_document(self):
         self.assertDbEqual(docs)
 
     def test_modify_not_exists(self):
-        doc1 = self.Person(id=ObjectId(), name="bob", age=10).save()
+        doc1 = self.Person(name="bob", age=10).save()
         doc2 = self.Person(id=ObjectId(), name="jim", age=20)
         docs = [dict(doc1.to_mongo())]
 
@@ -660,9 +660,8 @@ def test_modify_not_exists(self):
         self.assertDbEqual(docs)
 
     def test_modify_update(self):
-        other_doc = self.Person(id=ObjectId(), name="bob", age=10).save()
-        doc = self.Person(id=ObjectId(), name="jim", age=20,
-                          job=self.Job(name="10gen", years=3)).save()
+        other_doc = self.Person(name="bob", age=10).save()
+        doc = self.Person(name="jim", age=20, job=self.Job(name="10gen", years=3)).save()
 
         doc_copy = doc._from_son(doc.to_mongo())
 

From 7d3146234ad21ceac5260a4e9bec13b2f0dce56a Mon Sep 17 00:00:00 2001
From: Clay McClure <clay@daemons.net>
Date: Wed, 1 Oct 2014 15:59:13 -0400
Subject: [PATCH 0006/1519] Make `in_bulk()` respect `no_dereference()`

---
 mongoengine/queryset/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 7094dacc2..58e776113 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -619,7 +619,9 @@ def in_bulk(self, object_ids):
                 doc_map[doc['_id']] = self._get_as_pymongo(doc)
         else:
             for doc in docs:
-                doc_map[doc['_id']] = self._document._from_son(doc, only_fields=self.only_fields)
+                doc_map[doc['_id']] = self._document._from_son(doc,
+                        only_fields=self.only_fields,
+                        _auto_dereference=self._auto_dereference)
 
         return doc_map
 

From 9a4aef03587c3e9c3643cacd2aad3a139e81887a Mon Sep 17 00:00:00 2001
From: DavidBord <david.bordeynik@gmail.com>
Date: Wed, 29 Oct 2014 13:36:42 +0200
Subject: [PATCH 0007/1519] fix-#789: abstract shouldn't be inherited in
 EmbeddedDocument

---
 docs/changelog.rst              |  1 +
 mongoengine/base/metaclasses.py |  3 ++-
 tests/document/inheritance.py   | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f17a61c2c..155348c7d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- abstract shouldn't be inherited in EmbeddedDocument # 789
 - Allow specifying the '_cls' as a field for indexes #397
 - Stop ensure_indexes running on a secondaries unless connection is through mongos #746
 - Not overriding default values when loading a subset of fields #399
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index e80145530..48da84f42 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -46,8 +46,9 @@ def __new__(cls, name, bases, attrs):
                 elif hasattr(base, '_meta'):
                     meta.merge(base._meta)
             attrs['_meta'] = meta
+            attrs['_meta']['abstract'] = False  # 789: EmbeddedDocument shouldn't inherit abstract
 
-        if '_meta' in attrs and attrs['_meta'].get('allow_inheritance', ALLOW_INHERITANCE):
+        if attrs['_meta'].get('allow_inheritance', ALLOW_INHERITANCE):
             StringField = _import_class('StringField')
             attrs['_cls'] = StringField()
 
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index 566d36994..e8347054c 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -397,6 +397,16 @@ class EvilHuman(Human):
                 meta = {'abstract': True}
         self.assertRaises(ValueError, create_bad_abstract)
 
+    def test_abstract_embedded_documents(self):
+        # 789: EmbeddedDocument shouldn't inherit abstract
+        class A(EmbeddedDocument):
+            meta = {"abstract": True}
+
+        class B(A):
+            pass
+
+        self.assertFalse(B._meta["abstract"])
+
     def test_inherited_collections(self):
         """Ensure that subclassed documents don't override parents'
         collections

From b011d48d827e051b10827e4fa07736f580da8311 Mon Sep 17 00:00:00 2001
From: DavidBord <david.bordeynik@gmail.com>
Date: Mon, 6 Oct 2014 19:05:39 +0300
Subject: [PATCH 0008/1519] fix-#778: Add Support For MongoDB 2.6.X's maxTimeMS

---
 docs/changelog.rst           |  1 +
 mongoengine/queryset/base.py | 17 ++++++++++++++++-
 tests/queryset/queryset.py   |  4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 155348c7d..12712cd53 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Add Support For MongoDB 2.6.X's maxTimeMS #778
 - abstract shouldn't be inherited in EmbeddedDocument # 789
 - Allow specifying the '_cls' as a field for indexes #397
 - Stop ensure_indexes running on a secondaries unless connection is through mongos #746
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 7094dacc2..f10b1e320 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -82,6 +82,7 @@ def __init__(self, document, collection):
         self._skip = None
         self._hint = -1  # Using -1 as None is a valid value for hint
         self.only_fields = []
+        self._max_time_ms = None
 
     def __call__(self, q_obj=None, class_check=True, slave_okay=False,
                  read_preference=None, **query):
@@ -672,7 +673,7 @@ def clone_into(self, cls):
                       '_timeout', '_class_check', '_slave_okay', '_read_preference',
                       '_iter', '_scalar', '_as_pymongo', '_as_pymongo_coerce',
                       '_limit', '_skip', '_hint', '_auto_dereference',
-                      '_search_text', '_include_text_scores', 'only_fields')
+                      '_search_text', '_include_text_scores', 'only_fields', '_max_time_ms')
 
         for prop in copy_props:
             val = getattr(self, prop)
@@ -969,6 +970,13 @@ def as_pymongo(self, coerce_types=False):
         queryset._as_pymongo_coerce = coerce_types
         return queryset
 
+    def max_time_ms(self, ms):
+        """Wait `ms` milliseconds before killing the query on the server
+
+        :param ms: the number of milliseconds before killing the query on the server
+        """
+        return self._chainable_method("max_time_ms", ms)
+
     # JSON Helpers
 
     def to_json(self, *args, **kwargs):
@@ -1700,6 +1708,13 @@ def field_path_sub(match):
                       code)
         return code
 
+    def _chainable_method(self, method_name, val):
+        queryset = self.clone()
+        method = getattr(queryset._cursor, method_name)
+        method(val)
+        setattr(queryset, "_" + method_name, val)
+        return queryset
+
     # Deprecated
     def ensure_index(self, **kwargs):
         """Deprecated use :func:`Document.ensure_index`"""
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index fc56df7dd..8efee8b3d 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4401,6 +4401,10 @@ def test_delete_count(self):
         self.Person.objects().delete()
         self.assertEqual(self.Person.objects().skip(1).delete(), 0)  # test Document delete without existing documents
 
+    def test_max_time_ms(self):
+        # 778: max_time_ms can get only int or None as input
+        self.assertRaises(TypeError, self.Person.objects(name="name").max_time_ms, "not a number")
+
 
 if __name__ == '__main__':
     unittest.main()

From 4b498ae8cd845b0f6ac34f8823fff0b964703c14 Mon Sep 17 00:00:00 2001
From: David Czarnecki <dczarnecki@agoragames.com>
Date: Fri, 31 Oct 2014 11:40:20 -0400
Subject: [PATCH 0009/1519] Fix the documentation for reverse_delete_rule.

---
 docs/guide/signals.rst     | 2 +-
 mongoengine/fields.py      | 4 ++--
 tests/document/instance.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/guide/signals.rst b/docs/guide/signals.rst
index dc295d472..fc93e4cae 100644
--- a/docs/guide/signals.rst
+++ b/docs/guide/signals.rst
@@ -145,7 +145,7 @@ cleaner looking while still allowing manual execution of the callback::
 ReferenceFields and Signals
 ---------------------------
 
-Currently `reverse_delete_rules` do not trigger signals on the other part of
+Currently `reverse_delete_rule` does not trigger signals on the other part of
 the relationship.  If this is required you must manually handle the
 reverse deletion.
 
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 2441a7540..870d09e57 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -859,7 +859,7 @@ class ReferenceField(BaseField):
 
     Use the `reverse_delete_rule` to handle what should happen if the document
     the field is referencing is deleted.  EmbeddedDocuments, DictFields and
-    MapFields do not support reverse_delete_rules and an `InvalidDocumentError`
+    MapFields does not support reverse_delete_rule and an `InvalidDocumentError`
     will be raised if trying to set on one of these Document / Field types.
 
     The options are:
@@ -883,7 +883,7 @@ class Bar(Document):
         Bar.register_delete_rule(Foo, 'bar', NULLIFY)
 
     .. note ::
-        `reverse_delete_rules` do not trigger pre / post delete signals to be
+        `reverse_delete_rule` does not trigger pre / post delete signals to be
         triggered.
 
     .. versionchanged:: 0.5 added `reverse_delete_rule`
diff --git a/tests/document/instance.py b/tests/document/instance.py
index f925aeeba..c226b6146 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1795,7 +1795,7 @@ class Foo(Document):
         self.assertEqual(Bar.objects.count(), 1)  # No effect on the BlogPost
         self.assertEqual(Bar.objects.get().foo, None)
 
-    def test_invalid_reverse_delete_rules_raise_errors(self):
+    def test_invalid_reverse_delete_rule_raise_errors(self):
 
         def throw_invalid_document_error():
             class Blog(Document):

From eb4e7735c1a612431e730320b488253f6d3708b9 Mon Sep 17 00:00:00 2001
From: David Czarnecki <me@davidczarnecki.com>
Date: Sat, 1 Nov 2014 13:15:02 -0400
Subject: [PATCH 0010/1519] Adding myself to AUTHORS and CHANGELOG

---
 AUTHORS            | 1 +
 docs/changelog.rst | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index ffd63227e..34f8903fd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -210,3 +210,4 @@ that much better:
  * Jay Shirley (https://github.com/jshirley)
  * DavidBord (https://github.com/DavidBord)
  * Axel Haustant (https://github.com/noirbizarre)
+ * David Czarnecki (https://github.com/czarneckid)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 12712cd53..b8467381c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -56,6 +56,8 @@ Changes in 0.9.X - DEV
 - Allow atomic update for the entire `DictField` #742
 - Added MultiPointField, MultiLineField, MultiPolygonField
 - Fix multiple connections aliases being rewritten #748
+- Fixed a few instances where reverse_delete_rule was written as reverse_delete_rules. #791
+
 
 Changes in 0.8.7
 ================

From f571a944c93dd83d6cb2a7ae66b8c5b0f31ca292 Mon Sep 17 00:00:00 2001
From: Dmitry Konishchev <konishchev@gmail.com>
Date: Sun, 2 Nov 2014 17:52:44 +0300
Subject: [PATCH 0011/1519] Add #773 to changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b8467381c..777cab8d9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -37,7 +37,7 @@ Changes in 0.9.X - DEV
 - Removing support for Django 1.4.x, pymongo 2.5.x, pymongo 2.6.x.
 - Removing support for Python < 2.6.6
 - Fixed $maxDistance location for geoJSON $near queries with MongoDB 2.6+ #664
-- QuerySet.modify() method to provide find_and_modify() like behaviour #677
+- QuerySet.modify() and Document.modify() methods to provide find_and_modify() like behaviour #677 #773
 - Added support for the using() method on a queryset #676
 - PYPY support #673
 - Connection pooling #674

From 5112fb777ecc7094d498e3512ea868c515746292 Mon Sep 17 00:00:00 2001
From: Dmitry Konishchev <konishchev@gmail.com>
Date: Sun, 2 Nov 2014 17:56:25 +0300
Subject: [PATCH 0012/1519] Mention Document.modify() in the documentation

---
 docs/guide/querying.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 77e35df0d..bb8176fec 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -491,8 +491,11 @@ Documents may be updated atomically by using the
 :meth:`~mongoengine.queryset.QuerySet.update_one`,
 :meth:`~mongoengine.queryset.QuerySet.update` and
 :meth:`~mongoengine.queryset.QuerySet.modify` methods on a
-:meth:`~mongoengine.queryset.QuerySet`. There are several different "modifiers"
-that you may use with these methods:
+:class:`~mongoengine.queryset.QuerySet` or
+:meth:`~mongoengine.Document.modify` and
+:meth:`~mongoengine.Document.save` (with :attr:`save_condition` argument) on a
+:class:`~mongoengine.Document`.
+There are several different "modifiers" that you may use with these methods:
 
 * ``set`` -- set a particular value
 * ``unset`` -- delete a particular value (since MongoDB v1.3+)

From 28d62009a766cd52e37e7273c5eff61a1b6b1e65 Mon Sep 17 00:00:00 2001
From: Yohan Graterol <yohangraterol92@gmail.com>
Date: Wed, 5 Nov 2014 14:56:13 -0500
Subject: [PATCH 0013/1519] Update changelog.rst

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 777cab8d9..6925bc306 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -57,6 +57,7 @@ Changes in 0.9.X - DEV
 - Added MultiPointField, MultiLineField, MultiPolygonField
 - Fix multiple connections aliases being rewritten #748
 - Fixed a few instances where reverse_delete_rule was written as reverse_delete_rules. #791
+- Make `in_bulk()` respect `no_dereference()` #775
 
 
 Changes in 0.8.7

From c5f23ad93d669420112f8979f4d939a577eaaaf8 Mon Sep 17 00:00:00 2001
From: DavidBord <david.bordeynik@gmail.com>
Date: Thu, 18 Sep 2014 10:35:35 +0300
Subject: [PATCH 0014/1519] fix-#744: Querying by a field defined in a subclass
 raises InvalidQueryError

---
 docs/changelog.rst           |  1 +
 mongoengine/base/document.py | 13 +++++++++++++
 tests/queryset/queryset.py   | 17 +++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6925bc306..1feec3439 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Querying by a field defined in a subclass raises InvalidQueryError #744
 - Add Support For MongoDB 2.6.X's maxTimeMS #778
 - abstract shouldn't be inherited in EmbeddedDocument # 789
 - Allow specifying the '_cls' as a field for indexes #397
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 869449f93..05fd1faf5 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -884,6 +884,19 @@ def _lookup_field(cls, parts):
                 elif cls._dynamic:
                     DynamicField = _import_class('DynamicField')
                     field = DynamicField(db_field=field_name)
+                elif cls._meta.get("allow_inheritance", False) or cls._meta.get("abstract", False):
+                    # 744: in case the field is defined in a subclass
+                    field = None
+                    for subcls in cls.__subclasses__():
+                        try:
+                            field = subcls._lookup_field([field_name])[0]
+                        except LookUpError:
+                            continue
+
+                        if field is not None:
+                            break
+                    else:
+                        raise LookUpError('Cannot resolve field "%s"' % field_name)
                 else:
                     raise LookUpError('Cannot resolve field "%s"'
                                       % field_name)
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 8efee8b3d..7f548999a 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4405,6 +4405,23 @@ def test_max_time_ms(self):
         # 778: max_time_ms can get only int or None as input
         self.assertRaises(TypeError, self.Person.objects(name="name").max_time_ms, "not a number")
 
+    def test_subclass_field_query(self):
+        class Animal(Document):
+            is_mamal = BooleanField()
+            meta = dict(allow_inheritance=True)
+
+        class Cat(Animal):
+            whiskers_length = FloatField()
+
+        class ScottishCat(Cat):
+            folded_ears = BooleanField()
+
+        Animal(is_mamal=False).save()
+        Cat(is_mamal=True, whiskers_length=5.1).save()
+        ScottishCat(is_mamal=True, folded_ears=True).save()
+        self.assertEquals(Animal.objects(folded_ears=True).count(), 1)
+        self.assertEquals(Animal.objects(whiskers_length=5.1).count(), 1)
+
 
 if __name__ == '__main__':
     unittest.main()

From 914c5752a54a39b216e627b02ec935805d59ec38 Mon Sep 17 00:00:00 2001
From: DavidBord <david.bordeynik@gmail.com>
Date: Fri, 7 Nov 2014 09:18:42 +0200
Subject: [PATCH 0015/1519] fix-#759: with_limit_and_skip for count should
 default like in pymongo

---
 docs/changelog.rst               |  1 +
 mongoengine/queryset/base.py     |  2 +-
 mongoengine/queryset/queryset.py |  2 +-
 tests/queryset/queryset.py       | 10 +++++-----
 tests/test_django.py             |  5 +++++
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1feec3439..c216d4bbe 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- with_limit_and_skip for count should default like in pymongo #759
 - Querying by a field defined in a subclass raises InvalidQueryError #744
 - Add Support For MongoDB 2.6.X's maxTimeMS #778
 - abstract shouldn't be inherited in EmbeddedDocument # 789
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 95f4ae648..e43b78530 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -384,7 +384,7 @@ def insert(self, doc_or_docs, load_bulk=True, write_concern=None):
             self._document, documents=results, loaded=True)
         return return_one and results[0] or results
 
-    def count(self, with_limit_and_skip=True):
+    def count(self, with_limit_and_skip=False):
         """Count the selected elements in the query.
 
         :param with_limit_and_skip (optional): take any :meth:`limit` or
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index cebfcc50d..e8bd66ae0 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -94,7 +94,7 @@ def _populate_cache(self):
             except StopIteration:
                 self._has_more = False
 
-    def count(self, with_limit_and_skip=True):
+    def count(self, with_limit_and_skip=False):
         """Count the selected elements in the query.
 
         :param with_limit_and_skip (optional): take any :meth:`limit` or
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 7f548999a..40d010c66 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -914,7 +914,7 @@ def __repr__(self):
         docs = docs[1:4]
         self.assertEqual('[<Doc: 1>, <Doc: 2>, <Doc: 3>]', "%s" % docs)
 
-        self.assertEqual(docs.count(), 3)
+        self.assertEqual(docs.count(with_limit_and_skip=True), 3)
         for doc in docs:
             self.assertEqual('.. queryset mid-iteration ..', repr(docs))
 
@@ -3244,7 +3244,7 @@ class Post(Document):
         for i in xrange(10):
             Post(title="Post %s" % i).save()
 
-        self.assertEqual(5, Post.objects.limit(5).skip(5).count())
+        self.assertEqual(5, Post.objects.limit(5).skip(5).count(with_limit_and_skip=True))
 
         self.assertEqual(
             10, Post.objects.limit(5).skip(5).count(with_limit_and_skip=False))
@@ -4013,7 +4013,7 @@ class Person(Document):
             self.assertEqual(100, people._len)  # Caused by list calling len
             self.assertEqual(q, 1)
 
-            people.count()  # count is cached
+            people.count(with_limit_and_skip=True)  # count is cached
             self.assertEqual(q, 1)
 
     def test_no_cached_queryset(self):
@@ -4109,7 +4109,7 @@ def __unicode__(self):
         with query_counter() as q:
             self.assertEqual(q, 0)
 
-            self.assertEqual(users.count(), 7)
+            self.assertEqual(users.count(with_limit_and_skip=True), 7)
 
             for i, outer_user in enumerate(users):
                 self.assertEqual(outer_user.name, names[i])
@@ -4117,7 +4117,7 @@ def __unicode__(self):
                 inner_count = 0
 
                 # Calling len might disrupt the inner loop if there are bugs
-                self.assertEqual(users.count(), 7)
+                self.assertEqual(users.count(with_limit_and_skip=True), 7)
 
                 for j, inner_user in enumerate(users):
                     self.assertEqual(inner_user.name, names[j])
diff --git a/tests/test_django.py b/tests/test_django.py
index 7badbd64f..c4d3d5829 100644
--- a/tests/test_django.py
+++ b/tests/test_django.py
@@ -170,7 +170,12 @@ def test_filter(self):
         """Ensure that a queryset and filters work as expected
         """
 
+        class LimitCountQuerySet(QuerySet):
+            def count(self, with_limit_and_skip=True):
+                return super(LimitCountQuerySet, self).count(with_limit_and_skip)
+
         class Note(Document):
+            meta = dict(queryset_class=LimitCountQuerySet)
             text = StringField()
 
         Note.drop_collection()

From 1fcf0098044698ba95312cce7f671e8f792b3764 Mon Sep 17 00:00:00 2001
From: DavidBord <david.bordeynik@gmail.com>
Date: Fri, 7 Nov 2014 15:03:11 +0200
Subject: [PATCH 0016/1519] fix-#787: Fix storing value of precision attribute
 in DecimalField

---
 docs/changelog.rst    | 1 +
 mongoengine/fields.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1feec3439..ff227f8d7 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Fix storing value of precision attribute in DecimalField #787
 - Querying by a field defined in a subclass raises InvalidQueryError #744
 - Add Support For MongoDB 2.6.X's maxTimeMS #778
 - abstract shouldn't be inherited in EmbeddedDocument # 789
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 870d09e57..d9aeb3f16 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -308,7 +308,7 @@ def __init__(self, min_value=None, max_value=None, force_string=False,
         self.min_value = min_value
         self.max_value = max_value
         self.force_string = force_string
-        self.precision = decimal.Decimal(".%s" % ("0" * precision))
+        self.precision = precision
         self.rounding = rounding
 
         super(DecimalField, self).__init__(**kwargs)
@@ -322,7 +322,7 @@ def to_python(self, value):
             value = decimal.Decimal("%s" % value)
         except decimal.InvalidOperation:
             return value
-        return value.quantize(self.precision, rounding=self.rounding)
+        return value.quantize(decimal.Decimal(".%s" % ("0" * self.precision)), rounding=self.rounding)
 
     def to_mongo(self, value, use_db_field=True):
         if value is None:

From bdbd495a9e778d12157b789a74e0e00a303b5efd Mon Sep 17 00:00:00 2001
From: DavidBord <david.bordeynik@gmail.com>
Date: Sun, 17 Aug 2014 13:57:48 +0300
Subject: [PATCH 0017/1519] fix-#734: set attribute to None does not work (at
 least for fields with default values). Solves #735 as well

---
 docs/changelog.rst         |  1 +
 mongoengine/base/fields.py | 16 +++++++++++-----
 tests/document/instance.py | 21 +++++++++++++++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1feec3439..1842dca80 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Set attribute to None does not work (at least for fields with default values) #734
 - Querying by a field defined in a subclass raises InvalidQueryError #744
 - Add Support For MongoDB 2.6.X's maxTimeMS #778
 - abstract shouldn't be inherited in EmbeddedDocument # 789
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 5bb9c7ac4..2747dde1d 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -37,7 +37,7 @@ class BaseField(object):
     def __init__(self, db_field=None, name=None, required=False, default=None,
                  unique=False, unique_with=None, primary_key=False,
                  validation=None, choices=None, verbose_name=None,
-                 help_text=None):
+                 help_text=None, null=False):
         """
         :param db_field: The database field to store this field in
             (defaults to the name of the field)
@@ -60,6 +60,8 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
             model forms from the document model.
         :param help_text: (optional) The help text for this field and is often
             used when generating model forms from the document model.
+        :param null: (optional) Is the field value can be null. If no and there is a default value
+            then the default value is set
         """
         self.db_field = (db_field or name) if not primary_key else '_id'
 
@@ -75,6 +77,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.choices = choices
         self.verbose_name = verbose_name
         self.help_text = help_text
+        self.null = null
 
         # Adjust the appropriate creation counter, and save our local copy.
         if self.db_field == '_id':
@@ -100,10 +103,13 @@ def __set__(self, instance, value):
 
         # If setting to None and theres a default
         # Then set the value to the default value
-        if value is None and self.default is not None:
-            value = self.default
-            if callable(value):
-                value = value()
+        if value is None:
+            if self.null:
+                value = None
+            elif self.default is not None:
+                value = self.default
+                if callable(value):
+                    value = value()
 
         if instance._initialised:
             try:
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 360d53851..6bb203002 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2706,5 +2706,26 @@ class Person(Document):
         self.assertEquals(p4.height, 189)
         self.assertEquals(Person.objects(height=189).count(), 1)
 
+    def test_null_field(self):
+        # 734
+        class User(Document):
+            name = StringField()
+            height = IntField(default=184, null=True)
+        User.objects.delete()
+        u = User(name='user')
+        u.save()
+        u_from_db = User.objects.get(name='user')
+        u_from_db.height = None
+        u_from_db.save()
+        self.assertEquals(u_from_db.height, None)
+
+        # 735
+        User.objects.delete()
+        u = User(name='user')
+        u.save()
+        User.objects(name='user').update_one(set__height=None, upsert=True)
+        u_from_db = User.objects.get(name='user')
+        self.assertEquals(u_from_db.height, None)
+
 if __name__ == '__main__':
     unittest.main()

From 70942ac0f645a6736f622da22758d33140e43514 Mon Sep 17 00:00:00 2001
From: Yohan Graterol <yohangraterol92@gmail.com>
Date: Fri, 7 Nov 2014 11:03:49 -0500
Subject: [PATCH 0018/1519] Update changelog.rst

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b3497f9cb..809650f39 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -61,6 +61,7 @@ Changes in 0.9.X - DEV
 - Fix multiple connections aliases being rewritten #748
 - Fixed a few instances where reverse_delete_rule was written as reverse_delete_rules. #791
 - Make `in_bulk()` respect `no_dereference()` #775
+- Handle None from model __str__; Fixes #753 #754
 
 
 Changes in 0.8.7

From 3569529a84837d42a680e13f64bc912be6d0937f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Ericson?= <de.ericson@gmail.com>
Date: Sat, 8 Nov 2014 19:11:51 -0300
Subject: [PATCH 0019/1519] Fix KeyError on reload() from a DynamicDocument

If the document is in memory and a field is deleted from the db,
calling reload() would raise a KeyError.
---
 AUTHORS                   | 1 +
 mongoengine/document.py   | 8 +++++++-
 tests/document/dynamic.py | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 23930cc38..34f3d63fd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -212,3 +212,4 @@ that much better:
  * Axel Haustant (https://github.com/noirbizarre)
  * David Czarnecki (https://github.com/czarneckid)
  * Vyacheslav Murashkin (https://github.com/a4tunado)
+ * André Ericson (https://github.com/aericson)
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 2eab83ef3..1891c1642 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -543,7 +543,13 @@ def reload(self, *fields, **kwargs):
 
         for field in self._fields_ordered:
             if not fields or field in fields:
-                setattr(self, field, self._reload(field, obj[field]))
+                try:
+                    setattr(self, field, self._reload(field, obj[field]))
+                except KeyError:
+                    # If field is removed from the database while the object
+                    # is in memory, a reload would cause a KeyError
+                    # i.e. obj.update(unset__field=1) followed by obj.reload()
+                    delattr(self, field)
 
         self._changed_fields = obj._changed_fields
         self._created = False
diff --git a/tests/document/dynamic.py b/tests/document/dynamic.py
index a0bdb136d..52136efca 100644
--- a/tests/document/dynamic.py
+++ b/tests/document/dynamic.py
@@ -81,6 +81,13 @@ def test_delete_dynamic_field(self):
         obj = collection.find_one()
         self.assertEqual(sorted(obj.keys()), ['_cls', '_id', 'name'])
 
+    def test_reload_after_unsetting(self):
+        p = self.Person()
+        p.misc = 22
+        p.save()
+        p.update(unset__misc=1)
+        p.reload()
+
     def test_dynamic_document_queries(self):
         """Ensure we can query dynamic fields"""
         p = self.Person()

From 0452eec11d7b9ca39fb58f1141582d2a742f1ddb Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Sun, 9 Nov 2014 19:23:49 +0200
Subject: [PATCH 0020/1519] fix-#771: OperationError: Shard Keys are immutable.
 Tried to update id even though the document is not yet saved

---
 docs/changelog.rst           |  1 +
 mongoengine/base/document.py |  8 ++++----
 tests/document/instance.py   | 11 +++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 809650f39..e3f3ecd17 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- OperationError: Shard Keys are immutable. Tried to update id even though the document is not yet saved #771
 - with_limit_and_skip for count should default like in pymongo #759
 - Fix storing value of precision attribute in DecimalField #787
 - Querying by a field defined in a subclass raises InvalidQueryError #744
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index bf5bdf794..8995a3047 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -386,9 +386,9 @@ def to_json(self, *args, **kwargs):
         return json_util.dumps(self.to_mongo(use_db_field),  *args, **kwargs)
 
     @classmethod
-    def from_json(cls, json_data):
+    def from_json(cls, json_data, created=False):
         """Converts json data to an unsaved document instance"""
-        return cls._from_son(json_util.loads(json_data))
+        return cls._from_son(json_util.loads(json_data), created=created)
 
     def __expand_dynamic_values(self, name, value):
         """expand any dynamic values to their correct types / values"""
@@ -617,7 +617,7 @@ def _get_collection_name(cls):
         return cls._meta.get('collection', None)
 
     @classmethod
-    def _from_son(cls, son, _auto_dereference=True, only_fields=[]):
+    def _from_son(cls, son, _auto_dereference=True, only_fields=[], created=False):
         """Create an instance of a Document (subclass) from a PyMongo SON.
         """
 
@@ -667,7 +667,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=[]):
         if cls.STRICT:
             data = dict((k, v)
                         for k, v in data.iteritems() if k in cls._fields)
-        obj = cls(__auto_convert=False, _created=False, __only_fields=only_fields, **data)
+        obj = cls(__auto_convert=False, _created=created, __only_fields=only_fields, **data)
         obj._changed_fields = changed_fields
         if not _auto_dereference:
             obj._fields = fields
diff --git a/tests/document/instance.py b/tests/document/instance.py
index a22f3fbf0..b77335489 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2719,5 +2719,16 @@ class Person(Document):
         self.assertEquals(p4.height, 189)
         self.assertEquals(Person.objects(height=189).count(), 1)
 
+    def test_from_son(self):
+        # 771
+        class MyPerson(self.Person):
+            meta = dict(shard_key=["id"])
+        p = MyPerson.from_json('{"name": "name", "age": 27}', created=True)
+        self.assertEquals(p.id, None)
+        p.id = "12345"  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
+        p = MyPerson._from_son({"name": "name", "age": 27}, created=True)
+        self.assertEquals(p.id, None)
+        p.id = "12345"  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
+
 if __name__ == '__main__':
     unittest.main()

From 2af55baa9aa9c038df948b5545a2ee44d82258b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Ericson?= <de.ericson@gmail.com>
Date: Sun, 9 Nov 2014 16:13:49 -0300
Subject: [PATCH 0021/1519] Better BaseDocument equality check when not saved

When 2 instances of a Document had id = None they would be considered
equal unless an __eq__ were implemented.

We now return False for such case. It now behaves more similar to
Django's ORM.
---
 mongoengine/base/document.py         |  4 +++-
 tests/document/instance.py           | 19 +++++++++++++++++++
 tests/document/json_serialisation.py |  8 ++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index bf5bdf794..6be685ae3 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -241,10 +241,12 @@ def __str__(self):
         return txt_type('%s object' % self.__class__.__name__)
 
     def __eq__(self, other):
-        if isinstance(other, self.__class__) and hasattr(other, 'id'):
+        if isinstance(other, self.__class__) and hasattr(other, 'id') and other.id is not None:
             return self.id == other.id
         if isinstance(other, DBRef):
             return self._get_collection_name() == other.collection and self.id == other.id
+        if self.id is None:
+            return self is other
         return False
 
     def __ne__(self, other):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index a22f3fbf0..6dae88a06 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2503,6 +2503,10 @@ class Doc(Document):
             doc_name = StringField()
             doc = EmbeddedDocumentField(Embedded)
 
+            def __eq__(self, other):
+                return (self.doc_name == other.doc_name and
+                        self.doc == other.doc)
+
         classic_doc = Doc(doc_name="my doc", doc=Embedded(name="embedded doc"))
         dict_doc = Doc(**{"doc_name": "my doc",
                           "doc": {"name": "embedded doc"}})
@@ -2519,6 +2523,10 @@ class Doc(Document):
             doc_name = StringField()
             docs = ListField(EmbeddedDocumentField(Embedded))
 
+            def __eq__(self, other):
+                return (self.doc_name == other.doc_name and
+                        self.docs == other.docs)
+
         classic_doc = Doc(doc_name="my doc", docs=[
                           Embedded(name="embedded doc1"),
                           Embedded(name="embedded doc2")])
@@ -2719,5 +2727,16 @@ class Person(Document):
         self.assertEquals(p4.height, 189)
         self.assertEquals(Person.objects(height=189).count(), 1)
 
+    def test_not_saved_eq(self):
+        """Ensure we can compare documents not saved.
+        """
+        class Person(Document):
+            pass
+
+        p = Person()
+        p1 = Person()
+        self.assertNotEqual(p, p1)
+        self.assertEqual(p, p)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/document/json_serialisation.py b/tests/document/json_serialisation.py
index fd7795f7d..f47b5de5b 100644
--- a/tests/document/json_serialisation.py
+++ b/tests/document/json_serialisation.py
@@ -51,6 +51,10 @@ class Doc(Document):
             string = StringField()
             embedded_field = EmbeddedDocumentField(Embedded)
 
+            def __eq__(self, other):
+                return (self.string == other.string and
+                        self.embedded_field == other.embedded_field)
+
         doc = Doc(string="Hi", embedded_field=Embedded(string="Hi"))
 
         doc_json = doc.to_json(sort_keys=True, separators=(',', ':'))
@@ -99,6 +103,10 @@ class Doc(Document):
             generic_embedded_document_field = GenericEmbeddedDocumentField(
                                         default=lambda: EmbeddedDoc())
 
+            def __eq__(self, other):
+                import json
+                return json.loads(self.to_json()) == json.loads(other.to_json())
+
         doc = Doc()
         self.assertEqual(doc, Doc.from_json(doc.to_json()))
 

From 5583cf0a5fc217623600c287bfb5093921f41966 Mon Sep 17 00:00:00 2001
From: Yohan Graterol <yohangraterol92@gmail.com>
Date: Sun, 9 Nov 2014 21:27:23 -0500
Subject: [PATCH 0022/1519] PEP8 compliance tests/document/instance.py

---
 tests/document/instance.py | 117 ++++++++++++++++++++++++-------------
 1 file changed, 77 insertions(+), 40 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 5360ba363..36118512b 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -146,10 +146,18 @@ def test_polymorphic_references(self):
         """
         class Animal(Document):
             meta = {'allow_inheritance': True}
-        class Fish(Animal): pass
-        class Mammal(Animal): pass
-        class Dog(Mammal): pass
-        class Human(Mammal): pass
+
+        class Fish(Animal):
+            pass
+
+        class Mammal(Animal):
+            pass
+
+        class Dog(Mammal):
+            pass
+
+        class Human(Mammal):
+            pass
 
         class Zoo(Document):
             animals = ListField(ReferenceField(Animal))
@@ -461,7 +469,7 @@ class Foo(Document):
             f.reload()
         except Foo.DoesNotExist:
             pass
-        except Exception as ex:
+        except Exception:
             self.assertFalse("Threw wrong exception")
 
         f.save()
@@ -505,8 +513,9 @@ class Employee(Person):
 
         self.assertEqual(Person(name="Bob", age=35).to_mongo().keys(),
                          ['_cls', 'name', 'age'])
-        self.assertEqual(Employee(name="Bob", age=35, salary=0).to_mongo().keys(),
-                         ['_cls', 'name', 'age', 'salary'])
+        self.assertEqual(
+            Employee(name="Bob", age=35, salary=0).to_mongo().keys(),
+            ['_cls', 'name', 'age', 'salary'])
 
     def test_embedded_document_to_mongo_id(self):
         class SubDoc(EmbeddedDocument):
@@ -643,7 +652,8 @@ class TestDocument(Document):
 
     def test_modify_empty(self):
         doc = self.Person(name="bob", age=10).save()
-        self.assertRaises(InvalidDocumentError, lambda: self.Person().modify(set__age=10))
+        self.assertRaises(
+            InvalidDocumentError, lambda: self.Person().modify(set__age=10))
         self.assertDbEqual([dict(doc.to_mongo())])
 
     def test_modify_invalid_query(self):
@@ -651,8 +661,9 @@ def test_modify_invalid_query(self):
         doc2 = self.Person(name="jim", age=20).save()
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
-        self.assertRaises(InvalidQueryError, lambda:
-            doc1.modify(dict(id=doc2.id), set__value=20))
+        self.assertRaises(
+            InvalidQueryError,
+            lambda: doc1.modify(dict(id=doc2.id), set__value=20))
 
         self.assertDbEqual(docs)
 
@@ -676,7 +687,8 @@ def test_modify_not_exists(self):
 
     def test_modify_update(self):
         other_doc = self.Person(name="bob", age=10).save()
-        doc = self.Person(name="jim", age=20, job=self.Job(name="10gen", years=3)).save()
+        doc = self.Person(
+            name="jim", age=20, job=self.Job(name="10gen", years=3)).save()
 
         doc_copy = doc._from_son(doc.to_mongo())
 
@@ -685,7 +697,8 @@ def test_modify_update(self):
         doc.job.name = "Google"
         doc.job.years = 3
 
-        assert doc.modify(set__age=21, set__job__name="MongoDB", unset__job__years=True)
+        assert doc.modify(
+            set__age=21, set__job__name="MongoDB", unset__job__years=True)
         doc_copy.age = 21
         doc_copy.job.name = "MongoDB"
         del doc_copy.job.years
@@ -933,7 +946,7 @@ def UUID(i):
         w1 = Widget(toggle=False, save_id=UUID(1))
 
         # ignore save_condition on new record creation
-        w1.save(save_condition={'save_id':UUID(42)})
+        w1.save(save_condition={'save_id': UUID(42)})
         w1.reload()
         self.assertFalse(w1.toggle)
         self.assertEqual(w1.save_id, UUID(1))
@@ -943,7 +956,7 @@ def UUID(i):
         flip(w1)
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
-        w1.save(save_condition={'save_id':UUID(42)})
+        w1.save(save_condition={'save_id': UUID(42)})
         w1.reload()
         self.assertFalse(w1.toggle)
         self.assertEqual(w1.count, 0)
@@ -952,7 +965,7 @@ def UUID(i):
         flip(w1)
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
-        w1.save(save_condition={'save_id':UUID(1)})
+        w1.save(save_condition={'save_id': UUID(1)})
         w1.reload()
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
@@ -965,25 +978,25 @@ def UUID(i):
 
         flip(w1)
         w1.save_id = UUID(2)
-        w1.save(save_condition={'save_id':old_id})
+        w1.save(save_condition={'save_id': old_id})
         w1.reload()
         self.assertFalse(w1.toggle)
         self.assertEqual(w1.count, 2)
         flip(w2)
         flip(w2)
-        w2.save(save_condition={'save_id':old_id})
+        w2.save(save_condition={'save_id': old_id})
         w2.reload()
         self.assertFalse(w2.toggle)
         self.assertEqual(w2.count, 2)
 
         # save_condition uses mongoengine-style operator syntax
         flip(w1)
-        w1.save(save_condition={'count__lt':w1.count})
+        w1.save(save_condition={'count__lt': w1.count})
         w1.reload()
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)
         flip(w1)
-        w1.save(save_condition={'count__gte':w1.count})
+        w1.save(save_condition={'count__gte': w1.count})
         w1.reload()
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)
@@ -1429,7 +1442,8 @@ def test_save_custom_id(self):
         self.assertEqual(str(person_obj['_id']), '497ce96f395f2f052a494fd4')
 
     def test_save_custom_pk(self):
-        """Ensure that a document may be saved with a custom _id using pk alias.
+        """
+        Ensure that a document may be saved with a custom _id using pk alias.
         """
         # Create person object and save it to the database
         person = self.Person(name='Test User', age=30,
@@ -1515,9 +1529,15 @@ class Page(Document):
         p4 = Page(comments=[Comment(user=u2, comment="Heavy Metal song")])
         p4.save()
 
-        self.assertEqual([p1, p2], list(Page.objects.filter(comments__user=u1)))
-        self.assertEqual([p1, p2, p4], list(Page.objects.filter(comments__user=u2)))
-        self.assertEqual([p1, p3], list(Page.objects.filter(comments__user=u3)))
+        self.assertEqual(
+            [p1, p2],
+            list(Page.objects.filter(comments__user=u1)))
+        self.assertEqual(
+            [p1, p2, p4],
+            list(Page.objects.filter(comments__user=u2)))
+        self.assertEqual(
+            [p1, p3],
+            list(Page.objects.filter(comments__user=u3)))
 
     def test_save_embedded_document(self):
         """Ensure that a document with an embedded document field may be
@@ -1592,7 +1612,8 @@ class Employee(self.Person):
         self.assertEqual(promoted_employee.age, 50)
 
         # Ensure that the 'details' embedded object saved correctly
-        self.assertEqual(promoted_employee.details.position, 'Senior Developer')
+        self.assertEqual(
+            promoted_employee.details.position, 'Senior Developer')
 
         # Test removal
         promoted_employee.details = None
@@ -1728,7 +1749,8 @@ class BlogPost(Document):
         post.save()
 
         reviewer.delete()
-        self.assertEqual(BlogPost.objects.count(), 1)  # No effect on the BlogPost
+        # No effect on the BlogPost
+        self.assertEqual(BlogPost.objects.count(), 1)
         self.assertEqual(BlogPost.objects.get().reviewer, None)
 
         # Delete the Person, which should lead to deletion of the BlogPost, too
@@ -1777,8 +1799,10 @@ def test_reverse_delete_rule_cascade_and_nullify_complex_field(self):
 
         class BlogPost(Document):
             content = StringField()
-            authors = ListField(ReferenceField(self.Person, reverse_delete_rule=CASCADE))
-            reviewers = ListField(ReferenceField(self.Person, reverse_delete_rule=NULLIFY))
+            authors = ListField(ReferenceField(
+                self.Person, reverse_delete_rule=CASCADE))
+            reviewers = ListField(ReferenceField(
+                self.Person, reverse_delete_rule=NULLIFY))
 
         self.Person.drop_collection()
 
@@ -1878,8 +1902,12 @@ def test_invalid_reverse_delete_rule_raise_errors(self):
         def throw_invalid_document_error():
             class Blog(Document):
                 content = StringField()
-                authors = MapField(ReferenceField(self.Person, reverse_delete_rule=CASCADE))
-                reviewers = DictField(field=ReferenceField(self.Person, reverse_delete_rule=NULLIFY))
+                authors = MapField(ReferenceField(
+                    self.Person, reverse_delete_rule=CASCADE))
+                reviewers = DictField(
+                    field=ReferenceField(
+                        self.Person,
+                        reverse_delete_rule=NULLIFY))
 
         self.assertRaises(InvalidDocumentError, throw_invalid_document_error)
 
@@ -1888,7 +1916,8 @@ class Parents(EmbeddedDocument):
                 father = ReferenceField('Person', reverse_delete_rule=DENY)
                 mother = ReferenceField('Person', reverse_delete_rule=DENY)
 
-        self.assertRaises(InvalidDocumentError, throw_invalid_document_error_embedded)
+        self.assertRaises(
+            InvalidDocumentError, throw_invalid_document_error_embedded)
 
     def test_reverse_delete_rule_cascade_recurs(self):
         """Ensure that a chain of documents is also deleted upon cascaded
@@ -1910,16 +1939,16 @@ class Comment(Document):
         author = self.Person(name='Test User')
         author.save()
 
-        post = BlogPost(content = 'Watched some TV')
+        post = BlogPost(content='Watched some TV')
         post.author = author
         post.save()
 
-        comment = Comment(text = 'Kudos.')
+        comment = Comment(text='Kudos.')
         comment.post = post
         comment.save()
 
-        # Delete the Person, which should lead to deletion of the BlogPost, and,
-        # recursively to the Comment, too
+        # Delete the Person, which should lead to deletion of the BlogPost,
+        # and, recursively to the Comment, too
         author.delete()
         self.assertEqual(Comment.objects.count(), 0)
 
@@ -1942,7 +1971,7 @@ class BlogPost(Document):
         author = self.Person(name='Test User')
         author.save()
 
-        post = BlogPost(content = 'Watched some TV')
+        post = BlogPost(content='Watched some TV')
         post.author = author
         post.save()
 
@@ -2058,7 +2087,8 @@ def test_picklable(self):
 
     def test_dynamic_document_pickle(self):
 
-        pickle_doc = PickleDynamicTest(name="test", number=1, string="One", lists=['1', '2'])
+        pickle_doc = PickleDynamicTest(
+            name="test", number=1, string="One", lists=['1', '2'])
         pickle_doc.embedded = PickleDyanmicEmbedded(foo="Bar")
         pickled_doc = pickle.dumps(pickle_doc)  # make sure pickling works even before the doc is saved
 
@@ -2080,7 +2110,8 @@ def test_dynamic_document_pickle(self):
                          pickle_doc.embedded._dynamic_fields.keys())
 
     def test_picklable_on_signals(self):
-        pickle_doc = PickleSignalsTest(number=1, string="One", lists=['1', '2'])
+        pickle_doc = PickleSignalsTest(
+            number=1, string="One", lists=['1', '2'])
         pickle_doc.embedded = PickleEmbedded()
         pickle_doc.save()
         pickle_doc.delete()
@@ -2235,9 +2266,15 @@ class AuthorBooks(Document):
         self.assertEqual(AuthorBooks._get_db(), get_db("testdb-3"))
 
         # Collections
-        self.assertEqual(User._get_collection(), get_db("testdb-1")[User._get_collection_name()])
-        self.assertEqual(Book._get_collection(), get_db("testdb-2")[Book._get_collection_name()])
-        self.assertEqual(AuthorBooks._get_collection(), get_db("testdb-3")[AuthorBooks._get_collection_name()])
+        self.assertEqual(
+            User._get_collection(),
+            get_db("testdb-1")[User._get_collection_name()])
+        self.assertEqual(
+            Book._get_collection(),
+            get_db("testdb-2")[Book._get_collection_name()])
+        self.assertEqual(
+            AuthorBooks._get_collection(),
+            get_db("testdb-3")[AuthorBooks._get_collection_name()])
 
     def test_db_alias_overrides(self):
         """db_alias can be overriden

From eac4f6062edd0d7df187634d3abd9a479d222165 Mon Sep 17 00:00:00 2001
From: Yohan Graterol <yohangraterol92@gmail.com>
Date: Sun, 9 Nov 2014 21:28:03 -0500
Subject: [PATCH 0023/1519] Fix merge in docs/changelog.rst

---
 docs/changelog.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d0af955e0..d1714e788 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,13 +5,10 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
-<<<<<<< HEAD
 - OperationError: Shard Keys are immutable. Tried to update id even though the document is not yet saved #771
 - with_limit_and_skip for count should default like in pymongo #759
 - Fix storing value of precision attribute in DecimalField #787
-=======
 - Set attribute to None does not work (at least for fields with default values) #734
->>>>>>> bdbd495a9e778d12157b789a74e0e00a303b5efd
 - Querying by a field defined in a subclass raises InvalidQueryError #744
 - Add Support For MongoDB 2.6.X's maxTimeMS #778
 - abstract shouldn't be inherited in EmbeddedDocument # 789

From 2e01e0c30e7dbf373add8d97a1a76375eeacf3fe Mon Sep 17 00:00:00 2001
From: Yohan Graterol <yohangraterol92@gmail.com>
Date: Sun, 9 Nov 2014 21:32:50 -0500
Subject: [PATCH 0024/1519] Added merge to changelog.rst

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d1714e788..eb8ccc346 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Better BaseDocument equality check when not saved #798
 - OperationError: Shard Keys are immutable. Tried to update id even though the document is not yet saved #771
 - with_limit_and_skip for count should default like in pymongo #759
 - Fix storing value of precision attribute in DecimalField #787

From 57328e55f3da6fd3504d64f2ba478cfcef3d1e57 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Mon, 10 Nov 2014 09:37:35 +0200
Subject: [PATCH 0025/1519] Bumped django versions and added 1.7.1.

---
 .travis.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9a7f97e78..8724a8332 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,14 +10,17 @@ python:
     - "pypy3"
 env:
   - PYMONGO=dev DJANGO=dev
-  - PYMONGO=dev DJANGO=1.6.5
-  - PYMONGO=dev DJANGO=1.5.8
+  - PYMONGO=dev DJANGO=1.7.1
+  - PYMONGO=dev DJANGO=1.6.8
+  - PYMONGO=dev DJANGO=1.5.11
   - PYMONGO=2.7.1 DJANGO=dev
-  - PYMONGO=2.7.1 DJANGO=1.6.5
-  - PYMONGO=2.7.1 DJANGO=1.5.8
+  - PYMONGO=dev DJANGO=1.7.1
+  - PYMONGO=2.7.1 DJANGO=1.6.8
+  - PYMONGO=2.7.1 DJANGO=1.5.11
   - PYMONGO=2.7.2 DJANGO=dev
-  - PYMONGO=2.7.2 DJANGO=1.6.5
-  - PYMONGO=2.7.2 DJANGO=1.5.8
+  - PYMONGO=dev DJANGO=1.7.1
+  - PYMONGO=2.7.2 DJANGO=1.6.8
+  - PYMONGO=2.7.2 DJANGO=1.5.11
 
 matrix:
     exclude:
@@ -41,7 +44,7 @@ install:
     - sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk
     - if [[ $PYMONGO == 'dev' ]]; then travis_retry pip install https://github.com/mongodb/mongo-python-driver/tarball/master; true; fi
     - if [[ $PYMONGO != 'dev' ]]; then travis_retry pip install pymongo==$PYMONGO; true; fi
-    - if [[ $DJANGO == 'dev' ]]; then travis_retry pip install https://www.djangoproject.com/download/1.7c2/tarball/; fi
+    - if [[ $DJANGO == 'dev' ]]; then travis_retry https://github.com/django/django/tarball/master; fi
     - if [[ $DJANGO != 'dev' ]]; then travis_retry pip install Django==$DJANGO; fi
     - travis_retry pip install https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.1.tar.gz#md5=1534bb15cf311f07afaa3aacba1c028b
     - travis_retry pip install coveralls

From a4244defb530d01dea67e67e8dc2a5fb348a7a5f Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Mon, 10 Nov 2014 09:41:29 +0200
Subject: [PATCH 0026/1519] Fixed build matrix.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8724a8332..14a626754 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,11 @@ env:
   - PYMONGO=dev DJANGO=1.6.8
   - PYMONGO=dev DJANGO=1.5.11
   - PYMONGO=2.7.1 DJANGO=dev
-  - PYMONGO=dev DJANGO=1.7.1
+  - PYMONGO=2.7.1 DJANGO=1.7.1
   - PYMONGO=2.7.1 DJANGO=1.6.8
   - PYMONGO=2.7.1 DJANGO=1.5.11
   - PYMONGO=2.7.2 DJANGO=dev
-  - PYMONGO=dev DJANGO=1.7.1
+  - PYMONGO=2.7.2 DJANGO=1.7.1
   - PYMONGO=2.7.2 DJANGO=1.6.8
   - PYMONGO=2.7.2 DJANGO=1.5.11
 

From a22ad1ec3277de53d01f257cec9ef1b5d6298e2e Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Tue, 11 Nov 2014 09:09:21 +0200
Subject: [PATCH 0027/1519] Exclude Django 1,7 and Python 2.6 since Django 1.7
 doesn't support 2.6.

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 14a626754..850ecbe04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,12 @@ matrix:
           env: PYMONGO=2.7.1 DJANGO=dev
         - python: "2.6"
           env: PYMONGO=2.7.2 DJANGO=dev
+        - python: "2.6"
+          env: PYMONGO=dev DJANGO=1.7.1
+        - python: "2.6"
+          env: PYMONGO=2.7.1 DJANGO=1.7.1
+        - python: "2.6"
+          env: PYMONGO=2.7.2 DJANGO=1.7.1
     allow_failures:
         - python: "pypy3"
     fast_finish: true

From 96aedaa91fe437d72b931ef64f53740a76197313 Mon Sep 17 00:00:00 2001
From: Yohan Graterol <yohangraterol92@gmail.com>
Date: Wed, 12 Nov 2014 12:06:20 -0500
Subject: [PATCH 0028/1519] Install Django dev from repo with pip

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 850ecbe04..2d03faecc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ install:
     - sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk
     - if [[ $PYMONGO == 'dev' ]]; then travis_retry pip install https://github.com/mongodb/mongo-python-driver/tarball/master; true; fi
     - if [[ $PYMONGO != 'dev' ]]; then travis_retry pip install pymongo==$PYMONGO; true; fi
-    - if [[ $DJANGO == 'dev' ]]; then travis_retry https://github.com/django/django/tarball/master; fi
+    - if [[ $DJANGO == 'dev' ]]; then travis_retry pip install git+https://github.com/django/django.git; fi
     - if [[ $DJANGO != 'dev' ]]; then travis_retry pip install Django==$DJANGO; fi
     - travis_retry pip install https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.1.tar.gz#md5=1534bb15cf311f07afaa3aacba1c028b
     - travis_retry pip install coveralls

From b2c8c326d75a2ef61464d17ffd332e0d3d7cf896 Mon Sep 17 00:00:00 2001
From: mikhailmoshnogorsky <monogoria@yandex.ru>
Date: Wed, 12 Nov 2014 17:00:07 -0500
Subject: [PATCH 0029/1519] write_concern not in params of Collection#remove

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index e43b78530..8c880e973 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -459,7 +459,7 @@ def delete(self, write_concern=None, _from_doc_delete=False):
                     write_concern=write_concern,
                     **{'pull_all__%s' % field_name: self})
 
-        result = queryset._collection.remove(queryset._query, write_concern=write_concern)
+        result = queryset._collection.remove(queryset._query, **write_concern)
         return result["n"]
 
     def update(self, upsert=False, multi=True, write_concern=None,

From 03c2967337da63abca41e2e266d54f098d53806f Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Thu, 13 Nov 2014 20:47:31 +0200
Subject: [PATCH 0030/1519] Update changelog & authors - #801

---
 AUTHORS            | 5 +++--
 docs/changelog.rst | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 34f3d63fd..6079ff439 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -208,8 +208,9 @@ that much better:
  * Norberto Leite (https://github.com/nleite)
  * Bob Cribbs (https://github.com/bocribbz)
  * Jay Shirley (https://github.com/jshirley)
- * DavidBord (https://github.com/DavidBord)
+ * David Bordeynik (https://github.com/DavidBord)
  * Axel Haustant (https://github.com/noirbizarre)
  * David Czarnecki (https://github.com/czarneckid)
  * Vyacheslav Murashkin (https://github.com/a4tunado)
- * André Ericson (https://github.com/aericson)
+ * André Ericson https://github.com/aericson)
+ * Mikhail Moshnogorsky (https://github.com/mikhailmoshnogorsky)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index eb8ccc346..153bf42fd 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- write_concern not in params of Collection#remove #801
 - Better BaseDocument equality check when not saved #798
 - OperationError: Shard Keys are immutable. Tried to update id even though the document is not yet saved #771
 - with_limit_and_skip for count should default like in pymongo #759

From 8965172603cad014b1c891d2518ab38658b62161 Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Fri, 14 Nov 2014 21:42:41 +0200
Subject: [PATCH 0031/1519] fix-#515: sparse fields

---
 docs/changelog.rst           | 1 +
 mongoengine/base/document.py | 3 +--
 mongoengine/base/fields.py   | 5 ++++-
 tests/fields/fields.py       | 9 +++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 153bf42fd..35b94b1e9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Sparse fields #515
 - write_concern not in params of Collection#remove #801
 - Better BaseDocument equality check when not saved #798
 - OperationError: Shard Keys are immutable. Tried to update id even though the document is not yet saved #771
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index aea251e42..854ed6b42 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -786,10 +786,9 @@ def _unique_with_indexes(cls, namespace=""):
         """
         unique_indexes = []
         for field_name, field in cls._fields.items():
-            sparse = False
+            sparse = field.sparse
             # Generate a list of indexes needed by uniqueness constraints
             if field.unique:
-                field.required = True
                 unique_fields = [field.db_field]
 
                 # Add any unique_with fields to the back of the index spec
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 2747dde1d..f86d4175d 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -37,7 +37,7 @@ class BaseField(object):
     def __init__(self, db_field=None, name=None, required=False, default=None,
                  unique=False, unique_with=None, primary_key=False,
                  validation=None, choices=None, verbose_name=None,
-                 help_text=None, null=False):
+                 help_text=None, null=False, sparse=False):
         """
         :param db_field: The database field to store this field in
             (defaults to the name of the field)
@@ -62,6 +62,8 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
             used when generating model forms from the document model.
         :param null: (optional) Is the field value can be null. If no and there is a default value
             then the default value is set
+        :param sparse: (optional) `sparse=True` combined with `unique=True` and `required=False`
+            means that uniqueness won't be enforced for `None` values
         """
         self.db_field = (db_field or name) if not primary_key else '_id'
 
@@ -78,6 +80,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.verbose_name = verbose_name
         self.help_text = help_text
         self.null = null
+        self.sparse = sparse
 
         # Adjust the appropriate creation counter, and save our local copy.
         if self.db_field == '_id':
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 26a30bfcc..1079b2357 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3057,6 +3057,15 @@ class Human(Mammal):
         self.assertEquals(Animal.objects(_cls__in=["Animal.Mammal.Dog", "Animal.Fish"]).count(), 2)
         self.assertEquals(Animal.objects(_cls__in=["Animal.Fish.Guppy"]).count(), 0)
 
+    def test_sparse_field(self):
+        class Doc(Document):
+            name = StringField(required=False, unique=True, sparse=True)
+        try:
+            Doc().save()
+            Doc().save()
+        except Exception:
+            self.fail()
+
 
 if __name__ == '__main__':
     unittest.main()

From 17f7e2f8924c548ea03a100eb8e4b33a7a829969 Mon Sep 17 00:00:00 2001
From: Diego Berrocal <cestdiego@gmail.com>
Date: Wed, 19 Nov 2014 02:49:08 -0500
Subject: [PATCH 0032/1519] Big typo fix for allow_inheritance page

---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 8db991c1c..5b8327c31 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -704,7 +704,7 @@ document.::
     class DatedPage(Page):
         date = DateTimeField()
 
-.. note:: From 0.8 onwards you must declare :attr:`allow_inheritance` defaults
+.. note:: From 0.8 onwards :attr:`allow_inheritance` defaults
           to False, meaning you must set it to True to use inheritance.
 
 Working with existing data

From 285da0542ec3c840728cf805304a85a07851095c Mon Sep 17 00:00:00 2001
From: Diego Berrocal <cestdiego@gmail.com>
Date: Wed, 19 Nov 2014 09:39:51 -0500
Subject: [PATCH 0033/1519] Update AUTHORS with @cestdiego

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 6079ff439..d377d177f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -214,3 +214,4 @@ that much better:
  * Vyacheslav Murashkin (https://github.com/a4tunado)
  * André Ericson https://github.com/aericson)
  * Mikhail Moshnogorsky (https://github.com/mikhailmoshnogorsky)
+ * Diego Berrocal (https://github.com/cestdiego)

From bc53dd68308c88cc41bb3fb183c1d41392b40968 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <matt@skyfiremedia.com>
Date: Wed, 19 Nov 2014 15:50:32 -0500
Subject: [PATCH 0034/1519] Generate Unique Indices for Lists of EmbeddedDocs

- Unique indices are now created in the database for EmbeddedDocument
  fields when the EmbeddedDocument is in a ListField
- Closes Issue #358
---
 AUTHORS                      |  1 +
 mongoengine/base/document.py |  3 +++
 tests/document/indexes.py    | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index d377d177f..fb9a1ce5a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -215,3 +215,4 @@ that much better:
  * André Ericson https://github.com/aericson)
  * Mikhail Moshnogorsky (https://github.com/mikhailmoshnogorsky)
  * Diego Berrocal (https://github.com/cestdiego)
+ * Matthew Ellison (https://github.com/mmelliso)
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 854ed6b42..7a0130215 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -816,6 +816,9 @@ def _unique_with_indexes(cls, namespace=""):
                 index = {'fields': fields, 'unique': True, 'sparse': sparse}
                 unique_indexes.append(index)
 
+            if field.__class__.__name__ == "ListField":
+                field = field.field
+
             # Grab any embedded document field unique indexes
             if (field.__class__.__name__ == "EmbeddedDocumentField" and
                     field.document_type != cls):
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 4103c7ae7..4815350f6 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -577,6 +577,38 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
+    def test_unique_embedded_document_in_list(self):
+        """
+        Ensure that the uniqueness constraints are applied to fields in
+        embedded documents, even when the embedded documents in in a
+        list field.
+        """
+        class SubDocument(EmbeddedDocument):
+            year = IntField(db_field='yr')
+            slug = StringField(unique=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            subs = ListField(EmbeddedDocumentField(SubDocument))
+
+        BlogPost.drop_collection()
+
+        post1 = BlogPost(
+            title='test1', subs=[
+                SubDocument(year=2009, slug='conflict'),
+                SubDocument(year=2009, slug='conflict')
+            ]
+        )
+        post1.save()
+
+        post2 = BlogPost(
+            title='test2', subs=[SubDocument(year=2014, slug='conflict')]
+        )
+
+        self.assertRaises(NotUniqueError, post2.save)
+
+        BlogPost.drop_collection()
+
     def test_unique_with_embedded_document_and_embedded_unique(self):
         """Ensure that uniqueness constraints are applied to fields on
         embedded documents.  And work with unique_with as well.

From 43af9f3fad06388dd02f3da32e241592fc7d22b4 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <matt@skyfiremedia.com>
Date: Thu, 20 Nov 2014 11:20:04 -0500
Subject: [PATCH 0035/1519] Update Tests for EmbeddedDocument Unique Indicies

---
 tests/fields/fields.py     |  8 ++++----
 tests/queryset/queryset.py | 10 +++++-----
 tests/test_dereference.py  | 17 +++++++++--------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 1079b2357..d7edea376 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1974,14 +1974,14 @@ class Employee(Document):
     def test_recursive_embedding(self):
         """Ensure that EmbeddedDocumentFields can contain their own documents.
         """
-        class Tree(Document):
-            name = StringField()
-            children = ListField(EmbeddedDocumentField('TreeNode'))
-
         class TreeNode(EmbeddedDocument):
             name = StringField()
             children = ListField(EmbeddedDocumentField('self'))
 
+        class Tree(Document):
+            name = StringField()
+            children = ListField(EmbeddedDocumentField('TreeNode'))
+
         Tree.drop_collection()
         tree = Tree(name="Tree")
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 40d010c66..703728fe1 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -512,16 +512,16 @@ class BlogPost(Document):
 
     def test_updates_can_have_match_operators(self):
 
-        class Post(Document):
-            title = StringField(required=True)
-            tags = ListField(StringField())
-            comments = ListField(EmbeddedDocumentField("Comment"))
-
         class Comment(EmbeddedDocument):
             content = StringField()
             name = StringField(max_length=120)
             vote = IntField()
 
+        class Post(Document):
+            title = StringField(required=True)
+            tags = ListField(StringField())
+            comments = ListField(EmbeddedDocumentField("Comment"))
+
         Post.drop_collection()
 
         comm1 = Comment(content="very funny indeed", name="John S", vote=1)
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index c37ada595..85588558e 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -318,6 +318,10 @@ class SimpleList(Document):
     def test_circular_reference(self):
         """Ensure you can handle circular references
         """
+        class Relation(EmbeddedDocument):
+            name = StringField()
+            person = ReferenceField('Person')
+
         class Person(Document):
             name = StringField()
             relations = ListField(EmbeddedDocumentField('Relation'))
@@ -325,10 +329,6 @@ class Person(Document):
             def __repr__(self):
                 return "<Person: %s>" % self.name
 
-        class Relation(EmbeddedDocument):
-            name = StringField()
-            person = ReferenceField('Person')
-
         Person.drop_collection()
         mother = Person(name="Mother")
         daughter = Person(name="Daughter")
@@ -1220,14 +1220,15 @@ class Page(Document):
         self.assertEqual(page.tags[0], page.posts[0].tags[0])
 
     def test_select_related_follows_embedded_referencefields(self):
-        class Playlist(Document):
-            items = ListField(EmbeddedDocumentField("PlaylistItem"))
+
+        class Song(Document):
+            title = StringField()
 
         class PlaylistItem(EmbeddedDocument):
             song = ReferenceField("Song")
 
-        class Song(Document):
-            title = StringField()
+        class Playlist(Document):
+            items = ListField(EmbeddedDocumentField("PlaylistItem"))
 
         Playlist.drop_collection()
         Song.drop_collection()

From d70b7d41e816d5fde6d3b2e2a3696235a2e0993e Mon Sep 17 00:00:00 2001
From: Matthew Ellison <matt.ellison@dexgen.io>
Date: Fri, 21 Nov 2014 07:29:50 -0500
Subject: [PATCH 0036/1519] Update to Changelog to include Fix for #358

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 35b94b1e9..0ccb8491c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Generate Unique Indicies for Lists of EmbeddedDocuments #358
 - Sparse fields #515
 - write_concern not in params of Collection#remove #801
 - Better BaseDocument equality check when not saved #798

From e0f1e79e6ae72939973e900482d3db2a358209e2 Mon Sep 17 00:00:00 2001
From: Slam <3lnc.slam@gmail.com>
Date: Mon, 24 Nov 2014 16:57:43 +0200
Subject: [PATCH 0037/1519] Minor typos fixes in docs

---
 docs/changelog.rst                | 20 ++++++++++----------
 docs/guide/connecting.rst         |  5 +++--
 docs/guide/defining-documents.rst |  8 ++++----
 docs/guide/querying.rst           |  5 +++--
 docs/upgrade.rst                  |  4 ++--
 mongoengine/base/document.py      |  2 +-
 mongoengine/document.py           |  2 +-
 mongoengine/fields.py             | 12 ++++++------
 mongoengine/queryset/base.py      |  6 +++---
 mongoengine/queryset/visitor.py   |  2 +-
 10 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 35b94b1e9..1d9743534 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -71,7 +71,7 @@ Changes in 0.9.X - DEV
 
 Changes in 0.8.7
 ================
-- Calling reload on deleted / nonexistant documents raises DoesNotExist (#538)
+- Calling reload on deleted / nonexistent documents raises DoesNotExist (#538)
 - Stop ensure_indexes running on a secondaries (#555)
 - Fix circular import issue with django auth (#531) (#545)
 
@@ -84,7 +84,7 @@ Changes in 0.8.5
 - Fix multi level nested fields getting marked as changed (#523)
 - Django 1.6 login fix (#522) (#527)
 - Django 1.6 session fix (#509)
-- EmbeddedDocument._instance is now set when settng the attribute (#506)
+- EmbeddedDocument._instance is now set when setting the attribute (#506)
 - Fixed EmbeddedDocument with ReferenceField equality issue (#502)
 - Fixed GenericReferenceField serialization order (#499)
 - Fixed count and none bug (#498)
@@ -174,7 +174,7 @@ Changes in 0.8.0
 - Added `get_next_value` preview for SequenceFields (#319)
 - Added no_sub_classes context manager and queryset helper (#312)
 - Querysets now utilises a local cache
-- Changed __len__ behavour in the queryset (#247, #311)
+- Changed __len__ behaviour in the queryset (#247, #311)
 - Fixed querying string versions of ObjectIds issue with ReferenceField (#307)
 - Added $setOnInsert support for upserts (#308)
 - Upserts now possible with just query parameters (#309)
@@ -225,7 +225,7 @@ Changes in 0.8.0
 - Uses getlasterror to test created on updated saves (#163)
 - Fixed inheritance and unique index creation (#140)
 - Fixed reverse delete rule with inheritance (#197)
-- Fixed validation for GenericReferences which havent been dereferenced
+- Fixed validation for GenericReferences which haven't been dereferenced
 - Added switch_db context manager (#106)
 - Added switch_db method to document instances (#106)
 - Added no_dereference context manager (#82) (#61)
@@ -307,11 +307,11 @@ Changes in 0.7.2
 - Update index spec generation so its not destructive (#113)
 
 Changes in 0.7.1
-=================
+================
 - Fixed index spec inheritance (#111)
 
 Changes in 0.7.0
-=================
+================
 - Updated queryset.delete so you can use with skip / limit (#107)
 - Updated index creation allows kwargs to be passed through refs (#104)
 - Fixed Q object merge edge case (#109)
@@ -392,7 +392,7 @@ Changes in 0.6.12
 - Fixes error with _delta handling DBRefs
 
 Changes in 0.6.11
-==================
+=================
 - Fixed inconsistency handling None values field attrs
 - Fixed map_field embedded db_field issue
 - Fixed .save() _delta issue with DbRefs
@@ -472,7 +472,7 @@ Changes in 0.6.1
 - Fix for replicaSet connections
 
 Changes in 0.6
-================
+==============
 
 - Added FutureWarning to inherited classes not declaring 'allow_inheritance' as the default will change in 0.7
 - Added support for covered indexes when inheritance is off
@@ -560,8 +560,8 @@ Changes in v0.5
 - Updated default collection naming convention
 - Added Document Mixin support
 - Fixed queryet __repr__ mid iteration
-- Added hint() support, so cantell Mongo the proper index to use for the query
-- Fixed issue with inconsitent setting of _cls breaking inherited referencing
+- Added hint() support, so can tell Mongo the proper index to use for the query
+- Fixed issue with inconsistent setting of _cls breaking inherited referencing
 - Added help_text and verbose_name to fields to help with some form libs
 - Updated item_frequencies to handle embedded document lookups
 - Added delta tracking now only sets / unsets explicitly changed fields
diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index fcdfe0a34..0e61df96c 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -23,14 +23,14 @@ arguments should be provided::
 
     connect('project1', username='webapp', password='pwd123')
 
-Uri style connections are also supported - just supply the uri as
+URI style connections are also supported - just supply the uri as
 the :attr:`host` to
 :func:`~mongoengine.connect`::
 
     connect('project1', host='mongodb://localhost/database_name')
 
 Note that database name from uri has priority over name
-in ::func:`~mongoengine.connect`
+in :func:`~mongoengine.connect`
 
 ReplicaSets
 ===========
@@ -115,3 +115,4 @@ access to the same Group document across collection::
 
         with switch_collection(Group, 'group2000') as Group:
             Group(name="hello Group 2000 collection!").save()  # Saves in group2000 collection
+
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 5b8327c31..315fcde83 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -334,7 +334,7 @@ Its value can take any of the following constants:
   Any object's fields still referring to the object being deleted are removed
   (using MongoDB's "unset" operation), effectively nullifying the relationship.
 :const:`mongoengine.CASCADE`
-  Any object containing fields that are refererring to the object being deleted
+  Any object containing fields that are referring to the object being deleted
   are deleted first.
 :const:`mongoengine.PULL`
   Removes the reference to the object (using MongoDB's "pull" operation)
@@ -428,7 +428,7 @@ Document collections
 ====================
 Document classes that inherit **directly** from :class:`~mongoengine.Document`
 will have their own **collection** in the database. The name of the collection
-is by default the name of the class, coverted to lowercase (so in the example
+is by default the name of the class, converted to lowercase (so in the example
 above, the collection would be called `page`). If you need to change the name
 of the collection (e.g. to use MongoEngine with an existing database), then
 create a class dictionary attribute called :attr:`meta` on your document, and
@@ -664,11 +664,11 @@ Shard keys
 ==========
 
 If your collection is sharded, then you need to specify the shard key as a tuple,
-using the :attr:`shard_key` attribute of :attr:`-mongoengine.Document.meta`.
+using the :attr:`shard_key` attribute of :attr:`~mongoengine.Document.meta`.
 This ensures that the shard key is sent with the query when calling the
 :meth:`~mongoengine.document.Document.save` or
 :meth:`~mongoengine.document.Document.update` method on an existing
-:class:`-mongoengine.Document` instance::
+:class:`~mongoengine.Document` instance::
 
     class LogEntry(Document):
         machine = StringField()
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index bb8176fec..a3496f54b 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -17,7 +17,7 @@ fetch documents from the database::
 
     As of MongoEngine 0.8 the querysets utilise a local cache.  So iterating
     it multiple times will only cause a single query.  If this is not the
-    desired behavour you can call :class:`~mongoengine.QuerySet.no_cache`
+    desired behaviour you can call :class:`~mongoengine.QuerySet.no_cache`
     (version **0.8.3+**) to return a non-caching queryset.
 
 Filtering queries
@@ -252,7 +252,7 @@ To retrieve a result that should be unique in the collection, use
 no document matches the query, and
 :class:`~mongoengine.queryset.MultipleObjectsReturned`
 if more than one document matched the query.  These exceptions are merged into
-your document defintions eg: `MyDoc.DoesNotExist`
+your document definitions eg: `MyDoc.DoesNotExist`
 
 A variation of this method exists,
 :meth:`~mongoengine.queryset.Queryset.get_or_create`, that will create a new
@@ -658,3 +658,4 @@ following example shows how the substitutions are made::
         return comments;
     }
     """)
+
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index b55fe3122..25f67c7f2 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -5,7 +5,7 @@ Upgrading
 0.8.7
 *****
 
-Calling reload on deleted / nonexistant documents now raises a DoesNotExist
+Calling reload on deleted / nonexistent documents now raises a DoesNotExist
 exception.
 
 
@@ -263,7 +263,7 @@ update your code like so: ::
     [m for m in mammals]                                               # This will return all carnivores
 
 Len iterates the queryset
---------------------------
+-------------------------
 
 If you ever did `len(queryset)` it previously did a `count()` under the covers,
 this caused some unusual issues.  As `len(queryset)` is most often used by
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 854ed6b42..17a20853a 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -692,7 +692,7 @@ def merge_index_specs(index_specs, indices):
 
             spec_fields = [v['fields']
                            for k, v in enumerate(index_specs)]
-            # Merge unqiue_indexes with existing specs
+            # Merge unique_indexes with existing specs
             for k, v in enumerate(indices):
                 if v['fields'] in spec_fields:
                     index_specs[spec_fields.index(v['fields'])].update(v)
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 1891c1642..d9d2774c4 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -677,7 +677,7 @@ def list_indexes(cls, go_up=True, go_down=True):
         if cls._meta.get('abstract'):
             return []
 
-        # get all the base classes, subclasses and sieblings
+        # get all the base classes, subclasses and siblings
         classes = []
 
         def get_classes(cls):
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index d9aeb3f16..5ddcf5612 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -291,7 +291,7 @@ def __init__(self, min_value=None, max_value=None, force_string=False,
         :param max_value: Validation rule for the maximum acceptable value.
         :param force_string: Store as a string.
         :param precision: Number of decimal places to store.
-        :param rounding: The rounding rule from the python decimal libary:
+        :param rounding: The rounding rule from the python decimal library:
 
             - decimal.ROUND_CEILING (towards Infinity)
             - decimal.ROUND_DOWN (towards zero)
@@ -375,11 +375,11 @@ class DateTimeField(BaseField):
 
     Uses the python-dateutil library if available alternatively use time.strptime
     to parse the dates.  Note: python-dateutil's parser is fully featured and when
-    installed you can utilise it to convert varing types of date formats into valid
+    installed you can utilise it to convert varying types of date formats into valid
     python datetime objects.
 
     Note: Microseconds are rounded to the nearest millisecond.
-      Pre UTC microsecond support is effecively broken.
+      Pre UTC microsecond support is effectively broken.
       Use :class:`~mongoengine.fields.ComplexDateTimeField` if you
       need accurate microsecond support.
     """
@@ -638,7 +638,7 @@ class DynamicField(BaseField):
     Used by :class:`~mongoengine.DynamicDocument` to handle dynamic data"""
 
     def to_mongo(self, value):
-        """Convert a Python type to a MongoDBcompatible type.
+        """Convert a Python type to a MongoDB compatible type.
         """
 
         if isinstance(value, basestring):
@@ -1649,7 +1649,7 @@ def __init__(self, size=None, thumbnail_size=None,
 
 class SequenceField(BaseField):
 
-    """Provides a sequental counter see:
+    """Provides a sequential counter see:
      http://www.mongodb.org/display/DOCS/Object+IDs#ObjectIDs-SequenceNumbers
 
     .. note::
@@ -1750,7 +1750,7 @@ def __set__(self, instance, value):
 
     def prepare_query_value(self, op, value):
         """
-        This method is overriden in order to convert the query value into to required
+        This method is overridden in order to convert the query value into to required
         type. We need to do this in order to be able to successfully compare query
         values passed as string, the base implementation returns the value as is.
         """
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 8c880e973..e9e87cfc0 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -272,7 +272,7 @@ def get_or_create(self, write_concern=None, auto_save=True,
         .. note:: This requires two separate operations and therefore a
             race condition exists.  Because there are no transactions in
             mongoDB other approaches should be investigated, to ensure you
-            don't accidently duplicate data when using this method.  This is
+            don't accidentally duplicate data when using this method.  This is
             now scheduled to be removed before 1.0
 
         :param write_concern: optional extra keyword arguments used if we
@@ -992,8 +992,8 @@ def from_json(self, json_data):
 
     def aggregate(self, *pipeline, **kwargs):
         """
-        Perform a aggreggate function based in your queryset params
-        :param pipeline: list of agreggation commands,
+        Perform a aggregate function based in your queryset params
+        :param pipeline: list of aggregation commands,
             see: http://docs.mongodb.org/manual/core/aggregation-pipeline/
 
         .. versionadded:: 0.9
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index a39b05f0c..e5d2e6152 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -29,7 +29,7 @@ class DuplicateQueryConditionsError(InvalidQueryError):
 
 
 class SimplificationVisitor(QNodeVisitor):
-    """Simplifies query trees by combinging unnecessary 'and' connection nodes
+    """Simplifies query trees by combining unnecessary 'and' connection nodes
     into a single Q-object.
     """
 

From d65ce6fc2c957d5b297fea724ad35ab0b34a138b Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Fri, 28 Nov 2014 13:54:33 +0100
Subject: [PATCH 0038/1519] fixed bug for queryset.distinct to work also on
 embedded documents, not just on lists of embedded documents

---
 mongoengine/queryset/base.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index e9e87cfc0..f41fed39c 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -763,8 +763,7 @@ def distinct(self, field):
 
             # We may need to cast to the correct type eg.
             # ListField(EmbeddedDocumentField)
-            doc_field = getattr(
-                self._document._fields.get(field), "field", None)
+            doc_field = getattr(self._document._fields.get(field), "field", self._document._fields.get(field))
             instance = getattr(doc_field, "document_type", False)
             EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
             GenericEmbeddedDocumentField = _import_class(

From a03262fc011e86630d046e99993ba32397f314c2 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Fri, 28 Nov 2014 16:23:23 +0100
Subject: [PATCH 0039/1519] implemented ability to return instances and not
 simple dicts for distinct on subdocuments

---
 mongoengine/queryset/base.py | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index f41fed39c..0a4b161e9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -761,13 +761,29 @@ def distinct(self, field):
             distinct = self._dereference(queryset._cursor.distinct(field), 1,
                                          name=field, instance=self._document)
 
-            # We may need to cast to the correct type eg.
-            # ListField(EmbeddedDocumentField)
-            doc_field = getattr(self._document._fields.get(field), "field", self._document._fields.get(field))
-            instance = getattr(doc_field, "document_type", False)
+            doc_field = self._document._fields.get(field.split('.', 1)[0])
+            instance = False
+            # We may need to cast to the correct type eg. ListField(EmbeddedDocumentField)
             EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
-            GenericEmbeddedDocumentField = _import_class(
-                'GenericEmbeddedDocumentField')
+            ListField = _import_class('ListField')
+            GenericEmbeddedDocumentField = _import_class('GenericEmbeddedDocumentField')
+            if isinstance(doc_field, ListField):
+                doc_field = getattr(doc_field, "field", doc_field)
+            if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
+                instance = getattr(doc_field, "document_type", False)
+            # handle distinct on subdocuments
+            if '.' in field:
+                for field_part in field.split('.')[1:]:
+                    # if looping on embedded document, get the document type instance
+                    if instance and isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
+                        doc_field = instance
+                    # now get the subdocument
+                    doc_field = getattr(doc_field, field_part, doc_field)
+                    # We may need to cast to the correct type eg. ListField(EmbeddedDocumentField)
+                    if isinstance(doc_field, ListField):
+                        doc_field = getattr(doc_field, "field", doc_field)
+                    if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
+                        instance = getattr(doc_field, "document_type", False)
             if instance and isinstance(doc_field, (EmbeddedDocumentField,
                                                    GenericEmbeddedDocumentField)):
                 distinct = [instance(**doc) for doc in distinct]

From 2954017836453a87137e570f2793bfdb037ecf3e Mon Sep 17 00:00:00 2001
From: Slam <3lnc.slam@gmail.com>
Date: Sun, 30 Nov 2014 00:23:40 +0200
Subject: [PATCH 0040/1519] Fixes #811. Fixes reflinks

---
 mongoengine/document.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index d9d2774c4..8ecb54c1c 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -462,10 +462,11 @@ def switch_db(self, db_alias):
             user.switch_db('archive-db')
             user.save()
 
-        If you need to read from another database see
-        :class:`~mongoengine.context_managers.switch_db`
+        :param str db_alias: The database alias to use for saving the document
 
-        :param db_alias: The database alias to use for saving the document
+        .. seealso::
+            Use :class:`~mongoengine.context_managers.switch_collection`
+            if you need to read from another collection
         """
         with switch_db(self.__class__, db_alias) as cls:
             collection = cls._get_collection()
@@ -488,11 +489,12 @@ def switch_collection(self, collection_name):
             user.switch_collection('old-users')
             user.save()
 
-        If you need to read from another database see
-        :class:`~mongoengine.context_managers.switch_db`
-
-        :param collection_name: The database alias to use for saving the
+        :param str collection_name: The database alias to use for saving the
             document
+
+        .. seealso::
+            Use :class:`~mongoengine.context_managers.switch_db`
+            if you need to read from another database
         """
         with switch_collection(self.__class__, collection_name) as cls:
             collection = cls._get_collection()

From 74a89223c0c877da75b8813851de11ebaf63909e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilson=20J=C3=BAnior?= <wilsonpjunior@gmail.com>
Date: Sat, 29 Nov 2014 23:09:26 -0200
Subject: [PATCH 0041/1519] replaced `text_score` attribute to `get_text_score`
 method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Wilson Júnior <wilsonpjunior@gmail.com>
---
 mongoengine/document.py      |  7 -------
 mongoengine/queryset/base.py | 23 ++++++++++++++++++-----
 tests/queryset/queryset.py   | 11 +++++------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index d9d2774c4..1f1f81ae2 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -143,13 +143,6 @@ def fset(self, value):
         return property(fget, fset)
     pk = pk()
 
-    @property
-    def text_score(self):
-        """
-        Used for text searchs
-        """
-        return self._data.get('text_score')
-
     @classmethod
     def _get_db(cls):
         """Some Model using other db_alias"""
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index e9e87cfc0..7887ef3fb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -6,6 +6,7 @@
 import pprint
 import re
 import warnings
+import types
 
 from bson import SON
 from bson.code import Code
@@ -37,6 +38,8 @@
 
 RE_TYPE = type(re.compile(''))
 
+def get_text_score(doc):
+    return doc._data.get('_text_score')
 
 class BaseQuerySet(object):
 
@@ -158,8 +161,14 @@ def __getitem__(self, key):
 
             if queryset._as_pymongo:
                 return queryset._get_as_pymongo(queryset._cursor[key])
-            return queryset._document._from_son(queryset._cursor[key],
+            doc = queryset._document._from_son(queryset._cursor[key],
                                                 _auto_dereference=self._auto_dereference, only_fields=self.only_fields)
+
+            if self._include_text_scores:
+                doc.get_text_score = types.MethodType(get_text_score, doc)
+
+            return doc
+
         raise AttributeError
 
     def __iter__(self):
@@ -192,7 +201,7 @@ def filter(self, *q_objs, **query):
         """
         return self.__call__(*q_objs, **query)
 
-    def search_text(self, text, language=None, include_text_scores=False):
+    def search_text(self, text, language=None, include_text_scores=True):
         """
         Start a text search, using text indexes.
         Require: MongoDB server version 2.6+.
@@ -202,7 +211,7 @@ def search_text(self, text, language=None, include_text_scores=False):
             If not specified, the search uses the default language of the index.
             For supported languages, see `Text Search Languages <http://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages>`.
 
-        :param include_text_scores: If True, automaticaly add a text_score attribute to Document.
+        :param include_text_scores: If True, automatically add a get_text_score method to Document.
 
         """
         queryset = self.clone()
@@ -1341,6 +1350,10 @@ def next(self):
             return self._get_as_pymongo(raw_doc)
         doc = self._document._from_son(raw_doc,
                                        _auto_dereference=self._auto_dereference, only_fields=self.only_fields)
+
+        if self._include_text_scores:
+            doc.get_text_score = types.MethodType(get_text_score, doc)
+
         if self._scalar:
             return self._get_scalar(doc)
 
@@ -1380,7 +1393,7 @@ def _cursor_args(self):
             if 'fields' not in cursor_args:
                 cursor_args['fields'] = {}
 
-            cursor_args['fields']['text_score'] = {'$meta': "textScore"}
+            cursor_args['fields']['_text_score'] = {'$meta': "textScore"}
 
         return cursor_args
 
@@ -1597,7 +1610,7 @@ def _get_order_by(self, keys):
             if key == '$text_score':
                 # automatically set to include text scores
                 self._include_text_scores = True
-                key_list.append(('text_score', {'$meta': "textScore"}))
+                key_list.append(('_text_score', {'$meta': "textScore"}))
                 continue
 
             direction = pymongo.ASCENDING
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 703728fe1..a743a9334 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2783,13 +2783,12 @@ class News(Document):
         self.assertTrue('dilma' in new.content)
         self.assertTrue('planejamento' in new.title)
 
-        query = News.objects.search_text(
-            "candidata", include_text_scores=True)
+        query = News.objects.search_text("candidata")
 
         self.assertTrue(query._include_text_scores)
         new = query.first()
 
-        self.assertTrue(isinstance(new.text_score, float))
+        self.assertTrue(isinstance(new.get_text_score(), float))
 
         # count
         query = News.objects.search_text('brasil').order_by('$text_score')
@@ -2799,9 +2798,9 @@ class News(Document):
         self.assertEqual(query._query, {'$text': {'$search': 'brasil'}})
         cursor_args = query._cursor_args
         self.assertEqual(
-            cursor_args['fields'], {'text_score': {'$meta': 'textScore'}})
+            cursor_args['fields'], {'_text_score': {'$meta': 'textScore'}})
 
-        text_scores = [i.text_score for i in query]
+        text_scores = [i.get_text_score() for i in query]
         self.assertEqual(len(text_scores), 3)
 
         self.assertTrue(text_scores[0] > text_scores[1])
@@ -2811,7 +2810,7 @@ class News(Document):
         # get item
         item = News.objects.search_text(
             'brasil').order_by('$text_score').first()
-        self.assertEqual(item.text_score, max_text_score)
+        self.assertEqual(item.get_text_score(), max_text_score)
 
     @skip_older_mongodb
     def test_distinct_handles_references_to_alias(self):

From 4cca9f17dfa4065d1ab673fa01083a87fbfcf593 Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Mon, 2 Sep 2013 18:11:50 +0200
Subject: [PATCH 0042/1519] Check if undefined fields are supplied on document

If an undefined field is supplied to a document instance, a
`FieldDoesNotExist` Exception will be raised.
---
 mongoengine/base/document.py | 11 ++++++++++-
 mongoengine/errors.py        |  4 ++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index df06f6aed..2def35f48 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -12,7 +12,7 @@
 from mongoengine import signals
 from mongoengine.common import _import_class
 from mongoengine.errors import (ValidationError, InvalidDocumentError,
-                                LookUpError)
+                                LookUpError, FieldDoesNotExist)
 from mongoengine.python_support import PY3, txt_type
 
 from mongoengine.base.common import get_document, ALLOW_INHERITANCE
@@ -61,6 +61,15 @@ def __init__(self, *args, **values):
 
         signals.pre_init.send(self.__class__, document=self, values=values)
 
+        # Check if there are undefined fields supplied, if so raise an
+        # Exception.
+        for var in values.keys():
+            if var not in self._fields.keys():
+                msg = (
+                    "The field '{}' does not exist on the document '{}'"
+                ).format(var, self._class_name)
+                raise FieldDoesNotExist(msg)
+
         if self.STRICT and not self._dynamic:
             self._data = StrictDict.create(allowed_keys=self._fields_ordered)()
         else:
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 4b6b562c2..990150da9 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -40,6 +40,10 @@ class NotUniqueError(OperationError):
     pass
 
 
+class FieldDoesNotExist(Exception):
+    pass
+
+
 class ValidationError(AssertionError):
     """Validation exception.
 

From 06064decd2cf0da0f3c2d44852ad606dd666a6a4 Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Tue, 3 Sep 2013 11:25:45 +0200
Subject: [PATCH 0043/1519] check for dynamic document, exclude id pk and _cls

---
 mongoengine/base/document.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 2def35f48..ae9bdc308 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -63,12 +63,13 @@ def __init__(self, *args, **values):
 
         # Check if there are undefined fields supplied, if so raise an
         # Exception.
-        for var in values.keys():
-            if var not in self._fields.keys():
-                msg = (
-                    "The field '{}' does not exist on the document '{}'"
-                ).format(var, self._class_name)
-                raise FieldDoesNotExist(msg)
+        if not self._dynamic:
+            for var in values.keys():
+                if var not in self._fields.keys() + ['id', 'pk', '_cls']:
+                    msg = (
+                        "The field '{}' does not exist on the document '{}'"
+                    ).format(var, self._class_name)
+                    raise FieldDoesNotExist(msg)
 
         if self.STRICT and not self._dynamic:
             self._data = StrictDict.create(allowed_keys=self._fields_ordered)()

From 67bf6afc898147fab6059b4c6b49f05deaf22765 Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Fri, 27 Jun 2014 14:43:56 +0200
Subject: [PATCH 0044/1519] fixed tests that were using undefined model fields

---
 tests/fields/fields.py     | 2 ++
 tests/queryset/queryset.py | 7 +++++--
 tests/test_dereference.py  | 2 ++
 tests/test_django.py       | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index d7edea376..4f7fab02f 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2717,9 +2717,11 @@ def test_multiple_sequence_fields_on_docs(self):
 
         class Animal(Document):
             id = SequenceField(primary_key=True)
+            name = StringField()
 
         class Person(Document):
             id = SequenceField(primary_key=True)
+            name = StringField()
 
         self.db['mongoengine.counters'].drop()
         Animal.drop_collection()
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index a743a9334..e37ab8810 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1492,6 +1492,7 @@ def test_update(self):
         """Ensure that atomic updates work properly.
         """
         class BlogPost(Document):
+            name = StringField()
             title = StringField()
             hits = IntField()
             tags = ListField(StringField())
@@ -2878,12 +2879,14 @@ class Book(Document):
         self.assertEqual(authors, [mark_twain, john_tolkien])
 
     def test_distinct_ListField_ReferenceField(self):
-        class Foo(Document):
-            bar_lst = ListField(ReferenceField('Bar'))
 
         class Bar(Document):
             text = StringField()
 
+        class Foo(Document):
+            bar = ReferenceField('Bar')
+            bar_lst = ListField(ReferenceField('Bar'))
+
         Bar.drop_collection()
         Foo.drop_collection()
 
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 85588558e..2115b45a5 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -947,6 +947,8 @@ def test_multidirectional_lists(self):
 
         class Asset(Document):
             name = StringField(max_length=250, required=True)
+            path = StringField()
+            title = StringField()
             parent = GenericReferenceField(default=None)
             parents = ListField(GenericReferenceField())
             children = ListField(GenericReferenceField())
diff --git a/tests/test_django.py b/tests/test_django.py
index c4d3d5829..0070087fb 100644
--- a/tests/test_django.py
+++ b/tests/test_django.py
@@ -176,7 +176,7 @@ def count(self, with_limit_and_skip=True):
 
         class Note(Document):
             meta = dict(queryset_class=LimitCountQuerySet)
-            text = StringField()
+            name = StringField()
 
         Note.drop_collection()
 

From 913952ffe1ea79f90de1994262dac74e1406ae1d Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Mon, 30 Jun 2014 18:12:23 +0200
Subject: [PATCH 0045/1519] remove unittest test_no_overwritting_no_data_loss

Now that fields need to be defined explicitly, it's not possible to have
another property with the same name on a model.
https://github.com/MongoEngine/mongoengine/pull/457#issuecomment-47513105
---
 tests/document/instance.py | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 40c25f8df..3c6a9940f 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2443,30 +2443,6 @@ class Group(Document):
         group = Group.objects.first()
         self.assertEqual("hello - default", group.name)
 
-    def test_no_overwritting_no_data_loss(self):
-
-        class User(Document):
-            username = StringField(primary_key=True)
-            name = StringField()
-
-            @property
-            def foo(self):
-                return True
-
-        User.drop_collection()
-
-        user = User(username="Ross", foo="bar")
-        self.assertTrue(user.foo)
-
-        User._get_collection().save({"_id": "Ross", "foo": "Bar",
-                                     "data": [1, 2, 3]})
-
-        user = User.objects.first()
-        self.assertEqual("Ross", user.username)
-        self.assertEqual(True, user.foo)
-        self.assertEqual("Bar", user._data["foo"])
-        self.assertEqual([1, 2, 3], user._data["data"])
-
     def test_spaces_in_keys(self):
 
         class Embedded(DynamicEmbeddedDocument):

From 4627af3e90b924cecd0db17357b3115f8143977f Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Mon, 30 Jun 2014 18:27:55 +0200
Subject: [PATCH 0046/1519] add FieldDoesNotExist exception to __all__

So it will be available when you do:
    from mongoengine import *
---
 mongoengine/errors.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 990150da9..6cde7771e 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -5,7 +5,8 @@
 
 __all__ = ('NotRegistered', 'InvalidDocumentError', 'LookUpError',
            'DoesNotExist', 'MultipleObjectsReturned', 'InvalidQueryError',
-           'OperationError', 'NotUniqueError', 'ValidationError')
+           'OperationError', 'NotUniqueError', 'FieldDoesNotExist',
+           'ValidationError')
 
 
 class NotRegistered(Exception):

From 6d48100f44ae5dd5bab81a4a2a1e9002089767ad Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Mon, 30 Jun 2014 18:29:02 +0200
Subject: [PATCH 0047/1519] add test if FieldDoesNotExist is raised

When trying to set an undefined field.
---
 tests/fields/fields.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 4f7fab02f..ae4575ad6 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3068,6 +3068,16 @@ class Doc(Document):
         except Exception:
             self.fail()
 
+    def test_undefined_field_exception(self):
+        """Tests if a `FieldDoesNotExist` exception is raised when trying to
+        set a value to a field that's not defined.
+        """
+
+        class Doc(Document):
+            foo = StringField(db_field='f')
+
+        with self.assertRaises(FieldDoesNotExist):
+            Doc(bar='test')
 
 if __name__ == '__main__':
     unittest.main()

From 1cac35be0376f0842f169661a63b2cb9956f5898 Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Tue, 1 Jul 2014 14:21:29 +0200
Subject: [PATCH 0048/1519] using python 2.6 compatible way of assertRaises

---
 tests/fields/fields.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index ae4575ad6..75d698c7e 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3076,8 +3076,10 @@ def test_undefined_field_exception(self):
         class Doc(Document):
             foo = StringField(db_field='f')
 
-        with self.assertRaises(FieldDoesNotExist):
+        def test():
             Doc(bar='test')
 
+        self.assertRaises(FieldDoesNotExist, test)
+
 if __name__ == '__main__':
     unittest.main()

From 191a4e569e15f43f3d09a335684a5522de3e3784 Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Tue, 1 Jul 2014 15:18:01 +0200
Subject: [PATCH 0049/1519] added ints in string.format() for 2.6 compability

---
 mongoengine/base/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index ae9bdc308..bc4840f19 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -67,7 +67,7 @@ def __init__(self, *args, **values):
             for var in values.keys():
                 if var not in self._fields.keys() + ['id', 'pk', '_cls']:
                     msg = (
-                        "The field '{}' does not exist on the document '{}'"
+                        "The field '{0}' does not exist on the document '{1}'"
                     ).format(var, self._class_name)
                     raise FieldDoesNotExist(msg)
 

From 79705fbf11a59d6e18749eee806c9a5423858709 Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Thu, 10 Jul 2014 11:48:25 +0200
Subject: [PATCH 0050/1519] moved initialization of _created before
 FieldDoesNotExist check

Because otherwise we'll get a FieldDoesNotExist error on the field
_created.
---
 mongoengine/base/document.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index bc4840f19..5063dee5a 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -54,11 +54,14 @@ def __init__(self, *args, **values):
                     raise TypeError(
                         "Multiple values for keyword argument '" + name + "'")
                 values[name] = value
+
         __auto_convert = values.pop("__auto_convert", True)
 
         # 399: set default values only to fields loaded from DB
         __only_fields = set(values.pop("__only_fields", values))
 
+        _created = values.pop("_created", True)
+
         signals.pre_init.send(self.__class__, document=self, values=values)
 
         # Check if there are undefined fields supplied, if so raise an
@@ -77,7 +80,6 @@ def __init__(self, *args, **values):
             self._data = SemiStrictDict.create(
                 allowed_keys=self._fields_ordered)()
 
-        _created = values.pop("_created", True)
         self._data = {}
         self._dynamic_fields = SON()
 

From 80f80cd31f0aff842169bbcf5a07547111937c0f Mon Sep 17 00:00:00 2001
From: Rik <gitaarik@gmail.com>
Date: Tue, 25 Nov 2014 19:29:12 +0100
Subject: [PATCH 0051/1519] fixed more tests that were using undefined model
 fields

---
 tests/fields/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 75d698c7e..a95001b46 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1814,7 +1814,7 @@ class Ocorrence(Document):
         Animal.drop_collection()
         Ocorrence.drop_collection()
 
-        a = Animal(nam="Leopard", tag="heavy",
+        a = Animal(name="Leopard", tag="heavy",
                    owner=Owner(tp='u', name="Wilson Júnior")
                    )
         a.save()
@@ -1864,7 +1864,7 @@ class Ocorrence(Document):
         Animal.drop_collection()
         Ocorrence.drop_collection()
 
-        a = Animal(nam="Leopard", tag="heavy",
+        a = Animal(name="Leopard", tag="heavy",
                    owner=Owner(tags=['cool', 'funny'],
                                name="Wilson Júnior")
                    )

From 2b3bb81fae128bafa7b860088bd8c20bf53de942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wilson=20J=C3=BAnior?= <wilsonpjunior@gmail.com>
Date: Sat, 29 Nov 2014 23:48:58 -0200
Subject: [PATCH 0052/1519] Refactoring: `Simple is better than complex`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Wilson Júnior <wilsonpjunior@gmail.com>
---
 mongoengine/base/document.py | 12 +++++++++++-
 mongoengine/queryset/base.py | 31 +++++++------------------------
 tests/queryset/queryset.py   |  5 ++---
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 5063dee5a..998e366fe 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -68,7 +68,7 @@ def __init__(self, *args, **values):
         # Exception.
         if not self._dynamic:
             for var in values.keys():
-                if var not in self._fields.keys() + ['id', 'pk', '_cls']:
+                if var not in self._fields.keys() + ['id', 'pk', '_cls', '_text_score']:
                     msg = (
                         "The field '{0}' does not exist on the document '{1}'"
                     ).format(var, self._class_name)
@@ -281,6 +281,16 @@ def clean(self):
         """
         pass
 
+    def get_text_score(self):
+        """
+        Get text score from text query
+        """
+
+        if '_text_score' not in self._data:
+            raise InvalidDocumentError('This document is not originally built from a text query')
+
+        return self._data['_text_score']
+
     def to_mongo(self, use_db_field=True, fields=[]):
         """
         Return as SON data ready for use with MongoDB.
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 7887ef3fb..39ffa88fe 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -6,7 +6,6 @@
 import pprint
 import re
 import warnings
-import types
 
 from bson import SON
 from bson.code import Code
@@ -38,8 +37,6 @@
 
 RE_TYPE = type(re.compile(''))
 
-def get_text_score(doc):
-    return doc._data.get('_text_score')
 
 class BaseQuerySet(object):
 
@@ -69,7 +66,6 @@ def __init__(self, document, collection):
         self._as_pymongo = False
         self._as_pymongo_coerce = False
         self._search_text = None
-        self._include_text_scores = False
 
         # If inheritance is allowed, only return instances and instances of
         # subclasses of the class being used
@@ -161,13 +157,8 @@ def __getitem__(self, key):
 
             if queryset._as_pymongo:
                 return queryset._get_as_pymongo(queryset._cursor[key])
-            doc = queryset._document._from_son(queryset._cursor[key],
-                                                _auto_dereference=self._auto_dereference, only_fields=self.only_fields)
-
-            if self._include_text_scores:
-                doc.get_text_score = types.MethodType(get_text_score, doc)
-
-            return doc
+            return queryset._document._from_son(queryset._cursor[key],
+                                               _auto_dereference=self._auto_dereference, only_fields=self.only_fields)
 
         raise AttributeError
 
@@ -201,7 +192,7 @@ def filter(self, *q_objs, **query):
         """
         return self.__call__(*q_objs, **query)
 
-    def search_text(self, text, language=None, include_text_scores=True):
+    def search_text(self, text, language=None):
         """
         Start a text search, using text indexes.
         Require: MongoDB server version 2.6+.
@@ -210,14 +201,11 @@ def search_text(self, text, language=None, include_text_scores=True):
             for the search and the rules for the stemmer and tokenizer.
             If not specified, the search uses the default language of the index.
             For supported languages, see `Text Search Languages <http://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages>`.
-
-        :param include_text_scores: If True, automatically add a get_text_score method to Document.
-
         """
         queryset = self.clone()
         if queryset._search_text:
             raise OperationError(
-                "Is not possible to use search_text two times.")
+                "It is not possible to use search_text two times.")
 
         query_kwargs = SON({'$search': text})
         if language:
@@ -227,7 +215,6 @@ def search_text(self, text, language=None, include_text_scores=True):
         queryset._mongo_query = None
         queryset._cursor_obj = None
         queryset._search_text = text
-        queryset._include_text_scores = include_text_scores
 
         return queryset
 
@@ -684,7 +671,7 @@ def clone_into(self, cls):
                       '_timeout', '_class_check', '_slave_okay', '_read_preference',
                       '_iter', '_scalar', '_as_pymongo', '_as_pymongo_coerce',
                       '_limit', '_skip', '_hint', '_auto_dereference',
-                      '_search_text', '_include_text_scores', 'only_fields', '_max_time_ms')
+                      '_search_text', 'only_fields', '_max_time_ms')
 
         for prop in copy_props:
             val = getattr(self, prop)
@@ -1351,9 +1338,6 @@ def next(self):
         doc = self._document._from_son(raw_doc,
                                        _auto_dereference=self._auto_dereference, only_fields=self.only_fields)
 
-        if self._include_text_scores:
-            doc.get_text_score = types.MethodType(get_text_score, doc)
-
         if self._scalar:
             return self._get_scalar(doc)
 
@@ -1362,6 +1346,7 @@ def next(self):
     def rewind(self):
         """Rewind the cursor to its unevaluated state.
 
+
         .. versionadded:: 0.3
         """
         self._iter = False
@@ -1389,7 +1374,7 @@ def _cursor_args(self):
         if self._loaded_fields:
             cursor_args['fields'] = self._loaded_fields.as_dict()
 
-        if self._include_text_scores:
+        if self._search_text:
             if 'fields' not in cursor_args:
                 cursor_args['fields'] = {}
 
@@ -1608,8 +1593,6 @@ def _get_order_by(self, keys):
                 continue
 
             if key == '$text_score':
-                # automatically set to include text scores
-                self._include_text_scores = True
                 key_list.append(('_text_score', {'$meta': "textScore"}))
                 continue
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index e37ab8810..c91600d03 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2785,15 +2785,14 @@ class News(Document):
         self.assertTrue('planejamento' in new.title)
 
         query = News.objects.search_text("candidata")
-
-        self.assertTrue(query._include_text_scores)
+        self.assertEqual(query._search_text, "candidata")
         new = query.first()
 
         self.assertTrue(isinstance(new.get_text_score(), float))
 
         # count
         query = News.objects.search_text('brasil').order_by('$text_score')
-        self.assertTrue(query._include_text_scores)
+        self.assertEqual(query._search_text, "brasil")
 
         self.assertEqual(query.count(), 3)
         self.assertEqual(query._query, {'$text': {'$search': 'brasil'}})

From 531fa30b691bebbd98a6ab9884e0afbbbb6cd5b8 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Mon, 1 Dec 2014 18:20:29 +0100
Subject: [PATCH 0053/1519] added test for capacity to get distinct on
 subdocument of a list

---
 tests/queryset/queryset.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 703728fe1..92b820cfd 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2878,6 +2878,36 @@ class Book(Document):
 
         self.assertEqual(authors, [mark_twain, john_tolkien])
 
+    def test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField(self):
+
+        class Country(EmbeddedDocument):
+            country_name = StringField()
+
+        class Author(EmbeddedDocument):
+            name = StringField()
+            country = EmbeddedDocumentField(Country)
+
+        class Book(Document):
+            title = StringField()
+            authors = ListField(EmbeddedDocumentField(Author))
+
+        Book.drop_collection()
+
+        scotland = Country(country_name="Scotland")
+        tibet = Country(country_name="Tibet")
+
+        mark_twain = Author(name="Mark Twain", country=scotland)
+        john_tolkien = Author(name="John Ronald Reuel Tolkien", country=tibet)
+
+        book = Book(title="Tom Sawyer", authors=[mark_twain]).save()
+        book = Book(
+            title="The Lord of the Rings", authors=[john_tolkien]).save()
+        book = Book(
+            title="The Stories", authors=[mark_twain, john_tolkien]).save()
+        country_list = Book.objects.distinct("authors.country")
+
+        self.assertEqual(country_list, [scotland, tibet])
+
     def test_distinct_ListField_ReferenceField(self):
         class Foo(Document):
             bar_lst = ListField(ReferenceField('Bar'))

From 51f314e90726560bf2a8a081625902a4096cb3da Mon Sep 17 00:00:00 2001
From: Slam <3lnc.slam@gmail.com>
Date: Fri, 28 Nov 2014 13:10:38 +0200
Subject: [PATCH 0054/1519] Doc fixes, thanks @3Inc

Author:    Slam <3lnc.slam@gmail.com>
Date:      Fri Nov 28 13:10:38 2014 +0200
---
 docs/guide/connecting.rst         | 70 +++++++++++++++++++------------
 docs/guide/defining-documents.rst | 24 +++++++----
 docs/guide/document-instances.rst | 15 +++----
 docs/guide/querying.rst           | 45 +++++++++++---------
 docs/guide/signals.rst            | 10 ++---
 docs/index.rst                    |  2 +-
 mongoengine/base/fields.py        |  5 ++-
 mongoengine/document.py           |  3 +-
 mongoengine/fields.py             |  6 +++
 mongoengine/queryset/base.py      |  3 +-
 10 files changed, 112 insertions(+), 71 deletions(-)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index 0e61df96c..48926499e 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -23,21 +23,32 @@ arguments should be provided::
 
     connect('project1', username='webapp', password='pwd123')
 
-URI style connections are also supported - just supply the uri as
+URI style connections are also supported -- just supply the URI as
 the :attr:`host` to
 :func:`~mongoengine.connect`::
 
     connect('project1', host='mongodb://localhost/database_name')
 
-Note that database name from uri has priority over name
-in :func:`~mongoengine.connect`
+.. note:: Database, username and password from URI string overrides
+    corresponding parameters in :func:`~mongoengine.connect`: ::
+
+        connect(
+            name='test',
+            username='user',
+            password='12345',
+            host='mongodb://admin:qwerty@localhost/production'
+        )
+
+    will establish connection to ``production`` database using
+    ``admin`` username and ``qwerty`` password.
 
 ReplicaSets
 ===========
 
-MongoEngine supports :class:`~pymongo.mongo_replica_set_client.MongoReplicaSetClient`.
-To use them, please use a URI style connection and provide the `replicaSet` name in the
-connection kwargs.
+MongoEngine supports
+:class:`~pymongo.mongo_replica_set_client.MongoReplicaSetClient`. To use them,
+please use an URI style connection and provide the ``replicaSet`` name
+in the connection kwargs.
 
 Read preferences are supported through the connection or via individual
 queries by passing the read_preference ::
@@ -77,36 +88,38 @@ to point across databases and collections.  Below is an example schema, using
             meta = {"db_alias": "users-books-db"}
 
 
-Switch Database Context Manager
-===============================
-
-Sometimes you may want to switch the database to query against for a class
-for example, archiving older data into a separate database for performance
-reasons.
+Context Managers
+================
+Sometimes you may want to switch the database or collection to query against
+for a class.
+For example, archiving older data into a separate database for performance
+reasons or writing functions that dynamically choose collections to write
+document to.
 
+Switch Database
+---------------
 The :class:`~mongoengine.context_managers.switch_db` context manager allows
 you to change the database alias for a given class allowing quick and easy
-access to the same User document across databases::
+access the same User document across databases::
 
-        from mongoengine.context_managers import switch_db
+    from mongoengine.context_managers import switch_db
 
-        class User(Document):
-            name = StringField()
+    class User(Document):
+        name = StringField()
 
-            meta = {"db_alias": "user-db"}
+        meta = {"db_alias": "user-db"}
 
-        with switch_db(User, 'archive-user-db') as User:
-            User(name="Ross").save()  # Saves the 'archive-user-db'
+    with switch_db(User, 'archive-user-db') as User:
+        User(name="Ross").save()  # Saves the 'archive-user-db'
 
-.. note:: Make sure any aliases have been registered with
-    :func:`~mongoengine.register_connection` before using the context manager.
 
-There is also a switch collection context manager as well.  The
-:class:`~mongoengine.context_managers.switch_collection` context manager allows
-you to change the collection for a given class allowing quick and easy
-access to the same Group document across collection::
+Switch Collection
+-----------------
+The :class:`~mongoengine.context_managers.switch_collection` context manager
+allows you to change the collection for a given class allowing quick and easy
+access the same Group document across collection::
 
-        from mongoengine.context_managers import switch_db
+        from mongoengine.context_managers import switch_collection
 
         class Group(Document):
             name = StringField()
@@ -116,3 +129,8 @@ access to the same Group document across collection::
         with switch_collection(Group, 'group2000') as Group:
             Group(name="hello Group 2000 collection!").save()  # Saves in group2000 collection
 
+
+
+.. note:: Make sure any aliases have been registered with
+    :func:`~mongoengine.register_connection` or :func:`~mongoengine.connect`
+    before using the context manager.
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 315fcde83..5c45c19a2 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -4,7 +4,7 @@ Defining documents
 In MongoDB, a **document** is roughly equivalent to a **row** in an RDBMS. When
 working with relational databases, rows are stored in **tables**, which have a
 strict **schema** that the rows follow. MongoDB stores documents in
-**collections** rather than tables - the principal difference is that no schema
+**collections** rather than tables --- the principal difference is that no schema
 is enforced at a database level.
 
 Defining a document's schema
@@ -171,15 +171,15 @@ arguments can be set on all fields:
             size = StringField(max_length=3, choices=SIZE)
 
 :attr:`help_text` (Default: None)
-    Optional help text to output with the field - used by form libraries
+    Optional help text to output with the field -- used by form libraries
 
 :attr:`verbose_name` (Default: None)
-    Optional human-readable name for the field - used by form libraries
+    Optional human-readable name for the field -- used by form libraries
 
 
 List fields
 -----------
-MongoDB allows the storage of lists of items. To add a list of items to a
+MongoDB allows storing lists of items. To add a list of items to a
 :class:`~mongoengine.Document`, use the :class:`~mongoengine.fields.ListField` field
 type. :class:`~mongoengine.fields.ListField` takes another field object as its first
 argument, which specifies which type elements may be stored within the list::
@@ -471,8 +471,16 @@ Text indexes may be specified by prefixing the field name with a **$**. ::
     class Page(Document):
         title = StringField()
         rating = StringField()
+        created = DateTimeField()
         meta = {
-            'indexes': ['title', ('title', '-rating')]
+            'indexes': [
+                'title',
+                ('title', '-rating'),
+                {
+                    'fields': ['created'],
+                    'expireAfterSeconds': 3600
+                }
+            ]
         }
 
 If a dictionary is passed then the following options are available:
@@ -690,7 +698,7 @@ defined, you may subclass it and add any extra fields or methods you may need.
 As this is new class is not a direct subclass of
 :class:`~mongoengine.Document`, it will not be stored in its own collection; it
 will use the same collection as its superclass uses. This allows for more
-convenient and efficient retrieval of related documents - all you need do is
+convenient and efficient retrieval of related documents -- all you need do is
 set :attr:`allow_inheritance` to True in the :attr:`meta` data for a
 document.::
 
@@ -709,7 +717,7 @@ document.::
 
 Working with existing data
 --------------------------
-As MongoEngine no longer defaults to needing :attr:`_cls` you can quickly and
+As MongoEngine no longer defaults to needing :attr:`_cls`, you can quickly and
 easily get working with existing data.  Just define the document to match
 the expected schema in your database ::
 
@@ -732,7 +740,7 @@ Abstract classes
 
 If you want to add some extra functionality to a group of Document classes but
 you don't need or want the overhead of inheritance you can use the
-:attr:`abstract` attribute of :attr:`-mongoengine.Document.meta`.
+:attr:`abstract` attribute of :attr:`~mongoengine.Document.meta`.
 This won't turn on :ref:`document-inheritance` but will allow you to keep your
 code DRY::
 
diff --git a/docs/guide/document-instances.rst b/docs/guide/document-instances.rst
index f9a6610ff..0e9fcef62 100644
--- a/docs/guide/document-instances.rst
+++ b/docs/guide/document-instances.rst
@@ -2,7 +2,7 @@
 Documents instances
 ===================
 To create a new document object, create an instance of the relevant document
-class, providing values for its fields as its constructor keyword arguments.
+class, providing values for its fields as constructor keyword arguments.
 You may provide values for any of the fields on the document::
 
     >>> page = Page(title="Test Page")
@@ -32,11 +32,11 @@ already exist, then any changes will be updated atomically.  For example::
 
     Changes to documents are tracked and on the whole perform ``set`` operations.
 
-    * ``list_field.push(0)`` - *sets* the resulting list
-    * ``del(list_field)``   - *unsets* whole list
+    * ``list_field.push(0)`` --- *sets* the resulting list
+    * ``del(list_field)``   --- *unsets* whole list
 
     With lists its preferable to use ``Doc.update(push__list_field=0)`` as
-    this stops the whole list being updated - stopping any race conditions.
+    this stops the whole list being updated --- stopping any race conditions.
 
 .. seealso::
     :ref:`guide-atomic-updates`
@@ -74,7 +74,7 @@ Cascading Saves
 If your document contains :class:`~mongoengine.fields.ReferenceField` or
 :class:`~mongoengine.fields.GenericReferenceField` objects, then by default the
 :meth:`~mongoengine.Document.save` method will not save any changes to
-those objects.  If you want all references to also be saved also, noting each
+those objects.  If you want all references to be saved also, noting each
 save is a separate query, then passing :attr:`cascade` as True
 to the save method will cascade any saves.
 
@@ -113,12 +113,13 @@ you may still use :attr:`id` to access the primary key if you want::
     >>> bob.id == bob.email == 'bob@example.com'
     True
 
-You can also access the document's "primary key" using the :attr:`pk` field; in
-is an alias to :attr:`id`::
+You can also access the document's "primary key" using the :attr:`pk` field,
+it's an alias to :attr:`id`::
 
     >>> page = Page(title="Another Test Page")
     >>> page.save()
     >>> page.id == page.pk
+    True
 
 .. note::
 
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index a3496f54b..9d1dfd760 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -42,7 +42,7 @@ syntax::
 
 Query operators
 ===============
-Operators other than equality may also be used in queries; just attach the
+Operators other than equality may also be used in queries --- just attach the
 operator name to a key with a double-underscore::
 
     # Only find users whose age is 18 or less
@@ -84,19 +84,20 @@ expressions:
 Geo queries
 -----------
 
-There are a few special operators for performing geographical queries. The following
-were added in 0.8 for:  :class:`~mongoengine.fields.PointField`,
+There are a few special operators for performing geographical queries.
+The following were added in MongoEngine 0.8 for
+:class:`~mongoengine.fields.PointField`,
 :class:`~mongoengine.fields.LineStringField` and
 :class:`~mongoengine.fields.PolygonField`:
 
-* ``geo_within`` -- Check if a geometry is within a polygon.  For ease of use
-    it accepts either a geojson geometry or just the polygon coordinates eg::
+* ``geo_within`` -- check if a geometry is within a polygon. For ease of use
+  it accepts either a geojson geometry or just the polygon coordinates eg::
 
         loc.objects(point__geo_within=[[[40, 5], [40, 6], [41, 6], [40, 5]]])
         loc.objects(point__geo_within={"type": "Polygon",
                                  "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]})
 
-* ``geo_within_box`` - simplified geo_within searching with a box eg::
+* ``geo_within_box`` -- simplified geo_within searching with a box eg::
 
         loc.objects(point__geo_within_box=[(-125.0, 35.0), (-100.0, 40.0)])
         loc.objects(point__geo_within_box=[<bottom left coordinates>, <upper right coordinates>])
@@ -132,23 +133,21 @@ were added in 0.8 for:  :class:`~mongoengine.fields.PointField`,
         loc.objects(poly__geo_intersects={"type": "Polygon",
                                           "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]]})
 
-* ``near`` -- Find all the locations near a given point::
+* ``near`` -- find all the locations near a given point::
 
         loc.objects(point__near=[40, 5])
         loc.objects(point__near={"type": "Point", "coordinates": [40, 5]})
 
-
-    You can also set the maximum distance in meters as well::
+  You can also set the maximum distance in meters as well::
 
         loc.objects(point__near=[40, 5], point__max_distance=1000)
 
-
 The older 2D indexes are still supported with the
 :class:`~mongoengine.fields.GeoPointField`:
 
 * ``within_distance`` -- provide a list containing a point and a maximum
   distance (e.g. [(41.342, -87.653), 5])
-* ``within_spherical_distance`` -- Same as above but using the spherical geo model
+* ``within_spherical_distance`` -- same as above but using the spherical geo model
   (e.g. [(41.342, -87.653), 5/earth_radius])
 * ``near`` -- order the documents by how close they are to a given point
 * ``near_sphere`` -- Same as above but using the spherical geo model
@@ -198,12 +197,14 @@ However, this doesn't map well to the syntax so you can also use a capital S ins
 
     Post.objects(comments__by="joe").update(inc__comments__S__votes=1)
 
-    .. note:: Due to Mongo currently the $ operator only applies to the first matched item in the query.
+.. note::
+    Due to :program:`Mongo`, currently the $ operator only applies to the
+    first matched item in the query.
 
 
 Raw queries
 -----------
-It is possible to provide a raw PyMongo query as a query parameter, which will
+It is possible to provide a raw :mod:`PyMongo` query as a query parameter, which will
 be integrated directly into the query. This is done using the ``__raw__``
 keyword argument::
 
@@ -213,12 +214,12 @@ keyword argument::
 
 Limiting and skipping results
 =============================
-Just as with traditional ORMs, you may limit the number of results returned, or
+Just as with traditional ORMs, you may limit the number of results returned or
 skip a number or results in you query.
 :meth:`~mongoengine.queryset.QuerySet.limit` and
 :meth:`~mongoengine.queryset.QuerySet.skip` and methods are available on
-:class:`~mongoengine.queryset.QuerySet` objects, but the prefered syntax for
-achieving this is using array-slicing syntax::
+:class:`~mongoengine.queryset.QuerySet` objects, but the `array-slicing` syntax
+is preferred for achieving this::
 
     # Only the first 5 people
     users = User.objects[:5]
@@ -255,7 +256,7 @@ if more than one document matched the query.  These exceptions are merged into
 your document definitions eg: `MyDoc.DoesNotExist`
 
 A variation of this method exists,
-:meth:`~mongoengine.queryset.Queryset.get_or_create`, that will create a new
+:meth:`~mongoengine.queryset.QuerySet.get_or_create`, that will create a new
 document with the query arguments if no documents match the query. An
 additional keyword argument, :attr:`defaults` may be provided, which will be
 used as default values for the new document, in the case that it should need
@@ -266,9 +267,13 @@ to be created::
     >>> a.name == b.name and a.age == b.age
     True
 
+.. warning::
+    :meth:`~mongoengine.queryset.QuerySet.get_or_create` method is deprecated
+    since :mod:`mongoengine` 0.8.
+
 Default Document queries
 ========================
-By default, the objects :attr:`~mongoengine.Document.objects` attribute on a
+By default, the objects :attr:`~Document.objects` attribute on a
 document returns a :class:`~mongoengine.queryset.QuerySet` that doesn't filter
 the collection -- it returns all objects. This may be changed by defining a
 method on a document that modifies a queryset. The method should accept two
@@ -311,7 +316,7 @@ Should you want to add custom methods for interacting with or filtering
 documents, extending the :class:`~mongoengine.queryset.QuerySet` class may be
 the way to go. To use a custom :class:`~mongoengine.queryset.QuerySet` class on
 a document, set ``queryset_class`` to the custom class in a
-:class:`~mongoengine.Document`\ s ``meta`` dictionary::
+:class:`~mongoengine.Document`'s ``meta`` dictionary::
 
     class AwesomerQuerySet(QuerySet):
 
@@ -498,7 +503,7 @@ Documents may be updated atomically by using the
 There are several different "modifiers" that you may use with these methods:
 
 * ``set`` -- set a particular value
-* ``unset`` -- delete a particular value (since MongoDB v1.3+)
+* ``unset`` -- delete a particular value (since MongoDB v1.3)
 * ``inc`` -- increment a value by a given amount
 * ``dec`` -- decrement a value by a given amount
 * ``push`` -- append a value to a list
diff --git a/docs/guide/signals.rst b/docs/guide/signals.rst
index fc93e4cae..797a48699 100644
--- a/docs/guide/signals.rst
+++ b/docs/guide/signals.rst
@@ -35,25 +35,25 @@ Available signals include:
   :class:`~mongoengine.EmbeddedDocument` instance has been completed.
 
 `pre_save`
-  Called within :meth:`~mongoengine.document.Document.save` prior to performing
+  Called within :meth:`~mongoengine.Document.save` prior to performing
   any actions.
 
 `pre_save_post_validation`
-  Called within :meth:`~mongoengine.document.Document.save` after validation
+  Called within :meth:`~mongoengine.Document.save` after validation
   has taken place but before saving.
 
 `post_save`
-  Called within :meth:`~mongoengine.document.Document.save` after all actions
+  Called within :meth:`~mongoengine.Document.save` after all actions
   (validation, insert/update, cascades, clearing dirty flags) have completed
   successfully.  Passed the additional boolean keyword argument `created` to
   indicate if the save was an insert or an update.
 
 `pre_delete`
-  Called within :meth:`~mongoengine.document.Document.delete` prior to
+  Called within :meth:`~mongoengine.Document.delete` prior to
   attempting the delete operation.
 
 `post_delete`
-  Called within :meth:`~mongoengine.document.Document.delete` upon successful
+  Called within :meth:`~mongoengine.Document.delete` upon successful
   deletion of the record.
 
 `pre_bulk_insert`
diff --git a/docs/index.rst b/docs/index.rst
index 77f965cae..2102df026 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,7 +14,7 @@ MongoDB. To install it, simply run
   MongoEngine.
 
 :doc:`guide/index`
-  The Full guide to MongoEngine - from modeling documents to storing files,
+  The Full guide to MongoEngine --- from modeling documents to storing files,
   from querying for data to firing signals and *everything* between.
 
 :doc:`apireference`
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index f86d4175d..6fad5d632 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -428,6 +428,7 @@ def validate(self, value):
 class GeoJsonBaseField(BaseField):
 
     """A geo json field storing a geojson style object.
+
     .. versionadded:: 0.8
     """
 
@@ -436,8 +437,8 @@ class GeoJsonBaseField(BaseField):
 
     def __init__(self, auto_index=True, *args, **kwargs):
         """
-        :param auto_index: Automatically create a "2dsphere" index. Defaults
-            to `True`.
+        :param bool auto_index: Automatically create a "2dsphere" index.\
+            Defaults to `True`.
         """
         self._name = "%sField" % self._type
         if not auto_index:
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 1f1f81ae2..eecdb57fa 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -193,7 +193,7 @@ def modify(self, query={}, **update):
         in the database doesn't match the query.
 
         .. note:: All unsaved changes that has been made to the document are
-        rejected if the method returns True.
+            rejected if the method returns True.
 
         :param query: the update will be performed only if the document in the
             database matches the query
@@ -250,6 +250,7 @@ def save(self, force_insert=False, validate=True, clean=True,
         :param _refs: A list of processed references used in cascading saves
         :param save_condition: only perform save if matching record in db
             satisfies condition(s) (e.g., version number)
+
         .. versionchanged:: 0.5
             In existing documents it only saves changed fields using
             set / unset.  Saves are cascaded and any
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 5ddcf5612..7af647417 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1860,6 +1860,7 @@ class PointField(GeoJsonBaseField):
     to set the value.
 
     Requires mongodb >= 2.4
+
     .. versionadded:: 0.8
     """
     _type = "Point"
@@ -1879,6 +1880,7 @@ class LineStringField(GeoJsonBaseField):
     You can either pass a dict with the full information or a list of points.
 
     Requires mongodb >= 2.4
+
     .. versionadded:: 0.8
     """
     _type = "LineString"
@@ -1901,6 +1903,7 @@ class PolygonField(GeoJsonBaseField):
     holes.
 
     Requires mongodb >= 2.4
+
     .. versionadded:: 0.8
     """
     _type = "Polygon"
@@ -1921,6 +1924,7 @@ class MultiPointField(GeoJsonBaseField):
     to set the value.
 
     Requires mongodb >= 2.6
+
     .. versionadded:: 0.9
     """
     _type = "MultiPoint"
@@ -1941,6 +1945,7 @@ class MultiLineStringField(GeoJsonBaseField):
     You can either pass a dict with the full information or a list of points.
 
     Requires mongodb >= 2.6
+
     .. versionadded:: 0.9
     """
     _type = "MultiLineString"
@@ -1968,6 +1973,7 @@ class MultiPolygonField(GeoJsonBaseField):
     of Polygons.
 
     Requires mongodb >= 2.6
+
     .. versionadded:: 0.9
     """
     _type = "MultiPolygon"
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 39ffa88fe..3932465e5 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -402,6 +402,7 @@ def delete(self, write_concern=None, _from_doc_delete=False):
             will force an fsync on the primary server.
         :param _from_doc_delete: True when called from document delete therefore
             signals will have been triggered so don't loop.
+
         :returns number of deleted documents
         """
         queryset = self.clone()
@@ -989,7 +990,7 @@ def from_json(self, json_data):
     def aggregate(self, *pipeline, **kwargs):
         """
         Perform a aggregate function based in your queryset params
-        :param pipeline: list of aggregation commands,
+        :param pipeline: list of aggregation commands,\
             see: http://docs.mongodb.org/manual/core/aggregation-pipeline/
 
         .. versionadded:: 0.9

From e5a636a159b75a5672b90c021a1a2aa8c6a56c69 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Wed, 3 Dec 2014 11:09:05 +0200
Subject: [PATCH 0055/1519] Added a test that verifies distinct operations on
 nested embedded documents.

---
 tests/queryset/queryset.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 92b820cfd..a21c561d2 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2879,9 +2879,12 @@ class Book(Document):
         self.assertEqual(authors, [mark_twain, john_tolkien])
 
     def test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField(self):
-
+        class Continent(EmbeddedDocument):
+            continent_name = StringField()
+        
         class Country(EmbeddedDocument):
             country_name = StringField()
+            continent = EmbeddedDocumentField(Continent)
 
         class Author(EmbeddedDocument):
             name = StringField()
@@ -2893,8 +2896,11 @@ class Book(Document):
 
         Book.drop_collection()
 
-        scotland = Country(country_name="Scotland")
-        tibet = Country(country_name="Tibet")
+        europe = Continent(continent_name='europe')
+        asia = Continent(continent_name='asia')
+        
+        scotland = Country(country_name="Scotland", continent=europe)
+        tibet = Country(country_name="Tibet", continent=asia)
 
         mark_twain = Author(name="Mark Twain", country=scotland)
         john_tolkien = Author(name="John Ronald Reuel Tolkien", country=tibet)
@@ -2907,6 +2913,10 @@ class Book(Document):
         country_list = Book.objects.distinct("authors.country")
 
         self.assertEqual(country_list, [scotland, tibet])
+        
+        continent_list = Book.objects.distinct("authors.country.continent")
+        
+        self.assertEqual(continent_list, [asia, europe])
 
     def test_distinct_ListField_ReferenceField(self):
         class Foo(Document):

From 8aaa5951cab68b0c88ec04b892de014ffe2a6930 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Wed, 3 Dec 2014 13:13:07 +0100
Subject: [PATCH 0056/1519] fixed order of list for the test to pass

---
 tests/queryset/queryset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index a21c561d2..6670029d9 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2916,7 +2916,7 @@ class Book(Document):
         
         continent_list = Book.objects.distinct("authors.country.continent")
         
-        self.assertEqual(continent_list, [asia, europe])
+        self.assertEqual(continent_list, [europe, asia])
 
     def test_distinct_ListField_ReferenceField(self):
         class Foo(Document):

From 7bb65fca4ecbfdd616e4a232b563d386a04efde9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Fran=C3=A7ais?= <antoine.francais@dolead.com>
Date: Thu, 4 Dec 2014 11:34:23 +0100
Subject: [PATCH 0057/1519] Fix crash when applying deletion rules

When deleting a document references by other, if that refence is
defined on an abstract document, the operation fails, because it tries
to apply deletion on the abstract class which doesn't have a QuerySet.

Fix is simply to ignore document classes which are defined abstract when
applying rules on all classes referencing the document.
---
 mongoengine/queryset/base.py |   4 ++
 tests/queryset/queryset.py   | 104 +++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 3932465e5..a49f9968a 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -432,6 +432,8 @@ def delete(self, write_concern=None, _from_doc_delete=False):
         # references
         for rule_entry in delete_rules:
             document_cls, field_name = rule_entry
+            if document_cls._meta.get('abstract'):
+                continue
             rule = doc._meta['delete_rules'][rule_entry]
             if rule == DENY and document_cls.objects(
                     **{field_name + '__in': self}).count() > 0:
@@ -441,6 +443,8 @@ def delete(self, write_concern=None, _from_doc_delete=False):
 
         for rule_entry in delete_rules:
             document_cls, field_name = rule_entry
+            if document_cls._meta.get('abstract'):
+                continue
             rule = doc._meta['delete_rules'][rule_entry]
             if rule == CASCADE:
                 ref_q = document_cls.objects(**{field_name + '__in': self})
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c91600d03..7f3d5c483 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1302,6 +1302,31 @@ class BlogPost(Document):
         self.Person.objects(name='Test User').delete()
         self.assertEqual(1, BlogPost.objects.count())
 
+    def test_reverse_delete_rule_cascade_on_abstract_document(self):
+        """Ensure cascading deletion of referring documents from the database 
+        does not fail on abstract document.
+        """
+        class AbstractBlogPost(Document):
+            meta = {'abstract': True}
+            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)
+
+        class BlogPost(AbstractBlogPost):
+            content = StringField()
+        BlogPost.drop_collection()
+
+        me = self.Person(name='Test User')
+        me.save()
+        someoneelse = self.Person(name='Some-one Else')
+        someoneelse.save()
+
+        BlogPost(content='Watching TV', author=me).save()
+        BlogPost(content='Chilling out', author=me).save()
+        BlogPost(content='Pro Testing', author=someoneelse).save()
+
+        self.assertEqual(3, BlogPost.objects.count())
+        self.Person.objects(name='Test User').delete()
+        self.assertEqual(1, BlogPost.objects.count())  
+
     def test_reverse_delete_rule_cascade_self_referencing(self):
         """Ensure self-referencing CASCADE deletes do not result in infinite
         loop
@@ -1361,6 +1386,31 @@ class BlogPost(Document):
         self.assertEqual(1, BlogPost.objects.count())
         self.assertEqual(None, BlogPost.objects.first().category)
 
+    def test_reverse_delete_rule_nullify_on_abstract_document(self): 
+        """Ensure nullification of references to deleted documents when 
+        reference is on an abstract document.
+        """
+        class AbstractBlogPost(Document):
+            meta = {'abstract': True}
+            author = ReferenceField(self.Person, reverse_delete_rule=NULLIFY)
+
+        class BlogPost(AbstractBlogPost):
+            content = StringField()
+        BlogPost.drop_collection()
+
+        me = self.Person(name='Test User')
+        me.save()
+        someoneelse = self.Person(name='Some-one Else')
+        someoneelse.save()
+
+        BlogPost(content='Watching TV', author=me).save()
+
+        self.assertEqual(1, BlogPost.objects.count())
+        self.assertEqual(me, BlogPost.objects.first().author)
+        self.Person.objects(name='Test User').delete()
+        self.assertEqual(1, BlogPost.objects.count())
+        self.assertEqual(None, BlogPost.objects.first().author)
+
     def test_reverse_delete_rule_deny(self):
         """Ensure deletion gets denied on documents that still have references
         to them.
@@ -1380,6 +1430,26 @@ class BlogPost(Document):
 
         self.assertRaises(OperationError, self.Person.objects.delete)
 
+    def test_reverse_delete_rule_deny_on_abstract_document(self):
+        """Ensure deletion gets denied on documents that still have references
+        to them, when reference is on an abstract document.
+        """
+        class AbstractBlogPost(Document):
+            meta = {'abstract': True}
+            author = ReferenceField(self.Person, reverse_delete_rule=DENY)
+
+        class BlogPost(AbstractBlogPost):
+            content = StringField()
+        BlogPost.drop_collection()
+
+        me = self.Person(name='Test User')
+        me.save()
+
+        BlogPost(content='Watching TV', author=me).save()
+
+        self.assertEqual(1, BlogPost.objects.count())
+        self.assertRaises(OperationError, self.Person.objects.delete)
+    
     def test_reverse_delete_rule_pull(self):
         """Ensure pulling of references to deleted documents.
         """
@@ -1410,6 +1480,40 @@ class BlogPost(Document):
         self.assertEqual(post.authors, [me])
         self.assertEqual(another.authors, [])
 
+    def test_reverse_delete_rule_pull_on_abstract_documents(self):
+        """Ensure pulling of references to deleted documents when reference
+        is defined on an abstract document..
+        """
+        class AbstractBlogPost(Document):
+            meta = {'abstract': True}
+            authors = ListField(ReferenceField(self.Person, 
+                                               reverse_delete_rule=PULL))
+        
+        class BlogPost(AbstractBlogPost):
+            content = StringField()
+
+        BlogPost.drop_collection()
+        self.Person.drop_collection()
+
+        me = self.Person(name='Test User')
+        me.save()
+
+        someoneelse = self.Person(name='Some-one Else')
+        someoneelse.save()
+
+        post = BlogPost(content='Watching TV', authors=[me, someoneelse])
+        post.save()
+
+        another = BlogPost(content='Chilling Out', authors=[someoneelse])
+        another.save()
+
+        someoneelse.delete()
+        post.reload()
+        another.reload()
+
+        self.assertEqual(post.authors, [me])
+        self.assertEqual(another.authors, [])
+    
     def test_delete_with_limits(self):
 
         class Log(Document):

From db36d0a3752cc7cddfcd9c198f52c21028040933 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <matt.ellison@dexgen.io>
Date: Wed, 3 Dec 2014 23:50:51 -0500
Subject: [PATCH 0058/1519] Ensure Indexes before Each Save

- Rely on caching within the PyMongo driver to provide lightweight calls
  while indices are cached.
- Closes MongoEngine/mongoengine#812.
---
 docs/changelog.rst        |  3 ++-
 mongoengine/document.py   |  2 ++
 tests/document/indexes.py | 29 ++++++++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 493715779..fc8b281cf 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,8 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
-- Generate Unique Indicies for Lists of EmbeddedDocuments #358
+- Ensure Indexes before Each Save #812
+- Generate Unique Indices for Lists of EmbeddedDocuments #358
 - Sparse fields #515
 - write_concern not in params of Collection#remove #801
 - Better BaseDocument equality check when not saved #798
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 203b2659f..03318c849 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -285,6 +285,8 @@ def save(self, force_insert=False, validate=True, clean=True,
 
         try:
             collection = self._get_collection()
+            if self._meta.get('auto_create_index', True):
+                self.ensure_indexes()
             if created:
                 if force_insert:
                     object_id = collection.insert(doc, **write_concern)
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 4815350f6..d3e372677 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -18,7 +18,7 @@
 class IndexesTest(unittest.TestCase):
 
     def setUp(self):
-        connect(db='mongoenginetest')
+        self.connection = connect(db='mongoenginetest')
         self.db = get_db()
 
         class Person(Document):
@@ -795,6 +795,33 @@ class Book(Document):
         key = indexes["title_text"]["key"]
         self.assertTrue(('_fts', 'text') in key)
 
+    def test_indexes_after_database_drop(self):
+        """
+        Test to ensure that indexes are re-created on a collection even
+        after the database has been dropped.
+
+        Issue #812
+        """
+        class BlogPost(Document):
+            title = StringField()
+            slug = StringField(unique=True)
+
+        BlogPost.drop_collection()
+
+        # Create Post #1
+        post1 = BlogPost(title='test1', slug='test')
+        post1.save()
+
+        # Drop the Database
+        self.connection.drop_database(BlogPost._get_db().name)
+
+        # Re-create Post #1
+        post1 = BlogPost(title='test1', slug='test')
+        post1.save()
+
+        # Create Post #2
+        post2 = BlogPost(title='test2', slug='test')
+        self.assertRaises(NotUniqueError, post2.save)
 
 if __name__ == '__main__':
     unittest.main()

From d80be60e2b67386c0da07c2a7b3da71ee98ef9a1 Mon Sep 17 00:00:00 2001
From: aeroeng <aeroeng@aeroeng.net>
Date: Tue, 6 Jan 2015 14:37:40 -0500
Subject: [PATCH 0059/1519] mongo $and list should not contain list elements in
 order to avoid this error: $and/$or elements must be objects

---
 mongoengine/queryset/transform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index e575d9d6c..83bd9f8e1 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -160,7 +160,7 @@ def query(_doc_cls=None, _field_operation=False, **query):
         if isinstance(v, list):
             value = [{k: val} for val in v]
             if '$and' in mongo_query.keys():
-                mongo_query['$and'].append(value)
+                mongo_query['$and'].extend(value)
             else:
                 mongo_query['$and'] = value
 

From 1a24d599b31e020733f6a9e8a64a79579e6bd8d9 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <seglberg@gmail.com>
Date: Sun, 11 Jan 2015 19:12:10 -0500
Subject: [PATCH 0060/1519] Field Choices Now Accept Subclasses of Documents

- Fields containing 'choices' of which a choice is an
  EmbeddedDocument or Document will now accept subclasses of that
  choice.
---
 docs/changelog.rst         |  1 +
 mongoengine/base/fields.py | 28 +++++++++++++------------
 tests/fields/fields.py     | 43 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index fc8b281cf..ae4ba85a2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Field Choices Now Accept Subclasses of Documents
 - Ensure Indexes before Each Save #812
 - Generate Unique Indices for Lists of EmbeddedDocuments #358
 - Sparse fields #515
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 6fad5d632..359ea6d2a 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -158,21 +158,23 @@ def validate(self, value, clean=True):
     def _validate(self, value, **kwargs):
         Document = _import_class('Document')
         EmbeddedDocument = _import_class('EmbeddedDocument')
-        # check choices
+
+        # Check the Choices Constraint
         if self.choices:
-            is_cls = isinstance(value, (Document, EmbeddedDocument))
-            value_to_check = value.__class__ if is_cls else value
-            err_msg = 'an instance' if is_cls else 'one'
+
+            choice_list = self.choices
             if isinstance(self.choices[0], (list, tuple)):
-                option_keys = [k for k, v in self.choices]
-                if value_to_check not in option_keys:
-                    msg = ('Value must be %s of %s' %
-                           (err_msg, unicode(option_keys)))
-                    self.error(msg)
-            elif value_to_check not in self.choices:
-                msg = ('Value must be %s of %s' %
-                       (err_msg, unicode(self.choices)))
-                self.error(msg)
+                choice_list = [k for k, v in self.choices]
+
+            # Choices which are other types of Documents
+            if isinstance(value, (Document, EmbeddedDocument)):
+                if not any(isinstance(value, c) for c in choice_list):
+                    self.error(
+                        'Value must be instance of %s' % unicode(choice_list)
+                    )
+            # Choices which are types other than Documents
+            elif value not in choice_list:
+                self.error('Value must be one of %s' % unicode(choice_list))
 
         # check validation argument
         if self.validation is not None:
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index a95001b46..fedc7c385 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2446,6 +2446,49 @@ class Shirt(Document):
 
         Shirt.drop_collection()
 
+    def test_choices_validation_documents(self):
+        """
+        Ensure that a field with choices which are documents are
+        validated correctly.
+        """
+        class UserComments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
+
+        class BlogPost(Document):
+            comments = ListField(
+                GenericEmbeddedDocumentField(choices=(UserComments,))
+            )
+
+        BlogPost(comments=[
+            UserComments(author='user2', message='message2'),
+        ]).save()
+
+    def test_choices_validation_documents_inheritance(self):
+        """
+        Ensure that a field with choices which are documents are
+        validated correctly when a subclass of a valid choice is used.
+        """
+        class Comments(EmbeddedDocument):
+            meta = {
+                'abstract': True
+            }
+
+            author = StringField()
+            message = StringField()
+
+        class UserComments(Comments):
+            pass
+
+        class BlogPost(Document):
+            comments = ListField(
+                GenericEmbeddedDocumentField(choices=(Comments,))
+            )
+
+        BlogPost(comments=[
+            UserComments(author='user2', message='message2'),
+        ]).save()
+
     def test_choices_get_field_display(self):
         """Test dynamic helper for returning the display value of a choices
         field.

From 213a0a18a578c539baa83439b4719977271e7f34 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <seglberg@gmail.com>
Date: Mon, 12 Jan 2015 10:11:42 -0500
Subject: [PATCH 0061/1519] Updated Unit Tests for Field Choices of Documents

- Added Unit Test with Invalid EmbeddedDocument Choice.
- Updated Broken Link in Author's File
---
 AUTHORS                |  2 +-
 tests/fields/fields.py | 40 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index fb9a1ce5a..18258953a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -215,4 +215,4 @@ that much better:
  * André Ericson https://github.com/aericson)
  * Mikhail Moshnogorsky (https://github.com/mikhailmoshnogorsky)
  * Diego Berrocal (https://github.com/cestdiego)
- * Matthew Ellison (https://github.com/mmelliso)
+ * Matthew Ellison (https://github.com/seglberg)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index fedc7c385..ab220b25c 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2448,8 +2448,7 @@ class Shirt(Document):
 
     def test_choices_validation_documents(self):
         """
-        Ensure that a field with choices which are documents are
-        validated correctly.
+        Ensure fields with document choices validate given a valid choice.
         """
         class UserComments(EmbeddedDocument):
             author = StringField()
@@ -2460,20 +2459,50 @@ class BlogPost(Document):
                 GenericEmbeddedDocumentField(choices=(UserComments,))
             )
 
+        # Ensure Validation Passes
         BlogPost(comments=[
             UserComments(author='user2', message='message2'),
         ]).save()
 
+    def test_choices_validation_documents_invalid(self):
+        """
+        Ensure fields with document choices validate given an invalid choice.
+        This should throw a ValidationError exception.
+        """
+        class UserComments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
+
+        class ModeratorComments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
+
+        class BlogPost(Document):
+            comments = ListField(
+                GenericEmbeddedDocumentField(choices=(UserComments,))
+            )
+
+        # Single Entry Failure
+        post = BlogPost(comments=[
+            ModeratorComments(author='mod1', message='message1'),
+        ])
+        self.assertRaises(ValidationError, post.save)
+
+        # Mixed Entry Failure
+        post = BlogPost(comments=[
+            ModeratorComments(author='mod1', message='message1'),
+            UserComments(author='user2', message='message2'),
+        ])
+        self.assertRaises(ValidationError, post.save)
+
     def test_choices_validation_documents_inheritance(self):
         """
-        Ensure that a field with choices which are documents are
-        validated correctly when a subclass of a valid choice is used.
+        Ensure fields with document choices validate given subclass of choice.
         """
         class Comments(EmbeddedDocument):
             meta = {
                 'abstract': True
             }
-
             author = StringField()
             message = StringField()
 
@@ -2485,6 +2514,7 @@ class BlogPost(Document):
                 GenericEmbeddedDocumentField(choices=(Comments,))
             )
 
+        # Save Valid EmbeddedDocument Type
         BlogPost(comments=[
             UserComments(author='user2', message='message2'),
         ]).save()

From cbb0b57018b7accbd9bd4faa7a6fcb4afc9b5023 Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Fri, 13 Feb 2015 11:08:52 +0200
Subject: [PATCH 0062/1519] Fix #872: No module named 'django.utils.importlib'
 (Django dev)

---
 docs/changelog.rst                      |  1 +
 mongoengine/django/mongo_auth/models.py |  6 ++++-
 tests/test_django.py                    | 29 ++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ae4ba85a2..436671ecb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- No module named 'django.utils.importlib' (Django dev) #872
 - Field Choices Now Accept Subclasses of Documents
 - Ensure Indexes before Each Save #812
 - Generate Unique Indices for Lists of EmbeddedDocuments #358
diff --git a/mongoengine/django/mongo_auth/models.py b/mongoengine/django/mongo_auth/models.py
index 60965e6d7..ad4ceff8d 100644
--- a/mongoengine/django/mongo_auth/models.py
+++ b/mongoengine/django/mongo_auth/models.py
@@ -3,7 +3,11 @@
 from django.contrib.auth.models import UserManager
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
-from django.utils.importlib import import_module
+try:
+    from django.utils.module_loading import import_module
+except ImportError:
+    """Handle older versions of Django"""
+    from django.utils.importlib import import_module
 from django.utils.translation import ugettext_lazy as _
 
 
diff --git a/tests/test_django.py b/tests/test_django.py
index 0070087fb..cb7efe6f1 100644
--- a/tests/test_django.py
+++ b/tests/test_django.py
@@ -19,9 +19,12 @@
     AUTHENTICATION_BACKENDS = ('mongoengine.django.auth.MongoEngineBackend',)
 )
 
-# For Django >= 1.7
-if hasattr(django, 'setup'):
-    django.setup()
+try:
+    # For Django >= 1.7
+    if hasattr(django, 'setup'):
+        django.setup()
+except RuntimeError:
+    pass
 
 try:
     from django.contrib.auth import authenticate, get_user_model
@@ -34,7 +37,6 @@
     DJ15 = True
 except Exception:
     DJ15 = False
-from django.contrib.sessions.tests import SessionTestsMixin
 from mongoengine.django.sessions import SessionStore, MongoSession
 from mongoengine.django.tests import MongoTestCase
 from datetime import tzinfo, timedelta
@@ -226,13 +228,13 @@ class Note(Document):
         self.assertEqual(t.render(c), "10")
 
 
-class MongoDBSessionTest(SessionTestsMixin, unittest.TestCase):
+class _BaseMongoDBSessionTest(unittest.TestCase):
     backend = SessionStore
 
     def setUp(self):
         connect(db='mongoenginetest')
         MongoSession.drop_collection()
-        super(MongoDBSessionTest, self).setUp()
+        super(_BaseMongoDBSessionTest, self).setUp()
 
     def assertIn(self, first, second, msg=None):
         self.assertTrue(first in second, msg)
@@ -259,6 +261,21 @@ def test_session_expiration_tz(self):
         self.assertTrue('test_expire' in session, 'Session has expired before it is expected')
 
 
+try:
+    # SessionTestsMixin isn't available for import on django > 1.8a1
+    from django.contrib.sessions.tests import SessionTestsMixin
+
+    class _MongoDBSessionTest(SessionTestsMixin):
+        pass
+
+    class MongoDBSessionTest(_BaseMongoDBSessionTest):
+        pass
+
+except ImportError:
+    class MongoDBSessionTest(_BaseMongoDBSessionTest):
+        pass
+
+
 class MongoAuthTest(unittest.TestCase):
     user_data = {
         'username': 'user',

From 25298c72bbafb80a1814fc84496f2925c5d1700e Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Sun, 15 Feb 2015 10:02:22 +0200
Subject: [PATCH 0063/1519] Fix #877: Fix tests for pymongo 2.8+

---
 docs/changelog.rst        | 1 +
 tests/document/indexes.py | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 436671ecb..b5bf486c3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Fix tests for pymongo 2.8+ #877
 - No module named 'django.utils.importlib' (Django dev) #872
 - Field Choices Now Accept Subclasses of Documents
 - Ensure Indexes before Each Save #812
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index d3e372677..ab156f68f 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -495,9 +495,12 @@ class BlogPost(Document):
 
         self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10)
 
-        def invalid_index():
-            BlogPost.objects.hint('tags')
-        self.assertRaises(TypeError, invalid_index)
+        if pymongo.version >= '2.8':
+            self.assertEqual(BlogPost.objects.hint('tags').count(), 10)
+        else:
+            def invalid_index():
+                BlogPost.objects.hint('tags')
+            self.assertRaises(TypeError, invalid_index)
 
         def invalid_index_2():
             return BlogPost.objects.hint(('tags', 1))

From 225c31d5834158bd02c653ac24874fa083adec2a Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Sat, 14 Feb 2015 18:40:24 +0200
Subject: [PATCH 0064/1519] Fix #766: Add support for  operator

---
 docs/changelog.rst                |  1 +
 mongoengine/queryset/transform.py |  2 +-
 tests/queryset/transform.py       | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b5bf486c3..e70fc8e35 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Add support for $type operator # 766
 - Fix tests for pymongo 2.8+ #877
 - No module named 'django.utils.importlib' (Django dev) #872
 - Field Choices Now Accept Subclasses of Documents
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 83bd9f8e1..be78c411c 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -11,7 +11,7 @@
 
 
 COMPARISON_OPERATORS = ('ne', 'gt', 'gte', 'lt', 'lte', 'in', 'nin', 'mod',
-                        'all', 'size', 'exists', 'not', 'elemMatch')
+                        'all', 'size', 'exists', 'not', 'elemMatch', 'type')
 GEO_OPERATORS = ('within_distance', 'within_spherical_distance',
                  'within_box', 'within_polygon', 'near', 'near_sphere',
                  'max_distance', 'geo_within', 'geo_within_box',
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 48e01919d..2d5261f25 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -197,5 +197,17 @@ class Location(Document):
         update = transform.update(Location, set__poly={"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]})
         self.assertEqual(update, {'$set': {'poly': {"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]}}})
 
+    def test_type(self):
+        class Doc(Document):
+            df = DynamicField()
+        Doc(df=True).save()
+        Doc(df=7).save()
+        Doc(df="df").save()
+        self.assertEqual(Doc.objects(df__type=1).count(), 0)  # double
+        self.assertEqual(Doc.objects(df__type=8).count(), 1)  # bool
+        self.assertEqual(Doc.objects(df__type=2).count(), 1)  # str
+        self.assertEqual(Doc.objects(df__type=16).count(), 1)  # int
+
+
 if __name__ == '__main__':
     unittest.main()

From 5c3d91e65e5bf38932ad54659ab60820b8cd37db Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Mon, 16 Feb 2015 12:25:37 +0200
Subject: [PATCH 0065/1519] Fix #866:  does not follow

---
 docs/changelog.rst                 | 1 +
 mongoengine/base/datastructures.py | 4 ++++
 tests/fields/fields.py             | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e70fc8e35..a90b2373d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- `BaseDict` does not follow `setdefault` #866
 - Add support for $type operator # 766
 - Fix tests for pymongo 2.8+ #877
 - No module named 'django.utils.importlib' (Django dev) #872
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index abe41a144..022338d75 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -75,6 +75,10 @@ def popitem(self, *args, **kwargs):
         self._mark_as_changed()
         return super(BaseDict, self).popitem(*args, **kwargs)
 
+    def setdefault(self, *args, **kwargs):
+        self._mark_as_changed()
+        return super(BaseDict, self).setdefault(*args, **kwargs)
+
     def update(self, *args, **kwargs):
         self._mark_as_changed()
         return super(BaseDict, self).update(*args, **kwargs)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index ab220b25c..8e957c683 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1176,6 +1176,11 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual('updated', post.info['title'])
 
+        post.info.setdefault('authors', [])
+        post.save()
+        post.reload()
+        self.assertEqual([], post.info['authors'])
+
         BlogPost.drop_collection()
 
     def test_dictfield_strict(self):

From 129632cd6b4641d7b192507f9175df80733684f1 Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Tue, 17 Feb 2015 14:38:10 +0200
Subject: [PATCH 0066/1519] Fix #863: Request Support for $min, $max Field
 update operators

---
 docs/changelog.rst                |  1 +
 mongoengine/queryset/transform.py |  2 +-
 tests/queryset/queryset.py        | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a90b2373d..1f6565dc4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Request Support for $min, $max Field update operators #863
 - `BaseDict` does not follow `setdefault` #866
 - Add support for $type operator # 766
 - Fix tests for pymongo 2.8+ #877
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index be78c411c..03a09dc51 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -26,7 +26,7 @@
 
 UPDATE_OPERATORS = ('set', 'unset', 'inc', 'dec', 'pop', 'push',
                     'push_all', 'pull', 'pull_all', 'add_to_set',
-                    'set_on_insert')
+                    'set_on_insert', 'min', 'max')
 
 
 def query(_doc_cls=None, _field_operation=False, **query):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 03d2bdd9f..6cbac4956 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -510,6 +510,17 @@ class BlogPost(Document):
         self.assertEqual(post.comments[0].by, 'joe')
         self.assertEqual(post.comments[0].votes.score, 4)
 
+    def test_update_min_max(self):
+        class Scores(Document):
+            high_score = IntField()
+            low_score = IntField()
+        scores = Scores(high_score=800, low_score=200)
+        scores.save()
+        Scores.objects(id=scores.id).update(min__low_score=150)
+        self.assertEqual(Scores.objects(id=scores.id).get().low_score, 150)
+        Scores.objects(id=scores.id).update(min__low_score=250)
+        self.assertEqual(Scores.objects(id=scores.id).get().low_score, 150)
+
     def test_updates_can_have_match_operators(self):
 
         class Comment(EmbeddedDocument):

From b71a9bc0978bbc951943f962b8b5eb1cdaf73b5a Mon Sep 17 00:00:00 2001
From: Jerry Xu <jerrysxu@gmail.com>
Date: Tue, 17 Feb 2015 13:22:02 -0800
Subject: [PATCH 0067/1519] Update fields.py

Type name should be "MultiPolygon".
---
 mongoengine/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 7af647417..43536ef9a 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1959,7 +1959,7 @@ class MultiPolygonField(GeoJsonBaseField):
 
     .. code-block:: js
 
-        { "type" : "Polygon" ,
+        { "type" : "MultiPolygon" ,
           "coordinates" : [[
                 [[x1, y1], [x1, y1] ... [xn, yn]],
                 [[x1, y1], [x1, y1] ... [xn, yn]]

From ce9d0d7e8219f1ec6b98d46de892bae727c58c46 Mon Sep 17 00:00:00 2001
From: Jimmy Shen <jimmy@tsu.co>
Date: Wed, 18 Feb 2015 10:37:13 -0500
Subject: [PATCH 0068/1519] Fix #864: ComplexDateTimeField should fall back to
 None when null=True

---
 AUTHORS                    |  1 +
 docs/changelog.rst         |  2 +-
 mongoengine/fields.py      |  2 +-
 tests/document/instance.py | 12 ++++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 18258953a..0ed0e0b50 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -216,3 +216,4 @@ that much better:
  * Mikhail Moshnogorsky (https://github.com/mikhailmoshnogorsky)
  * Diego Berrocal (https://github.com/cestdiego)
  * Matthew Ellison (https://github.com/seglberg)
+ * Jimmy Shen (https://github.com/jimmyshen)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1f6565dc4..4e53234fa 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- ComplexDateTimeField should fall back to None when null=True #864
 - Request Support for $min, $max Field update operators #863
 - `BaseDict` does not follow `setdefault` #866
 - Add support for $type operator # 766
@@ -76,7 +77,6 @@ Changes in 0.9.X - DEV
 - Make `in_bulk()` respect `no_dereference()` #775
 - Handle None from model __str__; Fixes #753 #754
 
-
 Changes in 0.8.7
 ================
 - Calling reload on deleted / nonexistent documents raises DoesNotExist (#538)
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 7af647417..cfe66a48d 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -510,7 +510,7 @@ def _convert_from_string(self, data):
     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)
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 3c6a9940f..eb887dced 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2760,6 +2760,12 @@ def test_null_field(self):
         class User(Document):
             name = StringField()
             height = IntField(default=184, null=True)
+            str_fld = StringField(null=True)
+            int_fld = IntField(null=True)
+            flt_fld = FloatField(null=True)
+            dt_fld = DateTimeField(null=True)
+            cdt_fld = ComplexDateTimeField(null=True)
+
         User.objects.delete()
         u = User(name='user')
         u.save()
@@ -2767,6 +2773,12 @@ class User(Document):
         u_from_db.height = None
         u_from_db.save()
         self.assertEquals(u_from_db.height, None)
+        # 864
+        self.assertEqual(u_from_db.str_fld, None)
+        self.assertEqual(u_from_db.int_fld, None)
+        self.assertEqual(u_from_db.flt_fld, None)
+        self.assertEqual(u_from_db.dt_fld, None)
+        self.assertEqual(u_from_db.cdt_fld, None)
 
         # 735
         User.objects.delete()

From 42721628ebc48cf0a64084e31160b43c5b6853a2 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <seglberg@gmail.com>
Date: Wed, 3 Dec 2014 17:54:07 -0500
Subject: [PATCH 0069/1519] Added EmbeddedDocumentListField Implementation

- Added new field type: EmbeddedDocumentListField.
- Provides additional query ability for lists of embedded documents.
- Closes MongoEngine/mongoengine#503.
---
 docs/apireference.rst              |  16 +
 docs/changelog.rst                 |   1 +
 mongoengine/base/datastructures.py | 166 +++++++++-
 mongoengine/base/document.py       |  15 +-
 mongoengine/base/fields.py         |  14 +-
 mongoengine/common.py              |  18 +-
 mongoengine/dereference.py         |  10 +-
 mongoengine/document.py            |  22 +-
 mongoengine/fields.py              |  40 ++-
 tests/fields/fields.py             | 472 ++++++++++++++++++++++++++++-
 10 files changed, 745 insertions(+), 29 deletions(-)

diff --git a/docs/apireference.rst b/docs/apireference.rst
index 857a14b09..7ba93408c 100644
--- a/docs/apireference.rst
+++ b/docs/apireference.rst
@@ -79,6 +79,7 @@ Fields
 .. autoclass:: mongoengine.fields.GenericEmbeddedDocumentField
 .. autoclass:: mongoengine.fields.DynamicField
 .. autoclass:: mongoengine.fields.ListField
+.. autoclass:: mongoengine.fields.EmbeddedDocumentListField
 .. autoclass:: mongoengine.fields.SortedListField
 .. autoclass:: mongoengine.fields.DictField
 .. autoclass:: mongoengine.fields.MapField
@@ -103,6 +104,21 @@ Fields
 .. autoclass:: mongoengine.fields.ImageGridFsProxy
 .. autoclass:: mongoengine.fields.ImproperlyConfigured
 
+Embedded Document Querying
+==========================
+
+.. versionadded:: 0.9
+
+Additional queries for Embedded Documents are available when using the
+:class:`~mongoengine.EmbeddedDocumentListField` to store a list of embedded
+documents.
+
+A list of embedded documents is returned as a special list with the
+following methods:
+
+.. autoclass:: mongoengine.base.datastructures.EmbeddedDocumentList
+    :members:
+
 Misc
 ====
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4e53234fa..9aa6aa3a2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Added `EmbeddedDocumentListField` for Lists of Embedded Documents. #826
 - ComplexDateTimeField should fall back to None when null=True #864
 - Request Support for $min, $max Field update operators #863
 - `BaseDict` does not follow `setdefault` #866
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 022338d75..bac67ddca 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -2,8 +2,9 @@
 import functools
 import itertools
 from mongoengine.common import _import_class
+from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
 
-__all__ = ("BaseDict", "BaseList")
+__all__ = ("BaseDict", "BaseList", "EmbeddedDocumentList")
 
 
 class BaseDict(dict):
@@ -106,7 +107,7 @@ def __init__(self, list_items, instance, name):
         if isinstance(instance, (Document, EmbeddedDocument)):
             self._instance = weakref.proxy(instance)
         self._name = name
-        return super(BaseList, self).__init__(list_items)
+        super(BaseList, self).__init__(list_items)
 
     def __getitem__(self, key, *args, **kwargs):
         value = super(BaseList, self).__getitem__(key)
@@ -191,6 +192,167 @@ def _mark_as_changed(self, key=None):
                 self._instance._mark_as_changed(self._name)
 
 
+class EmbeddedDocumentList(BaseList):
+
+    @classmethod
+    def __match_all(cls, i, kwargs):
+        items = kwargs.items()
+        return all([
+            getattr(i, k) == v or str(getattr(i, k)) == v for k, v in items
+        ])
+
+    @classmethod
+    def __only_matches(cls, obj, kwargs):
+        if not kwargs:
+            return obj
+        return filter(lambda i: cls.__match_all(i, kwargs), obj)
+
+    def __init__(self, list_items, instance, name):
+        super(EmbeddedDocumentList, self).__init__(list_items, instance, name)
+        self._instance = instance
+
+    def filter(self, **kwargs):
+        """
+        Filters the list by only including embedded documents with the
+        given keyword arguments.
+
+        :param kwargs: The keyword arguments corresponding to the fields to
+         filter on. *Multiple arguments are treated as if they are ANDed
+         together.*
+        :return: A new ``EmbeddedDocumentList`` containing the matching
+         embedded documents.
+
+        Raises ``AttributeError`` if a given keyword is not a valid field for
+        the embedded document class.
+        """
+        values = self.__only_matches(self, kwargs)
+        return EmbeddedDocumentList(values, self._instance, self._name)
+
+    def exclude(self, **kwargs):
+        """
+        Filters the list by excluding embedded documents with the given
+        keyword arguments.
+
+        :param kwargs: The keyword arguments corresponding to the fields to
+         exclude on. *Multiple arguments are treated as if they are ANDed
+         together.*
+        :return: A new ``EmbeddedDocumentList`` containing the non-matching
+         embedded documents.
+
+        Raises ``AttributeError`` if a given keyword is not a valid field for
+        the embedded document class.
+        """
+        exclude = self.__only_matches(self, kwargs)
+        values = [item for item in self if item not in exclude]
+        return EmbeddedDocumentList(values, self._instance, self._name)
+
+    def count(self):
+        """
+        The number of embedded documents in the list.
+
+        :return: The length of the list, equivalent to the result of ``len()``.
+        """
+        return len(self)
+
+    def get(self, **kwargs):
+        """
+        Retrieves an embedded document determined by the given keyword
+        arguments.
+
+        :param kwargs: The keyword arguments corresponding to the fields to
+         search on. *Multiple arguments are treated as if they are ANDed
+         together.*
+        :return: The embedded document matched by the given keyword arguments.
+
+        Raises ``DoesNotExist`` if the arguments used to query an embedded
+        document returns no results. ``MultipleObjectsReturned`` if more
+        than one result is returned.
+        """
+        values = self.__only_matches(self, kwargs)
+        if len(values) == 0:
+            raise DoesNotExist(
+                "%s matching query does not exist." % self._name
+            )
+        elif len(values) > 1:
+            raise MultipleObjectsReturned(
+                "%d items returned, instead of 1" % len(values)
+            )
+
+        return values[0]
+
+    def first(self):
+        """
+        Returns the first embedded document in the list, or ``None`` if empty.
+        """
+        if len(self) > 0:
+            return self[0]
+
+    def create(self, **values):
+        """
+        Creates a new embedded document and saves it to the database.
+
+        .. note::
+            The embedded document changes are not automatically saved
+            to the database after calling this method.
+
+        :param values: A dictionary of values for the embedded document.
+        :return: The new embedded document instance.
+        """
+        name = self._name
+        EmbeddedClass = self._instance._fields[name].field.document_type_obj
+        self._instance[self._name].append(EmbeddedClass(**values))
+
+        return self._instance[self._name][-1]
+
+    def save(self, *args, **kwargs):
+        """
+        Saves the ancestor document.
+
+        :param args: Arguments passed up to the ancestor Document's save
+         method.
+        :param kwargs: Keyword arguments passed up to the ancestor Document's
+         save method.
+        """
+        self._instance.save(*args, **kwargs)
+
+    def delete(self):
+        """
+        Deletes the embedded documents from the database.
+
+        .. note::
+            The embedded document changes are not automatically saved
+            to the database after calling this method.
+
+        :return: The number of entries deleted.
+        """
+        values = list(self)
+        for item in values:
+            self._instance[self._name].remove(item)
+
+        return len(values)
+
+    def update(self, **update):
+        """
+        Updates the embedded documents with the given update values.
+
+        .. note::
+            The embedded document changes are not automatically saved
+            to the database after calling this method.
+
+        :param update: A dictionary of update values to apply to each
+         embedded document.
+        :return: The number of entries updated.
+        """
+        if len(update) == 0:
+            return 0
+        values = list(self)
+        for item in values:
+            for k, v in update.items():
+                setattr(item, k, v)
+
+        return len(values)
+
+
 class StrictDict(object):
     __slots__ = ()
     _special_fields = set(['get', 'pop', 'iteritems', 'items', 'keys', 'create'])
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 998e366fe..6bf38ee21 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -16,7 +16,13 @@
 from mongoengine.python_support import PY3, txt_type
 
 from mongoengine.base.common import get_document, ALLOW_INHERITANCE
-from mongoengine.base.datastructures import BaseDict, BaseList, StrictDict, SemiStrictDict
+from mongoengine.base.datastructures import (
+    BaseDict,
+    BaseList,
+    EmbeddedDocumentList,
+    StrictDict,
+    SemiStrictDict
+)
 from mongoengine.base.fields import ComplexBaseField
 
 __all__ = ('BaseDocument', 'NON_FIELD_ERRORS')
@@ -419,6 +425,8 @@ def __expand_dynamic_values(self, name, value):
         if not isinstance(value, (dict, list, tuple)):
             return value
 
+        EmbeddedDocumentListField = _import_class('EmbeddedDocumentListField')
+
         is_list = False
         if not hasattr(value, 'items'):
             is_list = True
@@ -442,7 +450,10 @@ def __expand_dynamic_values(self, name, value):
         # Convert lists / values so we can watch for any changes on them
         if (isinstance(value, (list, tuple)) and
                 not isinstance(value, BaseList)):
-            value = BaseList(value, self, name)
+            if issubclass(type(self), EmbeddedDocumentListField):
+                value = EmbeddedDocumentList(value, self, name)
+            else:
+                value = BaseList(value, self, name)
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
             value = BaseDict(value, self, name)
 
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 359ea6d2a..aa16804e6 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -9,7 +9,9 @@
 from mongoengine.errors import ValidationError
 
 from mongoengine.base.common import ALLOW_INHERITANCE
-from mongoengine.base.datastructures import BaseDict, BaseList
+from mongoengine.base.datastructures import (
+    BaseDict, BaseList, EmbeddedDocumentList
+)
 
 __all__ = ("BaseField", "ComplexBaseField",
            "ObjectIdField", "GeoJsonBaseField")
@@ -210,6 +212,7 @@ def __get__(self, instance, owner):
 
         ReferenceField = _import_class('ReferenceField')
         GenericReferenceField = _import_class('GenericReferenceField')
+        EmbeddedDocumentListField = _import_class('EmbeddedDocumentListField')
         dereference = (self._auto_dereference and
                        (self.field is None or isinstance(self.field,
                                                          (GenericReferenceField, ReferenceField))))
@@ -226,9 +229,12 @@ def __get__(self, instance, owner):
         value = super(ComplexBaseField, self).__get__(instance, owner)
 
         # Convert lists / values so we can watch for any changes on them
-        if (isinstance(value, (list, tuple)) and
-                not isinstance(value, BaseList)):
-            value = BaseList(value, instance, self.name)
+        if isinstance(value, (list, tuple)):
+            if (issubclass(type(self), EmbeddedDocumentListField) and
+                    not isinstance(value, EmbeddedDocumentList)):
+                value = EmbeddedDocumentList(value, instance, self.name)
+            elif not isinstance(value, BaseList):
+                value = BaseList(value, instance, self.name)
             instance._data[self.name] = value
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
             value = BaseDict(value, instance, self.name)
diff --git a/mongoengine/common.py b/mongoengine/common.py
index 7c0c18d2e..3e63e98ee 100644
--- a/mongoengine/common.py
+++ b/mongoengine/common.py
@@ -1,4 +1,5 @@
 _class_registry_cache = {}
+_field_list_cache = []
 
 
 def _import_class(cls_name):
@@ -20,13 +21,16 @@ class from the :data:`mongoengine.common._class_registry_cache`.
 
     doc_classes = ('Document', 'DynamicEmbeddedDocument', 'EmbeddedDocument',
                    'MapReduceDocument')
-    field_classes = ('DictField', 'DynamicField', 'EmbeddedDocumentField',
-                     'FileField', 'GenericReferenceField',
-                     'GenericEmbeddedDocumentField', 'GeoPointField',
-                     'PointField', 'LineStringField', 'ListField',
-                     'PolygonField', 'ReferenceField', 'StringField',
-                     'CachedReferenceField',
-                     'ComplexBaseField', 'GeoJsonBaseField')
+
+    # Field Classes
+    if not _field_list_cache:
+        from mongoengine.fields import __all__ as fields
+        _field_list_cache.extend(fields)
+        from mongoengine.base.fields import __all__ as fields
+        _field_list_cache.extend(fields)
+
+    field_classes = _field_list_cache
+
     queryset_classes = ('OperationError',)
     deref_classes = ('DeReference',)
 
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index a22e3473e..415d56782 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -1,6 +1,9 @@
 from bson import DBRef, SON
 
-from base import (BaseDict, BaseList, TopLevelDocumentMetaclass, get_document)
+from base import (
+    BaseDict, BaseList, EmbeddedDocumentList,
+    TopLevelDocumentMetaclass, get_document
+)
 from fields import (ReferenceField, ListField, DictField, MapField)
 from connection import get_db
 from queryset import QuerySet
@@ -189,6 +192,9 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
 
         if not hasattr(items, 'items'):
             is_list = True
+            list_type = BaseList
+            if isinstance(items, EmbeddedDocumentList):
+                list_type = EmbeddedDocumentList
             as_tuple = isinstance(items, tuple)
             iterator = enumerate(items)
             data = []
@@ -225,7 +231,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
 
         if instance and name:
             if is_list:
-                return tuple(data) if as_tuple else BaseList(data, instance, name)
+                return tuple(data) if as_tuple else list_type(data, instance, name)
             return BaseDict(data, instance, name)
         depth += 1
         return data
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 03318c849..5b1b313d9 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -9,9 +9,16 @@
 from bson.dbref import DBRef
 from mongoengine import signals
 from mongoengine.common import _import_class
-from mongoengine.base import (DocumentMetaclass, TopLevelDocumentMetaclass,
-                              BaseDocument, BaseDict, BaseList,
-                              ALLOW_INHERITANCE, get_document)
+from mongoengine.base import (
+    DocumentMetaclass,
+    TopLevelDocumentMetaclass,
+    BaseDocument,
+    BaseDict,
+    BaseList,
+    EmbeddedDocumentList,
+    ALLOW_INHERITANCE,
+    get_document
+)
 from mongoengine.errors import ValidationError, InvalidQueryError, InvalidDocumentError
 from mongoengine.queryset import (OperationError, NotUniqueError,
                                   QuerySet, transform)
@@ -76,6 +83,12 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not self.__eq__(other)
 
+    def save(self, *args, **kwargs):
+        self._instance.save(*args, **kwargs)
+
+    def reload(self, *args, **kwargs):
+        self._instance.reload(*args, **kwargs)
+
 
 class Document(BaseDocument):
 
@@ -560,6 +573,9 @@ def _reload(self, key, value):
         if isinstance(value, BaseDict):
             value = [(k, self._reload(k, v)) for k, v in value.items()]
             value = BaseDict(value, self, key)
+        elif isinstance(value, EmbeddedDocumentList):
+            value = [self._reload(key, v) for v in value]
+            value = EmbeddedDocumentList(value, self, key)
         elif isinstance(value, BaseList):
             value = [self._reload(key, v) for v in value]
             value = BaseList(value, self, key)
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index cfe66a48d..9d66774ed 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -39,13 +39,13 @@
     'FloatField', 'DecimalField', 'BooleanField', 'DateTimeField',
     'ComplexDateTimeField', 'EmbeddedDocumentField', 'ObjectIdField',
     'GenericEmbeddedDocumentField', 'DynamicField', 'ListField',
-    'SortedListField', 'DictField', 'MapField', 'ReferenceField',
-    'CachedReferenceField', 'GenericReferenceField', 'BinaryField',
-    'GridFSError', 'GridFSProxy', 'FileField', 'ImageGridFsProxy',
-    'ImproperlyConfigured', 'ImageField', 'GeoPointField', 'PointField',
-    'LineStringField', 'PolygonField', 'SequenceField', 'UUIDField',
-    'MultiPointField', 'MultiLineStringField', 'MultiPolygonField',
-    'GeoJsonBaseField']
+    'SortedListField', 'EmbeddedDocumentListField', 'DictField',
+    'MapField', 'ReferenceField', 'CachedReferenceField',
+    'GenericReferenceField', 'BinaryField', 'GridFSError', 'GridFSProxy',
+    'FileField', 'ImageGridFsProxy', 'ImproperlyConfigured', 'ImageField',
+    'GeoPointField', 'PointField', 'LineStringField', 'PolygonField',
+    'SequenceField', 'UUIDField', 'MultiPointField', 'MultiLineStringField',
+    'MultiPolygonField', 'GeoJsonBaseField']
 
 
 RECURSIVE_REFERENCE_CONSTANT = 'self'
@@ -728,6 +728,32 @@ def prepare_query_value(self, op, value):
         return super(ListField, self).prepare_query_value(op, value)
 
 
+class EmbeddedDocumentListField(ListField):
+    """A :class:`~mongoengine.ListField` designed specially to hold a list of
+    embedded documents to provide additional query helpers.
+
+    .. note::
+        The only valid list values are subclasses of
+        :class:`~mongoengine.EmbeddedDocument`.
+
+    .. versionadded:: 0.9
+
+    """
+
+    def __init__(self, document_type, *args, **kwargs):
+        """
+        :param document_type: The type of
+         :class:`~mongoengine.EmbeddedDocument` the list will hold.
+        :param args: Arguments passed directly into the parent
+         :class:`~mongoengine.ListField`.
+        :param kwargs: Keyword arguments passed directly into the parent
+         :class:`~mongoengine.ListField`.
+        """
+        super(EmbeddedDocumentListField, self).__init__(
+            field=EmbeddedDocumentField(document_type), **kwargs
+        )
+
+
 class SortedListField(ListField):
 
     """A ListField that sorts the contents of its list before writing to
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 8e957c683..64898995f 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -18,11 +18,11 @@
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.base import _document_registry
-from mongoengine.base.datastructures import BaseDict
+from mongoengine.base.datastructures import BaseDict, EmbeddedDocumentList
 from mongoengine.errors import NotRegistered
 from mongoengine.python_support import PY3, b, bin_type
 
-__all__ = ("FieldTest", )
+__all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")
 
 
 class FieldTest(unittest.TestCase):
@@ -3159,5 +3159,473 @@ def test():
 
         self.assertRaises(FieldDoesNotExist, test)
 
+
+class EmbeddedDocumentListFieldTestCase(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        cls.db = connect(db='EmbeddedDocumentListFieldTestCase')
+
+        class Comments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
+
+        class BlogPost(Document):
+            comments = EmbeddedDocumentListField(Comments)
+
+        cls.Comments = Comments
+        cls.BlogPost = BlogPost
+
+    def setUp(self):
+        """
+        Create two BlogPost entries in the database, each with
+        several EmbeddedDocuments.
+        """
+        self.post1 = self.BlogPost(comments=[
+            self.Comments(author='user1', message='message1'),
+            self.Comments(author='user2', message='message1')
+        ]).save()
+
+        self.post2 = self.BlogPost(comments=[
+            self.Comments(author='user2', message='message2'),
+            self.Comments(author='user2', message='message3'),
+            self.Comments(author='user3', message='message1')
+        ]).save()
+
+    def tearDown(self):
+        self.BlogPost.drop_collection()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.db.drop_database('EmbeddedDocumentListFieldTestCase')
+
+    def test_no_keyword_filter(self):
+        """
+        Tests the filter method of a List of Embedded Documents
+        with a no keyword.
+        """
+        filtered = self.post1.comments.filter()
+
+        # Ensure nothing was changed
+        # < 2.6 Incompatible >
+        # self.assertListEqual(filtered, self.post1.comments)
+        self.assertEqual(filtered, self.post1.comments)
+
+    def test_single_keyword_filter(self):
+        """
+        Tests the filter method of a List of Embedded Documents
+        with a single keyword.
+        """
+        filtered = self.post1.comments.filter(author='user1')
+
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(filtered), 1)
+
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(filtered[0].author, 'user1')
+
+    def test_multi_keyword_filter(self):
+        """
+        Tests the filter method of a List of Embedded Documents
+        with multiple keywords.
+        """
+        filtered = self.post2.comments.filter(
+            author='user2', message='message2'
+        )
+
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(filtered), 1)
+
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(filtered[0].author, 'user2')
+        self.assertEqual(filtered[0].message, 'message2')
+
+    def test_chained_filter(self):
+        """
+        Tests chained filter methods of a List of Embedded Documents
+        """
+        filtered = self.post2.comments.filter(author='user2').filter(
+            message='message2'
+        )
+
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(filtered), 1)
+
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(filtered[0].author, 'user2')
+        self.assertEqual(filtered[0].message, 'message2')
+
+    def test_unknown_keyword_filter(self):
+        """
+        Tests the filter method of a List of Embedded Documents
+        when the keyword is not a known keyword.
+        """
+        # < 2.6 Incompatible >
+        # with self.assertRaises(AttributeError):
+        #    self.post2.comments.filter(year=2)
+        self.assertRaises(AttributeError, self.post2.comments.filter, year=2)
+
+    def test_no_keyword_exclude(self):
+        """
+        Tests the exclude method of a List of Embedded Documents
+        with a no keyword.
+        """
+        filtered = self.post1.comments.exclude()
+
+        # Ensure everything was removed
+        # < 2.6 Incompatible >
+        # self.assertListEqual(filtered, [])
+        self.assertEqual(filtered, [])
+
+    def test_single_keyword_exclude(self):
+        """
+        Tests the exclude method of a List of Embedded Documents
+        with a single keyword.
+        """
+        excluded = self.post1.comments.exclude(author='user1')
+
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(excluded), 1)
+
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(excluded[0].author, 'user2')
+
+    def test_multi_keyword_exclude(self):
+        """
+        Tests the exclude method of a List of Embedded Documents
+        with multiple keywords.
+        """
+        excluded = self.post2.comments.exclude(
+            author='user3', message='message1'
+        )
+
+        # Ensure only 2 entries were returned.
+        self.assertEqual(len(excluded), 2)
+
+        # Ensure the entries returned are the correct entries.
+        self.assertEqual(excluded[0].author, 'user2')
+        self.assertEqual(excluded[1].author, 'user2')
+
+    def test_non_matching_exclude(self):
+        """
+        Tests the exclude method of a List of Embedded Documents
+        when the keyword does not match any entries.
+        """
+        excluded = self.post2.comments.exclude(author='user4')
+
+        # Ensure the 3 entries still exist.
+        self.assertEqual(len(excluded), 3)
+
+    def test_unknown_keyword_exclude(self):
+        """
+        Tests the exclude method of a List of Embedded Documents
+        when the keyword is not a known keyword.
+        """
+        # < 2.6 Incompatible >
+        # with self.assertRaises(AttributeError):
+        #    self.post2.comments.exclude(year=2)
+        self.assertRaises(AttributeError, self.post2.comments.exclude, year=2)
+
+    def test_chained_filter_exclude(self):
+        """
+        Tests the exclude method after a filter method of a List of
+        Embedded Documents.
+        """
+        excluded = self.post2.comments.filter(author='user2').exclude(
+            message='message2'
+        )
+
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(excluded), 1)
+
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(excluded[0].author, 'user2')
+        self.assertEqual(excluded[0].message, 'message3')
+
+    def test_count(self):
+        """
+        Tests the count method of a List of Embedded Documents.
+        """
+        self.assertEqual(self.post1.comments.count(), 2)
+        self.assertEqual(self.post1.comments.count(), len(self.post1.comments))
+
+    def test_filtered_count(self):
+        """
+        Tests the filter + count method of a List of Embedded Documents.
+        """
+        count = self.post1.comments.filter(author='user1').count()
+        self.assertEqual(count, 1)
+
+    def test_single_keyword_get(self):
+        """
+        Tests the get method of a List of Embedded Documents using a
+        single keyword.
+        """
+        comment = self.post1.comments.get(author='user1')
+
+        # < 2.6 Incompatible >
+        # self.assertIsInstance(comment, self.Comments)
+        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertEqual(comment.author, 'user1')
+
+    def test_multi_keyword_get(self):
+        """
+        Tests the get method of a List of Embedded Documents using
+        multiple keywords.
+        """
+        comment = self.post2.comments.get(author='user2', message='message2')
+
+        # < 2.6 Incompatible >
+        # self.assertIsInstance(comment, self.Comments)
+        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertEqual(comment.author, 'user2')
+        self.assertEqual(comment.message, 'message2')
+
+    def test_no_keyword_multiple_return_get(self):
+        """
+        Tests the get method of a List of Embedded Documents without
+        a keyword to return multiple documents.
+        """
+        # < 2.6 Incompatible >
+        # with self.assertRaises(MultipleObjectsReturned):
+        #    self.post1.comments.get()
+        self.assertRaises(MultipleObjectsReturned, self.post1.comments.get)
+
+    def test_keyword_multiple_return_get(self):
+        """
+        Tests the get method of a List of Embedded Documents with a keyword
+        to return multiple documents.
+        """
+        # < 2.6 Incompatible >
+        # with self.assertRaises(MultipleObjectsReturned):
+        #    self.post2.comments.get(author='user2')
+        self.assertRaises(
+            MultipleObjectsReturned, self.post2.comments.get, author='user2'
+        )
+
+    def test_unknown_keyword_get(self):
+        """
+        Tests the get method of a List of Embedded Documents with an
+        unknown keyword.
+        """
+        # < 2.6 Incompatible >
+        # with self.assertRaises(AttributeError):
+        #    self.post2.comments.get(year=2020)
+        self.assertRaises(AttributeError, self.post2.comments.get, year=2020)
+
+    def test_no_result_get(self):
+        """
+        Tests the get method of a List of Embedded Documents where get
+        returns no results.
+        """
+        # < 2.6 Incompatible >
+        # with self.assertRaises(DoesNotExist):
+        #    self.post1.comments.get(author='user3')
+        self.assertRaises(
+            DoesNotExist, self.post1.comments.get, author='user3'
+        )
+
+    def test_first(self):
+        """
+        Tests the first method of a List of Embedded Documents to
+        ensure it returns the first comment.
+        """
+        comment = self.post1.comments.first()
+
+        # Ensure a Comment object was returned.
+        # < 2.6 Incompatible >
+        # self.assertIsInstance(comment, self.Comments)
+        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertEqual(comment, self.post1.comments[0])
+
+    def test_create(self):
+        """
+        Test the create method of a List of Embedded Documents.
+        """
+        comment = self.post1.comments.create(
+            author='user4', message='message1'
+        )
+        self.post1.save()
+
+        # Ensure the returned value is the comment object.
+        # < 2.6 Incompatible >
+        # self.assertIsInstance(comment, self.Comments)
+        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertEqual(comment.author, 'user4')
+        self.assertEqual(comment.message, 'message1')
+
+        # Ensure the new comment was actually saved to the database.
+        # < 2.6 Incompatible >
+        # self.assertIn(
+        #    comment,
+        #    self.BlogPost.objects(comments__author='user4')[0].comments
+        # )
+        self.assertTrue(
+            comment in self.BlogPost.objects(
+                comments__author='user4'
+            )[0].comments
+        )
+
+    def test_filtered_create(self):
+        """
+        Test the create method of a List of Embedded Documents chained
+        to a call to the filter method. Filtering should have no effect
+        on creation.
+        """
+        comment = self.post1.comments.filter(author='user1').create(
+            author='user4', message='message1'
+        )
+        self.post1.save()
+
+        # Ensure the returned value is the comment object.
+        # < 2.6 Incompatible >
+        # self.assertIsInstance(comment, self.Comments)
+        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertEqual(comment.author, 'user4')
+        self.assertEqual(comment.message, 'message1')
+
+        # Ensure the new comment was actually saved to the database.
+        # < 2.6 Incompatible >
+        # self.assertIn(
+        #    comment,
+        #    self.BlogPost.objects(comments__author='user4')[0].comments
+        # )
+        self.assertTrue(
+            comment in self.BlogPost.objects(
+                comments__author='user4'
+            )[0].comments
+        )
+
+    def test_no_keyword_update(self):
+        """
+        Tests the update method of a List of Embedded Documents with
+        no keywords.
+        """
+        original = list(self.post1.comments)
+        number = self.post1.comments.update()
+        self.post1.save()
+
+        # Ensure that nothing was altered.
+        # < 2.6 Incompatible >
+        # self.assertIn(
+        #    original[0],
+        #    self.BlogPost.objects(id=self.post1.id)[0].comments
+        # )
+        self.assertTrue(
+            original[0] in self.BlogPost.objects(id=self.post1.id)[0].comments
+        )
+
+        # < 2.6 Incompatible >
+        # self.assertIn(
+        #    original[1],
+        #    self.BlogPost.objects(id=self.post1.id)[0].comments
+        # )
+        self.assertTrue(
+            original[1] in self.BlogPost.objects(id=self.post1.id)[0].comments
+        )
+
+        # Ensure the method returned 0 as the number of entries
+        # modified
+        self.assertEqual(number, 0)
+
+    def test_single_keyword_update(self):
+        """
+        Tests the update method of a List of Embedded Documents with
+        a single keyword.
+        """
+        number = self.post1.comments.update(author='user4')
+        self.post1.save()
+
+        comments = self.BlogPost.objects(id=self.post1.id)[0].comments
+
+        # Ensure that the database was updated properly.
+        self.assertEqual(comments[0].author, 'user4')
+        self.assertEqual(comments[1].author, 'user4')
+
+        # Ensure the method returned 2 as the number of entries
+        # modified
+        self.assertEqual(number, 2)
+
+    def test_save(self):
+        """
+        Tests the save method of a List of Embedded Documents.
+        """
+        comments = self.post1.comments
+        new_comment = self.Comments(author='user4')
+        comments.append(new_comment)
+        comments.save()
+
+        # Ensure that the new comment has been added to the database.
+        # < 2.6 Incompatible >
+        # self.assertIn(
+        #    new_comment,
+        #    self.BlogPost.objects(id=self.post1.id)[0].comments
+        # )
+        self.assertTrue(
+            new_comment in self.BlogPost.objects(id=self.post1.id)[0].comments
+        )
+
+    def test_delete(self):
+        """
+        Tests the delete method of a List of Embedded Documents.
+        """
+        number = self.post1.comments.delete()
+        self.post1.save()
+
+        # Ensure that all the comments under post1 were deleted in the
+        # database.
+        # < 2.6 Incompatible >
+        # self.assertListEqual(
+        #    self.BlogPost.objects(id=self.post1.id)[0].comments, []
+        # )
+        self.assertEqual(
+            self.BlogPost.objects(id=self.post1.id)[0].comments, []
+        )
+
+        # Ensure that post1 comments were deleted from the list.
+        # < 2.6 Incompatible >
+        # self.assertListEqual(self.post1.comments, [])
+        self.assertEqual(self.post1.comments, [])
+
+        # Ensure that comments still returned a EmbeddedDocumentList object.
+        # < 2.6 Incompatible >
+        # self.assertIsInstance(self.post1.comments, EmbeddedDocumentList)
+        self.assertTrue(isinstance(self.post1.comments, EmbeddedDocumentList))
+
+        # Ensure that the delete method returned 2 as the number of entries
+        # deleted from the database
+        self.assertEqual(number, 2)
+
+    def test_filtered_delete(self):
+        """
+        Tests the delete method of a List of Embedded Documents
+        after the filter method has been called.
+        """
+        comment = self.post1.comments[1]
+        number = self.post1.comments.filter(author='user2').delete()
+        self.post1.save()
+
+        # Ensure that only the user2 comment was deleted.
+        # < 2.6 Incompatible >
+        # self.assertNotIn(
+        #     comment, self.BlogPost.objects(id=self.post1.id)[0].comments
+        # )
+        self.assertTrue(
+            comment not in self.BlogPost.objects(id=self.post1.id)[0].comments
+        )
+        self.assertEqual(
+            len(self.BlogPost.objects(id=self.post1.id)[0].comments), 1
+        )
+
+        # Ensure that the user2 comment no longer exists in the list.
+        # < 2.6 Incompatible >
+        # self.assertNotIn(comment, self.post1.comments)
+        self.assertTrue(comment not in self.post1.comments)
+        self.assertEqual(len(self.post1.comments), 1)
+
+        # Ensure that the delete method returned 1 as the number of entries
+        # deleted from the database
+        self.assertEqual(number, 1)
+
 if __name__ == '__main__':
     unittest.main()

From 47f995bda3dd3525478b4743443ba2dc9b553e65 Mon Sep 17 00:00:00 2001
From: Vladimir Rutsky <rutsky@users.noreply.github.com>
Date: Fri, 20 Feb 2015 19:41:20 +0300
Subject: [PATCH 0070/1519] fix typo: "a the structure" -> "the structure"

---
 docs/tutorial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 0c592a0d6..311d2888e 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -65,7 +65,7 @@ which fields a :class:`User` may have, and what types of data they might store::
         first_name = StringField(max_length=50)
         last_name = StringField(max_length=50)
 
-This looks similar to how a the structure of a table would be defined in a
+This looks similar to how the structure of a table would be defined in a
 regular ORM. The key difference is that this schema will never be passed on to
 MongoDB --- this will only be enforced at the application level, making future
 changes easy to manage. Also, the User documents will be stored in a

From 4ae60da58dff1542c0ce8bc10c62cb4cfbecea5d Mon Sep 17 00:00:00 2001
From: Vladimir Rutsky <rutsky@users.noreply.github.com>
Date: Fri, 20 Feb 2015 19:59:36 +0300
Subject: [PATCH 0071/1519] fix reference format: "attr:`auto_create_index`"

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 03318c849..c46e4e18f 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -113,7 +113,7 @@ class Document(BaseDocument):
     a **+** or **-** sign.
 
     Automatic index creation can be disabled by specifying
-    attr:`auto_create_index` in the :attr:`meta` dictionary. If this is set to
+    :attr:`auto_create_index` in the :attr:`meta` dictionary. If this is set to
     False then indexes will not be created by MongoEngine.  This is useful in
     production systems where index creation is performed as part of a
     deployment system.

From e5986e0ae20424c1b97c540ec5cbe630f364b99b Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Fri, 27 Feb 2015 11:18:09 +0200
Subject: [PATCH 0072/1519] Use dict.pop() default argument instead of checking
 if the key exists ourselves.

---
 mongoengine/base/document.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 6bf38ee21..07b0a1402 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -411,8 +411,7 @@ def to_json(self, *args, **kwargs):
         """Converts a document to JSON.
         :param use_db_field: Set to True by default but enables the output of the json structure with the field names and not the mongodb store db_names in case of set to False
         """
-        use_db_field = kwargs.pop('use_db_field') if kwargs.has_key(
-            'use_db_field') else True
+        use_db_field = kwargs.pop('use_db_field', True)
         return json_util.dumps(self.to_mongo(use_db_field),  *args, **kwargs)
 
     @classmethod

From 4bd72ebc636c84f2c92ffe0e8e8f7dfbe43e4b19 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Fri, 27 Feb 2015 11:32:06 +0200
Subject: [PATCH 0073/1519] Use None instead of mutable arguments.

---
 mongoengine/base/document.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 6bf38ee21..5bc848f5b 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -297,10 +297,13 @@ def get_text_score(self):
 
         return self._data['_text_score']
 
-    def to_mongo(self, use_db_field=True, fields=[]):
+    def to_mongo(self, use_db_field=True, fields=None):
         """
         Return as SON data ready for use with MongoDB.
         """
+        if not fields:
+            fields = []
+        
         data = SON()
         data["_id"] = None
         data['_cls'] = self._class_name
@@ -652,9 +655,11 @@ def _get_collection_name(cls):
         return cls._meta.get('collection', None)
 
     @classmethod
-    def _from_son(cls, son, _auto_dereference=True, only_fields=[], created=False):
+    def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False):
         """Create an instance of a Document (subclass) from a PyMongo SON.
         """
+        if not only_fields:
+            only_fields = []
 
         # get the class name from the document, falling back to the given
         # class if unavailable

From 9ae2c731ed075929b6046b699a2cc355d03ff0a6 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 3 Mar 2015 14:30:09 -0800
Subject: [PATCH 0074/1519] dont drop any system collections

---
 mongoengine/django/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/django/tests.py b/mongoengine/django/tests.py
index d7fc3939d..b130acc82 100644
--- a/mongoengine/django/tests.py
+++ b/mongoengine/django/tests.py
@@ -23,7 +23,7 @@ def __init__(self, methodName='runtest'):
 
     def dropCollections(self):
         for collection in self.db.collection_names():
-            if collection == 'system.indexes':
+            if collection.startswith('system.'):
                 continue
             self.db.drop_collection(collection)
 

From 82a9e43b6f0ee4b29c2bf6801008a9a3e62ec386 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Wed, 18 Mar 2015 10:34:46 +0000
Subject: [PATCH 0075/1519] Updated travis build

Fixed pymongo versions to 2.7.2 and 2.8
The dev build for pymongo is the master branch which points to the new 3.0 driver.
Support for 3.0 will need to be added separately in the future as its a major version change and
will contain some backwards breaking changes
---
 .travis.yml | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2d03faecc..e8e6eec24 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,33 +9,25 @@ python:
     - "pypy"
     - "pypy3"
 env:
-  - PYMONGO=dev DJANGO=dev
-  - PYMONGO=dev DJANGO=1.7.1
-  - PYMONGO=dev DJANGO=1.6.8
-  - PYMONGO=dev DJANGO=1.5.11
-  - PYMONGO=2.7.1 DJANGO=dev
-  - PYMONGO=2.7.1 DJANGO=1.7.1
-  - PYMONGO=2.7.1 DJANGO=1.6.8
-  - PYMONGO=2.7.1 DJANGO=1.5.11
   - PYMONGO=2.7.2 DJANGO=dev
   - PYMONGO=2.7.2 DJANGO=1.7.1
   - PYMONGO=2.7.2 DJANGO=1.6.8
   - PYMONGO=2.7.2 DJANGO=1.5.11
+  - PYMONGO=2.8 DJANGO=dev
+  - PYMONGO=2.8 DJANGO=1.7.1
+  - PYMONGO=2.8 DJANGO=1.6.8
+  - PYMONGO=2.8 DJANGO=1.5.11
 
 matrix:
     exclude:
-        - python: "2.6"
-          env: PYMONGO=dev DJANGO=dev
-        - python: "2.6"
-          env: PYMONGO=2.7.1 DJANGO=dev
         - python: "2.6"
           env: PYMONGO=2.7.2 DJANGO=dev
         - python: "2.6"
-          env: PYMONGO=dev DJANGO=1.7.1
-        - python: "2.6"
-          env: PYMONGO=2.7.1 DJANGO=1.7.1
+          env: PYMONGO=2.8 DJANGO=dev
         - python: "2.6"
           env: PYMONGO=2.7.2 DJANGO=1.7.1
+        - python: "2.6"
+          env: PYMONGO=2.8 DJANGO=1.7.1
     allow_failures:
         - python: "pypy3"
     fast_finish: true

From bcd1841f7163d796d12d12f1bf59cc6a1b5fae63 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Mon, 23 Mar 2015 11:52:24 +0200
Subject: [PATCH 0076/1519] Enabled to release mongoengine to PyPi when
 tagging.

---
 .travis.yml | 114 ++++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 53 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e8e6eec24..474836720 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,63 +1,71 @@
-# http://travis-ci.org/#!/MongoEngine/mongoengine
 language: python
 python:
-    - "2.6"
-    - "2.7"
-    - "3.2"
-    - "3.3"
-    - "3.4"
-    - "pypy"
-    - "pypy3"
+- '2.6'
+- '2.7'
+- '3.2'
+- '3.3'
+- '3.4'
+- pypy
+- pypy3
 env:
-  - PYMONGO=2.7.2 DJANGO=dev
-  - PYMONGO=2.7.2 DJANGO=1.7.1
-  - PYMONGO=2.7.2 DJANGO=1.6.8
-  - PYMONGO=2.7.2 DJANGO=1.5.11
-  - PYMONGO=2.8 DJANGO=dev
-  - PYMONGO=2.8 DJANGO=1.7.1
-  - PYMONGO=2.8 DJANGO=1.6.8
-  - PYMONGO=2.8 DJANGO=1.5.11
-
+- PYMONGO=2.7.2 DJANGO=dev
+- PYMONGO=2.7.2 DJANGO=1.7.1
+- PYMONGO=2.7.2 DJANGO=1.6.8
+- PYMONGO=2.7.2 DJANGO=1.5.11
+- PYMONGO=2.8 DJANGO=dev
+- PYMONGO=2.8 DJANGO=1.7.1
+- PYMONGO=2.8 DJANGO=1.6.8
+- PYMONGO=2.8 DJANGO=1.5.11
 matrix:
-    exclude:
-        - python: "2.6"
-          env: PYMONGO=2.7.2 DJANGO=dev
-        - python: "2.6"
-          env: PYMONGO=2.8 DJANGO=dev
-        - python: "2.6"
-          env: PYMONGO=2.7.2 DJANGO=1.7.1
-        - python: "2.6"
-          env: PYMONGO=2.8 DJANGO=1.7.1
-    allow_failures:
-        - python: "pypy3"
-    fast_finish: true
-
+  exclude:
+  - python: '2.6'
+    env: PYMONGO=2.7.2 DJANGO=dev
+  - python: '2.6'
+    env: PYMONGO=2.8 DJANGO=dev
+  - python: '2.6'
+    env: PYMONGO=2.7.2 DJANGO=1.7.1
+  - python: '2.6'
+    env: PYMONGO=2.8 DJANGO=1.7.1
+  allow_failures:
+  - python: pypy3
+  fast_finish: true
 before_install:
-  - "travis_retry sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10"
-  - "echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list"
-  - "travis_retry sudo apt-get update"
-  - "travis_retry sudo apt-get install mongodb-org-server"
-
+- travis_retry sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
+- echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' |
+  sudo tee /etc/apt/sources.list.d/mongodb.list
+- travis_retry sudo apt-get update
+- travis_retry sudo apt-get install mongodb-org-server
 install:
-    - sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev python-tk
-    - if [[ $PYMONGO == 'dev' ]]; then travis_retry pip install https://github.com/mongodb/mongo-python-driver/tarball/master; true; fi
-    - if [[ $PYMONGO != 'dev' ]]; then travis_retry pip install pymongo==$PYMONGO; true; fi
-    - if [[ $DJANGO == 'dev' ]]; then travis_retry pip install git+https://github.com/django/django.git; fi
-    - if [[ $DJANGO != 'dev' ]]; then travis_retry pip install Django==$DJANGO; fi
-    - travis_retry pip install https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.1.tar.gz#md5=1534bb15cf311f07afaa3aacba1c028b
-    - travis_retry pip install coveralls
-    - travis_retry python setup.py install
-
+- sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev
+  libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
+  python-tk
+- if [[ $PYMONGO == 'dev' ]]; then travis_retry pip install https://github.com/mongodb/mongo-python-driver/tarball/master;
+  true; fi
+- if [[ $PYMONGO != 'dev' ]]; then travis_retry pip install pymongo==$PYMONGO; true;
+  fi
+- if [[ $DJANGO == 'dev' ]]; then travis_retry pip install git+https://github.com/django/django.git;
+  fi
+- if [[ $DJANGO != 'dev' ]]; then travis_retry pip install Django==$DJANGO; fi
+- travis_retry pip install https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.1.tar.gz#md5=1534bb15cf311f07afaa3aacba1c028b
+- travis_retry pip install coveralls
+- travis_retry python setup.py install
 script:
-    - travis_retry python setup.py test
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]]; then 2to3 . -w; fi;
-    - coverage run --source=mongoengine setup.py test
-    - coverage report -m
-    - python benchmark.py
-after_script:
-  coveralls --verbose
+- travis_retry python setup.py test
+- if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]]; then 2to3 . -w; fi;
+- coverage run --source=mongoengine setup.py test
+- coverage report -m
+- python benchmark.py
+after_script: coveralls --verbose
 notifications:
-  irc: "irc.freenode.org#mongoengine"
+  irc: irc.freenode.org#mongoengine
 branches:
   only:
-    - master
+  - master
+deploy:
+  provider: pypi
+  user: the_drow
+  password:
+    secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
+  on:
+    tags: true
+    repo: MongoEngine/mongoengine

From 2d075c4dd6e9ca8661b073c024502955391aa38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Wed, 30 Jul 2014 10:55:52 +0200
Subject: [PATCH 0077/1519] Added test for new_file after saved as none. #714

---
 tests/fields/file_tests.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 7ae53e8a3..811f17edd 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -114,6 +114,42 @@ class StreamFile(Document):
         # Ensure deleted file returns None
         self.assertTrue(result.the_file.read() == None)
 
+    def test_file_fields_stream_after_none(self):
+        """Ensure that a file field can be written to after it has been saved as
+        None
+        """
+        class StreamFile(Document):
+            the_file = FileField()
+
+        StreamFile.drop_collection()
+
+        text = b('Hello, World!')
+        more_text = b('Foo Bar')
+        content_type = 'text/plain'
+
+        streamfile = StreamFile()
+        streamfile.save()
+        streamfile.the_file.new_file()
+        streamfile.the_file.write(text)
+        streamfile.the_file.write(more_text)
+        streamfile.the_file.close()
+        streamfile.save()
+
+        result = StreamFile.objects.first()
+        self.assertTrue(streamfile == result)
+        self.assertEqual(result.the_file.read(), text + more_text)
+        #self.assertEqual(result.the_file.content_type, content_type)
+        result.the_file.seek(0)
+        self.assertEqual(result.the_file.tell(), 0)
+        self.assertEqual(result.the_file.read(len(text)), text)
+        self.assertEqual(result.the_file.tell(), len(text))
+        self.assertEqual(result.the_file.read(len(more_text)), more_text)
+        self.assertEqual(result.the_file.tell(), len(text + more_text))
+        result.the_file.delete()
+
+        # Ensure deleted file returns None
+        self.assertTrue(result.the_file.read() == None)
+
     def test_file_fields_set(self):
 
         class SetFile(Document):

From ce2b148dd2ddd4c64a764debc89f07d776ca8e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Wed, 30 Jul 2014 11:00:04 +0200
Subject: [PATCH 0078/1519] Fixes #714

---
 mongoengine/fields.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 3c4d3f276..3c1db4ac3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1357,6 +1357,7 @@ def get(self, id=None):
     def new_file(self, **kwargs):
         self.newfile = self.fs.new_file(**kwargs)
         self.grid_id = self.newfile._id
+        self._mark_as_changed()
 
     def put(self, file_obj, **kwargs):
         if self.grid_id:

From d13552208717c8a573be0818a05e0c1d9ec5e5a6 Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Mon, 23 Mar 2015 15:46:12 +0200
Subject: [PATCH 0079/1519] Adding #714 to changelog and AUTHORS

---
 AUTHORS            | 1 +
 docs/changelog.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 0ed0e0b50..446a34735 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -217,3 +217,4 @@ that much better:
  * Diego Berrocal (https://github.com/cestdiego)
  * Matthew Ellison (https://github.com/seglberg)
  * Jimmy Shen (https://github.com/jimmyshen)
+ * J. Fernando Sánchez (https://github.com/balkian)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9aa6aa3a2..59398339d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Update FileField when creating a new file #714
 - Added `EmbeddedDocumentListField` for Lists of Embedded Documents. #826
 - ComplexDateTimeField should fall back to None when null=True #864
 - Request Support for $min, $max Field update operators #863

From c888e461ba290098006131c9a2bd1e2caff74874 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Tue, 24 Mar 2015 17:09:26 +0000
Subject: [PATCH 0080/1519] Updated travis.yml to build release tags

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 474836720..38b72cc9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,6 +61,7 @@ notifications:
 branches:
   only:
   - master
+  - /^v.*$/
 deploy:
   provider: pypi
   user: the_drow

From cbd2a44350a83eaf06e5aa23cf813ab5460d5395 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Sat, 28 Mar 2015 11:34:22 +0300
Subject: [PATCH 0081/1519] Changed an invalid classifier to a valid one.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index f0819fbbf..88519788e 100644
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ def get_version(version_tuple):
     'Operating System :: OS Independent',
     'Programming Language :: Python',
     "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.6.6",
+    "Programming Language :: Python :: 2.6",
     "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.2",

From de0e5583a558238386043ebc25e3863a32190f51 Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Sun, 29 Mar 2015 09:28:26 +0300
Subject: [PATCH 0082/1519] Fix #595: Support += and *= for ListField

---
 docs/changelog.rst                 |  4 ++++
 mongoengine/base/datastructures.py |  8 ++++++++
 tests/fields/fields.py             | 12 ++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 59398339d..8f5904b89 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,10 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Support += and *= for ListField #595
+
+Changes in 0.9.0
+================
 - Update FileField when creating a new file #714
 - Added `EmbeddedDocumentListField` for Lists of Embedded Documents. #826
 - ComplexDateTimeField should fall back to None when null=True #864
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index bac67ddca..c9feb71a1 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -156,6 +156,14 @@ def __setstate__(self, state):
         self = state
         return self
 
+    def __iadd__(self, other):
+        self._mark_as_changed()
+        return super(BaseList, self).__iadd__(other)
+
+    def __imul__(self, other):
+        self._mark_as_changed()
+        return super(BaseList, self).__imul__(other)
+
     def append(self, *args, **kwargs):
         self._mark_as_changed()
         return super(BaseList, self).append(*args, **kwargs)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 64898995f..5e7f34b58 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -946,6 +946,18 @@ class BlogPost(Document):
             BlogPost.objects.filter(info__0__test__exact='5').count(), 0)
         self.assertEqual(
             BlogPost.objects.filter(info__100__test__exact='test').count(), 0)
+
+        post = BlogPost()
+        post.info = ['1', '2']
+        post.save()
+        post = BlogPost.objects(info=['1', '2']).get()
+        post.info += ['3', '4']
+        post.save()
+        self.assertEqual(BlogPost.objects(info=['1', '2', '3', '4']).count(), 1)
+        post = BlogPost.objects(info=['1', '2', '3', '4']).get()
+        post.info *= 2
+        post.save()
+        self.assertEqual(BlogPost.objects(info=['1', '2', '3', '4', '1', '2', '3', '4']).count(), 1)
         BlogPost.drop_collection()
 
     def test_list_field_passed_in_value(self):

From bb77838b3e7f1bd98ff58bf12760c4cdb8845b86 Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Mon, 30 Mar 2015 15:28:28 +0300
Subject: [PATCH 0083/1519] fix-#914: ListField of embedded docs doesn't set
 the _instance attribute when iterating over it

---
 docs/changelog.rst                 |  1 +
 mongoengine/base/datastructures.py |  4 ++++
 tests/document/instance.py         | 16 ++++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8f5904b89..72d2b49cd 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- ListField of embedded docs doesn't set the _instance attribute when iterating over it #914
 - Support += and *= for ListField #595
 
 Changes in 0.9.0
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index c9feb71a1..3f7354a3a 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -125,6 +125,10 @@ def __getitem__(self, key, *args, **kwargs):
             value._instance = self._instance
         return value
 
+    def __iter__(self):
+        for i in xrange(self.__len__()):
+            yield self[i]
+
     def __setitem__(self, key, value, *args, **kwargs):
         if isinstance(key, slice):
             self._mark_as_changed()
diff --git a/tests/document/instance.py b/tests/document/instance.py
index eb887dced..8704bad9b 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2799,5 +2799,21 @@ class Person(Document):
         self.assertNotEqual(p, p1)
         self.assertEqual(p, p)
 
+    def test_list_iter(self):
+        # 914
+        class B(EmbeddedDocument):
+            v = StringField()
+
+        class A(Document):
+            l = ListField(EmbeddedDocumentField(B))
+
+        A.objects.delete()
+        A(l=[B(v='1'), B(v='2'), B(v='3')]).save()
+        a = A.objects.get()
+        self.assertEqual(a.l._instance, a)
+        for idx, b in enumerate(a.l):
+            self.assertEqual(b._instance, a)
+        self.assertEqual(idx, 2)
+
 if __name__ == '__main__':
     unittest.main()

From 1ce6a7f4beaee3237a01ab31c20d141815c781e4 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Wed, 8 Apr 2015 10:49:23 +0100
Subject: [PATCH 0084/1519] Update upgrade.rst

Add note to the upgrade guide about 0.8.7 bad package issue.  #919 #929
---
 docs/upgrade.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 25f67c7f2..2648c4bbc 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -2,6 +2,18 @@
 Upgrading
 #########
 
+0.9.0
+*****
+
+The 0.8.7 package on pypi was corrupted.  If upgrading from 0.8.7 to 0.9.0 please follow:
+
+.. code-block::
+
+    pip uninstall pymongo
+    pip uninstall mongoengine
+    pip install pymongo==2.8
+    pip install mongoengine
+
 0.8.7
 *****
 

From 7a749b88c7e9bcbaf083f520163f952317c713b2 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Wed, 10 Dec 2014 16:44:16 +0100
Subject: [PATCH 0085/1519] added new test like defined in issue #712 and
 changed ObjectIdField to_python() method to use a try except similar to other
 Field classes

---
 mongoengine/base/fields.py | 7 +++++--
 tests/queryset/queryset.py | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index aa16804e6..bee02879f 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -410,8 +410,11 @@ class ObjectIdField(BaseField):
     """
 
     def to_python(self, value):
-        if not isinstance(value, ObjectId):
-            value = ObjectId(value)
+        try:
+            if not isinstance(value, ObjectId):
+                value = ObjectId(value)
+        except:
+            pass
         return value
 
     def to_mongo(self, value):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 6cbac4956..5c721f0b1 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4578,6 +4578,13 @@ class ScottishCat(Cat):
         self.assertEquals(Animal.objects(folded_ears=True).count(), 1)
         self.assertEquals(Animal.objects(whiskers_length=5.1).count(), 1)
 
+    def test_loop_via_invalid_id_does_not_crash(self):
+        class Person(Document):
+            name = StringField()
+        Person.objects.delete()
+        Person._get_collection().update({"name": "a"}, {"$set": {"_id": ""}}, upsert=True)
+        for p in Person.objects():
+            self.assertEqual(p.name, 'a')
 
 if __name__ == '__main__':
     unittest.main()

From 7fff635a3f2bd4957ad406f433dc942d2acec357 Mon Sep 17 00:00:00 2001
From: Yohan Graterol <yohangraterol92@gmail.com>
Date: Wed, 8 Apr 2015 11:29:55 -0500
Subject: [PATCH 0086/1519] Remove support to PIL.

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 8bc575ee2..1d01d8b72 100644
--- a/README.rst
+++ b/README.rst
@@ -39,7 +39,7 @@ Dependencies
 Optional Dependencies
 ---------------------
 - **Django Integration:** Django>=1.4.0 for Python 2.x or PyPy and Django>=1.5.0 for Python 3.x
-- **Image Fields**: Pillow>=2.0.0 or PIL (not recommended since MongoEngine is tested with Pillow)
+- **Image Fields**: Pillow>=2.0.0
 - dateutil>=2.1.0
 
 .. note

From a6a7cba12142f58c804704572f3740869b57b4c7 Mon Sep 17 00:00:00 2001
From: Michael Chase <mikec@justyo.co>
Date: Wed, 8 Apr 2015 19:40:43 -0700
Subject: [PATCH 0087/1519] Current class fields when unpickling. Fixes #888

Optimize dereferencing map by using sets.
---
 AUTHORS                      |  1 +
 docs/changelog.rst           |  2 ++
 mongoengine/base/document.py |  7 ++++++-
 mongoengine/dereference.py   | 16 ++++++++--------
 tests/document/instance.py   | 24 ++++++++++++++++++++++++
 tests/fixtures.py            |  9 +++++++++
 6 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 446a34735..1880cade5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -218,3 +218,4 @@ that much better:
  * Matthew Ellison (https://github.com/seglberg)
  * Jimmy Shen (https://github.com/jimmyshen)
  * J. Fernando Sánchez (https://github.com/balkian)
+ * Michael Chase (https://github.com/rxsegrxup)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 72d2b49cd..90f1138db 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,8 @@ Changes in 0.9.X - DEV
 ======================
 - ListField of embedded docs doesn't set the _instance attribute when iterating over it #914
 - Support += and *= for ListField #595
+- Use sets for populating dbrefs to dereference
+- Fixed unpickled documents replacing the global field's list. #888
 
 Changes in 0.9.0
 ================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index bcd761720..bd9e6ba64 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -206,7 +206,12 @@ def __setstate__(self, data):
             if k in data:
                 setattr(self, k, data[k])
         if '_fields_ordered' in data:
-            setattr(type(self), '_fields_ordered', data['_fields_ordered'])
+            if self._dynamic:
+                setattr(self, '_fields_ordered', data['_fields_ordered'])
+            else:
+                _super_fields_ordered = type(self)._fields_ordered
+                setattr(self, '_fields_ordered', _super_fields_ordered)
+
         dynamic_fields = data.get('_dynamic_fields') or SON()
         for k in dynamic_fields.keys():
             setattr(self, k, data["_data"].get(k))
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 415d56782..453ba14f9 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -102,24 +102,24 @@ def _find_references(self, items, depth=0):
                 for field_name, field in item._fields.iteritems():
                     v = item._data.get(field_name, None)
                     if isinstance(v, (DBRef)):
-                        reference_map.setdefault(field.document_type, []).append(v.id)
+                        reference_map.setdefault(field.document_type, set()).add(v.id)
                     elif isinstance(v, (dict, SON)) and '_ref' in v:
-                        reference_map.setdefault(get_document(v['_cls']), []).append(v['_ref'].id)
+                        reference_map.setdefault(get_document(v['_cls']), set()).add(v['_ref'].id)
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                         field_cls = getattr(getattr(field, 'field', None), 'document_type', None)
                         references = self._find_references(v, depth)
                         for key, refs in references.iteritems():
                             if isinstance(field_cls, (Document, TopLevelDocumentMetaclass)):
                                 key = field_cls
-                            reference_map.setdefault(key, []).extend(refs)
+                            reference_map.setdefault(key, set()).update(refs)
             elif isinstance(item, (DBRef)):
-                reference_map.setdefault(item.collection, []).append(item.id)
+                reference_map.setdefault(item.collection, set()).add(item.id)
             elif isinstance(item, (dict, SON)) and '_ref' in item:
-                reference_map.setdefault(get_document(item['_cls']), []).append(item['_ref'].id)
+                reference_map.setdefault(get_document(item['_cls']), set()).add(item['_ref'].id)
             elif isinstance(item, (dict, list, tuple)) and depth - 1 <= self.max_depth:
                 references = self._find_references(item, depth - 1)
                 for key, refs in references.iteritems():
-                    reference_map.setdefault(key, []).extend(refs)
+                    reference_map.setdefault(key, set()).update(refs)
 
         return reference_map
 
@@ -128,8 +128,8 @@ def _fetch_objects(self, doc_type=None):
         """
         object_map = {}
         for collection, dbrefs in self.reference_map.iteritems():
-            keys = object_map.keys()
-            refs = list(set([dbref for dbref in dbrefs if unicode(dbref).encode('utf-8') not in keys]))
+            refs = [dbref for dbref in dbrefs
+                    if unicode(dbref).encode('utf-8') not in object_map]
             if hasattr(collection, 'objects'):  # We have a document class for the refs
                 references = collection.objects.in_bulk(refs)
                 for key, doc in references.iteritems():
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 8704bad9b..10e38d496 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -10,6 +10,7 @@
 
 from datetime import datetime
 from bson import DBRef, ObjectId
+from tests import fixtures
 from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
                             PickleDyanmicEmbedded, PickleDynamicTest)
 
@@ -2085,6 +2086,29 @@ def test_picklable(self):
         self.assertEqual(pickle_doc.string, "Two")
         self.assertEqual(pickle_doc.lists, ["1", "2", "3"])
 
+    def test_regular_document_pickle(self):
+
+        pickle_doc = PickleTest(number=1, string="One", lists=['1', '2'])
+        pickled_doc = pickle.dumps(pickle_doc)  # make sure pickling works even before the doc is saved
+        pickle_doc.save()
+
+        pickled_doc = pickle.dumps(pickle_doc)
+
+        # Test that when a document's definition changes the new
+        # definition is used
+        fixtures.PickleTest = fixtures.NewDocumentPickleTest
+
+        resurrected = pickle.loads(pickled_doc)
+        self.assertEqual(resurrected.__class__,
+                         fixtures.NewDocumentPickleTest)
+        self.assertEqual(resurrected._fields_ordered,
+                         fixtures.NewDocumentPickleTest._fields_ordered)
+        self.assertNotEqual(resurrected._fields_ordered,
+                            pickle_doc._fields_ordered)
+
+        # The local PickleTest is still a ref to the original
+        fixtures.PickleTest = PickleTest
+
     def test_dynamic_document_pickle(self):
 
         pickle_doc = PickleDynamicTest(
diff --git a/tests/fixtures.py b/tests/fixtures.py
index f1344d7cd..b3bf73e88 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -17,6 +17,15 @@ class PickleTest(Document):
     photo = FileField()
 
 
+class NewDocumentPickleTest(Document):
+    number = IntField()
+    string = StringField(choices=(('One', '1'), ('Two', '2')))
+    embedded = EmbeddedDocumentField(PickleEmbedded)
+    lists = ListField(StringField())
+    photo = FileField()
+    new_field = StringField()
+
+
 class PickleDyanmicEmbedded(DynamicEmbeddedDocument):
     date = DateTimeField(default=datetime.now)
 

From f77f45b70c4f87647b07ac278fe58ebf2fc451c3 Mon Sep 17 00:00:00 2001
From: Eremeev Danil <hole666@mail.ru>
Date: Wed, 1 Apr 2015 10:10:08 +0500
Subject: [PATCH 0088/1519] _get_changed_fields fix for embedded documents with
 id field.

removed commented out piece of code

added author and record to changelog
---
 AUTHORS                      | 1 +
 docs/changelog.rst           | 1 +
 mongoengine/base/document.py | 3 +--
 tests/document/delta.py      | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1880cade5..0fd40b519 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -219,3 +219,4 @@ that much better:
  * Jimmy Shen (https://github.com/jimmyshen)
  * J. Fernando Sánchez (https://github.com/balkian)
  * Michael Chase (https://github.com/rxsegrxup)
+ * Eremeev Danil (https://github.com/elephanter)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 90f1138db..ba952d8e9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -85,6 +85,7 @@ Changes in 0.9.0
 - Fixed a few instances where reverse_delete_rule was written as reverse_delete_rules. #791
 - Make `in_bulk()` respect `no_dereference()` #775
 - Handle None from model __str__; Fixes #753 #754
+- _get_changed_fields fix for embedded documents with id field. #925
 
 Changes in 0.8.7
 ================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index bd9e6ba64..b23104398 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -308,7 +308,7 @@ def to_mongo(self, use_db_field=True, fields=None):
         """
         if not fields:
             fields = []
-        
+
         data = SON()
         data["_id"] = None
         data['_cls'] = self._class_name
@@ -553,7 +553,6 @@ def _get_changed_fields(self, inspected=None):
             if hasattr(data, 'id'):
                 if data.id in inspected:
                     continue
-                inspected.add(data.id)
             if isinstance(field, ReferenceField):
                 continue
             elif (isinstance(data, (EmbeddedDocument, DynamicEmbeddedDocument))
diff --git a/tests/document/delta.py b/tests/document/delta.py
index 24910627b..58df2c828 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -93,6 +93,7 @@ def test_delta_recursive(self):
     def delta_recursive(self, DocClass, EmbeddedClass):
 
         class Embedded(EmbeddedClass):
+            id = StringField()
             string_field = StringField()
             int_field = IntField()
             dict_field = DictField()
@@ -114,6 +115,7 @@ class Doc(DocClass):
         self.assertEqual(doc._delta(), ({}, {}))
 
         embedded_1 = Embedded()
+        embedded_1.id = "010101"
         embedded_1.string_field = 'hello'
         embedded_1.int_field = 1
         embedded_1.dict_field = {'hello': 'world'}
@@ -123,6 +125,7 @@ class Doc(DocClass):
         self.assertEqual(doc._get_changed_fields(), ['embedded_field'])
 
         embedded_delta = {
+            'id': "010101",
             'string_field': 'hello',
             'int_field': 1,
             'dict_field': {'hello': 'world'},

From 175659628d2150556ee33e19dec088816802ddbe Mon Sep 17 00:00:00 2001
From: Catstyle <Catstyle.Lee@gmail.com>
Date: Fri, 10 Apr 2015 11:31:31 +0800
Subject: [PATCH 0089/1519] fix mark_as_changed: handle higher/lower level
 changed fields correctly to avoid conflict update error

---
 AUTHORS                      |  1 +
 docs/changelog.rst           |  1 +
 mongoengine/base/document.py | 14 +++++++++-
 tests/document/delta.py      | 50 ++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 0fd40b519..af87d5039 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -220,3 +220,4 @@ that much better:
  * J. Fernando Sánchez (https://github.com/balkian)
  * Michael Chase (https://github.com/rxsegrxup)
  * Eremeev Danil (https://github.com/elephanter)
+ * Catstyle Lee (https://github.com/Catstyle)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index ba952d8e9..188247e65 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Fixed mark_as_changed to handle higher/lower level fields changed. #927
 - ListField of embedded docs doesn't set the _instance attribute when iterating over it #914
 - Support += and *= for ListField #595
 - Use sets for populating dbrefs to dereference
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index b23104398..33a6d8265 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -483,7 +483,19 @@ def _mark_as_changed(self, key):
             key = self._db_field_map.get(key, key)
 
         if key not in self._changed_fields:
-            self._changed_fields.append(key)
+            levels, idx = key.split('.'), 1
+            while idx <= len(levels):
+                if '.'.join(levels[:idx]) in self._changed_fields:
+                    break
+                idx += 1
+            else:
+                self._changed_fields.append(key)
+                # remove lower level changed fields
+                level = '.'.join(levels[:idx]) + '.'
+                remove = self._changed_fields.remove
+                for field in self._changed_fields:
+                    if field.startswith(level):
+                        remove(field)
 
     def _clear_changed_fields(self):
         """Using get_changed_fields iterate and remove any fields that are
diff --git a/tests/document/delta.py b/tests/document/delta.py
index 58df2c828..7ec6ee56a 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -735,6 +735,56 @@ class MyDoc(Document):
         mydoc._clear_changed_fields()
         self.assertEqual([], mydoc._get_changed_fields())
 
+    def test_lower_level_mark_as_changed(self):
+        class EmbeddedDoc(EmbeddedDocument):
+            name = StringField()
+
+        class MyDoc(Document):
+            subs = MapField(EmbeddedDocumentField(EmbeddedDoc))
+
+        MyDoc.drop_collection()
+
+        MyDoc().save()
+
+        mydoc = MyDoc.objects.first()
+        mydoc.subs['a'] = EmbeddedDoc()
+        self.assertEqual(["subs.a"], mydoc._get_changed_fields())
+
+        subdoc = mydoc.subs['a']
+        subdoc.name = 'bar'
+
+        self.assertEqual(["name"], subdoc._get_changed_fields())
+        self.assertEqual(["subs.a"], mydoc._get_changed_fields())
+        mydoc.save()
+
+        mydoc._clear_changed_fields()
+        self.assertEqual([], mydoc._get_changed_fields())
+
+    def test_upper_level_mark_as_changed(self):
+        class EmbeddedDoc(EmbeddedDocument):
+            name = StringField()
+
+        class MyDoc(Document):
+            subs = MapField(EmbeddedDocumentField(EmbeddedDoc))
+
+        MyDoc.drop_collection()
+
+        MyDoc(subs={'a': EmbeddedDoc(name='foo')}).save()
+
+        mydoc = MyDoc.objects.first()
+        subdoc = mydoc.subs['a']
+        subdoc.name = 'bar'
+
+        self.assertEqual(["name"], subdoc._get_changed_fields())
+        self.assertEqual(["subs.a.name"], mydoc._get_changed_fields())
+
+        mydoc.subs['a'] = EmbeddedDoc()
+        self.assertEqual(["subs.a"], mydoc._get_changed_fields())
+        mydoc.save()
+
+        mydoc._clear_changed_fields()
+        self.assertEqual([], mydoc._get_changed_fields())
+
     def test_referenced_object_changed_attributes(self):
         """Ensures that when you save a new reference to a field, the referenced object isn't altered"""
 

From cd2d9517a034d0534a87520cf84daacad5b07fd3 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Mon, 13 Apr 2015 17:49:08 +0200
Subject: [PATCH 0090/1519] Added 'strict' meta parameter

---
 mongoengine/base/document.py |   2 +-
 tests/document/instance.py   | 114 ++++++++++++++++++++++++++++++++++-
 tests/fields/fields.py       |   2 +-
 3 files changed, 115 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 33a6d8265..0ca3fcdeb 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -72,7 +72,7 @@ def __init__(self, *args, **values):
 
         # Check if there are undefined fields supplied, if so raise an
         # Exception.
-        if not self._dynamic:
+        if not self._dynamic and self._meta.get('strict', True):
             for var in values.keys():
                 if var not in self._fields.keys() + ['id', 'pk', '_cls', '_text_score']:
                     msg = (
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 10e38d496..6a34b749a 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -16,7 +16,8 @@
 
 from mongoengine import *
 from mongoengine.errors import (NotRegistered, InvalidDocumentError,
-                                InvalidQueryError, NotUniqueError)
+                                InvalidQueryError, NotUniqueError,
+                                FieldDoesNotExist)
 from mongoengine.queryset import NULLIFY, Q
 from mongoengine.connection import get_db
 from mongoengine.base import get_document
@@ -2467,6 +2468,117 @@ class Group(Document):
         group = Group.objects.first()
         self.assertEqual("hello - default", group.name)
 
+    def test_load_undefined_fields(self):
+        class User(Document):
+            name = StringField()
+
+        User.drop_collection()
+
+        User._get_collection().save({
+            'name': 'John',
+            'foo': 'Bar',
+            'data': [1, 2, 3]
+        })
+
+        with self.assertRaises(FieldDoesNotExist):
+            User.objects.first()
+
+    def test_load_undefined_fields_with_strict_false(self):
+        class User(Document):
+            name = StringField()
+
+            meta = {'strict': False}
+
+        User.drop_collection()
+
+        User._get_collection().save({
+            'name': 'John',
+            'foo': 'Bar',
+            'data': [1, 2, 3]
+        })
+
+        user = User.objects.first()
+        self.assertEqual(user.name, 'John')
+        self.assertFalse(hasattr(user, 'foo'))
+        self.assertEqual(user._data['foo'], 'Bar')
+        self.assertFalse(hasattr(user, 'data'))
+        self.assertEqual(user._data['data'], [1, 2, 3])
+
+    def test_load_undefined_fields_on_embedded_document(self):
+        class Thing(EmbeddedDocument):
+            name = StringField()
+
+        class User(Document):
+            name = StringField()
+            thing = EmbeddedDocumentField(Thing)
+
+        User.drop_collection()
+
+        User._get_collection().save({
+            'name': 'John',
+            'thing': {
+                'name': 'My thing',
+                'foo': 'Bar',
+                'data': [1, 2, 3]
+            }
+        })
+
+        with self.assertRaises(FieldDoesNotExist):
+            User.objects.first()
+
+    def test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc(self):
+        class Thing(EmbeddedDocument):
+            name = StringField()
+
+        class User(Document):
+            name = StringField()
+            thing = EmbeddedDocumentField(Thing)
+
+            meta = {'strict': False}
+
+        User.drop_collection()
+
+        User._get_collection().save({
+            'name': 'John',
+            'thing': {
+                'name': 'My thing',
+                'foo': 'Bar',
+                'data': [1, 2, 3]
+            }
+        })
+
+        with self.assertRaises(FieldDoesNotExist):
+            User.objects.first()
+
+    def test_load_undefined_fields_on_embedded_document_with_strict_false(self):
+        class Thing(EmbeddedDocument):
+            name = StringField()
+
+            meta = {'strict': False}
+
+        class User(Document):
+            name = StringField()
+            thing = EmbeddedDocumentField(Thing)
+
+        User.drop_collection()
+
+        User._get_collection().save({
+            'name': 'John',
+            'thing': {
+                'name': 'My thing',
+                'foo': 'Bar',
+                'data': [1, 2, 3]
+            }
+        })
+
+        user = User.objects.first()
+        self.assertEqual(user.name, 'John')
+        self.assertEqual(user.thing.name, 'My thing')
+        self.assertFalse(hasattr(user.thing, 'foo'))
+        self.assertEqual(user.thing._data['foo'], 'Bar')
+        self.assertFalse(hasattr(user.thing, 'data'))
+        self.assertEqual(user.thing._data['data'], [1, 2, 3])
+
     def test_spaces_in_keys(self):
 
         class Embedded(DynamicEmbeddedDocument):
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 5e7f34b58..887291db4 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3160,7 +3160,7 @@ class Doc(Document):
 
     def test_undefined_field_exception(self):
         """Tests if a `FieldDoesNotExist` exception is raised when trying to
-        set a value to a field that's not defined.
+        instanciate a document with a field that's not defined.
         """
 
         class Doc(Document):

From 2bfb195ad671aee104111f3fe2a324530df6b1d3 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Mon, 13 Apr 2015 18:07:48 +0200
Subject: [PATCH 0091/1519] Document FieldDoesNotExist and meta.strict

---
 docs/apireference.rst   | 3 +++
 mongoengine/document.py | 5 +++++
 mongoengine/errors.py   | 9 ++++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/docs/apireference.rst b/docs/apireference.rst
index 7ba93408c..625d4a8bd 100644
--- a/docs/apireference.rst
+++ b/docs/apireference.rst
@@ -34,6 +34,9 @@ Documents
 .. autoclass:: mongoengine.ValidationError
   :members:
 
+.. autoclass:: mongoengine.FieldDoesNotExist
+
+
 Context Managers
 ================
 
diff --git a/mongoengine/document.py b/mongoengine/document.py
index eea5dabc1..f8275021d 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -135,6 +135,11 @@ class Document(BaseDocument):
     doesn't contain a list) if allow_inheritance is True. This can be
     disabled by either setting cls to False on the specific index or
     by setting index_cls to False on the meta dictionary for the document.
+
+    By default, any extra attribute existing in stored data but not declared
+    in your model will raise a :class:`~mongoengine.FieldDoesNotExist` error.
+    This can be disabled by setting :attr:`strict` to ``False``
+    in the :attr:`meta` dictionnary.
     """
 
     # The __metaclass__ attribute is removed by 2to3 when running with Python3
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 6cde7771e..a411ac47a 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -42,7 +42,14 @@ class NotUniqueError(OperationError):
 
 
 class FieldDoesNotExist(Exception):
-    pass
+    """Raised when trying to set a field
+    not declared in a :class:`~mongoengine.Document`
+    or an :class:`~mongoengine.EmbeddedDocument`.
+
+    To avoid this behavior on data loading,
+    you should the :attr:`strict` to ``False``
+    in the :attr:`meta` dictionnary.
+    """
 
 
 class ValidationError(AssertionError):

From ddbcc8e84ba45539a01ab622161e28350268e327 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Mon, 13 Apr 2015 18:48:42 +0200
Subject: [PATCH 0092/1519] Ensure meta.strict does not bypass constructor
 check

---
 mongoengine/base/document.py |  6 +++---
 tests/fields/fields.py       | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 0ca3fcdeb..d31d75ba9 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -70,9 +70,9 @@ def __init__(self, *args, **values):
 
         signals.pre_init.send(self.__class__, document=self, values=values)
 
-        # Check if there are undefined fields supplied, if so raise an
-        # Exception.
-        if not self._dynamic and self._meta.get('strict', True):
+        # Check if there are undefined fields supplied to the constructor,
+        # if so raise an Exception.
+        if not self._dynamic and (self._meta.get('strict', True) or _created):
             for var in values.keys():
                 if var not in self._fields.keys() + ['id', 'pk', '_cls', '_text_score']:
                     msg = (
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 887291db4..f0a739517 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3171,6 +3171,21 @@ def test():
 
         self.assertRaises(FieldDoesNotExist, test)
 
+    def test_undefined_field_exception_with_strict(self):
+        """Tests if a `FieldDoesNotExist` exception is raised when trying to
+        instanciate a document with a field that's not defined,
+        even when strict is set to False.
+        """
+
+        class Doc(Document):
+            foo = StringField(db_field='f')
+            meta = {'strict': False}
+
+        def test():
+            Doc(bar='test')
+
+        self.assertRaises(FieldDoesNotExist, test)
+
 
 class EmbeddedDocumentListFieldTestCase(unittest.TestCase):
 

From 52c7b68cc31a5de0736d291b51906a0d639c0efc Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Mon, 13 Apr 2015 22:28:58 +0200
Subject: [PATCH 0093/1519] Restore Py26 compatibility on assertRaises

---
 tests/document/instance.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 6a34b749a..2cfdef652 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2480,8 +2480,7 @@ class User(Document):
             'data': [1, 2, 3]
         })
 
-        with self.assertRaises(FieldDoesNotExist):
-            User.objects.first()
+        self.assertRaises(FieldDoesNotExist, User.objects.first)
 
     def test_load_undefined_fields_with_strict_false(self):
         class User(Document):
@@ -2523,8 +2522,7 @@ class User(Document):
             }
         })
 
-        with self.assertRaises(FieldDoesNotExist):
-            User.objects.first()
+        self.assertRaises(FieldDoesNotExist, User.objects.first)
 
     def test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc(self):
         class Thing(EmbeddedDocument):
@@ -2547,8 +2545,7 @@ class User(Document):
             }
         })
 
-        with self.assertRaises(FieldDoesNotExist):
-            User.objects.first()
+        self.assertRaises(FieldDoesNotExist, User.objects.first)
 
     def test_load_undefined_fields_on_embedded_document_with_strict_false(self):
         class Thing(EmbeddedDocument):

From 2ffdbc7fc0e01905af8edc284039ab713b43e9ed Mon Sep 17 00:00:00 2001
From: Jimmy Shen <jimmy@tsu.co>
Date: Sun, 19 Apr 2015 03:26:14 -0400
Subject: [PATCH 0094/1519] fixed microsecond-level ordering/filtering bug with
 ComplexDateTimeField as well as unused separator option

---
 docs/changelog.rst     |  1 +
 mongoengine/fields.py  | 41 +++++++++++------------------------------
 tests/fields/fields.py | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 188247e65..3dbcc2f87 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Changes in 0.9.X - DEV
 - Support += and *= for ListField #595
 - Use sets for populating dbrefs to dereference
 - Fixed unpickled documents replacing the global field's list. #888
+- Fixed storage of microseconds in ComplexDateTimeField and unused separator option. #910
 
 Changes in 0.9.0
 ================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 3c1db4ac3..b5ed8bb2f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -458,37 +458,22 @@ class ComplexDateTimeField(StringField):
     """
 
     def __init__(self, separator=',', **kwargs):
-        self.names = ['year', 'month', 'day', 'hour', 'minute', 'second',
-                      'microsecond']
-        self.separtor = separator
+        self.names = ['year', 'month', 'day', 'hour', 'minute', 'second', 'microsecond']
+        self.separator = separator
+        self.format = separator.join(['%Y', '%m', '%d', '%H', '%M', '%S', '%f'])
         super(ComplexDateTimeField, self).__init__(**kwargs)
 
-    def _leading_zero(self, number):
-        """
-        Converts the given number to a string.
-
-        If it has only one digit, a leading zero so as it has always at least
-        two digits.
-        """
-        if int(number) < 10:
-            return "0%s" % number
-        else:
-            return str(number)
-
     def _convert_from_datetime(self, val):
         """
         Convert a `datetime` object to a string representation (which will be
         stored in MongoDB). This is the reverse function of
         `_convert_from_string`.
 
-        >>> a = datetime(2011, 6, 8, 20, 26, 24, 192284)
-        >>> RealDateTimeField()._convert_from_datetime(a)
-        '2011,06,08,20,26,24,192284'
+        >>> a = datetime(2011, 6, 8, 20, 26, 24, 92284)
+        >>> ComplexDateTimeField()._convert_from_datetime(a)
+        '2011,06,08,20,26,24,092284'
         """
-        data = []
-        for name in self.names:
-            data.append(self._leading_zero(getattr(val, name)))
-        return ','.join(data)
+        return val.strftime(self.format)
 
     def _convert_from_string(self, data):
         """
@@ -496,16 +481,12 @@ def _convert_from_string(self, data):
         will manipulate). This is the reverse function of
         `_convert_from_datetime`.
 
-        >>> a = '2011,06,08,20,26,24,192284'
+        >>> a = '2011,06,08,20,26,24,092284'
         >>> ComplexDateTimeField()._convert_from_string(a)
-        datetime.datetime(2011, 6, 8, 20, 26, 24, 192284)
+        datetime.datetime(2011, 6, 8, 20, 26, 24, 92284)
         """
-        data = data.split(',')
-        data = map(int, data)
-        values = {}
-        for i in range(7):
-            values[self.names[i]] = data[i]
-        return datetime.datetime(**values)
+        values = map(int, data.split(self.separator))
+        return datetime.datetime(*values)
 
     def __get__(self, instance, owner):
         data = super(ComplexDateTimeField, self).__get__(instance, owner)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 5e7f34b58..96686a8b7 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -5,6 +5,9 @@
 import datetime
 import unittest
 import uuid
+import math
+import itertools
+import re
 
 try:
     import dateutil
@@ -689,6 +692,7 @@ def test_complexdatetime_storage(self):
         """
         class LogEntry(Document):
             date = ComplexDateTimeField()
+            date_with_dots = ComplexDateTimeField(separator='.')
 
         LogEntry.drop_collection()
 
@@ -729,6 +733,18 @@ class LogEntry(Document):
             log1 = LogEntry.objects.get(date=d1)
             self.assertEqual(log, log1)
 
+        # Test string padding
+        microsecond = map(int, [math.pow(10, x) for x in xrange(6)])
+        mm = dd = hh = ii = ss = [1, 10]
+
+        for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
+            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']
+            self.assertTrue(re.match('^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$', stored) is not None)
+
+        # Test separator
+        stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()['date_with_dots']
+        self.assertTrue(re.match('^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$', stored) is not None)
+
         LogEntry.drop_collection()
 
     def test_complexdatetime_usage(self):
@@ -787,6 +803,25 @@ class LogEntry(Document):
 
         LogEntry.drop_collection()
 
+        # Test microsecond-level ordering/filtering
+        for microsecond in (99, 999, 9999, 10000):
+            LogEntry(date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)).save()
+
+        logs = list(LogEntry.objects.order_by('date'))
+        for next_idx, log in enumerate(logs[:-1], start=1):
+            next_log = logs[next_idx]
+            self.assertTrue(log.date < next_log.date)
+
+        logs = list(LogEntry.objects.order_by('-date'))
+        for next_idx, log in enumerate(logs[:-1], start=1):
+            next_log = logs[next_idx]
+            self.assertTrue(log.date > next_log.date)
+
+        logs = LogEntry.objects.filter(date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))
+        self.assertEqual(logs.count(), 4)
+
+        LogEntry.drop_collection()
+
     def test_list_validation(self):
         """Ensure that a list field only accepts lists with valid elements.
         """

From 24a9633edc33872d13c09d30a1062b1f83d15976 Mon Sep 17 00:00:00 2001
From: RussellLuo <luopeng.he@gmail.com>
Date: Mon, 20 Apr 2015 16:03:25 +0800
Subject: [PATCH 0095/1519] Override `authentication_source` by "authSource" in
 URI

---
 mongoengine/connection.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index dcecdd9ad..5e18efb76 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,4 +1,3 @@
-import pymongo
 from pymongo import MongoClient, MongoReplicaSetClient, uri_parser
 
 
@@ -58,8 +57,11 @@ def register_connection(alias, name=None, host=None, port=None,
             'password': uri_dict.get('password'),
             'read_preference': read_preference,
         })
-        if "replicaSet" in conn_settings['host']:
+        uri_options = uri_dict['options']
+        if 'replicaset' in uri_options:
             conn_settings['replicaSet'] = True
+        if 'authsource' in uri_options:
+            conn_settings['authentication_source'] = uri_options['authsource']
 
     # Deprecated parameters that should not be passed on
     kwargs.pop('slaves', None)

From 7530f03bf60d7f7f2cf2eb66b0e275d01dfc623b Mon Sep 17 00:00:00 2001
From: Matthew Ellison <seglberg@gmail.com>
Date: Fri, 24 Apr 2015 13:36:41 -0400
Subject: [PATCH 0096/1519] Removed Django Support from MongoEngine

Django support has now been split out of MongoEngine and will be
revisted as a new but separate module.

Closes #958
---
 .travis.yml                               |  21 +-
 docs/changelog.rst                        |   1 +
 docs/django.rst                           | 173 +--------
 mongoengine/__init__.py                   |   1 -
 mongoengine/django/__init__.py            |   0
 mongoengine/django/auth.py                | 412 ----------------------
 mongoengine/django/mongo_auth/__init__.py |   0
 mongoengine/django/mongo_auth/models.py   | 119 -------
 mongoengine/django/sessions.py            | 124 -------
 mongoengine/django/shortcuts.py           |  47 ---
 mongoengine/django/storage.py             | 112 ------
 mongoengine/django/tests.py               |  31 --
 mongoengine/django/utils.py               |   6 -
 setup.py                                  |   4 +-
 tests/test_django.py                      | 330 -----------------
 tests/test_jinja.py                       |  47 ---
 16 files changed, 10 insertions(+), 1418 deletions(-)
 delete mode 100644 mongoengine/django/__init__.py
 delete mode 100644 mongoengine/django/auth.py
 delete mode 100644 mongoengine/django/mongo_auth/__init__.py
 delete mode 100644 mongoengine/django/mongo_auth/models.py
 delete mode 100644 mongoengine/django/sessions.py
 delete mode 100644 mongoengine/django/shortcuts.py
 delete mode 100644 mongoengine/django/storage.py
 delete mode 100644 mongoengine/django/tests.py
 delete mode 100644 mongoengine/django/utils.py
 delete mode 100644 tests/test_django.py
 delete mode 100644 tests/test_jinja.py

diff --git a/.travis.yml b/.travis.yml
index 38b72cc9a..37ec8cf72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,24 +8,18 @@ python:
 - pypy
 - pypy3
 env:
-- PYMONGO=2.7.2 DJANGO=dev
-- PYMONGO=2.7.2 DJANGO=1.7.1
-- PYMONGO=2.7.2 DJANGO=1.6.8
-- PYMONGO=2.7.2 DJANGO=1.5.11
-- PYMONGO=2.8 DJANGO=dev
-- PYMONGO=2.8 DJANGO=1.7.1
-- PYMONGO=2.8 DJANGO=1.6.8
-- PYMONGO=2.8 DJANGO=1.5.11
+- PYMONGO=2.7.2
+- PYMONGO=2.8
 matrix:
   exclude:
   - python: '2.6'
-    env: PYMONGO=2.7.2 DJANGO=dev
+    env: PYMONGO=2.7.2 
   - python: '2.6'
-    env: PYMONGO=2.8 DJANGO=dev
+    env: PYMONGO=2.8
   - python: '2.6'
-    env: PYMONGO=2.7.2 DJANGO=1.7.1
+    env: PYMONGO=2.7.2
   - python: '2.6'
-    env: PYMONGO=2.8 DJANGO=1.7.1
+    env: PYMONGO=2.8
   allow_failures:
   - python: pypy3
   fast_finish: true
@@ -43,9 +37,6 @@ install:
   true; fi
 - if [[ $PYMONGO != 'dev' ]]; then travis_retry pip install pymongo==$PYMONGO; true;
   fi
-- if [[ $DJANGO == 'dev' ]]; then travis_retry pip install git+https://github.com/django/django.git;
-  fi
-- if [[ $DJANGO != 'dev' ]]; then travis_retry pip install Django==$DJANGO; fi
 - travis_retry pip install https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.1.tar.gz#md5=1534bb15cf311f07afaa3aacba1c028b
 - travis_retry pip install coveralls
 - travis_retry python setup.py install
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3dbcc2f87..5617a5b11 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,7 @@ Changes in 0.9.X - DEV
 - Use sets for populating dbrefs to dereference
 - Fixed unpickled documents replacing the global field's list. #888
 - Fixed storage of microseconds in ComplexDateTimeField and unused separator option. #910
+- Django support was removed and will be available as a separate extension. #958
 
 Changes in 0.9.0
 ================
diff --git a/docs/django.rst b/docs/django.rst
index 5d2423f23..4b9a04bdb 100644
--- a/docs/django.rst
+++ b/docs/django.rst
@@ -2,176 +2,5 @@
 Django Support
 ==============
 
-.. note:: Updated to support Django 1.5
-
-Connecting
-==========
-In your **settings.py** file, ignore the standard database settings (unless you
-also plan to use the ORM in your project), and instead call
-:func:`~mongoengine.connect` somewhere in the settings module.
-
-.. note::
-   If you are not using another Database backend you may need to add a dummy
-   database backend to ``settings.py`` eg::
-
-        DATABASES = {
-            'default': {
-                'ENGINE': 'django.db.backends.dummy'
-            }
-        }
-
-Authentication
-==============
-MongoEngine includes a Django authentication backend, which uses MongoDB. The
-:class:`~mongoengine.django.auth.User` model is a MongoEngine
-:class:`~mongoengine.Document`, but implements most of the methods and
-attributes that the standard Django :class:`User` model does - so the two are
-moderately compatible. Using this backend will allow you to store users in
-MongoDB but still use many of the Django authentication infrastructure (such as
-the :func:`login_required` decorator and the :func:`authenticate` function). To
-enable the MongoEngine auth backend, add the following to your **settings.py**
-file::
-
-    AUTHENTICATION_BACKENDS = (
-        'mongoengine.django.auth.MongoEngineBackend',
-    )
-
-The :mod:`~mongoengine.django.auth` module also contains a
-:func:`~mongoengine.django.auth.get_user` helper function, that takes a user's
-:attr:`id` and returns a :class:`~mongoengine.django.auth.User` object.
-
-.. versionadded:: 0.1.3
-
-Custom User model
-=================
-Django 1.5 introduced `Custom user Models
-<https://docs.djangoproject.com/en/dev/topics/auth/customizing/#auth-custom-user>`_
-which can be used as an alternative to the MongoEngine authentication backend.
-
-The main advantage of this option is that other components relying on
-:mod:`django.contrib.auth` and supporting the new swappable user model are more
-likely to work. For example, you can use the ``createsuperuser`` management
-command as usual.
-
-To enable the custom User model in Django, add ``'mongoengine.django.mongo_auth'``
-in your ``INSTALLED_APPS`` and set ``'mongo_auth.MongoUser'`` as the custom user
-user model to use. In your **settings.py** file you will have::
-
-    INSTALLED_APPS = (
-        ...
-        'django.contrib.auth',
-        'mongoengine.django.mongo_auth',
-        ...
-    )
-
-    AUTH_USER_MODEL = 'mongo_auth.MongoUser'
-
-An additional ``MONGOENGINE_USER_DOCUMENT`` setting enables you to replace the
-:class:`~mongoengine.django.auth.User` class with another class of your choice::
-
-    MONGOENGINE_USER_DOCUMENT = 'mongoengine.django.auth.User'
-
-The custom :class:`User` must be a :class:`~mongoengine.Document` class, but
-otherwise has the same requirements as a standard custom user model,
-as specified in the `Django Documentation
-<https://docs.djangoproject.com/en/dev/topics/auth/customizing/>`_.
-In particular, the custom class must define :attr:`USERNAME_FIELD` and
-:attr:`REQUIRED_FIELDS` attributes.
-
-Sessions
-========
-Django allows the use of different backend stores for its sessions. MongoEngine
-provides a MongoDB-based session backend for Django, which allows you to use
-sessions in your Django application with just MongoDB. To enable the MongoEngine
-session backend, ensure that your settings module has
-``'django.contrib.sessions.middleware.SessionMiddleware'`` in the
-``MIDDLEWARE_CLASSES`` field  and ``'django.contrib.sessions'`` in your
-``INSTALLED_APPS``. From there, all you need to do is add the following line
-into your settings module::
-
-    SESSION_ENGINE = 'mongoengine.django.sessions'
-    SESSION_SERIALIZER = 'mongoengine.django.sessions.BSONSerializer'
-
-Django provides session cookie, which expires after ```SESSION_COOKIE_AGE``` seconds, but doesn't delete cookie at sessions backend, so ``'mongoengine.django.sessions'`` supports  `mongodb TTL
-<http://docs.mongodb.org/manual/tutorial/expire-data/>`_.
-
-.. note:: ``SESSION_SERIALIZER`` is only necessary in Django 1.6 as the default
-   serializer is based around JSON and doesn't know how to convert
-   ``bson.objectid.ObjectId`` instances to strings.
-
-.. versionadded:: 0.2.1
-
-Storage
-=======
-With MongoEngine's support for GridFS via the :class:`~mongoengine.fields.FileField`,
-it is useful to have a Django file storage backend that wraps this. The new
-storage module is called :class:`~mongoengine.django.storage.GridFSStorage`.
-Using it is very similar to using the default FileSystemStorage.::
-
-    from mongoengine.django.storage import GridFSStorage
-    fs = GridFSStorage()
-
-    filename = fs.save('hello.txt', 'Hello, World!')
-
-All of the `Django Storage API methods
-<http://docs.djangoproject.com/en/dev/ref/files/storage/>`_ have been
-implemented except :func:`path`. If the filename provided already exists, an
-underscore and a number (before # the file extension, if one exists) will be
-appended to the filename until the generated filename doesn't exist. The
-:func:`save` method will return the new filename.::
-
-    >>> fs.exists('hello.txt')
-    True
-    >>> fs.open('hello.txt').read()
-    'Hello, World!'
-    >>> fs.size('hello.txt')
-    13
-    >>> fs.url('http://github.com/hello.txt')
-    'http://your_media_url/hello.txt'
-    >>> fs.open('hello.txt').name
-    'hello.txt'
-    >>> fs.listdir()
-    ([], [u'hello.txt'])
-
-All files will be saved and retrieved in GridFS via the :class:`FileDocument`
-document, allowing easy access to the files without the GridFSStorage
-backend.::
-
-    >>> from mongoengine.django.storage import FileDocument
-    >>> FileDocument.objects()
-    [<FileDocument: FileDocument object>]
-
-.. versionadded:: 0.4
-
-Shortcuts
-=========
-Inspired by the `Django shortcut get_object_or_404
-<https://docs.djangoproject.com/en/dev/topics/http/shortcuts/#get-object-or-404>`_,
-the :func:`~mongoengine.django.shortcuts.get_document_or_404` method returns 
-a document or raises an Http404 exception if the document does not exist::
-
-    from mongoengine.django.shortcuts import get_document_or_404
-    
-    admin_user = get_document_or_404(User, username='root')
-
-The first argument may be a Document or QuerySet object. All other passed arguments
-and keyword arguments are used in the query::
-
-    foo_email = get_document_or_404(User.objects.only('email'), username='foo', is_active=True).email
-
-.. note:: Like with :func:`get`, a MultipleObjectsReturned will be raised if more than one
-    object is found.
-
-
-Also inspired by the `Django shortcut get_list_or_404
-<https://docs.djangoproject.com/en/dev/topics/http/shortcuts/#get-list-or-404>`_,
-the :func:`~mongoengine.django.shortcuts.get_list_or_404` method returns a list of
-documents or raises an Http404 exception if the list is empty::
-
-    from mongoengine.django.shortcuts import get_list_or_404
-    
-    active_users = get_list_or_404(User, is_active=True)
-
-The first argument may be a Document or QuerySet object. All other passed
-arguments and keyword arguments are used to filter the query.
+.. note:: Django support has been split from MongoEngine and will be available on Github as a separate module. `See Here <https://github.com/MongoEngine/django-mongoengine>`_.
 
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index b215181ad..f1b2b30d8 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -10,7 +10,6 @@
 from signals import *
 from errors import *
 import errors
-import django
 
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
diff --git a/mongoengine/django/__init__.py b/mongoengine/django/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/mongoengine/django/auth.py b/mongoengine/django/auth.py
deleted file mode 100644
index 0a309c4cd..000000000
--- a/mongoengine/django/auth.py
+++ /dev/null
@@ -1,412 +0,0 @@
-from mongoengine import *
-
-from django.utils.encoding import smart_str
-from django.contrib.auth.models import _user_has_perm, _user_get_all_permissions, _user_has_module_perms
-from django.db import models
-from django.contrib.contenttypes.models import ContentTypeManager
-from django.contrib import auth
-from django.contrib.auth.models import AnonymousUser
-from django.utils.translation import ugettext_lazy as _
-
-from .utils import datetime_now
-
-REDIRECT_FIELD_NAME = 'next'
-
-try:
-    from django.contrib.auth.hashers import check_password, make_password
-except ImportError:
-    """Handle older versions of Django"""
-    from django.utils.hashcompat import md5_constructor, sha_constructor
-
-    def get_hexdigest(algorithm, salt, raw_password):
-        raw_password, salt = smart_str(raw_password), smart_str(salt)
-        if algorithm == 'md5':
-            return md5_constructor(salt + raw_password).hexdigest()
-        elif algorithm == 'sha1':
-            return sha_constructor(salt + raw_password).hexdigest()
-        raise ValueError('Got unknown password algorithm type in password')
-
-    def check_password(raw_password, password):
-        algo, salt, hash = password.split('$')
-        return hash == get_hexdigest(algo, salt, raw_password)
-
-    def make_password(raw_password):
-        from random import random
-        algo = 'sha1'
-        salt = get_hexdigest(algo, str(random()), str(random()))[:5]
-        hash = get_hexdigest(algo, salt, raw_password)
-        return '%s$%s$%s' % (algo, salt, hash)
-
-
-class ContentType(Document):
-    name = StringField(max_length=100)
-    app_label = StringField(max_length=100)
-    model = StringField(max_length=100, verbose_name=_('python model class name'),
-                        unique_with='app_label')
-    objects = ContentTypeManager()
-
-    class Meta:
-        verbose_name = _('content type')
-        verbose_name_plural = _('content types')
-        # db_table = 'django_content_type'
-        # ordering = ('name',)
-        # unique_together = (('app_label', 'model'),)
-
-    def __unicode__(self):
-        return self.name
-
-    def model_class(self):
-        "Returns the Python model class for this type of content."
-        from django.db import models
-        return models.get_model(self.app_label, self.model)
-
-    def get_object_for_this_type(self, **kwargs):
-        """
-        Returns an object of this type for the keyword arguments given.
-        Basically, this is a proxy around this object_type's get_object() model
-        method. The ObjectNotExist exception, if thrown, will not be caught,
-        so code that calls this method should catch it.
-        """
-        return self.model_class()._default_manager.using(self._state.db).get(**kwargs)
-
-    def natural_key(self):
-        return (self.app_label, self.model)
-
-
-class SiteProfileNotAvailable(Exception):
-    pass
-
-
-class PermissionManager(models.Manager):
-    def get_by_natural_key(self, codename, app_label, model):
-        return self.get(
-            codename=codename,
-            content_type=ContentType.objects.get_by_natural_key(app_label, model)
-        )
-
-
-class Permission(Document):
-    """The permissions system provides a way to assign permissions to specific
-    users and groups of users.
-
-    The permission system is used by the Django admin site, but may also be
-    useful in your own code. The Django admin site uses permissions as follows:
-
-        - The "add" permission limits the user's ability to view the "add"
-          form and add an object.
-        - The "change" permission limits a user's ability to view the change
-          list, view the "change" form and change an object.
-        - The "delete" permission limits the ability to delete an object.
-
-    Permissions are set globally per type of object, not per specific object
-    instance. It is possible to say "Mary may change news stories," but it's
-    not currently possible to say "Mary may change news stories, but only the
-    ones she created herself" or "Mary may only change news stories that have
-    a certain status or publication date."
-
-    Three basic permissions -- add, change and delete -- are automatically
-    created for each Django model.
-    """
-    name = StringField(max_length=50, verbose_name=_('username'))
-    content_type = ReferenceField(ContentType)
-    codename = StringField(max_length=100, verbose_name=_('codename'))
-        # FIXME: don't access field of the other class
-        # unique_with=['content_type__app_label', 'content_type__model'])
-
-    objects = PermissionManager()
-
-    class Meta:
-        verbose_name = _('permission')
-        verbose_name_plural = _('permissions')
-        # unique_together = (('content_type', 'codename'),)
-        # ordering = ('content_type__app_label', 'content_type__model', 'codename')
-
-    def __unicode__(self):
-        return u"%s | %s | %s" % (
-            unicode(self.content_type.app_label),
-            unicode(self.content_type),
-            unicode(self.name))
-
-    def natural_key(self):
-        return (self.codename,) + self.content_type.natural_key()
-    natural_key.dependencies = ['contenttypes.contenttype']
-
-
-class Group(Document):
-    """Groups are a generic way of categorizing users to apply permissions,
-    or some other label, to those users. A user can belong to any number of
-    groups.
-
-    A user in a group automatically has all the permissions granted to that
-    group. For example, if the group Site editors has the permission
-    can_edit_home_page, any user in that group will have that permission.
-
-    Beyond permissions, groups are a convenient way to categorize users to
-    apply some label, or extended functionality, to them. For example, you
-    could create a group 'Special users', and you could write code that would
-    do special things to those users -- such as giving them access to a
-    members-only portion of your site, or sending them members-only
-    e-mail messages.
-    """
-    name = StringField(max_length=80, unique=True, verbose_name=_('name'))
-    permissions = ListField(ReferenceField(Permission, verbose_name=_('permissions'), required=False))
-
-    class Meta:
-        verbose_name = _('group')
-        verbose_name_plural = _('groups')
-
-    def __unicode__(self):
-        return self.name
-
-
-class UserManager(models.Manager):
-    def create_user(self, username, email, password=None):
-        """
-        Creates and saves a User with the given username, e-mail and password.
-        """
-        now = datetime_now()
-
-        # Normalize the address by lowercasing the domain part of the email
-        # address.
-        try:
-            email_name, domain_part = email.strip().split('@', 1)
-        except ValueError:
-            pass
-        else:
-            email = '@'.join([email_name, domain_part.lower()])
-
-        user = self.model(username=username, email=email, is_staff=False,
-                          is_active=True, is_superuser=False, last_login=now,
-                          date_joined=now)
-
-        user.set_password(password)
-        user.save(using=self._db)
-        return user
-
-    def create_superuser(self, username, email, password):
-        u = self.create_user(username, email, password)
-        u.is_staff = True
-        u.is_active = True
-        u.is_superuser = True
-        u.save(using=self._db)
-        return u
-
-    def make_random_password(self, length=10, allowed_chars='abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'):
-        "Generates a random password with the given length and given allowed_chars"
-        # Note that default value of allowed_chars does not have "I" or letters
-        # that look like it -- just to avoid confusion.
-        from random import choice
-        return ''.join([choice(allowed_chars) for i in range(length)])
-
-
-class User(Document):
-    """A User document that aims to mirror most of the API specified by Django
-    at http://docs.djangoproject.com/en/dev/topics/auth/#users
-    """
-    username = StringField(max_length=30, required=True,
-                           verbose_name=_('username'),
-                           help_text=_("Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"))
-
-    first_name = StringField(max_length=30,
-                             verbose_name=_('first name'))
-
-    last_name = StringField(max_length=30,
-                            verbose_name=_('last name'))
-    email = EmailField(verbose_name=_('e-mail address'))
-    password = StringField(max_length=128,
-                           verbose_name=_('password'),
-                           help_text=_("Use '[algo]$[iterations]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."))
-    is_staff = BooleanField(default=False,
-                            verbose_name=_('staff status'),
-                            help_text=_("Designates whether the user can log into this admin site."))
-    is_active = BooleanField(default=True,
-                             verbose_name=_('active'),
-                             help_text=_("Designates whether this user should be treated as active. Unselect this instead of deleting accounts."))
-    is_superuser = BooleanField(default=False,
-                                verbose_name=_('superuser status'),
-                                help_text=_("Designates that this user has all permissions without explicitly assigning them."))
-    last_login = DateTimeField(default=datetime_now,
-                               verbose_name=_('last login'))
-    date_joined = DateTimeField(default=datetime_now,
-                                verbose_name=_('date joined'))
-
-    user_permissions = ListField(ReferenceField(Permission), verbose_name=_('user permissions'),
-                                                help_text=_('Permissions for the user.'))
-
-    USERNAME_FIELD = 'username'
-    REQUIRED_FIELDS = ['email']
-
-    meta = {
-        'allow_inheritance': True,
-        'indexes': [
-            {'fields': ['username'], 'unique': True, 'sparse': True}
-        ]
-    }
-
-    def __unicode__(self):
-        return self.username
-
-    def get_full_name(self):
-        """Returns the users first and last names, separated by a space.
-        """
-        full_name = u'%s %s' % (self.first_name or '', self.last_name or '')
-        return full_name.strip()
-
-    def is_anonymous(self):
-        return False
-
-    def is_authenticated(self):
-        return True
-
-    def set_password(self, raw_password):
-        """Sets the user's password - always use this rather than directly
-        assigning to :attr:`~mongoengine.django.auth.User.password` as the
-        password is hashed before storage.
-        """
-        self.password = make_password(raw_password)
-        self.save()
-        return self
-
-    def check_password(self, raw_password):
-        """Checks the user's password against a provided password - always use
-        this rather than directly comparing to
-        :attr:`~mongoengine.django.auth.User.password` as the password is
-        hashed before storage.
-        """
-        return check_password(raw_password, self.password)
-
-    @classmethod
-    def create_user(cls, username, password, email=None):
-        """Create (and save) a new user with the given username, password and
-        email address.
-        """
-        now = datetime_now()
-
-        # Normalize the address by lowercasing the domain part of the email
-        # address.
-        if email is not None:
-            try:
-                email_name, domain_part = email.strip().split('@', 1)
-            except ValueError:
-                pass
-            else:
-                email = '@'.join([email_name, domain_part.lower()])
-
-        user = cls(username=username, email=email, date_joined=now)
-        user.set_password(password)
-        user.save()
-        return user
-
-    def get_group_permissions(self, obj=None):
-        """
-        Returns a list of permission strings that this user has through his/her
-        groups. This method queries all available auth backends. If an object
-        is passed in, only permissions matching this object are returned.
-        """
-        permissions = set()
-        for backend in auth.get_backends():
-            if hasattr(backend, "get_group_permissions"):
-                permissions.update(backend.get_group_permissions(self, obj))
-        return permissions
-
-    def get_all_permissions(self, obj=None):
-        return _user_get_all_permissions(self, obj)
-
-    def has_perm(self, perm, obj=None):
-        """
-        Returns True if the user has the specified permission. This method
-        queries all available auth backends, but returns immediately if any
-        backend returns True. Thus, a user who has permission from a single
-        auth backend is assumed to have permission in general. If an object is
-        provided, permissions for this specific object are checked.
-        """
-
-        # Active superusers have all permissions.
-        if self.is_active and self.is_superuser:
-            return True
-
-        # Otherwise we need to check the backends.
-        return _user_has_perm(self, perm, obj)
-
-    def has_module_perms(self, app_label):
-        """
-        Returns True if the user has any permissions in the given app label.
-        Uses pretty much the same logic as has_perm, above.
-        """
-        # Active superusers have all permissions.
-        if self.is_active and self.is_superuser:
-            return True
-
-        return _user_has_module_perms(self, app_label)
-
-    def email_user(self, subject, message, from_email=None):
-        "Sends an e-mail to this User."
-        from django.core.mail import send_mail
-        send_mail(subject, message, from_email, [self.email])
-
-    def get_profile(self):
-        """
-        Returns site-specific profile for this user. Raises
-        SiteProfileNotAvailable if this site does not allow profiles.
-        """
-        if not hasattr(self, '_profile_cache'):
-            from django.conf import settings
-            if not getattr(settings, 'AUTH_PROFILE_MODULE', False):
-                raise SiteProfileNotAvailable('You need to set AUTH_PROFILE_MO'
-                                              'DULE in your project settings')
-            try:
-                app_label, model_name = settings.AUTH_PROFILE_MODULE.split('.')
-            except ValueError:
-                raise SiteProfileNotAvailable('app_label and model_name should'
-                        ' be separated by a dot in the AUTH_PROFILE_MODULE set'
-                        'ting')
-
-            try:
-                model = models.get_model(app_label, model_name)
-                if model is None:
-                    raise SiteProfileNotAvailable('Unable to load the profile '
-                        'model, check AUTH_PROFILE_MODULE in your project sett'
-                        'ings')
-                self._profile_cache = model._default_manager.using(self._state.db).get(user__id__exact=self.id)
-                self._profile_cache.user = self
-            except (ImportError, ImproperlyConfigured):
-                raise SiteProfileNotAvailable
-        return self._profile_cache
-
-
-class MongoEngineBackend(object):
-    """Authenticate using MongoEngine and mongoengine.django.auth.User.
-    """
-
-    supports_object_permissions = False
-    supports_anonymous_user = False
-    supports_inactive_user = False
-    _user_doc = False
-
-    def authenticate(self, username=None, password=None):
-        user = self.user_document.objects(username=username).first()
-        if user:
-            if password and user.check_password(password):
-                backend = auth.get_backends()[0]
-                user.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__)
-                return user
-        return None
-
-    def get_user(self, user_id):
-        return self.user_document.objects.with_id(user_id)
-
-    @property
-    def user_document(self):
-        if self._user_doc is False:
-            from .mongo_auth.models import get_user_document
-            self._user_doc = get_user_document()
-        return self._user_doc
-
-def get_user(userid):
-    """Returns a User object from an id (User.id). Django's equivalent takes
-    request, but taking an id instead leaves it up to the developer to store
-    the id in any way they want (session, signed cookie, etc.)
-    """
-    if not userid:
-        return AnonymousUser()
-    return MongoEngineBackend().get_user(userid) or AnonymousUser()
diff --git a/mongoengine/django/mongo_auth/__init__.py b/mongoengine/django/mongo_auth/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/mongoengine/django/mongo_auth/models.py b/mongoengine/django/mongo_auth/models.py
deleted file mode 100644
index ad4ceff8d..000000000
--- a/mongoengine/django/mongo_auth/models.py
+++ /dev/null
@@ -1,119 +0,0 @@
-from django.conf import settings
-from django.contrib.auth.hashers import make_password
-from django.contrib.auth.models import UserManager
-from django.core.exceptions import ImproperlyConfigured
-from django.db import models
-try:
-    from django.utils.module_loading import import_module
-except ImportError:
-    """Handle older versions of Django"""
-    from django.utils.importlib import import_module
-from django.utils.translation import ugettext_lazy as _
-
-
-__all__ = (
-    'get_user_document',
-)
-
-
-MONGOENGINE_USER_DOCUMENT = getattr(
-    settings, 'MONGOENGINE_USER_DOCUMENT', 'mongoengine.django.auth.User')
-
-
-def get_user_document():
-    """Get the user document class used for authentication.
-
-    This is the class defined in settings.MONGOENGINE_USER_DOCUMENT, which
-    defaults to `mongoengine.django.auth.User`.
-
-    """
-
-    name = MONGOENGINE_USER_DOCUMENT
-    dot = name.rindex('.')
-    module = import_module(name[:dot])
-    return getattr(module, name[dot + 1:])
-
-
-class MongoUserManager(UserManager):
-    """A User manager wich allows the use of MongoEngine documents in Django.
-
-    To use the manager, you must tell django.contrib.auth to use MongoUser as
-    the user model. In you settings.py, you need:
-
-        INSTALLED_APPS = (
-            ...
-            'django.contrib.auth',
-            'mongoengine.django.mongo_auth',
-            ...
-        )
-        AUTH_USER_MODEL = 'mongo_auth.MongoUser'
-
-    Django will use the model object to access the custom Manager, which will
-    replace the original queryset with MongoEngine querysets.
-
-    By default, mongoengine.django.auth.User will be used to store users. You
-    can specify another document class in MONGOENGINE_USER_DOCUMENT in your
-    settings.py.
-
-    The User Document class has the same requirements as a standard custom user
-    model: https://docs.djangoproject.com/en/dev/topics/auth/customizing/
-
-    In particular, the User Document class must define USERNAME_FIELD and
-    REQUIRED_FIELDS.
-
-    `AUTH_USER_MODEL` has been added in Django 1.5.
-
-    """
-
-    def contribute_to_class(self, model, name):
-        super(MongoUserManager, self).contribute_to_class(model, name)
-        self.dj_model = self.model
-        self.model = get_user_document()
-
-        self.dj_model.USERNAME_FIELD = self.model.USERNAME_FIELD
-        username = models.CharField(_('username'), max_length=30, unique=True)
-        username.contribute_to_class(self.dj_model, self.dj_model.USERNAME_FIELD)
-
-        self.dj_model.REQUIRED_FIELDS = self.model.REQUIRED_FIELDS
-        for name in self.dj_model.REQUIRED_FIELDS:
-            field = models.CharField(_(name), max_length=30)
-            field.contribute_to_class(self.dj_model, name)
-
-
-    def get(self, *args, **kwargs):
-        try:
-            return self.get_query_set().get(*args, **kwargs)
-        except self.model.DoesNotExist:
-            # ModelBackend expects this exception
-            raise self.dj_model.DoesNotExist
-
-    @property
-    def db(self):
-        raise NotImplementedError
-
-    def get_empty_query_set(self):
-        return self.model.objects.none()
-
-    def get_query_set(self):
-        return self.model.objects
-
-
-class MongoUser(models.Model):
-    """"Dummy user model for Django.
-
-    MongoUser is used to replace Django's UserManager with MongoUserManager.
-    The actual user document class is mongoengine.django.auth.User or any
-    other document class specified in MONGOENGINE_USER_DOCUMENT.
-
-    To get the user document class, use `get_user_document()`.
-
-    """
-
-    objects = MongoUserManager()
-
-    class Meta:
-        app_label = 'mongo_auth'
-
-    def set_password(self, password):
-        """Doesn't do anything, but works around the issue with Django 1.6."""
-        make_password(password)
diff --git a/mongoengine/django/sessions.py b/mongoengine/django/sessions.py
deleted file mode 100644
index f260951be..000000000
--- a/mongoengine/django/sessions.py
+++ /dev/null
@@ -1,124 +0,0 @@
-from bson import json_util
-from django.conf import settings
-from django.contrib.sessions.backends.base import SessionBase, CreateError
-from django.core.exceptions import SuspiciousOperation
-try:
-    from django.utils.encoding import force_unicode
-except ImportError:
-    from django.utils.encoding import force_text as force_unicode
-
-from mongoengine.document import Document
-from mongoengine import fields
-from mongoengine.queryset import OperationError
-from mongoengine.connection import DEFAULT_CONNECTION_NAME
-
-from .utils import datetime_now
-
-
-MONGOENGINE_SESSION_DB_ALIAS = getattr(
-    settings, 'MONGOENGINE_SESSION_DB_ALIAS',
-    DEFAULT_CONNECTION_NAME)
-
-# a setting for the name of the collection used to store sessions
-MONGOENGINE_SESSION_COLLECTION = getattr(
-    settings, 'MONGOENGINE_SESSION_COLLECTION',
-    'django_session')
-
-# a setting for whether session data is stored encoded or not
-MONGOENGINE_SESSION_DATA_ENCODE = getattr(
-    settings, 'MONGOENGINE_SESSION_DATA_ENCODE',
-    True)
-
-
-class MongoSession(Document):
-    session_key = fields.StringField(primary_key=True, max_length=40)
-    session_data = fields.StringField() if MONGOENGINE_SESSION_DATA_ENCODE \
-                                        else fields.DictField()
-    expire_date = fields.DateTimeField()
-
-    meta = {
-        'collection': MONGOENGINE_SESSION_COLLECTION,
-        'db_alias': MONGOENGINE_SESSION_DB_ALIAS,
-        'allow_inheritance': False,
-        'indexes': [
-            {
-                'fields': ['expire_date'],
-                'expireAfterSeconds': 0
-            }
-        ]
-    }
-
-    def get_decoded(self):
-        return SessionStore().decode(self.session_data)
-
-
-class SessionStore(SessionBase):
-    """A MongoEngine-based session store for Django.
-    """
-
-    def _get_session(self, *args, **kwargs):
-        sess = super(SessionStore, self)._get_session(*args, **kwargs)
-        if sess.get('_auth_user_id', None):
-            sess['_auth_user_id'] = str(sess.get('_auth_user_id'))
-        return sess
-
-    def load(self):
-        try:
-            s = MongoSession.objects(session_key=self.session_key,
-                                     expire_date__gt=datetime_now)[0]
-            if MONGOENGINE_SESSION_DATA_ENCODE:
-                return self.decode(force_unicode(s.session_data))
-            else:
-                return s.session_data
-        except (IndexError, SuspiciousOperation):
-            self.create()
-            return {}
-
-    def exists(self, session_key):
-        return bool(MongoSession.objects(session_key=session_key).first())
-
-    def create(self):
-        while True:
-            self._session_key = self._get_new_session_key()
-            try:
-                self.save(must_create=True)
-            except CreateError:
-                continue
-            self.modified = True
-            self._session_cache = {}
-            return
-
-    def save(self, must_create=False):
-        if self.session_key is None:
-            self._session_key = self._get_new_session_key()
-        s = MongoSession(session_key=self.session_key)
-        if MONGOENGINE_SESSION_DATA_ENCODE:
-            s.session_data = self.encode(self._get_session(no_load=must_create))
-        else:
-            s.session_data = self._get_session(no_load=must_create)
-        s.expire_date = self.get_expiry_date()
-        try:
-            s.save(force_insert=must_create)
-        except OperationError:
-            if must_create:
-                raise CreateError
-            raise
-
-    def delete(self, session_key=None):
-        if session_key is None:
-            if self.session_key is None:
-                return
-            session_key = self.session_key
-        MongoSession.objects(session_key=session_key).delete()
-
-
-class BSONSerializer(object):
-    """
-    Serializer that can handle BSON types (eg ObjectId).
-    """
-    def dumps(self, obj):
-        return json_util.dumps(obj, separators=(',', ':')).encode('ascii')
-
-    def loads(self, data):
-        return json_util.loads(data.decode('ascii'))
-
diff --git a/mongoengine/django/shortcuts.py b/mongoengine/django/shortcuts.py
deleted file mode 100644
index 9cc8370b0..000000000
--- a/mongoengine/django/shortcuts.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from mongoengine.queryset import QuerySet
-from mongoengine.base import BaseDocument
-from mongoengine.errors import ValidationError
-
-def _get_queryset(cls):
-    """Inspired by django.shortcuts.*"""
-    if isinstance(cls, QuerySet):
-        return cls
-    else:
-        return cls.objects
-
-def get_document_or_404(cls, *args, **kwargs):
-    """
-    Uses get() to return an document, or raises a Http404 exception if the document
-    does not exist.
-
-    cls may be a Document or QuerySet object. All other passed
-    arguments and keyword arguments are used in the get() query.
-
-    Note: Like with get(), an MultipleObjectsReturned will be raised if more than one
-    object is found.
-
-    Inspired by django.shortcuts.*
-    """
-    queryset = _get_queryset(cls)
-    try:
-        return queryset.get(*args, **kwargs)
-    except (queryset._document.DoesNotExist, ValidationError):
-        from django.http import Http404
-        raise Http404('No %s matches the given query.' % queryset._document._class_name)
-
-def get_list_or_404(cls, *args, **kwargs):
-    """
-    Uses filter() to return a list of documents, or raise a Http404 exception if
-    the list is empty.
-
-    cls may be a Document or QuerySet object. All other passed
-    arguments and keyword arguments are used in the filter() query.
-
-    Inspired by django.shortcuts.*
-    """
-    queryset = _get_queryset(cls)
-    obj_list = list(queryset.filter(*args, **kwargs))
-    if not obj_list:
-        from django.http import Http404
-        raise Http404('No %s matches the given query.' % queryset._document._class_name)
-    return obj_list
diff --git a/mongoengine/django/storage.py b/mongoengine/django/storage.py
deleted file mode 100644
index 9df6f9e80..000000000
--- a/mongoengine/django/storage.py
+++ /dev/null
@@ -1,112 +0,0 @@
-import os
-import itertools
-import urlparse
-
-from mongoengine import *
-from django.conf import settings
-from django.core.files.storage import Storage
-from django.core.exceptions import ImproperlyConfigured
-
-
-class FileDocument(Document):
-    """A document used to store a single file in GridFS.
-    """
-    file = FileField()
-
-
-class GridFSStorage(Storage):
-    """A custom storage backend to store files in GridFS
-    """
-
-    def __init__(self, base_url=None):
-
-        if base_url is None:
-            base_url = settings.MEDIA_URL
-        self.base_url = base_url
-        self.document = FileDocument
-        self.field = 'file'
-
-    def delete(self, name):
-        """Deletes the specified file from the storage system.
-        """
-        if self.exists(name):
-            doc = self.document.objects.first()
-            field = getattr(doc, self.field)
-            self._get_doc_with_name(name).delete()  # Delete the FileField
-            field.delete()                          # Delete the FileDocument
-
-    def exists(self, name):
-        """Returns True if a file referened by the given name already exists in the
-        storage system, or False if the name is available for a new file.
-        """
-        doc = self._get_doc_with_name(name)
-        if doc:
-            field = getattr(doc, self.field)
-            return bool(field.name)
-        else:
-            return False
-
-    def listdir(self, path=None):
-        """Lists the contents of the specified path, returning a 2-tuple of lists;
-        the first item being directories, the second item being files.
-        """
-        def name(doc):
-            return getattr(doc, self.field).name
-        docs = self.document.objects
-        return [], [name(d) for d in docs if name(d)]
-
-    def size(self, name):
-        """Returns the total size, in bytes, of the file specified by name.
-        """
-        doc = self._get_doc_with_name(name)
-        if doc:
-            return getattr(doc, self.field).length
-        else:
-            raise ValueError("No such file or directory: '%s'" % name)
-
-    def url(http://github.com/self,%20name):
-        """Returns an absolute URL where the file's contents can be accessed
-        directly by a web browser.
-        """
-        if self.base_url is None:
-            raise ValueError("This file is not accessible via a URL.")
-        return urlparse.urljoin(self.base_url, name).replace('\\', '/')
-
-    def _get_doc_with_name(self, name):
-        """Find the documents in the store with the given name
-        """
-        docs = self.document.objects
-        doc = [d for d in docs if hasattr(getattr(d, self.field), 'name') and getattr(d, self.field).name == name]
-        if doc:
-            return doc[0]
-        else:
-            return None
-
-    def _open(self, name, mode='rb'):
-        doc = self._get_doc_with_name(name)
-        if doc:
-            return getattr(doc, self.field)
-        else:
-            raise ValueError("No file found with the name '%s'." % name)
-
-    def get_available_name(self, name):
-        """Returns a filename that's free on the target storage system, and
-        available for new content to be written to.
-        """
-        file_root, file_ext = os.path.splitext(name)
-        # If the filename already exists, add an underscore and a number (before
-        # the file extension, if one exists) to the filename until the generated
-        # filename doesn't exist.
-        count = itertools.count(1)
-        while self.exists(name):
-            # file_ext includes the dot.
-            name = os.path.join("%s_%s%s" % (file_root, count.next(), file_ext))
-
-        return name
-
-    def _save(self, name, content):
-        doc = self.document()
-        getattr(doc, self.field).put(content, filename=name)
-        doc.save()
-
-        return name
diff --git a/mongoengine/django/tests.py b/mongoengine/django/tests.py
deleted file mode 100644
index b130acc82..000000000
--- a/mongoengine/django/tests.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#coding: utf-8
-
-from unittest import TestCase
-
-from mongoengine import connect
-from mongoengine.connection import get_db
-
-
-class MongoTestCase(TestCase):
-    """
-    TestCase class that clear the collection between the tests
-    """
-
-    @property
-    def db_name(self):
-        from django.conf import settings
-        return 'test_%s' % getattr(settings, 'MONGO_DATABASE_NAME', 'dummy')
-
-    def __init__(self, methodName='runtest'):
-        connect(self.db_name)
-        self.db = get_db()
-        super(MongoTestCase, self).__init__(methodName)
-
-    def dropCollections(self):
-        for collection in self.db.collection_names():
-            if collection.startswith('system.'):
-                continue
-            self.db.drop_collection(collection)
-
-    def tearDown(self):
-        self.dropCollections()
diff --git a/mongoengine/django/utils.py b/mongoengine/django/utils.py
deleted file mode 100644
index d3ef8a4b7..000000000
--- a/mongoengine/django/utils.py
+++ /dev/null
@@ -1,6 +0,0 @@
-try:
-    # django >= 1.4
-    from django.utils.timezone import now as datetime_now
-except ImportError:
-    from datetime import datetime
-    datetime_now = datetime.now
diff --git a/setup.py b/setup.py
index 88519788e..3ae5aeacf 100644
--- a/setup.py
+++ b/setup.py
@@ -53,12 +53,12 @@ def get_version(version_tuple):
 extra_opts = {"packages": find_packages(exclude=["tests", "tests.*"])}
 if sys.version_info[0] == 3:
     extra_opts['use_2to3'] = True
-    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'jinja2==2.6', 'Pillow>=2.0.0', 'django>=1.5.1']
+    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'Pillow>=2.0.0']
     if "test" in sys.argv or "nosetests" in sys.argv:
         extra_opts['packages'] = find_packages()
         extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]}
 else:
-    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'django>=1.4.2', 'Pillow>=2.0.0', 'jinja2>=2.6', 'python-dateutil']
+    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
 
     if sys.version_info[0] == 2 and sys.version_info[1] == 6:
         extra_opts['tests_require'].append('unittest2')
diff --git a/tests/test_django.py b/tests/test_django.py
deleted file mode 100644
index cb7efe6f1..000000000
--- a/tests/test_django.py
+++ /dev/null
@@ -1,330 +0,0 @@
-import sys
-sys.path[0:0] = [""]
-import unittest
-from nose.plugins.skip import SkipTest
-
-from mongoengine import *
-from mongoengine.django.shortcuts import get_document_or_404
-
-import django
-from django.http import Http404
-from django.template import Context, Template
-from django.conf import settings
-from django.core.paginator import Paginator
-
-settings.configure(
-    USE_TZ=True,
-    INSTALLED_APPS=('django.contrib.auth', 'mongoengine.django.mongo_auth'),
-    AUTH_USER_MODEL=('mongo_auth.MongoUser'),
-    AUTHENTICATION_BACKENDS = ('mongoengine.django.auth.MongoEngineBackend',)
-)
-
-try:
-    # For Django >= 1.7
-    if hasattr(django, 'setup'):
-        django.setup()
-except RuntimeError:
-    pass
-
-try:
-    from django.contrib.auth import authenticate, get_user_model
-    from mongoengine.django.auth import User
-    from mongoengine.django.mongo_auth.models import (
-        MongoUser,
-        MongoUserManager,
-        get_user_document,
-    )
-    DJ15 = True
-except Exception:
-    DJ15 = False
-from mongoengine.django.sessions import SessionStore, MongoSession
-from mongoengine.django.tests import MongoTestCase
-from datetime import tzinfo, timedelta
-ZERO = timedelta(0)
-
-
-class FixedOffset(tzinfo):
-    """Fixed offset in minutes east from UTC."""
-
-    def __init__(self, offset, name):
-        self.__offset = timedelta(minutes=offset)
-        self.__name = name
-
-    def utcoffset(self, dt):
-        return self.__offset
-
-    def tzname(self, dt):
-        return self.__name
-
-    def dst(self, dt):
-        return ZERO
-
-
-def activate_timezone(tz):
-    """Activate Django timezone support if it is available.
-    """
-    try:
-        from django.utils import timezone
-        timezone.deactivate()
-        timezone.activate(tz)
-    except ImportError:
-        pass
-
-
-class QuerySetTest(unittest.TestCase):
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-        self.Person = Person
-
-    def test_order_by_in_django_template(self):
-        """Ensure that QuerySets are properly ordered in Django template.
-        """
-        self.Person.drop_collection()
-
-        self.Person(name="A", age=20).save()
-        self.Person(name="D", age=10).save()
-        self.Person(name="B", age=40).save()
-        self.Person(name="C", age=30).save()
-
-        t = Template("{% for o in ol %}{{ o.name }}-{{ o.age }}:{% endfor %}")
-
-        d = {"ol": self.Person.objects.order_by('-name')}
-        self.assertEqual(t.render(Context(d)), u'D-10:C-30:B-40:A-20:')
-        d = {"ol": self.Person.objects.order_by('+name')}
-        self.assertEqual(t.render(Context(d)), u'A-20:B-40:C-30:D-10:')
-        d = {"ol": self.Person.objects.order_by('-age')}
-        self.assertEqual(t.render(Context(d)), u'B-40:C-30:A-20:D-10:')
-        d = {"ol": self.Person.objects.order_by('+age')}
-        self.assertEqual(t.render(Context(d)), u'D-10:A-20:C-30:B-40:')
-
-        self.Person.drop_collection()
-
-    def test_q_object_filter_in_template(self):
-
-        self.Person.drop_collection()
-
-        self.Person(name="A", age=20).save()
-        self.Person(name="D", age=10).save()
-        self.Person(name="B", age=40).save()
-        self.Person(name="C", age=30).save()
-
-        t = Template("{% for o in ol %}{{ o.name }}-{{ o.age }}:{% endfor %}")
-
-        d = {"ol": self.Person.objects.filter(Q(age=10) | Q(name="C"))}
-        self.assertEqual(t.render(Context(d)), 'D-10:C-30:')
-
-        # Check double rendering doesn't throw an error
-        self.assertEqual(t.render(Context(d)), 'D-10:C-30:')
-
-    def test_get_document_or_404(self):
-        p = self.Person(name="G404")
-        p.save()
-
-        self.assertRaises(Http404, get_document_or_404, self.Person, pk='1234')
-        self.assertEqual(p, get_document_or_404(self.Person, pk=p.pk))
-
-    def test_pagination(self):
-        """Ensure that Pagination works as expected
-        """
-        class Page(Document):
-            name = StringField()
-
-        Page.drop_collection()
-
-        for i in xrange(1, 11):
-            Page(name=str(i)).save()
-
-        paginator = Paginator(Page.objects.all(), 2)
-
-        t = Template("{% for i in page.object_list  %}{{ i.name }}:{% endfor %}")
-        for p in paginator.page_range:
-            d = {"page": paginator.page(p)}
-            end = p * 2
-            start = end - 1
-            self.assertEqual(t.render(Context(d)), u'%d:%d:' % (start, end))
-
-    def test_nested_queryset_template_iterator(self):
-        # Try iterating the same queryset twice, nested, in a Django template.
-        names = ['A', 'B', 'C', 'D']
-
-        class CustomUser(Document):
-            name = StringField()
-
-            def __unicode__(self):
-                return self.name
-
-        CustomUser.drop_collection()
-
-        for name in names:
-            CustomUser(name=name).save()
-
-        users = CustomUser.objects.all().order_by('name')
-        template = Template("{% for user in users %}{{ user.name }}{% ifequal forloop.counter 2 %} {% for inner_user in users %}{{ inner_user.name }}{% endfor %} {% endifequal %}{% endfor %}")
-        rendered = template.render(Context({'users': users}))
-        self.assertEqual(rendered, 'AB ABCD CD')
-
-    def test_filter(self):
-        """Ensure that a queryset and filters work as expected
-        """
-
-        class LimitCountQuerySet(QuerySet):
-            def count(self, with_limit_and_skip=True):
-                return super(LimitCountQuerySet, self).count(with_limit_and_skip)
-
-        class Note(Document):
-            meta = dict(queryset_class=LimitCountQuerySet)
-            name = StringField()
-
-        Note.drop_collection()
-
-        for i in xrange(1, 101):
-            Note(name="Note: %s" % i).save()
-
-        # Check the count
-        self.assertEqual(Note.objects.count(), 100)
-
-        # Get the first 10 and confirm
-        notes = Note.objects[:10]
-        self.assertEqual(notes.count(), 10)
-
-        # Test djangos template filters
-        # self.assertEqual(length(notes), 10)
-        t = Template("{{ notes.count }}")
-        c = Context({"notes": notes})
-        self.assertEqual(t.render(c), "10")
-
-        # Test with skip
-        notes = Note.objects.skip(90)
-        self.assertEqual(notes.count(), 10)
-
-        # Test djangos template filters
-        self.assertEqual(notes.count(), 10)
-        t = Template("{{ notes.count }}")
-        c = Context({"notes": notes})
-        self.assertEqual(t.render(c), "10")
-
-        # Test with limit
-        notes = Note.objects.skip(90)
-        self.assertEqual(notes.count(), 10)
-
-        # Test djangos template filters
-        self.assertEqual(notes.count(), 10)
-        t = Template("{{ notes.count }}")
-        c = Context({"notes": notes})
-        self.assertEqual(t.render(c), "10")
-
-        # Test with skip and limit
-        notes = Note.objects.skip(10).limit(10)
-
-        # Test djangos template filters
-        self.assertEqual(notes.count(), 10)
-        t = Template("{{ notes.count }}")
-        c = Context({"notes": notes})
-        self.assertEqual(t.render(c), "10")
-
-
-class _BaseMongoDBSessionTest(unittest.TestCase):
-    backend = SessionStore
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-        MongoSession.drop_collection()
-        super(_BaseMongoDBSessionTest, self).setUp()
-
-    def assertIn(self, first, second, msg=None):
-        self.assertTrue(first in second, msg)
-
-    def assertNotIn(self, first, second, msg=None):
-        self.assertFalse(first in second, msg)
-
-    def test_first_save(self):
-        session = SessionStore()
-        session['test'] = True
-        session.save()
-        self.assertTrue('test' in session)
-
-    def test_session_expiration_tz(self):
-        activate_timezone(FixedOffset(60, 'UTC+1'))
-        # create and save new session
-        session = SessionStore()
-        session.set_expiry(600)  # expire in 600 seconds
-        session['test_expire'] = True
-        session.save()
-        # reload session with key
-        key = session.session_key
-        session = SessionStore(key)
-        self.assertTrue('test_expire' in session, 'Session has expired before it is expected')
-
-
-try:
-    # SessionTestsMixin isn't available for import on django > 1.8a1
-    from django.contrib.sessions.tests import SessionTestsMixin
-
-    class _MongoDBSessionTest(SessionTestsMixin):
-        pass
-
-    class MongoDBSessionTest(_BaseMongoDBSessionTest):
-        pass
-
-except ImportError:
-    class MongoDBSessionTest(_BaseMongoDBSessionTest):
-        pass
-
-
-class MongoAuthTest(unittest.TestCase):
-    user_data = {
-        'username': 'user',
-        'email': 'user@example.com',
-        'password': 'test',
-    }
-
-    def setUp(self):
-        if not DJ15:
-            raise SkipTest('mongo_auth requires Django 1.5')
-        connect(db='mongoenginetest')
-        User.drop_collection()
-        super(MongoAuthTest, self).setUp()
-
-    def test_get_user_model(self):
-        self.assertEqual(get_user_model(), MongoUser)
-
-    def test_get_user_document(self):
-        self.assertEqual(get_user_document(), User)
-
-    def test_user_manager(self):
-        manager = get_user_model()._default_manager
-        self.assertTrue(isinstance(manager, MongoUserManager))
-
-    def test_user_manager_exception(self):
-        manager = get_user_model()._default_manager
-        self.assertRaises(MongoUser.DoesNotExist, manager.get,
-                          username='not found')
-
-    def test_create_user(self):
-        manager = get_user_model()._default_manager
-        user = manager.create_user(**self.user_data)
-        self.assertTrue(isinstance(user, User))
-        db_user = User.objects.get(username='user')
-        self.assertEqual(user.id, db_user.id)
-
-    def test_authenticate(self):
-        get_user_model()._default_manager.create_user(**self.user_data)
-        user = authenticate(username='user', password='fail')
-        self.assertEqual(None, user)
-        user = authenticate(username='user', password='test')
-        db_user = User.objects.get(username='user')
-        self.assertEqual(user.id, db_user.id)
-
-
-class MongoTestCaseTest(MongoTestCase):
-    def test_mongo_test_case(self):
-        self.db.dummy_collection.insert({'collection': 'will be dropped'})
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/test_jinja.py b/tests/test_jinja.py
deleted file mode 100644
index 0449f8688..000000000
--- a/tests/test_jinja.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import sys
-sys.path[0:0] = [""]
-
-import unittest
-
-from mongoengine import *
-
-import jinja2
-
-
-class TemplateFilterTest(unittest.TestCase):
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-
-    def test_jinja2(self):
-        env = jinja2.Environment()
-
-        class TestData(Document):
-            title = StringField()
-            description = StringField()
-
-        TestData.drop_collection()
-
-        examples = [('A', '1'),
-                    ('B', '2'),
-                    ('C', '3')]
-
-        for title, description in examples:
-            TestData(title=title, description=description).save()
-
-        tmpl = """
-{%- for record in content -%}
-    {%- if loop.first -%}{ {%- endif -%}
-    "{{ record.title }}": "{{ record.description }}"
-    {%- if loop.last -%} }{%- else -%},{% endif -%}
-{%- endfor -%}
-"""
-        ctx = {'content': TestData.objects}
-        template = env.from_string(tmpl)
-        rendered = template.render(**ctx)
-
-        self.assertEqual('{"A": "1","B": "2","C": "3"}', rendered)
-
-
-if __name__ == '__main__':
-    unittest.main()

From 6eb0bc50e237fb47e0ffa97b9d79c1cccd3bc61a Mon Sep 17 00:00:00 2001
From: RussellLuo <luopeng.he@gmail.com>
Date: Sat, 25 Apr 2015 08:01:24 +0800
Subject: [PATCH 0097/1519] Add a test for "authSource" feature

---
 tests/test_connection.py | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 2b3258430..aa7d59603 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -11,7 +11,10 @@
 import pymongo
 from bson.tz_util import utc
 
-from mongoengine import *
+from mongoengine import (
+    connect, register_connection,
+    Document, DateTimeField
+)
 import mongoengine.connection
 from mongoengine.connection import get_db, get_connection, ConnectionError
 
@@ -101,6 +104,38 @@ def test_connect_uri_without_db(self):
         c.admin.system.users.remove({})
         c.mongoenginetest.system.users.remove({})
 
+    def test_connect_uri_with_authsource(self):
+        """Ensure that the connect() method works well with
+        the option `authSource` in URI.
+        """
+        # Create users
+        c = connect(db='mongoenginetest', alias='test')
+        c.admin.system.users.remove({})
+        c.admin.add_user('username', 'password')
+
+        # Authentication fails without "authSource"
+        self.assertRaises(
+            ConnectionError, connect, 'mongoenginetest',
+            host='mongodb://username:password@localhost/mongoenginetest'
+        )
+
+        # Authentication succeeds with "authSource"
+        connect(
+            'mongoenginetest',
+            host=('mongodb://username:password@localhost/'
+                  'mongoenginetest?authSource=admin')
+        )
+
+        conn = get_connection('test')
+        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+
+        db = get_db('test')
+        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertEqual(db.name, 'mongoenginetest')
+
+        # Clear all users
+        c.admin.system.users.remove({})
+
     def test_register_connection(self):
         """Ensure that connections with different aliases may be registered.
         """

From b847bc0abab9cfaece3bbf17dbd5947875cbcc02 Mon Sep 17 00:00:00 2001
From: RussellLuo <luopeng.he@gmail.com>
Date: Sat, 25 Apr 2015 10:22:24 +0800
Subject: [PATCH 0098/1519] Make `test_connect_uri_with_authsource` to focus on
 the key point

---
 tests/test_connection.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index aa7d59603..9204d80cc 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -109,27 +109,24 @@ def test_connect_uri_with_authsource(self):
         the option `authSource` in URI.
         """
         # Create users
-        c = connect(db='mongoenginetest', alias='test')
+        c = connect('mongoenginetest')
         c.admin.system.users.remove({})
         c.admin.add_user('username', 'password')
 
         # Authentication fails without "authSource"
         self.assertRaises(
-            ConnectionError, connect, 'mongoenginetest',
+            ConnectionError, connect, 'mongoenginetest', alias='test1',
             host='mongodb://username:password@localhost/mongoenginetest'
         )
+        self.assertRaises(ConnectionError, get_db, 'test1')
 
         # Authentication succeeds with "authSource"
         connect(
-            'mongoenginetest',
+            'mongoenginetest', alias='test2',
             host=('mongodb://username:password@localhost/'
                   'mongoenginetest?authSource=admin')
         )
-
-        conn = get_connection('test')
-        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
-
-        db = get_db('test')
+        db = get_db('test2')
         self.assertTrue(isinstance(db, pymongo.database.Database))
         self.assertEqual(db.name, 'mongoenginetest')
 

From 27111e7b29e1b8918c6b52d0a79a1fdc72301e96 Mon Sep 17 00:00:00 2001
From: RussellLuo <luopeng.he@gmail.com>
Date: Sat, 25 Apr 2015 20:57:26 +0800
Subject: [PATCH 0099/1519] Update changelog for added `authSource` support

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3dbcc2f87..40df04194 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Added support for specifying authentication source as option `authSource` in URI. #967
 - Fixed mark_as_changed to handle higher/lower level fields changed. #927
 - ListField of embedded docs doesn't set the _instance attribute when iterating over it #914
 - Support += and *= for ListField #595

From d737fca295c7469e5adc3511b0abc5e44c8c1001 Mon Sep 17 00:00:00 2001
From: Eli Boyarski <eli.boyarski@gmail.com>
Date: Sun, 26 Apr 2015 17:23:13 +0300
Subject: [PATCH 0100/1519] Spelling

---
 mongoengine/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 3c1db4ac3..5498392d2 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1016,7 +1016,7 @@ def lookup_member(self, member_name):
 class CachedReferenceField(BaseField):
 
     """
-    A referencefield with cache fields to porpuse pseudo-joins
+    A referencefield with cache fields to purpose pseudo-joins
     .. versionadded:: 0.9
     """
 

From 1a0cad7f5f0c661f4fdf2ae7cd21ab756c2cf428 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <seglberg@gmail.com>
Date: Tue, 28 Apr 2015 10:02:39 -0400
Subject: [PATCH 0101/1519] Updated Django Support Documentation

Added "Call to Arms" for new Django Extension.
---
 docs/django.rst | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/django.rst b/docs/django.rst
index 4b9a04bdb..6982fe64b 100644
--- a/docs/django.rst
+++ b/docs/django.rst
@@ -2,5 +2,18 @@
 Django Support
 ==============
 
-.. note:: Django support has been split from MongoEngine and will be available on Github as a separate module. `See Here <https://github.com/MongoEngine/django-mongoengine>`_.
+.. note:: Django support has been split from the main MongoEngine
+    repository. The *legacy* Django extension may be found bundled with the
+    0.9 release of MongoEngine.
 
+
+
+Help Wanted!
+------------
+
+The MongoEngine team is looking for help contributing and maintaining a new
+Django extension for MongoEngine! If you have Django experience and would like
+to help contribute to the project, please get in touch on the 
+`mailing list <http://groups.google.com/group/mongoengine-users>`_ or by 
+simpily contributing on 
+`GitHub <https://github.com/MongoEngine/django-mongoengine>`_.

From 57f301815dcddbb896b18701959458421b1e3097 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Thu, 16 Apr 2015 14:09:32 +0200
Subject: [PATCH 0102/1519] Added a tox.ini file allowing to test with
 different versions

---
 tox.ini | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 tox.ini

diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000..6a3e0600d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,17 @@
+[tox]
+envlist =
+    {py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30}-{dj15,dj16,dj17,djdev},
+    py26-{mg27,mg28,mg30}-{dj15,dj16}
+
+[testenv]
+commands =
+    python setup.py test
+deps =
+    mg27: PyMongo<2.8
+    mg28: PyMongo>=2.8,<3.0
+    mg30: PyMongo>=3.0
+    mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
+    dj15: Django<1.6
+    dj16: Django>=1.6,<1.7
+    dj17: Django>=1.7,<1.8
+    djdev: https://github.com/django/django/tarball/master

From 8e8d9426df25536ce4b6aa6f18c7b45821f2ca73 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Thu, 16 Apr 2015 14:26:19 +0200
Subject: [PATCH 0103/1519] Document about tox testing

---
 CONTRIBUTING.rst |  2 ++
 README.rst       | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 8754896ad..0ad7fd5cd 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -46,6 +46,8 @@ General Guidelines
 - Write tests and make sure they pass (make sure you have a mongod
   running on the default port, then execute ``python setup.py test``
   from the cmd line to run the test suite).
+- Ensure tests pass on every Python and PyMongo versions.
+  You can test on these versions locally by executing ``tox``
 - Add yourself to AUTHORS :)
 
 Documentation
diff --git a/README.rst b/README.rst
index 1d01d8b72..59fbe1944 100644
--- a/README.rst
+++ b/README.rst
@@ -8,10 +8,10 @@ MongoEngine
 
 .. image:: https://secure.travis-ci.org/MongoEngine/mongoengine.png?branch=master
   :target: http://travis-ci.org/MongoEngine/mongoengine
-  
-.. image:: https://coveralls.io/repos/MongoEngine/mongoengine/badge.png?branch=master 
+
+.. image:: https://coveralls.io/repos/MongoEngine/mongoengine/badge.png?branch=master
   :target: https://coveralls.io/r/MongoEngine/mongoengine?branch=master
-  
+
 .. image:: https://landscape.io/github/MongoEngine/mongoengine/master/landscape.png
    :target: https://landscape.io/github/MongoEngine/mongoengine/master
    :alt: Code Health
@@ -98,6 +98,17 @@ Tests
 To run the test suite, ensure you are running a local instance of MongoDB on
 the standard port, and run: ``python setup.py test``.
 
+To run the test suite on every supported Python version and every supported PyMongo version,
+you can use ``tox``.
+tox and each supported Python version should be installed in your environment:
+
+.. code-block:: shell
+
+    # Install tox
+    $ pip install tox
+    # Run the test suites
+    $ tox
+
 Community
 =========
 - `MongoEngine Users mailing list

From 02c1ba39ad8a5cfbb27f51ef1844e3afd9f9d570 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Thu, 16 Apr 2015 16:13:01 +0200
Subject: [PATCH 0104/1519] Added Django 1.8 to tox

---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 6a3e0600d..61692f7c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    {py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30}-{dj15,dj16,dj17,djdev},
+    {py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30}-{dj15,dj16,dj17,dj18,djdev},
     py26-{mg27,mg28,mg30}-{dj15,dj16}
 
 [testenv]
@@ -14,4 +14,5 @@ deps =
     dj15: Django<1.6
     dj16: Django>=1.6,<1.7
     dj17: Django>=1.7,<1.8
+    dj18: Django>=1.8,<1.9
     djdev: https://github.com/django/django/tarball/master

From aa7bf7af1e7228c169fc788f3196966700c7055a Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Fri, 17 Apr 2015 10:36:26 +0200
Subject: [PATCH 0105/1519] adapted setup.cfg to use nosetests standard and
 allow usage of --tests argument, documenting it in the readme

---
 README.rst | 5 +++++
 setup.cfg  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 59fbe1944..6e32d3f35 100644
--- a/README.rst
+++ b/README.rst
@@ -109,6 +109,11 @@ tox and each supported Python version should be installed in your environment:
     # Run the test suites
     $ tox
 
+If you wish to run one single or selected tests, use the nosetest convention. It will find the folder,
+eventually the file, go to the TestClass specified after the colon and eventually right to the single test.
+Also use the -s argument if you want to print out whatever or access pdb while testing.
+``python setup.py nosetests --tests tests/test_django.py:QuerySetTest.test_get_document_or_404 -s``
+
 Community
 =========
 - `MongoEngine Users mailing list
diff --git a/setup.cfg b/setup.cfg
index 3f3faa8ca..2ee0f4992 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,5 +7,6 @@ detailed-errors = 1
 #cover-html-dir = ../htmlcov
 #cover-package = mongoengine
 py3where = build
-where = tests
+#where = tests
+tests = tests
 #tests =  document/__init__.py
\ No newline at end of file

From 91ee85152c8ac830a4f01c9a6a1b856f77d2f9d0 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Fri, 17 Apr 2015 11:26:47 +0200
Subject: [PATCH 0106/1519] Tests/Tox/TravisCI improvements

---
 .travis.yml      | 38 +++++++++++++++++++-------------------
 CONTRIBUTING.rst |  2 +-
 README.rst       |  2 +-
 setup.cfg        | 15 ++++++---------
 setup.py         |  2 +-
 tox.ini          |  2 +-
 6 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37ec8cf72..cd5d953b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,20 +8,30 @@ python:
 - pypy
 - pypy3
 env:
-- PYMONGO=2.7.2
-- PYMONGO=2.8
+- PYMONGO=2.7 DJANGO=dev
+- PYMONGO=2.7 DJANGO=1.8
+- PYMONGO=2.7 DJANGO=1.7
+- PYMONGO=2.7 DJANGO=1.6
+- PYMONGO=2.7 DJANGO=1.5
+- PYMONGO=2.8 DJANGO=dev
+- PYMONGO=2.8 DJANGO=1.8
+- PYMONGO=2.8 DJANGO=1.7
+- PYMONGO=2.8 DJANGO=1.6
+- PYMONGO=2.8 DJANGO=1.5
 matrix:
   exclude:
   - python: '2.6'
-    env: PYMONGO=2.7.2 
+    env: PYMONGO=2.7 DJANGO=dev
   - python: '2.6'
     env: PYMONGO=2.8
   - python: '2.6'
-    env: PYMONGO=2.7.2
+    env: PYMONGO=2.7 DJANGO=1.7
   - python: '2.6'
-    env: PYMONGO=2.8
-  allow_failures:
-  - python: pypy3
+    env: PYMONGO=2.8 DJANGO=1.7
+  - python: '2.6'
+    env: PYMONGO=2.7 DJANGO=1.8
+  - python: '2.6'
+    env: PYMONGO=2.8 DJANGO=1.8
   fast_finish: true
 before_install:
 - travis_retry sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
@@ -33,19 +43,9 @@ install:
 - sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev
   libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
   python-tk
-- if [[ $PYMONGO == 'dev' ]]; then travis_retry pip install https://github.com/mongodb/mongo-python-driver/tarball/master;
-  true; fi
-- if [[ $PYMONGO != 'dev' ]]; then travis_retry pip install pymongo==$PYMONGO; true;
-  fi
-- travis_retry pip install https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-2.1.tar.gz#md5=1534bb15cf311f07afaa3aacba1c028b
-- travis_retry pip install coveralls
-- travis_retry python setup.py install
+- travis_retry pip install tox>=1.9
 script:
-- travis_retry python setup.py test
-- if [[ $TRAVIS_PYTHON_VERSION == '3.'* ]]; then 2to3 . -w; fi;
-- coverage run --source=mongoengine setup.py test
-- coverage report -m
-- python benchmark.py
+- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- with-coverage
 after_script: coveralls --verbose
 notifications:
   irc: irc.freenode.org#mongoengine
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 0ad7fd5cd..c935d5a34 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -44,7 +44,7 @@ General Guidelines
 - Avoid backward breaking changes if at all possible.
 - Write inline documentation for new classes and methods.
 - Write tests and make sure they pass (make sure you have a mongod
-  running on the default port, then execute ``python setup.py test``
+  running on the default port, then execute ``python setup.py nosetests``
   from the cmd line to run the test suite).
 - Ensure tests pass on every Python and PyMongo versions.
   You can test on these versions locally by executing ``tox``
diff --git a/README.rst b/README.rst
index 6e32d3f35..2414ed16a 100644
--- a/README.rst
+++ b/README.rst
@@ -96,7 +96,7 @@ Some simple examples of what MongoEngine code looks like::
 Tests
 =====
 To run the test suite, ensure you are running a local instance of MongoDB on
-the standard port, and run: ``python setup.py test``.
+the standard port, and run: ``python setup.py nosetests``.
 
 To run the test suite on every supported Python version and every supported PyMongo version,
 you can use ``tox``.
diff --git a/setup.cfg b/setup.cfg
index 2ee0f4992..2aac6e1ef 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,9 @@
 [nosetests]
-verbosity = 3
+rednose = 1
+verbosity = 2
 detailed-errors = 1
-#with-coverage = 1
-#cover-erase = 1
-#cover-html = 1
-#cover-html-dir = ../htmlcov
-#cover-package = mongoengine
+cover-erase = 1
+cover-branches = 1
+cover-package = mongoengine
 py3where = build
-#where = tests
-tests = tests
-#tests =  document/__init__.py
\ No newline at end of file
+where = tests
diff --git a/setup.py b/setup.py
index 3ae5aeacf..42794452a 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,6 @@ def get_version(version_tuple):
 version_line = list(filter(lambda l: l.startswith('VERSION'), open(init)))[0]
 
 VERSION = get_version(eval(version_line.split('=')[-1]))
-print(VERSION)
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
@@ -79,5 +78,6 @@ def get_version(version_tuple):
       classifiers=CLASSIFIERS,
       install_requires=['pymongo>=2.7.1'],
       test_suite='nose.collector',
+      setup_requires=['nose', 'rednose'],  # Allow proper nose usage with setuptols and tox
       **extra_opts
 )
diff --git a/tox.ini b/tox.ini
index 61692f7c5..38517bdcd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist =
 
 [testenv]
 commands =
-    python setup.py test
+    python setup.py nosetests {posargs}
 deps =
     mg27: PyMongo<2.8
     mg28: PyMongo>=2.8,<3.0

From 15fcb57e2fe57a3b0b88a0440ca119fa9bd5d1ab Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Fri, 17 Apr 2015 16:08:31 +0200
Subject: [PATCH 0107/1519] Fix typo in travis config

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cd5d953b1..eda63217e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ install:
   python-tk
 - travis_retry pip install tox>=1.9
 script:
-- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- with-coverage
+- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 after_script: coveralls --verbose
 notifications:
   irc: irc.freenode.org#mongoengine

From dc45920afbddf5873563b4f73841426c8605639a Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Fri, 17 Apr 2015 16:29:16 +0200
Subject: [PATCH 0108/1519] Added missing coveralls install

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index eda63217e..1012d286f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ install:
 - sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev
   libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
   python-tk
-- travis_retry pip install tox>=1.9
+- travis_retry pip install tox>=1.9 coveralls
 script:
 - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 after_script: coveralls --verbose

From 29d858d58c13a8e47636ea95bad6c1b76fe13764 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Fri, 17 Apr 2015 17:20:37 +0200
Subject: [PATCH 0109/1519] Removed the deprecated py3where parameter

---
 setup.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2aac6e1ef..e59f0fe26 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,5 +5,4 @@ detailed-errors = 1
 cover-erase = 1
 cover-branches = 1
 cover-package = mongoengine
-py3where = build
-where = tests
+tests = tests

From 050378fa72014c4ba6b0ff2f4ae92f516afefa2e Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Fri, 17 Apr 2015 17:20:57 +0200
Subject: [PATCH 0110/1519] Little README tuning

---
 README.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 2414ed16a..5a873e225 100644
--- a/README.rst
+++ b/README.rst
@@ -112,7 +112,10 @@ tox and each supported Python version should be installed in your environment:
 If you wish to run one single or selected tests, use the nosetest convention. It will find the folder,
 eventually the file, go to the TestClass specified after the colon and eventually right to the single test.
 Also use the -s argument if you want to print out whatever or access pdb while testing.
-``python setup.py nosetests --tests tests/test_django.py:QuerySetTest.test_get_document_or_404 -s``
+
+.. code-block:: shell
+
+    $ python setup.py nosetests --tests tests/test_django.py:QuerySetTest.test_get_document_or_404 -s
 
 Community
 =========

From 76ea8c86b73cdbbadd4d80cf80fe606fc4d56389 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Sat, 18 Apr 2015 13:40:32 +0200
Subject: [PATCH 0111/1519] Use travis_retry on tox execution

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1012d286f..51d33c59b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ install:
   python-tk
 - travis_retry pip install tox>=1.9 coveralls
 script:
-- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
+- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 after_script: coveralls --verbose
 notifications:
   irc: irc.freenode.org#mongoengine

From 58c8cf1a3a83d0f61c4e23102aa199a68c49136e Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Wed, 22 Apr 2015 13:10:44 +0200
Subject: [PATCH 0112/1519] Split dependencies installation and test running
 avoing travis_retry on tests

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 51d33c59b..46a71a2fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,8 +44,9 @@ install:
   libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
   python-tk
 - travis_retry pip install tox>=1.9 coveralls
+- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
 script:
-- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
+- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 after_script: coveralls --verbose
 notifications:
   irc: irc.freenode.org#mongoengine

From c804c395ed293048c4e52ccd0717812c2438a73a Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Tue, 28 Apr 2015 20:31:13 +0200
Subject: [PATCH 0113/1519] Post rebase and Django removal tuning (and prepare
 for PyMongo 3)

---
 .travis.yml | 31 ++++++-------------------------
 README.rst  |  3 +--
 tox.ini     | 10 ++--------
 3 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46a71a2fc..74f409298 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,30 +8,11 @@ python:
 - pypy
 - pypy3
 env:
-- PYMONGO=2.7 DJANGO=dev
-- PYMONGO=2.7 DJANGO=1.8
-- PYMONGO=2.7 DJANGO=1.7
-- PYMONGO=2.7 DJANGO=1.6
-- PYMONGO=2.7 DJANGO=1.5
-- PYMONGO=2.8 DJANGO=dev
-- PYMONGO=2.8 DJANGO=1.8
-- PYMONGO=2.8 DJANGO=1.7
-- PYMONGO=2.8 DJANGO=1.6
-- PYMONGO=2.8 DJANGO=1.5
+- PYMONGO=2.7
+- PYMONGO=2.8
+# - PYMONGO=3.0
+# - PYMONGO=dev
 matrix:
-  exclude:
-  - python: '2.6'
-    env: PYMONGO=2.7 DJANGO=dev
-  - python: '2.6'
-    env: PYMONGO=2.8
-  - python: '2.6'
-    env: PYMONGO=2.7 DJANGO=1.7
-  - python: '2.6'
-    env: PYMONGO=2.8 DJANGO=1.7
-  - python: '2.6'
-    env: PYMONGO=2.7 DJANGO=1.8
-  - python: '2.6'
-    env: PYMONGO=2.8 DJANGO=1.8
   fast_finish: true
 before_install:
 - travis_retry sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
@@ -44,9 +25,9 @@ install:
   libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
   python-tk
 - travis_retry pip install tox>=1.9 coveralls
-- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
+- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
 script:
-- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO-dj$DJANGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
+- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 after_script: coveralls --verbose
 notifications:
   irc: irc.freenode.org#mongoengine
diff --git a/README.rst b/README.rst
index 5a873e225..2d17313f0 100644
--- a/README.rst
+++ b/README.rst
@@ -38,12 +38,11 @@ Dependencies
 
 Optional Dependencies
 ---------------------
-- **Django Integration:** Django>=1.4.0 for Python 2.x or PyPy and Django>=1.5.0 for Python 3.x
 - **Image Fields**: Pillow>=2.0.0
 - dateutil>=2.1.0
 
 .. note
-   MongoEngine always runs it's test suite against the latest patch version of each dependecy. e.g.: Django 1.6.5
+   MongoEngine always runs it's test suite against the latest patch version of each dependecy. e.g.: PyMongo 3.0.1
 
 Examples
 ========
diff --git a/tox.ini b/tox.ini
index 38517bdcd..3f69b5e85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
-envlist =
-    {py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30}-{dj15,dj16,dj17,dj18,djdev},
-    py26-{mg27,mg28,mg30}-{dj15,dj16}
+envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28}
+#envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30,mgdev}
 
 [testenv]
 commands =
@@ -11,8 +10,3 @@ deps =
     mg28: PyMongo>=2.8,<3.0
     mg30: PyMongo>=3.0
     mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
-    dj15: Django<1.6
-    dj16: Django>=1.6,<1.7
-    dj17: Django>=1.7,<1.8
-    dj18: Django>=1.8,<1.9
-    djdev: https://github.com/django/django/tarball/master

From 319f1deceb75499dc0c962a0fe8fdd7436f22894 Mon Sep 17 00:00:00 2001
From: Sridhar Sundarraman <srsridhar5@gmail.com>
Date: Sun, 12 Apr 2015 17:28:26 +0300
Subject: [PATCH 0114/1519] Unit Test to Demonstrate #954

---
 tests/document/validation.py | 42 ++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/tests/document/validation.py b/tests/document/validation.py
index 573c2e578..646efddbe 100644
--- a/tests/document/validation.py
+++ b/tests/document/validation.py
@@ -165,6 +165,48 @@ class Doc(Document):
 
         self.assertRaises(ValidationError, lambda: d2.validate())
 
+    def test_parent_reference_in_child_document(self):
+        """ Test to demonstrate behavior in Issue #954
+        """
+        class Parent(Document):
+            meta = {'allow_inheritance': True}
+            reference = ReferenceField('self')
+
+        class Child(Parent):
+            pass
+
+        parent = Parent()
+        parent.save()
+
+        child = Child(reference=parent)
+        try:
+            # Saving child should not raise a ValidationError
+            child.save()
+        except ValidationError as e:
+            self.fail("test should not throw validation error. %s" % e.message)
+
+    def test_parent_reference_set_as_attribute_in_child_document_(self):
+        """ Test to demonstrate behavior (when set as attribute) in Issue #954
+        """
+        class Parent(Document):
+            meta = {'allow_inheritance': True}
+            reference = ReferenceField('self')
+
+        class Child(Parent):
+            pass
+
+        parent = Parent()
+        parent.save()
+
+        child = Child()
+        child.reference = parent
+
+        try:
+            # Saving the child should not raise a ValidationError
+            child.save()
+        except ValidationError as e:
+            self.fail("test should not throw validation error. %s" % e.message)
+
 
 if __name__ == '__main__':
     unittest.main()

From 5d6a28954b70fd14b140978040d343d1f2f28982 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <seglberg@gmail.com>
Date: Tue, 28 Apr 2015 15:07:22 -0400
Subject: [PATCH 0115/1519] Reflect Inheritance in Field's 'owner_document'

The 'owner_document' property of a Field now reflects the parent field
which first contained the Field when a Document in inherited.

Fixes #954
Closes #955
---
 mongoengine/base/fields.py      | 17 ++++++++++++-----
 mongoengine/base/metaclasses.py |  3 ++-
 tests/document/validation.py    | 26 ++++++++++++--------------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index aa16804e6..08fbc9b7b 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -83,6 +83,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.help_text = help_text
         self.null = null
         self.sparse = sparse
+        self._owner_document = None
 
         # Adjust the appropriate creation counter, and save our local copy.
         if self.db_field == '_id':
@@ -189,6 +190,17 @@ def _validate(self, value, **kwargs):
 
         self.validate(value, **kwargs)
 
+    @property
+    def owner_document(self):
+        return self._owner_document
+
+    def _set_owner_document(self, owner_document):
+        self._owner_document = owner_document
+
+    @owner_document.setter
+    def owner_document(self, owner_document):
+        self._set_owner_document(owner_document)
+
 
 class ComplexBaseField(BaseField):
 
@@ -398,11 +410,6 @@ def _set_owner_document(self, owner_document):
             self.field.owner_document = owner_document
         self._owner_document = owner_document
 
-    def _get_owner_document(self, owner_document):
-        self._owner_document = owner_document
-
-    owner_document = property(_get_owner_document, _set_owner_document)
-
 
 class ObjectIdField(BaseField):
 
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 48da84f42..7a104da97 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -176,7 +176,8 @@ def __new__(cls, name, bases, attrs):
         # Handle delete rules
         for field in new_class._fields.itervalues():
             f = field
-            f.owner_document = new_class
+            if f.owner_document is None:
+                f.owner_document = new_class
             delete_rule = getattr(f, 'reverse_delete_rule', DO_NOTHING)
             if isinstance(f, CachedReferenceField):
 
diff --git a/tests/document/validation.py b/tests/document/validation.py
index 646efddbe..8498a7405 100644
--- a/tests/document/validation.py
+++ b/tests/document/validation.py
@@ -166,7 +166,9 @@ class Doc(Document):
         self.assertRaises(ValidationError, lambda: d2.validate())
 
     def test_parent_reference_in_child_document(self):
-        """ Test to demonstrate behavior in Issue #954
+        """
+        Test to ensure a ReferenceField can store a reference to a parent
+        class when inherited. Issue #954.
         """
         class Parent(Document):
             meta = {'allow_inheritance': True}
@@ -179,14 +181,14 @@ class Child(Parent):
         parent.save()
 
         child = Child(reference=parent)
-        try:
-            # Saving child should not raise a ValidationError
-            child.save()
-        except ValidationError as e:
-            self.fail("test should not throw validation error. %s" % e.message)
 
-    def test_parent_reference_set_as_attribute_in_child_document_(self):
-        """ Test to demonstrate behavior (when set as attribute) in Issue #954
+        # Saving child should not raise a ValidationError
+        child.save()
+
+    def test_parent_reference_set_as_attribute_in_child_document(self):
+        """
+        Test to ensure a ReferenceField can store a reference to a parent
+        class when inherited and when set via attribute. Issue #954.
         """
         class Parent(Document):
             meta = {'allow_inheritance': True}
@@ -201,12 +203,8 @@ class Child(Parent):
         child = Child()
         child.reference = parent
 
-        try:
-            # Saving the child should not raise a ValidationError
-            child.save()
-        except ValidationError as e:
-            self.fail("test should not throw validation error. %s" % e.message)
-
+        # Saving the child should not raise a ValidationError
+        child.save()
 
 if __name__ == '__main__':
     unittest.main()

From f2cbcea6d77e5fd9408aa5ec6c6e6af5c3683f46 Mon Sep 17 00:00:00 2001
From: Matthew Ellison <seglberg@gmail.com>
Date: Wed, 29 Apr 2015 14:26:05 -0400
Subject: [PATCH 0116/1519] Unit Tests for #954 Fail on Exception, not Error

---
 tests/document/validation.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/document/validation.py b/tests/document/validation.py
index 8498a7405..ba03366e5 100644
--- a/tests/document/validation.py
+++ b/tests/document/validation.py
@@ -183,7 +183,10 @@ class Child(Parent):
         child = Child(reference=parent)
 
         # Saving child should not raise a ValidationError
-        child.save()
+        try:
+            child.save()
+        except ValidationError as e:
+            self.fail("ValidationError raised: %s" % e.message)
 
     def test_parent_reference_set_as_attribute_in_child_document(self):
         """
@@ -204,7 +207,11 @@ class Child(Parent):
         child.reference = parent
 
         # Saving the child should not raise a ValidationError
-        child.save()
+        try:
+            child.save()
+        except ValidationError as e:
+            self.fail("ValidationError raised: %s" % e.message)
+
 
 if __name__ == '__main__':
     unittest.main()

From 7726be94be5e86b74e28d40af272a9365566cbea Mon Sep 17 00:00:00 2001
From: elephant <eremeev.danil@gmail.com>
Date: Mon, 6 Apr 2015 20:21:36 +0500
Subject: [PATCH 0117/1519] fixed wrong _delta results on nested MapFields #931

---
 mongoengine/dereference.py |  3 ++-
 tests/document/delta.py    | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 453ba14f9..0f60c2f54 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -220,7 +220,8 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                     elif isinstance(v, (dict, SON)) and '_ref' in v:
                         data[k]._data[field_name] = self.object_map.get(v['_ref'].id, v)
                     elif isinstance(v, dict) and depth <= self.max_depth:
-                        data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=name)
+                        item_name = "%s.%s.%s" % (name, k, field_name)
+                        data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
                     elif isinstance(v, (list, tuple)) and depth <= self.max_depth:
                         data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=name)
             elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
diff --git a/tests/document/delta.py b/tests/document/delta.py
index 7ec6ee56a..95a03861c 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -827,5 +827,29 @@ class User(Document):
         org2.reload()
         self.assertEqual(org2.name, 'New Org 2')
 
+    def test_delta_for_nested_map_fields(self):
+        class EmbeddedRole(EmbeddedDocument):
+            type = StringField()
+
+        class EmbeddedUser(EmbeddedDocument):
+            name = StringField()
+            roles = MapField(field=EmbeddedDocumentField(EmbeddedRole))
+
+        class Doc(Document):
+            users = MapField(field=EmbeddedDocumentField(EmbeddedUser))
+            num = IntField(default=-1)
+
+        Doc.drop_collection()
+
+        doc = Doc(num=1)
+        doc.users["007"] = EmbeddedUser(name="Agent007")
+        doc.save()
+
+        d = Doc.objects(num=1).first()
+        d.users["007"]["roles"]["666"] = EmbeddedRole(type="superadmin")
+        delta = d._delta()
+        self.assertEqual(True, "users.007.roles.666" in delta[0])
+        self.assertEqual('superadmin', delta[0]["users.007.roles.666"]["type"])
+
 if __name__ == '__main__':
     unittest.main()

From 31f7769199b1c0128ec66c0612a568061d4f22b3 Mon Sep 17 00:00:00 2001
From: Eremeev Danil <hole666@mail.ru>
Date: Thu, 9 Apr 2015 09:14:12 +0500
Subject: [PATCH 0118/1519] percent string formatting changed to format method

---
 mongoengine/dereference.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 0f60c2f54..cc710f4d1 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -220,7 +220,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                     elif isinstance(v, (dict, SON)) and '_ref' in v:
                         data[k]._data[field_name] = self.object_map.get(v['_ref'].id, v)
                     elif isinstance(v, dict) and depth <= self.max_depth:
-                        item_name = "%s.%s.%s" % (name, k, field_name)
+                        item_name = "{0}.{1}.{2}".format(name, k, field_name)
                         data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
                     elif isinstance(v, (list, tuple)) and depth <= self.max_depth:
                         data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=name)

From ebaba95eb376c761dd4d439a6836f2353dea674b Mon Sep 17 00:00:00 2001
From: Eremeev Danil <hole666@mail.ru>
Date: Thu, 9 Apr 2015 09:34:40 +0500
Subject: [PATCH 0119/1519] fixed same bug for nested List inside MapField,
 little code refactoring, added test for nested list and nested reference
 fields

---
 mongoengine/dereference.py |  4 +---
 tests/document/delta.py    | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index cc710f4d1..0428397c0 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -219,11 +219,9 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                         data[k]._data[field_name] = self.object_map.get(v.id, v)
                     elif isinstance(v, (dict, SON)) and '_ref' in v:
                         data[k]._data[field_name] = self.object_map.get(v['_ref'].id, v)
-                    elif isinstance(v, dict) and depth <= self.max_depth:
+                    elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                         item_name = "{0}.{1}.{2}".format(name, k, field_name)
                         data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
-                    elif isinstance(v, (list, tuple)) and depth <= self.max_depth:
-                        data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=name)
             elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                 item_name = '%s.%s' % (name, k) if name else name
                 data[k] = self._attach_objects(v, depth - 1, instance=instance, name=item_name)
diff --git a/tests/document/delta.py b/tests/document/delta.py
index 95a03861c..e5a81c066 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -828,12 +828,17 @@ class User(Document):
         self.assertEqual(org2.name, 'New Org 2')
 
     def test_delta_for_nested_map_fields(self):
+        class UInfoDocument(Document):
+            phone = StringField()
+
         class EmbeddedRole(EmbeddedDocument):
             type = StringField()
 
         class EmbeddedUser(EmbeddedDocument):
             name = StringField()
             roles = MapField(field=EmbeddedDocumentField(EmbeddedRole))
+            rolist = ListField(field=EmbeddedDocumentField(EmbeddedRole))
+            info = ReferenceField(UInfoDocument)
 
         class Doc(Document):
             users = MapField(field=EmbeddedDocumentField(EmbeddedUser))
@@ -845,11 +850,21 @@ class Doc(Document):
         doc.users["007"] = EmbeddedUser(name="Agent007")
         doc.save()
 
+        uinfo = UInfoDocument(phone="79089269066")
+        uinfo.save()
+
         d = Doc.objects(num=1).first()
         d.users["007"]["roles"]["666"] = EmbeddedRole(type="superadmin")
+        d.users["007"]["rolist"].append(EmbeddedRole(type="oops"))
+        d.users["007"]["info"] = uinfo
         delta = d._delta()
+        print delta
         self.assertEqual(True, "users.007.roles.666" in delta[0])
+        self.assertEqual(True, "users.007.rolist" in delta[0])
+        self.assertEqual(True, "users.007.info" in delta[0])
         self.assertEqual('superadmin', delta[0]["users.007.roles.666"]["type"])
+        self.assertEqual('oops', delta[0]["users.007.rolist"][0]["type"])
+        self.assertEqual(uinfo.id, delta[0]["users.007.info"])
 
 if __name__ == '__main__':
     unittest.main()

From a4f2f811d3e383b6e58a2a2ba9a6506d3a0bf08e Mon Sep 17 00:00:00 2001
From: Eremeev Danil <hole666@mail.ru>
Date: Thu, 9 Apr 2015 09:47:38 +0500
Subject: [PATCH 0120/1519] removed forgotten print

---
 tests/document/delta.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/document/delta.py b/tests/document/delta.py
index e5a81c066..de9405772 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -858,7 +858,6 @@ class Doc(Document):
         d.users["007"]["rolist"].append(EmbeddedRole(type="oops"))
         d.users["007"]["info"] = uinfo
         delta = d._delta()
-        print delta
         self.assertEqual(True, "users.007.roles.666" in delta[0])
         self.assertEqual(True, "users.007.rolist" in delta[0])
         self.assertEqual(True, "users.007.info" in delta[0])

From ca16050681b888e61fb2dc484845482176f4e7b7 Mon Sep 17 00:00:00 2001
From: Austin <asmacdo@gmail.com>
Date: Thu, 30 Apr 2015 16:02:50 -0400
Subject: [PATCH 0121/1519] Update docs with NotUniqueError

This was changed in https://github.com/MongoEngine/mongoengine/pull/62. It is present in versions > 0.7 http://docs.mongoengine.org/changelog.html#changes-in-0-7-0. I can reopen against an older branch if preferred.
---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 5c45c19a2..6f2495351 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -401,7 +401,7 @@ MongoEngine allows you to specify that a field should be unique across a
 collection by providing ``unique=True`` to a :class:`~mongoengine.fields.Field`\ 's
 constructor. If you try to save a document that has the same value for a unique
 field as a document that is already in the database, a
-:class:`~mongoengine.OperationError` will be raised. You may also specify
+:class:`~mongoengine.NotUniqueError` will be raised. You may also specify
 multi-field uniqueness constraints by using :attr:`unique_with`, which may be
 either a single field name, or a list or tuple of field names::
 

From a512ccca28ea2b9645b72f7e2a6593409dd02f2b Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Wed, 29 Apr 2015 15:11:48 +0300
Subject: [PATCH 0122/1519] fix-#453: Queryset update doesn't go through field
 validation

---
 docs/changelog.rst                |  1 +
 mongoengine/base/fields.py        |  7 +++++++
 mongoengine/fields.py             | 24 +++++++++++++++---------
 mongoengine/queryset/transform.py |  5 +----
 tests/queryset/queryset.py        | 14 ++++++++++++++
 5 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ed08c3913..2a6f78025 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- Queryset update doesn't go through field validation #453
 - Added support for specifying authentication source as option `authSource` in URI. #967
 - Fixed mark_as_changed to handle higher/lower level fields changed. #927
 - ListField of embedded docs doesn't set the _instance attribute when iterating over it #914
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index aa16804e6..6de2bfc6c 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -17,6 +17,11 @@
            "ObjectIdField", "GeoJsonBaseField")
 
 
+UPDATE_OPERATORS = set(['set', 'unset', 'inc', 'dec', 'pop', 'push',
+                        'push_all', 'pull', 'pull_all', 'add_to_set',
+                        'set_on_insert', 'min', 'max'])
+
+
 class BaseField(object):
 
     """A base class for fields in a MongoDB document. Instances of this class
@@ -150,6 +155,8 @@ def to_mongo(self, value):
     def prepare_query_value(self, op, value):
         """Prepare a value that is being used in a query for PyMongo.
         """
+        if op in UPDATE_OPERATORS:
+            self.validate(value)
         return value
 
     def validate(self, value, clean=True):
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index dbed6b996..bd6c88d6a 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -108,7 +108,7 @@ def prepare_query_value(self, op, value):
             # escape unsafe characters which could lead to a re.error
             value = re.escape(value)
             value = re.compile(regex % value, flags)
-        return value
+        return super(StringField, self).prepare_query_value(op, value)
 
 
 class URLField(StringField):
@@ -203,7 +203,7 @@ def prepare_query_value(self, op, value):
         if value is None:
             return value
 
-        return int(value)
+        return super(IntField, self).prepare_query_value(op, int(value))
 
 
 class LongField(BaseField):
@@ -238,7 +238,7 @@ def prepare_query_value(self, op, value):
         if value is None:
             return value
 
-        return long(value)
+        return super(LongField, self).prepare_query_value(op, long(value))
 
 
 class FloatField(BaseField):
@@ -273,7 +273,7 @@ def prepare_query_value(self, op, value):
         if value is None:
             return value
 
-        return float(value)
+        return super(FloatField, self).prepare_query_value(op, float(value))
 
 
 class DecimalField(BaseField):
@@ -347,7 +347,7 @@ def validate(self, value):
             self.error('Decimal value is too large')
 
     def prepare_query_value(self, op, value):
-        return self.to_mongo(value)
+        return super(DecimalField, self).prepare_query_value(op, self.to_mongo(value))
 
 
 class BooleanField(BaseField):
@@ -434,7 +434,7 @@ def to_mongo(self, value):
                     return None
 
     def prepare_query_value(self, op, value):
-        return self.to_mongo(value)
+        return super(DateTimeField, self).prepare_query_value(op, self.to_mongo(value))
 
 
 class ComplexDateTimeField(StringField):
@@ -518,7 +518,7 @@ def to_mongo(self, value):
         return self._convert_from_datetime(value)
 
     def prepare_query_value(self, op, value):
-        return self._convert_from_datetime(value)
+        return super(ComplexDateTimeField, self).prepare_query_value(op, self._convert_from_datetime(value))
 
 
 class EmbeddedDocumentField(BaseField):
@@ -569,6 +569,9 @@ def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
 
     def prepare_query_value(self, op, value):
+        if not isinstance(value, self.document_type):
+            value = self.document_type._from_son(value)
+        super(EmbeddedDocumentField, self).prepare_query_value(op, value)
         return self.to_mongo(value)
 
 
@@ -585,7 +588,7 @@ class GenericEmbeddedDocumentField(BaseField):
     """
 
     def prepare_query_value(self, op, value):
-        return self.to_mongo(value)
+        return super(GenericEmbeddedDocumentField, self).prepare_query_value(op, self.to_mongo(value))
 
     def to_python(self, value):
         if isinstance(value, dict):
@@ -668,7 +671,8 @@ def prepare_query_value(self, op, value):
         if isinstance(value, basestring):
             from mongoengine.fields import StringField
             return StringField().prepare_query_value(op, value)
-        return self.to_mongo(value)
+        return super(DynamicField, self).prepare_query_value(op, self.to_mongo(value))
+
 
     def validate(self, value, clean=True):
         if hasattr(value, "validate"):
@@ -979,8 +983,10 @@ def to_python(self, value):
     def prepare_query_value(self, op, value):
         if value is None:
             return None
+        super(ReferenceField, self).prepare_query_value(op, value)
         return self.to_mongo(value)
 
+
     def validate(self, value):
 
         if not isinstance(value, (self.document_type, DBRef)):
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 03a09dc51..007cf865b 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -3,6 +3,7 @@
 import pymongo
 from bson import SON
 
+from mongoengine.base.fields import UPDATE_OPERATORS
 from mongoengine.connection import get_connection
 from mongoengine.common import _import_class
 from mongoengine.errors import InvalidQueryError, LookUpError
@@ -24,10 +25,6 @@
 MATCH_OPERATORS = (COMPARISON_OPERATORS + GEO_OPERATORS +
                    STRING_OPERATORS + CUSTOM_OPERATORS)
 
-UPDATE_OPERATORS = ('set', 'unset', 'inc', 'dec', 'pop', 'push',
-                    'push_all', 'pull', 'pull_all', 'add_to_set',
-                    'set_on_insert', 'min', 'max')
-
 
 def query(_doc_cls=None, _field_operation=False, **query):
     """Transform a query from Django-style format to Mongo format.
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 6cbac4956..ac282c445 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -602,6 +602,20 @@ def test_update_results(self):
             set__name="bobby", multi=True)
         self.assertEqual(result, 2)
 
+    def test_update_validate(self):
+        class EmDoc(EmbeddedDocument):
+            str_f = StringField()
+
+        class Doc(Document):
+            str_f = StringField()
+            dt_f = DateTimeField()
+            cdt_f = ComplexDateTimeField()
+            ed_f = EmbeddedDocumentField(EmDoc)
+
+        self.assertRaises(ValidationError, Doc.objects().update, str_f=1, upsert=True)
+        self.assertRaises(ValidationError, Doc.objects().update, dt_f="datetime", upsert=True)
+        self.assertRaises(ValidationError, Doc.objects().update, ed_f__str_f=1, upsert=True)
+
     def test_upsert(self):
         self.Person.drop_collection()
 

From e5cf76b460c423a86e43451ff9d123b02e7afe82 Mon Sep 17 00:00:00 2001
From: Olivier Le Floch <olivier@le-floch.fr>
Date: Mon, 4 May 2015 15:02:01 -0700
Subject: [PATCH 0123/1519] Match other code blocks This fixes rendering on the
 documentation website: http://docs.mongoengine.org/upgrade.html

---
 docs/upgrade.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 2648c4bbc..b1a2217ff 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -5,9 +5,7 @@ Upgrading
 0.9.0
 *****
 
-The 0.8.7 package on pypi was corrupted.  If upgrading from 0.8.7 to 0.9.0 please follow:
-
-.. code-block::
+The 0.8.7 package on pypi was corrupted.  If upgrading from 0.8.7 to 0.9.0 please follow: ::
 
     pip uninstall pymongo
     pip uninstall mongoengine

From 4b8344082f3f47e7fdcc31ddce407ab812d62ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregor=20Kali=C5=A1nik?= <gregor@unimatrix.si>
Date: Tue, 5 May 2015 12:49:45 +0200
Subject: [PATCH 0124/1519] Testing if we can query embedded document's field
 inside MapField. Part of #912, which is fixed in 0.9.

---
 tests/fields/fields.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index e7a87ed0c..c29678565 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1431,16 +1431,26 @@ class Test(Document):
     def test_map_field_lookup(self):
         """Ensure MapField lookups succeed on Fields without a lookup method"""
 
+        class Action(EmbeddedDocument):
+            operation = StringField()
+            object    = StringField()
+
         class Log(Document):
             name = StringField()
             visited = MapField(DateTimeField())
+            actions = MapField(EmbeddedDocumentField(Action))
 
         Log.drop_collection()
-        Log(name="wilson", visited={'friends': datetime.datetime.now()}).save()
+        Log(name="wilson", visited={'friends': datetime.datetime.now()},
+            actions={'friends': Action(operation='drink', object='beer')}).save()
 
         self.assertEqual(1, Log.objects(
             visited__friends__exists=True).count())
 
+        self.assertEqual(1, Log.objects(
+            actions__friends__operation='drink',
+            actions__friends__object='beer').count())
+
     def test_embedded_db_field(self):
 
         class Embedded(EmbeddedDocument):

From 9bdc320cf84a2d796ddeb024101db2d9e344754d Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 6 May 2015 11:25:45 +0200
Subject: [PATCH 0125/1519] dont send a "cls" option to ensureIndex (related to
 https://jira.mongodb.org/browse/SERVER-769)

---
 AUTHORS                   |  3 +-
 docs/changelog.rst        |  1 +
 mongoengine/document.py   | 12 ++++++++
 tests/document/indexes.py | 58 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index af87d5039..9d105a606 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -119,7 +119,7 @@ that much better:
  * Anton Kolechkin
  * Sergey Nikitin
  * psychogenic
- * Stefan Wójcik
+ * Stefan Wójcik (https://github.com/wojcikstefan)
  * dimonb
  * Garry Polley
  * James Slagle
@@ -138,7 +138,6 @@ that much better:
  * hellysmile
  * Jaepil Jeong
  * Daniil Sharou
- * Stefan Wójcik
  * Pete Campton
  * Martyn Smith
  * Marcelo Anton
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2a6f78025..f4b5ec6c6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,6 +14,7 @@ Changes in 0.9.X - DEV
 - Fixed unpickled documents replacing the global field's list. #888
 - Fixed storage of microseconds in ComplexDateTimeField and unused separator option. #910
 - Django support was removed and will be available as a separate extension. #958
+- Don't send a "cls" option to ensureIndex (related to https://jira.mongodb.org/browse/SERVER-769)
 
 Changes in 0.9.0
 ================
diff --git a/mongoengine/document.py b/mongoengine/document.py
index f8275021d..01083d243 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -677,6 +677,12 @@ def ensure_indexes(cls):
                 cls_indexed = cls_indexed or includes_cls(fields)
                 opts = index_opts.copy()
                 opts.update(spec)
+
+                # we shouldn't pass 'cls' to the collection.ensureIndex options
+                # because of https://jira.mongodb.org/browse/SERVER-769
+                if 'cls' in opts:
+                    del opts['cls']
+
                 collection.ensure_index(fields, background=background,
                                         drop_dups=drop_dups, **opts)
 
@@ -684,6 +690,12 @@ def ensure_indexes(cls):
         # only if another index doesn't begin with _cls
         if (index_cls and not cls_indexed and
                 cls._meta.get('allow_inheritance', ALLOW_INHERITANCE) is True):
+
+            # we shouldn't pass 'cls' to the collection.ensureIndex options
+            # because of https://jira.mongodb.org/browse/SERVER-769
+            if 'cls' in index_opts:
+                del index_opts['cls']
+
             collection.ensure_index('_cls', background=background,
                                     **index_opts)
 
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index ab156f68f..6256cde30 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -826,5 +826,63 @@ class BlogPost(Document):
         post2 = BlogPost(title='test2', slug='test')
         self.assertRaises(NotUniqueError, post2.save)
 
+    def test_index_dont_send_cls_option(self):
+        """
+        Ensure that 'cls' option is not sent through ensureIndex. We shouldn't
+        send internal MongoEngine arguments that are not a part of the index
+        spec.
+
+        This is directly related to the fact that MongoDB doesn't validate the
+        options that are passed to ensureIndex. For more details, see:
+        https://jira.mongodb.org/browse/SERVER-769
+        """
+        class TestDoc(Document):
+            txt = StringField()
+
+            meta = {
+                'allow_inheritance': True,
+                'indexes': [
+                    { 'fields': ('txt',), 'cls': False }
+                ]
+            }
+
+        class TestChildDoc(TestDoc):
+            txt2 = StringField()
+
+            meta = {
+                'indexes': [
+                    { 'fields': ('txt2',), 'cls': False }
+                ]
+            }
+
+        TestDoc.drop_collection()
+        TestDoc.ensure_indexes()
+        TestChildDoc.ensure_indexes()
+
+        index_info = TestDoc._get_collection().index_information()
+        for key in index_info:
+            del index_info[key]['v']  # drop the index version - we don't care about that here
+
+        self.assertEqual(index_info, {
+            'txt_1': {
+                'key': [('txt', 1)],
+                'dropDups': False,
+                'background': False
+            },
+            '_id_': {
+                'key': [('_id', 1)],
+            },
+            'txt2_1': {
+                'key': [('txt2', 1)],
+                'dropDups': False,
+                'background': False
+            },
+            '_cls_1': {
+                'key': [('_cls', 1)],
+                'background': False,
+            }
+        })
+
+
 if __name__ == '__main__':
     unittest.main()

From 0949df014b7f686f7e2b705fdcc6a556dd11bf51 Mon Sep 17 00:00:00 2001
From: rma4ok <rma4ok@gmail.com>
Date: Wed, 29 Apr 2015 01:14:48 -0400
Subject: [PATCH 0126/1519] [fix] SortedListField: update whole list if order
 is changed

---
 mongoengine/base/document.py | 7 +++++++
 tests/fields/fields.py       | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index d31d75ba9..3eba16ca8 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -547,6 +547,7 @@ def _get_changed_fields(self, inspected=None):
         EmbeddedDocument = _import_class("EmbeddedDocument")
         DynamicEmbeddedDocument = _import_class("DynamicEmbeddedDocument")
         ReferenceField = _import_class("ReferenceField")
+        SortedListField = _import_class("SortedListField")
         changed_fields = []
         changed_fields += getattr(self, '_changed_fields', [])
 
@@ -577,6 +578,12 @@ def _get_changed_fields(self, inspected=None):
                 if (hasattr(field, 'field') and
                         isinstance(field.field, ReferenceField)):
                     continue
+                elif (isinstance(field, SortedListField) and field._ordering):
+                    # if ordering is affected whole list is changed
+                    if any(map(lambda d: field._ordering in d._changed_fields, data)):
+                        changed_fields.append(db_field_name)
+                        continue
+
                 self._nestable_types_changed_fields(
                     changed_fields, key, data, inspected)
         return changed_fields
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index c29678565..7a99bd78a 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -916,6 +916,13 @@ class BlogPost(Document):
         self.assertEqual(post.comments[0].content, comment2.content)
         self.assertEqual(post.comments[1].content, comment1.content)
 
+        post.comments[0].order = 2
+        post.save()
+        post.reload()
+
+        self.assertEqual(post.comments[0].content, comment1.content)
+        self.assertEqual(post.comments[1].content, comment2.content)
+
         BlogPost.drop_collection()
 
     def test_reverse_list_sorting(self):

From 43a5df87807d138d7b6c4b97a3059ab3c996057b Mon Sep 17 00:00:00 2001
From: rma4ok <rma4ok@gmail.com>
Date: Wed, 29 Apr 2015 11:23:51 -0400
Subject: [PATCH 0127/1519] [dist] Adding rma4ok to contributors

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 9d105a606..6745e14b3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -220,3 +220,4 @@ that much better:
  * Michael Chase (https://github.com/rxsegrxup)
  * Eremeev Danil (https://github.com/elephanter)
  * Catstyle Lee (https://github.com/Catstyle)
+ * Kiryl Yermakou (https://github.com/rma4ok)

From 0ee3203a5a6d3ac1ed43575e2ac4334578000b8b Mon Sep 17 00:00:00 2001
From: rma4ok <rma4ok@gmail.com>
Date: Wed, 29 Apr 2015 11:34:04 -0400
Subject: [PATCH 0128/1519] [docs] Adding SortedListField fix to changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f4b5ec6c6..a27db5a4f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,6 +15,7 @@ Changes in 0.9.X - DEV
 - Fixed storage of microseconds in ComplexDateTimeField and unused separator option. #910
 - Django support was removed and will be available as a separate extension. #958
 - Don't send a "cls" option to ensureIndex (related to https://jira.mongodb.org/browse/SERVER-769)
+- Fix for updating sorting in SortedListField. #978
 
 Changes in 0.9.0
 ================

From fc39fd75193d2ba11811409217e0e1b2d25447a8 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 6 May 2015 18:30:49 +0200
Subject: [PATCH 0129/1519] Update defining-documents.rst

Add primary_key notice according to issue #985
---
 docs/guide/defining-documents.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 6f2495351..274f0f43e 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -146,6 +146,8 @@ arguments can be set on all fields:
     When True, use this field as a primary key for the collection.  `DictField`
     and `EmbeddedDocuments` both support being the primary key for a document.
 
+    .. note:: If set, this field is also accessible throught the `pk` field.
+
 :attr:`choices` (Default: None)
     An iterable (e.g. a list or tuple) of choices to which the value of this
     field should be limited.

From 5f33d298d70f283ffcec3a0320efcaac1b6858ec Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 6 May 2015 21:32:36 +0200
Subject: [PATCH 0130/1519] Fix typo in guide/defining-documents.rst

---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 274f0f43e..56370c14f 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -146,7 +146,7 @@ arguments can be set on all fields:
     When True, use this field as a primary key for the collection.  `DictField`
     and `EmbeddedDocuments` both support being the primary key for a document.
 
-    .. note:: If set, this field is also accessible throught the `pk` field.
+    .. note:: If set, this field is also accessible through the `pk` field.
 
 :attr:`choices` (Default: None)
     An iterable (e.g. a list or tuple) of choices to which the value of this

From 63d55cb797cf835b34db2bbb3bc7a23d0235e6d7 Mon Sep 17 00:00:00 2001
From: Eremeev Danil <hole666@mail.ru>
Date: Thu, 9 Apr 2015 16:23:28 +0500
Subject: [PATCH 0131/1519] solution for #949

---
 mongoengine/queryset/transform.py |  3 +++
 tests/queryset/queryset.py        | 37 +++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 007cf865b..b08d450ac 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -44,6 +44,9 @@ def query(_doc_cls=None, _field_operation=False, **query):
         if len(parts) > 1 and parts[-1] in MATCH_OPERATORS:
             op = parts.pop()
 
+        if len(parts) > 1 and not parts[-1]:
+            parts.pop()
+
         negate = False
         if len(parts) > 1 and parts[-1] == 'not':
             parts.pop()
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index ac282c445..5d21cb0c5 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1328,7 +1328,7 @@ class BlogPost(Document):
         self.assertEqual(1, BlogPost.objects.count())
 
     def test_reverse_delete_rule_cascade_on_abstract_document(self):
-        """Ensure cascading deletion of referring documents from the database 
+        """Ensure cascading deletion of referring documents from the database
         does not fail on abstract document.
         """
         class AbstractBlogPost(Document):
@@ -1350,7 +1350,7 @@ class BlogPost(AbstractBlogPost):
 
         self.assertEqual(3, BlogPost.objects.count())
         self.Person.objects(name='Test User').delete()
-        self.assertEqual(1, BlogPost.objects.count())  
+        self.assertEqual(1, BlogPost.objects.count())
 
     def test_reverse_delete_rule_cascade_self_referencing(self):
         """Ensure self-referencing CASCADE deletes do not result in infinite
@@ -1411,8 +1411,8 @@ class BlogPost(Document):
         self.assertEqual(1, BlogPost.objects.count())
         self.assertEqual(None, BlogPost.objects.first().category)
 
-    def test_reverse_delete_rule_nullify_on_abstract_document(self): 
-        """Ensure nullification of references to deleted documents when 
+    def test_reverse_delete_rule_nullify_on_abstract_document(self):
+        """Ensure nullification of references to deleted documents when
         reference is on an abstract document.
         """
         class AbstractBlogPost(Document):
@@ -1474,7 +1474,7 @@ class BlogPost(AbstractBlogPost):
 
         self.assertEqual(1, BlogPost.objects.count())
         self.assertRaises(OperationError, self.Person.objects.delete)
-    
+
     def test_reverse_delete_rule_pull(self):
         """Ensure pulling of references to deleted documents.
         """
@@ -1511,9 +1511,9 @@ def test_reverse_delete_rule_pull_on_abstract_documents(self):
         """
         class AbstractBlogPost(Document):
             meta = {'abstract': True}
-            authors = ListField(ReferenceField(self.Person, 
+            authors = ListField(ReferenceField(self.Person,
                                                reverse_delete_rule=PULL))
-        
+
         class BlogPost(AbstractBlogPost):
             content = StringField()
 
@@ -1538,7 +1538,7 @@ class BlogPost(AbstractBlogPost):
 
         self.assertEqual(post.authors, [me])
         self.assertEqual(another.authors, [])
-    
+
     def test_delete_with_limits(self):
 
         class Log(Document):
@@ -3009,7 +3009,7 @@ class Book(Document):
     def test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField(self):
         class Continent(EmbeddedDocument):
             continent_name = StringField()
-        
+
         class Country(EmbeddedDocument):
             country_name = StringField()
             continent = EmbeddedDocumentField(Continent)
@@ -3026,7 +3026,7 @@ class Book(Document):
 
         europe = Continent(continent_name='europe')
         asia = Continent(continent_name='asia')
-        
+
         scotland = Country(country_name="Scotland", continent=europe)
         tibet = Country(country_name="Tibet", continent=asia)
 
@@ -3041,9 +3041,9 @@ class Book(Document):
         country_list = Book.objects.distinct("authors.country")
 
         self.assertEqual(country_list, [scotland, tibet])
-        
+
         continent_list = Book.objects.distinct("authors.country.continent")
-        
+
         self.assertEqual(continent_list, [europe, asia])
 
     def test_distinct_ListField_ReferenceField(self):
@@ -4592,6 +4592,19 @@ class ScottishCat(Cat):
         self.assertEquals(Animal.objects(folded_ears=True).count(), 1)
         self.assertEquals(Animal.objects(whiskers_length=5.1).count(), 1)
 
+    def test_last_field_name_like_operator(self):
+        class EmbeddedItem(EmbeddedDocument):
+            type = StringField()
+
+        class Doc(Document):
+            item = EmbeddedDocumentField(EmbeddedItem)
+
+        Doc.drop_collection()
+
+        doc = Doc(item=EmbeddedItem(type="axe"))
+        doc.save()
+
+        self.assertEqual(1, Doc.objects(item__type__="axe").count())
 
 if __name__ == '__main__':
     unittest.main()

From dfa8eaf24e5fd2de6673807a8b6959f256270aa1 Mon Sep 17 00:00:00 2001
From: Eremeev Danil <hole666@mail.ru>
Date: Tue, 5 May 2015 12:00:46 +0500
Subject: [PATCH 0132/1519] Added changeset, updated documentation and tests,
 changed test condition

---
 docs/changelog.rst                | 1 +
 docs/guide/querying.rst           | 9 ++++++++-
 mongoengine/queryset/transform.py | 3 ++-
 tests/queryset/queryset.py        | 4 +++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a27db5a4f..536765628 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -16,6 +16,7 @@ Changes in 0.9.X - DEV
 - Django support was removed and will be available as a separate extension. #958
 - Don't send a "cls" option to ensureIndex (related to https://jira.mongodb.org/browse/SERVER-769)
 - Fix for updating sorting in SortedListField. #978
+- Added __ support to escape field name in fields lookup keywords that match operators names #949
 
 Changes in 0.9.0
 ================
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 9d1dfd760..0a0354696 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -39,6 +39,14 @@ syntax::
     # been written by a user whose 'country' field is set to 'uk'
     uk_pages = Page.objects(author__country='uk')
 
+.. note::
+
+   (version **0.9.0+**) if your field name is like mongodb operator name (for example
+   type, lte, lt...) and you want to place it at the end of lookup keyword
+   mongoengine automatically  prepend $ to it. To avoid this use  __ at the end of
+   your lookup keyword. For example if you field name is ``type`` and you want to
+   query by this field you must use ``.objects(user__type__="admin")`` instead of
+   ``.objects(user__type="admin")``
 
 Query operators
 ===============
@@ -663,4 +671,3 @@ following example shows how the substitutions are made::
         return comments;
     }
     """)
-
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index b08d450ac..8ca3203c2 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -44,7 +44,8 @@ def query(_doc_cls=None, _field_operation=False, **query):
         if len(parts) > 1 and parts[-1] in MATCH_OPERATORS:
             op = parts.pop()
 
-        if len(parts) > 1 and not parts[-1]:
+        #if user escape field name by __
+        if len(parts) > 1 and parts[-1]=="":
             parts.pop()
 
         negate = False
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 5d21cb0c5..30c59bfa0 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4595,16 +4595,18 @@ class ScottishCat(Cat):
     def test_last_field_name_like_operator(self):
         class EmbeddedItem(EmbeddedDocument):
             type = StringField()
+            name = StringField()
 
         class Doc(Document):
             item = EmbeddedDocumentField(EmbeddedItem)
 
         Doc.drop_collection()
 
-        doc = Doc(item=EmbeddedItem(type="axe"))
+        doc = Doc(item=EmbeddedItem(type="axe", name="Heroic axe"))
         doc.save()
 
         self.assertEqual(1, Doc.objects(item__type__="axe").count())
+        self.assertEqual(1, Doc.objects(item__name__="Heroic axe").count())
 
 if __name__ == '__main__':
     unittest.main()

From aab0599280be45e202191ec668db1beba31a79a1 Mon Sep 17 00:00:00 2001
From: Eremeev Danil <hole666@mail.ru>
Date: Thu, 7 May 2015 10:53:25 +0500
Subject: [PATCH 0133/1519] test moved to another file, cosmetical fixes

---
 docs/guide/querying.rst           |  4 ++--
 mongoengine/queryset/transform.py |  2 +-
 tests/queryset/queryset.py        | 15 ---------------
 tests/queryset/transform.py       | 16 ++++++++++++++++
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 0a0354696..9861ce564 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -41,10 +41,10 @@ syntax::
 
 .. note::
 
-   (version **0.9.0+**) if your field name is like mongodb operator name (for example
+   (version **0.9.1+**) if your field name is like mongodb operator name (for example
    type, lte, lt...) and you want to place it at the end of lookup keyword
    mongoengine automatically  prepend $ to it. To avoid this use  __ at the end of
-   your lookup keyword. For example if you field name is ``type`` and you want to
+   your lookup keyword. For example if your field name is ``type`` and you want to
    query by this field you must use ``.objects(user__type__="admin")`` instead of
    ``.objects(user__type="admin")``
 
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 8ca3203c2..68adefbcb 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -45,7 +45,7 @@ def query(_doc_cls=None, _field_operation=False, **query):
             op = parts.pop()
 
         #if user escape field name by __
-        if len(parts) > 1 and parts[-1]=="":
+        if len(parts) > 1 and parts[-1] == "":
             parts.pop()
 
         negate = False
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 30c59bfa0..f407c0b74 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4592,21 +4592,6 @@ class ScottishCat(Cat):
         self.assertEquals(Animal.objects(folded_ears=True).count(), 1)
         self.assertEquals(Animal.objects(whiskers_length=5.1).count(), 1)
 
-    def test_last_field_name_like_operator(self):
-        class EmbeddedItem(EmbeddedDocument):
-            type = StringField()
-            name = StringField()
-
-        class Doc(Document):
-            item = EmbeddedDocumentField(EmbeddedItem)
-
-        Doc.drop_collection()
-
-        doc = Doc(item=EmbeddedItem(type="axe", name="Heroic axe"))
-        doc.save()
-
-        self.assertEqual(1, Doc.objects(item__type__="axe").count())
-        self.assertEqual(1, Doc.objects(item__name__="Heroic axe").count())
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 2d5261f25..77d3593c2 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -208,6 +208,22 @@ class Doc(Document):
         self.assertEqual(Doc.objects(df__type=2).count(), 1)  # str
         self.assertEqual(Doc.objects(df__type=16).count(), 1)  # int
 
+    def test_last_field_name_like_operator(self):
+        class EmbeddedItem(EmbeddedDocument):
+            type = StringField()
+            name = StringField()
+
+        class Doc(Document):
+            item = EmbeddedDocumentField(EmbeddedItem)
+
+        Doc.drop_collection()
+
+        doc = Doc(item=EmbeddedItem(type="axe", name="Heroic axe"))
+        doc.save()
+
+        self.assertEqual(1, Doc.objects(item__type__="axe").count())
+        self.assertEqual(1, Doc.objects(item__name__="Heroic axe").count())
+
 
 if __name__ == '__main__':
     unittest.main()

From a34fa74eaa74a8e0eede9cbb109dae2136f075c7 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 9 Apr 2015 03:40:42 +0200
Subject: [PATCH 0134/1519] fix connection problems with pymongo3 and added
 tests

---
 mongoengine/connection.py           | 10 ++++++---
 tests/test_connection.py            | 32 +++++++++++++++++++++++------
 tests/test_replicaset_connection.py | 27 +++++++++++++++++++-----
 3 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 5e18efb76..31f4cbcc8 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,4 +1,5 @@
-from pymongo import MongoClient, MongoReplicaSetClient, uri_parser
+import pymongo
+from pymongo import MongoClient, ReadPreference, uri_parser
 
 
 __all__ = ['ConnectionError', 'connect', 'register_connection',
@@ -6,6 +7,10 @@
 
 
 DEFAULT_CONNECTION_NAME = 'default'
+if pymongo.version_tuple[0] >= 3:
+    READ_PREFERENCE = ReadPreference.SECONDARY_PREFERRED
+else:
+    READ_PREFERENCE = False
 
 
 class ConnectionError(Exception):
@@ -18,7 +23,7 @@ class ConnectionError(Exception):
 
 
 def register_connection(alias, name=None, host=None, port=None,
-                        read_preference=False,
+                        read_preference=READ_PREFERENCE,
                         username=None, password=None, authentication_source=None,
                         **kwargs):
     """Add a connection.
@@ -109,7 +114,6 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
             # Discard replicaSet if not base string
             if not isinstance(conn_settings['replicaSet'], basestring):
                 conn_settings.pop('replicaSet', None)
-            connection_class = MongoReplicaSetClient
 
         try:
             connection = None
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 9204d80cc..88e039943 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,4 +1,6 @@
 import sys
+from time import sleep
+
 sys.path[0:0] = [""]
 
 try:
@@ -19,6 +21,13 @@
 from mongoengine.connection import get_db, get_connection, ConnectionError
 
 
+def get_tz_awareness(connection):
+    if pymongo.version_tuple[0] < 3:
+        return connection.tz_aware
+    else:
+        return connection.codec_options.tz_aware
+
+
 class ConnectionTest(unittest.TestCase):
 
     def tearDown(self):
@@ -51,6 +60,9 @@ def test_sharing_connections(self):
 
         connect('mongoenginetest', alias='testdb2')
         actual_connection = get_connection('testdb2')
+
+        # horrible, but since PyMongo3+, connection are created asynchronously
+        sleep(0.1)
         self.assertEqual(expected_connection, actual_connection)
 
     def test_connect_uri(self):
@@ -64,7 +76,8 @@ def test_connect_uri(self):
         c.admin.authenticate("admin", "password")
         c.mongoenginetest.add_user("username", "password")
 
-        self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
+        if pymongo.version_tuple[0] < 3:
+            self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
 
         connect("testdb_uri", host='mongodb://username:password@localhost/mongoenginetest')
 
@@ -90,7 +103,8 @@ def test_connect_uri_without_db(self):
         c.admin.authenticate("admin", "password")
         c.mongoenginetest.add_user("username", "password")
 
-        self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
+        if pymongo.version_tuple[0] < 3:
+            self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
 
         connect("mongoenginetest", host='mongodb://localhost/')
 
@@ -160,11 +174,11 @@ def test_connection_kwargs(self):
         connect('mongoenginetest', alias='t1', tz_aware=True)
         conn = get_connection('t1')
 
-        self.assertTrue(conn.tz_aware)
+        self.assertTrue(get_tz_awareness(conn))
 
         connect('mongoenginetest2', alias='t2')
         conn = get_connection('t2')
-        self.assertFalse(conn.tz_aware)
+        self.assertFalse(get_tz_awareness(conn))
 
     def test_datetime(self):
         connect('mongoenginetest', tz_aware=True)
@@ -188,8 +202,14 @@ def test_multiple_connection_settings(self):
         self.assertEqual(len(mongo_connections.items()), 2)
         self.assertTrue('t1' in mongo_connections.keys())
         self.assertTrue('t2' in mongo_connections.keys())
-        self.assertEqual(mongo_connections['t1'].host, 'localhost')
-        self.assertEqual(mongo_connections['t2'].host, '127.0.0.1')
+        if pymongo.version_tuple[0] < 3:
+            self.assertEqual(mongo_connections['t1'].host, 'localhost')
+            self.assertEqual(mongo_connections['t2'].host, '127.0.0.1')
+        else:
+            # horrible, but since PyMongo3+, connection are created asynchronously
+            sleep(0.1)
+            self.assertEqual(mongo_connections['t1'].address[0], 'localhost')
+            self.assertEqual(mongo_connections['t2'].address[0], '127.0.0.1')
 
 
 if __name__ == '__main__':
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index d27960f7a..b3a7e1bf1 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -3,15 +3,29 @@
 import unittest
 
 import pymongo
-from pymongo import ReadPreference, ReplicaSetConnection
+from pymongo import ReadPreference
+
+if pymongo.version_tuple[0] >= 3:
+    from pymongo import MongoClient
+    CONN_CLASS = MongoClient
+    READ_PREF = ReadPreference.SECONDARY
+else:
+    from pymongo import ReplicaSetConnection
+    CONN_CLASS = ReplicaSetConnection
+    READ_PREF = ReadPreference.SECONDARY_ONLY
 
 import mongoengine
 from mongoengine import *
-from mongoengine.connection import get_db, get_connection, ConnectionError
+from mongoengine.connection import ConnectionError
 
 
 class ConnectionTest(unittest.TestCase):
 
+    def setUp(self):
+        mongoengine.connection._connection_settings = {}
+        mongoengine.connection._connections = {}
+        mongoengine.connection._dbs = {}
+
     def tearDown(self):
         mongoengine.connection._connection_settings = {}
         mongoengine.connection._connections = {}
@@ -22,14 +36,17 @@ def test_replicaset_uri_passes_read_preference(self):
         """
 
         try:
-            conn = connect(db='mongoenginetest', host="mongodb://localhost/mongoenginetest?replicaSet=rs", read_preference=ReadPreference.SECONDARY_ONLY)
+            conn = connect(db='mongoenginetest',
+                           host="mongodb://localhost/mongoenginetest?replicaSet=rs",
+                           read_preference=READ_PREF)
         except ConnectionError, e:
             return
 
-        if not isinstance(conn, ReplicaSetConnection):
+        if not isinstance(conn, CONN_CLASS):
+            # really???
             return
 
-        self.assertEqual(conn.read_preference, ReadPreference.SECONDARY_ONLY)
+        self.assertEqual(conn.read_preference, READ_PREF)
 
 if __name__ == '__main__':
     unittest.main()

From 3b8f31c888b0e74e818de61bae83f5d3ca1ff23c Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 9 Apr 2015 03:43:49 +0200
Subject: [PATCH 0135/1519] fix problems with cursor arguments

---
 mongoengine/queryset/base.py | 38 ++++++++++++++++++++++++------------
 tests/queryset/queryset.py   | 29 ++++++++++++++++++++++++---
 2 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 7ffb9976f..11c92ece5 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -158,7 +158,8 @@ def __getitem__(self, key):
             if queryset._as_pymongo:
                 return queryset._get_as_pymongo(queryset._cursor[key])
             return queryset._document._from_son(queryset._cursor[key],
-                                               _auto_dereference=self._auto_dereference, only_fields=self.only_fields)
+                                               _auto_dereference=self._auto_dereference,
+                                               only_fields=self.only_fields)
 
         raise AttributeError
 
@@ -423,7 +424,9 @@ def delete(self, write_concern=None, _from_doc_delete=False):
         if call_document_delete:
             cnt = 0
             for doc in queryset:
-                doc.delete(write_concern=write_concern)
+                # How the fuck did this worked before ???
+                # doc.delete(write_concern=write_concern)
+                doc.delete(**write_concern)
                 cnt += 1
             return cnt
 
@@ -929,6 +932,7 @@ def timeout(self, enabled):
         queryset._timeout = enabled
         return queryset
 
+    # DEPRECATED. Has no more impact on PyMongo 3+
     def slave_okay(self, enabled):
         """Enable or disable the slave_okay when querying.
 
@@ -1383,22 +1387,30 @@ def _collection(self):
 
     @property
     def _cursor_args(self):
-        cursor_args = {
-            'snapshot': self._snapshot,
-            'timeout': self._timeout
-        }
-        if self._read_preference is not None:
-            cursor_args['read_preference'] = self._read_preference
+        if pymongo.version_tuple[0] < 3:
+            fields_name = 'fields'
+            cursor_args = {
+                'timeout': self._timeout,
+                'snapshot': self._snapshot
+            }
+            if self._read_preference is not None:
+                cursor_args['read_preference'] = self._read_preference
+            else:
+                cursor_args['slave_okay'] = self._slave_okay
         else:
-            cursor_args['slave_okay'] = self._slave_okay
+            fields_name = 'projection'
+            # snapshot seems not to be handled at all by PyMongo 3+
+            cursor_args = {
+                'no_cursor_timeout': self._timeout
+            }
         if self._loaded_fields:
-            cursor_args['fields'] = self._loaded_fields.as_dict()
+            cursor_args[fields_name] = self._loaded_fields.as_dict()
 
         if self._search_text:
-            if 'fields' not in cursor_args:
-                cursor_args['fields'] = {}
+            if fields_name not in cursor_args:
+                cursor_args[fields_name] = {}
 
-            cursor_args['fields']['_text_score'] = {'$meta': "textScore"}
+            cursor_args[fields_name]['_text_score'] = {'$meta': "textScore"}
 
         return cursor_args
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index f407c0b74..a02683615 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -51,6 +51,20 @@ def _inner(*args, **kwargs):
     return _inner
 
 
+def skip_pymongo3(f):
+    def _inner(*args, **kwargs):
+
+        if pymongo.version_tuple[0] >= 3:
+            raise SkipTest("Useless with PyMongo 3+")
+
+        return f(*args, **kwargs)
+
+    _inner.__name__ = f.__name__
+    _inner.__doc__ = f.__doc__
+
+    return _inner
+
+
 class QuerySetTest(unittest.TestCase):
 
     def setUp(self):
@@ -869,6 +883,8 @@ def test_slave_okay(self):
         self.assertEqual(person.name, "User A")
         self.assertEqual(person.age, 20)
 
+    @skip_older_mongodb
+    @skip_pymongo3
     def test_cursor_args(self):
         """Ensures the cursor args can be set as expected
         """
@@ -2926,8 +2942,12 @@ class News(Document):
         self.assertEqual(query.count(), 3)
         self.assertEqual(query._query, {'$text': {'$search': 'brasil'}})
         cursor_args = query._cursor_args
+        if pymongo.version_tuple[0] < 3:
+            cursor_args_fields = cursor_args['fields']
+        else:
+            cursor_args_fields = cursor_args['projection']
         self.assertEqual(
-            cursor_args['fields'], {'_text_score': {'$meta': 'textScore'}})
+            cursor_args_fields, {'_text_score': {'$meta': 'textScore'}})
 
         text_scores = [i.get_text_score() for i in query]
         self.assertEqual(len(text_scores), 3)
@@ -3992,8 +4012,11 @@ class Bar(Document):
         bars = list(Bar.objects(read_preference=ReadPreference.PRIMARY))
         self.assertEqual([], bars)
 
-        self.assertRaises(ConfigurationError, Bar.objects,
-                          read_preference='Primary')
+        if pymongo.version_tuple[0] < 3:
+            error_class = ConfigurationError
+        else:
+            error_class = TypeError
+        self.assertRaises(error_class, Bar.objects, read_preference='Primary')
 
         bars = Bar.objects(read_preference=ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(

From 36eedc987c1ae7ee03de1392c8550c354f6d3803 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 9 Apr 2015 03:45:25 +0200
Subject: [PATCH 0136/1519] adapted index test to new explain output in
 pymongo3 and added comment to a possible pymongo3 bug

---
 tests/document/indexes.py | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 6256cde30..b1ea37079 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -432,6 +432,7 @@ def test_covered_index(self):
 
         class Test(Document):
             a = IntField()
+            b = IntField()
 
             meta = {
                 'indexes': ['a'],
@@ -446,13 +447,30 @@ class Test(Document):
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
         query_plan = Test.objects(id=obj.id).exclude('a').explain()
-        self.assertFalse(query_plan['indexOnly'])
+        if pymongo.version_tuple[0] < 3:
+            self.assertFalse(query_plan['indexOnly'])
+        else:
+            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IDHACK')
 
         query_plan = Test.objects(id=obj.id).only('id').explain()
-        self.assertTrue(query_plan['indexOnly'])
+        if pymongo.version_tuple[0] < 3:
+            self.assertTrue(query_plan['indexOnly'])
+        else:
+            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IDHACK')
 
         query_plan = Test.objects(a=1).only('a').exclude('id').explain()
-        self.assertTrue(query_plan['indexOnly'])
+        if pymongo.version_tuple[0] < 3:
+            self.assertTrue(query_plan['indexOnly'])
+        else:
+            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IXSCAN')
+            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('stage'), 'PROJECTION')
+
+        query_plan = Test.objects(a=1).explain()
+        if pymongo.version_tuple[0] < 3:
+            self.assertFalse(query_plan['indexOnly'])
+        else:
+            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IXSCAN')
+            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('stage'), 'FETCH')
 
     def test_index_on_id(self):
 
@@ -491,6 +509,9 @@ class BlogPost(Document):
 
         self.assertEqual(BlogPost.objects.count(), 10)
         self.assertEqual(BlogPost.objects.hint().count(), 10)
+        # here we seem to have find a bug in PyMongo 3.
+        # The cursor first makes a SON out of the list of tuples
+        # Then later reuses it and wonders why is it not a list of tuples
         self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
 
         self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10)

From 775c8624d42a4f167d20cd792c434b84fd69ed9d Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 9 Apr 2015 03:46:42 +0200
Subject: [PATCH 0137/1519] change to try to address issues due to new save()
 behaviour, not satisfying, some tests are still failing

---
 mongoengine/document.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 01083d243..c9304c2b5 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1,11 +1,8 @@
-import warnings
 
-import hashlib
 import pymongo
 import re
 
 from pymongo.read_preferences import ReadPreference
-from bson import ObjectId
 from bson.dbref import DBRef
 from mongoengine import signals
 from mongoengine.common import _import_class
@@ -19,7 +16,7 @@
     ALLOW_INHERITANCE,
     get_document
 )
-from mongoengine.errors import ValidationError, InvalidQueryError, InvalidDocumentError
+from mongoengine.errors import InvalidQueryError, InvalidDocumentError
 from mongoengine.queryset import (OperationError, NotUniqueError,
                                   QuerySet, transform)
 from mongoengine.connection import get_db, DEFAULT_CONNECTION_NAME
@@ -296,7 +293,12 @@ def save(self, force_insert=False, validate=True, clean=True,
 
         doc = self.to_mongo()
 
-        created = ('_id' not in doc or self._created or force_insert)
+        # I think the self._created flag is not necessarily required in PyMongo3
+        # but may cause test test_collection_name_and_primary to fail
+        if pymongo.version_tuple[0] < 3:
+            created = ('_id' not in doc or self._created or force_insert)
+        else:
+            created = ('_id' not in doc or force_insert)
 
         signals.pre_save_post_validation.send(self.__class__, document=self,
                                               created=created)

From 46817caa68ac401d9e5084162095840ab8e4b7ff Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 9 Apr 2015 03:47:13 +0200
Subject: [PATCH 0138/1519] various unused imports removed (I am allergic)

---
 mongoengine/base/datastructures.py | 1 -
 mongoengine/base/metaclasses.py    | 4 +---
 mongoengine/python_support.py      | 2 +-
 mongoengine/queryset/transform.py  | 2 +-
 mongoengine/queryset/visitor.py    | 3 ---
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 3f7354a3a..91403de90 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,5 +1,4 @@
 import weakref
-import functools
 import itertools
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 7a104da97..8a25ff3dc 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -1,13 +1,11 @@
 import warnings
 
-import pymongo
-
 from mongoengine.common import _import_class
 from mongoengine.errors import InvalidDocumentError
 from mongoengine.python_support import PY3
 from mongoengine.queryset import (DO_NOTHING, DoesNotExist,
                                   MultipleObjectsReturned,
-                                  QuerySet, QuerySetManager)
+                                  QuerySetManager)
 
 from mongoengine.base.common import _document_registry, ALLOW_INHERITANCE
 from mongoengine.base.fields import BaseField, ComplexBaseField, ObjectIdField
diff --git a/mongoengine/python_support.py b/mongoengine/python_support.py
index 2c4df00c2..1214b4909 100644
--- a/mongoengine/python_support.py
+++ b/mongoengine/python_support.py
@@ -12,7 +12,7 @@ def b(s):
         return codecs.latin_1_encode(s)[0]
 
     bin_type = bytes
-    txt_type   = str
+    txt_type = str
 else:
     try:
         from cStringIO import StringIO
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 68adefbcb..e8cd2721d 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -6,7 +6,7 @@
 from mongoengine.base.fields import UPDATE_OPERATORS
 from mongoengine.connection import get_connection
 from mongoengine.common import _import_class
-from mongoengine.errors import InvalidQueryError, LookUpError
+from mongoengine.errors import InvalidQueryError
 
 __all__ = ('query', 'update')
 
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index e5d2e6152..84365f56b 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -1,8 +1,5 @@
 import copy
 
-from itertools import product
-from functools import reduce
-
 from mongoengine.errors import InvalidQueryError
 from mongoengine.queryset import transform
 

From ccbd128fa2a297eaf82c5ec8cb4cc34afda07654 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 9 Apr 2015 10:57:19 +0200
Subject: [PATCH 0139/1519] first adaptations after comments and find-outs

---
 mongoengine/connection.py    |  5 ++++-
 mongoengine/document.py      |  8 ++++----
 mongoengine/queryset/base.py |  2 --
 tests/document/indexes.py    | 10 +++++-----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 31f4cbcc8..0aa040ed6 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -8,8 +8,9 @@
 
 DEFAULT_CONNECTION_NAME = 'default'
 if pymongo.version_tuple[0] >= 3:
-    READ_PREFERENCE = ReadPreference.SECONDARY_PREFERRED
+    READ_PREFERENCE = ReadPreference.PRIMARY
 else:
+    from pymongo import MongoReplicaSetClient
     READ_PREFERENCE = False
 
 
@@ -126,6 +127,8 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
                 if conn_settings == connection_settings and _connections.get(db_alias, None):
                     connection = _connections[db_alias]
                     break
+                if pymongo.version_tuple[0] < 3:
+                    connection_class = MongoReplicaSetClient
 
             _connections[alias] = connection if connection else connection_class(**conn_settings)
         except Exception, e:
diff --git a/mongoengine/document.py b/mongoengine/document.py
index c9304c2b5..b27bd086e 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -295,10 +295,10 @@ def save(self, force_insert=False, validate=True, clean=True,
 
         # I think the self._created flag is not necessarily required in PyMongo3
         # but may cause test test_collection_name_and_primary to fail
-        if pymongo.version_tuple[0] < 3:
-            created = ('_id' not in doc or self._created or force_insert)
-        else:
-            created = ('_id' not in doc or force_insert)
+        # if pymongo.version_tuple[0] < 3:
+        created = ('_id' not in doc or self._created or force_insert)
+        # else:
+        #     created = ('_id' not in doc or force_insert)
 
         signals.pre_save_post_validation.send(self.__class__, document=self,
                                               created=created)
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 11c92ece5..09a4c3bca 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -424,8 +424,6 @@ def delete(self, write_concern=None, _from_doc_delete=False):
         if call_document_delete:
             cnt = 0
             for doc in queryset:
-                # How the fuck did this worked before ???
-                # doc.delete(write_concern=write_concern)
                 doc.delete(**write_concern)
                 cnt += 1
             return cnt
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index b1ea37079..b8b3ba0c7 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -509,12 +509,12 @@ class BlogPost(Document):
 
         self.assertEqual(BlogPost.objects.count(), 10)
         self.assertEqual(BlogPost.objects.hint().count(), 10)
-        # here we seem to have find a bug in PyMongo 3.
-        # The cursor first makes a SON out of the list of tuples
-        # Then later reuses it and wonders why is it not a list of tuples
-        self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
 
-        self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10)
+        # PyMongo 3.0 bug
+        if pymongo.version != '3.0':
+            self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
+
+            self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10)
 
         if pymongo.version >= '2.8':
             self.assertEqual(BlogPost.objects.hint('tags').count(), 10)

From c0f149347335e31be35742977de280283c3b8557 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 9 Apr 2015 15:50:16 +0200
Subject: [PATCH 0140/1519] fix revert situated at the wrong location

---
 mongoengine/connection.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 0aa040ed6..897dcc2af 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -115,6 +115,8 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
             # Discard replicaSet if not base string
             if not isinstance(conn_settings['replicaSet'], basestring):
                 conn_settings.pop('replicaSet', None)
+            if pymongo.version_tuple[0] < 3:
+                connection_class = MongoReplicaSetClient
 
         try:
             connection = None
@@ -127,8 +129,6 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
                 if conn_settings == connection_settings and _connections.get(db_alias, None):
                     connection = _connections[db_alias]
                     break
-                if pymongo.version_tuple[0] < 3:
-                    connection_class = MongoReplicaSetClient
 
             _connections[alias] = connection if connection else connection_class(**conn_settings)
         except Exception, e:

From 48316ba60d4051d38d156c5704d422b077ce11bd Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Fri, 10 Apr 2015 22:23:56 +0200
Subject: [PATCH 0141/1519] implemented global IS_PYMONGO_3

---
 mongoengine/connection.py           |  7 +++----
 mongoengine/document.py             |  2 +-
 mongoengine/python_support.py       |  7 +++++++
 mongoengine/queryset/base.py        |  3 ++-
 tests/document/indexes.py           | 11 ++++++-----
 tests/queryset/queryset.py          |  8 ++++----
 tests/test_connection.py            |  9 +++++----
 tests/test_replicaset_connection.py |  6 ++++--
 8 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 897dcc2af..b203e168b 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,13 +1,12 @@
-import pymongo
 from pymongo import MongoClient, ReadPreference, uri_parser
-
+from mongoengine.python_support import IS_PYMONGO_3
 
 __all__ = ['ConnectionError', 'connect', 'register_connection',
            'DEFAULT_CONNECTION_NAME']
 
 
 DEFAULT_CONNECTION_NAME = 'default'
-if pymongo.version_tuple[0] >= 3:
+if IS_PYMONGO_3:
     READ_PREFERENCE = ReadPreference.PRIMARY
 else:
     from pymongo import MongoReplicaSetClient
@@ -115,7 +114,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
             # Discard replicaSet if not base string
             if not isinstance(conn_settings['replicaSet'], basestring):
                 conn_settings.pop('replicaSet', None)
-            if pymongo.version_tuple[0] < 3:
+            if not IS_PYMONGO_3:
                 connection_class = MongoReplicaSetClient
 
         try:
diff --git a/mongoengine/document.py b/mongoengine/document.py
index b27bd086e..8cc928666 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -295,7 +295,7 @@ def save(self, force_insert=False, validate=True, clean=True,
 
         # I think the self._created flag is not necessarily required in PyMongo3
         # but may cause test test_collection_name_and_primary to fail
-        # if pymongo.version_tuple[0] < 3:
+        # if not IS_PYMONGO_3:
         created = ('_id' not in doc or self._created or force_insert)
         # else:
         #     created = ('_id' not in doc or force_insert)
diff --git a/mongoengine/python_support.py b/mongoengine/python_support.py
index 1214b4909..3412c8414 100644
--- a/mongoengine/python_support.py
+++ b/mongoengine/python_support.py
@@ -1,6 +1,13 @@
 """Helper functions and types to aid with Python 2.5 - 3 support."""
 
 import sys
+import pymongo
+
+
+if pymongo.version_tuple[0] < 3:
+    IS_PYMONGO_3 = False
+else:
+    IS_PYMONGO_3 = True
 
 PY3 = sys.version_info[0] == 3
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 09a4c3bca..6867cef38 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -21,6 +21,7 @@
 from mongoengine.base.common import get_document
 from mongoengine.errors import (OperationError, NotUniqueError,
                                 InvalidQueryError, LookUpError)
+from mongoengine.python_support import IS_PYMONGO_3
 from mongoengine.queryset import transform
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
@@ -1385,7 +1386,7 @@ def _collection(self):
 
     @property
     def _cursor_args(self):
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             fields_name = 'fields'
             cursor_args = {
                 'timeout': self._timeout,
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index b8b3ba0c7..7f40e2fd1 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import unittest
 import sys
+
 sys.path[0:0] = [""]
 
-import os
 import pymongo
 
 from nose.plugins.skip import SkipTest
@@ -11,6 +11,7 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db, get_connection
+from mongoengine.python_support import IS_PYMONGO_3
 
 __all__ = ("IndexesTest", )
 
@@ -447,26 +448,26 @@ class Test(Document):
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
         query_plan = Test.objects(id=obj.id).exclude('a').explain()
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             self.assertFalse(query_plan['indexOnly'])
         else:
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IDHACK')
 
         query_plan = Test.objects(id=obj.id).only('id').explain()
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             self.assertTrue(query_plan['indexOnly'])
         else:
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IDHACK')
 
         query_plan = Test.objects(a=1).only('a').exclude('id').explain()
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             self.assertTrue(query_plan['indexOnly'])
         else:
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IXSCAN')
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('stage'), 'PROJECTION')
 
         query_plan = Test.objects(a=1).explain()
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             self.assertFalse(query_plan['indexOnly'])
         else:
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IXSCAN')
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index a02683615..b757ddda1 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -17,7 +17,7 @@
 
 from mongoengine import *
 from mongoengine.connection import get_connection, get_db
-from mongoengine.python_support import PY3
+from mongoengine.python_support import PY3, IS_PYMONGO_3
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.queryset import (QuerySet, QuerySetManager,
                                   MultipleObjectsReturned, DoesNotExist,
@@ -54,7 +54,7 @@ def _inner(*args, **kwargs):
 def skip_pymongo3(f):
     def _inner(*args, **kwargs):
 
-        if pymongo.version_tuple[0] >= 3:
+        if IS_PYMONGO_3:
             raise SkipTest("Useless with PyMongo 3+")
 
         return f(*args, **kwargs)
@@ -2942,7 +2942,7 @@ class News(Document):
         self.assertEqual(query.count(), 3)
         self.assertEqual(query._query, {'$text': {'$search': 'brasil'}})
         cursor_args = query._cursor_args
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             cursor_args_fields = cursor_args['fields']
         else:
             cursor_args_fields = cursor_args['projection']
@@ -4012,7 +4012,7 @@ class Bar(Document):
         bars = list(Bar.objects(read_preference=ReadPreference.PRIMARY))
         self.assertEqual([], bars)
 
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             error_class = ConfigurationError
         else:
             error_class = TypeError
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 88e039943..f9cc9c78e 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -17,12 +17,13 @@
     connect, register_connection,
     Document, DateTimeField
 )
+from mongoengine.python_support import IS_PYMONGO_3
 import mongoengine.connection
 from mongoengine.connection import get_db, get_connection, ConnectionError
 
 
 def get_tz_awareness(connection):
-    if pymongo.version_tuple[0] < 3:
+    if not IS_PYMONGO_3:
         return connection.tz_aware
     else:
         return connection.codec_options.tz_aware
@@ -76,7 +77,7 @@ def test_connect_uri(self):
         c.admin.authenticate("admin", "password")
         c.mongoenginetest.add_user("username", "password")
 
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
 
         connect("testdb_uri", host='mongodb://username:password@localhost/mongoenginetest')
@@ -103,7 +104,7 @@ def test_connect_uri_without_db(self):
         c.admin.authenticate("admin", "password")
         c.mongoenginetest.add_user("username", "password")
 
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
 
         connect("mongoenginetest", host='mongodb://localhost/')
@@ -202,7 +203,7 @@ def test_multiple_connection_settings(self):
         self.assertEqual(len(mongo_connections.items()), 2)
         self.assertTrue('t1' in mongo_connections.keys())
         self.assertTrue('t2' in mongo_connections.keys())
-        if pymongo.version_tuple[0] < 3:
+        if not IS_PYMONGO_3:
             self.assertEqual(mongo_connections['t1'].host, 'localhost')
             self.assertEqual(mongo_connections['t2'].host, '127.0.0.1')
         else:
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index b3a7e1bf1..361cff412 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -1,11 +1,13 @@
 import sys
+
 sys.path[0:0] = [""]
 import unittest
 
-import pymongo
 from pymongo import ReadPreference
 
-if pymongo.version_tuple[0] >= 3:
+from mongoengine.python_support import IS_PYMONGO_3
+
+if IS_PYMONGO_3:
     from pymongo import MongoClient
     CONN_CLASS = MongoClient
     READ_PREF = ReadPreference.SECONDARY

From e80322021a5d41a1ee1ac889d11237a56c9f6f0e Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Fri, 10 Apr 2015 23:20:22 +0200
Subject: [PATCH 0142/1519] corrected and enhanced geo_index test

---
 tests/fields/geo.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/fields/geo.py b/tests/fields/geo.py
index 8193d87e9..a0d2237ab 100644
--- a/tests/fields/geo.py
+++ b/tests/fields/geo.py
@@ -336,12 +336,11 @@ class Parent(Document):
         Location.drop_collection()
         Parent.drop_collection()
 
-        list(Parent.objects)
-
-        collection = Parent._get_collection()
-        info = collection.index_information()
-
+        Parent(name='Berlin').save()
+        info = Parent._get_collection().index_information()
         self.assertFalse('location_2d' in info)
+        info = Location._get_collection().index_information()
+        self.assertTrue('location_2d' in info)
 
         self.assertEqual(len(Parent._geo_indices()), 0)
         self.assertEqual(len(Location._geo_indices()), 1)

From 3db896c4e210448aa16fda2a6cef835fd875d62a Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Sat, 11 Apr 2015 01:31:13 +0200
Subject: [PATCH 0143/1519] work-around for pymongo 3 bug

---
 mongoengine/document.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 8cc928666..ae5f585d6 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -166,6 +166,7 @@ def _get_db(cls):
     @classmethod
     def _get_collection(cls):
         """Returns the collection for the document."""
+        #TODO: use new get_collection() with PyMongo3 ?
         if not hasattr(cls, '_collection') or cls._collection is None:
             db = cls._get_db()
             collection_name = cls._get_collection_name()
@@ -293,12 +294,7 @@ def save(self, force_insert=False, validate=True, clean=True,
 
         doc = self.to_mongo()
 
-        # I think the self._created flag is not necessarily required in PyMongo3
-        # but may cause test test_collection_name_and_primary to fail
-        # if not IS_PYMONGO_3:
         created = ('_id' not in doc or self._created or force_insert)
-        # else:
-        #     created = ('_id' not in doc or force_insert)
 
         signals.pre_save_post_validation.send(self.__class__, document=self,
                                               created=created)
@@ -312,6 +308,10 @@ def save(self, force_insert=False, validate=True, clean=True,
                     object_id = collection.insert(doc, **write_concern)
                 else:
                     object_id = collection.save(doc, **write_concern)
+                    # Pymongo 3.0 bug, fix scheduled for 3.0.1
+                    if not object_id and pymongo.version_tuple == (3, 0):
+                        object_id = self._qs.filter(**self._object_key).first() and \
+                                    self._qs.filter(**self._object_key).first().pk
             else:
                 object_id = doc['_id']
                 updates, removals = self._delta()

From 0a65006bb4f3b356391de5b4258792a7bbf763e9 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Sat, 11 Apr 2015 01:31:54 +0200
Subject: [PATCH 0144/1519] replaced find_and_modify by PyMongo3 equivalents

---
 mongoengine/queryset/base.py | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 6867cef38..0ad0e03bf 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -13,6 +13,7 @@
 import pymongo
 import pymongo.errors
 from pymongo.common import validate_read_preference
+from pymongo.collection import ReturnDocument
 
 from mongoengine import signals
 from mongoengine.connection import get_db
@@ -547,7 +548,7 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
 
         :param upsert: insert if document doesn't exist (default ``False``)
         :param full_response: return the entire response object from the
-            server (default ``False``)
+            server (default ``False``, not available for PyMongo 3+)
         :param remove: remove rather than updating (default ``False``)
         :param new: return updated rather than original document
             (default ``False``)
@@ -565,13 +566,31 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
 
         queryset = self.clone()
         query = queryset._query
-        update = transform.update(queryset._document, **update)
+        if not remove and IS_PYMONGO_3:
+            update = transform.update(queryset._document, **update)
         sort = queryset._ordering
 
         try:
-            result = queryset._collection.find_and_modify(
-                query, update, upsert=upsert, sort=sort, remove=remove, new=new,
-                full_response=full_response, **self._cursor_args)
+            if IS_PYMONGO_3:
+                if full_response:
+                    msg = ("With PyMongo 3+, it is not possible anymore to get the full response.")
+                    warnings.warn(msg, DeprecationWarning)
+                if remove:
+                    result = queryset._collection.find_one_and_delete(
+                        query, sort=sort, **self._cursor_args)
+                else:
+                    if new:
+                        return_doc = ReturnDocument.AFTER
+                    else:
+                        return_doc = ReturnDocument.BEFORE
+                    result = queryset._collection.find_one_and_update(
+                        query, update, upsert=upsert, sort=sort, return_document=return_doc,
+                        **self._cursor_args)
+
+            else:
+                result = queryset._collection.find_and_modify(
+                    query, update, upsert=upsert, sort=sort, remove=remove, new=new,
+                    full_response=full_response, **self._cursor_args)
         except pymongo.errors.DuplicateKeyError, err:
             raise NotUniqueError(u"Update failed (%s)" % err)
         except pymongo.errors.OperationFailure, err:

From a5c2fc4f9da37d85bc59677187d6a289b4f2c2d7 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Sat, 11 Apr 2015 01:54:05 +0200
Subject: [PATCH 0145/1519] reinforced test for BinaryField being a Primary Key

---
 tests/fields/fields.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7a99bd78a..830c98827 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2488,10 +2488,11 @@ class Attachment(Document):
             id = BinaryField(primary_key=True)
 
         Attachment.drop_collection()
-
-        att = Attachment(id=uuid.uuid4().bytes).save()
+        binary_id = uuid.uuid4().bytes
+        att = Attachment(id=binary_id).save()
+        self.assertEqual(1, Attachment.objects.count())
+        self.assertIsNotNone(Attachment.objects.filter(id=binary_id).first())
         att.delete()
-
         self.assertEqual(0, Attachment.objects.count())
 
     def test_choices_validation(self):

From 6ad9a56bd914f48a877f1696af52d7385f23d0b4 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Sat, 11 Apr 2015 11:08:26 +0200
Subject: [PATCH 0146/1519] corrected bad import preventing to run on PyMongo
 2.X versions

---
 mongoengine/queryset/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 0ad0e03bf..81da98d7e 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -13,7 +13,6 @@
 import pymongo
 import pymongo.errors
 from pymongo.common import validate_read_preference
-from pymongo.collection import ReturnDocument
 
 from mongoengine import signals
 from mongoengine.connection import get_db
@@ -27,6 +26,9 @@
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
 
+if IS_PYMONGO_3:
+    from pymongo.collection import ReturnDocument
+
 
 __all__ = ('BaseQuerySet', 'DO_NOTHING', 'NULLIFY', 'CASCADE', 'DENY', 'PULL')
 

From f31f52ff1c7c033c3eef91f035883b41276568c4 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Sat, 11 Apr 2015 22:46:24 +0200
Subject: [PATCH 0147/1519] corrected test condition, depending on mongodb and
 not pymongo version

---
 tests/document/indexes.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 7f40e2fd1..f88b903aa 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -11,7 +11,6 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db, get_connection
-from mongoengine.python_support import IS_PYMONGO_3
 
 __all__ = ("IndexesTest", )
 
@@ -445,29 +444,32 @@ class Test(Document):
         obj = Test(a=1)
         obj.save()
 
+        connection = get_connection()
+        IS_MONGODB_3 = connection.server_info()['versionArray'][0] >= 3
+
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
         query_plan = Test.objects(id=obj.id).exclude('a').explain()
-        if not IS_PYMONGO_3:
+        if not IS_MONGODB_3:
             self.assertFalse(query_plan['indexOnly'])
         else:
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IDHACK')
 
         query_plan = Test.objects(id=obj.id).only('id').explain()
-        if not IS_PYMONGO_3:
+        if not IS_MONGODB_3:
             self.assertTrue(query_plan['indexOnly'])
         else:
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IDHACK')
 
         query_plan = Test.objects(a=1).only('a').exclude('id').explain()
-        if not IS_PYMONGO_3:
+        if not IS_MONGODB_3:
             self.assertTrue(query_plan['indexOnly'])
         else:
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IXSCAN')
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('stage'), 'PROJECTION')
 
         query_plan = Test.objects(a=1).explain()
-        if not IS_PYMONGO_3:
+        if not IS_MONGODB_3:
             self.assertFalse(query_plan['indexOnly'])
         else:
             self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IXSCAN')

From c44891a1a8b50fdff3ab7e4ffea049fa96d604ae Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Sat, 11 Apr 2015 22:55:08 +0200
Subject: [PATCH 0148/1519] changed unittest to call for compatibility with
 Python 2.6

---
 tests/fields/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 830c98827..3b860cc78 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2491,7 +2491,7 @@ class Attachment(Document):
         binary_id = uuid.uuid4().bytes
         att = Attachment(id=binary_id).save()
         self.assertEqual(1, Attachment.objects.count())
-        self.assertIsNotNone(Attachment.objects.filter(id=binary_id).first())
+        self.assertNotEqual(None, Attachment.objects.filter(id=binary_id).first())
         att.delete()
         self.assertEqual(0, Attachment.objects.count())
 

From 33b1eed3619b853fce9cb8a845f6664fee523ac0 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Sat, 11 Apr 2015 22:55:33 +0200
Subject: [PATCH 0149/1519] corrected logical test for not Pymongo3 versions

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 81da98d7e..2e087e100 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -568,7 +568,7 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
 
         queryset = self.clone()
         query = queryset._query
-        if not remove and IS_PYMONGO_3:
+        if not IS_PYMONGO_3 or not remove:
             update = transform.update(queryset._document, **update)
         sort = queryset._ordering
 

From 76adb13a64d72bc2e243e22e3853c98e0e8898be Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Sun, 12 Apr 2015 12:29:25 +0200
Subject: [PATCH 0150/1519] Minor text and comments enhancements

---
 mongoengine/document.py      | 6 ++++--
 mongoengine/queryset/base.py | 4 +++-
 tests/fields/fields.py       | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index ae5f585d6..2e3eee9df 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -166,7 +166,7 @@ def _get_db(cls):
     @classmethod
     def _get_collection(cls):
         """Returns the collection for the document."""
-        #TODO: use new get_collection() with PyMongo3 ?
+        # TODO: use new get_collection() with PyMongo3 ?
         if not hasattr(cls, '_collection') or cls._collection is None:
             db = cls._get_db()
             collection_name = cls._get_collection_name()
@@ -308,7 +308,9 @@ def save(self, force_insert=False, validate=True, clean=True,
                     object_id = collection.insert(doc, **write_concern)
                 else:
                     object_id = collection.save(doc, **write_concern)
-                    # Pymongo 3.0 bug, fix scheduled for 3.0.1
+                    # TODO: Pymongo 3.0 bug, fix scheduled for 3.0.1
+                    # In PyMongo 3.0, the save() call calls internally the _update() call
+                    # but they forget to return the _id value passed back, therefore getting it back here
                     if not object_id and pymongo.version_tuple == (3, 0):
                         object_id = self._qs.filter(**self._object_key).first() and \
                                     self._qs.filter(**self._object_key).first().pk
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 2e087e100..803374bd8 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -930,6 +930,7 @@ def explain(self, format=False):
             plan = pprint.pformat(plan)
         return plan
 
+    # DEPRECATED. Has no more impact on PyMongo 3+
     def snapshot(self, enabled):
         """Enable or disable snapshot mode when querying.
 
@@ -1419,7 +1420,8 @@ def _cursor_args(self):
                 cursor_args['slave_okay'] = self._slave_okay
         else:
             fields_name = 'projection'
-            # snapshot seems not to be handled at all by PyMongo 3+
+            # snapshot is not to handled at all by PyMongo 3+
+            # TODO: raise a warning?
             cursor_args = {
                 'no_cursor_timeout': self._timeout
             }
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 3b860cc78..0dc239c4f 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2491,7 +2491,8 @@ class Attachment(Document):
         binary_id = uuid.uuid4().bytes
         att = Attachment(id=binary_id).save()
         self.assertEqual(1, Attachment.objects.count())
-        self.assertNotEqual(None, Attachment.objects.filter(id=binary_id).first())
+        # TODO use assertIsNotNone once Python 2.6 support is dropped
+        self.assertFalse(Attachment.objects.filter(id=binary_id).first() is not None)
         att.delete()
         self.assertEqual(0, Attachment.objects.count())
 

From c25619fd6314ada89893c97dacd231e57a67e54b Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Sun, 12 Apr 2015 14:07:45 +0200
Subject: [PATCH 0151/1519] improved deprecation documentation and added
 warning when using snapshot with PyMongo3

---
 mongoengine/queryset/base.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 803374bd8..3752902a7 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -937,6 +937,7 @@ def snapshot(self, enabled):
         :param enabled: whether or not snapshot mode is enabled
 
         ..versionchanged:: 0.5 - made chainable
+        .. deprecated:: Ignored with PyMongo 3+
         """
         queryset = self.clone()
         queryset._snapshot = enabled
@@ -958,6 +959,8 @@ def slave_okay(self, enabled):
         """Enable or disable the slave_okay when querying.
 
         :param enabled: whether or not the slave_okay is enabled
+
+        .. deprecated:: Ignored with PyMongo 3+
         """
         queryset = self.clone()
         queryset._slave_okay = enabled
@@ -1420,8 +1423,11 @@ def _cursor_args(self):
                 cursor_args['slave_okay'] = self._slave_okay
         else:
             fields_name = 'projection'
-            # snapshot is not to handled at all by PyMongo 3+
-            # TODO: raise a warning?
+            # snapshot is not handled at all by PyMongo 3+
+            # TODO: evaluate similar possibilities using modifiers
+            if self._snapshot:
+                msg = "The snapshot option is not anymore available with PyMongo 3+"
+                warnings.warn(msg, DeprecationWarning)
             cursor_args = {
                 'no_cursor_timeout': self._timeout
             }

From 3421fffa9be637c8fa6eb5d023da5d3d2fb19e9e Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 16 Apr 2015 11:18:29 +0200
Subject: [PATCH 0152/1519] reactivated unnecessarily skipped test

---
 tests/queryset/geo.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 5148a48e3..dad511324 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -1,4 +1,6 @@
 import sys
+from mongoengine.connection import get_connection
+
 sys.path[0:0] = [""]
 
 import unittest
@@ -141,7 +143,13 @@ class Event(Document):
     def test_spherical_geospatial_operators(self):
         """Ensure that spherical geospatial queries are working
         """
-        raise SkipTest("https://jira.mongodb.org/browse/SERVER-14039")
+        # Needs MongoDB > 2.6.4 https://jira.mongodb.org/browse/SERVER-14039
+        connection = get_connection()
+        info = connection.test.command('buildInfo')
+        mongodb_version = tuple([int(i) for i in info['version'].split('.')])
+        if mongodb_version < (2, 6, 4):
+            raise SkipTest("Need MongoDB version 2.6.4+")
+
         class Point(Document):
             location = GeoPointField()
 

From 571a7dc42d0de14c097b0429f76c8a1131b9a48a Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 16 Apr 2015 11:45:04 +0200
Subject: [PATCH 0153/1519] Fix last issue with binary field as primary key and
 skipped new test

---
 mongoengine/document.py |  5 +++--
 tests/fields/fields.py  | 21 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 2e3eee9df..ff39b13ab 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -312,8 +312,9 @@ def save(self, force_insert=False, validate=True, clean=True,
                     # In PyMongo 3.0, the save() call calls internally the _update() call
                     # but they forget to return the _id value passed back, therefore getting it back here
                     if not object_id and pymongo.version_tuple == (3, 0):
-                        object_id = self._qs.filter(**self._object_key).first() and \
-                                    self._qs.filter(**self._object_key).first().pk
+                        pk_as_mongo_obj = self._fields.get(self._meta['id_field']).to_mongo(self.pk)
+                        object_id = self._qs.filter(pk=pk_as_mongo_obj).first() and \
+                                    self._qs.filter(pk=pk_as_mongo_obj).first().pk
             else:
                 object_id = doc['_id']
                 updates, removals = self._delta()
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 0dc239c4f..071f1dd09 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import sys
+from nose.plugins.skip import SkipTest
+
 sys.path[0:0] = [""]
 
 import datetime
@@ -2491,8 +2493,25 @@ class Attachment(Document):
         binary_id = uuid.uuid4().bytes
         att = Attachment(id=binary_id).save()
         self.assertEqual(1, Attachment.objects.count())
+        self.assertEqual(1, Attachment.objects.filter(id=att.id).count())
+        # TODO use assertIsNotNone once Python 2.6 support is dropped
+        self.assertTrue(Attachment.objects.filter(id=att.id).first() is not None)
+        att.delete()
+        self.assertEqual(0, Attachment.objects.count())
+
+    def test_binary_field_primary_filter_by_binary_pk_as_str(self):
+
+        raise SkipTest("Querying by id as string is not currently supported")
+
+        class Attachment(Document):
+            id = BinaryField(primary_key=True)
+
+        Attachment.drop_collection()
+        binary_id = uuid.uuid4().bytes
+        att = Attachment(id=binary_id).save()
+        self.assertEqual(1, Attachment.objects.filter(id=binary_id).count())
         # TODO use assertIsNotNone once Python 2.6 support is dropped
-        self.assertFalse(Attachment.objects.filter(id=binary_id).first() is not None)
+        self.assertTrue(Attachment.objects.filter(id=binary_id).first() is not None)
         att.delete()
         self.assertEqual(0, Attachment.objects.count())
 

From 9b2fde962c09eaf22520cf1eeb268e08dce29bc8 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 16 Apr 2015 13:14:20 +0200
Subject: [PATCH 0154/1519] added try except to geo test to catch random mongo
 internal errors

---
 tests/queryset/geo.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index dad511324..12e96a043 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -1,14 +1,16 @@
 import sys
-from mongoengine.connection import get_connection
 
 sys.path[0:0] = [""]
 
 import unittest
 from datetime import datetime, timedelta
-from mongoengine import *
 
+from pymongo.errors import OperationFailure
+from mongoengine import *
+from mongoengine.connection import get_connection
 from nose.plugins.skip import SkipTest
 
+
 __all__ = ("GeoQueriesTest",)
 
 
@@ -175,6 +177,13 @@ class Point(Document):
 
         points = Point.objects(location__near_sphere=[-122, 37.5],
                                location__max_distance=60 / earth_radius)
+        # This test is sometimes failing with Mongo internals non-sense.
+        # See https://travis-ci.org/MongoEngine/mongoengine/builds/58729101
+        try:
+            points.count()
+        except OperationFailure:
+            raise SkipTest("Sometimes MongoDB ignores its capacities on maxDistance")
+
         self.assertEqual(points.count(), 2)
 
         # Finds both points, but orders the north point first because it's

From 3ab5ba61493f0b6ef0e46fbcf7a3c06d8a9add4e Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Wed, 29 Apr 2015 15:51:17 +0200
Subject: [PATCH 0155/1519] added explicit warnings when calling methods having
 no effect anymore with PyMongo3+

---
 mongoengine/queryset/base.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 3752902a7..d65c8cd25 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -939,6 +939,9 @@ def snapshot(self, enabled):
         ..versionchanged:: 0.5 - made chainable
         .. deprecated:: Ignored with PyMongo 3+
         """
+        if IS_PYMONGO_3:
+            msg = ("snapshot is deprecated as it has no impact when using PyMongo 3+.")
+            warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._snapshot = enabled
         return queryset
@@ -962,6 +965,9 @@ def slave_okay(self, enabled):
 
         .. deprecated:: Ignored with PyMongo 3+
         """
+        if IS_PYMONGO_3:
+            msg = ("slave_okay is deprecated as it has no impact when using PyMongo 3+.")
+            warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._slave_okay = enabled
         return queryset

From c5ed308ea5ee408477cfa7985c8438ae5e1315da Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Wed, 29 Apr 2015 17:12:47 +0200
Subject: [PATCH 0156/1519] comments update after having tested PyMongo 3.0.1

---
 mongoengine/document.py   | 2 +-
 tests/document/indexes.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index ff39b13ab..838feb81f 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -308,9 +308,9 @@ def save(self, force_insert=False, validate=True, clean=True,
                     object_id = collection.insert(doc, **write_concern)
                 else:
                     object_id = collection.save(doc, **write_concern)
-                    # TODO: Pymongo 3.0 bug, fix scheduled for 3.0.1
                     # In PyMongo 3.0, the save() call calls internally the _update() call
                     # but they forget to return the _id value passed back, therefore getting it back here
+                    # Correct behaviour in 2.X and in 3.0.1+ versions
                     if not object_id and pymongo.version_tuple == (3, 0):
                         pk_as_mongo_obj = self._fields.get(self._meta['id_field']).to_mongo(self.pk)
                         object_id = self._qs.filter(pk=pk_as_mongo_obj).first() and \
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index f88b903aa..593fe8771 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -513,7 +513,7 @@ class BlogPost(Document):
         self.assertEqual(BlogPost.objects.count(), 10)
         self.assertEqual(BlogPost.objects.hint().count(), 10)
 
-        # PyMongo 3.0 bug
+        # PyMongo 3.0 bug only, works correctly with 2.X and 3.0.1+ versions
         if pymongo.version != '3.0':
             self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
 

From f4478fc76235ce2f1dd5b24759558a576d885467 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 7 May 2015 09:54:24 +0200
Subject: [PATCH 0157/1519] removed sleep thanks to @seglberg suggestion

---
 tests/test_connection.py | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index f9cc9c78e..3f92ffd6a 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,5 +1,5 @@
 import sys
-from time import sleep
+import datetime
 
 sys.path[0:0] = [""]
 
@@ -8,8 +8,6 @@
 except ImportError:
     import unittest
 
-import datetime
-
 import pymongo
 from bson.tz_util import utc
 
@@ -62,8 +60,12 @@ def test_sharing_connections(self):
         connect('mongoenginetest', alias='testdb2')
         actual_connection = get_connection('testdb2')
 
-        # horrible, but since PyMongo3+, connection are created asynchronously
-        sleep(0.1)
+        # Handle PyMongo 3+ Async Connection
+        if IS_PYMONGO_3:
+            # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
+            # Purposely not catching exception to fail test if thrown.
+            expected_connection.server_info()
+
         self.assertEqual(expected_connection, actual_connection)
 
     def test_connect_uri(self):
@@ -207,8 +209,11 @@ def test_multiple_connection_settings(self):
             self.assertEqual(mongo_connections['t1'].host, 'localhost')
             self.assertEqual(mongo_connections['t2'].host, '127.0.0.1')
         else:
-            # horrible, but since PyMongo3+, connection are created asynchronously
-            sleep(0.1)
+            # Handle PyMongo 3+ Async Connection
+            # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
+            # Purposely not catching exception to fail test if thrown.
+            mongo_connections['t1'].server_info()
+            mongo_connections['t2'].server_info()
             self.assertEqual(mongo_connections['t1'].address[0], 'localhost')
             self.assertEqual(mongo_connections['t2'].address[0], '127.0.0.1')
 

From 1005c99e9c01c72227ff374d7c03369c3028969c Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 7 May 2015 10:47:09 +0200
Subject: [PATCH 0158/1519] corrected index test for MongoDB 3+

---
 tests/document/indexes.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 593fe8771..54fd4ded5 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -866,7 +866,7 @@ class TestDoc(Document):
             meta = {
                 'allow_inheritance': True,
                 'indexes': [
-                    { 'fields': ('txt',), 'cls': False }
+                    {'fields': ('txt',), 'cls': False}
                 ]
             }
 
@@ -875,7 +875,7 @@ class TestChildDoc(TestDoc):
 
             meta = {
                 'indexes': [
-                    { 'fields': ('txt2',), 'cls': False }
+                    {'fields': ('txt2',), 'cls': False}
                 ]
             }
 
@@ -886,11 +886,14 @@ class TestChildDoc(TestDoc):
         index_info = TestDoc._get_collection().index_information()
         for key in index_info:
             del index_info[key]['v']  # drop the index version - we don't care about that here
+            del index_info[key]['ns']  # drop the index namespace - we don't care about that here
+            if 'dropDups' in index_info[key]:
+                del index_info[key]['dropDups']  # drop the index dropDups - it is deprecated in MongoDB 3+
+        print index_info
 
         self.assertEqual(index_info, {
             'txt_1': {
                 'key': [('txt', 1)],
-                'dropDups': False,
                 'background': False
             },
             '_id_': {
@@ -898,7 +901,6 @@ class TestChildDoc(TestDoc):
             },
             'txt2_1': {
                 'key': [('txt2', 1)],
-                'dropDups': False,
                 'background': False
             },
             '_cls_1': {

From c41dd6495d1cb47e346644164622031f5861628f Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 7 May 2015 10:47:28 +0200
Subject: [PATCH 0159/1519] corrected connection test for PyMongo3+

---
 tests/test_connection.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 3f92ffd6a..4a02696af 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,5 +1,6 @@
 import sys
 import datetime
+from pymongo.errors import OperationFailure
 
 sys.path[0:0] = [""]
 
@@ -124,6 +125,7 @@ def test_connect_uri_without_db(self):
     def test_connect_uri_with_authsource(self):
         """Ensure that the connect() method works well with
         the option `authSource` in URI.
+        This feature was introduced in MongoDB 2.4 and removed in 2.6
         """
         # Create users
         c = connect('mongoenginetest')
@@ -131,18 +133,25 @@ def test_connect_uri_with_authsource(self):
         c.admin.add_user('username', 'password')
 
         # Authentication fails without "authSource"
-        self.assertRaises(
-            ConnectionError, connect, 'mongoenginetest', alias='test1',
-            host='mongodb://username:password@localhost/mongoenginetest'
-        )
-        self.assertRaises(ConnectionError, get_db, 'test1')
+        if IS_PYMONGO_3:
+            test_conn = connect('mongoenginetest', alias='test2',
+                                host='mongodb://username:password@localhost/mongoenginetest')
+            self.assertRaises(OperationFailure, test_conn.server_info)
+        else:
+            self.assertRaises(
+                ConnectionError, connect, 'mongoenginetest', alias='test1',
+                host='mongodb://username:password@localhost/mongoenginetest'
+            )
+            self.assertRaises(ConnectionError, get_db, 'test1')
 
         # Authentication succeeds with "authSource"
-        connect(
+        test_conn2 = connect(
             'mongoenginetest', alias='test2',
             host=('mongodb://username:password@localhost/'
                   'mongoenginetest?authSource=admin')
         )
+        # This will fail starting from MongoDB 2.6+
+        # test_conn2.server_info()
         db = get_db('test2')
         self.assertTrue(isinstance(db, pymongo.database.Database))
         self.assertEqual(db.name, 'mongoenginetest')

From 14f82ea0a94fcaa733b2584a24521c934739217a Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 7 May 2015 10:56:22 +0200
Subject: [PATCH 0160/1519] enabled PYMONGO 3 and DEV for travis

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 74f409298..34702192f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,8 @@ python:
 env:
 - PYMONGO=2.7
 - PYMONGO=2.8
-# - PYMONGO=3.0
-# - PYMONGO=dev
+- PYMONGO=3.0
+- PYMONGO=dev
 matrix:
   fast_finish: true
 before_install:

From d36708933c5cb3fb6a747dead7c0d6ecb7003c1c Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 7 May 2015 11:03:44 +0200
Subject: [PATCH 0161/1519] author and changelog

---
 AUTHORS            | 1 +
 docs/changelog.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 6745e14b3..f424dbc2f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -221,3 +221,4 @@ that much better:
  * Eremeev Danil (https://github.com/elephanter)
  * Catstyle Lee (https://github.com/Catstyle)
  * Kiryl Yermakou (https://github.com/rma4ok)
+ * Matthieu Rigal (https://github.com/MRigal)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 536765628..19d306986 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,6 +17,7 @@ Changes in 0.9.X - DEV
 - Don't send a "cls" option to ensureIndex (related to https://jira.mongodb.org/browse/SERVER-769)
 - Fix for updating sorting in SortedListField. #978
 - Added __ support to escape field name in fields lookup keywords that match operators names #949
+- Support for PyMongo 3+ #946
 
 Changes in 0.9.0
 ================

From f97db93212798c8ce1f766aaf45bd222b46be4b3 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 7 May 2015 12:34:41 +0200
Subject: [PATCH 0162/1519] corrected test for MongoDB 2.X

---
 tests/document/indexes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 54fd4ded5..d43b22e56 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -886,10 +886,10 @@ class TestChildDoc(TestDoc):
         index_info = TestDoc._get_collection().index_information()
         for key in index_info:
             del index_info[key]['v']  # drop the index version - we don't care about that here
-            del index_info[key]['ns']  # drop the index namespace - we don't care about that here
+            if 'ns' in index_info[key]:
+                del index_info[key]['ns']  # drop the index namespace - we don't care about that here, MongoDB 3+
             if 'dropDups' in index_info[key]:
                 del index_info[key]['dropDups']  # drop the index dropDups - it is deprecated in MongoDB 3+
-        print index_info
 
         self.assertEqual(index_info, {
             'txt_1': {

From 73f08670612d89f728fd79e6c92bc0d3122fb5d8 Mon Sep 17 00:00:00 2001
From: Eli Boyarski <eli.boyarski@gmail.com>
Date: Fri, 10 Apr 2015 15:49:29 +0200
Subject: [PATCH 0163/1519] Unit Test - Unique Multikey Index

Adds a unit test to exhibit the behavior of MongoDB when using a unique
multikey index. MongoDB treats any missing unique multikey index value
as NULL, thus throwing a Duplicate Key Error when saving multiple
missing values.

See #930 for more information.

- Closes #930
- Closes #952
---
 tests/fields/fields.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7a99bd78a..e9532a5a3 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3675,6 +3675,31 @@ def test_delete(self):
         # deleted from the database
         self.assertEqual(number, 2)
 
+    def test_empty_list_embedded_documents_with_unique_field(self):
+        """
+        Tests that only one document with an empty list of embedded documents
+        that have a unique field can be saved, but if the unique field is
+        also sparse than multiple documents with an empty list can be saved.
+        """
+        class EmbeddedWithUnique(EmbeddedDocument):
+            number = IntField(unique=True)
+
+        class A(Document):
+            my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))
+
+        a1 = A(my_list=[]).save()
+        self.assertRaises(NotUniqueError, lambda: A(my_list=[]).save())
+
+        class EmbeddedWithSparseUnique(EmbeddedDocument):
+            number = IntField(unique=True, sparse=True)
+
+        class B(Document):
+            my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique))
+
+        b1 = B(my_list=[]).save()
+        b2 = B(my_list=[]).save()
+
+
     def test_filtered_delete(self):
         """
         Tests the delete method of a List of Embedded Documents

From 794101691cdbbaddeb889b5a62ef46a50ddc90ec Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 7 May 2015 19:34:31 +0200
Subject: [PATCH 0164/1519] removed wire_concern usage and cosmetics

---
 mongoengine/queryset/base.py      |  4 ++--
 mongoengine/queryset/transform.py | 11 +++--------
 tests/queryset/queryset.py        | 13 ++++++++++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index d65c8cd25..89eb9afa6 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -940,7 +940,7 @@ def snapshot(self, enabled):
         .. deprecated:: Ignored with PyMongo 3+
         """
         if IS_PYMONGO_3:
-            msg = ("snapshot is deprecated as it has no impact when using PyMongo 3+.")
+            msg = "snapshot is deprecated as it has no impact when using PyMongo 3+."
             warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._snapshot = enabled
@@ -966,7 +966,7 @@ def slave_okay(self, enabled):
         .. deprecated:: Ignored with PyMongo 3+
         """
         if IS_PYMONGO_3:
-            msg = ("slave_okay is deprecated as it has no impact when using PyMongo 3+.")
+            msg = "slave_okay is deprecated as it has no impact when using PyMongo 3+."
             warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._slave_okay = enabled
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index e8cd2721d..c43c4b401 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -128,20 +128,15 @@ def query(_doc_cls=None, _field_operation=False, **query):
                 mongo_query[key].update(value)
                 # $maxDistance needs to come last - convert to SON
                 value_dict = mongo_query[key]
-                if ('$maxDistance' in value_dict and '$near' in value_dict):
+                if '$maxDistance' in value_dict and '$near' in value_dict:
                     value_son = SON()
                     if isinstance(value_dict['$near'], dict):
                         for k, v in value_dict.iteritems():
                             if k == '$maxDistance':
                                 continue
                             value_son[k] = v
-                        if (get_connection().max_wire_version <= 1):
-                            value_son['$maxDistance'] = value_dict[
-                                '$maxDistance']
-                        else:
-                            value_son['$near'] = SON(value_son['$near'])
-                            value_son['$near'][
-                                '$maxDistance'] = value_dict['$maxDistance']
+                        value_son['$near'] = SON(value_son['$near'])
+                        value_son['$near']['$maxDistance'] = value_dict['$maxDistance']
                     else:
                         for k, v in value_dict.iteritems():
                             if k == '$maxDistance':
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index b757ddda1..65d843059 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -708,6 +708,11 @@ class Blog(Document):
 
         Blog.drop_collection()
 
+        # get MongoDB version info
+        connection = get_connection()
+        info = connection.test.command('buildInfo')
+        mongodb_version = tuple([int(i) for i in info['version'].split('.')])
+
         # Recreates the collection
         self.assertEqual(0, Blog.objects.count())
 
@@ -724,7 +729,7 @@ class Blog(Document):
                 blogs.append(Blog(title="post %s" % i, posts=[post1, post2]))
 
             Blog.objects.insert(blogs, load_bulk=False)
-            if (get_connection().max_wire_version <= 1):
+            if mongodb_version < (2, 6):
                 self.assertEqual(q, 1)
             else:
                 # profiling logs each doc now in the bulk op
@@ -737,7 +742,7 @@ class Blog(Document):
             self.assertEqual(q, 0)
 
             Blog.objects.insert(blogs)
-            if (get_connection().max_wire_version <= 1):
+            if mongodb_version < (2, 6):
                 self.assertEqual(q, 2)  # 1 for insert, and 1 for in bulk fetch
             else:
                 # 99 for insert, and 1 for in bulk fetch
@@ -869,8 +874,10 @@ class Project(Document):
 
             self.assertEqual(q, 3)
 
+    @skip_pymongo3
     def test_slave_okay(self):
-        """Ensures that a query can take slave_okay syntax
+        """Ensures that a query can take slave_okay syntax.
+        Useless with PyMongo 3+ as well as with MongoDB 3+.
         """
         person1 = self.Person(name="User A", age=20)
         person1.save()

From 7d7d0ea00191c026e37bae8e92faf653b2cebb8e Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Fri, 27 Feb 2015 11:21:55 +0200
Subject: [PATCH 0165/1519] Use not in instead of not (x in y).

---
 mongoengine/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index bd6c88d6a..53d4ac956 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -609,7 +609,7 @@ def to_mongo(self, document, use_db_field=True):
             return None
 
         data = document.to_mongo(use_db_field)
-        if not '_cls' in data:
+        if '_cls' not in data:
             data['_cls'] = document._class_name
         return data
 

From f730591f2cc6cb63ed8be69b1d814d9d3a5c1e2f Mon Sep 17 00:00:00 2001
From: Marcel van den Elst <marcel@marutec.nl>
Date: Wed, 20 May 2015 13:01:41 +0200
Subject: [PATCH 0166/1519] added passing test for updates on related models

ref #570: test would fail from v0.8.5 up, but fixed in master
---
 tests/queryset/queryset.py | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 65d843059..6e4d86d2e 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -630,6 +630,40 @@ class Doc(Document):
         self.assertRaises(ValidationError, Doc.objects().update, dt_f="datetime", upsert=True)
         self.assertRaises(ValidationError, Doc.objects().update, ed_f__str_f=1, upsert=True)
 
+    def test_update_related_models( self ):
+            class TestPerson( Document ):
+                name = StringField()
+
+            class TestOrganization( Document ):
+                name = StringField()
+                owner = ReferenceField( TestPerson )
+
+            TestPerson.drop_collection()
+            TestOrganization.drop_collection()
+
+            p = TestPerson( name='p1' )
+            p.save()
+            o = TestOrganization( name='o1' )
+            o.save()
+
+            o.owner = p
+            p.name = 'p2'
+
+            self.assertListEqual( o._get_changed_fields(), [ 'owner' ] )
+            self.assertListEqual( p._get_changed_fields(), [ 'name' ] )
+
+            o.save()
+
+            self.assertListEqual( o._get_changed_fields(), [] )
+            self.assertListEqual( p._get_changed_fields(), [ 'name' ] ) # Fails; it's empty
+
+            # This will do NOTHING at all, even though we changed the name
+            p.save()
+
+            p.reload()
+
+            self.assertEqual( p.name, 'p2' ) # Fails; it's still `p1`
+
     def test_upsert(self):
         self.Person.drop_collection()
 

From fde733c205a3d879ca5e74452104946d0aaa89fa Mon Sep 17 00:00:00 2001
From: Bruno Pierri Galvao <brunopgalvao@gmail.com>
Date: Thu, 21 May 2015 10:22:02 -0400
Subject: [PATCH 0167/1519] spelling change definion to definition

---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 56370c14f..79332493d 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -114,7 +114,7 @@ arguments can be set on all fields:
 :attr:`default` (Default: None)
     A value to use when no value is set for this field.
 
-    The definion of default parameters follow `the general rules on Python
+    The definition of default parameters follow `the general rules on Python
     <http://docs.python.org/reference/compound_stmts.html#function-definitions>`__,
     which means that some care should be taken when dealing with default mutable objects
     (like in :class:`~mongoengine.fields.ListField` or :class:`~mongoengine.fields.DictField`)::

From 2753e02cda4f3a1aae7ba1eba13c7ff31c496781 Mon Sep 17 00:00:00 2001
From: Charanpal <charanpal@gmail.com>
Date: Sat, 23 May 2015 14:46:56 +0100
Subject: [PATCH 0168/1519] Fix for case where Document is deleted and it's
 files (FieldFields) in GridFS remain.

---
 mongoengine/document.py    |  6 ++++
 tests/fields/file_tests.py | 65 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 838feb81f..813fcb2e6 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -463,6 +463,12 @@ def delete(self, **write_concern):
         """
         signals.pre_delete.send(self.__class__, document=self)
 
+        #Delete FileFields seperately 
+        FileField = _import_class('FileField')
+        for name, field in self._fields.iteritems():
+            if isinstance(field, FileField): 
+                getattr(self, name).delete()
+
         try:
             self._qs.filter(
                 **self._object_key).delete(write_concern=write_concern, _from_doc_delete=True)
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 811f17edd..7db900596 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -297,6 +297,71 @@ class TestFile(Document):
         test_file = TestFile()
         self.assertFalse(test_file.the_file in [{"test": 1}])
 
+    def test_file_disk_space(self): 
+        """ Test disk space usage when we delete/replace a file """ 
+        class TestFile(Document):
+            the_file = FileField()
+            
+        text = b('Hello, World!')
+        content_type = 'text/plain'
+
+        testfile = TestFile()
+        testfile.the_file.put(text, content_type=content_type, filename="hello")
+        testfile.save()
+        
+        #Now check fs.files and fs.chunks 
+        db = TestFile._get_db()
+        
+        files = db.fs.files.find()
+        chunks = db.fs.chunks.find()
+        self.assertEquals(len(list(files)), 1)
+        self.assertEquals(len(list(chunks)), 1)
+
+        #Deleting the docoument should delete the files 
+        testfile.delete()
+        
+        files = db.fs.files.find()
+        chunks = db.fs.chunks.find()
+        self.assertEquals(len(list(files)), 0)
+        self.assertEquals(len(list(chunks)), 0)
+        
+        #Test case where we don't store a file in the first place 
+        testfile = TestFile()
+        testfile.save()
+        
+        files = db.fs.files.find()
+        chunks = db.fs.chunks.find()
+        self.assertEquals(len(list(files)), 0)
+        self.assertEquals(len(list(chunks)), 0)
+        
+        testfile.delete()
+        
+        files = db.fs.files.find()
+        chunks = db.fs.chunks.find()
+        self.assertEquals(len(list(files)), 0)
+        self.assertEquals(len(list(chunks)), 0)
+        
+        #Test case where we overwrite the file 
+        testfile = TestFile()
+        testfile.the_file.put(text, content_type=content_type, filename="hello")
+        testfile.save()
+        
+        text = b('Bonjour, World!')
+        testfile.the_file.replace(text, content_type=content_type, filename="hello")
+        testfile.save()
+        
+        files = db.fs.files.find()
+        chunks = db.fs.chunks.find()
+        self.assertEquals(len(list(files)), 1)
+        self.assertEquals(len(list(chunks)), 1)
+        
+        testfile.delete()
+        
+        files = db.fs.files.find()
+        chunks = db.fs.chunks.find()
+        self.assertEquals(len(list(files)), 0)
+        self.assertEquals(len(list(chunks)), 0)
+
     def test_image_field(self):
         if not HAS_PIL:
             raise SkipTest('PIL not installed')

From c82b26d334d467128a4c9bc025959df602089999 Mon Sep 17 00:00:00 2001
From: Eliecer Daza <elin3t@gmail.com>
Date: Sun, 31 May 2015 18:28:12 -0500
Subject: [PATCH 0169/1519] little object name fix

replace little object name HtmlPost with TextPost that is the one used on the example
---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 2d17313f0..f2829cd3e 100644
--- a/README.rst
+++ b/README.rst
@@ -81,7 +81,7 @@ Some simple examples of what MongoEngine code looks like::
 
     >>> len(BlogPost.objects)
     2
-    >>> len(HtmlPost.objects)
+    >>> len(TextPost.objects)
     1
     >>> len(LinkPost.objects)
     1

From 283e92d55d1acc219c1dd1f8f0e374300b6bfdbe Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 7 May 2015 15:11:33 +0200
Subject: [PATCH 0170/1519] Added hashed index, a bit more of geo-indexes,
 possibility to give _cls and docs

---
 docs/guide/defining-documents.rst | 22 ++++++---
 mongoengine/base/document.py      | 22 ++++++---
 mongoengine/document.py           |  7 +++
 tests/document/indexes.py         | 79 +++++++++++++++++++++++++++++++
 4 files changed, 118 insertions(+), 12 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 56370c14f..13519a287 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -465,19 +465,26 @@ You can specify indexes on collections to make querying faster. This is done
 by creating a list of index specifications called :attr:`indexes` in the
 :attr:`~mongoengine.Document.meta` dictionary, where an index specification may
 either be a single field name, a tuple containing multiple field names, or a
-dictionary containing a full index definition. A direction may be specified on
-fields by prefixing the field name with a **+** (for ascending) or a **-** sign
-(for descending). Note that direction only matters on multi-field indexes.
-Text indexes may be specified by prefixing the field name with a **$**. ::
+dictionary containing a full index definition.
+
+A direction may be specified on fields by prefixing the field name with a
+**+** (for ascending) or a **-** sign (for descending). Note that direction
+only matters on multi-field indexes. Text indexes may be specified by prefixing
+the field name with a **$**. Hashed indexes may be specified by prefixing
+the field name with a **#**::
 
     class Page(Document):
+        category = IntField()
         title = StringField()
         rating = StringField()
         created = DateTimeField()
         meta = {
             'indexes': [
                 'title',
+                '$title',  # text index
+                '#title',  # hashed index
                 ('title', '-rating'),
+                ('category', '_cls'),
                 {
                     'fields': ['created'],
                     'expireAfterSeconds': 3600
@@ -532,11 +539,14 @@ There are a few top level defaults for all indexes that can be set::
 :attr:`index_background` (Optional)
     Set the default value for if an index should be indexed in the background
 
+:attr:`index_cls` (Optional)
+    A way to turn off a specific index for _cls.
+
 :attr:`index_drop_dups` (Optional)
     Set the default value for if an index should drop duplicates
 
-:attr:`index_cls` (Optional)
-    A way to turn off a specific index for _cls.
+.. note:: Since MongoDB 3.0 drop_dups is not supported anymore. Raises a Warning
+    and has no effect
 
 
 Compound Indexes and Indexing sub documents
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 3eba16ca8..5707992a4 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -782,7 +782,7 @@ def _build_index_spec(cls, spec):
         allow_inheritance = cls._meta.get('allow_inheritance',
                                           ALLOW_INHERITANCE)
         include_cls = (allow_inheritance and not spec.get('sparse', False) and
-                       spec.get('cls',  True))
+                       spec.get('cls',  True) and '_cls' not in spec['fields'])
 
         # 733: don't include cls if index_cls is False unless there is an explicit cls with the index
         include_cls = include_cls and (spec.get('cls', False) or cls._meta.get('index_cls', True))
@@ -795,16 +795,25 @@ def _build_index_spec(cls, spec):
 
             # ASCENDING from +
             # DESCENDING from -
-            # GEO2D from *
             # TEXT from $
+            # HASHED from #
+            # GEOSPHERE from (
+            # GEOHAYSTACK from )
+            # GEO2D from *
             direction = pymongo.ASCENDING
             if key.startswith("-"):
                 direction = pymongo.DESCENDING
-            elif key.startswith("*"):
-                direction = pymongo.GEO2D
             elif key.startswith("$"):
                 direction = pymongo.TEXT
-            if key.startswith(("+", "-", "*", "$")):
+            elif key.startswith("#"):
+                direction = pymongo.HASHED
+            elif key.startswith("("):
+                direction = pymongo.GEOSPHERE
+            elif key.startswith(")"):
+                direction = pymongo.GEOHAYSTACK
+            elif key.startswith("*"):
+                direction = pymongo.GEO2D
+            if key.startswith(("+", "-", "*", "$", "#", "(", ")")):
                 key = key[1:]
 
             # Use real field name, do it manually because we need field
@@ -827,7 +836,8 @@ def _build_index_spec(cls, spec):
             index_list.append((key, direction))
 
         # Don't add cls to a geo index
-        if include_cls and direction is not pymongo.GEO2D:
+        if include_cls and direction not in (
+                pymongo.GEO2D, pymongo.GEOHAYSTACK, pymongo.GEOSPHERE):
             index_list.insert(0, ('_cls', 1))
 
         if index_list:
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 838feb81f..3d919e7dc 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -637,14 +637,19 @@ def ensure_index(cls, key_or_list, drop_dups=False, background=False,
         :param key_or_list: a single index key or a list of index keys (to
             construct a multi-field index); keys may be prefixed with a **+**
             or a **-** to determine the index ordering
+        :param background: Allows index creation in the background
+        :param drop_dups: Was removed with MongoDB 3. The value will be
+            removed if PyMongo3+ is used
         """
         index_spec = cls._build_index_spec(key_or_list)
         index_spec = index_spec.copy()
         fields = index_spec.pop('fields')
         index_spec['drop_dups'] = drop_dups
+        # TODO: raise warning if dropdups given and remove with PyMongo3+
         index_spec['background'] = background
         index_spec.update(kwargs)
 
+        # TODO: ensure_index is deprecated
         return cls._get_collection().ensure_index(fields, **index_spec)
 
     @classmethod
@@ -688,6 +693,7 @@ def ensure_indexes(cls):
                 if 'cls' in opts:
                     del opts['cls']
 
+                # TODO: ensure_index is deprecated in PyMongo 3+ and drop_dups removed
                 collection.ensure_index(fields, background=background,
                                         drop_dups=drop_dups, **opts)
 
@@ -701,6 +707,7 @@ def ensure_indexes(cls):
             if 'cls' in index_opts:
                 del index_opts['cls']
 
+            # TODO: ensure_index is deprecated in PyMongo 3+
             collection.ensure_index('_cls', background=background,
                                     **index_opts)
 
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index d43b22e56..cecb8bf28 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -275,6 +275,49 @@ class Place(Document):
         info = [value['key'] for key, value in info.iteritems()]
         self.assertTrue([('current.location.point', '2d')] in info)
 
+    def test_explicit_geosphere_index(self):
+        """Ensure that geosphere indexes work when created via meta[indexes]
+        """
+        class Place(Document):
+            location = DictField()
+            meta = {
+                'allow_inheritance': True,
+                'indexes': [
+                    '(location.point',
+                ]
+            }
+
+        self.assertEqual([{'fields': [('location.point', '2dsphere')]}],
+                         Place._meta['index_specs'])
+
+        Place.ensure_indexes()
+        info = Place._get_collection().index_information()
+        info = [value['key'] for key, value in info.iteritems()]
+        self.assertTrue([('location.point', '2dsphere')] in info)
+
+    def test_explicit_geohaystack_index(self):
+        """Ensure that geohaystack indexes work when created via meta[indexes]
+        """
+        raise SkipTest('GeoHaystack index creation seems broken on PyMongo'
+                       'side, as it requires a bucketSize parameter.')
+
+        class Place(Document):
+            location = DictField()
+            meta = {
+                'allow_inheritance': True,
+                'indexes': [
+                    ')location.point',
+                ]
+            }
+
+        self.assertEqual([{'fields': [('location.point', 'geoHaystack')]}],
+                         Place._meta['index_specs'])
+
+        Place.ensure_indexes()
+        info = Place._get_collection().index_information()
+        info = [value['key'] for key, value in info.iteritems()]
+        self.assertTrue([('location.point', 'geoHaystack')] in info)
+
     def test_dictionary_indexes(self):
         """Ensure that indexes are used when meta[indexes] contains
         dictionaries instead of lists.
@@ -822,6 +865,18 @@ class Book(Document):
         key = indexes["title_text"]["key"]
         self.assertTrue(('_fts', 'text') in key)
 
+    def test_hashed_indexes(self):
+
+        class Book(Document):
+            ref_id = StringField()
+            meta = {
+                "indexes": ["#ref_id"],
+            }
+
+        indexes = Book.objects._collection.index_information()
+        self.assertTrue("ref_id_hashed" in indexes)
+        self.assertTrue(('ref_id', 'hashed') in indexes["ref_id_hashed"]["key"])
+
     def test_indexes_after_database_drop(self):
         """
         Test to ensure that indexes are re-created on a collection even
@@ -909,6 +964,30 @@ class TestChildDoc(TestDoc):
             }
         })
 
+    def test_compound_index_underscore_cls_not_overwritten(self):
+        """
+        Test that the compound index doesn't get another _cls when it is specified
+        """
+        class TestDoc(Document):
+            shard_1 = StringField()
+            txt_1 = StringField()
+
+            meta = {
+                'collection': 'test',
+                'allow_inheritance': True,
+                'sparse': True,
+                'shard_key': 'shard_1',
+                'indexes': [
+                    ('shard_1', '_cls', 'txt_1'),
+                ]
+            }
+
+        TestDoc.drop_collection()
+        TestDoc.ensure_indexes()
+
+        index_info = TestDoc._get_collection().index_information()
+        self.assertTrue('shard_1_1__cls_1_txt_1_1' in index_info)
+
 
 if __name__ == '__main__':
     unittest.main()

From f35d0b2b3778f249b7b49f42e9a372ecf6deb53a Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Mon, 1 Jun 2015 23:12:43 +0200
Subject: [PATCH 0171/1519] Added create_index method, warnings for drop_dups
 and a geohaystack test

---
 mongoengine/document.py   | 68 ++++++++++++++++++++++++++++-----------
 tests/document/indexes.py | 23 +++++++++----
 2 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 3d919e7dc..e4507c1c1 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1,4 +1,4 @@
-
+import warnings
 import pymongo
 import re
 
@@ -17,6 +17,7 @@
     get_document
 )
 from mongoengine.errors import InvalidQueryError, InvalidDocumentError
+from mongoengine.python_support import IS_PYMONGO_3
 from mongoengine.queryset import (OperationError, NotUniqueError,
                                   QuerySet, transform)
 from mongoengine.connection import get_db, DEFAULT_CONNECTION_NAME
@@ -630,27 +631,50 @@ def drop_collection(cls):
         db.drop_collection(cls._get_collection_name())
 
     @classmethod
-    def ensure_index(cls, key_or_list, drop_dups=False, background=False,
-                     **kwargs):
-        """Ensure that the given indexes are in place.
+    def create_index(cls, keys, background=False, **kwargs):
+        """Creates the given indexes if required.
 
-        :param key_or_list: a single index key or a list of index keys (to
+        :param keys: a single index key or a list of index keys (to
             construct a multi-field index); keys may be prefixed with a **+**
             or a **-** to determine the index ordering
         :param background: Allows index creation in the background
-        :param drop_dups: Was removed with MongoDB 3. The value will be
-            removed if PyMongo3+ is used
         """
-        index_spec = cls._build_index_spec(key_or_list)
+        index_spec = cls._build_index_spec(keys)
         index_spec = index_spec.copy()
         fields = index_spec.pop('fields')
-        index_spec['drop_dups'] = drop_dups
-        # TODO: raise warning if dropdups given and remove with PyMongo3+
+        drop_dups = kwargs.get('drop_dups', False)
+        if IS_PYMONGO_3 and drop_dups:
+            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
+            warnings.warn(msg, DeprecationWarning)
+        elif not IS_PYMONGO_3:
+            index_spec['drop_dups'] = drop_dups
         index_spec['background'] = background
         index_spec.update(kwargs)
 
-        # TODO: ensure_index is deprecated
-        return cls._get_collection().ensure_index(fields, **index_spec)
+        if IS_PYMONGO_3:
+            return cls._get_collection().create_index(fields, **index_spec)
+        else:
+            return cls._get_collection().ensure_index(fields, **index_spec)
+
+    @classmethod
+    def ensure_index(cls, key_or_list, drop_dups=False, background=False,
+                     **kwargs):
+        """Ensure that the given indexes are in place. Deprecated in favour
+        of create_index.
+
+        :param key_or_list: a single index key or a list of index keys (to
+            construct a multi-field index); keys may be prefixed with a **+**
+            or a **-** to determine the index ordering
+        :param background: Allows index creation in the background
+        :param drop_dups: Was removed/ignored with MongoDB >2.7.5. The value
+            will be removed if PyMongo3+ is used
+        """
+        if IS_PYMONGO_3 and drop_dups:
+            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
+            warnings.warn(msg, DeprecationWarning)
+        elif not IS_PYMONGO_3:
+            kwargs.update({'drop_dups': drop_dups})
+        return cls.create_index(key_or_list, background=background, **kwargs)
 
     @classmethod
     def ensure_indexes(cls):
@@ -665,6 +689,9 @@ def ensure_indexes(cls):
         drop_dups = cls._meta.get('index_drop_dups', False)
         index_opts = cls._meta.get('index_opts') or {}
         index_cls = cls._meta.get('index_cls', True)
+        if IS_PYMONGO_3 and drop_dups:
+            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
+            warnings.warn(msg, DeprecationWarning)
 
         collection = cls._get_collection()
         # 746: when connection is via mongos, the read preference is not necessarily an indication that
@@ -693,9 +720,11 @@ def ensure_indexes(cls):
                 if 'cls' in opts:
                     del opts['cls']
 
-                # TODO: ensure_index is deprecated in PyMongo 3+ and drop_dups removed
-                collection.ensure_index(fields, background=background,
-                                        drop_dups=drop_dups, **opts)
+                if IS_PYMONGO_3:
+                    collection.create_index(fields, background=background, **opts)
+                else:
+                    collection.ensure_index(fields, background=background,
+                                            drop_dups=drop_dups, **opts)
 
         # If _cls is being used (for polymorphism), it needs an index,
         # only if another index doesn't begin with _cls
@@ -707,9 +736,12 @@ def ensure_indexes(cls):
             if 'cls' in index_opts:
                 del index_opts['cls']
 
-            # TODO: ensure_index is deprecated in PyMongo 3+
-            collection.ensure_index('_cls', background=background,
-                                    **index_opts)
+            if IS_PYMONGO_3:
+                collection.create_index('_cls', background=background,
+                                        **index_opts)
+            else:
+                collection.ensure_index('_cls', background=background,
+                                        **index_opts)
 
     @classmethod
     def list_indexes(cls, go_up=True, go_down=True):
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index cecb8bf28..f9f68e573 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -298,19 +298,18 @@ class Place(Document):
     def test_explicit_geohaystack_index(self):
         """Ensure that geohaystack indexes work when created via meta[indexes]
         """
-        raise SkipTest('GeoHaystack index creation seems broken on PyMongo'
-                       'side, as it requires a bucketSize parameter.')
+        raise SkipTest('GeoHaystack index creation is not supported for now'
+                       'from meta, as it requires a bucketSize parameter.')
 
         class Place(Document):
             location = DictField()
+            name = StringField()
             meta = {
-                'allow_inheritance': True,
                 'indexes': [
-                    ')location.point',
+                    (')location.point', 'name')
                 ]
             }
-
-        self.assertEqual([{'fields': [('location.point', 'geoHaystack')]}],
+        self.assertEqual([{'fields': [('location.point', 'geoHaystack'), ('name', 1)]}],
                          Place._meta['index_specs'])
 
         Place.ensure_indexes()
@@ -318,6 +317,18 @@ class Place(Document):
         info = [value['key'] for key, value in info.iteritems()]
         self.assertTrue([('location.point', 'geoHaystack')] in info)
 
+    def test_create_geohaystack_index(self):
+        """Ensure that geohaystack indexes can be created
+        """
+        class Place(Document):
+            location = DictField()
+            name = StringField()
+
+        Place.ensure_index({'fields': (')location.point', 'name')}, bucketSize=10)
+        info = Place._get_collection().index_information()
+        info = [value['key'] for key, value in info.iteritems()]
+        self.assertTrue([('location.point', 'geoHaystack'), ('name', 1)] in info)
+
     def test_dictionary_indexes(self):
         """Ensure that indexes are used when meta[indexes] contains
         dictionaries instead of lists.

From a0257ed7e73383a9bd395877c83351bea8311cd3 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Tue, 2 Jun 2015 00:14:18 +0200
Subject: [PATCH 0172/1519] Updated test to use new create_index method

---
 tests/document/indexes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index f9f68e573..dcc71e5b0 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -324,7 +324,7 @@ class Place(Document):
             location = DictField()
             name = StringField()
 
-        Place.ensure_index({'fields': (')location.point', 'name')}, bucketSize=10)
+        Place.create_index({'fields': (')location.point', 'name')}, bucketSize=10)
         info = Place._get_collection().index_information()
         info = [value['key'] for key, value in info.iteritems()]
         self.assertTrue([('location.point', 'geoHaystack'), ('name', 1)] in info)

From fc140d04ef666930709ac185fc23a319372b443a Mon Sep 17 00:00:00 2001
From: Charanpal Dhanjal <charanpald@users.noreply.github.com>
Date: Tue, 2 Jun 2015 10:15:27 +0100
Subject: [PATCH 0173/1519] Fix comment in delete

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 813fcb2e6..f83f9fa14 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -463,7 +463,7 @@ def delete(self, **write_concern):
         """
         signals.pre_delete.send(self.__class__, document=self)
 
-        #Delete FileFields seperately 
+        # Delete FileFields separately 
         FileField = _import_class('FileField')
         for name, field in self._fields.iteritems():
             if isinstance(field, FileField): 

From ad81470d350d427b7c10e8c584e51af7c81e7c52 Mon Sep 17 00:00:00 2001
From: Charanpal Dhanjal <charanpald@users.noreply.github.com>
Date: Tue, 2 Jun 2015 10:17:17 +0100
Subject: [PATCH 0174/1519] Put space after hash

---
 tests/fields/file_tests.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 7db900596..4bd1b164a 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -309,7 +309,7 @@ class TestFile(Document):
         testfile.the_file.put(text, content_type=content_type, filename="hello")
         testfile.save()
         
-        #Now check fs.files and fs.chunks 
+        # Now check fs.files and fs.chunks 
         db = TestFile._get_db()
         
         files = db.fs.files.find()
@@ -317,7 +317,7 @@ class TestFile(Document):
         self.assertEquals(len(list(files)), 1)
         self.assertEquals(len(list(chunks)), 1)
 
-        #Deleting the docoument should delete the files 
+        # Deleting the docoument should delete the files 
         testfile.delete()
         
         files = db.fs.files.find()
@@ -325,7 +325,7 @@ class TestFile(Document):
         self.assertEquals(len(list(files)), 0)
         self.assertEquals(len(list(chunks)), 0)
         
-        #Test case where we don't store a file in the first place 
+        # Test case where we don't store a file in the first place 
         testfile = TestFile()
         testfile.save()
         
@@ -341,7 +341,7 @@ class TestFile(Document):
         self.assertEquals(len(list(files)), 0)
         self.assertEquals(len(list(chunks)), 0)
         
-        #Test case where we overwrite the file 
+        # Test case where we overwrite the file 
         testfile = TestFile()
         testfile.the_file.put(text, content_type=content_type, filename="hello")
         testfile.save()

From 73893f2a335c4389b544020f71b95d05922779c8 Mon Sep 17 00:00:00 2001
From: Charanpal Dhanjal <charanpald@users.noreply.github.com>
Date: Tue, 2 Jun 2015 10:20:37 +0100
Subject: [PATCH 0175/1519] Added charanpald

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index f424dbc2f..37170ffa5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -222,3 +222,4 @@ that much better:
  * Catstyle Lee (https://github.com/Catstyle)
  * Kiryl Yermakou (https://github.com/rma4ok)
  * Matthieu Rigal (https://github.com/MRigal)
+ * Charanpal Dhanjal (https://github.com/charanpald)

From 380d869195f42e63c3e5f9b23eb3c22b4ad4466f Mon Sep 17 00:00:00 2001
From: Charanpal Dhanjal <charanpald@users.noreply.github.com>
Date: Tue, 2 Jun 2015 10:23:37 +0100
Subject: [PATCH 0176/1519] Add fix to FileField deletion

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 19d306986..ffbc8c54a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -18,6 +18,7 @@ Changes in 0.9.X - DEV
 - Fix for updating sorting in SortedListField. #978
 - Added __ support to escape field name in fields lookup keywords that match operators names #949
 - Support for PyMongo 3+ #946
+- Fix for issue where FileField deletion did not free space in GridFS. 
 
 Changes in 0.9.0
 ================

From 65d6f8c01817ce7a7c104391db087f9a90f91269 Mon Sep 17 00:00:00 2001
From: Frederik Creemers <frederikcreemers@gmail.com>
Date: Tue, 2 Jun 2015 12:35:25 +0200
Subject: [PATCH 0177/1519] Solution for documentation issue #1003

Solution for documentation issue #1003. The explanation about reverse_delete_rule was a bit mixed up.
---
 docs/guide/defining-documents.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 79332493d..62676983a 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -315,9 +315,9 @@ reference with a delete rule specification.  A delete rule is specified by
 supplying the :attr:`reverse_delete_rule` attributes on the
 :class:`ReferenceField` definition, like this::
 
-    class Employee(Document):
+    class ProfilePage(Document):
         ...
-        profile_page = ReferenceField('ProfilePage', reverse_delete_rule=mongoengine.NULLIFY)
+        profile_page = ReferenceField('Employee', reverse_delete_rule=mongoengine.CASCADE)
 
 The declaration in this example means that when an :class:`Employee` object is
 removed, the :class:`ProfilePage` that belongs to that employee is removed as

From 621350515e60118d309767974d57d6a2b5729dd7 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Wed, 3 Jun 2015 01:02:19 +0200
Subject: [PATCH 0178/1519] Added test was still failing and implemented
 solution as described in #517

---
 docs/changelog.rst         |  1 +
 mongoengine/base/fields.py |  1 +
 mongoengine/fields.py      |  2 +-
 tests/queryset/queryset.py | 37 ++++++++++++++++++++++++++++++++++++-
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ffbc8c54a..42d98597d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -19,6 +19,7 @@ Changes in 0.9.X - DEV
 - Added __ support to escape field name in fields lookup keywords that match operators names #949
 - Support for PyMongo 3+ #946
 - Fix for issue where FileField deletion did not free space in GridFS. 
+- No_dereference() not respected on embedded docs containing reference. #517
 
 Changes in 0.9.0
 ================
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 91f95b4f4..b3ec07639 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -290,6 +290,7 @@ def to_python(self, value):
                 return value
 
         if self.field:
+            self.field._auto_dereference = self._auto_dereference
             value_dict = dict([(key, self.field.to_python(item))
                                for key, item in value.items()])
         else:
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 53d4ac956..9176828c6 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -546,7 +546,7 @@ def document_type(self):
 
     def to_python(self, value):
         if not isinstance(value, self.document_type):
-            return self.document_type._from_son(value)
+            return self.document_type._from_son(value, _auto_dereference=self._auto_dereference)
         return value
 
     def to_mongo(self, value, use_db_field=True, fields=[]):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 65d843059..3dc3ef205 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -13,7 +13,7 @@
 from pymongo.errors import ConfigurationError
 from pymongo.read_preferences import ReadPreference
 
-from bson import ObjectId
+from bson import ObjectId, DBRef
 
 from mongoengine import *
 from mongoengine.connection import get_connection, get_db
@@ -4185,6 +4185,41 @@ class User(Document):
                                     Organization))
         self.assertTrue(isinstance(qs.first().organization, Organization))
 
+    def test_no_dereference_embedded_doc(self):
+
+        class User(Document):
+            name = StringField()
+
+        class Member(EmbeddedDocument):
+            name = StringField()
+            user = ReferenceField(User)
+
+        class Organization(Document):
+            name = StringField()
+            members = ListField(EmbeddedDocumentField(Member))
+            ceo = ReferenceField(User)
+            member = EmbeddedDocumentField(Member)
+            admin = ListField(ReferenceField(User))
+
+        Organization.drop_collection()
+        User.drop_collection()
+
+        user = User(name="Flash")
+        user.save()
+
+        member = Member(name="Flash", user=user)
+
+        company = Organization(name="Mongo Inc", ceo=user, member=member)
+        company.admin.append(user)
+        company.members.append(member)
+        company.save()
+
+        result = Organization.objects().no_dereference().first()
+
+        self.assertTrue(isinstance(result.admin[0], (DBRef, ObjectId)))
+        self.assertTrue(isinstance(result.member.user, (DBRef, ObjectId)))
+        self.assertTrue(isinstance(result.members[0].user, (DBRef, ObjectId)))
+
     def test_cached_queryset(self):
         class Person(Document):
             name = StringField()

From ab2ef69c6a5574dcabfaffa8331d71e5a827fba3 Mon Sep 17 00:00:00 2001
From: "Breeze.kay" <dev@kbonez.net>
Date: Wed, 3 Jun 2015 18:13:54 +0800
Subject: [PATCH 0179/1519] improve _created status when switch collection and
 db

---
 mongoengine/document.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index f83f9fa14..791572a42 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -477,7 +477,7 @@ def delete(self, **write_concern):
             raise OperationError(message)
         signals.post_delete.send(self.__class__, document=self)
 
-    def switch_db(self, db_alias):
+    def switch_db(self, db_alias, keep_created=True):
         """
         Temporarily switch the database for a document instance.
 
@@ -499,12 +499,12 @@ def switch_db(self, db_alias):
         self._get_collection = lambda: collection
         self._get_db = lambda: db
         self._collection = collection
-        self._created = True
+        self._created = True if not keep_created else self._created
         self.__objects = self._qs
         self.__objects._collection_obj = collection
         return self
 
-    def switch_collection(self, collection_name):
+    def switch_collection(self, collection_name, keep_created=True):
         """
         Temporarily switch the collection for a document instance.
 
@@ -525,7 +525,7 @@ def switch_collection(self, collection_name):
             collection = cls._get_collection()
         self._get_collection = lambda: collection
         self._collection = collection
-        self._created = True
+        self._created = True if not keep_created else self._created
         self.__objects = self._qs
         self.__objects._collection_obj = collection
         return self

From 0f63e26641a113feae8e21a81beb0c55ffc996a2 Mon Sep 17 00:00:00 2001
From: Marcel van den Elst <marcel@marutec.nl>
Date: Thu, 4 Jun 2015 15:02:32 +0200
Subject: [PATCH 0180/1519] use AssertEqual instead of AssertListEqual for
 py2.6 compatibility

---
 tests/queryset/queryset.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 6e4d86d2e..8daccfd0a 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -649,13 +649,13 @@ class TestOrganization( Document ):
             o.owner = p
             p.name = 'p2'
 
-            self.assertListEqual( o._get_changed_fields(), [ 'owner' ] )
-            self.assertListEqual( p._get_changed_fields(), [ 'name' ] )
+            self.assertEqual( o._get_changed_fields(), [ 'owner' ] )
+            self.assertEqual( p._get_changed_fields(), [ 'name' ] )
 
             o.save()
 
-            self.assertListEqual( o._get_changed_fields(), [] )
-            self.assertListEqual( p._get_changed_fields(), [ 'name' ] ) # Fails; it's empty
+            self.assertEqual( o._get_changed_fields(), [] )
+            self.assertEqual( p._get_changed_fields(), [ 'name' ] ) # Fails; it's empty
 
             # This will do NOTHING at all, even though we changed the name
             p.save()

From 91aa4586e2a7684ff3a73f21a032e1702c04dbc5 Mon Sep 17 00:00:00 2001
From: Frederik Creemers <frederikcreemers@gmail.com>
Date: Thu, 4 Jun 2015 22:38:11 +0200
Subject: [PATCH 0181/1519] Fixes after code review

---
 docs/guide/defining-documents.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 62676983a..4d81b0546 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -317,10 +317,10 @@ supplying the :attr:`reverse_delete_rule` attributes on the
 
     class ProfilePage(Document):
         ...
-        profile_page = ReferenceField('Employee', reverse_delete_rule=mongoengine.CASCADE)
+        employee = ReferenceField('Employee', reverse_delete_rule=mongoengine.CASCADE)
 
 The declaration in this example means that when an :class:`Employee` object is
-removed, the :class:`ProfilePage` that belongs to that employee is removed as
+removed, the :class:`ProfilePage` that references that employee is removed as
 well.  If a whole batch of employees is removed, all profile pages that are
 linked are removed as well.
 

From 3e000f9be1d7e4fdd93317b6da0ab4a0e07b5431 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Thu, 21 May 2015 17:35:51 +0200
Subject: [PATCH 0182/1519] Raise error if save_condition fails #991

---
 mongoengine/document.py    |  6 +++++-
 tests/document/instance.py | 11 +++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 060919ca6..2c4872e91 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -266,7 +266,8 @@ def save(self, force_insert=False, validate=True, clean=True,
             to cascading saves.  Implies ``cascade=True``.
         :param _refs: A list of processed references used in cascading saves
         :param save_condition: only perform save if matching record in db
-            satisfies condition(s) (e.g., version number)
+            satisfies condition(s) (e.g., version number).
+            Raises :class:`OperationError` if the conditions are not satisfied
 
         .. versionchanged:: 0.5
             In existing documents it only saves changed fields using
@@ -348,6 +349,9 @@ def is_new_object(last_error):
                     upsert = save_condition is None
                     last_error = collection.update(select_dict, update_query,
                                                    upsert=upsert, **write_concern)
+                    if save_condition is not None and last_error['nModified'] == 0:
+                        raise OperationError('Race condition preventing'
+                                             ' document update detected')
                     created = is_new_object(last_error)
 
             if cascade is None:
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 2cfdef652..3ccabacdb 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -954,11 +954,12 @@ def UUID(i):
         self.assertEqual(w1.save_id, UUID(1))
         self.assertEqual(w1.count, 0)
 
-        # mismatch in save_condition prevents save
+        # mismatch in save_condition prevents save and raise exception
         flip(w1)
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
-        w1.save(save_condition={'save_id': UUID(42)})
+        self.assertRaises(OperationError,
+                          w1.save, save_condition={'save_id': UUID(42)})
         w1.reload()
         self.assertFalse(w1.toggle)
         self.assertEqual(w1.count, 0)
@@ -986,7 +987,8 @@ def UUID(i):
         self.assertEqual(w1.count, 2)
         flip(w2)
         flip(w2)
-        w2.save(save_condition={'save_id': old_id})
+        self.assertRaises(OperationError,
+                          w2.save, save_condition={'save_id': old_id})
         w2.reload()
         self.assertFalse(w2.toggle)
         self.assertEqual(w2.count, 2)
@@ -998,7 +1000,8 @@ def UUID(i):
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)
         flip(w1)
-        w1.save(save_condition={'count__gte': w1.count})
+        self.assertRaises(OperationError,
+                          w1.save, save_condition={'count__gte': w1.count})
         w1.reload()
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)

From 682db9b81f24d9160bc5707296ac3a1b507f200a Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 2 Jun 2015 17:44:57 +0200
Subject: [PATCH 0183/1519] Add versionchanged to document save_condition

---
 mongoengine/document.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 2c4872e91..f798780e0 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -266,7 +266,7 @@ def save(self, force_insert=False, validate=True, clean=True,
             to cascading saves.  Implies ``cascade=True``.
         :param _refs: A list of processed references used in cascading saves
         :param save_condition: only perform save if matching record in db
-            satisfies condition(s) (e.g., version number).
+            satisfies condition(s) (e.g. version number).
             Raises :class:`OperationError` if the conditions are not satisfied
 
         .. versionchanged:: 0.5
@@ -285,6 +285,8 @@ def save(self, force_insert=False, validate=True, clean=True,
         .. versionchanged:: 0.8.5
             Optional save_condition that only overwrites existing documents
             if the condition is satisfied in the current db record.
+        .. versionchanged:: 0.10
+            :class:`OperationError` exception raised if save_condition fails.
         """
         signals.pre_save.send(self.__class__, document=self)
 

From cca0222e1d415346eb1ee439ddba21daaf530851 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 2 Jun 2015 17:45:10 +0200
Subject: [PATCH 0184/1519] Update AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 37170ffa5..f64093d81 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -223,3 +223,4 @@ that much better:
  * Kiryl Yermakou (https://github.com/rma4ok)
  * Matthieu Rigal (https://github.com/MRigal)
  * Charanpal Dhanjal (https://github.com/charanpald)
+ * Emmanuel Leblond (https://github.com/touilleMan)

From 9c917c3bd389a222b3400dc61fb95de4c322cb75 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 2 Jun 2015 17:48:31 +0200
Subject: [PATCH 0185/1519] Update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 42d98597d..52e76ffcb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -20,6 +20,7 @@ Changes in 0.9.X - DEV
 - Support for PyMongo 3+ #946
 - Fix for issue where FileField deletion did not free space in GridFS. 
 - No_dereference() not respected on embedded docs containing reference. #517
+- Document save raise an exception if save_condition fails 
 
 Changes in 0.9.0
 ================

From 4034ab41829ba7da18af5dc2e8cc1544dbff8614 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Mon, 8 Jun 2015 18:40:28 +0200
Subject: [PATCH 0186/1519] Clean save_condition exception implementation and
 related tests

---
 mongoengine/document.py    |  2 +-
 tests/document/instance.py | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index f798780e0..eedd01d21 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -351,7 +351,7 @@ def is_new_object(last_error):
                     upsert = save_condition is None
                     last_error = collection.update(select_dict, update_query,
                                                    upsert=upsert, **write_concern)
-                    if save_condition is not None and last_error['nModified'] == 0:
+                    if not upsert and last_error['nModified'] == 0:
                         raise OperationError('Race condition preventing'
                                              ' document update detected')
                     created = is_new_object(last_error)
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 3ccabacdb..29692c204 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -958,8 +958,9 @@ def UUID(i):
         flip(w1)
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
-        self.assertRaises(OperationError,
-                          w1.save, save_condition={'save_id': UUID(42)})
+        self.assertRaisesRegexp(OperationError,
+            "Race condition preventing document update detected",
+            w1.save, save_condition={'save_id': UUID(42)})
         w1.reload()
         self.assertFalse(w1.toggle)
         self.assertEqual(w1.count, 0)
@@ -987,8 +988,9 @@ def UUID(i):
         self.assertEqual(w1.count, 2)
         flip(w2)
         flip(w2)
-        self.assertRaises(OperationError,
-                          w2.save, save_condition={'save_id': old_id})
+        self.assertRaisesRegexp(OperationError,
+            "Race condition preventing document update detected",
+            w2.save, save_condition={'save_id': old_id})
         w2.reload()
         self.assertFalse(w2.toggle)
         self.assertEqual(w2.count, 2)
@@ -1000,8 +1002,9 @@ def UUID(i):
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)
         flip(w1)
-        self.assertRaises(OperationError,
-                          w1.save, save_condition={'count__gte': w1.count})
+        self.assertRaisesRegexp(OperationError,
+            "Race condition preventing document update detected",
+            w1.save, save_condition={'count__gte': w1.count})
         w1.reload()
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)

From 153c239c9bcb9acbc3f87c0d89995a128e4e934f Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Thu, 11 Jun 2015 14:36:51 +0200
Subject: [PATCH 0187/1519] Replace assertRaisesRegexp by assertRaises
 (python2.6 compatibility)

---
 tests/document/instance.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 29692c204..e1710b9f2 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -958,8 +958,7 @@ def UUID(i):
         flip(w1)
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
-        self.assertRaisesRegexp(OperationError,
-            "Race condition preventing document update detected",
+        self.assertRaises(OperationError,
             w1.save, save_condition={'save_id': UUID(42)})
         w1.reload()
         self.assertFalse(w1.toggle)
@@ -988,8 +987,7 @@ def UUID(i):
         self.assertEqual(w1.count, 2)
         flip(w2)
         flip(w2)
-        self.assertRaisesRegexp(OperationError,
-            "Race condition preventing document update detected",
+        self.assertRaises(OperationError,
             w2.save, save_condition={'save_id': old_id})
         w2.reload()
         self.assertFalse(w2.toggle)
@@ -1002,8 +1000,7 @@ def UUID(i):
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)
         flip(w1)
-        self.assertRaisesRegexp(OperationError,
-            "Race condition preventing document update detected",
+        self.assertRaises(OperationError,
             w1.save, save_condition={'count__gte': w1.count})
         w1.reload()
         self.assertTrue(w1.toggle)

From cd7a9345ec624094e3811bf0c5ec2ed92d4ccc4d Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Thu, 11 Jun 2015 14:45:19 +0200
Subject: [PATCH 0188/1519] Add issue related in changelog.rst

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 52e76ffcb..65e236bab 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -20,7 +20,7 @@ Changes in 0.9.X - DEV
 - Support for PyMongo 3+ #946
 - Fix for issue where FileField deletion did not free space in GridFS. 
 - No_dereference() not respected on embedded docs containing reference. #517
-- Document save raise an exception if save_condition fails 
+- Document save raise an exception if save_condition fails #1005
 
 Changes in 0.9.0
 ================

From 1951b52aa5b62839f000deacb5ef9a02592c03f4 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 9 Jun 2015 16:20:35 +0200
Subject: [PATCH 0189/1519] Fix #1017 (document clash between same ids but
 different collections)

---
 mongoengine/dereference.py | 25 ++++++++++++++++---------
 tests/test_dereference.py  | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 0428397c0..8e8920d4a 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -128,21 +128,25 @@ def _fetch_objects(self, doc_type=None):
         """
         object_map = {}
         for collection, dbrefs in self.reference_map.iteritems():
-            refs = [dbref for dbref in dbrefs
-                    if unicode(dbref).encode('utf-8') not in object_map]
             if hasattr(collection, 'objects'):  # We have a document class for the refs
+                col_name = collection._get_collection_name()
+                refs = [dbref for dbref in dbrefs
+                        if (col_name, dbref) not in object_map]
                 references = collection.objects.in_bulk(refs)
                 for key, doc in references.iteritems():
-                    object_map[key] = doc
+                    object_map[(col_name, key)] = doc
             else:  # Generic reference: use the refs data to convert to document
                 if isinstance(doc_type, (ListField, DictField, MapField,)):
                     continue
 
+                refs = [dbref for dbref in dbrefs
+                        if (collection, dbref) not in object_map]
+
                 if doc_type:
                     references = doc_type._get_db()[collection].find({'_id': {'$in': refs}})
                     for ref in references:
                         doc = doc_type._from_son(ref)
-                        object_map[doc.id] = doc
+                        object_map[(collection, doc.id)] = doc
                 else:
                     references = get_db()[collection].find({'_id': {'$in': refs}})
                     for ref in references:
@@ -154,7 +158,7 @@ def _fetch_objects(self, doc_type=None):
                                     for x in collection.split('_')))._from_son(ref)
                         else:
                             doc = doc_type._from_son(ref)
-                        object_map[doc.id] = doc
+                        object_map[(collection, doc.id)] = doc
         return object_map
 
     def _attach_objects(self, items, depth=0, instance=None, name=None):
@@ -180,7 +184,8 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
 
         if isinstance(items, (dict, SON)):
             if '_ref' in items:
-                return self.object_map.get(items['_ref'].id, items)
+                return self.object_map.get(
+                    (items['_ref'].collection, items['_ref'].id), items)
             elif '_cls' in items:
                 doc = get_document(items['_cls'])._from_son(items)
                 _cls = doc._data.pop('_cls', None)
@@ -216,9 +221,11 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                 for field_name, field in v._fields.iteritems():
                     v = data[k]._data.get(field_name, None)
                     if isinstance(v, (DBRef)):
-                        data[k]._data[field_name] = self.object_map.get(v.id, v)
+                        data[k]._data[field_name] = self.object_map.get(
+                            (v.collection, v.id), v)
                     elif isinstance(v, (dict, SON)) and '_ref' in v:
-                        data[k]._data[field_name] = self.object_map.get(v['_ref'].id, v)
+                        data[k]._data[field_name] = self.object_map.get(
+                            (v['_ref'].collection , v['_ref'].id), v)
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                         item_name = "{0}.{1}.{2}".format(name, k, field_name)
                         data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
@@ -226,7 +233,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                 item_name = '%s.%s' % (name, k) if name else name
                 data[k] = self._attach_objects(v, depth - 1, instance=instance, name=item_name)
             elif hasattr(v, 'id'):
-                data[k] = self.object_map.get(v.id, v)
+                data[k] = self.object_map.get((v.collection, v.id), v)
 
         if instance and name:
             if is_list:
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 2115b45a5..e1ae37408 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -1026,6 +1026,43 @@ class Baz(Document):
         self.assertEqual(type(foo.bar), Bar)
         self.assertEqual(type(foo.baz), Baz)
 
+
+    def test_document_reload_reference_integrity(self):
+        """
+        Ensure reloading a document with multiple similar id
+        in different collections doesn't mix them.
+        """
+        class Topic(Document):
+            id = IntField(primary_key=True)
+        class User(Document):
+            id = IntField(primary_key=True)
+            name = StringField()
+        class Message(Document):
+            id = IntField(primary_key=True)
+            topic = ReferenceField(Topic)
+            author = ReferenceField(User)
+
+        Topic.drop_collection()
+        User.drop_collection()
+        Message.drop_collection()
+
+        # All objects share the same id, but each in a different collection
+        topic = Topic(id=1).save()
+        user = User(id=1, name='user-name').save()
+        Message(id=1, topic=topic, author=user).save()
+
+        concurrent_change_user = User.objects.get(id=1)
+        concurrent_change_user.name = 'new-name'
+        concurrent_change_user.save()
+        self.assertNotEqual(user.name, 'new-name')
+
+        msg = Message.objects.get(id=1)
+        msg.reload()
+        self.assertEqual(msg.topic, topic)
+        self.assertEqual(msg.author, user)
+        self.assertEqual(msg.author.name, 'new-name')
+
+
     def test_list_lookup_not_checked_in_map(self):
         """Ensure we dereference list data correctly
         """

From a2f0f20284ed28c8633ebc6b01a6e9ca71b04f83 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 11 Jun 2015 17:48:34 +0200
Subject: [PATCH 0190/1519] Improve error message for invalid query

---
 mongoengine/base/document.py      | 9 +++++++--
 mongoengine/queryset/transform.py | 2 +-
 tests/queryset/transform.py       | 9 +++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 5707992a4..1ab19e754 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -983,8 +983,13 @@ def _lookup_field(cls, parts):
                 if hasattr(getattr(field, 'field', None), 'lookup_member'):
                     new_field = field.field.lookup_member(field_name)
                 else:
-                   # Look up subfield on the previous field
-                    new_field = field.lookup_member(field_name)
+                    # Look up subfield on the previous field or raise
+                    try:
+                        new_field = field.lookup_member(field_name)
+                    except AttributeError:
+                        raise LookUpError('Cannot resolve subfield or operator {} '
+                                          'on the field {}'.format(
+                                              field_name, field.name))
                 if not new_field and isinstance(field, ComplexBaseField):
                     if hasattr(field.field, 'document_type') and cls._dynamic \
                             and field.field.document_type._dynamic:
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index c43c4b401..f6cfa87e5 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -44,7 +44,7 @@ def query(_doc_cls=None, _field_operation=False, **query):
         if len(parts) > 1 and parts[-1] in MATCH_OPERATORS:
             op = parts.pop()
 
-        #if user escape field name by __
+        # if user escape field name by __
         if len(parts) > 1 and parts[-1] == "":
             parts.pop()
 
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 77d3593c2..a543317a9 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -224,6 +224,15 @@ class Doc(Document):
         self.assertEqual(1, Doc.objects(item__type__="axe").count())
         self.assertEqual(1, Doc.objects(item__name__="Heroic axe").count())
 
+    def test_understandable_error_raised(self):
+        class Event(Document):
+            title = StringField()
+            location = GeoPointField()
+
+        box = [(35.0, -125.0), (40.0, -100.0)]
+        # I *meant* to execute location__within_box=box
+        events = Event.objects(location__within=box)
+        self.assertRaises(InvalidQueryError, lambda: events.count())
 
 if __name__ == '__main__':
     unittest.main()

From 1862bcf86709c7e58379ee5c5a0baa52b0347d78 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 16 Apr 2015 14:33:16 +0200
Subject: [PATCH 0191/1519] added test for abstract document without pk
 creation and adapted behaviour

---
 mongoengine/base/document.py  |  2 +-
 mongoengine/document.py       |  2 ++
 tests/document/inheritance.py | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 5707992a4..7142a3de2 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -184,7 +184,7 @@ def __setattr__(self, name, value):
             self__initialised = False
         # Check if the user has created a new instance of a class
         if (self._is_document and self__initialised
-                and self__created and name == self._meta['id_field']):
+                and self__created and name == self._meta.get('id_field')):
             super(BaseDocument, self).__setattr__('_created', False)
 
         super(BaseDocument, self).__setattr__(name, value)
diff --git a/mongoengine/document.py b/mongoengine/document.py
index eedd01d21..01b69fb2b 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -152,6 +152,8 @@ def pk():
         """
 
         def fget(self):
+            if not 'id_field' in self._meta:
+                return None
             return getattr(self, self._meta['id_field'])
 
         def fset(self, value):
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index e8347054c..afa3ccea0 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -307,6 +307,17 @@ class Mammal(Animal):
         doc = Animal(name='dog')
         self.assertFalse('_cls' in doc.to_mongo())
 
+    def test_abstract_document_creation_does_not_fail(self):
+
+        class City(Document):
+            continent = StringField()
+            meta = {'abstract': True,
+                    'allow_inheritance': False}
+        bkk = City(continent='asia')
+        self.assertEqual(None, bkk.pk)
+        # TODO: expected error? Shouldn'twe created a new error type
+        self.assertRaises(KeyError, lambda: setattr(bkk, 'pk', 1))
+
     def test_allow_inheritance_embedded_document(self):
         """Ensure embedded documents respect inheritance
         """

From 53fbc165ba84b0314d2c10f16bf9425bbba44fa2 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 16 Apr 2015 14:37:46 +0200
Subject: [PATCH 0192/1519] added content of PR #688 with a test to proove it
 is a bit right

---
 mongoengine/base/metaclasses.py | 14 ++++++++++----
 tests/document/inheritance.py   | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 8a25ff3dc..6fdbe19c3 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -390,10 +390,16 @@ def __new__(cls, name, bases, attrs):
             new_class._fields['id'] = ObjectIdField(db_field='_id')
             new_class._fields['id'].name = 'id'
             new_class.id = new_class._fields['id']
-
-        # Prepend id field to _fields_ordered
-        if 'id' in new_class._fields and 'id' not in new_class._fields_ordered:
-            new_class._fields_ordered = ('id', ) + new_class._fields_ordered
+            new_class._db_field_map['id'] = '_id'
+            new_class._reverse_db_field_map['_id'] = 'id'
+            if 'id' in new_class._fields_ordered:
+                # An existing id field will be overwritten anyway, so remove it
+                loc = new_class._fields_ordered.index('id')
+                new_class._fields_ordered = new_class._fields_ordered[:loc] + \
+                                            new_class._fields_ordered[loc+1:]
+            else:
+                # Prepend id field to _fields_ordered
+                new_class._fields_ordered = ('id', ) + new_class._fields_ordered
 
         # Merge in exceptions with parent hierarchy
         exceptions_to_merge = (DoesNotExist, MultipleObjectsReturned)
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index afa3ccea0..e408e6110 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -307,6 +307,23 @@ class Mammal(Animal):
         doc = Animal(name='dog')
         self.assertFalse('_cls' in doc.to_mongo())
 
+    def test_abstract_handle_ids_in_metaclass_properly(self):
+
+        class City(Document):
+            continent = StringField()
+            meta = {'abstract': True,
+                    'allow_inheritance': False}
+
+        class EuropeanCity(City):
+            name = StringField()
+            country = StringField()
+
+        berlin = EuropeanCity(name='Berlin', continent='Europe')
+        self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
+        self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
+        self.assertEqual(len(berlin._fields_ordered), 4)
+        self.assertEqual(berlin._fields_ordered[0], 'id')
+
     def test_abstract_document_creation_does_not_fail(self):
 
         class City(Document):

From 051cd744adbe9a00ee3e3630167bfd80bc431589 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 16 Apr 2015 14:38:30 +0200
Subject: [PATCH 0193/1519] added another test to proove we still do not handle
 all cases well

---
 tests/document/inheritance.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index e408e6110..cbc0d0b76 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -324,6 +324,24 @@ class EuropeanCity(City):
         self.assertEqual(len(berlin._fields_ordered), 4)
         self.assertEqual(berlin._fields_ordered[0], 'id')
 
+    def test_auto_id_vs_non_pk_id_field(self):
+
+        class City(Document):
+            continent = StringField()
+            id = IntField()
+            meta = {'abstract': True,
+                    'allow_inheritance': False}
+
+        class EuropeanCity(City):
+            name = StringField()
+            country = StringField()
+
+        berlin = EuropeanCity(name='Berlin', continent='Europe')
+        self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
+        self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
+        self.assertEqual(len(berlin._fields_ordered), 5)
+        self.assertEqual(berlin._fields_ordered[0], 'id')
+
     def test_abstract_document_creation_does_not_fail(self):
 
         class City(Document):

From 2e963023368372bb975bd671124686b20db822a6 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 16 Apr 2015 14:53:28 +0200
Subject: [PATCH 0194/1519] not in fix

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 01b69fb2b..7b05ef8c3 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -152,7 +152,7 @@ def pk():
         """
 
         def fget(self):
-            if not 'id_field' in self._meta:
+            if 'id_field' not in self._meta:
                 return None
             return getattr(self, self._meta['id_field'])
 

From 915849b2ce7706dbf091207f92ff7d9e37291823 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 11 Jun 2015 16:39:20 +0200
Subject: [PATCH 0195/1519] Implemented method to auto-generate
 non-collisioning auto_id names

---
 docs/changelog.rst                |  1 +
 docs/guide/defining-documents.rst |  2 +-
 mongoengine/base/metaclasses.py   | 38 +++++++++++++++++++------------
 tests/document/inheritance.py     | 29 ++++++++++++++++++-----
 tests/queryset/queryset.py        |  2 --
 5 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 65e236bab..dfa9c7a60 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -21,6 +21,7 @@ Changes in 0.9.X - DEV
 - Fix for issue where FileField deletion did not free space in GridFS. 
 - No_dereference() not respected on embedded docs containing reference. #517
 - Document save raise an exception if save_condition fails #1005
+- Fixes some internal _id handling issue. #961
 
 Changes in 0.9.0
 ================
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index d1448158a..4572d30b7 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -310,7 +310,7 @@ Dealing with deletion of referred documents
 By default, MongoDB doesn't check the integrity of your data, so deleting
 documents that other documents still hold references to will lead to consistency
 issues.  Mongoengine's :class:`ReferenceField` adds some functionality to
-safeguard against these kinds of database integrity problems, providing each
+safeguard against these kinds of database integrit2y problems, providing each
 reference with a delete rule specification.  A delete rule is specified by
 supplying the :attr:`reverse_delete_rule` attributes on the
 :class:`ReferenceField` definition, like this::
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 6fdbe19c3..f608940db 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -385,21 +385,17 @@ def __new__(cls, name, bases, attrs):
         new_class._auto_id_field = getattr(parent_doc_cls,
                                            '_auto_id_field', False)
         if not new_class._meta.get('id_field'):
+            # After 0.10, find not existing names, instead of overwriting
+            id_name, id_db_name = cls.get_auto_id_names(new_class)
             new_class._auto_id_field = True
-            new_class._meta['id_field'] = 'id'
-            new_class._fields['id'] = ObjectIdField(db_field='_id')
-            new_class._fields['id'].name = 'id'
-            new_class.id = new_class._fields['id']
-            new_class._db_field_map['id'] = '_id'
-            new_class._reverse_db_field_map['_id'] = 'id'
-            if 'id' in new_class._fields_ordered:
-                # An existing id field will be overwritten anyway, so remove it
-                loc = new_class._fields_ordered.index('id')
-                new_class._fields_ordered = new_class._fields_ordered[:loc] + \
-                                            new_class._fields_ordered[loc+1:]
-            else:
-                # Prepend id field to _fields_ordered
-                new_class._fields_ordered = ('id', ) + new_class._fields_ordered
+            new_class._meta['id_field'] = id_name
+            new_class._fields[id_name] = ObjectIdField(db_field=id_db_name)
+            new_class._fields[id_name].name = id_name
+            new_class.id = new_class._fields[id_name]
+            new_class._db_field_map[id_name] = id_db_name
+            new_class._reverse_db_field_map[id_db_name] = id_name
+            # Prepend id field to _fields_ordered
+            new_class._fields_ordered = (id_name, ) + new_class._fields_ordered
 
         # Merge in exceptions with parent hierarchy
         exceptions_to_merge = (DoesNotExist, MultipleObjectsReturned)
@@ -414,6 +410,20 @@ def __new__(cls, name, bases, attrs):
 
         return new_class
 
+    def get_auto_id_names(self):
+        id_name, id_db_name = ('id', '_id')
+        if id_name not in self._fields and \
+                id_db_name not in (v.db_field for v in self._fields.values()):
+            return id_name, id_db_name
+        id_basename, id_db_basename, i = 'auto_id', '_auto_id', 0
+        while id_name in self._fields or \
+                id_db_name in (v.db_field for v in self._fields.values()):
+            id_name = '{}_{}'.format(id_basename, i)
+            id_db_name = '{}_{}'.format(id_db_basename, i)
+            i += 1
+        return id_name, id_db_name
+
+
 
 class MetaDict(dict):
 
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index cbc0d0b76..7673a103d 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -316,14 +316,30 @@ class City(Document):
 
         class EuropeanCity(City):
             name = StringField()
-            country = StringField()
 
         berlin = EuropeanCity(name='Berlin', continent='Europe')
         self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
         self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
-        self.assertEqual(len(berlin._fields_ordered), 4)
+        self.assertEqual(len(berlin._fields_ordered), 3)
         self.assertEqual(berlin._fields_ordered[0], 'id')
 
+    def test_auto_id_not_set_if_specific_in_parent_class(self):
+
+        class City(Document):
+            continent = StringField()
+            city_id = IntField(primary_key=True)
+            meta = {'abstract': True,
+                    'allow_inheritance': False}
+
+        class EuropeanCity(City):
+            name = StringField()
+
+        berlin = EuropeanCity(name='Berlin', continent='Europe')
+        self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
+        self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
+        self.assertEqual(len(berlin._fields_ordered), 3)
+        self.assertEqual(berlin._fields_ordered[0], 'city_id')
+
     def test_auto_id_vs_non_pk_id_field(self):
 
         class City(Document):
@@ -334,13 +350,14 @@ class City(Document):
 
         class EuropeanCity(City):
             name = StringField()
-            country = StringField()
 
         berlin = EuropeanCity(name='Berlin', continent='Europe')
         self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
         self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
-        self.assertEqual(len(berlin._fields_ordered), 5)
-        self.assertEqual(berlin._fields_ordered[0], 'id')
+        self.assertEqual(len(berlin._fields_ordered), 4)
+        self.assertEqual(berlin._fields_ordered[0], 'auto_id_0')
+        berlin.save()
+        self.assertEqual(berlin.pk, berlin.auto_id_0)
 
     def test_abstract_document_creation_does_not_fail(self):
 
@@ -350,7 +367,7 @@ class City(Document):
                     'allow_inheritance': False}
         bkk = City(continent='asia')
         self.assertEqual(None, bkk.pk)
-        # TODO: expected error? Shouldn'twe created a new error type
+        # TODO: expected error? Shouldn't we create a new error type?
         self.assertRaises(KeyError, lambda: setattr(bkk, 'pk', 1))
 
     def test_allow_inheritance_embedded_document(self):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 0965e40f0..83fb52df3 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -3689,11 +3689,9 @@ def invalid_where():
     def test_scalar(self):
 
         class Organization(Document):
-            id = ObjectIdField('_id')
             name = StringField()
 
         class User(Document):
-            id = ObjectIdField('_id')
             name = StringField()
             organization = ObjectIdField()
 

From 810819861354914a217a58e6f7e9c772dca4549a Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Thu, 11 Jun 2015 22:38:05 +0200
Subject: [PATCH 0196/1519] corrected formatting for Python 2.6 compatibility

---
 mongoengine/base/metaclasses.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index f608940db..16e6bd298 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -418,8 +418,8 @@ def get_auto_id_names(self):
         id_basename, id_db_basename, i = 'auto_id', '_auto_id', 0
         while id_name in self._fields or \
                 id_db_name in (v.db_field for v in self._fields.values()):
-            id_name = '{}_{}'.format(id_basename, i)
-            id_db_name = '{}_{}'.format(id_db_basename, i)
+            id_name = '{0}_{1}'.format(id_basename, i)
+            id_db_name = '{0}_{1}'.format(id_db_basename, i)
             i += 1
         return id_name, id_db_name
 

From e1da83a8f6e835478e2e039cc241529c2384d2f2 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Fri, 12 Jun 2015 09:12:19 +0200
Subject: [PATCH 0197/1519] Cosmetic

---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 4572d30b7..d1448158a 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -310,7 +310,7 @@ Dealing with deletion of referred documents
 By default, MongoDB doesn't check the integrity of your data, so deleting
 documents that other documents still hold references to will lead to consistency
 issues.  Mongoengine's :class:`ReferenceField` adds some functionality to
-safeguard against these kinds of database integrit2y problems, providing each
+safeguard against these kinds of database integrity problems, providing each
 reference with a delete rule specification.  A delete rule is specified by
 supplying the :attr:`reverse_delete_rule` attributes on the
 :class:`ReferenceField` definition, like this::

From 3093175f544e9f976caada8d4dbe6dc2f99a0108 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Fri, 12 Jun 2015 11:03:52 +0200
Subject: [PATCH 0198/1519] SequenceField for abstract classes now have a
 proper name

---
 mongoengine/base/document.py    |  2 +-
 mongoengine/base/metaclasses.py |  1 -
 mongoengine/document.py         |  8 ++---
 mongoengine/fields.py           |  4 +--
 tests/fields/fields.py          | 52 +++++++++++++++++++++++++++++++++
 5 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 9357fde26..1049eabdc 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -672,7 +672,7 @@ def _delta(self):
 
     @classmethod
     def _get_collection_name(cls):
-        """Returns the collection name for this class.
+        """Returns the collection name for this class. None for abstract class
         """
         return cls._meta.get('collection', None)
 
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 16e6bd298..d4c26bfe7 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -424,7 +424,6 @@ def get_auto_id_names(self):
         return id_name, id_db_name
 
 
-
 class MetaDict(dict):
 
     """Custom dictionary for meta classes.
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 7b05ef8c3..885f7eeda 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -145,7 +145,7 @@ class Document(BaseDocument):
     my_metaclass = TopLevelDocumentMetaclass
     __metaclass__ = TopLevelDocumentMetaclass
 
-    __slots__ = ('__objects')
+    __slots__ = ('__objects',)
 
     def pk():
         """Primary key alias
@@ -174,10 +174,10 @@ def _get_collection(cls):
             db = cls._get_db()
             collection_name = cls._get_collection_name()
             # Create collection as a capped collection if specified
-            if cls._meta['max_size'] or cls._meta['max_documents']:
+            if cls._meta.get('max_size') or cls._meta.get('max_documents'):
                 # Get max document limit and max byte size from meta
-                max_size = cls._meta['max_size'] or 10000000  # 10MB default
-                max_documents = cls._meta['max_documents']
+                max_size = cls._meta.get('max_size') or 10000000  # 10MB default
+                max_documents = cls._meta.get('max_documents')
 
                 if collection_name in db.collection_names():
                     cls._collection = db[collection_name]
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 9176828c6..94f41d281 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1694,7 +1694,7 @@ def __init__(self, collection_name=None, db_alias=None, sequence_name=None,
         self.sequence_name = sequence_name
         self.value_decorator = (callable(value_decorator) and
                                 value_decorator or self.VALUE_DECORATOR)
-        return super(SequenceField, self).__init__(*args, **kwargs)
+        super(SequenceField, self).__init__(*args, **kwargs)
 
     def generate(self):
         """
@@ -1740,7 +1740,7 @@ def get_sequence_name(self):
         if self.sequence_name:
             return self.sequence_name
         owner = self.owner_document
-        if issubclass(owner, Document):
+        if issubclass(owner, Document) and not owner._meta.get('abstract'):
             return owner._get_collection_name()
         else:
             return ''.join('_%s' % c if c.isupper() else c
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index fd083c730..9f9bf1ddd 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -39,6 +39,7 @@ def setUp(self):
     def tearDown(self):
         self.db.drop_collection('fs.files')
         self.db.drop_collection('fs.chunks')
+        self.db.drop_collection('mongoengine.counters')
 
     def test_default_values_nothing_set(self):
         """Ensure that default field values are used when creating a document.
@@ -2954,6 +2955,57 @@ class Post(Document):
         self.assertEqual(1, post.comments[0].id)
         self.assertEqual(2, post.comments[1].id)
 
+    def test_inherited_sequencefield(self):
+        class Base(Document):
+            name = StringField()
+            counter = SequenceField()
+            meta = {'abstract': True}
+
+        class Foo(Base):
+            pass
+
+        class Bar(Base):
+            pass
+
+        bar = Bar(name='Bar')
+        bar.save()
+
+        foo = Foo(name='Foo')
+        foo.save()
+
+        self.assertTrue('base.counter' in
+                        self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertFalse(('foo.counter' or 'bar.counter') in
+                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertNotEqual(foo.counter, bar.counter)
+        self.assertEqual(foo._fields['counter'].owner_document, Base)
+        self.assertEqual(bar._fields['counter'].owner_document, Base)
+
+    def test_no_inherited_sequencefield(self):
+        class Base(Document):
+            name = StringField()
+            meta = {'abstract': True}
+
+        class Foo(Base):
+            counter = SequenceField()
+
+        class Bar(Base):
+            counter = SequenceField()
+
+        bar = Bar(name='Bar')
+        bar.save()
+
+        foo = Foo(name='Foo')
+        foo.save()
+
+        self.assertFalse('base.counter' in
+                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertTrue(('foo.counter' and 'bar.counter') in
+                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertEqual(foo.counter, bar.counter)
+        self.assertEqual(foo._fields['counter'].owner_document, Foo)
+        self.assertEqual(bar._fields['counter'].owner_document, Bar)
+
     def test_generic_embedded_document(self):
         class Car(EmbeddedDocument):
             name = StringField()

From eec876295d1e3feb5fd2e360b3b775a15ab2b14a Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Fri, 12 Jun 2015 12:13:28 +0200
Subject: [PATCH 0199/1519] Added passing test to prove save and only problem
 was fixed

---
 tests/queryset/queryset.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 83fb52df3..981d47f46 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -693,6 +693,43 @@ def test_set_on_insert(self):
         self.assertEqual("Bob", bob.name)
         self.assertEqual(30, bob.age)
 
+    def test_save_and_only_on_fields_with_default(self):
+        class Embed(EmbeddedDocument):
+            field = IntField()
+
+        class B(Document):
+            meta = {'collection': 'b'}
+
+            field = IntField(default=1)
+            embed = EmbeddedDocumentField(Embed, default=Embed)
+            embed_no_default = EmbeddedDocumentField(Embed)
+
+        # Creating {field : 2, embed : {field: 2}, embed_no_default: {field: 2}}
+        val = 2
+        embed = Embed()
+        embed.field = val
+        record = B()
+        record.field = val
+        record.embed = embed
+        record.embed_no_default = embed
+        record.save()
+
+        # Checking it was saved correctly
+        record.reload()
+        self.assertEqual(record.field, 2)
+        self.assertEqual(record.embed_no_default.field, 2)
+        self.assertEqual(record.embed.field, 2)
+
+        # Request only the _id field and save
+        clone = B.objects().only('id').first()
+        clone.save()
+
+        # Reload the record and see that the embed data is not lost
+        record.reload()
+        self.assertEqual(record.field, 2)
+        self.assertEqual(record.embed_no_default.field, 2)
+        self.assertEqual(record.embed.field, 2)
+
     def test_get_or_create(self):
         """Ensure that ``get_or_create`` returns one result or creates a new
         document.

From 4c1496b4a4d380fa62ada223819ec3cd0d523bc8 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Fri, 12 Jun 2015 13:10:36 +0200
Subject: [PATCH 0200/1519] Updated URL and Email field regex validators, added
 schemes arg to urlfield

---
 mongoengine/fields.py  | 23 ++++++++++++++++-------
 tests/fields/fields.py | 18 +++++++++++++++++-
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 9176828c6..b685534dc 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -119,22 +119,31 @@ class URLField(StringField):
     """
 
     _URL_REGEX = re.compile(
-        r'^(?:http|ftp)s?://'  # http:// or https://
-        # domain...
-        r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|'
+        r'^(?:[a-z0-9\.\-]*)://'  # scheme is validated separately
+        r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}(?<!-)\.?)|'  # domain...
         r'localhost|'  # localhost...
-        r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'  # ...or ip
+        r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|'  # ...or ipv4
+        r'\[?[A-F0-9]*:[A-F0-9:]+\]?)'  # ...or ipv6
         r'(?::\d+)?'  # optional port
         r'(?:/?|[/?]\S+)$', re.IGNORECASE)
+    _URL_SCHEMES = ['http', 'https', 'ftp', 'ftps']
 
-    def __init__(self, verify_exists=False, url_regex=None, **kwargs):
+    def __init__(self, verify_exists=False, url_regex=None, schemes=None, **kwargs):
         self.verify_exists = verify_exists
         self.url_regex = url_regex or self._URL_REGEX
+        self.schemes = schemes or self._URL_SCHEMES
         super(URLField, self).__init__(**kwargs)
 
     def validate(self, value):
+        # Check first if the scheme is valid
+        scheme = value.split('://')[0].lower()
+        if scheme not in self.schemes:
+            self.error('Invalid scheme {} in URL: {}'.format(scheme, value))
+            return
+
+        # Then check full URL
         if not self.url_regex.match(value):
-            self.error('Invalid URL: %s' % value)
+            self.error('Invalid URL: {}'.format(value))
             return
 
         if self.verify_exists:
@@ -162,7 +171,7 @@ class EmailField(StringField):
         # quoted-string
         r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"'
         # domain (max length of an ICAAN TLD is 22 characters)
-        r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,253}[A-Z0-9])?\.)+[A-Z]{2,22}$', re.IGNORECASE
+        r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}|[A-Z0-9-]{2,}(?<!-))$', re.IGNORECASE
     )
 
     def validate(self, value):
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index fd083c730..7e04482fe 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -341,6 +341,23 @@ class Link(Document):
         link.url = 'http://www.google.com:8080/'
         link.validate()
 
+    def test_url_scheme_validation(self):
+        """Ensure that URLFields validate urls with specific schemes properly.
+        """
+        class Link(Document):
+            url = URLField()
+
+        class SchemeLink(Document):
+            url = URLField(schemes=['ws', 'irc'])
+
+        link = Link()
+        link.url = 'ws://google.com'
+        self.assertRaises(ValidationError, link.validate)
+
+        scheme_link = SchemeLink()
+        scheme_link.url = 'ws://google.com'
+        scheme_link.validate()
+
     def test_int_validation(self):
         """Ensure that invalid values cannot be assigned to int fields.
         """
@@ -3088,7 +3105,6 @@ class User(Document):
         self.assertTrue(user.validate() is None)
 
         user = User(email=("Kofq@rhom0e4klgauOhpbpNdogawnyIKvQS0wk2mjqrgGQ5S"
-                           "ucictfqpdkK9iS1zeFw8sg7s7cwAF7suIfUfeyueLpfosjn3"
                            "aJIazqqWkm7.net"))
         self.assertTrue(user.validate() is None)
 

From d4c02c3988e5a139a8274780e6de1f5e2629893d Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Fri, 12 Jun 2015 13:12:35 +0200
Subject: [PATCH 0201/1519] Added to changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index dfa9c7a60..aba3f6b26 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -22,6 +22,7 @@ Changes in 0.9.X - DEV
 - No_dereference() not respected on embedded docs containing reference. #517
 - Document save raise an exception if save_condition fails #1005
 - Fixes some internal _id handling issue. #961
+- Updated URL and Email Field regex validators, added schemes argument to URLField validation. #652
 
 Changes in 0.9.0
 ================

From 7714cca5995a1f26e3e7d4bccbd2464591304fe4 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Fri, 12 Jun 2015 13:34:28 +0200
Subject: [PATCH 0202/1519] Removed get_or_create() method, deprecated since
 0.8

---
 docs/changelog.rst           |  1 +
 docs/guide/querying.rst      | 20 ++++-----------
 mongoengine/queryset/base.py | 48 ------------------------------------
 tests/fields/fields.py       |  4 +--
 tests/queryset/queryset.py   | 35 +-------------------------
 5 files changed, 8 insertions(+), 100 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index aba3f6b26..e3d7c8dfc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,6 +23,7 @@ Changes in 0.9.X - DEV
 - Document save raise an exception if save_condition fails #1005
 - Fixes some internal _id handling issue. #961
 - Updated URL and Email Field regex validators, added schemes argument to URLField validation. #652
+- Removed get_or_create() deprecated since 0.8.0. #300
 
 Changes in 0.9.0
 ================
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 9861ce564..1cde82cb7 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -263,21 +263,11 @@ no document matches the query, and
 if more than one document matched the query.  These exceptions are merged into
 your document definitions eg: `MyDoc.DoesNotExist`
 
-A variation of this method exists,
-:meth:`~mongoengine.queryset.QuerySet.get_or_create`, that will create a new
-document with the query arguments if no documents match the query. An
-additional keyword argument, :attr:`defaults` may be provided, which will be
-used as default values for the new document, in the case that it should need
-to be created::
-
-    >>> a, created = User.objects.get_or_create(name='User A', defaults={'age': 30})
-    >>> b, created = User.objects.get_or_create(name='User A', defaults={'age': 40})
-    >>> a.name == b.name and a.age == b.age
-    True
-
-.. warning::
-    :meth:`~mongoengine.queryset.QuerySet.get_or_create` method is deprecated
-    since :mod:`mongoengine` 0.8.
+A variation of this method, get_or_create() existed, but it was unsafe. It
+could not be made safe, because there are no transactions in mongoDB. Other
+approaches should be investigated, to ensure you don't accidentally duplicate
+data when using something similar to this method. Therefore it was deprecated
+in 0.8 and removed in 0.10.
 
 Default Document queries
 ========================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 89eb9afa6..c8a30783f 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -258,54 +258,6 @@ def create(self, **kwargs):
         """
         return self._document(**kwargs).save()
 
-    def get_or_create(self, write_concern=None, auto_save=True,
-                      *q_objs, **query):
-        """Retrieve unique object or create, if it doesn't exist. Returns a
-        tuple of ``(object, created)``, where ``object`` is the retrieved or
-        created object and ``created`` is a boolean specifying whether a new
-        object was created. Raises
-        :class:`~mongoengine.queryset.MultipleObjectsReturned` or
-        `DocumentName.MultipleObjectsReturned` if multiple results are found.
-        A new document will be created if the document doesn't exists; a
-        dictionary of default values for the new document may be provided as a
-        keyword argument called :attr:`defaults`.
-
-        .. note:: This requires two separate operations and therefore a
-            race condition exists.  Because there are no transactions in
-            mongoDB other approaches should be investigated, to ensure you
-            don't accidentally duplicate data when using this method.  This is
-            now scheduled to be removed before 1.0
-
-        :param write_concern: optional extra keyword arguments used if we
-            have to create a new document.
-            Passes any write_concern onto :meth:`~mongoengine.Document.save`
-
-        :param auto_save: if the object is to be saved automatically if
-            not found.
-
-        .. deprecated:: 0.8
-        .. versionchanged:: 0.6 - added `auto_save`
-        .. versionadded:: 0.3
-        """
-        msg = ("get_or_create is scheduled to be deprecated.  The approach is "
-               "flawed without transactions. Upserts should be preferred.")
-        warnings.warn(msg, DeprecationWarning)
-
-        defaults = query.get('defaults', {})
-        if 'defaults' in query:
-            del query['defaults']
-
-        try:
-            doc = self.get(*q_objs, **query)
-            return doc, False
-        except self._document.DoesNotExist:
-            query.update(defaults)
-            doc = self._document(**query)
-
-            if auto_save:
-                doc.save(write_concern=write_concern)
-            return doc, True
-
     def first(self):
         """Retrieve the first object matching the query.
         """
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 1a5c25619..35e3ca39a 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2152,9 +2152,7 @@ class Company(Document):
         obj = Product.objects(company=None).first()
         self.assertEqual(obj, me)
 
-        obj, created = Product.objects.get_or_create(company=None)
-
-        self.assertEqual(created, False)
+        obj = Product.objects.get(company=None)
         self.assertEqual(obj, me)
 
     def test_reference_query_conversion(self):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 981d47f46..fbc8ce4a7 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -340,8 +340,7 @@ def test_update_write_concern(self):
 
         write_concern = {"fsync": True}
 
-        author, created = self.Person.objects.get_or_create(
-            name='Test User', write_concern=write_concern)
+        author = self.Person.objects.create(name='Test User')
         author.save(write_concern=write_concern)
 
         result = self.Person.objects.update(
@@ -730,38 +729,6 @@ class B(Document):
         self.assertEqual(record.embed_no_default.field, 2)
         self.assertEqual(record.embed.field, 2)
 
-    def test_get_or_create(self):
-        """Ensure that ``get_or_create`` returns one result or creates a new
-        document.
-        """
-        person1 = self.Person(name="User A", age=20)
-        person1.save()
-        person2 = self.Person(name="User B", age=30)
-        person2.save()
-
-        # Retrieve the first person from the database
-        self.assertRaises(MultipleObjectsReturned,
-                          self.Person.objects.get_or_create)
-        self.assertRaises(self.Person.MultipleObjectsReturned,
-                          self.Person.objects.get_or_create)
-
-        # Use a query to filter the people found to just person2
-        person, created = self.Person.objects.get_or_create(age=30)
-        self.assertEqual(person.name, "User B")
-        self.assertEqual(created, False)
-
-        person, created = self.Person.objects.get_or_create(age__lt=30)
-        self.assertEqual(person.name, "User A")
-        self.assertEqual(created, False)
-
-        # Try retrieving when no objects exists - new doc should be created
-        kwargs = dict(age=50, defaults={'name': 'User C'})
-        person, created = self.Person.objects.get_or_create(**kwargs)
-        self.assertEqual(created, True)
-
-        person = self.Person.objects.get(age=50)
-        self.assertEqual(person.name, "User C")
-
     def test_bulk_insert(self):
         """Ensure that bulk insert works
         """

From 2b647d24051f1eac5ae8d5dcf42010dea083b2d6 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Fri, 12 Jun 2015 21:20:59 +0200
Subject: [PATCH 0203/1519] Improved doc for SequenceField

Related to issue #497
---
 mongoengine/fields.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 8e6c9b07e..c27d02b24 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1013,6 +1013,7 @@ class CachedReferenceField(BaseField):
 
     """
     A referencefield with cache fields to purpose pseudo-joins
+    
     .. versionadded:: 0.9
     """
 
@@ -1683,12 +1684,21 @@ class SequenceField(BaseField):
              cluster of machines, it is easier to create an object ID than have
              global, uniformly increasing sequence numbers.
 
+    :param collection_name:  Name of the counter collection (default 'mongoengine.counters')
+    :param sequence_name: Name of the sequence in the collection (default 'ClassName.counter')
+    :param value_decorator: Any callable to use as a counter (default int)
+        
     Use any callable as `value_decorator` to transform calculated counter into
     any value suitable for your needs, e.g. string or hexadecimal
     representation of the default integer counter value.
-
+    
+    .. note::
+    
+        In case the counter is defined in the abstract document, it will be 
+        common to all inherited documents and the default sequence name will 
+        be the class name of the abstract document.
+    
     .. versionadded:: 0.5
-
     .. versionchanged:: 0.8 added `value_decorator`
     """
 

From 2a3d3de0b2be6fbedf975fe99c6aaa721de8453f Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Mon, 15 Jun 2015 00:22:07 +0200
Subject: [PATCH 0204/1519] CappedCollection max_size normalized to multiple of
 256

---
 docs/changelog.rst                |  1 +
 docs/guide/defining-documents.rst |  6 ++-
 mongoengine/document.py           | 13 +++++--
 tests/document/instance.py        | 65 ++++++++++++++++++++++++++++++-
 4 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e3d7c8dfc..48e8b9aac 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -24,6 +24,7 @@ Changes in 0.9.X - DEV
 - Fixes some internal _id handling issue. #961
 - Updated URL and Email Field regex validators, added schemes argument to URLField validation. #652
 - Removed get_or_create() deprecated since 0.8.0. #300
+- Capped collection multiple of 256. #1011
 
 Changes in 0.9.0
 ================
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index d1448158a..8f7382eeb 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -447,8 +447,10 @@ A :class:`~mongoengine.Document` may use a **Capped Collection** by specifying
 :attr:`max_documents` and :attr:`max_size` in the :attr:`meta` dictionary.
 :attr:`max_documents` is the maximum number of documents that is allowed to be
 stored in the collection, and :attr:`max_size` is the maximum size of the
-collection in bytes. If :attr:`max_size` is not specified and
-:attr:`max_documents` is, :attr:`max_size` defaults to 10000000 bytes (10MB).
+collection in bytes. :attr:`max_size` is rounded up to the next multiple of 256
+by MongoDB internally and mongoengine before. Use also a multiple of 256 to
+avoid confusions. If :attr:`max_size` is not specified and
+:attr:`max_documents` is, :attr:`max_size` defaults to 10485760 bytes (10MB).
 The following example shows a :class:`Log` document that will be limited to
 1000 entries and 2MB of disk space::
 
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 885f7eeda..dee6cc10a 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -114,9 +114,11 @@ class Document(BaseDocument):
     specifying :attr:`max_documents` and :attr:`max_size` in the :attr:`meta`
     dictionary. :attr:`max_documents` is the maximum number of documents that
     is allowed to be stored in the collection, and :attr:`max_size` is the
-    maximum size of the collection in bytes. If :attr:`max_size` is not
+    maximum size of the collection in bytes. :attr:`max_size` is rounded up
+    to the next multiple of 256 by MongoDB internally and mongoengine before.
+    Use also a multiple of 256 to avoid confusions.  If :attr:`max_size` is not
     specified and :attr:`max_documents` is, :attr:`max_size` defaults to
-    10000000 bytes (10MB).
+    10485760 bytes (10MB).
 
     Indexes may be created by specifying :attr:`indexes` in the :attr:`meta`
     dictionary. The value should be a list of field names or tuples of field
@@ -137,7 +139,7 @@ class Document(BaseDocument):
     By default, any extra attribute existing in stored data but not declared
     in your model will raise a :class:`~mongoengine.FieldDoesNotExist` error.
     This can be disabled by setting :attr:`strict` to ``False``
-    in the :attr:`meta` dictionnary.
+    in the :attr:`meta` dictionary.
     """
 
     # The __metaclass__ attribute is removed by 2to3 when running with Python3
@@ -176,8 +178,11 @@ def _get_collection(cls):
             # Create collection as a capped collection if specified
             if cls._meta.get('max_size') or cls._meta.get('max_documents'):
                 # Get max document limit and max byte size from meta
-                max_size = cls._meta.get('max_size') or 10000000  # 10MB default
+                max_size = cls._meta.get('max_size') or 10 * 2 ** 20  # 10MB default
                 max_documents = cls._meta.get('max_documents')
+                # Round up to next 256 bytes as MongoDB would do it to avoid exception
+                if max_size % 256:
+                    max_size = (max_size / 256 + 1) * 256
 
                 if collection_name in db.collection_names():
                     cls._collection = db[collection_name]
diff --git a/tests/document/instance.py b/tests/document/instance.py
index e1710b9f2..fceec02f5 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -88,7 +88,7 @@ class Log(Document):
         options = Log.objects._collection.options()
         self.assertEqual(options['capped'], True)
         self.assertEqual(options['max'], 10)
-        self.assertTrue(options['size'] >= 4096)
+        self.assertEqual(options['size'], 4096)
 
         # Check that the document cannot be redefined with different options
         def recreate_log_document():
@@ -103,6 +103,69 @@ class Log(Document):
 
         Log.drop_collection()
 
+    def test_capped_collection_default(self):
+        """Ensure that capped collections defaults work properly.
+        """
+        class Log(Document):
+            date = DateTimeField(default=datetime.now)
+            meta = {
+                'max_documents': 10,
+            }
+
+        Log.drop_collection()
+
+        # Create a doc to create the collection
+        Log().save()
+
+        options = Log.objects._collection.options()
+        self.assertEqual(options['capped'], True)
+        self.assertEqual(options['max'], 10)
+        self.assertEqual(options['size'], 10 * 2**20)
+
+        # Check that the document with default value can be recreated
+        def recreate_log_document():
+            class Log(Document):
+                date = DateTimeField(default=datetime.now)
+                meta = {
+                    'max_documents': 10,
+                }
+            # Create the collection by accessing Document.objects
+            Log.objects
+        recreate_log_document()
+        Log.drop_collection()
+
+    def test_capped_collection_no_max_size_problems(self):
+        """Ensure that capped collections with odd max_size work properly.
+        MongoDB rounds up max_size to next multiple of 256, recreating a doc
+        with the same spec failed in mongoengine <0.10
+        """
+        class Log(Document):
+            date = DateTimeField(default=datetime.now)
+            meta = {
+                'max_size': 10000,
+            }
+
+        Log.drop_collection()
+
+        # Create a doc to create the collection
+        Log().save()
+
+        options = Log.objects._collection.options()
+        self.assertEqual(options['capped'], True)
+        self.assertTrue(options['size'] >= 10000)
+
+        # Check that the document with odd max_size value can be recreated
+        def recreate_log_document():
+            class Log(Document):
+                date = DateTimeField(default=datetime.now)
+                meta = {
+                    'max_size': 10000,
+                }
+            # Create the collection by accessing Document.objects
+            Log.objects
+        recreate_log_document()
+        Log.drop_collection()
+
     def test_repr(self):
         """Ensure that unicode representation works
         """

From 1bcd675ead609b8b423d227b9266df752f3c409a Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Mon, 15 Jun 2015 13:44:11 +0200
Subject: [PATCH 0205/1519] Python 3 fix, uses floor division

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index dee6cc10a..429f60658 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -182,7 +182,7 @@ def _get_collection(cls):
                 max_documents = cls._meta.get('max_documents')
                 # Round up to next 256 bytes as MongoDB would do it to avoid exception
                 if max_size % 256:
-                    max_size = (max_size / 256 + 1) * 256
+                    max_size = (max_size // 256 + 1) * 256
 
                 if collection_name in db.collection_names():
                     cls._collection = db[collection_name]

From dd095279c86d55f0497f751f8ca4cb56aeb36d55 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 7 Jun 2015 14:15:23 -0700
Subject: [PATCH 0206/1519] aggregate_sum/average + unit tests

---
 mongoengine/queryset/base.py | 34 ++++++++++++++++++
 tests/queryset/queryset.py   | 68 ++++++++++++++++++++++++++++++++----
 2 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c8a30783f..38389fbf2 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1248,6 +1248,23 @@ def sum(self, field):
         else:
             return 0
 
+    def aggregate_sum(self, field):
+        """Sum over the values of the specified field.
+
+        :param field: the field to sum over; use dot-notation to refer to
+            embedded document fields
+
+        This method is more performant than the regular `sum`, because it uses
+        the aggregation framework instead of map-reduce.
+        """
+        result = self._document._get_collection().aggregate([
+            { '$match': self._query },
+            { '$group': { '_id': 'sum', 'total': { '$sum': '$' + field } } }
+        ])
+        if result['result']:
+            return result['result'][0]['total']
+        return 0
+
     def average(self, field):
         """Average over the values of the specified field.
 
@@ -1303,6 +1320,23 @@ def average(self, field):
         else:
             return 0
 
+    def aggregate_average(self, field):
+        """Average over the values of the specified field.
+
+        :param field: the field to average over; use dot-notation to refer to
+            embedded document fields
+
+        This method is more performant than the regular `average`, because it
+        uses the aggregation framework instead of map-reduce.
+        """
+        result = self._document._get_collection().aggregate([
+            { '$match': self._query },
+            { '$group': { '_id': 'avg', 'total': { '$avg': '$' + field } } }
+        ])
+        if result['result']:
+            return result['result'][0]['total']
+        return 0
+
     def item_frequencies(self, field, normalize=False, map_reduce=True):
         """Returns a dictionary of all items present in a field across
         the whole queried set of documents, and their corresponding frequency.
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index e7eb49018..d43486788 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2706,26 +2706,58 @@ def test_average(self):
 
         avg = float(sum(ages)) / (len(ages) + 1)  # take into account the 0
         self.assertAlmostEqual(int(self.Person.objects.average('age')), avg)
+        self.assertAlmostEqual(
+            int(self.Person.objects.aggregate_average('age')), avg
+        )
 
         self.Person(name='ageless person').save()
         self.assertEqual(int(self.Person.objects.average('age')), avg)
+        self.assertEqual(
+            int(self.Person.objects.aggregate_average('age')), avg
+        )
 
         # dot notation
         self.Person(
             name='person meta', person_meta=self.PersonMeta(weight=0)).save()
         self.assertAlmostEqual(
             int(self.Person.objects.average('person_meta.weight')), 0)
+        self.assertAlmostEqual(
+            int(self.Person.objects.aggregate_average('person_meta.weight')),
+            0
+        )
 
         for i, weight in enumerate(ages):
             self.Person(
                 name='test meta%i', person_meta=self.PersonMeta(weight=weight)).save()
 
         self.assertAlmostEqual(
-            int(self.Person.objects.average('person_meta.weight')), avg)
+            int(self.Person.objects.average('person_meta.weight')), avg
+        )
+        self.assertAlmostEqual(
+            int(self.Person.objects.aggregate_average('person_meta.weight')),
+            avg
+        )
 
         self.Person(name='test meta none').save()
         self.assertEqual(
-            int(self.Person.objects.average('person_meta.weight')), avg)
+            int(self.Person.objects.average('person_meta.weight')), avg
+        )
+        self.assertEqual(
+            int(self.Person.objects.aggregate_average('person_meta.weight')),
+            avg
+        )
+
+        # test summing over a filtered queryset
+        over_50 = [a for a in ages if a >= 50]
+        avg = float(sum(over_50)) / len(over_50)
+        self.assertEqual(
+            self.Person.objects.filter(age__gte=50).average('age'),
+            avg
+        )
+        self.assertEqual(
+            self.Person.objects.filter(age__gte=50).aggregate_average('age'),
+            avg
+        )
 
     def test_sum(self):
         """Ensure that field can be summed over correctly.
@@ -2734,20 +2766,44 @@ def test_sum(self):
         for i, age in enumerate(ages):
             self.Person(name='test%s' % i, age=age).save()
 
-        self.assertEqual(int(self.Person.objects.sum('age')), sum(ages))
+        self.assertEqual(self.Person.objects.sum('age'), sum(ages))
+        self.assertEqual(
+            self.Person.objects.aggregate_sum('age'), sum(ages)
+        )
 
         self.Person(name='ageless person').save()
-        self.assertEqual(int(self.Person.objects.sum('age')), sum(ages))
+        self.assertEqual(self.Person.objects.sum('age'), sum(ages))
+        self.assertEqual(
+            self.Person.objects.aggregate_sum('age'), sum(ages)
+        )
 
         for i, age in enumerate(ages):
             self.Person(name='test meta%s' %
                         i, person_meta=self.PersonMeta(weight=age)).save()
 
         self.assertEqual(
-            int(self.Person.objects.sum('person_meta.weight')), sum(ages))
+            self.Person.objects.sum('person_meta.weight'), sum(ages)
+        )
+        self.assertEqual(
+            self.Person.objects.aggregate_sum('person_meta.weight'),
+            sum(ages)
+        )
 
         self.Person(name='weightless person').save()
-        self.assertEqual(int(self.Person.objects.sum('age')), sum(ages))
+        self.assertEqual(self.Person.objects.sum('age'), sum(ages))
+        self.assertEqual(
+            self.Person.objects.aggregate_sum('age'), sum(ages)
+        )
+
+        # test summing over a filtered queryset
+        self.assertEqual(
+            self.Person.objects.filter(age__gte=50).sum('age'),
+            sum([a for a in ages if a >= 50])
+        )
+        self.assertEqual(
+            self.Person.objects.filter(age__gte=50).aggregate_sum('age'),
+            sum([a for a in ages if a >= 50])
+        )
 
     def test_embedded_average(self):
         class Pay(EmbeddedDocument):

From 12337802657d7e6d03a1fd19e7f412d54b3ef05d Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 8 Jun 2015 13:46:19 -0700
Subject: [PATCH 0207/1519] make aggregate_sum/average compatible with pymongo
 3.x

---
 mongoengine/queryset/base.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 38389fbf2..b949e1219 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1261,8 +1261,13 @@ def aggregate_sum(self, field):
             { '$match': self._query },
             { '$group': { '_id': 'sum', 'total': { '$sum': '$' + field } } }
         ])
-        if result['result']:
-            return result['result'][0]['total']
+        if IS_PYMONGO_3:
+            result = list(result)
+            if result:
+                return result[0]['total']
+        else:
+            if result['result']:
+                return result['result'][0]['total']
         return 0
 
     def average(self, field):
@@ -1333,8 +1338,13 @@ def aggregate_average(self, field):
             { '$match': self._query },
             { '$group': { '_id': 'avg', 'total': { '$avg': '$' + field } } }
         ])
-        if result['result']:
-            return result['result'][0]['total']
+        if IS_PYMONGO_3:
+            result = list(result)
+            if result:
+                return result[0]['total']
+        else:
+            if result['result']:
+                return result['result'][0]['total']
         return 0
 
     def item_frequencies(self, field, normalize=False, map_reduce=True):

From b7ef82cb67d11787f7b305028690c542ad048301 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 17 Jun 2015 17:05:10 -0700
Subject: [PATCH 0208/1519] style tweaks + changelog entry

---
 docs/changelog.rst           |  1 +
 mongoengine/queryset/base.py | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 48e8b9aac..b9ad5b0e9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,6 +25,7 @@ Changes in 0.9.X - DEV
 - Updated URL and Email Field regex validators, added schemes argument to URLField validation. #652
 - Removed get_or_create() deprecated since 0.8.0. #300
 - Capped collection multiple of 256. #1011
+- Added `BaseQuerySet.aggregate_sum` and `BaseQuerySet.aggregate_average` methods.
 
 Changes in 0.9.0
 ================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index b949e1219..c3abd46a8 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1263,11 +1263,10 @@ def aggregate_sum(self, field):
         ])
         if IS_PYMONGO_3:
             result = list(result)
-            if result:
-                return result[0]['total']
         else:
-            if result['result']:
-                return result['result'][0]['total']
+            result = result.get('result')
+        if result:
+            return result[0]['total']
         return 0
 
     def average(self, field):
@@ -1340,11 +1339,10 @@ def aggregate_average(self, field):
         ])
         if IS_PYMONGO_3:
             result = list(result)
-            if result:
-                return result[0]['total']
         else:
-            if result['result']:
-                return result['result'][0]['total']
+            result = result.get('result')
+        if result:
+            return result[0]['total']
         return 0
 
     def item_frequencies(self, field, normalize=False, map_reduce=True):

From dfc7f35ef1717049a2d26d1bf5a9754f016ae4de Mon Sep 17 00:00:00 2001
From: "Breeze.kay" <dev@kbonez.net>
Date: Fri, 19 Jun 2015 15:40:05 +0800
Subject: [PATCH 0209/1519] add testcase and changelog for pull:#1020 'improve
 _created status when switch collection and db'

---
 AUTHORS                 |  2 ++
 docs/changelog.rst      |  1 +
 mongoengine/document.py |  8 +++++
 tests/test_signals.py   | 73 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index f64093d81..42082278a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -224,3 +224,5 @@ that much better:
  * Matthieu Rigal (https://github.com/MRigal)
  * Charanpal Dhanjal (https://github.com/charanpald)
  * Emmanuel Leblond (https://github.com/touilleMan)
+ * Breeze.Kay (https://github.com/9nix00)
+
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b9ad5b0e9..76e682546 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
+- improve Document._created status when switch collection and db #1020
 - Queryset update doesn't go through field validation #453
 - Added support for specifying authentication source as option `authSource` in URI. #967
 - Fixed mark_as_changed to handle higher/lower level fields changed. #927
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 654d7a4ca..dec721149 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -503,6 +503,10 @@ def switch_db(self, db_alias, keep_created=True):
 
         :param str db_alias: The database alias to use for saving the document
 
+        :param bool keep_created: keep self._created value after call `swith_db()` when True,
+                    else will always set self._created value to True
+
+
         .. seealso::
             Use :class:`~mongoengine.context_managers.switch_collection`
             if you need to read from another collection
@@ -531,6 +535,10 @@ def switch_collection(self, collection_name, keep_created=True):
         :param str collection_name: The database alias to use for saving the
             document
 
+        :param bool keep_created: keep self._created value after call `swith_db()` when True,
+                    else will always set self._created value to True
+
+
         .. seealso::
             Use :class:`~mongoengine.context_managers.switch_db`
             if you need to read from another database
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 6ab061d1d..8165e255f 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -279,5 +279,78 @@ def test_signals_with_explicit_doc_ids(self):
         # second time, it must be an update
         self.assertEqual(self.get_signal_output(ei.save), ['Is updated'])
 
+    def test_signals_with_switch_collection(self):
+        ei = self.ExplicitId(id=123)
+        ei.switch_collection("explicit__1")
+        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        ei.switch_collection("explicit__1")
+        self.assertEqual(self.get_signal_output(ei.save), ['Is updated'])
+
+        ei.switch_collection("explicit__1", keep_created=False)
+        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        ei.switch_collection("explicit__1", keep_created=False)
+        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+
+    def test_signals_with_switch_db(self):
+        connect('mongoenginetest')
+        register_connection('testdb-1', 'mongoenginetest2')
+
+        ei = self.ExplicitId(id=123)
+        ei.switch_db("testdb-1")
+        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        ei.switch_db("testdb-1")
+        self.assertEqual(self.get_signal_output(ei.save), ['Is updated'])
+
+        ei.switch_db("testdb-1", keep_created=False)
+        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        ei.switch_db("testdb-1", keep_created=False)
+        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+
+    def test_signals_with_switch_sharding_db(self):
+
+        import pymongo
+        from mongoengine.connection import get_connection
+
+        connect('mongoenginetest', alias='testdb1')
+        expected_connection = get_connection('testdb1')
+
+        connect('mongoenginetest', alias='testdb2')
+        actual_connection = get_connection('testdb2')
+
+        if pymongo.version_tuple[0] < 3:
+            IS_PYMONGO_3 = False
+        else:
+            IS_PYMONGO_3 = True
+
+        ei = self.ExplicitId(id=123)
+        ei.switch_db("testdb1")
+        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        ei.switch_db("testdb1")
+        self.assertEqual(self.get_signal_output(ei.save), ['Is updated'])
+
+        ei.switch_db("testdb2", keep_created=False)
+        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        ei.switch_db("testdb2", keep_created=False)
+        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+
+        # Handle PyMongo 3+ Async Connection
+        if IS_PYMONGO_3:
+            # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
+            # Purposely not catching exception to fail test if thrown.
+            expected_connection.server_info()
+
+        self.assertEqual(expected_connection, actual_connection)
+
+
+
+
+
+
+
+
+
+
+
+
 if __name__ == '__main__':
     unittest.main()

From 41bff0b2932c45f9e5d0343a2c1328d7a0f1cea4 Mon Sep 17 00:00:00 2001
From: "Breeze.kay" <dev@kbonez.net>
Date: Sun, 21 Jun 2015 09:32:31 +0800
Subject: [PATCH 0210/1519] remove
 testcase:test_signals_with_switch_sharding_db() and fix code style error for
 pull#1020

---
 docs/changelog.rst      |  2 +-
 mongoengine/document.py |  6 ++----
 tests/test_signals.py   | 45 -----------------------------------------
 3 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 76e682546..55ff77542 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,7 @@ Changelog
 
 Changes in 0.9.X - DEV
 ======================
-- improve Document._created status when switch collection and db #1020
+- Improve Document._created status when switch collection and db #1020
 - Queryset update doesn't go through field validation #453
 - Added support for specifying authentication source as option `authSource` in URI. #967
 - Fixed mark_as_changed to handle higher/lower level fields changed. #927
diff --git a/mongoengine/document.py b/mongoengine/document.py
index dec721149..0ceedfc19 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -503,8 +503,7 @@ def switch_db(self, db_alias, keep_created=True):
 
         :param str db_alias: The database alias to use for saving the document
 
-        :param bool keep_created: keep self._created value after call `swith_db()` when True,
-                    else will always set self._created value to True
+        :param bool keep_created: keep self._created value after switching db, else is reset to True
 
 
         .. seealso::
@@ -535,8 +534,7 @@ def switch_collection(self, collection_name, keep_created=True):
         :param str collection_name: The database alias to use for saving the
             document
 
-        :param bool keep_created: keep self._created value after call `swith_db()` when True,
-                    else will always set self._created value to True
+        :param bool keep_created: keep self._created value after switching collection, else is reset to True
 
 
         .. seealso::
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 8165e255f..8672925c9 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -306,51 +306,6 @@ def test_signals_with_switch_db(self):
         ei.switch_db("testdb-1", keep_created=False)
         self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
 
-    def test_signals_with_switch_sharding_db(self):
-
-        import pymongo
-        from mongoengine.connection import get_connection
-
-        connect('mongoenginetest', alias='testdb1')
-        expected_connection = get_connection('testdb1')
-
-        connect('mongoenginetest', alias='testdb2')
-        actual_connection = get_connection('testdb2')
-
-        if pymongo.version_tuple[0] < 3:
-            IS_PYMONGO_3 = False
-        else:
-            IS_PYMONGO_3 = True
-
-        ei = self.ExplicitId(id=123)
-        ei.switch_db("testdb1")
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
-        ei.switch_db("testdb1")
-        self.assertEqual(self.get_signal_output(ei.save), ['Is updated'])
-
-        ei.switch_db("testdb2", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
-        ei.switch_db("testdb2", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
-
-        # Handle PyMongo 3+ Async Connection
-        if IS_PYMONGO_3:
-            # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
-            # Purposely not catching exception to fail test if thrown.
-            expected_connection.server_info()
-
-        self.assertEqual(expected_connection, actual_connection)
-
-
-
-
-
-
-
-
-
-
-
 
 if __name__ == '__main__':
     unittest.main()

From bcc4d4e8c6820045b2fc7e58f747da78ae4dd5fd Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Sun, 21 Jun 2015 03:40:45 +0200
Subject: [PATCH 0211/1519] Added test and fix for delete with write_concern
 w:0

---
 docs/changelog.rst           | 1 +
 mongoengine/queryset/base.py | 3 ++-
 tests/queryset/queryset.py   | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b9ad5b0e9..f9f68f502 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -26,6 +26,7 @@ Changes in 0.9.X - DEV
 - Removed get_or_create() deprecated since 0.8.0. #300
 - Capped collection multiple of 256. #1011
 - Added `BaseQuerySet.aggregate_sum` and `BaseQuerySet.aggregate_average` methods.
+- Fix for delete with write_concern {'w': 0}. #1008
 
 Changes in 0.9.0
 ================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c3abd46a8..99d960444 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -418,7 +418,8 @@ def delete(self, write_concern=None, _from_doc_delete=False):
                     **{'pull_all__%s' % field_name: self})
 
         result = queryset._collection.remove(queryset._query, **write_concern)
-        return result["n"]
+        if result:
+            return result.get("n")
 
     def update(self, upsert=False, multi=True, write_concern=None,
                full_result=False, **update):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index d43486788..7b0902381 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1634,6 +1634,11 @@ class BlogPost(Document):
         self.Person.objects()[:1].delete()
         self.assertEqual(1, BlogPost.objects.count())
 
+    def test_limit_with_write_concern_0(self):
+
+        p1 = self.Person(name="User Z", age=20).save()
+        p1.delete(w=0)
+
     def test_reference_field_find(self):
         """Ensure cascading deletion of referring documents from the database.
         """

From d0b749a43c856b4103f0dea0974b30e74b459f76 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Sun, 21 Jun 2015 13:02:59 +0200
Subject: [PATCH 0212/1519] Made test explicit with an assert

---
 tests/queryset/queryset.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 7b0902381..aaa14ca0d 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1637,7 +1637,8 @@ class BlogPost(Document):
     def test_limit_with_write_concern_0(self):
 
         p1 = self.Person(name="User Z", age=20).save()
-        p1.delete(w=0)
+        del_result = p1.delete(w=0)
+        self.assertEqual(None, del_result)
 
     def test_reference_field_find(self):
         """Ensure cascading deletion of referring documents from the database.

From 49c0c9f44ca0fb01ed14a3ff390f6666b9303385 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Sun, 21 Jun 2015 01:37:25 +0200
Subject: [PATCH 0213/1519] Simplified lookup-field method, allowing dynamic
 lookup for more than two parts

---
 mongoengine/base/document.py | 20 ++++++--------------
 tests/document/dynamic.py    |  9 +++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 1049eabdc..73939fa99 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -935,6 +935,7 @@ def _lookup_field(cls, parts):
         """
 
         ListField = _import_class("ListField")
+        DynamicField = _import_class('DynamicField')
 
         if not isinstance(parts, (list, tuple)):
             parts = [parts]
@@ -944,7 +945,6 @@ def _lookup_field(cls, parts):
         for field_name in parts:
             # Handle ListField indexing:
             if field_name.isdigit() and isinstance(field, ListField):
-                new_field = field.field
                 fields.append(field_name)
                 continue
 
@@ -956,11 +956,9 @@ def _lookup_field(cls, parts):
                 if field_name in cls._fields:
                     field = cls._fields[field_name]
                 elif cls._dynamic:
-                    DynamicField = _import_class('DynamicField')
                     field = DynamicField(db_field=field_name)
                 elif cls._meta.get("allow_inheritance", False) or cls._meta.get("abstract", False):
                     # 744: in case the field is defined in a subclass
-                    field = None
                     for subcls in cls.__subclasses__():
                         try:
                             field = subcls._lookup_field([field_name])[0]
@@ -982,6 +980,9 @@ def _lookup_field(cls, parts):
                                       '__'.join(parts))
                 if hasattr(getattr(field, 'field', None), 'lookup_member'):
                     new_field = field.field.lookup_member(field_name)
+                elif cls._dynamic and (isinstance(field, DynamicField) or
+                                           getattr(getattr(field, 'document_type'), '_dynamic')):
+                    new_field = DynamicField(db_field=field_name)
                 else:
                     # Look up subfield on the previous field or raise
                     try:
@@ -991,17 +992,8 @@ def _lookup_field(cls, parts):
                                           'on the field {}'.format(
                                               field_name, field.name))
                 if not new_field and isinstance(field, ComplexBaseField):
-                    if hasattr(field.field, 'document_type') and cls._dynamic \
-                            and field.field.document_type._dynamic:
-                        DynamicField = _import_class('DynamicField')
-                        new_field = DynamicField(db_field=field_name)
-                    else:
-                        fields.append(field_name)
-                        continue
-                elif not new_field and hasattr(field, 'document_type') and cls._dynamic \
-                        and field.document_type._dynamic:
-                    DynamicField = _import_class('DynamicField')
-                    new_field = DynamicField(db_field=field_name)
+                    fields.append(field_name)
+                    continue
                 elif not new_field:
                     raise LookUpError('Cannot resolve field "%s"'
                                       % field_name)
diff --git a/tests/document/dynamic.py b/tests/document/dynamic.py
index 52136efca..b2947df46 100644
--- a/tests/document/dynamic.py
+++ b/tests/document/dynamic.py
@@ -129,6 +129,15 @@ def test_complex_data_lookups(self):
 
         self.assertEqual(1, self.Person.objects(misc__hello='world').count())
 
+    def test_three_level_complex_data_lookups(self):
+        """Ensure you can query three level document dynamic fields"""
+        p = self.Person()
+        p.misc = {'hello': {'hello2': 'world'}}
+        p.save()
+        # from pprint import pprint as pp; import pdb; pdb.set_trace();
+        print self.Person.objects(misc__hello__hello2='world')
+        self.assertEqual(1, self.Person.objects(misc__hello__hello2='world').count())
+
     def test_complex_embedded_document_validation(self):
         """Ensure embedded dynamic documents may be validated"""
         class Embedded(DynamicEmbeddedDocument):

From 45dc379d9a3a7e4600d30435b91fb6dcab9b2af3 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Sun, 21 Jun 2015 01:39:10 +0200
Subject: [PATCH 0214/1519] Added to changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6bff946dc..0dcd1e081 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -28,6 +28,7 @@ Changes in 0.9.X - DEV
 - Capped collection multiple of 256. #1011
 - Added `BaseQuerySet.aggregate_sum` and `BaseQuerySet.aggregate_average` methods.
 - Fix for delete with write_concern {'w': 0}. #1008
+- Allow dynamic lookup for more than two parts. #882
 
 Changes in 0.9.0
 ================

From 576629f825587029059f831957142c63df525f9d Mon Sep 17 00:00:00 2001
From: lihorne <lihorne@uwaterloo.ca>
Date: Wed, 28 Jan 2015 08:09:23 -0500
Subject: [PATCH 0215/1519] Added support for $minDistance query

---
 mongoengine/queryset/transform.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index f6cfa87e5..3171681b1 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -15,7 +15,7 @@
                         'all', 'size', 'exists', 'not', 'elemMatch', 'type')
 GEO_OPERATORS = ('within_distance', 'within_spherical_distance',
                  'within_box', 'within_polygon', 'near', 'near_sphere',
-                 'max_distance', 'geo_within', 'geo_within_box',
+                 'max_distance', 'min_distance', 'geo_within', 'geo_within_box',
                  'geo_within_polygon', 'geo_within_center',
                  'geo_within_sphere', 'geo_intersects')
 STRING_OPERATORS = ('contains', 'icontains', 'startswith',
@@ -128,21 +128,29 @@ def query(_doc_cls=None, _field_operation=False, **query):
                 mongo_query[key].update(value)
                 # $maxDistance needs to come last - convert to SON
                 value_dict = mongo_query[key]
-                if '$maxDistance' in value_dict and '$near' in value_dict:
+                if ('$maxDistance' in value_dict and '$near' in value_dict):
                     value_son = SON()
                     if isinstance(value_dict['$near'], dict):
                         for k, v in value_dict.iteritems():
-                            if k == '$maxDistance':
+                            if k == '$maxDistance' or k == '$minDistance':
                                 continue
                             value_son[k] = v
-                        value_son['$near'] = SON(value_son['$near'])
-                        value_son['$near']['$maxDistance'] = value_dict['$maxDistance']
+                        if (get_connection().max_wire_version <= 1):
+                            value_son['$maxDistance'] = value_dict[
+                                '$maxDistance']
+                        else:
+                            value_son['$near'] = SON(value_son['$near'])
+                            value_son['$near'][
+                                '$maxDistance'] = value_dict['$maxDistance']
                     else:
                         for k, v in value_dict.iteritems():
-                            if k == '$maxDistance':
+                            if k == '$maxDistance' or k == '$minDistance':
                                 continue
                             value_son[k] = v
-                        value_son['$maxDistance'] = value_dict['$maxDistance']
+                            if '$maxDistance' in value_dict:
+                                value_son['$maxDistance'] = value_dict['$maxDistance']
+                            if '$minDistance' in value_dict:
+                                value_son['$minDistance'] = value_dict['$minDistance']
 
                     mongo_query[key] = value_son
             else:
@@ -312,6 +320,8 @@ def _geo_operator(field, op, value):
             value = {'$within': {'$box': value}}
         elif op == "max_distance":
             value = {'$maxDistance': value}
+        elif op == "min_distance":
+            value = {'$minDistance': value}
         else:
             raise NotImplementedError("Geo method '%s' has not "
                                       "been implemented for a GeoPointField" % op)
@@ -332,6 +342,8 @@ def _geo_operator(field, op, value):
             value = {'$near': _infer_geometry(value)}
         elif op == "max_distance":
             value = {'$maxDistance': value}
+        elif op == "min_distance":
+            value = {'$minDistance': value}
         else:
             raise NotImplementedError("Geo method '%s' has not "
                                       "been implemented for a %s " % (op, field._name))

From 2d57dc056533c75fdd988698bea14db1de3c17e1 Mon Sep 17 00:00:00 2001
From: Liam Horne <lihorne@uwaterloo.ca>
Date: Wed, 28 Jan 2015 08:16:31 -0500
Subject: [PATCH 0216/1519] Fixed an indentation mistake

---
 mongoengine/queryset/transform.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 3171681b1..637e1b4bb 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -147,10 +147,10 @@ def query(_doc_cls=None, _field_operation=False, **query):
                             if k == '$maxDistance' or k == '$minDistance':
                                 continue
                             value_son[k] = v
-                            if '$maxDistance' in value_dict:
-                                value_son['$maxDistance'] = value_dict['$maxDistance']
-                            if '$minDistance' in value_dict:
-                                value_son['$minDistance'] = value_dict['$minDistance']
+                        if '$maxDistance' in value_dict:
+                            value_son['$maxDistance'] = value_dict['$maxDistance']
+                        if '$minDistance' in value_dict:
+                            value_son['$minDistance'] = value_dict['$minDistance']
 
                     mongo_query[key] = value_son
             else:

From 5efabdcea39922c1723d7978c35bc603975c3f8d Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Sun, 21 Jun 2015 03:03:50 +0200
Subject: [PATCH 0217/1519] Added tests, documentation and simplified code

---
 docs/changelog.rst                |  1 +
 docs/guide/querying.rst           |  6 ++--
 mongoengine/queryset/transform.py | 50 +++++++++++++------------------
 tests/queryset/geo.py             | 31 ++++++++++++++++++-
 tests/queryset/queryset.py        | 14 +++++++++
 5 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0dcd1e081..ac6837503 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -29,6 +29,7 @@ Changes in 0.9.X - DEV
 - Added `BaseQuerySet.aggregate_sum` and `BaseQuerySet.aggregate_average` methods.
 - Fix for delete with write_concern {'w': 0}. #1008
 - Allow dynamic lookup for more than two parts. #882
+- Added support for min_distance on geo queries. #831
 
 Changes in 0.9.0
 ================
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 1cde82cb7..688fc9e95 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -146,9 +146,10 @@ The following were added in MongoEngine 0.8 for
         loc.objects(point__near=[40, 5])
         loc.objects(point__near={"type": "Point", "coordinates": [40, 5]})
 
-  You can also set the maximum distance in meters as well::
+  You can also set the maximum and/or the minimum distance in meters as well::
 
         loc.objects(point__near=[40, 5], point__max_distance=1000)
+        loc.objects(point__near=[40, 5], point__min_distance=100)
 
 The older 2D indexes are still supported with the
 :class:`~mongoengine.fields.GeoPointField`:
@@ -168,7 +169,8 @@ The older 2D indexes are still supported with the
 
 * ``max_distance`` -- can be added to your location queries to set a maximum
   distance.
-
+* ``min_distance`` -- can be added to your location queries to set a minimum
+  distance.
 
 Querying lists
 --------------
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 637e1b4bb..919157030 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -6,7 +6,7 @@
 from mongoengine.base.fields import UPDATE_OPERATORS
 from mongoengine.connection import get_connection
 from mongoengine.common import _import_class
-from mongoengine.errors import InvalidQueryError
+from mongoengine.errors import InvalidQueryError, LookUpError
 
 __all__ = ('query', 'update')
 
@@ -44,8 +44,8 @@ def query(_doc_cls=None, _field_operation=False, **query):
         if len(parts) > 1 and parts[-1] in MATCH_OPERATORS:
             op = parts.pop()
 
-        # if user escape field name by __
-        if len(parts) > 1 and parts[-1] == "":
+        #if user escape field name by __
+        if len(parts) > 1 and parts[-1]=="":
             parts.pop()
 
         negate = False
@@ -126,32 +126,28 @@ def query(_doc_cls=None, _field_operation=False, **query):
         elif key in mongo_query:
             if key in mongo_query and isinstance(mongo_query[key], dict):
                 mongo_query[key].update(value)
-                # $maxDistance needs to come last - convert to SON
+                # $max/minDistance needs to come last - convert to SON
                 value_dict = mongo_query[key]
-                if ('$maxDistance' in value_dict and '$near' in value_dict):
+                if ('$maxDistance' in value_dict or '$minDistance' in value_dict) and '$near' in value_dict:
                     value_son = SON()
-                    if isinstance(value_dict['$near'], dict):
-                        for k, v in value_dict.iteritems():
-                            if k == '$maxDistance' or k == '$minDistance':
-                                continue
-                            value_son[k] = v
-                        if (get_connection().max_wire_version <= 1):
-                            value_son['$maxDistance'] = value_dict[
-                                '$maxDistance']
-                        else:
-                            value_son['$near'] = SON(value_son['$near'])
+                    for k, v in value_dict.iteritems():
+                        if k == '$maxDistance' or k == '$minDistance':
+                            continue
+                        value_son[k] = v
+                    if isinstance(value_dict['$near'], dict) and\
+                        get_connection().max_wire_version > 1:
+                        value_son['$near'] = SON(value_son['$near'])
+                        if '$maxDistance' in value_dict:
                             value_son['$near'][
                                 '$maxDistance'] = value_dict['$maxDistance']
+                        if '$minDistance' in value_dict:
+                            value_son['$near'][
+                                '$minDistance'] = value_dict['$minDistance']
                     else:
-                        for k, v in value_dict.iteritems():
-                            if k == '$maxDistance' or k == '$minDistance':
-                                continue
-                            value_son[k] = v
                         if '$maxDistance' in value_dict:
                             value_son['$maxDistance'] = value_dict['$maxDistance']
                         if '$minDistance' in value_dict:
                             value_son['$minDistance'] = value_dict['$minDistance']
-
                     mongo_query[key] = value_son
             else:
                 # Store for manually merging later
@@ -305,7 +301,11 @@ def update(_doc_cls=None, **update):
 
 def _geo_operator(field, op, value):
     """Helper to return the query for a given geo query"""
-    if field._geo_index == pymongo.GEO2D:
+    if op == "max_distance":
+        value = {'$maxDistance': value}
+    elif op == "min_distance":
+        value = {'$minDistance': value}
+    elif field._geo_index == pymongo.GEO2D:
         if op == "within_distance":
             value = {'$within': {'$center': value}}
         elif op == "within_spherical_distance":
@@ -318,10 +318,6 @@ def _geo_operator(field, op, value):
             value = {'$nearSphere': value}
         elif op == 'within_box':
             value = {'$within': {'$box': value}}
-        elif op == "max_distance":
-            value = {'$maxDistance': value}
-        elif op == "min_distance":
-            value = {'$minDistance': value}
         else:
             raise NotImplementedError("Geo method '%s' has not "
                                       "been implemented for a GeoPointField" % op)
@@ -340,10 +336,6 @@ def _geo_operator(field, op, value):
             value = {"$geoIntersects": _infer_geometry(value)}
         elif op == "near":
             value = {'$near': _infer_geometry(value)}
-        elif op == "max_distance":
-            value = {'$maxDistance': value}
-        elif op == "min_distance":
-            value = {'$minDistance': value}
         else:
             raise NotImplementedError("Geo method '%s' has not "
                                       "been implemented for a %s " % (op, field._name))
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 12e96a043..889dac38d 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -70,6 +70,11 @@ def __unicode__(self):
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0], event2)
 
+        # find events at least 10 degrees away of san francisco
+        point = [-122.415579, 37.7566023]
+        events = Event.objects(location__near=point, location__min_distance=10)
+        self.assertEqual(events.count(), 2)
+
         # find events within 10 degrees of san francisco
         point_and_distance = [[-122.415579, 37.7566023], 10]
         events = Event.objects(location__within_distance=point_and_distance)
@@ -171,7 +176,7 @@ class Point(Document):
 
         # Same behavior for _within_spherical_distance
         points = Point.objects(
-            location__within_spherical_distance=[[-122, 37.5], 60/earth_radius]
+            location__within_spherical_distance=[[-122, 37.5], 60 / earth_radius]
         )
         self.assertEqual(points.count(), 2)
 
@@ -186,6 +191,16 @@ class Point(Document):
 
         self.assertEqual(points.count(), 2)
 
+        # Test query works with max_distance being farer from one point
+        points = Point.objects(location__near_sphere=[-122, 37.8],
+                               location__min_distance=60 / earth_radius)
+        self.assertEqual(points.count(), 1)
+
+        # Test query works with min_distance being farer from one point
+        points = Point.objects(location__near_sphere=[-122, 37.8],
+                               location__min_distance=60 / earth_radius)
+        self.assertEqual(points.count(), 1)
+
         # Finds both points, but orders the north point first because it's
         # closer to the reference point to the north.
         points = Point.objects(location__near_sphere=[-122, 38.5])
@@ -268,6 +283,20 @@ def __unicode__(self):
         self.assertEqual(events.count(), 2)
         self.assertEqual(events[0], event3)
 
+        # ensure min_distance and max_distance combine well
+        events = Event.objects(location__near=[-87.67892, 41.9120459],
+                               location__min_distance=1000,
+                               location__max_distance=10000).order_by("-date")
+        self.assertEqual(events.count(), 1)
+        self.assertEqual(events[0], event3)
+
+        # ensure ordering is respected by "near"
+        events = Event.objects(location__near=[-87.67892, 41.9120459],
+                               # location__min_distance=10000
+                               location__min_distance=10000).order_by("-date")
+        self.assertEqual(events.count(), 1)
+        self.assertEqual(events[0], event2)
+
         # check that within_box works
         box = [(-125.0, 35.0), (-100.0, 40.0)]
         events = Event.objects(location__geo_within_box=box)
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index aaa14ca0d..4f00e1c6a 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4763,5 +4763,19 @@ class Person(Document):
         for p in Person.objects():
             self.assertEqual(p.name, 'a')
 
+    def test_last_field_name_like_operator(self):
+        class EmbeddedItem(EmbeddedDocument):
+            type = StringField()
+
+        class Doc(Document):
+            item = EmbeddedDocumentField(EmbeddedItem)
+
+        Doc.drop_collection()
+
+        doc = Doc(item=EmbeddedItem(type="axe"))
+        doc.save()
+
+        self.assertEqual(1, Doc.objects(item__type__="axe").count())
+
 if __name__ == '__main__':
     unittest.main()

From d96fcdb35cfcf083997c07a8f92afa022abf95df Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Sun, 21 Jun 2015 03:24:05 +0200
Subject: [PATCH 0218/1519] Fixed problem of ordering when using near_sphere
 operator

---
 mongoengine/queryset/transform.py | 3 ++-
 tests/queryset/geo.py             | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 919157030..7ede82129 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -128,7 +128,8 @@ def query(_doc_cls=None, _field_operation=False, **query):
                 mongo_query[key].update(value)
                 # $max/minDistance needs to come last - convert to SON
                 value_dict = mongo_query[key]
-                if ('$maxDistance' in value_dict or '$minDistance' in value_dict) and '$near' in value_dict:
+                if ('$maxDistance' in value_dict or '$minDistance' in value_dict) and \
+                        ('$near' in value_dict or '$nearSphere' in value_dict):
                     value_son = SON()
                     for k, v in value_dict.iteritems():
                         if k == '$maxDistance' or k == '$minDistance':
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 889dac38d..4a8001148 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -182,13 +182,6 @@ class Point(Document):
 
         points = Point.objects(location__near_sphere=[-122, 37.5],
                                location__max_distance=60 / earth_radius)
-        # This test is sometimes failing with Mongo internals non-sense.
-        # See https://travis-ci.org/MongoEngine/mongoengine/builds/58729101
-        try:
-            points.count()
-        except OperationFailure:
-            raise SkipTest("Sometimes MongoDB ignores its capacities on maxDistance")
-
         self.assertEqual(points.count(), 2)
 
         # Test query works with max_distance being farer from one point

From 95165aa92f817f23b287925b02a1756a94085208 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Sun, 21 Jun 2015 13:29:54 +0200
Subject: [PATCH 0219/1519] Logic and test adaptations for MongoDB < 3

---
 mongoengine/queryset/transform.py | 24 ++++++++++++++----------
 tests/queryset/geo.py             |  7 ++++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 7ede82129..dc1c2f585 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -135,16 +135,20 @@ def query(_doc_cls=None, _field_operation=False, **query):
                         if k == '$maxDistance' or k == '$minDistance':
                             continue
                         value_son[k] = v
-                    if isinstance(value_dict['$near'], dict) and\
-                        get_connection().max_wire_version > 1:
-                        value_son['$near'] = SON(value_son['$near'])
-                        if '$maxDistance' in value_dict:
-                            value_son['$near'][
-                                '$maxDistance'] = value_dict['$maxDistance']
-                        if '$minDistance' in value_dict:
-                            value_son['$near'][
-                                '$minDistance'] = value_dict['$minDistance']
-                    else:
+                    # seems only required for 2.6=<MongoDB<3
+                    near_embedded = False
+                    for near_op in ('$near', '$nearSphere'):
+                        if isinstance(value_dict.get(near_op), dict) and \
+                                get_connection().max_wire_version > 1:
+                            value_son[near_op] = SON(value_son[near_op])
+                            if '$maxDistance' in value_dict:
+                                value_son[near_op][
+                                    '$maxDistance'] = value_dict['$maxDistance']
+                            if '$minDistance' in value_dict:
+                                value_son[near_op][
+                                    '$minDistance'] = value_dict['$minDistance']
+                            near_embedded = True
+                    if not near_embedded:
                         if '$maxDistance' in value_dict:
                             value_son['$maxDistance'] = value_dict['$maxDistance']
                         if '$minDistance' in value_dict:
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 4a8001148..2ab99dd80 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -73,7 +73,12 @@ def __unicode__(self):
         # find events at least 10 degrees away of san francisco
         point = [-122.415579, 37.7566023]
         events = Event.objects(location__near=point, location__min_distance=10)
-        self.assertEqual(events.count(), 2)
+        # The following real test passes on MongoDB 3 but minDistance seems
+        # buggy on older MongoDB versions
+        if get_connection().server_info()['versionArray'][0] > 2:
+            self.assertEqual(events.count(), 2)
+        else:
+            self.assertTrue(events.count() >= 2)
 
         # find events within 10 degrees of san francisco
         point_and_distance = [[-122.415579, 37.7566023], 10]

From 40f6df7160c5f140ca40deed04d40386e7c0db27 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Sun, 21 Jun 2015 13:41:41 +0200
Subject: [PATCH 0220/1519] Adapted one more test for MongoDB < 3

---
 mongoengine/queryset/transform.py |  2 +-
 tests/queryset/geo.py             | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index dc1c2f585..4ff387690 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -6,7 +6,7 @@
 from mongoengine.base.fields import UPDATE_OPERATORS
 from mongoengine.connection import get_connection
 from mongoengine.common import _import_class
-from mongoengine.errors import InvalidQueryError, LookUpError
+from mongoengine.errors import InvalidQueryError
 
 __all__ = ('query', 'update')
 
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 2ab99dd80..9aac44f53 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -189,15 +189,23 @@ class Point(Document):
                                location__max_distance=60 / earth_radius)
         self.assertEqual(points.count(), 2)
 
-        # Test query works with max_distance being farer from one point
+        # Test query works with max_distance, being farer from one point
         points = Point.objects(location__near_sphere=[-122, 37.8],
-                               location__min_distance=60 / earth_radius)
+                               location__max_distance=60 / earth_radius)
+        close_point = points.first()
         self.assertEqual(points.count(), 1)
 
-        # Test query works with min_distance being farer from one point
+        # Test query works with min_distance, being farer from one point
         points = Point.objects(location__near_sphere=[-122, 37.8],
                                location__min_distance=60 / earth_radius)
-        self.assertEqual(points.count(), 1)
+        # The following real test passes on MongoDB 3 but minDistance seems
+        # buggy on older MongoDB versions
+        if get_connection().server_info()['versionArray'][0] > 2:
+            self.assertEqual(points.count(), 1)
+            far_point = points.first()
+            self.assertNotEqual(close_point, far_point)
+        else:
+            self.assertTrue(points.count() >= 1)
 
         # Finds both points, but orders the north point first because it's
         # closer to the reference point to the north.

From 9063b559c4683ff2607cf929b40e46d4f85205c6 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Mon, 22 Jun 2015 16:40:50 +0200
Subject: [PATCH 0221/1519] Fix for PyMongo3+

---
 mongoengine/queryset/transform.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 4ff387690..e7f5988cd 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -7,6 +7,7 @@
 from mongoengine.connection import get_connection
 from mongoengine.common import _import_class
 from mongoengine.errors import InvalidQueryError
+from mongoengine.python_support import IS_PYMONGO_3
 
 __all__ = ('query', 'update')
 
@@ -135,11 +136,12 @@ def query(_doc_cls=None, _field_operation=False, **query):
                         if k == '$maxDistance' or k == '$minDistance':
                             continue
                         value_son[k] = v
-                    # seems only required for 2.6=<MongoDB<3
+                    # Required for MongoDB >= 2.6, may fail when combining
+                    # PyMongo 3+ and MongoDB < 2.6
                     near_embedded = False
                     for near_op in ('$near', '$nearSphere'):
-                        if isinstance(value_dict.get(near_op), dict) and \
-                                get_connection().max_wire_version > 1:
+                        if isinstance(value_dict.get(near_op), dict) and (
+                                IS_PYMONGO_3 or get_connection().max_wire_version > 1):
                             value_son[near_op] = SON(value_son[near_op])
                             if '$maxDistance' in value_dict:
                                 value_son[near_op][

From 5c807f3dc86264cd80b63d74974a387c473d27f7 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Mon, 22 Jun 2015 16:41:36 +0200
Subject: [PATCH 0222/1519] Various test adjustments to improve stability
 independantly of execution order

---
 tests/test_connection.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 4a02696af..e9477b79c 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -54,11 +54,10 @@ def test_connect(self):
     def test_sharing_connections(self):
         """Ensure that connections are shared when the connection settings are exactly the same
         """
-        connect('mongoenginetest', alias='testdb1')
-
+        connect('mongoenginetests', alias='testdb1')
         expected_connection = get_connection('testdb1')
 
-        connect('mongoenginetest', alias='testdb2')
+        connect('mongoenginetests', alias='testdb2')
         actual_connection = get_connection('testdb2')
 
         # Handle PyMongo 3+ Async Connection
@@ -96,8 +95,7 @@ def test_connect_uri(self):
         c.mongoenginetest.system.users.remove({})
 
     def test_connect_uri_without_db(self):
-        """Ensure that the connect() method works properly with uri's
-        without database_name
+        """Ensure connect() method works properly with uri's without database_name
         """
         c = connect(db='mongoenginetest', alias='admin')
         c.admin.system.users.remove({})
@@ -130,28 +128,27 @@ def test_connect_uri_with_authsource(self):
         # Create users
         c = connect('mongoenginetest')
         c.admin.system.users.remove({})
-        c.admin.add_user('username', 'password')
+        c.admin.add_user('username2', 'password')
 
         # Authentication fails without "authSource"
         if IS_PYMONGO_3:
-            test_conn = connect('mongoenginetest', alias='test2',
-                                host='mongodb://username:password@localhost/mongoenginetest')
+            test_conn = connect('mongoenginetest', alias='test1',
+                                host='mongodb://username2:password@localhost/mongoenginetest')
             self.assertRaises(OperationFailure, test_conn.server_info)
         else:
             self.assertRaises(
                 ConnectionError, connect, 'mongoenginetest', alias='test1',
-                host='mongodb://username:password@localhost/mongoenginetest'
+                host='mongodb://username2:password@localhost/mongoenginetest'
             )
             self.assertRaises(ConnectionError, get_db, 'test1')
 
         # Authentication succeeds with "authSource"
         test_conn2 = connect(
             'mongoenginetest', alias='test2',
-            host=('mongodb://username:password@localhost/'
+            host=('mongodb://username2:password@localhost/'
                   'mongoenginetest?authSource=admin')
         )
         # This will fail starting from MongoDB 2.6+
-        # test_conn2.server_info()
         db = get_db('test2')
         self.assertTrue(isinstance(db, pymongo.database.Database))
         self.assertEqual(db.name, 'mongoenginetest')

From 6bd9529a66181893c167a5f304fc8f86901eea36 Mon Sep 17 00:00:00 2001
From: Vicky Donchenko <vdonchen@cisco.com>
Date: Mon, 1 Jun 2015 17:57:40 +0300
Subject: [PATCH 0223/1519] Allow to add custom metadata to fields

---
 AUTHORS                    |  1 +
 docs/changelog.rst         |  3 ++-
 mongoengine/base/fields.py |  4 +++-
 tests/fields/fields.py     | 17 +++++++++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 42082278a..c776a43ce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -225,4 +225,5 @@ that much better:
  * Charanpal Dhanjal (https://github.com/charanpald)
  * Emmanuel Leblond (https://github.com/touilleMan)
  * Breeze.Kay (https://github.com/9nix00)
+ * Vicki Donchenko (https://github.com/kivistein)
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index ac6837503..3dfe82f66 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -19,7 +19,7 @@ Changes in 0.9.X - DEV
 - Fix for updating sorting in SortedListField. #978
 - Added __ support to escape field name in fields lookup keywords that match operators names #949
 - Support for PyMongo 3+ #946
-- Fix for issue where FileField deletion did not free space in GridFS. 
+- Fix for issue where FileField deletion did not free space in GridFS.
 - No_dereference() not respected on embedded docs containing reference. #517
 - Document save raise an exception if save_condition fails #1005
 - Fixes some internal _id handling issue. #961
@@ -30,6 +30,7 @@ Changes in 0.9.X - DEV
 - Fix for delete with write_concern {'w': 0}. #1008
 - Allow dynamic lookup for more than two parts. #882
 - Added support for min_distance on geo queries. #831
+- Allow to add custom metadata to fields #705
 
 Changes in 0.9.0
 ================
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 5fae26952..d1f4434e8 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -44,7 +44,7 @@ class BaseField(object):
     def __init__(self, db_field=None, name=None, required=False, default=None,
                  unique=False, unique_with=None, primary_key=False,
                  validation=None, choices=None, verbose_name=None,
-                 help_text=None, null=False, sparse=False):
+                 help_text=None, null=False, sparse=False, custom_data=None):
         """
         :param db_field: The database field to store this field in
             (defaults to the name of the field)
@@ -71,6 +71,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
             then the default value is set
         :param sparse: (optional) `sparse=True` combined with `unique=True` and `required=False`
             means that uniqueness won't be enforced for `None` values
+        :param custom_data: (optional) Custom metadata for this field.
         """
         self.db_field = (db_field or name) if not primary_key else '_id'
 
@@ -89,6 +90,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.null = null
         self.sparse = sparse
         self._owner_document = None
+        self.custom_data = custom_data
 
         # Adjust the appropriate creation counter, and save our local copy.
         if self.db_field == '_id':
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 35e3ca39a..9b682fac8 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3818,5 +3818,22 @@ def test_filtered_delete(self):
         # deleted from the database
         self.assertEqual(number, 1)
 
+    def test_custom_data(self):
+        """
+        Tests that custom data is saved in the field object
+        and doesn't interfere with the rest of field functionalities.
+        """
+        custom_data = {'a': 'a_value', 'b': [1, 2]}
+        class CustomData(Document):
+            a_field = IntField()
+            c_field = IntField(custom_data=custom_data)
+
+        a1 = CustomData(a_field=1, c_field=2).save()
+        self.assertEqual(2, a1.c_field)
+        self.assertFalse(hasattr(a1.c_field, 'custom_data'))
+        self.assertTrue(hasattr(CustomData.c_field, 'custom_data'))
+        self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
+
+
 if __name__ == '__main__':
     unittest.main()

From 778c7dc5f2e22eef420c3b99fbcfef92d675c33e Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Wed, 29 Apr 2015 18:59:27 +0200
Subject: [PATCH 0224/1519] general pep8 and more clean-up

---
 mongoengine/base/datastructures.py | 30 +++++++++++++----
 mongoengine/base/document.py       | 12 +++----
 mongoengine/base/fields.py         | 13 +++-----
 mongoengine/base/metaclasses.py    | 14 +++-----
 mongoengine/connection.py          |  3 +-
 mongoengine/dereference.py         |  7 ++--
 mongoengine/document.py            | 30 ++++++++---------
 mongoengine/errors.py              |  3 +-
 mongoengine/fields.py              | 53 +++++-------------------------
 mongoengine/python_support.py      |  1 +
 mongoengine/queryset/base.py       | 15 ++++-----
 mongoengine/queryset/field_list.py |  1 -
 mongoengine/queryset/queryset.py   |  3 +-
 mongoengine/queryset/transform.py  |  4 +--
 mongoengine/signals.py             |  2 ++
 15 files changed, 81 insertions(+), 110 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 91403de90..7ec67797d 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,5 +1,6 @@
 import weakref
 import itertools
+
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
 
@@ -20,7 +21,7 @@ def __init__(self, dict_items, instance, name):
         if isinstance(instance, (Document, EmbeddedDocument)):
             self._instance = weakref.proxy(instance)
         self._name = name
-        return super(BaseDict, self).__init__(dict_items)
+        super(BaseDict, self).__init__(dict_items)
 
     def __getitem__(self, key, *args, **kwargs):
         value = super(BaseDict, self).__getitem__(key)
@@ -65,7 +66,7 @@ def __setstate__(self, state):
 
     def clear(self, *args, **kwargs):
         self._mark_as_changed()
-        return super(BaseDict, self).clear(*args, **kwargs)
+        return super(BaseDict, self).clear()
 
     def pop(self, *args, **kwargs):
         self._mark_as_changed()
@@ -73,7 +74,7 @@ def pop(self, *args, **kwargs):
 
     def popitem(self, *args, **kwargs):
         self._mark_as_changed()
-        return super(BaseDict, self).popitem(*args, **kwargs)
+        return super(BaseDict, self).popitem()
 
     def setdefault(self, *args, **kwargs):
         self._mark_as_changed()
@@ -189,7 +190,7 @@ def remove(self, *args, **kwargs):
 
     def reverse(self, *args, **kwargs):
         self._mark_as_changed()
-        return super(BaseList, self).reverse(*args, **kwargs)
+        return super(BaseList, self).reverse()
 
     def sort(self, *args, **kwargs):
         self._mark_as_changed()
@@ -368,25 +369,31 @@ class StrictDict(object):
     __slots__ = ()
     _special_fields = set(['get', 'pop', 'iteritems', 'items', 'keys', 'create'])
     _classes = {}
+
     def __init__(self, **kwargs):
-        for k,v in kwargs.iteritems():
+        for k, v in kwargs.iteritems():
             setattr(self, k, v)
+
     def __getitem__(self, key):
         key = '_reserved_' + key if key in self._special_fields else key
         try:
             return getattr(self, key)
         except AttributeError:
             raise KeyError(key)
+
     def __setitem__(self, key, value):
         key = '_reserved_' + key if key in self._special_fields else key
         return setattr(self, key, value)
+
     def __contains__(self, key):
         return hasattr(self, key)
+
     def get(self, key, default=None):
         try:
             return self[key]
         except KeyError:
             return default
+
     def pop(self, key, default=None):
         v = self.get(key, default)
         try:
@@ -394,19 +401,26 @@ def pop(self, key, default=None):
         except AttributeError:
             pass
         return v
+
     def iteritems(self):
         for key in self:
             yield key, self[key]
+
     def items(self):
         return [(k, self[k]) for k in iter(self)]
+
     def keys(self):
         return list(iter(self))
+
     def __iter__(self):
         return (key for key in self.__slots__ if hasattr(self, key))
+
     def __len__(self):
         return len(list(self.iteritems()))
+
     def __eq__(self, other):
         return self.items() == other.items()
+
     def __neq__(self, other):
         return self.items() != other.items()
 
@@ -417,8 +431,10 @@ def create(cls, allowed_keys):
         if allowed_keys not in cls._classes:
             class SpecificStrictDict(cls):
                 __slots__ = allowed_keys_tuple
+
                 def __repr__(self):
-                    return "{%s}" % ', '.join('"{0!s}": {0!r}'.format(k,v) for (k,v) in self.iteritems())
+                    return "{%s}" % ', '.join('"{0!s}": {0!r}'.format(k, v) for (k, v) in self.iteritems())
+
             cls._classes[allowed_keys] = SpecificStrictDict
         return cls._classes[allowed_keys]
 
@@ -426,6 +442,7 @@ def __repr__(self):
 class SemiStrictDict(StrictDict):
     __slots__ = ('_extras')
     _classes = {}
+
     def __getattr__(self, attr):
         try:
             super(SemiStrictDict, self).__getattr__(attr)
@@ -434,6 +451,7 @@ def __getattr__(self, attr):
                 return self.__getattribute__('_extras')[attr]
             except KeyError as e:
                 raise AttributeError(e)
+
     def __setattr__(self, attr, value):
         try:
             super(SemiStrictDict, self).__setattr__(attr, value)
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 73939fa99..747d3970a 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -14,7 +14,6 @@
 from mongoengine.errors import (ValidationError, InvalidDocumentError,
                                 LookUpError, FieldDoesNotExist)
 from mongoengine.python_support import PY3, txt_type
-
 from mongoengine.base.common import get_document, ALLOW_INHERITANCE
 from mongoengine.base.datastructures import (
     BaseDict,
@@ -420,7 +419,7 @@ def to_json(self, *args, **kwargs):
         :param use_db_field: Set to True by default but enables the output of the json structure with the field names and not the mongodb store db_names in case of set to False
         """
         use_db_field = kwargs.pop('use_db_field', True)
-        return json_util.dumps(self.to_mongo(use_db_field),  *args, **kwargs)
+        return json_util.dumps(self.to_mongo(use_db_field), *args, **kwargs)
 
     @classmethod
     def from_json(cls, json_data, created=False):
@@ -570,7 +569,7 @@ def _get_changed_fields(self, inspected=None):
                 continue
             elif (isinstance(data, (EmbeddedDocument, DynamicEmbeddedDocument))
                   and db_field_name not in changed_fields):
-                 # Find all embedded fields that have been changed
+                # Find all embedded fields that have been changed
                 changed = data._get_changed_fields(inspected)
                 changed_fields += ["%s%s" % (key, k) for k in changed if k]
             elif (isinstance(data, (list, tuple, dict)) and
@@ -621,7 +620,7 @@ def _delta(self):
         else:
             set_data = doc
             if '_id' in set_data:
-                del(set_data['_id'])
+                del set_data['_id']
 
         # Determine if any changed items were actually unset.
         for path, value in set_data.items():
@@ -632,7 +631,7 @@ def _delta(self):
             default = None
             if (self._dynamic and len(parts) and parts[0] in
                     self._dynamic_fields):
-                del(set_data[path])
+                del set_data[path]
                 unset_data[path] = 1
                 continue
             elif path in self._fields:
@@ -666,7 +665,7 @@ def _delta(self):
             if default != value:
                 continue
 
-            del(set_data[path])
+            del set_data[path]
             unset_data[path] = 1
         return set_data, unset_data
 
@@ -821,7 +820,6 @@ def _build_index_spec(cls, spec):
             parts = key.split('.')
             if parts in (['pk'], ['id'], ['_id']):
                 key = '_id'
-                fields = []
             else:
                 fields = cls._lookup_field(parts)
                 parts = []
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index d1f4434e8..02934d47c 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -7,7 +7,6 @@
 
 from mongoengine.common import _import_class
 from mongoengine.errors import ValidationError
-
 from mongoengine.base.common import ALLOW_INHERITANCE
 from mongoengine.base.datastructures import (
     BaseDict, BaseList, EmbeddedDocumentList
@@ -23,7 +22,6 @@
 
 
 class BaseField(object):
-
     """A base class for fields in a MongoDB document. Instances of this class
     may be added to subclasses of `Document` to define a document's schema.
 
@@ -212,7 +210,6 @@ def owner_document(self, owner_document):
 
 
 class ComplexBaseField(BaseField):
-
     """Handles complex fields, such as lists / dictionaries.
 
     Allows for nesting of embedded documents inside complex types.
@@ -330,8 +327,8 @@ def to_mongo(self, value):
                 return GenericReferenceField().to_mongo(value)
             cls = value.__class__
             val = value.to_mongo()
-            # If we its a document thats not inherited add _cls
-            if (isinstance(value, EmbeddedDocument)):
+            # If it's a document that is not inherited add _cls
+            if isinstance(value, EmbeddedDocument):
                 val['_cls'] = cls.__name__
             return val
 
@@ -370,8 +367,8 @@ def to_mongo(self, value):
                 elif hasattr(v, 'to_mongo'):
                     cls = v.__class__
                     val = v.to_mongo()
-                    # If we its a document thats not inherited add _cls
-                    if (isinstance(v, (Document, EmbeddedDocument))):
+                    # If it's a document that is not inherited add _cls
+                    if isinstance(v, (Document, EmbeddedDocument)):
                         val['_cls'] = cls.__name__
                     value_dict[k] = val
                 else:
@@ -422,7 +419,6 @@ def _set_owner_document(self, owner_document):
 
 
 class ObjectIdField(BaseField):
-
     """A field wrapper around MongoDB's ObjectIds.
     """
 
@@ -454,7 +450,6 @@ def validate(self, value):
 
 
 class GeoJsonBaseField(BaseField):
-
     """A geo json field storing a geojson style object.
 
     .. versionadded:: 0.8
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index d4c26bfe7..664c849ef 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -14,7 +14,6 @@
 
 
 class DocumentMetaclass(type):
-
     """Metaclass for all documents.
     """
 
@@ -144,7 +143,7 @@ def __new__(cls, name, bases, attrs):
         for base in document_bases:
             if _cls not in base._subclasses:
                 base._subclasses += (_cls,)
-            base._types = base._subclasses   # TODO depreciate _types
+            base._types = base._subclasses  # TODO depreciate _types
 
         (Document, EmbeddedDocument, DictField,
          CachedReferenceField) = cls._import_classes()
@@ -250,7 +249,6 @@ def _import_classes(cls):
 
 
 class TopLevelDocumentMetaclass(DocumentMetaclass):
-
     """Metaclass for top-level documents (i.e. documents that have their own
     collection in the database.
     """
@@ -260,7 +258,7 @@ def __new__(cls, name, bases, attrs):
         super_new = super(TopLevelDocumentMetaclass, cls).__new__
 
         # Set default _meta data if base class, otherwise get user defined meta
-        if (attrs.get('my_metaclass') == TopLevelDocumentMetaclass):
+        if attrs.get('my_metaclass') == TopLevelDocumentMetaclass:
             # defaults
             attrs['_meta'] = {
                 'abstract': True,
@@ -279,7 +277,7 @@ def __new__(cls, name, bases, attrs):
             attrs['_meta'].update(attrs.get('meta', {}))
         else:
             attrs['_meta'] = attrs.get('meta', {})
-            # Explictly set abstract to false unless set
+            # Explicitly set abstract to false unless set
             attrs['_meta']['abstract'] = attrs['_meta'].get('abstract', False)
             attrs['_is_base_cls'] = False
 
@@ -294,7 +292,7 @@ def __new__(cls, name, bases, attrs):
 
         # Clean up top level meta
         if 'meta' in attrs:
-            del(attrs['meta'])
+            del attrs['meta']
 
         # Find the parent document class
         parent_doc_cls = [b for b in flattened_bases
@@ -307,7 +305,7 @@ def __new__(cls, name, bases, attrs):
                 and not parent_doc_cls._meta.get('abstract', True)):
             msg = "Trying to set a collection on a subclass (%s)" % name
             warnings.warn(msg, SyntaxWarning)
-            del(attrs['_meta']['collection'])
+            del attrs['_meta']['collection']
 
         # Ensure abstract documents have abstract bases
         if attrs.get('_is_base_cls') or attrs['_meta'].get('abstract'):
@@ -425,7 +423,6 @@ def get_auto_id_names(self):
 
 
 class MetaDict(dict):
-
     """Custom dictionary for meta classes.
     Handles the merging of set indexes
     """
@@ -440,6 +437,5 @@ def merge(self, new_options):
 
 
 class BasesTuple(tuple):
-
     """Special class to handle introspection of bases tuple in __new__"""
     pass
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index b203e168b..cb1a731f7 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -120,7 +120,8 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
         try:
             connection = None
             # check for shared connections
-            connection_settings_iterator = ((db_alias, settings.copy()) for db_alias, settings in _connection_settings.iteritems())
+            connection_settings_iterator = (
+                (db_alias, settings.copy()) for db_alias, settings in _connection_settings.iteritems())
             for db_alias, connection_settings in connection_settings_iterator:
                 connection_settings.pop('name', None)
                 connection_settings.pop('username', None)
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 8e8920d4a..4449acb68 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -11,7 +11,6 @@
 
 
 class DeReference(object):
-
     def __call__(self, items, max_depth=1, instance=None, name=None):
         """
         Cheaply dereferences the items to a set depth.
@@ -49,8 +48,8 @@ def __call__(self, items, max_depth=1, instance=None, name=None):
 
                 if is_list and all([i.__class__ == doc_type for i in items]):
                     return items
-                elif not is_list and all([i.__class__ == doc_type
-                                         for i in items.values()]):
+                elif not is_list and all(
+                        [i.__class__ == doc_type for i in items.values()]):
                     return items
                 elif not field.dbref:
                     if not hasattr(items, 'items'):
@@ -155,7 +154,7 @@ def _fetch_objects(self, doc_type=None):
                         elif doc_type is None:
                             doc = get_document(
                                 ''.join(x.capitalize()
-                                    for x in collection.split('_')))._from_son(ref)
+                                        for x in collection.split('_')))._from_son(ref)
                         else:
                             doc = doc_type._from_son(ref)
                         object_map[(collection, doc.id)] = doc
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 0ceedfc19..07f85f167 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -3,6 +3,7 @@
 import re
 
 from pymongo.read_preferences import ReadPreference
+from bson import ObjectId
 from bson.dbref import DBRef
 from mongoengine import signals
 from mongoengine.common import _import_class
@@ -46,7 +47,6 @@ class InvalidCollectionError(Exception):
 
 
 class EmbeddedDocument(BaseDocument):
-
     """A :class:`~mongoengine.Document` that isn't stored in its own
     collection.  :class:`~mongoengine.EmbeddedDocument`\ s should be used as
     fields on :class:`~mongoengine.Document`\ s through the
@@ -89,7 +89,6 @@ def reload(self, *args, **kwargs):
 
 
 class Document(BaseDocument):
-
     """The base class used for defining the structure and properties of
     collections of documents stored in MongoDB. Inherit from this class, and
     add fields as class attributes to define a document's structure.
@@ -160,7 +159,9 @@ def fget(self):
 
         def fset(self, value):
             return setattr(self, self._meta['id_field'], value)
+
         return property(fget, fset)
+
     pk = pk()
 
     @classmethod
@@ -190,7 +191,7 @@ def _get_collection(cls):
                     # options match the specified capped options
                     options = cls._collection.options()
                     if options.get('max') != max_documents or \
-                       options.get('size') != max_size:
+                            options.get('size') != max_size:
                         msg = (('Cannot create collection "%s" as a capped '
                                 'collection as it already exists')
                                % cls._collection)
@@ -248,7 +249,7 @@ def modify(self, query={}, **update):
         return True
 
     def save(self, force_insert=False, validate=True, clean=True,
-             write_concern=None,  cascade=None, cascade_kwargs=None,
+             write_concern=None, cascade=None, cascade_kwargs=None,
              _refs=None, save_condition=None, **kwargs):
         """Save the :class:`~mongoengine.Document` to the database. If the
         document already exists, it will be updated, otherwise it will be
@@ -455,7 +456,7 @@ def update(self, **kwargs):
             if kwargs.get('upsert', False):
                 query = self.to_mongo()
                 if "_cls" in query:
-                    del(query["_cls"])
+                    del query["_cls"]
                 return self._qs.filter(**query).update_one(**kwargs)
             else:
                 raise OperationError(
@@ -580,8 +581,8 @@ def reload(self, *fields, **kwargs):
         if not self.pk:
             raise self.DoesNotExist("Document does not exist")
         obj = self._qs.read_preference(ReadPreference.PRIMARY).filter(
-            **self._object_key).only(*fields).limit(1
-                                                    ).select_related(max_depth=max_depth)
+            **self._object_key).only(*fields).limit(
+            1).select_related(max_depth=max_depth)
 
         if obj:
             obj = obj[0]
@@ -640,11 +641,11 @@ def register_delete_rule(cls, document_cls, field_name, rule):
                      for class_name in document_cls._subclasses
                      if class_name != document_cls.__name__] + [document_cls]
 
-        for cls in classes:
+        for klass in classes:
             for document_cls in documents:
-                delete_rules = cls._meta.get('delete_rules') or {}
+                delete_rules = klass._meta.get('delete_rules') or {}
                 delete_rules[(document_cls, field_name)] = rule
-                cls._meta['delete_rules'] = delete_rules
+                klass._meta['delete_rules'] = delete_rules
 
     @classmethod
     def drop_collection(cls):
@@ -769,7 +770,7 @@ def ensure_indexes(cls):
                                         **index_opts)
 
     @classmethod
-    def list_indexes(cls, go_up=True, go_down=True):
+    def list_indexes(cls):
         """ Lists all of the indexes that should be created for given
         collection. It includes all the indexes from super- and sub-classes.
         """
@@ -816,8 +817,8 @@ def get_indexes_spec(cls):
             return indexes
 
         indexes = []
-        for cls in classes:
-            for index in get_indexes_spec(cls):
+        for klass in classes:
+            for index in get_indexes_spec(klass):
                 if index not in indexes:
                     indexes.append(index)
 
@@ -856,7 +857,6 @@ def compare_indexes(cls):
 
 
 class DynamicDocument(Document):
-
     """A Dynamic Document class allowing flexible, expandable and uncontrolled
     schemas.  As a :class:`~mongoengine.Document` subclass, acts in the same
     way as an ordinary document but has expando style properties.  Any data
@@ -888,7 +888,6 @@ def __delattr__(self, *args, **kwargs):
 
 
 class DynamicEmbeddedDocument(EmbeddedDocument):
-
     """A Dynamic Embedded Document class allowing flexible, expandable and
     uncontrolled schemas. See :class:`~mongoengine.DynamicDocument` for more
     information about dynamic documents.
@@ -915,7 +914,6 @@ def __delattr__(self, *args, **kwargs):
 
 
 class MapReduceDocument(object):
-
     """A document returned from a map/reduce query.
 
     :param collection: An instance of :class:`~pymongo.Collection`
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index a411ac47a..ba33b57f1 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -115,6 +115,7 @@ def build_dict(source):
             else:
                 return unicode(source)
             return errors_dict
+
         if not self.errors:
             return {}
         return build_dict(self.errors)
@@ -127,7 +128,7 @@ def generate_key(value, prefix=''):
                 value = ' '.join([generate_key(k) for k in value])
             if isinstance(value, dict):
                 value = ' '.join(
-                        [generate_key(v, k) for k, v in value.iteritems()])
+                    [generate_key(v, k) for k, v in value.iteritems()])
 
             results = "%s.%s" % (prefix, value) if prefix else value
             return results
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index c27d02b24..4a50593e2 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -47,12 +47,10 @@
     'SequenceField', 'UUIDField', 'MultiPointField', 'MultiLineStringField',
     'MultiPolygonField', 'GeoJsonBaseField']
 
-
 RECURSIVE_REFERENCE_CONSTANT = 'self'
 
 
 class StringField(BaseField):
-
     """A unicode string field.
     """
 
@@ -112,7 +110,6 @@ def prepare_query_value(self, op, value):
 
 
 class URLField(StringField):
-
     """A field that validates input as an URL.
 
     .. versionadded:: 0.3
@@ -159,7 +156,6 @@ def validate(self, value):
 
 
 class EmailField(StringField):
-
     """A field that validates input as an E-Mail-Address.
 
     .. versionadded:: 0.4
@@ -181,7 +177,6 @@ def validate(self, value):
 
 
 class IntField(BaseField):
-
     """An 32-bit integer field.
     """
 
@@ -216,7 +211,6 @@ def prepare_query_value(self, op, value):
 
 
 class LongField(BaseField):
-
     """An 64-bit integer field.
     """
 
@@ -251,7 +245,6 @@ def prepare_query_value(self, op, value):
 
 
 class FloatField(BaseField):
-
     """An floating point number field.
     """
 
@@ -286,7 +279,6 @@ def prepare_query_value(self, op, value):
 
 
 class DecimalField(BaseField):
-
     """A fixed-point decimal number field.
 
     .. versionchanged:: 0.8
@@ -360,7 +352,6 @@ def prepare_query_value(self, op, value):
 
 
 class BooleanField(BaseField):
-
     """A boolean field type.
 
     .. versionadded:: 0.1.2
@@ -379,7 +370,6 @@ def validate(self, value):
 
 
 class DateTimeField(BaseField):
-
     """A datetime field.
 
     Uses the python-dateutil library if available alternatively use time.strptime
@@ -447,7 +437,6 @@ def prepare_query_value(self, op, value):
 
 
 class ComplexDateTimeField(StringField):
-
     """
     ComplexDateTimeField handles microseconds exactly instead of rounding
     like DateTimeField does.
@@ -531,7 +520,6 @@ def prepare_query_value(self, op, value):
 
 
 class EmbeddedDocumentField(BaseField):
-
     """An embedded document field - with a declared document_type.
     Only valid values are subclasses of :class:`~mongoengine.EmbeddedDocument`.
     """
@@ -585,7 +573,6 @@ def prepare_query_value(self, op, value):
 
 
 class GenericEmbeddedDocumentField(BaseField):
-
     """A generic embedded document field - allows any
     :class:`~mongoengine.EmbeddedDocument` to be stored.
 
@@ -624,7 +611,6 @@ def to_mongo(self, document, use_db_field=True):
 
 
 class DynamicField(BaseField):
-
     """A truly dynamic field type capable of handling different and varying
     types of data.
 
@@ -641,9 +627,9 @@ def to_mongo(self, value):
             cls = value.__class__
             val = value.to_mongo()
             # If we its a document thats not inherited add _cls
-            if (isinstance(value,   Document)):
+            if isinstance(value, Document):
                 val = {"_ref": value.to_dbref(), "_cls": cls.__name__}
-            if (isinstance(value, EmbeddedDocument)):
+            if isinstance(value, EmbeddedDocument):
                 val['_cls'] = cls.__name__
             return val
 
@@ -678,7 +664,6 @@ def lookup_member(self, member_name):
 
     def prepare_query_value(self, op, value):
         if isinstance(value, basestring):
-            from mongoengine.fields import StringField
             return StringField().prepare_query_value(op, value)
         return super(DynamicField, self).prepare_query_value(op, self.to_mongo(value))
 
@@ -689,7 +674,6 @@ def validate(self, value, clean=True):
 
 
 class ListField(ComplexBaseField):
-
     """A list field that wraps a standard field, allowing multiple instances
     of the field to be used as a list in the database.
 
@@ -749,7 +733,6 @@ def __init__(self, document_type, *args, **kwargs):
 
 
 class SortedListField(ListField):
-
     """A ListField that sorts the contents of its list before writing to
     the database in order to ensure that a sorted list is always
     retrieved.
@@ -801,7 +784,6 @@ def key_has_dot_or_dollar(d):
 
 
 class DictField(ComplexBaseField):
-
     """A dictionary field that wraps a standard Python dictionary. This is
     similar to an embedded document, but the structure is not defined.
 
@@ -857,7 +839,6 @@ def prepare_query_value(self, op, value):
 
 
 class MapField(DictField):
-
     """A field that maps a name to a specified field type. Similar to
     a DictField, except the 'value' of each item must match the specified
     field type.
@@ -873,7 +854,6 @@ def __init__(self, field=None, *args, **kwargs):
 
 
 class ReferenceField(BaseField):
-
     """A reference to a document that will be automatically dereferenced on
     access (lazily).
 
@@ -1010,7 +990,6 @@ def lookup_member(self, member_name):
 
 
 class CachedReferenceField(BaseField):
-
     """
     A referencefield with cache fields to purpose pseudo-joins
     
@@ -1025,7 +1004,6 @@ def __init__(self, document_type, fields=[], auto_sync=True, **kwargs):
         """
         if not isinstance(document_type, basestring) and \
                 not issubclass(document_type, (Document, basestring)):
-
             self.error('Argument to CachedReferenceField constructor must be a'
                        ' document class or a string')
 
@@ -1036,6 +1014,7 @@ def __init__(self, document_type, fields=[], auto_sync=True, **kwargs):
 
     def start_listener(self):
         from mongoengine import signals
+
         signals.post_save.connect(self.on_document_pre_save,
                                   sender=self.document_type)
 
@@ -1089,7 +1068,6 @@ def __get__(self, instance, owner):
     def to_mongo(self, document):
         id_field_name = self.document_type._meta['id_field']
         id_field = self.document_type._fields[id_field_name]
-        doc_tipe = self.document_type
 
         if isinstance(document, Document):
             # We need the id from the saved object to create the DBRef
@@ -1099,6 +1077,7 @@ def to_mongo(self, document):
                            ' been saved to the database')
         else:
             self.error('Only accept a document object')
+            # TODO: should raise here or will fail next statement
 
         value = SON((
             ("_id", id_field.to_mongo(id_)),
@@ -1150,7 +1129,6 @@ def sync_all(self):
 
 
 class GenericReferenceField(BaseField):
-
     """A reference to *any* :class:`~mongoengine.document.Document` subclass
     that will be automatically dereferenced on access (lazily).
 
@@ -1232,7 +1210,6 @@ def prepare_query_value(self, op, value):
 
 
 class BinaryField(BaseField):
-
     """A binary data field.
     """
 
@@ -1264,7 +1241,6 @@ class GridFSError(Exception):
 
 
 class GridFSProxy(object):
-
     """Proxy object to handle writing and reading of files to and from GridFS
 
     .. versionadded:: 0.4
@@ -1278,12 +1254,12 @@ def __init__(self, grid_id=None, key=None,
                  instance=None,
                  db_alias=DEFAULT_CONNECTION_NAME,
                  collection_name='fs'):
-        self.grid_id = grid_id                  # Store GridFS id for file
+        self.grid_id = grid_id  # Store GridFS id for file
         self.key = key
         self.instance = instance
         self.db_alias = db_alias
         self.collection_name = collection_name
-        self.newfile = None                     # Used for partial writes
+        self.newfile = None  # Used for partial writes
         self.gridout = None
 
     def __getattr__(self, name):
@@ -1410,7 +1386,6 @@ def _mark_as_changed(self):
 
 
 class FileField(BaseField):
-
     """A GridFS storage field.
 
     .. versionadded:: 0.4
@@ -1444,7 +1419,7 @@ def __get__(self, instance, owner):
     def __set__(self, instance, value):
         key = self.name
         if ((hasattr(value, 'read') and not
-             isinstance(value, GridFSProxy)) or isinstance(value, str_types)):
+        isinstance(value, GridFSProxy)) or isinstance(value, str_types)):
             # using "FileField() = file/string" notation
             grid_file = instance._data.get(self.name)
             # If a file already exists, delete it
@@ -1494,7 +1469,6 @@ def validate(self, value):
 
 
 class ImageGridFsProxy(GridFSProxy):
-
     """
     Proxy for ImageField
 
@@ -1518,6 +1492,7 @@ def put(self, file_obj, **kwargs):
             raise ValidationError('Invalid image: %s' % e)
 
         # Progressive JPEG
+        # TODO: fixme, at least unused, at worst bad implementation
         progressive = img.info.get('progressive') or False
 
         if (kwargs.get('progressive') and
@@ -1633,7 +1608,6 @@ class ImproperlyConfigured(Exception):
 
 
 class ImageField(FileField):
-
     """
     A Image File storage field.
 
@@ -1672,7 +1646,6 @@ def __init__(self, size=None, thumbnail_size=None,
 
 
 class SequenceField(BaseField):
-
     """Provides a sequential counter see:
      http://www.mongodb.org/display/DOCS/Object+IDs#ObjectIDs-SequenceNumbers
 
@@ -1796,7 +1769,6 @@ def to_python(self, value):
 
 
 class UUIDField(BaseField):
-
     """A UUID field.
 
     .. versionadded:: 0.6
@@ -1843,13 +1815,12 @@ def validate(self, value):
             if not isinstance(value, basestring):
                 value = str(value)
             try:
-                value = uuid.UUID(value)
+                uuid.UUID(value)
             except Exception, exc:
                 self.error('Could not convert to UUID: %s' % exc)
 
 
 class GeoPointField(BaseField):
-
     """A list storing a longitude and latitude coordinate.
 
     .. note:: this represents a generic point in a 2D plane and a legacy way of
@@ -1879,7 +1850,6 @@ def validate(self, value):
 
 
 class PointField(GeoJsonBaseField):
-
     """A GeoJSON field storing a longitude and latitude coordinate.
 
     The data is represented as:
@@ -1900,7 +1870,6 @@ class PointField(GeoJsonBaseField):
 
 
 class LineStringField(GeoJsonBaseField):
-
     """A GeoJSON field storing a line of longitude and latitude coordinates.
 
     The data is represented as:
@@ -1920,7 +1889,6 @@ class LineStringField(GeoJsonBaseField):
 
 
 class PolygonField(GeoJsonBaseField):
-
     """A GeoJSON field storing a polygon of longitude and latitude coordinates.
 
     The data is represented as:
@@ -1943,7 +1911,6 @@ class PolygonField(GeoJsonBaseField):
 
 
 class MultiPointField(GeoJsonBaseField):
-
     """A GeoJSON field storing a list of Points.
 
     The data is represented as:
@@ -1964,7 +1931,6 @@ class MultiPointField(GeoJsonBaseField):
 
 
 class MultiLineStringField(GeoJsonBaseField):
-
     """A GeoJSON field storing a list of LineStrings.
 
     The data is represented as:
@@ -1985,7 +1951,6 @@ class MultiLineStringField(GeoJsonBaseField):
 
 
 class MultiPolygonField(GeoJsonBaseField):
-
     """A GeoJSON field storing  list of Polygons.
 
     The data is represented as:
diff --git a/mongoengine/python_support.py b/mongoengine/python_support.py
index 3412c8414..5bb9038dd 100644
--- a/mongoengine/python_support.py
+++ b/mongoengine/python_support.py
@@ -14,6 +14,7 @@
 if PY3:
     import codecs
     from io import BytesIO as StringIO
+
     # return s converted to binary.  b('test') should be equivalent to b'test'
     def b(s):
         return codecs.latin_1_encode(s)[0]
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 99d960444..a8f55bfd4 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -43,7 +43,6 @@
 
 
 class BaseQuerySet(object):
-
     """A set of results returned from a query. Wraps a MongoDB cursor,
     providing :class:`~mongoengine.Document` objects as the results.
     """
@@ -162,8 +161,8 @@ def __getitem__(self, key):
             if queryset._as_pymongo:
                 return queryset._get_as_pymongo(queryset._cursor[key])
             return queryset._document._from_son(queryset._cursor[key],
-                                               _auto_dereference=self._auto_dereference,
-                                               only_fields=self.only_fields)
+                                                _auto_dereference=self._auto_dereference,
+                                                only_fields=self.only_fields)
 
         raise AttributeError
 
@@ -597,9 +596,10 @@ def in_bulk(self, object_ids):
                 doc_map[doc['_id']] = self._get_as_pymongo(doc)
         else:
             for doc in docs:
-                doc_map[doc['_id']] = self._document._from_son(doc,
-                        only_fields=self.only_fields,
-                        _auto_dereference=self._auto_dereference)
+                doc_map[doc['_id']] = self._document._from_son(
+                    doc,
+                    only_fields=self.only_fields,
+                    _auto_dereference=self._auto_dereference)
 
         return doc_map
 
@@ -830,7 +830,6 @@ def fields(self, _only_called=False, **kwargs):
         cleaned_fields = []
         for key, value in kwargs.items():
             parts = key.split('__')
-            op = None
             if parts[0] in operators:
                 op = parts.pop(0)
                 value = {'$' + op: value}
@@ -1616,7 +1615,7 @@ def _item_frequencies_exec_js(self, field, normalize=False):
 
         return frequencies
 
-    def _fields_to_dbfields(self, fields, subdoc=False):
+    def _fields_to_dbfields(self, fields):
         """Translate fields paths to its db equivalents"""
         ret = []
         subclasses = []
diff --git a/mongoengine/queryset/field_list.py b/mongoengine/queryset/field_list.py
index 140a71e05..c10ad5525 100644
--- a/mongoengine/queryset/field_list.py
+++ b/mongoengine/queryset/field_list.py
@@ -1,4 +1,3 @@
-
 __all__ = ('QueryFieldList',)
 
 
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index e8bd66ae0..1056de9b5 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -61,7 +61,6 @@ def __repr__(self):
             data[-1] = "...(remaining elements truncated)..."
         return repr(data)
 
-
     def _iter_results(self):
         """A generator for iterating over the result cache.
 
@@ -74,7 +73,7 @@ def _iter_results(self):
             upper = len(self._result_cache)
             while pos < upper:
                 yield self._result_cache[pos]
-                pos = pos + 1
+                pos += 1
             if not self._has_more:
                 raise StopIteration
             if len(self._result_cache) <= pos:
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index e7f5988cd..43542ac40 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -11,7 +11,6 @@
 
 __all__ = ('query', 'update')
 
-
 COMPARISON_OPERATORS = ('ne', 'gt', 'gte', 'lt', 'lte', 'in', 'nin', 'mod',
                         'all', 'size', 'exists', 'not', 'elemMatch', 'type')
 GEO_OPERATORS = ('within_distance', 'within_spherical_distance',
@@ -27,7 +26,7 @@
                    STRING_OPERATORS + CUSTOM_OPERATORS)
 
 
-def query(_doc_cls=None, _field_operation=False, **query):
+def query(_doc_cls=None, **query):
     """Transform a query from Django-style format to Mongo format.
     """
     mongo_query = {}
@@ -359,6 +358,7 @@ def _infer_geometry(value):
         raise InvalidQueryError("Invalid $geometry dictionary should have "
                                 "type and coordinates keys")
     elif isinstance(value, (list, set)):
+        # TODO: shouldn't we test value[0][0][0][0] to see if it is MultiPolygon?
         try:
             value[0][0][0]
             return {"$geometry": {"type": "Polygon", "coordinates": value}}
diff --git a/mongoengine/signals.py b/mongoengine/signals.py
index 06fb8b4f1..95532f03d 100644
--- a/mongoengine/signals.py
+++ b/mongoengine/signals.py
@@ -6,6 +6,7 @@
 signals_available = False
 try:
     from blinker import Namespace
+
     signals_available = True
 except ImportError:
     class Namespace(object):
@@ -27,6 +28,7 @@ def _fail(self, *args, **kwargs):
             raise RuntimeError('signalling support is unavailable '
                                'because the blinker library is '
                                'not installed.')
+
         send = lambda *a, **kw: None
         connect = disconnect = has_receivers_for = receivers_for = \
             temporarily_connected_to = _fail

From 217c9720eaba7c1692bb8d9e6c8dbdbc64fc97b1 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Wed, 29 Apr 2015 19:47:47 +0200
Subject: [PATCH 0225/1519] added iterkeys method and optimized repr, still
 very ugly

---
 mongoengine/base/datastructures.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 7ec67797d..8c71c5878 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -409,6 +409,9 @@ def iteritems(self):
     def items(self):
         return [(k, self[k]) for k in iter(self)]
 
+    def iterkeys(self):
+        return iter(self)
+
     def keys(self):
         return list(iter(self))
 
@@ -433,7 +436,7 @@ class SpecificStrictDict(cls):
                 __slots__ = allowed_keys_tuple
 
                 def __repr__(self):
-                    return "{%s}" % ', '.join('"{0!s}": {0!r}'.format(k, v) for (k, v) in self.iteritems())
+                    return "{%s}" % ', '.join('"{0!s}": {0!r}'.format(k) for k in self.iterkeys())
 
             cls._classes[allowed_keys] = SpecificStrictDict
         return cls._classes[allowed_keys]

From 307b35a5bfce9337de7e1a4b6583946b4bf4a4fe Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 30 Apr 2015 14:52:08 +0200
Subject: [PATCH 0226/1519] some more update, mainly docs

---
 CONTRIBUTING.rst | 10 +++++++++-
 README.rst       |  6 ++++--
 docs/django.rst  |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index c935d5a34..c7f581a1c 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -29,7 +29,10 @@ Style Guide
 -----------
 
 MongoEngine aims to follow `PEP8 <http://www.python.org/dev/peps/pep-0008/>`_
-including 4 space indents and 79 character line limits.
+including 4 space indents. When possible we try to stick to 79 character line limits.
+However, screens got bigger and an ORM has a strong focus on readability and
+if it can help, we accept 119 as maximum line length, in a similar way as
+`django does <https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/#python-style>`_
 
 Testing
 -------
@@ -38,6 +41,10 @@ All tests are run on `Travis <http://travis-ci.org/MongoEngine/mongoengine>`_
 and any pull requests are automatically tested by Travis. Any pull requests
 without tests will take longer to be integrated and might be refused.
 
+You may also submit a simple failing test as a PullRequest if you don't know
+how to fix it, it will be easier for other peopl to work on it and it may get
+fixed faster.
+
 General Guidelines
 ------------------
 
@@ -48,6 +55,7 @@ General Guidelines
   from the cmd line to run the test suite).
 - Ensure tests pass on every Python and PyMongo versions.
   You can test on these versions locally by executing ``tox``
+- Add enhancements or problematic bug fixes to docs/changelog.rst
 - Add yourself to AUTHORS :)
 
 Documentation
diff --git a/README.rst b/README.rst
index f2829cd3e..f4c92d5f8 100644
--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,9 @@ a `tutorial <http://readthedocs.org/docs/mongoengine-odm/en/latest/tutorial.html
 
 Installation
 ============
-If you have `setuptools <http://peak.telecommunity.com/DevCenter/setuptools>`_
+We recommend the use of `virtualenv <https://virtualenv.pypa.io/>`_ and of
+`pip <https://pip.pypa.io/>`_. You can then use ``pip install -U mongoengine``.
+You may also have `setuptools <http://peak.telecommunity.com/DevCenter/setuptools>`_ and thus
 you can use ``easy_install -U mongoengine``. Otherwise, you can download the
 source from `GitHub <http://github.com/MongoEngine/mongoengine>`_ and run ``python
 setup.py install``.
@@ -114,7 +116,7 @@ Also use the -s argument if you want to print out whatever or access pdb while t
 
 .. code-block:: shell
 
-    $ python setup.py nosetests --tests tests/test_django.py:QuerySetTest.test_get_document_or_404 -s
+    $ python setup.py nosetests --tests tests/fields/fields.py:FieldTest.test_cls_field -s
 
 Community
 =========
diff --git a/docs/django.rst b/docs/django.rst
index 6982fe64b..b8a52165d 100644
--- a/docs/django.rst
+++ b/docs/django.rst
@@ -15,5 +15,5 @@ The MongoEngine team is looking for help contributing and maintaining a new
 Django extension for MongoEngine! If you have Django experience and would like
 to help contribute to the project, please get in touch on the 
 `mailing list <http://groups.google.com/group/mongoengine-users>`_ or by 
-simpily contributing on 
+simply contributing on
 `GitHub <https://github.com/MongoEngine/django-mongoengine>`_.

From e438491938f0bfe5042d1bfc4798bc222c39fe64 Mon Sep 17 00:00:00 2001
From: mrigal <matthieu@orderbird.com>
Date: Thu, 30 Apr 2015 15:00:57 +0200
Subject: [PATCH 0227/1519] typos

---
 AUTHORS          | 2 +-
 CONTRIBUTING.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index c776a43ce..29993c843 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,7 +12,7 @@ Laine Herron https://github.com/LaineHerron
 
 CONTRIBUTORS
 
-Dervived from the git logs, inevitably incomplete but all of whom and others
+Derived from the git logs, inevitably incomplete but all of whom and others
 have submitted patches, reported bugs and generally helped make MongoEngine
 that much better:
 
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index c7f581a1c..aeba41f73 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -42,7 +42,7 @@ and any pull requests are automatically tested by Travis. Any pull requests
 without tests will take longer to be integrated and might be refused.
 
 You may also submit a simple failing test as a PullRequest if you don't know
-how to fix it, it will be easier for other peopl to work on it and it may get
+how to fix it, it will be easier for other people to work on it and it may get
 fixed faster.
 
 General Guidelines

From cd76a906f4a4e88d7511f233c7fb7f61996e88e3 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Wed, 24 Jun 2015 00:49:39 +0200
Subject: [PATCH 0228/1519] Set coverage to specific version as 4+ is not
 Python 3.2 compatible

---
 setup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 42794452a..f2afa8eef 100644
--- a/setup.py
+++ b/setup.py
@@ -52,12 +52,13 @@ def get_version(version_tuple):
 extra_opts = {"packages": find_packages(exclude=["tests", "tests.*"])}
 if sys.version_info[0] == 3:
     extra_opts['use_2to3'] = True
-    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'Pillow>=2.0.0']
+    extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0']
     if "test" in sys.argv or "nosetests" in sys.argv:
         extra_opts['packages'] = find_packages()
         extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]}
 else:
-    extra_opts['tests_require'] = ['nose', 'coverage', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
+    # coverage 4 does not support Python 3.2 anymore
+    extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
 
     if sys.version_info[0] == 2 and sys.version_info[1] == 6:
         extra_opts['tests_require'].append('unittest2')

From 0aeb1ca408c6e3cf15eaf51aabddfbe72fb3e72a Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Wed, 24 Jun 2015 00:50:36 +0200
Subject: [PATCH 0229/1519] Various fixes again

---
 docs/_themes/sphinx_rtd_theme/footer.html |  2 +-
 docs/guide/querying.rst                   |  2 +-
 mongoengine/base/datastructures.py        |  2 +-
 mongoengine/base/document.py              | 16 +++++------
 mongoengine/base/fields.py                |  6 ++--
 mongoengine/base/metaclasses.py           | 21 +++++++-------
 mongoengine/dereference.py                |  8 +++---
 mongoengine/document.py                   |  3 +-
 mongoengine/errors.py                     |  2 +-
 mongoengine/fields.py                     | 19 ++++++-------
 mongoengine/queryset/base.py              | 34 +++++++++++------------
 mongoengine/queryset/queryset.py          |  2 +-
 mongoengine/queryset/transform.py         |  4 +--
 tests/document/delta.py                   | 10 +++----
 tests/document/dynamic.py                 |  5 ++--
 tests/document/indexes.py                 |  2 +-
 tests/document/instance.py                |  4 +--
 tests/fields/__init__.py                  |  2 +-
 tests/fields/fields.py                    | 15 +++++-----
 tests/fields/file_tests.py                |  8 +++---
 tests/fields/geo.py                       |  4 +--
 tests/test_datastructures.py              |  6 +++-
 22 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/docs/_themes/sphinx_rtd_theme/footer.html b/docs/_themes/sphinx_rtd_theme/footer.html
index e42d753ff..1fa05eaad 100755
--- a/docs/_themes/sphinx_rtd_theme/footer.html
+++ b/docs/_themes/sphinx_rtd_theme/footer.html
@@ -2,7 +2,7 @@
   {% if next or prev %}
     <div class="rst-footer-buttons">
       {% if next %}
-        <a href="http://github.com/%7B%7B%20next.link|e%20%7D%7D" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}"/>Next <span class="icon icon-circle-arrow-right"></span></a>
+        <a href="http://github.com/%7B%7B%20next.link|e%20%7D%7D" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}">Next <span class="icon icon-circle-arrow-right"></span></a>
       {% endif %}
       {% if prev %}
         <a href="http://github.com/%7B%7B%20prev.link|e%20%7D%7D" class="btn btn-neutral" title="{{ prev.title|striptags|e }}"><span class="icon icon-circle-arrow-left"></span> Previous</a>
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 688fc9e95..f2e71b045 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -598,7 +598,7 @@ Some variables are made available in the scope of the Javascript function:
 
 The following example demonstrates the intended usage of
 :meth:`~mongoengine.queryset.QuerySet.exec_js` by defining a function that sums
-over a field on a document (this functionality is already available throught
+over a field on a document (this functionality is already available through
 :meth:`~mongoengine.queryset.QuerySet.sum` but is shown here for sake of
 example)::
 
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 8c71c5878..e4d2b3922 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -443,7 +443,7 @@ def __repr__(self):
 
 
 class SemiStrictDict(StrictDict):
-    __slots__ = ('_extras')
+    __slots__ = ('_extras', )
     _classes = {}
 
     def __getattr__(self, attr):
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 747d3970a..ee807cb43 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -149,7 +149,6 @@ def __setattr__(self, name, value):
         # Handle dynamic data only if an initialised dynamic document
         if self._dynamic and not self._dynamic_lock:
 
-            field = None
             if not hasattr(self, name) and not name.startswith('_'):
                 DynamicField = _import_class("DynamicField")
                 field = DynamicField(db_field=name)
@@ -182,8 +181,8 @@ def __setattr__(self, name, value):
         except AttributeError:
             self__initialised = False
         # Check if the user has created a new instance of a class
-        if (self._is_document and self__initialised
-                and self__created and name == self._meta.get('id_field')):
+        if (self._is_document and self__initialised and
+                self__created and name == self._meta.get('id_field')):
             super(BaseDocument, self).__setattr__('_created', False)
 
         super(BaseDocument, self).__setattr__(name, value)
@@ -327,7 +326,7 @@ def to_mongo(self, use_db_field=True, fields=None):
 
             if value is not None:
 
-                if isinstance(field, (EmbeddedDocumentField)):
+                if isinstance(field, EmbeddedDocumentField):
                     if fields:
                         key = '%s.' % field_name
                         embedded_fields = [
@@ -416,7 +415,8 @@ def validate(self, clean=True):
 
     def to_json(self, *args, **kwargs):
         """Converts a document to JSON.
-        :param use_db_field: Set to True by default but enables the output of the json structure with the field names and not the mongodb store db_names in case of set to False
+        :param use_db_field: Set to True by default but enables the output of the json structure with the field names
+            and not the mongodb store db_names in case of set to False
         """
         use_db_field = kwargs.pop('use_db_field', True)
         return json_util.dumps(self.to_mongo(use_db_field), *args, **kwargs)
@@ -577,7 +577,7 @@ def _get_changed_fields(self, inspected=None):
                 if (hasattr(field, 'field') and
                         isinstance(field.field, ReferenceField)):
                     continue
-                elif (isinstance(field, SortedListField) and field._ordering):
+                elif isinstance(field, SortedListField) and field._ordering:
                     # if ordering is affected whole list is changed
                     if any(map(lambda d: field._ordering in d._changed_fields, data)):
                         changed_fields.append(db_field_name)
@@ -627,7 +627,7 @@ def _delta(self):
             if value or isinstance(value, (numbers.Number, bool)):
                 continue
 
-            # If we've set a value that ain't the default value dont unset it.
+            # If we've set a value that ain't the default value don't unset it.
             default = None
             if (self._dynamic and len(parts) and parts[0] in
                     self._dynamic_fields):
@@ -979,7 +979,7 @@ def _lookup_field(cls, parts):
                 if hasattr(getattr(field, 'field', None), 'lookup_member'):
                     new_field = field.field.lookup_member(field_name)
                 elif cls._dynamic and (isinstance(field, DynamicField) or
-                                           getattr(getattr(field, 'document_type'), '_dynamic')):
+                                       getattr(getattr(field, 'document_type'), '_dynamic')):
                     new_field = DynamicField(db_field=field_name)
                 else:
                     # Look up subfield on the previous field or raise
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 02934d47c..21a243585 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -112,7 +112,7 @@ def __set__(self, instance, value):
         """Descriptor for assigning a value to a field in a document.
         """
 
-        # If setting to None and theres a default
+        # If setting to None and there is a default
         # Then set the value to the default value
         if value is None:
             if self.null:
@@ -259,8 +259,8 @@ def __get__(self, instance, owner):
             instance._data[self.name] = value
 
         if (self._auto_dereference and instance._initialised and
-                isinstance(value, (BaseList, BaseDict))
-                and not value._dereferenced):
+                isinstance(value, (BaseList, BaseDict)) and
+                not value._dereferenced):
             value = _dereference(
                 value, max_depth=1, instance=instance, name=self.name
             )
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 664c849ef..b5981aaee 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -110,7 +110,7 @@ def __new__(cls, name, bases, attrs):
         for base in flattened_bases:
             if (not getattr(base, '_is_base_cls', True) and
                     not getattr(base, '_meta', {}).get('abstract', True)):
-                # Collate heirarchy for _cls and _subclasses
+                # Collate hierarchy for _cls and _subclasses
                 class_name.append(base.__name__)
 
             if hasattr(base, '_meta'):
@@ -183,7 +183,7 @@ def __new__(cls, name, bases, attrs):
                         "CachedReferenceFields is not allowed in EmbeddedDocuments")
                 if not f.document_type:
                     raise InvalidDocumentError(
-                        "Document is not avaiable to sync")
+                        "Document is not available to sync")
 
                 if f.auto_sync:
                     f.start_listener()
@@ -245,7 +245,7 @@ def _import_classes(cls):
         EmbeddedDocument = _import_class('EmbeddedDocument')
         DictField = _import_class('DictField')
         CachedReferenceField = _import_class('CachedReferenceField')
-        return (Document, EmbeddedDocument, DictField, CachedReferenceField)
+        return Document, EmbeddedDocument, DictField, CachedReferenceField
 
 
 class TopLevelDocumentMetaclass(DocumentMetaclass):
@@ -301,8 +301,8 @@ def __new__(cls, name, bases, attrs):
 
         # Prevent classes setting collection different to their parents
         # If parent wasn't an abstract class
-        if (parent_doc_cls and 'collection' in attrs.get('_meta', {})
-                and not parent_doc_cls._meta.get('abstract', True)):
+        if (parent_doc_cls and 'collection' in attrs.get('_meta', {}) and
+                not parent_doc_cls._meta.get('abstract', True)):
             msg = "Trying to set a collection on a subclass (%s)" % name
             warnings.warn(msg, SyntaxWarning)
             del attrs['_meta']['collection']
@@ -408,14 +408,15 @@ def __new__(cls, name, bases, attrs):
 
         return new_class
 
-    def get_auto_id_names(self):
+    @classmethod
+    def get_auto_id_names(cls, new_class):
         id_name, id_db_name = ('id', '_id')
-        if id_name not in self._fields and \
-                id_db_name not in (v.db_field for v in self._fields.values()):
+        if id_name not in new_class._fields and \
+                id_db_name not in (v.db_field for v in new_class._fields.values()):
             return id_name, id_db_name
         id_basename, id_db_basename, i = 'auto_id', '_auto_id', 0
-        while id_name in self._fields or \
-                id_db_name in (v.db_field for v in self._fields.values()):
+        while id_name in new_class._fields or \
+                id_db_name in (v.db_field for v in new_class._fields.values()):
             id_name = '{0}_{1}'.format(id_basename, i)
             id_db_name = '{0}_{1}'.format(id_db_basename, i)
             i += 1
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 4449acb68..7fcc2ad26 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -100,7 +100,7 @@ def _find_references(self, items, depth=0):
             if isinstance(item, (Document, EmbeddedDocument)):
                 for field_name, field in item._fields.iteritems():
                     v = item._data.get(field_name, None)
-                    if isinstance(v, (DBRef)):
+                    if isinstance(v, DBRef):
                         reference_map.setdefault(field.document_type, set()).add(v.id)
                     elif isinstance(v, (dict, SON)) and '_ref' in v:
                         reference_map.setdefault(get_document(v['_cls']), set()).add(v['_ref'].id)
@@ -111,7 +111,7 @@ def _find_references(self, items, depth=0):
                             if isinstance(field_cls, (Document, TopLevelDocumentMetaclass)):
                                 key = field_cls
                             reference_map.setdefault(key, set()).update(refs)
-            elif isinstance(item, (DBRef)):
+            elif isinstance(item, DBRef):
                 reference_map.setdefault(item.collection, set()).add(item.id)
             elif isinstance(item, (dict, SON)) and '_ref' in item:
                 reference_map.setdefault(get_document(item['_cls']), set()).add(item['_ref'].id)
@@ -219,12 +219,12 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
             elif isinstance(v, (Document, EmbeddedDocument)):
                 for field_name, field in v._fields.iteritems():
                     v = data[k]._data.get(field_name, None)
-                    if isinstance(v, (DBRef)):
+                    if isinstance(v, DBRef):
                         data[k]._data[field_name] = self.object_map.get(
                             (v.collection, v.id), v)
                     elif isinstance(v, (dict, SON)) and '_ref' in v:
                         data[k]._data[field_name] = self.object_map.get(
-                            (v['_ref'].collection , v['_ref'].id), v)
+                            (v['_ref'].collection, v['_ref'].id), v)
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                         item_name = "{0}.{1}.{2}".format(name, k, field_name)
                         data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 07f85f167..c54987501 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -3,7 +3,6 @@
 import re
 
 from pymongo.read_preferences import ReadPreference
-from bson import ObjectId
 from bson.dbref import DBRef
 from mongoengine import signals
 from mongoengine.common import _import_class
@@ -61,7 +60,7 @@ class EmbeddedDocument(BaseDocument):
     dictionary.
     """
 
-    __slots__ = ('_instance')
+    __slots__ = ('_instance', )
 
     # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index ba33b57f1..b7fb7632e 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -126,7 +126,7 @@ def _format_errors(self):
         def generate_key(value, prefix=''):
             if isinstance(value, list):
                 value = ' '.join([generate_key(k) for k in value])
-            if isinstance(value, dict):
+            elif isinstance(value, dict):
                 value = ' '.join(
                     [generate_key(v, k) for k, v in value.iteritems()])
 
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 4a50593e2..bc16d1b63 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -667,7 +667,6 @@ def prepare_query_value(self, op, value):
             return StringField().prepare_query_value(op, value)
         return super(DynamicField, self).prepare_query_value(op, self.to_mongo(value))
 
-
     def validate(self, value, clean=True):
         if hasattr(value, "validate"):
             value.validate(clean=clean)
@@ -698,9 +697,10 @@ def validate(self, value):
 
     def prepare_query_value(self, op, value):
         if self.field:
-            if op in ('set', 'unset') and (not isinstance(value, basestring)
-                                           and not isinstance(value, BaseDocument)
-                                           and hasattr(value, '__iter__')):
+            if op in ('set', 'unset') and (
+                    not isinstance(value, basestring) and
+                    not isinstance(value, BaseDocument) and
+                    hasattr(value, '__iter__')):
                 return [self.field.prepare_query_value(op, v) for v in value]
             return self.field.prepare_query_value(op, value)
         return super(ListField, self).prepare_query_value(op, value)
@@ -718,12 +718,10 @@ class EmbeddedDocumentListField(ListField):
 
     """
 
-    def __init__(self, document_type, *args, **kwargs):
+    def __init__(self, document_type, **kwargs):
         """
         :param document_type: The type of
          :class:`~mongoengine.EmbeddedDocument` the list will hold.
-        :param args: Arguments passed directly into the parent
-         :class:`~mongoengine.ListField`.
         :param kwargs: Keyword arguments passed directly into the parent
          :class:`~mongoengine.ListField`.
         """
@@ -975,7 +973,6 @@ def prepare_query_value(self, op, value):
         super(ReferenceField, self).prepare_query_value(op, value)
         return self.to_mongo(value)
 
-
     def validate(self, value):
 
         if not isinstance(value, (self.document_type, DBRef)):
@@ -1100,7 +1097,7 @@ def prepare_query_value(self, op, value):
 
     def validate(self, value):
 
-        if not isinstance(value, (self.document_type)):
+        if not isinstance(value, self.document_type):
             self.error("A CachedReferenceField only accepts documents")
 
         if isinstance(value, Document) and value.id is None:
@@ -1419,7 +1416,7 @@ def __get__(self, instance, owner):
     def __set__(self, instance, value):
         key = self.name
         if ((hasattr(value, 'read') and not
-        isinstance(value, GridFSProxy)) or isinstance(value, str_types)):
+                isinstance(value, GridFSProxy)) or isinstance(value, str_types)):
             # using "FileField() = file/string" notation
             grid_file = instance._data.get(self.name)
             # If a file already exists, delete it
@@ -1553,7 +1550,7 @@ def delete(self, *args, **kwargs):
         if out and out.thumbnail_id:
             self.fs.delete(out.thumbnail_id)
 
-        return super(ImageGridFsProxy, self).delete(*args, **kwargs)
+        return super(ImageGridFsProxy, self).delete()
 
     def _put_thumbnail(self, thumbnail, format, progressive, **kwargs):
         w, h = thumbnail.size
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index a8f55bfd4..50b2ee195 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -86,8 +86,8 @@ def __init__(self, document, collection):
         self.only_fields = []
         self._max_time_ms = None
 
-    def __call__(self, q_obj=None, class_check=True, slave_okay=False,
-                 read_preference=None, **query):
+    def __call__(self, q_obj=None, class_check=True, read_preference=None,
+                 **query):
         """Filter the selected documents by calling the
         :class:`~mongoengine.queryset.QuerySet` with a query.
 
@@ -97,9 +97,7 @@ def __call__(self, q_obj=None, class_check=True, slave_okay=False,
             objects, only the last one will be used
         :param class_check: If set to False bypass class name check when
             querying collection
-        :param slave_okay: if True, allows this query to be run against a
-            replica secondary.
-        :params read_preference: if set, overrides connection-level
+        :param read_preference: if set, overrides connection-level
             read_preference from `ReplicaSetConnection`.
         :param query: Django-style query keyword arguments
         """
@@ -204,7 +202,8 @@ def search_text(self, text, language=None):
         :param language:  The language that determines the list of stop words
             for the search and the rules for the stemmer and tokenizer.
             If not specified, the search uses the default language of the index.
-            For supported languages, see `Text Search Languages <http://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages>`.
+            For supported languages, see
+            `Text Search Languages <http://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages>`.
         """
         queryset = self.clone()
         if queryset._search_text:
@@ -270,7 +269,7 @@ def first(self):
     def insert(self, doc_or_docs, load_bulk=True, write_concern=None):
         """bulk insert documents
 
-        :param docs_or_doc: a document or list of documents to be inserted
+        :param doc_or_docs: a document or list of documents to be inserted
         :param load_bulk (optional): If True returns the list of document
             instances
         :param write_concern: Extra keyword arguments are passed down to
@@ -405,8 +404,8 @@ def delete(self, write_concern=None, _from_doc_delete=False):
             if rule == CASCADE:
                 ref_q = document_cls.objects(**{field_name + '__in': self})
                 ref_q_count = ref_q.count()
-                if (doc != document_cls and ref_q_count > 0
-                        or (doc == document_cls and ref_q_count > 0)):
+                if (doc != document_cls and ref_q_count > 0 or
+                        (doc == document_cls and ref_q_count > 0)):
                     ref_q.delete(write_concern=write_concern)
             elif rule == NULLIFY:
                 document_cls.objects(**{field_name + '__in': self}).update(
@@ -527,7 +526,7 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
         try:
             if IS_PYMONGO_3:
                 if full_response:
-                    msg = ("With PyMongo 3+, it is not possible anymore to get the full response.")
+                    msg = "With PyMongo 3+, it is not possible anymore to get the full response."
                     warnings.warn(msg, DeprecationWarning)
                 if remove:
                     result = queryset._collection.find_one_and_delete(
@@ -619,7 +618,8 @@ def no_sub_classes(self):
         return self
 
     def using(self, alias):
-        """This method is for controlling which database the QuerySet will be evaluated against if you are using more than one database.
+        """This method is for controlling which database the QuerySet will be
+        evaluated against if you are using more than one database.
 
         :param alias: The database alias
 
@@ -966,7 +966,7 @@ def as_pymongo(self, coerce_types=False):
         """Instead of returning Document instances, return raw values from
         pymongo.
 
-        :param coerce_type: Field types (if applicable) would be use to
+        :param coerce_types: Field types (if applicable) would be use to
             coerce types.
         """
         queryset = self.clone()
@@ -1258,8 +1258,8 @@ def aggregate_sum(self, field):
         the aggregation framework instead of map-reduce.
         """
         result = self._document._get_collection().aggregate([
-            { '$match': self._query },
-            { '$group': { '_id': 'sum', 'total': { '$sum': '$' + field } } }
+            {'$match': self._query},
+            {'$group': {'_id': 'sum', 'total': {'$sum': '$' + field}}}
         ])
         if IS_PYMONGO_3:
             result = list(result)
@@ -1334,8 +1334,8 @@ def aggregate_average(self, field):
         uses the aggregation framework instead of map-reduce.
         """
         result = self._document._get_collection().aggregate([
-            { '$match': self._query },
-            { '$group': { '_id': 'avg', 'total': { '$avg': '$' + field } } }
+            {'$match': self._query},
+            {'$group': {'_id': 'avg', 'total': {'$avg': '$' + field}}}
         ])
         if IS_PYMONGO_3:
             result = list(result)
@@ -1637,7 +1637,7 @@ def _fields_to_dbfields(self, fields):
                         ret.append(subfield)
                         found = True
                         break
-                    except LookUpError, e:
+                    except LookUpError:
                         pass
 
                 if not found:
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 1056de9b5..6e5f7220e 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -160,4 +160,4 @@ class QuerySetNoDeRef(QuerySet):
     """Special no_dereference QuerySet"""
 
     def __dereference(items, max_depth=1, instance=None, name=None):
-        return items
\ No newline at end of file
+        return items
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 43542ac40..03f3acf0d 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -44,8 +44,8 @@ def query(_doc_cls=None, **query):
         if len(parts) > 1 and parts[-1] in MATCH_OPERATORS:
             op = parts.pop()
 
-        #if user escape field name by __
-        if len(parts) > 1 and parts[-1]=="":
+        # Allw to escape operator-like field name by __
+        if len(parts) > 1 and parts[-1] == "":
             parts.pop()
 
         negate = False
diff --git a/tests/document/delta.py b/tests/document/delta.py
index de9405772..cd37f415f 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -253,13 +253,13 @@ class Doc(DocClass):
         self.assertEqual(doc.embedded_field.list_field[2].list_field,
                          [1, 2, {'hello': 'world'}])
 
-        del(doc.embedded_field.list_field[2].list_field[2]['hello'])
+        del doc.embedded_field.list_field[2].list_field[2]['hello']
         self.assertEqual(doc._delta(),
                          ({}, {'embedded_field.list_field.2.list_field.2.hello': 1}))
         doc.save()
         doc = doc.reload(10)
 
-        del(doc.embedded_field.list_field[2].list_field)
+        del doc.embedded_field.list_field[2].list_field
         self.assertEqual(doc._delta(),
                          ({}, {'embedded_field.list_field.2.list_field': 1}))
 
@@ -593,13 +593,13 @@ class Doc(DocClass):
         self.assertEqual(doc.embedded_field.list_field[2].list_field,
             [1, 2, {'hello': 'world'}])
 
-        del(doc.embedded_field.list_field[2].list_field[2]['hello'])
+        del doc.embedded_field.list_field[2].list_field[2]['hello']
         self.assertEqual(doc._delta(),
             ({}, {'db_embedded_field.db_list_field.2.db_list_field.2.hello': 1}))
         doc.save()
         doc = doc.reload(10)
 
-        del(doc.embedded_field.list_field[2].list_field)
+        del doc.embedded_field.list_field[2].list_field
         self.assertEqual(doc._delta(), ({},
             {'db_embedded_field.db_list_field.2.db_list_field': 1}))
 
@@ -615,7 +615,7 @@ class Person(DynamicDocument):
             SON([('_cls', 'Person'), ('name', 'James'), ('age', 34)]), {}))
 
         p.doc = 123
-        del(p.doc)
+        del p.doc
         self.assertEqual(p._delta(), (
             SON([('_cls', 'Person'), ('name', 'James'), ('age', 34)]), {}))
 
diff --git a/tests/document/dynamic.py b/tests/document/dynamic.py
index b2947df46..e4289bd28 100644
--- a/tests/document/dynamic.py
+++ b/tests/document/dynamic.py
@@ -72,7 +72,7 @@ def test_delete_dynamic_field(self):
         obj = collection.find_one()
         self.assertEqual(sorted(obj.keys()), ['_cls', '_id', 'misc', 'name'])
 
-        del(p.misc)
+        del p.misc
         p.save()
 
         p = self.Person.objects.get()
@@ -340,7 +340,7 @@ class Person(DynamicDocument):
         person = Person.objects.first()
         person.attrval = "This works"
 
-        person["phone"] = "555-1212" # but this should too
+        person["phone"] = "555-1212"  # but this should too
 
         # Same thing two levels deep
         person["address"]["city"] = "Lundenne"
@@ -356,7 +356,6 @@ class Person(DynamicDocument):
 
         self.assertEqual(Person.objects.first().address.city, "Londinium")
 
-
         person = Person.objects.first()
         person["age"] = 35
         person.save()
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index dcc71e5b0..db1b45622 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -143,7 +143,7 @@ class A(Document):
             meta = {
                 'indexes': [
                         {
-                        'fields': ('title',),
+                            'fields': ('title',),
                         },
                 ],
                 'allow_inheritance': True,
diff --git a/tests/document/instance.py b/tests/document/instance.py
index fceec02f5..ea7d56682 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1897,11 +1897,11 @@ class BlogPost(Document):
         self.assertEqual(BlogPost.objects.count(), 0)
 
     def test_reverse_delete_rule_cascade_triggers_pre_delete_signal(self):
-        ''' ensure the pre_delete signal is triggered upon a cascading deletion
+        """ ensure the pre_delete signal is triggered upon a cascading deletion
         setup a blog post with content, an author and editor
         delete the author which triggers deletion of blogpost via cascade
         blog post's pre_delete signal alters an editor attribute
-        '''
+        """
         class Editor(self.Person):
             review_queue = IntField(default=0)
 
diff --git a/tests/fields/__init__.py b/tests/fields/__init__.py
index be70aaaa6..8e0640db6 100644
--- a/tests/fields/__init__.py
+++ b/tests/fields/__init__.py
@@ -1,3 +1,3 @@
 from fields import *
 from file_tests import *
-from geo import *
\ No newline at end of file
+from geo import *
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 9b682fac8..011a54d4a 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -946,7 +946,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
     def test_reverse_list_sorting(self):
-        '''Ensure that a reverse sorted list field properly sorts values'''
+        """Ensure that a reverse sorted list field properly sorts values"""
 
         class Category(EmbeddedDocument):
             count = IntField()
@@ -1334,7 +1334,6 @@ class Simple(Document):
     def test_atomic_update_dict_field(self):
         """Ensure that the entire DictField can be atomically updated."""
 
-
         class Simple(Document):
             mapping = DictField(field=ListField(IntField(required=True)))
 
@@ -1349,7 +1348,7 @@ class Simple(Document):
         self.assertEqual({"ints": [3, 4]}, e.mapping)
 
         def create_invalid_mapping():
-            e.update(set__mapping={"somestrings": ["foo", "bar",]})
+            e.update(set__mapping={"somestrings": ["foo", "bar", ]})
 
         self.assertRaises(ValueError, create_invalid_mapping)
 
@@ -1460,7 +1459,7 @@ def test_map_field_lookup(self):
 
         class Action(EmbeddedDocument):
             operation = StringField()
-            object    = StringField()
+            object = StringField()
 
         class Log(Document):
             name = StringField()
@@ -3774,7 +3773,7 @@ class EmbeddedWithUnique(EmbeddedDocument):
         class A(Document):
             my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))
 
-        a1 = A(my_list=[]).save()
+        A(my_list=[]).save()
         self.assertRaises(NotUniqueError, lambda: A(my_list=[]).save())
 
         class EmbeddedWithSparseUnique(EmbeddedDocument):
@@ -3783,9 +3782,8 @@ class EmbeddedWithSparseUnique(EmbeddedDocument):
         class B(Document):
             my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique))
 
-        b1 = B(my_list=[]).save()
-        b2 = B(my_list=[]).save()
-
+        B(my_list=[]).save()
+        B(my_list=[]).save()
 
     def test_filtered_delete(self):
         """
@@ -3824,6 +3822,7 @@ def test_custom_data(self):
         and doesn't interfere with the rest of field functionalities.
         """
         custom_data = {'a': 'a_value', 'b': [1, 2]}
+
         class CustomData(Document):
             a_field = IntField()
             c_field = IntField(custom_data=custom_data)
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 4bd1b164a..7c5abeac8 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -12,7 +12,7 @@
 from nose.plugins.skip import SkipTest
 from mongoengine import *
 from mongoengine.connection import get_db
-from mongoengine.python_support import PY3, b, StringIO
+from mongoengine.python_support import b, StringIO
 
 try:
     from PIL import Image
@@ -112,7 +112,7 @@ class StreamFile(Document):
         result.the_file.delete()
 
         # Ensure deleted file returns None
-        self.assertTrue(result.the_file.read() == None)
+        self.assertTrue(result.the_file.read() is None)
 
     def test_file_fields_stream_after_none(self):
         """Ensure that a file field can be written to after it has been saved as
@@ -138,7 +138,7 @@ class StreamFile(Document):
         result = StreamFile.objects.first()
         self.assertTrue(streamfile == result)
         self.assertEqual(result.the_file.read(), text + more_text)
-        #self.assertEqual(result.the_file.content_type, content_type)
+        # self.assertEqual(result.the_file.content_type, content_type)
         result.the_file.seek(0)
         self.assertEqual(result.the_file.tell(), 0)
         self.assertEqual(result.the_file.read(len(text)), text)
@@ -148,7 +148,7 @@ class StreamFile(Document):
         result.the_file.delete()
 
         # Ensure deleted file returns None
-        self.assertTrue(result.the_file.read() == None)
+        self.assertTrue(result.the_file.read() is None)
 
     def test_file_fields_set(self):
 
diff --git a/tests/fields/geo.py b/tests/fields/geo.py
index a0d2237ab..c3f414812 100644
--- a/tests/fields/geo.py
+++ b/tests/fields/geo.py
@@ -115,7 +115,7 @@ class Location(Document):
             expected = "Invalid LineString:\nBoth values (%s) in point must be float or int" % repr(coord[0])
             self._test_for_expected_error(Location, coord, expected)
 
-        Location(loc=[[1, 2], [3, 4], [5, 6], [1,2]]).validate()
+        Location(loc=[[1, 2], [3, 4], [5, 6], [1, 2]]).validate()
 
     def test_polygon_validation(self):
         class Location(Document):
@@ -226,7 +226,7 @@ class Location(Document):
             expected = "Invalid MultiLineString:\nBoth values (%s) in point must be float or int" % repr(coord[0][0])
             self._test_for_expected_error(Location, coord, expected)
 
-        Location(loc=[[[1, 2], [3, 4], [5, 6], [1,2]]]).validate()
+        Location(loc=[[[1, 2], [3, 4], [5, 6], [1, 2]]]).validate()
 
     def test_multipolygon_validation(self):
         class Location(Document):
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index c761a41ea..716df6514 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,11 +1,14 @@
 import unittest
 from mongoengine.base.datastructures import StrictDict, SemiStrictDict 
 
+
 class TestStrictDict(unittest.TestCase):
     def strict_dict_class(self, *args, **kwargs):
         return StrictDict.create(*args, **kwargs)
+
     def setUp(self):
         self.dtype = self.strict_dict_class(("a", "b", "c"))
+
     def test_init(self):
         d = self.dtype(a=1, b=1, c=1)
         self.assertEqual((d.a, d.b, d.c), (1, 1, 1))
@@ -38,8 +41,9 @@ def test_setattr_getattr(self):
     
     def test_setattr_raises_on_nonexisting_attr(self):
         d = self.dtype()
+
         def _f():
-            d.x=1
+            d.x = 1
         self.assertRaises(AttributeError, _f)
     
     def test_setattr_getattr_special(self):

From 839bc99f941fd49fb00e5c2b8f9ca280edbf5bc9 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Wed, 24 Jun 2015 01:16:32 +0200
Subject: [PATCH 0230/1519] Updated changelog to prepare 0.10.0 release

---
 docs/changelog.rst | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3dfe82f66..d35551ce3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,9 +2,15 @@
 Changelog
 =========
 
+Changes in 0.10.1 - DEV
+=======================
 
-Changes in 0.9.X - DEV
-======================
+Changes in 0.10.0
+=================
+- Django support was removed and will be available as a separate extension. #958
+- Allow to load undeclared field with meta attribute 'strict': False #957
+- Support for PyMongo 3+ #946
+- Removed get_or_create() deprecated since 0.8.0. #300
 - Improve Document._created status when switch collection and db #1020
 - Queryset update doesn't go through field validation #453
 - Added support for specifying authentication source as option `authSource` in URI. #967
@@ -14,17 +20,14 @@ Changes in 0.9.X - DEV
 - Use sets for populating dbrefs to dereference
 - Fixed unpickled documents replacing the global field's list. #888
 - Fixed storage of microseconds in ComplexDateTimeField and unused separator option. #910
-- Django support was removed and will be available as a separate extension. #958
 - Don't send a "cls" option to ensureIndex (related to https://jira.mongodb.org/browse/SERVER-769)
 - Fix for updating sorting in SortedListField. #978
 - Added __ support to escape field name in fields lookup keywords that match operators names #949
-- Support for PyMongo 3+ #946
 - Fix for issue where FileField deletion did not free space in GridFS.
 - No_dereference() not respected on embedded docs containing reference. #517
 - Document save raise an exception if save_condition fails #1005
 - Fixes some internal _id handling issue. #961
 - Updated URL and Email Field regex validators, added schemes argument to URLField validation. #652
-- Removed get_or_create() deprecated since 0.8.0. #300
 - Capped collection multiple of 256. #1011
 - Added `BaseQuerySet.aggregate_sum` and `BaseQuerySet.aggregate_average` methods.
 - Fix for delete with write_concern {'w': 0}. #1008

From c6151e34e0a3f87c5d8ceb409c968a1f8cdee4a6 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Wed, 24 Jun 2015 12:39:21 +0200
Subject: [PATCH 0231/1519] Bumped version to 0.10.0

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index f1b2b30d8..474c21543 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -14,7 +14,7 @@
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
 
-VERSION = (0, 9, 0)
+VERSION = (0, 10, 0)
 
 
 def get_version():

From e43fae86f1e70ce517c518210171f09d9984286b Mon Sep 17 00:00:00 2001
From: emilecaron <emile.caron@outlook.com>
Date: Thu, 25 Jun 2015 15:37:15 +0000
Subject: [PATCH 0232/1519] reproduce RuntimeError

---
 tests/queryset/queryset.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 4f00e1c6a..1e279744a 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1413,6 +1413,20 @@ class BlogPost(AbstractBlogPost):
         self.Person.objects(name='Test User').delete()
         self.assertEqual(1, BlogPost.objects.count())
 
+    def test_reverse_delete_rule_cascade_cycle(self):
+        """Ensure reference cascading doesn't loop if reference graph isn't
+        a tree
+        """
+        class Category(Document):
+            reference = ReferenceField('self', reverse_delete_rule=CASCADE)
+
+        base = Category().save()
+        other = Category(reference=base).save()
+        base.reference = other
+        base.save()
+
+        self.assertEqual(2, base.delete())
+
     def test_reverse_delete_rule_cascade_self_referencing(self):
         """Ensure self-referencing CASCADE deletes do not result in infinite
         loop

From 1e3d2df9e7430593b73d4515553612cd737f6c8d Mon Sep 17 00:00:00 2001
From: emilecaron <emile.caron@outlook.com>
Date: Thu, 25 Jun 2015 15:40:12 +0000
Subject: [PATCH 0233/1519] fix illogicality

---
 mongoengine/queryset/base.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 50b2ee195..21d20dae9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -404,8 +404,7 @@ def delete(self, write_concern=None, _from_doc_delete=False):
             if rule == CASCADE:
                 ref_q = document_cls.objects(**{field_name + '__in': self})
                 ref_q_count = ref_q.count()
-                if (doc != document_cls and ref_q_count > 0 or
-                        (doc == document_cls and ref_q_count > 0)):
+                if ref_q_count > 0:
                     ref_q.delete(write_concern=write_concern)
             elif rule == NULLIFY:
                 document_cls.objects(**{field_name + '__in': self}).update(

From 02f61c323df31e6966e93ebd18c64ad9da7650ae Mon Sep 17 00:00:00 2001
From: emilecaron <emile.caron@outlook.com>
Date: Thu, 25 Jun 2015 18:26:52 +0000
Subject: [PATCH 0234/1519] update test

---
 tests/queryset/queryset.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 1e279744a..050b2d039 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1417,15 +1417,18 @@ def test_reverse_delete_rule_cascade_cycle(self):
         """Ensure reference cascading doesn't loop if reference graph isn't
         a tree
         """
-        class Category(Document):
+        class Dummy(Document):
             reference = ReferenceField('self', reverse_delete_rule=CASCADE)
 
-        base = Category().save()
-        other = Category(reference=base).save()
+        base = Dummy().save()
+        other = Dummy(reference=base).save()
         base.reference = other
         base.save()
 
-        self.assertEqual(2, base.delete())
+        base.delete()
+
+        self.assertRaises(DoesNotExist, base.reload)
+        self.assertRaises(DoesNotExist, other.reload)
 
     def test_reverse_delete_rule_cascade_self_referencing(self):
         """Ensure self-referencing CASCADE deletes do not result in infinite

From 646baddce45512e01367346a07195c6a30a613b3 Mon Sep 17 00:00:00 2001
From: emilecaron <emile.caron@outlook.com>
Date: Thu, 25 Jun 2015 18:27:22 +0000
Subject: [PATCH 0235/1519] fix cascade delete cycle issuue

---
 mongoengine/queryset/base.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 21d20dae9..df628c35b 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -346,7 +346,7 @@ def count(self, with_limit_and_skip=False):
             return 0
         return self._cursor.count(with_limit_and_skip=with_limit_and_skip)
 
-    def delete(self, write_concern=None, _from_doc_delete=False):
+    def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
         """Delete the documents matched by the query.
 
         :param write_concern: Extra keyword arguments are passed down which
@@ -363,6 +363,11 @@ def delete(self, write_concern=None, _from_doc_delete=False):
         queryset = self.clone()
         doc = queryset._document
 
+        cascade_refs = set() if cascade_refs is None else cascade_refs
+        if doc in cascade_refs:
+            return 0
+        cascade_refs.add(doc)
+
         if write_concern is None:
             write_concern = {}
 
@@ -405,7 +410,7 @@ def delete(self, write_concern=None, _from_doc_delete=False):
                 ref_q = document_cls.objects(**{field_name + '__in': self})
                 ref_q_count = ref_q.count()
                 if ref_q_count > 0:
-                    ref_q.delete(write_concern=write_concern)
+                    ref_q.delete(write_concern=write_concern, cascade_refs=cascade_refs)
             elif rule == NULLIFY:
                 document_cls.objects(**{field_name + '__in': self}).update(
                     write_concern=write_concern, **{'unset__%s' % field_name: 1})

From b691a56d5113b135c5ca077fc0c19aab4e9e26de Mon Sep 17 00:00:00 2001
From: emilecaron <emile.caron@outlook.com>
Date: Fri, 26 Jun 2015 08:52:30 +0000
Subject: [PATCH 0236/1519] late set instanciation

---
 mongoengine/queryset/base.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index df628c35b..317e47bc5 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -363,10 +363,8 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
         queryset = self.clone()
         doc = queryset._document
 
-        cascade_refs = set() if cascade_refs is None else cascade_refs
-        if doc in cascade_refs:
+        if cascade_refs and doc in cascade_refs:
             return 0
-        cascade_refs.add(doc)
 
         if write_concern is None:
             write_concern = {}
@@ -410,6 +408,8 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                 ref_q = document_cls.objects(**{field_name + '__in': self})
                 ref_q_count = ref_q.count()
                 if ref_q_count > 0:
+                    cascade_refs = set() if cascade_refs is None else cascade_refs
+                    cascade_refs.add(doc)
                     ref_q.delete(write_concern=write_concern, cascade_refs=cascade_refs)
             elif rule == NULLIFY:
                 document_cls.objects(**{field_name + '__in': self}).update(

From 9b7fe9ac312abab6f35664d8c35df53d313b1c80 Mon Sep 17 00:00:00 2001
From: emilecaron <emile.caron@outlook.com>
Date: Fri, 26 Jun 2015 09:31:07 +0000
Subject: [PATCH 0237/1519] restore broken behavior

---
 mongoengine/queryset/base.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 317e47bc5..496e05668 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -409,7 +409,8 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                 ref_q_count = ref_q.count()
                 if ref_q_count > 0:
                     cascade_refs = set() if cascade_refs is None else cascade_refs
-                    cascade_refs.add(doc)
+                    if doc != document_cls:
+                        cascade_refs.add(doc)
                     ref_q.delete(write_concern=write_concern, cascade_refs=cascade_refs)
             elif rule == NULLIFY:
                 document_cls.objects(**{field_name + '__in': self}).update(

From 56a2e07dc21ec8438510dd9ff5e9dbb0c079b474 Mon Sep 17 00:00:00 2001
From: emilecaron <emile.caron@outlook.com>
Date: Fri, 26 Jun 2015 10:45:07 +0000
Subject: [PATCH 0238/1519] always store docs in cascade_refs

---
 mongoengine/queryset/base.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 496e05668..8db8351f0 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -363,9 +363,6 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
         queryset = self.clone()
         doc = queryset._document
 
-        if cascade_refs and doc in cascade_refs:
-            return 0
-
         if write_concern is None:
             write_concern = {}
 
@@ -405,12 +402,12 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                 continue
             rule = doc._meta['delete_rules'][rule_entry]
             if rule == CASCADE:
-                ref_q = document_cls.objects(**{field_name + '__in': self})
+                cascade_refs = set() if cascade_refs is None else cascade_refs
+                for ref in queryset:
+                    cascade_refs.add(ref.id)
+                ref_q = document_cls.objects(**{field_name + '__in': self, 'id__nin': cascade_refs})
                 ref_q_count = ref_q.count()
                 if ref_q_count > 0:
-                    cascade_refs = set() if cascade_refs is None else cascade_refs
-                    if doc != document_cls:
-                        cascade_refs.add(doc)
                     ref_q.delete(write_concern=write_concern, cascade_refs=cascade_refs)
             elif rule == NULLIFY:
                 document_cls.objects(**{field_name + '__in': self}).update(

From 4525eb457b576aabb975445b5ef542519ea68b29 Mon Sep 17 00:00:00 2001
From: emilecaron <emile.caron@outlook.com>
Date: Fri, 26 Jun 2015 14:22:39 +0200
Subject: [PATCH 0239/1519] update changelog

---
 AUTHORS            | 2 +-
 docs/changelog.rst | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 29993c843..b0400f4d3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -226,4 +226,4 @@ that much better:
  * Emmanuel Leblond (https://github.com/touilleMan)
  * Breeze.Kay (https://github.com/9nix00)
  * Vicki Donchenko (https://github.com/kivistein)
-
+ * Emile Caron (https://github.com/emilecaron)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index d35551ce3..1fba7985e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -34,6 +34,7 @@ Changes in 0.10.0
 - Allow dynamic lookup for more than two parts. #882
 - Added support for min_distance on geo queries. #831
 - Allow to add custom metadata to fields #705
+- Fix infinite recursion with CASCADE delete rules under specific conditions. #1046
 
 Changes in 0.9.0
 ================

From 4dc158589c1eab2313a905deff8a97a989cce558 Mon Sep 17 00:00:00 2001
From: Matthieu Rigal <matt.rigal@gmail.com>
Date: Fri, 26 Jun 2015 17:58:53 +0200
Subject: [PATCH 0240/1519] Moved change to right place and added fancier test

---
 docs/changelog.rst         |  2 +-
 tests/queryset/queryset.py | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1fba7985e..de47000db 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Changes in 0.10.1 - DEV
 =======================
+- Fix infinite recursion with CASCADE delete rules under specific conditions. #1046
 
 Changes in 0.10.0
 =================
@@ -34,7 +35,6 @@ Changes in 0.10.0
 - Allow dynamic lookup for more than two parts. #882
 - Added support for min_distance on geo queries. #831
 - Allow to add custom metadata to fields #705
-- Fix infinite recursion with CASCADE delete rules under specific conditions. #1046
 
 Changes in 0.9.0
 ================
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 050b2d039..9f4cd9b9a 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1430,6 +1430,30 @@ class Dummy(Document):
         self.assertRaises(DoesNotExist, base.reload)
         self.assertRaises(DoesNotExist, other.reload)
 
+    def test_reverse_delete_rule_cascade_complex_cycle(self):
+        """Ensure reference cascading doesn't loop if reference graph isn't
+        a tree
+        """
+        class Category(Document):
+            name = StringField()
+
+        class Dummy(Document):
+            reference = ReferenceField('self', reverse_delete_rule=CASCADE)
+            cat = ReferenceField(Category, reverse_delete_rule=CASCADE)
+
+        cat = Category(name='cat').save()
+        base = Dummy(cat=cat).save()
+        other = Dummy(reference=base).save()
+        other2 = Dummy(reference=other).save()
+        base.reference = other
+        base.save()
+
+        cat.delete()
+
+        self.assertRaises(DoesNotExist, base.reload)
+        self.assertRaises(DoesNotExist, other.reload)
+        self.assertRaises(DoesNotExist, other2.reload)
+
     def test_reverse_delete_rule_cascade_self_referencing(self):
         """Ensure self-referencing CASCADE deletes do not result in infinite
         loop

From 9ce605221a5dc1e43f65c57d80046cc995a34c69 Mon Sep 17 00:00:00 2001
From: amitlicht <amitlicht@gmail.com>
Date: Sun, 28 Jun 2015 17:53:20 +0300
Subject: [PATCH 0241/1519] Suggested fix for #1047: CachedReferenceField
 creates DBRef on to_python, but can't save them on to_mongo. Dereferencing
 DBRef to document type before returning it from to_python.

---
 mongoengine/fields.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index bc16d1b63..63c708b2f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1034,6 +1034,7 @@ def to_python(self, value):
             collection = self.document_type._get_collection_name()
             value = DBRef(
                 collection, self.document_type.id.to_python(value['_id']))
+            return self.document_type._from_son(self.document_type._get_db().dereference(value))
 
         return value
 

From d7a2ccf5ac35007378b6960653159193138f7f24 Mon Sep 17 00:00:00 2001
From: amitlicht <amitlicht@gmail.com>
Date: Tue, 30 Jun 2015 15:03:06 +0300
Subject: [PATCH 0242/1519] Adding a test case for #1047.

---
 tests/fields/fields.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 011a54d4a..a772de6d8 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1617,6 +1617,27 @@ class Person(Document):
                                'parent': "50a234ea469ac1eda42d347d"})
         mongoed = p1.to_mongo()
         self.assertTrue(isinstance(mongoed['parent'], ObjectId))
+        
+    def test_cached_reference_field_get_and_save(self):
+        """
+        Tests #1047: CachedReferenceField creates DBRefs on to_python, but can't save them on to_mongo
+        """
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(Animal)
+        
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
+        
+        Ocorrence(person="testte", 
+                  animal=Animal(name="Leopard", tag="heavy").save()).save()
+        p = Ocorrence.objects.get()
+        p.person = 'new_testte'
+        p.save()
 
     def test_cached_reference_fields(self):
         class Animal(Document):

From 6f16d35a9245f6edef8b8007df3beb34ceb01e02 Mon Sep 17 00:00:00 2001
From: amitlicht <amitlicht@gmail.com>
Date: Tue, 30 Jun 2015 15:08:20 +0300
Subject: [PATCH 0243/1519] Adding a changelog line & adding myself to AUTHORS.

---
 AUTHORS            | 1 +
 docs/changelog.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index b0400f4d3..a66bf7c01 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -227,3 +227,4 @@ that much better:
  * Breeze.Kay (https://github.com/9nix00)
  * Vicki Donchenko (https://github.com/kivistein)
  * Emile Caron (https://github.com/emilecaron)
+ * Amit Lichtenberg (https://github.com/amitlicht)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index de47000db..d521c010d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Changes in 0.10.1 - DEV
 =======================
 - Fix infinite recursion with CASCADE delete rules under specific conditions. #1046
+- Fix CachedReferenceField bug when loading cached docs as DBRef but failing to save them. #1047
 
 Changes in 0.10.0
 =================

From 2aaacc02e34dc52236ba7e275062e02911bcda45 Mon Sep 17 00:00:00 2001
From: Zeke Huang <zxhuang@gmail.com>
Date: Wed, 1 Jul 2015 12:39:30 -0700
Subject: [PATCH 0244/1519] comply to pymongo MongoClient constructor host

Only MongoReplicaSetClient use hosts_or_uri param and it will be deprecated soon.
---
 mongoengine/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index cb1a731f7..e22f61d29 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -108,7 +108,6 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
 
         connection_class = MongoClient
         if 'replicaSet' in conn_settings:
-            conn_settings['hosts_or_uri'] = conn_settings.pop('host', None)
             # Discard port since it can't be used on MongoReplicaSetClient
             conn_settings.pop('port', None)
             # Discard replicaSet if not base string
@@ -116,6 +115,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
                 conn_settings.pop('replicaSet', None)
             if not IS_PYMONGO_3:
                 connection_class = MongoReplicaSetClient
+                conn_settings['hosts_or_uri'] = conn_settings.pop('host', None)
 
         try:
             connection = None

From 5334ea393ede06837fbef19414e5961b9129fe66 Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Sun, 28 Jun 2015 20:33:35 +0300
Subject: [PATCH 0245/1519] fix-#842: Fix ignored chained options

---
 docs/changelog.rst           | 1 +
 mongoengine/queryset/base.py | 8 +-------
 tests/document/indexes.py    | 4 ++--
 tests/queryset/queryset.py   | 4 ++++
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d521c010d..c512eca00 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changes in 0.10.1 - DEV
 =======================
 - Fix infinite recursion with CASCADE delete rules under specific conditions. #1046
 - Fix CachedReferenceField bug when loading cached docs as DBRef but failing to save them. #1047
+- Fix ignored chained options #842
 
 Changes in 0.10.0
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 8db8351f0..0e183889b 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -684,11 +684,7 @@ def limit(self, n):
         :param n: the maximum number of objects to return
         """
         queryset = self.clone()
-        if n == 0:
-            queryset._cursor.limit(1)
-        else:
-            queryset._cursor.limit(n)
-        queryset._limit = n
+        queryset._limit = n if n != 0 else 1
         # Return self to allow chaining
         return queryset
 
@@ -699,7 +695,6 @@ def skip(self, n):
         :param n: the number of objects to skip before returning results
         """
         queryset = self.clone()
-        queryset._cursor.skip(n)
         queryset._skip = n
         return queryset
 
@@ -717,7 +712,6 @@ def hint(self, index=None):
         .. versionadded:: 0.5
         """
         queryset = self.clone()
-        queryset._cursor.hint(index)
         queryset._hint = index
         return queryset
 
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index db1b45622..ccc6cf446 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -577,11 +577,11 @@ class BlogPost(Document):
             self.assertEqual(BlogPost.objects.hint('tags').count(), 10)
         else:
             def invalid_index():
-                BlogPost.objects.hint('tags')
+                BlogPost.objects.hint('tags').next()
             self.assertRaises(TypeError, invalid_index)
 
         def invalid_index_2():
-            return BlogPost.objects.hint(('tags', 1))
+            return BlogPost.objects.hint(('tags', 1)).next()
         self.assertRaises(Exception, invalid_index_2)
 
     def test_unique(self):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 9f4cd9b9a..a2b839d65 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -188,6 +188,10 @@ def test_find(self):
             "[<Person: Person object>, <Person: Person object>]",  "%s" % self.Person.objects[1:3])
         self.assertEqual(
             "[<Person: Person object>, <Person: Person object>]",  "%s" % self.Person.objects[51:53])
+        # Test only after limit
+        self.assertEqual(self.Person.objects().limit(2).only('name')[0].age, None)
+        # Test only after skip
+        self.assertEqual(self.Person.objects().skip(2).only('name')[0].age, None)
 
     def test_find_one(self):
         """Ensure that a query using find_one returns a valid result.

From a5fb009b62e7e7aca00ca1e53bf1648c30ac9c38 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Mon, 6 Jul 2015 02:33:43 +0200
Subject: [PATCH 0246/1519] Fix GenericReferenceField choices with DBRef and
 let it possible to set Document choice as string

---
 mongoengine/base/fields.py | 33 ++++++++++++----------
 mongoengine/fields.py      | 29 ++++++++++++++++++++
 tests/fields/fields.py     | 56 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 15 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 21a243585..5b62cb7b9 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -165,26 +165,29 @@ def validate(self, value, clean=True):
         """
         pass
 
-    def _validate(self, value, **kwargs):
+    def _validate_choices(self, value):
         Document = _import_class('Document')
         EmbeddedDocument = _import_class('EmbeddedDocument')
 
+        choice_list = self.choices
+        if isinstance(choice_list[0], (list, tuple)):
+            choice_list = [k for k, v in choice_list]
+
+        # Choices which are other types of Documents
+        if isinstance(value, (Document, EmbeddedDocument)):
+            if not any(isinstance(value, c) for c in choice_list):
+                self.error(
+                    'Value must be instance of %s' % unicode(choice_list)
+                )
+        # Choices which are types other than Documents
+        elif value not in choice_list:
+            self.error('Value must be one of %s' % unicode(choice_list))
+
+
+    def _validate(self, value, **kwargs):
         # Check the Choices Constraint
         if self.choices:
-
-            choice_list = self.choices
-            if isinstance(self.choices[0], (list, tuple)):
-                choice_list = [k for k, v in self.choices]
-
-            # Choices which are other types of Documents
-            if isinstance(value, (Document, EmbeddedDocument)):
-                if not any(isinstance(value, c) for c in choice_list):
-                    self.error(
-                        'Value must be instance of %s' % unicode(choice_list)
-                    )
-            # Choices which are types other than Documents
-            elif value not in choice_list:
-                self.error('Value must be one of %s' % unicode(choice_list))
+            self._validate_choices(value)
 
         # check validation argument
         if self.validation is not None:
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 63c708b2f..098988e02 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1140,6 +1140,35 @@ class GenericReferenceField(BaseField):
     .. versionadded:: 0.3
     """
 
+    def __init__(self, *args, **kwargs):
+        choices = kwargs.pop('choices', None)
+        super(GenericReferenceField, self).__init__(*args, **kwargs)
+        self._original_choices = choices or []
+        self._cooked_choices = None
+
+    def _validate_choices(self, value):
+        if isinstance(value, dict):
+            # If the field has not been dereferenced, it is still a dict
+            # of class and DBRef
+            if value.get('_cls') in [c.__name__ for c in self.choices]:
+                return
+        super(GenericReferenceField, self)._validate_choices(value)
+
+    @property
+    def choices(self):
+        if self._cooked_choices is None:
+            self._cooked_choices = []
+            for choice in self._original_choices:
+                if isinstance(choice, basestring):
+                    choice = get_document(choice)
+                self._cooked_choices.append(choice)
+        return self._cooked_choices
+
+    @choices.setter
+    def choices(self, value):
+        self._original_choices = value
+        self._cooked_choices = None
+
     def __get__(self, instance, owner):
         if instance is None:
             return self
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index a772de6d8..9f9db25d6 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2396,6 +2396,62 @@ class Bookmark(Document):
         bm = Bookmark.objects.first()
         self.assertEqual(bm.bookmark_object, post_1)
 
+    def test_generic_reference_string_choices(self):
+        """Ensure that a GenericReferenceField can handle choices as strings
+        """
+        class Link(Document):
+            title = StringField()
+
+        class Post(Document):
+            title = StringField()
+
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField(choices=('Post', Link))
+
+        Link.drop_collection()
+        Post.drop_collection()
+        Bookmark.drop_collection()
+
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        bm = Bookmark(bookmark_object=link_1)
+        bm.save()
+
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
+
+        bm = Bookmark(bookmark_object=bm)
+        self.assertRaises(ValidationError, bm.validate)
+
+    def test_generic_reference_choices_no_dereference(self):
+        """Ensure that a GenericReferenceField can handle choices on
+        non-derefenreced (i.e. DBRef) elements
+        """
+        class Post(Document):
+            title = StringField()
+
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField(choices=(Post, ))
+            other_field = StringField()
+
+        Post.drop_collection()
+        Bookmark.drop_collection()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
+
+        bm = Bookmark.objects.get(id=bm.id)
+        # bookmark_object is now a DBRef
+        bm.other_field = 'dummy_change'
+        bm.save()
+
     def test_generic_reference_list_choices(self):
         """Ensure that a ListField properly dereferences generic references and
         respects choices.

From 34c67907624773e0bf2f1f14589d8c3c88b438b9 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Mon, 6 Jul 2015 10:10:05 +0200
Subject: [PATCH 0247/1519] Simplify implementation of choices in
 GenericReferenceField

---
 mongoengine/fields.py | 33 ++++++++++++++-------------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 098988e02..695f5caa1 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1143,32 +1143,27 @@ class GenericReferenceField(BaseField):
     def __init__(self, *args, **kwargs):
         choices = kwargs.pop('choices', None)
         super(GenericReferenceField, self).__init__(*args, **kwargs)
-        self._original_choices = choices or []
-        self._cooked_choices = None
+        self.choices = []
+        # Keep the choices as a list of allowed Document class names
+        if choices:
+            for choice in choices:
+                if isinstance(choice, basestring):
+                    self.choices.append(choice)
+                elif isinstance(choice, type) and issubclass(choice, Document):
+                    self.choices.append(choice._class_name)
+                else:
+                    self.error('Invalid choices provided: must be a list of'
+                               'Document subclasses and/or basestrings')
 
     def _validate_choices(self, value):
         if isinstance(value, dict):
             # If the field has not been dereferenced, it is still a dict
             # of class and DBRef
-            if value.get('_cls') in [c.__name__ for c in self.choices]:
-                return
+            value = value.get('_cls')
+        elif isinstance(value, Document):
+            value = value._class_name
         super(GenericReferenceField, self)._validate_choices(value)
 
-    @property
-    def choices(self):
-        if self._cooked_choices is None:
-            self._cooked_choices = []
-            for choice in self._original_choices:
-                if isinstance(choice, basestring):
-                    choice = get_document(choice)
-                self._cooked_choices.append(choice)
-        return self._cooked_choices
-
-    @choices.setter
-    def choices(self, value):
-        self._original_choices = value
-        self._cooked_choices = None
-
     def __get__(self, instance, owner):
         if instance is None:
             return self

From bebce2c0538f7fa39fe34058e4adcecc16afecf9 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Thu, 9 Jul 2015 10:51:04 +0200
Subject: [PATCH 0248/1519] Clean ununsed variables in iterations

---
 mongoengine/base/fields.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 5b62cb7b9..304c084db 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -171,7 +171,7 @@ def _validate_choices(self, value):
 
         choice_list = self.choices
         if isinstance(choice_list[0], (list, tuple)):
-            choice_list = [k for k, v in choice_list]
+            choice_list = [k for k, _ in choice_list]
 
         # Choices which are other types of Documents
         if isinstance(value, (Document, EmbeddedDocument)):
@@ -311,7 +311,7 @@ def to_python(self, value):
                     value_dict[k] = self.to_python(v)
 
         if is_list:  # Convert back to a list
-            return [v for k, v in sorted(value_dict.items(),
+            return [v for _, v in sorted(value_dict.items(),
                                          key=operator.itemgetter(0))]
         return value_dict
 
@@ -378,7 +378,7 @@ def to_mongo(self, value):
                     value_dict[k] = self.to_mongo(v)
 
         if is_list:  # Convert back to a list
-            return [v for k, v in sorted(value_dict.items(),
+            return [v for _, v in sorted(value_dict.items(),
                                          key=operator.itemgetter(0))]
         return value_dict
 

From a3e0fbd606eec9319d980dc618fbf4d17e22f508 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 15 Jul 2015 11:15:40 +0200
Subject: [PATCH 0249/1519] Add SaveConditionError exception

---
 mongoengine/document.py | 7 ++++---
 mongoengine/errors.py   | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index c54987501..70abadccf 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -16,7 +16,8 @@
     ALLOW_INHERITANCE,
     get_document
 )
-from mongoengine.errors import InvalidQueryError, InvalidDocumentError
+from mongoengine.errors import (InvalidQueryError, InvalidDocumentError,
+                                SaveConditionError)
 from mongoengine.python_support import IS_PYMONGO_3
 from mongoengine.queryset import (OperationError, NotUniqueError,
                                   QuerySet, transform)
@@ -359,8 +360,8 @@ def is_new_object(last_error):
                     last_error = collection.update(select_dict, update_query,
                                                    upsert=upsert, **write_concern)
                     if not upsert and last_error['nModified'] == 0:
-                        raise OperationError('Race condition preventing'
-                                             ' document update detected')
+                        raise SaveConditionError('Race condition preventing'
+                                                 ' document update detected')
                     created = is_new_object(last_error)
 
             if cascade is None:
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index b7fb7632e..2c5c2946f 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -41,6 +41,10 @@ class NotUniqueError(OperationError):
     pass
 
 
+class SaveConditionError(OperationError):
+    pass
+
+
 class FieldDoesNotExist(Exception):
     """Raised when trying to set a field
     not declared in a :class:`~mongoengine.Document`

From 3ffaf2c0e12ab59940baa1bec3f072b7133f1e4f Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 15 Jul 2015 11:59:29 +0200
Subject: [PATCH 0250/1519] Correct SaveConditionError involved tests

---
 tests/document/instance.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index ea7d56682..7a3934160 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -17,7 +17,7 @@
 from mongoengine import *
 from mongoengine.errors import (NotRegistered, InvalidDocumentError,
                                 InvalidQueryError, NotUniqueError,
-                                FieldDoesNotExist)
+                                FieldDoesNotExist, SaveConditionError)
 from mongoengine.queryset import NULLIFY, Q
 from mongoengine.connection import get_db
 from mongoengine.base import get_document
@@ -1021,7 +1021,7 @@ def UUID(i):
         flip(w1)
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
-        self.assertRaises(OperationError,
+        self.assertRaises(SaveConditionError,
             w1.save, save_condition={'save_id': UUID(42)})
         w1.reload()
         self.assertFalse(w1.toggle)
@@ -1050,7 +1050,7 @@ def UUID(i):
         self.assertEqual(w1.count, 2)
         flip(w2)
         flip(w2)
-        self.assertRaises(OperationError,
+        self.assertRaises(SaveConditionError,
             w2.save, save_condition={'save_id': old_id})
         w2.reload()
         self.assertFalse(w2.toggle)
@@ -1063,7 +1063,7 @@ def UUID(i):
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)
         flip(w1)
-        self.assertRaises(OperationError,
+        self.assertRaises(SaveConditionError,
             w1.save, save_condition={'count__gte': w1.count})
         w1.reload()
         self.assertTrue(w1.toggle)

From 0752c6b24f163cdfd763609e620dff2c31661294 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Sun, 19 Jul 2015 10:33:54 +0200
Subject: [PATCH 0251/1519] Update changelog for #1070

---
 docs/changelog.rst      | 1 +
 mongoengine/document.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c512eca00..4334ae5a0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changes in 0.10.1 - DEV
 - Fix infinite recursion with CASCADE delete rules under specific conditions. #1046
 - Fix CachedReferenceField bug when loading cached docs as DBRef but failing to save them. #1047
 - Fix ignored chained options #842
+- Document save's save_condition error raises `SaveConditionError` exception #1070
 
 Changes in 0.10.0
 =================
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 70abadccf..d68d6d652 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -295,6 +295,8 @@ def save(self, force_insert=False, validate=True, clean=True,
             if the condition is satisfied in the current db record.
         .. versionchanged:: 0.10
             :class:`OperationError` exception raised if save_condition fails.
+        .. versionchanged:: 0.10.1
+            :class: save_condition failure now raises a `SaveConditionError`
         """
         signals.pre_save.send(self.__class__, document=self)
 

From 6d991586fdefc4a050ff0b6dd6b18371e2240376 Mon Sep 17 00:00:00 2001
From: optik <tomek@greymatter.pl>
Date: Fri, 24 Jul 2015 15:26:10 +0200
Subject: [PATCH 0252/1519] Bad property name for indices description in docs

The correct name for MongoDB index definition property is weights not weight. Using "weight" will cause "Index with name ... already exists with different options"
---
 docs/guide/text-indexes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/text-indexes.rst b/docs/guide/text-indexes.rst
index 695159c62..725ad3699 100644
--- a/docs/guide/text-indexes.rst
+++ b/docs/guide/text-indexes.rst
@@ -17,7 +17,7 @@ Use the *$* prefix to set a text index, Look the declaration::
       meta = {'indexes': [
           {'fields': ['$title', "$content"],
            'default_language': 'english',
-           'weight': {'title': 10, 'content': 2}
+           'weights': {'title': 10, 'content': 2}
           }
       ]}
 

From a70ef5594d5e0ac378c8d718dc5bca2dfeeca7f3 Mon Sep 17 00:00:00 2001
From: marcoskv <marco.skv@gmail.com>
Date: Sun, 26 Jul 2015 22:41:24 +0200
Subject: [PATCH 0253/1519]  QuerySet count vs len #937

Current documentation does not consider performance issues in using len instead of count.
https://github.com/MongoEngine/mongoengine/issues/937
---
 docs/guide/querying.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index f2e71b045..5f7a3de9d 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -347,6 +347,8 @@ way of achieving this::
 
     num_users = len(User.objects)
 
+Even if len() is the Pythonic way of counting results, keep in mind that if you concerned about performance, :meth:`~mongoengine.queryset.QuerySet.count` is the way to go since it only execute a server side count query, while len() retrieves the results, places them in cache, and finally counts them. If we compare the performance of the two operations, len() is much slower than :meth:`~mongoengine.queryset.QuerySet.count`.
+
 Further aggregation
 -------------------
 You may sum over the values of a specific field on documents using

From 96cfbb201abd09e6f4c824a8bc771b2f2b235be2 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 4 Aug 2015 18:02:57 +0200
Subject: [PATCH 0254/1519] Replace use close method in pymongo

---
 mongoengine/connection.py | 2 +-
 tests/test_connection.py  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index cb1a731f7..5f62d6cf8 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -81,7 +81,7 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
     global _dbs
 
     if alias in _connections:
-        get_connection(alias=alias).disconnect()
+        get_connection(alias=alias).close()
         del _connections[alias]
     if alias in _dbs:
         del _dbs[alias]
diff --git a/tests/test_connection.py b/tests/test_connection.py
index e9477b79c..1b7b7a222 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -51,6 +51,14 @@ def test_connect(self):
         conn = get_connection('testdb')
         self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
 
+    def test_disconnect(self):
+        """Ensure that the disconnect() method works properly
+        """
+        conn1 = connect('mongoenginetest')
+        mongoengine.connection.disconnect()
+        conn2 = connect('mongoenginetest')
+        self.assertTrue(conn1 is not conn2)
+
     def test_sharing_connections(self):
         """Ensure that connections are shared when the connection settings are exactly the same
         """

From 10832a2ccc469d7164d590be461a2ea517a03928 Mon Sep 17 00:00:00 2001
From: Momchil Rogelov <momchilrogelov@gmail.com>
Date: Wed, 12 Aug 2015 10:57:20 +0100
Subject: [PATCH 0255/1519] save_condition falls back to "n" if "nModified" is
 not found to support mongo 2.4

---
 mongoengine/document.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index d68d6d652..cfbebde29 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -361,7 +361,8 @@ def is_new_object(last_error):
                     upsert = save_condition is None
                     last_error = collection.update(select_dict, update_query,
                                                    upsert=upsert, **write_concern)
-                    if not upsert and last_error['nModified'] == 0:
+                    n_modified = last_error.get('nModified', last_error["n"])
+                    if not upsert and n_modified == 0:
                         raise SaveConditionError('Race condition preventing'
                                                  ' document update detected')
                     created = is_new_object(last_error)

From b4ce14d74481380d52721b7b88dcfdaea42f9882 Mon Sep 17 00:00:00 2001
From: Momchil Rogelov <momchilrogelov@gmail.com>
Date: Thu, 13 Aug 2015 10:11:42 +0100
Subject: [PATCH 0256/1519] use n instead of nModified in save_condition

---
 mongoengine/document.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index cfbebde29..332c9a38a 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -361,8 +361,7 @@ def is_new_object(last_error):
                     upsert = save_condition is None
                     last_error = collection.update(select_dict, update_query,
                                                    upsert=upsert, **write_concern)
-                    n_modified = last_error.get('nModified', last_error["n"])
-                    if not upsert and n_modified == 0:
+                    if not upsert and last_error["n"] == 0:
                         raise SaveConditionError('Race condition preventing'
                                                  ' document update detected')
                     created = is_new_object(last_error)

From 736fe5b84e3533599de66b3b96412c3301afb9fd Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Sun, 30 Aug 2015 10:01:24 +0200
Subject: [PATCH 0257/1519] Fix unwanted dereference in DictField (issue #1058)

---
 mongoengine/fields.py  |  1 +
 tests/fields/fields.py | 71 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 695f5caa1..f58993111 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -794,6 +794,7 @@ class DictField(ComplexBaseField):
 
     def __init__(self, basecls=None, field=None, *args, **kwargs):
         self.field = field
+        self._auto_dereference = False
         self.basecls = basecls or BaseField
         if not issubclass(self.basecls, BaseField):
             self.error('DictField only accepts dict values')
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 9f9db25d6..7ef298fc5 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1257,6 +1257,44 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
+    def test_dictfield_dump_document(self):
+        """Ensure a DictField can handle another document's dump
+        """
+        class Doc(Document):
+            field = DictField()
+
+        class ToEmbed(Document):
+            id = IntField(primary_key=True, default=1)
+            recursive = DictField()
+
+        class ToEmbedParent(Document):
+            id = IntField(primary_key=True, default=1)
+            recursive = DictField()
+
+            meta = {'allow_inheritance': True}
+
+        class ToEmbedChild(ToEmbedParent):
+            pass
+
+        to_embed_recursive = ToEmbed(id=1).save()
+        to_embed = ToEmbed(
+            id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
+        doc = Doc(field=to_embed.to_mongo().to_dict())
+        doc.save()
+        assert isinstance(doc.field, dict)
+        assert doc.field == {'_id': 2, 'recursive': {'_id': 1, 'recursive': {}}}
+        # Same thing with a Document with a _cls field
+        to_embed_recursive = ToEmbedChild(id=1).save()
+        to_embed_child = ToEmbedChild(
+            id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
+        doc = Doc(field=to_embed_child.to_mongo().to_dict())
+        doc.save()
+        assert isinstance(doc.field, dict)
+        assert doc.field == {
+            '_id': 2, '_cls': 'ToEmbedParent.ToEmbedChild',
+            'recursive': {'_id': 1, '_cls': 'ToEmbedParent.ToEmbedChild', 'recursive': {}}
+        }
+
     def test_dictfield_strict(self):
         """Ensure that dict field handles validation if provided a strict field type."""
 
@@ -3327,6 +3365,39 @@ class Doc(Document):
         doc = Doc.objects.get()
         self.assertEqual(doc.embed_me.field_1, "hello")
 
+    def test_dynamicfield_dump_document(self):
+        """Ensure a DynamicField can handle another document's dump
+        """
+        class Doc(Document):
+            field = DynamicField()
+
+        class ToEmbed(Document):
+            id = IntField(primary_key=True, default=1)
+            recursive = DynamicField()
+
+        class ToEmbedParent(Document):
+            id = IntField(primary_key=True, default=1)
+            recursive = DynamicField()
+
+            meta = {'allow_inheritance': True}
+
+        class ToEmbedChild(ToEmbedParent):
+            pass
+
+        to_embed_recursive = ToEmbed(id=1).save()
+        to_embed = ToEmbed(id=2, recursive=to_embed_recursive).save()
+        doc = Doc(field=to_embed)
+        doc.save()
+        assert isinstance(doc.field, ToEmbed)
+        assert doc.field == to_embed
+        # Same thing with a Document with a _cls field
+        to_embed_recursive = ToEmbedChild(id=1).save()
+        to_embed_child = ToEmbedChild(id=2, recursive=to_embed_recursive).save()
+        doc = Doc(field=to_embed_child)
+        doc.save()
+        assert isinstance(doc.field, ToEmbedChild)
+        assert doc.field == to_embed_child
+
     def test_invalid_dict_value(self):
         class DictFieldTest(Document):
             dictionary = DictField(required=True)

From a6a102152136cc027e6454d07dc57eefbf3027b4 Mon Sep 17 00:00:00 2001
From: Catstyle <Catstyle.Lee@gmail.com>
Date: Tue, 30 Jun 2015 11:45:17 +0800
Subject: [PATCH 0258/1519] use obj._data instead of self._fields_ordered since
 DynamicDocument missing some attributes

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 332c9a38a..9d2d9c5fb 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -591,7 +591,7 @@ def reload(self, *fields, **kwargs):
         else:
             raise self.DoesNotExist("Document does not exist")
 
-        for field in self._fields_ordered:
+        for field in obj._data:
             if not fields or field in fields:
                 try:
                     setattr(self, field, self._reload(field, obj[field]))

From ba0934e41e8d5e7bfb6cb9a24a04509ebee98c68 Mon Sep 17 00:00:00 2001
From: Catstyle <Catstyle.Lee@gmail.com>
Date: Tue, 30 Jun 2015 14:02:03 +0800
Subject: [PATCH 0259/1519] added DynamicTest.test_reload_dynamic_field

---
 tests/document/dynamic.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/document/dynamic.py b/tests/document/dynamic.py
index e4289bd28..85325b06b 100644
--- a/tests/document/dynamic.py
+++ b/tests/document/dynamic.py
@@ -88,6 +88,18 @@ def test_reload_after_unsetting(self):
         p.update(unset__misc=1)
         p.reload()
 
+    def test_reload_dynamic_field(self):
+        self.Person.objects.delete()
+        p = self.Person.objects.create()
+        p.update(age=1)
+
+        self.assertEqual(len(p._data), 3)
+        self.assertEqual(sorted(p._data.keys()), ['_cls', 'id', 'name'])
+
+        p.reload()
+        self.assertEqual(len(p._data), 4)
+        self.assertEqual(sorted(p._data.keys()), ['_cls', 'age', 'id', 'name'])
+
     def test_dynamic_document_queries(self):
         """Ensure we can query dynamic fields"""
         p = self.Person()

From 7580383d266809e9b8ddb89b39cad8e190eedb7b Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 2 Sep 2015 19:00:18 +0200
Subject: [PATCH 0260/1519] Add #1050 fix to changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4334ae5a0..1300b5fdb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Changes in 0.10.1 - DEV
 - Fix CachedReferenceField bug when loading cached docs as DBRef but failing to save them. #1047
 - Fix ignored chained options #842
 - Document save's save_condition error raises `SaveConditionError` exception #1070
+- Fix Document.reload for DynamicDocument. #1050
 
 Changes in 0.10.0
 =================

From 92b9cb5d435f20e507de5d940b881906075c2f87 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 8 Sep 2015 17:35:35 +0200
Subject: [PATCH 0261/1519] Add drop_collection for test_subclass_field_query

---
 tests/queryset/queryset.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index a2b839d65..944c6fc13 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4794,6 +4794,8 @@ class Cat(Animal):
         class ScottishCat(Cat):
             folded_ears = BooleanField()
 
+        Animal.drop_collection()
+
         Animal(is_mamal=False).save()
         Cat(is_mamal=True, whiskers_length=5.1).save()
         ScottishCat(is_mamal=True, folded_ears=True).save()

From 6355c404ccc6feaf0c0006825b1574fb2e5e39e1 Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Wed, 16 Sep 2015 20:26:32 +0300
Subject: [PATCH 0262/1519] fix-#1105: StrictDict & SemiStrictDict are shadowed
 at init time

---
 docs/changelog.rst           | 1 +
 mongoengine/base/document.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1300b5fdb..4e9dea587 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,7 @@ Changes in 0.10.1 - DEV
 - Fix ignored chained options #842
 - Document save's save_condition error raises `SaveConditionError` exception #1070
 - Fix Document.reload for DynamicDocument. #1050
+- StrictDict & SemiStrictDict are shadowed at init time. #1105
 
 Changes in 0.10.0
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index ee807cb43..6353162ab 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -85,7 +85,6 @@ def __init__(self, *args, **values):
             self._data = SemiStrictDict.create(
                 allowed_keys=self._fields_ordered)()
 
-        self._data = {}
         self._dynamic_fields = SON()
 
         # Assign default values to instance

From 5a038de1d52405e32602b238cb66b4c3f779fc7c Mon Sep 17 00:00:00 2001
From: Lars Butler <Lars.Butler@gmail.com>
Date: Mon, 5 Oct 2015 14:31:41 +0200
Subject: [PATCH 0263/1519] fields.ReferenceField: add integer values to
 `reverse_delete_rule` docs

When I first tried to use the `reverse_delete_rule` feature of
`ReferenceField`, I had to dig through the source code to find what the
actual integer values were expected to be for DO_NOTHING, NULLIFY,
CASCADE, DENY, and PULL (or at least, where these constants were defined
so that I could import and use them). This patch adds the integer values
for those constants (which are defined in mongoengine.queryset.base) to
the docs so that users can easily choose the correct integer value.

Note: A possible improvement on this change would be to include
`mongoengine.queryset.base` module documentation in the generated docs,
and then update the `ReferenceField` docs to link to the documentation
of these constants (DO_NOTHING, NULLIFY, etc.).
---
 mongoengine/fields.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f58993111..ad3c468bf 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -863,12 +863,11 @@ class ReferenceField(BaseField):
 
     The options are:
 
-      * DO_NOTHING  - don't do anything (default).
-      * NULLIFY     - Updates the reference to null.
-      * CASCADE     - Deletes the documents associated with the reference.
-      * DENY        - Prevent the deletion of the reference object.
-      * PULL        - Pull the reference from a :class:`~mongoengine.fields.ListField`
-                      of references
+      * DO_NOTHING (0)  - don't do anything (default).
+      * NULLIFY    (1)  - Updates the reference to null.
+      * CASCADE    (2)  - Deletes the documents associated with the reference.
+      * DENY       (3)  - Prevent the deletion of the reference object.
+      * PULL       (4)  - Pull the reference from a :class:`~mongoengine.fields.ListField` of references
 
     Alternative syntax for registering delete rules (useful when implementing
     bi-directional delete rules)

From 11024deaae1cb22cfef117dc65643a22eac050a7 Mon Sep 17 00:00:00 2001
From: Kirill Kuzminykh <cykooz@gmail.com>
Date: Mon, 5 Oct 2015 22:40:44 +0300
Subject: [PATCH 0264/1519] Fixed detection of shared connections

---
 mongoengine/connection.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 4abca1ab7..cf2bd41ce 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -126,6 +126,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
                 connection_settings.pop('name', None)
                 connection_settings.pop('username', None)
                 connection_settings.pop('password', None)
+                connection_settings.pop('authentication_source', None)
                 if conn_settings == connection_settings and _connections.get(db_alias, None):
                     connection = _connections[db_alias]
                     break

From 35a0142f9b1e7a9862737f78da9ac4438f61338e Mon Sep 17 00:00:00 2001
From: Lars Butler <Lars.Butler@gmail.com>
Date: Mon, 5 Oct 2015 12:03:46 +0200
Subject: [PATCH 0265/1519] setup.py, tox.ini: move nose/rednose from install
 deps to test deps

Remove nose/rednose from `setup_requires` and instead declare them in
`tests_require`. Also explicitly add `nose` and `rednose` to
dependencies list in tox.ini (to avoid breaking test runs).

`python setup.py nosetests` is the preferred way for running tests, and
this works, except that placing test deps (nose/rednose) in the
`setup_requires` also means that these dependencies are pulled in for
installs of mongoengine. These deps are not actually be required just
to run mongoengine, so setup.py should not force users to install these
dependencies.

This refactoring should not change any test run semantics.
---
 setup.py | 5 ++---
 tox.ini  | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index f2afa8eef..7384e04da 100644
--- a/setup.py
+++ b/setup.py
@@ -52,13 +52,13 @@ def get_version(version_tuple):
 extra_opts = {"packages": find_packages(exclude=["tests", "tests.*"])}
 if sys.version_info[0] == 3:
     extra_opts['use_2to3'] = True
-    extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0']
+    extra_opts['tests_require'] = ['nose', 'rednose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0']
     if "test" in sys.argv or "nosetests" in sys.argv:
         extra_opts['packages'] = find_packages()
         extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]}
 else:
     # coverage 4 does not support Python 3.2 anymore
-    extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
+    extra_opts['tests_require'] = ['nose', 'rednose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
 
     if sys.version_info[0] == 2 and sys.version_info[1] == 6:
         extra_opts['tests_require'].append('unittest2')
@@ -79,6 +79,5 @@ def get_version(version_tuple):
       classifiers=CLASSIFIERS,
       install_requires=['pymongo>=2.7.1'],
       test_suite='nose.collector',
-      setup_requires=['nose', 'rednose'],  # Allow proper nose usage with setuptols and tox
       **extra_opts
 )
diff --git a/tox.ini b/tox.ini
index 3f69b5e85..e6aa7c813 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,8 @@ envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28}
 commands =
     python setup.py nosetests {posargs}
 deps =
+    nose
+    rednose
     mg27: PyMongo<2.8
     mg28: PyMongo>=2.8,<3.0
     mg30: PyMongo>=3.0

From b52cae6575aa7da2a53a2478bb6e242b1b042dac Mon Sep 17 00:00:00 2001
From: Lars Butler <Lars.Butler@gmail.com>
Date: Mon, 5 Oct 2015 12:15:35 +0200
Subject: [PATCH 0266/1519] AUTHORS: Add Lars Butler (that's me!)

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index a66bf7c01..4d5e69a31 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -228,3 +228,4 @@ that much better:
  * Vicki Donchenko (https://github.com/kivistein)
  * Emile Caron (https://github.com/emilecaron)
  * Amit Lichtenberg (https://github.com/amitlicht)
+ * Lars Butler (https://github.com/larsbutler)

From 9b500cd867eb73111b4b1bf5d24a1fd6e898cb44 Mon Sep 17 00:00:00 2001
From: Lars Butler <Lars.Butler@gmail.com>
Date: Mon, 5 Oct 2015 12:16:12 +0200
Subject: [PATCH 0267/1519] docs/changelog.rst: fix #1079 to version 0.10.1 -
 DEV

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4e9dea587..b340aab0d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Changes in 0.10.1 - DEV
 - Document save's save_condition error raises `SaveConditionError` exception #1070
 - Fix Document.reload for DynamicDocument. #1050
 - StrictDict & SemiStrictDict are shadowed at init time. #1105
+- Remove test dependencies (nose and rednose) from install dependencies list. #1079
 
 Changes in 0.10.0
 =================

From 5bbfca45fa1017e58b2d6c1413ee963261462b3f Mon Sep 17 00:00:00 2001
From: Gang Li <gli@informaticsincontext.com>
Date: Mon, 12 Oct 2015 10:34:26 -0400
Subject: [PATCH 0268/1519] Fixed: ListField minus index assignment does not
 work #1119 Add code to detect '-1' as a integer. Normalize negative index to
 regular list index Added list assignment test case

---
 mongoengine/base/document.py |  8 ++++--
 tests/fields/fields.py       | 48 ++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 6353162ab..64bf24a40 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -606,7 +606,9 @@ def _delta(self):
                 for p in parts:
                     if isinstance(d, (ObjectId, DBRef)):
                         break
-                    elif isinstance(d, list) and p.isdigit():
+                    elif isinstance(d, list) and p.lstrip('-').isdigit():
+                        if p[0] == '-':
+                            p = str(len(d)+int(p))
                         try:
                             d = d[int(p)]
                         except IndexError:
@@ -640,7 +642,9 @@ def _delta(self):
                 parts = path.split('.')
                 db_field_name = parts.pop()
                 for p in parts:
-                    if isinstance(d, list) and p.isdigit():
+                    if isinstance(d, list) and p.lstrip('-').isdigit():
+                        if p[0] == '-':
+                            p = str(len(d)+int(p))
                         d = d[int(p)]
                     elif (hasattr(d, '__getattribute__') and
                           not isinstance(d, dict)):
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7ef298fc5..0089f60d3 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1022,6 +1022,54 @@ class BlogPost(Document):
         self.assertEqual(BlogPost.objects(info=['1', '2', '3', '4', '1', '2', '3', '4']).count(), 1)
         BlogPost.drop_collection()
 
+    def test_list_assignment(self):
+        """Ensure that list field element assignment and slicing work 
+        """
+        class BlogPost(Document):
+            info = ListField()
+
+        BlogPost.drop_collection()
+
+        post = BlogPost()
+        post.info = ['e1', 'e2', 3, '4', 5]
+        post.save()
+        
+        post.info[0] = 1
+        post.save()
+        post.reload()
+        self.assertEqual(post.info[0], 1)
+        
+        post.info[1:3] = ['n2', 'n3']
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, [1, 'n2', 'n3', '4', 5])
+
+        post.info[-1] = 'n5'
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, [1, 'n2', 'n3', '4', 'n5'])
+
+        post.info[-2] = 4
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, [1, 'n2', 'n3', 4, 'n5'])
+
+        post.info[1:-1] = [2]
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, [1, 2, 'n5'])
+
+        post.info[:-1] = [1, 'n2', 'n3', 4]
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, [1, 'n2', 'n3', 4, 'n5'])
+
+        post.info[-4:3] = [2, 3]
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, [1, 2, 3, 4, 'n5'])
+
+
     def test_list_field_passed_in_value(self):
         class Foo(Document):
             bars = ListField(ReferenceField("Bar"))

From eb8176971c31591df4a7ab9f8f61efdb25e2dd68 Mon Sep 17 00:00:00 2001
From: Gang Li <gli@informaticsincontext.com>
Date: Mon, 12 Oct 2015 23:33:54 -0400
Subject: [PATCH 0269/1519] Removed "elif field.default" block to avoid
 silently, inconsistently changing database This resolved issue Please recall
 fix on: Saving document doesn't create new fields in existing collection #620
 #1126

---
 mongoengine/base/document.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 64bf24a40..f8dd8400f 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -712,14 +712,6 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
                         del data[field.db_field]
                 except (AttributeError, ValueError), e:
                     errors_dict[field_name] = e
-            elif field.default:
-                default = field.default
-                if callable(default):
-                    default = default()
-                if isinstance(default, BaseDocument):
-                    changed_fields.append(field_name)
-                elif not only_fields or field_name in only_fields:
-                    changed_fields.append(field_name)
 
         if errors_dict:
             errors = "\n".join(["%s - %s" % (k, v)

From e049cef00afb2fc1ae0e315674282a2d39464b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20Bevan=E2=80=93McGregor?= <alice@gothcandy.com>
Date: Tue, 13 Oct 2015 21:54:58 -0400
Subject: [PATCH 0270/1519] Add arbitrary metadata capture to `BaseField`.

Includes ability to detect and report conflicts.
---
 mongoengine/base/fields.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 304c084db..d92e9b3a5 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -42,7 +42,8 @@ class BaseField(object):
     def __init__(self, db_field=None, name=None, required=False, default=None,
                  unique=False, unique_with=None, primary_key=False,
                  validation=None, choices=None, verbose_name=None,
-                 help_text=None, null=False, sparse=False, custom_data=None):
+                 help_text=None, null=False, sparse=False, custom_data=None
+                 **kwargs):
         """
         :param db_field: The database field to store this field in
             (defaults to the name of the field)
@@ -70,6 +71,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         :param sparse: (optional) `sparse=True` combined with `unique=True` and `required=False`
             means that uniqueness won't be enforced for `None` values
         :param custom_data: (optional) Custom metadata for this field.
+        :param **kwargs: (optional) Arbitrary indirection-free metadata for this field.
         """
         self.db_field = (db_field or name) if not primary_key else '_id'
 
@@ -89,6 +91,15 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.sparse = sparse
         self._owner_document = None
         self.custom_data = custom_data
+        
+        conflicts = set(dir(self)).intersect(kwargs)
+        if conflicts:
+            raise TypeError("%s already has attribute(s): %s" % (
+                self.__class__.__name__,
+                ', '.join(conflicts)
+            ))
+            
+        self.__dict__.update(kwargs)
 
         # Adjust the appropriate creation counter, and save our local copy.
         if self.db_field == '_id':

From d133913c3dd561e3b0a0002489cad4be9973637f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20Bevan=E2=80=93McGregor?= <alice@gothcandy.com>
Date: Tue, 13 Oct 2015 21:59:29 -0400
Subject: [PATCH 0271/1519] Remove now superfluous special cases.

Removes `verbose_name`, `help_text`, and `custom_data`.  All three are
covered by the one metadata assignment and will continue working as
expected.
---
 mongoengine/base/fields.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index d92e9b3a5..3427a0944 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -41,8 +41,7 @@ class BaseField(object):
 
     def __init__(self, db_field=None, name=None, required=False, default=None,
                  unique=False, unique_with=None, primary_key=False,
-                 validation=None, choices=None, verbose_name=None,
-                 help_text=None, null=False, sparse=False, custom_data=None
+                 validation=None, choices=None, null=False, sparse=False,
                  **kwargs):
         """
         :param db_field: The database field to store this field in
@@ -61,16 +60,10 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
             field.  Generally this is deprecated in favour of the
             `FIELD.validate` method
         :param choices: (optional) The valid choices
-        :param verbose_name: (optional)  The verbose name for the field.
-            Designed to be human readable and is often used when generating
-            model forms from the document model.
-        :param help_text: (optional) The help text for this field and is often
-            used when generating model forms from the document model.
         :param null: (optional) Is the field value can be null. If no and there is a default value
             then the default value is set
         :param sparse: (optional) `sparse=True` combined with `unique=True` and `required=False`
             means that uniqueness won't be enforced for `None` values
-        :param custom_data: (optional) Custom metadata for this field.
         :param **kwargs: (optional) Arbitrary indirection-free metadata for this field.
         """
         self.db_field = (db_field or name) if not primary_key else '_id'
@@ -85,12 +78,9 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.primary_key = primary_key
         self.validation = validation
         self.choices = choices
-        self.verbose_name = verbose_name
-        self.help_text = help_text
         self.null = null
         self.sparse = sparse
         self._owner_document = None
-        self.custom_data = custom_data
         
         conflicts = set(dir(self)).intersect(kwargs)
         if conflicts:

From 3f3747a2fe660d08bb8af4f079fb2f4b0c3540eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20Bevan=E2=80=93McGregor?= <alice@gothcandy.com>
Date: Tue, 13 Oct 2015 21:59:46 -0400
Subject: [PATCH 0272/1519] Minor formatting tweaks and additional comments.

---
 mongoengine/base/fields.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 3427a0944..9f054a2bd 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -82,13 +82,14 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.sparse = sparse
         self._owner_document = None
         
+        # Detect and report conflicts between metadata and base properties.
         conflicts = set(dir(self)).intersect(kwargs)
         if conflicts:
             raise TypeError("%s already has attribute(s): %s" % (
-                self.__class__.__name__,
-                ', '.join(conflicts)
-            ))
-            
+                self.__class__.__name__, ', '.join(conflicts) ))
+        
+        # Assign metadata to the instance
+        # This efficient method is available because no __slots__ are defined.
         self.__dict__.update(kwargs)
 
         # Adjust the appropriate creation counter, and save our local copy.

From a57f28ac832041ccb5c21cb7713c9723a3fd672f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20Bevan=E2=80=93McGregor?= <alice@gothcandy.com>
Date: Tue, 13 Oct 2015 22:41:58 -0400
Subject: [PATCH 0273/1519] Correction for local monkeypatch.

---
 mongoengine/base/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 9f054a2bd..d14ecce02 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -83,7 +83,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self._owner_document = None
         
         # Detect and report conflicts between metadata and base properties.
-        conflicts = set(dir(self)).intersect(kwargs)
+        conflicts = set(dir(self)) & set(kwargs)
         if conflicts:
             raise TypeError("%s already has attribute(s): %s" % (
                 self.__class__.__name__, ', '.join(conflicts) ))

From 50b271c868c6b1fac95eb650d1b4b2592540e236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20Bevan=E2=80=93McGregor?= <alice@gothcandy.com>
Date: Tue, 13 Oct 2015 22:51:03 -0400
Subject: [PATCH 0274/1519] Arbitrary metadata documentation.

---
 docs/guide/defining-documents.rst | 10 +++++-----
 mongoengine/base/fields.py        |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 8f7382eeb..c3ad208e3 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -172,11 +172,11 @@ arguments can be set on all fields:
         class Shirt(Document):
             size = StringField(max_length=3, choices=SIZE)
 
-:attr:`help_text` (Default: None)
-    Optional help text to output with the field -- used by form libraries
-
-:attr:`verbose_name` (Default: None)
-    Optional human-readable name for the field -- used by form libraries
+:attr:`**kwargs` (Optional)
+    You can supply additional metadata as arbitrary additional keyword
+    arguments.  You can not override existing attributes, however.  Common
+    choices include `help_text` and `verbose_name`, commonly used by form and
+    widget libraries.
 
 
 List fields
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index d14ecce02..b10245261 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -64,7 +64,11 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
             then the default value is set
         :param sparse: (optional) `sparse=True` combined with `unique=True` and `required=False`
             means that uniqueness won't be enforced for `None` values
-        :param **kwargs: (optional) Arbitrary indirection-free metadata for this field.
+        :param **kwargs: (optional) Arbitrary indirection-free metadata for
+            this field can be supplied as additional keyword arguments and
+            accessed as attributes of the field. Must not conflict with any
+            existing attributes. Common metadata includes `verbose_name` and
+            `help_text`.
         """
         self.db_field = (db_field or name) if not primary_key else '_id'
 

From 3fe93968a6d428a94ca70cca4a39d090ff5e10f7 Mon Sep 17 00:00:00 2001
From: Gang Li <gli@informaticsincontext.com>
Date: Sun, 18 Oct 2015 00:19:36 -0400
Subject: [PATCH 0275/1519] update test case for: Please recall fix on: Saving
 document doesn't create new fields in existing collection #620 #1126

---
 tests/document/instance.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 7a3934160..3d41857e2 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2941,6 +2941,17 @@ class Person(Document):
         p4 = Person.objects()[0]
         p4.save()
         self.assertEquals(p4.height, 189)
+        
+        # However the default will not be fixed in DB
+        self.assertEquals(Person.objects(height=189).count(), 0)
+        
+        # alter DB for the new default
+        coll = Person._get_collection()
+        for person in Person.objects.as_pymongo():
+            if 'height' not in person:
+                person['height'] = 189
+                coll.save(person)
+                
         self.assertEquals(Person.objects(height=189).count(), 1)
 
     def test_from_son(self):

From 2ae2bfdde937b0f28b0598aa29d9fcd8d6c6e40c Mon Sep 17 00:00:00 2001
From: Gang Li <gli@informaticsincontext.com>
Date: Sun, 18 Oct 2015 00:31:40 -0400
Subject: [PATCH 0276/1519] updated changelog.rst for #1119

---
 AUTHORS            | 27 ++++++++++++++-------------
 docs/changelog.rst |  2 ++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a66bf7c01..a371f816f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,7 +6,7 @@ Matt Dennewitz <mattdennewitz@gmail.com>
 Deepak Thukral <iapain@yahoo.com>
 Florian Schlachter <flori@n-schlachter.de>
 Steve Challis <steve@stevechallis.com>
-Wilson Júnior <wilsonpjunior@gmail.com>
+Wilson Júnior <wilsonpjunior@gmail.com>
 Dan Crosta https://github.com/dcrosta
 Laine Herron https://github.com/LaineHerron
 
@@ -23,7 +23,7 @@ that much better:
  * flosch
  * Deepak Thukral
  * Colin Howe
- * Wilson Júnior (https://github.com/wpjunior)
+ * Wilson Júnior (https://github.com/wpjunior)
  * Alistair Roche
  * Dan Crosta
  * Viktor Kerkez
@@ -34,7 +34,7 @@ that much better:
  * Mircea Pasoi
  * Matt Chisholm
  * James Punteney
- * TimothéePeignier
+ * TimothéePeignier
  * Stuart Rackham
  * Serge Matveenko
  * Matt Dennewitz
@@ -46,7 +46,7 @@ that much better:
  * Nick Vlku
  * martin
  * Flavio Amieiro
- * Анхбаяр Лхагвадорж
+ * �нхба�р Лхагвадорж
  * Zak Johnson
  * Victor Farazdagi
  * vandersonmota
@@ -75,7 +75,7 @@ that much better:
  * Adam Parrish
  * jpfarias
  * jonrscott
- * Alice Zoë Bevan-McGregor (https://github.com/amcgregor/)
+ * Alice Zoë Bevan-McGregor (https://github.com/amcgregor/)
  * Stephen Young
  * tkloc
  * aid
@@ -111,7 +111,7 @@ that much better:
  * Tristan Escalada
  * Alexander Koshelev
  * Jaime Irurzun
- * Alexandre González
+ * Alexandre González
  * Thomas Steinacher
  * Tommi Komulainen
  * Peter Landry
@@ -119,7 +119,7 @@ that much better:
  * Anton Kolechkin
  * Sergey Nikitin
  * psychogenic
- * Stefan Wójcik (https://github.com/wojcikstefan)
+ * Stefan Wójcik (https://github.com/wojcikstefan)
  * dimonb
  * Garry Polley
  * James Slagle
@@ -147,7 +147,7 @@ that much better:
  * Gustavo Gawryszewski
  * Max Countryman
  * caitifbrito
- * lcya86 刘春洋
+ * lcya86 刘春洋
  * Martin Alderete (https://github.com/malderete)
  * Nick Joyce
  * Jared Forsyth
@@ -174,7 +174,7 @@ that much better:
  * Paul Uithol (https://github.com/PaulUithol)
  * Thom Knowles (https://github.com/fleat)
  * Paul (https://github.com/squamous)
- * Olivier Cortès (https://github.com/Karmak23)
+ * Olivier Cortès (https://github.com/Karmak23)
  * crazyzubr (https://github.com/crazyzubr)
  * FrankSomething (https://github.com/FrankSomething)
  * Alexandr Morozov (https://github.com/LK4D4)
@@ -183,7 +183,7 @@ that much better:
  * Daniel Ward (https://github.com/danielward)
  * Aniket Deshpande (https://github.com/anicake)
  * rfkrocktk (https://github.com/rfkrocktk)
- * Gustavo Andrés Angulo (https://github.com/woakas)
+ * Gustavo Andrés Angulo (https://github.com/woakas)
  * Dmytro Popovych (https://github.com/drudim)
  * Tom (https://github.com/tomprimozic)
  * j0hnsmith (https://github.com/j0hnsmith)
@@ -198,7 +198,7 @@ that much better:
  * Martyn Smith (https://github.com/martynsmith)
  * Andrei Zbikowski (https://github.com/b1naryth1ef)
  * Ronald van Rij (https://github.com/ronaldvanrij)
- * François Schmidts (https://github.com/jaesivsm)
+ * François Schmidts (https://github.com/jaesivsm)
  * Eric Plumb (https://github.com/professorplumb)
  * Damien Churchill (https://github.com/damoxc)
  * Aleksandr Sorokoumov (https://github.com/Gerrrr)
@@ -211,12 +211,12 @@ that much better:
  * Axel Haustant (https://github.com/noirbizarre)
  * David Czarnecki (https://github.com/czarneckid)
  * Vyacheslav Murashkin (https://github.com/a4tunado)
- * André Ericson https://github.com/aericson)
+ * André Ericson https://github.com/aericson)
  * Mikhail Moshnogorsky (https://github.com/mikhailmoshnogorsky)
  * Diego Berrocal (https://github.com/cestdiego)
  * Matthew Ellison (https://github.com/seglberg)
  * Jimmy Shen (https://github.com/jimmyshen)
- * J. Fernando Sánchez (https://github.com/balkian)
+ * J. Fernando Sánchez (https://github.com/balkian)
  * Michael Chase (https://github.com/rxsegrxup)
  * Eremeev Danil (https://github.com/elephanter)
  * Catstyle Lee (https://github.com/Catstyle)
@@ -228,3 +228,4 @@ that much better:
  * Vicki Donchenko (https://github.com/kivistein)
  * Emile Caron (https://github.com/emilecaron)
  * Amit Lichtenberg (https://github.com/amitlicht)
+ * Gang Li (https://github.com/iici-gli)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4e9dea587..fd06f6e9d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,8 @@ Changes in 0.10.1 - DEV
 - Document save's save_condition error raises `SaveConditionError` exception #1070
 - Fix Document.reload for DynamicDocument. #1050
 - StrictDict & SemiStrictDict are shadowed at init time. #1105
+- Fix ListField minus index assignment does not work. #1119
+- Remove code that marks field as changed when the field has default but not existed in database #1126
 
 Changes in 0.10.0
 =================

From c1645ab7a7f6b1dbc3107e25024f6cc4c65e6fd2 Mon Sep 17 00:00:00 2001
From: Gang Li <gli@informaticsincontext.com>
Date: Sun, 18 Oct 2015 01:14:27 -0400
Subject: [PATCH 0277/1519] restored

---
 AUTHORS | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a371f816f..12ae9ff60 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,7 +6,7 @@ Matt Dennewitz <mattdennewitz@gmail.com>
 Deepak Thukral <iapain@yahoo.com>
 Florian Schlachter <flori@n-schlachter.de>
 Steve Challis <steve@stevechallis.com>
-Wilson Júnior <wilsonpjunior@gmail.com>
+Wilson Júnior <wilsonpjunior@gmail.com>
 Dan Crosta https://github.com/dcrosta
 Laine Herron https://github.com/LaineHerron
 
@@ -23,7 +23,7 @@ that much better:
  * flosch
  * Deepak Thukral
  * Colin Howe
- * Wilson Júnior (https://github.com/wpjunior)
+ * Wilson Júnior (https://github.com/wpjunior)
  * Alistair Roche
  * Dan Crosta
  * Viktor Kerkez
@@ -34,7 +34,7 @@ that much better:
  * Mircea Pasoi
  * Matt Chisholm
  * James Punteney
- * TimothéePeignier
+ * TimothéePeignier
  * Stuart Rackham
  * Serge Matveenko
  * Matt Dennewitz
@@ -46,7 +46,7 @@ that much better:
  * Nick Vlku
  * martin
  * Flavio Amieiro
- * �нхба�р Лхагвадорж
+ * Анхбаяр Лхагвадорж
  * Zak Johnson
  * Victor Farazdagi
  * vandersonmota
@@ -75,7 +75,7 @@ that much better:
  * Adam Parrish
  * jpfarias
  * jonrscott
- * Alice Zoë Bevan-McGregor (https://github.com/amcgregor/)
+ * Alice Zoë Bevan-McGregor (https://github.com/amcgregor/)
  * Stephen Young
  * tkloc
  * aid
@@ -111,7 +111,7 @@ that much better:
  * Tristan Escalada
  * Alexander Koshelev
  * Jaime Irurzun
- * Alexandre González
+ * Alexandre González
  * Thomas Steinacher
  * Tommi Komulainen
  * Peter Landry
@@ -119,7 +119,7 @@ that much better:
  * Anton Kolechkin
  * Sergey Nikitin
  * psychogenic
- * Stefan Wójcik (https://github.com/wojcikstefan)
+ * Stefan Wójcik (https://github.com/wojcikstefan)
  * dimonb
  * Garry Polley
  * James Slagle
@@ -147,7 +147,7 @@ that much better:
  * Gustavo Gawryszewski
  * Max Countryman
  * caitifbrito
- * lcya86 刘春洋
+ * lcya86 刘春洋
  * Martin Alderete (https://github.com/malderete)
  * Nick Joyce
  * Jared Forsyth
@@ -174,7 +174,7 @@ that much better:
  * Paul Uithol (https://github.com/PaulUithol)
  * Thom Knowles (https://github.com/fleat)
  * Paul (https://github.com/squamous)
- * Olivier Cortès (https://github.com/Karmak23)
+ * Olivier Cortès (https://github.com/Karmak23)
  * crazyzubr (https://github.com/crazyzubr)
  * FrankSomething (https://github.com/FrankSomething)
  * Alexandr Morozov (https://github.com/LK4D4)
@@ -183,7 +183,7 @@ that much better:
  * Daniel Ward (https://github.com/danielward)
  * Aniket Deshpande (https://github.com/anicake)
  * rfkrocktk (https://github.com/rfkrocktk)
- * Gustavo Andrés Angulo (https://github.com/woakas)
+ * Gustavo Andrés Angulo (https://github.com/woakas)
  * Dmytro Popovych (https://github.com/drudim)
  * Tom (https://github.com/tomprimozic)
  * j0hnsmith (https://github.com/j0hnsmith)
@@ -198,7 +198,7 @@ that much better:
  * Martyn Smith (https://github.com/martynsmith)
  * Andrei Zbikowski (https://github.com/b1naryth1ef)
  * Ronald van Rij (https://github.com/ronaldvanrij)
- * François Schmidts (https://github.com/jaesivsm)
+ * François Schmidts (https://github.com/jaesivsm)
  * Eric Plumb (https://github.com/professorplumb)
  * Damien Churchill (https://github.com/damoxc)
  * Aleksandr Sorokoumov (https://github.com/Gerrrr)
@@ -211,12 +211,12 @@ that much better:
  * Axel Haustant (https://github.com/noirbizarre)
  * David Czarnecki (https://github.com/czarneckid)
  * Vyacheslav Murashkin (https://github.com/a4tunado)
- * André Ericson https://github.com/aericson)
+ * André Ericson https://github.com/aericson)
  * Mikhail Moshnogorsky (https://github.com/mikhailmoshnogorsky)
  * Diego Berrocal (https://github.com/cestdiego)
  * Matthew Ellison (https://github.com/seglberg)
  * Jimmy Shen (https://github.com/jimmyshen)
- * J. Fernando Sánchez (https://github.com/balkian)
+ * J. Fernando Sánchez (https://github.com/balkian)
  * Michael Chase (https://github.com/rxsegrxup)
  * Eremeev Danil (https://github.com/elephanter)
  * Catstyle Lee (https://github.com/Catstyle)

From 159b0828286378543b3d5437b149d041eadfb53b Mon Sep 17 00:00:00 2001
From: reallistic <mrmchase08@gmail.com>
Date: Thu, 24 Sep 2015 16:31:38 -0700
Subject: [PATCH 0278/1519] Recursively create mongo query for embeddeddocument
 elemMatch

---
 docs/changelog.rst                |  1 +
 mongoengine/queryset/transform.py | 21 +++++++++++++--------
 tests/queryset/queryset.py        |  9 +++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b340aab0d..bb626f33d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,7 @@ Changes in 0.10.1 - DEV
 - Fix Document.reload for DynamicDocument. #1050
 - StrictDict & SemiStrictDict are shadowed at init time. #1105
 - Remove test dependencies (nose and rednose) from install dependencies list. #1079
+- Recursively build query when using elemMatch operator. #1130
 
 Changes in 0.10.0
 =================
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 03f3acf0d..1f18c4295 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -26,12 +26,12 @@
                    STRING_OPERATORS + CUSTOM_OPERATORS)
 
 
-def query(_doc_cls=None, **query):
+def query(_doc_cls=None, **kwargs):
     """Transform a query from Django-style format to Mongo format.
     """
     mongo_query = {}
     merge_query = defaultdict(list)
-    for key, value in sorted(query.items()):
+    for key, value in sorted(kwargs.items()):
         if key == "__raw__":
             mongo_query.update(value)
             continue
@@ -105,13 +105,18 @@ def query(_doc_cls=None, **query):
         if op:
             if op in GEO_OPERATORS:
                 value = _geo_operator(field, op, value)
-            elif op in CUSTOM_OPERATORS:
-                if op in ('elem_match', 'match'):
-                    value = field.prepare_query_value(op, value)
-                    value = {"$elemMatch": value}
+            elif op in ('match', 'elemMatch'):
+                ListField = _import_class('ListField')
+                EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
+                if (isinstance(value, dict) and isinstance(field, ListField) and
+                    isinstance(field.field, EmbeddedDocumentField)):
+                    value = query(field.field.document_type, **value)
                 else:
-                    NotImplementedError("Custom method '%s' has not "
-                                        "been implemented" % op)
+                    value = field.prepare_query_value(op, value)
+                value = {"$elemMatch": value}
+            elif op in CUSTOM_OPERATORS:
+                NotImplementedError("Custom method '%s' has not "
+                                    "been implemented" % op)
             elif op not in STRING_OPERATORS:
                 value = {'$' + op: value}
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 944c6fc13..3eff7cea0 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4116,6 +4116,15 @@ class Bar(Document):
         ak = list(Bar.objects(foo__match=Foo(shape="square", color="purple")))
         self.assertEqual([b1], ak)
 
+        ak = list(
+            Bar.objects(foo__elemMatch={'shape': "square", "color__exists": True}))
+        self.assertEqual([b1, b2], ak)
+
+        ak = list(
+            Bar.objects(foo__match={'shape': "square", "color__exists": True}))
+        self.assertEqual([b1, b2], ak)
+
+
     def test_upsert_includes_cls(self):
         """Upserts should include _cls information for inheritable classes
         """

From 959740a585e23a71d56da05d046444f4d8810317 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Mon, 19 Oct 2015 16:33:40 +0200
Subject: [PATCH 0279/1519] Fix false positive test on _instance

---
 tests/document/instance.py | 44 ++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 7a3934160..8caa5675c 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -7,6 +7,7 @@
 import pickle
 import unittest
 import uuid
+import weakref
 
 from datetime import datetime
 from bson import DBRef, ObjectId
@@ -30,6 +31,8 @@
 __all__ = ("InstanceTest",)
 
 
+
+
 class InstanceTest(unittest.TestCase):
 
     def setUp(self):
@@ -63,6 +66,14 @@ def assertDbEqual(self, docs):
             list(self.Person._get_collection().find().sort("id")),
             sorted(docs, key=lambda doc: doc["_id"]))
 
+    def assertHasInstance(self, field, instance):
+        self.assertTrue(hasattr(field, "_instance"))
+        self.assertIsNotNone(field._instance)
+        if isinstance(field._instance, weakref.ProxyType):
+            self.assertTrue(field._instance.__eq__(instance))
+        else:
+            self.assertEqual(field._instance, instance)
+
     def test_capped_collection(self):
         """Ensure that capped collections work properly.
         """
@@ -608,10 +619,12 @@ class Doc(Document):
             embedded_field = EmbeddedDocumentField(Embedded)
 
         Doc.drop_collection()
-        Doc(embedded_field=Embedded(string="Hi")).save()
+        doc = Doc(embedded_field=Embedded(string="Hi"))
+        self.assertHasInstance(doc.embedded_field, doc)
 
+        doc.save()
         doc = Doc.objects.get()
-        self.assertEqual(doc, doc.embedded_field._instance)
+        self.assertHasInstance(doc.embedded_field, doc)
 
     def test_embedded_document_complex_instance(self):
         """Ensure that embedded documents in complex fields can reference
@@ -623,10 +636,12 @@ class Doc(Document):
             embedded_field = ListField(EmbeddedDocumentField(Embedded))
 
         Doc.drop_collection()
-        Doc(embedded_field=[Embedded(string="Hi")]).save()
+        doc = Doc(embedded_field=[Embedded(string="Hi")])
+        self.assertHasInstance(doc.embedded_field[0], doc)
 
+        doc.save()
         doc = Doc.objects.get()
-        self.assertEqual(doc, doc.embedded_field[0]._instance)
+        self.assertHasInstance(doc.embedded_field[0], doc)
 
     def test_instance_is_set_on_setattr(self):
 
@@ -639,11 +654,28 @@ class Account(Document):
         Account.drop_collection()
         acc = Account()
         acc.email = Email(email='test@example.com')
-        self.assertTrue(hasattr(acc._data["email"], "_instance"))
+        self.assertHasInstance(acc._data["email"], acc)
+        acc.save()
+
+        acc1 = Account.objects.first()
+        self.assertHasInstance(acc1._data["email"], acc1)
+
+    def test_instance_is_set_on_setattr_on_embedded_document_list(self):
+
+        class Email(EmbeddedDocument):
+            email = EmailField()
+
+        class Account(Document):
+            emails = EmbeddedDocumentListField(Email)
+
+        Account.drop_collection()
+        acc = Account()
+        acc.emails = [Email(email='test@example.com')]
+        self.assertHasInstance(acc._data["emails"][0], acc)
         acc.save()
 
         acc1 = Account.objects.first()
-        self.assertTrue(hasattr(acc1._data["email"], "_instance"))
+        self.assertHasInstance(acc1._data["emails"][0], acc1)
 
     def test_document_clean(self):
         class TestDocument(Document):

From 6399de0b51dedc0c52a9c0480df785a20ce38c50 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Mon, 19 Oct 2015 16:39:00 +0200
Subject: [PATCH 0280/1519] Fix _instance on list of EmbeddedDocuments

---
 mongoengine/base/fields.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 304c084db..4167720b4 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -135,6 +135,10 @@ def __set__(self, instance, value):
         EmbeddedDocument = _import_class('EmbeddedDocument')
         if isinstance(value, EmbeddedDocument):
             value._instance = weakref.proxy(instance)
+        elif isinstance(value, (list, tuple)):
+            for v in value:
+                if isinstance(v, EmbeddedDocument):
+                    v._instance = weakref.proxy(instance)
         instance._data[self.name] = value
 
     def error(self, message="", errors=None, field_name=None):

From 9fe99979fe25e0ed94431ff51d7375a6da8ab9f6 Mon Sep 17 00:00:00 2001
From: Axel Haustant <noirbizarre@gmail.com>
Date: Mon, 19 Oct 2015 18:04:15 +0200
Subject: [PATCH 0281/1519] Fix tests on Python 2.6 (assertIsNotNone does not
 exists)

---
 tests/document/instance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 8caa5675c..56e6765a9 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -68,7 +68,7 @@ def assertDbEqual(self, docs):
 
     def assertHasInstance(self, field, instance):
         self.assertTrue(hasattr(field, "_instance"))
-        self.assertIsNotNone(field._instance)
+        self.assertTrue(field._instance is not None)
         if isinstance(field._instance, weakref.ProxyType):
             self.assertTrue(field._instance.__eq__(instance))
         else:

From 44f92d41691284e552609bc535d99dc781dd06e4 Mon Sep 17 00:00:00 2001
From: abonhomme <jumand@gmail.com>
Date: Fri, 23 Oct 2015 11:07:26 -0400
Subject: [PATCH 0282/1519] docstring correction

Corrected the docstring for `mongoengine.queryset.base.update_one()`
---
 mongoengine/queryset/base.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 0e183889b..0867e0e20 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -472,7 +472,8 @@ def update(self, upsert=False, multi=True, write_concern=None,
             raise OperationError(u'Update failed (%s)' % unicode(err))
 
     def update_one(self, upsert=False, write_concern=None, **update):
-        """Perform an atomic update on first field matched by the query.
+        """Perform an atomic update on the fields of the first document
+        matched by the query.
 
         :param upsert: Any existing document with that "_id" is overwritten.
         :param write_concern: Extra keyword arguments are passed down which

From 2c282f955025c0c8d339c5ae539032ea3f544f84 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Sun, 8 Nov 2015 12:18:12 +0200
Subject: [PATCH 0283/1519] Added changelog entry for #1131.

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bb626f33d..51f0967fd 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,7 @@ Changes in 0.10.1 - DEV
 - StrictDict & SemiStrictDict are shadowed at init time. #1105
 - Remove test dependencies (nose and rednose) from install dependencies list. #1079
 - Recursively build query when using elemMatch operator. #1130
+- Fix instance back references for lists of embedded documents. #1131
 
 Changes in 0.10.0
 =================

From fb4e9c37728d330dc01baadc9fb2ab5c96d4566d Mon Sep 17 00:00:00 2001
From: Paul-Armand Verhaegen <paularmand.verhaegen@gmail.com>
Date: Tue, 10 Nov 2015 20:43:49 +0100
Subject: [PATCH 0284/1519] fix for reloading of strict with special fields

---
 mongoengine/document.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 9d2d9c5fb..0cdfeeb6a 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -594,12 +594,17 @@ def reload(self, *fields, **kwargs):
         for field in obj._data:
             if not fields or field in fields:
                 try:
-                    setattr(self, field, self._reload(field, obj[field]))
-                except KeyError:
-                    # If field is removed from the database while the object
-                    # is in memory, a reload would cause a KeyError
-                    # i.e. obj.update(unset__field=1) followed by obj.reload()
-                    delattr(self, field)
+		    setattr(self, field, self._reload(field, obj[field]))
+                except (KeyError, AttributeError):
+		    try:
+	                # If field is a special field, e.g. items is stored as _reserved_items,
+		        # an KeyError is thrown. So try to retrieve the field from _data
+		        setattr(self, field, self._reload(field, obj._data.get(field)))
+		    except KeyError:
+                        # If field is removed from the database while the object
+                        # is in memory, a reload would cause a KeyError
+                        # i.e. obj.update(unset__field=1) followed by obj.reload()
+                        delattr(self, field)
 
         self._changed_fields = obj._changed_fields
         self._created = False

From 6e745e9882edd0cf459166b289515cf4ee3145ef Mon Sep 17 00:00:00 2001
From: Paul-Armand Verhaegen <paularmand.verhaegen@gmail.com>
Date: Tue, 10 Nov 2015 21:13:24 +0100
Subject: [PATCH 0285/1519] fixed wrong indentation style

---
 mongoengine/document.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 0cdfeeb6a..bdae0a381 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -594,13 +594,13 @@ def reload(self, *fields, **kwargs):
         for field in obj._data:
             if not fields or field in fields:
                 try:
-		    setattr(self, field, self._reload(field, obj[field]))
+                    setattr(self, field, self._reload(field, obj[field]))
                 except (KeyError, AttributeError):
-		    try:
-	                # If field is a special field, e.g. items is stored as _reserved_items,
-		        # an KeyError is thrown. So try to retrieve the field from _data
-		        setattr(self, field, self._reload(field, obj._data.get(field)))
-		    except KeyError:
+                    try:
+                        # If field is a special field, e.g. items is stored as _reserved_items,
+                        # an KeyError is thrown. So try to retrieve the field from _data
+                        setattr(self, field, self._reload(field, obj._data.get(field)))
+                    except KeyError:
                         # If field is removed from the database while the object
                         # is in memory, a reload would cause a KeyError
                         # i.e. obj.update(unset__field=1) followed by obj.reload()

From 3c8906494fb57e2b1c47b40091dea1b9eef24f4f Mon Sep 17 00:00:00 2001
From: Paul-Armand Verhaegen <paularmand.verhaegen@gmail.com>
Date: Sun, 15 Nov 2015 15:31:22 +0100
Subject: [PATCH 0286/1519] Added #1156 to changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 51f0967fd..c9766c84e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,7 @@ Changes in 0.10.1 - DEV
 - Remove test dependencies (nose and rednose) from install dependencies list. #1079
 - Recursively build query when using elemMatch operator. #1130
 - Fix instance back references for lists of embedded documents. #1131
+- Fix for reloading of strict with special fields. #1156
 
 Changes in 0.10.0
 =================

From ed8174fe367c2c714ccc5addf7d7b02bff63592d Mon Sep 17 00:00:00 2001
From: Paul-Armand Verhaegen <paularmand.verhaegen@gmail.com>
Date: Sun, 15 Nov 2015 15:32:26 +0100
Subject: [PATCH 0287/1519] Added Paul-Armand Verhaegen to contributor list

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 4d5e69a31..df6ef6113 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -229,3 +229,4 @@ that much better:
  * Emile Caron (https://github.com/emilecaron)
  * Amit Lichtenberg (https://github.com/amitlicht)
  * Lars Butler (https://github.com/larsbutler)
+ * Paul-Armand Verhaegen (https://github.com/paularmand)

From cceef33fef18886082f35f847677bab67ed56a59 Mon Sep 17 00:00:00 2001
From: Ashley Whetter <ashley.whetter@aardman.com>
Date: Tue, 17 Nov 2015 14:22:10 +0000
Subject: [PATCH 0288/1519] Fixed a couple of documentation typos

---
 mongoengine/document.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 9d2d9c5fb..251f5bb39 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -217,7 +217,7 @@ def modify(self, query={}, **update):
         Returns True if the document has been updated or False if the document
         in the database doesn't match the query.
 
-        .. note:: All unsaved changes that has been made to the document are
+        .. note:: All unsaved changes that have been made to the document are
             rejected if the method returns True.
 
         :param query: the update will be performed only if the document in the
@@ -403,7 +403,7 @@ def is_new_object(last_error):
 
     def cascade_save(self, *args, **kwargs):
         """Recursively saves any references /
-           generic references on an objects"""
+           generic references on the document"""
         _refs = kwargs.get('_refs', []) or []
 
         ReferenceField = _import_class('ReferenceField')

From 5c464c3f5a6a927a976c671d51d73b56a5f0a62f Mon Sep 17 00:00:00 2001
From: Omer Katz <omer@zimperium.com>
Date: Wed, 18 Nov 2015 14:07:39 +0200
Subject: [PATCH 0289/1519] Bumped version to 0.10.1

---
 docs/changelog.rst      | 2 +-
 mongoengine/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 51f0967fd..cd3497930 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,7 +2,7 @@
 Changelog
 =========
 
-Changes in 0.10.1 - DEV
+Changes in 0.10.1
 =======================
 - Fix infinite recursion with CASCADE delete rules under specific conditions. #1046
 - Fix CachedReferenceField bug when loading cached docs as DBRef but failing to save them. #1047
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 474c21543..eefaf08d9 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -14,7 +14,7 @@
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
 
-VERSION = (0, 10, 0)
+VERSION = (0, 10, 1)
 
 
 def get_version():

From deb5677a5729a8213285f0637fc2d700c45301a7 Mon Sep 17 00:00:00 2001
From: George Macon <George.Macon@gtri.gatech.edu>
Date: Thu, 19 Nov 2015 17:14:45 -0500
Subject: [PATCH 0290/1519] Allow shard key to be in an embedded document
 (#551)

---
 mongoengine/document.py    | 15 +++++++++++---
 tests/document/instance.py | 40 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 9d2d9c5fb..bd2e7c5b9 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -341,8 +341,12 @@ def save(self, force_insert=False, validate=True, clean=True,
                 select_dict['_id'] = object_id
                 shard_key = self.__class__._meta.get('shard_key', tuple())
                 for k in shard_key:
-                    actual_key = self._db_field_map.get(k, k)
-                    select_dict[actual_key] = doc[actual_key]
+                    path = self._lookup_field(k.split('.'))
+                    actual_key = [p.db_field for p in path]
+                    val = doc
+                    for ak in actual_key:
+                        val = val[ak]
+                    select_dict['.'.join(actual_key)] = val
 
                 def is_new_object(last_error):
                     if last_error is not None:
@@ -444,7 +448,12 @@ def _object_key(self):
         select_dict = {'pk': self.pk}
         shard_key = self.__class__._meta.get('shard_key', tuple())
         for k in shard_key:
-            select_dict[k] = getattr(self, k)
+            path = self._lookup_field(k.split('.'))
+            actual_key = [p.db_field for p in path]
+            val = self
+            for ak in actual_key:
+                val = getattr(val, ak)
+            select_dict['__'.join(actual_key)] = val
         return select_dict
 
     def update(self, **kwargs):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 56e6765a9..5494ac6b1 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -484,6 +484,20 @@ class Animal(Document):
         doc.reload()
         Animal.drop_collection()
 
+    def test_reload_sharded_nested(self):
+        class SuperPhylum(EmbeddedDocument):
+            name = StringField()
+
+        class Animal(Document):
+            superphylum = EmbeddedDocumentField(SuperPhylum)
+            meta = {'shard_key': ('superphylum.name',)}
+
+        Animal.drop_collection()
+        doc = Animal(superphylum=SuperPhylum(name='Deuterostomia'))
+        doc.save()
+        doc.reload()
+        Animal.drop_collection()
+
     def test_reload_referencing(self):
         """Ensures reloading updates weakrefs correctly
         """
@@ -2715,6 +2729,32 @@ def change_shard_key():
 
         self.assertRaises(OperationError, change_shard_key)
 
+    def test_shard_key_in_embedded_document(self):
+        class Foo(EmbeddedDocument):
+            foo = StringField()
+
+        class Bar(Document):
+            meta = {
+                'shard_key': ('foo.foo',)
+            }
+            foo = EmbeddedDocumentField(Foo)
+            bar = StringField()
+
+        foo_doc = Foo(foo='hello')
+        bar_doc = Bar(foo=foo_doc, bar='world')
+        bar_doc.save()
+
+        self.assertTrue(bar_doc.id is not None)
+
+        bar_doc.bar = 'baz'
+        bar_doc.save()
+
+        def change_shard_key():
+            bar_doc.foo.foo = 'something'
+            bar_doc.save()
+
+        self.assertRaises(OperationError, change_shard_key)
+
     def test_shard_key_primary(self):
         class LogEntry(Document):
             machine = StringField(primary_key=True)

From f6d3bd8ccb692dd98b0ea45a5cd4f28a9068eff1 Mon Sep 17 00:00:00 2001
From: George Macon <George.Macon@gtri.gatech.edu>
Date: Thu, 19 Nov 2015 17:15:27 -0500
Subject: [PATCH 0291/1519] Update changelog for #551

---
 docs/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index cd3497930..6275d6d94 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+Changes in 0.10.2
+=================
+- Allow shard key to point to a field in an embedded document. #551
+
 Changes in 0.10.1
 =======================
 - Fix infinite recursion with CASCADE delete rules under specific conditions. #1046

From 899e56e5b81e56f703b07df57a7e010f4c0eff32 Mon Sep 17 00:00:00 2001
From: George Macon <George.Macon@gtri.gatech.edu>
Date: Thu, 19 Nov 2015 17:15:40 -0500
Subject: [PATCH 0292/1519] Add gmacon to AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 4d5e69a31..411e274d6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -229,3 +229,4 @@ that much better:
  * Emile Caron (https://github.com/emilecaron)
  * Amit Lichtenberg (https://github.com/amitlicht)
  * Lars Butler (https://github.com/larsbutler)
+ * George Macon (https://github.com/gmacon)

From 0a1ba7c434cc4d437b7992a44b9dc73627f293a9 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Sat, 21 Nov 2015 10:25:11 +0100
Subject: [PATCH 0293/1519] Add SaveConditionError to __all__

---
 mongoengine/errors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 2c5c2946f..15830b5c3 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -6,7 +6,7 @@
 __all__ = ('NotRegistered', 'InvalidDocumentError', 'LookUpError',
            'DoesNotExist', 'MultipleObjectsReturned', 'InvalidQueryError',
            'OperationError', 'NotUniqueError', 'FieldDoesNotExist',
-           'ValidationError')
+           'ValidationError', 'SaveConditionError')
 
 
 class NotRegistered(Exception):

From 19cbb442ee0755abde120a91150310824873a7af Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Mon, 23 Nov 2015 13:57:15 +0200
Subject: [PATCH 0294/1519] Added #1129 to the changelog.

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6275d6d94..5809314cc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Changes in 0.10.2
 =================
 - Allow shard key to point to a field in an embedded document. #551
+- Allow arbirary metadata in fields. #1129
 
 Changes in 0.10.1
 =======================

From 013227323d8725e6ffd2e13aecfd0f3a9165d276 Mon Sep 17 00:00:00 2001
From: Ashley Whetter <ashley.whetter@aardman.com>
Date: Tue, 10 Nov 2015 14:29:25 +0000
Subject: [PATCH 0295/1519] ReferenceFields can now reference abstract Document
 types

A class that inherits from an abstract Document type is stored in the database
as a reference with a 'cls' field that is the class name of the document being
stored.

Fixes #837
---
 mongoengine/fields.py  | 25 ++++++++++++++++-----
 tests/fields/fields.py | 50 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f58993111..13538c89e 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -928,9 +928,14 @@ def __get__(self, instance, owner):
         self._auto_dereference = instance._fields[self.name]._auto_dereference
         # Dereference DBRefs
         if self._auto_dereference and isinstance(value, DBRef):
-            value = self.document_type._get_db().dereference(value)
+            if hasattr(value, 'cls'):
+                # Dereference using the class type specified in the reference
+                cls = get_document(value.cls)
+            else:
+                cls = self.document_type
+            value = cls._get_db().dereference(value)
             if value is not None:
-                instance._data[self.name] = self.document_type._from_son(value)
+                instance._data[self.name] = cls._from_son(value)
 
         return super(ReferenceField, self).__get__(instance, owner)
 
@@ -940,22 +945,30 @@ def to_mongo(self, document):
                 return document.id
             return document
 
-        id_field_name = self.document_type._meta['id_field']
-        id_field = self.document_type._fields[id_field_name]
-
         if isinstance(document, Document):
             # We need the id from the saved object to create the DBRef
             id_ = document.pk
             if id_ is None:
                 self.error('You can only reference documents once they have'
                            ' been saved to the database')
+
+            # Use the attributes from the document instance, so that they
+            # override the attributes of this field's document type
+            cls = document
         else:
             id_ = document
+            cls = self.document_type
+
+        id_field_name = cls._meta['id_field']
+        id_field = cls._fields[id_field_name]
 
         id_ = id_field.to_mongo(id_)
         if self.dbref:
-            collection = self.document_type._get_collection_name()
+            collection = cls._get_collection_name()
             return DBRef(collection, id_)
+        elif self.document_type._meta.get('abstract'):
+            collection = cls._get_collection_name()
+            return DBRef(collection, id_, cls=cls._class_name)
 
         return id_
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7ef298fc5..860a5749a 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2281,6 +2281,56 @@ class BlogPost(Document):
         Member.drop_collection()
         BlogPost.drop_collection()
 
+    def test_reference_class_with_abstract_parent(self):
+        """Ensure that a class with an abstract parent can be referenced.
+        """
+        class Sibling(Document):
+            name = StringField()
+            meta = {"abstract": True}
+
+        class Sister(Sibling):
+            pass
+
+        class Brother(Sibling):
+            sibling = ReferenceField(Sibling)
+
+        Sister.drop_collection()
+        Brother.drop_collection()
+
+        sister = Sister(name="Alice")
+        sister.save()
+        brother = Brother(name="Bob", sibling=sister)
+        brother.save()
+
+        self.assertEquals(Brother.objects[0].sibling.name, sister.name)
+
+        Sister.drop_collection()
+        Brother.drop_collection()
+
+    def test_reference_abstract_class(self):
+        """Ensure that an abstract class instance cannot be used in the
+        reference of that abstract class.
+        """
+        class Sibling(Document):
+            name = StringField()
+            meta = {"abstract": True}
+
+        class Sister(Sibling):
+            pass
+
+        class Brother(Sibling):
+            sibling = ReferenceField(Sibling)
+
+        Sister.drop_collection()
+        Brother.drop_collection()
+
+        sister = Sibling(name="Alice")
+        brother = Brother(name="Bob", sibling=sister)
+        self.assertRaises(ValidationError, brother.save)
+
+        Sister.drop_collection()
+        Brother.drop_collection()
+
     def test_generic_reference(self):
         """Ensure that a GenericReferenceField properly dereferences items.
         """

From f96e68cd11c72ab321bc1b7923bdfffd29f3bb11 Mon Sep 17 00:00:00 2001
From: Ashley Whetter <ashley.whetter@aardman.com>
Date: Tue, 10 Nov 2015 15:02:19 +0000
Subject: [PATCH 0296/1519] Made type inheritance a validation check for
 abstract references

---
 mongoengine/fields.py  |  8 ++++++++
 tests/fields/fields.py | 25 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 13538c89e..4c8c84980 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -996,6 +996,14 @@ def validate(self, value):
             self.error('You can only reference documents once they have been '
                        'saved to the database')
 
+        if self.document_type._meta.get('abstract') and \
+                not isinstance(value, self.document_type):
+            self.error('%s is not an instance of abstract reference'
+                    ' type %s' % (value._class_name,
+                        self.document_type._class_name)
+                    )
+
+
     def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 860a5749a..15daecb9e 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2331,6 +2331,31 @@ class Brother(Sibling):
         Sister.drop_collection()
         Brother.drop_collection()
 
+    def test_abstract_reference_base_type(self):
+        """Ensure that an an abstract reference fails validation when given a
+        Document that does not inherit from the abstract type.
+        """
+        class Sibling(Document):
+            name = StringField()
+            meta = {"abstract": True}
+
+        class Brother(Sibling):
+            sibling = ReferenceField(Sibling)
+
+        class Mother(Document):
+            name = StringField()
+
+        Brother.drop_collection()
+        Mother.drop_collection()
+
+        mother = Mother(name="Carol")
+        mother.save()
+        brother = Brother(name="Bob", sibling=mother)
+        self.assertRaises(ValidationError, brother.save)
+
+        Brother.drop_collection()
+        Mother.drop_collection()
+
     def test_generic_reference(self):
         """Ensure that a GenericReferenceField properly dereferences items.
         """

From aa9d5969301964c3e25fe5205b4d25ce1a9dd296 Mon Sep 17 00:00:00 2001
From: Ashley Whetter <ashley.whetter@aardman.com>
Date: Tue, 10 Nov 2015 15:03:15 +0000
Subject: [PATCH 0297/1519] Updated documentation for abstract reference
 changes

---
 AUTHORS               | 1 +
 docs/changelog.rst    | 1 +
 mongoengine/fields.py | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 411e274d6..fbca84e4b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -230,3 +230,4 @@ that much better:
  * Amit Lichtenberg (https://github.com/amitlicht)
  * Lars Butler (https://github.com/larsbutler)
  * George Macon (https://github.com/gmacon)
+ * Ashley Whetter (https://github.com/AWhetter)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5809314cc..377204318 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changes in 0.10.2
 =================
 - Allow shard key to point to a field in an embedded document. #551
 - Allow arbirary metadata in fields. #1129
+- ReferenceFields now support abstract document types. #837
 
 Changes in 0.10.1
 =======================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 4c8c84980..6ef13640a 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -896,6 +896,10 @@ def __init__(self, document_type, dbref=False,
           or as the :class:`~pymongo.objectid.ObjectId`.id .
         :param reverse_delete_rule: Determines what to do when the referring
           object is deleted
+
+        .. note ::
+            A reference to an abstract document type is always stored as a
+            :class:`~pymongo.dbref.DBRef`, regardless of the value of `dbref`.
         """
         if not isinstance(document_type, basestring):
             if not issubclass(document_type, (Document, basestring)):

From 04497aec36232c893755698911edff31c044f192 Mon Sep 17 00:00:00 2001
From: Ashley Whetter <ashley.whetter@aardman.com>
Date: Wed, 11 Nov 2015 09:24:31 +0000
Subject: [PATCH 0298/1519] Fixed setting dbref to True on abstract reference
 fields causing the reference to be stored incorrectly

---
 mongoengine/fields.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 6ef13640a..f89d7d8bf 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -967,12 +967,12 @@ def to_mongo(self, document):
         id_field = cls._fields[id_field_name]
 
         id_ = id_field.to_mongo(id_)
-        if self.dbref:
-            collection = cls._get_collection_name()
-            return DBRef(collection, id_)
-        elif self.document_type._meta.get('abstract'):
+        if self.document_type._meta.get('abstract'):
             collection = cls._get_collection_name()
             return DBRef(collection, id_, cls=cls._class_name)
+        elif self.dbref:
+            collection = cls._get_collection_name()
+            return DBRef(collection, id_)
 
         return id_
 

From 3c0b00e42d63a3f51842b364a5f69f353d10b466 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Mon, 23 Nov 2015 15:40:16 +0200
Subject: [PATCH 0299/1519] Added python 3.5 to the build.

---
 .travis.yml | 1 +
 tox.ini     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 34702192f..a0d755513 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
 - '3.2'
 - '3.3'
 - '3.4'
+- '3.5'
 - pypy
 - pypy3
 env:
diff --git a/tox.ini b/tox.ini
index e6aa7c813..2f84d668f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28}
+envlist = {py26,py27,py32,py33,py34,py35,pypy,pypy3}-{mg27,mg28}
 #envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30,mgdev}
 
 [testenv]

From a7aead5138f8792e4030328e23531ee7d4024744 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 24 Jun 2015 22:34:38 -0700
Subject: [PATCH 0300/1519] re-create the cursor object whenever we apply
 read_preference

---
 docs/changelog.rst           |  1 +
 mongoengine/queryset/base.py |  1 +
 tests/queryset/queryset.py   | 48 +++++++++++++++++++++++++++++++++++-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 377204318..1ea4d19fc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changes in 0.10.2
 - Allow shard key to point to a field in an embedded document. #551
 - Allow arbirary metadata in fields. #1129
 - ReferenceFields now support abstract document types. #837
+- Fix `read_preference` (it had chaining issues with PyMongo 2.x and it didn't work at all with PyMongo 3.x) #1042
 
 Changes in 0.10.1
 =======================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 0867e0e20..8880c2e3f 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -930,6 +930,7 @@ def read_preference(self, read_preference):
         validate_read_preference('read_preference', read_preference)
         queryset = self.clone()
         queryset._read_preference = read_preference
+        queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_preference
         return queryset
 
     def scalar(self, *fields):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 3eff7cea0..8726801e6 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4165,7 +4165,11 @@ class MyDoc(Document):
 
     def test_read_preference(self):
         class Bar(Document):
-            pass
+            txt = StringField()
+
+            meta = {
+                'indexes': [ 'txt' ]
+            }
 
         Bar.drop_collection()
         bars = list(Bar.objects(read_preference=ReadPreference.PRIMARY))
@@ -4177,9 +4181,51 @@ class Bar(Document):
             error_class = TypeError
         self.assertRaises(error_class, Bar.objects, read_preference='Primary')
 
+        # read_preference as a kwarg
         bars = Bar.objects(read_preference=ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(
             bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._cursor._Cursor__read_preference,
+            ReadPreference.SECONDARY_PREFERRED)
+
+        # read_preference as a query set method
+        bars = Bar.objects.read_preference(ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._cursor._Cursor__read_preference,
+            ReadPreference.SECONDARY_PREFERRED)
+
+        # read_preference after skip
+        bars = Bar.objects.skip(1) \
+            .read_preference(ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._cursor._Cursor__read_preference,
+            ReadPreference.SECONDARY_PREFERRED)
+
+        # read_preference after limit
+        bars = Bar.objects.limit(1) \
+            .read_preference(ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._cursor._Cursor__read_preference,
+            ReadPreference.SECONDARY_PREFERRED)
+
+        # read_preference after order_by
+        bars = Bar.objects.order_by('txt') \
+            .read_preference(ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._cursor._Cursor__read_preference,
+            ReadPreference.SECONDARY_PREFERRED)
+
+        # read_preference after hint
+        bars = Bar.objects.hint([('txt', 1)]) \
+            .read_preference(ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._cursor._Cursor__read_preference,
+            ReadPreference.SECONDARY_PREFERRED)
 
     def test_json_simple(self):
 

From 54975de0f387ad02a75134a4275401f684b855d7 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 5 Jul 2015 15:59:50 -0700
Subject: [PATCH 0301/1519] fix read_preference for PyMongo 3+

---
 mongoengine/queryset/base.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 8880c2e3f..ac4764d35 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1444,8 +1444,16 @@ def _cursor_args(self):
     def _cursor(self):
         if self._cursor_obj is None:
 
-            self._cursor_obj = self._collection.find(self._query,
-                                                     **self._cursor_args)
+            # In PyMongo 3+, we define the read preference on a collection
+            # level, not a cursor level. Thus, we need to get a cloned
+            # collection object using `with_options` first.
+            if IS_PYMONGO_3 and self._read_preference is not None:
+                self._cursor_obj = self._collection\
+                    .with_options(read_preference=self._read_preference)\
+                    .find(self._query, **self._cursor_args)
+            else:
+                self._cursor_obj = self._collection.find(self._query,
+                                                         **self._cursor_args)
             # Apply where clauses to cursor
             if self._where_clause:
                 where_clause = self._sub_js_fields(self._where_clause)

From f9284d20cae1b2596c164493f7bac0f240ade4d5 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Tue, 24 Nov 2015 07:00:09 +0200
Subject: [PATCH 0302/1519] Moved #1042 to the next version in the changelog.

---
 docs/changelog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1ea4d19fc..a0c499006 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,12 +2,15 @@
 Changelog
 =========
 
+Changes in 0.10.3
+=================
+- Fix `read_preference` (it had chaining issues with PyMongo 2.x and it didn't work at all with PyMongo 3.x) #1042
+
 Changes in 0.10.2
 =================
 - Allow shard key to point to a field in an embedded document. #551
 - Allow arbirary metadata in fields. #1129
 - ReferenceFields now support abstract document types. #837
-- Fix `read_preference` (it had chaining issues with PyMongo 2.x and it didn't work at all with PyMongo 3.x) #1042
 
 Changes in 0.10.1
 =======================

From a6e996d92142866a1d18570fe60d91eca806e14d Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Tue, 24 Nov 2015 07:06:54 +0200
Subject: [PATCH 0303/1519] Added #1165 to the changelog.

---
 docs/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a0c499006..c9285416a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+Changes in 0.10.4 - DEV
+=======================
+- SaveConditionError is now importable from the top level package. #1165
+
 Changes in 0.10.3
 =================
 - Fix `read_preference` (it had chaining issues with PyMongo 2.x and it didn't work at all with PyMongo 3.x) #1042

From b7b28390df2f0684b4a1af7c91dbaef60a8fdab5 Mon Sep 17 00:00:00 2001
From: srossiter <steve@agiletek.co.uk>
Date: Tue, 24 Nov 2015 12:46:38 +0000
Subject: [PATCH 0304/1519] Added upsert_one method on BaseQuerySet and
 modified test_upsert_one

---
 AUTHORS                      |  1 +
 mongoengine/__init__.py      |  2 +-
 mongoengine/queryset/base.py | 27 +++++++++++++++++++++++++++
 tests/queryset/queryset.py   | 13 +++++++++++--
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index fbca84e4b..dd04aee10 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -231,3 +231,4 @@ that much better:
  * Lars Butler (https://github.com/larsbutler)
  * George Macon (https://github.com/gmacon)
  * Ashley Whetter (https://github.com/AWhetter)
+ * Steven Rossiter (https://github.com/BeardedSteve)
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index eefaf08d9..09fb26dc9 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -14,7 +14,7 @@
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
 
-VERSION = (0, 10, 1)
+VERSION = (0, 10, 2)
 
 
 def get_version():
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ac4764d35..5c44db9ca 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -471,6 +471,33 @@ def update(self, upsert=False, multi=True, write_concern=None,
                 raise OperationError(message)
             raise OperationError(u'Update failed (%s)' % unicode(err))
 
+
+    def upsert_one(self, write_concern=None, **update):
+        """Perform an atomic upsert on the fields of the first document
+        matched by the query.
+
+        :param write_concern: Extra keyword arguments are passed down which
+            will be used as options for the resultant
+            ``getLastError`` command.  For example,
+            ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
+            wait until at least two servers have recorded the write and
+            will force an fsync on the primary server.
+        :param update: Django-style update keyword arguments
+
+        :returns the new or overwritten document
+
+        .. versionadded:: 10.0.2
+        """
+
+        update = self.update(multi=False, upsert=True, write_concern=write_concern,
+                             full_result=True,**update)
+
+        if update['updatedExisting']:
+            document = self.get()
+        else:
+            document = self._document.objects.with_id(update['upserted'])
+        return document
+
     def update_one(self, upsert=False, write_concern=None, **update):
         """Perform an atomic update on the fields of the first document
         matched by the query.
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 8726801e6..87c14757c 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -680,12 +680,21 @@ def test_upsert(self):
     def test_upsert_one(self):
         self.Person.drop_collection()
 
-        self.Person.objects(name="Bob", age=30).update_one(upsert=True)
+        bob = self.Person.objects(name="Bob", age=30).upsert_one()
 
-        bob = self.Person.objects.first()
         self.assertEqual("Bob", bob.name)
         self.assertEqual(30, bob.age)
 
+        bob.name = "Bobby"
+        bob.save()
+
+        bobby = self.Person.objects(name="Bobby", age=30).upsert_one()
+
+        self.assertEqual("Bobby", bobby.name)
+        self.assertEqual(30, bobby.age)
+        self.assertEqual(bob.id, bobby.id)
+
+
     def test_set_on_insert(self):
         self.Person.drop_collection()
 

From 164e2b2678a7d88deb00aa353662e69ad7a6100c Mon Sep 17 00:00:00 2001
From: srossiter <steve@agiletek.co.uk>
Date: Tue, 24 Nov 2015 12:53:09 +0000
Subject: [PATCH 0305/1519] Docstring change and rename variable to avoid clash
 with kwargs

---
 mongoengine/queryset/base.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5c44db9ca..ce4174b9c 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -473,8 +473,7 @@ def update(self, upsert=False, multi=True, write_concern=None,
 
 
     def upsert_one(self, write_concern=None, **update):
-        """Perform an atomic upsert on the fields of the first document
-        matched by the query.
+        """Overwrite or add the first document matched by the query.
 
         :param write_concern: Extra keyword arguments are passed down which
             will be used as options for the resultant
@@ -486,16 +485,16 @@ def upsert_one(self, write_concern=None, **update):
 
         :returns the new or overwritten document
 
-        .. versionadded:: 10.0.2
+        .. versionadded:: 0.10.2
         """
 
-        update = self.update(multi=False, upsert=True, write_concern=write_concern,
+        atomic_update = self.update(multi=False, upsert=True, write_concern=write_concern,
                              full_result=True,**update)
 
-        if update['updatedExisting']:
+        if atomic_update['updatedExisting']:
             document = self.get()
         else:
-            document = self._document.objects.with_id(update['upserted'])
+            document = self._document.objects.with_id(atomic_update['upserted'])
         return document
 
     def update_one(self, upsert=False, write_concern=None, **update):

From fc3db7942d2a2cd0016776268ebc8263c9b44dab Mon Sep 17 00:00:00 2001
From: srossiter <steve@agiletek.co.uk>
Date: Tue, 24 Nov 2015 12:56:59 +0000
Subject: [PATCH 0306/1519] updated changelog and version tuple

---
 docs/changelog.rst      | 1 +
 mongoengine/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c9285416a..7776a99b8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Changes in 0.10.4 - DEV
 =======================
 - SaveConditionError is now importable from the top level package. #1165
+- upsert_one method added. #1157
 
 Changes in 0.10.3
 =================
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 09fb26dc9..14a7c1ce8 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -14,7 +14,7 @@
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
 
-VERSION = (0, 10, 2)
+VERSION = (0, 10, 4)
 
 
 def get_version():

From 2af8342fea1702a247de9587a9494e48bf73b9af Mon Sep 17 00:00:00 2001
From: hhstore <hhstore@qq.com>
Date: Thu, 26 Nov 2015 12:01:42 +0800
Subject: [PATCH 0307/1519] bugfix - two small bugs.

---
 docs/code/tumblelog.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/code/tumblelog.py b/docs/code/tumblelog.py
index 0e40e8992..c10160ea6 100644
--- a/docs/code/tumblelog.py
+++ b/docs/code/tumblelog.py
@@ -17,6 +17,10 @@ class Post(Document):
     tags = ListField(StringField(max_length=30))
     comments = ListField(EmbeddedDocumentField(Comment))
 
+    # bugfix
+    meta = {'allow_inheritance': True}
+
+
 class TextPost(Post):
     content = StringField()
 
@@ -45,7 +49,8 @@ class LinkPost(Post):
 print
 for post in Post.objects:
     print post.title
-    print '=' * post.title.count()
+    #print '=' * post.title.count()
+    print "=" * 20
 
     if isinstance(post, TextPost):
         print post.content

From 3c18f79ea45996e715c4d9af394c7d23947c2ffe Mon Sep 17 00:00:00 2001
From: Paul-Armand Verhaegen <paularmand.verhaegen@gmail.com>
Date: Fri, 27 Nov 2015 23:45:25 +0100
Subject: [PATCH 0308/1519] Added test for reloading of strict with special
 fields #1156

---
 tests/document/instance.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 56e6765a9..fe8ed1bd9 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -557,6 +557,28 @@ class Foo(Document):
         except Exception:
             self.assertFalse("Threw wrong exception")
 
+    def test_reload_of_non_strict_with_special_field_name(self):
+        """Ensures reloading works for documents with meta strict == False
+        """
+        class Post(Document):
+            meta = {
+                'strict': False
+            }
+            title = StringField()
+            items = ListField()
+
+        Post.drop_collection()
+
+        Post._get_collection().insert_one({
+            "title": "Items eclipse",
+            "items": ["more lorem", "even more ipsum"]
+        })
+
+        post = Post.objects.first()
+        post.reload()
+        self.assertEqual(post.title, "Items eclipse")
+        self.assertEqual(post.items, ["more lorem", "even more ipsum"])
+
     def test_dictionary_access(self):
         """Ensure that dictionary-style field access works properly.
         """

From 23f07fde5e88c42c42f26ca48edd10456c7babbf Mon Sep 17 00:00:00 2001
From: RussellLuo <luopeng.he@gmail.com>
Date: Sun, 8 Nov 2015 22:11:47 +0800
Subject: [PATCH 0309/1519] Add support for mocking MongoEngine based on
 mongomock

Using `mongomock://` scheme in URI enables the mocking. Fix #1045.
---
 mongoengine/connection.py | 21 ++++++++++++++++++---
 tests/test_connection.py  | 19 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 4abca1ab7..2ea572df9 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -54,8 +54,11 @@ def register_connection(alias, name=None, host=None, port=None,
     }
 
     # Handle uri style connections
-    if "://" in conn_settings['host']:
-        uri_dict = uri_parser.parse_uri(conn_settings['host'])
+    conn_host = conn_settings['host']
+    if conn_host.startswith('mongomock://'):
+        conn_settings['is_mock'] = True
+    elif '://' in conn_host:
+        uri_dict = uri_parser.parse_uri(conn_host)
         conn_settings.update({
             'name': uri_dict.get('database') or name,
             'username': uri_dict.get('username'),
@@ -106,7 +109,19 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
         conn_settings.pop('password', None)
         conn_settings.pop('authentication_source', None)
 
-        connection_class = MongoClient
+        is_mock = conn_settings.pop('is_mock', None)
+        if is_mock:
+            # Use MongoClient from mongomock
+            try:
+                import mongomock
+            except ImportError:
+                raise RuntimeError('You need mongomock installed '
+                                   'to mock MongoEngine.')
+            connection_class = mongomock.MongoClient
+        else:
+            # Use MongoClient from pymongo
+            connection_class = MongoClient
+
         if 'replicaSet' in conn_settings:
             # Discard port since it can't be used on MongoReplicaSetClient
             conn_settings.pop('port', None)
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 1b7b7a222..4466ee733 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -8,6 +8,7 @@
     import unittest2 as unittest
 except ImportError:
     import unittest
+from nose.plugins.skip import SkipTest
 
 import pymongo
 from bson.tz_util import utc
@@ -51,6 +52,22 @@ def test_connect(self):
         conn = get_connection('testdb')
         self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
 
+    def test_connect_in_mocking(self):
+        """Ensure that the connect() method works properly in mocking.
+        """
+        try:
+            import mongomock
+        except ImportError:
+            raise SkipTest('you need mongomock installed to run this testcase')
+
+        connect('mongoenginetest', host='mongomock://localhost')
+        conn = get_connection()
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect('mongoenginetest2', host='mongomock://localhost', alias='testdb')
+        conn = get_connection('testdb')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
     def test_disconnect(self):
         """Ensure that the disconnect() method works properly
         """
@@ -151,7 +168,7 @@ def test_connect_uri_with_authsource(self):
             self.assertRaises(ConnectionError, get_db, 'test1')
 
         # Authentication succeeds with "authSource"
-        test_conn2 = connect(
+        connect(
             'mongoenginetest', alias='test2',
             host=('mongodb://username2:password@localhost/'
                   'mongoenginetest?authSource=admin')

From a81d6d124b7f6f3dc17794fae32fe0f3959158b6 Mon Sep 17 00:00:00 2001
From: RussellLuo <luopeng.he@gmail.com>
Date: Sun, 6 Dec 2015 11:11:46 +0800
Subject: [PATCH 0310/1519] Update AUTHORS and add changelog entry for #1151

---
 AUTHORS            | 1 +
 docs/changelog.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 66e181c95..b087f41c6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -233,3 +233,4 @@ that much better:
  * Ashley Whetter (https://github.com/AWhetter)
  * Paul-Armand Verhaegen (https://github.com/paularmand)
  * Steven Rossiter (https://github.com/BeardedSteve)
+ * Luo Peng (https://github.com/RussellLuo)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c354be188..13b14a0ff 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Changes in 0.10.5
 =================
 - Fix for reloading of strict with special fields. #1156
+- Add support for mocking MongoEngine based on mongomock. #1151
 
 Changes in 0.10.4
 =================

From 713af133a09ba6c5b98dcc743ead3e1decc86124 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Sun, 6 Dec 2015 07:54:25 +0200
Subject: [PATCH 0311/1519] Moved #1151 changelog entry to the correct version.

---
 docs/changelog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 13b14a0ff..353a2a0ce 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,10 +2,13 @@
 Changelog
 =========
 
+Changes in 0.10.6 - Dev
+=======================
+- Add support for mocking MongoEngine based on mongomock. #1151
+
 Changes in 0.10.5
 =================
 - Fix for reloading of strict with special fields. #1156
-- Add support for mocking MongoEngine based on mongomock. #1151
 
 Changes in 0.10.4
 =================

From a3886702a396158cc8bf6e4c34a5428eca236c24 Mon Sep 17 00:00:00 2001
From: moonso <monsunas@gmail.com>
Date: Sun, 6 Dec 2015 11:02:26 +0100
Subject: [PATCH 0312/1519] Added page for documenting mongomock. Updated
 docs/guide/index.rst

---
 docs/guide/index.rst     |  1 +
 docs/guide/mongomock.rst | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 docs/guide/mongomock.rst

diff --git a/docs/guide/index.rst b/docs/guide/index.rst
index c40778882..46eb7af2c 100644
--- a/docs/guide/index.rst
+++ b/docs/guide/index.rst
@@ -13,3 +13,4 @@ User Guide
    gridfs
    signals
    text-indexes
+   mongomock
diff --git a/docs/guide/mongomock.rst b/docs/guide/mongomock.rst
new file mode 100644
index 000000000..9471e94ea
--- /dev/null
+++ b/docs/guide/mongomock.rst
@@ -0,0 +1,21 @@
+==============================
+Use mongomock for testing
+==============================
+
+`mongomock <https://github.com/vmalloc/mongomock/>`_ is a package to do just 
+what the name implies, mocking a mongo database.
+
+To use with mongoengine, simply specify mongomock when connecting with 
+mongoengine:
+
+.. code-block:: python
+
+    connect('mongoenginetest', host='mongomock://localhost')
+    conn = get_connection()
+
+or with an alias:
+
+.. code-block:: python
+
+    connect('mongoenginetest', host='mongomock://localhost', alias='testdb')
+    conn = get_connection('testdb)

From 04e8b83d4586a94ba3db5e342ba060e16e388b7e Mon Sep 17 00:00:00 2001
From: Ashley Whetter <ashley.whetter@aardman.com>
Date: Tue, 10 Nov 2015 11:05:30 +0000
Subject: [PATCH 0313/1519] Fixed being unable to run tests on Windows

---
 docs/changelog.rst | 1 +
 tox.ini            | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 353a2a0ce..0dcb7e949 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Changes in 0.10.6 - Dev
 =======================
 - Add support for mocking MongoEngine based on mongomock. #1151
+- Fixed not being able to run tests on Windows. #1153
 
 Changes in 0.10.5
 =================
diff --git a/tox.ini b/tox.ini
index 2f84d668f..124c8843b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,3 +12,6 @@ deps =
     mg28: PyMongo>=2.8,<3.0
     mg30: PyMongo>=3.0
     mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
+setenv =
+    PYTHON_EGG_CACHE = {envdir}/python-eggs
+passenv = windir

From 9c264611cf9af99057ac31d3f863fa300da8e2d7 Mon Sep 17 00:00:00 2001
From: bitdivision <rfwebb@gmail.com>
Date: Wed, 9 Dec 2015 11:40:22 +0000
Subject: [PATCH 0314/1519] Add EmbeddedDocumentListField to user guide

The 'defining a document' section currently doesn't include EmbeddedDocumentListField. Only EmbeddedDocumentField
---
 docs/guide/defining-documents.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index c3ad208e3..1a5fbfc9c 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -75,6 +75,7 @@ are as follows:
 * :class:`~mongoengine.fields.DynamicField`
 * :class:`~mongoengine.fields.EmailField`
 * :class:`~mongoengine.fields.EmbeddedDocumentField`
+* :class:`~mongoengine.fields.EmbeddedDocumentListField`
 * :class:`~mongoengine.fields.FileField`
 * :class:`~mongoengine.fields.FloatField`
 * :class:`~mongoengine.fields.GenericEmbeddedDocumentField`

From 00221e341008913cae7c309eb9ba7487fcffd4de Mon Sep 17 00:00:00 2001
From: George Macon <george.macon@gtri.gatech.edu>
Date: Wed, 16 Sep 2015 15:27:57 -0400
Subject: [PATCH 0315/1519] Allow sparse compound indexes

---
 docs/changelog.rst           |  1 +
 mongoengine/base/document.py |  4 ----
 tests/document/indexes.py    | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0dcb7e949..df9840597 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changes in 0.10.6 - Dev
 =======================
 - Add support for mocking MongoEngine based on mongomock. #1151
 - Fixed not being able to run tests on Windows. #1153
+- Allow creation of sparse compound indexes. #1114
 
 Changes in 0.10.5
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 6353162ab..05b3ad954 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -839,10 +839,6 @@ def _build_index_spec(cls, spec):
 
         if index_list:
             spec['fields'] = index_list
-        if spec.get('sparse', False) and len(spec['fields']) > 1:
-            raise ValueError(
-                'Sparse indexes can only have one field in them. '
-                'See https://jira.mongodb.org/browse/SERVER-2193')
 
         return spec
 
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index ccc6cf446..7ee017a63 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -863,6 +863,20 @@ class MyDoc(Document):
         self.assertTrue([('provider_ids.foo', 1)] in info)
         self.assertTrue([('provider_ids.bar', 1)] in info)
 
+    def test_sparse_compound_indexes(self):
+
+        class MyDoc(Document):
+            provider_ids = DictField()
+            meta = {
+                "indexes": [{'fields': ("provider_ids.foo", "provider_ids.bar"),
+                             'sparse': True}],
+            }
+
+        info = MyDoc.objects._collection.index_information()
+        self.assertEqual([('provider_ids.foo', 1), ('provider_ids.bar', 1)],
+                         info['provider_ids.foo_1_provider_ids.bar_1']['key'])
+        self.assertTrue(info['provider_ids.foo_1_provider_ids.bar_1']['sparse'])
+
     def test_text_indexes(self):
 
         class Book(Document):

From 35d3d3de724af4dec758be1c02fb56f0600b16b8 Mon Sep 17 00:00:00 2001
From: David Bordeynik <david.bordeynik@gmail.com>
Date: Tue, 15 Dec 2015 22:26:30 +0200
Subject: [PATCH 0316/1519] fix-#1187: count on ListField of
 EmbeddedDocumentField fails

---
 docs/changelog.rst         |  1 +
 mongoengine/fields.py      |  2 +-
 tests/queryset/queryset.py | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index df9840597..857835ae4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changes in 0.10.6 - Dev
 - Add support for mocking MongoEngine based on mongomock. #1151
 - Fixed not being able to run tests on Windows. #1153
 - Allow creation of sparse compound indexes. #1114
+- count on ListField of EmbeddedDocumentField fails. #1187
 
 Changes in 0.10.5
 =================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 3887fd84e..07209d0bb 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -697,7 +697,7 @@ def validate(self, value):
 
     def prepare_query_value(self, op, value):
         if self.field:
-            if op in ('set', 'unset') and (
+            if op in ('set', 'unset', None) and (
                     not isinstance(value, basestring) and
                     not isinstance(value, BaseDocument) and
                     hasattr(value, '__iter__')):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 87c14757c..39ec064c9 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -3613,6 +3613,15 @@ class MyDoc(Document):
         self.assertEqual(MyDoc.objects.count(), 10)
         self.assertEqual(MyDoc.objects.none().count(), 0)
 
+    def test_count_list_embedded(self):
+        class B(EmbeddedDocument):
+            c = StringField()
+
+        class A(Document):
+            b = ListField(EmbeddedDocumentField(B))
+
+        self.assertEqual(A.objects(b=[{'c': 'c'}]).count(), 0)
+
     def test_call_after_limits_set(self):
         """Ensure that re-filtering after slicing works
         """
@@ -4888,5 +4897,6 @@ class Doc(Document):
 
         self.assertEqual(1, Doc.objects(item__type__="axe").count())
 
+
 if __name__ == '__main__':
     unittest.main()

From acc7448dc50eef6f90edf5b16e992f0b7635466d Mon Sep 17 00:00:00 2001
From: Nick Pjetrovic <hika.petrovic@gmail.com>
Date: Thu, 24 Dec 2015 18:30:46 -0500
Subject: [PATCH 0317/1519] Fix pre_bulk_insert signal

---
 mongoengine/queryset/base.py |  4 +--
 tests/test_signals.py        | 51 +++++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ce4174b9c..489a4994d 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -296,7 +296,6 @@ def insert(self, doc_or_docs, load_bulk=True, write_concern=None):
             return_one = True
             docs = [docs]
 
-        raw = []
         for doc in docs:
             if not isinstance(doc, self._document):
                 msg = ("Some documents inserted aren't instances of %s"
@@ -305,9 +304,10 @@ def insert(self, doc_or_docs, load_bulk=True, write_concern=None):
             if doc.pk and not doc._created:
                 msg = "Some documents have ObjectIds use doc.update() instead"
                 raise OperationError(msg)
-            raw.append(doc.to_mongo())
 
         signals.pre_bulk_insert.send(self._document, documents=docs)
+
+        raw = [doc.to_mongo() for doc in docs]
         try:
             ids = self._collection.insert(raw, **write_concern)
         except pymongo.errors.DuplicateKeyError, err:
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 8672925c9..78305b7d8 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -118,6 +118,35 @@ def post_save(cls, sender, document, **kwargs):
         self.ExplicitId = ExplicitId
         ExplicitId.drop_collection()
 
+        class Post(Document):
+            title = StringField()
+            content = StringField()
+            active = BooleanField(default=False)
+
+            def __unicode__(self):
+                return self.title
+
+            @classmethod
+            def pre_bulk_insert(cls, sender, documents, **kwargs):
+                signal_output.append('pre_bulk_insert signal, %s' %
+                                     [(doc, {'active': documents[n].active})
+                                      for n, doc in enumerate(documents)])
+
+                # make changes here, this is just an example -
+                # it could be anything that needs pre-validation or looks-ups before bulk bulk inserting
+                for document in documents:
+                    if not document.active:
+                        document.active = True
+
+            @classmethod
+            def post_bulk_insert(cls, sender, documents, **kwargs):
+                signal_output.append('post_bulk_insert signal, %s' %
+                                     [(doc, {'active': documents[n].active})
+                                      for n, doc in enumerate(documents)])
+
+        self.Post = Post
+        Post.drop_collection()
+
         # Save up the number of connected signals so that we can check at the
         # end that all the signals we register get properly unregistered
         self.pre_signals = (
@@ -147,6 +176,9 @@ def post_save(cls, sender, document, **kwargs):
 
         signals.post_save.connect(ExplicitId.post_save, sender=ExplicitId)
 
+        signals.pre_bulk_insert.connect(Post.pre_bulk_insert, sender=Post)
+        signals.post_bulk_insert.connect(Post.post_bulk_insert, sender=Post)
+
     def tearDown(self):
         signals.pre_init.disconnect(self.Author.pre_init)
         signals.post_init.disconnect(self.Author.post_init)
@@ -163,6 +195,9 @@ def tearDown(self):
 
         signals.post_save.disconnect(self.ExplicitId.post_save)
 
+        signals.pre_bulk_insert.disconnect(self.Post.pre_bulk_insert)
+        signals.post_bulk_insert.disconnect(self.Post.post_bulk_insert)
+
         # Check that all our signals got disconnected properly.
         post_signals = (
             len(signals.pre_init.receivers),
@@ -199,7 +234,7 @@ def load_existing_author():
             a.save()
             self.get_signal_output(lambda: None) # eliminate signal output
             a1 = self.Author.objects(name='Bill Shakespeare')[0]
-        
+
         self.assertEqual(self.get_signal_output(create_author), [
             "pre_init signal, Author",
             "{'name': 'Bill Shakespeare'}",
@@ -306,6 +341,20 @@ def test_signals_with_switch_db(self):
         ei.switch_db("testdb-1", keep_created=False)
         self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
 
+    def test_signals_bulk_insert(self):
+        def bulk_set_active_post():
+            posts = [
+                self.Post(title='Post 1'),
+                self.Post(title='Post 2'),
+                self.Post(title='Post 3')
+            ]
+            self.Post.objects.insert(posts)
+
+        results = self.get_signal_output(bulk_set_active_post)
+        self.assertEqual(results, [
+            "pre_bulk_insert signal, [(<Post: Post 1>, {'active': False}), (<Post: Post 2>, {'active': False}), (<Post: Post 3>, {'active': False})]",
+            "post_bulk_insert signal, [(<Post: Post 1>, {'active': True}), (<Post: Post 2>, {'active': True}), (<Post: Post 3>, {'active': True})]"
+        ])
 
 if __name__ == '__main__':
     unittest.main()

From 3d80e549cb52939bfbdc9a1d4382bc5b80d4ddb3 Mon Sep 17 00:00:00 2001
From: Ruslan Nassonov <rus.nassonov@gmail.com>
Date: Fri, 25 Dec 2015 15:52:35 +0500
Subject: [PATCH 0318/1519] fix missing quote in /docs/guide/mongomock.rst

---
 docs/guide/mongomock.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/mongomock.rst b/docs/guide/mongomock.rst
index 9471e94ea..1d5227ec1 100644
--- a/docs/guide/mongomock.rst
+++ b/docs/guide/mongomock.rst
@@ -18,4 +18,4 @@ or with an alias:
 .. code-block:: python
 
     connect('mongoenginetest', host='mongomock://localhost', alias='testdb')
-    conn = get_connection('testdb)
+    conn = get_connection('testdb')

From 8c81f7ece99517703249051dc8462b50c81478a7 Mon Sep 17 00:00:00 2001
From: Zephor <zephor@qq.com>
Date: Wed, 6 Jan 2016 12:00:48 +0800
Subject: [PATCH 0319/1519] add highlight for python code

---
 README.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index f4c92d5f8..08e95029a 100644
--- a/README.rst
+++ b/README.rst
@@ -48,7 +48,9 @@ Optional Dependencies
 
 Examples
 ========
-Some simple examples of what MongoEngine code looks like::
+Some simple examples of what MongoEngine code looks like:
+
+.. code :: python
 
     class BlogPost(Document):
         title = StringField(required=True, max_length=200)

From 0284975f3fe408bec3a64afba66471b2973b5010 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 19 Jan 2016 15:34:38 +0100
Subject: [PATCH 0320/1519] Correct
 test_reload_of_non_strict_with_special_field_name for pymongo<2.9

---
 tests/document/instance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index deb4e6ac4..f463ec311 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -583,7 +583,7 @@ class Post(Document):
 
         Post.drop_collection()
 
-        Post._get_collection().insert_one({
+        Post._get_collection().insert({
             "title": "Items eclipse",
             "items": ["more lorem", "even more ipsum"]
         })

From 13897db6d3a953077a3fc4c4d555141e959d42da Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 20 Jan 2016 11:06:45 +0100
Subject: [PATCH 0321/1519] Fix mongomock url prefix error during connection

---
 mongoengine/connection.py |  5 +++++
 tests/test_connection.py  | 24 ++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index cde3ccd4c..4055a9b6e 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -38,8 +38,11 @@ def register_connection(alias, name=None, host=None, port=None,
     :param username: username to authenticate with
     :param password: password to authenticate with
     :param authentication_source: database to authenticate against
+    :param is_mock: explicitly use mongomock for this connection
+        (can also be done by using `mongomock://` as db host prefix)
     :param kwargs: allow ad-hoc parameters to be passed into the pymongo driver
 
+    .. versionchanged:: 0.10.6 - added mongomock support
     """
     global _connection_settings
 
@@ -57,6 +60,8 @@ def register_connection(alias, name=None, host=None, port=None,
     conn_host = conn_settings['host']
     if conn_host.startswith('mongomock://'):
         conn_settings['is_mock'] = True
+        # `mongomock://` is not a valid url prefix and must be replaced by `mongodb://`
+        conn_settings['host'] = conn_host.replace('mongomock://', 'mongodb://', 1)
     elif '://' in conn_host:
         uri_dict = uri_parser.parse_uri(conn_host)
         conn_settings.update({
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 4466ee733..b2f7406e2 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -64,8 +64,28 @@ def test_connect_in_mocking(self):
         conn = get_connection()
         self.assertTrue(isinstance(conn, mongomock.MongoClient))
 
-        connect('mongoenginetest2', host='mongomock://localhost', alias='testdb')
-        conn = get_connection('testdb')
+        connect('mongoenginetest2', host='mongomock://localhost', alias='testdb2')
+        conn = get_connection('testdb2')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect('mongoenginetest3', host='mongodb://localhost', is_mock=True, alias='testdb3')
+        conn = get_connection('testdb3')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect('mongoenginetest4', is_mock=True, alias='testdb4')
+        conn = get_connection('testdb4')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect(host='mongodb://localhost:27017/mongoenginetest5', is_mock=True, alias='testdb5')
+        conn = get_connection('testdb5')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect(host='mongomock://localhost:27017/mongoenginetest6', alias='testdb6')
+        conn = get_connection('testdb6')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect(host='mongomock://localhost:27017/mongoenginetest7', is_mock=True, alias='testdb7')
+        conn = get_connection('testdb7')
         self.assertTrue(isinstance(conn, mongomock.MongoClient))
 
     def test_disconnect(self):

From 7b7165f5d8ab9cc29c29a02fbdd547113edb30b9 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 20 Jan 2016 11:48:31 +0100
Subject: [PATCH 0322/1519] Force pip version to 7.1.2 in tox for py32 (support
 dropped for latter versions)

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 124c8843b..eae0767cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ deps =
     mg28: PyMongo>=2.8,<3.0
     mg30: PyMongo>=3.0
     mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
+    py32: pip==7.1.2
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs
 passenv = windir

From f4fa39c70ede0599d317e3b30f3b96da3f1d4249 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 20 Jan 2016 13:07:06 +0100
Subject: [PATCH 0323/1519] Revert "Force pip version to 7.1.2 in tox for py32
 (support dropped for latter versions)"

This reverts commit 7b7165f5d8ab9cc29c29a02fbdd547113edb30b9.
---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index eae0767cb..124c8843b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,6 @@ deps =
     mg28: PyMongo>=2.8,<3.0
     mg30: PyMongo>=3.0
     mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
-    py32: pip==7.1.2
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs
 passenv = windir

From feb5eed8a5db8799bfd4c86cda40d2f0b63071cd Mon Sep 17 00:00:00 2001
From: Bastien <bast.gerard@gmail.com>
Date: Thu, 21 Jan 2016 16:59:37 +0100
Subject: [PATCH 0324/1519] fixed minor typo in docstring

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c2ad027eb..f78001978 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1109,7 +1109,7 @@ def item_frequencies(self, field, normalize=False, map_reduce=True):
             Can only do direct simple mappings and cannot map across
             :class:`~mongoengine.fields.ReferenceField` or
             :class:`~mongoengine.fields.GenericReferenceField` for more complex
-            counting a manual map reduce call would is required.
+            counting a manual map reduce call is required.
 
         If the field is a :class:`~mongoengine.fields.ListField`, the items within
         each list will be counted individually.

From b4af8ec751a17fe6c819c2e129e89e7005a1d0ae Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Fri, 22 Jan 2016 08:38:42 +0100
Subject: [PATCH 0325/1519] Fix travis for python 3.2

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a0d755513..0af5c2692 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,8 @@ install:
 - sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev
   libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
   python-tk
-- travis_retry pip install tox>=1.9 coveralls
+# virtualenv>=14.0.0 has dropped Python 3.2 support
+- travis_retry pip install "virtualenv<14.0.0" "tox>=1.9" coveralls
 - travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
 script:
 - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage

From a20d40618f5c40e63e98efd57f0733592a9fe064 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Mon, 25 Jan 2016 01:42:19 +0100
Subject: [PATCH 0326/1519] Bump to v0.10.6

---
 docs/changelog.rst      | 4 ++--
 mongoengine/__init__.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index df9840597..b92b9cec5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,8 +2,8 @@
 Changelog
 =========
 
-Changes in 0.10.6 - Dev
-=======================
+Changes in 0.10.6
+=================
 - Add support for mocking MongoEngine based on mongomock. #1151
 - Fixed not being able to run tests on Windows. #1153
 - Allow creation of sparse compound indexes. #1114
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 791e741e4..65250b621 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -14,7 +14,7 @@
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
 
-VERSION = (0, 10, 5)
+VERSION = (0, 10, 6)
 
 
 def get_version():

From 6c9e1799c703fa0ab0f568c6da08b3990679ab64 Mon Sep 17 00:00:00 2001
From: Bryan Bennett <bbenne10@gmail.com>
Date: Wed, 20 Jan 2016 16:42:57 -0500
Subject: [PATCH 0327/1519] MongoEngine/mongoengine #1217: Curry **kwargs
 through to_mongo on fields

---
 mongoengine/base/document.py | 21 +++++++---------
 mongoengine/base/fields.py   | 22 +++++++++--------
 mongoengine/fields.py        | 46 ++++++++++++++++++------------------
 tests/document/instance.py   | 13 ++++++++++
 tests/fields/fields.py       |  2 +-
 5 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 05b3ad954..a890081ad 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -325,20 +325,17 @@ def to_mongo(self, use_db_field=True, fields=None):
 
             if value is not None:
 
-                if isinstance(field, EmbeddedDocumentField):
-                    if fields:
-                        key = '%s.' % field_name
-                        embedded_fields = [
-                            i.replace(key, '') for i in fields
-                            if i.startswith(key)]
+                if fields:
+                    key = '%s.' % field_name
+                    embedded_fields = [
+                        i.replace(key, '') for i in fields
+                        if i.startswith(key)]
 
-                    else:
-                        embedded_fields = []
-
-                    value = field.to_mongo(value, use_db_field=use_db_field,
-                                           fields=embedded_fields)
                 else:
-                    value = field.to_mongo(value)
+                    embedded_fields = []
+
+                value = field.to_mongo(value, use_db_field=use_db_field,
+                                        fields=embedded_fields)
 
             # Handle self generating fields
             if value is None and field._auto_gen:
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index b7b8d0de0..4b2d0e8f3 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -158,7 +158,7 @@ def to_python(self, value):
         """
         return value
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         """Convert a Python type to a MongoDB-compatible type.
         """
         return self.to_python(value)
@@ -325,7 +325,7 @@ def to_python(self, value):
                                          key=operator.itemgetter(0))]
         return value_dict
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         """Convert a Python type to a MongoDB-compatible type.
         """
         Document = _import_class("Document")
@@ -337,9 +337,10 @@ def to_mongo(self, value):
 
         if hasattr(value, 'to_mongo'):
             if isinstance(value, Document):
-                return GenericReferenceField().to_mongo(value)
+                return GenericReferenceField().to_mongo(
+                    value, **kwargs)
             cls = value.__class__
-            val = value.to_mongo()
+            val = value.to_mongo(**kwargs)
             # If it's a document that is not inherited add _cls
             if isinstance(value, EmbeddedDocument):
                 val['_cls'] = cls.__name__
@@ -354,7 +355,7 @@ def to_mongo(self, value):
                 return value
 
         if self.field:
-            value_dict = dict([(key, self.field.to_mongo(item))
+            value_dict = dict([(key, self.field.to_mongo(item, **kwargs))
                                for key, item in value.iteritems()])
         else:
             value_dict = {}
@@ -373,19 +374,20 @@ def to_mongo(self, value):
                         meta.get('allow_inheritance', ALLOW_INHERITANCE)
                         is True)
                     if not allow_inheritance and not self.field:
-                        value_dict[k] = GenericReferenceField().to_mongo(v)
+                        value_dict[k] = GenericReferenceField().to_mongo(
+                            v, **kwargs)
                     else:
                         collection = v._get_collection_name()
                         value_dict[k] = DBRef(collection, v.pk)
                 elif hasattr(v, 'to_mongo'):
                     cls = v.__class__
-                    val = v.to_mongo()
+                    val = v.to_mongo(**kwargs)
                     # If it's a document that is not inherited add _cls
                     if isinstance(v, (Document, EmbeddedDocument)):
                         val['_cls'] = cls.__name__
                     value_dict[k] = val
                 else:
-                    value_dict[k] = self.to_mongo(v)
+                    value_dict[k] = self.to_mongo(v, **kwargs)
 
         if is_list:  # Convert back to a list
             return [v for _, v in sorted(value_dict.items(),
@@ -443,7 +445,7 @@ def to_python(self, value):
             pass
         return value
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         if not isinstance(value, ObjectId):
             try:
                 return ObjectId(unicode(value))
@@ -618,7 +620,7 @@ def _validate_multipolygon(self, value):
         if errors:
             return "Invalid MultiPolygon:\n%s" % ", ".join(errors)
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         if isinstance(value, dict):
             return value
         return SON([("type", self._type), ("coordinates", value)])
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 3887fd84e..e5e25457e 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -325,7 +325,7 @@ def to_python(self, value):
             return value
         return value.quantize(decimal.Decimal(".%s" % ("0" * self.precision)), rounding=self.rounding)
 
-    def to_mongo(self, value, use_db_field=True):
+    def to_mongo(self, value, **kwargs):
         if value is None:
             return value
         if self.force_string:
@@ -388,7 +388,7 @@ def validate(self, value):
         if not isinstance(new_value, (datetime.datetime, datetime.date)):
             self.error(u'cannot parse date "%s"' % value)
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         if value is None:
             return value
         if isinstance(value, datetime.datetime):
@@ -511,7 +511,7 @@ def to_python(self, value):
         except:
             return original_value
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         value = self.to_python(value)
         return self._convert_from_datetime(value)
 
@@ -546,11 +546,10 @@ def to_python(self, value):
             return self.document_type._from_son(value, _auto_dereference=self._auto_dereference)
         return value
 
-    def to_mongo(self, value, use_db_field=True, fields=[]):
+    def to_mongo(self, value, **kwargs):
         if not isinstance(value, self.document_type):
             return value
-        return self.document_type.to_mongo(value, use_db_field,
-                                           fields=fields)
+        return self.document_type.to_mongo(value, **kwargs)
 
     def validate(self, value, clean=True):
         """Make sure that the document instance is an instance of the
@@ -600,11 +599,11 @@ def validate(self, value, clean=True):
 
         value.validate(clean=clean)
 
-    def to_mongo(self, document, use_db_field=True):
+    def to_mongo(self, document, **kwargs):
         if document is None:
             return None
 
-        data = document.to_mongo(use_db_field)
+        data = document.to_mongo(**kwargs)
         if '_cls' not in data:
             data['_cls'] = document._class_name
         return data
@@ -616,7 +615,7 @@ class DynamicField(BaseField):
 
     Used by :class:`~mongoengine.DynamicDocument` to handle dynamic data"""
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         """Convert a Python type to a MongoDB compatible type.
         """
 
@@ -625,7 +624,7 @@ def to_mongo(self, value):
 
         if hasattr(value, 'to_mongo'):
             cls = value.__class__
-            val = value.to_mongo()
+            val = value.to_mongo(**kwargs)
             # If we its a document thats not inherited add _cls
             if isinstance(value, Document):
                 val = {"_ref": value.to_dbref(), "_cls": cls.__name__}
@@ -643,7 +642,7 @@ def to_mongo(self, value):
 
         data = {}
         for k, v in value.iteritems():
-            data[k] = self.to_mongo(v)
+            data[k] = self.to_mongo(v, **kwargs)
 
         value = data
         if is_list:  # Convert back to a list
@@ -755,8 +754,8 @@ def __init__(self, field, **kwargs):
             self._order_reverse = kwargs.pop('reverse')
         super(SortedListField, self).__init__(field, **kwargs)
 
-    def to_mongo(self, value):
-        value = super(SortedListField, self).to_mongo(value)
+    def to_mongo(self, value, **kwargs):
+        value = super(SortedListField, self).to_mongo(value, **kwargs)
         if self._ordering is not None:
             return sorted(value, key=itemgetter(self._ordering),
                           reverse=self._order_reverse)
@@ -942,7 +941,7 @@ def __get__(self, instance, owner):
 
         return super(ReferenceField, self).__get__(instance, owner)
 
-    def to_mongo(self, document):
+    def to_mongo(self, document, **kwargs):
         if isinstance(document, DBRef):
             if not self.dbref:
                 return document.id
@@ -965,7 +964,7 @@ def to_mongo(self, document):
         id_field_name = cls._meta['id_field']
         id_field = cls._fields[id_field_name]
 
-        id_ = id_field.to_mongo(id_)
+        id_ = id_field.to_mongo(id_, **kwargs)
         if self.document_type._meta.get('abstract'):
             collection = cls._get_collection_name()
             return DBRef(collection, id_, cls=cls._class_name)
@@ -1088,7 +1087,7 @@ def __get__(self, instance, owner):
 
         return super(CachedReferenceField, self).__get__(instance, owner)
 
-    def to_mongo(self, document):
+    def to_mongo(self, document, **kwargs):
         id_field_name = self.document_type._meta['id_field']
         id_field = self.document_type._fields[id_field_name]
 
@@ -1103,10 +1102,11 @@ def to_mongo(self, document):
             # TODO: should raise here or will fail next statement
 
         value = SON((
-            ("_id", id_field.to_mongo(id_)),
+            ("_id", id_field.to_mongo(id_, **kwargs)),
         ))
 
-        value.update(dict(document.to_mongo(fields=self.fields)))
+        kwargs['fields'] = self.fields
+        value.update(dict(document.to_mongo(**kwargs)))
         return value
 
     def prepare_query_value(self, op, value):
@@ -1222,7 +1222,7 @@ def dereference(self, value):
             doc = doc_cls._from_son(doc)
         return doc
 
-    def to_mongo(self, document, use_db_field=True):
+    def to_mongo(self, document, **kwargs):
         if document is None:
             return None
 
@@ -1241,7 +1241,7 @@ def to_mongo(self, document, use_db_field=True):
         else:
             id_ = document
 
-        id_ = id_field.to_mongo(id_)
+        id_ = id_field.to_mongo(id_, **kwargs)
         collection = document._get_collection_name()
         ref = DBRef(collection, id_)
         return SON((
@@ -1270,7 +1270,7 @@ def __set__(self, instance, value):
             value = bin_type(value)
         return super(BinaryField, self).__set__(instance, value)
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         return Binary(value)
 
     def validate(self, value):
@@ -1495,7 +1495,7 @@ def get_proxy_obj(self, key, instance, db_alias=None, collection_name=None):
                                 db_alias=db_alias,
                                 collection_name=collection_name)
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         # Store the GridFS file id in MongoDB
         if isinstance(value, self.proxy_class) and value.grid_id is not None:
             return value.grid_id
@@ -1845,7 +1845,7 @@ def to_python(self, value):
                 return original_value
         return value
 
-    def to_mongo(self, value):
+    def to_mongo(self, value, **kwargs):
         if not self._binary:
             return unicode(value)
         elif isinstance(value, basestring):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index f463ec311..61f138976 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -679,6 +679,19 @@ class Doc(Document):
         doc = Doc.objects.get()
         self.assertHasInstance(doc.embedded_field[0], doc)
 
+    def test_embedded_document_complex_instance_no_use_db_field(self):
+        """Ensure that use_db_field is propagated to list of Emb Docs
+        """
+        class Embedded(EmbeddedDocument):
+            string = StringField(db_field='s')
+
+        class Doc(Document):
+            embedded_field = ListField(EmbeddedDocumentField(Embedded))
+
+        d = Doc(embedded_field=[Embedded(string="Hi")]).to_mongo(
+            use_db_field=False).to_dict()
+        self.assertEqual(d['embedded_field'], [{'string': 'Hi'}])
+
     def test_instance_is_set_on_setattr(self):
 
         class Email(EmbeddedDocument):
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 15daecb9e..dbba6f9fb 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3380,7 +3380,7 @@ class EnumField(BaseField):
             def __init__(self, **kwargs):
                 super(EnumField, self).__init__(**kwargs)
 
-            def to_mongo(self, value):
+            def to_mongo(self, value, **kwargs):
                 return value
 
             def to_python(self, value):

From 8f8217e9284375331ed64914d4db3b5190a8fb54 Mon Sep 17 00:00:00 2001
From: Bryan Bennett <bbenne10@gmail.com>
Date: Wed, 20 Jan 2016 16:58:25 -0500
Subject: [PATCH 0328/1519] Add Bryan Bennett to AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index b087f41c6..ad070b30d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -234,3 +234,4 @@ that much better:
  * Paul-Armand Verhaegen (https://github.com/paularmand)
  * Steven Rossiter (https://github.com/BeardedSteve)
  * Luo Peng (https://github.com/RussellLuo)
+ * Bryan Bennett (https://github.com/bbenne10)

From c65fd0e47752ed7b713288bba749aee6a6654695 Mon Sep 17 00:00:00 2001
From: Bryan Bennett <bbenne10@gmail.com>
Date: Wed, 20 Jan 2016 16:58:33 -0500
Subject: [PATCH 0329/1519] Note changes for #1217 in Changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b92b9cec5..363bdbfb4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changes in 0.10.6
 - Add support for mocking MongoEngine based on mongomock. #1151
 - Fixed not being able to run tests on Windows. #1153
 - Allow creation of sparse compound indexes. #1114
+- Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
 
 Changes in 0.10.5
 =================

From 7a568dc118fff0668807d334e9f5cffd3b8166ce Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 26 Jan 2016 15:54:57 +0100
Subject: [PATCH 0330/1519] Add version 0.10.7 - DEV in changelog.rst

---
 docs/changelog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 363bdbfb4..7682598b1 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,12 +2,15 @@
 Changelog
 =========
 
+Changes in 0.10.7 - DEV
+=======================
+- Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
+
 Changes in 0.10.6
 =================
 - Add support for mocking MongoEngine based on mongomock. #1151
 - Fixed not being able to run tests on Windows. #1153
 - Allow creation of sparse compound indexes. #1114
-- Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
 
 Changes in 0.10.5
 =================

From 9f8327926d3fa4f7559834a899bfc998371cfeb1 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Thu, 28 Jan 2016 18:18:51 +0100
Subject: [PATCH 0331/1519] Improve a bit queryset's test_elem_match

---
 tests/queryset/queryset.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 87c14757c..a9a2536a5 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4114,6 +4114,10 @@ class Bar(Document):
                       Foo(shape="circle", color="purple", thick=False)])
         b2.save()
 
+        b3 = Bar(foo=[Foo(shape="square", thick=True),
+                      Foo(shape="circle", color="purple", thick=False)])
+        b3.save()
+
         ak = list(
             Bar.objects(foo__match={'shape': "square", "color": "purple"}))
         self.assertEqual([b1], ak)
@@ -4133,6 +4137,13 @@ class Bar(Document):
             Bar.objects(foo__match={'shape': "square", "color__exists": True}))
         self.assertEqual([b1, b2], ak)
 
+        ak = list(
+            Bar.objects(foo__elemMatch={'shape': "square", "color__exists": False}))
+        self.assertEqual([b3], ak)
+
+        ak = list(
+            Bar.objects(foo__match={'shape': "square", "color__exists": False}))
+        self.assertEqual([b3], ak)
 
     def test_upsert_includes_cls(self):
         """Upserts should include _cls information for inheritable classes

From a643933d163b6dd3a1952bb171259210fadf4b31 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Sat, 30 Jan 2016 11:58:37 +0100
Subject: [PATCH 0332/1519] Fix cascade delete mixing among collections

---
 docs/changelog.rst           |  1 +
 mongoengine/queryset/base.py |  6 ++--
 tests/document/instance.py   | 56 ++++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7682598b1..6fb7e6aa9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Changes in 0.10.7 - DEV
 =======================
 - Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
+- Fixed cascade delete mixing among collections #1224
 
 Changes in 0.10.6
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 454d781a0..de796de57 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -403,8 +403,10 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
             rule = doc._meta['delete_rules'][rule_entry]
             if rule == CASCADE:
                 cascade_refs = set() if cascade_refs is None else cascade_refs
-                for ref in queryset:
-                    cascade_refs.add(ref.id)
+                # Handle recursive reference
+                if doc._collection == document_cls._collection:
+                    for ref in queryset:
+                        cascade_refs.add(ref.id)
                 ref_q = document_cls.objects(**{field_name + '__in': self, 'id__nin': cascade_refs})
                 ref_q_count = ref_q.count()
                 if ref_q_count > 0:
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 61f138976..4cfe8b8ee 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1906,6 +1906,62 @@ class BlogPost(Document):
         author.delete()
         self.assertEqual(BlogPost.objects.count(), 0)
 
+    def test_reverse_delete_rule_with_custom_id_field(self):
+        """Ensure that a referenced document with custom primary key
+        is also deleted upon deletion.
+        """
+        class User(Document):
+            name = StringField(primary_key=True)
+
+        class Book(Document):
+            author = ReferenceField(User, reverse_delete_rule=CASCADE)
+            reviewer = ReferenceField(User, reverse_delete_rule=NULLIFY)
+
+        User.drop_collection()
+        Book.drop_collection()
+
+        user = User(name='Mike').save()
+        reviewer = User(name='John').save()
+        book = Book(author=user, reviewer=reviewer).save()
+
+        reviewer.delete()
+        self.assertEqual(Book.objects.count(), 1)
+        self.assertEqual(Book.objects.get().reviewer, None)
+
+        user.delete()
+        self.assertEqual(Book.objects.count(), 0)
+
+    def test_reverse_delete_rule_with_shared_id_among_collections(self):
+        """Ensure that cascade delete rule doesn't mix id among collections.
+        """
+        class User(Document):
+            id = IntField(primary_key=True)
+
+        class Book(Document):
+            id = IntField(primary_key=True)
+            author = ReferenceField(User, reverse_delete_rule=CASCADE)
+
+        User.drop_collection()
+        Book.drop_collection()
+
+        user_1 = User(id=1).save()
+        user_2 = User(id=2).save()
+        book_1 = Book(id=1, author=user_2).save()
+        book_2 = Book(id=2, author=user_1).save()
+
+        user_2.delete()
+        # Deleting user_2 should also delete book_1 but not book_2
+        self.assertEqual(Book.objects.count(), 1)
+        self.assertEqual(Book.objects.get(), book_2)
+
+        user_3 = User(id=3).save()
+        book_3 = Book(id=3, author=user_3).save()
+
+        user_3.delete()
+        # Deleting user_3 should also delete book_3
+        self.assertEqual(Book.objects.count(), 1)
+        self.assertEqual(Book.objects.get(), book_2)
+
     def test_reverse_delete_rule_with_document_inheritance(self):
         """Ensure that a referenced document is also deleted upon deletion
         of a child document.

From b32006441847298405f5be7711477a88163ae064 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 9 Feb 2016 14:28:55 +0100
Subject: [PATCH 0333/1519] Add signal_kwargs arg for save/delete/bulk insert

---
 docs/changelog.rst           |   1 +
 mongoengine/document.py      |  26 +++++--
 mongoengine/queryset/base.py |  15 +++-
 tests/test_signals.py        | 145 +++++++++++++++++++++++++++--------
 4 files changed, 142 insertions(+), 45 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6fb7e6aa9..3794e9e35 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changes in 0.10.7 - DEV
 =======================
 - Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
 - Fixed cascade delete mixing among collections #1224
+- Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls #1206
 
 Changes in 0.10.6
 =================
diff --git a/mongoengine/document.py b/mongoengine/document.py
index d76c393be..8211d95ea 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -250,7 +250,7 @@ def modify(self, query={}, **update):
 
     def save(self, force_insert=False, validate=True, clean=True,
              write_concern=None, cascade=None, cascade_kwargs=None,
-             _refs=None, save_condition=None, **kwargs):
+             _refs=None, save_condition=None, signal_kwargs=None, **kwargs):
         """Save the :class:`~mongoengine.Document` to the database. If the
         document already exists, it will be updated, otherwise it will be
         created.
@@ -276,6 +276,8 @@ def save(self, force_insert=False, validate=True, clean=True,
         :param save_condition: only perform save if matching record in db
             satisfies condition(s) (e.g. version number).
             Raises :class:`OperationError` if the conditions are not satisfied
+        :parm signal_kwargs: (optional) kwargs dictionary to be passed to
+            the signal calls.
 
         .. versionchanged:: 0.5
             In existing documents it only saves changed fields using
@@ -297,8 +299,11 @@ def save(self, force_insert=False, validate=True, clean=True,
             :class:`OperationError` exception raised if save_condition fails.
         .. versionchanged:: 0.10.1
             :class: save_condition failure now raises a `SaveConditionError`
+        .. versionchanged:: 0.10.7
+            Add signal_kwargs argument
         """
-        signals.pre_save.send(self.__class__, document=self)
+        signal_kwargs = signal_kwargs or {}
+        signals.pre_save.send(self.__class__, document=self, **signal_kwargs)
 
         if validate:
             self.validate(clean=clean)
@@ -311,7 +316,7 @@ def save(self, force_insert=False, validate=True, clean=True,
         created = ('_id' not in doc or self._created or force_insert)
 
         signals.pre_save_post_validation.send(self.__class__, document=self,
-                                              created=created)
+                                              created=created, **signal_kwargs)
 
         try:
             collection = self._get_collection()
@@ -400,7 +405,8 @@ def is_new_object(last_error):
         if created or id_field not in self._meta.get('shard_key', []):
             self[id_field] = self._fields[id_field].to_python(object_id)
 
-        signals.post_save.send(self.__class__, document=self, created=created)
+        signals.post_save.send(self.__class__, document=self,
+                               created=created, **signal_kwargs)
         self._clear_changed_fields()
         self._created = False
         return self
@@ -476,18 +482,24 @@ def update(self, **kwargs):
         # Need to add shard key to query, or you get an error
         return self._qs.filter(**self._object_key).update_one(**kwargs)
 
-    def delete(self, **write_concern):
+    def delete(self, signal_kwargs=None, **write_concern):
         """Delete the :class:`~mongoengine.Document` from the database. This
         will only take effect if the document has been previously saved.
 
+        :parm signal_kwargs: (optional) kwargs dictionary to be passed to
+            the signal calls.
         :param write_concern: Extra keyword arguments are passed down which
             will be used as options for the resultant
             ``getLastError`` command.  For example,
             ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
             wait until at least two servers have recorded the write and
             will force an fsync on the primary server.
+
+        .. versionchanged:: 0.10.7
+            Add signal_kwargs argument
         """
-        signals.pre_delete.send(self.__class__, document=self)
+        signal_kwargs = signal_kwargs or {}
+        signals.pre_delete.send(self.__class__, document=self, **signal_kwargs)
 
         # Delete FileFields separately 
         FileField = _import_class('FileField')
@@ -501,7 +513,7 @@ def delete(self, **write_concern):
         except pymongo.errors.OperationFailure, err:
             message = u'Could not delete document (%s)' % err.message
             raise OperationError(message)
-        signals.post_delete.send(self.__class__, document=self)
+        signals.post_delete.send(self.__class__, document=self, **signal_kwargs)
 
     def switch_db(self, db_alias, keep_created=True):
         """
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index de796de57..f301e160e 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -266,7 +266,8 @@ def first(self):
             result = None
         return result
 
-    def insert(self, doc_or_docs, load_bulk=True, write_concern=None):
+    def insert(self, doc_or_docs, load_bulk=True,
+               write_concern=None, signal_kwargs=None):
         """bulk insert documents
 
         :param doc_or_docs: a document or list of documents to be inserted
@@ -279,11 +280,15 @@ def insert(self, doc_or_docs, load_bulk=True, write_concern=None):
                 ``insert(..., {w: 2, fsync: True})`` will wait until at least
                 two servers have recorded the write and will force an fsync on
                 each server being written to.
+        :parm signal_kwargs: (optional) kwargs dictionary to be passed to
+            the signal calls.
 
         By default returns document instances, set ``load_bulk`` to False to
         return just ``ObjectIds``
 
         .. versionadded:: 0.5
+        .. versionchanged:: 0.10.7
+            Add signal_kwargs argument
         """
         Document = _import_class('Document')
 
@@ -305,7 +310,9 @@ def insert(self, doc_or_docs, load_bulk=True, write_concern=None):
                 msg = "Some documents have ObjectIds use doc.update() instead"
                 raise OperationError(msg)
 
-        signals.pre_bulk_insert.send(self._document, documents=docs)
+        signal_kwargs = signal_kwargs or {}
+        signals.pre_bulk_insert.send(self._document,
+                                     documents=docs, **signal_kwargs)
 
         raw = [doc.to_mongo() for doc in docs]
         try:
@@ -324,7 +331,7 @@ def insert(self, doc_or_docs, load_bulk=True, write_concern=None):
 
         if not load_bulk:
             signals.post_bulk_insert.send(
-                self._document, documents=docs, loaded=False)
+                self._document, documents=docs, loaded=False, **signal_kwargs)
             return return_one and ids[0] or ids
 
         documents = self.in_bulk(ids)
@@ -332,7 +339,7 @@ def insert(self, doc_or_docs, load_bulk=True, write_concern=None):
         for obj_id in ids:
             results.append(documents.get(obj_id))
         signals.post_bulk_insert.send(
-            self._document, documents=results, loaded=True)
+            self._document, documents=results, loaded=True, **signal_kwargs)
         return return_one and results[0] or results
 
     def count(self, with_limit_and_skip=False):
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 78305b7d8..23da7cd4a 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -25,6 +25,8 @@ def setUp(self):
         connect(db='mongoenginetest')
 
         class Author(Document):
+            # Make the id deterministic for easier testing
+            id = SequenceField(primary_key=True)
             name = StringField()
 
             def __unicode__(self):
@@ -33,7 +35,7 @@ def __unicode__(self):
             @classmethod
             def pre_init(cls, sender, document, *args, **kwargs):
                 signal_output.append('pre_init signal, %s' % cls.__name__)
-                signal_output.append(str(kwargs['values']))
+                signal_output.append(kwargs['values'])
 
             @classmethod
             def post_init(cls, sender, document, **kwargs):
@@ -43,48 +45,55 @@ def post_init(cls, sender, document, **kwargs):
             @classmethod
             def pre_save(cls, sender, document, **kwargs):
                 signal_output.append('pre_save signal, %s' % document)
+                signal_output.append(kwargs)
 
             @classmethod
             def pre_save_post_validation(cls, sender, document, **kwargs):
                 signal_output.append('pre_save_post_validation signal, %s' % document)
-                if 'created' in kwargs:
-                    if kwargs['created']:
-                        signal_output.append('Is created')
-                    else:
-                        signal_output.append('Is updated')
+                if kwargs.pop('created', False):
+                    signal_output.append('Is created')
+                else:
+                    signal_output.append('Is updated')
+                signal_output.append(kwargs)
 
             @classmethod
             def post_save(cls, sender, document, **kwargs):
                 dirty_keys = document._delta()[0].keys() + document._delta()[1].keys()
                 signal_output.append('post_save signal, %s' % document)
                 signal_output.append('post_save dirty keys, %s' % dirty_keys)
-                if 'created' in kwargs:
-                    if kwargs['created']:
-                        signal_output.append('Is created')
-                    else:
-                        signal_output.append('Is updated')
+                if kwargs.pop('created', False):
+                    signal_output.append('Is created')
+                else:
+                    signal_output.append('Is updated')
+                signal_output.append(kwargs)
 
             @classmethod
             def pre_delete(cls, sender, document, **kwargs):
                 signal_output.append('pre_delete signal, %s' % document)
+                signal_output.append(kwargs)
 
             @classmethod
             def post_delete(cls, sender, document, **kwargs):
                 signal_output.append('post_delete signal, %s' % document)
+                signal_output.append(kwargs)
 
             @classmethod
             def pre_bulk_insert(cls, sender, documents, **kwargs):
                 signal_output.append('pre_bulk_insert signal, %s' % documents)
+                signal_output.append(kwargs)
 
             @classmethod
             def post_bulk_insert(cls, sender, documents, **kwargs):
                 signal_output.append('post_bulk_insert signal, %s' % documents)
-                if kwargs.get('loaded', False):
+                if kwargs.pop('loaded', False):
                     signal_output.append('Is loaded')
                 else:
                     signal_output.append('Not loaded')
+                signal_output.append(kwargs)
+
         self.Author = Author
         Author.drop_collection()
+        Author.id.set_next_value(0)
 
         class Another(Document):
 
@@ -96,10 +105,12 @@ def __unicode__(self):
             @classmethod
             def pre_delete(cls, sender, document, **kwargs):
                 signal_output.append('pre_delete signal, %s' % document)
+                signal_output.append(kwargs)
 
             @classmethod
             def post_delete(cls, sender, document, **kwargs):
                 signal_output.append('post_delete signal, %s' % document)
+                signal_output.append(kwargs)
 
         self.Another = Another
         Another.drop_collection()
@@ -137,12 +148,18 @@ def pre_bulk_insert(cls, sender, documents, **kwargs):
                 for document in documents:
                     if not document.active:
                         document.active = True
+                signal_output.append(kwargs)
 
             @classmethod
             def post_bulk_insert(cls, sender, documents, **kwargs):
                 signal_output.append('post_bulk_insert signal, %s' %
                                      [(doc, {'active': documents[n].active})
                                       for n, doc in enumerate(documents)])
+                if kwargs.pop('loaded', False):
+                    signal_output.append('Is loaded')
+                else:
+                    signal_output.append('Not loaded')
+                signal_output.append(kwargs)
 
         self.Post = Post
         Post.drop_collection()
@@ -237,63 +254,118 @@ def load_existing_author():
 
         self.assertEqual(self.get_signal_output(create_author), [
             "pre_init signal, Author",
-            "{'name': 'Bill Shakespeare'}",
+            {'name': 'Bill Shakespeare'},
             "post_init signal, Bill Shakespeare, document._created = True",
         ])
 
         a1 = self.Author(name='Bill Shakespeare')
         self.assertEqual(self.get_signal_output(a1.save), [
             "pre_save signal, Bill Shakespeare",
+            {},
             "pre_save_post_validation signal, Bill Shakespeare",
             "Is created",
+            {},
             "post_save signal, Bill Shakespeare",
             "post_save dirty keys, ['name']",
-            "Is created"
+            "Is created",
+            {}
         ])
 
         a1.reload()
         a1.name = 'William Shakespeare'
         self.assertEqual(self.get_signal_output(a1.save), [
             "pre_save signal, William Shakespeare",
+            {},
             "pre_save_post_validation signal, William Shakespeare",
             "Is updated",
+            {},
             "post_save signal, William Shakespeare",
             "post_save dirty keys, ['name']",
-            "Is updated"
+            "Is updated",
+            {}
         ])
 
         self.assertEqual(self.get_signal_output(a1.delete), [
             'pre_delete signal, William Shakespeare',
+            {},
             'post_delete signal, William Shakespeare',
+            {}
         ])
 
-        signal_output = self.get_signal_output(load_existing_author)
-        # test signal_output lines separately, because of random ObjectID after object load
-        self.assertEqual(signal_output[0],
+        self.assertEqual(self.get_signal_output(load_existing_author), [
             "pre_init signal, Author",
-        )
-        self.assertEqual(signal_output[2],
-            "post_init signal, Bill Shakespeare, document._created = False",
-        )
-
-
-        signal_output = self.get_signal_output(bulk_create_author_with_load)
+            {'id': 2, 'name': 'Bill Shakespeare'},
+            "post_init signal, Bill Shakespeare, document._created = False"
+        ])
 
-        # The output of this signal is not entirely deterministic. The reloaded
-        # object will have an object ID. Hence, we only check part of the output
-        self.assertEqual(signal_output[3], "pre_bulk_insert signal, [<Author: Bill Shakespeare>]"
-        )
-        self.assertEqual(signal_output[-2:],
-            ["post_bulk_insert signal, [<Author: Bill Shakespeare>]",
-             "Is loaded",])
+        self.assertEqual(self.get_signal_output(bulk_create_author_with_load), [
+            'pre_init signal, Author',
+            {'name': 'Bill Shakespeare'},
+            'post_init signal, Bill Shakespeare, document._created = True',
+            'pre_bulk_insert signal, [<Author: Bill Shakespeare>]',
+            {},
+            'pre_init signal, Author',
+            {'id': 3, 'name': 'Bill Shakespeare'},
+            'post_init signal, Bill Shakespeare, document._created = False',
+            'post_bulk_insert signal, [<Author: Bill Shakespeare>]',
+            'Is loaded',
+            {}
+        ])
 
         self.assertEqual(self.get_signal_output(bulk_create_author_without_load), [
             "pre_init signal, Author",
-            "{'name': 'Bill Shakespeare'}",
+            {'name': 'Bill Shakespeare'},
             "post_init signal, Bill Shakespeare, document._created = True",
             "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
+            {},
             "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
             "Not loaded",
+            {}
+        ])
+
+    def test_signal_kwargs(self):
+        """ Make sure signal_kwargs is passed to signals calls. """
+
+        def live_and_let_die():
+            a = self.Author(name='Bill Shakespeare')
+            a.save(signal_kwargs={'live': True, 'die': False})
+            a.delete(signal_kwargs={'live': False, 'die': True})
+
+        self.assertEqual(self.get_signal_output(live_and_let_die), [
+            "pre_init signal, Author",
+            {'name': 'Bill Shakespeare'},
+            "post_init signal, Bill Shakespeare, document._created = True",
+            "pre_save signal, Bill Shakespeare",
+            {'die': False, 'live': True},
+            "pre_save_post_validation signal, Bill Shakespeare",
+            "Is created",
+            {'die': False, 'live': True},
+            "post_save signal, Bill Shakespeare",
+            "post_save dirty keys, ['name']",
+            "Is created",
+            {'die': False, 'live': True},
+            'pre_delete signal, Bill Shakespeare',
+            {'die': True, 'live': False},
+            'post_delete signal, Bill Shakespeare',
+            {'die': True, 'live': False}
+        ])
+
+        def bulk_create_author():
+            a1 = self.Author(name='Bill Shakespeare')
+            self.Author.objects.insert([a1], signal_kwargs={'key': True})
+
+        self.assertEqual(self.get_signal_output(bulk_create_author), [
+            'pre_init signal, Author',
+            {'name': 'Bill Shakespeare'},
+            'post_init signal, Bill Shakespeare, document._created = True',
+            'pre_bulk_insert signal, [<Author: Bill Shakespeare>]',
+            {'key': True},
+            'pre_init signal, Author',
+            {'id': 2, 'name': 'Bill Shakespeare'},
+            'post_init signal, Bill Shakespeare, document._created = False',
+            'post_bulk_insert signal, [<Author: Bill Shakespeare>]',
+            'Is loaded',
+            {'key': True}
         ])
 
     def test_queryset_delete_signals(self):
@@ -302,7 +374,9 @@ def test_queryset_delete_signals(self):
         self.Another(name='Bill Shakespeare').save()
         self.assertEqual(self.get_signal_output(self.Another.objects.delete), [
             'pre_delete signal, Bill Shakespeare',
+            {},
             'post_delete signal, Bill Shakespeare',
+            {}
         ])
 
     def test_signals_with_explicit_doc_ids(self):
@@ -353,7 +427,10 @@ def bulk_set_active_post():
         results = self.get_signal_output(bulk_set_active_post)
         self.assertEqual(results, [
             "pre_bulk_insert signal, [(<Post: Post 1>, {'active': False}), (<Post: Post 2>, {'active': False}), (<Post: Post 3>, {'active': False})]",
-            "post_bulk_insert signal, [(<Post: Post 1>, {'active': True}), (<Post: Post 2>, {'active': True}), (<Post: Post 3>, {'active': True})]"
+            {},
+            "post_bulk_insert signal, [(<Post: Post 1>, {'active': True}), (<Post: Post 2>, {'active': True}), (<Post: Post 3>, {'active': True})]",
+            'Is loaded',
+            {}
         ])
 
 if __name__ == '__main__':

From 8f505c2dcc36c57d57fcba8e8bb4f52da4424344 Mon Sep 17 00:00:00 2001
From: hhstore <hhstore@qq.com>
Date: Wed, 17 Feb 2016 10:55:31 +0800
Subject: [PATCH 0334/1519] fix a small bug - ReferenceField() comment give a
 wrong demo .

---
 mongoengine/fields.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e5e25457e..1300b0e42 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -877,7 +877,7 @@ class Bar(Document):
             content = StringField()
             foo = ReferenceField('Foo')
 
-        Bar.register_delete_rule(Foo, 'bar', NULLIFY)
+        Bar.register_delete_rule(Foo, 'foo', NULLIFY)
 
     .. note ::
         `reverse_delete_rule` does not trigger pre / post delete signals to be
@@ -1013,7 +1013,7 @@ def lookup_member(self, member_name):
 class CachedReferenceField(BaseField):
     """
     A referencefield with cache fields to purpose pseudo-joins
-    
+
     .. versionadded:: 0.9
     """
 
@@ -1707,17 +1707,17 @@ class SequenceField(BaseField):
     :param collection_name:  Name of the counter collection (default 'mongoengine.counters')
     :param sequence_name: Name of the sequence in the collection (default 'ClassName.counter')
     :param value_decorator: Any callable to use as a counter (default int)
-        
+
     Use any callable as `value_decorator` to transform calculated counter into
     any value suitable for your needs, e.g. string or hexadecimal
     representation of the default integer counter value.
-    
+
     .. note::
-    
-        In case the counter is defined in the abstract document, it will be 
-        common to all inherited documents and the default sequence name will 
+
+        In case the counter is defined in the abstract document, it will be
+        common to all inherited documents and the default sequence name will
         be the class name of the abstract document.
-    
+
     .. versionadded:: 0.5
     .. versionchanged:: 0.8 added `value_decorator`
     """

From c499133bbe1aee8ed3d6adb024eb762ca47a2e5f Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Fri, 19 Feb 2016 00:11:30 +0100
Subject: [PATCH 0335/1519] Add missing drop_collection in tests fields

---
 tests/fields/fields.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index dbba6f9fb..bf2b5dd53 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1551,6 +1551,8 @@ class Person(Document):
             name = StringField()
             preferences = EmbeddedDocumentField(PersonPreferences)
 
+        Person.drop_collection()
+
         person = Person(name='Test User')
         person.preferences = 'My Preferences'
         self.assertRaises(ValidationError, person.validate)
@@ -1583,6 +1585,8 @@ class BlogPost(Document):
             content = StringField()
             author = EmbeddedDocumentField(User)
 
+        BlogPost.drop_collection()
+
         post = BlogPost(content='What I did today...')
         post.author = PowerUser(name='Test User', power=47)
         post.save()

From adce9e6220616ee030041da7ee6c12f78a133132 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Fri, 19 Feb 2016 01:58:15 +0100
Subject: [PATCH 0336/1519] Raise OperationError in drop_collection if no
 collection is set

---
 docs/changelog.rst      |  1 +
 mongoengine/document.py | 12 +++++++++++-
 tests/fields/fields.py  | 10 ++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3794e9e35..069872eca 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changes in 0.10.7 - DEV
 - Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
 - Fixed cascade delete mixing among collections #1224
 - Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls #1206
+- Raise `OperationError` when trying to do a `drop_collection` on document with no collection set.
 
 Changes in 0.10.6
 =================
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 8211d95ea..52353523e 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -679,10 +679,20 @@ def register_delete_rule(cls, document_cls, field_name, rule):
     def drop_collection(cls):
         """Drops the entire collection associated with this
         :class:`~mongoengine.Document` type from the database.
+
+        Raises :class:`OperationError` if the document has no collection set
+        (i.g. if it is `abstract`)
+
+        .. versionchanged:: 0.10.7
+            :class:`OperationError` exception raised if no collection available
         """
+        col_name = cls._get_collection_name()
+        if not col_name:
+            raise OperationError('Document %s has no collection defined '
+                                 '(is it abstract ?)' % cls)
         cls._collection = None
         db = cls._get_db()
-        db.drop_collection(cls._get_collection_name())
+        db.drop_collection(col_name)
 
     @classmethod
     def create_index(cls, keys, background=False, **kwargs):
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index bf2b5dd53..eb2f46c76 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2285,6 +2285,16 @@ class BlogPost(Document):
         Member.drop_collection()
         BlogPost.drop_collection()
 
+    def test_drop_abstract_document(self):
+        """Ensure that an abstract document cannot be dropped given it
+        has no underlying collection.
+        """
+        class AbstractDoc(Document):
+            name = StringField()
+            meta = {"abstract": True}
+
+        self.assertRaises(OperationError, AbstractDoc.drop_collection)
+
     def test_reference_class_with_abstract_parent(self):
         """Ensure that a class with an abstract parent can be referenced.
         """

From 9e9703183fd54997eea3c5a42d9e999c38975b23 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Fri, 19 Feb 2016 02:16:37 +0100
Subject: [PATCH 0337/1519] Add test for nested list in EmbeddedDocument

---
 mongoengine/base/fields.py |  3 +--
 tests/fields/fields.py     | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 4b2d0e8f3..be50ac40b 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -285,8 +285,6 @@ def __get__(self, instance, owner):
     def to_python(self, value):
         """Convert a MongoDB-compatible type to a Python type.
         """
-        Document = _import_class('Document')
-
         if isinstance(value, basestring):
             return value
 
@@ -306,6 +304,7 @@ def to_python(self, value):
             value_dict = dict([(key, self.field.to_python(item))
                                for key, item in value.items()])
         else:
+            Document = _import_class('Document')
             value_dict = {}
             for k, v in value.items():
                 if isinstance(v, Document):
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index eb2f46c76..757f66a85 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1593,6 +1593,31 @@ class BlogPost(Document):
 
         self.assertEqual(47, BlogPost.objects.first().author.power)
 
+    def test_embedded_document_inheritance_with_list(self):
+        """Ensure that nested list of subclassed embedded documents is
+        handled correctly.
+        """
+
+        class Group(EmbeddedDocument):
+            name = StringField()
+            content = ListField(StringField())
+
+        class Basedoc(Document):
+            groups = ListField(EmbeddedDocumentField(Group))
+            meta = {'abstract': True}
+
+        class User(Basedoc):
+            doctype = StringField(require=True, default='userdata')
+
+        User.drop_collection()
+
+        content = ['la', 'le', 'lu']
+        group = Group(name='foo', content=content)
+        foobar = User(groups=[group])
+        foobar.save()
+
+        self.assertEqual(content, User.objects.first().groups[0].content)
+
     def test_reference_validation(self):
         """Ensure that invalid docment objects cannot be assigned to reference
         fields.

From ddedc1ee92efe73e7d11f455bd8ee9cec122ca4a Mon Sep 17 00:00:00 2001
From: Konstantin Gukov <gukkos@gmail.com>
Date: Tue, 23 Feb 2016 23:40:23 +0500
Subject: [PATCH 0338/1519] Fixed too broad exception clauses in the project

---
 mongoengine/base/fields.py        | 16 ++++++++--------
 mongoengine/document.py           |  2 +-
 mongoengine/fields.py             | 16 ++++++++--------
 mongoengine/queryset/base.py      |  2 +-
 mongoengine/queryset/transform.py | 10 +++++++---
 setup.py                          |  9 +++++----
 tests/document/inheritance.py     |  2 +-
 7 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index be50ac40b..a803657d5 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -133,7 +133,7 @@ def __set__(self, instance, value):
                 if (self.name not in instance._data or
                         instance._data[self.name] != value):
                     instance._mark_as_changed(self.name)
-            except:
+            except Exception:
                 # Values cant be compared eg: naive and tz datetimes
                 # So mark it as changed
                 instance._mark_as_changed(self.name)
@@ -440,7 +440,7 @@ def to_python(self, value):
         try:
             if not isinstance(value, ObjectId):
                 value = ObjectId(value)
-        except:
+        except Exception:
             pass
         return value
 
@@ -459,7 +459,7 @@ def prepare_query_value(self, op, value):
     def validate(self, value):
         try:
             ObjectId(unicode(value))
-        except:
+        except Exception:
             self.error('Invalid Object ID')
 
 
@@ -511,7 +511,7 @@ def _validate_polygon(self, value, top_level=True):
         # Quick and dirty validator
         try:
             value[0][0][0]
-        except:
+        except (TypeError, IndexError):
             return "Invalid Polygon must contain at least one valid linestring"
 
         errors = []
@@ -535,7 +535,7 @@ def _validate_linestring(self, value, top_level=True):
         # Quick and dirty validator
         try:
             value[0][0]
-        except:
+        except (TypeError, IndexError):
             return "Invalid LineString must contain at least one valid point"
 
         errors = []
@@ -566,7 +566,7 @@ def _validate_multipoint(self, value):
         # Quick and dirty validator
         try:
             value[0][0]
-        except:
+        except (TypeError, IndexError):
             return "Invalid MultiPoint must contain at least one valid point"
 
         errors = []
@@ -585,7 +585,7 @@ def _validate_multilinestring(self, value, top_level=True):
         # Quick and dirty validator
         try:
             value[0][0][0]
-        except:
+        except (TypeError, IndexError):
             return "Invalid MultiLineString must contain at least one valid linestring"
 
         errors = []
@@ -607,7 +607,7 @@ def _validate_multipolygon(self, value):
         # Quick and dirty validator
         try:
             value[0][0][0][0]
-        except:
+        except (TypeError, IndexError):
             return "Invalid MultiPolygon must contain at least one valid Polygon"
 
         errors = []
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 52353523e..2fac15b0d 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -981,7 +981,7 @@ def object(self):
         if not isinstance(self.key, id_field_type):
             try:
                 self.key = id_field_type(self.key)
-            except:
+            except Exception:
                 raise Exception("Could not cast key as %s" %
                                 id_field_type.__name__)
 
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e5e25457e..b57f93b63 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -65,7 +65,7 @@ def to_python(self, value):
             return value
         try:
             value = value.decode('utf-8')
-        except:
+        except Exception:
             pass
         return value
 
@@ -194,7 +194,7 @@ def to_python(self, value):
     def validate(self, value):
         try:
             value = int(value)
-        except:
+        except Exception:
             self.error('%s could not be converted to int' % value)
 
         if self.min_value is not None and value < self.min_value:
@@ -228,7 +228,7 @@ def to_python(self, value):
     def validate(self, value):
         try:
             value = long(value)
-        except:
+        except Exception:
             self.error('%s could not be converted to long' % value)
 
         if self.min_value is not None and value < self.min_value:
@@ -508,7 +508,7 @@ def to_python(self, value):
         original_value = value
         try:
             return self._convert_from_string(value)
-        except:
+        except Exception:
             return original_value
 
     def to_mongo(self, value, **kwargs):
@@ -1370,7 +1370,7 @@ def get(self, id=None):
             if self.gridout is None:
                 self.gridout = self.fs.get(self.grid_id)
             return self.gridout
-        except:
+        except Exception:
             # File has been deleted
             return None
 
@@ -1408,7 +1408,7 @@ def read(self, size=-1):
         else:
             try:
                 return gridout.read(size)
-            except:
+            except Exception:
                 return ""
 
     def delete(self):
@@ -1473,7 +1473,7 @@ def __set__(self, instance, value):
             if grid_file:
                 try:
                     grid_file.delete()
-                except:
+                except Exception:
                     pass
 
             # Create a new proxy object as we don't already have one
@@ -1841,7 +1841,7 @@ def to_python(self, value):
                 if not isinstance(value, basestring):
                     value = unicode(value)
                 return uuid.UUID(value)
-            except:
+            except Exception:
                 return original_value
         return value
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index f301e160e..4bc635979 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1705,7 +1705,7 @@ def _get_order_by(self, keys):
             key = key.replace('__', '.')
             try:
                 key = self._document._translate_field_name(key)
-            except:
+            except Exception:
                 pass
             key_list.append((key, direction))
 
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 1f18c4295..13302afa5 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -364,20 +364,24 @@ def _infer_geometry(value):
                                 "type and coordinates keys")
     elif isinstance(value, (list, set)):
         # TODO: shouldn't we test value[0][0][0][0] to see if it is MultiPolygon?
+        # TODO: should both TypeError and IndexError be alike interpreted?
+
         try:
             value[0][0][0]
             return {"$geometry": {"type": "Polygon", "coordinates": value}}
-        except:
+        except (TypeError, IndexError):
             pass
+
         try:
             value[0][0]
             return {"$geometry": {"type": "LineString", "coordinates": value}}
-        except:
+        except (TypeError, IndexError):
             pass
+
         try:
             value[0]
             return {"$geometry": {"type": "Point", "coordinates": value}}
-        except:
+        except (TypeError, IndexError):
             pass
 
     raise InvalidQueryError("Invalid $geometry data. Can be either a dictionary "
diff --git a/setup.py b/setup.py
index 7384e04da..6aa924c87 100644
--- a/setup.py
+++ b/setup.py
@@ -10,11 +10,12 @@
 
 DESCRIPTION = 'MongoEngine is a Python Object-Document ' + \
 'Mapper for working with MongoDB.'
-LONG_DESCRIPTION = None
+
 try:
-    LONG_DESCRIPTION = open('README.rst').read()
-except:
-    pass
+    with open('README.rst') as fin:
+        LONG_DESCRIPTION = fin.read()
+except Exception:
+    LONG_DESCRIPTION = None
 
 
 def get_version(version_tuple):
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index 7673a103d..957938be0 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -411,7 +411,7 @@ class DateUpdatedDocument(Document):
         try:
             class MyDocument(DateCreatedDocument, DateUpdatedDocument):
                 pass
-        except:
+        except Exception:
             self.assertTrue(False, "Couldn't create MyDocument class")
 
     def test_abstract_documents(self):

From fed58f3920d8d2cf9b3f4e337231054f8583253f Mon Sep 17 00:00:00 2001
From: Konstantin Gukov <gukkos@gmail.com>
Date: Tue, 23 Feb 2016 22:59:20 +0500
Subject: [PATCH 0339/1519] Added support for long values in FloatFields

---
 mongoengine/fields.py  | 10 +++++++---
 tests/fields/fields.py | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index ba505fb5d..edf6515b3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -260,10 +260,14 @@ def to_python(self, value):
         return value
 
     def validate(self, value):
-        if isinstance(value, int):
-            value = float(value)
+        if isinstance(value, (int, long)):
+            try:
+                value = float(value)
+            except OverflowError:
+                self.error('The value is too large to be converted to float')
+
         if not isinstance(value, float):
-            self.error('FloatField only accepts float values')
+            self.error('FloatField only accepts float, int and long values')
 
         if self.min_value is not None and value < self.min_value:
             self.error('Float value is too small')
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 757f66a85..3b048094e 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -399,20 +399,36 @@ def test_float_validation(self):
         class Person(Document):
             height = FloatField(min_value=0.1, max_value=3.5)
 
+        class BigPerson(Document):
+            height = FloatField()
+
         person = Person()
         person.height = 1.89
         person.validate()
 
         person.height = '2.0'
         self.assertRaises(ValidationError, person.validate)
+
         person.height = 0.01
         self.assertRaises(ValidationError, person.validate)
+
         person.height = 4.0
         self.assertRaises(ValidationError, person.validate)
 
         person_2 = Person(height='something invalid')
         self.assertRaises(ValidationError, person_2.validate)
 
+        big_person = BigPerson()
+
+        big_person.height = 1L
+        big_person.validate()
+
+        big_person.height = 2 ** 500
+        big_person.validate()
+
+        big_person.height = 2 ** 100000  # Too big for a float value
+        self.assertRaises(ValidationError, big_person.validate)
+
     def test_decimal_validation(self):
         """Ensure that invalid values cannot be assigned to decimal fields.
         """

From 66b233eaea1f3c9ff0544413489000f562769204 Mon Sep 17 00:00:00 2001
From: Konstantin Gukov <gukkos@gmail.com>
Date: Sun, 6 Mar 2016 16:10:02 +0500
Subject: [PATCH 0340/1519] Added the six module to test int/long support

---
 mongoengine/fields.py  | 6 ++++--
 requirements.txt       | 3 ++-
 setup.py               | 2 +-
 tests/fields/fields.py | 7 +++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index edf6515b3..9d01d81c8 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -8,6 +8,8 @@
 import warnings
 from operator import itemgetter
 
+import six
+
 try:
     import dateutil
 except ImportError:
@@ -260,14 +262,14 @@ def to_python(self, value):
         return value
 
     def validate(self, value):
-        if isinstance(value, (int, long)):
+        if isinstance(value, six.integer_types):
             try:
                 value = float(value)
             except OverflowError:
                 self.error('The value is too large to be converted to float')
 
         if not isinstance(value, float):
-            self.error('FloatField only accepts float, int and long values')
+            self.error('FloatField only accepts float and integer values')
 
         if self.min_value is not None and value < self.min_value:
             self.error('Float value is too small')
diff --git a/requirements.txt b/requirements.txt
index 03935868f..b6a5b06c2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
-pymongo>=2.7.1
 nose
+pymongo>=2.7.1
+six==1.10.0
diff --git a/setup.py b/setup.py
index 6aa924c87..e34d834a0 100644
--- a/setup.py
+++ b/setup.py
@@ -78,7 +78,7 @@ def get_version(version_tuple):
       long_description=LONG_DESCRIPTION,
       platforms=['any'],
       classifiers=CLASSIFIERS,
-      install_requires=['pymongo>=2.7.1'],
+      install_requires=['pymongo>=2.7.1', 'six'],
       test_suite='nose.collector',
       **extra_opts
 )
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 3b048094e..1c1f49add 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import sys
+
+import six
 from nose.plugins.skip import SkipTest
 
 sys.path[0:0] = [""]
@@ -420,8 +422,9 @@ class BigPerson(Document):
 
         big_person = BigPerson()
 
-        big_person.height = 1L
-        big_person.validate()
+        for value, value_type in enumerate(six.integer_types):
+            big_person.height = value_type(value)
+            big_person.validate()
 
         big_person.height = 2 ** 500
         big_person.validate()

From 7748e68440df2e3ad2d48ec0b55b9647c4de014d Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Thu, 10 Mar 2016 12:19:11 +0200
Subject: [PATCH 0341/1519] Adjust changelog for #1188.

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3c0b64226..69555b95d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Changes in 0.10.7 - DEV
 - Fixed cascade delete mixing among collections #1224
 - Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls #1206
 - Raise `OperationError` when trying to do a `drop_collection` on document with no collection set.
+- count on ListField of EmbeddedDocumentField fails. #1187
 
 Changes in 0.10.6
 =================

From 7cc1a4eba04d33039e2422b39865ea72c30dee54 Mon Sep 17 00:00:00 2001
From: Gilbert Gilb's <gilbsgilbert@gmail.com>
Date: Tue, 15 Mar 2016 14:34:22 +0100
Subject: [PATCH 0342/1519] Fix long fields stored as int32 in Python 3. issue
 #1253

---
 AUTHORS                |  1 +
 mongoengine/fields.py  |  5 ++++-
 tests/fields/fields.py | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index ad070b30d..758c52eab 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -235,3 +235,4 @@ that much better:
  * Steven Rossiter (https://github.com/BeardedSteve)
  * Luo Peng (https://github.com/RussellLuo)
  * Bryan Bennett (https://github.com/bbenne10)
+ * Gilb's Gilb's (https://github.com/gilbsgilbs)
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 6f69465c5..35d5f35aa 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -19,7 +19,7 @@
 
 import pymongo
 import gridfs
-from bson import Binary, DBRef, SON, ObjectId
+from bson import Binary, DBRef, SON, ObjectId, Int64
 
 from mongoengine.errors import ValidationError
 from mongoengine.python_support import (PY3, bin_type, txt_type,
@@ -227,6 +227,9 @@ def to_python(self, value):
             pass
         return value
 
+    def to_mongo(self, value, **kwargs):
+        return Int64(value)
+
     def validate(self, value):
         try:
             value = long(value)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 1c1f49add..2695e849a 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -21,6 +21,7 @@
 from decimal import Decimal
 
 from bson import Binary, DBRef, ObjectId
+from bson.int64 import Int64
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -4114,6 +4115,19 @@ class CustomData(Document):
         self.assertTrue(hasattr(CustomData.c_field, 'custom_data'))
         self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
 
+    def test_long_field_is_stored_as_long(self):
+        """
+        Tests that long fields are stored as long in mongo, even if long value
+        is small enough to be an int.
+        """
+        class TestDocument(Document):
+            some_long = LongField()
+
+        doc = TestDocument(some_long=42).save()
+        db = get_db()
+        self.assertTrue(isinstance(get_db().test_document.find()[0]['some_long'], Int64))
+        self.assertTrue(isinstance(doc.some_long, (int, long,)))
+
 
 if __name__ == '__main__':
     unittest.main()

From cef4e313e11d594735520799a6e10bffbcafe4fe Mon Sep 17 00:00:00 2001
From: Gilbert Gilb's <gilbsgilbert@gmail.com>
Date: Tue, 15 Mar 2016 14:36:31 +0100
Subject: [PATCH 0343/1519] Update changelog for #1253

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 69555b95d..c34094a7c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,7 @@ Changes in 0.10.7 - DEV
 - Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls #1206
 - Raise `OperationError` when trying to do a `drop_collection` on document with no collection set.
 - count on ListField of EmbeddedDocumentField fails. #1187
+- Fixed long fields stored as int32 in Python 3. #1253
 
 Changes in 0.10.6
 =================

From 87a2358a65fbf701506fb661005fa55d492aa5a2 Mon Sep 17 00:00:00 2001
From: Gilbert Gilb's <gilbsgilbert@gmail.com>
Date: Tue, 15 Mar 2016 14:42:23 +0100
Subject: [PATCH 0344/1519] Fix unused variable. issue #1253

---
 tests/fields/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 2695e849a..bd0af17aa 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -4125,7 +4125,7 @@ class TestDocument(Document):
 
         doc = TestDocument(some_long=42).save()
         db = get_db()
-        self.assertTrue(isinstance(get_db().test_document.find()[0]['some_long'], Int64))
+        self.assertTrue(isinstance(db.test_document.find()[0]['some_long'], Int64))
         self.assertTrue(isinstance(doc.some_long, (int, long,)))
 
 

From d651d0d472205c629f0b3d3de792b8609c2a6917 Mon Sep 17 00:00:00 2001
From: Gilb's <gilbsgilbert@gmail.com>
Date: Tue, 15 Mar 2016 20:50:34 +0100
Subject: [PATCH 0345/1519] Fix tests and imports. issue #1253

---
 mongoengine/fields.py  |  7 ++++++-
 tests/fields/fields.py | 31 +++++++++++++++++--------------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 35d5f35aa..206edcff3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -19,7 +19,12 @@
 
 import pymongo
 import gridfs
-from bson import Binary, DBRef, SON, ObjectId, Int64
+from bson import Binary, DBRef, SON, ObjectId
+
+try:
+    from bson.int64 import Int64
+except ImportError:
+    Int64 = long
 
 from mongoengine.errors import ValidationError
 from mongoengine.python_support import (PY3, bin_type, txt_type,
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index bd0af17aa..c09cbf293 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -21,7 +21,10 @@
 from decimal import Decimal
 
 from bson import Binary, DBRef, ObjectId
-from bson.int64 import Int64
+try:
+    from bson.int64 import Int64
+except ImportError:
+    Int64 = long
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -3606,6 +3609,19 @@ def test():
 
         self.assertRaises(FieldDoesNotExist, test)
 
+    def test_long_field_is_considered_as_int64(self):
+        """
+        Tests that long fields are stored as long in mongo, even if long value
+        is small enough to be an int.
+        """
+        class TestLongFieldConsideredAsInt64(Document):
+            some_long = LongField()
+
+        doc = TestLongFieldConsideredAsInt64(some_long=42).save()
+        db = get_db()
+        self.assertTrue(isinstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64))
+        self.assertTrue(isinstance(doc.some_long, (int, long,)))
+
 
 class EmbeddedDocumentListFieldTestCase(unittest.TestCase):
 
@@ -4115,19 +4131,6 @@ class CustomData(Document):
         self.assertTrue(hasattr(CustomData.c_field, 'custom_data'))
         self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
 
-    def test_long_field_is_stored_as_long(self):
-        """
-        Tests that long fields are stored as long in mongo, even if long value
-        is small enough to be an int.
-        """
-        class TestDocument(Document):
-            some_long = LongField()
-
-        doc = TestDocument(some_long=42).save()
-        db = get_db()
-        self.assertTrue(isinstance(db.test_document.find()[0]['some_long'], Int64))
-        self.assertTrue(isinstance(doc.some_long, (int, long,)))
-
 
 if __name__ == '__main__':
     unittest.main()

From 39eec59c9025887d118a0027e7f338a872f94e64 Mon Sep 17 00:00:00 2001
From: Gilb's <gilbsgilbert@gmail.com>
Date: Tue, 15 Mar 2016 22:28:31 +0100
Subject: [PATCH 0346/1519] Fix test failing randomly because of concurrency.

---
 tests/document/indexes.py | 53 +++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 7ee017a63..1b4c4d968 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -11,6 +11,7 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db, get_connection
+from mongoengine.context_managers import switch_db
 
 __all__ = ("IndexesTest", )
 
@@ -822,33 +823,29 @@ class CompoundKey(EmbeddedDocument):
             name = StringField(required=True)
             term = StringField(required=True)
 
-        class Report(Document):
+        class ReportEmbedded(Document):
             key = EmbeddedDocumentField(CompoundKey, primary_key=True)
             text = StringField()
 
-        Report.drop_collection()
-
         my_key = CompoundKey(name="n", term="ok")
-        report = Report(text="OK", key=my_key).save()
+        report = ReportEmbedded(text="OK", key=my_key).save()
 
         self.assertEqual({'text': 'OK', '_id': {'term': 'ok', 'name': 'n'}},
                          report.to_mongo())
-        self.assertEqual(report, Report.objects.get(pk=my_key))
+        self.assertEqual(report, ReportEmbedded.objects.get(pk=my_key))
 
     def test_compound_key_dictfield(self):
 
-        class Report(Document):
+        class ReportDictField(Document):
             key = DictField(primary_key=True)
             text = StringField()
 
-        Report.drop_collection()
-
         my_key = {"name": "n", "term": "ok"}
-        report = Report(text="OK", key=my_key).save()
+        report = ReportDictField(text="OK", key=my_key).save()
 
         self.assertEqual({'text': 'OK', '_id': {'term': 'ok', 'name': 'n'}},
                          report.to_mongo())
-        self.assertEqual(report, Report.objects.get(pk=my_key))
+        self.assertEqual(report, ReportDictField.objects.get(pk=my_key))
 
     def test_string_indexes(self):
 
@@ -909,26 +906,38 @@ def test_indexes_after_database_drop(self):
 
         Issue #812
         """
+        # Use a new connection and database since dropping the database could
+        # cause concurrent tests to fail.
+        connection = connect(db='tempdatabase',
+                             alias='test_indexes_after_database_drop')
+
         class BlogPost(Document):
             title = StringField()
             slug = StringField(unique=True)
 
-        BlogPost.drop_collection()
+            meta = {'db_alias': 'test_indexes_after_database_drop'}
 
-        # Create Post #1
-        post1 = BlogPost(title='test1', slug='test')
-        post1.save()
+        try:
+            BlogPost.drop_collection()
 
-        # Drop the Database
-        self.connection.drop_database(BlogPost._get_db().name)
+            # Create Post #1
+            post1 = BlogPost(title='test1', slug='test')
+            post1.save()
 
-        # Re-create Post #1
-        post1 = BlogPost(title='test1', slug='test')
-        post1.save()
+            # Drop the Database
+            connection.drop_database('tempdatabase')
+
+            # Re-create Post #1
+            post1 = BlogPost(title='test1', slug='test')
+            post1.save()
+
+            # Create Post #2
+            post2 = BlogPost(title='test2', slug='test')
+            self.assertRaises(NotUniqueError, post2.save)
+        finally:
+            # Drop the temporary database at the end
+            connection.drop_database('tempdatabase')
 
-        # Create Post #2
-        post2 = BlogPost(title='test2', slug='test')
-        self.assertRaises(NotUniqueError, post2.save)
 
     def test_index_dont_send_cls_option(self):
         """

From d9b3a9fb60ecff7b250a5db3cfecdc406bfc15d5 Mon Sep 17 00:00:00 2001
From: Gilb's <gilbsgilbert@gmail.com>
Date: Fri, 18 Mar 2016 19:51:09 +0100
Subject: [PATCH 0347/1519] Use six integer types instead of explicit types,
 since six is now a dependency of the project.

---
 mongoengine/fields.py  | 1 -
 tests/fields/fields.py | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 206edcff3..c807809aa 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -20,7 +20,6 @@
 import pymongo
 import gridfs
 from bson import Binary, DBRef, SON, ObjectId
-
 try:
     from bson.int64 import Int64
 except ImportError:
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index c09cbf293..9af87f7f5 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -12,6 +12,7 @@
 import math
 import itertools
 import re
+import six
 
 try:
     import dateutil
@@ -3620,7 +3621,7 @@ class TestLongFieldConsideredAsInt64(Document):
         doc = TestLongFieldConsideredAsInt64(some_long=42).save()
         db = get_db()
         self.assertTrue(isinstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64))
-        self.assertTrue(isinstance(doc.some_long, (int, long,)))
+        self.assertTrue(isinstance(doc.some_long, six.integer_types))
 
 
 class EmbeddedDocumentListFieldTestCase(unittest.TestCase):

From e34100bab4678b41b38568c933a318b50c7a280d Mon Sep 17 00:00:00 2001
From: Gilb's <gilbsgilbert@gmail.com>
Date: Fri, 18 Mar 2016 23:43:23 +0100
Subject: [PATCH 0348/1519] Another attempt to fix random fails of test
 `test_compound_key_dictfield`.

---
 tests/document/indexes.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 1b4c4d968..e13d8b849 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -5,21 +5,23 @@
 sys.path[0:0] = [""]
 
 import pymongo
+from random import randint
 
 from nose.plugins.skip import SkipTest
 from datetime import datetime
 
 from mongoengine import *
 from mongoengine.connection import get_db, get_connection
-from mongoengine.context_managers import switch_db
 
 __all__ = ("IndexesTest", )
 
 
 class IndexesTest(unittest.TestCase):
+    _MAX_RAND = 10 ** 10
 
     def setUp(self):
-        self.connection = connect(db='mongoenginetest')
+        self.db_name = 'mongoenginetest_IndexesTest_' + str(randint(0, self._MAX_RAND))
+        self.connection = connect(db=self.db_name)
         self.db = get_db()
 
         class Person(Document):
@@ -33,10 +35,7 @@ class Person(Document):
         self.Person = Person
 
     def tearDown(self):
-        for collection in self.db.collection_names():
-            if 'system.' in collection:
-                continue
-            self.db.drop_collection(collection)
+        self.connection.drop_database(self.db)
 
     def test_indexes_document(self):
         """Ensure that indexes are used when meta[indexes] is specified for

From 4650e5e8fb206812c783c6458a30b24b708a6a03 Mon Sep 17 00:00:00 2001
From: Younes JAAIDI <yjaaidi@gmail.com>
Date: Fri, 25 Mar 2016 12:42:00 +0100
Subject: [PATCH 0349/1519] Fix MapField in order to handle unicode keys.

---
 mongoengine/dereference.py |  4 +++-
 tests/fields/fields.py     | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 7fcc2ad26..0428095a0 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -1,5 +1,7 @@
 from bson import DBRef, SON
 
+from mongoengine.python_support import txt_type
+
 from base import (
     BaseDict, BaseList, EmbeddedDocumentList,
     TopLevelDocumentMetaclass, get_document
@@ -226,7 +228,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                         data[k]._data[field_name] = self.object_map.get(
                             (v['_ref'].collection, v['_ref'].id), v)
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                        item_name = "{0}.{1}.{2}".format(name, k, field_name)
+                        item_name = txt_type("{0}.{1}.{2}").format(name, k, field_name)
                         data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
             elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                 item_name = '%s.%s' % (name, k) if name else name
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 15daecb9e..4211496c1 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1515,6 +1515,29 @@ class Log(Document):
             actions__friends__operation='drink',
             actions__friends__object='beer').count())
 
+    def test_map_field_unicode(self):
+
+        class Info(EmbeddedDocument):
+            description = StringField()
+            value_list = ListField(field=StringField())
+
+        class BlogPost(Document):
+            info_dict = MapField(field=EmbeddedDocumentField(Info))
+
+        BlogPost.drop_collection()
+
+        tree = BlogPost(info_dict={
+            u"éééé": {
+                'description': u"VALUE: éééé"
+            }
+        })
+
+        tree.save()
+
+        self.assertEqual(BlogPost.objects.get(id=tree.id).info_dict[u"éééé"].description, u"VALUE: éééé")
+
+        BlogPost.drop_collection()
+
     def test_embedded_db_field(self):
 
         class Embedded(EmbeddedDocument):

From 3b1509f30723f80cb8badedc863c4df47179473a Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Sat, 26 Mar 2016 09:13:25 +0300
Subject: [PATCH 0350/1519] Added changelog entry for #1267.

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c34094a7c..90de9556e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Changes in 0.10.7 - DEV
 - Raise `OperationError` when trying to do a `drop_collection` on document with no collection set.
 - count on ListField of EmbeddedDocumentField fails. #1187
 - Fixed long fields stored as int32 in Python 3. #1253
+- MapField now handles unicodes keys correctly. #1267
 
 Changes in 0.10.6
 =================

From 109202329f88144c42e9b5e2e5da3707c30ac22d Mon Sep 17 00:00:00 2001
From: Madiyar Aitbayev <madiyar92@gmail.com>
Date: Thu, 31 Mar 2016 02:33:13 +0100
Subject: [PATCH 0351/1519] Handles unicode correctly EmbeddedDocumentListField

---
 mongoengine/base/datastructures.py |  2 +-
 tests/fields/fields.py             | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index e4d2b3922..59dacdb71 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -210,7 +210,7 @@ class EmbeddedDocumentList(BaseList):
     def __match_all(cls, i, kwargs):
         items = kwargs.items()
         return all([
-            getattr(i, k) == v or str(getattr(i, k)) == v for k, v in items
+            getattr(i, k) == v or unicode(getattr(i, k)) == v for k, v in items
         ])
 
     @classmethod
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7575e8c68..6279774bb 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -4033,6 +4033,17 @@ def test_single_keyword_update(self):
         # modified
         self.assertEqual(number, 2)
 
+    def test_unicode(self):
+        """
+        Tests that unicode strings handled correctly
+        """
+        post = self.BlogPost(comments=[
+            self.Comments(author='user1', message=u'сообщение'),
+            self.Comments(author='user2', message=u'хабарлама')
+        ]).save()
+        self.assertEqual(post.comments.get(message=u'сообщение').author,
+                         'user1')
+
     def test_save(self):
         """
         Tests the save method of a List of Embedded Documents.

From 00430491caeaab6c2693dd437d5f0b25d7809fb4 Mon Sep 17 00:00:00 2001
From: Neurostack <nedrud@email.arizona.edu>
Date: Tue, 29 Mar 2016 11:46:03 -0600
Subject: [PATCH 0352/1519] Fixed bug accessing ListField (BaseList) with
 negative indices

If you __setitem__ in BaseList with a negative index and then try to save this, you will get an error like: OperationError: Could not save document (cannot use the part (shape of signal.shape.-1) to traverse the element ({shape: [ 0 ]})). To fix this I rectify negative list indices in BaseList _mark_as_changed as the appropriate positive index. This fixes the above error.
---
 AUTHORS                            |  1 +
 docs/changelog.rst                 |  1 +
 mongoengine/base/datastructures.py |  3 ++-
 tests/fields/fields.py             | 13 +++++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 758c52eab..758554c04 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -236,3 +236,4 @@ that much better:
  * Luo Peng (https://github.com/RussellLuo)
  * Bryan Bennett (https://github.com/bbenne10)
  * Gilb's Gilb's (https://github.com/gilbsgilbs)
+ * Joshua Nedrud (https://github.com/Neurostack)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 90de9556e..3fa9eb74e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,7 @@ Changes in 0.10.7 - DEV
 - count on ListField of EmbeddedDocumentField fails. #1187
 - Fixed long fields stored as int32 in Python 3. #1253
 - MapField now handles unicodes keys correctly. #1267
+- ListField now handles negative indicies correctly. #1270
 
 Changes in 0.10.6
 =================
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index e4d2b3922..ed6a46cc5 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -199,7 +199,8 @@ def sort(self, *args, **kwargs):
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, '_mark_as_changed'):
             if key:
-                self._instance._mark_as_changed('%s.%s' % (self._name, key))
+                self._instance._mark_as_changed('%s.%s' % (self._name, 
+                    key % len(self)))
             else:
                 self._instance._mark_as_changed(self._name)
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7575e8c68..b87c43661 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1160,6 +1160,19 @@ class Simple(Document):
         simple = simple.reload()
         self.assertEqual(simple.widgets, [4])
 
+    def test_list_field_with_negative_indices(self):
+        
+        class Simple(Document):
+            widgets = ListField()
+
+        simple = Simple(widgets=[1, 2, 3, 4]).save()
+        simple.widgets[-1] = 5
+        self.assertEqual(['widgets.3'], simple._changed_fields)
+        simple.save()
+
+        simple = simple.reload()
+        self.assertEqual(simple.widgets, [1, 2, 3, 5])
+
     def test_list_field_complex(self):
         """Ensure that the list fields can handle the complex types."""
 

From 3f30808104810e61ef34d382b5f5cdfccfb50be9 Mon Sep 17 00:00:00 2001
From: Shu Shen <sshen@siaras.com>
Date: Thu, 7 Apr 2016 09:56:21 -0700
Subject: [PATCH 0353/1519] Fix AttributeError when creating EmbeddedDocument

When an EmbeddedDocument is initialized with positional arguments, the
document attempts to read _auto_id_field attribute which may not exist
and would throw an AttributeError exception and fail the initialization.

This change and the test is based on the discussion in issue #681 and
PR #777 with a number of community members.
---
 AUTHORS                      |  1 +
 docs/changelog.rst           |  1 +
 mongoengine/base/document.py |  2 +-
 tests/document/instance.py   | 14 ++++++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 758554c04..59660cbb3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -237,3 +237,4 @@ that much better:
  * Bryan Bennett (https://github.com/bbenne10)
  * Gilb's Gilb's (https://github.com/gilbsgilbs)
  * Joshua Nedrud (https://github.com/Neurostack)
+ * Shu Shen (https://github.com/shushen)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3fa9eb74e..c2a0a527e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,7 @@ Changes in 0.10.7 - DEV
 - Fixed long fields stored as int32 in Python 3. #1253
 - MapField now handles unicodes keys correctly. #1267
 - ListField now handles negative indicies correctly. #1270
+- Fixed AttributeError when initializing EmbeddedDocument with positional args. #681
 
 Changes in 0.10.6
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index a890081ad..5641426d1 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -51,7 +51,7 @@ def __init__(self, *args, **values):
             # We only want named arguments.
             field = iter(self._fields_ordered)
             # If its an automatic id field then skip to the first defined field
-            if self._auto_id_field:
+            if getattr(self, '_auto_id_field', False):
                 next(field)
             for value in args:
                 name = next(field)
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 4cfe8b8ee..978488f17 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2928,6 +2928,20 @@ def test_mixed_creation(self):
         self.assertEqual(person.name, "Test User")
         self.assertEqual(person.age, 42)
 
+    def test_positional_creation_embedded(self):
+        """Ensure that embedded document may be created using positional arguments.
+        """
+        job = self.Job("Test Job", 4)
+        self.assertEqual(job.name, "Test Job")
+        self.assertEqual(job.years, 4)
+
+    def test_mixed_creation_embedded(self):
+        """Ensure that embedded document may be created using mixed arguments.
+        """
+        job = self.Job("Test Job", years=4)
+        self.assertEqual(job.name, "Test Job")
+        self.assertEqual(job.years, 4)
+
     def test_mixed_creation_dynamic(self):
         """Ensure that document may be created using mixed arguments.
         """

From 7d0ec33b54d97622a0e845cf0382b33ae40476f5 Mon Sep 17 00:00:00 2001
From: vahan <aivosha@gmail.com>
Date: Sun, 1 May 2016 22:59:39 -0400
Subject: [PATCH 0354/1519] * fixed the bug where dynamic doc has indx inside
 dict field

---
 mongoengine/base/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 05b3ad954..63dbf0db8 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -974,7 +974,7 @@ def _lookup_field(cls, parts):
                 if hasattr(getattr(field, 'field', None), 'lookup_member'):
                     new_field = field.field.lookup_member(field_name)
                 elif cls._dynamic and (isinstance(field, DynamicField) or
-                                       getattr(getattr(field, 'document_type'), '_dynamic')):
+                                       getattr(getattr(field, 'document_type', None), '_dynamic', None)):
                     new_field = DynamicField(db_field=field_name)
                 else:
                     # Look up subfield on the previous field or raise

From f750796444fbc25b4420d11aa46954b0b0a31d04 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 4 May 2016 17:11:38 -0700
Subject: [PATCH 0355/1519] fix typo

---
 mongoengine/queryset/queryset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 6e5f7220e..5121463bd 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -38,7 +38,7 @@ def __iter__(self):
 
     def __len__(self):
         """Since __len__ is called quite frequently (for example, as part of
-        list(qs) we populate the result cache and cache the length.
+        list(qs)), we populate the result cache and cache the length.
         """
         if self._len is not None:
             return self._len

From 1f223aa7e649340b824ad04b74d6bbe89daf6cae Mon Sep 17 00:00:00 2001
From: xiaost <xiaost7@gmail.com>
Date: Thu, 26 May 2016 00:29:41 +0800
Subject: [PATCH 0356/1519] Fix no_cursor_timeout with pymongo3

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 4bc635979..67b1af90b 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1462,7 +1462,7 @@ def _cursor_args(self):
                 msg = "The snapshot option is not anymore available with PyMongo 3+"
                 warnings.warn(msg, DeprecationWarning)
             cursor_args = {
-                'no_cursor_timeout': self._timeout
+                'no_cursor_timeout': not self._timeout
             }
         if self._loaded_fields:
             cursor_args[fields_name] = self._loaded_fields.as_dict()

From be0aee95f2009a818b3166fc5b92158994ed6305 Mon Sep 17 00:00:00 2001
From: xiaost <xiaost7@gmail.com>
Date: Fri, 3 Jun 2016 01:27:39 +0800
Subject: [PATCH 0357/1519] Update changelog for #1304

---
 AUTHORS            | 1 +
 docs/changelog.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 59660cbb3..8a983f86c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -238,3 +238,4 @@ that much better:
  * Gilb's Gilb's (https://github.com/gilbsgilbs)
  * Joshua Nedrud (https://github.com/Neurostack)
  * Shu Shen (https://github.com/shushen)
+ * xiaost7 (https://github.com/xiaost7)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c2a0a527e..8337c757b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,7 @@ Changes in 0.10.7 - DEV
 - MapField now handles unicodes keys correctly. #1267
 - ListField now handles negative indicies correctly. #1270
 - Fixed AttributeError when initializing EmbeddedDocument with positional args. #681
+- Fixed no_cursor_timeout error with pymongo 3.0+ #1304
 
 Changes in 0.10.6
 =================

From 4544afe4224d7a1b3278d77e8c3ca58d3c8bcadd Mon Sep 17 00:00:00 2001
From: Adam Chainz <adam@adamj.eu>
Date: Thu, 16 Jun 2016 21:21:10 +0100
Subject: [PATCH 0358/1519] Convert readthedocs links for their .org -> .io
 migration for hosted projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
---
 README.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 08e95029a..c94ec45cf 100644
--- a/README.rst
+++ b/README.rst
@@ -19,10 +19,10 @@ MongoEngine
 About
 =====
 MongoEngine is a Python Object-Document Mapper for working with MongoDB.
-Documentation available at http://mongoengine-odm.rtfd.org - there is currently
-a `tutorial <http://readthedocs.org/docs/mongoengine-odm/en/latest/tutorial.html>`_, a `user guide
-<https://mongoengine-odm.readthedocs.org/en/latest/guide/index.html>`_ and an `API reference
-<http://readthedocs.org/docs/mongoengine-odm/en/latest/apireference.html>`_.
+Documentation available at https://mongoengine-odm.readthedocs.io - there is currently
+a `tutorial <https://mongoengine-odm.readthedocs.io/tutorial.html>`_, a `user guide
+<https://mongoengine-odm.readthedocs.io/guide/index.html>`_ and an `API reference
+<https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Installation
 ============

From c21dcf14deea22f24a18a8860fd0394052350e8c Mon Sep 17 00:00:00 2001
From: vahan <aivosha@gmail.com>
Date: Fri, 24 Jun 2016 13:45:42 -0400
Subject: [PATCH 0359/1519] Update changelog.rst

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8337c757b..a5b0dd2fe 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Changes in 0.10.7 - DEV
 =======================
+- Fixed the bug where dynamic doc has index inside a dict field #1278
 - Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
 - Fixed cascade delete mixing among collections #1224
 - Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls #1206

From 21974f7288a1f0aa7a62dd3e40f25ea3a2ea7da7 Mon Sep 17 00:00:00 2001
From: Anentropic <ego@anentropic.com>
Date: Wed, 29 Jun 2016 14:24:33 +0100
Subject: [PATCH 0360/1519] better description for upsert arg on some methods

---
 mongoengine/queryset/base.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 4bc635979..ea9887325 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -434,7 +434,7 @@ def update(self, upsert=False, multi=True, write_concern=None,
                full_result=False, **update):
         """Perform an atomic update on the fields matched by the query.
 
-        :param upsert: Any existing document with that "_id" is overwritten.
+        :param upsert: insert if document doesn't exist (default ``False``)
         :param multi: Update multiple documents.
         :param write_concern: Extra keyword arguments are passed down which
             will be used as options for the resultant
@@ -480,7 +480,6 @@ def update(self, upsert=False, multi=True, write_concern=None,
                 raise OperationError(message)
             raise OperationError(u'Update failed (%s)' % unicode(err))
 
-
     def upsert_one(self, write_concern=None, **update):
         """Overwrite or add the first document matched by the query.
 
@@ -498,7 +497,7 @@ def upsert_one(self, write_concern=None, **update):
         """
 
         atomic_update = self.update(multi=False, upsert=True, write_concern=write_concern,
-                             full_result=True,**update)
+                             full_result=True, **update)
 
         if atomic_update['updatedExisting']:
             document = self.get()
@@ -510,7 +509,7 @@ def update_one(self, upsert=False, write_concern=None, **update):
         """Perform an atomic update on the fields of the first document
         matched by the query.
 
-        :param upsert: Any existing document with that "_id" is overwritten.
+        :param upsert: insert if document doesn't exist (default ``False``)
         :param write_concern: Extra keyword arguments are passed down which
             will be used as options for the resultant
             ``getLastError`` command.  For example,

From df9ed835caba83742b3ddd4995b72bc9541ccc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 2 Jul 2016 22:51:54 +0200
Subject: [PATCH 0361/1519] fixes in unit tests

---
 tests/document/instance.py                            |  4 ++--
 tests/fixtures.py                                     |  2 +-
 tests/migration/__init__.py                           |  5 ++++-
 ...ect_id.py => referencefield_dbref_to_object_id.py} |  0
 tests/test_dereference.py                             | 11 ++++++++---
 5 files changed, 15 insertions(+), 7 deletions(-)
 rename tests/migration/{refrencefield_dbref_to_object_id.py => referencefield_dbref_to_object_id.py} (100%)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 978488f17..ba01db4ce 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -13,7 +13,7 @@
 from bson import DBRef, ObjectId
 from tests import fixtures
 from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
-                            PickleDyanmicEmbedded, PickleDynamicTest)
+                            PickleDynamicEmbedded, PickleDynamicTest)
 
 from mongoengine import *
 from mongoengine.errors import (NotRegistered, InvalidDocumentError,
@@ -2317,7 +2317,7 @@ def test_dynamic_document_pickle(self):
 
         pickle_doc = PickleDynamicTest(
             name="test", number=1, string="One", lists=['1', '2'])
-        pickle_doc.embedded = PickleDyanmicEmbedded(foo="Bar")
+        pickle_doc.embedded = PickleDynamicEmbedded(foo="Bar")
         pickled_doc = pickle.dumps(pickle_doc)  # make sure pickling works even before the doc is saved
 
         pickle_doc.save()
diff --git a/tests/fixtures.py b/tests/fixtures.py
index b3bf73e88..d8eb8487f 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -26,7 +26,7 @@ class NewDocumentPickleTest(Document):
     new_field = StringField()
 
 
-class PickleDyanmicEmbedded(DynamicEmbeddedDocument):
+class PickleDynamicEmbedded(DynamicEmbeddedDocument):
     date = DateTimeField(default=datetime.now)
 
 
diff --git a/tests/migration/__init__.py b/tests/migration/__init__.py
index 6fc83e023..ef62d8760 100644
--- a/tests/migration/__init__.py
+++ b/tests/migration/__init__.py
@@ -1,8 +1,11 @@
+import unittest
+
 from convert_to_new_inheritance_model import *
 from decimalfield_as_float import *
-from refrencefield_dbref_to_object_id import *
+from referencefield_dbref_to_object_id import *
 from turn_off_inheritance import *
 from uuidfield_to_binary import *
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/migration/refrencefield_dbref_to_object_id.py b/tests/migration/referencefield_dbref_to_object_id.py
similarity index 100%
rename from tests/migration/refrencefield_dbref_to_object_id.py
rename to tests/migration/referencefield_dbref_to_object_id.py
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index e1ae37408..11bdd6121 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -12,9 +12,13 @@
 
 class FieldTest(unittest.TestCase):
 
-    def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
+    @classmethod
+    def setUpClass(cls):
+        cls.db = connect(db='mongoenginetest')
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.db.drop_database('mongoenginetest')
 
     def test_list_item_dereference(self):
         """Ensure that DBRef items in ListFields are dereferenced.
@@ -304,6 +308,7 @@ class SimpleList(Document):
 
         User.drop_collection()
         Post.drop_collection()
+        SimpleList.drop_collection()
 
         u1 = User.objects.create(name='u1')
         u2 = User.objects.create(name='u2')

From 16fea6f00941c75163b9a4f5f10affedb4916101 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 10 Jul 2016 13:21:12 -0700
Subject: [PATCH 0362/1519] replace QuerySet.sum/average implementations with
 aggregate_sum/average + tweaks

---
 mongoengine/queryset/base.py | 141 +++++++----------------------------
 tests/queryset/queryset.py   | 132 +++++++-------------------------
 2 files changed, 53 insertions(+), 220 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 97bf5d5a5..4b8461fe6 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1237,66 +1237,28 @@ def where(self, where_clause):
     def sum(self, field):
         """Sum over the values of the specified field.
 
-        :param field: the field to sum over; use dot-notation to refer to
+        :param field: the field to sum over; use dot notation to refer to
             embedded document fields
-
-        .. versionchanged:: 0.5 - updated to map_reduce as db.eval doesnt work
-            with sharding.
-        """
-        map_func = """
-            function() {
-                var path = '{{~%(field)s}}'.split('.'),
-                field = this;
-
-                for (p in path) {
-                    if (typeof field != 'undefined')
-                       field = field[path[p]];
-                    else
-                       break;
-                }
-
-                if (field && field.constructor == Array) {
-                    field.forEach(function(item) {
-                        emit(1, item||0);
-                    });
-                } else if (typeof field != 'undefined') {
-                    emit(1, field||0);
-                }
-            }
-        """ % dict(field=field)
-
-        reduce_func = Code("""
-            function(key, values) {
-                var sum = 0;
-                for (var i in values) {
-                    sum += values[i];
-                }
-                return sum;
-            }
-        """)
-
-        for result in self.map_reduce(map_func, reduce_func, output='inline'):
-            return result.value
-        else:
-            return 0
-
-    def aggregate_sum(self, field):
-        """Sum over the values of the specified field.
-
-        :param field: the field to sum over; use dot-notation to refer to
-            embedded document fields
-
-        This method is more performant than the regular `sum`, because it uses
-        the aggregation framework instead of map-reduce.
         """
-        result = self._document._get_collection().aggregate([
+        pipeline = [
             {'$match': self._query},
             {'$group': {'_id': 'sum', 'total': {'$sum': '$' + field}}}
-        ])
+        ]
+
+        # if we're performing a sum over a list field, we sum up all the
+        # elements in the list, hence we need to $unwind the arrays first
+        ListField = _import_class('ListField')
+        field_parts = field.split('.')
+        field_instances = self._document._lookup_field(field_parts)
+        if isinstance(field_instances[-1], ListField):
+            pipeline.insert(1, {'$unwind': '$' + field})
+
+        result = self._document._get_collection().aggregate(pipeline)
         if IS_PYMONGO_3:
             result = list(result)
         else:
             result = result.get('result')
+
         if result:
             return result[0]['total']
         return 0
@@ -1304,71 +1266,24 @@ def aggregate_sum(self, field):
     def average(self, field):
         """Average over the values of the specified field.
 
-        :param field: the field to average over; use dot-notation to refer to
+        :param field: the field to average over; use dot notation to refer to
             embedded document fields
-
-        .. versionchanged:: 0.5 - updated to map_reduce as db.eval doesnt work
-            with sharding.
-        """
-        map_func = """
-            function() {
-                var path = '{{~%(field)s}}'.split('.'),
-                field = this;
-
-                for (p in path) {
-                    if (typeof field != 'undefined')
-                       field = field[path[p]];
-                    else
-                       break;
-                }
-
-                if (field && field.constructor == Array) {
-                    field.forEach(function(item) {
-                        emit(1, {t: item||0, c: 1});
-                    });
-                } else if (typeof field != 'undefined') {
-                    emit(1, {t: field||0, c: 1});
-                }
-            }
-        """ % dict(field=field)
-
-        reduce_func = Code("""
-            function(key, values) {
-                var out = {t: 0, c: 0};
-                for (var i in values) {
-                    var value = values[i];
-                    out.t += value.t;
-                    out.c += value.c;
-                }
-                return out;
-            }
-        """)
-
-        finalize_func = Code("""
-            function(key, value) {
-                return value.t / value.c;
-            }
-        """)
-
-        for result in self.map_reduce(map_func, reduce_func,
-                                      finalize_f=finalize_func, output='inline'):
-            return result.value
-        else:
-            return 0
-
-    def aggregate_average(self, field):
-        """Average over the values of the specified field.
-
-        :param field: the field to average over; use dot-notation to refer to
-            embedded document fields
-
-        This method is more performant than the regular `average`, because it
-        uses the aggregation framework instead of map-reduce.
         """
-        result = self._document._get_collection().aggregate([
+        pipeline = [
             {'$match': self._query},
             {'$group': {'_id': 'avg', 'total': {'$avg': '$' + field}}}
-        ])
+        ]
+
+        # if we're performing an average over a list field, we average out
+        # all the elements in the list, hence we need to $unwind the arrays
+        # first
+        ListField = _import_class('ListField')
+        field_parts = field.split('.')
+        field_instances = self._document._lookup_field(field_parts)
+        if isinstance(field_instances[-1], ListField):
+            pipeline.insert(1, {'$unwind': '$' + field})
+
+        result = self._document._get_collection().aggregate(pipeline)
         if IS_PYMONGO_3:
             result = list(result)
         else:
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index f6a522afb..9d9268036 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2766,25 +2766,15 @@ def test_average(self):
 
         avg = float(sum(ages)) / (len(ages) + 1)  # take into account the 0
         self.assertAlmostEqual(int(self.Person.objects.average('age')), avg)
-        self.assertAlmostEqual(
-            int(self.Person.objects.aggregate_average('age')), avg
-        )
 
         self.Person(name='ageless person').save()
         self.assertEqual(int(self.Person.objects.average('age')), avg)
-        self.assertEqual(
-            int(self.Person.objects.aggregate_average('age')), avg
-        )
 
         # dot notation
         self.Person(
             name='person meta', person_meta=self.PersonMeta(weight=0)).save()
         self.assertAlmostEqual(
             int(self.Person.objects.average('person_meta.weight')), 0)
-        self.assertAlmostEqual(
-            int(self.Person.objects.aggregate_average('person_meta.weight')),
-            0
-        )
 
         for i, weight in enumerate(ages):
             self.Person(
@@ -2793,19 +2783,11 @@ def test_average(self):
         self.assertAlmostEqual(
             int(self.Person.objects.average('person_meta.weight')), avg
         )
-        self.assertAlmostEqual(
-            int(self.Person.objects.aggregate_average('person_meta.weight')),
-            avg
-        )
 
         self.Person(name='test meta none').save()
         self.assertEqual(
             int(self.Person.objects.average('person_meta.weight')), avg
         )
-        self.assertEqual(
-            int(self.Person.objects.aggregate_average('person_meta.weight')),
-            avg
-        )
 
         # test summing over a filtered queryset
         over_50 = [a for a in ages if a >= 50]
@@ -2814,10 +2796,6 @@ def test_average(self):
             self.Person.objects.filter(age__gte=50).average('age'),
             avg
         )
-        self.assertEqual(
-            self.Person.objects.filter(age__gte=50).aggregate_average('age'),
-            avg
-        )
 
     def test_sum(self):
         """Ensure that field can be summed over correctly.
@@ -2827,15 +2805,9 @@ def test_sum(self):
             self.Person(name='test%s' % i, age=age).save()
 
         self.assertEqual(self.Person.objects.sum('age'), sum(ages))
-        self.assertEqual(
-            self.Person.objects.aggregate_sum('age'), sum(ages)
-        )
 
         self.Person(name='ageless person').save()
         self.assertEqual(self.Person.objects.sum('age'), sum(ages))
-        self.assertEqual(
-            self.Person.objects.aggregate_sum('age'), sum(ages)
-        )
 
         for i, age in enumerate(ages):
             self.Person(name='test meta%s' %
@@ -2844,26 +2816,15 @@ def test_sum(self):
         self.assertEqual(
             self.Person.objects.sum('person_meta.weight'), sum(ages)
         )
-        self.assertEqual(
-            self.Person.objects.aggregate_sum('person_meta.weight'),
-            sum(ages)
-        )
 
         self.Person(name='weightless person').save()
         self.assertEqual(self.Person.objects.sum('age'), sum(ages))
-        self.assertEqual(
-            self.Person.objects.aggregate_sum('age'), sum(ages)
-        )
 
         # test summing over a filtered queryset
         self.assertEqual(
             self.Person.objects.filter(age__gte=50).sum('age'),
             sum([a for a in ages if a >= 50])
         )
-        self.assertEqual(
-            self.Person.objects.filter(age__gte=50).aggregate_sum('age'),
-            sum([a for a in ages if a >= 50])
-        )
 
     def test_embedded_average(self):
         class Pay(EmbeddedDocument):
@@ -2876,21 +2837,12 @@ class Doc(Document):
 
         Doc.drop_collection()
 
-        Doc(name=u"Wilson Junior",
-            pay=Pay(value=150)).save()
-
-        Doc(name=u"Isabella Luanna",
-            pay=Pay(value=530)).save()
+        Doc(name='Wilson Junior', pay=Pay(value=150)).save()
+        Doc(name='Isabella Luanna', pay=Pay(value=530)).save()
+        Doc(name='Tayza mariana', pay=Pay(value=165)).save()
+        Doc(name='Eliana Costa', pay=Pay(value=115)).save()
 
-        Doc(name=u"Tayza mariana",
-            pay=Pay(value=165)).save()
-
-        Doc(name=u"Eliana Costa",
-            pay=Pay(value=115)).save()
-
-        self.assertEqual(
-            Doc.objects.average('pay.value'),
-            240)
+        self.assertEqual(Doc.objects.average('pay.value'), 240)
 
     def test_embedded_array_average(self):
         class Pay(EmbeddedDocument):
@@ -2898,26 +2850,16 @@ class Pay(EmbeddedDocument):
 
         class Doc(Document):
             name = StringField()
-            pay = EmbeddedDocumentField(
-                Pay)
+            pay = EmbeddedDocumentField(Pay)
 
         Doc.drop_collection()
 
-        Doc(name=u"Wilson Junior",
-            pay=Pay(values=[150, 100])).save()
+        Doc(name='Wilson Junior', pay=Pay(values=[150, 100])).save()
+        Doc(name='Isabella Luanna', pay=Pay(values=[530, 100])).save()
+        Doc(name='Tayza mariana', pay=Pay(values=[165, 100])).save()
+        Doc(name='Eliana Costa', pay=Pay(values=[115, 100])).save()
 
-        Doc(name=u"Isabella Luanna",
-            pay=Pay(values=[530, 100])).save()
-
-        Doc(name=u"Tayza mariana",
-            pay=Pay(values=[165, 100])).save()
-
-        Doc(name=u"Eliana Costa",
-            pay=Pay(values=[115, 100])).save()
-
-        self.assertEqual(
-            Doc.objects.average('pay.values'),
-            170)
+        self.assertEqual(Doc.objects.average('pay.values'), 170)
 
     def test_array_average(self):
         class Doc(Document):
@@ -2930,9 +2872,7 @@ class Doc(Document):
         Doc(values=[165, 100]).save()
         Doc(values=[115, 100]).save()
 
-        self.assertEqual(
-            Doc.objects.average('values'),
-            170)
+        self.assertEqual(Doc.objects.average('values'), 170)
 
     def test_embedded_sum(self):
         class Pay(EmbeddedDocument):
@@ -2940,26 +2880,16 @@ class Pay(EmbeddedDocument):
 
         class Doc(Document):
             name = StringField()
-            pay = EmbeddedDocumentField(
-                Pay)
+            pay = EmbeddedDocumentField(Pay)
 
         Doc.drop_collection()
 
-        Doc(name=u"Wilson Junior",
-            pay=Pay(value=150)).save()
-
-        Doc(name=u"Isabella Luanna",
-            pay=Pay(value=530)).save()
-
-        Doc(name=u"Tayza mariana",
-            pay=Pay(value=165)).save()
+        Doc(name='Wilson Junior', pay=Pay(value=150)).save()
+        Doc(name='Isabella Luanna', pay=Pay(value=530)).save()
+        Doc(name='Tayza mariana', pay=Pay(value=165)).save()
+        Doc(name='Eliana Costa', pay=Pay(value=115)).save()
 
-        Doc(name=u"Eliana Costa",
-            pay=Pay(value=115)).save()
-
-        self.assertEqual(
-            Doc.objects.sum('pay.value'),
-            960)
+        self.assertEqual(Doc.objects.sum('pay.value'), 960)
 
     def test_embedded_array_sum(self):
         class Pay(EmbeddedDocument):
@@ -2967,26 +2897,16 @@ class Pay(EmbeddedDocument):
 
         class Doc(Document):
             name = StringField()
-            pay = EmbeddedDocumentField(
-                Pay)
+            pay = EmbeddedDocumentField(Pay)
 
         Doc.drop_collection()
 
-        Doc(name=u"Wilson Junior",
-            pay=Pay(values=[150, 100])).save()
-
-        Doc(name=u"Isabella Luanna",
-            pay=Pay(values=[530, 100])).save()
-
-        Doc(name=u"Tayza mariana",
-            pay=Pay(values=[165, 100])).save()
+        Doc(name='Wilson Junior', pay=Pay(values=[150, 100])).save()
+        Doc(name='Isabella Luanna', pay=Pay(values=[530, 100])).save()
+        Doc(name='Tayza mariana', pay=Pay(values=[165, 100])).save()
+        Doc(name='Eliana Costa', pay=Pay(values=[115, 100])).save()
 
-        Doc(name=u"Eliana Costa",
-            pay=Pay(values=[115, 100])).save()
-
-        self.assertEqual(
-            Doc.objects.sum('pay.values'),
-            1360)
+        self.assertEqual(Doc.objects.sum('pay.values'), 1360)
 
     def test_array_sum(self):
         class Doc(Document):
@@ -2999,9 +2919,7 @@ class Doc(Document):
         Doc(values=[165, 100]).save()
         Doc(values=[115, 100]).save()
 
-        self.assertEqual(
-            Doc.objects.sum('values'),
-            1360)
+        self.assertEqual(Doc.objects.sum('values'), 1360)
 
     def test_distinct(self):
         """Ensure that the QuerySet.distinct method works.

From 3fa9e703836b978076de80193235d97e2f169654 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 11 Jul 2016 10:42:27 -0700
Subject: [PATCH 0363/1519] prefer tuples over lists for immutable structures

---
 mongoengine/queryset/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 4b8461fe6..7efb0fb6c 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1255,7 +1255,7 @@ def sum(self, field):
 
         result = self._document._get_collection().aggregate(pipeline)
         if IS_PYMONGO_3:
-            result = list(result)
+            result = tuple(result)
         else:
             result = result.get('result')
 
@@ -1285,7 +1285,7 @@ def average(self, field):
 
         result = self._document._get_collection().aggregate(pipeline)
         if IS_PYMONGO_3:
-            result = list(result)
+            result = tuple(result)
         else:
             result = result.get('result')
         if result:

From 6148a608fb1fe588549870b76bcf43a52a8879d3 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 11 Jul 2016 10:45:40 -0700
Subject: [PATCH 0364/1519] update the changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a5b0dd2fe..c52f2776c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,6 +15,7 @@ Changes in 0.10.7 - DEV
 - ListField now handles negative indicies correctly. #1270
 - Fixed AttributeError when initializing EmbeddedDocument with positional args. #681
 - Fixed no_cursor_timeout error with pymongo 3.0+ #1304
+- Replaced map-reduce based QuerySet.sum/average with aggregation-based implementations #1336
 
 Changes in 0.10.6
 =================

From f35034b989d83cae883c37524d86711a4014046f Mon Sep 17 00:00:00 2001
From: Amos Latteier <amos@latteier.com>
Date: Mon, 18 Jul 2016 13:23:01 -0700
Subject: [PATCH 0365/1519] fix example for register_delete_rule. see issue
 #1339

---
 mongoengine/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index c807809aa..2db6383c1 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -890,7 +890,7 @@ class Bar(Document):
             content = StringField()
             foo = ReferenceField('Foo')
 
-        Bar.register_delete_rule(Foo, 'foo', NULLIFY)
+        Foo.register_delete_rule(Bar, 'foo', NULLIFY)
 
     .. note ::
         `reverse_delete_rule` does not trigger pre / post delete signals to be

From 40e99b1b80479e3dda631ab551a318d21d50da0a Mon Sep 17 00:00:00 2001
From: anih <admin@e-back.net>
Date: Wed, 27 Jul 2016 12:10:46 +0200
Subject: [PATCH 0366/1519] Speed up checking if we passed missing field

---
 mongoengine/base/document.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 448f83896..fadda159f 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -72,12 +72,13 @@ def __init__(self, *args, **values):
         # Check if there are undefined fields supplied to the constructor,
         # if so raise an Exception.
         if not self._dynamic and (self._meta.get('strict', True) or _created):
-            for var in values.keys():
-                if var not in self._fields.keys() + ['id', 'pk', '_cls', '_text_score']:
-                    msg = (
-                        "The field '{0}' does not exist on the document '{1}'"
-                    ).format(var, self._class_name)
-                    raise FieldDoesNotExist(msg)
+            _missing_fields_keys = set(values.keys()) - set(
+              self._fields.keys() + ['id', 'pk', '_cls', '_text_score'])
+            if _missing_fields_keys:
+                msg = (
+                    "The fields '{0}' does not exist on the document '{1}'"
+                ).format(_missing_fields_keys, self._class_name)
+                raise FieldDoesNotExist(msg)
 
         if self.STRICT and not self._dynamic:
             self._data = StrictDict.create(allowed_keys=self._fields_ordered)()

From 709983eea673a55564fce9a5d497ac3cf050abd1 Mon Sep 17 00:00:00 2001
From: DionysusG <yuan.gan@fandm.edu>
Date: Thu, 4 Aug 2016 16:21:52 +0800
Subject: [PATCH 0367/1519] fix typo at docs/guide/defineing-documents.rst

---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 1a5fbfc9c..6ac88f010 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -29,7 +29,7 @@ documents are serialized based on their field order.
 
 Dynamic document schemas
 ========================
-One of the benefits of MongoDb is dynamic schemas for a collection, whilst data
+One of the benefits of MongoDB is dynamic schemas for a collection, whilst data
 should be planned and organised (after all explicit is better than implicit!)
 there are scenarios where having dynamic / expando style documents is desirable.
 

From 8f55d385d674211f01a8eb78088f4324664adffe Mon Sep 17 00:00:00 2001
From: Gallaecio <adriyetichaves@gmail.com>
Date: Thu, 11 Aug 2016 08:52:53 +0200
Subject: [PATCH 0368/1519] Fix array-slicing documentation

Fixes #1359.
---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 5f7a3de9d..913de5d6c 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -237,7 +237,7 @@ is preferred for achieving this::
     # All except for the first 5 people
     users = User.objects[5:]
 
-    # 5 users, starting from the 10th user found
+    # 5 users, starting from the 11th user found
     users = User.objects[10:15]
 
 You may also index the query to retrieve a single result. If an item at that

From 5ef59c06dff223acfcce23f41780abc1faf47aa2 Mon Sep 17 00:00:00 2001
From: Sergey Kovalev <remedy@yandex-team.ru>
Date: Sat, 13 Aug 2016 09:41:26 +0300
Subject: [PATCH 0369/1519] Fix misleading comment about the descriptor

---
 mongoengine/queryset/manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/manager.py b/mongoengine/queryset/manager.py
index 47c2143da..199205e92 100644
--- a/mongoengine/queryset/manager.py
+++ b/mongoengine/queryset/manager.py
@@ -29,7 +29,7 @@ def __get__(self, instance, owner):
         Document.objects is accessed.
         """
         if instance is not None:
-            # Document class being used rather than a document object
+            # Document object being used rather than a document class
             return self
 
         # owner is the document that contains the QuerySetManager

From 327e164869e9fd1bda1a7065863bd1ad13981e32 Mon Sep 17 00:00:00 2001
From: Victor <victor.varvaryuk@mindojo.com>
Date: Thu, 4 Aug 2016 08:31:19 +0300
Subject: [PATCH 0370/1519] Fix for #1176 -- similar to
 https://github.com/MongoEngine/mongoengine/pull/982 but for `update`.

---
 AUTHORS                           | 1 +
 README.rst                        | 2 +-
 docs/changelog.rst                | 1 +
 mongoengine/queryset/transform.py | 6 +++++-
 tests/queryset/transform.py       | 4 ++++
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 8a983f86c..9ed06c7ad 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -239,3 +239,4 @@ that much better:
  * Joshua Nedrud (https://github.com/Neurostack)
  * Shu Shen (https://github.com/shushen)
  * xiaost7 (https://github.com/xiaost7)
+ * Victor Varvaryuk
diff --git a/README.rst b/README.rst
index c94ec45cf..547ecbd93 100644
--- a/README.rst
+++ b/README.rst
@@ -99,7 +99,7 @@ Some simple examples of what MongoEngine code looks like:
 Tests
 =====
 To run the test suite, ensure you are running a local instance of MongoDB on
-the standard port, and run: ``python setup.py nosetests``.
+the standard port and have installed ``nose`` and ``rednose``, and run: ``python setup.py nosetests``.
 
 To run the test suite on every supported Python version and every supported PyMongo version,
 you can use ``tox``.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c52f2776c..e71b1ff9a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -16,6 +16,7 @@ Changes in 0.10.7 - DEV
 - Fixed AttributeError when initializing EmbeddedDocument with positional args. #681
 - Fixed no_cursor_timeout error with pymongo 3.0+ #1304
 - Replaced map-reduce based QuerySet.sum/average with aggregation-based implementations #1336
+- Fixed support for `__` to escape field names that match operators names in `update` #1351
 
 Changes in 0.10.6
 =================
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 13302afa5..e5e7f83f5 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -44,7 +44,7 @@ def query(_doc_cls=None, **kwargs):
         if len(parts) > 1 and parts[-1] in MATCH_OPERATORS:
             op = parts.pop()
 
-        # Allw to escape operator-like field name by __
+        # Allow to escape operator-like field name by __
         if len(parts) > 1 and parts[-1] == "":
             parts.pop()
 
@@ -212,6 +212,10 @@ def update(_doc_cls=None, **update):
         if parts[-1] in COMPARISON_OPERATORS:
             match = parts.pop()
 
+        # Allow to escape operator-like field name by __
+        if len(parts) > 1 and parts[-1] == "":
+            parts.pop()
+
         if _doc_cls:
             # Switch field names to proper names [set in Field(name='foo')]
             try:
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index a543317a9..1cb8223d9 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -224,6 +224,10 @@ class Doc(Document):
         self.assertEqual(1, Doc.objects(item__type__="axe").count())
         self.assertEqual(1, Doc.objects(item__name__="Heroic axe").count())
 
+        Doc.objects(id=doc.id).update(set__item__type__='sword')
+        self.assertEqual(1, Doc.objects(item__type__="sword").count())
+        self.assertEqual(0, Doc.objects(item__type__="axe").count())
+
     def test_understandable_error_raised(self):
         class Event(Document):
             title = StringField()

From ca415d5d623b47bfd7e765b28c0b1778db0bbe3b Mon Sep 17 00:00:00 2001
From: Gang Li <gli@informaticsincontext.com>
Date: Sun, 4 Sep 2016 14:20:59 -0400
Subject: [PATCH 0371/1519] Fix for:Base document _mark_as_changed bug #1369

---
 mongoengine/base/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index f8dd8400f..12d3dfa0d 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -491,7 +491,7 @@ def _mark_as_changed(self, key):
                 # remove lower level changed fields
                 level = '.'.join(levels[:idx]) + '.'
                 remove = self._changed_fields.remove
-                for field in self._changed_fields:
+                for field in self._changed_fields[:]:
                     if field.startswith(level):
                         remove(field)
 

From bd84667a2b6db42d3ac59dfa5baed047374e338b Mon Sep 17 00:00:00 2001
From: anih <admin@e-back.net>
Date: Tue, 6 Sep 2016 09:27:41 +0200
Subject: [PATCH 0372/1519] fixes

---
 mongoengine/base/document.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index fadda159f..68a00485e 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -72,12 +72,12 @@ def __init__(self, *args, **values):
         # Check if there are undefined fields supplied to the constructor,
         # if so raise an Exception.
         if not self._dynamic and (self._meta.get('strict', True) or _created):
-            _missing_fields_keys = set(values.keys()) - set(
+            _undefined_fields = set(values.keys()) - set(
               self._fields.keys() + ['id', 'pk', '_cls', '_text_score'])
-            if _missing_fields_keys:
+            if _undefined_fields:
                 msg = (
-                    "The fields '{0}' does not exist on the document '{1}'"
-                ).format(_missing_fields_keys, self._class_name)
+                    "The fields '{0}' do not exist on the document '{1}'"
+                ).format(_undefined_fields, self._class_name)
                 raise FieldDoesNotExist(msg)
 
         if self.STRICT and not self._dynamic:

From 2c4536e13756c0388fff25d6445e664c354b31e6 Mon Sep 17 00:00:00 2001
From: Gang Li <gli@informaticsincontext.com>
Date: Tue, 6 Sep 2016 17:27:47 -0400
Subject: [PATCH 0373/1519] redo fix for ListField loses use_db_field when
 serializing #1217 The new fix reverted the change on BaseField to_mongo so
 that it will not force new field class to add kwargs to to_mongo function.
 The new derived field class to_mongo can support use_db_field and fields
 parameters as needed. Basically all field classes derived from
 ComplexBaseField support those parameters.

---
 mongoengine/base/document.py | 16 ++++++-----
 mongoengine/base/fields.py   | 35 +++++++++++++++---------
 mongoengine/fields.py        | 52 +++++++++++++++++++-----------------
 tests/fields/fields.py       |  2 +-
 4 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 4959991e4..d9f59ada6 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -309,7 +309,7 @@ def to_mongo(self, use_db_field=True, fields=None):
         data = SON()
         data["_id"] = None
         data['_cls'] = self._class_name
-        EmbeddedDocumentField = _import_class("EmbeddedDocumentField")
+        
         # only root fields ['test1.a', 'test2'] => ['test1', 'test2']
         root_fields = set([f.split('.')[0] for f in fields])
 
@@ -324,18 +324,20 @@ def to_mongo(self, use_db_field=True, fields=None):
                 field = self._dynamic_fields.get(field_name)
 
             if value is not None:
-
-                if fields:
+                f_inputs = field.to_mongo.__code__.co_varnames
+                ex_vars = {}
+                if fields and 'fields' in f_inputs:
                     key = '%s.' % field_name
                     embedded_fields = [
                         i.replace(key, '') for i in fields
                         if i.startswith(key)]
 
-                else:
-                    embedded_fields = []
+                    ex_vars['fields'] = embedded_fields 
 
-                value = field.to_mongo(value, use_db_field=use_db_field,
-                                        fields=embedded_fields)
+                if 'use_db_field' in f_inputs:
+                    ex_vars['use_db_field'] = use_db_field
+                     
+                value = field.to_mongo(value, **ex_vars)
 
             # Handle self generating fields
             if value is None and field._auto_gen:
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index a803657d5..ce30bfa7b 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -158,11 +158,24 @@ def to_python(self, value):
         """
         return value
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         """Convert a Python type to a MongoDB-compatible type.
         """
         return self.to_python(value)
 
+    def _to_mongo_safe_call(self, value, use_db_field=True, fields=None):
+        """A helper method to call to_mongo with proper inputs
+        """
+        f_inputs = self.to_mongo.__code__.co_varnames
+        ex_vars = {}
+        if 'fields' in f_inputs:
+            ex_vars['fields'] = fields 
+
+        if 'use_db_field' in f_inputs:
+            ex_vars['use_db_field'] = use_db_field
+             
+        return self.to_mongo(value, **ex_vars)
+
     def prepare_query_value(self, op, value):
         """Prepare a value that is being used in a query for PyMongo.
         """
@@ -324,7 +337,7 @@ def to_python(self, value):
                                          key=operator.itemgetter(0))]
         return value_dict
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value, use_db_field=True, fields=None):
         """Convert a Python type to a MongoDB-compatible type.
         """
         Document = _import_class("Document")
@@ -336,10 +349,9 @@ def to_mongo(self, value, **kwargs):
 
         if hasattr(value, 'to_mongo'):
             if isinstance(value, Document):
-                return GenericReferenceField().to_mongo(
-                    value, **kwargs)
+                return GenericReferenceField().to_mongo(value)
             cls = value.__class__
-            val = value.to_mongo(**kwargs)
+            val = value.to_mongo(use_db_field, fields)
             # If it's a document that is not inherited add _cls
             if isinstance(value, EmbeddedDocument):
                 val['_cls'] = cls.__name__
@@ -354,7 +366,7 @@ def to_mongo(self, value, **kwargs):
                 return value
 
         if self.field:
-            value_dict = dict([(key, self.field.to_mongo(item, **kwargs))
+            value_dict = dict([(key, self.field._to_mongo_safe_call(item, use_db_field, fields))
                                for key, item in value.iteritems()])
         else:
             value_dict = {}
@@ -373,20 +385,19 @@ def to_mongo(self, value, **kwargs):
                         meta.get('allow_inheritance', ALLOW_INHERITANCE)
                         is True)
                     if not allow_inheritance and not self.field:
-                        value_dict[k] = GenericReferenceField().to_mongo(
-                            v, **kwargs)
+                        value_dict[k] = GenericReferenceField().to_mongo(v)
                     else:
                         collection = v._get_collection_name()
                         value_dict[k] = DBRef(collection, v.pk)
                 elif hasattr(v, 'to_mongo'):
                     cls = v.__class__
-                    val = v.to_mongo(**kwargs)
+                    val = v.to_mongo(use_db_field, fields)
                     # If it's a document that is not inherited add _cls
                     if isinstance(v, (Document, EmbeddedDocument)):
                         val['_cls'] = cls.__name__
                     value_dict[k] = val
                 else:
-                    value_dict[k] = self.to_mongo(v, **kwargs)
+                    value_dict[k] = self.to_mongo(v, use_db_field, fields)
 
         if is_list:  # Convert back to a list
             return [v for _, v in sorted(value_dict.items(),
@@ -444,7 +455,7 @@ def to_python(self, value):
             pass
         return value
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         if not isinstance(value, ObjectId):
             try:
                 return ObjectId(unicode(value))
@@ -619,7 +630,7 @@ def _validate_multipolygon(self, value):
         if errors:
             return "Invalid MultiPolygon:\n%s" % ", ".join(errors)
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         if isinstance(value, dict):
             return value
         return SON([("type", self._type), ("coordinates", value)])
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 2db6383c1..1b85f96ed 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -231,7 +231,7 @@ def to_python(self, value):
             pass
         return value
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         return Int64(value)
 
     def validate(self, value):
@@ -338,7 +338,7 @@ def to_python(self, value):
             return value
         return value.quantize(decimal.Decimal(".%s" % ("0" * self.precision)), rounding=self.rounding)
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         if value is None:
             return value
         if self.force_string:
@@ -401,7 +401,7 @@ def validate(self, value):
         if not isinstance(new_value, (datetime.datetime, datetime.date)):
             self.error(u'cannot parse date "%s"' % value)
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         if value is None:
             return value
         if isinstance(value, datetime.datetime):
@@ -524,7 +524,7 @@ def to_python(self, value):
         except Exception:
             return original_value
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         value = self.to_python(value)
         return self._convert_from_datetime(value)
 
@@ -559,10 +559,10 @@ def to_python(self, value):
             return self.document_type._from_son(value, _auto_dereference=self._auto_dereference)
         return value
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value, use_db_field=True, fields=None):
         if not isinstance(value, self.document_type):
             return value
-        return self.document_type.to_mongo(value, **kwargs)
+        return self.document_type.to_mongo(value, use_db_field, fields)
 
     def validate(self, value, clean=True):
         """Make sure that the document instance is an instance of the
@@ -612,11 +612,11 @@ def validate(self, value, clean=True):
 
         value.validate(clean=clean)
 
-    def to_mongo(self, document, **kwargs):
+    def to_mongo(self, document, use_db_field=True, fields=None):
         if document is None:
             return None
 
-        data = document.to_mongo(**kwargs)
+        data = document.to_mongo(use_db_field, fields)
         if '_cls' not in data:
             data['_cls'] = document._class_name
         return data
@@ -628,7 +628,7 @@ class DynamicField(BaseField):
 
     Used by :class:`~mongoengine.DynamicDocument` to handle dynamic data"""
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value, use_db_field=True, fields=None):
         """Convert a Python type to a MongoDB compatible type.
         """
 
@@ -637,7 +637,7 @@ def to_mongo(self, value, **kwargs):
 
         if hasattr(value, 'to_mongo'):
             cls = value.__class__
-            val = value.to_mongo(**kwargs)
+            val = value.to_mongo(use_db_field, fields)
             # If we its a document thats not inherited add _cls
             if isinstance(value, Document):
                 val = {"_ref": value.to_dbref(), "_cls": cls.__name__}
@@ -655,7 +655,7 @@ def to_mongo(self, value, **kwargs):
 
         data = {}
         for k, v in value.iteritems():
-            data[k] = self.to_mongo(v, **kwargs)
+            data[k] = self.to_mongo(v, use_db_field, fields)
 
         value = data
         if is_list:  # Convert back to a list
@@ -767,8 +767,8 @@ def __init__(self, field, **kwargs):
             self._order_reverse = kwargs.pop('reverse')
         super(SortedListField, self).__init__(field, **kwargs)
 
-    def to_mongo(self, value, **kwargs):
-        value = super(SortedListField, self).to_mongo(value, **kwargs)
+    def to_mongo(self, value, use_db_field=True, fields=None):
+        value = super(SortedListField, self).to_mongo(value, use_db_field, fields)
         if self._ordering is not None:
             return sorted(value, key=itemgetter(self._ordering),
                           reverse=self._order_reverse)
@@ -954,7 +954,7 @@ def __get__(self, instance, owner):
 
         return super(ReferenceField, self).__get__(instance, owner)
 
-    def to_mongo(self, document, **kwargs):
+    def to_mongo(self, document):
         if isinstance(document, DBRef):
             if not self.dbref:
                 return document.id
@@ -977,7 +977,7 @@ def to_mongo(self, document, **kwargs):
         id_field_name = cls._meta['id_field']
         id_field = cls._fields[id_field_name]
 
-        id_ = id_field.to_mongo(id_, **kwargs)
+        id_ = id_field.to_mongo(id_)
         if self.document_type._meta.get('abstract'):
             collection = cls._get_collection_name()
             return DBRef(collection, id_, cls=cls._class_name)
@@ -1100,7 +1100,7 @@ def __get__(self, instance, owner):
 
         return super(CachedReferenceField, self).__get__(instance, owner)
 
-    def to_mongo(self, document, **kwargs):
+    def to_mongo(self, document, use_db_field=True, fields=None):
         id_field_name = self.document_type._meta['id_field']
         id_field = self.document_type._fields[id_field_name]
 
@@ -1115,11 +1115,15 @@ def to_mongo(self, document, **kwargs):
             # TODO: should raise here or will fail next statement
 
         value = SON((
-            ("_id", id_field.to_mongo(id_, **kwargs)),
+            ("_id", id_field.to_mongo(id_)),
         ))
 
-        kwargs['fields'] = self.fields
-        value.update(dict(document.to_mongo(**kwargs)))
+        if fields:
+            new_fields = [f for f in self.fields if f in fields]
+        else:
+            new_fields = self.fields
+            
+        value.update(dict(document.to_mongo(use_db_field, fields=new_fields)))
         return value
 
     def prepare_query_value(self, op, value):
@@ -1235,7 +1239,7 @@ def dereference(self, value):
             doc = doc_cls._from_son(doc)
         return doc
 
-    def to_mongo(self, document, **kwargs):
+    def to_mongo(self, document):
         if document is None:
             return None
 
@@ -1254,7 +1258,7 @@ def to_mongo(self, document, **kwargs):
         else:
             id_ = document
 
-        id_ = id_field.to_mongo(id_, **kwargs)
+        id_ = id_field.to_mongo(id_)
         collection = document._get_collection_name()
         ref = DBRef(collection, id_)
         return SON((
@@ -1283,7 +1287,7 @@ def __set__(self, instance, value):
             value = bin_type(value)
         return super(BinaryField, self).__set__(instance, value)
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         return Binary(value)
 
     def validate(self, value):
@@ -1508,7 +1512,7 @@ def get_proxy_obj(self, key, instance, db_alias=None, collection_name=None):
                                 db_alias=db_alias,
                                 collection_name=collection_name)
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         # Store the GridFS file id in MongoDB
         if isinstance(value, self.proxy_class) and value.grid_id is not None:
             return value.grid_id
@@ -1858,7 +1862,7 @@ def to_python(self, value):
                 return original_value
         return value
 
-    def to_mongo(self, value, **kwargs):
+    def to_mongo(self, value):
         if not self._binary:
             return unicode(value)
         elif isinstance(value, basestring):
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index ef35874df..3b3fe857b 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3527,7 +3527,7 @@ class EnumField(BaseField):
             def __init__(self, **kwargs):
                 super(EnumField, self).__init__(**kwargs)
 
-            def to_mongo(self, value, **kwargs):
+            def to_mongo(self, value):
                 return value
 
             def to_python(self, value):

From 43dabb28251a2740dc1c5366ddf659e52dfb3ef6 Mon Sep 17 00:00:00 2001
From: BenCotte <benoit.cotte@essec.edu>
Date: Tue, 11 Oct 2016 18:14:17 +0200
Subject: [PATCH 0374/1519] Dictionnary Field recommended use

At Dictionary Fields description, it seems that the intent of the sentence make more sense by adding : "not".
---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 6ac88f010..d276b0419 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -215,7 +215,7 @@ document class as the first argument::
 Dictionary Fields
 -----------------
 Often, an embedded document may be used instead of a dictionary -- generally
-this is recommended as dictionaries don't support validation or custom field
+this is not recommended as dictionaries don't support validation or custom field
 types. However, sometimes you will not know the structure of what you want to
 store; in this situation a :class:`~mongoengine.fields.DictField` is appropriate::
 

From 6992615c984105e996f9afc9d1b6211c082de550 Mon Sep 17 00:00:00 2001
From: Thomas Steinacher <tom@eggdrop.ch>
Date: Wed, 12 Oct 2016 16:59:54 +0200
Subject: [PATCH 0375/1519] Use English spelling for "email address"

---
 mongoengine/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 1b85f96ed..9d189235f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -162,7 +162,7 @@ def validate(self, value):
 
 
 class EmailField(StringField):
-    """A field that validates input as an E-Mail-Address.
+    """A field that validates input as an email address.
 
     .. versionadded:: 0.4
     """
@@ -178,7 +178,7 @@ class EmailField(StringField):
 
     def validate(self, value):
         if not EmailField.EMAIL_REGEX.match(value):
-            self.error('Invalid Mail-address: %s' % value)
+            self.error('Invalid email address: %s' % value)
         super(EmailField, self).validate(value)
 
 

From f7ac8cea9041a93027e7dacd0be674b78b2beeae Mon Sep 17 00:00:00 2001
From: Jeff Tharp <jeff@close.io>
Date: Wed, 19 Oct 2016 11:57:02 -0700
Subject: [PATCH 0376/1519] Fix connecting to a list of hosts

---
 mongoengine/connection.py | 48 +++++++++++++++++++++++----------------
 tests/test_connection.py  | 34 +++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 4055a9b6e..0974f83b0 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,5 +1,5 @@
 from pymongo import MongoClient, ReadPreference, uri_parser
-from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.python_support import (IS_PYMONGO_3, str_types)
 
 __all__ = ['ConnectionError', 'connect', 'register_connection',
            'DEFAULT_CONNECTION_NAME']
@@ -56,25 +56,35 @@ def register_connection(alias, name=None, host=None, port=None,
         'authentication_source': authentication_source
     }
 
-    # Handle uri style connections
     conn_host = conn_settings['host']
-    if conn_host.startswith('mongomock://'):
-        conn_settings['is_mock'] = True
-        # `mongomock://` is not a valid url prefix and must be replaced by `mongodb://`
-        conn_settings['host'] = conn_host.replace('mongomock://', 'mongodb://', 1)
-    elif '://' in conn_host:
-        uri_dict = uri_parser.parse_uri(conn_host)
-        conn_settings.update({
-            'name': uri_dict.get('database') or name,
-            'username': uri_dict.get('username'),
-            'password': uri_dict.get('password'),
-            'read_preference': read_preference,
-        })
-        uri_options = uri_dict['options']
-        if 'replicaset' in uri_options:
-            conn_settings['replicaSet'] = True
-        if 'authsource' in uri_options:
-            conn_settings['authentication_source'] = uri_options['authsource']
+    # host can be a list or a string, so if string, force to a list
+    if isinstance(conn_host, str_types):
+        conn_host = [conn_host]
+
+    resolved_hosts = []
+    for entity in conn_host:
+        # Handle uri style connections
+        if entity.startswith('mongomock://'):
+            conn_settings['is_mock'] = True
+            # `mongomock://` is not a valid url prefix and must be replaced by `mongodb://`
+            resolved_hosts.append(entity.replace('mongomock://', 'mongodb://', 1))
+        elif '://' in entity:
+            uri_dict = uri_parser.parse_uri(entity)
+            resolved_hosts.append(entity)
+            conn_settings.update({
+                'name': uri_dict.get('database') or name,
+                'username': uri_dict.get('username'),
+                'password': uri_dict.get('password'),
+                'read_preference': read_preference,
+            })
+            uri_options = uri_dict['options']
+            if 'replicaset' in uri_options:
+                conn_settings['replicaSet'] = True
+            if 'authsource' in uri_options:
+                conn_settings['authentication_source'] = uri_options['authsource']
+        else:
+            resolved_hosts.append(entity)
+    conn_settings['host'] = resolved_hosts
 
     # Deprecated parameters that should not be passed on
     kwargs.pop('slaves', None)
diff --git a/tests/test_connection.py b/tests/test_connection.py
index b2f7406e2..1d422d099 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -88,6 +88,40 @@ def test_connect_in_mocking(self):
         conn = get_connection('testdb7')
         self.assertTrue(isinstance(conn, mongomock.MongoClient))
 
+    def test_connect_with_host_list(self):
+        """Ensure that the connect() method works when host is a list
+
+        Uses mongomock to test w/o needing multiple mongod/mongos processes
+        """
+        try:
+            import mongomock
+        except ImportError:
+            raise SkipTest('you need mongomock installed to run this testcase')
+
+        connect(host=['mongomock://localhost'])
+        conn = get_connection()
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect(host=['mongodb://localhost'], is_mock=True,  alias='testdb2')
+        conn = get_connection('testdb2')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect(host=['localhost'], is_mock=True,  alias='testdb3')
+        conn = get_connection('testdb3')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect(host=['mongomock://localhost:27017', 'mongomock://localhost:27018'], alias='testdb4')
+        conn = get_connection('testdb4')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect(host=['mongodb://localhost:27017', 'mongodb://localhost:27018'], is_mock=True,  alias='testdb5')
+        conn = get_connection('testdb5')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
+        connect(host=['localhost:27017', 'localhost:27018'], is_mock=True,  alias='testdb6')
+        conn = get_connection('testdb6')
+        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+
     def test_disconnect(self):
         """Ensure that the disconnect() method works properly
         """

From 40ed9a53c9226aed2a40b93ec3d0aaef629dd09e Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 19 Oct 2016 15:43:07 -0400
Subject: [PATCH 0377/1519] dont run tests for python 3.2

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 124c8843b..6a8a8d758 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py32,py33,py34,py35,pypy,pypy3}-{mg27,mg28}
+envlist = {py26,py27,py33,py34,py35,pypy,pypy3}-{mg27,mg28}
 #envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30,mgdev}
 
 [testenv]

From 5446592d44243e88f29d414f695e07893cdc2e43 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 19 Oct 2016 16:05:59 -0400
Subject: [PATCH 0378/1519] remove rednose to see if it masks another issue

---
 setup.cfg | 1 -
 setup.py  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index e59f0fe26..a946c1755 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [nosetests]
-rednose = 1
 verbosity = 2
 detailed-errors = 1
 cover-erase = 1
diff --git a/setup.py b/setup.py
index e34d834a0..de9985cd9 100644
--- a/setup.py
+++ b/setup.py
@@ -53,13 +53,13 @@ def get_version(version_tuple):
 extra_opts = {"packages": find_packages(exclude=["tests", "tests.*"])}
 if sys.version_info[0] == 3:
     extra_opts['use_2to3'] = True
-    extra_opts['tests_require'] = ['nose', 'rednose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0']
+    extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0']
     if "test" in sys.argv or "nosetests" in sys.argv:
         extra_opts['packages'] = find_packages()
         extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]}
 else:
     # coverage 4 does not support Python 3.2 anymore
-    extra_opts['tests_require'] = ['nose', 'rednose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
+    extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
 
     if sys.version_info[0] == 2 and sys.version_info[1] == 6:
         extra_opts['tests_require'].append('unittest2')

From 5fe1497c92c97f34ee2d65ddf4326b16ab6f5383 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 19 Oct 2016 16:14:02 -0400
Subject: [PATCH 0379/1519] remove rednose from tox deps

---
 tox.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 124c8843b..b0728a258 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,6 @@ commands =
     python setup.py nosetests {posargs}
 deps =
     nose
-    rednose
     mg27: PyMongo<2.8
     mg28: PyMongo>=2.8,<3.0
     mg30: PyMongo>=3.0

From fb3243f1bc8c401a3f32e0d3a06b9fba3fdbc73c Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 19 Oct 2016 16:23:48 -0400
Subject: [PATCH 0380/1519] readme fix

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 547ecbd93..2baee368e 100644
--- a/README.rst
+++ b/README.rst
@@ -99,7 +99,7 @@ Some simple examples of what MongoEngine code looks like:
 Tests
 =====
 To run the test suite, ensure you are running a local instance of MongoDB on
-the standard port and have installed ``nose`` and ``rednose``, and run: ``python setup.py nosetests``.
+the standard port and have ``nose`` installed. Then, run: ``python setup.py nosetests``.
 
 To run the test suite on every supported Python version and every supported PyMongo version,
 you can use ``tox``.

From d9e4b562a9fd9b066fcd4e22275c6a406daf28b8 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 19 Oct 2016 16:30:39 -0400
Subject: [PATCH 0381/1519] for good measure, remove py32 from the
 commented-out envlist, too

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 6a8a8d758..e96cff1a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist = {py26,py27,py33,py34,py35,pypy,pypy3}-{mg27,mg28}
-#envlist = {py26,py27,py32,py33,py34,pypy,pypy3}-{mg27,mg28,mg30,mgdev}
+#envlist = {py26,py27,py33,py34,pypy,pypy3}-{mg27,mg28,mg30,mgdev}
 
 [testenv]
 commands =

From dd473d1e1eb7ee424947cfd7f2bd88eb584dee19 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 19 Oct 2016 18:15:15 -0400
Subject: [PATCH 0382/1519] remove v3.2 from .travis.yml

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0af5c2692..9e1eb7cd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: python
 python:
 - '2.6'
 - '2.7'
-- '3.2'
 - '3.3'
 - '3.4'
 - '3.5'

From 81870777a94f5adbe4e1a2be8c0e5d32f9f5e6cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lafr=C3=A9choux?=
 <jlafrechoux@nobatek.com>
Date: Mon, 24 Oct 2016 11:59:54 +0200
Subject: [PATCH 0383/1519] Update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b54b5cb65..2d325ed14 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Changes in 0.10.7 - DEV
 =======================
+- Dropped Python 3.2 support #1390
 - Fixed the bug where dynamic doc has index inside a dict field #1278
 - Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
 - Fixed cascade delete mixing among collections #1224

From 2141f2c4c5b4e724d03c4093dda58bb0c3f31c38 Mon Sep 17 00:00:00 2001
From: Stanivlav Kaledin <staskaledin@gmail.com>
Date: Mon, 14 Nov 2016 19:57:48 +0300
Subject: [PATCH 0384/1519] Fixed issue
 https://github.com/MongoEngine/mongoengine/issues/442 Added support for
 pickling BaseQueryset instances Added BaseQueryset.__getstate__,
 BaseQuerySet.__setstate__ methods

---
 mongoengine/queryset/base.py | 33 +++++++++++++++
 tests/queryset/pickable.py   | 78 ++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 tests/queryset/pickable.py

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 7efb0fb6c..c7d569ea2 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -123,6 +123,39 @@ def __call__(self, q_obj=None, class_check=True, read_preference=None,
 
         return queryset
 
+    def __getstate__(self):
+        """
+        Need for pickling queryset
+
+        See https://github.com/MongoEngine/mongoengine/issues/442
+        """
+
+        obj_dict = self.__dict__.copy()
+
+        # don't picke collection, instead pickle collection params
+        obj_dict.pop("_collection_obj")
+
+        # don't pickle cursor
+        obj_dict["_cursor_obj"] = None
+
+        return obj_dict
+
+    def __setstate__(self, obj_dict):
+        """
+        Need for pickling queryset
+
+        See https://github.com/MongoEngine/mongoengine/issues/442
+        """
+
+        obj_dict["_collection_obj"] = obj_dict["_document"]._get_collection()
+
+        # update attributes
+        self.__dict__.update(obj_dict)
+
+        # forse load cursor
+        self._cursor
+
+
     def __getitem__(self, key):
         """Support skip and limit using getitem and slicing syntax.
         """
diff --git a/tests/queryset/pickable.py b/tests/queryset/pickable.py
new file mode 100644
index 000000000..7964f383c
--- /dev/null
+++ b/tests/queryset/pickable.py
@@ -0,0 +1,78 @@
+import pickle
+import unittest
+from pymongo.mongo_client import MongoClient
+from mongoengine import Document, StringField, IntField
+from mongoengine.connection import connect
+
+__author__ = 'stas'
+
+class Person(Document):
+    name = StringField()
+    age = IntField()
+
+class TestQuerysetPickable(unittest.TestCase):
+    """
+    Test for adding pickling support for QuerySet instances
+    See issue https://github.com/MongoEngine/mongoengine/issues/442
+    """
+    def setUp(self):
+        super(TestQuerysetPickable, self).setUp()
+
+        connection = connect(db="test") #type: pymongo.mongo_client.MongoClient
+
+        connection.drop_database("test")
+
+        self.john = Person.objects.create(
+            name="John",
+            age=21
+        )
+
+
+    def test_picke_simple_qs(self):
+
+        qs = Person.objects.all()
+
+        pickle.dumps(qs)
+
+    def _get_loaded(self, qs):
+        s = pickle.dumps(qs)
+
+        return pickle.loads(s)
+
+    def test_unpickle(self):
+        qs = Person.objects.all()
+
+        loadedQs = self._get_loaded(qs)
+
+        self.assertEqual(qs.count(), loadedQs.count())
+
+        #can update loadedQs
+        loadedQs.update(age=23)
+
+        #check
+        self.assertEqual(Person.objects.first().age, 23)
+
+    def test_pickle_support_filtration(self):
+        Person.objects.create(
+            name="Alice",
+            age=22
+        )
+
+        Person.objects.create(
+            name="Bob",
+            age=23
+        )
+
+        qs = Person.objects.filter(age__gte=22)
+        self.assertEqual(qs.count(), 2)
+
+        loaded = self._get_loaded(qs)
+
+        self.assertEqual(loaded.count(), 2)
+        self.assertEqual(loaded.filter(name="Bob").first().age, 23)
+
+
+
+
+
+

From ac90d6ae5cdeeddc5fa1b5102c7009a3a2673c57 Mon Sep 17 00:00:00 2001
From: Stanivlav Kaledin <staskaledin@gmail.com>
Date: Mon, 14 Nov 2016 20:06:34 +0300
Subject: [PATCH 0385/1519] Don't force _cursor

---
 mongoengine/queryset/base.py | 2 +-
 tests/queryset/pickable.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c7d569ea2..38af72ff3 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -153,7 +153,7 @@ def __setstate__(self, obj_dict):
         self.__dict__.update(obj_dict)
 
         # forse load cursor
-        self._cursor
+        # self._cursor
 
 
     def __getitem__(self, key):
diff --git a/tests/queryset/pickable.py b/tests/queryset/pickable.py
index 7964f383c..d96e7dc6a 100644
--- a/tests/queryset/pickable.py
+++ b/tests/queryset/pickable.py
@@ -70,7 +70,7 @@ def test_pickle_support_filtration(self):
 
         self.assertEqual(loaded.count(), 2)
         self.assertEqual(loaded.filter(name="Bob").first().age, 23)
-
+    
 
 
 

From 07018b50602b87207f23e1795d2ddba171902f3c Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 6 Jul 2016 15:23:00 +0200
Subject: [PATCH 0386/1519] Raise DoesNotExist when dereferencing unknown
 document

---
 mongoengine/fields.py  | 24 ++++++++++++++++--------
 tests/fields/fields.py | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 9d189235f..47e33d1d0 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -25,7 +25,7 @@
 except ImportError:
     Int64 = long
 
-from mongoengine.errors import ValidationError
+from mongoengine.errors import ValidationError, DoesNotExist
 from mongoengine.python_support import (PY3, bin_type, txt_type,
                                         str_types, StringIO)
 from base import (BaseField, ComplexBaseField, ObjectIdField, GeoJsonBaseField,
@@ -948,9 +948,11 @@ def __get__(self, instance, owner):
                 cls = get_document(value.cls)
             else:
                 cls = self.document_type
-            value = cls._get_db().dereference(value)
-            if value is not None:
-                instance._data[self.name] = cls._from_son(value)
+            dereferenced = cls._get_db().dereference(value)
+            if dereferenced is None:
+                raise DoesNotExist('Trying to dereference unknown document %s' % value)
+            else:
+                instance._data[self.name] = cls._from_son(dereferenced)
 
         return super(ReferenceField, self).__get__(instance, owner)
 
@@ -1094,9 +1096,11 @@ def __get__(self, instance, owner):
         self._auto_dereference = instance._fields[self.name]._auto_dereference
         # Dereference DBRefs
         if self._auto_dereference and isinstance(value, DBRef):
-            value = self.document_type._get_db().dereference(value)
-            if value is not None:
-                instance._data[self.name] = self.document_type._from_son(value)
+            dereferenced = self.document_type._get_db().dereference(value)
+            if dereferenced is None:
+                raise DoesNotExist('Trying to dereference unknown document %s' % value)
+            else:
+                instance._data[self.name] = self.document_type._from_son(dereferenced)
 
         return super(CachedReferenceField, self).__get__(instance, owner)
 
@@ -1214,7 +1218,11 @@ def __get__(self, instance, owner):
 
         self._auto_dereference = instance._fields[self.name]._auto_dereference
         if self._auto_dereference and isinstance(value, (dict, SON)):
-            instance._data[self.name] = self.dereference(value)
+            dereferenced = self.dereference(value)
+            if dereferenced is None:
+                raise DoesNotExist('Trying to dereference unknown document %s' % value)
+            else:
+                instance._data[self.name] = dereferenced
 
         return super(GenericReferenceField, self).__get__(instance, owner)
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 3b3fe857b..36b9f4cde 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -31,7 +31,7 @@
 from mongoengine.connection import get_db
 from mongoengine.base import _document_registry
 from mongoengine.base.datastructures import BaseDict, EmbeddedDocumentList
-from mongoengine.errors import NotRegistered
+from mongoengine.errors import NotRegistered, DoesNotExist
 from mongoengine.python_support import PY3, b, bin_type
 
 __all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")
@@ -1726,6 +1726,37 @@ class User(Basedoc):
 
         self.assertEqual(content, User.objects.first().groups[0].content)
 
+    def test_reference_miss(self):
+        """Ensure an exception is raised when dereferencing unknow document
+        """
+
+        class Foo(Document):
+            pass
+
+        class Bar(Document):
+            ref = ReferenceField(Foo)
+            generic_ref = GenericReferenceField()
+
+        Foo.drop_collection()
+        Bar.drop_collection()
+
+        foo = Foo().save()
+        bar = Bar(ref=foo, generic_ref=foo).save()
+
+        # Reference is no longer valid
+        foo.delete()
+        bar = Bar.objects.get()
+        self.assertRaises(DoesNotExist, lambda: getattr(bar, 'ref'))
+        self.assertRaises(DoesNotExist, lambda: getattr(bar, 'generic_ref'))
+
+        # When auto_dereference is disabled, there is no trouble returning DBRef
+        bar = Bar.objects.get()
+        expected = foo.to_dbref()
+        bar._fields['ref']._auto_dereference = False
+        self.assertEqual(bar.ref, expected)
+        bar._fields['generic_ref']._auto_dereference = False
+        self.assertEqual(bar.generic_ref, {'_ref': expected, '_cls': 'Foo'})
+
     def test_reference_validation(self):
         """Ensure that invalid docment objects cannot be assigned to reference
         fields.

From 23d06b79a64e072ba9669acd61a367226d28fdac Mon Sep 17 00:00:00 2001
From: Stanivlav Kaledin <staskaledin@gmail.com>
Date: Thu, 17 Nov 2016 19:05:46 +0300
Subject: [PATCH 0387/1519] Add info in CHANGELOG

---
 AUTHORS            | 1 +
 docs/changelog.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index e545b8519..12475c2e7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -241,3 +241,4 @@ that much better:
  * Shu Shen (https://github.com/shushen)
  * xiaost7 (https://github.com/xiaost7)
  * Victor Varvaryuk
+ * Stanislav Kaledin (https://github.com/sallyruthstruik)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2d325ed14..413314b61 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -18,6 +18,7 @@ Changes in 0.10.7 - DEV
 - Fixed no_cursor_timeout error with pymongo 3.0+ #1304
 - Replaced map-reduce based QuerySet.sum/average with aggregation-based implementations #1336
 - Fixed support for `__` to escape field names that match operators names in `update` #1351
+- Add support for pickling QuerySet instances. #1397
 
 Changes in 0.10.6
 =================

From d8dd07d9efb4a98f941736dd90b77d838ea676bc Mon Sep 17 00:00:00 2001
From: BenCotte <benoit.cotte@essec.edu>
Date: Sun, 20 Nov 2016 11:19:36 +0100
Subject: [PATCH 0388/1519] Updating Dict Fields use description

Update dict fields use misleading description to clarify use case.
---
 docs/guide/defining-documents.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index d276b0419..f59f856e8 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -214,9 +214,9 @@ document class as the first argument::
 
 Dictionary Fields
 -----------------
-Often, an embedded document may be used instead of a dictionary -- generally
-this is not recommended as dictionaries don't support validation or custom field
-types. However, sometimes you will not know the structure of what you want to
+Often, an embedded document may be used instead of a dictionary – generally 
+embedded documents are recommended as dictionaries don’t support validation 
+or custom field types. However, sometimes you will not know the structure of what you want to
 store; in this situation a :class:`~mongoengine.fields.DictField` is appropriate::
 
     class SurveyResponse(Document):

From d19bb2308d7200cceb06d1b4aea482833ffc7a05 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Thu, 24 Nov 2016 09:40:17 -0500
Subject: [PATCH 0389/1519] add #1389 to the changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 413314b61..eb72d8471 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -19,6 +19,7 @@ Changes in 0.10.7 - DEV
 - Replaced map-reduce based QuerySet.sum/average with aggregation-based implementations #1336
 - Fixed support for `__` to escape field names that match operators names in `update` #1351
 - Add support for pickling QuerySet instances. #1397
+- Fixed connecting to a list of hosts #1389
 
 Changes in 0.10.6
 =================

From faef5b857011be80f001a4abd5fba2013e1caea4 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 28 Nov 2016 10:40:16 -0500
Subject: [PATCH 0390/1519] finalize the v0.10.7 changelog

---
 docs/changelog.rst | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index eb72d8471..e40bf903e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,10 +2,15 @@
 Changelog
 =========
 
-Changes in 0.10.7 - DEV
-=======================
+Changes in 0.10.8
+=================
+- Fill this in as PRs for v0.10.8 are merged
+
+Changes in 0.10.7
+=================
 - Dropped Python 3.2 support #1390
 - Fixed the bug where dynamic doc has index inside a dict field #1278
+- Fixed: ListField minus index assignment does not work #1128
 - Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
 - Fixed cascade delete mixing among collections #1224
 - Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls #1206
@@ -18,8 +23,11 @@ Changes in 0.10.7 - DEV
 - Fixed no_cursor_timeout error with pymongo 3.0+ #1304
 - Replaced map-reduce based QuerySet.sum/average with aggregation-based implementations #1336
 - Fixed support for `__` to escape field names that match operators names in `update` #1351
-- Add support for pickling QuerySet instances. #1397
+- Fixed BaseDocument#_mark_as_changed #1369
+- Added support for pickling QuerySet instances. #1397
 - Fixed connecting to a list of hosts #1389
+- Fixed a bug where accessing broken references wouldn't raise a DoesNotExist error #1334
+- Improvements to the dictionary fields docs # 1383
 
 Changes in 0.10.6
 =================

From b461f26e5d1349f49ab5ccbfdbf2787caa4f8d4c Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 28 Nov 2016 10:42:05 -0500
Subject: [PATCH 0391/1519] version bump

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 65250b621..d74786866 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -14,7 +14,7 @@
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
 
-VERSION = (0, 10, 6)
+VERSION = (0, 10, 7)
 
 
 def get_version():

From 5135185e317db21e1be8f0b701e6ecbe4fd610ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 28 Nov 2016 12:31:50 -0500
Subject: [PATCH 0392/1519] Use SVG in README badges

---
 README.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.rst b/README.rst
index 2baee368e..3f56dd836 100644
--- a/README.rst
+++ b/README.rst
@@ -6,15 +6,15 @@ MongoEngine
 :Author: Harry Marr (http://github.com/hmarr)
 :Maintainer: Ross Lawley (http://github.com/rozza)
 
-.. image:: https://secure.travis-ci.org/MongoEngine/mongoengine.png?branch=master
-  :target: http://travis-ci.org/MongoEngine/mongoengine
+.. image:: https://travis-ci.org/MongoEngine/mongoengine.svg?branch=master
+  :target: https://travis-ci.org/MongoEngine/mongoengine
 
-.. image:: https://coveralls.io/repos/MongoEngine/mongoengine/badge.png?branch=master
-  :target: https://coveralls.io/r/MongoEngine/mongoengine?branch=master
+.. image:: https://coveralls.io/repos/github/MongoEngine/mongoengine/badge.svg?branch=master
+  :target: https://coveralls.io/github/MongoEngine/mongoengine?branch=master
 
-.. image:: https://landscape.io/github/MongoEngine/mongoengine/master/landscape.png
-   :target: https://landscape.io/github/MongoEngine/mongoengine/master
-   :alt: Code Health
+.. image:: https://landscape.io/github/MongoEngine/mongoengine/master/landscape.svg?style=flat
+  :target: https://landscape.io/github/MongoEngine/mongoengine/master
+  :alt: Code Health
 
 About
 =====

From 3c455cf1c13f923db40de4a855dd402217bee3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 28 Nov 2016 19:00:34 -0500
Subject: [PATCH 0393/1519] Improve health of this package (#1409)

* added flake8 and flake8-import-order to travis for py27

* fixed a test that fails from time to time depending on an order of a dict

* flake8 tweaks for the entire codebase excluding tests
---
 .travis.yml                        |  21 ++-
 mongoengine/__init__.py            |   9 +-
 mongoengine/base/datastructures.py |   7 +-
 mongoengine/base/document.py       |  46 ++---
 mongoengine/base/fields.py         |  15 +-
 mongoengine/base/metaclasses.py    |  10 +-
 mongoengine/dereference.py         |  13 +-
 mongoengine/document.py            |  35 ++--
 mongoengine/fields.py              |  32 ++--
 mongoengine/queryset/__init__.py   |   6 +-
 mongoengine/queryset/base.py       |  20 +--
 mongoengine/queryset/queryset.py   |   4 +-
 mongoengine/queryset/transform.py  |  11 +-
 mongoengine/signals.py             |   2 +-
 requirements.txt                   |   2 +
 setup.cfg                          |   6 +
 setup.py                           |  44 ++---
 tests/document/indexes.py          |   7 +-
 tests/queryset/queryset.py         | 262 +++++++++++++++--------------
 tests/queryset/transform.py        |  43 ++---
 tests/queryset/visitor.py          |  42 +++--
 tox.ini                            |  10 +-
 22 files changed, 351 insertions(+), 296 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9e1eb7cd0..8d764a322 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: python
+
 python:
 - '2.6'
 - '2.7'
@@ -7,35 +8,51 @@ python:
 - '3.5'
 - pypy
 - pypy3
+
 env:
 - PYMONGO=2.7
 - PYMONGO=2.8
 - PYMONGO=3.0
 - PYMONGO=dev
+
 matrix:
   fast_finish: true
+
 before_install:
 - travis_retry sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 - echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' |
   sudo tee /etc/apt/sources.list.d/mongodb.list
 - travis_retry sudo apt-get update
 - travis_retry sudo apt-get install mongodb-org-server
+
 install:
 - sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev
   libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
   python-tk
-# virtualenv>=14.0.0 has dropped Python 3.2 support
-- travis_retry pip install "virtualenv<14.0.0" "tox>=1.9" coveralls
+- travis_retry pip install --upgrade pip
+- travis_retry pip install coveralls
+- travis_retry pip install flake8
+- travis_retry pip install tox>=1.9
+- travis_retry pip install "virtualenv<14.0.0"  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
 - travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
+
+# Run flake8 for py27
+before_script:
+- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then tox -e flake8; fi
+
 script:
 - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
+
 after_script: coveralls --verbose
+
 notifications:
   irc: irc.freenode.org#mongoengine
+
 branches:
   only:
   - master
   - /^v.*$/
+
 deploy:
   provider: pypi
   user: the_drow
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index d74786866..d2e26ebfb 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -1,15 +1,15 @@
+import connection
+from connection import *
 import document
 from document import *
+import errors
+from errors import *
 import fields
 from fields import *
-import connection
-from connection import *
 import queryset
 from queryset import *
 import signals
 from signals import *
-from errors import *
-import errors
 
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
@@ -22,4 +22,5 @@ def get_version():
         return '.'.join(map(str, VERSION[:-1])) + VERSION[-1]
     return '.'.join(map(str, VERSION))
 
+
 __version__ = get_version()
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 466b5e885..2bb7ff2c2 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,5 +1,5 @@
-import weakref
 import itertools
+import weakref
 
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
@@ -199,8 +199,9 @@ def sort(self, *args, **kwargs):
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, '_mark_as_changed'):
             if key:
-                self._instance._mark_as_changed('%s.%s' % (self._name, 
-                    key % len(self)))
+                self._instance._mark_as_changed(
+                    '%s.%s' % (self._name, key % len(self))
+                )
             else:
                 self._instance._mark_as_changed(self._name)
 
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 7e418d4ee..eaa2019a4 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1,28 +1,28 @@
 import copy
-import operator
 import numbers
+import operator
 from collections import Hashable
 from functools import partial
 
-import pymongo
-from bson import json_util, ObjectId
+from bson import ObjectId, json_util
 from bson.dbref import DBRef
 from bson.son import SON
+import pymongo
 
 from mongoengine import signals
-from mongoengine.common import _import_class
-from mongoengine.errors import (ValidationError, InvalidDocumentError,
-                                LookUpError, FieldDoesNotExist)
-from mongoengine.python_support import PY3, txt_type
-from mongoengine.base.common import get_document, ALLOW_INHERITANCE
+from mongoengine.base.common import ALLOW_INHERITANCE, get_document
 from mongoengine.base.datastructures import (
     BaseDict,
     BaseList,
     EmbeddedDocumentList,
-    StrictDict,
-    SemiStrictDict
+    SemiStrictDict,
+    StrictDict
 )
 from mongoengine.base.fields import ComplexBaseField
+from mongoengine.common import _import_class
+from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError,
+                                LookUpError, ValidationError)
+from mongoengine.python_support import PY3, txt_type
 
 __all__ = ('BaseDocument', 'NON_FIELD_ERRORS')
 
@@ -73,7 +73,7 @@ def __init__(self, *args, **values):
         # if so raise an Exception.
         if not self._dynamic and (self._meta.get('strict', True) or _created):
             _undefined_fields = set(values.keys()) - set(
-              self._fields.keys() + ['id', 'pk', '_cls', '_text_score'])
+                self._fields.keys() + ['id', 'pk', '_cls', '_text_score'])
             if _undefined_fields:
                 msg = (
                     "The fields '{0}' do not exist on the document '{1}'"
@@ -310,7 +310,7 @@ def to_mongo(self, use_db_field=True, fields=None):
         data = SON()
         data["_id"] = None
         data['_cls'] = self._class_name
-        
+
         # only root fields ['test1.a', 'test2'] => ['test1', 'test2']
         root_fields = set([f.split('.')[0] for f in fields])
 
@@ -333,11 +333,11 @@ def to_mongo(self, use_db_field=True, fields=None):
                         i.replace(key, '') for i in fields
                         if i.startswith(key)]
 
-                    ex_vars['fields'] = embedded_fields 
+                    ex_vars['fields'] = embedded_fields
 
                 if 'use_db_field' in f_inputs:
                     ex_vars['use_db_field'] = use_db_field
-                     
+
                 value = field.to_mongo(value, **ex_vars)
 
             # Handle self generating fields
@@ -566,8 +566,10 @@ def _get_changed_fields(self, inspected=None):
                     continue
             if isinstance(field, ReferenceField):
                 continue
-            elif (isinstance(data, (EmbeddedDocument, DynamicEmbeddedDocument))
-                  and db_field_name not in changed_fields):
+            elif (
+                isinstance(data, (EmbeddedDocument, DynamicEmbeddedDocument)) and
+                db_field_name not in changed_fields
+            ):
                 # Find all embedded fields that have been changed
                 changed = data._get_changed_fields(inspected)
                 changed_fields += ["%s%s" % (key, k) for k in changed if k]
@@ -608,7 +610,7 @@ def _delta(self):
                         break
                     elif isinstance(d, list) and p.lstrip('-').isdigit():
                         if p[0] == '-':
-                            p = str(len(d)+int(p))
+                            p = str(len(d) + int(p))
                         try:
                             d = d[int(p)]
                         except IndexError:
@@ -644,7 +646,7 @@ def _delta(self):
                 for p in parts:
                     if isinstance(d, list) and p.lstrip('-').isdigit():
                         if p[0] == '-':
-                            p = str(len(d)+int(p))
+                            p = str(len(d) + int(p))
                         d = d[int(p)]
                     elif (hasattr(d, '__getattribute__') and
                           not isinstance(d, dict)):
@@ -775,8 +777,12 @@ def _build_index_spec(cls, spec):
         # Check to see if we need to include _cls
         allow_inheritance = cls._meta.get('allow_inheritance',
                                           ALLOW_INHERITANCE)
-        include_cls = (allow_inheritance and not spec.get('sparse', False) and
-                       spec.get('cls',  True) and '_cls' not in spec['fields'])
+        include_cls = (
+            allow_inheritance and
+            not spec.get('sparse', False) and
+            spec.get('cls', True) and
+            '_cls' not in spec['fields']
+        )
 
         # 733: don't include cls if index_cls is False unless there is an explicit cls with the index
         include_cls = include_cls and (spec.get('cls', False) or cls._meta.get('index_cls', True))
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index ce30bfa7b..037074d10 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -5,12 +5,12 @@
 from bson import DBRef, ObjectId, SON
 import pymongo
 
-from mongoengine.common import _import_class
-from mongoengine.errors import ValidationError
 from mongoengine.base.common import ALLOW_INHERITANCE
 from mongoengine.base.datastructures import (
     BaseDict, BaseList, EmbeddedDocumentList
 )
+from mongoengine.common import _import_class
+from mongoengine.errors import ValidationError
 
 __all__ = ("BaseField", "ComplexBaseField",
            "ObjectIdField", "GeoJsonBaseField")
@@ -85,13 +85,13 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.null = null
         self.sparse = sparse
         self._owner_document = None
-        
+
         # Detect and report conflicts between metadata and base properties.
         conflicts = set(dir(self)) & set(kwargs)
         if conflicts:
             raise TypeError("%s already has attribute(s): %s" % (
-                self.__class__.__name__, ', '.join(conflicts) ))
-        
+                self.__class__.__name__, ', '.join(conflicts)))
+
         # Assign metadata to the instance
         # This efficient method is available because no __slots__ are defined.
         self.__dict__.update(kwargs)
@@ -169,11 +169,11 @@ def _to_mongo_safe_call(self, value, use_db_field=True, fields=None):
         f_inputs = self.to_mongo.__code__.co_varnames
         ex_vars = {}
         if 'fields' in f_inputs:
-            ex_vars['fields'] = fields 
+            ex_vars['fields'] = fields
 
         if 'use_db_field' in f_inputs:
             ex_vars['use_db_field'] = use_db_field
-             
+
         return self.to_mongo(value, **ex_vars)
 
     def prepare_query_value(self, op, value):
@@ -206,7 +206,6 @@ def _validate_choices(self, value):
         elif value not in choice_list:
             self.error('Value must be one of %s' % unicode(choice_list))
 
-
     def _validate(self, value, **kwargs):
         # Check the Choices Constraint
         if self.choices:
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index b5981aaee..972834517 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -1,5 +1,7 @@
 import warnings
 
+from mongoengine.base.common import ALLOW_INHERITANCE, _document_registry
+from mongoengine.base.fields import BaseField, ComplexBaseField, ObjectIdField
 from mongoengine.common import _import_class
 from mongoengine.errors import InvalidDocumentError
 from mongoengine.python_support import PY3
@@ -7,16 +9,14 @@
                                   MultipleObjectsReturned,
                                   QuerySetManager)
 
-from mongoengine.base.common import _document_registry, ALLOW_INHERITANCE
-from mongoengine.base.fields import BaseField, ComplexBaseField, ObjectIdField
 
 __all__ = ('DocumentMetaclass', 'TopLevelDocumentMetaclass')
 
 
 class DocumentMetaclass(type):
-    """Metaclass for all documents.
-    """
+    """Metaclass for all documents."""
 
+    # TODO lower complexity of this method
     def __new__(cls, name, bases, attrs):
         flattened_bases = cls._get_bases(bases)
         super_new = super(DocumentMetaclass, cls).__new__
@@ -162,7 +162,7 @@ def __new__(cls, name, bases, attrs):
         # copies __func__ into im_func and __self__ into im_self for
         # classmethod objects in Document derived classes.
         if PY3:
-            for key, val in new_class.__dict__.items():
+            for val in new_class.__dict__.values():
                 if isinstance(val, classmethod):
                     f = val.__get__(new_class)
                     if hasattr(f, '__func__') and not hasattr(f, 'im_func'):
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 0428095a0..c16028d2a 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -1,15 +1,14 @@
 from bson import DBRef, SON
 
-from mongoengine.python_support import txt_type
-
-from base import (
+from .base import (
     BaseDict, BaseList, EmbeddedDocumentList,
     TopLevelDocumentMetaclass, get_document
 )
-from fields import (ReferenceField, ListField, DictField, MapField)
-from connection import get_db
-from queryset import QuerySet
-from document import Document, EmbeddedDocument
+from .connection import get_db
+from .document import Document, EmbeddedDocument
+from .fields import DictField, ListField, MapField, ReferenceField
+from .python_support import txt_type
+from .queryset import QuerySet
 
 
 class DeReference(object):
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 2fac15b0d..607b1bd99 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1,28 +1,29 @@
-import warnings
-import pymongo
 import re
+import warnings
 
-from pymongo.read_preferences import ReadPreference
 from bson.dbref import DBRef
+import pymongo
+from pymongo.read_preferences import ReadPreference
+
 from mongoengine import signals
-from mongoengine.common import _import_class
 from mongoengine.base import (
-    DocumentMetaclass,
-    TopLevelDocumentMetaclass,
-    BaseDocument,
+    ALLOW_INHERITANCE,
     BaseDict,
+    BaseDocument,
     BaseList,
+    DocumentMetaclass,
     EmbeddedDocumentList,
-    ALLOW_INHERITANCE,
+    TopLevelDocumentMetaclass,
     get_document
 )
-from mongoengine.errors import (InvalidQueryError, InvalidDocumentError,
+from mongoengine.common import _import_class
+from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
+from mongoengine.context_managers import switch_collection, switch_db
+from mongoengine.errors import (InvalidDocumentError, InvalidQueryError,
                                 SaveConditionError)
 from mongoengine.python_support import IS_PYMONGO_3
-from mongoengine.queryset import (OperationError, NotUniqueError,
+from mongoengine.queryset import (NotUniqueError, OperationError,
                                   QuerySet, transform)
-from mongoengine.connection import get_db, DEFAULT_CONNECTION_NAME
-from mongoengine.context_managers import switch_db, switch_collection
 
 __all__ = ('Document', 'EmbeddedDocument', 'DynamicDocument',
            'DynamicEmbeddedDocument', 'OperationError',
@@ -332,8 +333,10 @@ def save(self, force_insert=False, validate=True, clean=True,
                     # Correct behaviour in 2.X and in 3.0.1+ versions
                     if not object_id and pymongo.version_tuple == (3, 0):
                         pk_as_mongo_obj = self._fields.get(self._meta['id_field']).to_mongo(self.pk)
-                        object_id = self._qs.filter(pk=pk_as_mongo_obj).first() and \
-                                    self._qs.filter(pk=pk_as_mongo_obj).first().pk
+                        object_id = (
+                            self._qs.filter(pk=pk_as_mongo_obj).first() and
+                            self._qs.filter(pk=pk_as_mongo_obj).first().pk
+                        )  # TODO doesn't this make 2 queries?
             else:
                 object_id = doc['_id']
                 updates, removals = self._delta()
@@ -501,10 +504,10 @@ def delete(self, signal_kwargs=None, **write_concern):
         signal_kwargs = signal_kwargs or {}
         signals.pre_delete.send(self.__class__, document=self, **signal_kwargs)
 
-        # Delete FileFields separately 
+        # Delete FileFields separately
         FileField = _import_class('FileField')
         for name, field in self._fields.iteritems():
-            if isinstance(field, FileField): 
+            if isinstance(field, FileField):
                 getattr(self, name).delete()
 
         try:
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 47e33d1d0..3f46c5eca 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -8,6 +8,9 @@
 import warnings
 from operator import itemgetter
 
+from bson import Binary, DBRef, ObjectId, SON
+import gridfs
+import pymongo
 import six
 
 try:
@@ -17,22 +20,18 @@
 else:
     import dateutil.parser
 
-import pymongo
-import gridfs
-from bson import Binary, DBRef, SON, ObjectId
 try:
     from bson.int64 import Int64
 except ImportError:
     Int64 = long
 
-from mongoengine.errors import ValidationError, DoesNotExist
-from mongoengine.python_support import (PY3, bin_type, txt_type,
-                                        str_types, StringIO)
-from base import (BaseField, ComplexBaseField, ObjectIdField, GeoJsonBaseField,
-                  get_document, BaseDocument)
-from queryset import DO_NOTHING, QuerySet
-from document import Document, EmbeddedDocument
-from connection import get_db, DEFAULT_CONNECTION_NAME
+from .base import (BaseDocument, BaseField, ComplexBaseField, GeoJsonBaseField,
+                   ObjectIdField, get_document)
+from .connection import DEFAULT_CONNECTION_NAME, get_db
+from .document import Document, EmbeddedDocument
+from .errors import DoesNotExist, ValidationError
+from .python_support import PY3, StringIO, bin_type, str_types, txt_type
+from .queryset import DO_NOTHING, QuerySet
 
 try:
     from PIL import Image, ImageOps
@@ -1015,11 +1014,10 @@ def validate(self, value):
 
         if self.document_type._meta.get('abstract') and \
                 not isinstance(value, self.document_type):
-            self.error('%s is not an instance of abstract reference'
-                    ' type %s' % (value._class_name,
-                        self.document_type._class_name)
-                    )
-
+            self.error(
+                '%s is not an instance of abstract reference type %s' % (
+                    self.document_type._class_name)
+            )
 
     def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
@@ -1126,7 +1124,7 @@ def to_mongo(self, document, use_db_field=True, fields=None):
             new_fields = [f for f in self.fields if f in fields]
         else:
             new_fields = self.fields
-            
+
         value.update(dict(document.to_mongo(use_db_field, fields=new_fields)))
         return value
 
diff --git a/mongoengine/queryset/__init__.py b/mongoengine/queryset/__init__.py
index 026a7acdd..c8fa09dba 100644
--- a/mongoengine/queryset/__init__.py
+++ b/mongoengine/queryset/__init__.py
@@ -1,6 +1,6 @@
-from mongoengine.errors import (DoesNotExist, MultipleObjectsReturned,
-                                InvalidQueryError, OperationError,
-                                NotUniqueError)
+from mongoengine.errors import (DoesNotExist, InvalidQueryError,
+                                MultipleObjectsReturned, NotUniqueError,
+                                OperationError)
 from mongoengine.queryset.field_list import *
 from mongoengine.queryset.manager import *
 from mongoengine.queryset.queryset import *
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 38af72ff3..8b99d69cb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -7,20 +7,19 @@
 import re
 import warnings
 
-from bson import SON
+from bson import SON, json_util
 from bson.code import Code
-from bson import json_util
 import pymongo
 import pymongo.errors
 from pymongo.common import validate_read_preference
 
 from mongoengine import signals
+from mongoengine.base.common import get_document
+from mongoengine.common import _import_class
 from mongoengine.connection import get_db
 from mongoengine.context_managers import switch_db
-from mongoengine.common import _import_class
-from mongoengine.base.common import get_document
-from mongoengine.errors import (OperationError, NotUniqueError,
-                                InvalidQueryError, LookUpError)
+from mongoengine.errors import (InvalidQueryError, LookUpError,
+                                NotUniqueError, OperationError)
 from mongoengine.python_support import IS_PYMONGO_3
 from mongoengine.queryset import transform
 from mongoengine.queryset.field_list import QueryFieldList
@@ -155,10 +154,8 @@ def __setstate__(self, obj_dict):
         # forse load cursor
         # self._cursor
 
-
     def __getitem__(self, key):
-        """Support skip and limit using getitem and slicing syntax.
-        """
+        """Support skip and limit using getitem and slicing syntax."""
         queryset = self.clone()
 
         # Slice provided
@@ -529,8 +526,9 @@ def upsert_one(self, write_concern=None, **update):
         .. versionadded:: 0.10.2
         """
 
-        atomic_update = self.update(multi=False, upsert=True, write_concern=write_concern,
-                             full_result=True, **update)
+        atomic_update = self.update(multi=False, upsert=True,
+                                    write_concern=write_concern,
+                                    full_result=True, **update)
 
         if atomic_update['updatedExisting']:
             document = self.get()
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 5121463bd..e68537d27 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -1,6 +1,6 @@
 from mongoengine.errors import OperationError
-from mongoengine.queryset.base import (BaseQuerySet, DO_NOTHING, NULLIFY,
-                                       CASCADE, DENY, PULL)
+from mongoengine.queryset.base import (BaseQuerySet, CASCADE, DENY, DO_NOTHING,
+                                       NULLIFY, PULL)
 
 __all__ = ('QuerySet', 'QuerySetNoCache', 'DO_NOTHING', 'NULLIFY', 'CASCADE',
            'DENY', 'PULL')
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index e5e7f83f5..54371d6b2 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -1,11 +1,11 @@
 from collections import defaultdict
 
-import pymongo
 from bson import SON
+import pymongo
 
 from mongoengine.base.fields import UPDATE_OPERATORS
-from mongoengine.connection import get_connection
 from mongoengine.common import _import_class
+from mongoengine.connection import get_connection
 from mongoengine.errors import InvalidQueryError
 from mongoengine.python_support import IS_PYMONGO_3
 
@@ -108,8 +108,11 @@ def query(_doc_cls=None, **kwargs):
             elif op in ('match', 'elemMatch'):
                 ListField = _import_class('ListField')
                 EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
-                if (isinstance(value, dict) and isinstance(field, ListField) and
-                    isinstance(field.field, EmbeddedDocumentField)):
+                if (
+                    isinstance(value, dict) and
+                    isinstance(field, ListField) and
+                    isinstance(field.field, EmbeddedDocumentField)
+                ):
                     value = query(field.field.document_type, **value)
                 else:
                     value = field.prepare_query_value(op, value)
diff --git a/mongoengine/signals.py b/mongoengine/signals.py
index 95532f03d..64828448b 100644
--- a/mongoengine/signals.py
+++ b/mongoengine/signals.py
@@ -29,7 +29,7 @@ def _fail(self, *args, **kwargs):
                                'because the blinker library is '
                                'not installed.')
 
-        send = lambda *a, **kw: None
+        send = lambda *a, **kw: None  # noqa
         connect = disconnect = has_receivers_for = receivers_for = \
             temporarily_connected_to = _fail
         del _fail
diff --git a/requirements.txt b/requirements.txt
index b6a5b06c2..854ed26d5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,5 @@
 nose
 pymongo>=2.7.1
 six==1.10.0
+flake8
+flake8-import-order
diff --git a/setup.cfg b/setup.cfg
index a946c1755..6bf12cb50 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,3 +5,9 @@ cover-erase = 1
 cover-branches = 1
 cover-package = mongoengine
 tests = tests
+
+[flake8]
+ignore=E501,F401,F403,F405,I201
+exclude=build,dist,docs,venv,.tox,.eggs,tests
+max-complexity=42
+application-import-names=mongoengine,tests
diff --git a/setup.py b/setup.py
index de9985cd9..816a6de98 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 import os
 import sys
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 # Hack to silence atexit traceback in newer python versions
 try:
@@ -8,8 +8,10 @@
 except ImportError:
     pass
 
-DESCRIPTION = 'MongoEngine is a Python Object-Document ' + \
-'Mapper for working with MongoDB.'
+DESCRIPTION = (
+    'MongoEngine is a Python Object-Document '
+    'Mapper for working with MongoDB.'
+)
 
 try:
     with open('README.rst') as fin:
@@ -23,6 +25,7 @@ def get_version(version_tuple):
         return '.'.join(map(str, version_tuple[:-1])) + version_tuple[-1]
     return '.'.join(map(str, version_tuple))
 
+
 # Dirty hack to get version number from monogengine/__init__.py - we can't
 # import it as it depends on PyMongo and PyMongo isn't installed until this
 # file is read
@@ -64,21 +67,22 @@ def get_version(version_tuple):
     if sys.version_info[0] == 2 and sys.version_info[1] == 6:
         extra_opts['tests_require'].append('unittest2')
 
-setup(name='mongoengine',
-      version=VERSION,
-      author='Harry Marr',
-      author_email='harry.marr@{nospam}gmail.com',
-      maintainer="Ross Lawley",
-      maintainer_email="ross.lawley@{nospam}gmail.com",
-      url='http://mongoengine.org/',
-      download_url='https://github.com/MongoEngine/mongoengine/tarball/master',
-      license='MIT',
-      include_package_data=True,
-      description=DESCRIPTION,
-      long_description=LONG_DESCRIPTION,
-      platforms=['any'],
-      classifiers=CLASSIFIERS,
-      install_requires=['pymongo>=2.7.1', 'six'],
-      test_suite='nose.collector',
-      **extra_opts
+setup(
+    name='mongoengine',
+    version=VERSION,
+    author='Harry Marr',
+    author_email='harry.marr@{nospam}gmail.com',
+    maintainer="Ross Lawley",
+    maintainer_email="ross.lawley@{nospam}gmail.com",
+    url='http://mongoengine.org/',
+    download_url='https://github.com/MongoEngine/mongoengine/tarball/master',
+    license='MIT',
+    include_package_data=True,
+    description=DESCRIPTION,
+    long_description=LONG_DESCRIPTION,
+    platforms=['any'],
+    classifiers=CLASSIFIERS,
+    install_requires=['pymongo>=2.7.1', 'six'],
+    test_suite='nose.collector',
+    **extra_opts
 )
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index e13d8b849..eb1b4d11a 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -844,7 +844,12 @@ class ReportDictField(Document):
 
         self.assertEqual({'text': 'OK', '_id': {'term': 'ok', 'name': 'n'}},
                          report.to_mongo())
-        self.assertEqual(report, ReportDictField.objects.get(pk=my_key))
+
+        # We can't directly call ReportDictField.objects.get(pk=my_key),
+        # because dicts are unordered, and if the order in MongoDB is
+        # different than the one in `my_key`, this test will fail.
+        self.assertEqual(report, ReportDictField.objects.get(pk__name=my_key['name']))
+        self.assertEqual(report, ReportDictField.objects.get(pk__term=my_key['term']))
 
     def test_string_indexes(self):
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 9d9268036..8430dceff 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1,28 +1,23 @@
 # -*- coding: utf-8 -*-
 
-import sys
-sys.path[0:0] = [""]
-
+import datetime
 import unittest
 import uuid
-from nose.plugins.skip import SkipTest
-
-from datetime import datetime, timedelta
 
+from bson import DBRef, ObjectId
+from nose.plugins.skip import SkipTest
 import pymongo
 from pymongo.errors import ConfigurationError
 from pymongo.read_preferences import ReadPreference
 
-from bson import ObjectId, DBRef
 
 from mongoengine import *
 from mongoengine.connection import get_connection, get_db
-from mongoengine.python_support import PY3, IS_PYMONGO_3
 from mongoengine.context_managers import query_counter, switch_db
-from mongoengine.queryset import (QuerySet, QuerySetManager,
-                                  MultipleObjectsReturned, DoesNotExist,
-                                  queryset_manager)
 from mongoengine.errors import InvalidQueryError
+from mongoengine.python_support import IS_PYMONGO_3, PY3
+from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
+                                  QuerySet, QuerySetManager, queryset_manager)
 
 __all__ = ("QuerySetTest",)
 
@@ -184,12 +179,14 @@ def test_find(self):
 
         self.assertEqual(self.Person.objects.count(), 55)
         self.assertEqual("Person object", "%s" % self.Person.objects[0])
-        self.assertEqual(
-            "[<Person: Person object>, <Person: Person object>]",  "%s" % self.Person.objects[1:3])
-        self.assertEqual(
-            "[<Person: Person object>, <Person: Person object>]",  "%s" % self.Person.objects[51:53])
+        self.assertEqual("[<Person: Person object>, <Person: Person object>]",
+                         "%s" % self.Person.objects[1:3])
+        self.assertEqual("[<Person: Person object>, <Person: Person object>]",
+                         "%s" % self.Person.objects[51:53])
+
         # Test only after limit
         self.assertEqual(self.Person.objects().limit(2).only('name')[0].age, None)
+
         # Test only after skip
         self.assertEqual(self.Person.objects().skip(2).only('name')[0].age, None)
 
@@ -287,6 +284,9 @@ class Blog(Document):
         blog = Blog.objects(posts__0__comments__0__name='testa').get()
         self.assertEqual(blog, blog1)
 
+        blog = Blog.objects(posts__0__comments__0__name='testb').get()
+        self.assertEqual(blog, blog2)
+
         query = Blog.objects(posts__1__comments__1__name='testb')
         self.assertEqual(query.count(), 2)
 
@@ -633,39 +633,39 @@ class Doc(Document):
         self.assertRaises(ValidationError, Doc.objects().update, dt_f="datetime", upsert=True)
         self.assertRaises(ValidationError, Doc.objects().update, ed_f__str_f=1, upsert=True)
 
-    def test_update_related_models( self ):
-            class TestPerson( Document ):
+    def test_update_related_models(self):
+            class TestPerson(Document):
                 name = StringField()
 
-            class TestOrganization( Document ):
+            class TestOrganization(Document):
                 name = StringField()
-                owner = ReferenceField( TestPerson )
+                owner = ReferenceField(TestPerson)
 
             TestPerson.drop_collection()
             TestOrganization.drop_collection()
 
-            p = TestPerson( name='p1' )
+            p = TestPerson(name='p1')
             p.save()
-            o = TestOrganization( name='o1' )
+            o = TestOrganization(name='o1')
             o.save()
 
             o.owner = p
             p.name = 'p2'
 
-            self.assertEqual( o._get_changed_fields(), [ 'owner' ] )
-            self.assertEqual( p._get_changed_fields(), [ 'name' ] )
+            self.assertEqual(o._get_changed_fields(), ['owner'])
+            self.assertEqual(p._get_changed_fields(), ['name'])
 
             o.save()
 
-            self.assertEqual( o._get_changed_fields(), [] )
-            self.assertEqual( p._get_changed_fields(), [ 'name' ] ) # Fails; it's empty
+            self.assertEqual(o._get_changed_fields(), [])
+            self.assertEqual(p._get_changed_fields(), ['name'])  # Fails; it's empty
 
             # This will do NOTHING at all, even though we changed the name
             p.save()
 
             p.reload()
 
-            self.assertEqual( p.name, 'p2' ) # Fails; it's still `p1`
+            self.assertEqual(p.name, 'p2')  # Fails; it's still `p1`
 
     def test_upsert(self):
         self.Person.drop_collection()
@@ -694,7 +694,6 @@ def test_upsert_one(self):
         self.assertEqual(30, bobby.age)
         self.assertEqual(bob.id, bobby.id)
 
-
     def test_set_on_insert(self):
         self.Person.drop_collection()
 
@@ -1113,24 +1112,29 @@ def published(doc_cls, queryset):
         blog_2.save()
         blog_3.save()
 
-        blog_post_1 = BlogPost(blog=blog_1, title="Blog Post #1",
-                               is_published=True,
-                               published_date=datetime(2010, 1, 5, 0, 0, 0))
-        blog_post_2 = BlogPost(blog=blog_2, title="Blog Post #2",
-                               is_published=True,
-                               published_date=datetime(2010, 1, 6, 0, 0, 0))
-        blog_post_3 = BlogPost(blog=blog_3, title="Blog Post #3",
-                               is_published=True,
-                               published_date=datetime(2010, 1, 7, 0, 0, 0))
-
-        blog_post_1.save()
-        blog_post_2.save()
-        blog_post_3.save()
+        BlogPost.objects.create(
+            blog=blog_1,
+            title="Blog Post #1",
+            is_published=True,
+            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)
+        )
+        BlogPost.objects.create(
+            blog=blog_2,
+            title="Blog Post #2",
+            is_published=True,
+            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+        )
+        BlogPost.objects.create(
+            blog=blog_3,
+            title="Blog Post #3",
+            is_published=True,
+            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
+        )
 
         # find all published blog posts before 2010-01-07
         published_posts = BlogPost.published()
         published_posts = published_posts.filter(
-            published_date__lt=datetime(2010, 1, 7, 0, 0, 0))
+            published_date__lt=datetime.datetime(2010, 1, 7, 0, 0, 0))
         self.assertEqual(published_posts.count(), 2)
 
         blog_posts = BlogPost.objects
@@ -1161,16 +1165,18 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        blog_post_1 = BlogPost(title="Blog Post #1",
-                               published_date=datetime(2010, 1, 5, 0, 0, 0))
-        blog_post_2 = BlogPost(title="Blog Post #2",
-                               published_date=datetime(2010, 1, 6, 0, 0, 0))
-        blog_post_3 = BlogPost(title="Blog Post #3",
-                               published_date=datetime(2010, 1, 7, 0, 0, 0))
-
-        blog_post_1.save()
-        blog_post_2.save()
-        blog_post_3.save()
+        blog_post_1 = BlogPost.objects.create(
+            title="Blog Post #1",
+            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)
+        )
+        blog_post_2 = BlogPost.objects.create(
+            title="Blog Post #2",
+            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+        )
+        blog_post_3 = BlogPost.objects.create(
+            title="Blog Post #3",
+            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
+        )
 
         # get the "first" BlogPost using default ordering
         # from BlogPost.meta.ordering
@@ -1219,7 +1225,7 @@ class BlogPost(Document):
             }
 
         BlogPost.objects.create(
-            title='whatever', published_date=datetime.utcnow())
+            title='whatever', published_date=datetime.datetime.utcnow())
 
         with db_ops_tracker() as q:
             BlogPost.objects.get(title='whatever')
@@ -2082,18 +2088,22 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        blog_post_3 = BlogPost(title="Blog Post #3",
-                               published_date=datetime(2010, 1, 6, 0, 0, 0))
-        blog_post_2 = BlogPost(title="Blog Post #2",
-                               published_date=datetime(2010, 1, 5, 0, 0, 0))
-        blog_post_4 = BlogPost(title="Blog Post #4",
-                               published_date=datetime(2010, 1, 7, 0, 0, 0))
-        blog_post_1 = BlogPost(title="Blog Post #1", published_date=None)
-
-        blog_post_3.save()
-        blog_post_1.save()
-        blog_post_4.save()
-        blog_post_2.save()
+        blog_post_3 = BlogPost.objects.create(
+            title="Blog Post #3",
+            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+        )
+        blog_post_2 = BlogPost.objects.create(
+            title="Blog Post #2",
+            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)
+        )
+        blog_post_4 = BlogPost.objects.create(
+            title="Blog Post #4",
+            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
+        )
+        blog_post_1 = BlogPost.objects.create(
+            title="Blog Post #1",
+            published_date=None
+        )
 
         expected = [blog_post_1, blog_post_2, blog_post_3, blog_post_4]
         self.assertSequence(BlogPost.objects.order_by('published_date'),
@@ -2112,16 +2122,18 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        blog_post_1 = BlogPost(title="A",
-                               published_date=datetime(2010, 1, 6, 0, 0, 0))
-        blog_post_2 = BlogPost(title="B",
-                               published_date=datetime(2010, 1, 6, 0, 0, 0))
-        blog_post_3 = BlogPost(title="C",
-                               published_date=datetime(2010, 1, 7, 0, 0, 0))
-
-        blog_post_2.save()
-        blog_post_3.save()
-        blog_post_1.save()
+        blog_post_1 = BlogPost.objects.create(
+            title="A",
+            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+        )
+        blog_post_2 = BlogPost.objects.create(
+            title="B",
+            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+        )
+        blog_post_3 = BlogPost.objects.create(
+            title="C",
+            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
+        )
 
         qs = BlogPost.objects.order_by('published_date', 'title')
         expected = [blog_post_1, blog_post_2, blog_post_3]
@@ -2425,7 +2437,7 @@ class Link(Document):
 
         Link.drop_collection()
 
-        now = datetime.utcnow()
+        now = datetime.datetime.utcnow()
 
         # Note: Test data taken from a custom Reddit homepage on
         # Fri, 12 Feb 2010 14:36:00 -0600. Link ordering should
@@ -2434,27 +2446,27 @@ class Link(Document):
         Link(title="Google Buzz auto-followed a woman's abusive ex ...",
              up_votes=1079,
              down_votes=553,
-             submitted=now - timedelta(hours=4)).save()
+             submitted=now - datetime.timedelta(hours=4)).save()
         Link(title="We did it! Barbie is a computer engineer.",
              up_votes=481,
              down_votes=124,
-             submitted=now - timedelta(hours=2)).save()
+             submitted=now - datetime.timedelta(hours=2)).save()
         Link(title="This Is A Mosquito Getting Killed By A Laser",
              up_votes=1446,
              down_votes=530,
-             submitted=now - timedelta(hours=13)).save()
+             submitted=now - datetime.timedelta(hours=13)).save()
         Link(title="Arabic flashcards land physics student in jail.",
              up_votes=215,
              down_votes=105,
-             submitted=now - timedelta(hours=6)).save()
+             submitted=now - datetime.timedelta(hours=6)).save()
         Link(title="The Burger Lab: Presenting, the Flood Burger",
              up_votes=48,
              down_votes=17,
-             submitted=now - timedelta(hours=5)).save()
+             submitted=now - datetime.timedelta(hours=5)).save()
         Link(title="How to see polarization with the naked eye",
              up_votes=74,
              down_votes=13,
-             submitted=now - timedelta(hours=10)).save()
+             submitted=now - datetime.timedelta(hours=10)).save()
 
         map_f = """
             function() {
@@ -2504,7 +2516,7 @@ class Link(Document):
 
         # provide the reddit epoch (used for ranking) as a variable available
         # to all phases of the map/reduce operation: map, reduce, and finalize.
-        reddit_epoch = mktime(datetime(2005, 12, 8, 7, 46, 43).timetuple())
+        reddit_epoch = mktime(datetime.datetime(2005, 12, 8, 7, 46, 43).timetuple())
         scope = {'reddit_epoch': reddit_epoch}
 
         # run a map/reduce operation across all links. ordering is set
@@ -3096,13 +3108,11 @@ class Book(Document):
         mark_twain = Author(name="Mark Twain")
         john_tolkien = Author(name="John Ronald Reuel Tolkien")
 
-        book = Book(title="Tom Sawyer", authors=[mark_twain]).save()
-        book = Book(
-            title="The Lord of the Rings", authors=[john_tolkien]).save()
-        book = Book(
-            title="The Stories", authors=[mark_twain, john_tolkien]).save()
-        authors = Book.objects.distinct("authors")
+        Book.objects.create(title="Tom Sawyer", authors=[mark_twain])
+        Book.objects.create(title="The Lord of the Rings", authors=[john_tolkien])
+        Book.objects.create(title="The Stories", authors=[mark_twain, john_tolkien])
 
+        authors = Book.objects.distinct("authors")
         self.assertEqual(authors, [mark_twain, john_tolkien])
 
     def test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField(self):
@@ -3132,17 +3142,14 @@ class Book(Document):
         mark_twain = Author(name="Mark Twain", country=scotland)
         john_tolkien = Author(name="John Ronald Reuel Tolkien", country=tibet)
 
-        book = Book(title="Tom Sawyer", authors=[mark_twain]).save()
-        book = Book(
-            title="The Lord of the Rings", authors=[john_tolkien]).save()
-        book = Book(
-            title="The Stories", authors=[mark_twain, john_tolkien]).save()
-        country_list = Book.objects.distinct("authors.country")
+        Book.objects.create(title="Tom Sawyer", authors=[mark_twain])
+        Book.objects.create(title="The Lord of the Rings", authors=[john_tolkien])
+        Book.objects.create(title="The Stories", authors=[mark_twain, john_tolkien])
 
+        country_list = Book.objects.distinct("authors.country")
         self.assertEqual(country_list, [scotland, tibet])
 
         continent_list = Book.objects.distinct("authors.country.continent")
-
         self.assertEqual(continent_list, [europe, asia])
 
     def test_distinct_ListField_ReferenceField(self):
@@ -3174,7 +3181,7 @@ def test_custom_manager(self):
         class BlogPost(Document):
             tags = ListField(StringField())
             deleted = BooleanField(default=False)
-            date = DateTimeField(default=datetime.now)
+            date = DateTimeField(default=datetime.datetime.now)
 
             @queryset_manager
             def objects(cls, qryset):
@@ -3997,14 +4004,14 @@ def test_scalar_cursor_behaviour(self):
         self.assertEqual(
             "A0", "%s" % self.Person.objects.scalar('name').order_by('name')[0])
         if PY3:
-            self.assertEqual(
-                "['A1', 'A2']",  "%s" % self.Person.objects.order_by('age').scalar('name')[1:3])
-            self.assertEqual("['A51', 'A52']",  "%s" % self.Person.objects.order_by(
+            self.assertEqual("['A1', 'A2']", "%s" % self.Person.objects.order_by(
+                'age').scalar('name')[1:3])
+            self.assertEqual("['A51', 'A52']", "%s" % self.Person.objects.order_by(
                 'age').scalar('name')[51:53])
         else:
-            self.assertEqual("[u'A1', u'A2']",  "%s" % self.Person.objects.order_by(
+            self.assertEqual("[u'A1', u'A2']", "%s" % self.Person.objects.order_by(
                 'age').scalar('name')[1:3])
-            self.assertEqual("[u'A51', u'A52']",  "%s" % self.Person.objects.order_by(
+            self.assertEqual("[u'A51', u'A52']", "%s" % self.Person.objects.order_by(
                 'age').scalar('name')[51:53])
 
         # with_id and in_bulk
@@ -4013,12 +4020,12 @@ def test_scalar_cursor_behaviour(self):
                          self.Person.objects.scalar('name').with_id(person.id))
 
         pks = self.Person.objects.order_by('age').scalar('pk')[1:3]
+        names = self.Person.objects.scalar('name').in_bulk(list(pks)).values()
         if PY3:
-            self.assertEqual("['A1', 'A2']",  "%s" % sorted(
-                self.Person.objects.scalar('name').in_bulk(list(pks)).values()))
+            expected = "['A1', 'A2']"
         else:
-            self.assertEqual("[u'A1', u'A2']",  "%s" % sorted(
-                self.Person.objects.scalar('name').in_bulk(list(pks)).values()))
+            expected = "[u'A1', u'A2']"
+        self.assertEqual(expected, "%s" % sorted(names))
 
     def test_elem_match(self):
         class Foo(EmbeddedDocument):
@@ -4115,7 +4122,7 @@ class Bar(Document):
             txt = StringField()
 
             meta = {
-                'indexes': [ 'txt' ]
+                'indexes': ['txt']
             }
 
         Bar.drop_collection()
@@ -4130,49 +4137,49 @@ class Bar(Document):
 
         # read_preference as a kwarg
         bars = Bar.objects(read_preference=ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference,
+                         ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._cursor._Cursor__read_preference,
-            ReadPreference.SECONDARY_PREFERRED)
+                         ReadPreference.SECONDARY_PREFERRED)
 
         # read_preference as a query set method
         bars = Bar.objects.read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference,
+                         ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._cursor._Cursor__read_preference,
-            ReadPreference.SECONDARY_PREFERRED)
+                         ReadPreference.SECONDARY_PREFERRED)
 
         # read_preference after skip
         bars = Bar.objects.skip(1) \
             .read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference,
+                         ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._cursor._Cursor__read_preference,
-            ReadPreference.SECONDARY_PREFERRED)
+                         ReadPreference.SECONDARY_PREFERRED)
 
         # read_preference after limit
         bars = Bar.objects.limit(1) \
             .read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference,
+                         ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._cursor._Cursor__read_preference,
-            ReadPreference.SECONDARY_PREFERRED)
+                         ReadPreference.SECONDARY_PREFERRED)
 
         # read_preference after order_by
         bars = Bar.objects.order_by('txt') \
             .read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference,
+                         ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._cursor._Cursor__read_preference,
-            ReadPreference.SECONDARY_PREFERRED)
+                         ReadPreference.SECONDARY_PREFERRED)
 
         # read_preference after hint
         bars = Bar.objects.hint([('txt', 1)]) \
             .read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference,
+                         ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._cursor._Cursor__read_preference,
-            ReadPreference.SECONDARY_PREFERRED)
+                         ReadPreference.SECONDARY_PREFERRED)
 
     def test_json_simple(self):
 
@@ -4208,7 +4215,7 @@ class Doc(Document):
             int_field = IntField(default=1)
             float_field = FloatField(default=1.1)
             boolean_field = BooleanField(default=True)
-            datetime_field = DateTimeField(default=datetime.now)
+            datetime_field = DateTimeField(default=datetime.datetime.now)
             embedded_document_field = EmbeddedDocumentField(
                 EmbeddedDoc, default=lambda: EmbeddedDoc())
             list_field = ListField(default=lambda: [1, 2, 3])
@@ -4218,7 +4225,7 @@ class Doc(Document):
                 Simple, default=lambda: Simple().save())
             map_field = MapField(IntField(), default=lambda: {"simple": 1})
             decimal_field = DecimalField(default=1.0)
-            complex_datetime_field = ComplexDateTimeField(default=datetime.now)
+            complex_datetime_field = ComplexDateTimeField(default=datetime.datetime.now)
             url_field = URLField(default="http://mongoengine.org/")
             dynamic_field = DynamicField(default=1)
             generic_reference_field = GenericReferenceField(
@@ -4565,8 +4572,7 @@ class B(Document):
         B.drop_collection()
 
         a = A.objects.create(id='custom_id')
-
-        b = B.objects.create(a=a)
+        B.objects.create(a=a)
 
         self.assertEqual(B.objects.count(), 1)
         self.assertEqual(B.objects.get(a=a).a, a)
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 1cb8223d9..06fe4ea5d 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -1,11 +1,7 @@
-import sys
-sys.path[0:0] = [""]
-
 import unittest
 
 from mongoengine import *
-from mongoengine.queryset import Q
-from mongoengine.queryset import transform
+from mongoengine.queryset import Q, transform
 
 __all__ = ("TransformTest",)
 
@@ -41,8 +37,8 @@ class Doc(Document):
         DicDoc.drop_collection()
         Doc.drop_collection()
 
+        DicDoc().save()
         doc = Doc().save()
-        dic_doc = DicDoc().save()
 
         for k, v in (("set", "$set"), ("set_on_insert", "$setOnInsert"), ("push", "$push")):
             update = transform.update(DicDoc, **{"%s__dictField__test" % k: doc})
@@ -55,7 +51,6 @@ class Doc(Document):
         update = transform.update(DicDoc, pull__dictField__test=doc)
         self.assertTrue(isinstance(update["$pull"]["dictField"]["test"], dict))
 
-
     def test_query_field_name(self):
         """Ensure that the correct field name is used when querying.
         """
@@ -156,26 +151,33 @@ def test_raw_and_merging(self):
         class Doc(Document):
             meta = {'allow_inheritance': False}
 
-        raw_query = Doc.objects(__raw__={'deleted': False,
-                                'scraped': 'yes',
-                                '$nor': [{'views.extracted': 'no'},
-                                         {'attachments.views.extracted':'no'}]
-                                })._query
-
-        expected = {'deleted': False, 'scraped': 'yes',
-                    '$nor': [{'views.extracted': 'no'},
-                             {'attachments.views.extracted': 'no'}]}
-        self.assertEqual(expected, raw_query)
+        raw_query = Doc.objects(__raw__={
+            'deleted': False,
+            'scraped': 'yes',
+            '$nor': [
+                {'views.extracted': 'no'},
+                {'attachments.views.extracted': 'no'}
+            ]
+        })._query
+
+        self.assertEqual(raw_query, {
+            'deleted': False,
+            'scraped': 'yes',
+            '$nor': [
+                {'views.extracted': 'no'},
+                {'attachments.views.extracted': 'no'}
+            ]
+        })
 
     def test_geojson_PointField(self):
         class Location(Document):
             loc = PointField()
 
         update = transform.update(Location, set__loc=[1, 2])
-        self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1,2]}}})
+        self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1, 2]}}})
 
-        update = transform.update(Location, set__loc={"type": "Point", "coordinates": [1,2]})
-        self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1,2]}}})
+        update = transform.update(Location, set__loc={"type": "Point", "coordinates": [1, 2]})
+        self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1, 2]}}})
 
     def test_geojson_LineStringField(self):
         class Location(Document):
@@ -238,5 +240,6 @@ class Event(Document):
         events = Event.objects(location__within=box)
         self.assertRaises(InvalidQueryError, lambda: events.count())
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/queryset/visitor.py b/tests/queryset/visitor.py
index 0bb6f69d6..7e5fcf195 100644
--- a/tests/queryset/visitor.py
+++ b/tests/queryset/visitor.py
@@ -1,14 +1,12 @@
-import sys
-sys.path[0:0] = [""]
-
+import datetime
+import re
 import unittest
 
 from bson import ObjectId
-from datetime import datetime
 
 from mongoengine import *
-from mongoengine.queryset import Q
 from mongoengine.errors import InvalidQueryError
+from mongoengine.queryset import Q
 
 __all__ = ("QTest",)
 
@@ -132,12 +130,12 @@ class TestDoc(Document):
         TestDoc(x=10).save()
         TestDoc(y=True).save()
 
-        self.assertEqual(query,
-        {'$and': [
-            {'$or': [{'x': {'$gt': 0}}, {'x': {'$exists': False}}]},
-            {'$or': [{'x': {'$lt': 100}}, {'y': True}]}
-        ]})
-
+        self.assertEqual(query, {
+            '$and': [
+                {'$or': [{'x': {'$gt': 0}}, {'x': {'$exists': False}}]},
+                {'$or': [{'x': {'$lt': 100}}, {'y': True}]}
+            ]
+        })
         self.assertEqual(2, TestDoc.objects(q1 & q2).count())
 
     def test_or_and_or_combination(self):
@@ -157,15 +155,14 @@ class TestDoc(Document):
         q2 = (Q(x__lt=100) & (Q(y=False) | Q(y__exists=False)))
         query = (q1 | q2).to_query(TestDoc)
 
-        self.assertEqual(query,
-            {'$or': [
+        self.assertEqual(query, {
+            '$or': [
                 {'$and': [{'x': {'$gt': 0}},
                           {'$or': [{'y': True}, {'y': {'$exists': False}}]}]},
                 {'$and': [{'x': {'$lt': 100}},
                           {'$or': [{'y': False}, {'y': {'$exists': False}}]}]}
-            ]}
-        )
-
+            ]
+        })
         self.assertEqual(2, TestDoc.objects(q1 | q2).count())
 
     def test_multiple_occurence_in_field(self):
@@ -215,19 +212,19 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post1 = BlogPost(title='Test 1', publish_date=datetime(2010, 1, 8), published=False)
+        post1 = BlogPost(title='Test 1', publish_date=datetime.datetime(2010, 1, 8), published=False)
         post1.save()
 
-        post2 = BlogPost(title='Test 2', publish_date=datetime(2010, 1, 15), published=True)
+        post2 = BlogPost(title='Test 2', publish_date=datetime.datetime(2010, 1, 15), published=True)
         post2.save()
 
         post3 = BlogPost(title='Test 3', published=True)
         post3.save()
 
-        post4 = BlogPost(title='Test 4', publish_date=datetime(2010, 1, 8))
+        post4 = BlogPost(title='Test 4', publish_date=datetime.datetime(2010, 1, 8))
         post4.save()
 
-        post5 = BlogPost(title='Test 1', publish_date=datetime(2010, 1, 15))
+        post5 = BlogPost(title='Test 1', publish_date=datetime.datetime(2010, 1, 15))
         post5.save()
 
         post6 = BlogPost(title='Test 1', published=False)
@@ -250,7 +247,7 @@ class BlogPost(Document):
         self.assertTrue(all(obj.id in posts for obj in published_posts))
 
         # Check Q object combination
-        date = datetime(2010, 1, 10)
+        date = datetime.datetime(2010, 1, 10)
         q = BlogPost.objects(Q(publish_date__lte=date) | Q(published=True))
         posts = [post.id for post in q]
 
@@ -273,8 +270,10 @@ class BlogPost(Document):
         # Test invalid query objs
         def wrong_query_objs():
             self.Person.objects('user1')
+
         def wrong_query_objs_filter():
             self.Person.objects('user1')
+
         self.assertRaises(InvalidQueryError, wrong_query_objs)
         self.assertRaises(InvalidQueryError, wrong_query_objs_filter)
 
@@ -284,7 +283,6 @@ def test_q_regex(self):
         person = self.Person(name='Guido van Rossum')
         person.save()
 
-        import re
         obj = self.Person.objects(Q(name=re.compile('^Gui'))).first()
         self.assertEqual(obj, person)
         obj = self.Person.objects(Q(name=re.compile('^gui'))).first()
diff --git a/tox.ini b/tox.ini
index 8eef60cb7..d6052edfa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
-envlist = {py26,py27,py33,py34,py35,pypy,pypy3}-{mg27,mg28}
-#envlist = {py26,py27,py33,py34,pypy,pypy3}-{mg27,mg28,mg30,mgdev}
+envlist = {py26,py27,py33,py34,py35,pypy,pypy3}-{mg27,mg28},flake8
 
 [testenv]
 commands =
@@ -14,3 +13,10 @@ deps =
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs
 passenv = windir
+
+[testenv:flake8]
+deps =
+    flake8
+    flake8-import-order
+commands =
+   flake8

From 2b7417c728ed0f3c6c1c12c267d9bea74433ef9d Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 28 Nov 2016 19:33:11 -0500
Subject: [PATCH 0394/1519] add a missing entry to the changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e40bf903e..f67f915e6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -27,6 +27,7 @@ Changes in 0.10.7
 - Added support for pickling QuerySet instances. #1397
 - Fixed connecting to a list of hosts #1389
 - Fixed a bug where accessing broken references wouldn't raise a DoesNotExist error #1334
+- Fixed not being able to specify use_db_field=False on ListField(EmbeddedDocumentField) instances #1218
 - Improvements to the dictionary fields docs # 1383
 
 Changes in 0.10.6

From 8d6cb087c6436d78aa7700a8e6c098d265fb34b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lafr=C3=A9choux?=
 <lafrech@users.noreply.github.com>
Date: Tue, 29 Nov 2016 09:28:13 +0100
Subject: [PATCH 0395/1519] Fix changelog

---
 docs/changelog.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f67f915e6..ecea6df98 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,7 +11,6 @@ Changes in 0.10.7
 - Dropped Python 3.2 support #1390
 - Fixed the bug where dynamic doc has index inside a dict field #1278
 - Fixed: ListField minus index assignment does not work #1128
-- Fixed not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances
 - Fixed cascade delete mixing among collections #1224
 - Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls #1206
 - Raise `OperationError` when trying to do a `drop_collection` on document with no collection set.
@@ -28,7 +27,7 @@ Changes in 0.10.7
 - Fixed connecting to a list of hosts #1389
 - Fixed a bug where accessing broken references wouldn't raise a DoesNotExist error #1334
 - Fixed not being able to specify use_db_field=False on ListField(EmbeddedDocumentField) instances #1218
-- Improvements to the dictionary fields docs # 1383
+- Improvements to the dictionary fields docs #1383
 
 Changes in 0.10.6
 =================

From 999cdfd9970c2d1c160cef04d13113c8ad3fe85f Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Fri, 2 Dec 2016 11:32:38 -0500
Subject: [PATCH 0396/1519] Fix BaseQuerySet#sum and BaseQuerySet#average for
 fields that specify a db_field

---
 mongoengine/queryset/base.py |  6 ++++--
 tests/queryset/queryset.py   | 28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 8b99d69cb..bc70b44ae 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1271,9 +1271,10 @@ def sum(self, field):
         :param field: the field to sum over; use dot notation to refer to
             embedded document fields
         """
+        db_field = self._fields_to_dbfields([field]).pop()
         pipeline = [
             {'$match': self._query},
-            {'$group': {'_id': 'sum', 'total': {'$sum': '$' + field}}}
+            {'$group': {'_id': 'sum', 'total': {'$sum': '$' + db_field}}}
         ]
 
         # if we're performing a sum over a list field, we sum up all the
@@ -1300,9 +1301,10 @@ def average(self, field):
         :param field: the field to average over; use dot notation to refer to
             embedded document fields
         """
+        db_field = self._fields_to_dbfields([field]).pop()
         pipeline = [
             {'$match': self._query},
-            {'$group': {'_id': 'avg', 'total': {'$avg': '$' + field}}}
+            {'$group': {'_id': 'avg', 'total': {'$avg': '$' + db_field}}}
         ]
 
         # if we're performing an average over a list field, we average out
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 8430dceff..6e2e9e5db 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2838,6 +2838,34 @@ def test_sum(self):
             sum([a for a in ages if a >= 50])
         )
 
+    def test_sum_over_db_field(self):
+        """Ensure that a field mapped to a db field with a different name
+        can be summed over correctly.
+        """
+        class UserVisit(Document):
+            num_visits = IntField(db_field='visits')
+
+        UserVisit.drop_collection()
+
+        UserVisit.objects.create(num_visits=10)
+        UserVisit.objects.create(num_visits=5)
+
+        self.assertEqual(UserVisit.objects.sum('num_visits'), 15)
+
+    def test_average_over_db_field(self):
+        """Ensure that a field mapped to a db field with a different name
+        can have its average computed correctly.
+        """
+        class UserVisit(Document):
+            num_visits = IntField(db_field='visits')
+
+        UserVisit.drop_collection()
+
+        UserVisit.objects.create(num_visits=20)
+        UserVisit.objects.create(num_visits=10)
+
+        self.assertEqual(UserVisit.objects.average('num_visits'), 15)
+
     def test_embedded_average(self):
         class Pay(EmbeddedDocument):
             value = DecimalField()

From 4f87db784e11598fc91a42b7559610eda4e111d2 Mon Sep 17 00:00:00 2001
From: Francesc Elies <francesc.elies@gmail.com>
Date: Sat, 3 Dec 2016 04:05:20 +0100
Subject: [PATCH 0397/1519] Make the README example easier to replicate (#1382)

---
 README.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.rst b/README.rst
index 3f56dd836..5072d6dfc 100644
--- a/README.rst
+++ b/README.rst
@@ -52,10 +52,14 @@ Some simple examples of what MongoEngine code looks like:
 
 .. code :: python
 
+    from mongoengine import *
+    connect('mydb')
+
     class BlogPost(Document):
         title = StringField(required=True, max_length=200)
         posted = DateTimeField(default=datetime.datetime.now)
         tags = ListField(StringField(max_length=50))
+        meta = {'allow_inheritance': True}
 
     class TextPost(BlogPost):
         content = StringField(required=True)

From 02fb3b9315202b1e39fc0db72b5cffca4229acc7 Mon Sep 17 00:00:00 2001
From: zeez <zeezdev@gmail.com>
Date: Sun, 4 Dec 2016 02:08:24 +0500
Subject: [PATCH 0398/1519] Support for authentication mechanism #905 (#1333)

---
 mongoengine/connection.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 0974f83b0..b4e852d46 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -6,6 +6,7 @@
 
 
 DEFAULT_CONNECTION_NAME = 'default'
+
 if IS_PYMONGO_3:
     READ_PREFERENCE = ReadPreference.PRIMARY
 else:
@@ -25,6 +26,7 @@ class ConnectionError(Exception):
 def register_connection(alias, name=None, host=None, port=None,
                         read_preference=READ_PREFERENCE,
                         username=None, password=None, authentication_source=None,
+                        authentication_mechanism=None,
                         **kwargs):
     """Add a connection.
 
@@ -38,6 +40,9 @@ def register_connection(alias, name=None, host=None, port=None,
     :param username: username to authenticate with
     :param password: password to authenticate with
     :param authentication_source: database to authenticate against
+    :param authentication_mechanism: database authentication mechanisms.
+        By default, use SCRAM-SHA-1 with MongoDB 3.0 and later,
+        MONGODB-CR (MongoDB Challenge Response protocol) for older servers.
     :param is_mock: explicitly use mongomock for this connection
         (can also be done by using `mongomock://` as db host prefix)
     :param kwargs: allow ad-hoc parameters to be passed into the pymongo driver
@@ -53,9 +58,11 @@ def register_connection(alias, name=None, host=None, port=None,
         'read_preference': read_preference,
         'username': username,
         'password': password,
-        'authentication_source': authentication_source
+        'authentication_source': authentication_source,
+        'authentication_mechanism': authentication_mechanism
     }
 
+    # Handle uri style connections
     conn_host = conn_settings['host']
     # host can be a list or a string, so if string, force to a list
     if isinstance(conn_host, str_types):
@@ -82,6 +89,8 @@ def register_connection(alias, name=None, host=None, port=None,
                 conn_settings['replicaSet'] = True
             if 'authsource' in uri_options:
                 conn_settings['authentication_source'] = uri_options['authsource']
+            if 'authmechanism' in uri_options:
+                conn_settings['authentication_mechanism'] = uri_options['authmechanism']
         else:
             resolved_hosts.append(entity)
     conn_settings['host'] = resolved_hosts
@@ -123,6 +132,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
         conn_settings.pop('username', None)
         conn_settings.pop('password', None)
         conn_settings.pop('authentication_source', None)
+        conn_settings.pop('authentication_mechanism', None)
 
         is_mock = conn_settings.pop('is_mock', None)
         if is_mock:
@@ -157,6 +167,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
                 connection_settings.pop('username', None)
                 connection_settings.pop('password', None)
                 connection_settings.pop('authentication_source', None)
+                connection_settings.pop('authentication_mechanism', None)
                 if conn_settings == connection_settings and _connections.get(db_alias, None):
                     connection = _connections[db_alias]
                     break
@@ -176,11 +187,13 @@ def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
         conn = get_connection(alias)
         conn_settings = _connection_settings[alias]
         db = conn[conn_settings['name']]
+        auth_kwargs = {'source': conn_settings['authentication_source']}
+        if conn_settings['authentication_mechanism'] is not None:
+            auth_kwargs['mechanism'] = conn_settings['authentication_mechanism']
         # Authenticate if necessary
-        if conn_settings['username'] and conn_settings['password']:
-            db.authenticate(conn_settings['username'],
-                            conn_settings['password'],
-                            source=conn_settings['authentication_source'])
+        if conn_settings['username'] and (conn_settings['password'] or
+                                          conn_settings['authentication_mechanism'] == 'MONGODB-X509'):
+            db.authenticate(conn_settings['username'], conn_settings['password'], **auth_kwargs)
         _dbs[alias] = db
     return _dbs[alias]
 

From d8d98b6143198b3c6cbe6f3aa4b5ad5bb099b1a3 Mon Sep 17 00:00:00 2001
From: Ollie Ford <me@ojford.com>
Date: Sat, 3 Dec 2016 21:10:05 +0000
Subject: [PATCH 0399/1519] Support Falsey `primary_key`s (#1354)

---
 mongoengine/document.py    |  6 +++---
 tests/document/instance.py | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 607b1bd99..91dcafc47 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -472,7 +472,7 @@ def update(self, **kwargs):
         Raises :class:`OperationError` if called on an object that has not yet
         been saved.
         """
-        if not self.pk:
+        if self.pk is None:
             if kwargs.get('upsert', False):
                 query = self.to_mongo()
                 if "_cls" in query:
@@ -604,7 +604,7 @@ def reload(self, *fields, **kwargs):
         elif "max_depth" in kwargs:
             max_depth = kwargs["max_depth"]
 
-        if not self.pk:
+        if self.pk is None:
             raise self.DoesNotExist("Document does not exist")
         obj = self._qs.read_preference(ReadPreference.PRIMARY).filter(
             **self._object_key).only(*fields).limit(
@@ -655,7 +655,7 @@ def _reload(self, key, value):
     def to_dbref(self):
         """Returns an instance of :class:`~bson.dbref.DBRef` useful in
         `__raw__` queries."""
-        if not self.pk:
+        if self.pk is None:
             msg = "Only saved documents can have a valid dbref"
             raise OperationError(msg)
         return DBRef(self.__class__._get_collection_name(), self.pk)
diff --git a/tests/document/instance.py b/tests/document/instance.py
index cb2c17462..1342f981c 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -3202,5 +3202,20 @@ class A(Document):
             self.assertEqual(b._instance, a)
         self.assertEqual(idx, 2)
 
+    def test_falsey_pk(self):
+        """Ensure that we can create and update a document with Falsey PK.
+        """
+        class Person(Document):
+            age = IntField(primary_key=True)
+            height = FloatField()
+
+        person = Person()
+        person.age = 0
+        person.height = 1.89
+        person.save()
+
+        person.update(set__height=2.0)
+
+
 if __name__ == '__main__':
     unittest.main()

From 088c5f49d9e5e3e403b8627982e17d5942e965a3 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sat, 3 Dec 2016 16:32:14 -0500
Subject: [PATCH 0400/1519] update the changelog

---
 docs/changelog.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ecea6df98..ad710bb1e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,9 @@ Changelog
 
 Changes in 0.10.8
 =================
-- Fill this in as PRs for v0.10.8 are merged
+- Added ability to specify an authentication mechanism (e.g. X.509) #1333
+- Added support for falsey primary keys (e.g. doc.pk = 0) #1354
+- Fixed BaseQuerySet#sum/average for fields w/ explicit db_field #1417
 
 Changes in 0.10.7
 =================

From 800f656dcfbf53aaab9e45ade517834227f4d0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 4 Dec 2016 00:31:54 -0500
Subject: [PATCH 0401/1519] remove unnecessary randomness in indexes tests
 (#1423)

---
 tests/document/indexes.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index eb1b4d11a..75314bb06 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -2,10 +2,8 @@
 import unittest
 import sys
 
-sys.path[0:0] = [""]
 
 import pymongo
-from random import randint
 
 from nose.plugins.skip import SkipTest
 from datetime import datetime
@@ -17,11 +15,9 @@
 
 
 class IndexesTest(unittest.TestCase):
-    _MAX_RAND = 10 ** 10
 
     def setUp(self):
-        self.db_name = 'mongoenginetest_IndexesTest_' + str(randint(0, self._MAX_RAND))
-        self.connection = connect(db=self.db_name)
+        self.connection = connect(db='mongoenginetest')
         self.db = get_db()
 
         class Person(Document):

From 8391af026c2480202baa65b36f8e6f0646506eea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 4 Dec 2016 00:32:53 -0500
Subject: [PATCH 0402/1519] Fix filtering by embedded_doc=None (#1422)

---
 mongoengine/fields.py      |  2 +-
 tests/queryset/queryset.py | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 3f46c5eca..783aac463 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -577,7 +577,7 @@ def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
 
     def prepare_query_value(self, op, value):
-        if not isinstance(value, self.document_type):
+        if value is not None and not isinstance(value, self.document_type):
             value = self.document_type._from_son(value)
         super(EmbeddedDocumentField, self).prepare_query_value(op, value)
         return self.to_mongo(value)
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 6e2e9e5db..072b91221 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1239,7 +1239,8 @@ class BlogPost(Document):
             self.assertFalse('$orderby' in q.get_ops()[0]['query'])
 
     def test_find_embedded(self):
-        """Ensure that an embedded document is properly returned from a query.
+        """Ensure that an embedded document is properly returned from
+        a query.
         """
         class User(EmbeddedDocument):
             name = StringField()
@@ -1250,16 +1251,31 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post = BlogPost(content='Had a good coffee today...')
-        post.author = User(name='Test User')
-        post.save()
+        BlogPost.objects.create(
+            author=User(name='Test User'),
+            content='Had a good coffee today...'
+        )
 
         result = BlogPost.objects.first()
         self.assertTrue(isinstance(result.author, User))
         self.assertEqual(result.author.name, 'Test User')
 
+    def test_find_empty_embedded(self):
+        """Ensure that you can save and find an empty embedded document."""
+        class User(EmbeddedDocument):
+            name = StringField()
+
+        class BlogPost(Document):
+            content = StringField()
+            author = EmbeddedDocumentField(User)
+
         BlogPost.drop_collection()
 
+        BlogPost.objects.create(content='Anonymous post...')
+
+        result = BlogPost.objects.get(author=None)
+        self.assertEqual(result.author, None)
+
     def test_find_dict_item(self):
         """Ensure that DictField items may be found.
         """

From 0007535a469c45bf0cc72a486c37b871a6f01c5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 4 Dec 2016 00:33:42 -0500
Subject: [PATCH 0403/1519] Add support for cursor.comment (#1420)

---
 mongoengine/queryset/base.py |  8 ++++++++
 tests/queryset/queryset.py   | 16 +++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index bc70b44ae..5f748b501 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -933,6 +933,14 @@ def order_by(self, *keys):
         queryset._ordering = queryset._get_order_by(keys)
         return queryset
 
+    def comment(self, text):
+        """Add a comment to the query.
+
+        See https://docs.mongodb.com/manual/reference/method/cursor.comment/#cursor.comment
+        for details.
+        """
+        return self._chainable_method("comment", text)
+
     def explain(self, format=False):
         """Return an explain plan record for the
         :class:`~mongoengine.queryset.QuerySet`\ 's cursor.
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 072b91221..88ae18aa8 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -339,7 +339,6 @@ class B(Document):
 
     def test_update_write_concern(self):
         """Test that passing write_concern works"""
-
         self.Person.drop_collection()
 
         write_concern = {"fsync": True}
@@ -2215,6 +2214,21 @@ class Author(Document):
             a.author.name for a in Author.objects.order_by('-author__age')]
         self.assertEqual(names, ['User A', 'User B', 'User C'])
 
+    def test_comment(self):
+        """Make sure adding a comment to the query works."""
+        class User(Document):
+            age = IntField()
+
+        with db_ops_tracker() as q:
+            adult = (User.objects.filter(age__gte=18)
+                .comment('looking for an adult')
+                .first())
+            ops = q.get_ops()
+            self.assertEqual(len(ops), 1)
+            op = ops[0]
+            self.assertEqual(op['query']['$query'], {'age': {'$gte': 18}})
+            self.assertEqual(op['query']['$comment'], 'looking for an adult')
+
     def test_map_reduce(self):
         """Ensure map/reduce is both mapping and reducing.
         """

From eb743beaa3bb128edc1f9d97e5681b1bff5d0759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 4 Dec 2016 00:34:24 -0500
Subject: [PATCH 0404/1519] fix doc.get_<field>_display + unit test inspired by
 #1279 (#1419)

---
 mongoengine/base/document.py | 23 ++++++++---------
 tests/fields/fields.py       | 50 +++++++++++++++++++-----------------
 2 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index eaa2019a4..59f5aebc7 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -121,7 +121,7 @@ def __init__(self, *args, **values):
                 else:
                     self._data[key] = value
 
-        # Set any get_fieldname_display methods
+        # Set any get_<field>_display methods
         self.__set_field_display()
 
         if self._dynamic:
@@ -1005,19 +1005,18 @@ def _translate_field_name(cls, field, sep='.'):
         return '.'.join(parts)
 
     def __set_field_display(self):
-        """Dynamically set the display value for a field with choices"""
-        for attr_name, field in self._fields.items():
-            if field.choices:
-                if self._dynamic:
-                    obj = self
-                else:
-                    obj = type(self)
-                setattr(obj,
-                        'get_%s_display' % attr_name,
-                        partial(self.__get_field_display, field=field))
+        """For each field that specifies choices, create a
+        get_<field>_display method.
+        """
+        fields_with_choices = [(n, f) for n, f in self._fields.items()
+                               if f.choices]
+        for attr_name, field in fields_with_choices:
+            setattr(self,
+                    'get_%s_display' % attr_name,
+                    partial(self.__get_field_display, field=field))
 
     def __get_field_display(self, field):
-        """Returns the display value for a choice field"""
+        """Return the display value for a choice field"""
         value = getattr(self, field.name)
         if field.choices and isinstance(field.choices[0], (list, tuple)):
             return dict(field.choices).get(value, value)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 36b9f4cde..2153a42ef 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1047,7 +1047,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
     def test_list_assignment(self):
-        """Ensure that list field element assignment and slicing work 
+        """Ensure that list field element assignment and slicing work
         """
         class BlogPost(Document):
             info = ListField()
@@ -1057,12 +1057,12 @@ class BlogPost(Document):
         post = BlogPost()
         post.info = ['e1', 'e2', 3, '4', 5]
         post.save()
-        
+
         post.info[0] = 1
         post.save()
         post.reload()
         self.assertEqual(post.info[0], 1)
-        
+
         post.info[1:3] = ['n2', 'n3']
         post.save()
         post.reload()
@@ -1209,7 +1209,7 @@ class Simple(Document):
         self.assertEqual(simple.widgets, [4])
 
     def test_list_field_with_negative_indices(self):
-        
+
         class Simple(Document):
             widgets = ListField()
 
@@ -1823,7 +1823,7 @@ class Person(Document):
                                'parent': "50a234ea469ac1eda42d347d"})
         mongoed = p1.to_mongo()
         self.assertTrue(isinstance(mongoed['parent'], ObjectId))
-        
+
     def test_cached_reference_field_get_and_save(self):
         """
         Tests #1047: CachedReferenceField creates DBRefs on to_python, but can't save them on to_mongo
@@ -1835,11 +1835,11 @@ class Animal(Document):
         class Ocorrence(Document):
             person = StringField()
             animal = CachedReferenceField(Animal)
-        
+
         Animal.drop_collection()
         Ocorrence.drop_collection()
-        
-        Ocorrence(person="testte", 
+
+        Ocorrence(person="testte",
                   animal=Animal(name="Leopard", tag="heavy").save()).save()
         p = Ocorrence.objects.get()
         p.person = 'new_testte'
@@ -3001,28 +3001,32 @@ class Shirt(Document):
                 ('S', 'Small'), ('M', 'Medium'), ('L', 'Large'),
                 ('XL', 'Extra Large'), ('XXL', 'Extra Extra Large')))
             style = StringField(max_length=3, choices=(
-                ('S', 'Small'), ('B', 'Baggy'), ('W', 'wide')), default='S')
+                ('S', 'Small'), ('B', 'Baggy'), ('W', 'Wide')), default='W')
 
         Shirt.drop_collection()
 
-        shirt = Shirt()
+        shirt1 = Shirt()
+        shirt2 = Shirt()
 
-        self.assertEqual(shirt.get_size_display(), None)
-        self.assertEqual(shirt.get_style_display(), 'Small')
+        # Make sure get_<field>_display returns the default value (or None)
+        self.assertEqual(shirt1.get_size_display(), None)
+        self.assertEqual(shirt1.get_style_display(), 'Wide')
 
-        shirt.size = "XXL"
-        shirt.style = "B"
-        self.assertEqual(shirt.get_size_display(), 'Extra Extra Large')
-        self.assertEqual(shirt.get_style_display(), 'Baggy')
+        shirt1.size = 'XXL'
+        shirt1.style = 'B'
+        shirt2.size = 'M'
+        shirt2.style = 'S'
+        self.assertEqual(shirt1.get_size_display(), 'Extra Extra Large')
+        self.assertEqual(shirt1.get_style_display(), 'Baggy')
+        self.assertEqual(shirt2.get_size_display(), 'Medium')
+        self.assertEqual(shirt2.get_style_display(), 'Small')
 
         # Set as Z - an invalid choice
-        shirt.size = "Z"
-        shirt.style = "Z"
-        self.assertEqual(shirt.get_size_display(), 'Z')
-        self.assertEqual(shirt.get_style_display(), 'Z')
-        self.assertRaises(ValidationError, shirt.validate)
-
-        Shirt.drop_collection()
+        shirt1.size = 'Z'
+        shirt1.style = 'Z'
+        self.assertEqual(shirt1.get_size_display(), 'Z')
+        self.assertEqual(shirt1.get_style_display(), 'Z')
+        self.assertRaises(ValidationError, shirt1.validate)
 
     def test_simple_choices_validation(self):
         """Ensure that value is in a container of allowed values.

From 15714ef8558342ea0313aeb23841f9da17476405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 4 Dec 2016 16:10:59 -0500
Subject: [PATCH 0405/1519] Fix __repr__ method of the StrictDict (#1424)

---
 mongoengine/base/datastructures.py |  2 +-
 tests/test_datastructures.py       | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 2bb7ff2c2..2c6ebc2a5 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -438,7 +438,7 @@ class SpecificStrictDict(cls):
                 __slots__ = allowed_keys_tuple
 
                 def __repr__(self):
-                    return "{%s}" % ', '.join('"{0!s}": {0!r}'.format(k) for k in self.iterkeys())
+                    return "{%s}" % ', '.join('"{0!s}": {1!r}'.format(k, v) for k, v in self.items())
 
             cls._classes[allowed_keys] = SpecificStrictDict
         return cls._classes[allowed_keys]
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 716df6514..eb40e767f 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,5 +1,6 @@
 import unittest
-from mongoengine.base.datastructures import StrictDict, SemiStrictDict 
+
+from mongoengine.base.datastructures import StrictDict, SemiStrictDict
 
 
 class TestStrictDict(unittest.TestCase):
@@ -13,9 +14,17 @@ def test_init(self):
         d = self.dtype(a=1, b=1, c=1)
         self.assertEqual((d.a, d.b, d.c), (1, 1, 1))
 
+    def test_repr(self):
+        d = self.dtype(a=1, b=2, c=3)
+        self.assertEqual(repr(d), '{"a": 1, "b": 2, "c": 3}')
+
+        # make sure quotes are escaped properly
+        d = self.dtype(a='"', b="'", c="")
+        self.assertEqual(repr(d), '{"a": \'"\', "b": "\'", "c": \'\'}')
+
     def test_init_fails_on_nonexisting_attrs(self):
         self.assertRaises(AttributeError, lambda: self.dtype(a=1, b=2, d=3))
-        
+
     def test_eq(self):
         d = self.dtype(a=1, b=1, c=1)
         dd = self.dtype(a=1, b=1, c=1)
@@ -24,7 +33,7 @@ def test_eq(self):
         g = self.strict_dict_class(("a", "b", "c", "d"))(a=1, b=1, c=1, d=1)
         h = self.strict_dict_class(("a", "c", "b"))(a=1, b=1, c=1)
         i = self.strict_dict_class(("a", "c", "b"))(a=1, b=1, c=2)
-        
+
         self.assertEqual(d, dd)
         self.assertNotEqual(d, e)
         self.assertNotEqual(d, f)
@@ -38,19 +47,19 @@ def test_setattr_getattr(self):
         d.a = 1
         self.assertEqual(d.a, 1)
         self.assertRaises(AttributeError, lambda: d.b)
-    
+
     def test_setattr_raises_on_nonexisting_attr(self):
         d = self.dtype()
 
         def _f():
             d.x = 1
         self.assertRaises(AttributeError, _f)
-    
+
     def test_setattr_getattr_special(self):
         d = self.strict_dict_class(["items"])
         d.items = 1
         self.assertEqual(d.items, 1)
-    
+
     def test_get(self):
         d = self.dtype(a=1)
         self.assertEqual(d.get('a'), 1)
@@ -88,7 +97,7 @@ def test_setattr_getattr_nonexisting_attr_succeeds(self):
     def test_init_succeeds_with_nonexisting_attrs(self):
         d = self.dtype(a=1, b=1, c=1, x=2)
         self.assertEqual((d.a, d.b, d.c, d.x), (1, 1, 1, 2))
-   
+
     def test_iter_with_nonexisting_attrs(self):
         d = self.dtype(a=1, b=1, c=1, x=2)
         self.assertEqual(list(d), ['a', 'b', 'c', 'x'])

From 4d0c092d9f92ffa32cf6787e1b1968439bfaed80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 5 Dec 2016 09:38:24 -0500
Subject: [PATCH 0406/1519] Fix iteration within iteration (#1427)

---
 mongoengine/queryset/base.py     |  2 ++
 mongoengine/queryset/queryset.py | 52 ++++++++++++++++++++++++--------
 tests/queryset/queryset.py       | 50 ++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 12 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5f748b501..45da9a21f 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -275,6 +275,8 @@ def get(self, *q_objs, **query):
         except StopIteration:
             return result
 
+        # If we were able to retrieve the 2nd doc, rewind the cursor and
+        # raise the MultipleObjectsReturned exception.
         queryset.rewind()
         message = u'%d items returned, instead of 1' % queryset.count()
         raise queryset._document.MultipleObjectsReturned(message)
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index e68537d27..b185b340a 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -27,9 +27,10 @@ def __iter__(self):
         in batches of ``ITER_CHUNK_SIZE``.
 
         If ``self._has_more`` the cursor hasn't been exhausted so cache then
-        batch.  Otherwise iterate the result_cache.
+        batch. Otherwise iterate the result_cache.
         """
         self._iter = True
+
         if self._has_more:
             return self._iter_results()
 
@@ -42,10 +43,12 @@ def __len__(self):
         """
         if self._len is not None:
             return self._len
+
+        # Populate the result cache with *all* of the docs in the cursor
         if self._has_more:
-            # populate the cache
             list(self._iter_results())
 
+        # Cache the length of the complete result cache and return it
         self._len = len(self._result_cache)
         return self._len
 
@@ -64,18 +67,33 @@ def __repr__(self):
     def _iter_results(self):
         """A generator for iterating over the result cache.
 
-        Also populates the cache if there are more possible results to yield.
-        Raises StopIteration when there are no more results"""
+        Also populates the cache if there are more possible results to
+        yield. Raises StopIteration when there are no more results.
+        """
         if self._result_cache is None:
             self._result_cache = []
+
         pos = 0
         while True:
-            upper = len(self._result_cache)
-            while pos < upper:
+
+            # For all positions lower than the length of the current result
+            # cache, serve the docs straight from the cache w/o hitting the
+            # database.
+            # XXX it's VERY important to compute the len within the `while`
+            # condition because the result cache might expand mid-iteration
+            # (e.g. if we call len(qs) inside a loop that iterates over the
+            # queryset). Fortunately len(list) is O(1) in Python, so this
+            # doesn't cause performance issues.
+            while pos < len(self._result_cache):
                 yield self._result_cache[pos]
                 pos += 1
+
+            # Raise StopIteration if we already established there were no more
+            # docs in the db cursor.
             if not self._has_more:
                 raise StopIteration
+
+            # Otherwise, populate more of the cache and repeat.
             if len(self._result_cache) <= pos:
                 self._populate_cache()
 
@@ -86,12 +104,22 @@ def _populate_cache(self):
         """
         if self._result_cache is None:
             self._result_cache = []
-        if self._has_more:
-            try:
-                for i in xrange(ITER_CHUNK_SIZE):
-                    self._result_cache.append(self.next())
-            except StopIteration:
-                self._has_more = False
+
+        # Skip populating the cache if we already established there are no
+        # more docs to pull from the database.
+        if not self._has_more:
+            return
+
+        # Pull in ITER_CHUNK_SIZE docs from the database and store them in
+        # the result cache.
+        try:
+            for i in xrange(ITER_CHUNK_SIZE):
+                self._result_cache.append(self.next())
+        except StopIteration:
+            # Getting this exception means there are no more docs in the
+            # db cursor. Set _has_more to False so that we can use that
+            # information in other places.
+            self._has_more = False
 
     def count(self, with_limit_and_skip=False):
         """Count the selected elements in the query.
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 88ae18aa8..0fb78b6bb 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4890,6 +4890,56 @@ class Doc(Document):
 
         self.assertEqual(1, Doc.objects(item__type__="axe").count())
 
+    def test_len_during_iteration(self):
+        """Tests that calling len on a queyset during iteration doesn't
+        stop paging.
+        """
+        class Data(Document):
+            pass
+
+        for i in xrange(300):
+            Data().save()
+
+        records = Data.objects.limit(250)
+
+        # This should pull all 250 docs from mongo and populate the result
+        # cache
+        len(records)
+
+        # Assert that iterating over documents in the qs touches every
+        # document even if we call len(qs) midway through the iteration.
+        for i, r in enumerate(records):
+            if i == 58:
+                len(records)
+        self.assertEqual(i, 249)
+
+        # Assert the same behavior is true even if we didn't pre-populate the
+        # result cache.
+        records = Data.objects.limit(250)
+        for i, r in enumerate(records):
+            if i == 58:
+                len(records)
+        self.assertEqual(i, 249)
+
+    def test_iteration_within_iteration(self):
+        """You should be able to reliably iterate over all the documents
+        in a given queryset even if there are multiple iterations of it
+        happening at the same time.
+        """
+        class Data(Document):
+            pass
+
+        for i in xrange(300):
+            Data().save()
+
+        qs = Data.objects.limit(250)
+        for i, doc in enumerate(qs):
+            for j, doc2 in enumerate(qs):
+                pass
+
+        self.assertEqual(i, 249)
+        self.assertEqual(j, 249)
+
 
 if __name__ == '__main__':
     unittest.main()

From d25058a46dbb176566efd9e674ab26507c088388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 5 Dec 2016 22:13:22 -0500
Subject: [PATCH 0407/1519] Implement BaseQuerySet.batch_size (#1426)

---
 mongoengine/queryset/base.py | 17 +++++++++++++++++
 tests/queryset/queryset.py   | 28 ++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 45da9a21f..17ee989e9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -82,6 +82,7 @@ def __init__(self, document, collection):
         self._limit = None
         self._skip = None
         self._hint = -1  # Using -1 as None is a valid value for hint
+        self._batch_size = None
         self.only_fields = []
         self._max_time_ms = None
 
@@ -783,6 +784,19 @@ def hint(self, index=None):
         queryset._hint = index
         return queryset
 
+    def batch_size(self, size):
+        """Limit the number of documents returned in a single batch (each
+        batch requires a round trip to the server).
+
+        See http://api.mongodb.com/python/current/api/pymongo/cursor.html#pymongo.cursor.Cursor.batch_size
+        for details.
+
+        :param size: desired size of each batch.
+        """
+        queryset = self.clone()
+        queryset._batch_size = size
+        return queryset
+
     def distinct(self, field):
         """Return a list of distinct values for a given field.
 
@@ -1469,6 +1483,9 @@ def _cursor(self):
             if self._hint != -1:
                 self._cursor_obj.hint(self._hint)
 
+            if self._batch_size is not None:
+                self._cursor_obj.batch_size(self._batch_size)
+
         return self._cursor_obj
 
     def __deepcopy__(self, memo):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 0fb78b6bb..2c00838a6 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -337,6 +337,34 @@ class B(Document):
         query = query.filter(boolfield=True)
         self.assertEqual(query.count(), 1)
 
+    def test_batch_size(self):
+        """Ensure that batch_size works."""
+        class A(Document):
+            s = StringField()
+
+        A.drop_collection()
+
+        for i in range(100):
+            A.objects.create(s=str(i))
+
+        # test iterating over the result set
+        cnt = 0
+        for a in A.objects.batch_size(10):
+            cnt += 1
+        self.assertEqual(cnt, 100)
+
+        # test chaining
+        qs = A.objects.all()
+        qs = qs.limit(10).batch_size(20).skip(91)
+        cnt = 0
+        for a in qs:
+            cnt += 1
+        self.assertEqual(cnt, 9)
+
+        # test invalid batch size
+        qs = A.objects.batch_size(-1)
+        self.assertRaises(ValueError, lambda: list(qs))
+
     def test_update_write_concern(self):
         """Test that passing write_concern works"""
         self.Person.drop_collection()

From f168682a68451e7e55fb993ddfaff09ea3358fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 5 Dec 2016 22:31:00 -0500
Subject: [PATCH 0408/1519] Dont let the MongoDB URI override connection
 settings it doesnt explicitly specify (#1421)

---
 mongoengine/connection.py | 23 +++++++++++++++--------
 tests/test_connection.py  | 39 ++++++++++++++++++++++++++-------------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index b4e852d46..ee21ba90c 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -25,7 +25,8 @@ class ConnectionError(Exception):
 
 def register_connection(alias, name=None, host=None, port=None,
                         read_preference=READ_PREFERENCE,
-                        username=None, password=None, authentication_source=None,
+                        username=None, password=None,
+                        authentication_source=None,
                         authentication_mechanism=None,
                         **kwargs):
     """Add a connection.
@@ -70,20 +71,26 @@ def register_connection(alias, name=None, host=None, port=None,
 
     resolved_hosts = []
     for entity in conn_host:
-        # Handle uri style connections
+
+        # Handle Mongomock
         if entity.startswith('mongomock://'):
             conn_settings['is_mock'] = True
             # `mongomock://` is not a valid url prefix and must be replaced by `mongodb://`
             resolved_hosts.append(entity.replace('mongomock://', 'mongodb://', 1))
+
+        # Handle URI style connections, only updating connection params which
+        # were explicitly specified in the URI.
         elif '://' in entity:
             uri_dict = uri_parser.parse_uri(entity)
             resolved_hosts.append(entity)
-            conn_settings.update({
-                'name': uri_dict.get('database') or name,
-                'username': uri_dict.get('username'),
-                'password': uri_dict.get('password'),
-                'read_preference': read_preference,
-            })
+
+            if uri_dict.get('database'):
+                conn_settings['name'] = uri_dict.get('database')
+
+            for param in ('read_preference', 'username', 'password'):
+                if uri_dict.get(param):
+                    conn_settings[param] = uri_dict[param]
+
             uri_options = uri_dict['options']
             if 'replicaset' in uri_options:
                 conn_settings['replicaSet'] = True
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 1d422d099..e64318918 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -174,30 +174,43 @@ def test_connect_uri(self):
         c.mongoenginetest.system.users.remove({})
 
     def test_connect_uri_without_db(self):
-        """Ensure connect() method works properly with uri's without database_name
+        """Ensure connect() method works properly if the URI doesn't
+        include a database name.
         """
-        c = connect(db='mongoenginetest', alias='admin')
-        c.admin.system.users.remove({})
-        c.mongoenginetest.system.users.remove({})
+        connect("mongoenginetest", host='mongodb://localhost/')
 
-        c.admin.add_user("admin", "password")
-        c.admin.authenticate("admin", "password")
-        c.mongoenginetest.add_user("username", "password")
+        conn = get_connection()
+        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
 
-        if not IS_PYMONGO_3:
-            self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
+        db = get_db()
+        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertEqual(db.name, 'mongoenginetest')
 
-        connect("mongoenginetest", host='mongodb://localhost/')
+    def test_connect_uri_default_db(self):
+        """Ensure connect() defaults to the right database name if
+        the URI and the database_name don't explicitly specify it.
+        """
+        connect(host='mongodb://localhost/')
 
         conn = get_connection()
         self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
 
         db = get_db()
         self.assertTrue(isinstance(db, pymongo.database.Database))
-        self.assertEqual(db.name, 'mongoenginetest')
+        self.assertEqual(db.name, 'test')
 
-        c.admin.system.users.remove({})
-        c.mongoenginetest.system.users.remove({})
+    def test_uri_without_credentials_doesnt_override_conn_settings(self):
+        """Ensure connect() uses the username & password params if the URI
+        doesn't explicitly specify them.
+        """
+        c = connect(host='mongodb://localhost/mongoenginetest',
+                    username='user',
+                    password='pass')
+
+        # OperationFailure means that mongoengine attempted authentication
+        # w/ the provided username/password and failed - that's the desired
+        # behavior. If the MongoDB URI would override the credentials
+        self.assertRaises(OperationFailure, get_db)
 
     def test_connect_uri_with_authsource(self):
         """Ensure that the connect() method works well with

From 25e0f12976635c0c6fc89ea68b2eacfdda2fce55 Mon Sep 17 00:00:00 2001
From: rmendocna <ricardoandrademendonca@gmail.com>
Date: Tue, 6 Dec 2016 03:54:21 +0000
Subject: [PATCH 0409/1519] fix delete cascade for models without a literal id
 field: replace with pk (#1247)

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 17ee989e9..ec48b4f36 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -447,7 +447,7 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                 if doc._collection == document_cls._collection:
                     for ref in queryset:
                         cascade_refs.add(ref.id)
-                ref_q = document_cls.objects(**{field_name + '__in': self, 'id__nin': cascade_refs})
+                ref_q = document_cls.objects(**{field_name + '__in': self, 'pk__nin': cascade_refs})
                 ref_q_count = ref_q.count()
                 if ref_q_count > 0:
                     ref_q.delete(write_concern=write_concern, cascade_refs=cascade_refs)

From 7ce8768c1937f7522e650fa42677fe4b1725c7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B8=CC=86=20=D0=AF?=
 =?UTF-8?q?=D0=BD=D1=86=D0=B5=D0=BD?= <d.yantsen@gmail.com>
Date: Tue, 6 Dec 2016 10:42:10 +0500
Subject: [PATCH 0410/1519] Added rounding for unicode return value of to_mongo
 in DecimalField. Closes #1103

---
 AUTHORS               | 1 +
 docs/changelog.rst    | 1 +
 mongoengine/fields.py | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 12475c2e7..1d724718c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -242,3 +242,4 @@ that much better:
  * xiaost7 (https://github.com/xiaost7)
  * Victor Varvaryuk
  * Stanislav Kaledin (https://github.com/sallyruthstruik)
+ * Dmitry Yantsen (https://github.com/mrTable)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index ad710bb1e..61ea45c4b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changes in 0.10.8
 - Added ability to specify an authentication mechanism (e.g. X.509) #1333
 - Added support for falsey primary keys (e.g. doc.pk = 0) #1354
 - Fixed BaseQuerySet#sum/average for fields w/ explicit db_field #1417
+- Fixed absent rounding for DecimalField when `force_string` is set. #1103
 
 Changes in 0.10.7
 =================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 783aac463..2ad921d5b 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -341,7 +341,7 @@ def to_mongo(self, value):
         if value is None:
             return value
         if self.force_string:
-            return unicode(value)
+            return unicode(self.to_python(value))
         return float(self.to_python(value))
 
     def validate(self, value):

From 3b71a6b5c521e204c7c18d6ddd9eea6070d71b25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B8=CC=86=20=D0=AF?=
 =?UTF-8?q?=D0=BD=D1=86=D0=B5=D0=BD?= <d.yantsen@gmail.com>
Date: Tue, 6 Dec 2016 11:33:44 +0500
Subject: [PATCH 0411/1519] Improved tests to avoid regression Issue #1103

---
 tests/fields/fields.py | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 2153a42ef..cd20d362f 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -483,27 +483,41 @@ class Person(Document):
 
     def test_decimal_storage(self):
         class Person(Document):
-            btc = DecimalField(precision=4)
+            float_value = DecimalField(precision=4)
+            string_value = DecimalField(precision=4, force_string=True)
 
         Person.drop_collection()
-        Person(btc=10).save()
-        Person(btc=10.1).save()
-        Person(btc=10.11).save()
-        Person(btc="10.111").save()
-        Person(btc=Decimal("10.1111")).save()
-        Person(btc=Decimal("10.11111")).save()
+        values_to_store = [10, 10.1, 10.11, "10.111", Decimal("10.1111"), Decimal("10.11111")]
+        for store_at_creation in [True, False]:
+            for value in values_to_store:
+                # to_python is called explicitly if values were sent in the kwargs of __init__
+                if store_at_creation:
+                    Person(float_value=value, string_value=value).save()
+                else:
+                    person = Person.objects.create()
+                    person.float_value = value
+                    person.string_value = value
+                    person.save()
 
         # How its stored
-        expected = [{'btc': 10.0}, {'btc': 10.1}, {'btc': 10.11},
-                    {'btc': 10.111}, {'btc': 10.1111}, {'btc': 10.1111}]
+        expected = [
+            {'float_value': 10.0, 'string_value': '10.0000'},
+            {'float_value': 10.1, 'string_value': '10.1000'},
+            {'float_value': 10.11, 'string_value': '10.1100'},
+            {'float_value': 10.111, 'string_value': '10.1110'},
+            {'float_value': 10.1111, 'string_value': '10.1111'},
+            {'float_value': 10.1111, 'string_value': '10.1111'}]
+        expected.extend(expected)
         actual = list(Person.objects.exclude('id').as_pymongo())
         self.assertEqual(expected, actual)
 
         # How it comes out locally
         expected = [Decimal('10.0000'), Decimal('10.1000'), Decimal('10.1100'),
                     Decimal('10.1110'), Decimal('10.1111'), Decimal('10.1111')]
-        actual = list(Person.objects().scalar('btc'))
-        self.assertEqual(expected, actual)
+        expected.extend(expected)
+        for field_name in ['float_value', 'string_value']:
+            actual = list(Person.objects().scalar(field_name))
+            self.assertEqual(expected, actual)
 
     def test_boolean_validation(self):
         """Ensure that invalid values cannot be assigned to boolean fields.

From 1b9432824babf8011b3d352119d18ca7c0146190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Fri, 9 Dec 2016 12:56:06 -0500
Subject: [PATCH 0412/1519] Add ability to filter the generic reference field
 by ObjectId and DBRef (#1425)

---
 mongoengine/fields.py             |  2 +-
 mongoengine/queryset/transform.py | 19 ++++++++++++++++--
 setup.cfg                         |  2 +-
 tests/fields/fields.py            | 32 +++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 783aac463..c07a45e3a 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1249,7 +1249,7 @@ def to_mongo(self, document):
         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']
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 54371d6b2..b3acca40f 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -1,6 +1,7 @@
 from collections import defaultdict
 
-from bson import SON
+from bson import ObjectId, SON
+from bson.dbref import DBRef
 import pymongo
 
 from mongoengine.base.fields import UPDATE_OPERATORS
@@ -26,6 +27,7 @@
                    STRING_OPERATORS + CUSTOM_OPERATORS)
 
 
+# TODO make this less complex
 def query(_doc_cls=None, **kwargs):
     """Transform a query from Django-style format to Mongo format.
     """
@@ -62,6 +64,7 @@ def query(_doc_cls=None, **kwargs):
             parts = []
 
             CachedReferenceField = _import_class('CachedReferenceField')
+            GenericReferenceField = _import_class('GenericReferenceField')
 
             cleaned_fields = []
             for field in fields:
@@ -101,6 +104,16 @@ def query(_doc_cls=None, **kwargs):
                 # 'in', 'nin' and 'all' require a list of values
                 value = [field.prepare_query_value(op, v) for v in value]
 
+            # If we're querying a GenericReferenceField, we need to alter the
+            # key depending on the value:
+            # * If the value is a DBRef, the key should be "field_name._ref".
+            # * If the value is an ObjectId, the key should be "field_name._ref.$id".
+            if isinstance(field, GenericReferenceField):
+                if isinstance(value, DBRef):
+                    parts[-1] += '._ref'
+                elif isinstance(value, ObjectId):
+                    parts[-1] += '._ref.$id'
+
         # if op and op not in COMPARISON_OPERATORS:
         if op:
             if op in GEO_OPERATORS:
@@ -128,11 +141,13 @@ def query(_doc_cls=None, **kwargs):
 
         for i, part in indices:
             parts.insert(i, part)
+
         key = '.'.join(parts)
+
         if op is None or key not in mongo_query:
             mongo_query[key] = value
         elif key in mongo_query:
-            if key in mongo_query and isinstance(mongo_query[key], dict):
+            if isinstance(mongo_query[key], dict):
                 mongo_query[key].update(value)
                 # $max/minDistance needs to come last - convert to SON
                 value_dict = mongo_query[key]
diff --git a/setup.cfg b/setup.cfg
index 6bf12cb50..09a593b42 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,5 +9,5 @@ tests = tests
 [flake8]
 ignore=E501,F401,F403,F405,I201
 exclude=build,dist,docs,venv,.tox,.eggs,tests
-max-complexity=42
+max-complexity=45
 application-import-names=mongoengine,tests
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 2153a42ef..14b105612 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2810,6 +2810,38 @@ class User(Document):
         Post.drop_collection()
         User.drop_collection()
 
+    def test_generic_reference_filter_by_dbref(self):
+        """Ensure we can search for a specific generic reference by
+        providing its ObjectId.
+        """
+        class Doc(Document):
+            ref = GenericReferenceField()
+
+        Doc.drop_collection()
+
+        doc1 = Doc.objects.create()
+        doc2 = Doc.objects.create(ref=doc1)
+
+        doc = Doc.objects.get(ref=DBRef('doc', doc1.pk))
+        self.assertEqual(doc, doc2)
+
+    def test_generic_reference_filter_by_objectid(self):
+        """Ensure we can search for a specific generic reference by
+        providing its DBRef.
+        """
+        class Doc(Document):
+            ref = GenericReferenceField()
+
+        Doc.drop_collection()
+
+        doc1 = Doc.objects.create()
+        doc2 = Doc.objects.create(ref=doc1)
+
+        self.assertTrue(isinstance(doc1.pk, ObjectId))
+
+        doc = Doc.objects.get(ref=doc1.pk)
+        self.assertEqual(doc, doc2)
+
     def test_binary_fields(self):
         """Ensure that binary fields can be stored and retrieved.
         """

From e28804c03a81db7a0293562659b5b61171895b3e Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sat, 10 Dec 2016 13:11:37 -0500
Subject: [PATCH 0413/1519] add venv & venv3 to .gitignore

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7c0a9172a..b180e87ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,6 @@ env/
 .project
 .pydevproject
 tests/test_bugfix.py
-htmlcov/
\ No newline at end of file
+htmlcov/
+venv
+venv3

From 7b860f7739f684d1f545c06d5c46af18f2f50207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sat, 10 Dec 2016 13:29:31 -0500
Subject: [PATCH 0414/1519] Deprecate Python v2.6 (#1430)

---
 .travis.yml                   |  2 +-
 mongoengine/python_support.py | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d764a322..4721a0868 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 
 python:
-- '2.6'
+- '2.6'  # TODO remove in v0.11.0
 - '2.7'
 - '3.3'
 - '3.4'
diff --git a/mongoengine/python_support.py b/mongoengine/python_support.py
index 5bb9038dd..f4b6f20fc 100644
--- a/mongoengine/python_support.py
+++ b/mongoengine/python_support.py
@@ -1,9 +1,22 @@
-"""Helper functions and types to aid with Python 2.5 - 3 support."""
+"""Helper functions and types to aid with Python 2.6 - 3 support."""
 
 import sys
+import warnings
+
 import pymongo
 
 
+# Show a deprecation warning for people using Python v2.6
+# TODO remove in mongoengine v0.11.0
+if sys.version_info[0] == 2 and sys.version_info[1] == 6:
+    warnings.warn(
+        'Python v2.6 support is deprecated and is going to be dropped '
+        'entirely in the upcoming v0.11.0 release. Update your Python '
+        'version if you want to have access to the latest features and '
+        'bug fixes in MongoEngine.',
+        DeprecationWarning
+    )
+
 if pymongo.version_tuple[0] < 3:
     IS_PYMONGO_3 = False
 else:

From c6c5f85abbb65461a0a4c51f4eb518dc0d6fcfa3 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sat, 10 Dec 2016 23:30:16 -0500
Subject: [PATCH 0415/1519] update the changelog with everything we've added in
 v0.10.8

---
 docs/changelog.rst | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ad710bb1e..fc70f6b16 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,9 +4,19 @@ Changelog
 
 Changes in 0.10.8
 =================
+- Added support for QuerySet.batch_size (#1426)
+- Fixed query set iteration within iteration #1427
+- Fixed an issue where specifying a MongoDB URI host would override more information than it should #1421
+- Added ability to filter the generic reference field by ObjectId and DBRef #1425
+- Fixed delete cascade for models with a custom primary key field #1247
 - Added ability to specify an authentication mechanism (e.g. X.509) #1333
 - Added support for falsey primary keys (e.g. doc.pk = 0) #1354
-- Fixed BaseQuerySet#sum/average for fields w/ explicit db_field #1417
+- Fixed QuerySet#sum/average for fields w/ explicit db_field #1417
+- Fixed filtering by embedded_doc=None #1422
+- Added support for cursor.comment #1420
+- Fixed doc.get_<field>_display #1419
+- Fixed __repr__ method of the StrictDict #1424
+- Added a deprecation warning for Python 2.6
 
 Changes in 0.10.7
 =================

From 6f5f5b47115a776b7147c0dc6ad0cb8e79a4bf16 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sat, 10 Dec 2016 23:36:06 -0500
Subject: [PATCH 0416/1519] version bump (forgot to do it with v0.10.8 release,
 so have to go for v0.10.9)

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index d2e26ebfb..1544aa516 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -14,7 +14,7 @@
 __all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
            list(queryset.__all__) + signals.__all__ + list(errors.__all__))
 
-VERSION = (0, 10, 7)
+VERSION = (0, 10, 9)
 
 
 def get_version():

From 3135b456bedb19c8d420ad03d10e353bc734a160 Mon Sep 17 00:00:00 2001
From: Gilbert Gilb's <gilbsgilbs@users.noreply.github.com>
Date: Sun, 11 Dec 2016 21:38:06 +0100
Subject: [PATCH 0417/1519] Upgrade notice for 0.10.7 (#1433)

---
 docs/upgrade.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index b1a2217ff..a363eae35 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -2,6 +2,13 @@
 Upgrading
 #########
 
+0.10.7
+******
+
+`QuerySet.aggregate_sum` and `QuerySet.aggregate_average` are dropped. Use
+`QuerySet.sum` and `QuerySet.average` instead which use the aggreation framework
+by default from now on.
+
 0.9.0
 *****
 

From 835d3c3d186144f1b7d4d929d40712c8ef75dd21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 11 Dec 2016 18:49:21 -0500
Subject: [PATCH 0418/1519] Improve the health of this package (#1428)

---
 .landscape.yml                                |  22 ++
 .travis.yml                                   |   7 +-
 benchmark.py                                  | 152 ++------
 docs/changelog.rst                            |   7 +
 docs/upgrade.rst                              |  26 ++
 mongoengine/__init__.py                       |  44 ++-
 mongoengine/base/__init__.py                  |  24 +-
 mongoengine/base/common.py                    |   9 +-
 mongoengine/base/datastructures.py            |  40 +-
 mongoengine/base/document.py                  | 356 ++++++++++--------
 mongoengine/base/fields.py                    | 148 ++++----
 mongoengine/base/metaclasses.py               |  68 ++--
 mongoengine/connection.py                     | 145 ++++---
 mongoengine/context_managers.py               |  82 ++--
 mongoengine/dereference.py                    |  42 +--
 mongoengine/document.py                       | 186 ++++-----
 mongoengine/errors.py                         |  16 +-
 mongoengine/fields.py                         | 334 ++++++++--------
 mongoengine/python_support.py                 |  51 +--
 mongoengine/queryset/__init__.py              |  16 +-
 mongoengine/queryset/base.py                  | 292 +++++++-------
 mongoengine/queryset/field_list.py            |   2 +-
 mongoengine/queryset/queryset.py              |  14 +-
 mongoengine/queryset/transform.py             | 129 ++++---
 mongoengine/queryset/visitor.py               |  14 +-
 mongoengine/signals.py                        |   7 +-
 setup.cfg                                     |  12 +-
 setup.py                                      |  25 +-
 tests/__init__.py                             |   1 -
 tests/all_warnings/__init__.py                |   2 -
 tests/document/__init__.py                    |   2 -
 tests/document/class_methods.py               |   2 -
 tests/document/delta.py                       |   2 -
 tests/document/dynamic.py                     |  10 +-
 tests/document/indexes.py                     |   4 +-
 tests/document/inheritance.py                 |  38 +-
 tests/document/instance.py                    | 195 +++++-----
 tests/document/json_serialisation.py          |   3 -
 tests/document/validation.py                  |  15 +-
 tests/fields/fields.py                        | 256 ++++---------
 tests/fields/file_tests.py                    |  85 ++---
 tests/fields/geo.py                           |   3 -
 tests/migration/__init__.py                   |  11 -
 .../convert_to_new_inheritance_model.py       |  51 ---
 tests/migration/decimalfield_as_float.py      |  50 ---
 .../referencefield_dbref_to_object_id.py      |  52 ---
 tests/migration/turn_off_inheritance.py       |  62 ---
 tests/migration/uuidfield_to_binary.py        |  48 ---
 tests/queryset/field_list.py                  |  11 +-
 tests/queryset/geo.py                         |   6 +-
 tests/queryset/modify.py                      |   5 +-
 tests/queryset/queryset.py                    | 179 +++++----
 tests/queryset/transform.py                   |   3 +-
 tests/queryset/visitor.py                     |  11 +-
 tests/test_connection.py                      |  18 +-
 tests/test_context_managers.py                |   8 +-
 tests/test_datastructures.py                  |   9 +-
 tests/test_dereference.py                     |  42 +--
 tests/test_replicaset_connection.py           |   7 +-
 tests/test_signals.py                         |   2 -
 60 files changed, 1567 insertions(+), 1896 deletions(-)
 create mode 100644 .landscape.yml
 delete mode 100644 tests/migration/__init__.py
 delete mode 100644 tests/migration/convert_to_new_inheritance_model.py
 delete mode 100644 tests/migration/decimalfield_as_float.py
 delete mode 100644 tests/migration/referencefield_dbref_to_object_id.py
 delete mode 100644 tests/migration/turn_off_inheritance.py
 delete mode 100644 tests/migration/uuidfield_to_binary.py

diff --git a/.landscape.yml b/.landscape.yml
new file mode 100644
index 000000000..a27bbb034
--- /dev/null
+++ b/.landscape.yml
@@ -0,0 +1,22 @@
+pylint:
+    disable:
+        # We use this a lot (e.g. via document._meta)
+        - protected-access
+
+    options:
+        additional-builtins:
+            # add xrange and long as valid built-ins. In Python 3, xrange is
+            # translated into range and long is translated into int via 2to3 (see
+            # "use_2to3" in setup.py). This should be removed when we drop Python
+            # 2 support (which probably won't happen any time soon).
+            - xrange
+            - long
+
+pyflakes:
+    disable:
+        # undefined variables are already covered by pylint (and exclude
+        # xrange & long)
+        - F821
+
+ignore-paths:
+    - benchmark.py
diff --git a/.travis.yml b/.travis.yml
index 4721a0868..cb6c97e69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 
 python:
-- '2.6'  # TODO remove in v0.11.0
 - '2.7'
 - '3.3'
 - '3.4'
@@ -43,7 +42,11 @@ before_script:
 script:
 - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 
-after_script: coveralls --verbose
+# For now only submit coveralls for Python v2.7. Python v3.x currently shows
+# 0% coverage. That's caused by 'use_2to3', which builds the py3-compatible
+# code in a separate dir and runs tests on that.
+after_script:
+- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls --verbose; fi
 
 notifications:
   irc: irc.freenode.org#mongoengine
diff --git a/benchmark.py b/benchmark.py
index 53ecf32cb..8e93ee40c 100644
--- a/benchmark.py
+++ b/benchmark.py
@@ -1,118 +1,41 @@
 #!/usr/bin/env python
 
-import timeit
-
-
-def cprofile_main():
-    from pymongo import Connection
-    connection = Connection()
-    connection.drop_database('timeit_test')
-    connection.disconnect()
-
-    from mongoengine import Document, DictField, connect
-    connect("timeit_test")
-
-    class Noddy(Document):
-        fields = DictField()
+"""
+Simple benchmark comparing PyMongo and MongoEngine.
+
+Sample run on a mid 2015 MacBook Pro (commit b282511):
+
+Benchmarking...
+----------------------------------------------------------------------------------------------------
+Creating 10000 dictionaries - Pymongo
+2.58979988098
+----------------------------------------------------------------------------------------------------
+Creating 10000 dictionaries - Pymongo write_concern={"w": 0}
+1.26657605171
+----------------------------------------------------------------------------------------------------
+Creating 10000 dictionaries - MongoEngine
+8.4351580143
+----------------------------------------------------------------------------------------------------
+Creating 10000 dictionaries without continual assign - MongoEngine
+7.20191693306
+----------------------------------------------------------------------------------------------------
+Creating 10000 dictionaries - MongoEngine - write_concern={"w": 0}, cascade = True
+6.31104588509
+----------------------------------------------------------------------------------------------------
+Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False, cascade=True
+6.07083487511
+----------------------------------------------------------------------------------------------------
+Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False
+5.97704291344
+----------------------------------------------------------------------------------------------------
+Creating 10000 dictionaries - MongoEngine, force_insert=True, write_concern={"w": 0}, validate=False
+5.9111430645
+"""
 
-    for i in range(1):
-        noddy = Noddy()
-        for j in range(20):
-            noddy.fields["key" + str(j)] = "value " + str(j)
-        noddy.save()
+import timeit
 
 
 def main():
-    """
-    0.4 Performance Figures ...
-
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - Pymongo
-    3.86744189262
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine
-    6.23374891281
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, safe=False, validate=False
-    5.33027005196
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, safe=False, validate=False, cascade=False
-    pass - No Cascade
-
-    0.5.X
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - Pymongo
-    3.89597702026
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine
-    21.7735359669
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, safe=False, validate=False
-    19.8670389652
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, safe=False, validate=False, cascade=False
-    pass - No Cascade
-
-    0.6.X
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - Pymongo
-    3.81559205055
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine
-    10.0446798801
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, safe=False, validate=False
-    9.51354718208
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, safe=False, validate=False, cascade=False
-    9.02567505836
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, force=True
-    8.44933390617
-
-    0.7.X
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - Pymongo
-    3.78801012039
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine
-    9.73050498962
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, safe=False, validate=False
-    8.33456707001
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, safe=False, validate=False, cascade=False
-    8.37778115273
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, force=True
-    8.36906409264
-    0.8.X
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - Pymongo
-    3.69964408875
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - Pymongo write_concern={"w": 0}
-    3.5526599884
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine
-    7.00959801674
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries without continual assign - MongoEngine
-    5.60943293571
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine - write_concern={"w": 0}, cascade=True
-    6.715102911
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False, cascade=True
-    5.50644683838
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False
-    4.69851183891
-    ----------------------------------------------------------------------------------------------------
-    Creating 10000 dictionaries - MongoEngine, force_insert=True, write_concern={"w": 0}, validate=False
-    4.68946313858
-    ----------------------------------------------------------------------------------------------------
-    """
     print("Benchmarking...")
 
     setup = """
@@ -131,7 +54,7 @@ def main():
 for i in range(10000):
     example = {'fields': {}}
     for j in range(20):
-        example['fields']["key"+str(j)] = "value "+str(j)
+        example['fields']['key' + str(j)] = 'value ' + str(j)
 
     noddy.save(example)
 
@@ -146,9 +69,10 @@ def main():
 
     stmt = """
 from pymongo import MongoClient
+from pymongo.write_concern import WriteConcern
 connection = MongoClient()
 
-db = connection.timeit_test
+db = connection.get_database('timeit_test', write_concern=WriteConcern(w=0))
 noddy = db.noddy
 
 for i in range(10000):
@@ -156,7 +80,7 @@ def main():
     for j in range(20):
         example['fields']["key"+str(j)] = "value "+str(j)
 
-    noddy.save(example, write_concern={"w": 0})
+    noddy.save(example)
 
 myNoddys = noddy.find()
 [n for n in myNoddys] # iterate
@@ -171,10 +95,10 @@ def main():
 from pymongo import MongoClient
 connection = MongoClient()
 connection.drop_database('timeit_test')
-connection.disconnect()
+connection.close()
 
 from mongoengine import Document, DictField, connect
-connect("timeit_test")
+connect('timeit_test')
 
 class Noddy(Document):
     fields = DictField()
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3407d9cea..e04c48fbc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,13 @@ Changelog
 
 Development
 ===========
+- (Fill this out as you fix issues and develop you features).
+
+Changes in 0.11.0
+=================
+- BREAKING CHANGE: Renamed `ConnectionError` to `MongoEngineConnectionError` since the former is a built-in exception name in Python v3.x. #1428
+- BREAKING CHANGE: Dropped Python 2.6 support. #1428
+- BREAKING CHANGE: `from mongoengine.base import ErrorClass` won't work anymore for any error from `mongoengine.errors` (e.g. `ValidationError`). Use `from mongoengine.errors import ErrorClass instead`. #1428
 - Fixed absent rounding for DecimalField when `force_string` is set. #1103
 
 Changes in 0.10.8
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index a363eae35..c0ae72051 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -2,6 +2,32 @@
 Upgrading
 #########
 
+0.11.0
+******
+This release includes a major rehaul of MongoEngine's code quality and
+introduces a few breaking changes. It also touches many different parts of
+the package and although all the changes have been tested and scrutinized,
+you're encouraged to thorougly test the upgrade.
+
+First breaking change involves renaming `ConnectionError` to `MongoEngineConnectionError`.
+If you import or catch this exception, you'll need to rename it in your code.
+
+Second breaking change drops Python v2.6 support. If you run MongoEngine on
+that Python version, you'll need to upgrade it first.
+
+Third breaking change drops an old backward compatibility measure where
+`from mongoengine.base import ErrorClass` would work on top of
+`from mongoengine.errors import ErrorClass` (where `ErrorClass` is e.g.
+`ValidationError`). If you import any exceptions from `mongoengine.base`,
+change it to `mongoengine.errors`.
+
+0.10.8
+******
+This version fixed an issue where specifying a MongoDB URI host would override
+more information than it should. These changes are minor, but they still
+subtly modify the connection logic and thus you're encouraged to test your
+MongoDB connection before shipping v0.10.8 in production.
+
 0.10.7
 ******
 
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 1544aa516..cece51265 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -1,25 +1,35 @@
-import connection
-from connection import *
-import document
-from document import *
-import errors
-from errors import *
-import fields
-from fields import *
-import queryset
-from queryset import *
-import signals
-from signals import *
-
-__all__ = (list(document.__all__) + fields.__all__ + connection.__all__ +
-           list(queryset.__all__) + signals.__all__ + list(errors.__all__))
+# Import submodules so that we can expose their __all__
+from mongoengine import connection
+from mongoengine import document
+from mongoengine import errors
+from mongoengine import fields
+from mongoengine import queryset
+from mongoengine import signals
+
+# Import everything from each submodule so that it can be accessed via
+# mongoengine, e.g. instead of `from mongoengine.connection import connect`,
+# users can simply use `from mongoengine import connect`, or even
+# `from mongoengine import *` and then `connect('testdb')`.
+from mongoengine.connection import *
+from mongoengine.document import *
+from mongoengine.errors import *
+from mongoengine.fields import *
+from mongoengine.queryset import *
+from mongoengine.signals import *
+
+
+__all__ = (list(document.__all__) + list(fields.__all__) +
+           list(connection.__all__) + list(queryset.__all__) +
+           list(signals.__all__) + list(errors.__all__))
+
 
 VERSION = (0, 10, 9)
 
 
 def get_version():
-    if isinstance(VERSION[-1], basestring):
-        return '.'.join(map(str, VERSION[:-1])) + VERSION[-1]
+    """Return the VERSION as a string, e.g. for VERSION == (0, 10, 7),
+    return '0.10.7'.
+    """
     return '.'.join(map(str, VERSION))
 
 
diff --git a/mongoengine/base/__init__.py b/mongoengine/base/__init__.py
index e8d4b6ad9..da31b9227 100644
--- a/mongoengine/base/__init__.py
+++ b/mongoengine/base/__init__.py
@@ -1,8 +1,28 @@
+# Base module is split into several files for convenience. Files inside of
+# this module should import from a specific submodule (e.g.
+# `from mongoengine.base.document import BaseDocument`), but all of the
+# other modules should import directly from the top-level module (e.g.
+# `from mongoengine.base import BaseDocument`). This approach is cleaner and
+# also helps with cyclical import errors.
 from mongoengine.base.common import *
 from mongoengine.base.datastructures import *
 from mongoengine.base.document import *
 from mongoengine.base.fields import *
 from mongoengine.base.metaclasses import *
 
-# Help with backwards compatibility
-from mongoengine.errors import *
+__all__ = (
+    # common
+    'UPDATE_OPERATORS', '_document_registry', 'get_document',
+
+    # datastructures
+    'BaseDict', 'BaseList', 'EmbeddedDocumentList',
+
+    # document
+    'BaseDocument',
+
+    # fields
+    'BaseField', 'ComplexBaseField', 'ObjectIdField', 'GeoJsonBaseField',
+
+    # metaclasses
+    'DocumentMetaclass', 'TopLevelDocumentMetaclass'
+)
diff --git a/mongoengine/base/common.py b/mongoengine/base/common.py
index 3a966c792..da2b8b68b 100644
--- a/mongoengine/base/common.py
+++ b/mongoengine/base/common.py
@@ -1,13 +1,18 @@
 from mongoengine.errors import NotRegistered
 
-__all__ = ('ALLOW_INHERITANCE', 'get_document', '_document_registry')
+__all__ = ('UPDATE_OPERATORS', 'get_document', '_document_registry')
+
+
+UPDATE_OPERATORS = set(['set', 'unset', 'inc', 'dec', 'pop', 'push',
+                        'push_all', 'pull', 'pull_all', 'add_to_set',
+                        'set_on_insert', 'min', 'max'])
 
-ALLOW_INHERITANCE = False
 
 _document_registry = {}
 
 
 def get_document(name):
+    """Get a document class by name."""
     doc = _document_registry.get(name, None)
     if not doc:
         # Possible old style name
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 2c6ebc2a5..5e90a2e55 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,14 +1,16 @@
 import itertools
 import weakref
 
+import six
+
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
 
-__all__ = ("BaseDict", "BaseList", "EmbeddedDocumentList")
+__all__ = ('BaseDict', 'BaseList', 'EmbeddedDocumentList')
 
 
 class BaseDict(dict):
-    """A special dict so we can watch any changes"""
+    """A special dict so we can watch any changes."""
 
     _dereferenced = False
     _instance = None
@@ -93,8 +95,7 @@ def _mark_as_changed(self, key=None):
 
 
 class BaseList(list):
-    """A special list so we can watch any changes
-    """
+    """A special list so we can watch any changes."""
 
     _dereferenced = False
     _instance = None
@@ -209,17 +210,22 @@ def _mark_as_changed(self, key=None):
 class EmbeddedDocumentList(BaseList):
 
     @classmethod
-    def __match_all(cls, i, kwargs):
-        items = kwargs.items()
-        return all([
-            getattr(i, k) == v or unicode(getattr(i, k)) == v for k, v in items
-        ])
+    def __match_all(cls, embedded_doc, kwargs):
+        """Return True if a given embedded doc matches all the filter
+        kwargs. If it doesn't return False.
+        """
+        for key, expected_value in kwargs.items():
+            doc_val = getattr(embedded_doc, key)
+            if doc_val != expected_value and six.text_type(doc_val) != expected_value:
+                return False
+        return True
 
     @classmethod
-    def __only_matches(cls, obj, kwargs):
+    def __only_matches(cls, embedded_docs, kwargs):
+        """Return embedded docs that match the filter kwargs."""
         if not kwargs:
-            return obj
-        return filter(lambda i: cls.__match_all(i, kwargs), obj)
+            return embedded_docs
+        return [doc for doc in embedded_docs if cls.__match_all(doc, kwargs)]
 
     def __init__(self, list_items, instance, name):
         super(EmbeddedDocumentList, self).__init__(list_items, instance, name)
@@ -285,18 +291,18 @@ def get(self, **kwargs):
         values = self.__only_matches(self, kwargs)
         if len(values) == 0:
             raise DoesNotExist(
-                "%s matching query does not exist." % self._name
+                '%s matching query does not exist.' % self._name
             )
         elif len(values) > 1:
             raise MultipleObjectsReturned(
-                "%d items returned, instead of 1" % len(values)
+                '%d items returned, instead of 1' % len(values)
             )
 
         return values[0]
 
     def first(self):
-        """
-        Returns the first embedded document in the list, or ``None`` if empty.
+        """Return the first embedded document in the list, or ``None``
+        if empty.
         """
         if len(self) > 0:
             return self[0]
@@ -438,7 +444,7 @@ class SpecificStrictDict(cls):
                 __slots__ = allowed_keys_tuple
 
                 def __repr__(self):
-                    return "{%s}" % ', '.join('"{0!s}": {1!r}'.format(k, v) for k, v in self.items())
+                    return '{%s}' % ', '.join('"{0!s}": {1!r}'.format(k, v) for k, v in self.items())
 
             cls._classes[allowed_keys] = SpecificStrictDict
         return cls._classes[allowed_keys]
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 59f5aebc7..03dc75626 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1,6 +1,5 @@
 import copy
 import numbers
-import operator
 from collections import Hashable
 from functools import partial
 
@@ -8,30 +7,27 @@
 from bson.dbref import DBRef
 from bson.son import SON
 import pymongo
+import six
 
 from mongoengine import signals
-from mongoengine.base.common import ALLOW_INHERITANCE, get_document
-from mongoengine.base.datastructures import (
-    BaseDict,
-    BaseList,
-    EmbeddedDocumentList,
-    SemiStrictDict,
-    StrictDict
-)
+from mongoengine.base.common import get_document
+from mongoengine.base.datastructures import (BaseDict, BaseList,
+                                             EmbeddedDocumentList,
+                                             SemiStrictDict, StrictDict)
 from mongoengine.base.fields import ComplexBaseField
 from mongoengine.common import _import_class
 from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError,
-                                LookUpError, ValidationError)
-from mongoengine.python_support import PY3, txt_type
+                                LookUpError, OperationError, ValidationError)
 
-__all__ = ('BaseDocument', 'NON_FIELD_ERRORS')
+__all__ = ('BaseDocument',)
 
 NON_FIELD_ERRORS = '__all__'
 
 
 class BaseDocument(object):
     __slots__ = ('_changed_fields', '_initialised', '_created', '_data',
-                 '_dynamic_fields', '_auto_id_field', '_db_field_map', '__weakref__')
+                 '_dynamic_fields', '_auto_id_field', '_db_field_map',
+                 '__weakref__')
 
     _dynamic = False
     _dynamic_lock = True
@@ -57,15 +53,15 @@ def __init__(self, *args, **values):
                 name = next(field)
                 if name in values:
                     raise TypeError(
-                        "Multiple values for keyword argument '" + name + "'")
+                        'Multiple values for keyword argument "%s"' % name)
                 values[name] = value
 
-        __auto_convert = values.pop("__auto_convert", True)
+        __auto_convert = values.pop('__auto_convert', True)
 
         # 399: set default values only to fields loaded from DB
-        __only_fields = set(values.pop("__only_fields", values))
+        __only_fields = set(values.pop('__only_fields', values))
 
-        _created = values.pop("_created", True)
+        _created = values.pop('_created', True)
 
         signals.pre_init.send(self.__class__, document=self, values=values)
 
@@ -76,7 +72,7 @@ def __init__(self, *args, **values):
                 self._fields.keys() + ['id', 'pk', '_cls', '_text_score'])
             if _undefined_fields:
                 msg = (
-                    "The fields '{0}' do not exist on the document '{1}'"
+                    'The fields "{0}" do not exist on the document "{1}"'
                 ).format(_undefined_fields, self._class_name)
                 raise FieldDoesNotExist(msg)
 
@@ -95,7 +91,7 @@ def __init__(self, *args, **values):
             value = getattr(self, key, None)
             setattr(self, key, value)
 
-        if "_cls" not in values:
+        if '_cls' not in values:
             self._cls = self._class_name
 
         # Set passed values after initialisation
@@ -150,7 +146,7 @@ def __setattr__(self, name, value):
         if self._dynamic and not self._dynamic_lock:
 
             if not hasattr(self, name) and not name.startswith('_'):
-                DynamicField = _import_class("DynamicField")
+                DynamicField = _import_class('DynamicField')
                 field = DynamicField(db_field=name)
                 field.name = name
                 self._dynamic_fields[name] = field
@@ -169,11 +165,13 @@ def __setattr__(self, name, value):
         except AttributeError:
             self__created = True
 
-        if (self._is_document and not self__created and
-                name in self._meta.get('shard_key', tuple()) and
-                self._data.get(name) != value):
-            OperationError = _import_class('OperationError')
-            msg = "Shard Keys are immutable. Tried to update %s" % name
+        if (
+            self._is_document and
+            not self__created and
+            name in self._meta.get('shard_key', tuple()) and
+            self._data.get(name) != value
+        ):
+            msg = 'Shard Keys are immutable. Tried to update %s' % name
             raise OperationError(msg)
 
         try:
@@ -197,8 +195,8 @@ def __getstate__(self):
         return data
 
     def __setstate__(self, data):
-        if isinstance(data["_data"], SON):
-            data["_data"] = self.__class__._from_son(data["_data"])._data
+        if isinstance(data['_data'], SON):
+            data['_data'] = self.__class__._from_son(data['_data'])._data
         for k in ('_changed_fields', '_initialised', '_created', '_data',
                   '_dynamic_fields'):
             if k in data:
@@ -212,7 +210,7 @@ def __setstate__(self, data):
 
         dynamic_fields = data.get('_dynamic_fields') or SON()
         for k in dynamic_fields.keys():
-            setattr(self, k, data["_data"].get(k))
+            setattr(self, k, data['_data'].get(k))
 
     def __iter__(self):
         return iter(self._fields_ordered)
@@ -254,12 +252,13 @@ def __repr__(self):
         return repr_type('<%s: %s>' % (self.__class__.__name__, u))
 
     def __str__(self):
+        # TODO this could be simpler?
         if hasattr(self, '__unicode__'):
-            if PY3:
+            if six.PY3:
                 return self.__unicode__()
             else:
-                return unicode(self).encode('utf-8')
-        return txt_type('%s object' % self.__class__.__name__)
+                return six.text_type(self).encode('utf-8')
+        return six.text_type('%s object' % self.__class__.__name__)
 
     def __eq__(self, other):
         if isinstance(other, self.__class__) and hasattr(other, 'id') and other.id is not None:
@@ -308,7 +307,7 @@ def to_mongo(self, use_db_field=True, fields=None):
             fields = []
 
         data = SON()
-        data["_id"] = None
+        data['_id'] = None
         data['_cls'] = self._class_name
 
         # only root fields ['test1.a', 'test2'] => ['test1', 'test2']
@@ -351,18 +350,8 @@ def to_mongo(self, use_db_field=True, fields=None):
                 else:
                     data[field.name] = value
 
-        # If "_id" has not been set, then try and set it
-        Document = _import_class("Document")
-        if isinstance(self, Document):
-            if data["_id"] is None:
-                data["_id"] = self._data.get("id", None)
-
-        if data['_id'] is None:
-            data.pop('_id')
-
         # Only add _cls if allow_inheritance is True
-        if (not hasattr(self, '_meta') or
-                not self._meta.get('allow_inheritance', ALLOW_INHERITANCE)):
+        if not self._meta.get('allow_inheritance'):
             data.pop('_cls')
 
         return data
@@ -376,16 +365,16 @@ def validate(self, clean=True):
         if clean:
             try:
                 self.clean()
-            except ValidationError, error:
+            except ValidationError as error:
                 errors[NON_FIELD_ERRORS] = error
 
         # Get a list of tuples of field names and their current values
         fields = [(self._fields.get(name, self._dynamic_fields.get(name)),
                    self._data.get(name)) for name in self._fields_ordered]
 
-        EmbeddedDocumentField = _import_class("EmbeddedDocumentField")
+        EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
         GenericEmbeddedDocumentField = _import_class(
-            "GenericEmbeddedDocumentField")
+            'GenericEmbeddedDocumentField')
 
         for field, value in fields:
             if value is not None:
@@ -395,21 +384,21 @@ def validate(self, clean=True):
                         field._validate(value, clean=clean)
                     else:
                         field._validate(value)
-                except ValidationError, error:
+                except ValidationError as error:
                     errors[field.name] = error.errors or error
-                except (ValueError, AttributeError, AssertionError), error:
+                except (ValueError, AttributeError, AssertionError) as error:
                     errors[field.name] = error
             elif field.required and not getattr(field, '_auto_gen', False):
                 errors[field.name] = ValidationError('Field is required',
                                                      field_name=field.name)
 
         if errors:
-            pk = "None"
+            pk = 'None'
             if hasattr(self, 'pk'):
                 pk = self.pk
             elif self._instance and hasattr(self._instance, 'pk'):
                 pk = self._instance.pk
-            message = "ValidationError (%s:%s) " % (self._class_name, pk)
+            message = 'ValidationError (%s:%s) ' % (self._class_name, pk)
             raise ValidationError(message, errors=errors)
 
     def to_json(self, *args, **kwargs):
@@ -426,33 +415,26 @@ def from_json(cls, json_data, created=False):
         return cls._from_son(json_util.loads(json_data), created=created)
 
     def __expand_dynamic_values(self, name, value):
-        """expand any dynamic values to their correct types / values"""
+        """Expand any dynamic values to their correct types / values."""
         if not isinstance(value, (dict, list, tuple)):
             return value
 
-        EmbeddedDocumentListField = _import_class('EmbeddedDocumentListField')
-
-        is_list = False
-        if not hasattr(value, 'items'):
-            is_list = True
-            value = dict([(k, v) for k, v in enumerate(value)])
-
-        if not is_list and '_cls' in value:
+        # If the value is a dict with '_cls' in it, turn it into a document
+        is_dict = isinstance(value, dict)
+        if is_dict and '_cls' in value:
             cls = get_document(value['_cls'])
             return cls(**value)
 
-        data = {}
-        for k, v in value.items():
-            key = name if is_list else k
-            data[k] = self.__expand_dynamic_values(key, v)
-
-        if is_list:  # Convert back to a list
-            data_items = sorted(data.items(), key=operator.itemgetter(0))
-            value = [v for k, v in data_items]
+        if is_dict:
+            value = {
+                k: self.__expand_dynamic_values(k, v)
+                for k, v in value.items()
+            }
         else:
-            value = data
+            value = [self.__expand_dynamic_values(name, v) for v in value]
 
         # Convert lists / values so we can watch for any changes on them
+        EmbeddedDocumentListField = _import_class('EmbeddedDocumentListField')
         if (isinstance(value, (list, tuple)) and
                 not isinstance(value, BaseList)):
             if issubclass(type(self), EmbeddedDocumentListField):
@@ -465,8 +447,7 @@ def __expand_dynamic_values(self, name, value):
         return value
 
     def _mark_as_changed(self, key):
-        """Marks a key as explicitly changed by the user
-        """
+        """Mark a key as explicitly changed by the user."""
         if not key:
             return
 
@@ -496,10 +477,11 @@ def _mark_as_changed(self, key):
                         remove(field)
 
     def _clear_changed_fields(self):
-        """Using get_changed_fields iterate and remove any fields that are
-        marked as changed"""
+        """Using _get_changed_fields iterate and remove any fields that
+        are marked as changed.
+        """
         for changed in self._get_changed_fields():
-            parts = changed.split(".")
+            parts = changed.split('.')
             data = self
             for part in parts:
                 if isinstance(data, list):
@@ -511,10 +493,13 @@ def _clear_changed_fields(self):
                     data = data.get(part, None)
                 else:
                     data = getattr(data, part, None)
-                if hasattr(data, "_changed_fields"):
-                    if hasattr(data, "_is_document") and data._is_document:
+
+                if hasattr(data, '_changed_fields'):
+                    if getattr(data, '_is_document', False):
                         continue
+
                     data._changed_fields = []
+
         self._changed_fields = []
 
     def _nestable_types_changed_fields(self, changed_fields, key, data, inspected):
@@ -526,26 +511,27 @@ def _nestable_types_changed_fields(self, changed_fields, key, data, inspected):
             iterator = data.iteritems()
 
         for index, value in iterator:
-            list_key = "%s%s." % (key, index)
+            list_key = '%s%s.' % (key, index)
             # don't check anything lower if this key is already marked
             # as changed.
             if list_key[:-1] in changed_fields:
                 continue
             if hasattr(value, '_get_changed_fields'):
                 changed = value._get_changed_fields(inspected)
-                changed_fields += ["%s%s" % (list_key, k)
+                changed_fields += ['%s%s' % (list_key, k)
                                    for k in changed if k]
             elif isinstance(value, (list, tuple, dict)):
                 self._nestable_types_changed_fields(
                     changed_fields, list_key, value, inspected)
 
     def _get_changed_fields(self, inspected=None):
-        """Returns a list of all fields that have explicitly been changed.
+        """Return a list of all fields that have explicitly been changed.
         """
-        EmbeddedDocument = _import_class("EmbeddedDocument")
-        DynamicEmbeddedDocument = _import_class("DynamicEmbeddedDocument")
-        ReferenceField = _import_class("ReferenceField")
-        SortedListField = _import_class("SortedListField")
+        EmbeddedDocument = _import_class('EmbeddedDocument')
+        DynamicEmbeddedDocument = _import_class('DynamicEmbeddedDocument')
+        ReferenceField = _import_class('ReferenceField')
+        SortedListField = _import_class('SortedListField')
+
         changed_fields = []
         changed_fields += getattr(self, '_changed_fields', [])
 
@@ -572,7 +558,7 @@ def _get_changed_fields(self, inspected=None):
             ):
                 # Find all embedded fields that have been changed
                 changed = data._get_changed_fields(inspected)
-                changed_fields += ["%s%s" % (key, k) for k in changed if k]
+                changed_fields += ['%s%s' % (key, k) for k in changed if k]
             elif (isinstance(data, (list, tuple, dict)) and
                     db_field_name not in changed_fields):
                 if (hasattr(field, 'field') and
@@ -676,21 +662,25 @@ def _delta(self):
 
     @classmethod
     def _get_collection_name(cls):
-        """Returns the collection name for this class. None for abstract class
+        """Return the collection name for this class. None for abstract
+        class.
         """
         return cls._meta.get('collection', None)
 
     @classmethod
     def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False):
-        """Create an instance of a Document (subclass) from a PyMongo SON.
+        """Create an instance of a Document (subclass) from a PyMongo
+        SON.
         """
         if not only_fields:
             only_fields = []
 
-        # get the class name from the document, falling back to the given
+        # Get the class name from the document, falling back to the given
         # class if unavailable
         class_name = son.get('_cls', cls._class_name)
-        data = dict(("%s" % key, value) for key, value in son.iteritems())
+
+        # Convert SON to a dict, making sure each key is a string
+        data = {str(key): value for key, value in son.iteritems()}
 
         # Return correct subclass for document type
         if class_name != cls._class_name:
@@ -712,19 +702,20 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
                                         else field.to_python(value))
                     if field_name != field.db_field:
                         del data[field.db_field]
-                except (AttributeError, ValueError), e:
+                except (AttributeError, ValueError) as e:
                     errors_dict[field_name] = e
 
         if errors_dict:
-            errors = "\n".join(["%s - %s" % (k, v)
+            errors = '\n'.join(['%s - %s' % (k, v)
                                 for k, v in errors_dict.items()])
-            msg = ("Invalid data to create a `%s` instance.\n%s"
+            msg = ('Invalid data to create a `%s` instance.\n%s'
                    % (cls._class_name, errors))
             raise InvalidDocumentError(msg)
 
+        # In STRICT documents, remove any keys that aren't in cls._fields
         if cls.STRICT:
-            data = dict((k, v)
-                        for k, v in data.iteritems() if k in cls._fields)
+            data = {k: v for k, v in data.iteritems() if k in cls._fields}
+
         obj = cls(__auto_convert=False, _created=created, __only_fields=only_fields, **data)
         obj._changed_fields = changed_fields
         if not _auto_dereference:
@@ -734,37 +725,43 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
 
     @classmethod
     def _build_index_specs(cls, meta_indexes):
-        """Generate and merge the full index specs
-        """
-
+        """Generate and merge the full index specs."""
         geo_indices = cls._geo_indices()
         unique_indices = cls._unique_with_indexes()
-        index_specs = [cls._build_index_spec(spec)
-                       for spec in meta_indexes]
+        index_specs = [cls._build_index_spec(spec) for spec in meta_indexes]
 
         def merge_index_specs(index_specs, indices):
+            """Helper method for merging index specs."""
             if not indices:
                 return index_specs
 
-            spec_fields = [v['fields']
-                           for k, v in enumerate(index_specs)]
-            # Merge unique_indexes with existing specs
-            for k, v in enumerate(indices):
-                if v['fields'] in spec_fields:
-                    index_specs[spec_fields.index(v['fields'])].update(v)
+            # Create a map of index fields to index spec. We're converting
+            # the fields from a list to a tuple so that it's hashable.
+            spec_fields = {
+                tuple(index['fields']): index for index in index_specs
+            }
+
+            # For each new index, if there's an existing index with the same
+            # fields list, update the existing spec with all data from the
+            # new spec.
+            for new_index in indices:
+                candidate = spec_fields.get(tuple(new_index['fields']))
+                if candidate is None:
+                    index_specs.append(new_index)
                 else:
-                    index_specs.append(v)
+                    candidate.update(new_index)
+
             return index_specs
 
+        # Merge geo indexes and unique_with indexes into the meta index specs.
         index_specs = merge_index_specs(index_specs, geo_indices)
         index_specs = merge_index_specs(index_specs, unique_indices)
         return index_specs
 
     @classmethod
     def _build_index_spec(cls, spec):
-        """Build a PyMongo index spec from a MongoEngine index spec.
-        """
-        if isinstance(spec, basestring):
+        """Build a PyMongo index spec from a MongoEngine index spec."""
+        if isinstance(spec, six.string_types):
             spec = {'fields': [spec]}
         elif isinstance(spec, (list, tuple)):
             spec = {'fields': list(spec)}
@@ -775,8 +772,7 @@ def _build_index_spec(cls, spec):
         direction = None
 
         # Check to see if we need to include _cls
-        allow_inheritance = cls._meta.get('allow_inheritance',
-                                          ALLOW_INHERITANCE)
+        allow_inheritance = cls._meta.get('allow_inheritance')
         include_cls = (
             allow_inheritance and
             not spec.get('sparse', False) and
@@ -786,7 +782,7 @@ def _build_index_spec(cls, spec):
 
         # 733: don't include cls if index_cls is False unless there is an explicit cls with the index
         include_cls = include_cls and (spec.get('cls', False) or cls._meta.get('index_cls', True))
-        if "cls" in spec:
+        if 'cls' in spec:
             spec.pop('cls')
         for key in spec['fields']:
             # If inherited spec continue
@@ -801,19 +797,19 @@ def _build_index_spec(cls, spec):
             # GEOHAYSTACK from )
             # GEO2D from *
             direction = pymongo.ASCENDING
-            if key.startswith("-"):
+            if key.startswith('-'):
                 direction = pymongo.DESCENDING
-            elif key.startswith("$"):
+            elif key.startswith('$'):
                 direction = pymongo.TEXT
-            elif key.startswith("#"):
+            elif key.startswith('#'):
                 direction = pymongo.HASHED
-            elif key.startswith("("):
+            elif key.startswith('('):
                 direction = pymongo.GEOSPHERE
-            elif key.startswith(")"):
+            elif key.startswith(')'):
                 direction = pymongo.GEOHAYSTACK
-            elif key.startswith("*"):
+            elif key.startswith('*'):
                 direction = pymongo.GEO2D
-            if key.startswith(("+", "-", "*", "$", "#", "(", ")")):
+            if key.startswith(('+', '-', '*', '$', '#', '(', ')')):
                 key = key[1:]
 
             # Use real field name, do it manually because we need field
@@ -826,7 +822,7 @@ def _build_index_spec(cls, spec):
                 parts = []
                 for field in fields:
                     try:
-                        if field != "_id":
+                        if field != '_id':
                             field = field.db_field
                     except AttributeError:
                         pass
@@ -845,49 +841,53 @@ def _build_index_spec(cls, spec):
         return spec
 
     @classmethod
-    def _unique_with_indexes(cls, namespace=""):
-        """
-        Find and set unique indexes
-        """
+    def _unique_with_indexes(cls, namespace=''):
+        """Find unique indexes in the document schema and return them."""
         unique_indexes = []
         for field_name, field in cls._fields.items():
             sparse = field.sparse
+
             # Generate a list of indexes needed by uniqueness constraints
             if field.unique:
                 unique_fields = [field.db_field]
 
                 # Add any unique_with fields to the back of the index spec
                 if field.unique_with:
-                    if isinstance(field.unique_with, basestring):
+                    if isinstance(field.unique_with, six.string_types):
                         field.unique_with = [field.unique_with]
 
                     # Convert unique_with field names to real field names
                     unique_with = []
                     for other_name in field.unique_with:
                         parts = other_name.split('.')
+
                         # Lookup real name
                         parts = cls._lookup_field(parts)
                         name_parts = [part.db_field for part in parts]
                         unique_with.append('.'.join(name_parts))
+
                         # Unique field should be required
                         parts[-1].required = True
                         sparse = (not sparse and
                                   parts[-1].name not in cls.__dict__)
+
                     unique_fields += unique_with
 
                 # Add the new index to the list
-                fields = [("%s%s" % (namespace, f), pymongo.ASCENDING)
-                          for f in unique_fields]
+                fields = [
+                    ('%s%s' % (namespace, f), pymongo.ASCENDING)
+                    for f in unique_fields
+                ]
                 index = {'fields': fields, 'unique': True, 'sparse': sparse}
                 unique_indexes.append(index)
 
-            if field.__class__.__name__ == "ListField":
+            if field.__class__.__name__ == 'ListField':
                 field = field.field
 
             # Grab any embedded document field unique indexes
-            if (field.__class__.__name__ == "EmbeddedDocumentField" and
+            if (field.__class__.__name__ == 'EmbeddedDocumentField' and
                     field.document_type != cls):
-                field_namespace = "%s." % field_name
+                field_namespace = '%s.' % field_name
                 doc_cls = field.document_type
                 unique_indexes += doc_cls._unique_with_indexes(field_namespace)
 
@@ -899,8 +899,9 @@ def _geo_indices(cls, inspected=None, parent_field=None):
         geo_indices = []
         inspected.append(cls)
 
-        geo_field_type_names = ["EmbeddedDocumentField", "GeoPointField",
-                                "PointField", "LineStringField", "PolygonField"]
+        geo_field_type_names = ('EmbeddedDocumentField', 'GeoPointField',
+                                'PointField', 'LineStringField',
+                                'PolygonField')
 
         geo_field_types = tuple([_import_class(field)
                                  for field in geo_field_type_names])
@@ -908,32 +909,68 @@ def _geo_indices(cls, inspected=None, parent_field=None):
         for field in cls._fields.values():
             if not isinstance(field, geo_field_types):
                 continue
+
             if hasattr(field, 'document_type'):
                 field_cls = field.document_type
                 if field_cls in inspected:
                     continue
+
                 if hasattr(field_cls, '_geo_indices'):
                     geo_indices += field_cls._geo_indices(
                         inspected, parent_field=field.db_field)
             elif field._geo_index:
                 field_name = field.db_field
                 if parent_field:
-                    field_name = "%s.%s" % (parent_field, field_name)
-                geo_indices.append({'fields':
-                                    [(field_name, field._geo_index)]})
+                    field_name = '%s.%s' % (parent_field, field_name)
+                geo_indices.append({
+                    'fields': [(field_name, field._geo_index)]
+                })
+
         return geo_indices
 
     @classmethod
     def _lookup_field(cls, parts):
-        """Lookup a field based on its attribute and return a list containing
-        the field's parents and the field.
+        """Given the path to a given field, return a list containing
+        the Field object associated with that field and all of its parent
+        Field objects.
+
+        Args:
+            parts (str, list, or tuple) - path to the field. Should be a
+            string for simple fields existing on this document or a list
+            of strings for a field that exists deeper in embedded documents.
+
+        Returns:
+            A list of Field instances for fields that were found or
+            strings for sub-fields that weren't.
+
+        Example:
+            >>> user._lookup_field('name')
+            [<mongoengine.fields.StringField at 0x1119bff50>]
+
+            >>> user._lookup_field('roles')
+            [<mongoengine.fields.EmbeddedDocumentListField at 0x1119ec250>]
+
+            >>> user._lookup_field(['roles', 'role'])
+            [<mongoengine.fields.EmbeddedDocumentListField at 0x1119ec250>,
+             <mongoengine.fields.StringField at 0x1119ec050>]
+
+            >>> user._lookup_field('doesnt_exist')
+            raises LookUpError
+
+            >>> user._lookup_field(['roles', 'doesnt_exist'])
+            [<mongoengine.fields.EmbeddedDocumentListField at 0x1119ec250>,
+             'doesnt_exist']
+
         """
+        # TODO this method is WAY too complicated. Simplify it.
+        # TODO don't think returning a string for embedded non-existent fields is desired
 
-        ListField = _import_class("ListField")
+        ListField = _import_class('ListField')
         DynamicField = _import_class('DynamicField')
 
         if not isinstance(parts, (list, tuple)):
             parts = [parts]
+
         fields = []
         field = None
 
@@ -943,16 +980,17 @@ def _lookup_field(cls, parts):
                 fields.append(field_name)
                 continue
 
+            # Look up first field from the document
             if field is None:
-                # Look up first field from the document
                 if field_name == 'pk':
                     # Deal with "primary key" alias
                     field_name = cls._meta['id_field']
+
                 if field_name in cls._fields:
                     field = cls._fields[field_name]
                 elif cls._dynamic:
                     field = DynamicField(db_field=field_name)
-                elif cls._meta.get("allow_inheritance", False) or cls._meta.get("abstract", False):
+                elif cls._meta.get('allow_inheritance') or cls._meta.get('abstract', False):
                     # 744: in case the field is defined in a subclass
                     for subcls in cls.__subclasses__():
                         try:
@@ -965,35 +1003,55 @@ def _lookup_field(cls, parts):
                     else:
                         raise LookUpError('Cannot resolve field "%s"' % field_name)
                 else:
-                    raise LookUpError('Cannot resolve field "%s"'
-                                      % field_name)
+                    raise LookUpError('Cannot resolve field "%s"' % field_name)
             else:
                 ReferenceField = _import_class('ReferenceField')
                 GenericReferenceField = _import_class('GenericReferenceField')
+
+                # If previous field was a reference, throw an error (we
+                # cannot look up fields that are on references).
                 if isinstance(field, (ReferenceField, GenericReferenceField)):
                     raise LookUpError('Cannot perform join in mongoDB: %s' %
                                       '__'.join(parts))
+
+                # If the parent field has a "field" attribute which has a
+                # lookup_member method, call it to find the field
+                # corresponding to this iteration.
                 if hasattr(getattr(field, 'field', None), 'lookup_member'):
                     new_field = field.field.lookup_member(field_name)
+
+                # If the parent field is a DynamicField or if it's part of
+                # a DynamicDocument, mark current field as a DynamicField
+                # with db_name equal to the field name.
                 elif cls._dynamic and (isinstance(field, DynamicField) or
                                        getattr(getattr(field, 'document_type', None), '_dynamic', None)):
                     new_field = DynamicField(db_field=field_name)
+
+                # Else, try to use the parent field's lookup_member method
+                # to find the subfield.
+                elif hasattr(field, 'lookup_member'):
+                    new_field = field.lookup_member(field_name)
+
+                # Raise a LookUpError if all the other conditions failed.
                 else:
-                    # Look up subfield on the previous field or raise
-                    try:
-                        new_field = field.lookup_member(field_name)
-                    except AttributeError:
-                        raise LookUpError('Cannot resolve subfield or operator {} '
-                                          'on the field {}'.format(
-                                              field_name, field.name))
+                    raise LookUpError(
+                        'Cannot resolve subfield or operator {} '
+                        'on the field {}'.format(field_name, field.name)
+                    )
+
+                # If current field still wasn't found and the parent field
+                # is a ComplexBaseField, add the name current field name and
+                # move on.
                 if not new_field and isinstance(field, ComplexBaseField):
                     fields.append(field_name)
                     continue
                 elif not new_field:
-                    raise LookUpError('Cannot resolve field "%s"'
-                                      % field_name)
+                    raise LookUpError('Cannot resolve field "%s"' % field_name)
+
                 field = new_field  # update field to the new field type
+
             fields.append(field)
+
         return fields
 
     @classmethod
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 037074d10..b13660c1d 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -4,21 +4,17 @@
 
 from bson import DBRef, ObjectId, SON
 import pymongo
+import six
 
-from mongoengine.base.common import ALLOW_INHERITANCE
-from mongoengine.base.datastructures import (
-    BaseDict, BaseList, EmbeddedDocumentList
-)
+from mongoengine.base.common import UPDATE_OPERATORS
+from mongoengine.base.datastructures import (BaseDict, BaseList,
+                                             EmbeddedDocumentList)
 from mongoengine.common import _import_class
 from mongoengine.errors import ValidationError
 
-__all__ = ("BaseField", "ComplexBaseField",
-           "ObjectIdField", "GeoJsonBaseField")
 
-
-UPDATE_OPERATORS = set(['set', 'unset', 'inc', 'dec', 'pop', 'push',
-                        'push_all', 'pull', 'pull_all', 'add_to_set',
-                        'set_on_insert', 'min', 'max'])
+__all__ = ('BaseField', 'ComplexBaseField', 'ObjectIdField',
+           'GeoJsonBaseField')
 
 
 class BaseField(object):
@@ -73,7 +69,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.db_field = (db_field or name) if not primary_key else '_id'
 
         if name:
-            msg = "Fields' 'name' attribute deprecated in favour of 'db_field'"
+            msg = 'Field\'s "name" attribute deprecated in favour of "db_field"'
             warnings.warn(msg, DeprecationWarning)
         self.required = required or primary_key
         self.default = default
@@ -89,7 +85,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         # Detect and report conflicts between metadata and base properties.
         conflicts = set(dir(self)) & set(kwargs)
         if conflicts:
-            raise TypeError("%s already has attribute(s): %s" % (
+            raise TypeError('%s already has attribute(s): %s' % (
                 self.__class__.__name__, ', '.join(conflicts)))
 
         # Assign metadata to the instance
@@ -147,25 +143,21 @@ def __set__(self, instance, value):
                     v._instance = weakref.proxy(instance)
         instance._data[self.name] = value
 
-    def error(self, message="", errors=None, field_name=None):
-        """Raises a ValidationError.
-        """
+    def error(self, message='', errors=None, field_name=None):
+        """Raise a ValidationError."""
         field_name = field_name if field_name else self.name
         raise ValidationError(message, errors=errors, field_name=field_name)
 
     def to_python(self, value):
-        """Convert a MongoDB-compatible type to a Python type.
-        """
+        """Convert a MongoDB-compatible type to a Python type."""
         return value
 
     def to_mongo(self, value):
-        """Convert a Python type to a MongoDB-compatible type.
-        """
+        """Convert a Python type to a MongoDB-compatible type."""
         return self.to_python(value)
 
     def _to_mongo_safe_call(self, value, use_db_field=True, fields=None):
-        """A helper method to call to_mongo with proper inputs
-        """
+        """Helper method to call to_mongo with proper inputs."""
         f_inputs = self.to_mongo.__code__.co_varnames
         ex_vars = {}
         if 'fields' in f_inputs:
@@ -177,15 +169,13 @@ def _to_mongo_safe_call(self, value, use_db_field=True, fields=None):
         return self.to_mongo(value, **ex_vars)
 
     def prepare_query_value(self, op, value):
-        """Prepare a value that is being used in a query for PyMongo.
-        """
+        """Prepare a value that is being used in a query for PyMongo."""
         if op in UPDATE_OPERATORS:
             self.validate(value)
         return value
 
     def validate(self, value, clean=True):
-        """Perform validation on a value.
-        """
+        """Perform validation on a value."""
         pass
 
     def _validate_choices(self, value):
@@ -200,11 +190,13 @@ def _validate_choices(self, value):
         if isinstance(value, (Document, EmbeddedDocument)):
             if not any(isinstance(value, c) for c in choice_list):
                 self.error(
-                    'Value must be instance of %s' % unicode(choice_list)
+                    'Value must be an instance of %s' % (
+                        six.text_type(choice_list)
+                    )
                 )
         # Choices which are types other than Documents
         elif value not in choice_list:
-            self.error('Value must be one of %s' % unicode(choice_list))
+            self.error('Value must be one of %s' % six.text_type(choice_list))
 
     def _validate(self, value, **kwargs):
         # Check the Choices Constraint
@@ -247,8 +239,7 @@ class ComplexBaseField(BaseField):
     field = None
 
     def __get__(self, instance, owner):
-        """Descriptor to automatically dereference references.
-        """
+        """Descriptor to automatically dereference references."""
         if instance is None:
             # Document class being used rather than a document object
             return self
@@ -260,7 +251,7 @@ def __get__(self, instance, owner):
                        (self.field is None or isinstance(self.field,
                                                          (GenericReferenceField, ReferenceField))))
 
-        _dereference = _import_class("DeReference")()
+        _dereference = _import_class('DeReference')()
 
         self._auto_dereference = instance._fields[self.name]._auto_dereference
         if instance._initialised and dereference and instance._data.get(self.name):
@@ -295,9 +286,8 @@ def __get__(self, instance, owner):
         return value
 
     def to_python(self, value):
-        """Convert a MongoDB-compatible type to a Python type.
-        """
-        if isinstance(value, basestring):
+        """Convert a MongoDB-compatible type to a Python type."""
+        if isinstance(value, six.string_types):
             return value
 
         if hasattr(value, 'to_python'):
@@ -307,14 +297,14 @@ def to_python(self, value):
         if not hasattr(value, 'items'):
             try:
                 is_list = True
-                value = dict([(k, v) for k, v in enumerate(value)])
+                value = {k: v for k, v in enumerate(value)}
             except TypeError:  # Not iterable return the value
                 return value
 
         if self.field:
             self.field._auto_dereference = self._auto_dereference
-            value_dict = dict([(key, self.field.to_python(item))
-                               for key, item in value.items()])
+            value_dict = {key: self.field.to_python(item)
+                          for key, item in value.items()}
         else:
             Document = _import_class('Document')
             value_dict = {}
@@ -337,13 +327,12 @@ def to_python(self, value):
         return value_dict
 
     def to_mongo(self, value, use_db_field=True, fields=None):
-        """Convert a Python type to a MongoDB-compatible type.
-        """
-        Document = _import_class("Document")
-        EmbeddedDocument = _import_class("EmbeddedDocument")
-        GenericReferenceField = _import_class("GenericReferenceField")
+        """Convert a Python type to a MongoDB-compatible type."""
+        Document = _import_class('Document')
+        EmbeddedDocument = _import_class('EmbeddedDocument')
+        GenericReferenceField = _import_class('GenericReferenceField')
 
-        if isinstance(value, basestring):
+        if isinstance(value, six.string_types):
             return value
 
         if hasattr(value, 'to_mongo'):
@@ -360,13 +349,15 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         if not hasattr(value, 'items'):
             try:
                 is_list = True
-                value = dict([(k, v) for k, v in enumerate(value)])
+                value = {k: v for k, v in enumerate(value)}
             except TypeError:  # Not iterable return the value
                 return value
 
         if self.field:
-            value_dict = dict([(key, self.field._to_mongo_safe_call(item, use_db_field, fields))
-                               for key, item in value.iteritems()])
+            value_dict = {
+                key: self.field._to_mongo_safe_call(item, use_db_field, fields)
+                for key, item in value.iteritems()
+            }
         else:
             value_dict = {}
             for k, v in value.iteritems():
@@ -380,9 +371,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
                     # any _cls data so make it a generic reference allows
                     # us to dereference
                     meta = getattr(v, '_meta', {})
-                    allow_inheritance = (
-                        meta.get('allow_inheritance', ALLOW_INHERITANCE)
-                        is True)
+                    allow_inheritance = meta.get('allow_inheritance')
                     if not allow_inheritance and not self.field:
                         value_dict[k] = GenericReferenceField().to_mongo(v)
                     else:
@@ -404,8 +393,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         return value_dict
 
     def validate(self, value):
-        """If field is provided ensure the value is valid.
-        """
+        """If field is provided ensure the value is valid."""
         errors = {}
         if self.field:
             if hasattr(value, 'iteritems') or hasattr(value, 'items'):
@@ -415,9 +403,9 @@ def validate(self, value):
             for k, v in sequence:
                 try:
                     self.field._validate(v)
-                except ValidationError, error:
+                except ValidationError as error:
                     errors[k] = error.errors or error
-                except (ValueError, AssertionError), error:
+                except (ValueError, AssertionError) as error:
                     errors[k] = error
 
             if errors:
@@ -443,8 +431,7 @@ def _set_owner_document(self, owner_document):
 
 
 class ObjectIdField(BaseField):
-    """A field wrapper around MongoDB's ObjectIds.
-    """
+    """A field wrapper around MongoDB's ObjectIds."""
 
     def to_python(self, value):
         try:
@@ -457,10 +444,10 @@ def to_python(self, value):
     def to_mongo(self, value):
         if not isinstance(value, ObjectId):
             try:
-                return ObjectId(unicode(value))
-            except Exception, e:
+                return ObjectId(six.text_type(value))
+            except Exception as e:
                 # e.message attribute has been deprecated since Python 2.6
-                self.error(unicode(e))
+                self.error(six.text_type(e))
         return value
 
     def prepare_query_value(self, op, value):
@@ -468,7 +455,7 @@ def prepare_query_value(self, op, value):
 
     def validate(self, value):
         try:
-            ObjectId(unicode(value))
+            ObjectId(six.text_type(value))
         except Exception:
             self.error('Invalid Object ID')
 
@@ -480,21 +467,20 @@ class GeoJsonBaseField(BaseField):
     """
 
     _geo_index = pymongo.GEOSPHERE
-    _type = "GeoBase"
+    _type = 'GeoBase'
 
     def __init__(self, auto_index=True, *args, **kwargs):
         """
-        :param bool auto_index: Automatically create a "2dsphere" index.\
+        :param bool auto_index: Automatically create a '2dsphere' index.\
             Defaults to `True`.
         """
-        self._name = "%sField" % self._type
+        self._name = '%sField' % self._type
         if not auto_index:
             self._geo_index = False
         super(GeoJsonBaseField, self).__init__(*args, **kwargs)
 
     def validate(self, value):
-        """Validate the GeoJson object based on its type
-        """
+        """Validate the GeoJson object based on its type."""
         if isinstance(value, dict):
             if set(value.keys()) == set(['type', 'coordinates']):
                 if value['type'] != self._type:
@@ -509,7 +495,7 @@ def validate(self, value):
             self.error('%s can only accept lists of [x, y]' % self._name)
             return
 
-        validate = getattr(self, "_validate_%s" % self._type.lower())
+        validate = getattr(self, '_validate_%s' % self._type.lower())
         error = validate(value)
         if error:
             self.error(error)
@@ -522,7 +508,7 @@ def _validate_polygon(self, value, top_level=True):
         try:
             value[0][0][0]
         except (TypeError, IndexError):
-            return "Invalid Polygon must contain at least one valid linestring"
+            return 'Invalid Polygon must contain at least one valid linestring'
 
         errors = []
         for val in value:
@@ -533,12 +519,12 @@ def _validate_polygon(self, value, top_level=True):
                 errors.append(error)
         if errors:
             if top_level:
-                return "Invalid Polygon:\n%s" % ", ".join(errors)
+                return 'Invalid Polygon:\n%s' % ', '.join(errors)
             else:
-                return "%s" % ", ".join(errors)
+                return '%s' % ', '.join(errors)
 
     def _validate_linestring(self, value, top_level=True):
-        """Validates a linestring"""
+        """Validate a linestring."""
         if not isinstance(value, (list, tuple)):
             return 'LineStrings must contain list of coordinate pairs'
 
@@ -546,7 +532,7 @@ def _validate_linestring(self, value, top_level=True):
         try:
             value[0][0]
         except (TypeError, IndexError):
-            return "Invalid LineString must contain at least one valid point"
+            return 'Invalid LineString must contain at least one valid point'
 
         errors = []
         for val in value:
@@ -555,19 +541,19 @@ def _validate_linestring(self, value, top_level=True):
                 errors.append(error)
         if errors:
             if top_level:
-                return "Invalid LineString:\n%s" % ", ".join(errors)
+                return 'Invalid LineString:\n%s' % ', '.join(errors)
             else:
-                return "%s" % ", ".join(errors)
+                return '%s' % ', '.join(errors)
 
     def _validate_point(self, value):
         """Validate each set of coords"""
         if not isinstance(value, (list, tuple)):
             return 'Points must be a list of coordinate pairs'
         elif not len(value) == 2:
-            return "Value (%s) must be a two-dimensional point" % repr(value)
+            return 'Value (%s) must be a two-dimensional point' % repr(value)
         elif (not isinstance(value[0], (float, int)) or
               not isinstance(value[1], (float, int))):
-            return "Both values (%s) in point must be float or int" % repr(value)
+            return 'Both values (%s) in point must be float or int' % repr(value)
 
     def _validate_multipoint(self, value):
         if not isinstance(value, (list, tuple)):
@@ -577,7 +563,7 @@ def _validate_multipoint(self, value):
         try:
             value[0][0]
         except (TypeError, IndexError):
-            return "Invalid MultiPoint must contain at least one valid point"
+            return 'Invalid MultiPoint must contain at least one valid point'
 
         errors = []
         for point in value:
@@ -586,7 +572,7 @@ def _validate_multipoint(self, value):
                 errors.append(error)
 
         if errors:
-            return "%s" % ", ".join(errors)
+            return '%s' % ', '.join(errors)
 
     def _validate_multilinestring(self, value, top_level=True):
         if not isinstance(value, (list, tuple)):
@@ -596,7 +582,7 @@ def _validate_multilinestring(self, value, top_level=True):
         try:
             value[0][0][0]
         except (TypeError, IndexError):
-            return "Invalid MultiLineString must contain at least one valid linestring"
+            return 'Invalid MultiLineString must contain at least one valid linestring'
 
         errors = []
         for linestring in value:
@@ -606,9 +592,9 @@ def _validate_multilinestring(self, value, top_level=True):
 
         if errors:
             if top_level:
-                return "Invalid MultiLineString:\n%s" % ", ".join(errors)
+                return 'Invalid MultiLineString:\n%s' % ', '.join(errors)
             else:
-                return "%s" % ", ".join(errors)
+                return '%s' % ', '.join(errors)
 
     def _validate_multipolygon(self, value):
         if not isinstance(value, (list, tuple)):
@@ -618,7 +604,7 @@ def _validate_multipolygon(self, value):
         try:
             value[0][0][0][0]
         except (TypeError, IndexError):
-            return "Invalid MultiPolygon must contain at least one valid Polygon"
+            return 'Invalid MultiPolygon must contain at least one valid Polygon'
 
         errors = []
         for polygon in value:
@@ -627,9 +613,9 @@ def _validate_multipolygon(self, value):
                 errors.append(error)
 
         if errors:
-            return "Invalid MultiPolygon:\n%s" % ", ".join(errors)
+            return 'Invalid MultiPolygon:\n%s' % ', '.join(errors)
 
     def to_mongo(self, value):
         if isinstance(value, dict):
             return value
-        return SON([("type", self._type), ("coordinates", value)])
+        return SON([('type', self._type), ('coordinates', value)])
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 972834517..481408bf0 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -1,10 +1,11 @@
 import warnings
 
-from mongoengine.base.common import ALLOW_INHERITANCE, _document_registry
+import six
+
+from mongoengine.base.common import _document_registry
 from mongoengine.base.fields import BaseField, ComplexBaseField, ObjectIdField
 from mongoengine.common import _import_class
 from mongoengine.errors import InvalidDocumentError
-from mongoengine.python_support import PY3
 from mongoengine.queryset import (DO_NOTHING, DoesNotExist,
                                   MultipleObjectsReturned,
                                   QuerySetManager)
@@ -45,7 +46,8 @@ def __new__(cls, name, bases, attrs):
             attrs['_meta'] = meta
             attrs['_meta']['abstract'] = False  # 789: EmbeddedDocument shouldn't inherit abstract
 
-        if attrs['_meta'].get('allow_inheritance', ALLOW_INHERITANCE):
+        # If allow_inheritance is True, add a "_cls" string field to the attrs
+        if attrs['_meta'].get('allow_inheritance'):
             StringField = _import_class('StringField')
             attrs['_cls'] = StringField()
 
@@ -87,16 +89,17 @@ def __new__(cls, name, bases, attrs):
         # Ensure no duplicate db_fields
         duplicate_db_fields = [k for k, v in field_names.items() if v > 1]
         if duplicate_db_fields:
-            msg = ("Multiple db_fields defined for: %s " %
-                   ", ".join(duplicate_db_fields))
+            msg = ('Multiple db_fields defined for: %s ' %
+                   ', '.join(duplicate_db_fields))
             raise InvalidDocumentError(msg)
 
         # Set _fields and db_field maps
         attrs['_fields'] = doc_fields
-        attrs['_db_field_map'] = dict([(k, getattr(v, 'db_field', k))
-                                       for k, v in doc_fields.iteritems()])
-        attrs['_reverse_db_field_map'] = dict(
-            (v, k) for k, v in attrs['_db_field_map'].iteritems())
+        attrs['_db_field_map'] = {k: getattr(v, 'db_field', k)
+                                  for k, v in doc_fields.items()}
+        attrs['_reverse_db_field_map'] = {
+            v: k for k, v in attrs['_db_field_map'].items()
+        }
 
         attrs['_fields_ordered'] = tuple(i[1] for i in sorted(
                                          (v.creation_counter, v.name)
@@ -116,10 +119,8 @@ def __new__(cls, name, bases, attrs):
             if hasattr(base, '_meta'):
                 # Warn if allow_inheritance isn't set and prevent
                 # inheritance of classes where inheritance is set to False
-                allow_inheritance = base._meta.get('allow_inheritance',
-                                                   ALLOW_INHERITANCE)
-                if (allow_inheritance is not True and
-                        not base._meta.get('abstract')):
+                allow_inheritance = base._meta.get('allow_inheritance')
+                if not allow_inheritance and not base._meta.get('abstract'):
                     raise ValueError('Document %s may not be subclassed' %
                                      base.__name__)
 
@@ -161,7 +162,7 @@ def __new__(cls, name, bases, attrs):
         # module continues to use im_func and im_self, so the code below
         # copies __func__ into im_func and __self__ into im_self for
         # classmethod objects in Document derived classes.
-        if PY3:
+        if six.PY3:
             for val in new_class.__dict__.values():
                 if isinstance(val, classmethod):
                     f = val.__get__(new_class)
@@ -179,11 +180,11 @@ def __new__(cls, name, bases, attrs):
             if isinstance(f, CachedReferenceField):
 
                 if issubclass(new_class, EmbeddedDocument):
-                    raise InvalidDocumentError(
-                        "CachedReferenceFields is not allowed in EmbeddedDocuments")
+                    raise InvalidDocumentError('CachedReferenceFields is not '
+                                               'allowed in EmbeddedDocuments')
                 if not f.document_type:
                     raise InvalidDocumentError(
-                        "Document is not available to sync")
+                        'Document is not available to sync')
 
                 if f.auto_sync:
                     f.start_listener()
@@ -195,8 +196,8 @@ def __new__(cls, name, bases, attrs):
                                       'reverse_delete_rule',
                                       DO_NOTHING)
                 if isinstance(f, DictField) and delete_rule != DO_NOTHING:
-                    msg = ("Reverse delete rules are not supported "
-                           "for %s (field: %s)" %
+                    msg = ('Reverse delete rules are not supported '
+                           'for %s (field: %s)' %
                            (field.__class__.__name__, field.name))
                     raise InvalidDocumentError(msg)
 
@@ -204,16 +205,16 @@ def __new__(cls, name, bases, attrs):
 
             if delete_rule != DO_NOTHING:
                 if issubclass(new_class, EmbeddedDocument):
-                    msg = ("Reverse delete rules are not supported for "
-                           "EmbeddedDocuments (field: %s)" % field.name)
+                    msg = ('Reverse delete rules are not supported for '
+                           'EmbeddedDocuments (field: %s)' % field.name)
                     raise InvalidDocumentError(msg)
                 f.document_type.register_delete_rule(new_class,
                                                      field.name, delete_rule)
 
             if (field.name and hasattr(Document, field.name) and
                     EmbeddedDocument not in new_class.mro()):
-                msg = ("%s is a document method and not a valid "
-                       "field name" % field.name)
+                msg = ('%s is a document method and not a valid '
+                       'field name' % field.name)
                 raise InvalidDocumentError(msg)
 
         return new_class
@@ -271,6 +272,11 @@ def __new__(cls, name, bases, attrs):
                 'index_drop_dups': False,
                 'index_opts': None,
                 'delete_rules': None,
+
+                # allow_inheritance can be True, False, and None. True means
+                # "allow inheritance", False means "don't allow inheritance",
+                # None means "do whatever your parent does, or don't allow
+                # inheritance if you're a top-level class".
                 'allow_inheritance': None,
             }
             attrs['_is_base_cls'] = True
@@ -303,7 +309,7 @@ def __new__(cls, name, bases, attrs):
         # If parent wasn't an abstract class
         if (parent_doc_cls and 'collection' in attrs.get('_meta', {}) and
                 not parent_doc_cls._meta.get('abstract', True)):
-            msg = "Trying to set a collection on a subclass (%s)" % name
+            msg = 'Trying to set a collection on a subclass (%s)' % name
             warnings.warn(msg, SyntaxWarning)
             del attrs['_meta']['collection']
 
@@ -311,7 +317,7 @@ def __new__(cls, name, bases, attrs):
         if attrs.get('_is_base_cls') or attrs['_meta'].get('abstract'):
             if (parent_doc_cls and
                     not parent_doc_cls._meta.get('abstract', False)):
-                msg = "Abstract document cannot have non-abstract base"
+                msg = 'Abstract document cannot have non-abstract base'
                 raise ValueError(msg)
             return super_new(cls, name, bases, attrs)
 
@@ -334,12 +340,16 @@ def __new__(cls, name, bases, attrs):
 
         meta.merge(attrs.get('_meta', {}))  # Top level meta
 
-        # Only simple classes (direct subclasses of Document)
-        # may set allow_inheritance to False
+        # Only simple classes (i.e. direct subclasses of Document) may set
+        # allow_inheritance to False. If the base Document allows inheritance,
+        # none of its subclasses can override allow_inheritance to False.
         simple_class = all([b._meta.get('abstract')
                             for b in flattened_bases if hasattr(b, '_meta')])
-        if (not simple_class and meta['allow_inheritance'] is False and
-                not meta['abstract']):
+        if (
+            not simple_class and
+            meta['allow_inheritance'] is False and
+            not meta['abstract']
+        ):
             raise ValueError('Only direct subclasses of Document may set '
                              '"allow_inheritance" to False')
 
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index ee21ba90c..bb353cffd 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,7 +1,9 @@
 from pymongo import MongoClient, ReadPreference, uri_parser
-from mongoengine.python_support import (IS_PYMONGO_3, str_types)
+import six
 
-__all__ = ['ConnectionError', 'connect', 'register_connection',
+from mongoengine.python_support import IS_PYMONGO_3
+
+__all__ = ['MongoEngineConnectionError', 'connect', 'register_connection',
            'DEFAULT_CONNECTION_NAME']
 
 
@@ -14,7 +16,10 @@
     READ_PREFERENCE = False
 
 
-class ConnectionError(Exception):
+class MongoEngineConnectionError(Exception):
+    """Error raised when the database connection can't be established or
+    when a connection with a requested alias can't be retrieved.
+    """
     pass
 
 
@@ -50,8 +55,6 @@ def register_connection(alias, name=None, host=None, port=None,
 
     .. versionchanged:: 0.10.6 - added mongomock support
     """
-    global _connection_settings
-
     conn_settings = {
         'name': name or 'test',
         'host': host or 'localhost',
@@ -66,7 +69,7 @@ def register_connection(alias, name=None, host=None, port=None,
     # Handle uri style connections
     conn_host = conn_settings['host']
     # host can be a list or a string, so if string, force to a list
-    if isinstance(conn_host, str_types):
+    if isinstance(conn_host, six.string_types):
         conn_host = [conn_host]
 
     resolved_hosts = []
@@ -111,9 +114,7 @@ def register_connection(alias, name=None, host=None, port=None,
 
 
 def disconnect(alias=DEFAULT_CONNECTION_NAME):
-    global _connections
-    global _dbs
-
+    """Close the connection with a given alias."""
     if alias in _connections:
         get_connection(alias=alias).close()
         del _connections[alias]
@@ -122,71 +123,100 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
 
 
 def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
-    global _connections
+    """Return a connection with a given alias."""
+
     # Connect to the database if not already connected
     if reconnect:
         disconnect(alias)
 
-    if alias not in _connections:
-        if alias not in _connection_settings:
-            msg = 'Connection with alias "%s" has not been defined' % alias
-            if alias == DEFAULT_CONNECTION_NAME:
-                msg = 'You have not defined a default connection'
-            raise ConnectionError(msg)
-        conn_settings = _connection_settings[alias].copy()
-
-        conn_settings.pop('name', None)
-        conn_settings.pop('username', None)
-        conn_settings.pop('password', None)
-        conn_settings.pop('authentication_source', None)
-        conn_settings.pop('authentication_mechanism', None)
-
-        is_mock = conn_settings.pop('is_mock', None)
-        if is_mock:
-            # Use MongoClient from mongomock
-            try:
-                import mongomock
-            except ImportError:
-                raise RuntimeError('You need mongomock installed '
-                                   'to mock MongoEngine.')
-            connection_class = mongomock.MongoClient
-        else:
-            # Use MongoClient from pymongo
-            connection_class = MongoClient
+    # If the requested alias already exists in the _connections list, return
+    # it immediately.
+    if alias in _connections:
+        return _connections[alias]
 
+    # Validate that the requested alias exists in the _connection_settings.
+    # Raise MongoEngineConnectionError if it doesn't.
+    if alias not in _connection_settings:
+        if alias == DEFAULT_CONNECTION_NAME:
+            msg = 'You have not defined a default connection'
+        else:
+            msg = 'Connection with alias "%s" has not been defined' % alias
+        raise MongoEngineConnectionError(msg)
+
+    def _clean_settings(settings_dict):
+        irrelevant_fields = set([
+            'name', 'username', 'password', 'authentication_source',
+            'authentication_mechanism'
+        ])
+        return {
+            k: v for k, v in settings_dict.items()
+            if k not in irrelevant_fields
+        }
+
+    # Retrieve a copy of the connection settings associated with the requested
+    # alias and remove the database name and authentication info (we don't
+    # care about them at this point).
+    conn_settings = _clean_settings(_connection_settings[alias].copy())
+
+    # Determine if we should use PyMongo's or mongomock's MongoClient.
+    is_mock = conn_settings.pop('is_mock', False)
+    if is_mock:
+        try:
+            import mongomock
+        except ImportError:
+            raise RuntimeError('You need mongomock installed to mock '
+                               'MongoEngine.')
+        connection_class = mongomock.MongoClient
+    else:
+        connection_class = MongoClient
+
+        # Handle replica set connections
         if 'replicaSet' in conn_settings:
+
             # Discard port since it can't be used on MongoReplicaSetClient
             conn_settings.pop('port', None)
-            # Discard replicaSet if not base string
-            if not isinstance(conn_settings['replicaSet'], basestring):
-                conn_settings.pop('replicaSet', None)
+
+            # Discard replicaSet if it's not a string
+            if not isinstance(conn_settings['replicaSet'], six.string_types):
+                del conn_settings['replicaSet']
+
+            # For replica set connections with PyMongo 2.x, use
+            # MongoReplicaSetClient.
+            # TODO remove this once we stop supporting PyMongo 2.x.
             if not IS_PYMONGO_3:
                 connection_class = MongoReplicaSetClient
                 conn_settings['hosts_or_uri'] = conn_settings.pop('host', None)
 
+    # Iterate over all of the connection settings and if a connection with
+    # the same parameters is already established, use it instead of creating
+    # a new one.
+    existing_connection = None
+    connection_settings_iterator = (
+        (db_alias, settings.copy())
+        for db_alias, settings in _connection_settings.items()
+    )
+    for db_alias, connection_settings in connection_settings_iterator:
+        connection_settings = _clean_settings(connection_settings)
+        if conn_settings == connection_settings and _connections.get(db_alias):
+            existing_connection = _connections[db_alias]
+            break
+
+    # If an existing connection was found, assign it to the new alias
+    if existing_connection:
+        _connections[alias] = existing_connection
+    else:
+        # Otherwise, create the new connection for this alias. Raise
+        # MongoEngineConnectionError if it can't be established.
         try:
-            connection = None
-            # check for shared connections
-            connection_settings_iterator = (
-                (db_alias, settings.copy()) for db_alias, settings in _connection_settings.iteritems())
-            for db_alias, connection_settings in connection_settings_iterator:
-                connection_settings.pop('name', None)
-                connection_settings.pop('username', None)
-                connection_settings.pop('password', None)
-                connection_settings.pop('authentication_source', None)
-                connection_settings.pop('authentication_mechanism', None)
-                if conn_settings == connection_settings and _connections.get(db_alias, None):
-                    connection = _connections[db_alias]
-                    break
-
-            _connections[alias] = connection if connection else connection_class(**conn_settings)
-        except Exception, e:
-            raise ConnectionError("Cannot connect to database %s :\n%s" % (alias, e))
+            _connections[alias] = connection_class(**conn_settings)
+        except Exception as e:
+            raise MongoEngineConnectionError(
+                'Cannot connect to database %s :\n%s' % (alias, e))
+
     return _connections[alias]
 
 
 def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
-    global _dbs
     if reconnect:
         disconnect(alias)
 
@@ -217,7 +247,6 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
 
     .. versionchanged:: 0.6 - added multiple database support.
     """
-    global _connections
     if alias not in _connections:
         register_connection(alias, db, **kwargs)
 
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index cc8600660..c477575e8 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -2,12 +2,12 @@
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 
 
-__all__ = ("switch_db", "switch_collection", "no_dereference",
-           "no_sub_classes", "query_counter")
+__all__ = ('switch_db', 'switch_collection', 'no_dereference',
+           'no_sub_classes', 'query_counter')
 
 
 class switch_db(object):
-    """ switch_db alias context manager.
+    """switch_db alias context manager.
 
     Example ::
 
@@ -18,15 +18,14 @@ class switch_db(object):
         class Group(Document):
             name = StringField()
 
-        Group(name="test").save()  # Saves in the default db
+        Group(name='test').save()  # Saves in the default db
 
         with switch_db(Group, 'testdb-1') as Group:
-            Group(name="hello testdb!").save()  # Saves in testdb-1
-
+            Group(name='hello testdb!').save()  # Saves in testdb-1
     """
 
     def __init__(self, cls, db_alias):
-        """ Construct the switch_db context manager
+        """Construct the switch_db context manager
 
         :param cls: the class to change the registered db
         :param db_alias: the name of the specific database to use
@@ -34,37 +33,36 @@ def __init__(self, cls, db_alias):
         self.cls = cls
         self.collection = cls._get_collection()
         self.db_alias = db_alias
-        self.ori_db_alias = cls._meta.get("db_alias", DEFAULT_CONNECTION_NAME)
+        self.ori_db_alias = cls._meta.get('db_alias', DEFAULT_CONNECTION_NAME)
 
     def __enter__(self):
-        """ change the db_alias and clear the cached collection """
-        self.cls._meta["db_alias"] = self.db_alias
+        """Change the db_alias and clear the cached collection."""
+        self.cls._meta['db_alias'] = self.db_alias
         self.cls._collection = None
         return self.cls
 
     def __exit__(self, t, value, traceback):
-        """ Reset the db_alias and collection """
-        self.cls._meta["db_alias"] = self.ori_db_alias
+        """Reset the db_alias and collection."""
+        self.cls._meta['db_alias'] = self.ori_db_alias
         self.cls._collection = self.collection
 
 
 class switch_collection(object):
-    """ switch_collection alias context manager.
+    """switch_collection alias context manager.
 
     Example ::
 
         class Group(Document):
             name = StringField()
 
-        Group(name="test").save()  # Saves in the default db
+        Group(name='test').save()  # Saves in the default db
 
         with switch_collection(Group, 'group1') as Group:
-            Group(name="hello testdb!").save()  # Saves in group1 collection
-
+            Group(name='hello testdb!').save()  # Saves in group1 collection
     """
 
     def __init__(self, cls, collection_name):
-        """ Construct the switch_collection context manager
+        """Construct the switch_collection context manager.
 
         :param cls: the class to change the registered db
         :param collection_name: the name of the collection to use
@@ -75,7 +73,7 @@ def __init__(self, cls, collection_name):
         self.collection_name = collection_name
 
     def __enter__(self):
-        """ change the _get_collection_name and clear the cached collection """
+        """Change the _get_collection_name and clear the cached collection."""
 
         @classmethod
         def _get_collection_name(cls):
@@ -86,24 +84,23 @@ def _get_collection_name(cls):
         return self.cls
 
     def __exit__(self, t, value, traceback):
-        """ Reset the collection """
+        """Reset the collection."""
         self.cls._collection = self.ori_collection
         self.cls._get_collection_name = self.ori_get_collection_name
 
 
 class no_dereference(object):
-    """ no_dereference context manager.
+    """no_dereference context manager.
 
     Turns off all dereferencing in Documents for the duration of the context
     manager::
 
         with no_dereference(Group) as Group:
             Group.objects.find()
-
     """
 
     def __init__(self, cls):
-        """ Construct the no_dereference context manager.
+        """Construct the no_dereference context manager.
 
         :param cls: the class to turn dereferencing off on
         """
@@ -119,103 +116,102 @@ def __init__(self, cls):
                                                ComplexBaseField))]
 
     def __enter__(self):
-        """ change the objects default and _auto_dereference values"""
+        """Change the objects default and _auto_dereference values."""
         for field in self.deref_fields:
             self.cls._fields[field]._auto_dereference = False
         return self.cls
 
     def __exit__(self, t, value, traceback):
-        """ Reset the default and _auto_dereference values"""
+        """Reset the default and _auto_dereference values."""
         for field in self.deref_fields:
             self.cls._fields[field]._auto_dereference = True
         return self.cls
 
 
 class no_sub_classes(object):
-    """ no_sub_classes context manager.
+    """no_sub_classes context manager.
 
     Only returns instances of this class and no sub (inherited) classes::
 
         with no_sub_classes(Group) as Group:
             Group.objects.find()
-
     """
 
     def __init__(self, cls):
-        """ Construct the no_sub_classes context manager.
+        """Construct the no_sub_classes context manager.
 
         :param cls: the class to turn querying sub classes on
         """
         self.cls = cls
 
     def __enter__(self):
-        """ change the objects default and _auto_dereference values"""
+        """Change the objects default and _auto_dereference values."""
         self.cls._all_subclasses = self.cls._subclasses
         self.cls._subclasses = (self.cls,)
         return self.cls
 
     def __exit__(self, t, value, traceback):
-        """ Reset the default and _auto_dereference values"""
+        """Reset the default and _auto_dereference values."""
         self.cls._subclasses = self.cls._all_subclasses
         delattr(self.cls, '_all_subclasses')
         return self.cls
 
 
 class query_counter(object):
-    """ Query_counter context manager to get the number of queries. """
+    """Query_counter context manager to get the number of queries."""
 
     def __init__(self):
-        """ Construct the query_counter. """
+        """Construct the query_counter."""
         self.counter = 0
         self.db = get_db()
 
     def __enter__(self):
-        """ On every with block we need to drop the profile collection. """
+        """On every with block we need to drop the profile collection."""
         self.db.set_profiling_level(0)
         self.db.system.profile.drop()
         self.db.set_profiling_level(2)
         return self
 
     def __exit__(self, t, value, traceback):
-        """ Reset the profiling level. """
+        """Reset the profiling level."""
         self.db.set_profiling_level(0)
 
     def __eq__(self, value):
-        """ == Compare querycounter. """
+        """== Compare querycounter."""
         counter = self._get_count()
         return value == counter
 
     def __ne__(self, value):
-        """ != Compare querycounter. """
+        """!= Compare querycounter."""
         return not self.__eq__(value)
 
     def __lt__(self, value):
-        """ < Compare querycounter. """
+        """< Compare querycounter."""
         return self._get_count() < value
 
     def __le__(self, value):
-        """ <= Compare querycounter. """
+        """<= Compare querycounter."""
         return self._get_count() <= value
 
     def __gt__(self, value):
-        """ > Compare querycounter. """
+        """> Compare querycounter."""
         return self._get_count() > value
 
     def __ge__(self, value):
-        """ >= Compare querycounter. """
+        """>= Compare querycounter."""
         return self._get_count() >= value
 
     def __int__(self):
-        """ int representation. """
+        """int representation."""
         return self._get_count()
 
     def __repr__(self):
-        """ repr query_counter as the number of queries. """
+        """repr query_counter as the number of queries."""
         return u"%s" % self._get_count()
 
     def _get_count(self):
-        """ Get the number of queries. """
-        ignore_query = {"ns": {"$ne": "%s.system.indexes" % self.db.name}}
+        """Get the number of queries."""
+        ignore_query = {'ns': {'$ne': '%s.system.indexes' % self.db.name}}
         count = self.db.system.profile.find(ignore_query).count() - self.counter
         self.counter += 1
         return count
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index c16028d2a..59204d4d6 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -1,14 +1,12 @@
 from bson import DBRef, SON
+import six
 
-from .base import (
-    BaseDict, BaseList, EmbeddedDocumentList,
-    TopLevelDocumentMetaclass, get_document
-)
-from .connection import get_db
-from .document import Document, EmbeddedDocument
-from .fields import DictField, ListField, MapField, ReferenceField
-from .python_support import txt_type
-from .queryset import QuerySet
+from mongoengine.base import (BaseDict, BaseList, EmbeddedDocumentList,
+                              TopLevelDocumentMetaclass, get_document)
+from mongoengine.connection import get_db
+from mongoengine.document import Document, EmbeddedDocument
+from mongoengine.fields import DictField, ListField, MapField, ReferenceField
+from mongoengine.queryset import QuerySet
 
 
 class DeReference(object):
@@ -25,7 +23,7 @@ def __call__(self, items, max_depth=1, instance=None, name=None):
             :class:`~mongoengine.base.ComplexBaseField`
         :param get: A boolean determining if being called by __get__
         """
-        if items is None or isinstance(items, basestring):
+        if items is None or isinstance(items, six.string_types):
             return items
 
         # cheapest way to convert a queryset to a list
@@ -68,11 +66,11 @@ def _get_items(items):
 
                         items = _get_items(items)
                     else:
-                        items = dict([
-                            (k, field.to_python(v))
-                            if not isinstance(v, (DBRef, Document)) else (k, v)
-                            for k, v in items.iteritems()]
-                        )
+                        items = {
+                            k: (v if isinstance(v, (DBRef, Document))
+                                else field.to_python(v))
+                            for k, v in items.iteritems()
+                        }
 
         self.reference_map = self._find_references(items)
         self.object_map = self._fetch_objects(doc_type=doc_type)
@@ -90,14 +88,14 @@ def _find_references(self, items, depth=0):
             return reference_map
 
         # Determine the iterator to use
-        if not hasattr(items, 'items'):
-            iterator = enumerate(items)
+        if isinstance(items, dict):
+            iterator = items.values()
         else:
-            iterator = items.iteritems()
+            iterator = items
 
         # Recursively find dbreferences
         depth += 1
-        for k, item in iterator:
+        for item in iterator:
             if isinstance(item, (Document, EmbeddedDocument)):
                 for field_name, field in item._fields.iteritems():
                     v = item._data.get(field_name, None)
@@ -151,7 +149,7 @@ def _fetch_objects(self, doc_type=None):
                     references = get_db()[collection].find({'_id': {'$in': refs}})
                     for ref in references:
                         if '_cls' in ref:
-                            doc = get_document(ref["_cls"])._from_son(ref)
+                            doc = get_document(ref['_cls'])._from_son(ref)
                         elif doc_type is None:
                             doc = get_document(
                                 ''.join(x.capitalize()
@@ -218,7 +216,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
             if k in self.object_map and not is_list:
                 data[k] = self.object_map[k]
             elif isinstance(v, (Document, EmbeddedDocument)):
-                for field_name, field in v._fields.iteritems():
+                for field_name in v._fields:
                     v = data[k]._data.get(field_name, None)
                     if isinstance(v, DBRef):
                         data[k]._data[field_name] = self.object_map.get(
@@ -227,7 +225,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                         data[k]._data[field_name] = self.object_map.get(
                             (v['_ref'].collection, v['_ref'].id), v)
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                        item_name = txt_type("{0}.{1}.{2}").format(name, k, field_name)
+                        item_name = six.text_type('{0}.{1}.{2}').format(name, k, field_name)
                         data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
             elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                 item_name = '%s.%s' % (name, k) if name else name
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 91dcafc47..e86a45d9b 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -4,18 +4,12 @@
 from bson.dbref import DBRef
 import pymongo
 from pymongo.read_preferences import ReadPreference
+import six
 
 from mongoengine import signals
-from mongoengine.base import (
-    ALLOW_INHERITANCE,
-    BaseDict,
-    BaseDocument,
-    BaseList,
-    DocumentMetaclass,
-    EmbeddedDocumentList,
-    TopLevelDocumentMetaclass,
-    get_document
-)
+from mongoengine.base import (BaseDict, BaseDocument, BaseList,
+                              DocumentMetaclass, EmbeddedDocumentList,
+                              TopLevelDocumentMetaclass, get_document)
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.context_managers import switch_collection, switch_db
@@ -31,12 +25,10 @@
 
 
 def includes_cls(fields):
-    """ Helper function used for ensuring and comparing indexes
-    """
-
+    """Helper function used for ensuring and comparing indexes."""
     first_field = None
     if len(fields):
-        if isinstance(fields[0], basestring):
+        if isinstance(fields[0], six.string_types):
             first_field = fields[0]
         elif isinstance(fields[0], (list, tuple)) and len(fields[0]):
             first_field = fields[0][0]
@@ -57,9 +49,8 @@ class EmbeddedDocument(BaseDocument):
     to create a specialised version of the embedded document that will be
     stored in the same collection. To facilitate this behaviour a `_cls`
     field is added to documents (hidden though the MongoEngine interface).
-    To disable this behaviour and remove the dependence on the presence of
-    `_cls` set :attr:`allow_inheritance` to ``False`` in the :attr:`meta`
-    dictionary.
+    To enable this behaviour set :attr:`allow_inheritance` to ``True`` in the
+    :attr:`meta` dictionary.
     """
 
     __slots__ = ('_instance', )
@@ -82,6 +73,15 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not self.__eq__(other)
 
+    def to_mongo(self, *args, **kwargs):
+        data = super(EmbeddedDocument, self).to_mongo(*args, **kwargs)
+
+        # remove _id from the SON if it's in it and it's None
+        if '_id' in data and data['_id'] is None:
+            del data['_id']
+
+        return data
+
     def save(self, *args, **kwargs):
         self._instance.save(*args, **kwargs)
 
@@ -106,9 +106,8 @@ class Document(BaseDocument):
     create a specialised version of the document that will be stored in the
     same collection. To facilitate this behaviour a `_cls`
     field is added to documents (hidden though the MongoEngine interface).
-    To disable this behaviour and remove the dependence on the presence of
-    `_cls` set :attr:`allow_inheritance` to ``False`` in the :attr:`meta`
-    dictionary.
+    To enable this behaviourset :attr:`allow_inheritance` to ``True`` in the
+    :attr:`meta` dictionary.
 
     A :class:`~mongoengine.Document` may use a **Capped Collection** by
     specifying :attr:`max_documents` and :attr:`max_size` in the :attr:`meta`
@@ -149,26 +148,22 @@ class Document(BaseDocument):
 
     __slots__ = ('__objects',)
 
-    def pk():
-        """Primary key alias
-        """
-
-        def fget(self):
-            if 'id_field' not in self._meta:
-                return None
-            return getattr(self, self._meta['id_field'])
-
-        def fset(self, value):
-            return setattr(self, self._meta['id_field'], value)
-
-        return property(fget, fset)
+    @property
+    def pk(self):
+        """Get the primary key."""
+        if 'id_field' not in self._meta:
+            return None
+        return getattr(self, self._meta['id_field'])
 
-    pk = pk()
+    @pk.setter
+    def pk(self, value):
+        """Set the primary key."""
+        return setattr(self, self._meta['id_field'], value)
 
     @classmethod
     def _get_db(cls):
         """Some Model using other db_alias"""
-        return get_db(cls._meta.get("db_alias", DEFAULT_CONNECTION_NAME))
+        return get_db(cls._meta.get('db_alias', DEFAULT_CONNECTION_NAME))
 
     @classmethod
     def _get_collection(cls):
@@ -211,7 +206,20 @@ def _get_collection(cls):
                 cls.ensure_indexes()
         return cls._collection
 
-    def modify(self, query={}, **update):
+    def to_mongo(self, *args, **kwargs):
+        data = super(Document, self).to_mongo(*args, **kwargs)
+
+        # If '_id' is None, try and set it from self._data. If that
+        # doesn't exist either, remote '_id' from the SON completely.
+        if data['_id'] is None:
+            if self._data.get('id') is None:
+                del data['_id']
+            else:
+                data['_id'] = self._data['id']
+
+        return data
+
+    def modify(self, query=None, **update):
         """Perform an atomic update of the document in the database and reload
         the document object using updated version.
 
@@ -225,17 +233,19 @@ def modify(self, query={}, **update):
             database matches the query
         :param update: Django-style update keyword arguments
         """
+        if query is None:
+            query = {}
 
         if self.pk is None:
-            raise InvalidDocumentError("The document does not have a primary key.")
+            raise InvalidDocumentError('The document does not have a primary key.')
 
-        id_field = self._meta["id_field"]
+        id_field = self._meta['id_field']
         query = query.copy() if isinstance(query, dict) else query.to_query(self)
 
         if id_field not in query:
             query[id_field] = self.pk
         elif query[id_field] != self.pk:
-            raise InvalidQueryError("Invalid document modify query: it must modify only this document.")
+            raise InvalidQueryError('Invalid document modify query: it must modify only this document.')
 
         updated = self._qs(**query).modify(new=True, **update)
         if updated is None:
@@ -310,7 +320,7 @@ def save(self, force_insert=False, validate=True, clean=True,
             self.validate(clean=clean)
 
         if write_concern is None:
-            write_concern = {"w": 1}
+            write_concern = {'w': 1}
 
         doc = self.to_mongo()
 
@@ -347,7 +357,7 @@ def save(self, force_insert=False, validate=True, clean=True,
                 else:
                     select_dict = {}
                 select_dict['_id'] = object_id
-                shard_key = self.__class__._meta.get('shard_key', tuple())
+                shard_key = self._meta.get('shard_key', tuple())
                 for k in shard_key:
                     path = self._lookup_field(k.split('.'))
                     actual_key = [p.db_field for p in path]
@@ -358,7 +368,7 @@ def save(self, force_insert=False, validate=True, clean=True,
 
                 def is_new_object(last_error):
                     if last_error is not None:
-                        updated = last_error.get("updatedExisting")
+                        updated = last_error.get('updatedExisting')
                         if updated is not None:
                             return not updated
                     return created
@@ -366,14 +376,14 @@ def is_new_object(last_error):
                 update_query = {}
 
                 if updates:
-                    update_query["$set"] = updates
+                    update_query['$set'] = updates
                 if removals:
-                    update_query["$unset"] = removals
+                    update_query['$unset'] = removals
                 if updates or removals:
                     upsert = save_condition is None
                     last_error = collection.update(select_dict, update_query,
                                                    upsert=upsert, **write_concern)
-                    if not upsert and last_error["n"] == 0:
+                    if not upsert and last_error['n'] == 0:
                         raise SaveConditionError('Race condition preventing'
                                                  ' document update detected')
                     created = is_new_object(last_error)
@@ -384,26 +394,27 @@ def is_new_object(last_error):
 
             if cascade:
                 kwargs = {
-                    "force_insert": force_insert,
-                    "validate": validate,
-                    "write_concern": write_concern,
-                    "cascade": cascade
+                    'force_insert': force_insert,
+                    'validate': validate,
+                    'write_concern': write_concern,
+                    'cascade': cascade
                 }
                 if cascade_kwargs:  # Allow granular control over cascades
                     kwargs.update(cascade_kwargs)
                 kwargs['_refs'] = _refs
                 self.cascade_save(**kwargs)
-        except pymongo.errors.DuplicateKeyError, err:
+        except pymongo.errors.DuplicateKeyError as err:
             message = u'Tried to save duplicate unique keys (%s)'
-            raise NotUniqueError(message % unicode(err))
-        except pymongo.errors.OperationFailure, err:
+            raise NotUniqueError(message % six.text_type(err))
+        except pymongo.errors.OperationFailure as err:
             message = 'Could not save document (%s)'
-            if re.match('^E1100[01] duplicate key', unicode(err)):
+            if re.match('^E1100[01] duplicate key', six.text_type(err)):
                 # E11000 - duplicate key error index
                 # E11001 - duplicate key on update
                 message = u'Tried to save duplicate unique keys (%s)'
-                raise NotUniqueError(message % unicode(err))
-            raise OperationError(message % unicode(err))
+                raise NotUniqueError(message % six.text_type(err))
+            raise OperationError(message % six.text_type(err))
+
         id_field = self._meta['id_field']
         if created or id_field not in self._meta.get('shard_key', []):
             self[id_field] = self._fields[id_field].to_python(object_id)
@@ -414,10 +425,11 @@ def is_new_object(last_error):
         self._created = False
         return self
 
-    def cascade_save(self, *args, **kwargs):
-        """Recursively saves any references /
-           generic references on the document"""
-        _refs = kwargs.get('_refs', []) or []
+    def cascade_save(self, **kwargs):
+        """Recursively save any references and generic references on the
+        document.
+        """
+        _refs = kwargs.get('_refs') or []
 
         ReferenceField = _import_class('ReferenceField')
         GenericReferenceField = _import_class('GenericReferenceField')
@@ -443,16 +455,17 @@ def cascade_save(self, *args, **kwargs):
 
     @property
     def _qs(self):
-        """
-        Returns the queryset to use for updating / reloading / deletions
-        """
+        """Return the queryset to use for updating / reloading / deletions."""
         if not hasattr(self, '__objects'):
             self.__objects = QuerySet(self, self._get_collection())
         return self.__objects
 
     @property
     def _object_key(self):
-        """Dict to identify object in collection
+        """Get the query dict that can be used to fetch this object from
+        the database. Most of the time it's a simple PK lookup, but in
+        case of a sharded collection with a compound shard key, it can
+        contain a more complex query.
         """
         select_dict = {'pk': self.pk}
         shard_key = self.__class__._meta.get('shard_key', tuple())
@@ -475,8 +488,8 @@ def update(self, **kwargs):
         if self.pk is None:
             if kwargs.get('upsert', False):
                 query = self.to_mongo()
-                if "_cls" in query:
-                    del query["_cls"]
+                if '_cls' in query:
+                    del query['_cls']
                 return self._qs.filter(**query).update_one(**kwargs)
             else:
                 raise OperationError(
@@ -513,7 +526,7 @@ def delete(self, signal_kwargs=None, **write_concern):
         try:
             self._qs.filter(
                 **self._object_key).delete(write_concern=write_concern, _from_doc_delete=True)
-        except pymongo.errors.OperationFailure, err:
+        except pymongo.errors.OperationFailure as err:
             message = u'Could not delete document (%s)' % err.message
             raise OperationError(message)
         signals.post_delete.send(self.__class__, document=self, **signal_kwargs)
@@ -601,11 +614,12 @@ def reload(self, *fields, **kwargs):
         if fields and isinstance(fields[0], int):
             max_depth = fields[0]
             fields = fields[1:]
-        elif "max_depth" in kwargs:
-            max_depth = kwargs["max_depth"]
+        elif 'max_depth' in kwargs:
+            max_depth = kwargs['max_depth']
 
         if self.pk is None:
-            raise self.DoesNotExist("Document does not exist")
+            raise self.DoesNotExist('Document does not exist')
+
         obj = self._qs.read_preference(ReadPreference.PRIMARY).filter(
             **self._object_key).only(*fields).limit(
             1).select_related(max_depth=max_depth)
@@ -613,7 +627,7 @@ def reload(self, *fields, **kwargs):
         if obj:
             obj = obj[0]
         else:
-            raise self.DoesNotExist("Document does not exist")
+            raise self.DoesNotExist('Document does not exist')
 
         for field in obj._data:
             if not fields or field in fields:
@@ -656,7 +670,7 @@ def to_dbref(self):
         """Returns an instance of :class:`~bson.dbref.DBRef` useful in
         `__raw__` queries."""
         if self.pk is None:
-            msg = "Only saved documents can have a valid dbref"
+            msg = 'Only saved documents can have a valid dbref'
             raise OperationError(msg)
         return DBRef(self.__class__._get_collection_name(), self.pk)
 
@@ -711,7 +725,7 @@ def create_index(cls, keys, background=False, **kwargs):
         fields = index_spec.pop('fields')
         drop_dups = kwargs.get('drop_dups', False)
         if IS_PYMONGO_3 and drop_dups:
-            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
+            msg = 'drop_dups is deprecated and is removed when using PyMongo 3+.'
             warnings.warn(msg, DeprecationWarning)
         elif not IS_PYMONGO_3:
             index_spec['drop_dups'] = drop_dups
@@ -737,7 +751,7 @@ def ensure_index(cls, key_or_list, drop_dups=False, background=False,
             will be removed if PyMongo3+ is used
         """
         if IS_PYMONGO_3 and drop_dups:
-            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
+            msg = 'drop_dups is deprecated and is removed when using PyMongo 3+.'
             warnings.warn(msg, DeprecationWarning)
         elif not IS_PYMONGO_3:
             kwargs.update({'drop_dups': drop_dups})
@@ -757,7 +771,7 @@ def ensure_indexes(cls):
         index_opts = cls._meta.get('index_opts') or {}
         index_cls = cls._meta.get('index_cls', True)
         if IS_PYMONGO_3 and drop_dups:
-            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
+            msg = 'drop_dups is deprecated and is removed when using PyMongo 3+.'
             warnings.warn(msg, DeprecationWarning)
 
         collection = cls._get_collection()
@@ -795,8 +809,7 @@ def ensure_indexes(cls):
 
         # If _cls is being used (for polymorphism), it needs an index,
         # only if another index doesn't begin with _cls
-        if (index_cls and not cls_indexed and
-                cls._meta.get('allow_inheritance', ALLOW_INHERITANCE) is True):
+        if index_cls and not cls_indexed and cls._meta.get('allow_inheritance'):
 
             # we shouldn't pass 'cls' to the collection.ensureIndex options
             # because of https://jira.mongodb.org/browse/SERVER-769
@@ -866,16 +879,15 @@ def get_indexes_spec(cls):
         # finish up by appending { '_id': 1 } and { '_cls': 1 }, if needed
         if [(u'_id', 1)] not in indexes:
             indexes.append([(u'_id', 1)])
-        if (cls._meta.get('index_cls', True) and
-                cls._meta.get('allow_inheritance', ALLOW_INHERITANCE) is True):
+        if cls._meta.get('index_cls', True) and cls._meta.get('allow_inheritance'):
             indexes.append([(u'_cls', 1)])
 
         return indexes
 
     @classmethod
     def compare_indexes(cls):
-        """ Compares the indexes defined in MongoEngine with the ones existing
-        in the database. Returns any missing/extra indexes.
+        """ Compares the indexes defined in MongoEngine with the ones
+        existing in the database. Returns any missing/extra indexes.
         """
 
         required = cls.list_indexes()
@@ -919,8 +931,9 @@ class DynamicDocument(Document):
     _dynamic = True
 
     def __delattr__(self, *args, **kwargs):
-        """Deletes the attribute by setting to None and allowing _delta to unset
-        it"""
+        """Delete the attribute by setting to None and allowing _delta
+        to unset it.
+        """
         field_name = args[0]
         if field_name in self._dynamic_fields:
             setattr(self, field_name, None)
@@ -942,8 +955,9 @@ class DynamicEmbeddedDocument(EmbeddedDocument):
     _dynamic = True
 
     def __delattr__(self, *args, **kwargs):
-        """Deletes the attribute by setting to None and allowing _delta to unset
-        it"""
+        """Delete the attribute by setting to None and allowing _delta
+        to unset it.
+        """
         field_name = args[0]
         if field_name in self._fields:
             default = self._fields[field_name].default
@@ -985,10 +999,10 @@ def object(self):
             try:
                 self.key = id_field_type(self.key)
             except Exception:
-                raise Exception("Could not cast key as %s" %
+                raise Exception('Could not cast key as %s' %
                                 id_field_type.__name__)
 
-        if not hasattr(self, "_key_object"):
+        if not hasattr(self, '_key_object'):
             self._key_object = self._document.objects.with_id(self.key)
             return self._key_object
         return self._key_object
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 15830b5c3..2549e8228 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -1,7 +1,6 @@
 from collections import defaultdict
 
-from mongoengine.python_support import txt_type
-
+import six
 
 __all__ = ('NotRegistered', 'InvalidDocumentError', 'LookUpError',
            'DoesNotExist', 'MultipleObjectsReturned', 'InvalidQueryError',
@@ -71,13 +70,13 @@ class ValidationError(AssertionError):
     field_name = None
     _message = None
 
-    def __init__(self, message="", **kwargs):
+    def __init__(self, message='', **kwargs):
         self.errors = kwargs.get('errors', {})
         self.field_name = kwargs.get('field_name')
         self.message = message
 
     def __str__(self):
-        return txt_type(self.message)
+        return six.text_type(self.message)
 
     def __repr__(self):
         return '%s(%s,)' % (self.__class__.__name__, self.message)
@@ -111,17 +110,20 @@ def build_dict(source):
             errors_dict = {}
             if not source:
                 return errors_dict
+
             if isinstance(source, dict):
                 for field_name, error in source.iteritems():
                     errors_dict[field_name] = build_dict(error)
             elif isinstance(source, ValidationError) and source.errors:
                 return build_dict(source.errors)
             else:
-                return unicode(source)
+                return six.text_type(source)
+
             return errors_dict
 
         if not self.errors:
             return {}
+
         return build_dict(self.errors)
 
     def _format_errors(self):
@@ -134,10 +136,10 @@ def generate_key(value, prefix=''):
                 value = ' '.join(
                     [generate_key(v, k) for k, v in value.iteritems()])
 
-            results = "%s.%s" % (prefix, value) if prefix else value
+            results = '%s.%s' % (prefix, value) if prefix else value
             return results
 
         error_dict = defaultdict(list)
         for k, v in self.to_dict().iteritems():
             error_dict[generate_key(v)].append(k)
-        return ' '.join(["%s: %s" % (k, v) for k, v in error_dict.iteritems()])
+        return ' '.join(['%s: %s' % (k, v) for k, v in error_dict.iteritems()])
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e9cc974cd..d812a762a 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -3,7 +3,6 @@
 import itertools
 import re
 import time
-import urllib2
 import uuid
 import warnings
 from operator import itemgetter
@@ -25,13 +24,13 @@
 except ImportError:
     Int64 = long
 
-from .base import (BaseDocument, BaseField, ComplexBaseField, GeoJsonBaseField,
-                   ObjectIdField, get_document)
-from .connection import DEFAULT_CONNECTION_NAME, get_db
-from .document import Document, EmbeddedDocument
-from .errors import DoesNotExist, ValidationError
-from .python_support import PY3, StringIO, bin_type, str_types, txt_type
-from .queryset import DO_NOTHING, QuerySet
+from mongoengine.base import (BaseDocument, BaseField, ComplexBaseField,
+                              GeoJsonBaseField, ObjectIdField, get_document)
+from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
+from mongoengine.document import Document, EmbeddedDocument
+from mongoengine.errors import DoesNotExist, ValidationError
+from mongoengine.python_support import StringIO
+from mongoengine.queryset import DO_NOTHING, QuerySet
 
 try:
     from PIL import Image, ImageOps
@@ -39,7 +38,7 @@
     Image = None
     ImageOps = None
 
-__all__ = [
+__all__ = (
     'StringField', 'URLField', 'EmailField', 'IntField', 'LongField',
     'FloatField', 'DecimalField', 'BooleanField', 'DateTimeField',
     'ComplexDateTimeField', 'EmbeddedDocumentField', 'ObjectIdField',
@@ -50,14 +49,14 @@
     'FileField', 'ImageGridFsProxy', 'ImproperlyConfigured', 'ImageField',
     'GeoPointField', 'PointField', 'LineStringField', 'PolygonField',
     'SequenceField', 'UUIDField', 'MultiPointField', 'MultiLineStringField',
-    'MultiPolygonField', 'GeoJsonBaseField']
+    'MultiPolygonField', 'GeoJsonBaseField'
+)
 
 RECURSIVE_REFERENCE_CONSTANT = 'self'
 
 
 class StringField(BaseField):
-    """A unicode string field.
-    """
+    """A unicode string field."""
 
     def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):
         self.regex = re.compile(regex) if regex else None
@@ -66,7 +65,7 @@ def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):
         super(StringField, self).__init__(**kwargs)
 
     def to_python(self, value):
-        if isinstance(value, unicode):
+        if isinstance(value, six.text_type):
             return value
         try:
             value = value.decode('utf-8')
@@ -75,7 +74,7 @@ def to_python(self, value):
         return value
 
     def validate(self, value):
-        if not isinstance(value, basestring):
+        if not isinstance(value, six.string_types):
             self.error('StringField only accepts string values')
 
         if self.max_length is not None and len(value) > self.max_length:
@@ -91,7 +90,7 @@ def lookup_member(self, member_name):
         return None
 
     def prepare_query_value(self, op, value):
-        if not isinstance(op, basestring):
+        if not isinstance(op, six.string_types):
             return value
 
         if op.lstrip('i') in ('startswith', 'endswith', 'contains', 'exact'):
@@ -148,17 +147,6 @@ def validate(self, value):
             self.error('Invalid URL: {}'.format(value))
             return
 
-        if self.verify_exists:
-            warnings.warn(
-                "The URLField verify_exists argument has intractable security "
-                "and performance issues. Accordingly, it has been deprecated.",
-                DeprecationWarning)
-            try:
-                request = urllib2.Request(value)
-                urllib2.urlopen(request)
-            except Exception, e:
-                self.error('This URL appears to be a broken link: %s' % e)
-
 
 class EmailField(StringField):
     """A field that validates input as an email address.
@@ -182,8 +170,7 @@ def validate(self, value):
 
 
 class IntField(BaseField):
-    """An 32-bit integer field.
-    """
+    """32-bit integer field."""
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
         self.min_value, self.max_value = min_value, max_value
@@ -216,8 +203,7 @@ def prepare_query_value(self, op, value):
 
 
 class LongField(BaseField):
-    """An 64-bit integer field.
-    """
+    """64-bit integer field."""
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
         self.min_value, self.max_value = min_value, max_value
@@ -253,8 +239,7 @@ def prepare_query_value(self, op, value):
 
 
 class FloatField(BaseField):
-    """An floating point number field.
-    """
+    """Floating point number field."""
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
         self.min_value, self.max_value = min_value, max_value
@@ -291,7 +276,7 @@ def prepare_query_value(self, op, value):
 
 
 class DecimalField(BaseField):
-    """A fixed-point decimal number field.
+    """Fixed-point decimal number field.
 
     .. versionchanged:: 0.8
     .. versionadded:: 0.3
@@ -332,25 +317,25 @@ def to_python(self, value):
 
         # Convert to string for python 2.6 before casting to Decimal
         try:
-            value = decimal.Decimal("%s" % value)
+            value = decimal.Decimal('%s' % value)
         except decimal.InvalidOperation:
             return value
-        return value.quantize(decimal.Decimal(".%s" % ("0" * self.precision)), rounding=self.rounding)
+        return value.quantize(decimal.Decimal('.%s' % ('0' * self.precision)), rounding=self.rounding)
 
     def to_mongo(self, value):
         if value is None:
             return value
         if self.force_string:
-            return unicode(self.to_python(value))
+            return six.text_type(self.to_python(value))
         return float(self.to_python(value))
 
     def validate(self, value):
         if not isinstance(value, decimal.Decimal):
-            if not isinstance(value, basestring):
-                value = unicode(value)
+            if not isinstance(value, six.string_types):
+                value = six.text_type(value)
             try:
                 value = decimal.Decimal(value)
-            except Exception, exc:
+            except Exception as exc:
                 self.error('Could not convert value to decimal: %s' % exc)
 
         if self.min_value is not None and value < self.min_value:
@@ -364,7 +349,7 @@ def prepare_query_value(self, op, value):
 
 
 class BooleanField(BaseField):
-    """A boolean field type.
+    """Boolean field type.
 
     .. versionadded:: 0.1.2
     """
@@ -382,7 +367,7 @@ def validate(self, value):
 
 
 class DateTimeField(BaseField):
-    """A datetime field.
+    """Datetime field.
 
     Uses the python-dateutil library if available alternatively use time.strptime
     to parse the dates.  Note: python-dateutil's parser is fully featured and when
@@ -410,7 +395,7 @@ def to_mongo(self, value):
         if callable(value):
             return value()
 
-        if not isinstance(value, basestring):
+        if not isinstance(value, six.string_types):
             return None
 
         # Attempt to parse a datetime:
@@ -537,16 +522,19 @@ class EmbeddedDocumentField(BaseField):
     """
 
     def __init__(self, document_type, **kwargs):
-        if not isinstance(document_type, basestring):
-            if not issubclass(document_type, EmbeddedDocument):
-                self.error('Invalid embedded document class provided to an '
-                           'EmbeddedDocumentField')
+        if (
+            not isinstance(document_type, six.string_types) and
+            not issubclass(document_type, EmbeddedDocument)
+        ):
+            self.error('Invalid embedded document class provided to an '
+                       'EmbeddedDocumentField')
+
         self.document_type_obj = document_type
         super(EmbeddedDocumentField, self).__init__(**kwargs)
 
     @property
     def document_type(self):
-        if isinstance(self.document_type_obj, basestring):
+        if isinstance(self.document_type_obj, six.string_types):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 self.document_type_obj = self.owner_document
             else:
@@ -631,7 +619,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         """Convert a Python type to a MongoDB compatible type.
         """
 
-        if isinstance(value, basestring):
+        if isinstance(value, six.string_types):
             return value
 
         if hasattr(value, 'to_mongo'):
@@ -639,7 +627,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
             val = value.to_mongo(use_db_field, fields)
             # If we its a document thats not inherited add _cls
             if isinstance(value, Document):
-                val = {"_ref": value.to_dbref(), "_cls": cls.__name__}
+                val = {'_ref': value.to_dbref(), '_cls': cls.__name__}
             if isinstance(value, EmbeddedDocument):
                 val['_cls'] = cls.__name__
             return val
@@ -650,7 +638,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         is_list = False
         if not hasattr(value, 'items'):
             is_list = True
-            value = dict([(k, v) for k, v in enumerate(value)])
+            value = {k: v for k, v in enumerate(value)}
 
         data = {}
         for k, v in value.iteritems():
@@ -674,12 +662,12 @@ def lookup_member(self, member_name):
         return member_name
 
     def prepare_query_value(self, op, value):
-        if isinstance(value, basestring):
+        if isinstance(value, six.string_types):
             return StringField().prepare_query_value(op, value)
         return super(DynamicField, self).prepare_query_value(op, self.to_mongo(value))
 
     def validate(self, value, clean=True):
-        if hasattr(value, "validate"):
+        if hasattr(value, 'validate'):
             value.validate(clean=clean)
 
 
@@ -699,21 +687,27 @@ def __init__(self, field=None, **kwargs):
         super(ListField, self).__init__(**kwargs)
 
     def validate(self, value):
-        """Make sure that a list of valid fields is being used.
-        """
+        """Make sure that a list of valid fields is being used."""
         if (not isinstance(value, (list, tuple, QuerySet)) or
-                isinstance(value, basestring)):
+                isinstance(value, six.string_types)):
             self.error('Only lists and tuples may be used in a list field')
         super(ListField, self).validate(value)
 
     def prepare_query_value(self, op, value):
         if self.field:
-            if op in ('set', 'unset', None) and (
-                    not isinstance(value, basestring) and
-                    not isinstance(value, BaseDocument) and
-                    hasattr(value, '__iter__')):
+
+            # If the value is iterable and it's not a string nor a
+            # BaseDocument, call prepare_query_value for each of its items.
+            if (
+                op in ('set', 'unset', None) and
+                hasattr(value, '__iter__') and
+                not isinstance(value, six.string_types) and
+                not isinstance(value, BaseDocument)
+            ):
                 return [self.field.prepare_query_value(op, v) for v in value]
+
             return self.field.prepare_query_value(op, value)
+
         return super(ListField, self).prepare_query_value(op, value)
 
 
@@ -726,7 +720,6 @@ class EmbeddedDocumentListField(ListField):
         :class:`~mongoengine.EmbeddedDocument`.
 
     .. versionadded:: 0.9
-
     """
 
     def __init__(self, document_type, **kwargs):
@@ -775,17 +768,17 @@ def to_mongo(self, value, use_db_field=True, fields=None):
 
 
 def key_not_string(d):
-    """ Helper function to recursively determine if any key in a dictionary is
-    not a string.
+    """Helper function to recursively determine if any key in a
+    dictionary is not a string.
     """
     for k, v in d.items():
-        if not isinstance(k, basestring) or (isinstance(v, dict) and key_not_string(v)):
+        if not isinstance(k, six.string_types) or (isinstance(v, dict) and key_not_string(v)):
             return True
 
 
 def key_has_dot_or_dollar(d):
-    """ Helper function to recursively determine if any key in a dictionary
-    contains a dot or a dollar sign.
+    """Helper function to recursively determine if any key in a
+    dictionary contains a dot or a dollar sign.
     """
     for k, v in d.items():
         if ('.' in k or '$' in k) or (isinstance(v, dict) and key_has_dot_or_dollar(v)):
@@ -813,14 +806,13 @@ def __init__(self, basecls=None, field=None, *args, **kwargs):
         super(DictField, self).__init__(*args, **kwargs)
 
     def validate(self, value):
-        """Make sure that a list of valid fields is being used.
-        """
+        """Make sure that a list of valid fields is being used."""
         if not isinstance(value, dict):
             self.error('Only dictionaries may be used in a DictField')
 
         if key_not_string(value):
-            msg = ("Invalid dictionary key - documents must "
-                   "have only string keys")
+            msg = ('Invalid dictionary key - documents must '
+                   'have only string keys')
             self.error(msg)
         if key_has_dot_or_dollar(value):
             self.error('Invalid dictionary key name - keys may not contain "."'
@@ -835,14 +827,15 @@ def prepare_query_value(self, op, value):
                            'istartswith', 'endswith', 'iendswith',
                            'exact', 'iexact']
 
-        if op in match_operators and isinstance(value, basestring):
+        if op in match_operators and isinstance(value, six.string_types):
             return StringField().prepare_query_value(op, value)
 
         if hasattr(self.field, 'field'):
             if op in ('set', 'unset') and isinstance(value, dict):
-                return dict(
-                    (k, self.field.prepare_query_value(op, v))
-                    for k, v in value.items())
+                return {
+                    k: self.field.prepare_query_value(op, v)
+                    for k, v in value.items()
+                }
             return self.field.prepare_query_value(op, value)
 
         return super(DictField, self).prepare_query_value(op, value)
@@ -911,10 +904,12 @@ def __init__(self, document_type, dbref=False,
             A reference to an abstract document type is always stored as a
             :class:`~pymongo.dbref.DBRef`, regardless of the value of `dbref`.
         """
-        if not isinstance(document_type, basestring):
-            if not issubclass(document_type, (Document, basestring)):
-                self.error('Argument to ReferenceField constructor must be a '
-                           'document class or a string')
+        if (
+            not isinstance(document_type, six.string_types) and
+            not issubclass(document_type, Document)
+        ):
+            self.error('Argument to ReferenceField constructor must be a '
+                       'document class or a string')
 
         self.dbref = dbref
         self.document_type_obj = document_type
@@ -923,7 +918,7 @@ def __init__(self, document_type, dbref=False,
 
     @property
     def document_type(self):
-        if isinstance(self.document_type_obj, basestring):
+        if isinstance(self.document_type_obj, six.string_types):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 self.document_type_obj = self.owner_document
             else:
@@ -931,8 +926,7 @@ def document_type(self):
         return self.document_type_obj
 
     def __get__(self, instance, owner):
-        """Descriptor to allow lazy dereferencing.
-        """
+        """Descriptor to allow lazy dereferencing."""
         if instance is None:
             # Document class being used rather than a document object
             return self
@@ -989,8 +983,7 @@ def to_mongo(self, document):
         return id_
 
     def to_python(self, value):
-        """Convert a MongoDB-compatible type to a Python type.
-        """
+        """Convert a MongoDB-compatible type to a Python type."""
         if (not self.dbref and
                 not isinstance(value, (DBRef, Document, EmbeddedDocument))):
             collection = self.document_type._get_collection_name()
@@ -1006,7 +999,7 @@ def prepare_query_value(self, op, value):
     def validate(self, value):
 
         if not isinstance(value, (self.document_type, DBRef)):
-            self.error("A ReferenceField only accepts DBRef or documents")
+            self.error('A ReferenceField only accepts DBRef or documents')
 
         if isinstance(value, Document) and value.id is None:
             self.error('You can only reference documents once they have been '
@@ -1030,14 +1023,19 @@ class CachedReferenceField(BaseField):
     .. versionadded:: 0.9
     """
 
-    def __init__(self, document_type, fields=[], auto_sync=True, **kwargs):
+    def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
         """Initialises the Cached Reference Field.
 
         :param fields:  A list of fields to be cached in document
         :param auto_sync: if True documents are auto updated.
         """
-        if not isinstance(document_type, basestring) and \
-                not issubclass(document_type, (Document, basestring)):
+        if fields is None:
+            fields = []
+
+        if (
+            not isinstance(document_type, six.string_types) and
+            not issubclass(document_type, Document)
+        ):
             self.error('Argument to CachedReferenceField constructor must be a'
                        ' document class or a string')
 
@@ -1053,18 +1051,20 @@ def start_listener(self):
                                   sender=self.document_type)
 
     def on_document_pre_save(self, sender, document, created, **kwargs):
-        if not created:
-            update_kwargs = dict(
-                ('set__%s__%s' % (self.name, k), v)
-                for k, v in document._delta()[0].items()
-                if k in self.fields)
+        if created:
+            return None
 
-            if update_kwargs:
-                filter_kwargs = {}
-                filter_kwargs[self.name] = document
+        update_kwargs = {
+            'set__%s__%s' % (self.name, key): val
+            for key, val in document._delta()[0].items()
+            if key in self.fields
+        }
+        if update_kwargs:
+            filter_kwargs = {}
+            filter_kwargs[self.name] = document
 
-                self.owner_document.objects(
-                    **filter_kwargs).update(**update_kwargs)
+            self.owner_document.objects(
+                **filter_kwargs).update(**update_kwargs)
 
     def to_python(self, value):
         if isinstance(value, dict):
@@ -1077,7 +1077,7 @@ def to_python(self, value):
 
     @property
     def document_type(self):
-        if isinstance(self.document_type_obj, basestring):
+        if isinstance(self.document_type_obj, six.string_types):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 self.document_type_obj = self.owner_document
             else:
@@ -1117,7 +1117,7 @@ def to_mongo(self, document, use_db_field=True, fields=None):
             # TODO: should raise here or will fail next statement
 
         value = SON((
-            ("_id", id_field.to_mongo(id_)),
+            ('_id', id_field.to_mongo(id_)),
         ))
 
         if fields:
@@ -1143,7 +1143,7 @@ def prepare_query_value(self, op, value):
     def validate(self, value):
 
         if not isinstance(value, self.document_type):
-            self.error("A CachedReferenceField only accepts documents")
+            self.error('A CachedReferenceField only accepts documents')
 
         if isinstance(value, Document) and value.id is None:
             self.error('You can only reference documents once they have been '
@@ -1191,13 +1191,13 @@ def __init__(self, *args, **kwargs):
         # Keep the choices as a list of allowed Document class names
         if choices:
             for choice in choices:
-                if isinstance(choice, basestring):
+                if isinstance(choice, six.string_types):
                     self.choices.append(choice)
                 elif isinstance(choice, type) and issubclass(choice, Document):
                     self.choices.append(choice._class_name)
                 else:
                     self.error('Invalid choices provided: must be a list of'
-                               'Document subclasses and/or basestrings')
+                               'Document subclasses and/or six.string_typess')
 
     def _validate_choices(self, value):
         if isinstance(value, dict):
@@ -1280,8 +1280,7 @@ def prepare_query_value(self, op, value):
 
 
 class BinaryField(BaseField):
-    """A binary data field.
-    """
+    """A binary data field."""
 
     def __init__(self, max_bytes=None, **kwargs):
         self.max_bytes = max_bytes
@@ -1289,18 +1288,18 @@ def __init__(self, max_bytes=None, **kwargs):
 
     def __set__(self, instance, value):
         """Handle bytearrays in python 3.1"""
-        if PY3 and isinstance(value, bytearray):
-            value = bin_type(value)
+        if six.PY3 and isinstance(value, bytearray):
+            value = six.binary_type(value)
         return super(BinaryField, self).__set__(instance, value)
 
     def to_mongo(self, value):
         return Binary(value)
 
     def validate(self, value):
-        if not isinstance(value, (bin_type, txt_type, Binary)):
-            self.error("BinaryField only accepts instances of "
-                       "(%s, %s, Binary)" % (
-                           bin_type.__name__, txt_type.__name__))
+        if not isinstance(value, (six.binary_type, six.text_type, Binary)):
+            self.error('BinaryField only accepts instances of '
+                       '(%s, %s, Binary)' % (
+                           six.binary_type.__name__, six.text_type.__name__))
 
         if self.max_bytes is not None and len(value) > self.max_bytes:
             self.error('Binary value is too long')
@@ -1384,11 +1383,13 @@ def fs(self):
                 get_db(self.db_alias), self.collection_name)
         return self._fs
 
-    def get(self, id=None):
-        if id:
-            self.grid_id = id
+    def get(self, grid_id=None):
+        if grid_id:
+            self.grid_id = grid_id
+
         if self.grid_id is None:
             return None
+
         try:
             if self.gridout is None:
                 self.gridout = self.fs.get(self.grid_id)
@@ -1432,7 +1433,7 @@ def read(self, size=-1):
             try:
                 return gridout.read(size)
             except Exception:
-                return ""
+                return ''
 
     def delete(self):
         # Delete file from GridFS, FileField still remains
@@ -1464,9 +1465,8 @@ class FileField(BaseField):
     """
     proxy_class = GridFSProxy
 
-    def __init__(self,
-                 db_alias=DEFAULT_CONNECTION_NAME,
-                 collection_name="fs", **kwargs):
+    def __init__(self, db_alias=DEFAULT_CONNECTION_NAME, collection_name='fs',
+                 **kwargs):
         super(FileField, self).__init__(**kwargs)
         self.collection_name = collection_name
         self.db_alias = db_alias
@@ -1488,8 +1488,10 @@ def __get__(self, instance, owner):
 
     def __set__(self, instance, value):
         key = self.name
-        if ((hasattr(value, 'read') and not
-                isinstance(value, GridFSProxy)) or isinstance(value, str_types)):
+        if (
+            (hasattr(value, 'read') and not isinstance(value, GridFSProxy)) or
+            isinstance(value, (six.binary_type, six.string_types))
+        ):
             # using "FileField() = file/string" notation
             grid_file = instance._data.get(self.name)
             # If a file already exists, delete it
@@ -1558,7 +1560,7 @@ def put(self, file_obj, **kwargs):
         try:
             img = Image.open(file_obj)
             img_format = img.format
-        except Exception, e:
+        except Exception as e:
             raise ValidationError('Invalid image: %s' % e)
 
         # Progressive JPEG
@@ -1667,10 +1669,10 @@ def thumbnail(self):
             return self.fs.get(out.thumbnail_id)
 
     def write(self, *args, **kwargs):
-        raise RuntimeError("Please use \"put\" method instead")
+        raise RuntimeError('Please use "put" method instead')
 
     def writelines(self, *args, **kwargs):
-        raise RuntimeError("Please use \"put\" method instead")
+        raise RuntimeError('Please use "put" method instead')
 
 
 class ImproperlyConfigured(Exception):
@@ -1695,14 +1697,17 @@ class ImageField(FileField):
     def __init__(self, size=None, thumbnail_size=None,
                  collection_name='images', **kwargs):
         if not Image:
-            raise ImproperlyConfigured("PIL library was not found")
+            raise ImproperlyConfigured('PIL library was not found')
 
         params_size = ('width', 'height', 'force')
-        extra_args = dict(size=size, thumbnail_size=thumbnail_size)
+        extra_args = {
+            'size': size,
+            'thumbnail_size': thumbnail_size
+        }
         for att_name, att in extra_args.items():
             value = None
             if isinstance(att, (tuple, list)):
-                if PY3:
+                if six.PY3:
                     value = dict(itertools.zip_longest(params_size, att,
                                                        fillvalue=None))
                 else:
@@ -1763,10 +1768,10 @@ def generate(self):
         Generate and Increment the counter
         """
         sequence_name = self.get_sequence_name()
-        sequence_id = "%s.%s" % (sequence_name, self.name)
+        sequence_id = '%s.%s' % (sequence_name, self.name)
         collection = get_db(alias=self.db_alias)[self.collection_name]
-        counter = collection.find_and_modify(query={"_id": sequence_id},
-                                             update={"$inc": {"next": 1}},
+        counter = collection.find_and_modify(query={'_id': sequence_id},
+                                             update={'$inc': {'next': 1}},
                                              new=True,
                                              upsert=True)
         return self.value_decorator(counter['next'])
@@ -1789,9 +1794,9 @@ def get_next_value(self):
         as it is only fixed on set.
         """
         sequence_name = self.get_sequence_name()
-        sequence_id = "%s.%s" % (sequence_name, self.name)
+        sequence_id = '%s.%s' % (sequence_name, self.name)
         collection = get_db(alias=self.db_alias)[self.collection_name]
-        data = collection.find_one({"_id": sequence_id})
+        data = collection.find_one({'_id': sequence_id})
 
         if data:
             return self.value_decorator(data['next'] + 1)
@@ -1861,8 +1866,8 @@ def to_python(self, value):
         if not self._binary:
             original_value = value
             try:
-                if not isinstance(value, basestring):
-                    value = unicode(value)
+                if not isinstance(value, six.string_types):
+                    value = six.text_type(value)
                 return uuid.UUID(value)
             except Exception:
                 return original_value
@@ -1870,8 +1875,8 @@ def to_python(self, value):
 
     def to_mongo(self, value):
         if not self._binary:
-            return unicode(value)
-        elif isinstance(value, basestring):
+            return six.text_type(value)
+        elif isinstance(value, six.string_types):
             return uuid.UUID(value)
         return value
 
@@ -1882,11 +1887,11 @@ def prepare_query_value(self, op, value):
 
     def validate(self, value):
         if not isinstance(value, uuid.UUID):
-            if not isinstance(value, basestring):
+            if not isinstance(value, six.string_types):
                 value = str(value)
             try:
                 uuid.UUID(value)
-            except Exception, exc:
+            except Exception as exc:
                 self.error('Could not convert to UUID: %s' % exc)
 
 
@@ -1904,19 +1909,18 @@ class GeoPointField(BaseField):
     _geo_index = pymongo.GEO2D
 
     def validate(self, value):
-        """Make sure that a geo-value is of type (x, y)
-        """
+        """Make sure that a geo-value is of type (x, y)"""
         if not isinstance(value, (list, tuple)):
             self.error('GeoPointField can only accept tuples or lists '
                        'of (x, y)')
 
         if not len(value) == 2:
-            self.error("Value (%s) must be a two-dimensional point" %
+            self.error('Value (%s) must be a two-dimensional point' %
                        repr(value))
         elif (not isinstance(value[0], (float, int)) or
               not isinstance(value[1], (float, int))):
             self.error(
-                "Both values (%s) in point must be float or int" % repr(value))
+                'Both values (%s) in point must be float or int' % repr(value))
 
 
 class PointField(GeoJsonBaseField):
@@ -1926,8 +1930,8 @@ class PointField(GeoJsonBaseField):
 
     .. code-block:: js
 
-        { "type" : "Point" ,
-          "coordinates" : [x, y]}
+        {'type' : 'Point' ,
+         'coordinates' : [x, y]}
 
     You can either pass a dict with the full information or a list
     to set the value.
@@ -1936,7 +1940,7 @@ class PointField(GeoJsonBaseField):
 
     .. versionadded:: 0.8
     """
-    _type = "Point"
+    _type = 'Point'
 
 
 class LineStringField(GeoJsonBaseField):
@@ -1946,8 +1950,8 @@ class LineStringField(GeoJsonBaseField):
 
     .. code-block:: js
 
-        { "type" : "LineString" ,
-          "coordinates" : [[x1, y1], [x1, y1] ... [xn, yn]]}
+        {'type' : 'LineString' ,
+         'coordinates' : [[x1, y1], [x1, y1] ... [xn, yn]]}
 
     You can either pass a dict with the full information or a list of points.
 
@@ -1955,7 +1959,7 @@ class LineStringField(GeoJsonBaseField):
 
     .. versionadded:: 0.8
     """
-    _type = "LineString"
+    _type = 'LineString'
 
 
 class PolygonField(GeoJsonBaseField):
@@ -1965,9 +1969,9 @@ class PolygonField(GeoJsonBaseField):
 
     .. code-block:: js
 
-        { "type" : "Polygon" ,
-          "coordinates" : [[[x1, y1], [x1, y1] ... [xn, yn]],
-                           [[x1, y1], [x1, y1] ... [xn, yn]]}
+        {'type' : 'Polygon' ,
+         'coordinates' : [[[x1, y1], [x1, y1] ... [xn, yn]],
+                          [[x1, y1], [x1, y1] ... [xn, yn]]}
 
     You can either pass a dict with the full information or a list
     of LineStrings. The first LineString being the outside and the rest being
@@ -1977,7 +1981,7 @@ class PolygonField(GeoJsonBaseField):
 
     .. versionadded:: 0.8
     """
-    _type = "Polygon"
+    _type = 'Polygon'
 
 
 class MultiPointField(GeoJsonBaseField):
@@ -1987,8 +1991,8 @@ class MultiPointField(GeoJsonBaseField):
 
     .. code-block:: js
 
-        { "type" : "MultiPoint" ,
-          "coordinates" : [[x1, y1], [x2, y2]]}
+        {'type' : 'MultiPoint' ,
+         'coordinates' : [[x1, y1], [x2, y2]]}
 
     You can either pass a dict with the full information or a list
     to set the value.
@@ -1997,7 +2001,7 @@ class MultiPointField(GeoJsonBaseField):
 
     .. versionadded:: 0.9
     """
-    _type = "MultiPoint"
+    _type = 'MultiPoint'
 
 
 class MultiLineStringField(GeoJsonBaseField):
@@ -2007,9 +2011,9 @@ class MultiLineStringField(GeoJsonBaseField):
 
     .. code-block:: js
 
-        { "type" : "MultiLineString" ,
-          "coordinates" : [[[x1, y1], [x1, y1] ... [xn, yn]],
-                           [[x1, y1], [x1, y1] ... [xn, yn]]]}
+        {'type' : 'MultiLineString' ,
+         'coordinates' : [[[x1, y1], [x1, y1] ... [xn, yn]],
+                          [[x1, y1], [x1, y1] ... [xn, yn]]]}
 
     You can either pass a dict with the full information or a list of points.
 
@@ -2017,7 +2021,7 @@ class MultiLineStringField(GeoJsonBaseField):
 
     .. versionadded:: 0.9
     """
-    _type = "MultiLineString"
+    _type = 'MultiLineString'
 
 
 class MultiPolygonField(GeoJsonBaseField):
@@ -2027,14 +2031,14 @@ class MultiPolygonField(GeoJsonBaseField):
 
     .. code-block:: js
 
-        { "type" : "MultiPolygon" ,
-          "coordinates" : [[
-                [[x1, y1], [x1, y1] ... [xn, yn]],
-                [[x1, y1], [x1, y1] ... [xn, yn]]
-            ], [
-                [[x1, y1], [x1, y1] ... [xn, yn]],
-                [[x1, y1], [x1, y1] ... [xn, yn]]
-            ]
+        {'type' : 'MultiPolygon' ,
+         'coordinates' : [[
+               [[x1, y1], [x1, y1] ... [xn, yn]],
+               [[x1, y1], [x1, y1] ... [xn, yn]]
+           ], [
+               [[x1, y1], [x1, y1] ... [xn, yn]],
+               [[x1, y1], [x1, y1] ... [xn, yn]]
+           ]
         }
 
     You can either pass a dict with the full information or a list
@@ -2044,4 +2048,4 @@ class MultiPolygonField(GeoJsonBaseField):
 
     .. versionadded:: 0.9
     """
-    _type = "MultiPolygon"
+    _type = 'MultiPolygon'
diff --git a/mongoengine/python_support.py b/mongoengine/python_support.py
index f4b6f20fc..e51e1bc98 100644
--- a/mongoengine/python_support.py
+++ b/mongoengine/python_support.py
@@ -1,50 +1,25 @@
-"""Helper functions and types to aid with Python 2.6 - 3 support."""
-
-import sys
-import warnings
-
+"""
+Helper functions, constants, and types to aid with Python v2.7 - v3.x and
+PyMongo v2.7 - v3.x support.
+"""
 import pymongo
+import six
 
 
-# Show a deprecation warning for people using Python v2.6
-# TODO remove in mongoengine v0.11.0
-if sys.version_info[0] == 2 and sys.version_info[1] == 6:
-    warnings.warn(
-        'Python v2.6 support is deprecated and is going to be dropped '
-        'entirely in the upcoming v0.11.0 release. Update your Python '
-        'version if you want to have access to the latest features and '
-        'bug fixes in MongoEngine.',
-        DeprecationWarning
-    )
-
 if pymongo.version_tuple[0] < 3:
     IS_PYMONGO_3 = False
 else:
     IS_PYMONGO_3 = True
 
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    import codecs
-    from io import BytesIO as StringIO
 
-    # return s converted to binary.  b('test') should be equivalent to b'test'
-    def b(s):
-        return codecs.latin_1_encode(s)[0]
+# six.BytesIO resolves to StringIO.StringIO in Py2 and io.BytesIO in Py3.
+StringIO = six.BytesIO
 
-    bin_type = bytes
-    txt_type = str
-else:
+# Additionally for Py2, try to use the faster cStringIO, if available
+if not six.PY3:
     try:
-        from cStringIO import StringIO
+        import cStringIO
     except ImportError:
-        from StringIO import StringIO
-
-    # Conversion to binary only necessary in Python 3
-    def b(s):
-        return s
-
-    bin_type = str
-    txt_type = unicode
-
-str_types = (bin_type, txt_type)
+        pass
+    else:
+        StringIO = cStringIO.StringIO
diff --git a/mongoengine/queryset/__init__.py b/mongoengine/queryset/__init__.py
index c8fa09dba..5219c39e1 100644
--- a/mongoengine/queryset/__init__.py
+++ b/mongoengine/queryset/__init__.py
@@ -1,11 +1,17 @@
-from mongoengine.errors import (DoesNotExist, InvalidQueryError,
-                                MultipleObjectsReturned, NotUniqueError,
-                                OperationError)
+from mongoengine.errors import *
 from mongoengine.queryset.field_list import *
 from mongoengine.queryset.manager import *
 from mongoengine.queryset.queryset import *
 from mongoengine.queryset.transform import *
 from mongoengine.queryset.visitor import *
 
-__all__ = (field_list.__all__ + manager.__all__ + queryset.__all__ +
-           transform.__all__ + visitor.__all__)
+# Expose just the public subset of all imported objects and constants.
+__all__ = (
+    'QuerySet', 'QuerySetNoCache', 'Q', 'queryset_manager', 'QuerySetManager',
+    'QueryFieldList', 'DO_NOTHING', 'NULLIFY', 'CASCADE', 'DENY', 'PULL',
+
+    # Errors that might be related to a queryset, mostly here for backward
+    # compatibility
+    'DoesNotExist', 'InvalidQueryError', 'MultipleObjectsReturned',
+    'NotUniqueError', 'OperationError',
+)
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ec48b4f36..3ee978b8b 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -12,9 +12,10 @@
 import pymongo
 import pymongo.errors
 from pymongo.common import validate_read_preference
+import six
 
 from mongoengine import signals
-from mongoengine.base.common import get_document
+from mongoengine.base import get_document
 from mongoengine.common import _import_class
 from mongoengine.connection import get_db
 from mongoengine.context_managers import switch_db
@@ -73,10 +74,10 @@ def __init__(self, document, collection):
         # subclasses of the class being used
         if document._meta.get('allow_inheritance') is True:
             if len(self._document._subclasses) == 1:
-                self._initial_query = {"_cls": self._document._subclasses[0]}
+                self._initial_query = {'_cls': self._document._subclasses[0]}
             else:
                 self._initial_query = {
-                    "_cls": {"$in": self._document._subclasses}}
+                    '_cls': {'$in': self._document._subclasses}}
             self._loaded_fields = QueryFieldList(always_include=['_cls'])
         self._cursor_obj = None
         self._limit = None
@@ -105,8 +106,8 @@ def __call__(self, q_obj=None, class_check=True, read_preference=None,
         if q_obj:
             # make sure proper query object is passed
             if not isinstance(q_obj, QNode):
-                msg = ("Not a query object: %s. "
-                       "Did you intend to use key=value?" % q_obj)
+                msg = ('Not a query object: %s. '
+                       'Did you intend to use key=value?' % q_obj)
                 raise InvalidQueryError(msg)
             query &= q_obj
 
@@ -133,10 +134,10 @@ def __getstate__(self):
         obj_dict = self.__dict__.copy()
 
         # don't picke collection, instead pickle collection params
-        obj_dict.pop("_collection_obj")
+        obj_dict.pop('_collection_obj')
 
         # don't pickle cursor
-        obj_dict["_cursor_obj"] = None
+        obj_dict['_cursor_obj'] = None
 
         return obj_dict
 
@@ -147,7 +148,7 @@ def __setstate__(self, obj_dict):
         See https://github.com/MongoEngine/mongoengine/issues/442
         """
 
-        obj_dict["_collection_obj"] = obj_dict["_document"]._get_collection()
+        obj_dict['_collection_obj'] = obj_dict['_document']._get_collection()
 
         # update attributes
         self.__dict__.update(obj_dict)
@@ -166,7 +167,7 @@ def __getitem__(self, key):
                 queryset._skip, queryset._limit = key.start, key.stop
                 if key.start and key.stop:
                     queryset._limit = key.stop - key.start
-            except IndexError, err:
+            except IndexError as err:
                 # PyMongo raises an error if key.start == key.stop, catch it,
                 # bin it, kill it.
                 start = key.start or 0
@@ -199,19 +200,16 @@ def __iter__(self):
         raise NotImplementedError
 
     def _has_data(self):
-        """ Retrieves whether cursor has any data. """
-
+        """Return True if cursor has any data."""
         queryset = self.order_by()
         return False if queryset.first() is None else True
 
     def __nonzero__(self):
-        """ Avoid to open all records in an if stmt in Py2. """
-
+        """Avoid to open all records in an if stmt in Py2."""
         return self._has_data()
 
     def __bool__(self):
-        """ Avoid to open all records in an if stmt in Py3. """
-
+        """Avoid to open all records in an if stmt in Py3."""
         return self._has_data()
 
     # Core functions
@@ -239,7 +237,7 @@ def search_text(self, text, language=None):
         queryset = self.clone()
         if queryset._search_text:
             raise OperationError(
-                "It is not possible to use search_text two times.")
+                'It is not possible to use search_text two times.')
 
         query_kwargs = SON({'$search': text})
         if language:
@@ -268,7 +266,7 @@ def get(self, *q_objs, **query):
         try:
             result = queryset.next()
         except StopIteration:
-            msg = ("%s matching query does not exist."
+            msg = ('%s matching query does not exist.'
                    % queryset._document._class_name)
             raise queryset._document.DoesNotExist(msg)
         try:
@@ -290,8 +288,7 @@ def create(self, **kwargs):
         return self._document(**kwargs).save()
 
     def first(self):
-        """Retrieve the first object matching the query.
-        """
+        """Retrieve the first object matching the query."""
         queryset = self.clone()
         try:
             result = queryset[0]
@@ -340,7 +337,7 @@ def insert(self, doc_or_docs, load_bulk=True,
                        % str(self._document))
                 raise OperationError(msg)
             if doc.pk and not doc._created:
-                msg = "Some documents have ObjectIds use doc.update() instead"
+                msg = 'Some documents have ObjectIds use doc.update() instead'
                 raise OperationError(msg)
 
         signal_kwargs = signal_kwargs or {}
@@ -350,17 +347,17 @@ def insert(self, doc_or_docs, load_bulk=True,
         raw = [doc.to_mongo() for doc in docs]
         try:
             ids = self._collection.insert(raw, **write_concern)
-        except pymongo.errors.DuplicateKeyError, err:
+        except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'
-            raise NotUniqueError(message % unicode(err))
-        except pymongo.errors.OperationFailure, err:
+            raise NotUniqueError(message % six.text_type(err))
+        except pymongo.errors.OperationFailure as err:
             message = 'Could not save document (%s)'
-            if re.match('^E1100[01] duplicate key', unicode(err)):
+            if re.match('^E1100[01] duplicate key', six.text_type(err)):
                 # E11000 - duplicate key error index
                 # E11001 - duplicate key on update
                 message = u'Tried to save duplicate unique keys (%s)'
-                raise NotUniqueError(message % unicode(err))
-            raise OperationError(message % unicode(err))
+                raise NotUniqueError(message % six.text_type(err))
+            raise OperationError(message % six.text_type(err))
 
         if not load_bulk:
             signals.post_bulk_insert.send(
@@ -386,7 +383,8 @@ def count(self, with_limit_and_skip=False):
             return 0
         return self._cursor.count(with_limit_and_skip=with_limit_and_skip)
 
-    def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
+    def delete(self, write_concern=None, _from_doc_delete=False,
+               cascade_refs=None):
         """Delete the documents matched by the query.
 
         :param write_concern: Extra keyword arguments are passed down which
@@ -409,8 +407,9 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
         # Handle deletes where skips or limits have been applied or
         # there is an untriggered delete signal
         has_delete_signal = signals.signals_available and (
-            signals.pre_delete.has_receivers_for(self._document) or
-            signals.post_delete.has_receivers_for(self._document))
+            signals.pre_delete.has_receivers_for(doc) or
+            signals.post_delete.has_receivers_for(doc)
+        )
 
         call_document_delete = (queryset._skip or queryset._limit or
                                 has_delete_signal) and not _from_doc_delete
@@ -423,37 +422,44 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
             return cnt
 
         delete_rules = doc._meta.get('delete_rules') or {}
+        delete_rules = list(delete_rules.items())
+
         # Check for DENY rules before actually deleting/nullifying any other
         # references
-        for rule_entry in delete_rules:
+        for rule_entry, rule in delete_rules:
             document_cls, field_name = rule_entry
             if document_cls._meta.get('abstract'):
                 continue
-            rule = doc._meta['delete_rules'][rule_entry]
-            if rule == DENY and document_cls.objects(
-                    **{field_name + '__in': self}).count() > 0:
-                msg = ("Could not delete document (%s.%s refers to it)"
-                       % (document_cls.__name__, field_name))
-                raise OperationError(msg)
 
-        for rule_entry in delete_rules:
+            if rule == DENY:
+                refs = document_cls.objects(**{field_name + '__in': self})
+                if refs.limit(1).count() > 0:
+                    raise OperationError(
+                        'Could not delete document (%s.%s refers to it)'
+                        % (document_cls.__name__, field_name)
+                    )
+
+        # Check all the other rules
+        for rule_entry, rule in delete_rules:
             document_cls, field_name = rule_entry
             if document_cls._meta.get('abstract'):
                 continue
-            rule = doc._meta['delete_rules'][rule_entry]
+
             if rule == CASCADE:
                 cascade_refs = set() if cascade_refs is None else cascade_refs
                 # Handle recursive reference
                 if doc._collection == document_cls._collection:
                     for ref in queryset:
                         cascade_refs.add(ref.id)
-                ref_q = document_cls.objects(**{field_name + '__in': self, 'pk__nin': cascade_refs})
-                ref_q_count = ref_q.count()
-                if ref_q_count > 0:
-                    ref_q.delete(write_concern=write_concern, cascade_refs=cascade_refs)
+                refs = document_cls.objects(**{field_name + '__in': self,
+                                               'pk__nin': cascade_refs})
+                if refs.count() > 0:
+                    refs.delete(write_concern=write_concern,
+                                cascade_refs=cascade_refs)
             elif rule == NULLIFY:
                 document_cls.objects(**{field_name + '__in': self}).update(
-                    write_concern=write_concern, **{'unset__%s' % field_name: 1})
+                    write_concern=write_concern,
+                    **{'unset__%s' % field_name: 1})
             elif rule == PULL:
                 document_cls.objects(**{field_name + '__in': self}).update(
                     write_concern=write_concern,
@@ -461,7 +467,7 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
 
         result = queryset._collection.remove(queryset._query, **write_concern)
         if result:
-            return result.get("n")
+            return result.get('n')
 
     def update(self, upsert=False, multi=True, write_concern=None,
                full_result=False, **update):
@@ -482,7 +488,7 @@ def update(self, upsert=False, multi=True, write_concern=None,
         .. versionadded:: 0.2
         """
         if not update and not upsert:
-            raise OperationError("No update parameters, would remove data")
+            raise OperationError('No update parameters, would remove data')
 
         if write_concern is None:
             write_concern = {}
@@ -495,9 +501,9 @@ def update(self, upsert=False, multi=True, write_concern=None,
         # then ensure we add _cls to the update operation
         if upsert and '_cls' in query:
             if '$set' in update:
-                update["$set"]["_cls"] = queryset._document._class_name
+                update['$set']['_cls'] = queryset._document._class_name
             else:
-                update["$set"] = {"_cls": queryset._document._class_name}
+                update['$set'] = {'_cls': queryset._document._class_name}
         try:
             result = queryset._collection.update(query, update, multi=multi,
                                                  upsert=upsert, **write_concern)
@@ -505,13 +511,13 @@ def update(self, upsert=False, multi=True, write_concern=None,
                 return result
             elif result:
                 return result['n']
-        except pymongo.errors.DuplicateKeyError, err:
-            raise NotUniqueError(u'Update failed (%s)' % unicode(err))
-        except pymongo.errors.OperationFailure, err:
-            if unicode(err) == u'multi not coded yet':
+        except pymongo.errors.DuplicateKeyError as err:
+            raise NotUniqueError(u'Update failed (%s)' % six.text_type(err))
+        except pymongo.errors.OperationFailure as err:
+            if six.text_type(err) == u'multi not coded yet':
                 message = u'update() method requires MongoDB 1.1.3+'
                 raise OperationError(message)
-            raise OperationError(u'Update failed (%s)' % unicode(err))
+            raise OperationError(u'Update failed (%s)' % six.text_type(err))
 
     def upsert_one(self, write_concern=None, **update):
         """Overwrite or add the first document matched by the query.
@@ -582,11 +588,11 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
         """
 
         if remove and new:
-            raise OperationError("Conflicting parameters: remove and new")
+            raise OperationError('Conflicting parameters: remove and new')
 
         if not update and not upsert and not remove:
             raise OperationError(
-                "No update parameters, must either update or remove")
+                'No update parameters, must either update or remove')
 
         queryset = self.clone()
         query = queryset._query
@@ -597,7 +603,7 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
         try:
             if IS_PYMONGO_3:
                 if full_response:
-                    msg = "With PyMongo 3+, it is not possible anymore to get the full response."
+                    msg = 'With PyMongo 3+, it is not possible anymore to get the full response.'
                     warnings.warn(msg, DeprecationWarning)
                 if remove:
                     result = queryset._collection.find_one_and_delete(
@@ -615,14 +621,14 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
                 result = queryset._collection.find_and_modify(
                     query, update, upsert=upsert, sort=sort, remove=remove, new=new,
                     full_response=full_response, **self._cursor_args)
-        except pymongo.errors.DuplicateKeyError, err:
-            raise NotUniqueError(u"Update failed (%s)" % err)
-        except pymongo.errors.OperationFailure, err:
-            raise OperationError(u"Update failed (%s)" % err)
+        except pymongo.errors.DuplicateKeyError as err:
+            raise NotUniqueError(u'Update failed (%s)' % err)
+        except pymongo.errors.OperationFailure as err:
+            raise OperationError(u'Update failed (%s)' % err)
 
         if full_response:
-            if result["value"] is not None:
-                result["value"] = self._document._from_son(result["value"], only_fields=self.only_fields)
+            if result['value'] is not None:
+                result['value'] = self._document._from_son(result['value'], only_fields=self.only_fields)
         else:
             if result is not None:
                 result = self._document._from_son(result, only_fields=self.only_fields)
@@ -640,7 +646,7 @@ def with_id(self, object_id):
         """
         queryset = self.clone()
         if not queryset._query_obj.empty:
-            msg = "Cannot use a filter whilst using `with_id`"
+            msg = 'Cannot use a filter whilst using `with_id`'
             raise InvalidQueryError(msg)
         return queryset.filter(pk=object_id).first()
 
@@ -684,7 +690,7 @@ def no_sub_classes(self):
         Only return instances of this document and not any inherited documents
         """
         if self._document._meta.get('allow_inheritance') is True:
-            self._initial_query = {"_cls": self._document._class_name}
+            self._initial_query = {'_cls': self._document._class_name}
 
         return self
 
@@ -810,49 +816,56 @@ def distinct(self, field):
         .. versionchanged:: 0.6 - Improved db_field refrence handling
         """
         queryset = self.clone()
+
         try:
             field = self._fields_to_dbfields([field]).pop()
-        finally:
-            distinct = self._dereference(queryset._cursor.distinct(field), 1,
-                                         name=field, instance=self._document)
-
-            doc_field = self._document._fields.get(field.split('.', 1)[0])
-            instance = False
-            # We may need to cast to the correct type eg. ListField(EmbeddedDocumentField)
-            EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
-            ListField = _import_class('ListField')
-            GenericEmbeddedDocumentField = _import_class('GenericEmbeddedDocumentField')
-            if isinstance(doc_field, ListField):
-                doc_field = getattr(doc_field, "field", doc_field)
-            if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
-                instance = getattr(doc_field, "document_type", False)
-            # handle distinct on subdocuments
-            if '.' in field:
-                for field_part in field.split('.')[1:]:
-                    # if looping on embedded document, get the document type instance
-                    if instance and isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
-                        doc_field = instance
-                    # now get the subdocument
-                    doc_field = getattr(doc_field, field_part, doc_field)
-                    # We may need to cast to the correct type eg. ListField(EmbeddedDocumentField)
-                    if isinstance(doc_field, ListField):
-                        doc_field = getattr(doc_field, "field", doc_field)
-                    if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
-                        instance = getattr(doc_field, "document_type", False)
-            if instance and isinstance(doc_field, (EmbeddedDocumentField,
-                                                   GenericEmbeddedDocumentField)):
-                distinct = [instance(**doc) for doc in distinct]
-            return distinct
+        except LookUpError:
+            pass
+
+        distinct = self._dereference(queryset._cursor.distinct(field), 1,
+                                     name=field, instance=self._document)
+
+        doc_field = self._document._fields.get(field.split('.', 1)[0])
+        instance = None
+
+        # We may need to cast to the correct type eg. ListField(EmbeddedDocumentField)
+        EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
+        ListField = _import_class('ListField')
+        GenericEmbeddedDocumentField = _import_class('GenericEmbeddedDocumentField')
+        if isinstance(doc_field, ListField):
+            doc_field = getattr(doc_field, 'field', doc_field)
+        if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
+            instance = getattr(doc_field, 'document_type', None)
+
+        # handle distinct on subdocuments
+        if '.' in field:
+            for field_part in field.split('.')[1:]:
+                # if looping on embedded document, get the document type instance
+                if instance and isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
+                    doc_field = instance
+                # now get the subdocument
+                doc_field = getattr(doc_field, field_part, doc_field)
+                # We may need to cast to the correct type eg. ListField(EmbeddedDocumentField)
+                if isinstance(doc_field, ListField):
+                    doc_field = getattr(doc_field, 'field', doc_field)
+                if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
+                    instance = getattr(doc_field, 'document_type', None)
+
+        if instance and isinstance(doc_field, (EmbeddedDocumentField,
+                                               GenericEmbeddedDocumentField)):
+            distinct = [instance(**doc) for doc in distinct]
+
+        return distinct
 
     def only(self, *fields):
         """Load only a subset of this document's fields. ::
 
-            post = BlogPost.objects(...).only("title", "author.name")
+            post = BlogPost.objects(...).only('title', 'author.name')
 
         .. note :: `only()` is chainable and will perform a union ::
             So with the following it will fetch both: `title` and `author.name`::
 
-                post = BlogPost.objects.only("title").only("author.name")
+                post = BlogPost.objects.only('title').only('author.name')
 
         :func:`~mongoengine.queryset.QuerySet.all_fields` will reset any
         field filters.
@@ -862,19 +875,19 @@ def only(self, *fields):
         .. versionadded:: 0.3
         .. versionchanged:: 0.5 - Added subfield support
         """
-        fields = dict([(f, QueryFieldList.ONLY) for f in fields])
+        fields = {f: QueryFieldList.ONLY for f in fields}
         self.only_fields = fields.keys()
         return self.fields(True, **fields)
 
     def exclude(self, *fields):
         """Opposite to .only(), exclude some document's fields. ::
 
-            post = BlogPost.objects(...).exclude("comments")
+            post = BlogPost.objects(...).exclude('comments')
 
         .. note :: `exclude()` is chainable and will perform a union ::
             So with the following it will exclude both: `title` and `author.name`::
 
-                post = BlogPost.objects.exclude("title").exclude("author.name")
+                post = BlogPost.objects.exclude('title').exclude('author.name')
 
         :func:`~mongoengine.queryset.QuerySet.all_fields` will reset any
         field filters.
@@ -883,7 +896,7 @@ def exclude(self, *fields):
 
         .. versionadded:: 0.5
         """
-        fields = dict([(f, QueryFieldList.EXCLUDE) for f in fields])
+        fields = {f: QueryFieldList.EXCLUDE for f in fields}
         return self.fields(**fields)
 
     def fields(self, _only_called=False, **kwargs):
@@ -904,7 +917,7 @@ def fields(self, _only_called=False, **kwargs):
         """
 
         # Check for an operator and transform to mongo-style if there is
-        operators = ["slice"]
+        operators = ['slice']
         cleaned_fields = []
         for key, value in kwargs.items():
             parts = key.split('__')
@@ -928,7 +941,7 @@ def all_fields(self):
         """Include all fields. Reset all previously calls of .only() or
         .exclude(). ::
 
-            post = BlogPost.objects.exclude("comments").all_fields()
+            post = BlogPost.objects.exclude('comments').all_fields()
 
         .. versionadded:: 0.5
         """
@@ -955,7 +968,7 @@ def comment(self, text):
         See https://docs.mongodb.com/manual/reference/method/cursor.comment/#cursor.comment
         for details.
         """
-        return self._chainable_method("comment", text)
+        return self._chainable_method('comment', text)
 
     def explain(self, format=False):
         """Return an explain plan record for the
@@ -964,8 +977,15 @@ def explain(self, format=False):
         :param format: format the plan before returning it
         """
         plan = self._cursor.explain()
+
+        # TODO remove this option completely - it's useless. If somebody
+        # wants to pretty-print the output, they easily can.
         if format:
+            msg = ('"format" param of BaseQuerySet.explain has been '
+                   'deprecated and will be removed in future versions.')
+            warnings.warn(msg, DeprecationWarning)
             plan = pprint.pformat(plan)
+
         return plan
 
     # DEPRECATED. Has no more impact on PyMongo 3+
@@ -978,7 +998,7 @@ def snapshot(self, enabled):
         .. deprecated:: Ignored with PyMongo 3+
         """
         if IS_PYMONGO_3:
-            msg = "snapshot is deprecated as it has no impact when using PyMongo 3+."
+            msg = 'snapshot is deprecated as it has no impact when using PyMongo 3+.'
             warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._snapshot = enabled
@@ -1004,7 +1024,7 @@ def slave_okay(self, enabled):
         .. deprecated:: Ignored with PyMongo 3+
         """
         if IS_PYMONGO_3:
-            msg = "slave_okay is deprecated as it has no impact when using PyMongo 3+."
+            msg = 'slave_okay is deprecated as it has no impact when using PyMongo 3+.'
             warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._slave_okay = enabled
@@ -1066,7 +1086,7 @@ def max_time_ms(self, ms):
 
         :param ms: the number of milliseconds before killing the query on the server
         """
-        return self._chainable_method("max_time_ms", ms)
+        return self._chainable_method('max_time_ms', ms)
 
     # JSON Helpers
 
@@ -1149,19 +1169,19 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
 
         MapReduceDocument = _import_class('MapReduceDocument')
 
-        if not hasattr(self._collection, "map_reduce"):
-            raise NotImplementedError("Requires MongoDB >= 1.7.1")
+        if not hasattr(self._collection, 'map_reduce'):
+            raise NotImplementedError('Requires MongoDB >= 1.7.1')
 
         map_f_scope = {}
         if isinstance(map_f, Code):
             map_f_scope = map_f.scope
-            map_f = unicode(map_f)
+            map_f = six.text_type(map_f)
         map_f = Code(queryset._sub_js_fields(map_f), map_f_scope)
 
         reduce_f_scope = {}
         if isinstance(reduce_f, Code):
             reduce_f_scope = reduce_f.scope
-            reduce_f = unicode(reduce_f)
+            reduce_f = six.text_type(reduce_f)
         reduce_f_code = queryset._sub_js_fields(reduce_f)
         reduce_f = Code(reduce_f_code, reduce_f_scope)
 
@@ -1171,7 +1191,7 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
             finalize_f_scope = {}
             if isinstance(finalize_f, Code):
                 finalize_f_scope = finalize_f.scope
-                finalize_f = unicode(finalize_f)
+                finalize_f = six.text_type(finalize_f)
             finalize_f_code = queryset._sub_js_fields(finalize_f)
             finalize_f = Code(finalize_f_code, finalize_f_scope)
             mr_args['finalize'] = finalize_f
@@ -1187,7 +1207,7 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
         else:
             map_reduce_function = 'map_reduce'
 
-            if isinstance(output, basestring):
+            if isinstance(output, six.string_types):
                 mr_args['out'] = output
 
             elif isinstance(output, dict):
@@ -1200,7 +1220,7 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
                         break
 
                 else:
-                    raise OperationError("actionData not specified for output")
+                    raise OperationError('actionData not specified for output')
 
                 db_alias = output.get('db_alias')
                 remaing_args = ['db', 'sharded', 'nonAtomic']
@@ -1430,7 +1450,7 @@ def _cursor_args(self):
             # snapshot is not handled at all by PyMongo 3+
             # TODO: evaluate similar possibilities using modifiers
             if self._snapshot:
-                msg = "The snapshot option is not anymore available with PyMongo 3+"
+                msg = 'The snapshot option is not anymore available with PyMongo 3+'
                 warnings.warn(msg, DeprecationWarning)
             cursor_args = {
                 'no_cursor_timeout': not self._timeout
@@ -1442,7 +1462,7 @@ def _cursor_args(self):
             if fields_name not in cursor_args:
                 cursor_args[fields_name] = {}
 
-            cursor_args[fields_name]['_text_score'] = {'$meta': "textScore"}
+            cursor_args[fields_name]['_text_score'] = {'$meta': 'textScore'}
 
         return cursor_args
 
@@ -1497,8 +1517,8 @@ def _query(self):
         if self._mongo_query is None:
             self._mongo_query = self._query_obj.to_query(self._document)
             if self._class_check and self._initial_query:
-                if "_cls" in self._mongo_query:
-                    self._mongo_query = {"$and": [self._initial_query, self._mongo_query]}
+                if '_cls' in self._mongo_query:
+                    self._mongo_query = {'$and': [self._initial_query, self._mongo_query]}
                 else:
                     self._mongo_query.update(self._initial_query)
         return self._mongo_query
@@ -1510,8 +1530,7 @@ def _dereference(self):
         return self.__dereference
 
     def no_dereference(self):
-        """Turn off any dereferencing for the results of this queryset.
-        """
+        """Turn off any dereferencing for the results of this queryset."""
         queryset = self.clone()
         queryset._auto_dereference = False
         return queryset
@@ -1540,7 +1559,7 @@ def _item_frequencies_map_reduce(self, field, normalize=False):
                     emit(null, 1);
                 }
             }
-        """ % dict(field=field)
+        """ % {'field': field}
         reduce_func = """
             function(key, values) {
                 var total = 0;
@@ -1562,8 +1581,8 @@ def _item_frequencies_map_reduce(self, field, normalize=False):
 
         if normalize:
             count = sum(frequencies.values())
-            frequencies = dict([(k, float(v) / count)
-                                for k, v in frequencies.items()])
+            frequencies = {k: float(v) / count
+                           for k, v in frequencies.items()}
 
         return frequencies
 
@@ -1615,10 +1634,10 @@ def _item_frequencies_exec_js(self, field, normalize=False):
             }
         """
         total, data, types = self.exec_js(freq_func, field)
-        values = dict([(types.get(k), int(v)) for k, v in data.iteritems()])
+        values = {types.get(k): int(v) for k, v in data.iteritems()}
 
         if normalize:
-            values = dict([(k, float(v) / total) for k, v in values.items()])
+            values = {k: float(v) / total for k, v in values.items()}
 
         frequencies = {}
         for k, v in values.iteritems():
@@ -1640,14 +1659,14 @@ def _fields_to_dbfields(self, fields):
                           for x in document._subclasses][1:]
         for field in fields:
             try:
-                field = ".".join(f.db_field for f in
+                field = '.'.join(f.db_field for f in
                                  document._lookup_field(field.split('.')))
                 ret.append(field)
-            except LookUpError, err:
+            except LookUpError as err:
                 found = False
                 for subdoc in subclasses:
                     try:
-                        subfield = ".".join(f.db_field for f in
+                        subfield = '.'.join(f.db_field for f in
                                             subdoc._lookup_field(field.split('.')))
                         ret.append(subfield)
                         found = True
@@ -1660,15 +1679,14 @@ def _fields_to_dbfields(self, fields):
         return ret
 
     def _get_order_by(self, keys):
-        """Creates a list of order by fields
-        """
+        """Creates a list of order by fields"""
         key_list = []
         for key in keys:
             if not key:
                 continue
 
             if key == '$text_score':
-                key_list.append(('_text_score', {'$meta': "textScore"}))
+                key_list.append(('_text_score', {'$meta': 'textScore'}))
                 continue
 
             direction = pymongo.ASCENDING
@@ -1740,7 +1758,7 @@ def clean(data, path=None):
                     # If we need to coerce types, we need to determine the
                     # type of this field and use the corresponding
                     # .to_python(...)
-                    from mongoengine.fields import EmbeddedDocumentField
+                    EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
 
                     obj = self._document
                     for chunk in path.split('.'):
@@ -1774,7 +1792,7 @@ def field_path_sub(match):
             field_name = match.group(1).split('.')
             fields = self._document._lookup_field(field_name)
             # Substitute the correct name for the field into the javascript
-            return ".".join([f.db_field for f in fields])
+            return '.'.join([f.db_field for f in fields])
 
         code = re.sub(u'\[\s*~([A-z_][A-z_0-9.]+?)\s*\]', field_sub, code)
         code = re.sub(u'\{\{\s*~([A-z_][A-z_0-9.]+?)\s*\}\}', field_path_sub,
@@ -1785,21 +1803,21 @@ def _chainable_method(self, method_name, val):
         queryset = self.clone()
         method = getattr(queryset._cursor, method_name)
         method(val)
-        setattr(queryset, "_" + method_name, val)
+        setattr(queryset, '_' + method_name, val)
         return queryset
 
     # Deprecated
     def ensure_index(self, **kwargs):
         """Deprecated use :func:`Document.ensure_index`"""
-        msg = ("Doc.objects()._ensure_index() is deprecated. "
-               "Use Doc.ensure_index() instead.")
+        msg = ('Doc.objects()._ensure_index() is deprecated. '
+               'Use Doc.ensure_index() instead.')
         warnings.warn(msg, DeprecationWarning)
         self._document.__class__.ensure_index(**kwargs)
         return self
 
     def _ensure_indexes(self):
         """Deprecated use :func:`~Document.ensure_indexes`"""
-        msg = ("Doc.objects()._ensure_indexes() is deprecated. "
-               "Use Doc.ensure_indexes() instead.")
+        msg = ('Doc.objects()._ensure_indexes() is deprecated. '
+               'Use Doc.ensure_indexes() instead.')
         warnings.warn(msg, DeprecationWarning)
         self._document.__class__.ensure_indexes()
diff --git a/mongoengine/queryset/field_list.py b/mongoengine/queryset/field_list.py
index c10ad5525..0524c3bbb 100644
--- a/mongoengine/queryset/field_list.py
+++ b/mongoengine/queryset/field_list.py
@@ -67,7 +67,7 @@ def __nonzero__(self):
         return bool(self.fields)
 
     def as_dict(self):
-        field_list = dict((field, self.value) for field in self.fields)
+        field_list = {field: self.value for field in self.fields}
         if self.slice:
             field_list.update(self.slice)
         if self._id is not None:
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index b185b340a..9c1f24e12 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -53,15 +53,14 @@ def __len__(self):
         return self._len
 
     def __repr__(self):
-        """Provides the string representation of the QuerySet
-        """
+        """Provide a string representation of the QuerySet"""
         if self._iter:
             return '.. queryset mid-iteration ..'
 
         self._populate_cache()
         data = self._result_cache[:REPR_OUTPUT_SIZE + 1]
         if len(data) > REPR_OUTPUT_SIZE:
-            data[-1] = "...(remaining elements truncated)..."
+            data[-1] = '...(remaining elements truncated)...'
         return repr(data)
 
     def _iter_results(self):
@@ -113,7 +112,7 @@ def _populate_cache(self):
         # Pull in ITER_CHUNK_SIZE docs from the database and store them in
         # the result cache.
         try:
-            for i in xrange(ITER_CHUNK_SIZE):
+            for _ in xrange(ITER_CHUNK_SIZE):
                 self._result_cache.append(self.next())
         except StopIteration:
             # Getting this exception means there are no more docs in the
@@ -142,7 +141,7 @@ def no_cache(self):
         .. versionadded:: 0.8.3 Convert to non caching queryset
         """
         if self._result_cache is not None:
-            raise OperationError("QuerySet already cached")
+            raise OperationError('QuerySet already cached')
         return self.clone_into(QuerySetNoCache(self._document, self._collection))
 
 
@@ -165,13 +164,14 @@ def __repr__(self):
             return '.. queryset mid-iteration ..'
 
         data = []
-        for i in xrange(REPR_OUTPUT_SIZE + 1):
+        for _ in xrange(REPR_OUTPUT_SIZE + 1):
             try:
                 data.append(self.next())
             except StopIteration:
                 break
+
         if len(data) > REPR_OUTPUT_SIZE:
-            data[-1] = "...(remaining elements truncated)..."
+            data[-1] = '...(remaining elements truncated)...'
 
         self.rewind()
         return repr(data)
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index b3acca40f..af59917cf 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -3,8 +3,9 @@
 from bson import ObjectId, SON
 from bson.dbref import DBRef
 import pymongo
+import six
 
-from mongoengine.base.fields import UPDATE_OPERATORS
+from mongoengine.base import UPDATE_OPERATORS
 from mongoengine.common import _import_class
 from mongoengine.connection import get_connection
 from mongoengine.errors import InvalidQueryError
@@ -29,12 +30,11 @@
 
 # TODO make this less complex
 def query(_doc_cls=None, **kwargs):
-    """Transform a query from Django-style format to Mongo format.
-    """
+    """Transform a query from Django-style format to Mongo format."""
     mongo_query = {}
     merge_query = defaultdict(list)
     for key, value in sorted(kwargs.items()):
-        if key == "__raw__":
+        if key == '__raw__':
             mongo_query.update(value)
             continue
 
@@ -47,7 +47,7 @@ def query(_doc_cls=None, **kwargs):
             op = parts.pop()
 
         # Allow to escape operator-like field name by __
-        if len(parts) > 1 and parts[-1] == "":
+        if len(parts) > 1 and parts[-1] == '':
             parts.pop()
 
         negate = False
@@ -59,7 +59,7 @@ def query(_doc_cls=None, **kwargs):
             # Switch field names to proper names [set in Field(name='foo')]
             try:
                 fields = _doc_cls._lookup_field(parts)
-            except Exception, e:
+            except Exception as e:
                 raise InvalidQueryError(e)
             parts = []
 
@@ -69,7 +69,7 @@ def query(_doc_cls=None, **kwargs):
             cleaned_fields = []
             for field in fields:
                 append_field = True
-                if isinstance(field, basestring):
+                if isinstance(field, six.string_types):
                     parts.append(field)
                     append_field = False
                 # is last and CachedReferenceField
@@ -87,9 +87,9 @@ def query(_doc_cls=None, **kwargs):
             singular_ops = [None, 'ne', 'gt', 'gte', 'lt', 'lte', 'not']
             singular_ops += STRING_OPERATORS
             if op in singular_ops:
-                if isinstance(field, basestring):
+                if isinstance(field, six.string_types):
                     if (op in STRING_OPERATORS and
-                            isinstance(value, basestring)):
+                            isinstance(value, six.string_types)):
                         StringField = _import_class('StringField')
                         value = StringField.prepare_query_value(op, value)
                     else:
@@ -129,10 +129,10 @@ def query(_doc_cls=None, **kwargs):
                     value = query(field.field.document_type, **value)
                 else:
                     value = field.prepare_query_value(op, value)
-                value = {"$elemMatch": value}
+                value = {'$elemMatch': value}
             elif op in CUSTOM_OPERATORS:
-                NotImplementedError("Custom method '%s' has not "
-                                    "been implemented" % op)
+                NotImplementedError('Custom method "%s" has not '
+                                    'been implemented' % op)
             elif op not in STRING_OPERATORS:
                 value = {'$' + op: value}
 
@@ -197,15 +197,16 @@ def query(_doc_cls=None, **kwargs):
 
 
 def update(_doc_cls=None, **update):
-    """Transform an update spec from Django-style format to Mongo format.
+    """Transform an update spec from Django-style format to Mongo
+    format.
     """
     mongo_update = {}
     for key, value in update.items():
-        if key == "__raw__":
+        if key == '__raw__':
             mongo_update.update(value)
             continue
         parts = key.split('__')
-        # if there is no operator, default to "set"
+        # if there is no operator, default to 'set'
         if len(parts) < 3 and parts[0] not in UPDATE_OPERATORS:
             parts.insert(0, 'set')
         # Check for an operator and transform to mongo-style if there is
@@ -224,21 +225,21 @@ def update(_doc_cls=None, **update):
             elif op == 'add_to_set':
                 op = 'addToSet'
             elif op == 'set_on_insert':
-                op = "setOnInsert"
+                op = 'setOnInsert'
 
         match = None
         if parts[-1] in COMPARISON_OPERATORS:
             match = parts.pop()
 
         # Allow to escape operator-like field name by __
-        if len(parts) > 1 and parts[-1] == "":
+        if len(parts) > 1 and parts[-1] == '':
             parts.pop()
 
         if _doc_cls:
             # Switch field names to proper names [set in Field(name='foo')]
             try:
                 fields = _doc_cls._lookup_field(parts)
-            except Exception, e:
+            except Exception as e:
                 raise InvalidQueryError(e)
             parts = []
 
@@ -246,7 +247,7 @@ def update(_doc_cls=None, **update):
             appended_sub_field = False
             for field in fields:
                 append_field = True
-                if isinstance(field, basestring):
+                if isinstance(field, six.string_types):
                     # Convert the S operator to $
                     if field == 'S':
                         field = '$'
@@ -267,7 +268,7 @@ def update(_doc_cls=None, **update):
             else:
                 field = cleaned_fields[-1]
 
-            GeoJsonBaseField = _import_class("GeoJsonBaseField")
+            GeoJsonBaseField = _import_class('GeoJsonBaseField')
             if isinstance(field, GeoJsonBaseField):
                 value = field.to_mongo(value)
 
@@ -281,7 +282,7 @@ def update(_doc_cls=None, **update):
                     value = [field.prepare_query_value(op, v) for v in value]
                 elif field.required or value is not None:
                     value = field.prepare_query_value(op, value)
-            elif op == "unset":
+            elif op == 'unset':
                 value = 1
 
         if match:
@@ -291,16 +292,16 @@ def update(_doc_cls=None, **update):
         key = '.'.join(parts)
 
         if not op:
-            raise InvalidQueryError("Updates must supply an operation "
-                                    "eg: set__FIELD=value")
+            raise InvalidQueryError('Updates must supply an operation '
+                                    'eg: set__FIELD=value')
 
         if 'pull' in op and '.' in key:
             # Dot operators don't work on pull operations
             # unless they point to a list field
             # Otherwise it uses nested dict syntax
             if op == 'pullAll':
-                raise InvalidQueryError("pullAll operations only support "
-                                        "a single field depth")
+                raise InvalidQueryError('pullAll operations only support '
+                                        'a single field depth')
 
             # Look for the last list field and use dot notation until there
             field_classes = [c.__class__ for c in cleaned_fields]
@@ -311,7 +312,7 @@ def update(_doc_cls=None, **update):
                 # Then process as normal
                 last_listField = len(
                     cleaned_fields) - field_classes.index(ListField)
-                key = ".".join(parts[:last_listField])
+                key = '.'.join(parts[:last_listField])
                 parts = parts[last_listField:]
                 parts.insert(0, key)
 
@@ -319,7 +320,7 @@ def update(_doc_cls=None, **update):
             for key in parts:
                 value = {key: value}
         elif op == 'addToSet' and isinstance(value, list):
-            value = {key: {"$each": value}}
+            value = {key: {'$each': value}}
         else:
             value = {key: value}
         key = '$' + op
@@ -333,78 +334,82 @@ def update(_doc_cls=None, **update):
 
 
 def _geo_operator(field, op, value):
-    """Helper to return the query for a given geo query"""
-    if op == "max_distance":
+    """Helper to return the query for a given geo query."""
+    if op == 'max_distance':
         value = {'$maxDistance': value}
-    elif op == "min_distance":
+    elif op == 'min_distance':
         value = {'$minDistance': value}
     elif field._geo_index == pymongo.GEO2D:
-        if op == "within_distance":
+        if op == 'within_distance':
             value = {'$within': {'$center': value}}
-        elif op == "within_spherical_distance":
+        elif op == 'within_spherical_distance':
             value = {'$within': {'$centerSphere': value}}
-        elif op == "within_polygon":
+        elif op == 'within_polygon':
             value = {'$within': {'$polygon': value}}
-        elif op == "near":
+        elif op == 'near':
             value = {'$near': value}
-        elif op == "near_sphere":
+        elif op == 'near_sphere':
             value = {'$nearSphere': value}
         elif op == 'within_box':
             value = {'$within': {'$box': value}}
         else:
-            raise NotImplementedError("Geo method '%s' has not "
-                                      "been implemented for a GeoPointField" % op)
+            raise NotImplementedError('Geo method "%s" has not been '
+                                      'implemented for a GeoPointField' % op)
     else:
-        if op == "geo_within":
-            value = {"$geoWithin": _infer_geometry(value)}
-        elif op == "geo_within_box":
-            value = {"$geoWithin": {"$box": value}}
-        elif op == "geo_within_polygon":
-            value = {"$geoWithin": {"$polygon": value}}
-        elif op == "geo_within_center":
-            value = {"$geoWithin": {"$center": value}}
-        elif op == "geo_within_sphere":
-            value = {"$geoWithin": {"$centerSphere": value}}
-        elif op == "geo_intersects":
-            value = {"$geoIntersects": _infer_geometry(value)}
-        elif op == "near":
+        if op == 'geo_within':
+            value = {'$geoWithin': _infer_geometry(value)}
+        elif op == 'geo_within_box':
+            value = {'$geoWithin': {'$box': value}}
+        elif op == 'geo_within_polygon':
+            value = {'$geoWithin': {'$polygon': value}}
+        elif op == 'geo_within_center':
+            value = {'$geoWithin': {'$center': value}}
+        elif op == 'geo_within_sphere':
+            value = {'$geoWithin': {'$centerSphere': value}}
+        elif op == 'geo_intersects':
+            value = {'$geoIntersects': _infer_geometry(value)}
+        elif op == 'near':
             value = {'$near': _infer_geometry(value)}
         else:
-            raise NotImplementedError("Geo method '%s' has not "
-                                      "been implemented for a %s " % (op, field._name))
+            raise NotImplementedError(
+                'Geo method "%s" has not been implemented for a %s '
+                % (op, field._name)
+            )
     return value
 
 
 def _infer_geometry(value):
-    """Helper method that tries to infer the $geometry shape for a given value"""
+    """Helper method that tries to infer the $geometry shape for a
+    given value.
+    """
     if isinstance(value, dict):
-        if "$geometry" in value:
+        if '$geometry' in value:
             return value
         elif 'coordinates' in value and 'type' in value:
-            return {"$geometry": value}
-        raise InvalidQueryError("Invalid $geometry dictionary should have "
-                                "type and coordinates keys")
+            return {'$geometry': value}
+        raise InvalidQueryError('Invalid $geometry dictionary should have '
+                                'type and coordinates keys')
     elif isinstance(value, (list, set)):
         # TODO: shouldn't we test value[0][0][0][0] to see if it is MultiPolygon?
         # TODO: should both TypeError and IndexError be alike interpreted?
 
         try:
             value[0][0][0]
-            return {"$geometry": {"type": "Polygon", "coordinates": value}}
+            return {'$geometry': {'type': 'Polygon', 'coordinates': value}}
         except (TypeError, IndexError):
             pass
 
         try:
             value[0][0]
-            return {"$geometry": {"type": "LineString", "coordinates": value}}
+            return {'$geometry': {'type': 'LineString', 'coordinates': value}}
         except (TypeError, IndexError):
             pass
 
         try:
             value[0]
-            return {"$geometry": {"type": "Point", "coordinates": value}}
+            return {'$geometry': {'type': 'Point', 'coordinates': value}}
         except (TypeError, IndexError):
             pass
 
-    raise InvalidQueryError("Invalid $geometry data. Can be either a dictionary "
-                            "or (nested) lists of coordinate(s)")
+    raise InvalidQueryError('Invalid $geometry data. Can be either a '
+                            'dictionary or (nested) lists of coordinate(s)')
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index 84365f56b..bcf93a13e 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -69,9 +69,9 @@ def __init__(self, document):
         self.document = document
 
     def visit_combination(self, combination):
-        operator = "$and"
+        operator = '$and'
         if combination.operation == combination.OR:
-            operator = "$or"
+            operator = '$or'
         return {operator: combination.children}
 
     def visit_query(self, query):
@@ -79,8 +79,7 @@ def visit_query(self, query):
 
 
 class QNode(object):
-    """Base class for nodes in query trees.
-    """
+    """Base class for nodes in query trees."""
 
     AND = 0
     OR = 1
@@ -94,7 +93,8 @@ def accept(self, visitor):
         raise NotImplementedError
 
     def _combine(self, other, operation):
-        """Combine this node with another node into a QCombination object.
+        """Combine this node with another node into a QCombination
+        object.
         """
         if getattr(other, 'empty', True):
             return self
@@ -116,8 +116,8 @@ def __and__(self, other):
 
 
 class QCombination(QNode):
-    """Represents the combination of several conditions by a given logical
-    operator.
+    """Represents the combination of several conditions by a given
+    logical operator.
     """
 
     def __init__(self, operation, children):
diff --git a/mongoengine/signals.py b/mongoengine/signals.py
index 64828448b..a892dec0d 100644
--- a/mongoengine/signals.py
+++ b/mongoengine/signals.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-
-__all__ = ['pre_init', 'post_init', 'pre_save', 'pre_save_post_validation',
-           'post_save', 'pre_delete', 'post_delete']
+__all__ = ('pre_init', 'post_init', 'pre_save', 'pre_save_post_validation',
+           'post_save', 'pre_delete', 'post_delete')
 
 signals_available = False
 try:
@@ -34,6 +32,7 @@ def _fail(self, *args, **kwargs):
             temporarily_connected_to = _fail
         del _fail
 
+
 # the namespace for code signals.  If you are not mongoengine code, do
 # not put signals in here.  Create your own namespace instead.
 _signals = Namespace()
diff --git a/setup.cfg b/setup.cfg
index 09a593b42..1887c4768 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,13 +1,11 @@
 [nosetests]
-verbosity = 2
-detailed-errors = 1
-cover-erase = 1
-cover-branches = 1
-cover-package = mongoengine
-tests = tests
+verbosity=2
+detailed-errors=1
+tests=tests
+cover-package=mongoengine
 
 [flake8]
 ignore=E501,F401,F403,F405,I201
-exclude=build,dist,docs,venv,.tox,.eggs,tests
+exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
 max-complexity=45
 application-import-names=mongoengine,tests
diff --git a/setup.py b/setup.py
index 816a6de98..fa682d208 100644
--- a/setup.py
+++ b/setup.py
@@ -21,8 +21,9 @@
 
 
 def get_version(version_tuple):
-    if not isinstance(version_tuple[-1], int):
-        return '.'.join(map(str, version_tuple[:-1])) + version_tuple[-1]
+    """Return the version tuple as a string, e.g. for (0, 10, 7),
+    return '0.10.7'.
+    """
     return '.'.join(map(str, version_tuple))
 
 
@@ -41,31 +42,29 @@ def get_version(version_tuple):
     'Operating System :: OS Independent',
     'Programming Language :: Python',
     "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.6",
     "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.2",
     "Programming Language :: Python :: 3.3",
     "Programming Language :: Python :: 3.4",
+    "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     'Topic :: Database',
     'Topic :: Software Development :: Libraries :: Python Modules',
 ]
 
-extra_opts = {"packages": find_packages(exclude=["tests", "tests.*"])}
+extra_opts = {
+    'packages': find_packages(exclude=['tests', 'tests.*']),
+    'tests_require': ['nose', 'coverage==4.2', 'blinker', 'Pillow>=2.0.0']
+}
 if sys.version_info[0] == 3:
     extra_opts['use_2to3'] = True
-    extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0']
-    if "test" in sys.argv or "nosetests" in sys.argv:
+    if 'test' in sys.argv or 'nosetests' in sys.argv:
         extra_opts['packages'] = find_packages()
-        extra_opts['package_data'] = {"tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]}
+        extra_opts['package_data'] = {
+            'tests': ['fields/mongoengine.png', 'fields/mongodb_leaf.png']}
 else:
-    # coverage 4 does not support Python 3.2 anymore
-    extra_opts['tests_require'] = ['nose', 'coverage==3.7.1', 'blinker', 'Pillow>=2.0.0', 'python-dateutil']
-
-    if sys.version_info[0] == 2 and sys.version_info[1] == 6:
-        extra_opts['tests_require'].append('unittest2')
+    extra_opts['tests_require'] += ['python-dateutil']
 
 setup(
     name='mongoengine',
diff --git a/tests/__init__.py b/tests/__init__.py
index b24df5d22..eab0ddc7c 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,4 +2,3 @@
 from document import *
 from queryset import *
 from fields import *
-from migration import *
diff --git a/tests/all_warnings/__init__.py b/tests/all_warnings/__init__.py
index 53ce638c1..3aebe4baf 100644
--- a/tests/all_warnings/__init__.py
+++ b/tests/all_warnings/__init__.py
@@ -3,8 +3,6 @@
 only get triggered on first hit.  This way we can ensure its imported into the
 top level and called first by the test suite.
 """
-import sys
-sys.path[0:0] = [""]
 import unittest
 import warnings
 
diff --git a/tests/document/__init__.py b/tests/document/__init__.py
index 1acc9f4b8..f71376ea6 100644
--- a/tests/document/__init__.py
+++ b/tests/document/__init__.py
@@ -1,5 +1,3 @@
-import sys
-sys.path[0:0] = [""]
 import unittest
 
 from class_methods import *
diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index 5da474aca..dd3addb76 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
-sys.path[0:0] = [""]
 import unittest
 
 from mongoengine import *
diff --git a/tests/document/delta.py b/tests/document/delta.py
index cd37f415f..add4fe8d3 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
-sys.path[0:0] = [""]
 import unittest
 
 from bson import SON
diff --git a/tests/document/dynamic.py b/tests/document/dynamic.py
index 85325b06b..a478df421 100644
--- a/tests/document/dynamic.py
+++ b/tests/document/dynamic.py
@@ -1,6 +1,4 @@
 import unittest
-import sys
-sys.path[0:0] = [""]
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -143,11 +141,9 @@ def test_complex_data_lookups(self):
 
     def test_three_level_complex_data_lookups(self):
         """Ensure you can query three level document dynamic fields"""
-        p = self.Person()
-        p.misc = {'hello': {'hello2': 'world'}}
-        p.save()
-        # from pprint import pprint as pp; import pdb; pdb.set_trace();
-        print self.Person.objects(misc__hello__hello2='world')
+        p = self.Person.objects.create(
+            misc={'hello': {'hello2': 'world'}}
+        )
         self.assertEqual(1, self.Person.objects(misc__hello__hello2='world').count())
 
     def test_complex_embedded_document_validation(self):
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 75314bb06..af93e7db2 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -556,8 +556,8 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        for i in xrange(0, 10):
-            tags = [("tag %i" % n) for n in xrange(0, i % 2)]
+        for i in range(0, 10):
+            tags = [("tag %i" % n) for n in range(0, i % 2)]
             BlogPost(tags=tags).save()
 
         self.assertEqual(BlogPost.objects.count(), 10)
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index 957938be0..2897e1d15 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
-sys.path[0:0] = [""]
 import unittest
 import warnings
 
@@ -253,19 +251,17 @@ class Human(Mammal): pass
         self.assertEqual(classes, [Human])
 
     def test_allow_inheritance(self):
-        """Ensure that inheritance may be disabled on simple classes and that
-        _cls and _subclasses will not be used.
+        """Ensure that inheritance is disabled by default on simple
+        classes and that _cls will not be used.
         """
-
         class Animal(Document):
             name = StringField()
 
-        def create_dog_class():
+        # can't inherit because Animal didn't explicitly allow inheritance
+        with self.assertRaises(ValueError):
             class Dog(Animal):
                 pass
 
-        self.assertRaises(ValueError, create_dog_class)
-
         # Check that _cls etc aren't present on simple documents
         dog = Animal(name='dog').save()
         self.assertEqual(dog.to_mongo().keys(), ['_id', 'name'])
@@ -275,17 +271,15 @@ class Dog(Animal):
         self.assertFalse('_cls' in obj)
 
     def test_cant_turn_off_inheritance_on_subclass(self):
-        """Ensure if inheritance is on in a subclass you cant turn it off
+        """Ensure if inheritance is on in a subclass you cant turn it off.
         """
-
         class Animal(Document):
             name = StringField()
             meta = {'allow_inheritance': True}
 
-        def create_mammal_class():
+        with self.assertRaises(ValueError):
             class Mammal(Animal):
                 meta = {'allow_inheritance': False}
-        self.assertRaises(ValueError, create_mammal_class)
 
     def test_allow_inheritance_abstract_document(self):
         """Ensure that abstract documents can set inheritance rules and that
@@ -298,10 +292,9 @@ class FinalDocument(Document):
         class Animal(FinalDocument):
             name = StringField()
 
-        def create_mammal_class():
+        with self.assertRaises(ValueError):
             class Mammal(Animal):
                 pass
-        self.assertRaises(ValueError, create_mammal_class)
 
         # Check that _cls isn't present in simple documents
         doc = Animal(name='dog')
@@ -360,29 +353,26 @@ class EuropeanCity(City):
         self.assertEqual(berlin.pk, berlin.auto_id_0)
 
     def test_abstract_document_creation_does_not_fail(self):
-
         class City(Document):
             continent = StringField()
             meta = {'abstract': True,
                     'allow_inheritance': False}
+
         bkk = City(continent='asia')
         self.assertEqual(None, bkk.pk)
         # TODO: expected error? Shouldn't we create a new error type?
-        self.assertRaises(KeyError, lambda: setattr(bkk, 'pk', 1))
+        with self.assertRaises(KeyError):
+            setattr(bkk, 'pk', 1)
 
     def test_allow_inheritance_embedded_document(self):
-        """Ensure embedded documents respect inheritance
-        """
-
+        """Ensure embedded documents respect inheritance."""
         class Comment(EmbeddedDocument):
             content = StringField()
 
-        def create_special_comment():
+        with self.assertRaises(ValueError):
             class SpecialComment(Comment):
                 pass
 
-        self.assertRaises(ValueError, create_special_comment)
-
         doc = Comment(content='test')
         self.assertFalse('_cls' in doc.to_mongo())
 
@@ -454,11 +444,11 @@ class Human(Mammal): pass
         self.assertEqual(Guppy._get_collection_name(), 'fish')
         self.assertEqual(Human._get_collection_name(), 'human')
 
-        def create_bad_abstract():
+        # ensure that a subclass of a non-abstract class can't be abstract
+        with self.assertRaises(ValueError):
             class EvilHuman(Human):
                 evil = BooleanField(default=True)
                 meta = {'abstract': True}
-        self.assertRaises(ValueError, create_bad_abstract)
 
     def test_abstract_embedded_documents(self):
         # 789: EmbeddedDocument shouldn't inherit abstract
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 1342f981c..b92bafa9a 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
-sys.path[0:0] = [""]
-
 import bson
 import os
 import pickle
@@ -16,12 +13,12 @@
                             PickleDynamicEmbedded, PickleDynamicTest)
 
 from mongoengine import *
+from mongoengine.base import get_document, _document_registry
+from mongoengine.connection import get_db
 from mongoengine.errors import (NotRegistered, InvalidDocumentError,
                                 InvalidQueryError, NotUniqueError,
                                 FieldDoesNotExist, SaveConditionError)
 from mongoengine.queryset import NULLIFY, Q
-from mongoengine.connection import get_db
-from mongoengine.base import get_document
 from mongoengine.context_managers import switch_db, query_counter
 from mongoengine import signals
 
@@ -102,21 +99,18 @@ class Log(Document):
         self.assertEqual(options['size'], 4096)
 
         # Check that the document cannot be redefined with different options
-        def recreate_log_document():
-            class Log(Document):
-                date = DateTimeField(default=datetime.now)
-                meta = {
-                    'max_documents': 11,
-                }
-            # Create the collection by accessing Document.objects
-            Log.objects
-        self.assertRaises(InvalidCollectionError, recreate_log_document)
+        class Log(Document):
+            date = DateTimeField(default=datetime.now)
+            meta = {
+                'max_documents': 11,
+            }
 
-        Log.drop_collection()
+        # Accessing Document.objects creates the collection
+        with self.assertRaises(InvalidCollectionError):
+            Log.objects
 
     def test_capped_collection_default(self):
-        """Ensure that capped collections defaults work properly.
-        """
+        """Ensure that capped collections defaults work properly."""
         class Log(Document):
             date = DateTimeField(default=datetime.now)
             meta = {
@@ -134,16 +128,14 @@ class Log(Document):
         self.assertEqual(options['size'], 10 * 2**20)
 
         # Check that the document with default value can be recreated
-        def recreate_log_document():
-            class Log(Document):
-                date = DateTimeField(default=datetime.now)
-                meta = {
-                    'max_documents': 10,
-                }
-            # Create the collection by accessing Document.objects
-            Log.objects
-        recreate_log_document()
-        Log.drop_collection()
+        class Log(Document):
+            date = DateTimeField(default=datetime.now)
+            meta = {
+                'max_documents': 10,
+            }
+
+        # Create the collection by accessing Document.objects
+        Log.objects
 
     def test_capped_collection_no_max_size_problems(self):
         """Ensure that capped collections with odd max_size work properly.
@@ -166,16 +158,14 @@ class Log(Document):
         self.assertTrue(options['size'] >= 10000)
 
         # Check that the document with odd max_size value can be recreated
-        def recreate_log_document():
-            class Log(Document):
-                date = DateTimeField(default=datetime.now)
-                meta = {
-                    'max_size': 10000,
-                }
-            # Create the collection by accessing Document.objects
-            Log.objects
-        recreate_log_document()
-        Log.drop_collection()
+        class Log(Document):
+            date = DateTimeField(default=datetime.now)
+            meta = {
+                'max_size': 10000,
+            }
+
+        # Create the collection by accessing Document.objects
+        Log.objects
 
     def test_repr(self):
         """Ensure that unicode representation works
@@ -286,7 +276,7 @@ class CompareStats(Document):
 
         list_stats = []
 
-        for i in xrange(10):
+        for i in range(10):
             s = Stats()
             s.save()
             list_stats.append(s)
@@ -356,14 +346,14 @@ class User(Document):
         self.assertEqual(User._fields['username'].db_field, '_id')
         self.assertEqual(User._meta['id_field'], 'username')
 
-        def create_invalid_user():
-            User(name='test').save()  # no primary key field
-        self.assertRaises(ValidationError, create_invalid_user)
+        # test no primary key field
+        self.assertRaises(ValidationError, User(name='test').save)
 
-        def define_invalid_user():
+        # define a subclass with a different primary key field than the
+        # parent
+        with self.assertRaises(ValueError):
             class EmailUser(User):
                 email = StringField(primary_key=True)
-        self.assertRaises(ValueError, define_invalid_user)
 
         class EmailUser(User):
             email = StringField()
@@ -411,12 +401,10 @@ class NicePlace(Place):
 
         # Mimic Place and NicePlace definitions being in a different file
         # and the NicePlace model not being imported in at query time.
-        from mongoengine.base import _document_registry
         del(_document_registry['Place.NicePlace'])
 
-        def query_without_importing_nice_place():
-            print Place.objects.all()
-        self.assertRaises(NotRegistered, query_without_importing_nice_place)
+        with self.assertRaises(NotRegistered):
+            list(Place.objects.all())
 
     def test_document_registry_regressions(self):
 
@@ -745,7 +733,7 @@ def clean(self):
 
         try:
             t.save()
-        except ValidationError, e:
+        except ValidationError as e:
             expect_msg = "Draft entries may not have a publication date."
             self.assertTrue(expect_msg in e.message)
             self.assertEqual(e.to_dict(), {'__all__': expect_msg})
@@ -784,7 +772,7 @@ class TestDocument(Document):
         t = TestDocument(doc=TestEmbeddedDocument(x=10, y=25, z=15))
         try:
             t.save()
-        except ValidationError, e:
+        except ValidationError as e:
             expect_msg = "Value of z != x + y"
             self.assertTrue(expect_msg in e.message)
             self.assertEqual(e.to_dict(), {'doc': {'__all__': expect_msg}})
@@ -798,8 +786,10 @@ class TestDocument(Document):
 
     def test_modify_empty(self):
         doc = self.Person(name="bob", age=10).save()
-        self.assertRaises(
-            InvalidDocumentError, lambda: self.Person().modify(set__age=10))
+
+        with self.assertRaises(InvalidDocumentError):
+            self.Person().modify(set__age=10)
+
         self.assertDbEqual([dict(doc.to_mongo())])
 
     def test_modify_invalid_query(self):
@@ -807,9 +797,8 @@ def test_modify_invalid_query(self):
         doc2 = self.Person(name="jim", age=20).save()
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
-        self.assertRaises(
-            InvalidQueryError,
-            lambda: doc1.modify(dict(id=doc2.id), set__value=20))
+        with self.assertRaises(InvalidQueryError):
+            doc1.modify({'id': doc2.id}, set__value=20)
 
         self.assertDbEqual(docs)
 
@@ -818,7 +807,7 @@ def test_modify_match_another_document(self):
         doc2 = self.Person(name="jim", age=20).save()
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
-        assert not doc1.modify(dict(name=doc2.name), set__age=100)
+        assert not doc1.modify({'name': doc2.name}, set__age=100)
 
         self.assertDbEqual(docs)
 
@@ -827,7 +816,7 @@ def test_modify_not_exists(self):
         doc2 = self.Person(id=ObjectId(), name="jim", age=20)
         docs = [dict(doc1.to_mongo())]
 
-        assert not doc2.modify(dict(name=doc2.name), set__age=100)
+        assert not doc2.modify({'name': doc2.name}, set__age=100)
 
         self.assertDbEqual(docs)
 
@@ -1293,12 +1282,11 @@ class Doc(Document):
 
     def test_document_update(self):
 
-        def update_not_saved_raises():
+        # try updating a non-saved document
+        with self.assertRaises(OperationError):
             person = self.Person(name='dcrosta')
             person.update(set__name='Dan Crosta')
 
-        self.assertRaises(OperationError, update_not_saved_raises)
-
         author = self.Person(name='dcrosta')
         author.save()
 
@@ -1308,19 +1296,17 @@ def update_not_saved_raises():
         p1 = self.Person.objects.first()
         self.assertEqual(p1.name, author.name)
 
-        def update_no_value_raises():
+        # try sending an empty update
+        with self.assertRaises(OperationError):
             person = self.Person.objects.first()
             person.update()
 
-        self.assertRaises(OperationError, update_no_value_raises)
-
-        def update_no_op_should_default_to_set():
-            person = self.Person.objects.first()
-            person.update(name="Dan")
-            person.reload()
-            return person.name
-
-        self.assertEqual("Dan", update_no_op_should_default_to_set())
+        # update that doesn't explicitly specify an operator should default
+        # to 'set__'
+        person = self.Person.objects.first()
+        person.update(name="Dan")
+        person.reload()
+        self.assertEqual("Dan", person.name)
 
     def test_update_unique_field(self):
         class Doc(Document):
@@ -1329,8 +1315,8 @@ class Doc(Document):
         doc1 = Doc(name="first").save()
         doc2 = Doc(name="second").save()
 
-        self.assertRaises(NotUniqueError, lambda:
-                          doc2.update(set__name=doc1.name))
+        with self.assertRaises(NotUniqueError):
+            doc2.update(set__name=doc1.name)
 
     def test_embedded_update(self):
         """
@@ -1848,15 +1834,13 @@ class BlogPost(Document):
 
     def test_duplicate_db_fields_raise_invalid_document_error(self):
         """Ensure a InvalidDocumentError is thrown if duplicate fields
-        declare the same db_field"""
-
-        def throw_invalid_document_error():
+        declare the same db_field.
+        """
+        with self.assertRaises(InvalidDocumentError):
             class Foo(Document):
                 name = StringField()
                 name2 = StringField(db_field='name')
 
-        self.assertRaises(InvalidDocumentError, throw_invalid_document_error)
-
     def test_invalid_son(self):
         """Raise an error if loading invalid data"""
         class Occurrence(EmbeddedDocument):
@@ -1868,11 +1852,13 @@ class Word(Document):
             forms = ListField(StringField(), default=list)
             occurs = ListField(EmbeddedDocumentField(Occurrence), default=list)
 
-        def raise_invalid_document():
-            Word._from_son({'stem': [1, 2, 3], 'forms': 1, 'count': 'one',
-                            'occurs': {"hello": None}})
-
-        self.assertRaises(InvalidDocumentError, raise_invalid_document)
+        with self.assertRaises(InvalidDocumentError):
+            Word._from_son({
+                'stem': [1, 2, 3],
+                'forms': 1,
+                'count': 'one',
+                'occurs': {"hello": None}
+            })
 
     def test_reverse_delete_rule_cascade_and_nullify(self):
         """Ensure that a referenced document is also deleted upon deletion.
@@ -2103,8 +2089,7 @@ class Foo(Document):
         self.assertEqual(Bar.objects.get().foo, None)
 
     def test_invalid_reverse_delete_rule_raise_errors(self):
-
-        def throw_invalid_document_error():
+        with self.assertRaises(InvalidDocumentError):
             class Blog(Document):
                 content = StringField()
                 authors = MapField(ReferenceField(
@@ -2114,21 +2099,15 @@ class Blog(Document):
                         self.Person,
                         reverse_delete_rule=NULLIFY))
 
-        self.assertRaises(InvalidDocumentError, throw_invalid_document_error)
-
-        def throw_invalid_document_error_embedded():
+        with self.assertRaises(InvalidDocumentError):
             class Parents(EmbeddedDocument):
                 father = ReferenceField('Person', reverse_delete_rule=DENY)
                 mother = ReferenceField('Person', reverse_delete_rule=DENY)
 
-        self.assertRaises(
-            InvalidDocumentError, throw_invalid_document_error_embedded)
-
     def test_reverse_delete_rule_cascade_recurs(self):
         """Ensure that a chain of documents is also deleted upon cascaded
         deletion.
         """
-
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)
@@ -2344,15 +2323,14 @@ def test_picklable_on_signals(self):
         pickle_doc.save()
         pickle_doc.delete()
 
-    def test_throw_invalid_document_error(self):
-
-        # test handles people trying to upsert
-        def throw_invalid_document_error():
+    def test_override_method_with_field(self):
+        """Test creating a field with a field name that would override
+        the "validate" method.
+        """
+        with self.assertRaises(InvalidDocumentError):
             class Blog(Document):
                 validate = DictField()
 
-        self.assertRaises(InvalidDocumentError, throw_invalid_document_error)
-
     def test_mutating_documents(self):
 
         class B(EmbeddedDocument):
@@ -2815,11 +2793,10 @@ class LogEntry(Document):
         log.log = "Saving"
         log.save()
 
-        def change_shard_key():
+        # try to change the shard key
+        with self.assertRaises(OperationError):
             log.machine = "127.0.0.1"
 
-        self.assertRaises(OperationError, change_shard_key)
-
     def test_shard_key_in_embedded_document(self):
         class Foo(EmbeddedDocument):
             foo = StringField()
@@ -2840,12 +2817,11 @@ class Bar(Document):
         bar_doc.bar = 'baz'
         bar_doc.save()
 
-        def change_shard_key():
+        # try to change the shard key
+        with self.assertRaises(OperationError):
             bar_doc.foo.foo = 'something'
             bar_doc.save()
 
-        self.assertRaises(OperationError, change_shard_key)
-
     def test_shard_key_primary(self):
         class LogEntry(Document):
             machine = StringField(primary_key=True)
@@ -2866,11 +2842,10 @@ class LogEntry(Document):
         log.log = "Saving"
         log.save()
 
-        def change_shard_key():
+        # try to change the shard key
+        with self.assertRaises(OperationError):
             log.machine = "127.0.0.1"
 
-        self.assertRaises(OperationError, change_shard_key)
-
     def test_kwargs_simple(self):
 
         class Embedded(EmbeddedDocument):
@@ -2955,11 +2930,9 @@ class Person(DynamicDocument):
     def test_bad_mixed_creation(self):
         """Ensure that document gives correct error when duplicating arguments
         """
-        def construct_bad_instance():
+        with self.assertRaises(TypeError):
             return self.Person("Test User", 42, name="Bad User")
 
-        self.assertRaises(TypeError, construct_bad_instance)
-
     def test_data_contains_id_field(self):
         """Ensure that asking for _data returns 'id'
         """
@@ -3118,17 +3091,17 @@ class Person(Document):
         p4 = Person.objects()[0]
         p4.save()
         self.assertEquals(p4.height, 189)
-        
+
         # However the default will not be fixed in DB
         self.assertEquals(Person.objects(height=189).count(), 0)
-        
+
         # alter DB for the new default
         coll = Person._get_collection()
         for person in Person.objects.as_pymongo():
             if 'height' not in person:
                 person['height'] = 189
                 coll.save(person)
-                
+
         self.assertEquals(Person.objects(height=189).count(), 1)
 
     def test_from_son(self):
diff --git a/tests/document/json_serialisation.py b/tests/document/json_serialisation.py
index f47b5de5b..110f1e14d 100644
--- a/tests/document/json_serialisation.py
+++ b/tests/document/json_serialisation.py
@@ -1,6 +1,3 @@
-import sys
-sys.path[0:0] = [""]
-
 import unittest
 import uuid
 
diff --git a/tests/document/validation.py b/tests/document/validation.py
index ba03366e5..105bc8b0b 100644
--- a/tests/document/validation.py
+++ b/tests/document/validation.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
-sys.path[0:0] = [""]
-
 import unittest
 from datetime import datetime
 
@@ -60,7 +57,7 @@ class User(Document):
 
         try:
             User().validate()
-        except ValidationError, e:
+        except ValidationError as e:
             self.assertTrue("User:None" in e.message)
             self.assertEqual(e.to_dict(), {
                 'username': 'Field is required',
@@ -70,7 +67,7 @@ class User(Document):
         user.name = None
         try:
             user.save()
-        except ValidationError, e:
+        except ValidationError as e:
             self.assertTrue("User:RossC0" in e.message)
             self.assertEqual(e.to_dict(), {
                 'name': 'Field is required'})
@@ -118,7 +115,7 @@ class Doc(Document):
 
         try:
             Doc(id="bad").validate()
-        except ValidationError, e:
+        except ValidationError as e:
             self.assertTrue("SubDoc:None" in e.message)
             self.assertEqual(e.to_dict(), {
                 "e": {'val': 'OK could not be converted to int'}})
@@ -136,7 +133,7 @@ class Doc(Document):
         doc.e.val = "OK"
         try:
             doc.save()
-        except ValidationError, e:
+        except ValidationError as e:
             self.assertTrue("Doc:test" in e.message)
             self.assertEqual(e.to_dict(), {
                 "e": {'val': 'OK could not be converted to int'}})
@@ -156,14 +153,14 @@ class Doc(Document):
 
         s = SubDoc()
 
-        self.assertRaises(ValidationError, lambda: s.validate())
+        self.assertRaises(ValidationError, s.validate)
 
         d1.e = s
         d2.e = s
 
         del d1
 
-        self.assertRaises(ValidationError, lambda: d2.validate())
+        self.assertRaises(ValidationError, d2.validate)
 
     def test_parent_reference_in_child_document(self):
         """
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 6cf4f1286..678786fa1 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1,11 +1,7 @@
 # -*- coding: utf-8 -*-
-import sys
-
 import six
 from nose.plugins.skip import SkipTest
 
-sys.path[0:0] = [""]
-
 import datetime
 import unittest
 import uuid
@@ -29,10 +25,9 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from mongoengine.base import _document_registry
-from mongoengine.base.datastructures import BaseDict, EmbeddedDocumentList
+from mongoengine.base import (BaseDict, BaseField, EmbeddedDocumentList,
+                              _document_registry)
 from mongoengine.errors import NotRegistered, DoesNotExist
-from mongoengine.python_support import PY3, b, bin_type
 
 __all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")
 
@@ -653,8 +648,8 @@ class LogEntry(Document):
 
         # Post UTC - microseconds are rounded (down) nearest millisecond and
         # dropped
-        d1 = datetime.datetime(1970, 01, 01, 00, 00, 01, 999)
-        d2 = datetime.datetime(1970, 01, 01, 00, 00, 01)
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
+        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1)
         log = LogEntry()
         log.date = d1
         log.save()
@@ -663,15 +658,15 @@ class LogEntry(Document):
         self.assertEqual(log.date, d2)
 
         # Post UTC - microseconds are rounded (down) nearest millisecond
-        d1 = datetime.datetime(1970, 01, 01, 00, 00, 01, 9999)
-        d2 = datetime.datetime(1970, 01, 01, 00, 00, 01, 9000)
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
+        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9000)
         log.date = d1
         log.save()
         log.reload()
         self.assertNotEqual(log.date, d1)
         self.assertEqual(log.date, d2)
 
-        if not PY3:
+        if not six.PY3:
             # Pre UTC dates microseconds below 1000 are dropped
             # This does not seem to be true in PY3
             d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
@@ -691,7 +686,7 @@ class LogEntry(Document):
 
         LogEntry.drop_collection()
 
-        d1 = datetime.datetime(1970, 01, 01, 00, 00, 01)
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1)
         log = LogEntry()
         log.date = d1
         log.validate()
@@ -708,8 +703,8 @@ class LogEntry(Document):
         LogEntry.drop_collection()
 
         # create 60 log entries
-        for i in xrange(1950, 2010):
-            d = datetime.datetime(i, 01, 01, 00, 00, 01)
+        for i in range(1950, 2010):
+            d = datetime.datetime(i, 1, 1, 0, 0, 1)
             LogEntry(date=d).save()
 
         self.assertEqual(LogEntry.objects.count(), 60)
@@ -756,7 +751,7 @@ class LogEntry(Document):
 
         # Post UTC - microseconds are rounded (down) nearest millisecond and
         # dropped - with default datetimefields
-        d1 = datetime.datetime(1970, 01, 01, 00, 00, 01, 999)
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
         log = LogEntry()
         log.date = d1
         log.save()
@@ -765,7 +760,7 @@ class LogEntry(Document):
 
         # Post UTC - microseconds are rounded (down) nearest millisecond - with
         # default datetimefields
-        d1 = datetime.datetime(1970, 01, 01, 00, 00, 01, 9999)
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
         log.date = d1
         log.save()
         log.reload()
@@ -782,7 +777,7 @@ class LogEntry(Document):
         # Pre UTC microseconds above 1000 is wonky - with default datetimefields
         # log.date has an invalid microsecond value so I can't construct
         # a date to compare.
-        for i in xrange(1001, 3113, 33):
+        for i in range(1001, 3113, 33):
             d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, i)
             log.date = d1
             log.save()
@@ -792,7 +787,7 @@ class LogEntry(Document):
             self.assertEqual(log, log1)
 
         # Test string padding
-        microsecond = map(int, [math.pow(10, x) for x in xrange(6)])
+        microsecond = map(int, [math.pow(10, x) for x in range(6)])
         mm = dd = hh = ii = ss = [1, 10]
 
         for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
@@ -814,7 +809,7 @@ class LogEntry(Document):
 
         LogEntry.drop_collection()
 
-        d1 = datetime.datetime(1970, 01, 01, 00, 00, 01, 999)
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
         log = LogEntry()
         log.date = d1
         log.save()
@@ -825,8 +820,8 @@ class LogEntry(Document):
         LogEntry.drop_collection()
 
         # create 60 log entries
-        for i in xrange(1950, 2010):
-            d = datetime.datetime(i, 01, 01, 00, 00, 01, 999)
+        for i in range(1950, 2010):
+            d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)
             LogEntry(date=d).save()
 
         self.assertEqual(LogEntry.objects.count(), 60)
@@ -1134,12 +1129,11 @@ class Simple(Document):
         e.mapping = [1]
         e.save()
 
-        def create_invalid_mapping():
+        # try creating an invalid mapping
+        with self.assertRaises(ValidationError):
             e.mapping = ["abc"]
             e.save()
 
-        self.assertRaises(ValidationError, create_invalid_mapping)
-
         Simple.drop_collection()
 
     def test_list_field_rejects_strings(self):
@@ -1406,12 +1400,11 @@ class Simple(Document):
         e.mapping['someint'] = 1
         e.save()
 
-        def create_invalid_mapping():
+        # try creating an invalid mapping
+        with self.assertRaises(ValidationError):
             e.mapping['somestring'] = "abc"
             e.save()
 
-        self.assertRaises(ValidationError, create_invalid_mapping)
-
         Simple.drop_collection()
 
     def test_dictfield_complex(self):
@@ -1484,11 +1477,10 @@ class Simple(Document):
         self.assertEqual(BaseDict, type(e.mapping))
         self.assertEqual({"ints": [3, 4]}, e.mapping)
 
-        def create_invalid_mapping():
+        # try creating an invalid mapping
+        with self.assertRaises(ValueError):
             e.update(set__mapping={"somestrings": ["foo", "bar", ]})
 
-        self.assertRaises(ValueError, create_invalid_mapping)
-
         Simple.drop_collection()
 
     def test_mapfield(self):
@@ -1503,18 +1495,14 @@ class Simple(Document):
         e.mapping['someint'] = 1
         e.save()
 
-        def create_invalid_mapping():
+        with self.assertRaises(ValidationError):
             e.mapping['somestring'] = "abc"
             e.save()
 
-        self.assertRaises(ValidationError, create_invalid_mapping)
-
-        def create_invalid_class():
+        with self.assertRaises(ValidationError):
             class NoDeclaredType(Document):
                 mapping = MapField()
 
-        self.assertRaises(ValidationError, create_invalid_class)
-
         Simple.drop_collection()
 
     def test_complex_mapfield(self):
@@ -1543,14 +1531,10 @@ class Extensible(Document):
         self.assertTrue(isinstance(e2.mapping['somestring'], StringSetting))
         self.assertTrue(isinstance(e2.mapping['someint'], IntegerSetting))
 
-        def create_invalid_mapping():
+        with self.assertRaises(ValidationError):
             e.mapping['someint'] = 123
             e.save()
 
-        self.assertRaises(ValidationError, create_invalid_mapping)
-
-        Extensible.drop_collection()
-
     def test_embedded_mapfield_db_field(self):
 
         class Embedded(EmbeddedDocument):
@@ -1760,8 +1744,8 @@ class Bar(Document):
         # Reference is no longer valid
         foo.delete()
         bar = Bar.objects.get()
-        self.assertRaises(DoesNotExist, lambda: getattr(bar, 'ref'))
-        self.assertRaises(DoesNotExist, lambda: getattr(bar, 'generic_ref'))
+        self.assertRaises(DoesNotExist, getattr, bar, 'ref')
+        self.assertRaises(DoesNotExist, getattr, bar, 'generic_ref')
 
         # When auto_dereference is disabled, there is no trouble returning DBRef
         bar = Bar.objects.get()
@@ -2036,7 +2020,7 @@ class Person(Document):
         })
 
     def test_cached_reference_fields_on_embedded_documents(self):
-        def build():
+        with self.assertRaises(InvalidDocumentError):
             class Test(Document):
                 name = StringField()
 
@@ -2045,8 +2029,6 @@ class Test(Document):
                     'test': CachedReferenceField(Test)
             })
 
-        self.assertRaises(InvalidDocumentError, build)
-
     def test_cached_reference_auto_sync(self):
         class Person(Document):
             TYPES = (
@@ -2863,7 +2845,7 @@ class Attachment(Document):
             content_type = StringField()
             blob = BinaryField()
 
-        BLOB = b('\xe6\x00\xc4\xff\x07')
+        BLOB = six.b('\xe6\x00\xc4\xff\x07')
         MIME_TYPE = 'application/octet-stream'
 
         Attachment.drop_collection()
@@ -2873,7 +2855,7 @@ class Attachment(Document):
 
         attachment_1 = Attachment.objects().first()
         self.assertEqual(MIME_TYPE, attachment_1.content_type)
-        self.assertEqual(BLOB, bin_type(attachment_1.blob))
+        self.assertEqual(BLOB, six.binary_type(attachment_1.blob))
 
         Attachment.drop_collection()
 
@@ -2900,13 +2882,13 @@ class AttachmentSizeLimit(Document):
 
         attachment_required = AttachmentRequired()
         self.assertRaises(ValidationError, attachment_required.validate)
-        attachment_required.blob = Binary(b('\xe6\x00\xc4\xff\x07'))
+        attachment_required.blob = Binary(six.b('\xe6\x00\xc4\xff\x07'))
         attachment_required.validate()
 
         attachment_size_limit = AttachmentSizeLimit(
-            blob=b('\xe6\x00\xc4\xff\x07'))
+            blob=six.b('\xe6\x00\xc4\xff\x07'))
         self.assertRaises(ValidationError, attachment_size_limit.validate)
-        attachment_size_limit.blob = b('\xe6\x00\xc4\xff')
+        attachment_size_limit.blob = six.b('\xe6\x00\xc4\xff')
         attachment_size_limit.validate()
 
         Attachment.drop_collection()
@@ -3152,7 +3134,7 @@ class Shirt(Document):
 
         try:
             shirt.validate()
-        except ValidationError, error:
+        except ValidationError as error:
             # get the validation rules
             error_dict = error.to_dict()
             self.assertEqual(error_dict['size'], SIZE_MESSAGE)
@@ -3181,7 +3163,7 @@ class Person(Document):
         self.db['mongoengine.counters'].drop()
         Person.drop_collection()
 
-        for x in xrange(10):
+        for x in range(10):
             Person(name="Person %s" % x).save()
 
         c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
@@ -3205,7 +3187,7 @@ class Person(Document):
         self.db['mongoengine.counters'].drop()
         Person.drop_collection()
 
-        for x in xrange(10):
+        for x in range(10):
             Person(name="Person %s" % x).save()
 
         self.assertEqual(Person.id.get_next_value(), 11)
@@ -3220,7 +3202,7 @@ class Person(Document):
         self.db['mongoengine.counters'].drop()
         Person.drop_collection()
 
-        for x in xrange(10):
+        for x in range(10):
             Person(name="Person %s" % x).save()
 
         self.assertEqual(Person.id.get_next_value(), '11')
@@ -3236,7 +3218,7 @@ class Person(Document):
         self.db['mongoengine.counters'].drop()
         Person.drop_collection()
 
-        for x in xrange(10):
+        for x in range(10):
             Person(name="Person %s" % x).save()
 
         c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
@@ -3261,7 +3243,7 @@ class Person(Document):
         self.db['mongoengine.counters'].drop()
         Person.drop_collection()
 
-        for x in xrange(10):
+        for x in range(10):
             Person(name="Person %s" % x).save()
 
         c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
@@ -3323,7 +3305,7 @@ class Person(Document):
         Animal.drop_collection()
         Person.drop_collection()
 
-        for x in xrange(10):
+        for x in range(10):
             Animal(name="Animal %s" % x).save()
             Person(name="Person %s" % x).save()
 
@@ -3353,7 +3335,7 @@ class Person(Document):
         self.db['mongoengine.counters'].drop()
         Person.drop_collection()
 
-        for x in xrange(10):
+        for x in range(10):
             p = Person(name="Person %s" % x)
             p.save()
 
@@ -3540,7 +3522,7 @@ class Post(Document):
         self.assertRaises(ValidationError, post.validate)
         try:
             post.validate()
-        except ValidationError, error:
+        except ValidationError as error:
             # ValidationError.errors property
             self.assertTrue(hasattr(error, 'errors'))
             self.assertTrue(isinstance(error.errors, dict))
@@ -3601,8 +3583,6 @@ def test_tuples_as_tuples(self):
         Ensure that tuples remain tuples when they are
         inside a ComplexBaseField
         """
-        from mongoengine.base import BaseField
-
         class EnumField(BaseField):
 
             def __init__(self, **kwargs):
@@ -3836,9 +3816,7 @@ def test_no_keyword_filter(self):
         filtered = self.post1.comments.filter()
 
         # Ensure nothing was changed
-        # < 2.6 Incompatible >
-        # self.assertListEqual(filtered, self.post1.comments)
-        self.assertEqual(filtered, self.post1.comments)
+        self.assertListEqual(filtered, self.post1.comments)
 
     def test_single_keyword_filter(self):
         """
@@ -3889,10 +3867,8 @@ def test_unknown_keyword_filter(self):
         Tests the filter method of a List of Embedded Documents
         when the keyword is not a known keyword.
         """
-        # < 2.6 Incompatible >
-        # with self.assertRaises(AttributeError):
-        #    self.post2.comments.filter(year=2)
-        self.assertRaises(AttributeError, self.post2.comments.filter, year=2)
+        with self.assertRaises(AttributeError):
+            self.post2.comments.filter(year=2)
 
     def test_no_keyword_exclude(self):
         """
@@ -3902,9 +3878,7 @@ def test_no_keyword_exclude(self):
         filtered = self.post1.comments.exclude()
 
         # Ensure everything was removed
-        # < 2.6 Incompatible >
-        # self.assertListEqual(filtered, [])
-        self.assertEqual(filtered, [])
+        self.assertListEqual(filtered, [])
 
     def test_single_keyword_exclude(self):
         """
@@ -3950,10 +3924,8 @@ def test_unknown_keyword_exclude(self):
         Tests the exclude method of a List of Embedded Documents
         when the keyword is not a known keyword.
         """
-        # < 2.6 Incompatible >
-        # with self.assertRaises(AttributeError):
-        #    self.post2.comments.exclude(year=2)
-        self.assertRaises(AttributeError, self.post2.comments.exclude, year=2)
+        with self.assertRaises(AttributeError):
+            self.post2.comments.exclude(year=2)
 
     def test_chained_filter_exclude(self):
         """
@@ -3991,10 +3963,7 @@ def test_single_keyword_get(self):
         single keyword.
         """
         comment = self.post1.comments.get(author='user1')
-
-        # < 2.6 Incompatible >
-        # self.assertIsInstance(comment, self.Comments)
-        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertIsInstance(comment, self.Comments)
         self.assertEqual(comment.author, 'user1')
 
     def test_multi_keyword_get(self):
@@ -4003,10 +3972,7 @@ def test_multi_keyword_get(self):
         multiple keywords.
         """
         comment = self.post2.comments.get(author='user2', message='message2')
-
-        # < 2.6 Incompatible >
-        # self.assertIsInstance(comment, self.Comments)
-        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertIsInstance(comment, self.Comments)
         self.assertEqual(comment.author, 'user2')
         self.assertEqual(comment.message, 'message2')
 
@@ -4015,44 +3981,32 @@ def test_no_keyword_multiple_return_get(self):
         Tests the get method of a List of Embedded Documents without
         a keyword to return multiple documents.
         """
-        # < 2.6 Incompatible >
-        # with self.assertRaises(MultipleObjectsReturned):
-        #    self.post1.comments.get()
-        self.assertRaises(MultipleObjectsReturned, self.post1.comments.get)
+        with self.assertRaises(MultipleObjectsReturned):
+            self.post1.comments.get()
 
     def test_keyword_multiple_return_get(self):
         """
         Tests the get method of a List of Embedded Documents with a keyword
         to return multiple documents.
         """
-        # < 2.6 Incompatible >
-        # with self.assertRaises(MultipleObjectsReturned):
-        #    self.post2.comments.get(author='user2')
-        self.assertRaises(
-            MultipleObjectsReturned, self.post2.comments.get, author='user2'
-        )
+        with self.assertRaises(MultipleObjectsReturned):
+            self.post2.comments.get(author='user2')
 
     def test_unknown_keyword_get(self):
         """
         Tests the get method of a List of Embedded Documents with an
         unknown keyword.
         """
-        # < 2.6 Incompatible >
-        # with self.assertRaises(AttributeError):
-        #    self.post2.comments.get(year=2020)
-        self.assertRaises(AttributeError, self.post2.comments.get, year=2020)
+        with self.assertRaises(AttributeError):
+            self.post2.comments.get(year=2020)
 
     def test_no_result_get(self):
         """
         Tests the get method of a List of Embedded Documents where get
         returns no results.
         """
-        # < 2.6 Incompatible >
-        # with self.assertRaises(DoesNotExist):
-        #    self.post1.comments.get(author='user3')
-        self.assertRaises(
-            DoesNotExist, self.post1.comments.get, author='user3'
-        )
+        with self.assertRaises(DoesNotExist):
+            self.post1.comments.get(author='user3')
 
     def test_first(self):
         """
@@ -4062,9 +4016,7 @@ def test_first(self):
         comment = self.post1.comments.first()
 
         # Ensure a Comment object was returned.
-        # < 2.6 Incompatible >
-        # self.assertIsInstance(comment, self.Comments)
-        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertIsInstance(comment, self.Comments)
         self.assertEqual(comment, self.post1.comments[0])
 
     def test_create(self):
@@ -4077,22 +4029,14 @@ def test_create(self):
         self.post1.save()
 
         # Ensure the returned value is the comment object.
-        # < 2.6 Incompatible >
-        # self.assertIsInstance(comment, self.Comments)
-        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertIsInstance(comment, self.Comments)
         self.assertEqual(comment.author, 'user4')
         self.assertEqual(comment.message, 'message1')
 
         # Ensure the new comment was actually saved to the database.
-        # < 2.6 Incompatible >
-        # self.assertIn(
-        #    comment,
-        #    self.BlogPost.objects(comments__author='user4')[0].comments
-        # )
-        self.assertTrue(
-            comment in self.BlogPost.objects(
-                comments__author='user4'
-            )[0].comments
+        self.assertIn(
+            comment,
+            self.BlogPost.objects(comments__author='user4')[0].comments
         )
 
     def test_filtered_create(self):
@@ -4107,22 +4051,14 @@ def test_filtered_create(self):
         self.post1.save()
 
         # Ensure the returned value is the comment object.
-        # < 2.6 Incompatible >
-        # self.assertIsInstance(comment, self.Comments)
-        self.assertTrue(isinstance(comment, self.Comments))
+        self.assertIsInstance(comment, self.Comments)
         self.assertEqual(comment.author, 'user4')
         self.assertEqual(comment.message, 'message1')
 
         # Ensure the new comment was actually saved to the database.
-        # < 2.6 Incompatible >
-        # self.assertIn(
-        #    comment,
-        #    self.BlogPost.objects(comments__author='user4')[0].comments
-        # )
-        self.assertTrue(
-            comment in self.BlogPost.objects(
-                comments__author='user4'
-            )[0].comments
+        self.assertIn(
+            comment,
+            self.BlogPost.objects(comments__author='user4')[0].comments
         )
 
     def test_no_keyword_update(self):
@@ -4135,22 +4071,14 @@ def test_no_keyword_update(self):
         self.post1.save()
 
         # Ensure that nothing was altered.
-        # < 2.6 Incompatible >
-        # self.assertIn(
-        #    original[0],
-        #    self.BlogPost.objects(id=self.post1.id)[0].comments
-        # )
-        self.assertTrue(
-            original[0] in self.BlogPost.objects(id=self.post1.id)[0].comments
+        self.assertIn(
+            original[0],
+            self.BlogPost.objects(id=self.post1.id)[0].comments
         )
 
-        # < 2.6 Incompatible >
-        # self.assertIn(
-        #    original[1],
-        #    self.BlogPost.objects(id=self.post1.id)[0].comments
-        # )
-        self.assertTrue(
-            original[1] in self.BlogPost.objects(id=self.post1.id)[0].comments
+        self.assertIn(
+            original[1],
+            self.BlogPost.objects(id=self.post1.id)[0].comments
         )
 
         # Ensure the method returned 0 as the number of entries
@@ -4196,13 +4124,9 @@ def test_save(self):
         comments.save()
 
         # Ensure that the new comment has been added to the database.
-        # < 2.6 Incompatible >
-        # self.assertIn(
-        #    new_comment,
-        #    self.BlogPost.objects(id=self.post1.id)[0].comments
-        # )
-        self.assertTrue(
-            new_comment in self.BlogPost.objects(id=self.post1.id)[0].comments
+        self.assertIn(
+            new_comment,
+            self.BlogPost.objects(id=self.post1.id)[0].comments
         )
 
     def test_delete(self):
@@ -4214,23 +4138,15 @@ def test_delete(self):
 
         # Ensure that all the comments under post1 were deleted in the
         # database.
-        # < 2.6 Incompatible >
-        # self.assertListEqual(
-        #    self.BlogPost.objects(id=self.post1.id)[0].comments, []
-        # )
-        self.assertEqual(
+        self.assertListEqual(
             self.BlogPost.objects(id=self.post1.id)[0].comments, []
         )
 
         # Ensure that post1 comments were deleted from the list.
-        # < 2.6 Incompatible >
-        # self.assertListEqual(self.post1.comments, [])
-        self.assertEqual(self.post1.comments, [])
+        self.assertListEqual(self.post1.comments, [])
 
         # Ensure that comments still returned a EmbeddedDocumentList object.
-        # < 2.6 Incompatible >
-        # self.assertIsInstance(self.post1.comments, EmbeddedDocumentList)
-        self.assertTrue(isinstance(self.post1.comments, EmbeddedDocumentList))
+        self.assertIsInstance(self.post1.comments, EmbeddedDocumentList)
 
         # Ensure that the delete method returned 2 as the number of entries
         # deleted from the database
@@ -4270,21 +4186,15 @@ def test_filtered_delete(self):
         self.post1.save()
 
         # Ensure that only the user2 comment was deleted.
-        # < 2.6 Incompatible >
-        # self.assertNotIn(
-        #     comment, self.BlogPost.objects(id=self.post1.id)[0].comments
-        # )
-        self.assertTrue(
-            comment not in self.BlogPost.objects(id=self.post1.id)[0].comments
+        self.assertNotIn(
+            comment, self.BlogPost.objects(id=self.post1.id)[0].comments
         )
         self.assertEqual(
             len(self.BlogPost.objects(id=self.post1.id)[0].comments), 1
         )
 
         # Ensure that the user2 comment no longer exists in the list.
-        # < 2.6 Incompatible >
-        # self.assertNotIn(comment, self.post1.comments)
-        self.assertTrue(comment not in self.post1.comments)
+        self.assertNotIn(comment, self.post1.comments)
         self.assertEqual(len(self.post1.comments), 1)
 
         # Ensure that the delete method returned 1 as the number of entries
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 7c5abeac8..b266a5e58 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -1,18 +1,16 @@
 # -*- coding: utf-8 -*-
-import sys
-sys.path[0:0] = [""]
-
 import copy
 import os
 import unittest
 import tempfile
 
 import gridfs
+import six
 
 from nose.plugins.skip import SkipTest
 from mongoengine import *
 from mongoengine.connection import get_db
-from mongoengine.python_support import b, StringIO
+from mongoengine.python_support import StringIO
 
 try:
     from PIL import Image
@@ -49,7 +47,7 @@ class PutFile(Document):
 
         PutFile.drop_collection()
 
-        text = b('Hello, World!')
+        text = six.b('Hello, World!')
         content_type = 'text/plain'
 
         putfile = PutFile()
@@ -88,8 +86,8 @@ class StreamFile(Document):
 
         StreamFile.drop_collection()
 
-        text = b('Hello, World!')
-        more_text = b('Foo Bar')
+        text = six.b('Hello, World!')
+        more_text = six.b('Foo Bar')
         content_type = 'text/plain'
 
         streamfile = StreamFile()
@@ -123,8 +121,8 @@ class StreamFile(Document):
 
         StreamFile.drop_collection()
 
-        text = b('Hello, World!')
-        more_text = b('Foo Bar')
+        text = six.b('Hello, World!')
+        more_text = six.b('Foo Bar')
         content_type = 'text/plain'
 
         streamfile = StreamFile()
@@ -155,8 +153,8 @@ def test_file_fields_set(self):
         class SetFile(Document):
             the_file = FileField()
 
-        text = b('Hello, World!')
-        more_text = b('Foo Bar')
+        text = six.b('Hello, World!')
+        more_text = six.b('Foo Bar')
 
         SetFile.drop_collection()
 
@@ -185,7 +183,7 @@ class GridDocument(Document):
         GridDocument.drop_collection()
 
         with tempfile.TemporaryFile() as f:
-            f.write(b("Hello World!"))
+            f.write(six.b("Hello World!"))
             f.flush()
 
             # Test without default
@@ -202,7 +200,7 @@ class GridDocument(Document):
             self.assertEqual(doc_b.the_file.grid_id, doc_c.the_file.grid_id)
 
             # Test with default
-            doc_d = GridDocument(the_file=b(''))
+            doc_d = GridDocument(the_file=six.b(''))
             doc_d.save()
 
             doc_e = GridDocument.objects.with_id(doc_d.id)
@@ -228,7 +226,7 @@ class TestFile(Document):
         # First instance
         test_file = TestFile()
         test_file.name = "Hello, World!"
-        test_file.the_file.put(b('Hello, World!'))
+        test_file.the_file.put(six.b('Hello, World!'))
         test_file.save()
 
         # Second instance
@@ -282,7 +280,7 @@ class TestFile(Document):
 
         test_file = TestFile()
         self.assertFalse(bool(test_file.the_file))
-        test_file.the_file.put(b('Hello, World!'), content_type='text/plain')
+        test_file.the_file.put(six.b('Hello, World!'), content_type='text/plain')
         test_file.save()
         self.assertTrue(bool(test_file.the_file))
 
@@ -297,66 +295,66 @@ class TestFile(Document):
         test_file = TestFile()
         self.assertFalse(test_file.the_file in [{"test": 1}])
 
-    def test_file_disk_space(self): 
-        """ Test disk space usage when we delete/replace a file """ 
+    def test_file_disk_space(self):
+        """ Test disk space usage when we delete/replace a file """
         class TestFile(Document):
             the_file = FileField()
-            
-        text = b('Hello, World!')
+
+        text = six.b('Hello, World!')
         content_type = 'text/plain'
 
         testfile = TestFile()
         testfile.the_file.put(text, content_type=content_type, filename="hello")
         testfile.save()
-        
-        # Now check fs.files and fs.chunks 
+
+        # Now check fs.files and fs.chunks
         db = TestFile._get_db()
-        
+
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
         self.assertEquals(len(list(files)), 1)
         self.assertEquals(len(list(chunks)), 1)
 
-        # Deleting the docoument should delete the files 
+        # Deleting the docoument should delete the files
         testfile.delete()
-        
+
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
         self.assertEquals(len(list(files)), 0)
         self.assertEquals(len(list(chunks)), 0)
-        
-        # Test case where we don't store a file in the first place 
+
+        # Test case where we don't store a file in the first place
         testfile = TestFile()
         testfile.save()
-        
+
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
         self.assertEquals(len(list(files)), 0)
         self.assertEquals(len(list(chunks)), 0)
-        
+
         testfile.delete()
-        
+
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
         self.assertEquals(len(list(files)), 0)
         self.assertEquals(len(list(chunks)), 0)
-        
-        # Test case where we overwrite the file 
+
+        # Test case where we overwrite the file
         testfile = TestFile()
         testfile.the_file.put(text, content_type=content_type, filename="hello")
         testfile.save()
-        
-        text = b('Bonjour, World!')
+
+        text = six.b('Bonjour, World!')
         testfile.the_file.replace(text, content_type=content_type, filename="hello")
         testfile.save()
-        
+
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
         self.assertEquals(len(list(files)), 1)
         self.assertEquals(len(list(chunks)), 1)
-        
+
         testfile.delete()
-        
+
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
         self.assertEquals(len(list(files)), 0)
@@ -372,14 +370,14 @@ class TestImage(Document):
         TestImage.drop_collection()
 
         with tempfile.TemporaryFile() as f:
-            f.write(b("Hello World!"))
+            f.write(six.b("Hello World!"))
             f.flush()
 
             t = TestImage()
             try:
                 t.image.put(f)
                 self.fail("Should have raised an invalidation error")
-            except ValidationError, e:
+            except ValidationError as e:
                 self.assertEqual("%s" % e, "Invalid image: cannot identify image file %s" % f)
 
         t = TestImage()
@@ -496,7 +494,7 @@ class TestFile(Document):
         # First instance
         test_file = TestFile()
         test_file.name = "Hello, World!"
-        test_file.the_file.put(b('Hello, World!'),
+        test_file.the_file.put(six.b('Hello, World!'),
                           name="hello.txt")
         test_file.save()
 
@@ -504,16 +502,15 @@ class TestFile(Document):
         self.assertEqual(data.get('name'), 'hello.txt')
 
         test_file = TestFile.objects.first()
-        self.assertEqual(test_file.the_file.read(),
-                          b('Hello, World!'))
+        self.assertEqual(test_file.the_file.read(), six.b('Hello, World!'))
 
         test_file = TestFile.objects.first()
-        test_file.the_file = b('HELLO, WORLD!')
+        test_file.the_file = six.b('HELLO, WORLD!')
         test_file.save()
 
         test_file = TestFile.objects.first()
         self.assertEqual(test_file.the_file.read(),
-                          b('HELLO, WORLD!'))
+                         six.b('HELLO, WORLD!'))
 
     def test_copyable(self):
         class PutFile(Document):
@@ -521,7 +518,7 @@ class PutFile(Document):
 
         PutFile.drop_collection()
 
-        text = b('Hello, World!')
+        text = six.b('Hello, World!')
         content_type = 'text/plain'
 
         putfile = PutFile()
diff --git a/tests/fields/geo.py b/tests/fields/geo.py
index c3f414812..1c5bccc0b 100644
--- a/tests/fields/geo.py
+++ b/tests/fields/geo.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
-sys.path[0:0] = [""]
-
 import unittest
 
 from mongoengine import *
diff --git a/tests/migration/__init__.py b/tests/migration/__init__.py
deleted file mode 100644
index ef62d8760..000000000
--- a/tests/migration/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import unittest
-
-from convert_to_new_inheritance_model import *
-from decimalfield_as_float import *
-from referencefield_dbref_to_object_id import *
-from turn_off_inheritance import *
-from uuidfield_to_binary import *
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/migration/convert_to_new_inheritance_model.py b/tests/migration/convert_to_new_inheritance_model.py
deleted file mode 100644
index 89ee9e9d2..000000000
--- a/tests/migration/convert_to_new_inheritance_model.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-import unittest
-
-from mongoengine import Document, connect
-from mongoengine.connection import get_db
-from mongoengine.fields import StringField
-
-__all__ = ('ConvertToNewInheritanceModel', )
-
-
-class ConvertToNewInheritanceModel(unittest.TestCase):
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
-
-    def tearDown(self):
-        for collection in self.db.collection_names():
-            if 'system.' in collection:
-                continue
-            self.db.drop_collection(collection)
-
-    def test_how_to_convert_to_the_new_inheritance_model(self):
-        """Demonstrates migrating from 0.7 to 0.8
-        """
-
-        # 1. Declaration of the class
-        class Animal(Document):
-            name = StringField()
-            meta = {
-                'allow_inheritance': True,
-                'indexes': ['name']
-            }
-
-        # 2. Remove _types
-        collection = Animal._get_collection()
-        collection.update({}, {"$unset": {"_types": 1}}, multi=True)
-
-        # 3. Confirm extra data is removed
-        count = collection.find({'_types': {"$exists": True}}).count()
-        self.assertEqual(0, count)
-
-        # 4. Remove indexes
-        info = collection.index_information()
-        indexes_to_drop = [key for key, value in info.iteritems()
-                           if '_types' in dict(value['key'])]
-        for index in indexes_to_drop:
-            collection.drop_index(index)
-
-        # 5. Recreate indexes
-        Animal.ensure_indexes()
diff --git a/tests/migration/decimalfield_as_float.py b/tests/migration/decimalfield_as_float.py
deleted file mode 100644
index 3903c913f..000000000
--- a/tests/migration/decimalfield_as_float.py
+++ /dev/null
@@ -1,50 +0,0 @@
- # -*- coding: utf-8 -*-
-import unittest
-import decimal
-from decimal import Decimal
-
-from mongoengine import Document, connect
-from mongoengine.connection import get_db
-from mongoengine.fields import StringField, DecimalField, ListField
-
-__all__ = ('ConvertDecimalField', )
-
-
-class ConvertDecimalField(unittest.TestCase):
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
-
-    def test_how_to_convert_decimal_fields(self):
-        """Demonstrates migrating from 0.7 to 0.8
-        """
-
-        # 1. Old definition - using dbrefs
-        class Person(Document):
-            name = StringField()
-            money = DecimalField(force_string=True)
-            monies = ListField(DecimalField(force_string=True))
-
-        Person.drop_collection()
-        Person(name="Wilson Jr", money=Decimal("2.50"),
-               monies=[Decimal("2.10"), Decimal("5.00")]).save()
-
-        # 2. Start the migration by changing the schema
-        # Change DecimalField - add precision and rounding settings
-        class Person(Document):
-            name = StringField()
-            money = DecimalField(precision=2, rounding=decimal.ROUND_HALF_UP)
-            monies = ListField(DecimalField(precision=2,
-                                            rounding=decimal.ROUND_HALF_UP))
-
-        # 3. Loop all the objects and mark parent as changed
-        for p in Person.objects:
-            p._mark_as_changed('money')
-            p._mark_as_changed('monies')
-            p.save()
-
-        # 4. Confirmation of the fix!
-        wilson = Person.objects(name="Wilson Jr").as_pymongo()[0]
-        self.assertTrue(isinstance(wilson['money'], float))
-        self.assertTrue(all([isinstance(m, float) for m in wilson['monies']]))
diff --git a/tests/migration/referencefield_dbref_to_object_id.py b/tests/migration/referencefield_dbref_to_object_id.py
deleted file mode 100644
index d3acbe923..000000000
--- a/tests/migration/referencefield_dbref_to_object_id.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-import unittest
-
-from mongoengine import Document, connect
-from mongoengine.connection import get_db
-from mongoengine.fields import StringField, ReferenceField, ListField
-
-__all__ = ('ConvertToObjectIdsModel', )
-
-
-class ConvertToObjectIdsModel(unittest.TestCase):
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
-
-    def test_how_to_convert_to_object_id_reference_fields(self):
-        """Demonstrates migrating from 0.7 to 0.8
-        """
-
-        # 1. Old definition - using dbrefs
-        class Person(Document):
-            name = StringField()
-            parent = ReferenceField('self', dbref=True)
-            friends = ListField(ReferenceField('self', dbref=True))
-
-        Person.drop_collection()
-
-        p1 = Person(name="Wilson", parent=None).save()
-        f1 = Person(name="John", parent=None).save()
-        f2 = Person(name="Paul", parent=None).save()
-        f3 = Person(name="George", parent=None).save()
-        f4 = Person(name="Ringo", parent=None).save()
-        Person(name="Wilson Jr", parent=p1, friends=[f1, f2, f3, f4]).save()
-
-        # 2. Start the migration by changing the schema
-        # Change ReferenceField as now dbref defaults to False
-        class Person(Document):
-            name = StringField()
-            parent = ReferenceField('self')
-            friends = ListField(ReferenceField('self'))
-
-        # 3. Loop all the objects and mark parent as changed
-        for p in Person.objects:
-            p._mark_as_changed('parent')
-            p._mark_as_changed('friends')
-            p.save()
-
-        # 4. Confirmation of the fix!
-        wilson = Person.objects(name="Wilson Jr").as_pymongo()[0]
-        self.assertEqual(p1.id, wilson['parent'])
-        self.assertEqual([f1.id, f2.id, f3.id, f4.id], wilson['friends'])
diff --git a/tests/migration/turn_off_inheritance.py b/tests/migration/turn_off_inheritance.py
deleted file mode 100644
index ee461a84b..000000000
--- a/tests/migration/turn_off_inheritance.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-import unittest
-
-from mongoengine import Document, connect
-from mongoengine.connection import get_db
-from mongoengine.fields import StringField
-
-__all__ = ('TurnOffInheritanceTest', )
-
-
-class TurnOffInheritanceTest(unittest.TestCase):
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
-
-    def tearDown(self):
-        for collection in self.db.collection_names():
-            if 'system.' in collection:
-                continue
-            self.db.drop_collection(collection)
-
-    def test_how_to_turn_off_inheritance(self):
-        """Demonstrates migrating from allow_inheritance = True to False.
-        """
-
-        # 1. Old declaration of the class
-
-        class Animal(Document):
-            name = StringField()
-            meta = {
-                'allow_inheritance': True,
-                'indexes': ['name']
-            }
-
-        # 2. Turn off inheritance
-        class Animal(Document):
-            name = StringField()
-            meta = {
-                'allow_inheritance': False,
-                'indexes': ['name']
-            }
-
-        # 3. Remove _types and _cls
-        collection = Animal._get_collection()
-        collection.update({}, {"$unset": {"_types": 1, "_cls": 1}}, multi=True)
-
-        # 3. Confirm extra data is removed
-        count = collection.find({"$or": [{'_types': {"$exists": True}},
-                                         {'_cls': {"$exists": True}}]}).count()
-        assert count == 0
-
-        # 4. Remove indexes
-        info = collection.index_information()
-        indexes_to_drop = [key for key, value in info.iteritems()
-                           if '_types' in dict(value['key'])
-                              or '_cls' in dict(value['key'])]
-        for index in indexes_to_drop:
-            collection.drop_index(index)
-
-        # 5. Recreate indexes
-        Animal.ensure_indexes()
diff --git a/tests/migration/uuidfield_to_binary.py b/tests/migration/uuidfield_to_binary.py
deleted file mode 100644
index a535e91fa..000000000
--- a/tests/migration/uuidfield_to_binary.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-import unittest
-import uuid
-
-from mongoengine import Document, connect
-from mongoengine.connection import get_db
-from mongoengine.fields import StringField, UUIDField, ListField
-
-__all__ = ('ConvertToBinaryUUID', )
-
-
-class ConvertToBinaryUUID(unittest.TestCase):
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
-
-    def test_how_to_convert_to_binary_uuid_fields(self):
-        """Demonstrates migrating from 0.7 to 0.8
-        """
-
-        # 1. Old definition - using dbrefs
-        class Person(Document):
-            name = StringField()
-            uuid = UUIDField(binary=False)
-            uuids = ListField(UUIDField(binary=False))
-
-        Person.drop_collection()
-        Person(name="Wilson Jr", uuid=uuid.uuid4(),
-               uuids=[uuid.uuid4(), uuid.uuid4()]).save()
-
-        # 2. Start the migration by changing the schema
-        # Change UUIDFIeld as now binary defaults to True
-        class Person(Document):
-            name = StringField()
-            uuid = UUIDField()
-            uuids = ListField(UUIDField())
-
-        # 3. Loop all the objects and mark parent as changed
-        for p in Person.objects:
-            p._mark_as_changed('uuid')
-            p._mark_as_changed('uuids')
-            p.save()
-
-        # 4. Confirmation of the fix!
-        wilson = Person.objects(name="Wilson Jr").as_pymongo()[0]
-        self.assertTrue(isinstance(wilson['uuid'], uuid.UUID))
-        self.assertTrue(all([isinstance(u, uuid.UUID) for u in wilson['uuids']]))
diff --git a/tests/queryset/field_list.py b/tests/queryset/field_list.py
index 7d66d2639..76d5f779b 100644
--- a/tests/queryset/field_list.py
+++ b/tests/queryset/field_list.py
@@ -1,6 +1,3 @@
-import sys
-sys.path[0:0] = [""]
-
 import unittest
 
 from mongoengine import *
@@ -95,7 +92,7 @@ class MyDoc(Document):
         exclude = ['d', 'e']
         only = ['b', 'c']
 
-        qs = MyDoc.objects.fields(**dict(((i, 1) for i in include)))
+        qs = MyDoc.objects.fields(**{i: 1 for i in include})
         self.assertEqual(qs._loaded_fields.as_dict(),
                          {'a': 1, 'b': 1, 'c': 1, 'd': 1, 'e': 1})
         qs = qs.only(*only)
@@ -103,14 +100,14 @@ class MyDoc(Document):
         qs = qs.exclude(*exclude)
         self.assertEqual(qs._loaded_fields.as_dict(), {'b': 1, 'c': 1})
 
-        qs = MyDoc.objects.fields(**dict(((i, 1) for i in include)))
+        qs = MyDoc.objects.fields(**{i: 1 for i in include})
         qs = qs.exclude(*exclude)
         self.assertEqual(qs._loaded_fields.as_dict(), {'a': 1, 'b': 1, 'c': 1})
         qs = qs.only(*only)
         self.assertEqual(qs._loaded_fields.as_dict(), {'b': 1, 'c': 1})
 
         qs = MyDoc.objects.exclude(*exclude)
-        qs = qs.fields(**dict(((i, 1) for i in include)))
+        qs = qs.fields(**{i: 1 for i in include})
         self.assertEqual(qs._loaded_fields.as_dict(), {'a': 1, 'b': 1, 'c': 1})
         qs = qs.only(*only)
         self.assertEqual(qs._loaded_fields.as_dict(), {'b': 1, 'c': 1})
@@ -129,7 +126,7 @@ class MyDoc(Document):
         exclude = ['d', 'e']
         only = ['b', 'c']
 
-        qs = MyDoc.objects.fields(**dict(((i, 1) for i in include)))
+        qs = MyDoc.objects.fields(**{i: 1 for i in include})
         qs = qs.exclude(*exclude)
         qs = qs.only(*only)
         qs = qs.fields(slice__b=5)
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 9aac44f53..d10c51cd0 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -1,9 +1,5 @@
-import sys
-
-sys.path[0:0] = [""]
-
-import unittest
 from datetime import datetime, timedelta
+import unittest
 
 from pymongo.errors import OperationFailure
 from mongoengine import *
diff --git a/tests/queryset/modify.py b/tests/queryset/modify.py
index e0c7d1fe6..607937f68 100644
--- a/tests/queryset/modify.py
+++ b/tests/queryset/modify.py
@@ -1,6 +1,3 @@
-import sys
-sys.path[0:0] = [""]
-
 import unittest
 
 from mongoengine import connect, Document, IntField
@@ -99,4 +96,4 @@ def test_modify_with_fields(self):
 
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 2c00838a6..e4c71de76 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -9,13 +9,13 @@
 import pymongo
 from pymongo.errors import ConfigurationError
 from pymongo.read_preferences import ReadPreference
-
+import six
 
 from mongoengine import *
 from mongoengine.connection import get_connection, get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
-from mongoengine.python_support import IS_PYMONGO_3, PY3
+from mongoengine.python_support import IS_PYMONGO_3
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
 
@@ -25,7 +25,10 @@
 class db_ops_tracker(query_counter):
 
     def get_ops(self):
-        ignore_query = {"ns": {"$ne": "%s.system.indexes" % self.db.name}}
+        ignore_query = {
+            'ns': {'$ne': '%s.system.indexes' % self.db.name},
+            'command.count': {'$ne': 'system.profile'}
+        }
         return list(self.db.system.profile.find(ignore_query))
 
 
@@ -94,12 +97,12 @@ class BlogPost(Document):
             author = ReferenceField(self.Person)
             author2 = GenericReferenceField()
 
-        def test_reference():
+        # test addressing a field from a reference
+        with self.assertRaises(InvalidQueryError):
             list(BlogPost.objects(author__name="test"))
 
-        self.assertRaises(InvalidQueryError, test_reference)
-
-        def test_generic_reference():
+        # should fail for a generic reference as well
+        with self.assertRaises(InvalidQueryError):
             list(BlogPost.objects(author2__name="test"))
 
     def test_find(self):
@@ -174,7 +177,7 @@ def test_find(self):
 
         # Test larger slice __repr__
         self.Person.objects.delete()
-        for i in xrange(55):
+        for i in range(55):
             self.Person(name='A%s' % i, age=i).save()
 
         self.assertEqual(self.Person.objects.count(), 55)
@@ -218,14 +221,15 @@ def test_find_one(self):
         person = self.Person.objects[1]
         self.assertEqual(person.name, "User B")
 
-        self.assertRaises(IndexError, self.Person.objects.__getitem__, 2)
+        with self.assertRaises(IndexError):
+            self.Person.objects[2]
 
         # Find a document using just the object id
         person = self.Person.objects.with_id(person1.id)
         self.assertEqual(person.name, "User A")
 
-        self.assertRaises(
-            InvalidQueryError, self.Person.objects(name="User A").with_id, person1.id)
+        with self.assertRaises(InvalidQueryError):
+            self.Person.objects(name="User A").with_id(person1.id)
 
     def test_find_only_one(self):
         """Ensure that a query using ``get`` returns at most one result.
@@ -363,7 +367,8 @@ class A(Document):
 
         # test invalid batch size
         qs = A.objects.batch_size(-1)
-        self.assertRaises(ValueError, lambda: list(qs))
+        with self.assertRaises(ValueError):
+            list(qs)
 
     def test_update_write_concern(self):
         """Test that passing write_concern works"""
@@ -392,18 +397,14 @@ def test_update_update_has_a_value(self):
         """Test to ensure that update is passed a value to update to"""
         self.Person.drop_collection()
 
-        author = self.Person(name='Test User')
-        author.save()
+        author = self.Person.objects.create(name='Test User')
 
-        def update_raises():
+        with self.assertRaises(OperationError):
             self.Person.objects(pk=author.pk).update({})
 
-        def update_one_raises():
+        with self.assertRaises(OperationError):
             self.Person.objects(pk=author.pk).update_one({})
 
-        self.assertRaises(OperationError, update_raises)
-        self.assertRaises(OperationError, update_one_raises)
-
     def test_update_array_position(self):
         """Ensure that updating by array position works.
 
@@ -431,8 +432,8 @@ class Blog(Document):
         Blog.objects.create(posts=[post2, post1])
 
         # Update all of the first comments of second posts of all blogs
-        Blog.objects().update(set__posts__1__comments__0__name="testc")
-        testc_blogs = Blog.objects(posts__1__comments__0__name="testc")
+        Blog.objects().update(set__posts__1__comments__0__name='testc')
+        testc_blogs = Blog.objects(posts__1__comments__0__name='testc')
         self.assertEqual(testc_blogs.count(), 2)
 
         Blog.drop_collection()
@@ -441,14 +442,13 @@ class Blog(Document):
 
         # Update only the first blog returned by the query
         Blog.objects().update_one(
-            set__posts__1__comments__1__name="testc")
-        testc_blogs = Blog.objects(posts__1__comments__1__name="testc")
+            set__posts__1__comments__1__name='testc')
+        testc_blogs = Blog.objects(posts__1__comments__1__name='testc')
         self.assertEqual(testc_blogs.count(), 1)
 
         # Check that using this indexing syntax on a non-list fails
-        def non_list_indexing():
-            Blog.objects().update(set__posts__1__comments__0__name__1="asdf")
-        self.assertRaises(InvalidQueryError, non_list_indexing)
+        with self.assertRaises(InvalidQueryError):
+            Blog.objects().update(set__posts__1__comments__0__name__1='asdf')
 
         Blog.drop_collection()
 
@@ -516,15 +516,12 @@ class Simple(Document):
         self.assertEqual(simple.x, [1, 2, None, 4, 3, 2, 3, 4])
 
         # Nested updates arent supported yet..
-        def update_nested():
+        with self.assertRaises(OperationError):
             Simple.drop_collection()
             Simple(x=[{'test': [1, 2, 3, 4]}]).save()
             Simple.objects(x__test=2).update(set__x__S__test__S=3)
             self.assertEqual(simple.x, [1, 2, 3, 4])
 
-        self.assertRaises(OperationError, update_nested)
-        Simple.drop_collection()
-
     def test_update_using_positional_operator_embedded_document(self):
         """Ensure that the embedded documents can be updated using the positional
         operator."""
@@ -617,11 +614,11 @@ class Club(Document):
             members = DictField()
 
         club = Club()
-        club.members['John'] = dict(gender="M", age=13)
+        club.members['John'] = {'gender': 'M', 'age': 13}
         club.save()
 
         Club.objects().update(
-            set__members={"John": dict(gender="F", age=14)})
+            set__members={"John": {'gender': 'F', 'age': 14}})
 
         club = Club.objects().first()
         self.assertEqual(club.members['John']['gender'], "F")
@@ -802,7 +799,7 @@ class Blog(Document):
             post2 = Post(comments=[comment2, comment2])
 
             blogs = []
-            for i in xrange(1, 100):
+            for i in range(1, 100):
                 blogs.append(Blog(title="post %s" % i, posts=[post1, post2]))
 
             Blog.objects.insert(blogs, load_bulk=False)
@@ -839,30 +836,31 @@ class Blog(Document):
 
         self.assertEqual(Blog.objects.count(), 2)
 
-        # test handles people trying to upsert
-        def throw_operation_error():
+        # test inserting an existing document (shouldn't be allowed)
+        with self.assertRaises(OperationError):
+            blog = Blog.objects.first()
+            Blog.objects.insert(blog)
+
+        # test inserting a query set
+        with self.assertRaises(OperationError):
             blogs = Blog.objects
             Blog.objects.insert(blogs)
 
-        self.assertRaises(OperationError, throw_operation_error)
-
-        # Test can insert new doc
+        # insert a new doc
         new_post = Blog(title="code123", id=ObjectId())
         Blog.objects.insert(new_post)
 
-        # test handles other classes being inserted
-        def throw_operation_error_wrong_doc():
-            class Author(Document):
-                pass
-            Blog.objects.insert(Author())
+        class Author(Document):
+            pass
 
-        self.assertRaises(OperationError, throw_operation_error_wrong_doc)
+        # try inserting a different document class
+        with self.assertRaises(OperationError):
+            Blog.objects.insert(Author())
 
-        def throw_operation_error_not_a_document():
+        # try inserting a non-document
+        with self.assertRaises(OperationError):
             Blog.objects.insert("HELLO WORLD")
 
-        self.assertRaises(OperationError, throw_operation_error_not_a_document)
-
         Blog.drop_collection()
 
         blog1 = Blog(title="code", posts=[post1, post2])
@@ -882,14 +880,13 @@ def throw_operation_error_not_a_document():
         blog3 = Blog(title="baz", posts=[post1, post2])
         Blog.objects.insert([blog1, blog2])
 
-        def throw_operation_error_not_unique():
+        with self.assertRaises(NotUniqueError):
             Blog.objects.insert([blog2, blog3])
 
-        self.assertRaises(NotUniqueError, throw_operation_error_not_unique)
         self.assertEqual(Blog.objects.count(), 2)
 
-        Blog.objects.insert([blog2, blog3], write_concern={"w": 0,
-                                                           'continue_on_error': True})
+        Blog.objects.insert([blog2, blog3],
+                            write_concern={"w": 0, 'continue_on_error': True})
         self.assertEqual(Blog.objects.count(), 3)
 
     def test_get_changed_fields_query_count(self):
@@ -1022,7 +1019,7 @@ def __repr__(self):
 
         Doc.drop_collection()
 
-        for i in xrange(1000):
+        for i in range(1000):
             Doc(number=i).save()
 
         docs = Doc.objects.order_by('number')
@@ -1176,7 +1173,7 @@ def assertSequence(self, qs, expected):
         qs = list(qs)
         expected = list(expected)
         self.assertEqual(len(qs), len(expected))
-        for i in xrange(len(qs)):
+        for i in range(len(qs)):
             self.assertEqual(qs[i], expected[i])
 
     def test_ordering(self):
@@ -1216,7 +1213,8 @@ class BlogPost(Document):
         self.assertSequence(qs, expected)
 
     def test_clear_ordering(self):
-        """ Ensure that the default ordering can be cleared by calling order_by().
+        """Ensure that the default ordering can be cleared by calling
+        order_by() w/o any arguments.
         """
         class BlogPost(Document):
             title = StringField()
@@ -1232,12 +1230,13 @@ class BlogPost(Document):
             BlogPost.objects.filter(title='whatever').first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertEqual(
-                q.get_ops()[0]['query']['$orderby'], {u'published_date': -1})
+                q.get_ops()[0]['query']['$orderby'],
+                {'published_date': -1}
+            )
 
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title='whatever').order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
-            print q.get_ops()[0]['query']
             self.assertFalse('$orderby' in q.get_ops()[0]['query'])
 
     def test_no_ordering_for_get(self):
@@ -1710,7 +1709,7 @@ class Log(Document):
 
         Log.drop_collection()
 
-        for i in xrange(10):
+        for i in range(10):
             Log().save()
 
         Log.objects()[3:5].delete()
@@ -1910,12 +1909,10 @@ class Site(Document):
         Site.objects(id=s.id).update_one(pull__collaborators__user='Esteban')
         self.assertEqual(Site.objects.first().collaborators, [])
 
-        def pull_all():
+        with self.assertRaises(InvalidQueryError):
             Site.objects(id=s.id).update_one(
                 pull_all__collaborators__user=['Ross'])
 
-        self.assertRaises(InvalidQueryError, pull_all)
-
     def test_pull_from_nested_embedded(self):
 
         class User(EmbeddedDocument):
@@ -1946,12 +1943,10 @@ class Site(Document):
             pull__collaborators__unhelpful={'name': 'Frank'})
         self.assertEqual(Site.objects.first().collaborators['unhelpful'], [])
 
-        def pull_all():
+        with self.assertRaises(InvalidQueryError):
             Site.objects(id=s.id).update_one(
                 pull_all__collaborators__helpful__name=['Ross'])
 
-        self.assertRaises(InvalidQueryError, pull_all)
-
     def test_pull_from_nested_mapfield(self):
 
         class Collaborator(EmbeddedDocument):
@@ -1980,12 +1975,10 @@ class Site(Document):
             pull__collaborators__unhelpful={'user': 'Frank'})
         self.assertEqual(Site.objects.first().collaborators['unhelpful'], [])
 
-        def pull_all():
+        with self.assertRaises(InvalidQueryError):
             Site.objects(id=s.id).update_one(
                 pull_all__collaborators__helpful__user=['Ross'])
 
-        self.assertRaises(InvalidQueryError, pull_all)
-
     def test_update_one_pop_generic_reference(self):
 
         class BlogTag(Document):
@@ -2610,7 +2603,7 @@ class BlogPost(Document):
         BlogPost(hits=2, tags=['music', 'actors']).save()
 
         def test_assertions(f):
-            f = dict((key, int(val)) for key, val in f.items())
+            f = {key: int(val) for key, val in f.items()}
             self.assertEqual(
                 set(['music', 'film', 'actors', 'watch']), set(f.keys()))
             self.assertEqual(f['music'], 3)
@@ -2625,7 +2618,7 @@ def test_assertions(f):
 
         # Ensure query is taken into account
         def test_assertions(f):
-            f = dict((key, int(val)) for key, val in f.items())
+            f = {key: int(val) for key, val in f.items()}
             self.assertEqual(set(['music', 'actors', 'watch']), set(f.keys()))
             self.assertEqual(f['music'], 2)
             self.assertEqual(f['actors'], 1)
@@ -2689,7 +2682,7 @@ class Person(Document):
         doc.save()
 
         def test_assertions(f):
-            f = dict((key, int(val)) for key, val in f.items())
+            f = {key: int(val) for key, val in f.items()}
             self.assertEqual(
                 set(['62-3331-1656', '62-3332-1656']), set(f.keys()))
             self.assertEqual(f['62-3331-1656'], 2)
@@ -2703,7 +2696,7 @@ def test_assertions(f):
 
         # Ensure query is taken into account
         def test_assertions(f):
-            f = dict((key, int(val)) for key, val in f.items())
+            f = {key: int(val) for key, val in f.items()}
             self.assertEqual(set(['62-3331-1656']), set(f.keys()))
             self.assertEqual(f['62-3331-1656'], 2)
 
@@ -2810,10 +2803,10 @@ class Test(Document):
 
         Test.drop_collection()
 
-        for i in xrange(50):
+        for i in range(50):
             Test(val=1).save()
 
-        for i in xrange(20):
+        for i in range(20):
             Test(val=2).save()
 
         freqs = Test.objects.item_frequencies(
@@ -3603,7 +3596,7 @@ class Post(Document):
 
         Post.drop_collection()
 
-        for i in xrange(10):
+        for i in range(10):
             Post(title="Post %s" % i).save()
 
         self.assertEqual(5, Post.objects.limit(5).skip(5).count(with_limit_and_skip=True))
@@ -3618,7 +3611,7 @@ class MyDoc(Document):
             pass
 
         MyDoc.drop_collection()
-        for i in xrange(0, 10):
+        for i in range(0, 10):
             MyDoc().save()
 
         self.assertEqual(MyDoc.objects.count(), 10)
@@ -3674,7 +3667,7 @@ class Number(Document):
 
         Number.drop_collection()
 
-        for i in xrange(1, 101):
+        for i in range(1, 101):
             t = Number(n=i)
             t.save()
 
@@ -3821,11 +3814,9 @@ class IntPair(Document):
         self.assertTrue(a in results)
         self.assertTrue(c in results)
 
-        def invalid_where():
+        with self.assertRaises(TypeError):
             list(IntPair.objects.where(fielda__gte=3))
 
-        self.assertRaises(TypeError, invalid_where)
-
     def test_scalar(self):
 
         class Organization(Document):
@@ -4081,7 +4072,7 @@ def test_scalar_cursor_behaviour(self):
 
         # Test larger slice __repr__
         self.Person.objects.delete()
-        for i in xrange(55):
+        for i in range(55):
             self.Person(name='A%s' % i, age=i).save()
 
         self.assertEqual(self.Person.objects.scalar('name').count(), 55)
@@ -4089,7 +4080,7 @@ def test_scalar_cursor_behaviour(self):
             "A0", "%s" % self.Person.objects.order_by('name').scalar('name').first())
         self.assertEqual(
             "A0", "%s" % self.Person.objects.scalar('name').order_by('name')[0])
-        if PY3:
+        if six.PY3:
             self.assertEqual("['A1', 'A2']", "%s" % self.Person.objects.order_by(
                 'age').scalar('name')[1:3])
             self.assertEqual("['A51', 'A52']", "%s" % self.Person.objects.order_by(
@@ -4107,7 +4098,7 @@ def test_scalar_cursor_behaviour(self):
 
         pks = self.Person.objects.order_by('age').scalar('pk')[1:3]
         names = self.Person.objects.scalar('name').in_bulk(list(pks)).values()
-        if PY3:
+        if six.PY3:
             expected = "['A1', 'A2']"
         else:
             expected = "[u'A1', u'A2']"
@@ -4463,7 +4454,7 @@ class Person(Document):
             name = StringField()
 
         Person.drop_collection()
-        for i in xrange(100):
+        for i in range(100):
             Person(name="No: %s" % i).save()
 
         with query_counter() as q:
@@ -4494,7 +4485,7 @@ class Person(Document):
             name = StringField()
 
         Person.drop_collection()
-        for i in xrange(100):
+        for i in range(100):
             Person(name="No: %s" % i).save()
 
         with query_counter() as q:
@@ -4538,7 +4529,7 @@ class Noddy(Document):
             fields = DictField()
 
         Noddy.drop_collection()
-        for i in xrange(100):
+        for i in range(100):
             noddy = Noddy()
             for j in range(20):
                 noddy.fields["key" + str(j)] = "value " + str(j)
@@ -4550,7 +4541,9 @@ class Noddy(Document):
         self.assertEqual(counter, 100)
 
         self.assertEqual(len(list(docs)), 100)
-        self.assertRaises(TypeError, lambda: len(docs))
+
+        with self.assertRaises(TypeError):
+            len(docs)
 
         with query_counter() as q:
             self.assertEqual(q, 0)
@@ -4739,7 +4732,7 @@ class Person(Document):
             name = StringField()
 
         Person.drop_collection()
-        for i in xrange(100):
+        for i in range(100):
             Person(name="No: %s" % i).save()
 
         with query_counter() as q:
@@ -4863,10 +4856,10 @@ class Person(Document):
         ])
 
     def test_delete_count(self):
-        [self.Person(name="User {0}".format(i), age=i * 10).save() for i in xrange(1, 4)]
+        [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
         self.assertEqual(self.Person.objects().delete(), 3)  # test ordinary QuerySey delete count
 
-        [self.Person(name="User {0}".format(i), age=i * 10).save() for i in xrange(1, 4)]
+        [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
 
         self.assertEqual(self.Person.objects().skip(1).delete(), 2)  # test Document delete with existing documents
 
@@ -4875,12 +4868,14 @@ def test_delete_count(self):
 
     def test_max_time_ms(self):
         # 778: max_time_ms can get only int or None as input
-        self.assertRaises(TypeError, self.Person.objects(name="name").max_time_ms, "not a number")
+        self.assertRaises(TypeError,
+                          self.Person.objects(name="name").max_time_ms,
+                          'not a number')
 
     def test_subclass_field_query(self):
         class Animal(Document):
             is_mamal = BooleanField()
-            meta = dict(allow_inheritance=True)
+            meta = {'allow_inheritance': True}
 
         class Cat(Animal):
             whiskers_length = FloatField()
@@ -4925,7 +4920,7 @@ def test_len_during_iteration(self):
         class Data(Document):
             pass
 
-        for i in xrange(300):
+        for i in range(300):
             Data().save()
 
         records = Data.objects.limit(250)
@@ -4957,7 +4952,7 @@ def test_iteration_within_iteration(self):
         class Data(Document):
             pass
 
-        for i in xrange(300):
+        for i in range(300):
             Data().save()
 
         qs = Data.objects.limit(250)
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 06fe4ea5d..20ab0b3fc 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -238,7 +238,8 @@ class Event(Document):
         box = [(35.0, -125.0), (40.0, -100.0)]
         # I *meant* to execute location__within_box=box
         events = Event.objects(location__within=box)
-        self.assertRaises(InvalidQueryError, lambda: events.count())
+        with self.assertRaises(InvalidQueryError):
+            events.count()
 
 
 if __name__ == '__main__':
diff --git a/tests/queryset/visitor.py b/tests/queryset/visitor.py
index 7e5fcf195..6f020e881 100644
--- a/tests/queryset/visitor.py
+++ b/tests/queryset/visitor.py
@@ -185,7 +185,7 @@ class TestDoc(Document):
             x = IntField()
 
         TestDoc.drop_collection()
-        for i in xrange(1, 101):
+        for i in range(1, 101):
             t = TestDoc(x=i)
             t.save()
 
@@ -268,14 +268,13 @@ class BlogPost(Document):
         self.assertEqual(self.Person.objects(Q(age__in=[20, 30])).count(), 3)
 
         # Test invalid query objs
-        def wrong_query_objs():
+        with self.assertRaises(InvalidQueryError):
             self.Person.objects('user1')
 
-        def wrong_query_objs_filter():
-            self.Person.objects('user1')
+        # filter should fail, too
+        with self.assertRaises(InvalidQueryError):
+            self.Person.objects.filter('user1')
 
-        self.assertRaises(InvalidQueryError, wrong_query_objs)
-        self.assertRaises(InvalidQueryError, wrong_query_objs_filter)
 
     def test_q_regex(self):
         """Ensure that Q objects can be queried using regexes.
diff --git a/tests/test_connection.py b/tests/test_connection.py
index e64318918..d8f1a79e4 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,9 +1,6 @@
-import sys
 import datetime
 from pymongo.errors import OperationFailure
 
-sys.path[0:0] = [""]
-
 try:
     import unittest2 as unittest
 except ImportError:
@@ -19,7 +16,8 @@
 )
 from mongoengine.python_support import IS_PYMONGO_3
 import mongoengine.connection
-from mongoengine.connection import get_db, get_connection, ConnectionError
+from mongoengine.connection import (MongoEngineConnectionError, get_db,
+                                    get_connection)
 
 
 def get_tz_awareness(connection):
@@ -159,7 +157,10 @@ def test_connect_uri(self):
         c.mongoenginetest.add_user("username", "password")
 
         if not IS_PYMONGO_3:
-            self.assertRaises(ConnectionError, connect, "testdb_uri_bad", host='mongodb://test:password@localhost')
+            self.assertRaises(
+                MongoEngineConnectionError, connect, 'testdb_uri_bad',
+                host='mongodb://test:password@localhost'
+            )
 
         connect("testdb_uri", host='mongodb://username:password@localhost/mongoenginetest')
 
@@ -229,10 +230,11 @@ def test_connect_uri_with_authsource(self):
             self.assertRaises(OperationFailure, test_conn.server_info)
         else:
             self.assertRaises(
-                ConnectionError, connect, 'mongoenginetest', alias='test1',
+                MongoEngineConnectionError, connect, 'mongoenginetest',
+                alias='test1',
                 host='mongodb://username2:password@localhost/mongoenginetest'
             )
-            self.assertRaises(ConnectionError, get_db, 'test1')
+            self.assertRaises(MongoEngineConnectionError, get_db, 'test1')
 
         # Authentication succeeds with "authSource"
         connect(
@@ -253,7 +255,7 @@ def test_register_connection(self):
         """
         register_connection('testdb', 'mongoenginetest2')
 
-        self.assertRaises(ConnectionError, get_connection)
+        self.assertRaises(MongoEngineConnectionError, get_connection)
         conn = get_connection('testdb')
         self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
 
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index c201a5fc0..0f6bf815e 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -1,5 +1,3 @@
-import sys
-sys.path[0:0] = [""]
 import unittest
 
 from mongoengine import *
@@ -79,7 +77,7 @@ class Group(Document):
         User.drop_collection()
         Group.drop_collection()
 
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             User(name='user %s' % i).save()
 
         user = User.objects.first()
@@ -117,7 +115,7 @@ class Group(Document):
         User.drop_collection()
         Group.drop_collection()
 
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             User(name='user %s' % i).save()
 
         user = User.objects.first()
@@ -195,7 +193,7 @@ def test_query_counter(self):
         with query_counter() as q:
             self.assertEqual(0, q)
 
-            for i in xrange(1, 51):
+            for i in range(1, 51):
                 db.test.find({}).count()
 
             self.assertEqual(50, q)
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index eb40e767f..6830a188f 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -23,7 +23,8 @@ def test_repr(self):
         self.assertEqual(repr(d), '{"a": \'"\', "b": "\'", "c": \'\'}')
 
     def test_init_fails_on_nonexisting_attrs(self):
-        self.assertRaises(AttributeError, lambda: self.dtype(a=1, b=2, d=3))
+        with self.assertRaises(AttributeError):
+            self.dtype(a=1, b=2, d=3)
 
     def test_eq(self):
         d = self.dtype(a=1, b=1, c=1)
@@ -46,14 +47,12 @@ def test_setattr_getattr(self):
         d = self.dtype()
         d.a = 1
         self.assertEqual(d.a, 1)
-        self.assertRaises(AttributeError, lambda: d.b)
+        self.assertRaises(AttributeError, getattr, d, 'b')
 
     def test_setattr_raises_on_nonexisting_attr(self):
         d = self.dtype()
-
-        def _f():
+        with self.assertRaises(AttributeError):
             d.x = 1
-        self.assertRaises(AttributeError, _f)
 
     def test_setattr_getattr_special(self):
         d = self.strict_dict_class(["items"])
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 11bdd6121..7f58a85b0 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
-sys.path[0:0] = [""]
 import unittest
 
 from bson import DBRef, ObjectId
@@ -32,7 +30,7 @@ class Group(Document):
         User.drop_collection()
         Group.drop_collection()
 
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             user = User(name='user %s' % i)
             user.save()
 
@@ -90,7 +88,7 @@ class Group(Document):
         User.drop_collection()
         Group.drop_collection()
 
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             user = User(name='user %s' % i)
             user.save()
 
@@ -162,7 +160,7 @@ class Group(Document):
         User.drop_collection()
         Group.drop_collection()
 
-        for i in xrange(1, 26):
+        for i in range(1, 26):
             user = User(name='user %s' % i)
             user.save()
 
@@ -440,7 +438,7 @@ class Group(Document):
         Group.drop_collection()
 
         members = []
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             a = UserA(name='User A %s' % i)
             a.save()
 
@@ -531,7 +529,7 @@ class Group(Document):
         Group.drop_collection()
 
         members = []
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             a = UserA(name='User A %s' % i)
             a.save()
 
@@ -614,15 +612,15 @@ class Group(Document):
         Group.drop_collection()
 
         members = []
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             user = User(name='user %s' % i)
             user.save()
             members.append(user)
 
-        group = Group(members=dict([(str(u.id), u) for u in members]))
+        group = Group(members={str(u.id): u for u in members})
         group.save()
 
-        group = Group(members=dict([(str(u.id), u) for u in members]))
+        group = Group(members={str(u.id): u for u in members})
         group.save()
 
         with query_counter() as q:
@@ -687,7 +685,7 @@ class Group(Document):
         Group.drop_collection()
 
         members = []
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             a = UserA(name='User A %s' % i)
             a.save()
 
@@ -699,9 +697,9 @@ class Group(Document):
 
             members += [a, b, c]
 
-        group = Group(members=dict([(str(u.id), u) for u in members]))
+        group = Group(members={str(u.id): u for u in members})
         group.save()
-        group = Group(members=dict([(str(u.id), u) for u in members]))
+        group = Group(members={str(u.id): u for u in members})
         group.save()
 
         with query_counter() as q:
@@ -783,16 +781,16 @@ class Group(Document):
         Group.drop_collection()
 
         members = []
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             a = UserA(name='User A %s' % i)
             a.save()
 
             members += [a]
 
-        group = Group(members=dict([(str(u.id), u) for u in members]))
+        group = Group(members={str(u.id): u for u in members})
         group.save()
 
-        group = Group(members=dict([(str(u.id), u) for u in members]))
+        group = Group(members={str(u.id): u for u in members})
         group.save()
 
         with query_counter() as q:
@@ -866,7 +864,7 @@ class Group(Document):
         Group.drop_collection()
 
         members = []
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             a = UserA(name='User A %s' % i)
             a.save()
 
@@ -878,9 +876,9 @@ class Group(Document):
 
             members += [a, b, c]
 
-        group = Group(members=dict([(str(u.id), u) for u in members]))
+        group = Group(members={str(u.id): u for u in members})
         group.save()
-        group = Group(members=dict([(str(u.id), u) for u in members]))
+        group = Group(members={str(u.id): u for u in members})
         group.save()
 
         with query_counter() as q:
@@ -1103,7 +1101,7 @@ class Group(Document):
         User.drop_collection()
         Group.drop_collection()
 
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             User(name='user %s' % i).save()
 
         Group(name="Test", members=User.objects).save()
@@ -1132,7 +1130,7 @@ class Group(Document):
         User.drop_collection()
         Group.drop_collection()
 
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             User(name='user %s' % i).save()
 
         Group(name="Test", members=User.objects).save()
@@ -1169,7 +1167,7 @@ class Group(Document):
         Group.drop_collection()
 
         members = []
-        for i in xrange(1, 51):
+        for i in range(1, 51):
             a = UserA(name='User A %s' % i).save()
             b = UserB(name='User B %s' % i).save()
             c = UserC(name='User C %s' % i).save()
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index 361cff412..a53f5903e 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -1,6 +1,3 @@
-import sys
-
-sys.path[0:0] = [""]
 import unittest
 
 from pymongo import ReadPreference
@@ -18,7 +15,7 @@
 
 import mongoengine
 from mongoengine import *
-from mongoengine.connection import ConnectionError
+from mongoengine.connection import MongoEngineConnectionError
 
 
 class ConnectionTest(unittest.TestCase):
@@ -41,7 +38,7 @@ def test_replicaset_uri_passes_read_preference(self):
             conn = connect(db='mongoenginetest',
                            host="mongodb://localhost/mongoenginetest?replicaSet=rs",
                            read_preference=READ_PREF)
-        except ConnectionError, e:
+        except MongoEngineConnectionError as e:
             return
 
         if not isinstance(conn, CONN_CLASS):
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 23da7cd4a..df687d0ee 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import sys
-sys.path[0:0] = [""]
 import unittest
 
 from mongoengine import *

From 403ceb19dc9733b92287d3392f7f73f0f8abd5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 12 Dec 2016 10:44:03 -0500
Subject: [PATCH 0419/1519] set @wojcikstefan as the maintainer (closes #1342)
 (#1434)

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 5072d6dfc..e46a835f1 100644
--- a/README.rst
+++ b/README.rst
@@ -4,7 +4,7 @@ MongoEngine
 :Info: MongoEngine is an ORM-like layer on top of PyMongo.
 :Repository: https://github.com/MongoEngine/mongoengine
 :Author: Harry Marr (http://github.com/hmarr)
-:Maintainer: Ross Lawley (http://github.com/rozza)
+:Maintainer: Stefan Wójcik (http://github.com/wojcikstefan)
 
 .. image:: https://travis-ci.org/MongoEngine/mongoengine.svg?branch=master
   :target: https://travis-ci.org/MongoEngine/mongoengine

From 88a951ba4f090857d9e5e0c850b88add8553ae27 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 12 Dec 2016 19:03:15 -0500
Subject: [PATCH 0420/1519] version bump

---
 mongoengine/__init__.py    | 2 +-
 mongoengine/base/fields.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index cece51265..f8969592b 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 10, 9)
+VERSION = (0, 11, 0)
 
 
 def get_version():
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index b13660c1d..b0644cecc 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -23,7 +23,6 @@ class BaseField(object):
 
     .. versionchanged:: 0.5 - added verbose and help text
     """
-
     name = None
     _geo_index = False
     _auto_gen = False  # Call `generate` to generate a value

From c9d496e9a0c55acbe1429a9b678cd6874ab7091d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 12 Dec 2016 23:08:11 -0500
Subject: [PATCH 0421/1519] Fix connecting to MongoReplicaSetClient (#1436)

---
 mongoengine/connection.py | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index bb353cffd..a532c896c 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -66,9 +66,9 @@ def register_connection(alias, name=None, host=None, port=None,
         'authentication_mechanism': authentication_mechanism
     }
 
-    # Handle uri style connections
     conn_host = conn_settings['host']
-    # host can be a list or a string, so if string, force to a list
+
+    # Host can be a list or a string, so if string, force to a list.
     if isinstance(conn_host, six.string_types):
         conn_host = [conn_host]
 
@@ -170,23 +170,22 @@ def _clean_settings(settings_dict):
     else:
         connection_class = MongoClient
 
-        # Handle replica set connections
-        if 'replicaSet' in conn_settings:
+        # For replica set connections with PyMongo 2.x, use
+        # MongoReplicaSetClient.
+        # TODO remove this once we stop supporting PyMongo 2.x.
+        if 'replicaSet' in conn_settings and not IS_PYMONGO_3:
+            connection_class = MongoReplicaSetClient
+            conn_settings['hosts_or_uri'] = conn_settings.pop('host', None)
+
+            # hosts_or_uri has to be a string, so if 'host' was provided
+            # as a list, join its parts and separate them by ','
+            if isinstance(conn_settings['hosts_or_uri'], list):
+                conn_settings['hosts_or_uri'] = ','.join(
+                    conn_settings['hosts_or_uri'])
 
             # Discard port since it can't be used on MongoReplicaSetClient
             conn_settings.pop('port', None)
 
-            # Discard replicaSet if it's not a string
-            if not isinstance(conn_settings['replicaSet'], six.string_types):
-                del conn_settings['replicaSet']
-
-            # For replica set connections with PyMongo 2.x, use
-            # MongoReplicaSetClient.
-            # TODO remove this once we stop supporting PyMongo 2.x.
-            if not IS_PYMONGO_3:
-                connection_class = MongoReplicaSetClient
-                conn_settings['hosts_or_uri'] = conn_settings.pop('host', None)
-
     # Iterate over all of the connection settings and if a connection with
     # the same parameters is already established, use it instead of creating
     # a new one.

From a4d0da0085345ba9958b811fc96b999a6260653d Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 12 Dec 2016 23:08:57 -0500
Subject: [PATCH 0422/1519] update the changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e04c48fbc..57fba3ed6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop you features).
+- Fixed connecting to a replica set with PyMongo 2.x #1436
 
 Changes in 0.11.0
 =================

From 65914fb2b26e219c26ee4ce459a108fa644cc474 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 12 Dec 2016 23:24:19 -0500
Subject: [PATCH 0423/1519] fix the way MongoDB URI w/ ?replicaset is passed

---
 mongoengine/connection.py | 2 +-
 tests/test_connection.py  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index a532c896c..c7c16ca39 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -96,7 +96,7 @@ def register_connection(alias, name=None, host=None, port=None,
 
             uri_options = uri_dict['options']
             if 'replicaset' in uri_options:
-                conn_settings['replicaSet'] = True
+                conn_settings['replicaSet'] = uri_options['replicaset']
             if 'authsource' in uri_options:
                 conn_settings['authentication_source'] = uri_options['authsource']
             if 'authmechanism' in uri_options:
diff --git a/tests/test_connection.py b/tests/test_connection.py
index d8f1a79e4..34168b85c 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -200,6 +200,13 @@ def test_connect_uri_default_db(self):
         self.assertTrue(isinstance(db, pymongo.database.Database))
         self.assertEqual(db.name, 'test')
 
+    def test_connect_uri_with_replicaset(self):
+        """Ensure connect() works when specifying a replicaSet."""
+        c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
+        db = get_db()
+        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertEqual(db.name, 'test')
+
     def test_uri_without_credentials_doesnt_override_conn_settings(self):
         """Ensure connect() uses the username & password params if the URI
         doesn't explicitly specify them.

From 76524b7498a87a9b3e40f89c4efd26376c13e92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malthe=20J=C3=B8rgensen?= <malthe.jorgensen@gmail.com>
Date: Tue, 13 Dec 2016 05:27:25 +0100
Subject: [PATCH 0424/1519] Raise TypeError when `__in`-operator used with a
 Document (#1237)

---
 mongoengine/common.py             |  5 +++-
 mongoengine/queryset/transform.py | 17 +++++++++--
 setup.cfg                         |  2 +-
 tests/queryset/queryset.py        | 50 +++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/mongoengine/common.py b/mongoengine/common.py
index 3e63e98ee..bde7e78c4 100644
--- a/mongoengine/common.py
+++ b/mongoengine/common.py
@@ -34,7 +34,10 @@ class from the :data:`mongoengine.common._class_registry_cache`.
     queryset_classes = ('OperationError',)
     deref_classes = ('DeReference',)
 
-    if cls_name in doc_classes:
+    if cls_name == 'BaseDocument':
+        from mongoengine.base import document as module
+        import_classes = ['BaseDocument']
+    elif cls_name in doc_classes:
         from mongoengine import document as module
         import_classes = doc_classes
     elif cls_name in field_classes:
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index af59917cf..61d434904 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -101,8 +101,21 @@ def query(_doc_cls=None, **kwargs):
                         value = value['_id']
 
             elif op in ('in', 'nin', 'all', 'near') and not isinstance(value, dict):
-                # 'in', 'nin' and 'all' require a list of values
-                value = [field.prepare_query_value(op, v) for v in value]
+                # Raise an error if the in/nin/all/near param is not iterable. We need a
+                # special check for BaseDocument, because - although it's iterable - using
+                # it as such in the context of this method is most definitely a mistake.
+                BaseDocument = _import_class('BaseDocument')
+                if isinstance(value, BaseDocument):
+                    raise TypeError("When using the `in`, `nin`, `all`, or "
+                                    "`near`-operators you can\'t use a "
+                                    "`Document`, you must wrap your object "
+                                    "in a list (object -> [object]).")
+                elif not hasattr(value, '__iter__'):
+                    raise TypeError("The `in`, `nin`, `all`, or "
+                                    "`near`-operators must be applied to an "
+                                    "iterable (e.g. a list).")
+                else:
+                    value = [field.prepare_query_value(op, v) for v in value]
 
             # If we're querying a GenericReferenceField, we need to alter the
             # key depending on the value:
diff --git a/setup.cfg b/setup.cfg
index 1887c4768..eabe32719 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,5 +7,5 @@ cover-package=mongoengine
 [flake8]
 ignore=E501,F401,F403,F405,I201
 exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
-max-complexity=45
+max-complexity=47
 application-import-names=mongoengine,tests
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index e4c71de76..28b831cd8 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4963,6 +4963,56 @@ class Data(Document):
         self.assertEqual(i, 249)
         self.assertEqual(j, 249)
 
+    def test_in_operator_on_non_iterable(self):
+        """Ensure that using the `__in` operator on a non-iterable raises an
+        error.
+        """
+        class User(Document):
+            name = StringField()
+
+        class BlogPost(Document):
+            content = StringField()
+            authors = ListField(ReferenceField(User))
+
+        User.drop_collection()
+        BlogPost.drop_collection()
+
+        author = User(name='Test User')
+        author.save()
+        post = BlogPost(content='Had a good coffee today...', authors=[author])
+        post.save()
+
+        blog_posts = BlogPost.objects(authors__in=[author])
+        self.assertEqual(list(blog_posts), [post])
+
+        # Using the `__in`-operator with a non-iterable should raise a TypeError
+        self.assertRaises(TypeError, BlogPost.objects(authors__in=author.id).count)
+
+    def test_in_operator_on_document(self):
+        """Ensure that using the `__in` operator on a `Document` raises an
+        error.
+        """
+        class User(Document):
+            name = StringField()
+
+        class BlogPost(Document):
+            content = StringField()
+            authors = ListField(ReferenceField(User))
+
+        User.drop_collection()
+        BlogPost.drop_collection()
+
+        author = User(name='Test User')
+        author.save()
+        post = BlogPost(content='Had a good coffee today...', authors=[author])
+        post.save()
+
+        blog_posts = BlogPost.objects(authors__in=[author])
+        self.assertEqual(list(blog_posts), [post])
+
+        # Using the `__in`-operator with a `Document` should raise a TypeError
+        self.assertRaises(TypeError, BlogPost.objects(authors__in=author).count)
+
 
 if __name__ == '__main__':
     unittest.main()

From 8e884fd3ea85031bd5fa2a855a6eed0becd0730f Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 12 Dec 2016 23:30:38 -0500
Subject: [PATCH 0425/1519] make the __in=non_iterable_or_doc tests more
 concise

---
 tests/queryset/queryset.py | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 28b831cd8..11ce0a27a 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4977,40 +4977,19 @@ class BlogPost(Document):
         User.drop_collection()
         BlogPost.drop_collection()
 
-        author = User(name='Test User')
-        author.save()
-        post = BlogPost(content='Had a good coffee today...', authors=[author])
-        post.save()
+        author = User.objects.create(name='Test User')
+        post = BlogPost.objects.create(content='Had a good coffee today...',
+                                       authors=[author])
 
+        # Make sure using `__in` with a list works
         blog_posts = BlogPost.objects(authors__in=[author])
         self.assertEqual(list(blog_posts), [post])
 
-        # Using the `__in`-operator with a non-iterable should raise a TypeError
-        self.assertRaises(TypeError, BlogPost.objects(authors__in=author.id).count)
-
-    def test_in_operator_on_document(self):
-        """Ensure that using the `__in` operator on a `Document` raises an
-        error.
-        """
-        class User(Document):
-            name = StringField()
-
-        class BlogPost(Document):
-            content = StringField()
-            authors = ListField(ReferenceField(User))
-
-        User.drop_collection()
-        BlogPost.drop_collection()
-
-        author = User(name='Test User')
-        author.save()
-        post = BlogPost(content='Had a good coffee today...', authors=[author])
-        post.save()
-
-        blog_posts = BlogPost.objects(authors__in=[author])
-        self.assertEqual(list(blog_posts), [post])
+        # Using `__in` with a non-iterable should raise a TypeError
+        self.assertRaises(TypeError, BlogPost.objects(authors__in=author.pk).count)
 
-        # Using the `__in`-operator with a `Document` should raise a TypeError
+        # Using `__in` with a `Document` (which is seemingly iterable but not
+        # in a way we'd expect) should raise a TypeError, too
         self.assertRaises(TypeError, BlogPost.objects(authors__in=author).count)
 
 

From b1d8aca46a3abd5999655cf7d90ede82a2e89c15 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 12 Dec 2016 23:33:49 -0500
Subject: [PATCH 0426/1519] update the changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 57fba3ed6..af3437c18 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop you features).
 - Fixed connecting to a replica set with PyMongo 2.x #1436
+- Fixed an obscure error message when filtering by `field__in=non_iterable`. #1237
 
 Changes in 0.11.0
 =================

From 553f496d847ce51018e8df591c1fd4052fbbcbed Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 13 Dec 2016 00:42:03 -0500
Subject: [PATCH 0427/1519] fix tests

---
 tests/test_connection.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 34168b85c..9143571f6 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -202,10 +202,16 @@ def test_connect_uri_default_db(self):
 
     def test_connect_uri_with_replicaset(self):
         """Ensure connect() works when specifying a replicaSet."""
-        c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
-        db = get_db()
-        self.assertTrue(isinstance(db, pymongo.database.Database))
-        self.assertEqual(db.name, 'test')
+        if IS_PYMONGO_3:
+            c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
+            db = get_db()
+            self.assertTrue(isinstance(db, pymongo.database.Database))
+            self.assertEqual(db.name, 'test')
+        else:
+            # PyMongo < v3.x raises an exception:
+            # "localhost:27017 is not a member of replica set local-rs"
+            with self.assertRaises(MongoEngineConnectionError):
+                c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
 
     def test_uri_without_credentials_doesnt_override_conn_settings(self):
         """Ensure connect() uses the username & password params if the URI

From 57c2e867d8c729d95eafa1f66a5b4767855af2e3 Mon Sep 17 00:00:00 2001
From: Manuel Jeckelmann <maennel@users.noreply.github.com>
Date: Mon, 19 Dec 2016 23:54:43 +0100
Subject: [PATCH 0428/1519] Remove py26 from contributing docs (#1439)

Python 2.6 is not supported anymore with version 0.11.0
---
 CONTRIBUTING.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index aeba41f73..06bf2f615 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -20,7 +20,7 @@ post to the `user group <http://groups.google.com/group/mongoengine-users>`
 Supported Interpreters
 ----------------------
 
-MongoEngine supports CPython 2.6 and newer. Language
+MongoEngine supports CPython 2.7 and newer. Language
 features not supported by all interpreters can not be used.
 Please also ensure that your code is properly converted by
 `2to3 <http://docs.python.org/library/2to3.html>`_ for Python 3 support.

From c84f703f926c2e37095c0703d884b2dc5a06b7e6 Mon Sep 17 00:00:00 2001
From: George Karakostas <gckarakostas@gmail.com>
Date: Thu, 22 Dec 2016 20:06:55 +0200
Subject: [PATCH 0429/1519] Update documentation to include a Q import (#1441)

---
 docs/guide/querying.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 913de5d6c..980947df1 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -479,6 +479,8 @@ operators. To use a :class:`~mongoengine.queryset.Q` object, pass it in as the
 first positional argument to :attr:`Document.objects` when you filter it by
 calling it with keyword arguments::
 
+    from mongoengine.queryset.visitor import Q
+
     # Get published posts
     Post.objects(Q(published=True) | Q(publish_date__lte=datetime.now()))
 

From b8454c7f5b685852db136c38c603316bcbe90345 Mon Sep 17 00:00:00 2001
From: John Dupuy <johnd@makerredux.com>
Date: Thu, 22 Dec 2016 12:11:44 -0600
Subject: [PATCH 0430/1519] Fixed ListField deletion bug (#1435)

---
 mongoengine/base/datastructures.py |   5 +-
 tests/fields/fields.py             | 244 +++++++++++++++++++++++++++++
 2 files changed, 245 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 5e90a2e55..8a7681e5d 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -138,10 +138,7 @@ def __setitem__(self, key, value, *args, **kwargs):
         return super(BaseList, self).__setitem__(key, value)
 
     def __delitem__(self, key, *args, **kwargs):
-        if isinstance(key, slice):
-            self._mark_as_changed()
-        else:
-            self._mark_as_changed(key)
+        self._mark_as_changed()
         return super(BaseList, self).__delitem__(key)
 
     def __setslice__(self, *args, **kwargs):
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 678786fa1..d47b2ab61 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1042,6 +1042,7 @@ class BlogPost(Document):
         self.assertEqual(
             BlogPost.objects.filter(info__100__test__exact='test').count(), 0)
 
+        # test queries by list
         post = BlogPost()
         post.info = ['1', '2']
         post.save()
@@ -1053,8 +1054,251 @@ class BlogPost(Document):
         post.info *= 2
         post.save()
         self.assertEqual(BlogPost.objects(info=['1', '2', '3', '4', '1', '2', '3', '4']).count(), 1)
+
+        BlogPost.drop_collection()
+
+
+    def test_list_field_manipulative_operators(self):
+        """Ensure that ListField works with standard list operators that manipulate the list.
+        """
+        class BlogPost(Document):
+            ref = StringField()
+            info = ListField(StringField())
+
+        BlogPost.drop_collection()
+
+        post = BlogPost()
+        post.ref = "1234"
+        post.info = ['0', '1', '2', '3', '4', '5']
+        post.save()
+
+        def reset_post():
+            post.info = ['0', '1', '2', '3', '4', '5']
+            post.save()
+
+        # '__add__(listB)'
+        # listA+listB
+        # operator.add(listA, listB) 
+        reset_post()
+        temp = ['a', 'b']
+        post.info = post.info + temp
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'a', 'b'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'a', 'b'])
+
+        # '__delitem__(index)'
+        # aka 'del list[index]'
+        # aka 'operator.delitem(list, index)'
+        reset_post()
+        del post.info[2] # del from middle ('2')
+        self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
+
+        # '__delitem__(slice(i, j))'
+        # aka 'del list[i:j]'
+        # aka 'operator.delitem(list, slice(i,j))'
+        reset_post()
+        del post.info[1:3] # removes '1', '2'
+        self.assertEqual(post.info, ['0', '3', '4', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '3', '4', '5'])
+
+        # '__iadd__'
+        # aka 'list += list'
+        reset_post()
+        temp = ['a', 'b']
+        post.info += temp
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'a', 'b'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'a', 'b'])
+
+        # '__imul__'
+        # aka 'list *= number'
+        reset_post()
+        post.info *= 2
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+
+        # '__mul__'
+        # aka 'listA*listB'
+        reset_post()
+        post.info = post.info * 2
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+
+        # '__rmul__'
+        # aka 'listB*listA'
+        reset_post()
+        post.info = 2 * post.info
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+
+        # '__setitem__(index, value)'
+        # aka 'list[index]=value'
+        # aka 'setitem(list, value)'
+        reset_post()
+        post.info[4] = 'a'
+        self.assertEqual(post.info, ['0', '1', '2', '3', 'a', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '2', '3', 'a', '5'])
+
+        # '__setitem__(slice(i, j), listB)'
+        # aka 'listA[i:j] = listB'
+        # aka 'setitem(listA, slice(i, j), listB)'
+        reset_post()
+        post.info[1:3] = ['h', 'e', 'l', 'l', 'o']
+        self.assertEqual(post.info, ['0', 'h', 'e', 'l', 'l', 'o', '3', '4', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', 'h', 'e', 'l', 'l', 'o', '3', '4', '5'])
+
+        # 'append'
+        reset_post()
+        post.info.append('h')
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'h'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'h'])
+
+        # 'extend'
+        reset_post()
+        post.info.extend(['h', 'e', 'l', 'l', 'o'])
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'h', 'e', 'l', 'l', 'o'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'h', 'e', 'l', 'l', 'o'])
+        # 'insert'
+
+        # 'pop'
+        reset_post()
+        x = post.info.pop(2)
+        y = post.info.pop()
+        self.assertEqual(post.info, ['0', '1', '3', '4'])
+        self.assertEqual(x, '2')
+        self.assertEqual(y, '5')
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '3', '4'])
+
+        # 'remove'
+        reset_post()
+        post.info.remove('2')
+        self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
+
+        # 'reverse'
+        reset_post()
+        post.info.reverse()
+        self.assertEqual(post.info, ['5', '4', '3', '2', '1', '0'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['5', '4', '3', '2', '1', '0'])
+
+        # 'sort': though this operator method does manipulate the list, it is tested in
+        #     the 'test_list_field_lexicograpic_operators' function
+        BlogPost.drop_collection()
+
+    def test_list_field_invalid_operators(self):
+        class BlogPost(Document):
+            ref = StringField()
+            info = ListField(StringField())
+        post = BlogPost()
+        post.ref = "1234"
+        post.info = ['0', '1', '2', '3', '4', '5']
+        # '__hash__'
+        # aka 'hash(list)'
+        # # assert TypeError
+        self.assertRaises(TypeError, lambda: hash(post.info))
+
+    def test_list_field_lexicographic_operators(self):
+        """Ensure that ListField works with standard list operators that do lexigraphic ordering.
+        """
+        class BlogPost(Document):
+            ref = StringField()
+            text_info = ListField(StringField())
+            oid_info = ListField(ObjectIdField())
+            bool_info = ListField(BooleanField())
         BlogPost.drop_collection()
 
+        blogSmall = BlogPost(ref="small")
+        blogSmall.text_info = ["a", "a", "a"]
+        blogSmall.bool_info = [False, False]
+        blogSmall.save()
+        blogSmall.reload()
+
+        blogLargeA = BlogPost(ref="big")
+        blogLargeA.text_info = ["a", "z", "j"]
+        blogLargeA.bool_info = [False, True]
+        blogLargeA.save()
+        blogLargeA.reload()
+
+        blogLargeB = BlogPost(ref="big2")
+        blogLargeB.text_info = ["a", "z", "j"]
+        blogLargeB.oid_info = [
+            "54495ad94c934721ede76f90",
+            "54495ad94c934721ede76d23",
+            "54495ad94c934721ede76d00"
+        ]
+        blogLargeB.bool_info = [False, True]
+        blogLargeB.save()
+        blogLargeB.reload()
+        # '__eq__' aka '=='
+        self.assertEqual(blogLargeA.text_info, blogLargeB.text_info)
+        self.assertEqual(blogLargeA.bool_info, blogLargeB.bool_info)
+        # '__ge__' aka '>='
+        self.assertGreaterEqual(blogLargeA.text_info, blogSmall.text_info)
+        self.assertGreaterEqual(blogLargeA.text_info, blogLargeB.text_info)
+        self.assertGreaterEqual(blogLargeA.bool_info, blogSmall.bool_info)
+        self.assertGreaterEqual(blogLargeA.bool_info, blogLargeB.bool_info)
+        # '__gt__' aka '>'
+        self.assertGreaterEqual(blogLargeA.text_info, blogSmall.text_info)
+        self.assertGreaterEqual(blogLargeA.bool_info, blogSmall.bool_info)
+        # '__le__' aka '<='
+        self.assertLessEqual(blogSmall.text_info, blogLargeB.text_info)
+        self.assertLessEqual(blogLargeA.text_info, blogLargeB.text_info)
+        self.assertLessEqual(blogSmall.bool_info, blogLargeB.bool_info)
+        self.assertLessEqual(blogLargeA.bool_info, blogLargeB.bool_info)
+        # '__lt__' aka '<'
+        self.assertLess(blogSmall.text_info, blogLargeB.text_info)
+        self.assertLess(blogSmall.bool_info, blogLargeB.bool_info)
+        # '__ne__' aka '!='
+        self.assertNotEqual(blogSmall.text_info, blogLargeB.text_info)
+        self.assertNotEqual(blogSmall.bool_info, blogLargeB.bool_info)
+        # 'sort'
+        blogLargeB.bool_info = [True, False, True, False]
+        blogLargeB.text_info.sort()
+        blogLargeB.oid_info.sort()
+        blogLargeB.bool_info.sort()
+        sorted_target_list = [
+            ObjectId("54495ad94c934721ede76d00"),
+            ObjectId("54495ad94c934721ede76d23"),
+            ObjectId("54495ad94c934721ede76f90")
+        ]
+        self.assertEqual(blogLargeB.text_info, ["a", "j", "z"])
+        self.assertEqual(blogLargeB.oid_info, sorted_target_list)
+        self.assertEqual(blogLargeB.bool_info, [False, False, True, True])
+        blogLargeB.save()
+        blogLargeB.reload()
+        self.assertEqual(blogLargeB.text_info, ["a", "j", "z"])
+        self.assertEqual(blogLargeB.oid_info, sorted_target_list)
+        self.assertEqual(blogLargeB.bool_info, [False, False, True, True])
+
+        BlogPost.drop_collection()
+ 
     def test_list_assignment(self):
         """Ensure that list field element assignment and slicing work
         """

From 96d20756ca1ce29608362aa753236a07a670d55d Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Thu, 22 Dec 2016 13:13:19 -0500
Subject: [PATCH 0431/1519] remove redundant whitespace

---
 tests/fields/fields.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index d47b2ab61..c6089c8b6 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1057,7 +1057,6 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-
     def test_list_field_manipulative_operators(self):
         """Ensure that ListField works with standard list operators that manipulate the list.
         """
@@ -1078,7 +1077,7 @@ def reset_post():
 
         # '__add__(listB)'
         # listA+listB
-        # operator.add(listA, listB) 
+        # operator.add(listA, listB)
         reset_post()
         temp = ['a', 'b']
         post.info = post.info + temp
@@ -1298,7 +1297,7 @@ class BlogPost(Document):
         self.assertEqual(blogLargeB.bool_info, [False, False, True, True])
 
         BlogPost.drop_collection()
- 
+
     def test_list_assignment(self):
         """Ensure that list field element assignment and slicing work
         """
@@ -1346,7 +1345,6 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.info, [1, 2, 3, 4, 'n5'])
 
-
     def test_list_field_passed_in_value(self):
         class Foo(Document):
             bars = ListField(ReferenceField("Bar"))

From 9f4b04ea0f4d4a6d15a3f59f674d11f073ebe2a1 Mon Sep 17 00:00:00 2001
From: Manuel Jeckelmann <maennel@users.noreply.github.com>
Date: Thu, 22 Dec 2016 19:19:18 +0100
Subject: [PATCH 0432/1519] Fix querying an embedded document field by an
 invalid value (#1440)

---
 mongoengine/base/document.py |  6 ++++--
 mongoengine/fields.py        |  8 ++++++--
 tests/document/instance.py   |  4 ++++
 tests/queryset/queryset.py   | 18 ++++++++++++++++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 03dc75626..03536d6fa 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -16,8 +16,7 @@
                                              SemiStrictDict, StrictDict)
 from mongoengine.base.fields import ComplexBaseField
 from mongoengine.common import _import_class
-from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError,
-                                LookUpError, OperationError, ValidationError)
+from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError, LookUpError, OperationError, ValidationError)
 
 __all__ = ('BaseDocument',)
 
@@ -675,6 +674,9 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
         if not only_fields:
             only_fields = []
 
+        if son and not isinstance(son, dict):
+            raise ValueError("The source SON object needs to be of type 'dict'")
+
         # Get the class name from the document, falling back to the given
         # class if unavailable
         class_name = son.get('_cls', cls._class_name)
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index d812a762a..3991ef5c0 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -28,7 +28,7 @@
                               GeoJsonBaseField, ObjectIdField, get_document)
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
-from mongoengine.errors import DoesNotExist, ValidationError
+from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
 from mongoengine.python_support import StringIO
 from mongoengine.queryset import DO_NOTHING, QuerySet
 
@@ -566,7 +566,11 @@ def lookup_member(self, member_name):
 
     def prepare_query_value(self, op, value):
         if value is not None and not isinstance(value, self.document_type):
-            value = self.document_type._from_son(value)
+            try:
+                value = self.document_type._from_son(value)
+            except ValueError:
+                raise InvalidQueryError("Querying the embedded document '%s' failed, due to an invalid query value" %
+                                        (self.document_type._class_name,))
         super(EmbeddedDocumentField, self).prepare_query_value(op, value)
         return self.to_mongo(value)
 
diff --git a/tests/document/instance.py b/tests/document/instance.py
index b92bafa9a..d961f034c 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1860,6 +1860,10 @@ class Word(Document):
                 'occurs': {"hello": None}
             })
 
+        # Tests for issue #1438: https://github.com/MongoEngine/mongoengine/issues/1438
+        with self.assertRaises(ValueError):
+            Word._from_son('this is not a valid SON dict')
+
     def test_reverse_delete_rule_cascade_and_nullify(self):
         """Ensure that a referenced document is also deleted upon deletion.
         """
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 11ce0a27a..a15807a5b 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1266,7 +1266,7 @@ class BlogPost(Document):
 
     def test_find_embedded(self):
         """Ensure that an embedded document is properly returned from
-        a query.
+        different manners of querying.
         """
         class User(EmbeddedDocument):
             name = StringField()
@@ -1277,8 +1277,9 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
+        user = User(name='Test User')
         BlogPost.objects.create(
-            author=User(name='Test User'),
+            author=user,
             content='Had a good coffee today...'
         )
 
@@ -1286,6 +1287,19 @@ class BlogPost(Document):
         self.assertTrue(isinstance(result.author, User))
         self.assertEqual(result.author.name, 'Test User')
 
+        result = BlogPost.objects.get(author__name=user.name)
+        self.assertTrue(isinstance(result.author, User))
+        self.assertEqual(result.author.name, 'Test User')
+
+        result = BlogPost.objects.get(author={'name': user.name})
+        self.assertTrue(isinstance(result.author, User))
+        self.assertEqual(result.author.name, 'Test User')
+
+        # Fails, since the string is not a type that is able to represent the
+        # author's document structure (should be dict)
+        with self.assertRaises(InvalidQueryError):
+            BlogPost.objects.get(author=user.name)
+
     def test_find_empty_embedded(self):
         """Ensure that you can save and find an empty embedded document."""
         class User(EmbeddedDocument):

From 5c3928190aab390443a1c5d967b17dadd8f68f14 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Thu, 22 Dec 2016 13:20:05 -0500
Subject: [PATCH 0433/1519] fix line width

---
 mongoengine/base/document.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 03536d6fa..1667215d4 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -16,7 +16,8 @@
                                              SemiStrictDict, StrictDict)
 from mongoengine.base.fields import ComplexBaseField
 from mongoengine.common import _import_class
-from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError, LookUpError, OperationError, ValidationError)
+from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError,
+                                LookUpError, OperationError, ValidationError)
 
 __all__ = ('BaseDocument',)
 

From 2770cec187835ded145049341a4e72c1c97f8e1d Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 27 Dec 2016 10:20:13 -0500
Subject: [PATCH 0434/1519] better docstring for BaseQuerySet.fields

---
 mongoengine/queryset/base.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 3ee978b8b..5c0fb5b37 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -900,18 +900,24 @@ def exclude(self, *fields):
         return self.fields(**fields)
 
     def fields(self, _only_called=False, **kwargs):
-        """Manipulate how you load this document's fields.  Used by `.only()`
-        and `.exclude()` to manipulate which fields to retrieve.  Fields also
-        allows for a greater level of control for example:
+        """Manipulate how you load this document's fields. Used by `.only()`
+        and `.exclude()` to manipulate which fields to retrieve. If called
+        directly, use a set of kwargs similar to the MongoDB projection
+        document. For example:
 
-        Retrieving a Subrange of Array Elements:
+        Include only a subset of fields:
 
-        You can use the $slice operator to retrieve a subrange of elements in
-        an array. For example to get the first 5 comments::
+            posts = BlogPost.objects(...).fields(author=1, title=1)
 
-            post = BlogPost.objects(...).fields(slice__comments=5)
+        Exclude a specific field:
 
-        :param kwargs: A dictionary identifying what to include
+            posts = BlogPost.objects(...).fields(comments=0)
+
+        To retrieve a subrange of array elements:
+
+            posts = BlogPost.objects(...).fields(slice__comments=5)
+
+        :param kwargs: A set keywors arguments identifying what to include.
 
         .. versionadded:: 0.5
         """

From e07cb82c151841c948019a5384c7c0f728c461e9 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 27 Dec 2016 17:38:26 -0500
Subject: [PATCH 0435/1519] validate db_field

---
 mongoengine/base/fields.py | 11 +++++++++++
 tests/fields/fields.py     | 31 ++++++++++++++++++++++---------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index b0644cecc..2bcdcfdf1 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -81,6 +81,17 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.sparse = sparse
         self._owner_document = None
 
+        # Validate the db_field
+        if self.db_field and (
+            '.' in self.db_field or
+            '\0' in self.db_field or
+            self.db_field.startswith('$')
+        ):
+            raise ValueError(
+                'field names cannot contain dots (".") or null characters '
+                '("\\0"), and they must not start with a dollar sign ("$").'
+            )
+
         # Detect and report conflicts between metadata and base properties.
         conflicts = set(dir(self)) & set(kwargs)
         if conflicts:
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index c6089c8b6..5874a36d2 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -306,6 +306,24 @@ class Person(Document):
         person.id = '497ce96f395f2f052a494fd4'
         person.validate()
 
+    def test_db_field_validation(self):
+        """Ensure that db_field doesn't accept invalid values."""
+
+        # dot in the name
+        with self.assertRaises(ValueError):
+            class User(Document):
+                name = StringField(db_field='user.name')
+
+        # name starting with $
+        with self.assertRaises(ValueError):
+            class User(Document):
+                name = StringField(db_field='$name')
+
+        # name containing a null character
+        with self.assertRaises(ValueError):
+            class User(Document):
+                name = StringField(db_field='name\0')
+
     def test_string_validation(self):
         """Ensure that invalid values cannot be assigned to string fields.
         """
@@ -3973,30 +3991,25 @@ def test_undefined_field_exception(self):
         """Tests if a `FieldDoesNotExist` exception is raised when trying to
         instanciate a document with a field that's not defined.
         """
-
         class Doc(Document):
-            foo = StringField(db_field='f')
+            foo = StringField()
 
-        def test():
+        with self.assertRaises(FieldDoesNotExist):
             Doc(bar='test')
 
-        self.assertRaises(FieldDoesNotExist, test)
 
     def test_undefined_field_exception_with_strict(self):
         """Tests if a `FieldDoesNotExist` exception is raised when trying to
         instanciate a document with a field that's not defined,
         even when strict is set to False.
         """
-
         class Doc(Document):
-            foo = StringField(db_field='f')
+            foo = StringField()
             meta = {'strict': False}
 
-        def test():
+        with self.assertRaises(FieldDoesNotExist):
             Doc(bar='test')
 
-        self.assertRaises(FieldDoesNotExist, test)
-
     def test_long_field_is_considered_as_int64(self):
         """
         Tests that long fields are stored as long in mongo, even if long value

From 91dad4060f437037ad35e3892b1953bdfc2d0128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Wed, 28 Dec 2016 00:51:47 -0500
Subject: [PATCH 0436/1519] raise an error when trying to save an abstract
 document (#1449)

---
 mongoengine/document.py    | 4 +++-
 tests/document/instance.py | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index e86a45d9b..0fa2460d2 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -313,6 +313,9 @@ def save(self, force_insert=False, validate=True, clean=True,
         .. versionchanged:: 0.10.7
             Add signal_kwargs argument
         """
+        if self._meta.get('abstract'):
+            raise InvalidDocumentError('Cannot save an abstract document.')
+
         signal_kwargs = signal_kwargs or {}
         signals.pre_save.send(self.__class__, document=self, **signal_kwargs)
 
@@ -828,7 +831,6 @@ def list_indexes(cls):
         """ Lists all of the indexes that should be created for given
         collection. It includes all the indexes from super- and sub-classes.
         """
-
         if cls._meta.get('abstract'):
             return []
 
diff --git a/tests/document/instance.py b/tests/document/instance.py
index d961f034c..b187f766b 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -435,6 +435,15 @@ def test_to_dbref(self):
 
         person.to_dbref()
 
+    def test_save_abstract_document(self):
+        """Saving an abstract document should fail."""
+        class Doc(Document):
+            name = StringField()
+            meta = {'abstract': True}
+
+        with self.assertRaises(InvalidDocumentError):
+            Doc(name='aaa').save()
+
     def test_reload(self):
         """Ensure that attributes may be reloaded.
         """

From f4e1d80a8753e1088433570f5cb17c8a206b619e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Wed, 28 Dec 2016 02:04:49 -0500
Subject: [PATCH 0437/1519] support a negative dec operator (#1450)

---
 mongoengine/queryset/transform.py | 3 +--
 tests/queryset/queryset.py        | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 61d434904..bb04ee376 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -233,8 +233,7 @@ def update(_doc_cls=None, **update):
                 # Support decrement by flipping a positive value's sign
                 # and using 'inc'
                 op = 'inc'
-                if value > 0:
-                    value = -value
+                value = -value
             elif op == 'add_to_set':
                 op = 'addToSet'
             elif op == 'set_on_insert':
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index a15807a5b..2d5b5b0fa 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1826,6 +1826,11 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.hits, 10)
 
+        # Negative dec operator is equal to a positive inc operator
+        BlogPost.objects.update_one(dec__hits=-1)
+        post.reload()
+        self.assertEqual(post.hits, 11)
+
         BlogPost.objects.update(push__tags='mongo')
         post.reload()
         self.assertTrue('mongo' in post.tags)

From c6cc0136176146ed0f0aed396bc2041eecc2d51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Wed, 28 Dec 2016 11:40:57 -0500
Subject: [PATCH 0438/1519] fix BaseQuerySet.fields when mixing
 exclusion/inclusion with complex values like $slice (#1452)

---
 mongoengine/queryset/base.py | 15 ++++++++++++++-
 tests/queryset/field_list.py | 10 ++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5c0fb5b37..098f198e2 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -933,7 +933,20 @@ def fields(self, _only_called=False, **kwargs):
             key = '.'.join(parts)
             cleaned_fields.append((key, value))
 
-        fields = sorted(cleaned_fields, key=operator.itemgetter(1))
+        # Sort fields by their values, explicitly excluded fields first, then
+        # explicitly included, and then more complicated operators such as
+        # $slice.
+        def _sort_key(field_tuple):
+            key, value = field_tuple
+            if isinstance(value, (int)):
+                return value  # 0 for exclusion, 1 for inclusion
+            else:
+                return 2  # so that complex values appear last
+
+        fields = sorted(cleaned_fields, key=_sort_key)
+
+        # Clone the queryset, group all fields by their value, convert
+        # each of them to db_fields, and set the queryset's _loaded_fields
         queryset = self.clone()
         for value, group in itertools.groupby(fields, lambda x: x[1]):
             fields = [field for field, value in group]
diff --git a/tests/queryset/field_list.py b/tests/queryset/field_list.py
index 76d5f779b..d1277e062 100644
--- a/tests/queryset/field_list.py
+++ b/tests/queryset/field_list.py
@@ -141,6 +141,16 @@ class MyDoc(Document):
         self.assertEqual(qs._loaded_fields.as_dict(),
                          {'b': {'$slice': 5}})
 
+    def test_mix_slice_with_other_fields(self):
+        class MyDoc(Document):
+            a = ListField()
+            b = ListField()
+            c = ListField()
+
+        qs = MyDoc.objects.fields(a=1, b=0, slice__c=2)
+        self.assertEqual(qs._loaded_fields.as_dict(),
+                         {'c': {'$slice': 2}, 'a': 1})
+
     def test_only(self):
         """Ensure that QuerySet.only only returns the requested fields.
         """

From 74b37d11cf1dfba93fc6ee8ff4bdbda767f0b975 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 28 Dec 2016 11:46:18 -0500
Subject: [PATCH 0439/1519] only validate db_field if it's a string type

---
 mongoengine/base/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 2bcdcfdf1..9ba9dc9a0 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -41,7 +41,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         """
         :param db_field: The database field to store this field in
             (defaults to the name of the field)
-        :param name: Depreciated - use db_field
+        :param name: Deprecated - use db_field
         :param required: If the field is required. Whether it has to have a
             value or not. Defaults to False.
         :param default: (optional) The default value for this field if no value
@@ -82,7 +82,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self._owner_document = None
 
         # Validate the db_field
-        if self.db_field and (
+        if isinstance(self.db_field, six.string_types) and (
             '.' in self.db_field or
             '\0' in self.db_field or
             self.db_field.startswith('$')

From b013a065f7d61f1439312b775a372f9d4cebf59a Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 28 Dec 2016 11:50:28 -0500
Subject: [PATCH 0440/1519] remove readme mention of the irc channel

---
 CONTRIBUTING.rst | 2 +-
 README.rst       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 06bf2f615..2668499ce 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -14,7 +14,7 @@ Before starting to write code, look for existing `tickets
 <https://github.com/MongoEngine/mongoengine/issues?state=open>`_ or `create one
 <https://github.com/MongoEngine/mongoengine/issues>`_ for your specific
 issue or feature request. That way you avoid working on something
-that might not be of interest or that has already been addressed.  If in doubt
+that might not be of interest or that has already been addressed. If in doubt
 post to the `user group <http://groups.google.com/group/mongoengine-users>`
 
 Supported Interpreters
diff --git a/README.rst b/README.rst
index e46a835f1..1afc819d1 100644
--- a/README.rst
+++ b/README.rst
@@ -130,7 +130,6 @@ Community
   <http://groups.google.com/group/mongoengine-users>`_
 - `MongoEngine Developers mailing list
   <http://groups.google.com/group/mongoengine-dev>`_
-- `#mongoengine IRC channel <http://webchat.freenode.net/?channels=mongoengine>`_
 
 Contributing
 ============

From 96e95ac533d171ab7f371f0089487d9cfc870755 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 28 Dec 2016 17:18:55 -0500
Subject: [PATCH 0441/1519] minor readme tweaks

---
 README.rst | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 1afc819d1..e42fd3ea4 100644
--- a/README.rst
+++ b/README.rst
@@ -57,7 +57,7 @@ Some simple examples of what MongoEngine code looks like:
 
     class BlogPost(Document):
         title = StringField(required=True, max_length=200)
-        posted = DateTimeField(default=datetime.datetime.now)
+        posted = DateTimeField(default=datetime.datetime.utcnow)
         tags = ListField(StringField(max_length=50))
         meta = {'allow_inheritance': True}
 
@@ -87,17 +87,18 @@ Some simple examples of what MongoEngine code looks like:
     ...     print
     ...
 
-    >>> len(BlogPost.objects)
+    # Count all blog posts and its subtypes
+    >>> BlogPost.objects.count()
     2
-    >>> len(TextPost.objects)
+    >>> TextPost.objects.count()
     1
-    >>> len(LinkPost.objects)
+    >>> LinkPost.objects.count()
     1
 
-    # Find tagged posts
-    >>> len(BlogPost.objects(tags='mongoengine'))
+    # Count tagged posts
+    >>> BlogPost.objects(tags='mongoengine').count()
     2
-    >>> len(BlogPost.objects(tags='mongodb'))
+    >>> BlogPost.objects(tags='mongodb').count()
     1
 
 Tests
@@ -133,4 +134,4 @@ Community
 
 Contributing
 ============
-We welcome contributions! see  the `Contribution guidelines <https://github.com/MongoEngine/mongoengine/blob/master/CONTRIBUTING.rst>`_
+We welcome contributions! See the `Contribution guidelines <https://github.com/MongoEngine/mongoengine/blob/master/CONTRIBUTING.rst>`_

From 47c58bce2bcff79a60f2550710f68dd58d1d33d1 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 28 Dec 2016 21:08:18 -0500
Subject: [PATCH 0442/1519] fix "connect" example in the docs

---
 docs/guide/connecting.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index 48926499e..827e5a3c2 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -33,7 +33,7 @@ the :attr:`host` to
     corresponding parameters in :func:`~mongoengine.connect`: ::
 
         connect(
-            name='test',
+            db='test',
             username='user',
             password='12345',
             host='mongodb://admin:qwerty@localhost/production'

From b7ec587e5b82717dd704a7812b576ceff405cff3 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 28 Dec 2016 22:15:46 -0500
Subject: [PATCH 0443/1519] better docstring for BaseDocument.to_json

---
 mongoengine/base/document.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 1667215d4..9d3667068 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -402,9 +402,11 @@ def validate(self, clean=True):
             raise ValidationError(message, errors=errors)
 
     def to_json(self, *args, **kwargs):
-        """Converts a document to JSON.
-        :param use_db_field: Set to True by default but enables the output of the json structure with the field names
-            and not the mongodb store db_names in case of set to False
+        """Convert this document to JSON.
+
+        :param use_db_field: Serialize field names as they appear in
+            MongoDB (as opposed to attribute names on this document).
+            Defaults to True.
         """
         use_db_field = kwargs.pop('use_db_field', True)
         return json_util.dumps(self.to_mongo(use_db_field), *args, **kwargs)

From 2ee8984b443dda0cf7ea6fac51e801f161d0f16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Wed, 28 Dec 2016 23:25:38 -0500
Subject: [PATCH 0444/1519] add a $rename operator (#1454)

---
 mongoengine/base/common.py |  2 +-
 tests/document/instance.py | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/common.py b/mongoengine/base/common.py
index da2b8b68b..b9971ff71 100644
--- a/mongoengine/base/common.py
+++ b/mongoengine/base/common.py
@@ -5,7 +5,7 @@
 
 UPDATE_OPERATORS = set(['set', 'unset', 'inc', 'dec', 'pop', 'push',
                         'push_all', 'pull', 'pull_all', 'add_to_set',
-                        'set_on_insert', 'min', 'max'])
+                        'set_on_insert', 'min', 'max', 'rename'])
 
 
 _document_registry = {}
diff --git a/tests/document/instance.py b/tests/document/instance.py
index b187f766b..9b52c809a 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1232,6 +1232,19 @@ def test_update(self):
         self.assertEqual(person.name, None)
         self.assertEqual(person.age, None)
 
+    def test_update_rename_operator(self):
+        """Test the $rename operator."""
+        coll = self.Person._get_collection()
+        doc = self.Person(name='John').save()
+        raw_doc = coll.find_one({'_id': doc.pk})
+        self.assertEqual(set(raw_doc.keys()), set(['_id', '_cls', 'name']))
+
+        doc.update(rename__name='first_name')
+        raw_doc = coll.find_one({'_id': doc.pk})
+        self.assertEqual(set(raw_doc.keys()),
+                         set(['_id', '_cls', 'first_name']))
+        self.assertEqual(raw_doc['first_name'], 'John')
+
     def test_inserts_if_you_set_the_pk(self):
         p1 = self.Person(name='p1', id=bson.ObjectId()).save()
         p2 = self.Person(name='p2')

From c6240ca41598330f3592f9f4dccd7a0b41f2a0a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Thu, 29 Dec 2016 12:37:38 -0500
Subject: [PATCH 0445/1519] Test connection's write concern (#1456)

---
 tests/test_connection.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 9143571f6..cc75f1e77 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -296,6 +296,19 @@ def test_connection_kwargs(self):
         conn = get_connection('t2')
         self.assertFalse(get_tz_awareness(conn))
 
+    def test_write_concern(self):
+        """Ensure write concern can be specified in connect() via
+        a kwarg or as part of the connection URI.
+        """
+        conn1 = connect(alias='conn1', host='mongodb://localhost/testing?w=1&j=true')
+        conn2 = connect('testing', alias='conn2', w=1, j=True)
+        if IS_PYMONGO_3:
+            self.assertEqual(conn1.write_concern.document, {'w': 1, 'j': True})
+            self.assertEqual(conn2.write_concern.document, {'w': 1, 'j': True})
+        else:
+            self.assertEqual(dict(conn1.write_concern), {'w': 1, 'j': True})
+            self.assertEqual(dict(conn2.write_concern), {'w': 1, 'j': True})
+
     def test_datetime(self):
         connect('mongoenginetest', tz_aware=True)
         d = datetime.datetime(2010, 5, 5, tzinfo=utc)

From ebd34427c7a10d322a3f5c2bdef8f34afc08ca2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Fri, 30 Dec 2016 05:43:56 -0500
Subject: [PATCH 0446/1519] Cleaner Document.save (#1458)

---
 mongoengine/document.py | 142 ++++++++++++++++++++++++----------------
 1 file changed, 85 insertions(+), 57 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 0fa2460d2..b79e5e976 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -332,68 +332,20 @@ def save(self, force_insert=False, validate=True, clean=True,
         signals.pre_save_post_validation.send(self.__class__, document=self,
                                               created=created, **signal_kwargs)
 
+        if self._meta.get('auto_create_index', True):
+            self.ensure_indexes()
+
         try:
-            collection = self._get_collection()
-            if self._meta.get('auto_create_index', True):
-                self.ensure_indexes()
+            # Save a new document or update an existing one
             if created:
-                if force_insert:
-                    object_id = collection.insert(doc, **write_concern)
-                else:
-                    object_id = collection.save(doc, **write_concern)
-                    # In PyMongo 3.0, the save() call calls internally the _update() call
-                    # but they forget to return the _id value passed back, therefore getting it back here
-                    # Correct behaviour in 2.X and in 3.0.1+ versions
-                    if not object_id and pymongo.version_tuple == (3, 0):
-                        pk_as_mongo_obj = self._fields.get(self._meta['id_field']).to_mongo(self.pk)
-                        object_id = (
-                            self._qs.filter(pk=pk_as_mongo_obj).first() and
-                            self._qs.filter(pk=pk_as_mongo_obj).first().pk
-                        )  # TODO doesn't this make 2 queries?
+                object_id = self._save_create(doc, force_insert, write_concern)
             else:
-                object_id = doc['_id']
-                updates, removals = self._delta()
-                # Need to add shard key to query, or you get an error
-                if save_condition is not None:
-                    select_dict = transform.query(self.__class__,
-                                                  **save_condition)
-                else:
-                    select_dict = {}
-                select_dict['_id'] = object_id
-                shard_key = self._meta.get('shard_key', tuple())
-                for k in shard_key:
-                    path = self._lookup_field(k.split('.'))
-                    actual_key = [p.db_field for p in path]
-                    val = doc
-                    for ak in actual_key:
-                        val = val[ak]
-                    select_dict['.'.join(actual_key)] = val
-
-                def is_new_object(last_error):
-                    if last_error is not None:
-                        updated = last_error.get('updatedExisting')
-                        if updated is not None:
-                            return not updated
-                    return created
-
-                update_query = {}
-
-                if updates:
-                    update_query['$set'] = updates
-                if removals:
-                    update_query['$unset'] = removals
-                if updates or removals:
-                    upsert = save_condition is None
-                    last_error = collection.update(select_dict, update_query,
-                                                   upsert=upsert, **write_concern)
-                    if not upsert and last_error['n'] == 0:
-                        raise SaveConditionError('Race condition preventing'
-                                                 ' document update detected')
-                    created = is_new_object(last_error)
+                object_id, created = self._save_update(doc, save_condition,
+                                                       write_concern)
 
             if cascade is None:
-                cascade = self._meta.get(
-                    'cascade', False) or cascade_kwargs is not None
+                cascade = (self._meta.get('cascade', False) or
+                           cascade_kwargs is not None)
 
             if cascade:
                 kwargs = {
@@ -406,6 +358,7 @@ def is_new_object(last_error):
                     kwargs.update(cascade_kwargs)
                 kwargs['_refs'] = _refs
                 self.cascade_save(**kwargs)
+
         except pymongo.errors.DuplicateKeyError as err:
             message = u'Tried to save duplicate unique keys (%s)'
             raise NotUniqueError(message % six.text_type(err))
@@ -418,16 +371,91 @@ def is_new_object(last_error):
                 raise NotUniqueError(message % six.text_type(err))
             raise OperationError(message % six.text_type(err))
 
+        # Make sure we store the PK on this document now that it's saved
         id_field = self._meta['id_field']
         if created or id_field not in self._meta.get('shard_key', []):
             self[id_field] = self._fields[id_field].to_python(object_id)
 
         signals.post_save.send(self.__class__, document=self,
                                created=created, **signal_kwargs)
+
         self._clear_changed_fields()
         self._created = False
+
         return self
 
+    def _save_create(self, doc, force_insert, write_concern):
+        """Save a new document.
+
+        Helper method, should only be used inside save().
+        """
+        collection = self._get_collection()
+
+        if force_insert:
+            return collection.insert(doc, **write_concern)
+
+        object_id = collection.save(doc, **write_concern)
+
+        # In PyMongo 3.0, the save() call calls internally the _update() call
+        # but they forget to return the _id value passed back, therefore getting it back here
+        # Correct behaviour in 2.X and in 3.0.1+ versions
+        if not object_id and pymongo.version_tuple == (3, 0):
+            pk_as_mongo_obj = self._fields.get(self._meta['id_field']).to_mongo(self.pk)
+            object_id = (
+                self._qs.filter(pk=pk_as_mongo_obj).first() and
+                self._qs.filter(pk=pk_as_mongo_obj).first().pk
+            )  # TODO doesn't this make 2 queries?
+
+        return object_id
+
+    def _save_update(self, doc, save_condition, write_concern):
+        """Update an existing document.
+
+        Helper method, should only be used inside save().
+        """
+        collection = self._get_collection()
+        object_id = doc['_id']
+        created = False
+
+        select_dict = {}
+        if save_condition is not None:
+            select_dict = transform.query(self.__class__, **save_condition)
+
+        select_dict['_id'] = object_id
+
+        # Need to add shard key to query, or you get an error
+        shard_key = self._meta.get('shard_key', tuple())
+        for k in shard_key:
+            path = self._lookup_field(k.split('.'))
+            actual_key = [p.db_field for p in path]
+            val = doc
+            for ak in actual_key:
+                val = val[ak]
+            select_dict['.'.join(actual_key)] = val
+
+        updates, removals = self._delta()
+        update_query = {}
+        if updates:
+            update_query['$set'] = updates
+        if removals:
+            update_query['$unset'] = removals
+        if updates or removals:
+            upsert = save_condition is None
+            last_error = collection.update(select_dict, update_query,
+                                           upsert=upsert, **write_concern)
+            if not upsert and last_error['n'] == 0:
+                raise SaveConditionError('Race condition preventing'
+                                         ' document update detected')
+            if last_error is not None:
+                updated_existing = last_error.get('updatedExisting')
+                if updated_existing is False:
+                    created = True
+                    # !!! This is bad, means we accidentally created a new,
+                    # potentially corrupted document. See
+                    # https://github.com/MongoEngine/mongoengine/issues/564
+
+        return object_id, created
+
     def cascade_save(self, **kwargs):
         """Recursively save any references and generic references on the
         document.

From 193aa4e1f2c58d5a734c257be7e284b20799208c Mon Sep 17 00:00:00 2001
From: lanf0n <lanfon72@gmail.com>
Date: Fri, 6 Jan 2017 11:37:09 +0800
Subject: [PATCH 0447/1519] [#1459] fix typo `__neq__` to `__ne__` (#1461)

---
 mongoengine/base/datastructures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 8a7681e5d..b9aca8fae 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -429,7 +429,7 @@ def __len__(self):
     def __eq__(self, other):
         return self.items() == other.items()
 
-    def __neq__(self, other):
+    def __ne__(self, other):
         return self.items() != other.items()
 
     @classmethod

From b5fb82d95dd4801562e5ad6d242e58d31fa49558 Mon Sep 17 00:00:00 2001
From: Eli Boyarski <eli.boyarski@gmail.com>
Date: Sun, 8 Jan 2017 19:57:36 +0200
Subject: [PATCH 0448/1519] Typo fix (#1463)

---
 tests/fields/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 5874a36d2..5c83d58cd 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1985,7 +1985,7 @@ class User(Basedoc):
         self.assertEqual(content, User.objects.first().groups[0].content)
 
     def test_reference_miss(self):
-        """Ensure an exception is raised when dereferencing unknow document
+        """Ensure an exception is raised when dereferencing unknown document
         """
 
         class Foo(Document):

From 1b6743ee5317d60d5f98981868307d7407c367f3 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 8 Jan 2017 14:50:09 -0500
Subject: [PATCH 0449/1519] add a changelog entry about broken references
 raising DoesNotExist

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index af3437c18..a38378c84 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,7 @@ Changes in 0.11.0
 - BREAKING CHANGE: Renamed `ConnectionError` to `MongoEngineConnectionError` since the former is a built-in exception name in Python v3.x. #1428
 - BREAKING CHANGE: Dropped Python 2.6 support. #1428
 - BREAKING CHANGE: `from mongoengine.base import ErrorClass` won't work anymore for any error from `mongoengine.errors` (e.g. `ValidationError`). Use `from mongoengine.errors import ErrorClass instead`. #1428
+- BREAKING CHANGE: Accessing a broken reference will raise a `DoesNotExist` error. In the past it used to return `None`. #1334
 - Fixed absent rounding for DecimalField when `force_string` is set. #1103
 
 Changes in 0.10.8

From e5acbcc0dd4c9dfe827c88b08a59160a73239781 Mon Sep 17 00:00:00 2001
From: Eli Boyarski <eli.boyarski@gmail.com>
Date: Mon, 9 Jan 2017 18:24:27 +0200
Subject: [PATCH 0450/1519] Improved a docstring for FieldDoesNotExist (#1466)

---
 mongoengine/errors.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 2549e8228..131596d19 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -50,8 +50,8 @@ class FieldDoesNotExist(Exception):
     or an :class:`~mongoengine.EmbeddedDocument`.
 
     To avoid this behavior on data loading,
-    you should the :attr:`strict` to ``False``
-    in the :attr:`meta` dictionnary.
+    you should set the :attr:`strict` to ``False``
+    in the :attr:`meta` dictionary.
     """
 
 

From 4eedf000250a9267b9e40646f0f4e32ceef3298f Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 17 Jan 2017 02:42:23 -0500
Subject: [PATCH 0451/1519] nicer readme note about dependencies

---
 README.rst | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index e42fd3ea4..fa872afd1 100644
--- a/README.rst
+++ b/README.rst
@@ -35,16 +35,20 @@ setup.py install``.
 
 Dependencies
 ============
+All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_.
+
+Bare minimum you need to use this package:
 - pymongo>=2.7.1
-- sphinx (optional - for documentation generation)
+- six>=1.10.0
 
-Optional Dependencies
----------------------
-- **Image Fields**: Pillow>=2.0.0
+If you utilize a ``DateTimeField`` and want to use a more flexible date parser:
 - dateutil>=2.1.0
 
-.. note
-   MongoEngine always runs it's test suite against the latest patch version of each dependecy. e.g.: PyMongo 3.0.1
+If you to utilize an ``ImageField`` or ``ImageGridFsProxy``:
+- Pillow>=2.0.0
+
+If you want to generate the documentation (e.g. to contribute to it):
+- sphinx
 
 Examples
 ========

From affc12df4b4e23a88cf589d3b44bcfaecf25cc97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Tue, 17 Jan 2017 02:43:29 -0500
Subject: [PATCH 0452/1519] Update README.rst

---
 README.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.rst b/README.rst
index fa872afd1..a7b9c48cf 100644
--- a/README.rst
+++ b/README.rst
@@ -38,16 +38,20 @@ Dependencies
 All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_.
 
 Bare minimum you need to use this package:
+
 - pymongo>=2.7.1
 - six>=1.10.0
 
 If you utilize a ``DateTimeField`` and want to use a more flexible date parser:
+
 - dateutil>=2.1.0
 
 If you to utilize an ``ImageField`` or ``ImageGridFsProxy``:
+
 - Pillow>=2.0.0
 
 If you want to generate the documentation (e.g. to contribute to it):
+
 - sphinx
 
 Examples

From 80530bb13c357cbac14547bec268fdcf5cfe19c7 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 17 Jan 2017 02:46:37 -0500
Subject: [PATCH 0453/1519] nicer readme

---
 README.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index a7b9c48cf..068cc4ba0 100644
--- a/README.rst
+++ b/README.rst
@@ -35,18 +35,16 @@ setup.py install``.
 
 Dependencies
 ============
-All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_.
-
-Bare minimum you need to use this package:
+All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_. At the very least, you'll need these two packages to use MongoEngine:
 
 - pymongo>=2.7.1
 - six>=1.10.0
 
-If you utilize a ``DateTimeField`` and want to use a more flexible date parser:
+If you utilize a ``DateTimeField`` and you want to use a more flexible date parser:
 
 - dateutil>=2.1.0
 
-If you to utilize an ``ImageField`` or ``ImageGridFsProxy``:
+If you also utilize an ``ImageField`` or ``ImageGridFsProxy``:
 
 - Pillow>=2.0.0
 

From f33cd625bf4fa0f208a59604785f8d394c27a38c Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 17 Jan 2017 02:47:45 -0500
Subject: [PATCH 0454/1519] nicer readme

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 068cc4ba0..adfa0c715 100644
--- a/README.rst
+++ b/README.rst
@@ -40,11 +40,11 @@ All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`
 - pymongo>=2.7.1
 - six>=1.10.0
 
-If you utilize a ``DateTimeField`` and you want to use a more flexible date parser:
+If you utilize a ``DateTimeField``, you might also use a more flexible date parser:
 
 - dateutil>=2.1.0
 
-If you also utilize an ``ImageField`` or ``ImageGridFsProxy``:
+If you need to use an ``ImageField`` or ``ImageGridFsProxy``:
 
 - Pillow>=2.0.0
 

From d8a732836522d964454b3101d4ccb9943d1de9bb Mon Sep 17 00:00:00 2001
From: martin sereinig <srecnig@veryunited.net>
Date: Mon, 6 Feb 2017 22:11:42 +0100
Subject: [PATCH 0455/1519] Fix docs regarding reverse_delete_rule and delete
 signals (#1473)

---
 docs/guide/defining-documents.rst | 5 -----
 docs/guide/signals.rst            | 7 -------
 mongoengine/fields.py             | 4 ----
 3 files changed, 16 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index f59f856e8..e656dee01 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -361,11 +361,6 @@ Its value can take any of the following constants:
    In Django, be sure to put all apps that have such delete rule declarations in
    their :file:`models.py` in the :const:`INSTALLED_APPS` tuple.
 
-
-.. warning::
-   Signals are not triggered when doing cascading updates / deletes - if this
-   is required you must manually handle the update / delete.
-
 Generic reference fields
 ''''''''''''''''''''''''
 A second kind of reference field also exists,
diff --git a/docs/guide/signals.rst b/docs/guide/signals.rst
index 797a48699..30277966f 100644
--- a/docs/guide/signals.rst
+++ b/docs/guide/signals.rst
@@ -142,11 +142,4 @@ cleaner looking while still allowing manual execution of the callback::
         modified = DateTimeField()
 
 
-ReferenceFields and Signals
----------------------------
-
-Currently `reverse_delete_rule` does not trigger signals on the other part of
-the relationship.  If this is required you must manually handle the
-reverse deletion.
-
 .. _blinker: http://pypi.python.org/pypi/blinker
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 3991ef5c0..0ea7d3b65 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -888,10 +888,6 @@ class Bar(Document):
 
         Foo.register_delete_rule(Bar, 'foo', NULLIFY)
 
-    .. note ::
-        `reverse_delete_rule` does not trigger pre / post delete signals to be
-        triggered.
-
     .. versionchanged:: 0.5 added `reverse_delete_rule`
     """
 

From 3ca2e953fb5ff6f5f5373cae9dce6b97609d2d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Thu, 9 Feb 2017 12:02:46 -0800
Subject: [PATCH 0456/1519] Fix limit/skip/hint/batch_size chaining (#1476)

---
 mongoengine/queryset/base.py     | 195 +++++++++++++++++++++----------
 mongoengine/queryset/queryset.py |   8 +-
 tests/queryset/queryset.py       | 114 ++++++++++++++----
 3 files changed, 226 insertions(+), 91 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 098f198e2..7e4856863 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -86,6 +86,7 @@ def __init__(self, document, collection):
         self._batch_size = None
         self.only_fields = []
         self._max_time_ms = None
+        self._comment = None
 
     def __call__(self, q_obj=None, class_check=True, read_preference=None,
                  **query):
@@ -706,39 +707,36 @@ def using(self, alias):
         with switch_db(self._document, alias) as cls:
             collection = cls._get_collection()
 
-        return self.clone_into(self.__class__(self._document, collection))
+        return self._clone_into(self.__class__(self._document, collection))
 
     def clone(self):
-        """Creates a copy of the current
-          :class:`~mongoengine.queryset.QuerySet`
+        """Create a copy of the current queryset."""
+        return self._clone_into(self.__class__(self._document, self._collection_obj))
 
-        .. versionadded:: 0.5
-        """
-        return self.clone_into(self.__class__(self._document, self._collection_obj))
-
-    def clone_into(self, cls):
-        """Creates a copy of the current
-          :class:`~mongoengine.queryset.base.BaseQuerySet` into another child class
+    def _clone_into(self, new_qs):
+        """Copy all of the relevant properties of this queryset to
+        a new queryset (which has to be an instance of
+        :class:`~mongoengine.queryset.base.BaseQuerySet`).
         """
-        if not isinstance(cls, BaseQuerySet):
+        if not isinstance(new_qs, BaseQuerySet):
             raise OperationError(
-                '%s is not a subclass of BaseQuerySet' % cls.__name__)
+                '%s is not a subclass of BaseQuerySet' % new_qs.__name__)
 
         copy_props = ('_mongo_query', '_initial_query', '_none', '_query_obj',
                       '_where_clause', '_loaded_fields', '_ordering', '_snapshot',
                       '_timeout', '_class_check', '_slave_okay', '_read_preference',
                       '_iter', '_scalar', '_as_pymongo', '_as_pymongo_coerce',
                       '_limit', '_skip', '_hint', '_auto_dereference',
-                      '_search_text', 'only_fields', '_max_time_ms')
+                      '_search_text', 'only_fields', '_max_time_ms', '_comment')
 
         for prop in copy_props:
             val = getattr(self, prop)
-            setattr(cls, prop, copy.copy(val))
+            setattr(new_qs, prop, copy.copy(val))
 
         if self._cursor_obj:
-            cls._cursor_obj = self._cursor_obj.clone()
+            new_qs._cursor_obj = self._cursor_obj.clone()
 
-        return cls
+        return new_qs
 
     def select_related(self, max_depth=1):
         """Handles dereferencing of :class:`~bson.dbref.DBRef` objects or
@@ -760,7 +758,11 @@ def limit(self, n):
         """
         queryset = self.clone()
         queryset._limit = n if n != 0 else 1
-        # Return self to allow chaining
+
+        # If a cursor object has already been created, apply the limit to it.
+        if queryset._cursor_obj:
+            queryset._cursor_obj.limit(queryset._limit)
+
         return queryset
 
     def skip(self, n):
@@ -771,6 +773,11 @@ def skip(self, n):
         """
         queryset = self.clone()
         queryset._skip = n
+
+        # If a cursor object has already been created, apply the skip to it.
+        if queryset._cursor_obj:
+            queryset._cursor_obj.skip(queryset._skip)
+
         return queryset
 
     def hint(self, index=None):
@@ -788,6 +795,11 @@ def hint(self, index=None):
         """
         queryset = self.clone()
         queryset._hint = index
+
+        # If a cursor object has already been created, apply the hint to it.
+        if queryset._cursor_obj:
+            queryset._cursor_obj.hint(queryset._hint)
+
         return queryset
 
     def batch_size(self, size):
@@ -801,6 +813,11 @@ def batch_size(self, size):
         """
         queryset = self.clone()
         queryset._batch_size = size
+
+        # If a cursor object has already been created, apply the batch size to it.
+        if queryset._cursor_obj:
+            queryset._cursor_obj.batch_size(queryset._batch_size)
+
         return queryset
 
     def distinct(self, field):
@@ -972,13 +989,31 @@ def all_fields(self):
     def order_by(self, *keys):
         """Order the :class:`~mongoengine.queryset.QuerySet` by the keys. The
         order may be specified by prepending each of the keys by a + or a -.
-        Ascending order is assumed.
+        Ascending order is assumed. If no keys are passed, existing ordering
+        is cleared instead.
 
         :param keys: fields to order the query results by; keys may be
             prefixed with **+** or **-** to determine the ordering direction
         """
         queryset = self.clone()
-        queryset._ordering = queryset._get_order_by(keys)
+
+        old_ordering = queryset._ordering
+        new_ordering = queryset._get_order_by(keys)
+
+        if queryset._cursor_obj:
+
+            # If a cursor object has already been created, apply the sort to it
+            if new_ordering:
+                queryset._cursor_obj.sort(new_ordering)
+
+            # If we're trying to clear a previous explicit ordering, we need
+            # to clear the cursor entirely (because PyMongo doesn't allow
+            # clearing an existing sort on a cursor).
+            elif old_ordering:
+                queryset._cursor_obj = None
+
+        queryset._ordering = new_ordering
+
         return queryset
 
     def comment(self, text):
@@ -1424,10 +1459,13 @@ def next(self):
             raise StopIteration
 
         raw_doc = self._cursor.next()
+
         if self._as_pymongo:
             return self._get_as_pymongo(raw_doc)
-        doc = self._document._from_son(raw_doc,
-                                       _auto_dereference=self._auto_dereference, only_fields=self.only_fields)
+
+        doc = self._document._from_son(
+            raw_doc, _auto_dereference=self._auto_dereference,
+            only_fields=self.only_fields)
 
         if self._scalar:
             return self._get_scalar(doc)
@@ -1437,7 +1475,6 @@ def next(self):
     def rewind(self):
         """Rewind the cursor to its unevaluated state.
 
-
         .. versionadded:: 0.3
         """
         self._iter = False
@@ -1487,43 +1524,54 @@ def _cursor_args(self):
 
     @property
     def _cursor(self):
-        if self._cursor_obj is None:
-
-            # In PyMongo 3+, we define the read preference on a collection
-            # level, not a cursor level. Thus, we need to get a cloned
-            # collection object using `with_options` first.
-            if IS_PYMONGO_3 and self._read_preference is not None:
-                self._cursor_obj = self._collection\
-                    .with_options(read_preference=self._read_preference)\
-                    .find(self._query, **self._cursor_args)
-            else:
-                self._cursor_obj = self._collection.find(self._query,
-                                                         **self._cursor_args)
-            # Apply where clauses to cursor
-            if self._where_clause:
-                where_clause = self._sub_js_fields(self._where_clause)
-                self._cursor_obj.where(where_clause)
-
-            if self._ordering:
-                # Apply query ordering
-                self._cursor_obj.sort(self._ordering)
-            elif self._ordering is None and self._document._meta['ordering']:
-                # Otherwise, apply the ordering from the document model, unless
-                # it's been explicitly cleared via order_by with no arguments
-                order = self._get_order_by(self._document._meta['ordering'])
-                self._cursor_obj.sort(order)
-
-            if self._limit is not None:
-                self._cursor_obj.limit(self._limit)
-
-            if self._skip is not None:
-                self._cursor_obj.skip(self._skip)
-
-            if self._hint != -1:
-                self._cursor_obj.hint(self._hint)
-
-            if self._batch_size is not None:
-                self._cursor_obj.batch_size(self._batch_size)
+        """Return a PyMongo cursor object corresponding to this queryset."""
+
+        # If _cursor_obj already exists, return it immediately.
+        if self._cursor_obj is not None:
+            return self._cursor_obj
+
+        # Create a new PyMongo cursor.
+        # XXX In PyMongo 3+, we define the read preference on a collection
+        # level, not a cursor level. Thus, we need to get a cloned collection
+        # object using `with_options` first.
+        if IS_PYMONGO_3 and self._read_preference is not None:
+            self._cursor_obj = self._collection\
+                .with_options(read_preference=self._read_preference)\
+                .find(self._query, **self._cursor_args)
+        else:
+            self._cursor_obj = self._collection.find(self._query,
+                                                     **self._cursor_args)
+        # Apply "where" clauses to cursor
+        if self._where_clause:
+            where_clause = self._sub_js_fields(self._where_clause)
+            self._cursor_obj.where(where_clause)
+
+        # Apply ordering to the cursor.
+        # XXX self._ordering can be equal to:
+        # * None if we didn't explicitly call order_by on this queryset.
+        # * A list of PyMongo-style sorting tuples.
+        # * An empty list if we explicitly called order_by() without any
+        #   arguments. This indicates that we want to clear the default
+        #   ordering.
+        if self._ordering:
+            # explicit ordering
+            self._cursor_obj.sort(self._ordering)
+        elif self._ordering is None and self._document._meta['ordering']:
+            # default ordering
+            order = self._get_order_by(self._document._meta['ordering'])
+            self._cursor_obj.sort(order)
+
+        if self._limit is not None:
+            self._cursor_obj.limit(self._limit)
+
+        if self._skip is not None:
+            self._cursor_obj.skip(self._skip)
+
+        if self._hint != -1:
+            self._cursor_obj.hint(self._hint)
+
+        if self._batch_size is not None:
+            self._cursor_obj.batch_size(self._batch_size)
 
         return self._cursor_obj
 
@@ -1698,7 +1746,13 @@ def _fields_to_dbfields(self, fields):
         return ret
 
     def _get_order_by(self, keys):
-        """Creates a list of order by fields"""
+        """Given a list of MongoEngine-style sort keys, return a list
+        of sorting tuples that can be applied to a PyMongo cursor. For
+        example:
+
+        >>> qs._get_order_by(['-last_name', 'first_name'])
+        [('last_name', -1), ('first_name', 1)]
+        """
         key_list = []
         for key in keys:
             if not key:
@@ -1711,17 +1765,19 @@ def _get_order_by(self, keys):
             direction = pymongo.ASCENDING
             if key[0] == '-':
                 direction = pymongo.DESCENDING
+
             if key[0] in ('-', '+'):
                 key = key[1:]
+
             key = key.replace('__', '.')
             try:
                 key = self._document._translate_field_name(key)
             except Exception:
+                # TODO this exception should be more specific
                 pass
+
             key_list.append((key, direction))
 
-        if self._cursor_obj and key_list:
-            self._cursor_obj.sort(key_list)
         return key_list
 
     def _get_scalar(self, doc):
@@ -1819,10 +1875,21 @@ def field_path_sub(match):
         return code
 
     def _chainable_method(self, method_name, val):
+        """Call a particular method on the PyMongo cursor call a particular chainable method
+        with the provided value.
+        """
         queryset = self.clone()
-        method = getattr(queryset._cursor, method_name)
-        method(val)
+
+        # Get an existing cursor object or create a new one
+        cursor = queryset._cursor
+
+        # Find the requested method on the cursor and call it with the
+        # provided value
+        getattr(cursor, method_name)(val)
+
+        # Cache the value on the queryset._{method_name}
         setattr(queryset, '_' + method_name, val)
+
         return queryset
 
     # Deprecated
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 9c1f24e12..b5d2765b4 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -136,13 +136,15 @@ def count(self, with_limit_and_skip=False):
         return self._len
 
     def no_cache(self):
-        """Convert to a non_caching queryset
+        """Convert to a non-caching queryset
 
         .. versionadded:: 0.8.3 Convert to non caching queryset
         """
         if self._result_cache is not None:
             raise OperationError('QuerySet already cached')
-        return self.clone_into(QuerySetNoCache(self._document, self._collection))
+
+        return self._clone_into(QuerySetNoCache(self._document,
+                                                self._collection))
 
 
 class QuerySetNoCache(BaseQuerySet):
@@ -153,7 +155,7 @@ def cache(self):
 
         .. versionadded:: 0.8.3 Convert to caching queryset
         """
-        return self.clone_into(QuerySet(self._document, self._collection))
+        return self._clone_into(QuerySet(self._document, self._collection))
 
     def __repr__(self):
         """Provides the string representation of the QuerySet
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 2d5b5b0fa..c54fa13d6 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -106,58 +106,111 @@ class BlogPost(Document):
             list(BlogPost.objects(author2__name="test"))
 
     def test_find(self):
-        """Ensure that a query returns a valid set of results.
-        """
-        self.Person(name="User A", age=20).save()
-        self.Person(name="User B", age=30).save()
+        """Ensure that a query returns a valid set of results."""
+        user_a = self.Person.objects.create(name='User A', age=20)
+        user_b = self.Person.objects.create(name='User B', age=30)
 
         # Find all people in the collection
         people = self.Person.objects
         self.assertEqual(people.count(), 2)
         results = list(people)
+
         self.assertTrue(isinstance(results[0], self.Person))
         self.assertTrue(isinstance(results[0].id, (ObjectId, str, unicode)))
-        self.assertEqual(results[0].name, "User A")
+
+        self.assertEqual(results[0], user_a)
+        self.assertEqual(results[0].name, 'User A')
         self.assertEqual(results[0].age, 20)
-        self.assertEqual(results[1].name, "User B")
+
+        self.assertEqual(results[1], user_b)
+        self.assertEqual(results[1].name, 'User B')
         self.assertEqual(results[1].age, 30)
 
-        # Use a query to filter the people found to just person1
+        # Filter people by age
         people = self.Person.objects(age=20)
         self.assertEqual(people.count(), 1)
         person = people.next()
+        self.assertEqual(person, user_a)
         self.assertEqual(person.name, "User A")
         self.assertEqual(person.age, 20)
 
-        # Test limit
+    def test_limit(self):
+        """Ensure that QuerySet.limit works as expected."""
+        user_a = self.Person.objects.create(name='User A', age=20)
+        user_b = self.Person.objects.create(name='User B', age=30)
+
+        # Test limit on a new queryset
         people = list(self.Person.objects.limit(1))
         self.assertEqual(len(people), 1)
-        self.assertEqual(people[0].name, 'User A')
+        self.assertEqual(people[0], user_a)
 
-        # Test skip
+        # Test limit on an existing queryset
+        people = self.Person.objects
+        self.assertEqual(len(people), 2)
+        people2 = people.limit(1)
+        self.assertEqual(len(people), 2)
+        self.assertEqual(len(people2), 1)
+        self.assertEqual(people2[0], user_a)
+
+        # Test chaining of only after limit
+        person = self.Person.objects().limit(1).only('name').first()
+        self.assertEqual(person, user_a)
+        self.assertEqual(person.name, 'User A')
+        self.assertEqual(person.age, None)
+
+    def test_skip(self):
+        """Ensure that QuerySet.skip works as expected."""
+        user_a = self.Person.objects.create(name='User A', age=20)
+        user_b = self.Person.objects.create(name='User B', age=30)
+
+        # Test skip on a new queryset
         people = list(self.Person.objects.skip(1))
         self.assertEqual(len(people), 1)
-        self.assertEqual(people[0].name, 'User B')
+        self.assertEqual(people[0], user_b)
 
-        person3 = self.Person(name="User C", age=40)
-        person3.save()
+        # Test skip on an existing queryset
+        people = self.Person.objects
+        self.assertEqual(len(people), 2)
+        people2 = people.skip(1)
+        self.assertEqual(len(people), 2)
+        self.assertEqual(len(people2), 1)
+        self.assertEqual(people2[0], user_b)
+
+        # Test chaining of only after skip
+        person = self.Person.objects().skip(1).only('name').first()
+        self.assertEqual(person, user_b)
+        self.assertEqual(person.name, 'User B')
+        self.assertEqual(person.age, None)
+
+    def test_slice(self):
+        """Ensure slicing a queryset works as expected."""
+        user_a = self.Person.objects.create(name='User A', age=20)
+        user_b = self.Person.objects.create(name='User B', age=30)
+        user_c = self.Person.objects.create(name="User C", age=40)
 
         # Test slice limit
         people = list(self.Person.objects[:2])
         self.assertEqual(len(people), 2)
-        self.assertEqual(people[0].name, 'User A')
-        self.assertEqual(people[1].name, 'User B')
+        self.assertEqual(people[0], user_a)
+        self.assertEqual(people[1], user_b)
 
         # Test slice skip
         people = list(self.Person.objects[1:])
         self.assertEqual(len(people), 2)
-        self.assertEqual(people[0].name, 'User B')
-        self.assertEqual(people[1].name, 'User C')
+        self.assertEqual(people[0], user_b)
+        self.assertEqual(people[1], user_c)
 
         # Test slice limit and skip
         people = list(self.Person.objects[1:2])
         self.assertEqual(len(people), 1)
-        self.assertEqual(people[0].name, 'User B')
+        self.assertEqual(people[0], user_b)
+
+        # Test slice limit and skip on an existing queryset
+        people = self.Person.objects
+        self.assertEqual(len(people), 3)
+        people2 = people[1:2]
+        self.assertEqual(len(people2), 1)
+        self.assertEqual(people2[0], user_b)
 
         # Test slice limit and skip cursor reset
         qs = self.Person.objects[1:2]
@@ -168,6 +221,7 @@ def test_find(self):
         self.assertEqual(len(people), 1)
         self.assertEqual(people[0].name, 'User B')
 
+        # Test empty slice
         people = list(self.Person.objects[1:1])
         self.assertEqual(len(people), 0)
 
@@ -187,12 +241,6 @@ def test_find(self):
         self.assertEqual("[<Person: Person object>, <Person: Person object>]",
                          "%s" % self.Person.objects[51:53])
 
-        # Test only after limit
-        self.assertEqual(self.Person.objects().limit(2).only('name')[0].age, None)
-
-        # Test only after skip
-        self.assertEqual(self.Person.objects().skip(2).only('name')[0].age, None)
-
     def test_find_one(self):
         """Ensure that a query using find_one returns a valid result.
         """
@@ -1226,6 +1274,7 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
+        # default ordering should be used by default
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title='whatever').first()
             self.assertEqual(len(q.get_ops()), 1)
@@ -1234,11 +1283,28 @@ class BlogPost(Document):
                 {'published_date': -1}
             )
 
+        # calling order_by() should clear the default ordering
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title='whatever').order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertFalse('$orderby' in q.get_ops()[0]['query'])
 
+        # calling an explicit order_by should use a specified sort
+        with db_ops_tracker() as q:
+            BlogPost.objects.filter(title='whatever').order_by('published_date').first()
+            self.assertEqual(len(q.get_ops()), 1)
+            self.assertEqual(
+                q.get_ops()[0]['query']['$orderby'],
+                {'published_date': 1}
+            )
+
+        # calling order_by() after an explicit sort should clear it
+        with db_ops_tracker() as q:
+            qs = BlogPost.objects.filter(title='whatever').order_by('published_date')
+            qs.order_by().first()
+            self.assertEqual(len(q.get_ops()), 1)
+            self.assertFalse('$orderby' in q.get_ops()[0]['query'])
+
     def test_no_ordering_for_get(self):
         """ Ensure that Doc.objects.get doesn't use any ordering.
         """

From ed34c2ca68a8005c1c48ef067163e63e273087c2 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Thu, 9 Feb 2017 12:13:56 -0800
Subject: [PATCH 0457/1519] update the changelog and upgrade docs

---
 docs/changelog.rst |  2 ++
 docs/upgrade.rst   | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a38378c84..cd99b73e9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,8 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop you features).
+- POTENTIAL BREAKING CHANGE: Fixed limit/skip/hint/batch_size chaining #1476
+- POTENTIAL BREAKING CHANGE: Changed a public `QuerySet.clone_into` method to a private `QuerySet._clone_into` #1476
 - Fixed connecting to a replica set with PyMongo 2.x #1436
 - Fixed an obscure error message when filtering by `field__in=non_iterable`. #1237
 
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index c0ae72051..17b1c4ac5 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -2,6 +2,20 @@
 Upgrading
 #########
 
+Development
+***********
+(Fill this out whenever you introduce breaking changes to MongoEngine)
+
+This release includes various fixes for the `BaseQuerySet` methods and how they
+are chained together. Since version 0.10.1 applying limit/skip/hint/batch_size
+to an already-existing queryset wouldn't modify the underlying PyMongo cursor.
+This has been fixed now, so you'll need to make sure that your code didn't rely
+on the broken implementation.
+
+Additionally, a public `BaseQuerySet.clone_into` has been renamed to a private
+`_clone_into`. If you directly used that method in your code, you'll need to
+rename its occurrences.
+
 0.11.0
 ******
 This release includes a major rehaul of MongoEngine's code quality and

From b27c7ce11baaf65fd36448b8b692fba15927b06c Mon Sep 17 00:00:00 2001
From: bagerard <bast.gerard@gmail.com>
Date: Wed, 15 Feb 2017 14:51:47 +0100
Subject: [PATCH 0458/1519] allow to use sets in field choices (#1482)

---
 docs/changelog.rst                |  3 +-
 docs/guide/defining-documents.rst |  6 +--
 mongoengine/base/fields.py        |  3 +-
 tests/fields/fields.py            | 61 ++++++++++++++++++-------------
 tests/fields/file_tests.py        |  8 ++--
 tests/utils.py                    | 22 +++++++++++
 6 files changed, 68 insertions(+), 35 deletions(-)
 create mode 100644 tests/utils.py

diff --git a/docs/changelog.rst b/docs/changelog.rst
index cd99b73e9..0da97e905 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,8 @@ Changelog
 
 Development
 ===========
-- (Fill this out as you fix issues and develop you features).
+- (Fill this out as you fix issues and develop your features).
+- Fixed using sets in field choices #1481
 - POTENTIAL BREAKING CHANGE: Fixed limit/skip/hint/batch_size chaining #1476
 - POTENTIAL BREAKING CHANGE: Changed a public `QuerySet.clone_into` method to a private `QuerySet._clone_into` #1476
 - Fixed connecting to a replica set with PyMongo 2.x #1436
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index e656dee01..d41ae7e63 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -150,7 +150,7 @@ arguments can be set on all fields:
     .. note:: If set, this field is also accessible through the `pk` field.
 
 :attr:`choices` (Default: None)
-    An iterable (e.g. a list or tuple) of choices to which the value of this
+    An iterable (e.g. list, tuple or set) of choices to which the value of this
     field should be limited.
 
     Can be either be a nested tuples of value (stored in mongo) and a
@@ -214,8 +214,8 @@ document class as the first argument::
 
 Dictionary Fields
 -----------------
-Often, an embedded document may be used instead of a dictionary – generally 
-embedded documents are recommended as dictionaries don’t support validation 
+Often, an embedded document may be used instead of a dictionary – generally
+embedded documents are recommended as dictionaries don’t support validation
 or custom field types. However, sometimes you will not know the structure of what you want to
 store; in this situation a :class:`~mongoengine.fields.DictField` is appropriate::
 
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 9ba9dc9a0..5658b1856 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -193,7 +193,8 @@ def _validate_choices(self, value):
         EmbeddedDocument = _import_class('EmbeddedDocument')
 
         choice_list = self.choices
-        if isinstance(choice_list[0], (list, tuple)):
+        if isinstance(next(iter(choice_list)), (list, tuple)):
+            # next(iter) is useful for sets
             choice_list = [k for k, _ in choice_list]
 
         # Choices which are other types of Documents
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 5c83d58cd..f24bcae4a 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
-import six
-from nose.plugins.skip import SkipTest
-
 import datetime
 import unittest
 import uuid
 import math
 import itertools
 import re
+
+from nose.plugins.skip import SkipTest
 import six
 
 try:
@@ -27,21 +26,13 @@
 from mongoengine.connection import get_db
 from mongoengine.base import (BaseDict, BaseField, EmbeddedDocumentList,
                               _document_registry)
-from mongoengine.errors import NotRegistered, DoesNotExist
-
-__all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")
 
+from tests.utils import MongoDBTestCase
 
-class FieldTest(unittest.TestCase):
+__all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")
 
-    def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
 
-    def tearDown(self):
-        self.db.drop_collection('fs.files')
-        self.db.drop_collection('fs.chunks')
-        self.db.drop_collection('mongoengine.counters')
+class FieldTest(MongoDBTestCase):
 
     def test_default_values_nothing_set(self):
         """Ensure that default field values are used when creating a document.
@@ -3186,26 +3177,42 @@ class Attachment(Document):
         att.delete()
         self.assertEqual(0, Attachment.objects.count())
 
-    def test_choices_validation(self):
-        """Ensure that value is in a container of allowed values.
+    def test_choices_allow_using_sets_as_choices(self):
+        """Ensure that sets can be used when setting choices
         """
         class Shirt(Document):
-            size = StringField(max_length=3, choices=(
-                ('S', 'Small'), ('M', 'Medium'), ('L', 'Large'),
-                ('XL', 'Extra Large'), ('XXL', 'Extra Extra Large')))
+            size = StringField(choices={'M', 'L'})
 
-        Shirt.drop_collection()
+        Shirt(size='M').validate()
+
+    def test_choices_validation_allow_no_value(self):
+        """Ensure that .validate passes and no value was provided
+        for a field setup with choices
+        """
+        class Shirt(Document):
+            size = StringField(choices=('S', 'M'))
 
         shirt = Shirt()
         shirt.validate()
 
-        shirt.size = "S"
+    def test_choices_validation_accept_possible_value(self):
+        """Ensure that value is in a container of allowed values.
+        """
+        class Shirt(Document):
+            size = StringField(choices=('S', 'M'))
+
+        shirt = Shirt(size='S')
         shirt.validate()
 
-        shirt.size = "XS"
-        self.assertRaises(ValidationError, shirt.validate)
+    def test_choices_validation_reject_unknown_value(self):
+        """Ensure that unallowed value are rejected upon validation
+        """
+        class Shirt(Document):
+            size = StringField(choices=('S', 'M'))
 
-        Shirt.drop_collection()
+        shirt = Shirt(size="XS")
+        with self.assertRaises(ValidationError):
+            shirt.validate()
 
     def test_choices_validation_documents(self):
         """
@@ -4420,7 +4427,8 @@ class A(Document):
             my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))
 
         A(my_list=[]).save()
-        self.assertRaises(NotUniqueError, lambda: A(my_list=[]).save())
+        with self.assertRaises(NotUniqueError):
+            A(my_list=[]).save()
 
         class EmbeddedWithSparseUnique(EmbeddedDocument):
             number = IntField(unique=True, sparse=True)
@@ -4431,6 +4439,9 @@ class B(Document):
         B(my_list=[]).save()
         B(my_list=[]).save()
 
+        A.drop_collection()
+        B.drop_collection()
+
     def test_filtered_delete(self):
         """
         Tests the delete method of a List of Embedded Documents
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index b266a5e58..8364d5ef9 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -18,15 +18,13 @@
 except ImportError:
     HAS_PIL = False
 
+from tests.utils import MongoDBTestCase
+
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), 'mongoengine.png')
 TEST_IMAGE2_PATH = os.path.join(os.path.dirname(__file__), 'mongodb_leaf.png')
 
 
-class FileTest(unittest.TestCase):
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
+class FileTest(MongoDBTestCase):
 
     def tearDown(self):
         self.db.drop_collection('fs.files')
diff --git a/tests/utils.py b/tests/utils.py
new file mode 100644
index 000000000..128bbff0f
--- /dev/null
+++ b/tests/utils.py
@@ -0,0 +1,22 @@
+import unittest
+
+from mongoengine import connect
+from mongoengine.connection import get_db
+
+MONGO_TEST_DB = 'mongoenginetest'
+
+
+class MongoDBTestCase(unittest.TestCase):
+    """Base class for tests that need a mongodb connection
+    db is being dropped automatically
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        cls._connection = connect(db=MONGO_TEST_DB)
+        cls._connection.drop_database(MONGO_TEST_DB)
+        cls.db = get_db()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls._connection.drop_database(MONGO_TEST_DB)

From 3fe8031cf3d607f960664c971fff328bd98c19db Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 22 Feb 2017 12:44:05 -0500
Subject: [PATCH 0459/1519] fix EmbeddedDocumentListFieldTestCase

---
 tests/fields/fields.py | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index f24bcae4a..e6898e1b3 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -218,9 +218,9 @@ class HandleNoneFields(Document):
         self.assertTrue(isinstance(ret.comp_dt_fld, datetime.datetime))
 
     def test_not_required_handles_none_from_database(self):
-        """Ensure that every fields can handle null values from the database.
+        """Ensure that every field can handle null values from the
+        database.
         """
-
         class HandleNoneFields(Document):
             str_fld = StringField(required=True)
             int_fld = IntField(required=True)
@@ -4031,12 +4031,13 @@ class TestLongFieldConsideredAsInt64(Document):
         self.assertTrue(isinstance(doc.some_long, six.integer_types))
 
 
-class EmbeddedDocumentListFieldTestCase(unittest.TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        cls.db = connect(db='EmbeddedDocumentListFieldTestCase')
+class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):
 
+    def setUp(self):
+        """
+        Create two BlogPost entries in the database, each with
+        several EmbeddedDocuments.
+        """
         class Comments(EmbeddedDocument):
             author = StringField()
             message = StringField()
@@ -4044,14 +4045,11 @@ class Comments(EmbeddedDocument):
         class BlogPost(Document):
             comments = EmbeddedDocumentListField(Comments)
 
-        cls.Comments = Comments
-        cls.BlogPost = BlogPost
+        BlogPost.drop_collection()
+
+        self.Comments = Comments
+        self.BlogPost = BlogPost
 
-    def setUp(self):
-        """
-        Create two BlogPost entries in the database, each with
-        several EmbeddedDocuments.
-        """
         self.post1 = self.BlogPost(comments=[
             self.Comments(author='user1', message='message1'),
             self.Comments(author='user2', message='message1')
@@ -4063,13 +4061,6 @@ def setUp(self):
             self.Comments(author='user3', message='message1')
         ]).save()
 
-    def tearDown(self):
-        self.BlogPost.drop_collection()
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.db.drop_database('EmbeddedDocumentListFieldTestCase')
-
     def test_no_keyword_filter(self):
         """
         Tests the filter method of a List of Embedded Documents
@@ -4436,12 +4427,12 @@ class EmbeddedWithSparseUnique(EmbeddedDocument):
         class B(Document):
             my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique))
 
-        B(my_list=[]).save()
-        B(my_list=[]).save()
-
         A.drop_collection()
         B.drop_collection()
 
+        B(my_list=[]).save()
+        B(my_list=[]).save()
+
     def test_filtered_delete(self):
         """
         Tests the delete method of a List of Embedded Documents
@@ -4478,6 +4469,8 @@ class CustomData(Document):
             a_field = IntField()
             c_field = IntField(custom_data=custom_data)
 
+        CustomData.drop_collection()
+
         a1 = CustomData(a_field=1, c_field=2).save()
         self.assertEqual(2, a1.c_field)
         self.assertFalse(hasattr(a1.c_field, 'custom_data'))

From 3f3166679659ac19b0651fb92d321153568a53b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Fri, 24 Feb 2017 16:18:34 -0500
Subject: [PATCH 0460/1519] Fix the exception message when validating unicode
 URLs (#1486)

---
 mongoengine/fields.py  |  4 ++--
 tests/fields/fields.py | 26 ++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 0ea7d3b65..114250954 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -139,12 +139,12 @@ def validate(self, value):
         # Check first if the scheme is valid
         scheme = value.split('://')[0].lower()
         if scheme not in self.schemes:
-            self.error('Invalid scheme {} in URL: {}'.format(scheme, value))
+            self.error(u'Invalid scheme {} in URL: {}'.format(scheme, value))
             return
 
         # Then check full URL
         if not self.url_regex.match(value):
-            self.error('Invalid URL: {}'.format(value))
+            self.error(u'Invalid URL: {}'.format(value))
             return
 
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index e6898e1b3..318c0c595 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -341,11 +341,12 @@ class Person(Document):
         person.validate()
 
     def test_url_validation(self):
-        """Ensure that URLFields validate urls properly.
-        """
+        """Ensure that URLFields validate urls properly."""
         class Link(Document):
             url = URLField()
 
+        Link.drop_collection()
+
         link = Link()
         link.url = 'google'
         self.assertRaises(ValidationError, link.validate)
@@ -353,6 +354,27 @@ class Link(Document):
         link.url = 'http://www.google.com:8080/'
         link.validate()
 
+    def test_unicode_url_validation(self):
+        """Ensure unicode URLs are validated properly."""
+        class Link(Document):
+            url = URLField()
+
+        Link.drop_collection()
+
+        link = Link()
+        link.url = u'http://xn--b1agh1afp.com/'
+
+        # TODO fix URL validation - this *IS* a valid URL
+        # For now we just want to make sure that the error message is correct
+        try:
+            link.validate()
+            self.assertTrue(False)
+        except ValidationError as e:
+            self.assertEqual(
+                unicode(e),
+                u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])"
+            )
+
     def test_url_scheme_validation(self):
         """Ensure that URLFields validate urls with specific schemes properly.
         """

From e93a95d0cb92d91225bdf30abb8e661503fde6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sat, 25 Feb 2017 14:09:10 -0500
Subject: [PATCH 0461/1519] Test and document controlling the size of the
 connection pool (#1489)

---
 mongoengine/connection.py |  9 +++++++--
 tests/test_connection.py  | 29 +++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index c7c16ca39..7eae810f1 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -51,7 +51,9 @@ def register_connection(alias, name=None, host=None, port=None,
         MONGODB-CR (MongoDB Challenge Response protocol) for older servers.
     :param is_mock: explicitly use mongomock for this connection
         (can also be done by using `mongomock://` as db host prefix)
-    :param kwargs: allow ad-hoc parameters to be passed into the pymongo driver
+    :param kwargs: ad-hoc parameters to be passed into the pymongo driver,
+        for example maxpoolsize, tz_aware, etc. See the documentation
+        for pymongo's `MongoClient` for a full list.
 
     .. versionchanged:: 0.10.6 - added mongomock support
     """
@@ -241,9 +243,12 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
     running on the default port on localhost. If authentication is needed,
     provide username and password arguments as well.
 
-    Multiple databases are supported by using aliases.  Provide a separate
+    Multiple databases are supported by using aliases. Provide a separate
     `alias` to connect to a different instance of :program:`mongod`.
 
+    See the docstring for `register_connection` for more details about all
+    supported kwargs.
+
     .. versionchanged:: 0.6 - added multiple database support.
     """
     if alias not in _connections:
diff --git a/tests/test_connection.py b/tests/test_connection.py
index cc75f1e77..a1d3bfb62 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -285,8 +285,7 @@ def test_register_connection_defaults(self):
         self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
 
     def test_connection_kwargs(self):
-        """Ensure that connection kwargs get passed to pymongo.
-        """
+        """Ensure that connection kwargs get passed to pymongo."""
         connect('mongoenginetest', alias='t1', tz_aware=True)
         conn = get_connection('t1')
 
@@ -296,6 +295,32 @@ def test_connection_kwargs(self):
         conn = get_connection('t2')
         self.assertFalse(get_tz_awareness(conn))
 
+    def test_connection_pool_via_kwarg(self):
+        """Ensure we can specify a max connection pool size using
+        a connection kwarg.
+        """
+        # Use "max_pool_size" or "maxpoolsize" depending on PyMongo version
+        # (former was changed to the latter as described in
+        # https://jira.mongodb.org/browse/PYTHON-854).
+        # TODO remove once PyMongo < 3.0 support is dropped
+        if pymongo.version_tuple[0] >= 3:
+            pool_size_kwargs = {'maxpoolsize': 100}
+        else:
+            pool_size_kwargs = {'max_pool_size': 100}
+
+        conn = connect('mongoenginetest', alias='max_pool_size_via_kwarg', **pool_size_kwargs)
+        self.assertEqual(conn.max_pool_size, 100)
+
+    def test_connection_pool_via_uri(self):
+        """Ensure we can specify a max connection pool size using
+        an option in a connection URI.
+        """
+        if pymongo.version_tuple[0] == 2 and pymongo.version_tuple[1] < 9:
+            raise SkipTest('maxpoolsize as a URI option is only supported in PyMongo v2.9+')
+
+        conn = connect(host='mongodb://localhost/test?maxpoolsize=100', alias='max_pool_size_via_uri')
+        self.assertEqual(conn.max_pool_size, 100)
+
     def test_write_concern(self):
         """Ensure write concern can be specified in connect() via
         a kwarg or as part of the connection URI.

From 2bedb36d7f025bdda72fde0b927eafa10143f823 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer.drow@gmail.com>
Date: Sun, 26 Feb 2017 21:52:43 +0200
Subject: [PATCH 0462/1519] Test against multiple MongoDB versions in Travis
 (#1074)

---
 .install_mongodb_on_travis.sh |  23 ++
 .travis.yml                   |  67 ++++--
 CONTRIBUTING.rst              |  29 ++-
 README.rst                    |  45 ++--
 tests/document/indexes.py     |  21 +-
 tests/queryset/geo.py         | 442 +++++++++++++++++++---------------
 tests/queryset/queryset.py    |  82 +++----
 tests/test_connection.py      |  26 +-
 tests/utils.py                |  58 ++++-
 tox.ini                       |  13 +-
 10 files changed, 470 insertions(+), 336 deletions(-)
 create mode 100644 .install_mongodb_on_travis.sh

diff --git a/.install_mongodb_on_travis.sh b/.install_mongodb_on_travis.sh
new file mode 100644
index 000000000..8563ae744
--- /dev/null
+++ b/.install_mongodb_on_travis.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
+
+if [ "$MONGODB" = "2.4" ]; then
+    echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" | sudo tee /etc/apt/sources.list.d/mongodb.list
+    sudo apt-get update
+    sudo apt-get install mongodb-10gen=2.4.14
+    sudo service mongodb start
+elif [ "$MONGODB" = "2.6" ]; then
+    echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" | sudo tee /etc/apt/sources.list.d/mongodb.list
+    sudo apt-get update
+    sudo apt-get install mongodb-org-server=2.6.12
+    # service should be started automatically
+elif [ "$MONGODB" = "3.0" ]; then
+    echo "deb http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb.list
+    sudo apt-get update
+    sudo apt-get install mongodb-org-server=3.0.14
+    # service should be started automatically
+else
+    echo "Invalid MongoDB version, expected 2.4, 2.6, or 3.0."
+    exit 1
+fi;
diff --git a/.travis.yml b/.travis.yml
index cb6c97e69..474489508 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,48 @@
+# For full coverage, we'd have to test all supported Python, MongoDB, and
+# PyMongo combinations. However, that would result in an overly long build
+# with a very large number of jobs, hence we only test a subset of all the
+# combinations:
+# * MongoDB v2.4 & v3.0 are only tested against Python v2.7 & v3.5.
+# * MongoDB v2.4 is tested against PyMongo v2.7 & v3.x.
+# * MongoDB v3.0 is tested against PyMongo v3.x.
+# * MongoDB v2.6 is currently the "main" version tested against Python v2.7,
+#   v3.5, PyPy & PyPy3, and PyMongo v2.7, v2.8 & v3.x.
+#
+# Reminder: Update README.rst if you change MongoDB versions we test.
+
 language: python
 
 python:
-- '2.7'
-- '3.3'
-- '3.4'
-- '3.5'
+- 2.7
+- 3.5
 - pypy
 - pypy3
 
 env:
-- PYMONGO=2.7
-- PYMONGO=2.8
-- PYMONGO=3.0
-- PYMONGO=dev
+- MONGODB=2.6 PYMONGO=2.7
+- MONGODB=2.6 PYMONGO=2.8
+- MONGODB=2.6 PYMONGO=3.0
 
 matrix:
+  # Finish the build as soon as one job fails
   fast_finish: true
 
+  include:
+  - python: 2.7
+    env: MONGODB=2.4 PYMONGO=2.7
+  - python: 2.7
+    env: MONGODB=2.4 PYMONGO=3.0
+  - python: 2.7
+    env: MONGODB=3.0 PYMONGO=3.0
+  - python: 3.5
+    env: MONGODB=2.4 PYMONGO=2.7
+  - python: 3.5
+    env: MONGODB=2.4 PYMONGO=3.0
+  - python: 3.5
+    env: MONGODB=3.0 PYMONGO=3.0
+
 before_install:
-- travis_retry sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
-- echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' |
-  sudo tee /etc/apt/sources.list.d/mongodb.list
-- travis_retry sudo apt-get update
-- travis_retry sudo apt-get install mongodb-org-server
+- bash .install_mongodb_on_travis.sh
 
 install:
 - sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev
@@ -30,14 +50,17 @@ install:
   python-tk
 - travis_retry pip install --upgrade pip
 - travis_retry pip install coveralls
-- travis_retry pip install flake8
+- travis_retry pip install flake8 flake8-import-order
 - travis_retry pip install tox>=1.9
 - travis_retry pip install "virtualenv<14.0.0"  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
 - travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
 
+# Cache dependencies installed via pip
+cache: pip
+
 # Run flake8 for py27
 before_script:
-- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then tox -e flake8; fi
+- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then flake8 .; else echo "flake8 only runs on py27"; fi
 
 script:
 - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
@@ -45,22 +68,34 @@ script:
 # For now only submit coveralls for Python v2.7. Python v3.x currently shows
 # 0% coverage. That's caused by 'use_2to3', which builds the py3-compatible
 # code in a separate dir and runs tests on that.
-after_script:
+after_success:
 - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls --verbose; fi
 
 notifications:
   irc: irc.freenode.org#mongoengine
 
+# Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
 branches:
   only:
   - master
   - /^v.*$/
 
+# Whenever a new release is created via GitHub, publish it on PyPI.
 deploy:
   provider: pypi
   user: the_drow
   password:
     secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
+
+  # create a source distribution and a pure python wheel for faster installs
+  distributions: "sdist bdist_wheel"
+
+  # only deploy on tagged commits (aka GitHub releases) and only for the
+  # parent repo's builds running Python 2.7 along with dev PyMongo (we run
+  # Travis against many different Python and PyMongo versions and we don't
+  # want the deploy to occur multiple times).
   on:
     tags: true
     repo: MongoEngine/mongoengine
+    condition: "$PYMONGO = 3.0"
+    python: 2.7
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 2668499ce..5707886ba 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -29,19 +29,20 @@ Style Guide
 -----------
 
 MongoEngine aims to follow `PEP8 <http://www.python.org/dev/peps/pep-0008/>`_
-including 4 space indents. When possible we try to stick to 79 character line limits.
-However, screens got bigger and an ORM has a strong focus on readability and
-if it can help, we accept 119 as maximum line length, in a similar way as
-`django does <https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/#python-style>`_
+including 4 space indents. When possible we try to stick to 79 character line
+limits. However, screens got bigger and an ORM has a strong focus on
+readability and if it can help, we accept 119 as maximum line length, in a
+similar way as `django does
+<https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/#python-style>`_
 
 Testing
 -------
 
 All tests are run on `Travis <http://travis-ci.org/MongoEngine/mongoengine>`_
-and any pull requests are automatically tested by Travis. Any pull requests
-without tests will take longer to be integrated and might be refused.
+and any pull requests are automatically tested. Any pull requests without
+tests will take longer to be integrated and might be refused.
 
-You may also submit a simple failing test as a PullRequest if you don't know
+You may also submit a simple failing test as a pull request if you don't know
 how to fix it, it will be easier for other people to work on it and it may get
 fixed faster.
 
@@ -49,13 +50,18 @@ General Guidelines
 ------------------
 
 - Avoid backward breaking changes if at all possible.
+- If you *have* to introduce a breaking change, make it very clear in your
+  pull request's description. Also, describe how users of this package
+  should adapt to the breaking change in docs/upgrade.rst.
 - Write inline documentation for new classes and methods.
 - Write tests and make sure they pass (make sure you have a mongod
   running on the default port, then execute ``python setup.py nosetests``
   from the cmd line to run the test suite).
-- Ensure tests pass on every Python and PyMongo versions.
-  You can test on these versions locally by executing ``tox``
-- Add enhancements or problematic bug fixes to docs/changelog.rst
+- Ensure tests pass on all supported Python, PyMongo, and MongoDB versions.
+  You can test various Python and PyMongo versions locally by executing
+  ``tox``. For different MongoDB versions, you can rely on our automated
+  Travis tests.
+- Add enhancements or problematic bug fixes to docs/changelog.rst.
 - Add yourself to AUTHORS :)
 
 Documentation
@@ -69,3 +75,6 @@ just make your changes to the inline documentation of the appropriate
 branch and submit a `pull request <https://help.github.com/articles/using-pull-requests>`_.
 You might also use the github `Edit <https://github.com/blog/844-forking-with-the-edit-button>`_
 button.
+
+If you want to test your documentation changes locally, you need to install
+the ``sphinx`` package.
diff --git a/README.rst b/README.rst
index adfa0c715..e1e2aef69 100644
--- a/README.rst
+++ b/README.rst
@@ -19,23 +19,31 @@ MongoEngine
 About
 =====
 MongoEngine is a Python Object-Document Mapper for working with MongoDB.
-Documentation available at https://mongoengine-odm.readthedocs.io - there is currently
-a `tutorial <https://mongoengine-odm.readthedocs.io/tutorial.html>`_, a `user guide
-<https://mongoengine-odm.readthedocs.io/guide/index.html>`_ and an `API reference
-<https://mongoengine-odm.readthedocs.io/apireference.html>`_.
+Documentation is available at https://mongoengine-odm.readthedocs.io - there
+is currently a `tutorial <https://mongoengine-odm.readthedocs.io/tutorial.html>`_,
+a `user guide <https://mongoengine-odm.readthedocs.io/guide/index.html>`_, and
+an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
+
+Supported MongoDB Versions
+==========================
+MongoEngine is currently tested against MongoDB v2.4, v2.6, and v3.0. Future
+versions should be supported as well, but aren't actively tested at the moment.
+Make sure to open an issue or submit a pull request if you experience any
+problems with MongoDB v3.2+.
 
 Installation
 ============
 We recommend the use of `virtualenv <https://virtualenv.pypa.io/>`_ and of
 `pip <https://pip.pypa.io/>`_. You can then use ``pip install -U mongoengine``.
-You may also have `setuptools <http://peak.telecommunity.com/DevCenter/setuptools>`_ and thus
-you can use ``easy_install -U mongoengine``. Otherwise, you can download the
+You may also have `setuptools <http://peak.telecommunity.com/DevCenter/setuptools>`_
+and thus you can use ``easy_install -U mongoengine``. Otherwise, you can download the
 source from `GitHub <http://github.com/MongoEngine/mongoengine>`_ and run ``python
 setup.py install``.
 
 Dependencies
 ============
-All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_. At the very least, you'll need these two packages to use MongoEngine:
+All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_.
+At the very least, you'll need these two packages to use MongoEngine:
 
 - pymongo>=2.7.1
 - six>=1.10.0
@@ -48,10 +56,6 @@ If you need to use an ``ImageField`` or ``ImageGridFsProxy``:
 
 - Pillow>=2.0.0
 
-If you want to generate the documentation (e.g. to contribute to it):
-
-- sphinx
-
 Examples
 ========
 Some simple examples of what MongoEngine code looks like:
@@ -110,11 +114,11 @@ Some simple examples of what MongoEngine code looks like:
 Tests
 =====
 To run the test suite, ensure you are running a local instance of MongoDB on
-the standard port and have ``nose`` installed. Then, run: ``python setup.py nosetests``.
+the standard port and have ``nose`` installed. Then, run ``python setup.py nosetests``.
 
-To run the test suite on every supported Python version and every supported PyMongo version,
-you can use ``tox``.
-tox and each supported Python version should be installed in your environment:
+To run the test suite on every supported Python and PyMongo version, you can
+use ``tox``. You'll need to make sure you have each supported Python version
+installed in your environment and then:
 
 .. code-block:: shell
 
@@ -123,13 +127,16 @@ tox and each supported Python version should be installed in your environment:
     # Run the test suites
     $ tox
 
-If you wish to run one single or selected tests, use the nosetest convention. It will find the folder,
-eventually the file, go to the TestClass specified after the colon and eventually right to the single test.
-Also use the -s argument if you want to print out whatever or access pdb while testing.
+If you wish to run a subset of tests, use the nosetests convention:
 
 .. code-block:: shell
 
-    $ python setup.py nosetests --tests tests/fields/fields.py:FieldTest.test_cls_field -s
+    # Run all the tests in a particular test file
+    $ python setup.py nosetests --tests tests/fields/fields.py
+    # Run only particular test class in that file
+    $ python setup.py nosetests --tests tests/fields/fields.py:FieldTest
+    # Use the -s option if you want to print some debug statements or use pdb
+    $ python setup.py nosetests --tests tests/fields/fields.py:FieldTest -s
 
 Community
 =========
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index af93e7db2..5d219eda0 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -2,14 +2,14 @@
 import unittest
 import sys
 
-
-import pymongo
-
 from nose.plugins.skip import SkipTest
 from datetime import datetime
+import pymongo
 
 from mongoengine import *
-from mongoengine.connection import get_db, get_connection
+from mongoengine.connection import get_db
+
+from tests.utils import get_mongodb_version, needs_mongodb_v26
 
 __all__ = ("IndexesTest", )
 
@@ -494,8 +494,7 @@ class Test(Document):
         obj = Test(a=1)
         obj.save()
 
-        connection = get_connection()
-        IS_MONGODB_3 = connection.server_info()['versionArray'][0] >= 3
+        IS_MONGODB_3 = get_mongodb_version()[0] >= 3
 
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
@@ -733,14 +732,6 @@ class Log(Document):
 
         Log.drop_collection()
 
-        if pymongo.version_tuple[0] < 2 and pymongo.version_tuple[1] < 3:
-            raise SkipTest('pymongo needs to be 2.3 or higher for this test')
-
-        connection = get_connection()
-        version_array = connection.server_info()['versionArray']
-        if version_array[0] < 2 and version_array[1] < 2:
-            raise SkipTest('MongoDB needs to be 2.2 or higher for this test')
-
         # Indexes are lazy so use list() to perform query
         list(Log.objects)
         info = Log.objects._collection.index_information()
@@ -874,8 +865,8 @@ class MyDoc(Document):
                          info['provider_ids.foo_1_provider_ids.bar_1']['key'])
         self.assertTrue(info['provider_ids.foo_1_provider_ids.bar_1']['sparse'])
 
+    @needs_mongodb_v26
     def test_text_indexes(self):
-
         class Book(Document):
             title = DictField()
             meta = {
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index d10c51cd0..51a323821 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -1,105 +1,139 @@
-from datetime import datetime, timedelta
+import datetime
 import unittest
 
-from pymongo.errors import OperationFailure
 from mongoengine import *
-from mongoengine.connection import get_connection
-from nose.plugins.skip import SkipTest
 
+from tests.utils import MongoDBTestCase, needs_mongodb_v3
 
-__all__ = ("GeoQueriesTest",)
 
+__all__ = ("GeoQueriesTest",)
 
-class GeoQueriesTest(unittest.TestCase):
 
-    def setUp(self):
-        connect(db='mongoenginetest')
+class GeoQueriesTest(MongoDBTestCase):
 
-    def test_geospatial_operators(self):
-        """Ensure that geospatial queries are working.
-        """
+    def _create_event_data(self, point_field_class=GeoPointField):
+        """Create some sample data re-used in many of the tests below."""
         class Event(Document):
             title = StringField()
             date = DateTimeField()
-            location = GeoPointField()
+            location = point_field_class()
 
             def __unicode__(self):
                 return self.title
 
+        self.Event = Event
+
         Event.drop_collection()
 
-        event1 = Event(title="Coltrane Motion @ Double Door",
-                       date=datetime.now() - timedelta(days=1),
-                       location=[-87.677137, 41.909889]).save()
-        event2 = Event(title="Coltrane Motion @ Bottom of the Hill",
-                       date=datetime.now() - timedelta(days=10),
-                       location=[-122.4194155, 37.7749295]).save()
-        event3 = Event(title="Coltrane Motion @ Empty Bottle",
-                       date=datetime.now(),
-                       location=[-87.686638, 41.900474]).save()
+        event1 = Event.objects.create(
+            title="Coltrane Motion @ Double Door",
+            date=datetime.datetime.now() - datetime.timedelta(days=1),
+            location=[-87.677137, 41.909889])
+        event2 = Event.objects.create(
+            title="Coltrane Motion @ Bottom of the Hill",
+            date=datetime.datetime.now() - datetime.timedelta(days=10),
+            location=[-122.4194155, 37.7749295])
+        event3 = Event.objects.create(
+            title="Coltrane Motion @ Empty Bottle",
+            date=datetime.datetime.now(),
+            location=[-87.686638, 41.900474])
+
+        return event1, event2, event3
+
+    def test_near(self):
+        """Make sure the "near" operator works."""
+        event1, event2, event3 = self._create_event_data()
 
         # find all events "near" pitchfork office, chicago.
         # note that "near" will show the san francisco event, too,
         # although it sorts to last.
-        events = Event.objects(location__near=[-87.67892, 41.9120459])
+        events = self.Event.objects(location__near=[-87.67892, 41.9120459])
         self.assertEqual(events.count(), 3)
         self.assertEqual(list(events), [event1, event3, event2])
 
-        # find events within 5 degrees of pitchfork office, chicago
-        point_and_distance = [[-87.67892, 41.9120459], 5]
-        events = Event.objects(location__within_distance=point_and_distance)
-        self.assertEqual(events.count(), 2)
-        events = list(events)
-        self.assertTrue(event2 not in events)
-        self.assertTrue(event1 in events)
-        self.assertTrue(event3 in events)
-
         # ensure ordering is respected by "near"
-        events = Event.objects(location__near=[-87.67892, 41.9120459])
+        events = self.Event.objects(location__near=[-87.67892, 41.9120459])
         events = events.order_by("-date")
         self.assertEqual(events.count(), 3)
         self.assertEqual(list(events), [event3, event1, event2])
 
+    def test_near_and_max_distance(self):
+        """Ensure the "max_distance" operator works alongside the "near"
+        operator.
+        """
+        event1, event2, event3 = self._create_event_data()
+
         # find events within 10 degrees of san francisco
         point = [-122.415579, 37.7566023]
-        events = Event.objects(location__near=point, location__max_distance=10)
+        events = self.Event.objects(location__near=point,
+                                    location__max_distance=10)
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0], event2)
 
+    # $minDistance was added in MongoDB v2.6, but continued being buggy
+    # until v3.0; skip for older versions
+    @needs_mongodb_v3
+    def test_near_and_min_distance(self):
+        """Ensure the "min_distance" operator works alongside the "near"
+        operator.
+        """
+        event1, event2, event3 = self._create_event_data()
+
         # find events at least 10 degrees away of san francisco
         point = [-122.415579, 37.7566023]
-        events = Event.objects(location__near=point, location__min_distance=10)
-        # The following real test passes on MongoDB 3 but minDistance seems
-        # buggy on older MongoDB versions
-        if get_connection().server_info()['versionArray'][0] > 2:
-            self.assertEqual(events.count(), 2)
-        else:
-            self.assertTrue(events.count() >= 2)
+        events = self.Event.objects(location__near=point,
+                                    location__min_distance=10)
+        self.assertEqual(events.count(), 2)
+
+    def test_within_distance(self):
+        """Make sure the "within_distance" operator works."""
+        event1, event2, event3 = self._create_event_data()
+
+        # find events within 5 degrees of pitchfork office, chicago
+        point_and_distance = [[-87.67892, 41.9120459], 5]
+        events = self.Event.objects(
+            location__within_distance=point_and_distance)
+        self.assertEqual(events.count(), 2)
+        events = list(events)
+        self.assertTrue(event2 not in events)
+        self.assertTrue(event1 in events)
+        self.assertTrue(event3 in events)
 
         # find events within 10 degrees of san francisco
         point_and_distance = [[-122.415579, 37.7566023], 10]
-        events = Event.objects(location__within_distance=point_and_distance)
+        events = self.Event.objects(
+            location__within_distance=point_and_distance)
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0], event2)
 
         # find events within 1 degree of greenpoint, broolyn, nyc, ny
         point_and_distance = [[-73.9509714, 40.7237134], 1]
-        events = Event.objects(location__within_distance=point_and_distance)
+        events = self.Event.objects(
+            location__within_distance=point_and_distance)
         self.assertEqual(events.count(), 0)
 
         # ensure ordering is respected by "within_distance"
         point_and_distance = [[-87.67892, 41.9120459], 10]
-        events = Event.objects(location__within_distance=point_and_distance)
+        events = self.Event.objects(
+            location__within_distance=point_and_distance)
         events = events.order_by("-date")
         self.assertEqual(events.count(), 2)
         self.assertEqual(events[0], event3)
 
+    def test_within_box(self):
+        """Ensure the "within_box" operator works."""
+        event1, event2, event3 = self._create_event_data()
+
         # check that within_box works
         box = [(-125.0, 35.0), (-100.0, 40.0)]
-        events = Event.objects(location__within_box=box)
+        events = self.Event.objects(location__within_box=box)
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0].id, event2.id)
 
+    def test_within_polygon(self):
+        """Ensure the "within_polygon" operator works."""
+        event1, event2, event3 = self._create_event_data()
+
         polygon = [
             (-87.694445, 41.912114),
             (-87.69084, 41.919395),
@@ -107,7 +141,7 @@ def __unicode__(self):
             (-87.654276, 41.911731),
             (-87.656164, 41.898061),
         ]
-        events = Event.objects(location__within_polygon=polygon)
+        events = self.Event.objects(location__within_polygon=polygon)
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0].id, event1.id)
 
@@ -116,13 +150,151 @@ def __unicode__(self):
             (-1.225891, 52.792797),
             (-4.40094, 53.389881)
         ]
-        events = Event.objects(location__within_polygon=polygon2)
+        events = self.Event.objects(location__within_polygon=polygon2)
         self.assertEqual(events.count(), 0)
 
-    def test_geo_spatial_embedded(self):
+    def test_2dsphere_near(self):
+        """Make sure the "near" operator works with a PointField, which
+        corresponds to a 2dsphere index.
+        """
+        event1, event2, event3 = self._create_event_data(
+            point_field_class=PointField
+        )
+
+        # find all events "near" pitchfork office, chicago.
+        # note that "near" will show the san francisco event, too,
+        # although it sorts to last.
+        events = self.Event.objects(location__near=[-87.67892, 41.9120459])
+        self.assertEqual(events.count(), 3)
+        self.assertEqual(list(events), [event1, event3, event2])
+
+        # ensure ordering is respected by "near"
+        events = self.Event.objects(location__near=[-87.67892, 41.9120459])
+        events = events.order_by("-date")
+        self.assertEqual(events.count(), 3)
+        self.assertEqual(list(events), [event3, event1, event2])
+
+    def test_2dsphere_near_and_max_distance(self):
+        """Ensure the "max_distance" operator works alongside the "near"
+        operator with a 2dsphere index.
+        """
+        event1, event2, event3 = self._create_event_data(
+            point_field_class=PointField
+        )
+
+        # find events within 10km of san francisco
+        point = [-122.415579, 37.7566023]
+        events = self.Event.objects(location__near=point,
+                                    location__max_distance=10000)
+        self.assertEqual(events.count(), 1)
+        self.assertEqual(events[0], event2)
+
+        # find events within 1km of greenpoint, broolyn, nyc, ny
+        events = self.Event.objects(location__near=[-73.9509714, 40.7237134],
+                                    location__max_distance=1000)
+        self.assertEqual(events.count(), 0)
 
+        # ensure ordering is respected by "near"
+        events = self.Event.objects(
+            location__near=[-87.67892, 41.9120459],
+            location__max_distance=10000
+        ).order_by("-date")
+        self.assertEqual(events.count(), 2)
+        self.assertEqual(events[0], event3)
+
+    def test_2dsphere_geo_within_box(self):
+        """Ensure the "geo_within_box" operator works with a 2dsphere
+        index.
+        """
+        event1, event2, event3 = self._create_event_data(
+            point_field_class=PointField
+        )
+
+        # check that within_box works
+        box = [(-125.0, 35.0), (-100.0, 40.0)]
+        events = self.Event.objects(location__geo_within_box=box)
+        self.assertEqual(events.count(), 1)
+        self.assertEqual(events[0].id, event2.id)
+
+    def test_2dsphere_geo_within_polygon(self):
+        """Ensure the "geo_within_polygon" operator works with a
+        2dsphere index.
+        """
+        event1, event2, event3 = self._create_event_data(
+            point_field_class=PointField
+        )
+
+        polygon = [
+            (-87.694445, 41.912114),
+            (-87.69084, 41.919395),
+            (-87.681742, 41.927186),
+            (-87.654276, 41.911731),
+            (-87.656164, 41.898061),
+        ]
+        events = self.Event.objects(location__geo_within_polygon=polygon)
+        self.assertEqual(events.count(), 1)
+        self.assertEqual(events[0].id, event1.id)
+
+        polygon2 = [
+            (-1.742249, 54.033586),
+            (-1.225891, 52.792797),
+            (-4.40094, 53.389881)
+        ]
+        events = self.Event.objects(location__geo_within_polygon=polygon2)
+        self.assertEqual(events.count(), 0)
+
+    # $minDistance was added in MongoDB v2.6, but continued being buggy
+    # until v3.0; skip for older versions
+    @needs_mongodb_v3
+    def test_2dsphere_near_and_min_max_distance(self):
+        """Ensure "min_distace" and "max_distance" operators work well
+        together with the "near" operator in a 2dsphere index.
+        """
+        event1, event2, event3 = self._create_event_data(
+            point_field_class=PointField
+        )
+
+        # ensure min_distance and max_distance combine well
+        events = self.Event.objects(
+            location__near=[-87.67892, 41.9120459],
+            location__min_distance=1000,
+            location__max_distance=10000
+        ).order_by("-date")
+        self.assertEqual(events.count(), 1)
+        self.assertEqual(events[0], event3)
+
+        # ensure ordering is respected by "near" with "min_distance"
+        events = self.Event.objects(
+            location__near=[-87.67892, 41.9120459],
+            location__min_distance=10000
+        ).order_by("-date")
+        self.assertEqual(events.count(), 1)
+        self.assertEqual(events[0], event2)
+
+    def test_2dsphere_geo_within_center(self):
+        """Make sure the "geo_within_center" operator works with a
+        2dsphere index.
+        """
+        event1, event2, event3 = self._create_event_data(
+            point_field_class=PointField
+        )
+
+        # find events within 5 degrees of pitchfork office, chicago
+        point_and_distance = [[-87.67892, 41.9120459], 2]
+        events = self.Event.objects(
+            location__geo_within_center=point_and_distance)
+        self.assertEqual(events.count(), 2)
+        events = list(events)
+        self.assertTrue(event2 not in events)
+        self.assertTrue(event1 in events)
+        self.assertTrue(event3 in events)
+
+    def _test_embedded(self, point_field_class):
+        """Helper test method ensuring given point field class works
+        well in an embedded document.
+        """
         class Venue(EmbeddedDocument):
-            location = GeoPointField()
+            location = point_field_class()
             name = StringField()
 
         class Event(Document):
@@ -148,16 +320,18 @@ class Event(Document):
         self.assertEqual(events.count(), 3)
         self.assertEqual(list(events), [event1, event3, event2])
 
-    def test_spherical_geospatial_operators(self):
-        """Ensure that spherical geospatial queries are working
-        """
-        # Needs MongoDB > 2.6.4 https://jira.mongodb.org/browse/SERVER-14039
-        connection = get_connection()
-        info = connection.test.command('buildInfo')
-        mongodb_version = tuple([int(i) for i in info['version'].split('.')])
-        if mongodb_version < (2, 6, 4):
-            raise SkipTest("Need MongoDB version 2.6.4+")
+    def test_geo_spatial_embedded(self):
+        """Make sure GeoPointField works properly in an embedded document."""
+        self._test_embedded(point_field_class=GeoPointField)
+
+    def test_2dsphere_point_embedded(self):
+        """Make sure PointField works properly in an embedded document."""
+        self._test_embedded(point_field_class=PointField)
 
+    # Needs MongoDB > 2.6.4 https://jira.mongodb.org/browse/SERVER-14039
+    @needs_mongodb_v3
+    def test_spherical_geospatial_operators(self):
+        """Ensure that spherical geospatial queries are working."""
         class Point(Document):
             location = GeoPointField()
 
@@ -177,7 +351,10 @@ class Point(Document):
 
         # Same behavior for _within_spherical_distance
         points = Point.objects(
-            location__within_spherical_distance=[[-122, 37.5], 60 / earth_radius]
+            location__within_spherical_distance=[
+                [-122, 37.5],
+                60 / earth_radius
+            ]
         )
         self.assertEqual(points.count(), 2)
 
@@ -194,14 +371,9 @@ class Point(Document):
         # Test query works with min_distance, being farer from one point
         points = Point.objects(location__near_sphere=[-122, 37.8],
                                location__min_distance=60 / earth_radius)
-        # The following real test passes on MongoDB 3 but minDistance seems
-        # buggy on older MongoDB versions
-        if get_connection().server_info()['versionArray'][0] > 2:
-            self.assertEqual(points.count(), 1)
-            far_point = points.first()
-            self.assertNotEqual(close_point, far_point)
-        else:
-            self.assertTrue(points.count() >= 1)
+        self.assertEqual(points.count(), 1)
+        far_point = points.first()
+        self.assertNotEqual(close_point, far_point)
 
         # Finds both points, but orders the north point first because it's
         # closer to the reference point to the north.
@@ -220,141 +392,15 @@ class Point(Document):
         # Finds only one point because only the first point is within 60km of
         # the reference point to the south.
         points = Point.objects(
-            location__within_spherical_distance=[[-122, 36.5], 60/earth_radius])
+            location__within_spherical_distance=[
+                [-122, 36.5],
+                60 / earth_radius
+            ]
+        )
         self.assertEqual(points.count(), 1)
         self.assertEqual(points[0].id, south_point.id)
 
-    def test_2dsphere_point(self):
-
-        class Event(Document):
-            title = StringField()
-            date = DateTimeField()
-            location = PointField()
-
-            def __unicode__(self):
-                return self.title
-
-        Event.drop_collection()
-
-        event1 = Event(title="Coltrane Motion @ Double Door",
-                       date=datetime.now() - timedelta(days=1),
-                       location=[-87.677137, 41.909889])
-        event1.save()
-        event2 = Event(title="Coltrane Motion @ Bottom of the Hill",
-                       date=datetime.now() - timedelta(days=10),
-                       location=[-122.4194155, 37.7749295]).save()
-        event3 = Event(title="Coltrane Motion @ Empty Bottle",
-                       date=datetime.now(),
-                       location=[-87.686638, 41.900474]).save()
-
-        # find all events "near" pitchfork office, chicago.
-        # note that "near" will show the san francisco event, too,
-        # although it sorts to last.
-        events = Event.objects(location__near=[-87.67892, 41.9120459])
-        self.assertEqual(events.count(), 3)
-        self.assertEqual(list(events), [event1, event3, event2])
-
-        # find events within 5 degrees of pitchfork office, chicago
-        point_and_distance = [[-87.67892, 41.9120459], 2]
-        events = Event.objects(location__geo_within_center=point_and_distance)
-        self.assertEqual(events.count(), 2)
-        events = list(events)
-        self.assertTrue(event2 not in events)
-        self.assertTrue(event1 in events)
-        self.assertTrue(event3 in events)
-
-        # ensure ordering is respected by "near"
-        events = Event.objects(location__near=[-87.67892, 41.9120459])
-        events = events.order_by("-date")
-        self.assertEqual(events.count(), 3)
-        self.assertEqual(list(events), [event3, event1, event2])
-
-        # find events within 10km of san francisco
-        point = [-122.415579, 37.7566023]
-        events = Event.objects(location__near=point, location__max_distance=10000)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0], event2)
-
-        # find events within 1km of greenpoint, broolyn, nyc, ny
-        events = Event.objects(location__near=[-73.9509714, 40.7237134], location__max_distance=1000)
-        self.assertEqual(events.count(), 0)
-
-        # ensure ordering is respected by "near"
-        events = Event.objects(location__near=[-87.67892, 41.9120459],
-                               location__max_distance=10000).order_by("-date")
-        self.assertEqual(events.count(), 2)
-        self.assertEqual(events[0], event3)
-
-        # ensure min_distance and max_distance combine well
-        events = Event.objects(location__near=[-87.67892, 41.9120459],
-                               location__min_distance=1000,
-                               location__max_distance=10000).order_by("-date")
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0], event3)
-
-        # ensure ordering is respected by "near"
-        events = Event.objects(location__near=[-87.67892, 41.9120459],
-                               # location__min_distance=10000
-                               location__min_distance=10000).order_by("-date")
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0], event2)
-
-        # check that within_box works
-        box = [(-125.0, 35.0), (-100.0, 40.0)]
-        events = Event.objects(location__geo_within_box=box)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0].id, event2.id)
-
-        polygon = [
-            (-87.694445, 41.912114),
-            (-87.69084, 41.919395),
-            (-87.681742, 41.927186),
-            (-87.654276, 41.911731),
-            (-87.656164, 41.898061),
-        ]
-        events = Event.objects(location__geo_within_polygon=polygon)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0].id, event1.id)
-
-        polygon2 = [
-            (-1.742249, 54.033586),
-            (-1.225891, 52.792797),
-            (-4.40094, 53.389881)
-        ]
-        events = Event.objects(location__geo_within_polygon=polygon2)
-        self.assertEqual(events.count(), 0)
-
-    def test_2dsphere_point_embedded(self):
-
-        class Venue(EmbeddedDocument):
-            location = GeoPointField()
-            name = StringField()
-
-        class Event(Document):
-            title = StringField()
-            venue = EmbeddedDocumentField(Venue)
-
-        Event.drop_collection()
-
-        venue1 = Venue(name="The Rock", location=[-87.677137, 41.909889])
-        venue2 = Venue(name="The Bridge", location=[-122.4194155, 37.7749295])
-
-        event1 = Event(title="Coltrane Motion @ Double Door",
-                       venue=venue1).save()
-        event2 = Event(title="Coltrane Motion @ Bottom of the Hill",
-                       venue=venue2).save()
-        event3 = Event(title="Coltrane Motion @ Empty Bottle",
-                       venue=venue1).save()
-
-        # find all events "near" pitchfork office, chicago.
-        # note that "near" will show the san francisco event, too,
-        # although it sorts to last.
-        events = Event.objects(venue__location__near=[-87.67892, 41.9120459])
-        self.assertEqual(events.count(), 3)
-        self.assertEqual(list(events), [event1, event3, event2])
-
     def test_linestring(self):
-
         class Road(Document):
             name = StringField()
             line = LineStringField()
@@ -410,7 +456,6 @@ class Road(Document):
         self.assertEqual(1, roads)
 
     def test_polygon(self):
-
         class Road(Document):
             name = StringField()
             poly = PolygonField()
@@ -507,5 +552,6 @@ class Location(Document):
         loc = Location.objects.as_pymongo()[0]
         self.assertEqual(loc["poly"], {"type": "Polygon", "coordinates": [[[40, 4], [40, 6], [41, 6], [40, 4]]]})
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c54fa13d6..b496e04a6 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -19,6 +19,9 @@
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
 
+from tests.utils import needs_mongodb_v26, skip_pymongo3
+
+
 __all__ = ("QuerySetTest",)
 
 
@@ -32,37 +35,6 @@ def get_ops(self):
         return list(self.db.system.profile.find(ignore_query))
 
 
-def skip_older_mongodb(f):
-    def _inner(*args, **kwargs):
-        connection = get_connection()
-        info = connection.test.command('buildInfo')
-        mongodb_version = tuple([int(i) for i in info['version'].split('.')])
-
-        if mongodb_version < (2, 6):
-            raise SkipTest("Need MongoDB version 2.6+")
-
-        return f(*args, **kwargs)
-
-    _inner.__name__ = f.__name__
-    _inner.__doc__ = f.__doc__
-
-    return _inner
-
-
-def skip_pymongo3(f):
-    def _inner(*args, **kwargs):
-
-        if IS_PYMONGO_3:
-            raise SkipTest("Useless with PyMongo 3+")
-
-        return f(*args, **kwargs)
-
-    _inner.__name__ = f.__name__
-    _inner.__doc__ = f.__doc__
-
-    return _inner
-
-
 class QuerySetTest(unittest.TestCase):
 
     def setUp(self):
@@ -599,16 +571,23 @@ class BlogPost(Document):
         self.assertEqual(post.comments[0].by, 'joe')
         self.assertEqual(post.comments[0].votes.score, 4)
 
+    @needs_mongodb_v26
     def test_update_min_max(self):
         class Scores(Document):
             high_score = IntField()
             low_score = IntField()
-        scores = Scores(high_score=800, low_score=200)
-        scores.save()
+
+        scores = Scores.objects.create(high_score=800, low_score=200)
+
         Scores.objects(id=scores.id).update(min__low_score=150)
-        self.assertEqual(Scores.objects(id=scores.id).get().low_score, 150)
+        self.assertEqual(Scores.objects.get(id=scores.id).low_score, 150)
         Scores.objects(id=scores.id).update(min__low_score=250)
-        self.assertEqual(Scores.objects(id=scores.id).get().low_score, 150)
+        self.assertEqual(Scores.objects.get(id=scores.id).low_score, 150)
+
+        Scores.objects(id=scores.id).update(max__high_score=1000)
+        self.assertEqual(Scores.objects.get(id=scores.id).high_score, 1000)
+        Scores.objects(id=scores.id).update(max__high_score=500)
+        self.assertEqual(Scores.objects.get(id=scores.id).high_score, 1000)
 
     def test_updates_can_have_match_operators(self):
 
@@ -1012,7 +991,7 @@ def test_slave_okay(self):
         self.assertEqual(person.name, "User A")
         self.assertEqual(person.age, 20)
 
-    @skip_older_mongodb
+    @needs_mongodb_v26
     @skip_pymongo3
     def test_cursor_args(self):
         """Ensures the cursor args can be set as expected
@@ -3129,7 +3108,7 @@ class Bar(Document):
 
         self.assertEqual(Foo.objects.distinct("bar"), [bar])
 
-    @skip_older_mongodb
+    @needs_mongodb_v26
     def test_text_indexes(self):
         class News(Document):
             title = StringField()
@@ -3216,7 +3195,7 @@ class News(Document):
             'brasil').order_by('$text_score').first()
         self.assertEqual(item.get_text_score(), max_text_score)
 
-    @skip_older_mongodb
+    @needs_mongodb_v26
     def test_distinct_handles_references_to_alias(self):
         register_connection('testdb', 'mongoenginetest2')
 
@@ -4891,6 +4870,7 @@ class Person(Document):
             self.assertTrue(Person.objects._has_data(),
                             'Cursor has data and returned False')
 
+    @needs_mongodb_v26
     def test_queryset_aggregation_framework(self):
         class Person(Document):
             name = StringField()
@@ -4925,17 +4905,13 @@ class Person(Document):
             {'_id': p1.pk, 'name': "ISABELLA LUANNA"}
         ])
 
-        data = Person.objects(
-            age__gte=17, age__lte=40).order_by('-age').aggregate(
-                {'$group': {
-                    '_id': None,
-                    'total': {'$sum': 1},
-                    'avg': {'$avg': '$age'}
-                }
-                }
-
-        )
-
+        data = Person.objects(age__gte=17, age__lte=40).order_by('-age').aggregate({
+            '$group': {
+                '_id': None,
+                'total': {'$sum': 1},
+                'avg': {'$avg': '$age'}
+            }
+        })
         self.assertEqual(list(data), [
             {'_id': None, 'avg': 29, 'total': 2}
         ])
@@ -4976,11 +4952,13 @@ class ScottishCat(Cat):
         self.assertEquals(Animal.objects(folded_ears=True).count(), 1)
         self.assertEquals(Animal.objects(whiskers_length=5.1).count(), 1)
 
-    def test_loop_via_invalid_id_does_not_crash(self):
+    def test_loop_over_invalid_id_does_not_crash(self):
         class Person(Document):
             name = StringField()
-        Person.objects.delete()
-        Person._get_collection().update({"name": "a"}, {"$set": {"_id": ""}}, upsert=True)
+
+        Person.drop_collection()
+
+        Person._get_collection().insert({'name': 'a', 'id': ''})
         for p in Person.objects():
             self.assertEqual(p.name, 'a')
 
diff --git a/tests/test_connection.py b/tests/test_connection.py
index a1d3bfb62..d74f68c74 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -35,8 +35,7 @@ def tearDown(self):
         mongoengine.connection._dbs = {}
 
     def test_connect(self):
-        """Ensure that the connect() method works properly.
-        """
+        """Ensure that the connect() method works properly."""
         connect('mongoenginetest')
 
         conn = get_connection()
@@ -146,8 +145,7 @@ def test_sharing_connections(self):
         self.assertEqual(expected_connection, actual_connection)
 
     def test_connect_uri(self):
-        """Ensure that the connect() method works properly with uri's
-        """
+        """Ensure that the connect() method works properly with URIs."""
         c = connect(db='mongoenginetest', alias='admin')
         c.admin.system.users.remove({})
         c.mongoenginetest.system.users.remove({})
@@ -227,9 +225,8 @@ def test_uri_without_credentials_doesnt_override_conn_settings(self):
         self.assertRaises(OperationFailure, get_db)
 
     def test_connect_uri_with_authsource(self):
-        """Ensure that the connect() method works well with
-        the option `authSource` in URI.
-        This feature was introduced in MongoDB 2.4 and removed in 2.6
+        """Ensure that the connect() method works well with `authSource`
+        option in the URI.
         """
         # Create users
         c = connect('mongoenginetest')
@@ -238,30 +235,31 @@ def test_connect_uri_with_authsource(self):
 
         # Authentication fails without "authSource"
         if IS_PYMONGO_3:
-            test_conn = connect('mongoenginetest', alias='test1',
-                                host='mongodb://username2:password@localhost/mongoenginetest')
+            test_conn = connect(
+                'mongoenginetest', alias='test1',
+                host='mongodb://username2:password@localhost/mongoenginetest'
+            )
             self.assertRaises(OperationFailure, test_conn.server_info)
         else:
             self.assertRaises(
-                MongoEngineConnectionError, connect, 'mongoenginetest',
-                alias='test1',
+                MongoEngineConnectionError,
+                connect, 'mongoenginetest', alias='test1',
                 host='mongodb://username2:password@localhost/mongoenginetest'
             )
             self.assertRaises(MongoEngineConnectionError, get_db, 'test1')
 
         # Authentication succeeds with "authSource"
-        connect(
+        authd_conn = connect(
             'mongoenginetest', alias='test2',
             host=('mongodb://username2:password@localhost/'
                   'mongoenginetest?authSource=admin')
         )
-        # This will fail starting from MongoDB 2.6+
         db = get_db('test2')
         self.assertTrue(isinstance(db, pymongo.database.Database))
         self.assertEqual(db.name, 'mongoenginetest')
 
         # Clear all users
-        c.admin.system.users.remove({})
+        authd_conn.admin.system.users.remove({})
 
     def test_register_connection(self):
         """Ensure that connections with different aliases may be registered.
diff --git a/tests/utils.py b/tests/utils.py
index 128bbff0f..4566d8644 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,7 +1,11 @@
 import unittest
 
+from nose.plugins.skip import SkipTest
+
 from mongoengine import connect
-from mongoengine.connection import get_db
+from mongoengine.connection import get_db, get_connection
+from mongoengine.python_support import IS_PYMONGO_3
+
 
 MONGO_TEST_DB = 'mongoenginetest'
 
@@ -20,3 +24,55 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls._connection.drop_database(MONGO_TEST_DB)
+
+
+def get_mongodb_version():
+    """Return the version tuple of the MongoDB server that the default
+    connection is connected to.
+    """
+    return tuple(get_connection().server_info()['versionArray'])
+
+def _decorated_with_ver_requirement(func, ver_tuple):
+    """Return a given function decorated with the version requirement
+    for a particular MongoDB version tuple.
+    """
+    def _inner(*args, **kwargs):
+        mongodb_ver = get_mongodb_version()
+        if mongodb_ver >= ver_tuple:
+            return func(*args, **kwargs)
+
+        raise SkipTest('Needs MongoDB v{}+'.format(
+            '.'.join([str(v) for v in ver_tuple])
+        ))
+
+    _inner.__name__ = func.__name__
+    _inner.__doc__ = func.__doc__
+
+    return _inner
+
+def needs_mongodb_v26(func):
+    """Raise a SkipTest exception if we're working with MongoDB version
+    lower than v2.6.
+    """
+    return _decorated_with_ver_requirement(func, (2, 6))
+
+def needs_mongodb_v3(func):
+    """Raise a SkipTest exception if we're working with MongoDB version
+    lower than v3.0.
+    """
+    return _decorated_with_ver_requirement(func, (3, 0))
+
+def skip_pymongo3(f):
+    """Raise a SkipTest exception if we're running a test against
+    PyMongo v3.x.
+    """
+    def _inner(*args, **kwargs):
+        if IS_PYMONGO_3:
+            raise SkipTest("Useless with PyMongo 3+")
+        return f(*args, **kwargs)
+
+    _inner.__name__ = f.__name__
+    _inner.__doc__ = f.__doc__
+
+    return _inner
+
diff --git a/tox.ini b/tox.ini
index d6052edfa..7f0d36e41 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py26,py27,py33,py34,py35,pypy,pypy3}-{mg27,mg28},flake8
+envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg30}
 
 [testenv]
 commands =
@@ -7,16 +7,7 @@ commands =
 deps =
     nose
     mg27: PyMongo<2.8
-    mg28: PyMongo>=2.8,<3.0
+    mg28: PyMongo>=2.8,<2.9
     mg30: PyMongo>=3.0
-    mgdev: https://github.com/mongodb/mongo-python-driver/tarball/master
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs
-passenv = windir
-
-[testenv:flake8]
-deps =
-    flake8
-    flake8-import-order
-commands =
-   flake8

From 627cf90de03dac4c172624b0c5571379589edaf7 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 26 Feb 2017 20:30:37 -0500
Subject: [PATCH 0463/1519] tutorial tweaks: better copy + use py3-friendly
 syntax

---
 docs/tutorial.rst | 65 ++++++++++++++++++++++-------------------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 311d2888e..fc92ce0ce 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -3,11 +3,10 @@ Tutorial
 ========
 
 This tutorial introduces **MongoEngine** by means of example --- we will walk
-through how to create a simple **Tumblelog** application. A Tumblelog is a type
-of blog where posts are not constrained to being conventional text-based posts.
-As well as text-based entries, users may post images, links, videos, etc. For
-simplicity's sake, we'll stick to text, image and link entries in our
-application. As the purpose of this tutorial is to introduce MongoEngine, we'll
+through how to create a simple **Tumblelog** application. A tumblelog is a
+blog that supports mixed media content, including text, images, links, video,
+audio, etc. For simplicity's sake, we'll stick to text, image, and link
+entries. As the purpose of this tutorial is to introduce MongoEngine, we'll
 focus on the data-modelling side of the application, leaving out a user
 interface.
 
@@ -16,14 +15,14 @@ Getting started
 
 Before we start, make sure that a copy of MongoDB is running in an accessible
 location --- running it locally will be easier, but if that is not an option
-then it may be run on a remote server. If you haven't installed mongoengine,
+then it may be run on a remote server. If you haven't installed MongoEngine,
 simply use pip to install it like so::
 
     $ pip install mongoengine
 
 Before we can start using MongoEngine, we need to tell it how to connect to our
 instance of :program:`mongod`. For this we use the :func:`~mongoengine.connect`
-function. If running locally the only argument we need to provide is the name
+function. If running locally, the only argument we need to provide is the name
 of the MongoDB database to use::
 
     from mongoengine import *
@@ -39,18 +38,18 @@ Defining our documents
 MongoDB is *schemaless*, which means that no schema is enforced by the database
 --- we may add and remove fields however we want and MongoDB won't complain.
 This makes life a lot easier in many regards, especially when there is a change
-to the data model. However, defining schemata for our documents can help to
-iron out bugs involving incorrect types or missing fields, and also allow us to
+to the data model. However, defining schemas for our documents can help to iron
+out bugs involving incorrect types or missing fields, and also allow us to
 define utility methods on our documents in the same way that traditional
 :abbr:`ORMs (Object-Relational Mappers)` do.
 
 In our Tumblelog application we need to store several different types of
-information.  We will need to have a collection of **users**, so that we may
+information. We will need to have a collection of **users**, so that we may
 link posts to an individual. We also need to store our different types of
 **posts** (eg: text, image and link) in the database. To aid navigation of our
 Tumblelog, posts may have **tags** associated with them, so that the list of
 posts shown to the user may be limited to posts that have been assigned a
-specific tag.  Finally, it would be nice if **comments** could be added to
+specific tag. Finally, it would be nice if **comments** could be added to
 posts. We'll start with **users**, as the other document models are slightly
 more involved.
 
@@ -78,7 +77,7 @@ Now we'll think about how to store the rest of the information. If we were
 using a relational database, we would most likely have a table of **posts**, a
 table of **comments** and a table of **tags**.  To associate the comments with
 individual posts, we would put a column in the comments table that contained a
-foreign key to the posts table.  We'd also need a link table to provide the
+foreign key to the posts table. We'd also need a link table to provide the
 many-to-many relationship between posts and tags. Then we'd need to address the
 problem of storing the specialised post-types (text, image and link). There are
 several ways we can achieve this, but each of them have their problems --- none
@@ -96,7 +95,7 @@ using* the new fields we need to support video posts. This fits with the
 Object-Oriented principle of *inheritance* nicely. We can think of
 :class:`Post` as a base class, and :class:`TextPost`, :class:`ImagePost` and
 :class:`LinkPost` as subclasses of :class:`Post`. In fact, MongoEngine supports
-this kind of modelling out of the box --- all you need do is turn on inheritance
+this kind of modeling out of the box --- all you need do is turn on inheritance
 by setting :attr:`allow_inheritance` to True in the :attr:`meta`::
 
     class Post(Document):
@@ -128,8 +127,8 @@ link table, we can just store a list of tags in each post. So, for both
 efficiency and simplicity's sake, we'll store the tags as strings directly
 within the post, rather than storing references to tags in a separate
 collection. Especially as tags are generally very short (often even shorter
-than a document's id), this denormalisation won't impact very strongly on the
-size of our database. So let's take a look that the code our modified
+than a document's id), this denormalization won't impact the size of the
+database very strongly. Let's take a look at the code of our modified
 :class:`Post` class::
 
     class Post(Document):
@@ -141,7 +140,7 @@ The :class:`~mongoengine.fields.ListField` object that is used to define a Post'
 takes a field object as its first argument --- this means that you can have
 lists of any type of field (including lists).
 
-.. note:: We don't need to modify the specialised post types as they all
+.. note:: We don't need to modify the specialized post types as they all
     inherit from :class:`Post`.
 
 Comments
@@ -149,7 +148,7 @@ Comments
 
 A comment is typically associated with *one* post. In a relational database, to
 display a post with its comments, we would have to retrieve the post from the
-database, then query the database again for the comments associated with the
+database and then query the database again for the comments associated with the
 post. This works, but there is no real reason to be storing the comments
 separately from their associated posts, other than to work around the
 relational model. Using MongoDB we can store the comments as a list of
@@ -219,8 +218,8 @@ Now that we've got our user in the database, let's add a couple of posts::
     post2.tags = ['mongoengine']
     post2.save()
 
-.. note:: If you change a field on a object that has already been saved, then
-    call :meth:`save` again, the document will be updated.
+.. note:: If you change a field on an object that has already been saved and
+    then call :meth:`save` again, the document will be updated.
 
 Accessing our data
 ==================
@@ -232,17 +231,17 @@ used to access the documents in the database collection associated with that
 class. So let's see how we can get our posts' titles::
 
     for post in Post.objects:
-        print post.title
+        print(post.title)
 
 Retrieving type-specific information
 ------------------------------------
 
-This will print the titles of our posts, one on each line. But What if we want
+This will print the titles of our posts, one on each line. But what if we want
 to access the type-specific data (link_url, content, etc.)? One way is simply
 to use the :attr:`objects` attribute of a subclass of :class:`Post`::
 
     for post in TextPost.objects:
-        print post.content
+        print(post.content)
 
 Using TextPost's :attr:`objects` attribute only returns documents that were
 created using :class:`TextPost`. Actually, there is a more general rule here:
@@ -259,16 +258,14 @@ instances of :class:`Post` --- they were instances of the subclass of
 practice::
 
     for post in Post.objects:
-        print post.title
-        print '=' * len(post.title)
+        print(post.title)
+        print('=' * len(post.title))
 
         if isinstance(post, TextPost):
-            print post.content
+            print(post.content)
 
         if isinstance(post, LinkPost):
-            print 'Link:', post.link_url
-
-        print
+            print('Link: {}'.format(post.link_url))
 
 This would print the title of each post, followed by the content if it was a
 text post, and "Link: <url>" if it was a link post.
@@ -283,7 +280,7 @@ your query.  Let's adjust our query so that only posts with the tag "mongodb"
 are returned::
 
     for post in Post.objects(tags='mongodb'):
-        print post.title
+        print(post.title)
 
 There are also methods available on :class:`~mongoengine.queryset.QuerySet`
 objects that allow different results to be returned, for example, calling
@@ -292,11 +289,11 @@ the first matched by the query you provide. Aggregation functions may also be
 used on :class:`~mongoengine.queryset.QuerySet` objects::
 
     num_posts = Post.objects(tags='mongodb').count()
-    print 'Found %d posts with tag "mongodb"' % num_posts
+    print('Found {} posts with tag "mongodb"'.format(num_posts))
 
-Learning more about mongoengine
+Learning more about MongoEngine
 -------------------------------
 
-If you got this far you've made a great start, so well done!  The next step on
-your mongoengine journey is the `full user guide <guide/index.html>`_, where you
-can learn indepth about how to use mongoengine and mongodb.
+If you got this far you've made a great start, so well done! The next step on
+your MongoEngine journey is the `full user guide <guide/index.html>`_, where
+you can learn in-depth about how to use MongoEngine and MongoDB.

From 5f43c032f2778af7f9c13c32c8cec4e7756569d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 26 Feb 2017 21:29:06 -0500
Subject: [PATCH 0464/1519] revamp the "connecting" user guide and test more
 ways of connecting to a replica set (#1490)

---
 docs/guide/connecting.rst | 53 +++++++++++++++++++++------------------
 docs/guide/installing.rst |  4 +--
 tests/test_connection.py  | 45 +++++++++++++++++++++++----------
 3 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index 827e5a3c2..f40ed4c50 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -42,13 +42,18 @@ the :attr:`host` to
     will establish connection to ``production`` database using
     ``admin`` username and ``qwerty`` password.
 
-ReplicaSets
-===========
+Replica Sets
+============
 
-MongoEngine supports
-:class:`~pymongo.mongo_replica_set_client.MongoReplicaSetClient`. To use them,
-please use an URI style connection and provide the ``replicaSet`` name
-in the connection kwargs.
+MongoEngine supports connecting to replica sets::
+
+    from mongoengine import connect
+
+    # Regular connect
+    connect('dbname', replicaset='rs-name')
+
+    # MongoDB URI-style connect
+    connect(host='mongodb://localhost/dbname?replicaSet=rs-name')
 
 Read preferences are supported through the connection or via individual
 queries by passing the read_preference ::
@@ -59,76 +64,74 @@ queries by passing the read_preference ::
 Multiple Databases
 ==================
 
-Multiple database support was added in MongoEngine 0.6. To use multiple
-databases you can use :func:`~mongoengine.connect` and provide an `alias` name
-for the connection - if no `alias` is provided then "default" is used.
+To use multiple databases you can use :func:`~mongoengine.connect` and provide
+an `alias` name for the connection - if no `alias` is provided then "default"
+is used.
 
 In the background this uses :func:`~mongoengine.register_connection` to
 store the data and you can register all aliases up front if required.
 
 Individual documents can also support multiple databases by providing a
-`db_alias` in their meta data.  This allows :class:`~pymongo.dbref.DBRef` objects
-to point across databases and collections.  Below is an example schema, using
-3 different databases to store data::
+`db_alias` in their meta data. This allows :class:`~pymongo.dbref.DBRef`
+objects to point across databases and collections. Below is an example schema,
+using 3 different databases to store data::
 
         class User(Document):
             name = StringField()
 
-            meta = {"db_alias": "user-db"}
+            meta = {'db_alias': 'user-db'}
 
         class Book(Document):
             name = StringField()
 
-            meta = {"db_alias": "book-db"}
+            meta = {'db_alias': 'book-db'}
 
         class AuthorBooks(Document):
             author = ReferenceField(User)
             book = ReferenceField(Book)
 
-            meta = {"db_alias": "users-books-db"}
+            meta = {'db_alias': 'users-books-db'}
 
 
 Context Managers
 ================
-Sometimes you may want to switch the database or collection to query against
-for a class.
+Sometimes you may want to switch the database or collection to query against.
 For example, archiving older data into a separate database for performance
 reasons or writing functions that dynamically choose collections to write
-document to.
+a document to.
 
 Switch Database
 ---------------
 The :class:`~mongoengine.context_managers.switch_db` context manager allows
 you to change the database alias for a given class allowing quick and easy
-access the same User document across databases::
+access to the same User document across databases::
 
     from mongoengine.context_managers import switch_db
 
     class User(Document):
         name = StringField()
 
-        meta = {"db_alias": "user-db"}
+        meta = {'db_alias': 'user-db'}
 
     with switch_db(User, 'archive-user-db') as User:
-        User(name="Ross").save()  # Saves the 'archive-user-db'
+        User(name='Ross').save()  # Saves the 'archive-user-db'
 
 
 Switch Collection
 -----------------
 The :class:`~mongoengine.context_managers.switch_collection` context manager
 allows you to change the collection for a given class allowing quick and easy
-access the same Group document across collection::
+access to the same Group document across collection::
 
         from mongoengine.context_managers import switch_collection
 
         class Group(Document):
             name = StringField()
 
-        Group(name="test").save()  # Saves in the default db
+        Group(name='test').save()  # Saves in the default db
 
         with switch_collection(Group, 'group2000') as Group:
-            Group(name="hello Group 2000 collection!").save()  # Saves in group2000 collection
-
+            Group(name='hello Group 2000 collection!').save()  # Saves in group2000 collection
 
 
 .. note:: Make sure any aliases have been registered with
diff --git a/docs/guide/installing.rst b/docs/guide/installing.rst
index e93f0485f..b89d48f0d 100644
--- a/docs/guide/installing.rst
+++ b/docs/guide/installing.rst
@@ -2,13 +2,13 @@
 Installing MongoEngine
 ======================
 
-To use MongoEngine, you will need to download `MongoDB <http://mongodb.org/>`_
+To use MongoEngine, you will need to download `MongoDB <http://mongodb.com/>`_
 and ensure it is running in an accessible location. You will also need
 `PyMongo <http://api.mongodb.org/python>`_ to use MongoEngine, but if you
 install MongoEngine using setuptools, then the dependencies will be handled for
 you.
 
-MongoEngine is available on PyPI, so to use it you can use :program:`pip`:
+MongoEngine is available on PyPI, so you can use :program:`pip`:
 
 .. code-block:: console
 
diff --git a/tests/test_connection.py b/tests/test_connection.py
index d74f68c74..cdcf13773 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -198,19 +198,6 @@ def test_connect_uri_default_db(self):
         self.assertTrue(isinstance(db, pymongo.database.Database))
         self.assertEqual(db.name, 'test')
 
-    def test_connect_uri_with_replicaset(self):
-        """Ensure connect() works when specifying a replicaSet."""
-        if IS_PYMONGO_3:
-            c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
-            db = get_db()
-            self.assertTrue(isinstance(db, pymongo.database.Database))
-            self.assertEqual(db.name, 'test')
-        else:
-            # PyMongo < v3.x raises an exception:
-            # "localhost:27017 is not a member of replica set local-rs"
-            with self.assertRaises(MongoEngineConnectionError):
-                c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
-
     def test_uri_without_credentials_doesnt_override_conn_settings(self):
         """Ensure connect() uses the username & password params if the URI
         doesn't explicitly specify them.
@@ -332,6 +319,38 @@ def test_write_concern(self):
             self.assertEqual(dict(conn1.write_concern), {'w': 1, 'j': True})
             self.assertEqual(dict(conn2.write_concern), {'w': 1, 'j': True})
 
+    def test_connect_with_replicaset_via_uri(self):
+        """Ensure connect() works when specifying a replicaSet via the
+        MongoDB URI.
+        """
+        if IS_PYMONGO_3:
+            c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
+            db = get_db()
+            self.assertTrue(isinstance(db, pymongo.database.Database))
+            self.assertEqual(db.name, 'test')
+        else:
+            # PyMongo < v3.x raises an exception:
+            # "localhost:27017 is not a member of replica set local-rs"
+            with self.assertRaises(MongoEngineConnectionError):
+                c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
+
+    def test_connect_with_replicaset_via_kwargs(self):
+        """Ensure connect() works when specifying a replicaSet via the
+        connection kwargs
+        """
+        if IS_PYMONGO_3:
+            c = connect(replicaset='local-rs')
+            self.assertEqual(c._MongoClient__options.replica_set_name,
+                             'local-rs')
+            db = get_db()
+            self.assertTrue(isinstance(db, pymongo.database.Database))
+            self.assertEqual(db.name, 'test')
+        else:
+            # PyMongo < v3.x raises an exception:
+            # "localhost:27017 is not a member of replica set local-rs"
+            with self.assertRaises(MongoEngineConnectionError):
+                c = connect(replicaset='local-rs')
+
     def test_datetime(self):
         connect('mongoenginetest', tz_aware=True)
         d = datetime.datetime(2010, 5, 5, tzinfo=utc)

From 398964945a3e99f7a224968b3d1177eaffed6484 Mon Sep 17 00:00:00 2001
From: Ephraim Berkovitch <ephraim.berkovitch@gmail.com>
Date: Mon, 27 Feb 2017 16:42:44 +0200
Subject: [PATCH 0465/1519] Document.objects.create should raise NotUniqueError
 upon saving duplicate primary key (#1485)

---
 .gitignore                   |  1 +
 mongoengine/queryset/base.py |  2 +-
 tests/document/indexes.py    | 28 +++++++++++++++-------------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index b180e87ef..048a2d192 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ tests/test_bugfix.py
 htmlcov/
 venv
 venv3
+scratchpad
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 7e4856863..fde46ae63 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -286,7 +286,7 @@ def create(self, **kwargs):
 
         .. versionadded:: 0.4
         """
-        return self._document(**kwargs).save()
+        return self._document(**kwargs).save(force_insert=True)
 
     def first(self):
         """Retrieve the first object matching the query."""
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 5d219eda0..58e09199e 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -412,7 +412,6 @@ class MongoUser(User):
         User.ensure_indexes()
         info = User.objects._collection.index_information()
         self.assertEqual(sorted(info.keys()), ['_cls_1_user_guid_1', '_id_'])
-        User.drop_collection()
 
     def test_embedded_document_index(self):
         """Tests settings an index on an embedded document
@@ -434,7 +433,6 @@ class BlogPost(Document):
 
         info = BlogPost.objects._collection.index_information()
         self.assertEqual(sorted(info.keys()), ['_id_', 'date.yr_-1'])
-        BlogPost.drop_collection()
 
     def test_list_embedded_document_index(self):
         """Ensure list embedded documents can be indexed
@@ -461,7 +459,6 @@ class BlogPost(Document):
         post1 = BlogPost(title="Embedded Indexes tests in place",
                          tags=[Tag(name="about"), Tag(name="time")])
         post1.save()
-        BlogPost.drop_collection()
 
     def test_recursive_embedded_objects_dont_break_indexes(self):
 
@@ -622,8 +619,6 @@ class BlogPost(Document):
         post3 = BlogPost(title='test3', date=Date(year=2010), slug='test')
         self.assertRaises(OperationError, post3.save)
 
-        BlogPost.drop_collection()
-
     def test_unique_embedded_document(self):
         """Ensure that uniqueness constraints are applied to fields on embedded documents.
         """
@@ -651,8 +646,6 @@ class BlogPost(Document):
                          sub=SubDocument(year=2010, slug='test'))
         self.assertRaises(NotUniqueError, post3.save)
 
-        BlogPost.drop_collection()
-
     def test_unique_embedded_document_in_list(self):
         """
         Ensure that the uniqueness constraints are applied to fields in
@@ -683,8 +676,6 @@ class BlogPost(Document):
 
         self.assertRaises(NotUniqueError, post2.save)
 
-        BlogPost.drop_collection()
-
     def test_unique_with_embedded_document_and_embedded_unique(self):
         """Ensure that uniqueness constraints are applied to fields on
         embedded documents.  And work with unique_with as well.
@@ -718,8 +709,6 @@ class BlogPost(Document):
                          sub=SubDocument(year=2009, slug='test-1'))
         self.assertRaises(NotUniqueError, post3.save)
 
-        BlogPost.drop_collection()
-
     def test_ttl_indexes(self):
 
         class Log(Document):
@@ -759,13 +748,11 @@ class Customer(Document):
             raise AssertionError("We saved a dupe!")
         except NotUniqueError:
             pass
-        Customer.drop_collection()
 
     def test_unique_and_primary(self):
         """If you set a field as primary, then unexpected behaviour can occur.
         You won't create a duplicate but you will update an existing document.
         """
-
         class User(Document):
             name = StringField(primary_key=True, unique=True)
             password = StringField()
@@ -781,8 +768,23 @@ class User(Document):
         self.assertEqual(User.objects.count(), 1)
         self.assertEqual(User.objects.get().password, 'secret2')
 
+    def test_unique_and_primary_create(self):
+        """Create a new record with a duplicate primary key
+        throws an exception
+        """
+        class User(Document):
+            name = StringField(primary_key=True)
+            password = StringField()
+
         User.drop_collection()
 
+        User.objects.create(name='huangz', password='secret')
+        with self.assertRaises(NotUniqueError):
+            User.objects.create(name='huangz', password='secret2')
+
+        self.assertEqual(User.objects.count(), 1)
+        self.assertEqual(User.objects.get().password, 'secret')
+
     def test_index_with_pk(self):
         """Ensure you can use `pk` as part of a query"""
 

From 68109530148d87800cab0abe4bc288a0d9248550 Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Mon, 27 Feb 2017 09:55:50 +0000
Subject: [PATCH 0466/1519] added OrderedDynamicField class to store data in
 the defined order because of #203

---
 mongoengine/fields.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 114250954..4b6a1a9b3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -5,6 +5,7 @@
 import time
 import uuid
 import warnings
+from collections import OrderedDict
 from operator import itemgetter
 
 from bson import Binary, DBRef, ObjectId, SON
@@ -49,7 +50,7 @@
     'FileField', 'ImageGridFsProxy', 'ImproperlyConfigured', 'ImageField',
     'GeoPointField', 'PointField', 'LineStringField', 'PolygonField',
     'SequenceField', 'UUIDField', 'MultiPointField', 'MultiLineStringField',
-    'MultiPolygonField', 'GeoJsonBaseField'
+    'MultiPolygonField', 'GeoJsonBaseField', 'OrderedDynamicField'
 )
 
 RECURSIVE_REFERENCE_CONSTANT = 'self'
@@ -644,7 +645,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
             is_list = True
             value = {k: v for k, v in enumerate(value)}
 
-        data = {}
+        data = self._container_type() if hasattr(self, '_container_type') else {}
         for k, v in value.iteritems():
             data[k] = self.to_mongo(v, use_db_field, fields)
 
@@ -675,6 +676,16 @@ def validate(self, value, clean=True):
             value.validate(clean=clean)
 
 
+class OrderedDynamicField(DynamicField):
+    """A field that wraps DynamicField. This uses OrderedDict class
+    to guarantee to store data in the defined order instead of dict.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(OrderedDynamicField, self).__init__(*args, **kwargs)
+        self._container_type = OrderedDict
+
+
 class ListField(ComplexBaseField):
     """A list field that wraps a standard field, allowing multiple instances
     of the field to be used as a list in the database.

From 84a8f1eb2b0c21f3e245469a469e14194c8c2d2a Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Tue, 28 Feb 2017 03:35:39 +0000
Subject: [PATCH 0467/1519] added OrderedDocument class to decode BSON data to
 OrderedDict for retrieving data in order

---
 mongoengine/document.py      | 28 +++++++++++++++++++++++++++-
 mongoengine/queryset/base.py |  4 ++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index b79e5e976..a2a5e1563 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1,6 +1,7 @@
 import re
 import warnings
 
+from collections import OrderedDict
 from bson.dbref import DBRef
 import pymongo
 from pymongo.read_preferences import ReadPreference
@@ -21,7 +22,8 @@
 
 __all__ = ('Document', 'EmbeddedDocument', 'DynamicDocument',
            'DynamicEmbeddedDocument', 'OperationError',
-           'InvalidCollectionError', 'NotUniqueError', 'MapReduceDocument')
+           'InvalidCollectionError', 'NotUniqueError', 'MapReduceDocument',
+           'OrderedDocument')
 
 
 def includes_cls(fields):
@@ -1036,3 +1038,27 @@ def object(self):
             self._key_object = self._document.objects.with_id(self.key)
             return self._key_object
         return self._key_object
+
+
+class OrderedDocument(Document):
+    """A document that is almost same with Document except for returning
+    results in OrderedDict instead of dict.
+    """
+
+    # The __metaclass__ attribute is removed by 2to3 when running with Python3
+    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
+    my_metaclass = TopLevelDocumentMetaclass
+    __metaclass__ = TopLevelDocumentMetaclass
+
+    @classmethod
+    def _get_collection(cls):
+        collection = super(OrderedDocument, cls)._get_collection()
+
+        if IS_PYMONGO_3:
+            # returns collection object which is set OrderedDict class to be decoded from BSON document
+            from bson import CodecOptions
+            return collection.with_options(codec_options=CodecOptions(document_class=OrderedDict))
+        else:
+            # set attribute to specify the class to be decoeded
+            cls.decoded_class = OrderedDict
+            return collection
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 7e4856863..4738f5f73 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1501,6 +1501,10 @@ def _cursor_args(self):
                 cursor_args['read_preference'] = self._read_preference
             else:
                 cursor_args['slave_okay'] = self._slave_okay
+
+            # set decode format if needed
+            if hasattr(self._document, 'decoded_class'):
+                cursor_args['as_class'] = self._document.decoded_class
         else:
             fields_name = 'projection'
             # snapshot is not handled at all by PyMongo 3+

From e32a9777d794103a562ed6c087751dea665b7fdc Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Tue, 28 Feb 2017 03:35:53 +0000
Subject: [PATCH 0468/1519] added test for OrderedDynamicField and
 OrderedDocument

---
 tests/fields/fields.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 318c0c595..3516471f1 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -7,6 +7,7 @@
 import re
 
 from nose.plugins.skip import SkipTest
+from collections import OrderedDict
 import six
 
 try:
@@ -4499,6 +4500,40 @@ class CustomData(Document):
         self.assertTrue(hasattr(CustomData.c_field, 'custom_data'))
         self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
 
+    def test_ordered_dynamic_fields_class(self):
+        """
+        Tests that OrderedDynamicFields interits features of the DynamicFields
+        and saves/retrieves data in order.
+        """
+        class Member(Document):
+            name = StringField()
+            age = IntField()
+
+        class Team(OrderedDocument):
+            members = OrderedDynamicField()
+
+        Member.drop_collection()
+        Team.drop_collection()
+
+        member_info = [
+            ('Martin McFly', 17),
+            ('Emmett Brown', 65),
+            ('George McFly', 47)
+        ]
+        members = OrderedDict()
+        for name, age in member_info:
+            members[name] = Member(name=name, age=age)
+            members[name].save()
+
+        Team(members=members).save()
+
+        index = 0
+        team = Team.objects.get()
+        for member in team.members:
+            print("%s == %s" % (member, member_info[index][0]))
+            self.assertEqual(member, member_info[index][0])
+            index += 1
+
 
 if __name__ == '__main__':
     unittest.main()

From 5957dc72eb209982a13821f6afe3e74ca39719a8 Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Wed, 1 Mar 2017 09:20:57 +0000
Subject: [PATCH 0469/1519] To achive storing object data in order with minimum
 implementation, I changed followings.

- added optional parameter `container_class` which enables to choose
  intermediate class at encoding Python data, instead of additional
  field class.
- removed OrderedDocument class because the equivalent feature could
  be implemented by the outside of Mongoengine.
---
 mongoengine/document.py      | 28 +--------------------
 mongoengine/fields.py        | 23 ++++++++---------
 mongoengine/queryset/base.py |  4 ---
 tests/fields/fields.py       | 48 +++++++++++++++---------------------
 4 files changed, 31 insertions(+), 72 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index a2a5e1563..b79e5e976 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1,7 +1,6 @@
 import re
 import warnings
 
-from collections import OrderedDict
 from bson.dbref import DBRef
 import pymongo
 from pymongo.read_preferences import ReadPreference
@@ -22,8 +21,7 @@
 
 __all__ = ('Document', 'EmbeddedDocument', 'DynamicDocument',
            'DynamicEmbeddedDocument', 'OperationError',
-           'InvalidCollectionError', 'NotUniqueError', 'MapReduceDocument',
-           'OrderedDocument')
+           'InvalidCollectionError', 'NotUniqueError', 'MapReduceDocument')
 
 
 def includes_cls(fields):
@@ -1038,27 +1036,3 @@ def object(self):
             self._key_object = self._document.objects.with_id(self.key)
             return self._key_object
         return self._key_object
-
-
-class OrderedDocument(Document):
-    """A document that is almost same with Document except for returning
-    results in OrderedDict instead of dict.
-    """
-
-    # The __metaclass__ attribute is removed by 2to3 when running with Python3
-    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
-    my_metaclass = TopLevelDocumentMetaclass
-    __metaclass__ = TopLevelDocumentMetaclass
-
-    @classmethod
-    def _get_collection(cls):
-        collection = super(OrderedDocument, cls)._get_collection()
-
-        if IS_PYMONGO_3:
-            # returns collection object which is set OrderedDict class to be decoded from BSON document
-            from bson import CodecOptions
-            return collection.with_options(codec_options=CodecOptions(document_class=OrderedDict))
-        else:
-            # set attribute to specify the class to be decoeded
-            cls.decoded_class = OrderedDict
-            return collection
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 4b6a1a9b3..70061e086 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -5,7 +5,6 @@
 import time
 import uuid
 import warnings
-from collections import OrderedDict
 from operator import itemgetter
 
 from bson import Binary, DBRef, ObjectId, SON
@@ -50,7 +49,7 @@
     'FileField', 'ImageGridFsProxy', 'ImproperlyConfigured', 'ImageField',
     'GeoPointField', 'PointField', 'LineStringField', 'PolygonField',
     'SequenceField', 'UUIDField', 'MultiPointField', 'MultiLineStringField',
-    'MultiPolygonField', 'GeoJsonBaseField', 'OrderedDynamicField'
+    'MultiPolygonField', 'GeoJsonBaseField'
 )
 
 RECURSIVE_REFERENCE_CONSTANT = 'self'
@@ -620,6 +619,14 @@ class DynamicField(BaseField):
 
     Used by :class:`~mongoengine.DynamicDocument` to handle dynamic data"""
 
+    def __init__(self, container_class=dict, *args, **kwargs):
+        self._container_cls = container_class
+        if not issubclass(self._container_cls, dict):
+            self.error('The class that is specified in `container_class` parameter '
+                       'must be a subclass of `dict`.')
+
+        super(DynamicField, self).__init__(*args, **kwargs)
+
     def to_mongo(self, value, use_db_field=True, fields=None):
         """Convert a Python type to a MongoDB compatible type.
         """
@@ -645,7 +652,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
             is_list = True
             value = {k: v for k, v in enumerate(value)}
 
-        data = self._container_type() if hasattr(self, '_container_type') else {}
+        data = self._container_cls()
         for k, v in value.iteritems():
             data[k] = self.to_mongo(v, use_db_field, fields)
 
@@ -676,16 +683,6 @@ def validate(self, value, clean=True):
             value.validate(clean=clean)
 
 
-class OrderedDynamicField(DynamicField):
-    """A field that wraps DynamicField. This uses OrderedDict class
-    to guarantee to store data in the defined order instead of dict.
-    """
-
-    def __init__(self, *args, **kwargs):
-        super(OrderedDynamicField, self).__init__(*args, **kwargs)
-        self._container_type = OrderedDict
-
-
 class ListField(ComplexBaseField):
     """A list field that wraps a standard field, allowing multiple instances
     of the field to be used as a list in the database.
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 4738f5f73..7e4856863 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1501,10 +1501,6 @@ def _cursor_args(self):
                 cursor_args['read_preference'] = self._read_preference
             else:
                 cursor_args['slave_okay'] = self._slave_okay
-
-            # set decode format if needed
-            if hasattr(self._document, 'decoded_class'):
-                cursor_args['as_class'] = self._document.decoded_class
         else:
             fields_name = 'projection'
             # snapshot is not handled at all by PyMongo 3+
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 3516471f1..b73eb0af5 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -4500,39 +4500,31 @@ class CustomData(Document):
         self.assertTrue(hasattr(CustomData.c_field, 'custom_data'))
         self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
 
-    def test_ordered_dynamic_fields_class(self):
+    def test_dynamicfield_with_container_class(self):
         """
-        Tests that OrderedDynamicFields interits features of the DynamicFields
-        and saves/retrieves data in order.
+        Tests that object can be stored in order by DynamicField class
+        with container_class parameter.
         """
-        class Member(Document):
-            name = StringField()
-            age = IntField()
+        raw_data = [('d', 1), ('c', 2), ('b', 3), ('a', 4)]
 
-        class Team(OrderedDocument):
-            members = OrderedDynamicField()
+        class Doc(Document):
+            ordered_data = DynamicField(container_class=OrderedDict)
+            unordered_data = DynamicField()
 
-        Member.drop_collection()
-        Team.drop_collection()
+        Doc.drop_collection()
 
-        member_info = [
-            ('Martin McFly', 17),
-            ('Emmett Brown', 65),
-            ('George McFly', 47)
-        ]
-        members = OrderedDict()
-        for name, age in member_info:
-            members[name] = Member(name=name, age=age)
-            members[name].save()
-
-        Team(members=members).save()
-
-        index = 0
-        team = Team.objects.get()
-        for member in team.members:
-            print("%s == %s" % (member, member_info[index][0]))
-            self.assertEqual(member, member_info[index][0])
-            index += 1
+        doc = Doc(ordered_data=OrderedDict(raw_data),
+                  unordered_data=dict(raw_data)).save()
+
+        self.assertEqual(type(doc.ordered_data), OrderedDict)
+        self.assertEqual(type(doc.unordered_data), dict)
+        self.assertEqual([k for k,_ in doc.ordered_data.items()], ['d', 'c', 'b', 'a'])
+        self.assertNotEqual([k for k,_ in doc.unordered_data.items()], ['d', 'c', 'b', 'a'])
+
+    def test_dynamicfield_with_wrong_container_class(self):
+        with self.assertRaises(ValidationError):
+            class DocWithInvalidField:
+                data = DynamicField(container_class=list)
 
 
 if __name__ == '__main__':

From 6aaf9ba470edcba89489b95f0302884730bf70ca Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Wed, 1 Mar 2017 09:32:28 +0000
Subject: [PATCH 0470/1519] removed a checking of dict order because this order
 is not cared (some implementation might be in ordered, but other one is not)

---
 tests/fields/fields.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index b73eb0af5..2db373171 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -4519,7 +4519,6 @@ class Doc(Document):
         self.assertEqual(type(doc.ordered_data), OrderedDict)
         self.assertEqual(type(doc.unordered_data), dict)
         self.assertEqual([k for k,_ in doc.ordered_data.items()], ['d', 'c', 'b', 'a'])
-        self.assertNotEqual([k for k,_ in doc.unordered_data.items()], ['d', 'c', 'b', 'a'])
 
     def test_dynamicfield_with_wrong_container_class(self):
         with self.assertRaises(ValidationError):

From 741643af5f01b74067ece4f41c6a7982020ee6fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Thu, 2 Mar 2017 00:05:10 -0500
Subject: [PATCH 0471/1519] clean up field unit tests (#1498)

---
 tests/fields/fields.py | 3960 ++++++++++++++++++++--------------------
 1 file changed, 1940 insertions(+), 2020 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 318c0c595..ed7baa2bd 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -16,7 +16,7 @@
 
 from decimal import Decimal
 
-from bson import Binary, DBRef, ObjectId
+from bson import Binary, DBRef, ObjectId, SON
 try:
     from bson.int64 import Int64
 except ImportError:
@@ -35,7 +35,8 @@
 class FieldTest(MongoDBTestCase):
 
     def test_default_values_nothing_set(self):
-        """Ensure that default field values are used when creating a document.
+        """Ensure that default field values are used when creating
+        a document.
         """
         class Person(Document):
             name = StringField()
@@ -47,8 +48,9 @@ class Person(Document):
 
         # Confirm saving now would store values
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(
-            data_to_be_saved, ['age', 'created', 'name', 'userid'])
+        self.assertEqual(data_to_be_saved,
+            ['age', 'created', 'name', 'userid']
+        )
 
         self.assertTrue(person.validate() is None)
 
@@ -68,7 +70,8 @@ class Person(Document):
             data_to_be_saved, ['age', 'created', 'name', 'userid'])
 
     def test_default_values_set_to_None(self):
-        """Ensure that default field values are used when creating a document.
+        """Ensure that default field values are used even when
+        we explcitly initialize the doc with None values.
         """
         class Person(Document):
             name = StringField()
@@ -100,7 +103,8 @@ class Person(Document):
         self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
 
     def test_default_values_when_setting_to_None(self):
-        """Ensure that default field values are used when creating a document.
+        """Ensure that default field values are used when creating
+        a document.
         """
         class Person(Document):
             name = StringField()
@@ -120,10 +124,10 @@ class Person(Document):
 
         self.assertTrue(person.validate() is None)
 
-        self.assertEqual(person.name, person.name)
-        self.assertEqual(person.age, person.age)
-        self.assertEqual(person.userid, person.userid)
-        self.assertEqual(person.created, person.created)
+        self.assertEqual(person.name, None)
+        self.assertEqual(person.age, 30)
+        self.assertEqual(person.userid, 'test')
+        self.assertTrue(isinstance(person.created, datetime.datetime))
 
         self.assertEqual(person._data['name'], person.name)
         self.assertEqual(person._data['age'], person.age)
@@ -135,7 +139,8 @@ class Person(Document):
         self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
 
     def test_default_values_when_deleting_value(self):
-        """Ensure that default field values are used when creating a document.
+        """Ensure that default field values are used after non-default
+        values are explicitly deleted.
         """
         class Person(Document):
             name = StringField()
@@ -143,7 +148,8 @@ class Person(Document):
             userid = StringField(default=lambda: 'test', required=True)
             created = DateTimeField(default=datetime.datetime.utcnow)
 
-        person = Person(name="Ross")
+        person = Person(name="Ross", age=50, userid='different',
+                        created=datetime.datetime(2014, 6, 12))
         del person.name
         del person.age
         del person.userid
@@ -154,10 +160,11 @@ class Person(Document):
 
         self.assertTrue(person.validate() is None)
 
-        self.assertEqual(person.name, person.name)
-        self.assertEqual(person.age, person.age)
-        self.assertEqual(person.userid, person.userid)
-        self.assertEqual(person.created, person.created)
+        self.assertEqual(person.name, None)
+        self.assertEqual(person.age, 30)
+        self.assertEqual(person.userid, 'test')
+        self.assertTrue(isinstance(person.created, datetime.datetime))
+        self.assertNotEqual(person.created, datetime.datetime(2014, 6, 12))
 
         self.assertEqual(person._data['name'], person.name)
         self.assertEqual(person._data['age'], person.age)
@@ -169,8 +176,7 @@ class Person(Document):
         self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
 
     def test_required_values(self):
-        """Ensure that required field constraints are enforced.
-        """
+        """Ensure that required field constraints are enforced."""
         class Person(Document):
             name = StringField(required=True)
             age = IntField(required=True)
@@ -182,9 +188,9 @@ class Person(Document):
         self.assertRaises(ValidationError, person.validate)
 
     def test_not_required_handles_none_in_update(self):
-        """Ensure that every fields should accept None if required is False.
+        """Ensure that every fields should accept None if required is
+        False.
         """
-
         class HandleNoneFields(Document):
             str_fld = StringField()
             int_fld = IntField()
@@ -236,23 +242,27 @@ class HandleNoneFields(Document):
         doc.com_dt_fld = datetime.datetime.utcnow()
         doc.save()
 
-        collection = self.db[HandleNoneFields._get_collection_name()]
-        obj = collection.update({"_id": doc.id}, {"$unset": {
-            "str_fld": 1,
-            "int_fld": 1,
-            "flt_fld": 1,
-            "comp_dt_fld": 1}
+        # Unset all the fields
+        obj = HandleNoneFields._get_collection().update({"_id": doc.id}, {
+            "$unset": {
+                "str_fld": 1,
+                "int_fld": 1,
+                "flt_fld": 1,
+                "comp_dt_fld": 1
+            }
         })
 
         # Retrive data from db and verify it.
-        ret = HandleNoneFields.objects.all()[0]
-
+        ret = HandleNoneFields.objects.first()
         self.assertEqual(ret.str_fld, None)
         self.assertEqual(ret.int_fld, None)
         self.assertEqual(ret.flt_fld, None)
-        # Return current time if retrived value is None.
+
+        # ComplexDateTimeField returns current time if retrived value is None.
         self.assertTrue(isinstance(ret.comp_dt_fld, datetime.datetime))
 
+        # Retrieved object shouldn't pass validation when a re-save is
+        # attempted.
         self.assertRaises(ValidationError, ret.validate)
 
     def test_int_and_float_ne_operator(self):
@@ -280,7 +290,8 @@ class TestDocument(Document):
         self.assertEqual(1, TestDocument.objects(long_fld__ne=None).count())
 
     def test_object_id_validation(self):
-        """Ensure that invalid values cannot be assigned to string fields.
+        """Ensure that invalid values cannot be assigned to an
+        ObjectIdField.
         """
         class Person(Document):
             name = StringField()
@@ -297,27 +308,8 @@ class Person(Document):
         person.id = '497ce96f395f2f052a494fd4'
         person.validate()
 
-    def test_db_field_validation(self):
-        """Ensure that db_field doesn't accept invalid values."""
-
-        # dot in the name
-        with self.assertRaises(ValueError):
-            class User(Document):
-                name = StringField(db_field='user.name')
-
-        # name starting with $
-        with self.assertRaises(ValueError):
-            class User(Document):
-                name = StringField(db_field='$name')
-
-        # name containing a null character
-        with self.assertRaises(ValueError):
-            class User(Document):
-                name = StringField(db_field='name\0')
-
     def test_string_validation(self):
-        """Ensure that invalid values cannot be assigned to string fields.
-        """
+        """Ensure that invalid values cannot be assigned to string fields."""
         class Person(Document):
             name = StringField(max_length=20)
             userid = StringField(r'[0-9a-z_]+$')
@@ -490,10 +482,25 @@ class Person(Document):
         person_2 = Person(height='something invalid')
         self.assertRaises(ValidationError, person_2.validate)
 
-        Person.drop_collection()
+    def test_db_field_validation(self):
+        """Ensure that db_field doesn't accept invalid values."""
 
-    def test_decimal_comparison(self):
+        # dot in the name
+        with self.assertRaises(ValueError):
+            class User(Document):
+                name = StringField(db_field='user.name')
+
+        # name starting with $
+        with self.assertRaises(ValueError):
+            class User(Document):
+                name = StringField(db_field='$name')
+
+        # name containing a null character
+        with self.assertRaises(ValueError):
+            class User(Document):
+                name = StringField(db_field='name\0')
 
+    def test_decimal_comparison(self):
         class Person(Document):
             money = DecimalField()
 
@@ -546,7 +553,8 @@ class Person(Document):
             self.assertEqual(expected, actual)
 
     def test_boolean_validation(self):
-        """Ensure that invalid values cannot be assigned to boolean fields.
+        """Ensure that invalid values cannot be assigned to boolean
+        fields.
         """
         class Person(Document):
             admin = BooleanField()
@@ -586,8 +594,7 @@ class Person(Document):
             self.assertRaises(ValidationError, person.validate)
 
     def test_uuid_field_binary(self):
-        """Test UUID fields storing as Binary object
-        """
+        """Test UUID fields storing as Binary object."""
         class Person(Document):
             api_key = UUIDField(binary=True)
 
@@ -611,7 +618,8 @@ class Person(Document):
             self.assertRaises(ValidationError, person.validate)
 
     def test_datetime_validation(self):
-        """Ensure that invalid values cannot be assigned to datetime fields.
+        """Ensure that invalid values cannot be assigned to datetime
+        fields.
         """
         class LogEntry(Document):
             time = DateTimeField()
@@ -675,8 +683,6 @@ class LogEntry(Document):
         log.reload()
         self.assertEqual(log.date.date(), datetime.date.today())
 
-        LogEntry.drop_collection()
-
         # Post UTC - microseconds are rounded (down) nearest millisecond and
         # dropped
         d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
@@ -708,8 +714,6 @@ class LogEntry(Document):
             self.assertNotEqual(log.date, d1)
             self.assertEqual(log.date, d2)
 
-        LogEntry.drop_collection()
-
     def test_datetime_usage(self):
         """Tests for regular datetime fields"""
         class LogEntry(Document):
@@ -731,48 +735,42 @@ class LogEntry(Document):
             log1 = LogEntry.objects.get(date=d1.isoformat('T'))
             self.assertEqual(log, log1)
 
-        LogEntry.drop_collection()
-
-        # create 60 log entries
-        for i in range(1950, 2010):
+        # create additional 19 log entries for a total of 20
+        for i in range(1971, 1990):
             d = datetime.datetime(i, 1, 1, 0, 0, 1)
             LogEntry(date=d).save()
 
-        self.assertEqual(LogEntry.objects.count(), 60)
+        self.assertEqual(LogEntry.objects.count(), 20)
 
         # Test ordering
         logs = LogEntry.objects.order_by("date")
-        count = logs.count()
         i = 0
-        while i == count - 1:
+        while i < 19:
             self.assertTrue(logs[i].date <= logs[i + 1].date)
             i += 1
 
         logs = LogEntry.objects.order_by("-date")
-        count = logs.count()
         i = 0
-        while i == count - 1:
+        while i < 19:
             self.assertTrue(logs[i].date >= logs[i + 1].date)
             i += 1
 
         # Test searching
         logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 30)
+        self.assertEqual(logs.count(), 10)
 
         logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 30)
+        self.assertEqual(logs.count(), 10)
 
         logs = LogEntry.objects.filter(
-            date__lte=datetime.datetime(2011, 1, 1),
-            date__gte=datetime.datetime(2000, 1, 1),
+            date__lte=datetime.datetime(1980, 1, 1),
+            date__gte=datetime.datetime(1975, 1, 1),
         )
-        self.assertEqual(logs.count(), 10)
-
-        LogEntry.drop_collection()
+        self.assertEqual(logs.count(), 5)
 
     def test_complexdatetime_storage(self):
-        """Tests for complex datetime fields - which can handle microseconds
-        without rounding.
+        """Tests for complex datetime fields - which can handle
+        microseconds without rounding.
         """
         class LogEntry(Document):
             date = ComplexDateTimeField()
@@ -829,18 +827,16 @@ class LogEntry(Document):
         stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()['date_with_dots']
         self.assertTrue(re.match('^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$', stored) is not None)
 
-        LogEntry.drop_collection()
-
     def test_complexdatetime_usage(self):
-        """Tests for complex datetime fields - which can handle microseconds
-        without rounding.
+        """Tests for complex datetime fields - which can handle
+        microseconds without rounding.
         """
         class LogEntry(Document):
             date = ComplexDateTimeField()
 
         LogEntry.drop_collection()
 
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
+        d1 = datetime.datetime(1950, 1, 1, 0, 0, 1, 999)
         log = LogEntry()
         log.date = d1
         log.save()
@@ -848,10 +844,8 @@ class LogEntry(Document):
         log1 = LogEntry.objects.get(date=d1)
         self.assertEqual(log, log1)
 
-        LogEntry.drop_collection()
-
-        # create 60 log entries
-        for i in range(1950, 2010):
+        # create extra 59 log entries for a total of 60
+        for i in range(1951, 2010):
             d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)
             LogEntry(date=d).save()
 
@@ -859,16 +853,14 @@ class LogEntry(Document):
 
         # Test ordering
         logs = LogEntry.objects.order_by("date")
-        count = logs.count()
         i = 0
-        while i == count - 1:
+        while i < 59:
             self.assertTrue(logs[i].date <= logs[i + 1].date)
             i += 1
 
         logs = LogEntry.objects.order_by("-date")
-        count = logs.count()
         i = 0
-        while i == count - 1:
+        while i < 59:
             self.assertTrue(logs[i].date >= logs[i + 1].date)
             i += 1
 
@@ -889,7 +881,9 @@ class LogEntry(Document):
 
         # Test microsecond-level ordering/filtering
         for microsecond in (99, 999, 9999, 10000):
-            LogEntry(date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)).save()
+            LogEntry(
+                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)
+            ).save()
 
         logs = list(LogEntry.objects.order_by('date'))
         for next_idx, log in enumerate(logs[:-1], start=1):
@@ -901,14 +895,12 @@ class LogEntry(Document):
             next_log = logs[next_idx]
             self.assertTrue(log.date > next_log.date)
 
-        logs = LogEntry.objects.filter(date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))
+        logs = LogEntry.objects.filter(
+            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))
         self.assertEqual(logs.count(), 4)
 
-        LogEntry.drop_collection()
-
     def test_list_validation(self):
-        """Ensure that a list field only accepts lists with valid elements.
-        """
+        """Ensure that a list field only accepts lists with valid elements."""
         class User(Document):
             pass
 
@@ -922,6 +914,9 @@ class BlogPost(Document):
             authors = ListField(ReferenceField(User))
             generic = ListField(GenericReferenceField())
 
+        User.drop_collection()
+        BlogPost.drop_collection()
+
         post = BlogPost(content='Went for a walk today...')
         post.validate()
 
@@ -967,9 +962,6 @@ class BlogPost(Document):
         post.generic = [user]
         post.validate()
 
-        User.drop_collection()
-        BlogPost.drop_collection()
-
     def test_sorted_list_sorting(self):
         """Ensure that a sorted list field properly sorts values.
         """
@@ -983,6 +975,8 @@ class BlogPost(Document):
                                        ordering='order')
             tags = SortedListField(StringField())
 
+        BlogPost.drop_collection()
+
         post = BlogPost(content='Went for a walk today...')
         post.save()
 
@@ -1007,8 +1001,6 @@ class BlogPost(Document):
         self.assertEqual(post.comments[0].content, comment1.content)
         self.assertEqual(post.comments[1].content, comment2.content)
 
-        BlogPost.drop_collection()
-
     def test_reverse_list_sorting(self):
         """Ensure that a reverse sorted list field properly sorts values"""
 
@@ -1021,6 +1013,8 @@ class CategoryList(Document):
                                          ordering='count', reverse=True)
             name = StringField()
 
+        CategoryList.drop_collection()
+
         catlist = CategoryList(name="Top categories")
         cat1 = Category(name='posts', count=10)
         cat2 = Category(name='food', count=100)
@@ -1033,11 +1027,8 @@ class CategoryList(Document):
         self.assertEqual(catlist.categories[1].name, cat3.name)
         self.assertEqual(catlist.categories[2].name, cat1.name)
 
-        CategoryList.drop_collection()
-
     def test_list_field(self):
-        """Ensure that list types work as expected.
-        """
+        """Ensure that list types work as expected."""
         class BlogPost(Document):
             info = ListField()
 
@@ -1086,8 +1077,6 @@ class BlogPost(Document):
         post.save()
         self.assertEqual(BlogPost.objects(info=['1', '2', '3', '4', '1', '2', '3', '4']).count(), 1)
 
-        BlogPost.drop_collection()
-
     def test_list_field_manipulative_operators(self):
         """Ensure that ListField works with standard list operators that manipulate the list.
         """
@@ -1238,30 +1227,32 @@ def reset_post():
         post.reload()
         self.assertEqual(post.info, ['5', '4', '3', '2', '1', '0'])
 
-        # 'sort': though this operator method does manipulate the list, it is tested in
-        #     the 'test_list_field_lexicograpic_operators' function
-        BlogPost.drop_collection()
+        # 'sort': though this operator method does manipulate the list, it is
+        # tested in the 'test_list_field_lexicograpic_operators' function
 
     def test_list_field_invalid_operators(self):
         class BlogPost(Document):
             ref = StringField()
             info = ListField(StringField())
+
         post = BlogPost()
         post.ref = "1234"
         post.info = ['0', '1', '2', '3', '4', '5']
+
         # '__hash__'
         # aka 'hash(list)'
-        # # assert TypeError
         self.assertRaises(TypeError, lambda: hash(post.info))
 
     def test_list_field_lexicographic_operators(self):
-        """Ensure that ListField works with standard list operators that do lexigraphic ordering.
+        """Ensure that ListField works with standard list operators that
+        do lexigraphic ordering.
         """
         class BlogPost(Document):
             ref = StringField()
             text_info = ListField(StringField())
             oid_info = ListField(ObjectIdField())
             bool_info = ListField(BooleanField())
+
         BlogPost.drop_collection()
 
         blogSmall = BlogPost(ref="small")
@@ -1286,28 +1277,35 @@ class BlogPost(Document):
         blogLargeB.bool_info = [False, True]
         blogLargeB.save()
         blogLargeB.reload()
+
         # '__eq__' aka '=='
         self.assertEqual(blogLargeA.text_info, blogLargeB.text_info)
         self.assertEqual(blogLargeA.bool_info, blogLargeB.bool_info)
+
         # '__ge__' aka '>='
         self.assertGreaterEqual(blogLargeA.text_info, blogSmall.text_info)
         self.assertGreaterEqual(blogLargeA.text_info, blogLargeB.text_info)
         self.assertGreaterEqual(blogLargeA.bool_info, blogSmall.bool_info)
         self.assertGreaterEqual(blogLargeA.bool_info, blogLargeB.bool_info)
+
         # '__gt__' aka '>'
         self.assertGreaterEqual(blogLargeA.text_info, blogSmall.text_info)
         self.assertGreaterEqual(blogLargeA.bool_info, blogSmall.bool_info)
+
         # '__le__' aka '<='
         self.assertLessEqual(blogSmall.text_info, blogLargeB.text_info)
         self.assertLessEqual(blogLargeA.text_info, blogLargeB.text_info)
         self.assertLessEqual(blogSmall.bool_info, blogLargeB.bool_info)
         self.assertLessEqual(blogLargeA.bool_info, blogLargeB.bool_info)
+
         # '__lt__' aka '<'
         self.assertLess(blogSmall.text_info, blogLargeB.text_info)
         self.assertLess(blogSmall.bool_info, blogLargeB.bool_info)
+
         # '__ne__' aka '!='
         self.assertNotEqual(blogSmall.text_info, blogLargeB.text_info)
         self.assertNotEqual(blogSmall.bool_info, blogLargeB.bool_info)
+
         # 'sort'
         blogLargeB.bool_info = [True, False, True, False]
         blogLargeB.text_info.sort()
@@ -1327,11 +1325,8 @@ class BlogPost(Document):
         self.assertEqual(blogLargeB.oid_info, sorted_target_list)
         self.assertEqual(blogLargeB.bool_info, [False, False, True, True])
 
-        BlogPost.drop_collection()
-
     def test_list_assignment(self):
-        """Ensure that list field element assignment and slicing work
-        """
+        """Ensure that list field element assignment and slicing work."""
         class BlogPost(Document):
             info = ListField()
 
@@ -1391,8 +1386,9 @@ class Bar(Document):
         self.assertEqual(repr(foo.bars), '[<Bar: Bar object>]')
 
     def test_list_field_strict(self):
-        """Ensure that list field handles validation if provided a strict field type."""
-
+        """Ensure that list field handles validation if provided
+        a strict field type.
+        """
         class Simple(Document):
             mapping = ListField(field=IntField())
 
@@ -1407,30 +1403,26 @@ class Simple(Document):
             e.mapping = ["abc"]
             e.save()
 
-        Simple.drop_collection()
-
     def test_list_field_rejects_strings(self):
-        """Strings aren't valid list field data types"""
-
+        """Strings aren't valid list field data types."""
         class Simple(Document):
             mapping = ListField()
 
         Simple.drop_collection()
+
         e = Simple()
         e.mapping = 'hello world'
-
         self.assertRaises(ValidationError, e.save)
 
     def test_complex_field_required(self):
-        """Ensure required cant be None / Empty"""
-
+        """Ensure required cant be None / Empty."""
         class Simple(Document):
             mapping = ListField(required=True)
 
         Simple.drop_collection()
+
         e = Simple()
         e.mapping = []
-
         self.assertRaises(ValidationError, e.save)
 
         class Simple(Document):
@@ -1439,18 +1431,17 @@ class Simple(Document):
         Simple.drop_collection()
         e = Simple()
         e.mapping = {}
-
         self.assertRaises(ValidationError, e.save)
 
     def test_complex_field_same_value_not_changed(self):
-        """
-        If a complex field is set to the same value, it should not be marked as
-        changed.
+        """If a complex field is set to the same value, it should not
+        be marked as changed.
         """
         class Simple(Document):
             mapping = ListField()
 
         Simple.drop_collection()
+
         e = Simple().save()
         e.mapping = []
         self.assertEqual([], e._changed_fields)
@@ -1459,12 +1450,12 @@ class Simple(Document):
             mapping = DictField()
 
         Simple.drop_collection()
+
         e = Simple().save()
         e.mapping = {}
         self.assertEqual([], e._changed_fields)
 
     def test_slice_marks_field_as_changed(self):
-
         class Simple(Document):
             widgets = ListField()
 
@@ -1477,7 +1468,6 @@ class Simple(Document):
         self.assertEqual(simple.widgets, [4])
 
     def test_del_slice_marks_field_as_changed(self):
-
         class Simple(Document):
             widgets = ListField()
 
@@ -1490,7 +1480,6 @@ class Simple(Document):
         self.assertEqual(simple.widgets, [4])
 
     def test_list_field_with_negative_indices(self):
-
         class Simple(Document):
             widgets = ListField()
 
@@ -1504,7 +1493,6 @@ class Simple(Document):
 
     def test_list_field_complex(self):
         """Ensure that the list fields can handle the complex types."""
-
         class SettingBase(EmbeddedDocument):
             meta = {'allow_inheritance': True}
 
@@ -1518,6 +1506,7 @@ class Simple(Document):
             mapping = ListField()
 
         Simple.drop_collection()
+
         e = Simple()
         e.mapping.append(StringSetting(value='foo'))
         e.mapping.append(IntegerSetting(value=42))
@@ -1555,11 +1544,8 @@ class Simple(Document):
         self.assertEqual(
             Simple.objects.filter(mapping__2__list__1__value='Boo').count(), 1)
 
-        Simple.drop_collection()
-
     def test_dict_field(self):
-        """Ensure that dict types work as expected.
-        """
+        """Ensure that dict types work as expected."""
         class BlogPost(Document):
             info = DictField()
 
@@ -1621,11 +1607,8 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual([], post.info['authors'])
 
-        BlogPost.drop_collection()
-
     def test_dictfield_dump_document(self):
-        """Ensure a DictField can handle another document's dump
-        """
+        """Ensure a DictField can handle another document's dump."""
         class Doc(Document):
             field = DictField()
 
@@ -1663,7 +1646,6 @@ class ToEmbedChild(ToEmbedParent):
 
     def test_dictfield_strict(self):
         """Ensure that dict field handles validation if provided a strict field type."""
-
         class Simple(Document):
             mapping = DictField(field=IntField())
 
@@ -1678,11 +1660,8 @@ class Simple(Document):
             e.mapping['somestring'] = "abc"
             e.save()
 
-        Simple.drop_collection()
-
     def test_dictfield_complex(self):
         """Ensure that the dict field can handle the complex types."""
-
         class SettingBase(EmbeddedDocument):
             meta = {'allow_inheritance': True}
 
@@ -1696,6 +1675,7 @@ class Simple(Document):
             mapping = DictField()
 
         Simple.drop_collection()
+
         e = Simple()
         e.mapping['somestring'] = StringSetting(value='foo')
         e.mapping['someint'] = IntegerSetting(value=42)
@@ -1732,11 +1712,8 @@ class Simple(Document):
         self.assertEqual(
             Simple.objects.filter(mapping__nested_dict__list__1__value='Boo').count(), 1)
 
-        Simple.drop_collection()
-
     def test_atomic_update_dict_field(self):
         """Ensure that the entire DictField can be atomically updated."""
-
         class Simple(Document):
             mapping = DictField(field=ListField(IntField(required=True)))
 
@@ -1754,11 +1731,8 @@ class Simple(Document):
         with self.assertRaises(ValueError):
             e.update(set__mapping={"somestrings": ["foo", "bar", ]})
 
-        Simple.drop_collection()
-
     def test_mapfield(self):
         """Ensure that the MapField handles the declared type."""
-
         class Simple(Document):
             mapping = MapField(IntField())
 
@@ -1776,11 +1750,8 @@ class Simple(Document):
             class NoDeclaredType(Document):
                 mapping = MapField()
 
-        Simple.drop_collection()
-
     def test_complex_mapfield(self):
         """Ensure that the MapField can handle complex declared types."""
-
         class SettingBase(EmbeddedDocument):
             meta = {"allow_inheritance": True}
 
@@ -1809,7 +1780,6 @@ class Extensible(Document):
             e.save()
 
     def test_embedded_mapfield_db_field(self):
-
         class Embedded(EmbeddedDocument):
             number = IntField(default=0, db_field='i')
 
@@ -1846,11 +1816,10 @@ class Test(Document):
         test.my_map['1'].name = 'test updated'
         test.save()
 
-        Test.drop_collection()
-
     def test_map_field_lookup(self):
-        """Ensure MapField lookups succeed on Fields without a lookup method"""
-
+        """Ensure MapField lookups succeed on Fields without a lookup
+        method.
+        """
         class Action(EmbeddedDocument):
             operation = StringField()
             object = StringField()
@@ -1872,7 +1841,6 @@ class Log(Document):
             actions__friends__object='beer').count())
 
     def test_map_field_unicode(self):
-
         class Info(EmbeddedDocument):
             description = StringField()
             value_list = ListField(field=StringField())
@@ -1890,12 +1858,12 @@ class BlogPost(Document):
 
         tree.save()
 
-        self.assertEqual(BlogPost.objects.get(id=tree.id).info_dict[u"éééé"].description, u"VALUE: éééé")
-
-        BlogPost.drop_collection()
+        self.assertEqual(
+            BlogPost.objects.get(id=tree.id).info_dict[u"éééé"].description,
+            u"VALUE: éééé"
+        )
 
     def test_embedded_db_field(self):
-
         class Embedded(EmbeddedDocument):
             number = IntField(default=0, db_field='i')
 
@@ -1949,8 +1917,8 @@ class Person(Document):
         person.validate()
 
     def test_embedded_document_inheritance(self):
-        """Ensure that subclasses of embedded documents may be provided to
-        EmbeddedDocumentFields of the superclass' type.
+        """Ensure that subclasses of embedded documents may be provided
+        to EmbeddedDocumentFields of the superclass' type.
         """
         class User(EmbeddedDocument):
             name = StringField()
@@ -1976,7 +1944,6 @@ def test_embedded_document_inheritance_with_list(self):
         """Ensure that nested list of subclassed embedded documents is
         handled correctly.
         """
-
         class Group(EmbeddedDocument):
             name = StringField()
             content = ListField(StringField())
@@ -1998,9 +1965,9 @@ class User(Basedoc):
         self.assertEqual(content, User.objects.first().groups[0].content)
 
     def test_reference_miss(self):
-        """Ensure an exception is raised when dereferencing unknown document
+        """Ensure an exception is raised when dereferencing an unknown
+        document.
         """
-
         class Foo(Document):
             pass
 
@@ -2029,8 +1996,8 @@ class Bar(Document):
         self.assertEqual(bar.generic_ref, {'_ref': expected, '_cls': 'Foo'})
 
     def test_reference_validation(self):
-        """Ensure that invalid docment objects cannot be assigned to reference
-        fields.
+        """Ensure that invalid document objects cannot be assigned to
+        reference fields.
         """
         class User(Document):
             name = StringField()
@@ -2042,6 +2009,8 @@ class BlogPost(Document):
         User.drop_collection()
         BlogPost.drop_collection()
 
+        # Make sure ReferenceField only accepts a document class or a string
+        # with a document class name.
         self.assertRaises(ValidationError, ReferenceField, EmbeddedDocument)
 
         user = User(name='Test User')
@@ -2056,19 +2025,18 @@ class BlogPost(Document):
         post1.author = post2
         self.assertRaises(ValidationError, post1.validate)
 
+        # Make sure referencing a saved document of the right type works
         user.save()
         post1.author = user
         post1.save()
 
+        # Make sure referencing a saved document of the *wrong* type fails
         post2.save()
         post1.author = post2
         self.assertRaises(ValidationError, post1.validate)
 
-        User.drop_collection()
-        BlogPost.drop_collection()
-
     def test_dbref_reference_fields(self):
-
+        """Make sure storing references as bson.dbref.DBRef works."""
         class Person(Document):
             name = StringField()
             parent = ReferenceField('self', dbref=True)
@@ -2078,2426 +2046,2378 @@ class Person(Document):
         p1 = Person(name="John").save()
         Person(name="Ross", parent=p1).save()
 
-        col = Person._get_collection()
-        data = col.find_one({'name': 'Ross'})
-        self.assertEqual(data['parent'], DBRef('person', p1.pk))
+        self.assertEqual(
+            Person._get_collection().find_one({'name': 'Ross'})['parent'],
+            DBRef('person', p1.pk)
+        )
 
         p = Person.objects.get(name="Ross")
         self.assertEqual(p.parent, p1)
 
     def test_dbref_to_mongo(self):
+        """Make sure that calling to_mongo on a ReferenceField which
+        has dbref=False, but actually actually contains a DBRef returns
+        an ID of that DBRef.
+        """
         class Person(Document):
             name = StringField()
             parent = ReferenceField('self', dbref=False)
 
-        p1 = Person._from_son({'name': "Yakxxx",
-                               'parent': "50a234ea469ac1eda42d347d"})
-        mongoed = p1.to_mongo()
-        self.assertTrue(isinstance(mongoed['parent'], ObjectId))
+        p = Person(
+            name='Steve',
+            parent=DBRef('person', 'abcdefghijklmnop')
+        )
+        self.assertEqual(p.to_mongo(), SON([
+            ('name', u'Steve'),
+            ('parent', 'abcdefghijklmnop')
+        ]))
 
-    def test_cached_reference_field_get_and_save(self):
-        """
-        Tests #1047: CachedReferenceField creates DBRefs on to_python, but can't save them on to_mongo
-        """
-        class Animal(Document):
+    def test_objectid_reference_fields(self):
+
+        class Person(Document):
             name = StringField()
-            tag = StringField()
+            parent = ReferenceField('self', dbref=False)
 
-        class Ocorrence(Document):
-            person = StringField()
-            animal = CachedReferenceField(Animal)
+        Person.drop_collection()
 
-        Animal.drop_collection()
-        Ocorrence.drop_collection()
+        p1 = Person(name="John").save()
+        Person(name="Ross", parent=p1).save()
 
-        Ocorrence(person="testte",
-                  animal=Animal(name="Leopard", tag="heavy").save()).save()
-        p = Ocorrence.objects.get()
-        p.person = 'new_testte'
-        p.save()
+        col = Person._get_collection()
+        data = col.find_one({'name': 'Ross'})
+        self.assertEqual(data['parent'], p1.pk)
 
-    def test_cached_reference_fields(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
+        p = Person.objects.get(name="Ross")
+        self.assertEqual(p.parent, p1)
 
-        class Ocorrence(Document):
-            person = StringField()
-            animal = CachedReferenceField(
-                Animal, fields=['tag'])
+    def test_list_item_dereference(self):
+        """Ensure that DBRef items in ListFields are dereferenced.
+        """
+        class User(Document):
+            name = StringField()
 
-        Animal.drop_collection()
-        Ocorrence.drop_collection()
+        class Group(Document):
+            members = ListField(ReferenceField(User))
 
-        a = Animal(name="Leopard", tag="heavy")
-        a.save()
+        User.drop_collection()
+        Group.drop_collection()
 
-        self.assertEqual(Animal._cached_reference_fields, [Ocorrence.animal])
-        o = Ocorrence(person="teste", animal=a)
-        o.save()
+        user1 = User(name='user1')
+        user1.save()
+        user2 = User(name='user2')
+        user2.save()
 
-        p = Ocorrence(person="Wilson")
-        p.save()
+        group = Group(members=[user1, user2])
+        group.save()
 
-        self.assertEqual(Ocorrence.objects(animal=None).count(), 1)
+        group_obj = Group.objects.first()
 
-        self.assertEqual(
-            a.to_mongo(fields=['tag']), {'tag': 'heavy', "_id": a.pk})
+        self.assertEqual(group_obj.members[0].name, user1.name)
+        self.assertEqual(group_obj.members[1].name, user2.name)
 
-        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
+    def test_recursive_reference(self):
+        """Ensure that ReferenceFields can reference their own documents.
+        """
+        class Employee(Document):
+            name = StringField()
+            boss = ReferenceField('self')
+            friends = ListField(ReferenceField('self'))
 
-        # counts
-        Ocorrence(person="teste 2").save()
-        Ocorrence(person="teste 3").save()
+        Employee.drop_collection()
 
-        count = Ocorrence.objects(animal__tag='heavy').count()
-        self.assertEqual(count, 1)
+        bill = Employee(name='Bill Lumbergh')
+        bill.save()
 
-        ocorrence = Ocorrence.objects(animal__tag='heavy').first()
-        self.assertEqual(ocorrence.person, "teste")
-        self.assertTrue(isinstance(ocorrence.animal, Animal))
+        michael = Employee(name='Michael Bolton')
+        michael.save()
 
-    def test_cached_reference_field_decimal(self):
-        class PersonAuto(Document):
-            name = StringField()
-            salary = DecimalField()
+        samir = Employee(name='Samir Nagheenanajar')
+        samir.save()
 
-        class SocialTest(Document):
-            group = StringField()
-            person = CachedReferenceField(
-                PersonAuto,
-                fields=('salary',))
+        friends = [michael, samir]
+        peter = Employee(name='Peter Gibbons', boss=bill, friends=friends)
+        peter.save()
 
-        PersonAuto.drop_collection()
-        SocialTest.drop_collection()
+        peter = Employee.objects.with_id(peter.id)
+        self.assertEqual(peter.boss, bill)
+        self.assertEqual(peter.friends, friends)
 
-        p = PersonAuto(name="Alberto", salary=Decimal('7000.00'))
-        p.save()
+    def test_recursive_embedding(self):
+        """Ensure that EmbeddedDocumentFields can contain their own documents.
+        """
+        class TreeNode(EmbeddedDocument):
+            name = StringField()
+            children = ListField(EmbeddedDocumentField('self'))
 
-        s = SocialTest(group="dev", person=p)
-        s.save()
+        class Tree(Document):
+            name = StringField()
+            children = ListField(EmbeddedDocumentField('TreeNode'))
 
-        self.assertEqual(
-            SocialTest.objects._collection.find_one({'person.salary': 7000.00}), {
-                '_id': s.pk,
-                'group': s.group,
-                'person': {
-                    '_id': p.pk,
-                    'salary': 7000.00
-                }
-            })
+        Tree.drop_collection()
 
-    def test_cached_reference_field_reference(self):
-        class Group(Document):
-            name = StringField()
+        tree = Tree(name="Tree")
+        first_child = TreeNode(name="Child 1")
+        tree.children.append(first_child)
 
-        class Person(Document):
-            name = StringField()
-            group = ReferenceField(Group)
+        second_child = TreeNode(name="Child 2")
+        first_child.children.append(second_child)
+        tree.save()
 
-        class SocialData(Document):
-            obs = StringField()
-            tags = ListField(
-                StringField())
-            person = CachedReferenceField(
-                Person,
-                fields=('group',))
+        tree = Tree.objects.first()
+        self.assertEqual(len(tree.children), 1)
 
-        Group.drop_collection()
-        Person.drop_collection()
-        SocialData.drop_collection()
+        self.assertEqual(len(tree.children[0].children), 1)
 
-        g1 = Group(name='dev')
-        g1.save()
+        third_child = TreeNode(name="Child 3")
+        tree.children[0].children.append(third_child)
+        tree.save()
 
-        g2 = Group(name="designers")
-        g2.save()
+        self.assertEqual(len(tree.children), 1)
+        self.assertEqual(tree.children[0].name, first_child.name)
+        self.assertEqual(tree.children[0].children[0].name, second_child.name)
+        self.assertEqual(tree.children[0].children[1].name, third_child.name)
 
-        p1 = Person(name="Alberto", group=g1)
-        p1.save()
+        # Test updating
+        tree.children[0].name = 'I am Child 1'
+        tree.children[0].children[0].name = 'I am Child 2'
+        tree.children[0].children[1].name = 'I am Child 3'
+        tree.save()
 
-        p2 = Person(name="Andre", group=g1)
-        p2.save()
+        self.assertEqual(tree.children[0].name, 'I am Child 1')
+        self.assertEqual(tree.children[0].children[0].name, 'I am Child 2')
+        self.assertEqual(tree.children[0].children[1].name, 'I am Child 3')
 
-        p3 = Person(name="Afro design", group=g2)
-        p3.save()
+        # Test removal
+        self.assertEqual(len(tree.children[0].children), 2)
+        del(tree.children[0].children[1])
 
-        s1 = SocialData(obs="testing 123", person=p1, tags=['tag1', 'tag2'])
-        s1.save()
+        tree.save()
+        self.assertEqual(len(tree.children[0].children), 1)
 
-        s2 = SocialData(obs="testing 321", person=p3, tags=['tag3', 'tag4'])
-        s2.save()
+        tree.children[0].children.pop(0)
+        tree.save()
+        self.assertEqual(len(tree.children[0].children), 0)
+        self.assertEqual(tree.children[0].children, [])
 
-        self.assertEqual(SocialData.objects._collection.find_one(
-            {'tags': 'tag2'}), {
-                '_id': s1.pk,
-                'obs': 'testing 123',
-                'tags': ['tag1', 'tag2'],
-                'person': {
-                    '_id': p1.pk,
-                    'group': g1.pk
-                }
-        })
+        tree.children[0].children.insert(0, third_child)
+        tree.children[0].children.insert(0, second_child)
+        tree.save()
+        self.assertEqual(len(tree.children[0].children), 2)
+        self.assertEqual(tree.children[0].children[0].name, second_child.name)
+        self.assertEqual(tree.children[0].children[1].name, third_child.name)
 
-        self.assertEqual(SocialData.objects(person__group=g2).count(), 1)
-        self.assertEqual(SocialData.objects(person__group=g2).first(), s2)
+    def test_undefined_reference(self):
+        """Ensure that ReferenceFields may reference undefined Documents.
+        """
+        class Product(Document):
+            name = StringField()
+            company = ReferenceField('Company')
 
-    def test_cached_reference_field_update_all(self):
-        class Person(Document):
-            TYPES = (
-                ('pf', "PF"),
-                ('pj', "PJ")
-            )
+        class Company(Document):
             name = StringField()
-            tp = StringField(
-                choices=TYPES
-            )
 
-            father = CachedReferenceField('self', fields=('tp',))
+        Product.drop_collection()
+        Company.drop_collection()
 
-        Person.drop_collection()
+        ten_gen = Company(name='10gen')
+        ten_gen.save()
+        mongodb = Product(name='MongoDB', company=ten_gen)
+        mongodb.save()
 
-        a1 = Person(name="Wilson Father", tp="pj")
-        a1.save()
+        me = Product(name='MongoEngine')
+        me.save()
 
-        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
-        a2.save()
+        obj = Product.objects(company=ten_gen).first()
+        self.assertEqual(obj, mongodb)
+        self.assertEqual(obj.company, ten_gen)
 
-        self.assertEqual(dict(a2.to_mongo()), {
-            "_id": a2.pk,
-            "name": u"Wilson Junior",
-            "tp": u"pf",
-            "father": {
-                "_id": a1.pk,
-                "tp": u"pj"
-            }
-        })
+        obj = Product.objects(company=None).first()
+        self.assertEqual(obj, me)
 
-        self.assertEqual(Person.objects(father=a1)._query, {
-            'father._id': a1.pk
-        })
-        self.assertEqual(Person.objects(father=a1).count(), 1)
+        obj = Product.objects.get(company=None)
+        self.assertEqual(obj, me)
 
-        Person.objects.update(set__tp="pf")
-        Person.father.sync_all()
+    def test_reference_query_conversion(self):
+        """Ensure that ReferenceFields can be queried using objects and values
+        of the type of the primary key of the referenced object.
+        """
+        class Member(Document):
+            user_num = IntField(primary_key=True)
 
-        a2.reload()
-        self.assertEqual(dict(a2.to_mongo()), {
-            "_id": a2.pk,
-            "name": u"Wilson Junior",
-            "tp": u"pf",
-            "father": {
-                "_id": a1.pk,
-                "tp": u"pf"
-            }
-        })
+        class BlogPost(Document):
+            title = StringField()
+            author = ReferenceField(Member, dbref=False)
 
-    def test_cached_reference_fields_on_embedded_documents(self):
-        with self.assertRaises(InvalidDocumentError):
-            class Test(Document):
-                name = StringField()
+        Member.drop_collection()
+        BlogPost.drop_collection()
 
-            type('WrongEmbeddedDocument', (
-                EmbeddedDocument,), {
-                    'test': CachedReferenceField(Test)
-            })
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
 
-    def test_cached_reference_auto_sync(self):
-        class Person(Document):
-            TYPES = (
-                ('pf', "PF"),
-                ('pj', "PJ")
-            )
-            name = StringField()
-            tp = StringField(
-                choices=TYPES
-            )
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
 
-            father = CachedReferenceField('self', fields=('tp',))
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
 
-        Person.drop_collection()
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
 
-        a1 = Person(name="Wilson Father", tp="pj")
-        a1.save()
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
 
-        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
-        a2.save()
+    def test_reference_query_conversion_dbref(self):
+        """Ensure that ReferenceFields can be queried using objects and values
+        of the type of the primary key of the referenced object.
+        """
+        class Member(Document):
+            user_num = IntField(primary_key=True)
 
-        a1.tp = 'pf'
-        a1.save()
+        class BlogPost(Document):
+            title = StringField()
+            author = ReferenceField(Member, dbref=True)
 
-        a2.reload()
-        self.assertEqual(dict(a2.to_mongo()), {
-            '_id': a2.pk,
-            'name': 'Wilson Junior',
-            'tp': 'pf',
-            'father': {
-                '_id': a1.pk,
-                'tp': 'pf'
-            }
-        })
+        Member.drop_collection()
+        BlogPost.drop_collection()
 
-    def test_cached_reference_auto_sync_disabled(self):
-        class Persone(Document):
-            TYPES = (
-                ('pf', "PF"),
-                ('pj', "PJ")
-            )
-            name = StringField()
-            tp = StringField(
-                choices=TYPES
-            )
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
 
-            father = CachedReferenceField(
-                'self', fields=('tp',), auto_sync=False)
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
 
-        Persone.drop_collection()
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
 
-        a1 = Persone(name="Wilson Father", tp="pj")
-        a1.save()
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
 
-        a2 = Persone(name='Wilson Junior', tp='pf', father=a1)
-        a2.save()
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
 
-        a1.tp = 'pf'
-        a1.save()
+    def test_drop_abstract_document(self):
+        """Ensure that an abstract document cannot be dropped given it
+        has no underlying collection.
+        """
+        class AbstractDoc(Document):
+            name = StringField()
+            meta = {"abstract": True}
 
-        self.assertEqual(Persone.objects._collection.find_one({'_id': a2.pk}), {
-            '_id': a2.pk,
-            'name': 'Wilson Junior',
-            'tp': 'pf',
-            'father': {
-                '_id': a1.pk,
-                'tp': 'pj'
-            }
-        })
+        self.assertRaises(OperationError, AbstractDoc.drop_collection)
 
-    def test_cached_reference_embedded_fields(self):
-        class Owner(EmbeddedDocument):
-            TPS = (
-                ('n', "Normal"),
-                ('u', "Urgent")
-            )
+    def test_reference_class_with_abstract_parent(self):
+        """Ensure that a class with an abstract parent can be referenced.
+        """
+        class Sibling(Document):
             name = StringField()
-            tp = StringField(
-                verbose_name="Type",
-                db_field="t",
-                choices=TPS)
+            meta = {"abstract": True}
 
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
+        class Sister(Sibling):
+            pass
 
-            owner = EmbeddedDocumentField(Owner)
+        class Brother(Sibling):
+            sibling = ReferenceField(Sibling)
 
-        class Ocorrence(Document):
-            person = StringField()
-            animal = CachedReferenceField(
-                Animal, fields=['tag', 'owner.tp'])
+        Sister.drop_collection()
+        Brother.drop_collection()
 
-        Animal.drop_collection()
-        Ocorrence.drop_collection()
+        sister = Sister(name="Alice")
+        sister.save()
+        brother = Brother(name="Bob", sibling=sister)
+        brother.save()
 
-        a = Animal(name="Leopard", tag="heavy",
-                   owner=Owner(tp='u', name="Wilson Júnior")
-                   )
-        a.save()
+        self.assertEquals(Brother.objects[0].sibling.name, sister.name)
 
-        o = Ocorrence(person="teste", animal=a)
-        o.save()
-        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tp'])), {
-            '_id': a.pk,
-            'tag': 'heavy',
-            'owner': {
-                't': 'u'
-            }
-        })
-        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
-        self.assertEqual(o.to_mongo()['animal']['owner']['t'], 'u')
+    def test_reference_abstract_class(self):
+        """Ensure that an abstract class instance cannot be used in the
+        reference of that abstract class.
+        """
+        class Sibling(Document):
+            name = StringField()
+            meta = {"abstract": True}
 
-        # counts
-        Ocorrence(person="teste 2").save()
-        Ocorrence(person="teste 3").save()
+        class Sister(Sibling):
+            pass
 
-        count = Ocorrence.objects(
-            animal__tag='heavy', animal__owner__tp='u').count()
-        self.assertEqual(count, 1)
+        class Brother(Sibling):
+            sibling = ReferenceField(Sibling)
 
-        ocorrence = Ocorrence.objects(
-            animal__tag='heavy',
-            animal__owner__tp='u').first()
-        self.assertEqual(ocorrence.person, "teste")
-        self.assertTrue(isinstance(ocorrence.animal, Animal))
+        Sister.drop_collection()
+        Brother.drop_collection()
 
-    def test_cached_reference_embedded_list_fields(self):
-        class Owner(EmbeddedDocument):
-            name = StringField()
-            tags = ListField(StringField())
+        sister = Sibling(name="Alice")
+        brother = Brother(name="Bob", sibling=sister)
+        self.assertRaises(ValidationError, brother.save)
 
-        class Animal(Document):
+    def test_abstract_reference_base_type(self):
+        """Ensure that an an abstract reference fails validation when given a
+        Document that does not inherit from the abstract type.
+        """
+        class Sibling(Document):
             name = StringField()
-            tag = StringField()
+            meta = {"abstract": True}
 
-            owner = EmbeddedDocumentField(Owner)
+        class Brother(Sibling):
+            sibling = ReferenceField(Sibling)
 
-        class Ocorrence(Document):
-            person = StringField()
-            animal = CachedReferenceField(
-                Animal, fields=['tag', 'owner.tags'])
+        class Mother(Document):
+            name = StringField()
 
-        Animal.drop_collection()
-        Ocorrence.drop_collection()
+        Brother.drop_collection()
+        Mother.drop_collection()
 
-        a = Animal(name="Leopard", tag="heavy",
-                   owner=Owner(tags=['cool', 'funny'],
-                               name="Wilson Júnior")
-                   )
-        a.save()
+        mother = Mother(name="Carol")
+        mother.save()
+        brother = Brother(name="Bob", sibling=mother)
+        self.assertRaises(ValidationError, brother.save)
 
-        o = Ocorrence(person="teste 2", animal=a)
-        o.save()
-        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tags'])), {
-            '_id': a.pk,
-            'tag': 'heavy',
-            'owner': {
-                'tags': ['cool', 'funny']
-            }
-        })
+    def test_generic_reference(self):
+        """Ensure that a GenericReferenceField properly dereferences items.
+        """
+        class Link(Document):
+            title = StringField()
+            meta = {'allow_inheritance': False}
 
-        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
-        self.assertEqual(o.to_mongo()['animal']['owner']['tags'],
-                         ['cool', 'funny'])
+        class Post(Document):
+            title = StringField()
 
-        # counts
-        Ocorrence(person="teste 2").save()
-        Ocorrence(person="teste 3").save()
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField()
 
-        query = Ocorrence.objects(
-            animal__tag='heavy', animal__owner__tags='cool')._query
-        self.assertEqual(
-            query, {'animal.owner.tags': 'cool', 'animal.tag': 'heavy'})
+        Link.drop_collection()
+        Post.drop_collection()
+        Bookmark.drop_collection()
 
-        ocorrence = Ocorrence.objects(
-            animal__tag='heavy',
-            animal__owner__tags='cool').first()
-        self.assertEqual(ocorrence.person, "teste 2")
-        self.assertTrue(isinstance(ocorrence.animal, Animal))
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
 
-    def test_objectid_reference_fields(self):
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
 
-        class Person(Document):
-            name = StringField()
-            parent = ReferenceField('self', dbref=False)
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
 
-        Person.drop_collection()
+        bm = Bookmark.objects(bookmark_object=post_1).first()
 
-        p1 = Person(name="John").save()
-        Person(name="Ross", parent=p1).save()
+        self.assertEqual(bm.bookmark_object, post_1)
+        self.assertTrue(isinstance(bm.bookmark_object, Post))
 
-        col = Person._get_collection()
-        data = col.find_one({'name': 'Ross'})
-        self.assertEqual(data['parent'], p1.pk)
+        bm.bookmark_object = link_1
+        bm.save()
 
-        p = Person.objects.get(name="Ross")
-        self.assertEqual(p.parent, p1)
+        bm = Bookmark.objects(bookmark_object=link_1).first()
 
-    def test_list_item_dereference(self):
-        """Ensure that DBRef items in ListFields are dereferenced.
+        self.assertEqual(bm.bookmark_object, link_1)
+        self.assertTrue(isinstance(bm.bookmark_object, Link))
+
+    def test_generic_reference_list(self):
+        """Ensure that a ListField properly dereferences generic references.
         """
-        class User(Document):
-            name = StringField()
+        class Link(Document):
+            title = StringField()
 
-        class Group(Document):
-            members = ListField(ReferenceField(User))
+        class Post(Document):
+            title = StringField()
 
+        class User(Document):
+            bookmarks = ListField(GenericReferenceField())
+
+        Link.drop_collection()
+        Post.drop_collection()
         User.drop_collection()
-        Group.drop_collection()
 
-        user1 = User(name='user1')
-        user1.save()
-        user2 = User(name='user2')
-        user2.save()
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
 
-        group = Group(members=[user1, user2])
-        group.save()
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
 
-        group_obj = Group.objects.first()
+        user = User(bookmarks=[post_1, link_1])
+        user.save()
 
-        self.assertEqual(group_obj.members[0].name, user1.name)
-        self.assertEqual(group_obj.members[1].name, user2.name)
+        user = User.objects(bookmarks__all=[post_1, link_1]).first()
 
-        User.drop_collection()
-        Group.drop_collection()
+        self.assertEqual(user.bookmarks[0], post_1)
+        self.assertEqual(user.bookmarks[1], link_1)
 
-    def test_recursive_reference(self):
-        """Ensure that ReferenceFields can reference their own documents.
+    def test_generic_reference_document_not_registered(self):
+        """Ensure dereferencing out of the document registry throws a
+        `NotRegistered` error.
         """
-        class Employee(Document):
-            name = StringField()
-            boss = ReferenceField('self')
-            friends = ListField(ReferenceField('self'))
-
-        Employee.drop_collection()
-        bill = Employee(name='Bill Lumbergh')
-        bill.save()
+        class Link(Document):
+            title = StringField()
 
-        michael = Employee(name='Michael Bolton')
-        michael.save()
+        class User(Document):
+            bookmarks = ListField(GenericReferenceField())
 
-        samir = Employee(name='Samir Nagheenanajar')
-        samir.save()
+        Link.drop_collection()
+        User.drop_collection()
 
-        friends = [michael, samir]
-        peter = Employee(name='Peter Gibbons', boss=bill, friends=friends)
-        peter.save()
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
 
-        peter = Employee.objects.with_id(peter.id)
-        self.assertEqual(peter.boss, bill)
-        self.assertEqual(peter.friends, friends)
+        user = User(bookmarks=[link_1])
+        user.save()
 
-    def test_recursive_embedding(self):
-        """Ensure that EmbeddedDocumentFields can contain their own documents.
-        """
-        class TreeNode(EmbeddedDocument):
-            name = StringField()
-            children = ListField(EmbeddedDocumentField('self'))
+        # Mimic User and Link definitions being in a different file
+        # and the Link model not being imported in the User file.
+        del(_document_registry["Link"])
 
-        class Tree(Document):
-            name = StringField()
-            children = ListField(EmbeddedDocumentField('TreeNode'))
+        user = User.objects.first()
+        try:
+            user.bookmarks
+            raise AssertionError("Link was removed from the registry")
+        except NotRegistered:
+            pass
 
-        Tree.drop_collection()
-        tree = Tree(name="Tree")
+    def test_generic_reference_is_none(self):
 
-        first_child = TreeNode(name="Child 1")
-        tree.children.append(first_child)
+        class Person(Document):
+            name = StringField()
+            city = GenericReferenceField()
 
-        second_child = TreeNode(name="Child 2")
-        first_child.children.append(second_child)
-        tree.save()
+        Person.drop_collection()
 
-        tree = Tree.objects.first()
-        self.assertEqual(len(tree.children), 1)
+        Person(name="Wilson Jr").save()
+        self.assertEqual(repr(Person.objects(city=None)),
+                         "[<Person: Person object>]")
 
-        self.assertEqual(len(tree.children[0].children), 1)
+    def test_generic_reference_choices(self):
+        """Ensure that a GenericReferenceField can handle choices."""
+        class Link(Document):
+            title = StringField()
 
-        third_child = TreeNode(name="Child 3")
-        tree.children[0].children.append(third_child)
-        tree.save()
+        class Post(Document):
+            title = StringField()
 
-        self.assertEqual(len(tree.children), 1)
-        self.assertEqual(tree.children[0].name, first_child.name)
-        self.assertEqual(tree.children[0].children[0].name, second_child.name)
-        self.assertEqual(tree.children[0].children[1].name, third_child.name)
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField(choices=(Post,))
 
-        # Test updating
-        tree.children[0].name = 'I am Child 1'
-        tree.children[0].children[0].name = 'I am Child 2'
-        tree.children[0].children[1].name = 'I am Child 3'
-        tree.save()
+        Link.drop_collection()
+        Post.drop_collection()
+        Bookmark.drop_collection()
 
-        self.assertEqual(tree.children[0].name, 'I am Child 1')
-        self.assertEqual(tree.children[0].children[0].name, 'I am Child 2')
-        self.assertEqual(tree.children[0].children[1].name, 'I am Child 3')
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
 
-        # Test removal
-        self.assertEqual(len(tree.children[0].children), 2)
-        del(tree.children[0].children[1])
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
 
-        tree.save()
-        self.assertEqual(len(tree.children[0].children), 1)
+        bm = Bookmark(bookmark_object=link_1)
+        self.assertRaises(ValidationError, bm.validate)
 
-        tree.children[0].children.pop(0)
-        tree.save()
-        self.assertEqual(len(tree.children[0].children), 0)
-        self.assertEqual(tree.children[0].children, [])
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
 
-        tree.children[0].children.insert(0, third_child)
-        tree.children[0].children.insert(0, second_child)
-        tree.save()
-        self.assertEqual(len(tree.children[0].children), 2)
-        self.assertEqual(tree.children[0].children[0].name, second_child.name)
-        self.assertEqual(tree.children[0].children[1].name, third_child.name)
+        bm = Bookmark.objects.first()
+        self.assertEqual(bm.bookmark_object, post_1)
 
-    def test_undefined_reference(self):
-        """Ensure that ReferenceFields may reference undefined Documents.
+    def test_generic_reference_string_choices(self):
+        """Ensure that a GenericReferenceField can handle choices as strings
         """
-        class Product(Document):
-            name = StringField()
-            company = ReferenceField('Company')
+        class Link(Document):
+            title = StringField()
 
-        class Company(Document):
-            name = StringField()
+        class Post(Document):
+            title = StringField()
 
-        Product.drop_collection()
-        Company.drop_collection()
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField(choices=('Post', Link))
 
-        ten_gen = Company(name='10gen')
-        ten_gen.save()
-        mongodb = Product(name='MongoDB', company=ten_gen)
-        mongodb.save()
+        Link.drop_collection()
+        Post.drop_collection()
+        Bookmark.drop_collection()
 
-        me = Product(name='MongoEngine')
-        me.save()
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
 
-        obj = Product.objects(company=ten_gen).first()
-        self.assertEqual(obj, mongodb)
-        self.assertEqual(obj.company, ten_gen)
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
 
-        obj = Product.objects(company=None).first()
-        self.assertEqual(obj, me)
+        bm = Bookmark(bookmark_object=link_1)
+        bm.save()
 
-        obj = Product.objects.get(company=None)
-        self.assertEqual(obj, me)
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
 
-    def test_reference_query_conversion(self):
-        """Ensure that ReferenceFields can be queried using objects and values
-        of the type of the primary key of the referenced object.
-        """
-        class Member(Document):
-            user_num = IntField(primary_key=True)
+        bm = Bookmark(bookmark_object=bm)
+        self.assertRaises(ValidationError, bm.validate)
 
-        class BlogPost(Document):
+    def test_generic_reference_choices_no_dereference(self):
+        """Ensure that a GenericReferenceField can handle choices on
+        non-derefenreced (i.e. DBRef) elements
+        """
+        class Post(Document):
             title = StringField()
-            author = ReferenceField(Member, dbref=False)
-
-        Member.drop_collection()
-        BlogPost.drop_collection()
 
-        m1 = Member(user_num=1)
-        m1.save()
-        m2 = Member(user_num=2)
-        m2.save()
-
-        post1 = BlogPost(title='post 1', author=m1)
-        post1.save()
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField(choices=(Post, ))
+            other_field = StringField()
 
-        post2 = BlogPost(title='post 2', author=m2)
-        post2.save()
+        Post.drop_collection()
+        Bookmark.drop_collection()
 
-        post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
 
-        post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
 
-        Member.drop_collection()
-        BlogPost.drop_collection()
+        bm = Bookmark.objects.get(id=bm.id)
+        # bookmark_object is now a DBRef
+        bm.other_field = 'dummy_change'
+        bm.save()
 
-    def test_reference_query_conversion_dbref(self):
-        """Ensure that ReferenceFields can be queried using objects and values
-        of the type of the primary key of the referenced object.
+    def test_generic_reference_list_choices(self):
+        """Ensure that a ListField properly dereferences generic references and
+        respects choices.
         """
-        class Member(Document):
-            user_num = IntField(primary_key=True)
+        class Link(Document):
+            title = StringField()
 
-        class BlogPost(Document):
+        class Post(Document):
             title = StringField()
-            author = ReferenceField(Member, dbref=True)
 
-        Member.drop_collection()
-        BlogPost.drop_collection()
+        class User(Document):
+            bookmarks = ListField(GenericReferenceField(choices=(Post,)))
 
-        m1 = Member(user_num=1)
-        m1.save()
-        m2 = Member(user_num=2)
-        m2.save()
+        Link.drop_collection()
+        Post.drop_collection()
+        User.drop_collection()
 
-        post1 = BlogPost(title='post 1', author=m1)
-        post1.save()
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
 
-        post2 = BlogPost(title='post 2', author=m2)
-        post2.save()
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
 
-        post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
+        user = User(bookmarks=[link_1])
+        self.assertRaises(ValidationError, user.validate)
 
-        post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
+        user = User(bookmarks=[post_1])
+        user.save()
 
-        Member.drop_collection()
-        BlogPost.drop_collection()
+        user = User.objects.first()
+        self.assertEqual(user.bookmarks, [post_1])
 
-    def test_drop_abstract_document(self):
-        """Ensure that an abstract document cannot be dropped given it
-        has no underlying collection.
+    def test_generic_reference_list_item_modification(self):
+        """Ensure that modifications of related documents (through generic reference) don't influence on querying
         """
-        class AbstractDoc(Document):
-            name = StringField()
-            meta = {"abstract": True}
-
-        self.assertRaises(OperationError, AbstractDoc.drop_collection)
+        class Post(Document):
+            title = StringField()
 
-    def test_reference_class_with_abstract_parent(self):
-        """Ensure that a class with an abstract parent can be referenced.
-        """
-        class Sibling(Document):
-            name = StringField()
-            meta = {"abstract": True}
+        class User(Document):
+            username = StringField()
+            bookmarks = ListField(GenericReferenceField())
 
-        class Sister(Sibling):
-            pass
+        Post.drop_collection()
+        User.drop_collection()
 
-        class Brother(Sibling):
-            sibling = ReferenceField(Sibling)
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
 
-        Sister.drop_collection()
-        Brother.drop_collection()
+        user = User(bookmarks=[post_1])
+        user.save()
 
-        sister = Sister(name="Alice")
-        sister.save()
-        brother = Brother(name="Bob", sibling=sister)
-        brother.save()
+        post_1.title = "Title was modified"
+        user.username = "New username"
+        user.save()
 
-        self.assertEquals(Brother.objects[0].sibling.name, sister.name)
+        user = User.objects(bookmarks__all=[post_1]).first()
 
-        Sister.drop_collection()
-        Brother.drop_collection()
+        self.assertNotEqual(user, None)
+        self.assertEqual(user.bookmarks[0], post_1)
 
-    def test_reference_abstract_class(self):
-        """Ensure that an abstract class instance cannot be used in the
-        reference of that abstract class.
+    def test_generic_reference_filter_by_dbref(self):
+        """Ensure we can search for a specific generic reference by
+        providing its ObjectId.
         """
-        class Sibling(Document):
-            name = StringField()
-            meta = {"abstract": True}
-
-        class Sister(Sibling):
-            pass
-
-        class Brother(Sibling):
-            sibling = ReferenceField(Sibling)
+        class Doc(Document):
+            ref = GenericReferenceField()
 
-        Sister.drop_collection()
-        Brother.drop_collection()
+        Doc.drop_collection()
 
-        sister = Sibling(name="Alice")
-        brother = Brother(name="Bob", sibling=sister)
-        self.assertRaises(ValidationError, brother.save)
+        doc1 = Doc.objects.create()
+        doc2 = Doc.objects.create(ref=doc1)
 
-        Sister.drop_collection()
-        Brother.drop_collection()
+        doc = Doc.objects.get(ref=DBRef('doc', doc1.pk))
+        self.assertEqual(doc, doc2)
 
-    def test_abstract_reference_base_type(self):
-        """Ensure that an an abstract reference fails validation when given a
-        Document that does not inherit from the abstract type.
+    def test_generic_reference_filter_by_objectid(self):
+        """Ensure we can search for a specific generic reference by
+        providing its DBRef.
         """
-        class Sibling(Document):
-            name = StringField()
-            meta = {"abstract": True}
-
-        class Brother(Sibling):
-            sibling = ReferenceField(Sibling)
+        class Doc(Document):
+            ref = GenericReferenceField()
 
-        class Mother(Document):
-            name = StringField()
+        Doc.drop_collection()
 
-        Brother.drop_collection()
-        Mother.drop_collection()
+        doc1 = Doc.objects.create()
+        doc2 = Doc.objects.create(ref=doc1)
 
-        mother = Mother(name="Carol")
-        mother.save()
-        brother = Brother(name="Bob", sibling=mother)
-        self.assertRaises(ValidationError, brother.save)
+        self.assertTrue(isinstance(doc1.pk, ObjectId))
 
-        Brother.drop_collection()
-        Mother.drop_collection()
+        doc = Doc.objects.get(ref=doc1.pk)
+        self.assertEqual(doc, doc2)
 
-    def test_generic_reference(self):
-        """Ensure that a GenericReferenceField properly dereferences items.
+    def test_binary_fields(self):
+        """Ensure that binary fields can be stored and retrieved.
         """
-        class Link(Document):
-            title = StringField()
-            meta = {'allow_inheritance': False}
+        class Attachment(Document):
+            content_type = StringField()
+            blob = BinaryField()
 
-        class Post(Document):
-            title = StringField()
+        BLOB = six.b('\xe6\x00\xc4\xff\x07')
+        MIME_TYPE = 'application/octet-stream'
 
-        class Bookmark(Document):
-            bookmark_object = GenericReferenceField()
+        Attachment.drop_collection()
 
-        Link.drop_collection()
-        Post.drop_collection()
-        Bookmark.drop_collection()
+        attachment = Attachment(content_type=MIME_TYPE, blob=BLOB)
+        attachment.save()
 
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
+        attachment_1 = Attachment.objects().first()
+        self.assertEqual(MIME_TYPE, attachment_1.content_type)
+        self.assertEqual(BLOB, six.binary_type(attachment_1.blob))
 
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
+    def test_binary_validation(self):
+        """Ensure that invalid values cannot be assigned to binary fields.
+        """
+        class Attachment(Document):
+            blob = BinaryField()
 
-        bm = Bookmark(bookmark_object=post_1)
-        bm.save()
+        class AttachmentRequired(Document):
+            blob = BinaryField(required=True)
 
-        bm = Bookmark.objects(bookmark_object=post_1).first()
+        class AttachmentSizeLimit(Document):
+            blob = BinaryField(max_bytes=4)
 
-        self.assertEqual(bm.bookmark_object, post_1)
-        self.assertTrue(isinstance(bm.bookmark_object, Post))
+        Attachment.drop_collection()
+        AttachmentRequired.drop_collection()
+        AttachmentSizeLimit.drop_collection()
 
-        bm.bookmark_object = link_1
-        bm.save()
+        attachment = Attachment()
+        attachment.validate()
+        attachment.blob = 2
+        self.assertRaises(ValidationError, attachment.validate)
 
-        bm = Bookmark.objects(bookmark_object=link_1).first()
+        attachment_required = AttachmentRequired()
+        self.assertRaises(ValidationError, attachment_required.validate)
+        attachment_required.blob = Binary(six.b('\xe6\x00\xc4\xff\x07'))
+        attachment_required.validate()
 
-        self.assertEqual(bm.bookmark_object, link_1)
-        self.assertTrue(isinstance(bm.bookmark_object, Link))
+        attachment_size_limit = AttachmentSizeLimit(
+            blob=six.b('\xe6\x00\xc4\xff\x07'))
+        self.assertRaises(ValidationError, attachment_size_limit.validate)
+        attachment_size_limit.blob = six.b('\xe6\x00\xc4\xff')
+        attachment_size_limit.validate()
 
-        Link.drop_collection()
-        Post.drop_collection()
-        Bookmark.drop_collection()
+    def test_binary_field_primary(self):
+        class Attachment(Document):
+            id = BinaryField(primary_key=True)
 
-    def test_generic_reference_list(self):
-        """Ensure that a ListField properly dereferences generic references.
-        """
-        class Link(Document):
-            title = StringField()
+        Attachment.drop_collection()
+        binary_id = uuid.uuid4().bytes
+        att = Attachment(id=binary_id).save()
+        self.assertEqual(1, Attachment.objects.count())
+        self.assertEqual(1, Attachment.objects.filter(id=att.id).count())
+        att.delete()
+        self.assertEqual(0, Attachment.objects.count())
 
-        class Post(Document):
-            title = StringField()
+    def test_binary_field_primary_filter_by_binary_pk_as_str(self):
+        raise SkipTest("Querying by id as string is not currently supported")
 
-        class User(Document):
-            bookmarks = ListField(GenericReferenceField())
+        class Attachment(Document):
+            id = BinaryField(primary_key=True)
 
-        Link.drop_collection()
-        Post.drop_collection()
-        User.drop_collection()
+        Attachment.drop_collection()
+        binary_id = uuid.uuid4().bytes
+        att = Attachment(id=binary_id).save()
+        self.assertEqual(1, Attachment.objects.filter(id=binary_id).count())
+        att.delete()
+        self.assertEqual(0, Attachment.objects.count())
 
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
+    def test_choices_allow_using_sets_as_choices(self):
+        """Ensure that sets can be used when setting choices
+        """
+        class Shirt(Document):
+            size = StringField(choices={'M', 'L'})
 
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
+        Shirt(size='M').validate()
 
-        user = User(bookmarks=[post_1, link_1])
-        user.save()
+    def test_choices_validation_allow_no_value(self):
+        """Ensure that .validate passes and no value was provided
+        for a field setup with choices
+        """
+        class Shirt(Document):
+            size = StringField(choices=('S', 'M'))
 
-        user = User.objects(bookmarks__all=[post_1, link_1]).first()
+        shirt = Shirt()
+        shirt.validate()
 
-        self.assertEqual(user.bookmarks[0], post_1)
-        self.assertEqual(user.bookmarks[1], link_1)
+    def test_choices_validation_accept_possible_value(self):
+        """Ensure that value is in a container of allowed values.
+        """
+        class Shirt(Document):
+            size = StringField(choices=('S', 'M'))
 
-        Link.drop_collection()
-        Post.drop_collection()
-        User.drop_collection()
+        shirt = Shirt(size='S')
+        shirt.validate()
 
-    def test_generic_reference_document_not_registered(self):
-        """Ensure dereferencing out of the document registry throws a
-        `NotRegistered` error.
+    def test_choices_validation_reject_unknown_value(self):
+        """Ensure that unallowed value are rejected upon validation
         """
-        class Link(Document):
-            title = StringField()
+        class Shirt(Document):
+            size = StringField(choices=('S', 'M'))
 
-        class User(Document):
-            bookmarks = ListField(GenericReferenceField())
-
-        Link.drop_collection()
-        User.drop_collection()
-
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
+        shirt = Shirt(size="XS")
+        with self.assertRaises(ValidationError):
+            shirt.validate()
 
-        user = User(bookmarks=[link_1])
-        user.save()
+    def test_choices_validation_documents(self):
+        """
+        Ensure fields with document choices validate given a valid choice.
+        """
+        class UserComments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
 
-        # Mimic User and Link definitions being in a different file
-        # and the Link model not being imported in the User file.
-        del(_document_registry["Link"])
+        class BlogPost(Document):
+            comments = ListField(
+                GenericEmbeddedDocumentField(choices=(UserComments,))
+            )
 
-        user = User.objects.first()
-        try:
-            user.bookmarks
-            raise AssertionError("Link was removed from the registry")
-        except NotRegistered:
-            pass
+        # Ensure Validation Passes
+        BlogPost(comments=[
+            UserComments(author='user2', message='message2'),
+        ]).save()
 
-        Link.drop_collection()
-        User.drop_collection()
+    def test_choices_validation_documents_invalid(self):
+        """
+        Ensure fields with document choices validate given an invalid choice.
+        This should throw a ValidationError exception.
+        """
+        class UserComments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
 
-    def test_generic_reference_is_none(self):
+        class ModeratorComments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
 
-        class Person(Document):
-            name = StringField()
-            city = GenericReferenceField()
+        class BlogPost(Document):
+            comments = ListField(
+                GenericEmbeddedDocumentField(choices=(UserComments,))
+            )
 
-        Person.drop_collection()
-        Person(name="Wilson Jr").save()
+        # Single Entry Failure
+        post = BlogPost(comments=[
+            ModeratorComments(author='mod1', message='message1'),
+        ])
+        self.assertRaises(ValidationError, post.save)
 
-        self.assertEqual(repr(Person.objects(city=None)),
-                         "[<Person: Person object>]")
+        # Mixed Entry Failure
+        post = BlogPost(comments=[
+            ModeratorComments(author='mod1', message='message1'),
+            UserComments(author='user2', message='message2'),
+        ])
+        self.assertRaises(ValidationError, post.save)
 
-    def test_generic_reference_choices(self):
-        """Ensure that a GenericReferenceField can handle choices
+    def test_choices_validation_documents_inheritance(self):
         """
-        class Link(Document):
-            title = StringField()
-
-        class Post(Document):
-            title = StringField()
-
-        class Bookmark(Document):
-            bookmark_object = GenericReferenceField(choices=(Post,))
-
-        Link.drop_collection()
-        Post.drop_collection()
-        Bookmark.drop_collection()
+        Ensure fields with document choices validate given subclass of choice.
+        """
+        class Comments(EmbeddedDocument):
+            meta = {
+                'abstract': True
+            }
+            author = StringField()
+            message = StringField()
 
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
+        class UserComments(Comments):
+            pass
 
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
+        class BlogPost(Document):
+            comments = ListField(
+                GenericEmbeddedDocumentField(choices=(Comments,))
+            )
 
-        bm = Bookmark(bookmark_object=link_1)
-        self.assertRaises(ValidationError, bm.validate)
+        # Save Valid EmbeddedDocument Type
+        BlogPost(comments=[
+            UserComments(author='user2', message='message2'),
+        ]).save()
 
-        bm = Bookmark(bookmark_object=post_1)
-        bm.save()
+    def test_choices_get_field_display(self):
+        """Test dynamic helper for returning the display value of a choices
+        field.
+        """
+        class Shirt(Document):
+            size = StringField(max_length=3, choices=(
+                ('S', 'Small'), ('M', 'Medium'), ('L', 'Large'),
+                ('XL', 'Extra Large'), ('XXL', 'Extra Extra Large')))
+            style = StringField(max_length=3, choices=(
+                ('S', 'Small'), ('B', 'Baggy'), ('W', 'Wide')), default='W')
 
-        bm = Bookmark.objects.first()
-        self.assertEqual(bm.bookmark_object, post_1)
+        Shirt.drop_collection()
 
-    def test_generic_reference_string_choices(self):
-        """Ensure that a GenericReferenceField can handle choices as strings
-        """
-        class Link(Document):
-            title = StringField()
+        shirt1 = Shirt()
+        shirt2 = Shirt()
 
-        class Post(Document):
-            title = StringField()
+        # Make sure get_<field>_display returns the default value (or None)
+        self.assertEqual(shirt1.get_size_display(), None)
+        self.assertEqual(shirt1.get_style_display(), 'Wide')
 
-        class Bookmark(Document):
-            bookmark_object = GenericReferenceField(choices=('Post', Link))
+        shirt1.size = 'XXL'
+        shirt1.style = 'B'
+        shirt2.size = 'M'
+        shirt2.style = 'S'
+        self.assertEqual(shirt1.get_size_display(), 'Extra Extra Large')
+        self.assertEqual(shirt1.get_style_display(), 'Baggy')
+        self.assertEqual(shirt2.get_size_display(), 'Medium')
+        self.assertEqual(shirt2.get_style_display(), 'Small')
 
-        Link.drop_collection()
-        Post.drop_collection()
-        Bookmark.drop_collection()
+        # Set as Z - an invalid choice
+        shirt1.size = 'Z'
+        shirt1.style = 'Z'
+        self.assertEqual(shirt1.get_size_display(), 'Z')
+        self.assertEqual(shirt1.get_style_display(), 'Z')
+        self.assertRaises(ValidationError, shirt1.validate)
 
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
+    def test_simple_choices_validation(self):
+        """Ensure that value is in a container of allowed values.
+        """
+        class Shirt(Document):
+            size = StringField(max_length=3,
+                               choices=('S', 'M', 'L', 'XL', 'XXL'))
 
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
+        Shirt.drop_collection()
 
-        bm = Bookmark(bookmark_object=link_1)
-        bm.save()
+        shirt = Shirt()
+        shirt.validate()
 
-        bm = Bookmark(bookmark_object=post_1)
-        bm.save()
+        shirt.size = "S"
+        shirt.validate()
 
-        bm = Bookmark(bookmark_object=bm)
-        self.assertRaises(ValidationError, bm.validate)
+        shirt.size = "XS"
+        self.assertRaises(ValidationError, shirt.validate)
 
-    def test_generic_reference_choices_no_dereference(self):
-        """Ensure that a GenericReferenceField can handle choices on
-        non-derefenreced (i.e. DBRef) elements
+    def test_simple_choices_get_field_display(self):
+        """Test dynamic helper for returning the display value of a choices
+        field.
         """
-        class Post(Document):
-            title = StringField()
+        class Shirt(Document):
+            size = StringField(max_length=3,
+                               choices=('S', 'M', 'L', 'XL', 'XXL'))
+            style = StringField(max_length=3,
+                                choices=('Small', 'Baggy', 'wide'),
+                                default='Small')
 
-        class Bookmark(Document):
-            bookmark_object = GenericReferenceField(choices=(Post, ))
-            other_field = StringField()
+        Shirt.drop_collection()
 
-        Post.drop_collection()
-        Bookmark.drop_collection()
+        shirt = Shirt()
 
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
+        self.assertEqual(shirt.get_size_display(), None)
+        self.assertEqual(shirt.get_style_display(), 'Small')
 
-        bm = Bookmark(bookmark_object=post_1)
-        bm.save()
+        shirt.size = "XXL"
+        shirt.style = "Baggy"
+        self.assertEqual(shirt.get_size_display(), 'XXL')
+        self.assertEqual(shirt.get_style_display(), 'Baggy')
 
-        bm = Bookmark.objects.get(id=bm.id)
-        # bookmark_object is now a DBRef
-        bm.other_field = 'dummy_change'
-        bm.save()
+        # Set as Z - an invalid choice
+        shirt.size = "Z"
+        shirt.style = "Z"
+        self.assertEqual(shirt.get_size_display(), 'Z')
+        self.assertEqual(shirt.get_style_display(), 'Z')
+        self.assertRaises(ValidationError, shirt.validate)
 
-    def test_generic_reference_list_choices(self):
-        """Ensure that a ListField properly dereferences generic references and
-        respects choices.
+    def test_simple_choices_validation_invalid_value(self):
+        """Ensure that error messages are correct.
         """
-        class Link(Document):
-            title = StringField()
-
-        class Post(Document):
-            title = StringField()
+        SIZES = ('S', 'M', 'L', 'XL', 'XXL')
+        COLORS = (('R', 'Red'), ('B', 'Blue'))
+        SIZE_MESSAGE = u"Value must be one of ('S', 'M', 'L', 'XL', 'XXL')"
+        COLOR_MESSAGE = u"Value must be one of ['R', 'B']"
 
-        class User(Document):
-            bookmarks = ListField(GenericReferenceField(choices=(Post,)))
+        class Shirt(Document):
+            size = StringField(max_length=3, choices=SIZES)
+            color = StringField(max_length=1, choices=COLORS)
 
-        Link.drop_collection()
-        Post.drop_collection()
-        User.drop_collection()
+        Shirt.drop_collection()
 
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
+        shirt = Shirt()
+        shirt.validate()
 
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
+        shirt.size = "S"
+        shirt.color = "R"
+        shirt.validate()
 
-        user = User(bookmarks=[link_1])
-        self.assertRaises(ValidationError, user.validate)
+        shirt.size = "XS"
+        shirt.color = "G"
 
-        user = User(bookmarks=[post_1])
-        user.save()
+        try:
+            shirt.validate()
+        except ValidationError as error:
+            # get the validation rules
+            error_dict = error.to_dict()
+            self.assertEqual(error_dict['size'], SIZE_MESSAGE)
+            self.assertEqual(error_dict['color'], COLOR_MESSAGE)
 
-        user = User.objects.first()
-        self.assertEqual(user.bookmarks, [post_1])
+    def test_ensure_unique_default_instances(self):
+        """Ensure that every field has it's own unique default instance."""
+        class D(Document):
+            data = DictField()
+            data2 = DictField(default=lambda: {})
 
-        Link.drop_collection()
-        Post.drop_collection()
-        User.drop_collection()
+        d1 = D()
+        d1.data['foo'] = 'bar'
+        d1.data2['foo'] = 'bar'
+        d2 = D()
+        self.assertEqual(d2.data, {})
+        self.assertEqual(d2.data2, {})
 
-    def test_generic_reference_list_item_modification(self):
-        """Ensure that modifications of related documents (through generic reference) don't influence on querying
-        """
-        class Post(Document):
-            title = StringField()
+    def test_sequence_field(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            name = StringField()
 
-        class User(Document):
-            username = StringField()
-            bookmarks = ListField(GenericReferenceField())
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
 
-        Post.drop_collection()
-        User.drop_collection()
+        for x in range(10):
+            Person(name="Person %s" % x).save()
 
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
 
-        user = User(bookmarks=[post_1])
-        user.save()
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
 
-        post_1.title = "Title was modified"
-        user.username = "New username"
-        user.save()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
 
-        user = User.objects(bookmarks__all=[post_1]).first()
+        Person.id.set_next_value(1000)
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 1000)
 
-        self.assertNotEqual(user, None)
-        self.assertEqual(user.bookmarks[0], post_1)
+    def test_sequence_field_get_next_value(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            name = StringField()
 
-        Post.drop_collection()
-        User.drop_collection()
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
 
-    def test_generic_reference_filter_by_dbref(self):
-        """Ensure we can search for a specific generic reference by
-        providing its ObjectId.
-        """
-        class Doc(Document):
-            ref = GenericReferenceField()
+        for x in range(10):
+            Person(name="Person %s" % x).save()
 
-        Doc.drop_collection()
+        self.assertEqual(Person.id.get_next_value(), 11)
+        self.db['mongoengine.counters'].drop()
 
-        doc1 = Doc.objects.create()
-        doc2 = Doc.objects.create(ref=doc1)
+        self.assertEqual(Person.id.get_next_value(), 1)
 
-        doc = Doc.objects.get(ref=DBRef('doc', doc1.pk))
-        self.assertEqual(doc, doc2)
+        class Person(Document):
+            id = SequenceField(primary_key=True, value_decorator=str)
+            name = StringField()
 
-    def test_generic_reference_filter_by_objectid(self):
-        """Ensure we can search for a specific generic reference by
-        providing its DBRef.
-        """
-        class Doc(Document):
-            ref = GenericReferenceField()
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
 
-        Doc.drop_collection()
+        for x in range(10):
+            Person(name="Person %s" % x).save()
 
-        doc1 = Doc.objects.create()
-        doc2 = Doc.objects.create(ref=doc1)
+        self.assertEqual(Person.id.get_next_value(), '11')
+        self.db['mongoengine.counters'].drop()
 
-        self.assertTrue(isinstance(doc1.pk, ObjectId))
+        self.assertEqual(Person.id.get_next_value(), '1')
 
-        doc = Doc.objects.get(ref=doc1.pk)
-        self.assertEqual(doc, doc2)
+    def test_sequence_field_sequence_name(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True, sequence_name='jelly')
+            name = StringField()
 
-    def test_binary_fields(self):
-        """Ensure that binary fields can be stored and retrieved.
-        """
-        class Attachment(Document):
-            content_type = StringField()
-            blob = BinaryField()
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
 
-        BLOB = six.b('\xe6\x00\xc4\xff\x07')
-        MIME_TYPE = 'application/octet-stream'
+        for x in range(10):
+            Person(name="Person %s" % x).save()
 
-        Attachment.drop_collection()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
+        self.assertEqual(c['next'], 10)
 
-        attachment = Attachment(content_type=MIME_TYPE, blob=BLOB)
-        attachment.save()
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
 
-        attachment_1 = Attachment.objects().first()
-        self.assertEqual(MIME_TYPE, attachment_1.content_type)
-        self.assertEqual(BLOB, six.binary_type(attachment_1.blob))
+        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
+        self.assertEqual(c['next'], 10)
 
-        Attachment.drop_collection()
+        Person.id.set_next_value(1000)
+        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
+        self.assertEqual(c['next'], 1000)
 
-    def test_binary_validation(self):
-        """Ensure that invalid values cannot be assigned to binary fields.
-        """
-        class Attachment(Document):
-            blob = BinaryField()
+    def test_multiple_sequence_fields(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            counter = SequenceField()
+            name = StringField()
 
-        class AttachmentRequired(Document):
-            blob = BinaryField(required=True)
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
 
-        class AttachmentSizeLimit(Document):
-            blob = BinaryField(max_bytes=4)
+        for x in range(10):
+            Person(name="Person %s" % x).save()
 
-        Attachment.drop_collection()
-        AttachmentRequired.drop_collection()
-        AttachmentSizeLimit.drop_collection()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
 
-        attachment = Attachment()
-        attachment.validate()
-        attachment.blob = 2
-        self.assertRaises(ValidationError, attachment.validate)
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
 
-        attachment_required = AttachmentRequired()
-        self.assertRaises(ValidationError, attachment_required.validate)
-        attachment_required.blob = Binary(six.b('\xe6\x00\xc4\xff\x07'))
-        attachment_required.validate()
+        counters = [i.counter for i in Person.objects]
+        self.assertEqual(counters, range(1, 11))
 
-        attachment_size_limit = AttachmentSizeLimit(
-            blob=six.b('\xe6\x00\xc4\xff\x07'))
-        self.assertRaises(ValidationError, attachment_size_limit.validate)
-        attachment_size_limit.blob = six.b('\xe6\x00\xc4\xff')
-        attachment_size_limit.validate()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
 
-        Attachment.drop_collection()
-        AttachmentRequired.drop_collection()
-        AttachmentSizeLimit.drop_collection()
+        Person.id.set_next_value(1000)
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 1000)
 
-    def test_binary_field_primary(self):
+        Person.counter.set_next_value(999)
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.counter'})
+        self.assertEqual(c['next'], 999)
 
-        class Attachment(Document):
-            id = BinaryField(primary_key=True)
+    def test_sequence_fields_reload(self):
+        class Animal(Document):
+            counter = SequenceField()
+            name = StringField()
 
-        Attachment.drop_collection()
-        binary_id = uuid.uuid4().bytes
-        att = Attachment(id=binary_id).save()
-        self.assertEqual(1, Attachment.objects.count())
-        self.assertEqual(1, Attachment.objects.filter(id=att.id).count())
-        # TODO use assertIsNotNone once Python 2.6 support is dropped
-        self.assertTrue(Attachment.objects.filter(id=att.id).first() is not None)
-        att.delete()
-        self.assertEqual(0, Attachment.objects.count())
+        self.db['mongoengine.counters'].drop()
+        Animal.drop_collection()
 
-    def test_binary_field_primary_filter_by_binary_pk_as_str(self):
+        a = Animal(name="Boi").save()
 
-        raise SkipTest("Querying by id as string is not currently supported")
+        self.assertEqual(a.counter, 1)
+        a.reload()
+        self.assertEqual(a.counter, 1)
 
-        class Attachment(Document):
-            id = BinaryField(primary_key=True)
+        a.counter = None
+        self.assertEqual(a.counter, 2)
+        a.save()
 
-        Attachment.drop_collection()
-        binary_id = uuid.uuid4().bytes
-        att = Attachment(id=binary_id).save()
-        self.assertEqual(1, Attachment.objects.filter(id=binary_id).count())
-        # TODO use assertIsNotNone once Python 2.6 support is dropped
-        self.assertTrue(Attachment.objects.filter(id=binary_id).first() is not None)
-        att.delete()
-        self.assertEqual(0, Attachment.objects.count())
+        self.assertEqual(a.counter, 2)
 
-    def test_choices_allow_using_sets_as_choices(self):
-        """Ensure that sets can be used when setting choices
-        """
-        class Shirt(Document):
-            size = StringField(choices={'M', 'L'})
+        a = Animal.objects.first()
+        self.assertEqual(a.counter, 2)
+        a.reload()
+        self.assertEqual(a.counter, 2)
 
-        Shirt(size='M').validate()
+    def test_multiple_sequence_fields_on_docs(self):
+        class Animal(Document):
+            id = SequenceField(primary_key=True)
+            name = StringField()
 
-    def test_choices_validation_allow_no_value(self):
-        """Ensure that .validate passes and no value was provided
-        for a field setup with choices
-        """
-        class Shirt(Document):
-            size = StringField(choices=('S', 'M'))
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            name = StringField()
 
-        shirt = Shirt()
-        shirt.validate()
+        self.db['mongoengine.counters'].drop()
+        Animal.drop_collection()
+        Person.drop_collection()
 
-    def test_choices_validation_accept_possible_value(self):
-        """Ensure that value is in a container of allowed values.
-        """
-        class Shirt(Document):
-            size = StringField(choices=('S', 'M'))
+        for x in range(10):
+            Animal(name="Animal %s" % x).save()
+            Person(name="Person %s" % x).save()
 
-        shirt = Shirt(size='S')
-        shirt.validate()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
 
-    def test_choices_validation_reject_unknown_value(self):
-        """Ensure that unallowed value are rejected upon validation
-        """
-        class Shirt(Document):
-            size = StringField(choices=('S', 'M'))
+        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
+        self.assertEqual(c['next'], 10)
 
-        shirt = Shirt(size="XS")
-        with self.assertRaises(ValidationError):
-            shirt.validate()
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
 
-    def test_choices_validation_documents(self):
-        """
-        Ensure fields with document choices validate given a valid choice.
-        """
-        class UserComments(EmbeddedDocument):
-            author = StringField()
-            message = StringField()
+        id = [i.id for i in Animal.objects]
+        self.assertEqual(id, range(1, 11))
 
-        class BlogPost(Document):
-            comments = ListField(
-                GenericEmbeddedDocumentField(choices=(UserComments,))
-            )
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
 
-        # Ensure Validation Passes
-        BlogPost(comments=[
-            UserComments(author='user2', message='message2'),
-        ]).save()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
+        self.assertEqual(c['next'], 10)
 
-    def test_choices_validation_documents_invalid(self):
-        """
-        Ensure fields with document choices validate given an invalid choice.
-        This should throw a ValidationError exception.
-        """
-        class UserComments(EmbeddedDocument):
-            author = StringField()
-            message = StringField()
+    def test_sequence_field_value_decorator(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True, value_decorator=str)
+            name = StringField()
 
-        class ModeratorComments(EmbeddedDocument):
-            author = StringField()
-            message = StringField()
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
 
-        class BlogPost(Document):
-            comments = ListField(
-                GenericEmbeddedDocumentField(choices=(UserComments,))
-            )
+        for x in range(10):
+            p = Person(name="Person %s" % x)
+            p.save()
 
-        # Single Entry Failure
-        post = BlogPost(comments=[
-            ModeratorComments(author='mod1', message='message1'),
-        ])
-        self.assertRaises(ValidationError, post.save)
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
 
-        # Mixed Entry Failure
-        post = BlogPost(comments=[
-            ModeratorComments(author='mod1', message='message1'),
-            UserComments(author='user2', message='message2'),
-        ])
-        self.assertRaises(ValidationError, post.save)
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, map(str, range(1, 11)))
 
-    def test_choices_validation_documents_inheritance(self):
-        """
-        Ensure fields with document choices validate given subclass of choice.
-        """
-        class Comments(EmbeddedDocument):
-            meta = {
-                'abstract': True
-            }
-            author = StringField()
-            message = StringField()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
 
-        class UserComments(Comments):
-            pass
+    def test_embedded_sequence_field(self):
+        class Comment(EmbeddedDocument):
+            id = SequenceField()
+            content = StringField(required=True)
 
-        class BlogPost(Document):
-            comments = ListField(
-                GenericEmbeddedDocumentField(choices=(Comments,))
-            )
+        class Post(Document):
+            title = StringField(required=True)
+            comments = ListField(EmbeddedDocumentField(Comment))
 
-        # Save Valid EmbeddedDocument Type
-        BlogPost(comments=[
-            UserComments(author='user2', message='message2'),
-        ]).save()
+        self.db['mongoengine.counters'].drop()
+        Post.drop_collection()
 
-    def test_choices_get_field_display(self):
-        """Test dynamic helper for returning the display value of a choices
-        field.
-        """
-        class Shirt(Document):
-            size = StringField(max_length=3, choices=(
-                ('S', 'Small'), ('M', 'Medium'), ('L', 'Large'),
-                ('XL', 'Extra Large'), ('XXL', 'Extra Extra Large')))
-            style = StringField(max_length=3, choices=(
-                ('S', 'Small'), ('B', 'Baggy'), ('W', 'Wide')), default='W')
+        Post(title="MongoEngine",
+             comments=[Comment(content="NoSQL Rocks"),
+                       Comment(content="MongoEngine Rocks")]).save()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'comment.id'})
+        self.assertEqual(c['next'], 2)
+        post = Post.objects.first()
+        self.assertEqual(1, post.comments[0].id)
+        self.assertEqual(2, post.comments[1].id)
 
-        Shirt.drop_collection()
+    def test_inherited_sequencefield(self):
+        class Base(Document):
+            name = StringField()
+            counter = SequenceField()
+            meta = {'abstract': True}
 
-        shirt1 = Shirt()
-        shirt2 = Shirt()
+        class Foo(Base):
+            pass
 
-        # Make sure get_<field>_display returns the default value (or None)
-        self.assertEqual(shirt1.get_size_display(), None)
-        self.assertEqual(shirt1.get_style_display(), 'Wide')
+        class Bar(Base):
+            pass
 
-        shirt1.size = 'XXL'
-        shirt1.style = 'B'
-        shirt2.size = 'M'
-        shirt2.style = 'S'
-        self.assertEqual(shirt1.get_size_display(), 'Extra Extra Large')
-        self.assertEqual(shirt1.get_style_display(), 'Baggy')
-        self.assertEqual(shirt2.get_size_display(), 'Medium')
-        self.assertEqual(shirt2.get_style_display(), 'Small')
+        bar = Bar(name='Bar')
+        bar.save()
 
-        # Set as Z - an invalid choice
-        shirt1.size = 'Z'
-        shirt1.style = 'Z'
-        self.assertEqual(shirt1.get_size_display(), 'Z')
-        self.assertEqual(shirt1.get_style_display(), 'Z')
-        self.assertRaises(ValidationError, shirt1.validate)
+        foo = Foo(name='Foo')
+        foo.save()
 
-    def test_simple_choices_validation(self):
-        """Ensure that value is in a container of allowed values.
-        """
-        class Shirt(Document):
-            size = StringField(max_length=3,
-                               choices=('S', 'M', 'L', 'XL', 'XXL'))
+        self.assertTrue('base.counter' in
+                        self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertFalse(('foo.counter' or 'bar.counter') in
+                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertNotEqual(foo.counter, bar.counter)
+        self.assertEqual(foo._fields['counter'].owner_document, Base)
+        self.assertEqual(bar._fields['counter'].owner_document, Base)
 
-        Shirt.drop_collection()
+    def test_no_inherited_sequencefield(self):
+        class Base(Document):
+            name = StringField()
+            meta = {'abstract': True}
 
-        shirt = Shirt()
-        shirt.validate()
+        class Foo(Base):
+            counter = SequenceField()
 
-        shirt.size = "S"
-        shirt.validate()
+        class Bar(Base):
+            counter = SequenceField()
 
-        shirt.size = "XS"
-        self.assertRaises(ValidationError, shirt.validate)
+        bar = Bar(name='Bar')
+        bar.save()
 
-        Shirt.drop_collection()
+        foo = Foo(name='Foo')
+        foo.save()
 
-    def test_simple_choices_get_field_display(self):
-        """Test dynamic helper for returning the display value of a choices
-        field.
-        """
-        class Shirt(Document):
-            size = StringField(max_length=3,
-                               choices=('S', 'M', 'L', 'XL', 'XXL'))
-            style = StringField(max_length=3,
-                                choices=('Small', 'Baggy', 'wide'),
-                                default='Small')
+        self.assertFalse('base.counter' in
+                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertTrue(('foo.counter' and 'bar.counter') in
+                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertEqual(foo.counter, bar.counter)
+        self.assertEqual(foo._fields['counter'].owner_document, Foo)
+        self.assertEqual(bar._fields['counter'].owner_document, Bar)
 
-        Shirt.drop_collection()
+    def test_generic_embedded_document(self):
+        class Car(EmbeddedDocument):
+            name = StringField()
 
-        shirt = Shirt()
+        class Dish(EmbeddedDocument):
+            food = StringField(required=True)
+            number = IntField()
 
-        self.assertEqual(shirt.get_size_display(), None)
-        self.assertEqual(shirt.get_style_display(), 'Small')
+        class Person(Document):
+            name = StringField()
+            like = GenericEmbeddedDocumentField()
 
-        shirt.size = "XXL"
-        shirt.style = "Baggy"
-        self.assertEqual(shirt.get_size_display(), 'XXL')
-        self.assertEqual(shirt.get_style_display(), 'Baggy')
+        Person.drop_collection()
 
-        # Set as Z - an invalid choice
-        shirt.size = "Z"
-        shirt.style = "Z"
-        self.assertEqual(shirt.get_size_display(), 'Z')
-        self.assertEqual(shirt.get_style_display(), 'Z')
-        self.assertRaises(ValidationError, shirt.validate)
+        person = Person(name='Test User')
+        person.like = Car(name='Fiat')
+        person.save()
 
-        Shirt.drop_collection()
+        person = Person.objects.first()
+        self.assertTrue(isinstance(person.like, Car))
 
-    def test_simple_choices_validation_invalid_value(self):
-        """Ensure that error messages are correct.
-        """
-        SIZES = ('S', 'M', 'L', 'XL', 'XXL')
-        COLORS = (('R', 'Red'), ('B', 'Blue'))
-        SIZE_MESSAGE = u"Value must be one of ('S', 'M', 'L', 'XL', 'XXL')"
-        COLOR_MESSAGE = u"Value must be one of ['R', 'B']"
+        person.like = Dish(food="arroz", number=15)
+        person.save()
 
-        class Shirt(Document):
-            size = StringField(max_length=3, choices=SIZES)
-            color = StringField(max_length=1, choices=COLORS)
+        person = Person.objects.first()
+        self.assertTrue(isinstance(person.like, Dish))
 
-        Shirt.drop_collection()
-
-        shirt = Shirt()
-        shirt.validate()
-
-        shirt.size = "S"
-        shirt.color = "R"
-        shirt.validate()
-
-        shirt.size = "XS"
-        shirt.color = "G"
-
-        try:
-            shirt.validate()
-        except ValidationError as error:
-            # get the validation rules
-            error_dict = error.to_dict()
-            self.assertEqual(error_dict['size'], SIZE_MESSAGE)
-            self.assertEqual(error_dict['color'], COLOR_MESSAGE)
-
-        Shirt.drop_collection()
-
-    def test_ensure_unique_default_instances(self):
-        """Ensure that every field has it's own unique default instance."""
-        class D(Document):
-            data = DictField()
-            data2 = DictField(default=lambda: {})
+    def test_generic_embedded_document_choices(self):
+        """Ensure you can limit GenericEmbeddedDocument choices."""
+        class Car(EmbeddedDocument):
+            name = StringField()
 
-        d1 = D()
-        d1.data['foo'] = 'bar'
-        d1.data2['foo'] = 'bar'
-        d2 = D()
-        self.assertEqual(d2.data, {})
-        self.assertEqual(d2.data2, {})
+        class Dish(EmbeddedDocument):
+            food = StringField(required=True)
+            number = IntField()
 
-    def test_sequence_field(self):
         class Person(Document):
-            id = SequenceField(primary_key=True)
             name = StringField()
+            like = GenericEmbeddedDocumentField(choices=(Dish,))
 
-        self.db['mongoengine.counters'].drop()
         Person.drop_collection()
 
-        for x in range(10):
-            Person(name="Person %s" % x).save()
+        person = Person(name='Test User')
+        person.like = Car(name='Fiat')
+        self.assertRaises(ValidationError, person.validate)
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        person.like = Dish(food="arroz", number=15)
+        person.save()
 
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
+        person = Person.objects.first()
+        self.assertTrue(isinstance(person.like, Dish))
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+    def test_generic_list_embedded_document_choices(self):
+        """Ensure you can limit GenericEmbeddedDocument choices inside
+        a list field.
+        """
+        class Car(EmbeddedDocument):
+            name = StringField()
 
-        Person.id.set_next_value(1000)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 1000)
+        class Dish(EmbeddedDocument):
+            food = StringField(required=True)
+            number = IntField()
 
-    def test_sequence_field_get_next_value(self):
         class Person(Document):
-            id = SequenceField(primary_key=True)
             name = StringField()
+            likes = ListField(GenericEmbeddedDocumentField(choices=(Dish,)))
 
-        self.db['mongoengine.counters'].drop()
         Person.drop_collection()
 
-        for x in range(10):
-            Person(name="Person %s" % x).save()
-
-        self.assertEqual(Person.id.get_next_value(), 11)
-        self.db['mongoengine.counters'].drop()
+        person = Person(name='Test User')
+        person.likes = [Car(name='Fiat')]
+        self.assertRaises(ValidationError, person.validate)
 
-        self.assertEqual(Person.id.get_next_value(), 1)
+        person.likes = [Dish(food="arroz", number=15)]
+        person.save()
 
-        class Person(Document):
-            id = SequenceField(primary_key=True, value_decorator=str)
-            name = StringField()
+        person = Person.objects.first()
+        self.assertTrue(isinstance(person.likes[0], Dish))
 
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
+    def test_recursive_validation(self):
+        """Ensure that a validation result to_dict is available."""
+        class Author(EmbeddedDocument):
+            name = StringField(required=True)
 
-        for x in range(10):
-            Person(name="Person %s" % x).save()
+        class Comment(EmbeddedDocument):
+            author = EmbeddedDocumentField(Author, required=True)
+            content = StringField(required=True)
 
-        self.assertEqual(Person.id.get_next_value(), '11')
-        self.db['mongoengine.counters'].drop()
+        class Post(Document):
+            title = StringField(required=True)
+            comments = ListField(EmbeddedDocumentField(Comment))
 
-        self.assertEqual(Person.id.get_next_value(), '1')
+        bob = Author(name='Bob')
+        post = Post(title='hello world')
+        post.comments.append(Comment(content='hello', author=bob))
+        post.comments.append(Comment(author=bob))
 
-    def test_sequence_field_sequence_name(self):
-        class Person(Document):
-            id = SequenceField(primary_key=True, sequence_name='jelly')
-            name = StringField()
+        self.assertRaises(ValidationError, post.validate)
+        try:
+            post.validate()
+        except ValidationError as error:
+            # ValidationError.errors property
+            self.assertTrue(hasattr(error, 'errors'))
+            self.assertTrue(isinstance(error.errors, dict))
+            self.assertTrue('comments' in error.errors)
+            self.assertTrue(1 in error.errors['comments'])
+            self.assertTrue(isinstance(error.errors['comments'][1]['content'],
+                                       ValidationError))
 
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
+            # ValidationError.schema property
+            error_dict = error.to_dict()
+            self.assertTrue(isinstance(error_dict, dict))
+            self.assertTrue('comments' in error_dict)
+            self.assertTrue(1 in error_dict['comments'])
+            self.assertTrue('content' in error_dict['comments'][1])
+            self.assertEqual(error_dict['comments'][1]['content'],
+                             u'Field is required')
 
-        for x in range(10):
-            Person(name="Person %s" % x).save()
+        post.comments[1].content = 'here we go'
+        post.validate()
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
-        self.assertEqual(c['next'], 10)
+    def test_email_field(self):
+        class User(Document):
+            email = EmailField()
 
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
+        user = User(email="ross@example.com")
+        self.assertTrue(user.validate() is None)
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
-        self.assertEqual(c['next'], 10)
+        user = User(email="ross@example.co.uk")
+        self.assertTrue(user.validate() is None)
 
-        Person.id.set_next_value(1000)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
-        self.assertEqual(c['next'], 1000)
+        user = User(email=("Kofq@rhom0e4klgauOhpbpNdogawnyIKvQS0wk2mjqrgGQ5S"
+                           "aJIazqqWkm7.net"))
+        self.assertTrue(user.validate() is None)
 
-    def test_multiple_sequence_fields(self):
-        class Person(Document):
-            id = SequenceField(primary_key=True)
-            counter = SequenceField()
-            name = StringField()
+        user = User(email="new-tld@example.technology")
+        self.assertTrue(user.validate() is None)
 
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
+        user = User(email='me@localhost')
+        self.assertRaises(ValidationError, user.validate)
 
-        for x in range(10):
-            Person(name="Person %s" % x).save()
+        user = User(email="ross@example.com.")
+        self.assertRaises(ValidationError, user.validate)
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+    def test_email_field_honors_regex(self):
+        class User(Document):
+            email = EmailField(regex=r'\w+@example.com')
 
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
+        # Fails regex validation
+        user = User(email='me@foo.com')
+        self.assertRaises(ValidationError, user.validate)
 
-        counters = [i.counter for i in Person.objects]
-        self.assertEqual(counters, range(1, 11))
+        # Passes regex validation
+        user = User(email='me@example.com')
+        self.assertTrue(user.validate() is None)
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+    def test_tuples_as_tuples(self):
+        """Ensure that tuples remain tuples when they are inside
+        a ComplexBaseField.
+        """
+        class EnumField(BaseField):
 
-        Person.id.set_next_value(1000)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 1000)
+            def __init__(self, **kwargs):
+                super(EnumField, self).__init__(**kwargs)
 
-        Person.counter.set_next_value(999)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.counter'})
-        self.assertEqual(c['next'], 999)
+            def to_mongo(self, value):
+                return value
 
-    def test_sequence_fields_reload(self):
-        class Animal(Document):
-            counter = SequenceField()
-            name = StringField()
+            def to_python(self, value):
+                return tuple(value)
 
-        self.db['mongoengine.counters'].drop()
-        Animal.drop_collection()
+        class TestDoc(Document):
+            items = ListField(EnumField())
 
-        a = Animal(name="Boi").save()
+        TestDoc.drop_collection()
 
-        self.assertEqual(a.counter, 1)
-        a.reload()
-        self.assertEqual(a.counter, 1)
+        tuples = [(100, 'Testing')]
+        doc = TestDoc()
+        doc.items = tuples
+        doc.save()
+        x = TestDoc.objects().get()
+        self.assertTrue(x is not None)
+        self.assertTrue(len(x.items) == 1)
+        self.assertTrue(tuple(x.items[0]) in tuples)
+        self.assertTrue(x.items[0] in tuples)
 
-        a.counter = None
-        self.assertEqual(a.counter, 2)
-        a.save()
+    def test_dynamic_fields_class(self):
+        class Doc2(Document):
+            field_1 = StringField(db_field='f')
 
-        self.assertEqual(a.counter, 2)
+        class Doc(Document):
+            my_id = IntField(required=True, unique=True, primary_key=True)
+            embed_me = DynamicField(db_field='e')
+            field_x = StringField(db_field='x')
 
-        a = Animal.objects.first()
-        self.assertEqual(a.counter, 2)
-        a.reload()
-        self.assertEqual(a.counter, 2)
+        Doc.drop_collection()
+        Doc2.drop_collection()
 
-    def test_multiple_sequence_fields_on_docs(self):
+        doc2 = Doc2(field_1="hello")
+        doc = Doc(my_id=1, embed_me=doc2, field_x="x")
+        self.assertRaises(OperationError, doc.save)
 
-        class Animal(Document):
-            id = SequenceField(primary_key=True)
-            name = StringField()
+        doc2.save()
+        doc.save()
 
-        class Person(Document):
-            id = SequenceField(primary_key=True)
-            name = StringField()
+        doc = Doc.objects.get()
+        self.assertEqual(doc.embed_me.field_1, "hello")
 
-        self.db['mongoengine.counters'].drop()
-        Animal.drop_collection()
-        Person.drop_collection()
-
-        for x in range(10):
-            Animal(name="Animal %s" % x).save()
-            Person(name="Person %s" % x).save()
+    def test_dynamic_fields_embedded_class(self):
+        class Embed(EmbeddedDocument):
+            field_1 = StringField(db_field='f')
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        class Doc(Document):
+            my_id = IntField(required=True, unique=True, primary_key=True)
+            embed_me = DynamicField(db_field='e')
+            field_x = StringField(db_field='x')
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
-        self.assertEqual(c['next'], 10)
+        Doc.drop_collection()
 
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
+        Doc(my_id=1, embed_me=Embed(field_1="hello"), field_x="x").save()
 
-        id = [i.id for i in Animal.objects]
-        self.assertEqual(id, range(1, 11))
+        doc = Doc.objects.get()
+        self.assertEqual(doc.embed_me.field_1, "hello")
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+    def test_dynamicfield_dump_document(self):
+        """Ensure a DynamicField can handle another document's dump."""
+        class Doc(Document):
+            field = DynamicField()
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
-        self.assertEqual(c['next'], 10)
+        class ToEmbed(Document):
+            id = IntField(primary_key=True, default=1)
+            recursive = DynamicField()
 
-    def test_sequence_field_value_decorator(self):
-        class Person(Document):
-            id = SequenceField(primary_key=True, value_decorator=str)
-            name = StringField()
+        class ToEmbedParent(Document):
+            id = IntField(primary_key=True, default=1)
+            recursive = DynamicField()
 
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
+            meta = {'allow_inheritance': True}
 
-        for x in range(10):
-            p = Person(name="Person %s" % x)
-            p.save()
+        class ToEmbedChild(ToEmbedParent):
+            pass
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        to_embed_recursive = ToEmbed(id=1).save()
+        to_embed = ToEmbed(id=2, recursive=to_embed_recursive).save()
+        doc = Doc(field=to_embed)
+        doc.save()
+        assert isinstance(doc.field, ToEmbed)
+        assert doc.field == to_embed
+        # Same thing with a Document with a _cls field
+        to_embed_recursive = ToEmbedChild(id=1).save()
+        to_embed_child = ToEmbedChild(id=2, recursive=to_embed_recursive).save()
+        doc = Doc(field=to_embed_child)
+        doc.save()
+        assert isinstance(doc.field, ToEmbedChild)
+        assert doc.field == to_embed_child
 
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, map(str, range(1, 11)))
+    def test_invalid_dict_value(self):
+        class DictFieldTest(Document):
+            dictionary = DictField(required=True)
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        DictFieldTest.drop_collection()
 
-    def test_embedded_sequence_field(self):
-        class Comment(EmbeddedDocument):
-            id = SequenceField()
-            content = StringField(required=True)
+        test = DictFieldTest(dictionary=None)
+        test.dictionary  # Just access to test getter
+        self.assertRaises(ValidationError, test.validate)
 
-        class Post(Document):
-            title = StringField(required=True)
-            comments = ListField(EmbeddedDocumentField(Comment))
+        test = DictFieldTest(dictionary=False)
+        test.dictionary  # Just access to test getter
+        self.assertRaises(ValidationError, test.validate)
 
-        self.db['mongoengine.counters'].drop()
-        Post.drop_collection()
+    def test_cls_field(self):
+        class Animal(Document):
+            meta = {'allow_inheritance': True}
 
-        Post(title="MongoEngine",
-             comments=[Comment(content="NoSQL Rocks"),
-                       Comment(content="MongoEngine Rocks")]).save()
-        c = self.db['mongoengine.counters'].find_one({'_id': 'comment.id'})
-        self.assertEqual(c['next'], 2)
-        post = Post.objects.first()
-        self.assertEqual(1, post.comments[0].id)
-        self.assertEqual(2, post.comments[1].id)
+        class Fish(Animal):
+            pass
 
-    def test_inherited_sequencefield(self):
-        class Base(Document):
-            name = StringField()
-            counter = SequenceField()
-            meta = {'abstract': True}
+        class Mammal(Animal):
+            pass
 
-        class Foo(Base):
+        class Dog(Mammal):
             pass
 
-        class Bar(Base):
+        class Human(Mammal):
             pass
 
-        bar = Bar(name='Bar')
-        bar.save()
+        Animal.objects.delete()
+        Dog().save()
+        Fish().save()
+        Human().save()
+        self.assertEquals(Animal.objects(_cls__in=["Animal.Mammal.Dog", "Animal.Fish"]).count(), 2)
+        self.assertEquals(Animal.objects(_cls__in=["Animal.Fish.Guppy"]).count(), 0)
 
-        foo = Foo(name='Foo')
-        foo.save()
+    def test_sparse_field(self):
+        class Doc(Document):
+            name = StringField(required=False, unique=True, sparse=True)
 
-        self.assertTrue('base.counter' in
-                        self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertFalse(('foo.counter' or 'bar.counter') in
-                         self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertNotEqual(foo.counter, bar.counter)
-        self.assertEqual(foo._fields['counter'].owner_document, Base)
-        self.assertEqual(bar._fields['counter'].owner_document, Base)
+        # This would raise an exception in a non-sparse unique index
+        Doc().save()
+        Doc().save()
 
-    def test_no_inherited_sequencefield(self):
-        class Base(Document):
-            name = StringField()
-            meta = {'abstract': True}
+    def test_undefined_field_exception(self):
+        """Tests if a `FieldDoesNotExist` exception is raised when
+        trying to instantiate a document with a field that's not
+        defined.
+        """
+        class Doc(Document):
+            foo = StringField()
 
-        class Foo(Base):
-            counter = SequenceField()
+        with self.assertRaises(FieldDoesNotExist):
+            Doc(bar='test')
 
-        class Bar(Base):
-            counter = SequenceField()
+    def test_undefined_field_exception_with_strict(self):
+        """Tests if a `FieldDoesNotExist` exception is raised when
+        trying to instantiate a document with a field that's not
+        defined, even when strict is set to False.
+        """
+        class Doc(Document):
+            foo = StringField()
+            meta = {'strict': False}
 
-        bar = Bar(name='Bar')
-        bar.save()
+        with self.assertRaises(FieldDoesNotExist):
+            Doc(bar='test')
 
-        foo = Foo(name='Foo')
-        foo.save()
+    def test_long_field_is_considered_as_int64(self):
+        """
+        Tests that long fields are stored as long in mongo, even if long
+        value is small enough to be an int.
+        """
+        class TestLongFieldConsideredAsInt64(Document):
+            some_long = LongField()
 
-        self.assertFalse('base.counter' in
-                         self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertTrue(('foo.counter' and 'bar.counter') in
-                         self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertEqual(foo.counter, bar.counter)
-        self.assertEqual(foo._fields['counter'].owner_document, Foo)
-        self.assertEqual(bar._fields['counter'].owner_document, Bar)
+        doc = TestLongFieldConsideredAsInt64(some_long=42).save()
+        db = get_db()
+        self.assertTrue(isinstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64))
+        self.assertTrue(isinstance(doc.some_long, six.integer_types))
 
-    def test_generic_embedded_document(self):
-        class Car(EmbeddedDocument):
-            name = StringField()
 
-        class Dish(EmbeddedDocument):
-            food = StringField(required=True)
-            number = IntField()
+class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):
 
-        class Person(Document):
-            name = StringField()
-            like = GenericEmbeddedDocumentField()
+    def setUp(self):
+        """
+        Create two BlogPost entries in the database, each with
+        several EmbeddedDocuments.
+        """
+        class Comments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
 
-        Person.drop_collection()
+        class BlogPost(Document):
+            comments = EmbeddedDocumentListField(Comments)
 
-        person = Person(name='Test User')
-        person.like = Car(name='Fiat')
-        person.save()
+        BlogPost.drop_collection()
 
-        person = Person.objects.first()
-        self.assertTrue(isinstance(person.like, Car))
+        self.Comments = Comments
+        self.BlogPost = BlogPost
 
-        person.like = Dish(food="arroz", number=15)
-        person.save()
+        self.post1 = self.BlogPost(comments=[
+            self.Comments(author='user1', message='message1'),
+            self.Comments(author='user2', message='message1')
+        ]).save()
 
-        person = Person.objects.first()
-        self.assertTrue(isinstance(person.like, Dish))
+        self.post2 = self.BlogPost(comments=[
+            self.Comments(author='user2', message='message2'),
+            self.Comments(author='user2', message='message3'),
+            self.Comments(author='user3', message='message1')
+        ]).save()
 
-    def test_generic_embedded_document_choices(self):
-        """Ensure you can limit GenericEmbeddedDocument choices
+    def test_no_keyword_filter(self):
         """
-        class Car(EmbeddedDocument):
-            name = StringField()
-
-        class Dish(EmbeddedDocument):
-            food = StringField(required=True)
-            number = IntField()
-
-        class Person(Document):
-            name = StringField()
-            like = GenericEmbeddedDocumentField(choices=(Dish,))
+        Tests the filter method of a List of Embedded Documents
+        with a no keyword.
+        """
+        filtered = self.post1.comments.filter()
 
-        Person.drop_collection()
+        # Ensure nothing was changed
+        self.assertListEqual(filtered, self.post1.comments)
 
-        person = Person(name='Test User')
-        person.like = Car(name='Fiat')
-        self.assertRaises(ValidationError, person.validate)
+    def test_single_keyword_filter(self):
+        """
+        Tests the filter method of a List of Embedded Documents
+        with a single keyword.
+        """
+        filtered = self.post1.comments.filter(author='user1')
 
-        person.like = Dish(food="arroz", number=15)
-        person.save()
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(filtered), 1)
 
-        person = Person.objects.first()
-        self.assertTrue(isinstance(person.like, Dish))
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(filtered[0].author, 'user1')
 
-    def test_generic_list_embedded_document_choices(self):
-        """Ensure you can limit GenericEmbeddedDocument choices inside a list
-        field
+    def test_multi_keyword_filter(self):
         """
-        class Car(EmbeddedDocument):
-            name = StringField()
+        Tests the filter method of a List of Embedded Documents
+        with multiple keywords.
+        """
+        filtered = self.post2.comments.filter(
+            author='user2', message='message2'
+        )
 
-        class Dish(EmbeddedDocument):
-            food = StringField(required=True)
-            number = IntField()
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(filtered), 1)
 
-        class Person(Document):
-            name = StringField()
-            likes = ListField(GenericEmbeddedDocumentField(choices=(Dish,)))
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(filtered[0].author, 'user2')
+        self.assertEqual(filtered[0].message, 'message2')
 
-        Person.drop_collection()
+    def test_chained_filter(self):
+        """
+        Tests chained filter methods of a List of Embedded Documents
+        """
+        filtered = self.post2.comments.filter(author='user2').filter(
+            message='message2'
+        )
 
-        person = Person(name='Test User')
-        person.likes = [Car(name='Fiat')]
-        self.assertRaises(ValidationError, person.validate)
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(filtered), 1)
 
-        person.likes = [Dish(food="arroz", number=15)]
-        person.save()
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(filtered[0].author, 'user2')
+        self.assertEqual(filtered[0].message, 'message2')
 
-        person = Person.objects.first()
-        self.assertTrue(isinstance(person.likes[0], Dish))
+    def test_unknown_keyword_filter(self):
+        """
+        Tests the filter method of a List of Embedded Documents
+        when the keyword is not a known keyword.
+        """
+        with self.assertRaises(AttributeError):
+            self.post2.comments.filter(year=2)
 
-    def test_recursive_validation(self):
-        """Ensure that a validation result to_dict is available.
+    def test_no_keyword_exclude(self):
         """
-        class Author(EmbeddedDocument):
-            name = StringField(required=True)
+        Tests the exclude method of a List of Embedded Documents
+        with a no keyword.
+        """
+        filtered = self.post1.comments.exclude()
 
-        class Comment(EmbeddedDocument):
-            author = EmbeddedDocumentField(Author, required=True)
-            content = StringField(required=True)
+        # Ensure everything was removed
+        self.assertListEqual(filtered, [])
 
-        class Post(Document):
-            title = StringField(required=True)
-            comments = ListField(EmbeddedDocumentField(Comment))
+    def test_single_keyword_exclude(self):
+        """
+        Tests the exclude method of a List of Embedded Documents
+        with a single keyword.
+        """
+        excluded = self.post1.comments.exclude(author='user1')
 
-        bob = Author(name='Bob')
-        post = Post(title='hello world')
-        post.comments.append(Comment(content='hello', author=bob))
-        post.comments.append(Comment(author=bob))
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(excluded), 1)
 
-        self.assertRaises(ValidationError, post.validate)
-        try:
-            post.validate()
-        except ValidationError as error:
-            # ValidationError.errors property
-            self.assertTrue(hasattr(error, 'errors'))
-            self.assertTrue(isinstance(error.errors, dict))
-            self.assertTrue('comments' in error.errors)
-            self.assertTrue(1 in error.errors['comments'])
-            self.assertTrue(isinstance(error.errors['comments'][1]['content'],
-                                       ValidationError))
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(excluded[0].author, 'user2')
 
-            # ValidationError.schema property
-            error_dict = error.to_dict()
-            self.assertTrue(isinstance(error_dict, dict))
-            self.assertTrue('comments' in error_dict)
-            self.assertTrue(1 in error_dict['comments'])
-            self.assertTrue('content' in error_dict['comments'][1])
-            self.assertEqual(error_dict['comments'][1]['content'],
-                             u'Field is required')
+    def test_multi_keyword_exclude(self):
+        """
+        Tests the exclude method of a List of Embedded Documents
+        with multiple keywords.
+        """
+        excluded = self.post2.comments.exclude(
+            author='user3', message='message1'
+        )
 
-        post.comments[1].content = 'here we go'
-        post.validate()
+        # Ensure only 2 entries were returned.
+        self.assertEqual(len(excluded), 2)
 
-    def test_email_field(self):
-        class User(Document):
-            email = EmailField()
+        # Ensure the entries returned are the correct entries.
+        self.assertEqual(excluded[0].author, 'user2')
+        self.assertEqual(excluded[1].author, 'user2')
 
-        user = User(email="ross@example.com")
-        self.assertTrue(user.validate() is None)
+    def test_non_matching_exclude(self):
+        """
+        Tests the exclude method of a List of Embedded Documents
+        when the keyword does not match any entries.
+        """
+        excluded = self.post2.comments.exclude(author='user4')
 
-        user = User(email="ross@example.co.uk")
-        self.assertTrue(user.validate() is None)
+        # Ensure the 3 entries still exist.
+        self.assertEqual(len(excluded), 3)
 
-        user = User(email=("Kofq@rhom0e4klgauOhpbpNdogawnyIKvQS0wk2mjqrgGQ5S"
-                           "aJIazqqWkm7.net"))
-        self.assertTrue(user.validate() is None)
+    def test_unknown_keyword_exclude(self):
+        """
+        Tests the exclude method of a List of Embedded Documents
+        when the keyword is not a known keyword.
+        """
+        with self.assertRaises(AttributeError):
+            self.post2.comments.exclude(year=2)
 
-        user = User(email="new-tld@example.technology")
-        self.assertTrue(user.validate() is None)
+    def test_chained_filter_exclude(self):
+        """
+        Tests the exclude method after a filter method of a List of
+        Embedded Documents.
+        """
+        excluded = self.post2.comments.filter(author='user2').exclude(
+            message='message2'
+        )
 
-        user = User(email='me@localhost')
-        self.assertRaises(ValidationError, user.validate)
+        # Ensure only 1 entry was returned.
+        self.assertEqual(len(excluded), 1)
 
-        user = User(email="ross@example.com.")
-        self.assertRaises(ValidationError, user.validate)
+        # Ensure the entry returned is the correct entry.
+        self.assertEqual(excluded[0].author, 'user2')
+        self.assertEqual(excluded[0].message, 'message3')
 
-    def test_email_field_honors_regex(self):
-        class User(Document):
-            email = EmailField(regex=r'\w+@example.com')
+    def test_count(self):
+        """
+        Tests the count method of a List of Embedded Documents.
+        """
+        self.assertEqual(self.post1.comments.count(), 2)
+        self.assertEqual(self.post1.comments.count(), len(self.post1.comments))
 
-        # Fails regex validation
-        user = User(email='me@foo.com')
-        self.assertRaises(ValidationError, user.validate)
+    def test_filtered_count(self):
+        """
+        Tests the filter + count method of a List of Embedded Documents.
+        """
+        count = self.post1.comments.filter(author='user1').count()
+        self.assertEqual(count, 1)
 
-        # Passes regex validation
-        user = User(email='me@example.com')
-        self.assertTrue(user.validate() is None)
+    def test_single_keyword_get(self):
+        """
+        Tests the get method of a List of Embedded Documents using a
+        single keyword.
+        """
+        comment = self.post1.comments.get(author='user1')
+        self.assertIsInstance(comment, self.Comments)
+        self.assertEqual(comment.author, 'user1')
 
-    def test_tuples_as_tuples(self):
+    def test_multi_keyword_get(self):
         """
-        Ensure that tuples remain tuples when they are
-        inside a ComplexBaseField
+        Tests the get method of a List of Embedded Documents using
+        multiple keywords.
         """
-        class EnumField(BaseField):
+        comment = self.post2.comments.get(author='user2', message='message2')
+        self.assertIsInstance(comment, self.Comments)
+        self.assertEqual(comment.author, 'user2')
+        self.assertEqual(comment.message, 'message2')
 
-            def __init__(self, **kwargs):
-                super(EnumField, self).__init__(**kwargs)
+    def test_no_keyword_multiple_return_get(self):
+        """
+        Tests the get method of a List of Embedded Documents without
+        a keyword to return multiple documents.
+        """
+        with self.assertRaises(MultipleObjectsReturned):
+            self.post1.comments.get()
 
-            def to_mongo(self, value):
-                return value
+    def test_keyword_multiple_return_get(self):
+        """
+        Tests the get method of a List of Embedded Documents with a keyword
+        to return multiple documents.
+        """
+        with self.assertRaises(MultipleObjectsReturned):
+            self.post2.comments.get(author='user2')
 
-            def to_python(self, value):
-                return tuple(value)
+    def test_unknown_keyword_get(self):
+        """
+        Tests the get method of a List of Embedded Documents with an
+        unknown keyword.
+        """
+        with self.assertRaises(AttributeError):
+            self.post2.comments.get(year=2020)
 
-        class TestDoc(Document):
-            items = ListField(EnumField())
+    def test_no_result_get(self):
+        """
+        Tests the get method of a List of Embedded Documents where get
+        returns no results.
+        """
+        with self.assertRaises(DoesNotExist):
+            self.post1.comments.get(author='user3')
 
-        TestDoc.drop_collection()
-        tuples = [(100, 'Testing')]
-        doc = TestDoc()
-        doc.items = tuples
-        doc.save()
-        x = TestDoc.objects().get()
-        self.assertTrue(x is not None)
-        self.assertTrue(len(x.items) == 1)
-        self.assertTrue(tuple(x.items[0]) in tuples)
-        self.assertTrue(x.items[0] in tuples)
+    def test_first(self):
+        """
+        Tests the first method of a List of Embedded Documents to
+        ensure it returns the first comment.
+        """
+        comment = self.post1.comments.first()
 
-    def test_dynamic_fields_class(self):
+        # Ensure a Comment object was returned.
+        self.assertIsInstance(comment, self.Comments)
+        self.assertEqual(comment, self.post1.comments[0])
 
-        class Doc2(Document):
-            field_1 = StringField(db_field='f')
+    def test_create(self):
+        """
+        Test the create method of a List of Embedded Documents.
+        """
+        comment = self.post1.comments.create(
+            author='user4', message='message1'
+        )
+        self.post1.save()
 
-        class Doc(Document):
-            my_id = IntField(required=True, unique=True, primary_key=True)
-            embed_me = DynamicField(db_field='e')
-            field_x = StringField(db_field='x')
+        # Ensure the returned value is the comment object.
+        self.assertIsInstance(comment, self.Comments)
+        self.assertEqual(comment.author, 'user4')
+        self.assertEqual(comment.message, 'message1')
 
-        Doc.drop_collection()
-        Doc2.drop_collection()
+        # Ensure the new comment was actually saved to the database.
+        self.assertIn(
+            comment,
+            self.BlogPost.objects(comments__author='user4')[0].comments
+        )
 
-        doc2 = Doc2(field_1="hello")
-        doc = Doc(my_id=1, embed_me=doc2, field_x="x")
-        self.assertRaises(OperationError, doc.save)
+    def test_filtered_create(self):
+        """
+        Test the create method of a List of Embedded Documents chained
+        to a call to the filter method. Filtering should have no effect
+        on creation.
+        """
+        comment = self.post1.comments.filter(author='user1').create(
+            author='user4', message='message1'
+        )
+        self.post1.save()
 
-        doc2.save()
-        doc.save()
+        # Ensure the returned value is the comment object.
+        self.assertIsInstance(comment, self.Comments)
+        self.assertEqual(comment.author, 'user4')
+        self.assertEqual(comment.message, 'message1')
 
-        doc = Doc.objects.get()
-        self.assertEqual(doc.embed_me.field_1, "hello")
+        # Ensure the new comment was actually saved to the database.
+        self.assertIn(
+            comment,
+            self.BlogPost.objects(comments__author='user4')[0].comments
+        )
 
-    def test_dynamic_fields_embedded_class(self):
+    def test_no_keyword_update(self):
+        """
+        Tests the update method of a List of Embedded Documents with
+        no keywords.
+        """
+        original = list(self.post1.comments)
+        number = self.post1.comments.update()
+        self.post1.save()
 
-        class Embed(EmbeddedDocument):
-            field_1 = StringField(db_field='f')
+        # Ensure that nothing was altered.
+        self.assertIn(
+            original[0],
+            self.BlogPost.objects(id=self.post1.id)[0].comments
+        )
 
-        class Doc(Document):
-            my_id = IntField(required=True, unique=True, primary_key=True)
-            embed_me = DynamicField(db_field='e')
-            field_x = StringField(db_field='x')
+        self.assertIn(
+            original[1],
+            self.BlogPost.objects(id=self.post1.id)[0].comments
+        )
 
-        Doc.drop_collection()
+        # Ensure the method returned 0 as the number of entries
+        # modified
+        self.assertEqual(number, 0)
 
-        Doc(my_id=1, embed_me=Embed(field_1="hello"), field_x="x").save()
+    def test_single_keyword_update(self):
+        """
+        Tests the update method of a List of Embedded Documents with
+        a single keyword.
+        """
+        number = self.post1.comments.update(author='user4')
+        self.post1.save()
 
-        doc = Doc.objects.get()
-        self.assertEqual(doc.embed_me.field_1, "hello")
+        comments = self.BlogPost.objects(id=self.post1.id)[0].comments
 
-    def test_dynamicfield_dump_document(self):
-        """Ensure a DynamicField can handle another document's dump
-        """
-        class Doc(Document):
-            field = DynamicField()
+        # Ensure that the database was updated properly.
+        self.assertEqual(comments[0].author, 'user4')
+        self.assertEqual(comments[1].author, 'user4')
 
-        class ToEmbed(Document):
-            id = IntField(primary_key=True, default=1)
-            recursive = DynamicField()
+        # Ensure the method returned 2 as the number of entries
+        # modified
+        self.assertEqual(number, 2)
 
-        class ToEmbedParent(Document):
-            id = IntField(primary_key=True, default=1)
-            recursive = DynamicField()
+    def test_unicode(self):
+        """
+        Tests that unicode strings handled correctly
+        """
+        post = self.BlogPost(comments=[
+            self.Comments(author='user1', message=u'сообщение'),
+            self.Comments(author='user2', message=u'хабарлама')
+        ]).save()
+        self.assertEqual(post.comments.get(message=u'сообщение').author,
+                         'user1')
 
-            meta = {'allow_inheritance': True}
+    def test_save(self):
+        """
+        Tests the save method of a List of Embedded Documents.
+        """
+        comments = self.post1.comments
+        new_comment = self.Comments(author='user4')
+        comments.append(new_comment)
+        comments.save()
 
-        class ToEmbedChild(ToEmbedParent):
-            pass
+        # Ensure that the new comment has been added to the database.
+        self.assertIn(
+            new_comment,
+            self.BlogPost.objects(id=self.post1.id)[0].comments
+        )
 
-        to_embed_recursive = ToEmbed(id=1).save()
-        to_embed = ToEmbed(id=2, recursive=to_embed_recursive).save()
-        doc = Doc(field=to_embed)
-        doc.save()
-        assert isinstance(doc.field, ToEmbed)
-        assert doc.field == to_embed
-        # Same thing with a Document with a _cls field
-        to_embed_recursive = ToEmbedChild(id=1).save()
-        to_embed_child = ToEmbedChild(id=2, recursive=to_embed_recursive).save()
-        doc = Doc(field=to_embed_child)
-        doc.save()
-        assert isinstance(doc.field, ToEmbedChild)
-        assert doc.field == to_embed_child
+    def test_delete(self):
+        """
+        Tests the delete method of a List of Embedded Documents.
+        """
+        number = self.post1.comments.delete()
+        self.post1.save()
 
-    def test_invalid_dict_value(self):
-        class DictFieldTest(Document):
-            dictionary = DictField(required=True)
+        # Ensure that all the comments under post1 were deleted in the
+        # database.
+        self.assertListEqual(
+            self.BlogPost.objects(id=self.post1.id)[0].comments, []
+        )
 
-        DictFieldTest.drop_collection()
+        # Ensure that post1 comments were deleted from the list.
+        self.assertListEqual(self.post1.comments, [])
 
-        test = DictFieldTest(dictionary=None)
-        test.dictionary  # Just access to test getter
-        self.assertRaises(ValidationError, test.validate)
+        # Ensure that comments still returned a EmbeddedDocumentList object.
+        self.assertIsInstance(self.post1.comments, EmbeddedDocumentList)
 
-        test = DictFieldTest(dictionary=False)
-        test.dictionary  # Just access to test getter
-        self.assertRaises(ValidationError, test.validate)
+        # Ensure that the delete method returned 2 as the number of entries
+        # deleted from the database
+        self.assertEqual(number, 2)
 
-    def test_cls_field(self):
-        class Animal(Document):
-            meta = {'allow_inheritance': True}
+    def test_empty_list_embedded_documents_with_unique_field(self):
+        """
+        Tests that only one document with an empty list of embedded documents
+        that have a unique field can be saved, but if the unique field is
+        also sparse than multiple documents with an empty list can be saved.
+        """
+        class EmbeddedWithUnique(EmbeddedDocument):
+            number = IntField(unique=True)
 
-        class Fish(Animal):
-            pass
+        class A(Document):
+            my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))
 
-        class Mammal(Animal):
-            pass
+        A(my_list=[]).save()
+        with self.assertRaises(NotUniqueError):
+            A(my_list=[]).save()
 
-        class Dog(Mammal):
-            pass
+        class EmbeddedWithSparseUnique(EmbeddedDocument):
+            number = IntField(unique=True, sparse=True)
 
-        class Human(Mammal):
-            pass
+        class B(Document):
+            my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique))
 
-        Animal.objects.delete()
-        Dog().save()
-        Fish().save()
-        Human().save()
-        self.assertEquals(Animal.objects(_cls__in=["Animal.Mammal.Dog", "Animal.Fish"]).count(), 2)
-        self.assertEquals(Animal.objects(_cls__in=["Animal.Fish.Guppy"]).count(), 0)
+        A.drop_collection()
+        B.drop_collection()
 
-    def test_sparse_field(self):
-        class Doc(Document):
-            name = StringField(required=False, unique=True, sparse=True)
-        try:
-            Doc().save()
-            Doc().save()
-        except Exception:
-            self.fail()
+        B(my_list=[]).save()
+        B(my_list=[]).save()
 
-    def test_undefined_field_exception(self):
-        """Tests if a `FieldDoesNotExist` exception is raised when trying to
-        instanciate a document with a field that's not defined.
+    def test_filtered_delete(self):
         """
-        class Doc(Document):
-            foo = StringField()
-
-        with self.assertRaises(FieldDoesNotExist):
-            Doc(bar='test')
+        Tests the delete method of a List of Embedded Documents
+        after the filter method has been called.
+        """
+        comment = self.post1.comments[1]
+        number = self.post1.comments.filter(author='user2').delete()
+        self.post1.save()
 
+        # Ensure that only the user2 comment was deleted.
+        self.assertNotIn(
+            comment, self.BlogPost.objects(id=self.post1.id)[0].comments
+        )
+        self.assertEqual(
+            len(self.BlogPost.objects(id=self.post1.id)[0].comments), 1
+        )
 
-    def test_undefined_field_exception_with_strict(self):
-        """Tests if a `FieldDoesNotExist` exception is raised when trying to
-        instanciate a document with a field that's not defined,
-        even when strict is set to False.
-        """
-        class Doc(Document):
-            foo = StringField()
-            meta = {'strict': False}
+        # Ensure that the user2 comment no longer exists in the list.
+        self.assertNotIn(comment, self.post1.comments)
+        self.assertEqual(len(self.post1.comments), 1)
 
-        with self.assertRaises(FieldDoesNotExist):
-            Doc(bar='test')
+        # Ensure that the delete method returned 1 as the number of entries
+        # deleted from the database
+        self.assertEqual(number, 1)
 
-    def test_long_field_is_considered_as_int64(self):
+    def test_custom_data(self):
         """
-        Tests that long fields are stored as long in mongo, even if long value
-        is small enough to be an int.
+        Tests that custom data is saved in the field object
+        and doesn't interfere with the rest of field functionalities.
         """
-        class TestLongFieldConsideredAsInt64(Document):
-            some_long = LongField()
-
-        doc = TestLongFieldConsideredAsInt64(some_long=42).save()
-        db = get_db()
-        self.assertTrue(isinstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64))
-        self.assertTrue(isinstance(doc.some_long, six.integer_types))
+        custom_data = {'a': 'a_value', 'b': [1, 2]}
 
+        class CustomData(Document):
+            a_field = IntField()
+            c_field = IntField(custom_data=custom_data)
 
-class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):
+        CustomData.drop_collection()
 
-    def setUp(self):
+        a1 = CustomData(a_field=1, c_field=2).save()
+        self.assertEqual(2, a1.c_field)
+        self.assertFalse(hasattr(a1.c_field, 'custom_data'))
+        self.assertTrue(hasattr(CustomData.c_field, 'custom_data'))
+        self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
+
+
+class CachedReferenceFieldTest(MongoDBTestCase):
+
+    def test_cached_reference_field_get_and_save(self):
         """
-        Create two BlogPost entries in the database, each with
-        several EmbeddedDocuments.
+        Tests #1047: CachedReferenceField creates DBRefs on to_python,
+        but can't save them on to_mongo.
         """
-        class Comments(EmbeddedDocument):
-            author = StringField()
-            message = StringField()
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
 
-        class BlogPost(Document):
-            comments = EmbeddedDocumentListField(Comments)
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(Animal)
 
-        BlogPost.drop_collection()
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
 
-        self.Comments = Comments
-        self.BlogPost = BlogPost
+        Ocorrence(person="testte",
+                  animal=Animal(name="Leopard", tag="heavy").save()).save()
+        p = Ocorrence.objects.get()
+        p.person = 'new_testte'
+        p.save()
 
-        self.post1 = self.BlogPost(comments=[
-            self.Comments(author='user1', message='message1'),
-            self.Comments(author='user2', message='message1')
-        ]).save()
+    def test_cached_reference_fields(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
 
-        self.post2 = self.BlogPost(comments=[
-            self.Comments(author='user2', message='message2'),
-            self.Comments(author='user2', message='message3'),
-            self.Comments(author='user3', message='message1')
-        ]).save()
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(
+                Animal, fields=['tag'])
 
-    def test_no_keyword_filter(self):
-        """
-        Tests the filter method of a List of Embedded Documents
-        with a no keyword.
-        """
-        filtered = self.post1.comments.filter()
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
 
-        # Ensure nothing was changed
-        self.assertListEqual(filtered, self.post1.comments)
+        a = Animal(name="Leopard", tag="heavy")
+        a.save()
 
-    def test_single_keyword_filter(self):
-        """
-        Tests the filter method of a List of Embedded Documents
-        with a single keyword.
-        """
-        filtered = self.post1.comments.filter(author='user1')
+        self.assertEqual(Animal._cached_reference_fields, [Ocorrence.animal])
+        o = Ocorrence(person="teste", animal=a)
+        o.save()
 
-        # Ensure only 1 entry was returned.
-        self.assertEqual(len(filtered), 1)
+        p = Ocorrence(person="Wilson")
+        p.save()
 
-        # Ensure the entry returned is the correct entry.
-        self.assertEqual(filtered[0].author, 'user1')
+        self.assertEqual(Ocorrence.objects(animal=None).count(), 1)
 
-    def test_multi_keyword_filter(self):
-        """
-        Tests the filter method of a List of Embedded Documents
-        with multiple keywords.
-        """
-        filtered = self.post2.comments.filter(
-            author='user2', message='message2'
-        )
+        self.assertEqual(
+            a.to_mongo(fields=['tag']), {'tag': 'heavy', "_id": a.pk})
 
-        # Ensure only 1 entry was returned.
-        self.assertEqual(len(filtered), 1)
+        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
 
-        # Ensure the entry returned is the correct entry.
-        self.assertEqual(filtered[0].author, 'user2')
-        self.assertEqual(filtered[0].message, 'message2')
+        # counts
+        Ocorrence(person="teste 2").save()
+        Ocorrence(person="teste 3").save()
 
-    def test_chained_filter(self):
-        """
-        Tests chained filter methods of a List of Embedded Documents
-        """
-        filtered = self.post2.comments.filter(author='user2').filter(
-            message='message2'
-        )
+        count = Ocorrence.objects(animal__tag='heavy').count()
+        self.assertEqual(count, 1)
 
-        # Ensure only 1 entry was returned.
-        self.assertEqual(len(filtered), 1)
+        ocorrence = Ocorrence.objects(animal__tag='heavy').first()
+        self.assertEqual(ocorrence.person, "teste")
+        self.assertTrue(isinstance(ocorrence.animal, Animal))
 
-        # Ensure the entry returned is the correct entry.
-        self.assertEqual(filtered[0].author, 'user2')
-        self.assertEqual(filtered[0].message, 'message2')
+    def test_cached_reference_field_decimal(self):
+        class PersonAuto(Document):
+            name = StringField()
+            salary = DecimalField()
 
-    def test_unknown_keyword_filter(self):
-        """
-        Tests the filter method of a List of Embedded Documents
-        when the keyword is not a known keyword.
-        """
-        with self.assertRaises(AttributeError):
-            self.post2.comments.filter(year=2)
+        class SocialTest(Document):
+            group = StringField()
+            person = CachedReferenceField(
+                PersonAuto,
+                fields=('salary',))
 
-    def test_no_keyword_exclude(self):
-        """
-        Tests the exclude method of a List of Embedded Documents
-        with a no keyword.
-        """
-        filtered = self.post1.comments.exclude()
+        PersonAuto.drop_collection()
+        SocialTest.drop_collection()
 
-        # Ensure everything was removed
-        self.assertListEqual(filtered, [])
+        p = PersonAuto(name="Alberto", salary=Decimal('7000.00'))
+        p.save()
 
-    def test_single_keyword_exclude(self):
-        """
-        Tests the exclude method of a List of Embedded Documents
-        with a single keyword.
-        """
-        excluded = self.post1.comments.exclude(author='user1')
+        s = SocialTest(group="dev", person=p)
+        s.save()
 
-        # Ensure only 1 entry was returned.
-        self.assertEqual(len(excluded), 1)
+        self.assertEqual(
+            SocialTest.objects._collection.find_one({'person.salary': 7000.00}), {
+                '_id': s.pk,
+                'group': s.group,
+                'person': {
+                    '_id': p.pk,
+                    'salary': 7000.00
+                }
+            })
 
-        # Ensure the entry returned is the correct entry.
-        self.assertEqual(excluded[0].author, 'user2')
+    def test_cached_reference_field_reference(self):
+        class Group(Document):
+            name = StringField()
 
-    def test_multi_keyword_exclude(self):
-        """
-        Tests the exclude method of a List of Embedded Documents
-        with multiple keywords.
-        """
-        excluded = self.post2.comments.exclude(
-            author='user3', message='message1'
-        )
+        class Person(Document):
+            name = StringField()
+            group = ReferenceField(Group)
 
-        # Ensure only 2 entries were returned.
-        self.assertEqual(len(excluded), 2)
+        class SocialData(Document):
+            obs = StringField()
+            tags = ListField(
+                StringField())
+            person = CachedReferenceField(
+                Person,
+                fields=('group',))
 
-        # Ensure the entries returned are the correct entries.
-        self.assertEqual(excluded[0].author, 'user2')
-        self.assertEqual(excluded[1].author, 'user2')
+        Group.drop_collection()
+        Person.drop_collection()
+        SocialData.drop_collection()
 
-    def test_non_matching_exclude(self):
-        """
-        Tests the exclude method of a List of Embedded Documents
-        when the keyword does not match any entries.
-        """
-        excluded = self.post2.comments.exclude(author='user4')
+        g1 = Group(name='dev')
+        g1.save()
 
-        # Ensure the 3 entries still exist.
-        self.assertEqual(len(excluded), 3)
+        g2 = Group(name="designers")
+        g2.save()
 
-    def test_unknown_keyword_exclude(self):
-        """
-        Tests the exclude method of a List of Embedded Documents
-        when the keyword is not a known keyword.
-        """
-        with self.assertRaises(AttributeError):
-            self.post2.comments.exclude(year=2)
+        p1 = Person(name="Alberto", group=g1)
+        p1.save()
 
-    def test_chained_filter_exclude(self):
-        """
-        Tests the exclude method after a filter method of a List of
-        Embedded Documents.
-        """
-        excluded = self.post2.comments.filter(author='user2').exclude(
-            message='message2'
-        )
+        p2 = Person(name="Andre", group=g1)
+        p2.save()
 
-        # Ensure only 1 entry was returned.
-        self.assertEqual(len(excluded), 1)
+        p3 = Person(name="Afro design", group=g2)
+        p3.save()
 
-        # Ensure the entry returned is the correct entry.
-        self.assertEqual(excluded[0].author, 'user2')
-        self.assertEqual(excluded[0].message, 'message3')
+        s1 = SocialData(obs="testing 123", person=p1, tags=['tag1', 'tag2'])
+        s1.save()
 
-    def test_count(self):
-        """
-        Tests the count method of a List of Embedded Documents.
-        """
-        self.assertEqual(self.post1.comments.count(), 2)
-        self.assertEqual(self.post1.comments.count(), len(self.post1.comments))
+        s2 = SocialData(obs="testing 321", person=p3, tags=['tag3', 'tag4'])
+        s2.save()
 
-    def test_filtered_count(self):
-        """
-        Tests the filter + count method of a List of Embedded Documents.
-        """
-        count = self.post1.comments.filter(author='user1').count()
-        self.assertEqual(count, 1)
+        self.assertEqual(SocialData.objects._collection.find_one(
+            {'tags': 'tag2'}), {
+                '_id': s1.pk,
+                'obs': 'testing 123',
+                'tags': ['tag1', 'tag2'],
+                'person': {
+                    '_id': p1.pk,
+                    'group': g1.pk
+                }
+        })
 
-    def test_single_keyword_get(self):
-        """
-        Tests the get method of a List of Embedded Documents using a
-        single keyword.
-        """
-        comment = self.post1.comments.get(author='user1')
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, 'user1')
+        self.assertEqual(SocialData.objects(person__group=g2).count(), 1)
+        self.assertEqual(SocialData.objects(person__group=g2).first(), s2)
 
-    def test_multi_keyword_get(self):
-        """
-        Tests the get method of a List of Embedded Documents using
-        multiple keywords.
-        """
-        comment = self.post2.comments.get(author='user2', message='message2')
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, 'user2')
-        self.assertEqual(comment.message, 'message2')
+    def test_cached_reference_field_update_all(self):
+        class Person(Document):
+            TYPES = (
+                ('pf', "PF"),
+                ('pj', "PJ")
+            )
+            name = StringField()
+            tp = StringField(
+                choices=TYPES
+            )
 
-    def test_no_keyword_multiple_return_get(self):
-        """
-        Tests the get method of a List of Embedded Documents without
-        a keyword to return multiple documents.
-        """
-        with self.assertRaises(MultipleObjectsReturned):
-            self.post1.comments.get()
+            father = CachedReferenceField('self', fields=('tp',))
 
-    def test_keyword_multiple_return_get(self):
-        """
-        Tests the get method of a List of Embedded Documents with a keyword
-        to return multiple documents.
-        """
-        with self.assertRaises(MultipleObjectsReturned):
-            self.post2.comments.get(author='user2')
+        Person.drop_collection()
 
-    def test_unknown_keyword_get(self):
-        """
-        Tests the get method of a List of Embedded Documents with an
-        unknown keyword.
-        """
-        with self.assertRaises(AttributeError):
-            self.post2.comments.get(year=2020)
+        a1 = Person(name="Wilson Father", tp="pj")
+        a1.save()
 
-    def test_no_result_get(self):
-        """
-        Tests the get method of a List of Embedded Documents where get
-        returns no results.
-        """
-        with self.assertRaises(DoesNotExist):
-            self.post1.comments.get(author='user3')
+        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
+        a2.save()
 
-    def test_first(self):
-        """
-        Tests the first method of a List of Embedded Documents to
-        ensure it returns the first comment.
-        """
-        comment = self.post1.comments.first()
+        self.assertEqual(dict(a2.to_mongo()), {
+            "_id": a2.pk,
+            "name": u"Wilson Junior",
+            "tp": u"pf",
+            "father": {
+                "_id": a1.pk,
+                "tp": u"pj"
+            }
+        })
 
-        # Ensure a Comment object was returned.
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment, self.post1.comments[0])
+        self.assertEqual(Person.objects(father=a1)._query, {
+            'father._id': a1.pk
+        })
+        self.assertEqual(Person.objects(father=a1).count(), 1)
 
-    def test_create(self):
-        """
-        Test the create method of a List of Embedded Documents.
-        """
-        comment = self.post1.comments.create(
-            author='user4', message='message1'
-        )
-        self.post1.save()
+        Person.objects.update(set__tp="pf")
+        Person.father.sync_all()
 
-        # Ensure the returned value is the comment object.
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, 'user4')
-        self.assertEqual(comment.message, 'message1')
+        a2.reload()
+        self.assertEqual(dict(a2.to_mongo()), {
+            "_id": a2.pk,
+            "name": u"Wilson Junior",
+            "tp": u"pf",
+            "father": {
+                "_id": a1.pk,
+                "tp": u"pf"
+            }
+        })
 
-        # Ensure the new comment was actually saved to the database.
-        self.assertIn(
-            comment,
-            self.BlogPost.objects(comments__author='user4')[0].comments
-        )
+    def test_cached_reference_fields_on_embedded_documents(self):
+        with self.assertRaises(InvalidDocumentError):
+            class Test(Document):
+                name = StringField()
 
-    def test_filtered_create(self):
-        """
-        Test the create method of a List of Embedded Documents chained
-        to a call to the filter method. Filtering should have no effect
-        on creation.
-        """
-        comment = self.post1.comments.filter(author='user1').create(
-            author='user4', message='message1'
-        )
-        self.post1.save()
+            type('WrongEmbeddedDocument', (
+                EmbeddedDocument,), {
+                    'test': CachedReferenceField(Test)
+            })
 
-        # Ensure the returned value is the comment object.
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, 'user4')
-        self.assertEqual(comment.message, 'message1')
+    def test_cached_reference_auto_sync(self):
+        class Person(Document):
+            TYPES = (
+                ('pf', "PF"),
+                ('pj', "PJ")
+            )
+            name = StringField()
+            tp = StringField(
+                choices=TYPES
+            )
 
-        # Ensure the new comment was actually saved to the database.
-        self.assertIn(
-            comment,
-            self.BlogPost.objects(comments__author='user4')[0].comments
-        )
+            father = CachedReferenceField('self', fields=('tp',))
 
-    def test_no_keyword_update(self):
-        """
-        Tests the update method of a List of Embedded Documents with
-        no keywords.
-        """
-        original = list(self.post1.comments)
-        number = self.post1.comments.update()
-        self.post1.save()
+        Person.drop_collection()
 
-        # Ensure that nothing was altered.
-        self.assertIn(
-            original[0],
-            self.BlogPost.objects(id=self.post1.id)[0].comments
-        )
+        a1 = Person(name="Wilson Father", tp="pj")
+        a1.save()
 
-        self.assertIn(
-            original[1],
-            self.BlogPost.objects(id=self.post1.id)[0].comments
-        )
+        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
+        a2.save()
 
-        # Ensure the method returned 0 as the number of entries
-        # modified
-        self.assertEqual(number, 0)
+        a1.tp = 'pf'
+        a1.save()
 
-    def test_single_keyword_update(self):
-        """
-        Tests the update method of a List of Embedded Documents with
-        a single keyword.
-        """
-        number = self.post1.comments.update(author='user4')
-        self.post1.save()
+        a2.reload()
+        self.assertEqual(dict(a2.to_mongo()), {
+            '_id': a2.pk,
+            'name': 'Wilson Junior',
+            'tp': 'pf',
+            'father': {
+                '_id': a1.pk,
+                'tp': 'pf'
+            }
+        })
 
-        comments = self.BlogPost.objects(id=self.post1.id)[0].comments
+    def test_cached_reference_auto_sync_disabled(self):
+        class Persone(Document):
+            TYPES = (
+                ('pf', "PF"),
+                ('pj', "PJ")
+            )
+            name = StringField()
+            tp = StringField(
+                choices=TYPES
+            )
 
-        # Ensure that the database was updated properly.
-        self.assertEqual(comments[0].author, 'user4')
-        self.assertEqual(comments[1].author, 'user4')
+            father = CachedReferenceField(
+                'self', fields=('tp',), auto_sync=False)
 
-        # Ensure the method returned 2 as the number of entries
-        # modified
-        self.assertEqual(number, 2)
+        Persone.drop_collection()
 
-    def test_unicode(self):
-        """
-        Tests that unicode strings handled correctly
-        """
-        post = self.BlogPost(comments=[
-            self.Comments(author='user1', message=u'сообщение'),
-            self.Comments(author='user2', message=u'хабарлама')
-        ]).save()
-        self.assertEqual(post.comments.get(message=u'сообщение').author,
-                         'user1')
+        a1 = Persone(name="Wilson Father", tp="pj")
+        a1.save()
 
-    def test_save(self):
-        """
-        Tests the save method of a List of Embedded Documents.
-        """
-        comments = self.post1.comments
-        new_comment = self.Comments(author='user4')
-        comments.append(new_comment)
-        comments.save()
+        a2 = Persone(name='Wilson Junior', tp='pf', father=a1)
+        a2.save()
 
-        # Ensure that the new comment has been added to the database.
-        self.assertIn(
-            new_comment,
-            self.BlogPost.objects(id=self.post1.id)[0].comments
-        )
+        a1.tp = 'pf'
+        a1.save()
 
-    def test_delete(self):
-        """
-        Tests the delete method of a List of Embedded Documents.
-        """
-        number = self.post1.comments.delete()
-        self.post1.save()
+        self.assertEqual(Persone.objects._collection.find_one({'_id': a2.pk}), {
+            '_id': a2.pk,
+            'name': 'Wilson Junior',
+            'tp': 'pf',
+            'father': {
+                '_id': a1.pk,
+                'tp': 'pj'
+            }
+        })
 
-        # Ensure that all the comments under post1 were deleted in the
-        # database.
-        self.assertListEqual(
-            self.BlogPost.objects(id=self.post1.id)[0].comments, []
-        )
+    def test_cached_reference_embedded_fields(self):
+        class Owner(EmbeddedDocument):
+            TPS = (
+                ('n', "Normal"),
+                ('u', "Urgent")
+            )
+            name = StringField()
+            tp = StringField(
+                verbose_name="Type",
+                db_field="t",
+                choices=TPS)
 
-        # Ensure that post1 comments were deleted from the list.
-        self.assertListEqual(self.post1.comments, [])
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
 
-        # Ensure that comments still returned a EmbeddedDocumentList object.
-        self.assertIsInstance(self.post1.comments, EmbeddedDocumentList)
+            owner = EmbeddedDocumentField(Owner)
 
-        # Ensure that the delete method returned 2 as the number of entries
-        # deleted from the database
-        self.assertEqual(number, 2)
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(
+                Animal, fields=['tag', 'owner.tp'])
 
-    def test_empty_list_embedded_documents_with_unique_field(self):
-        """
-        Tests that only one document with an empty list of embedded documents
-        that have a unique field can be saved, but if the unique field is
-        also sparse than multiple documents with an empty list can be saved.
-        """
-        class EmbeddedWithUnique(EmbeddedDocument):
-            number = IntField(unique=True)
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
 
-        class A(Document):
-            my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))
+        a = Animal(name="Leopard", tag="heavy",
+                   owner=Owner(tp='u', name="Wilson Júnior")
+                   )
+        a.save()
 
-        A(my_list=[]).save()
-        with self.assertRaises(NotUniqueError):
-            A(my_list=[]).save()
+        o = Ocorrence(person="teste", animal=a)
+        o.save()
+        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tp'])), {
+            '_id': a.pk,
+            'tag': 'heavy',
+            'owner': {
+                't': 'u'
+            }
+        })
+        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
+        self.assertEqual(o.to_mongo()['animal']['owner']['t'], 'u')
 
-        class EmbeddedWithSparseUnique(EmbeddedDocument):
-            number = IntField(unique=True, sparse=True)
+        # counts
+        Ocorrence(person="teste 2").save()
+        Ocorrence(person="teste 3").save()
 
-        class B(Document):
-            my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique))
+        count = Ocorrence.objects(
+            animal__tag='heavy', animal__owner__tp='u').count()
+        self.assertEqual(count, 1)
 
-        A.drop_collection()
-        B.drop_collection()
+        ocorrence = Ocorrence.objects(
+            animal__tag='heavy',
+            animal__owner__tp='u').first()
+        self.assertEqual(ocorrence.person, "teste")
+        self.assertTrue(isinstance(ocorrence.animal, Animal))
 
-        B(my_list=[]).save()
-        B(my_list=[]).save()
+    def test_cached_reference_embedded_list_fields(self):
+        class Owner(EmbeddedDocument):
+            name = StringField()
+            tags = ListField(StringField())
 
-    def test_filtered_delete(self):
-        """
-        Tests the delete method of a List of Embedded Documents
-        after the filter method has been called.
-        """
-        comment = self.post1.comments[1]
-        number = self.post1.comments.filter(author='user2').delete()
-        self.post1.save()
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
 
-        # Ensure that only the user2 comment was deleted.
-        self.assertNotIn(
-            comment, self.BlogPost.objects(id=self.post1.id)[0].comments
-        )
-        self.assertEqual(
-            len(self.BlogPost.objects(id=self.post1.id)[0].comments), 1
-        )
+            owner = EmbeddedDocumentField(Owner)
 
-        # Ensure that the user2 comment no longer exists in the list.
-        self.assertNotIn(comment, self.post1.comments)
-        self.assertEqual(len(self.post1.comments), 1)
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(
+                Animal, fields=['tag', 'owner.tags'])
 
-        # Ensure that the delete method returned 1 as the number of entries
-        # deleted from the database
-        self.assertEqual(number, 1)
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
 
-    def test_custom_data(self):
-        """
-        Tests that custom data is saved in the field object
-        and doesn't interfere with the rest of field functionalities.
-        """
-        custom_data = {'a': 'a_value', 'b': [1, 2]}
+        a = Animal(name="Leopard", tag="heavy",
+                   owner=Owner(tags=['cool', 'funny'],
+                               name="Wilson Júnior")
+                   )
+        a.save()
 
-        class CustomData(Document):
-            a_field = IntField()
-            c_field = IntField(custom_data=custom_data)
+        o = Ocorrence(person="teste 2", animal=a)
+        o.save()
+        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tags'])), {
+            '_id': a.pk,
+            'tag': 'heavy',
+            'owner': {
+                'tags': ['cool', 'funny']
+            }
+        })
 
-        CustomData.drop_collection()
+        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
+        self.assertEqual(o.to_mongo()['animal']['owner']['tags'],
+                         ['cool', 'funny'])
 
-        a1 = CustomData(a_field=1, c_field=2).save()
-        self.assertEqual(2, a1.c_field)
-        self.assertFalse(hasattr(a1.c_field, 'custom_data'))
-        self.assertTrue(hasattr(CustomData.c_field, 'custom_data'))
-        self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
+        # counts
+        Ocorrence(person="teste 2").save()
+        Ocorrence(person="teste 3").save()
+
+        query = Ocorrence.objects(
+            animal__tag='heavy', animal__owner__tags='cool')._query
+        self.assertEqual(
+            query, {'animal.owner.tags': 'cool', 'animal.tag': 'heavy'})
+
+        ocorrence = Ocorrence.objects(
+            animal__tag='heavy',
+            animal__owner__tags='cool').first()
+        self.assertEqual(ocorrence.person, "teste 2")
+        self.assertTrue(isinstance(ocorrence.animal, Animal))
 
 
 if __name__ == '__main__':

From 30e8b8186f0ee84f186bc60982bd7e703e1e657d Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Thu, 2 Mar 2017 00:25:56 -0500
Subject: [PATCH 0472/1519] clean up document instance tests

---
 tests/document/instance.py | 260 +++++++++++++------------------------
 1 file changed, 91 insertions(+), 169 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 9b52c809a..78d326fc6 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -28,8 +28,6 @@
 __all__ = ("InstanceTest",)
 
 
-
-
 class InstanceTest(unittest.TestCase):
 
     def setUp(self):
@@ -72,8 +70,7 @@ def assertHasInstance(self, field, instance):
             self.assertEqual(field._instance, instance)
 
     def test_capped_collection(self):
-        """Ensure that capped collections work properly.
-        """
+        """Ensure that capped collections work properly."""
         class Log(Document):
             date = DateTimeField(default=datetime.now)
             meta = {
@@ -181,8 +178,7 @@ def __unicode__(self):
         self.assertEqual('<Article: привет мир>', repr(doc))
 
     def test_repr_none(self):
-        """Ensure None values handled correctly
-        """
+        """Ensure None values are handled correctly."""
         class Article(Document):
             title = StringField()
 
@@ -190,25 +186,23 @@ def __str__(self):
                 return None
 
         doc = Article(title=u'привет мир')
-
         self.assertEqual('<Article: None>', repr(doc))
 
     def test_queryset_resurrects_dropped_collection(self):
         self.Person.drop_collection()
-
         self.assertEqual([], list(self.Person.objects()))
 
+        # Ensure works correctly with inhertited classes
         class Actor(self.Person):
             pass
 
-        # Ensure works correctly with inhertited classes
         Actor.objects()
         self.Person.drop_collection()
         self.assertEqual([], list(Actor.objects()))
 
     def test_polymorphic_references(self):
-        """Ensure that the correct subclasses are returned from a query when
-        using references / generic references
+        """Ensure that the correct subclasses are returned from a query
+        when using references / generic references
         """
         class Animal(Document):
             meta = {'allow_inheritance': True}
@@ -258,9 +252,6 @@ class Zoo(Document):
         classes = [a.__class__ for a in Zoo.objects.first().animals]
         self.assertEqual(classes, [Animal, Fish, Mammal, Dog, Human])
 
-        Zoo.drop_collection()
-        Animal.drop_collection()
-
     def test_reference_inheritance(self):
         class Stats(Document):
             created = DateTimeField(default=datetime.now)
@@ -287,8 +278,7 @@ class CompareStats(Document):
         self.assertEqual(list_stats, CompareStats.objects.first().stats)
 
     def test_db_field_load(self):
-        """Ensure we load data correctly
-        """
+        """Ensure we load data correctly from the right db field."""
         class Person(Document):
             name = StringField(required=True)
             _rank = StringField(required=False, db_field="rank")
@@ -307,8 +297,7 @@ def rank(self):
         self.assertEqual(Person.objects.get(name="Fred").rank, "Private")
 
     def test_db_embedded_doc_field_load(self):
-        """Ensure we load embedded document data correctly
-        """
+        """Ensure we load embedded document data correctly."""
         class Rank(EmbeddedDocument):
             title = StringField(required=True)
 
@@ -333,8 +322,7 @@ def rank(self):
         self.assertEqual(Person.objects.get(name="Fred").rank, "Private")
 
     def test_custom_id_field(self):
-        """Ensure that documents may be created with custom primary keys.
-        """
+        """Ensure that documents may be created with custom primary keys."""
         class User(Document):
             username = StringField(primary_key=True)
             name = StringField()
@@ -382,10 +370,7 @@ class EmailUser(User):
         self.assertEqual(user_son['_id'], 'mongo')
         self.assertTrue('username' not in user_son['_id'])
 
-        User.drop_collection()
-
     def test_document_not_registered(self):
-
         class Place(Document):
             name = StringField()
 
@@ -407,7 +392,6 @@ class NicePlace(Place):
             list(Place.objects.all())
 
     def test_document_registry_regressions(self):
-
         class Location(Document):
             name = StringField()
             meta = {'allow_inheritance': True}
@@ -421,18 +405,16 @@ class Area(Location):
         self.assertEqual(Area, get_document("Location.Area"))
 
     def test_creation(self):
-        """Ensure that document may be created using keyword arguments.
-        """
+        """Ensure that document may be created using keyword arguments."""
         person = self.Person(name="Test User", age=30)
         self.assertEqual(person.name, "Test User")
         self.assertEqual(person.age, 30)
 
     def test_to_dbref(self):
-        """Ensure that you can get a dbref of a document"""
+        """Ensure that you can get a dbref of a document."""
         person = self.Person(name="Test User", age=30)
         self.assertRaises(OperationError, person.to_dbref)
         person.save()
-
         person.to_dbref()
 
     def test_save_abstract_document(self):
@@ -445,8 +427,7 @@ class Doc(Document):
             Doc(name='aaa').save()
 
     def test_reload(self):
-        """Ensure that attributes may be reloaded.
-        """
+        """Ensure that attributes may be reloaded."""
         person = self.Person(name="Test User", age=20)
         person.save()
 
@@ -479,7 +460,6 @@ class Animal(Document):
         doc = Animal(superphylum='Deuterostomia')
         doc.save()
         doc.reload()
-        Animal.drop_collection()
 
     def test_reload_sharded_nested(self):
         class SuperPhylum(EmbeddedDocument):
@@ -493,11 +473,9 @@ class Animal(Document):
         doc = Animal(superphylum=SuperPhylum(name='Deuterostomia'))
         doc.save()
         doc.reload()
-        Animal.drop_collection()
 
     def test_reload_referencing(self):
-        """Ensures reloading updates weakrefs correctly
-        """
+        """Ensures reloading updates weakrefs correctly."""
         class Embedded(EmbeddedDocument):
             dict_field = DictField()
             list_field = ListField()
@@ -569,8 +547,7 @@ class Foo(Document):
             self.assertFalse("Threw wrong exception")
 
     def test_reload_of_non_strict_with_special_field_name(self):
-        """Ensures reloading works for documents with meta strict == False
-        """
+        """Ensures reloading works for documents with meta strict == False."""
         class Post(Document):
             meta = {
                 'strict': False
@@ -591,8 +568,7 @@ class Post(Document):
         self.assertEqual(post.items, ["more lorem", "even more ipsum"])
 
     def test_dictionary_access(self):
-        """Ensure that dictionary-style field access works properly.
-        """
+        """Ensure that dictionary-style field access works properly."""
         person = self.Person(name='Test User', age=30, job=self.Job())
         self.assertEqual(person['name'], 'Test User')
 
@@ -634,8 +610,7 @@ class SubDoc(EmbeddedDocument):
         self.assertEqual(sub_doc.to_mongo().keys(), ['id'])
 
     def test_embedded_document(self):
-        """Ensure that embedded documents are set up correctly.
-        """
+        """Ensure that embedded documents are set up correctly."""
         class Comment(EmbeddedDocument):
             content = StringField()
 
@@ -643,8 +618,7 @@ class Comment(EmbeddedDocument):
         self.assertFalse('id' in Comment._fields)
 
     def test_embedded_document_instance(self):
-        """Ensure that embedded documents can reference parent instance
-        """
+        """Ensure that embedded documents can reference parent instance."""
         class Embedded(EmbeddedDocument):
             string = StringField()
 
@@ -652,6 +626,7 @@ class Doc(Document):
             embedded_field = EmbeddedDocumentField(Embedded)
 
         Doc.drop_collection()
+
         doc = Doc(embedded_field=Embedded(string="Hi"))
         self.assertHasInstance(doc.embedded_field, doc)
 
@@ -661,7 +636,8 @@ class Doc(Document):
 
     def test_embedded_document_complex_instance(self):
         """Ensure that embedded documents in complex fields can reference
-        parent instance"""
+        parent instance.
+        """
         class Embedded(EmbeddedDocument):
             string = StringField()
 
@@ -677,8 +653,7 @@ class Doc(Document):
         self.assertHasInstance(doc.embedded_field[0], doc)
 
     def test_embedded_document_complex_instance_no_use_db_field(self):
-        """Ensure that use_db_field is propagated to list of Emb Docs
-        """
+        """Ensure that use_db_field is propagated to list of Emb Docs."""
         class Embedded(EmbeddedDocument):
             string = StringField(db_field='s')
 
@@ -690,7 +665,6 @@ class Doc(Document):
         self.assertEqual(d['embedded_field'], [{'string': 'Hi'}])
 
     def test_instance_is_set_on_setattr(self):
-
         class Email(EmbeddedDocument):
             email = EmailField()
 
@@ -698,6 +672,7 @@ class Account(Document):
             email = EmbeddedDocumentField(Email)
 
         Account.drop_collection()
+
         acc = Account()
         acc.email = Email(email='test@example.com')
         self.assertHasInstance(acc._data["email"], acc)
@@ -707,7 +682,6 @@ class Account(Document):
         self.assertHasInstance(acc1._data["email"], acc1)
 
     def test_instance_is_set_on_setattr_on_embedded_document_list(self):
-
         class Email(EmbeddedDocument):
             email = EmailField()
 
@@ -853,32 +827,28 @@ def test_modify_update(self):
         self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
 
     def test_save(self):
-        """Ensure that a document may be saved in the database.
-        """
+        """Ensure that a document may be saved in the database."""
+
         # Create person object and save it to the database
         person = self.Person(name='Test User', age=30)
         person.save()
+
         # Ensure that the object is in the database
         collection = self.db[self.Person._get_collection_name()]
         person_obj = collection.find_one({'name': 'Test User'})
         self.assertEqual(person_obj['name'], 'Test User')
         self.assertEqual(person_obj['age'], 30)
         self.assertEqual(person_obj['_id'], person.id)
-        # Test skipping validation on save
 
+        # Test skipping validation on save
         class Recipient(Document):
             email = EmailField(required=True)
 
         recipient = Recipient(email='root@localhost')
         self.assertRaises(ValidationError, recipient.save)
-
-        try:
-            recipient.save(validate=False)
-        except ValidationError:
-            self.fail()
+        recipient.save(validate=False)
 
     def test_save_to_a_value_that_equates_to_false(self):
-
         class Thing(EmbeddedDocument):
             count = IntField()
 
@@ -898,7 +868,6 @@ class User(Document):
         self.assertEqual(user.thing.count, 0)
 
     def test_save_max_recursion_not_hit(self):
-
         class Person(Document):
             name = StringField()
             parent = ReferenceField('self')
@@ -924,7 +893,6 @@ class Person(Document):
         p0.save()
 
     def test_save_max_recursion_not_hit_with_file_field(self):
-
         class Foo(Document):
             name = StringField()
             picture = FileField()
@@ -948,7 +916,6 @@ class Foo(Document):
             self.assertEqual(b.picture, b.bar.picture, b.bar.bar.picture)
 
     def test_save_cascades(self):
-
         class Person(Document):
             name = StringField()
             parent = ReferenceField('self')
@@ -971,7 +938,6 @@ class Person(Document):
         self.assertEqual(p1.name, p.parent.name)
 
     def test_save_cascade_kwargs(self):
-
         class Person(Document):
             name = StringField()
             parent = ReferenceField('self')
@@ -992,7 +958,6 @@ class Person(Document):
         self.assertEqual(p1.name, p2.parent.name)
 
     def test_save_cascade_meta_false(self):
-
         class Person(Document):
             name = StringField()
             parent = ReferenceField('self')
@@ -1021,7 +986,6 @@ class Person(Document):
         self.assertEqual(p1.name, p.parent.name)
 
     def test_save_cascade_meta_true(self):
-
         class Person(Document):
             name = StringField()
             parent = ReferenceField('self')
@@ -1046,7 +1010,6 @@ class Person(Document):
         self.assertNotEqual(p1.name, p.parent.name)
 
     def test_save_cascades_generically(self):
-
         class Person(Document):
             name = StringField()
             parent = GenericReferenceField()
@@ -1072,7 +1035,6 @@ class Person(Document):
         self.assertEqual(p1.name, p.parent.name)
 
     def test_save_atomicity_condition(self):
-
         class Widget(Document):
             toggle = BooleanField(default=False)
             count = IntField(default=0)
@@ -1150,7 +1112,8 @@ def UUID(i):
 
     def test_update(self):
         """Ensure that an existing document is updated instead of be
-        overwritten."""
+        overwritten.
+        """
         # Create person object and save it to the database
         person = self.Person(name='Test User', age=30)
         person.save()
@@ -1254,7 +1217,6 @@ def test_inserts_if_you_set_the_pk(self):
         self.assertEqual(2, self.Person.objects.count())
 
     def test_can_save_if_not_included(self):
-
         class EmbeddedDoc(EmbeddedDocument):
             pass
 
@@ -1341,10 +1303,7 @@ class Doc(Document):
             doc2.update(set__name=doc1.name)
 
     def test_embedded_update(self):
-        """
-        Test update on `EmbeddedDocumentField` fields
-        """
-
+        """Test update on `EmbeddedDocumentField` fields."""
         class Page(EmbeddedDocument):
             log_message = StringField(verbose_name="Log message",
                                       required=True)
@@ -1365,11 +1324,9 @@ class Site(Document):
         self.assertEqual(site.page.log_message, "Error: Dummy message")
 
     def test_embedded_update_db_field(self):
+        """Test update on `EmbeddedDocumentField` fields when db_field
+        is other than default.
         """
-        Test update on `EmbeddedDocumentField` fields when db_field is other
-        than default.
-        """
-
         class Page(EmbeddedDocument):
             log_message = StringField(verbose_name="Log message",
                                       db_field="page_log_message",
@@ -1392,9 +1349,7 @@ class Site(Document):
         self.assertEqual(site.page.log_message, "Error: Dummy message")
 
     def test_save_only_changed_fields(self):
-        """Ensure save only sets / unsets changed fields
-        """
-
+        """Ensure save only sets / unsets changed fields."""
         class User(self.Person):
             active = BooleanField(default=True)
 
@@ -1514,8 +1469,8 @@ class UserSubscription(Document):
             self.assertEqual(q, 3)
 
     def test_set_unset_one_operation(self):
-        """Ensure that $set and $unset actions are performed in the same
-        operation.
+        """Ensure that $set and $unset actions are performed in the
+        same operation.
         """
         class FooBar(Document):
             foo = StringField(default=None)
@@ -1536,9 +1491,7 @@ class FooBar(Document):
             self.assertEqual(1, q)
 
     def test_save_only_changed_fields_recursive(self):
-        """Ensure save only sets / unsets changed fields
-        """
-
+        """Ensure save only sets / unsets changed fields."""
         class Comment(EmbeddedDocument):
             published = BooleanField(default=True)
 
@@ -1578,8 +1531,7 @@ class User(self.Person):
         self.assertFalse(person.comments_dict['first_post'].published)
 
     def test_delete(self):
-        """Ensure that document may be deleted using the delete method.
-        """
+        """Ensure that document may be deleted using the delete method."""
         person = self.Person(name="Test User", age=30)
         person.save()
         self.assertEqual(self.Person.objects.count(), 1)
@@ -1587,33 +1539,34 @@ def test_delete(self):
         self.assertEqual(self.Person.objects.count(), 0)
 
     def test_save_custom_id(self):
-        """Ensure that a document may be saved with a custom _id.
-        """
+        """Ensure that a document may be saved with a custom _id."""
+
         # Create person object and save it to the database
         person = self.Person(name='Test User', age=30,
                              id='497ce96f395f2f052a494fd4')
         person.save()
+
         # Ensure that the object is in the database with the correct _id
         collection = self.db[self.Person._get_collection_name()]
         person_obj = collection.find_one({'name': 'Test User'})
         self.assertEqual(str(person_obj['_id']), '497ce96f395f2f052a494fd4')
 
     def test_save_custom_pk(self):
-        """
-        Ensure that a document may be saved with a custom _id using pk alias.
+        """Ensure that a document may be saved with a custom _id using
+        pk alias.
         """
         # Create person object and save it to the database
         person = self.Person(name='Test User', age=30,
                              pk='497ce96f395f2f052a494fd4')
         person.save()
+
         # Ensure that the object is in the database with the correct _id
         collection = self.db[self.Person._get_collection_name()]
         person_obj = collection.find_one({'name': 'Test User'})
         self.assertEqual(str(person_obj['_id']), '497ce96f395f2f052a494fd4')
 
     def test_save_list(self):
-        """Ensure that a list field may be properly saved.
-        """
+        """Ensure that a list field may be properly saved."""
         class Comment(EmbeddedDocument):
             content = StringField()
 
@@ -1636,8 +1589,6 @@ class BlogPost(Document):
         for comment_obj, comment in zip(post_obj['comments'], comments):
             self.assertEqual(comment_obj['content'], comment['content'])
 
-        BlogPost.drop_collection()
-
     def test_list_search_by_embedded(self):
         class User(Document):
             username = StringField(required=True)
@@ -1697,8 +1648,8 @@ class Page(Document):
             list(Page.objects.filter(comments__user=u3)))
 
     def test_save_embedded_document(self):
-        """Ensure that a document with an embedded document field may be
-        saved in the database.
+        """Ensure that a document with an embedded document field may
+        be saved in the database.
         """
         class EmployeeDetails(EmbeddedDocument):
             position = StringField()
@@ -1717,13 +1668,13 @@ class Employee(self.Person):
         employee_obj = collection.find_one({'name': 'Test Employee'})
         self.assertEqual(employee_obj['name'], 'Test Employee')
         self.assertEqual(employee_obj['age'], 50)
+
         # Ensure that the 'details' embedded object saved correctly
         self.assertEqual(employee_obj['details']['position'], 'Developer')
 
     def test_embedded_update_after_save(self):
-        """
-        Test update of `EmbeddedDocumentField` attached to a newly saved
-        document.
+        """Test update of `EmbeddedDocumentField` attached to a newly
+        saved document.
         """
         class Page(EmbeddedDocument):
             log_message = StringField(verbose_name="Log message",
@@ -1744,8 +1695,8 @@ class Site(Document):
         self.assertEqual(site.page.log_message, "Error: Dummy message")
 
     def test_updating_an_embedded_document(self):
-        """Ensure that a document with an embedded document field may be
-        saved in the database.
+        """Ensure that a document with an embedded document field may
+        be saved in the database.
         """
         class EmployeeDetails(EmbeddedDocument):
             position = StringField()
@@ -1780,7 +1731,6 @@ class Employee(self.Person):
         self.assertEqual(promoted_employee.details, None)
 
     def test_object_mixins(self):
-
         class NameMixin(object):
             name = StringField()
 
@@ -1819,9 +1769,9 @@ class TestDoc(Document, DoubleMixIn):
         self.assertEqual(t.count, 12)
 
     def test_save_reference(self):
-        """Ensure that a document reference field may be saved in the database.
+        """Ensure that a document reference field may be saved in the
+        database.
         """
-
         class BlogPost(Document):
             meta = {'collection': 'blogpost_1'}
             content = StringField()
@@ -1852,8 +1802,6 @@ class BlogPost(Document):
         author = list(self.Person.objects(name='Test User'))[-1]
         self.assertEqual(author.age, 25)
 
-        BlogPost.drop_collection()
-
     def test_duplicate_db_fields_raise_invalid_document_error(self):
         """Ensure a InvalidDocumentError is thrown if duplicate fields
         declare the same db_field.
@@ -1864,7 +1812,7 @@ class Foo(Document):
                 name2 = StringField(db_field='name')
 
     def test_invalid_son(self):
-        """Raise an error if loading invalid data"""
+        """Raise an error if loading invalid data."""
         class Occurrence(EmbeddedDocument):
             number = IntField()
 
@@ -1887,9 +1835,9 @@ class Word(Document):
             Word._from_son('this is not a valid SON dict')
 
     def test_reverse_delete_rule_cascade_and_nullify(self):
-        """Ensure that a referenced document is also deleted upon deletion.
+        """Ensure that a referenced document is also deleted upon
+        deletion.
         """
-
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)
@@ -1944,7 +1892,8 @@ class Book(Document):
         self.assertEqual(Book.objects.count(), 0)
 
     def test_reverse_delete_rule_with_shared_id_among_collections(self):
-        """Ensure that cascade delete rule doesn't mix id among collections.
+        """Ensure that cascade delete rule doesn't mix id among
+        collections.
         """
         class User(Document):
             id = IntField(primary_key=True)
@@ -1975,10 +1924,9 @@ class Book(Document):
         self.assertEqual(Book.objects.get(), book_2)
 
     def test_reverse_delete_rule_with_document_inheritance(self):
-        """Ensure that a referenced document is also deleted upon deletion
-        of a child document.
+        """Ensure that a referenced document is also deleted upon
+        deletion of a child document.
         """
-
         class Writer(self.Person):
             pass
 
@@ -2010,10 +1958,9 @@ class BlogPost(Document):
         self.assertEqual(BlogPost.objects.count(), 0)
 
     def test_reverse_delete_rule_cascade_and_nullify_complex_field(self):
-        """Ensure that a referenced document is also deleted upon deletion for
-        complex fields.
+        """Ensure that a referenced document is also deleted upon
+        deletion for complex fields.
         """
-
         class BlogPost(Document):
             content = StringField()
             authors = ListField(ReferenceField(
@@ -2022,7 +1969,6 @@ class BlogPost(Document):
                 self.Person, reverse_delete_rule=NULLIFY))
 
         self.Person.drop_collection()
-
         BlogPost.drop_collection()
 
         author = self.Person(name='Test User')
@@ -2046,10 +1992,10 @@ class BlogPost(Document):
         self.assertEqual(BlogPost.objects.count(), 0)
 
     def test_reverse_delete_rule_cascade_triggers_pre_delete_signal(self):
-        """ ensure the pre_delete signal is triggered upon a cascading deletion
-        setup a blog post with content, an author and editor
-        delete the author which triggers deletion of blogpost via cascade
-        blog post's pre_delete signal alters an editor attribute
+        """Ensure the pre_delete signal is triggered upon a cascading
+        deletion setup a blog post with content, an author and editor
+        delete the author which triggers deletion of blogpost via
+        cascade blog post's pre_delete signal alters an editor attribute.
         """
         class Editor(self.Person):
             review_queue = IntField(default=0)
@@ -2077,6 +2023,7 @@ def pre_delete(cls, sender, document, **kwargs):
 
         # delete the author, the post is also deleted due to the CASCADE rule
         author.delete()
+
         # the pre-delete signal should have decremented the editor's queue
         editor = Editor.objects(name='Max P.').get()
         self.assertEqual(editor.review_queue, 0)
@@ -2085,7 +2032,6 @@ def test_two_way_reverse_delete_rule(self):
         """Ensure that Bi-Directional relationships work with
         reverse_delete_rule
         """
-
         class Bar(Document):
             content = StringField()
             foo = ReferenceField('Foo')
@@ -2131,8 +2077,8 @@ class Parents(EmbeddedDocument):
                 mother = ReferenceField('Person', reverse_delete_rule=DENY)
 
     def test_reverse_delete_rule_cascade_recurs(self):
-        """Ensure that a chain of documents is also deleted upon cascaded
-        deletion.
+        """Ensure that a chain of documents is also deleted upon
+        cascaded deletion.
         """
         class BlogPost(Document):
             content = StringField()
@@ -2162,15 +2108,10 @@ class Comment(Document):
         author.delete()
         self.assertEqual(Comment.objects.count(), 0)
 
-        self.Person.drop_collection()
-        BlogPost.drop_collection()
-        Comment.drop_collection()
-
     def test_reverse_delete_rule_deny(self):
-        """Ensure that a document cannot be referenced if there are still
-        documents referring to it.
+        """Ensure that a document cannot be referenced if there are
+        still documents referring to it.
         """
-
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, reverse_delete_rule=DENY)
@@ -2198,11 +2139,7 @@ class BlogPost(Document):
         author.delete()
         self.assertEqual(self.Person.objects.count(), 1)
 
-        self.Person.drop_collection()
-        BlogPost.drop_collection()
-
     def subclasses_and_unique_keys_works(self):
-
         class A(Document):
             pass
 
@@ -2218,12 +2155,9 @@ class B(A):
 
         self.assertEqual(A.objects.count(), 2)
         self.assertEqual(B.objects.count(), 1)
-        A.drop_collection()
-        B.drop_collection()
 
     def test_document_hash(self):
-        """Test document in list, dict, set
-        """
+        """Test document in list, dict, set."""
         class User(Document):
             pass
 
@@ -2266,11 +2200,9 @@ class BlogPost(Document):
 
         # in Set
         all_user_set = set(User.objects.all())
-
         self.assertTrue(u1 in all_user_set)
 
     def test_picklable(self):
-
         pickle_doc = PickleTest(number=1, string="One", lists=['1', '2'])
         pickle_doc.embedded = PickleEmbedded()
         pickled_doc = pickle.dumps(pickle_doc)  # make sure pickling works even before the doc is saved
@@ -2296,7 +2228,6 @@ def test_picklable(self):
         self.assertEqual(pickle_doc.lists, ["1", "2", "3"])
 
     def test_regular_document_pickle(self):
-
         pickle_doc = PickleTest(number=1, string="One", lists=['1', '2'])
         pickled_doc = pickle.dumps(pickle_doc)  # make sure pickling works even before the doc is saved
         pickle_doc.save()
@@ -2319,7 +2250,6 @@ def test_regular_document_pickle(self):
         fixtures.PickleTest = PickleTest
 
     def test_dynamic_document_pickle(self):
-
         pickle_doc = PickleDynamicTest(
             name="test", number=1, string="One", lists=['1', '2'])
         pickle_doc.embedded = PickleDynamicEmbedded(foo="Bar")
@@ -2358,7 +2288,6 @@ class Blog(Document):
                 validate = DictField()
 
     def test_mutating_documents(self):
-
         class B(EmbeddedDocument):
             field1 = StringField(default='field1')
 
@@ -2366,6 +2295,7 @@ class A(Document):
             b = EmbeddedDocumentField(B, default=lambda: B())
 
         A.drop_collection()
+
         a = A()
         a.save()
         a.reload()
@@ -2389,12 +2319,13 @@ class A(Document):
         self.assertEqual(a.b.field2.c_field, 'new value')
 
     def test_can_save_false_values(self):
-        """Ensures you can save False values on save"""
+        """Ensures you can save False values on save."""
         class Doc(Document):
             foo = StringField()
             archived = BooleanField(default=False, required=True)
 
         Doc.drop_collection()
+
         d = Doc()
         d.save()
         d.archived = False
@@ -2403,11 +2334,12 @@ class Doc(Document):
         self.assertEqual(Doc.objects(archived=False).count(), 1)
 
     def test_can_save_false_values_dynamic(self):
-        """Ensures you can save False values on dynamic docs"""
+        """Ensures you can save False values on dynamic docs."""
         class Doc(DynamicDocument):
             foo = StringField()
 
         Doc.drop_collection()
+
         d = Doc()
         d.save()
         d.archived = False
@@ -2447,7 +2379,7 @@ def fake_update(*args, **kwargs):
             Collection.update = orig_update
 
     def test_db_alias_tests(self):
-        """ DB Alias tests """
+        """DB Alias tests."""
         # mongoenginetest - Is default connection alias from setUp()
         # Register Aliases
         register_connection('testdb-1', 'mongoenginetest2')
@@ -2509,8 +2441,7 @@ class AuthorBooks(Document):
             get_db("testdb-3")[AuthorBooks._get_collection_name()])
 
     def test_db_alias_overrides(self):
-        """db_alias can be overriden
-        """
+        """Test db_alias can be overriden."""
         # Register a connection with db_alias testdb-2
         register_connection('testdb-2', 'mongoenginetest2')
 
@@ -2534,8 +2465,7 @@ class B(A):
                          B._get_collection().database.name)
 
     def test_db_alias_propagates(self):
-        """db_alias propagates?
-        """
+        """db_alias propagates?"""
         register_connection('testdb-1', 'mongoenginetest2')
 
         class A(Document):
@@ -2548,8 +2478,7 @@ class B(A):
         self.assertEqual('testdb-1', B._meta.get('db_alias'))
 
     def test_db_ref_usage(self):
-        """ DB Ref usage  in dict_fields"""
-
+        """DB Ref usage in dict_fields."""
         class User(Document):
             name = StringField()
 
@@ -2784,7 +2713,6 @@ class User(Document):
         self.assertEqual(user.thing._data['data'], [1, 2, 3])
 
     def test_spaces_in_keys(self):
-
         class Embedded(DynamicEmbeddedDocument):
             pass
 
@@ -2873,7 +2801,6 @@ class LogEntry(Document):
             log.machine = "127.0.0.1"
 
     def test_kwargs_simple(self):
-
         class Embedded(EmbeddedDocument):
             name = StringField()
 
@@ -2893,7 +2820,6 @@ def __eq__(self, other):
         self.assertEqual(classic_doc._data, dict_doc._data)
 
     def test_kwargs_complex(self):
-
         class Embedded(EmbeddedDocument):
             name = StringField()
 
@@ -2916,36 +2842,35 @@ def __eq__(self, other):
         self.assertEqual(classic_doc._data, dict_doc._data)
 
     def test_positional_creation(self):
-        """Ensure that document may be created using positional arguments.
-        """
+        """Ensure that document may be created using positional arguments."""
         person = self.Person("Test User", 42)
         self.assertEqual(person.name, "Test User")
         self.assertEqual(person.age, 42)
 
     def test_mixed_creation(self):
-        """Ensure that document may be created using mixed arguments.
-        """
+        """Ensure that document may be created using mixed arguments."""
         person = self.Person("Test User", age=42)
         self.assertEqual(person.name, "Test User")
         self.assertEqual(person.age, 42)
 
     def test_positional_creation_embedded(self):
-        """Ensure that embedded document may be created using positional arguments.
+        """Ensure that embedded document may be created using positional
+        arguments.
         """
         job = self.Job("Test Job", 4)
         self.assertEqual(job.name, "Test Job")
         self.assertEqual(job.years, 4)
 
     def test_mixed_creation_embedded(self):
-        """Ensure that embedded document may be created using mixed arguments.
+        """Ensure that embedded document may be created using mixed
+        arguments.
         """
         job = self.Job("Test Job", years=4)
         self.assertEqual(job.name, "Test Job")
         self.assertEqual(job.years, 4)
 
     def test_mixed_creation_dynamic(self):
-        """Ensure that document may be created using mixed arguments.
-        """
+        """Ensure that document may be created using mixed arguments."""
         class Person(DynamicDocument):
             name = StringField()
 
@@ -2954,14 +2879,14 @@ class Person(DynamicDocument):
         self.assertEqual(person.age, 42)
 
     def test_bad_mixed_creation(self):
-        """Ensure that document gives correct error when duplicating arguments
+        """Ensure that document gives correct error when duplicating
+        arguments.
         """
         with self.assertRaises(TypeError):
             return self.Person("Test User", 42, name="Bad User")
 
     def test_data_contains_id_field(self):
-        """Ensure that asking for _data returns 'id'
-        """
+        """Ensure that asking for _data returns 'id'."""
         class Person(Document):
             name = StringField()
 
@@ -2973,7 +2898,6 @@ class Person(Document):
         self.assertEqual(person._data.get('id'), person.id)
 
     def test_complex_nesting_document_and_embedded_document(self):
-
         class Macro(EmbeddedDocument):
             value = DynamicField(default="UNDEFINED")
 
@@ -3016,7 +2940,6 @@ def save(self, *args, **kwargs):
             system.nodes["node"].parameters["param"].macros["test"].value)
 
     def test_embedded_document_equality(self):
-
         class Test(Document):
             field = StringField(required=True)
 
@@ -3202,8 +3125,7 @@ class A(Document):
         self.assertEqual(idx, 2)
 
     def test_falsey_pk(self):
-        """Ensure that we can create and update a document with Falsey PK.
-        """
+        """Ensure that we can create and update a document with Falsey PK."""
         class Person(Document):
             age = IntField(primary_key=True)
             height = FloatField()

From 19ef2be88b65d5f2103fded394b3c9b0b9b6973b Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 5 Mar 2017 00:05:33 -0500
Subject: [PATCH 0473/1519] fix #937

---
 docs/guide/querying.rst | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 980947df1..0bb196581 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -340,14 +340,19 @@ Javascript code that is executed on the database server.
 
 Counting results
 ----------------
-Just as with limiting and skipping results, there is a method on
-:class:`~mongoengine.queryset.QuerySet` objects --
-:meth:`~mongoengine.queryset.QuerySet.count`, but there is also a more Pythonic
-way of achieving this::
-
-    num_users = len(User.objects)
-
-Even if len() is the Pythonic way of counting results, keep in mind that if you concerned about performance, :meth:`~mongoengine.queryset.QuerySet.count` is the way to go since it only execute a server side count query, while len() retrieves the results, places them in cache, and finally counts them. If we compare the performance of the two operations, len() is much slower than :meth:`~mongoengine.queryset.QuerySet.count`.
+Just as with limiting and skipping results, there is a method on a
+:class:`~mongoengine.queryset.QuerySet` object --
+:meth:`~mongoengine.queryset.QuerySet.count`::
+
+    num_users = User.objects.count()
+
+You could technically use ``len(User.objects)`` to get the same result, but it
+would be significantly slower than :meth:`~mongoengine.queryset.QuerySet.count`.
+When you execute a server-side count query, you let MongoDB do the heavy
+lifting and you receive a single integer over the wire. Meanwhile, len()
+retrieves all the results, places them in a local cache, and finally counts
+them. If we compare the performance of the two operations, len() is much slower
+than :meth:`~mongoengine.queryset.QuerySet.count`.
 
 Further aggregation
 -------------------

From e8ea29496401bc618c96339d43ae5480abb52851 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 5 Mar 2017 18:12:01 -0500
Subject: [PATCH 0474/1519] test negative indexes (closes #1119)

---
 tests/fields/fields.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index ed7baa2bd..8e0da410e 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1173,6 +1173,14 @@ def reset_post():
         post.reload()
         self.assertEqual(post.info, ['0', '1', '2', '3', 'a', '5'])
 
+        # __setitem__(index, value) with a negative index
+        reset_post()
+        post.info[-2] = 'a'
+        self.assertEqual(post.info, ['0', '1', '2', '3', 'a', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', '1', '2', '3', 'a', '5'])
+
         # '__setitem__(slice(i, j), listB)'
         # aka 'listA[i:j] = listB'
         # aka 'setitem(listA, slice(i, j), listB)'
@@ -1183,6 +1191,16 @@ def reset_post():
         post.reload()
         self.assertEqual(post.info, ['0', 'h', 'e', 'l', 'l', 'o', '3', '4', '5'])
 
+        # '__setitem__(slice(i, j), listB)' with negative i and j
+        reset_post()
+        post.info[-5:-3] = ['h', 'e', 'l', 'l', 'o']
+        self.assertEqual(post.info, ['0', 'h', 'e', 'l', 'l', 'o', '3', '4', '5'])
+        post.save()
+        post.reload()
+        self.assertEqual(post.info, ['0', 'h', 'e', 'l', 'l', 'o', '3', '4', '5'])
+
+        # negative
+
         # 'append'
         reset_post()
         post.info.append('h')

From f9ccf635ca17e7f30efaeccba37b32c7ea062157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 5 Mar 2017 18:20:09 -0500
Subject: [PATCH 0475/1519] Respect db fields in multiple layers of embedded
 docs (#1501)

---
 mongoengine/base/document.py |  9 ++++++--
 tests/fields/fields.py       | 45 ++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 9d3667068..ce96837aa 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -684,8 +684,13 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
         # class if unavailable
         class_name = son.get('_cls', cls._class_name)
 
-        # Convert SON to a dict, making sure each key is a string
-        data = {str(key): value for key, value in son.iteritems()}
+        # Convert SON to a data dict, making sure each key is a string and
+        # corresponds to the right db field.
+        data = {}
+        for key, value in son.iteritems():
+            key = str(key)
+            key = cls._db_field_map.get(key, key)
+            data[key] = value
 
         # Return correct subclass for document type
         if class_name != cls._class_name:
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 8e0da410e..2305f3afb 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1901,6 +1901,51 @@ class Test(Document):
         doc = self.db.test.find_one()
         self.assertEqual(doc['x']['i'], 2)
 
+    def test_double_embedded_db_field(self):
+        """Make sure multiple layers of embedded docs resolve db fields
+        properly and can be initialized using dicts.
+        """
+        class C(EmbeddedDocument):
+            txt = StringField()
+
+        class B(EmbeddedDocument):
+            c = EmbeddedDocumentField(C, db_field='fc')
+
+        class A(Document):
+            b = EmbeddedDocumentField(B, db_field='fb')
+
+        a = A(
+            b=B(
+                c=C(txt='hi')
+            )
+        )
+        a.validate()
+
+        a = A(b={'c': {'txt': 'hi'}})
+        a.validate()
+
+    def test_double_embedded_db_field_from_son(self):
+        """Make sure multiple layers of embedded docs resolve db fields
+        from SON properly.
+        """
+        class C(EmbeddedDocument):
+            txt = StringField()
+
+        class B(EmbeddedDocument):
+            c = EmbeddedDocumentField(C, db_field='fc')
+
+        class A(Document):
+            b = EmbeddedDocumentField(B, db_field='fb')
+
+        a = A._from_son(SON([
+            ('fb', SON([
+                ('fc', SON([
+                    ('txt', 'hi')
+                ]))
+            ]))
+        ]))
+        self.assertEqual(a.b.c.txt, 'hi')
+
     def test_embedded_document_validation(self):
         """Ensure that invalid embedded documents cannot be assigned to
         embedded document fields.

From 49035543b996a7e802e95b36c5cef249904f6e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 5 Mar 2017 21:17:53 -0500
Subject: [PATCH 0476/1519] cleanup BaseQuerySet.__getitem__ (#1502)

---
 mongoengine/queryset/base.py | 57 ++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index fde46ae63..7c60a4893 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -158,44 +158,49 @@ def __setstate__(self, obj_dict):
         # self._cursor
 
     def __getitem__(self, key):
-        """Support skip and limit using getitem and slicing syntax."""
+        """Return a document instance corresponding to a given index if
+        the key is an integer. If the key is a slice, translate its
+        bounds into a skip and a limit, and return a cloned queryset
+        with that skip/limit applied. For example:
+
+        >>> User.objects[0]
+        <User: User object>
+        >>> User.objects[1:3]
+        [<User: User object>, <User: User object>]
+        """
         queryset = self.clone()
 
-        # Slice provided
+        # Handle a slice
         if isinstance(key, slice):
-            try:
-                queryset._cursor_obj = queryset._cursor[key]
-                queryset._skip, queryset._limit = key.start, key.stop
-                if key.start and key.stop:
-                    queryset._limit = key.stop - key.start
-            except IndexError as err:
-                # PyMongo raises an error if key.start == key.stop, catch it,
-                # bin it, kill it.
-                start = key.start or 0
-                if start >= 0 and key.stop >= 0 and key.step is None:
-                    if start == key.stop:
-                        queryset.limit(0)
-                        queryset._skip = key.start
-                        queryset._limit = key.stop - start
-                        return queryset
-                raise err
+            queryset._cursor_obj = queryset._cursor[key]
+            queryset._skip, queryset._limit = key.start, key.stop
+            if key.start and key.stop:
+                queryset._limit = key.stop - key.start
+
             # Allow further QuerySet modifications to be performed
             return queryset
-        # Integer index provided
+
+        # Handle an index
         elif isinstance(key, int):
             if queryset._scalar:
                 return queryset._get_scalar(
-                    queryset._document._from_son(queryset._cursor[key],
-                                                 _auto_dereference=self._auto_dereference,
-                                                 only_fields=self.only_fields))
+                    queryset._document._from_son(
+                        queryset._cursor[key],
+                        _auto_dereference=self._auto_dereference,
+                        only_fields=self.only_fields
+                    )
+                )
 
             if queryset._as_pymongo:
                 return queryset._get_as_pymongo(queryset._cursor[key])
-            return queryset._document._from_son(queryset._cursor[key],
-                                                _auto_dereference=self._auto_dereference,
-                                                only_fields=self.only_fields)
 
-        raise AttributeError
+            return queryset._document._from_son(
+                queryset._cursor[key],
+                _auto_dereference=self._auto_dereference,
+                only_fields=self.only_fields
+            )
+
+        raise AttributeError('Provide a slice or an integer index')
 
     def __iter__(self):
         raise NotImplementedError

From b78010aa940af31a4b36bd074965c037d78eee0d Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 5 Mar 2017 21:24:40 -0500
Subject: [PATCH 0477/1519] remove test_last_field_name_like_operator (it's a
 dupe of the same test in tests/queryset/transform.py)

---
 tests/queryset/queryset.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index b496e04a6..3ae3fb423 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4962,20 +4962,6 @@ class Person(Document):
         for p in Person.objects():
             self.assertEqual(p.name, 'a')
 
-    def test_last_field_name_like_operator(self):
-        class EmbeddedItem(EmbeddedDocument):
-            type = StringField()
-
-        class Doc(Document):
-            item = EmbeddedDocumentField(EmbeddedItem)
-
-        Doc.drop_collection()
-
-        doc = Doc(item=EmbeddedItem(type="axe"))
-        doc.save()
-
-        self.assertEqual(1, Doc.objects(item__type__="axe").count())
-
     def test_len_during_iteration(self):
         """Tests that calling len on a queyset during iteration doesn't
         stop paging.

From f2fe58c3c5d01e49accc7c48356adbb6694d8693 Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Wed, 8 Mar 2017 10:25:41 +0000
Subject: [PATCH 0478/1519] Added a condition to store data to ObjectDict when
 the items type is it

Previous dereference implementation re-contains data as `dict` except
for the predicted type.
But the OrderedDict is not predicted, so the its data would be converted
`dict` implicitly.
As the result, the order of stored data get wrong. And this patch
prevents it.
---
 mongoengine/dereference.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 59204d4d6..c11449b9b 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -1,3 +1,4 @@
+from collections import OrderedDict
 from bson import DBRef, SON
 import six
 
@@ -201,6 +202,10 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
             as_tuple = isinstance(items, tuple)
             iterator = enumerate(items)
             data = []
+        elif type(items) == OrderedDict:
+            is_list = False
+            iterator = items.iteritems()
+            data = OrderedDict()
         else:
             is_list = False
             iterator = items.iteritems()

From 9cd3dcdebf36728fc1ba8958bd69ccd3edff1d24 Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Wed, 8 Mar 2017 14:45:43 +0000
Subject: [PATCH 0479/1519] Added a test for the change of the condition in
 DeReference processing

This checks DBRef conversion using DynamicField with the ordering
guarantee.
---
 tests/test_dereference.py | 70 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 7f58a85b0..9a9766112 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -2,10 +2,15 @@
 import unittest
 
 from bson import DBRef, ObjectId
+from collections import OrderedDict
 
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.context_managers import query_counter
+from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.base import TopLevelDocumentMetaclass
+if IS_PYMONGO_3:
+    from bson import CodecOptions
 
 
 class FieldTest(unittest.TestCase):
@@ -1287,5 +1292,70 @@ class Playlist(Document):
 
             self.assertEqual(q, 2)
 
+    def test_dynamic_field_dereference(self):
+        class Merchandise(Document):
+            name = StringField()
+            price = IntField()
+
+        class Store(Document):
+            merchandises = DynamicField()
+
+        Merchandise.drop_collection()
+        Store.drop_collection()
+
+        merchandises = {
+            '#1': Merchandise(name='foo', price=100).save(),
+            '#2': Merchandise(name='bar', price=120).save(),
+            '#3': Merchandise(name='baz', price=110).save(),
+        }
+        Store(merchandises=merchandises).save()
+
+        store = Store.objects().first()
+        for obj in store.merchandises.values():
+            self.assertFalse(isinstance(obj, Merchandise))
+
+        store.select_related()
+        for obj in store.merchandises.values():
+            self.assertTrue(isinstance(obj, Merchandise))
+
+    def test_dynamic_field_dereference_with_ordering_guarantee_on_pymongo3(self):
+        # This is because 'codec_options' is supported on pymongo3 or later
+        if IS_PYMONGO_3:
+            class OrderedDocument(Document):
+                my_metaclass = TopLevelDocumentMetaclass
+                __metaclass__ = TopLevelDocumentMetaclass
+
+                @classmethod
+                def _get_collection(cls):
+                    collection = super(OrderedDocument, cls)._get_collection()
+                    opts = CodecOptions(document_class=OrderedDict)
+
+                    return collection.with_options(codec_options=opts)
+
+            class Merchandise(Document):
+                name = StringField()
+                price = IntField()
+
+            class Store(OrderedDocument):
+                merchandises = DynamicField(container_class=OrderedDict)
+
+            Merchandise.drop_collection()
+            Store.drop_collection()
+
+            merchandises = OrderedDict()
+            merchandises['#1'] = Merchandise(name='foo', price=100).save()
+            merchandises['#2'] = Merchandise(name='bar', price=120).save()
+            merchandises['#3'] = Merchandise(name='baz', price=110).save()
+
+            Store(merchandises=merchandises).save()
+
+            store = Store.objects().first()
+
+            store.select_related()
+
+            # confirms that the load data order is same with the one at storing
+            self.assertTrue(type(store.merchandises), OrderedDict)
+            self.assertEqual(','.join(store.merchandises.keys()), '#1,#2,#3')
+
 if __name__ == '__main__':
     unittest.main()

From ffbb2c96896a184032807ab00dbcc0ca89ece77a Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Wed, 8 Mar 2017 14:46:04 +0000
Subject: [PATCH 0480/1519] This is Additional tests for the container_class
 parameter of DynamicField

This tests DynamicField dereference with ordering guarantee.
---
 tests/fields/fields.py | 50 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 2db373171..2c0d12286 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -5,6 +5,7 @@
 import math
 import itertools
 import re
+import pymongo
 
 from nose.plugins.skip import SkipTest
 from collections import OrderedDict
@@ -26,9 +27,12 @@
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.base import (BaseDict, BaseField, EmbeddedDocumentList,
-                              _document_registry)
+                              _document_registry, TopLevelDocumentMetaclass)
 
-from tests.utils import MongoDBTestCase
+from tests.utils import MongoDBTestCase, MONGO_TEST_DB
+from mongoengine.python_support import IS_PYMONGO_3
+if IS_PYMONGO_3:
+    from bson import CodecOptions
 
 __all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")
 
@@ -4513,18 +4517,54 @@ class Doc(Document):
 
         Doc.drop_collection()
 
-        doc = Doc(ordered_data=OrderedDict(raw_data),
-                  unordered_data=dict(raw_data)).save()
+        doc = Doc(ordered_data=OrderedDict(raw_data), unordered_data=dict(raw_data)).save()
 
+        # checks that the data is in order
         self.assertEqual(type(doc.ordered_data), OrderedDict)
         self.assertEqual(type(doc.unordered_data), dict)
-        self.assertEqual([k for k,_ in doc.ordered_data.items()], ['d', 'c', 'b', 'a'])
+        self.assertEqual(','.join(doc.ordered_data.keys()), 'd,c,b,a')
+
+        # checks that the data is stored to the database in order
+        pymongo_db = pymongo.MongoClient()[MONGO_TEST_DB]
+        if IS_PYMONGO_3:
+            codec_option = CodecOptions(document_class=OrderedDict)
+            db_doc = pymongo_db.doc.with_options(codec_options=codec_option).find_one()
+        else:
+            db_doc = pymongo_db.doc.find_one(as_class=OrderedDict)
+
+        self.assertEqual(','.join(doc.ordered_data.keys()), 'd,c,b,a')
 
     def test_dynamicfield_with_wrong_container_class(self):
         with self.assertRaises(ValidationError):
             class DocWithInvalidField:
                 data = DynamicField(container_class=list)
 
+    def test_dynamicfield_with_wrong_container_class_and_reload_docuemnt(self):
+        # This is because 'codec_options' is supported on pymongo3 or later
+        if IS_PYMONGO_3:
+            class OrderedDocument(Document):
+                my_metaclass = TopLevelDocumentMetaclass
+                __metaclass__ = TopLevelDocumentMetaclass
+
+                @classmethod
+                def _get_collection(cls):
+                    collection = super(OrderedDocument, cls)._get_collection()
+                    opts = CodecOptions(document_class=OrderedDict)
+
+                    return collection.with_options(codec_options=opts)
+
+            raw_data = [('d', 1), ('c', 2), ('b', 3), ('a', 4)]
+
+            class Doc(OrderedDocument):
+                data = DynamicField(container_class=OrderedDict)
+
+            Doc.drop_collection()
+
+            doc = Doc(data=OrderedDict(raw_data)).save()
+            doc.reload()
+
+            self.assertEqual(type(doc.data), OrderedDict)
+            self.assertEqual(','.join(doc.data.keys()), 'd,c,b,a')
 
 if __name__ == '__main__':
     unittest.main()

From 58f293fef33ce9fe3f3c536dd831d7f71b95e623 Mon Sep 17 00:00:00 2001
From: Richard Fortescue-Webb <rfwebb@gmail.com>
Date: Wed, 29 Mar 2017 10:34:50 +0100
Subject: [PATCH 0481/1519] Allow ReferenceFields to take ObjectIds

---
 mongoengine/fields.py  |  4 ++--
 tests/fields/fields.py | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 114250954..b67b385d9 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -998,8 +998,8 @@ def prepare_query_value(self, op, value):
 
     def validate(self, value):
 
-        if not isinstance(value, (self.document_type, DBRef)):
-            self.error('A ReferenceField only accepts DBRef or documents')
+        if not isinstance(value, (self.document_type, DBRef, ObjectId)):
+            self.error('A ReferenceField only accepts DBRef, ObjectId or documents')
 
         if isinstance(value, Document) and value.id is None:
             self.error('You can only reference documents once they have been '
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 2305f3afb..5f49596a3 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2088,6 +2088,12 @@ class BlogPost(Document):
         post1.author = post2
         self.assertRaises(ValidationError, post1.validate)
 
+        # Ensure ObjectID's are accepted as references
+        user_object_id = user.pk
+        post3 = BlogPost(content="Chips and curry sauce taste good.")
+        post3.author = user_object_id
+        post3.save()
+
         # Make sure referencing a saved document of the right type works
         user.save()
         post1.author = user
@@ -2098,6 +2104,20 @@ class BlogPost(Document):
         post1.author = post2
         self.assertRaises(ValidationError, post1.validate)
 
+    def test_objectid_reference_fields(self):
+        """Make sure storing Object ID references works."""
+        class Person(Document):
+            name = StringField()
+            parent = ReferenceField('self')
+
+        Person.drop_collection()
+
+        p1 = Person(name="John").save()
+        Person(name="Ross", parent=p1).save()
+
+        p = Person.objects.get(name="Ross")
+        self.assertEqual(p.parent, p1)
+
     def test_dbref_reference_fields(self):
         """Make sure storing references as bson.dbref.DBRef works."""
         class Person(Document):

From 5713de896674110c73f90d0a2016d4410a79d6e3 Mon Sep 17 00:00:00 2001
From: Richard Fortescue-Webb <rfwebb@gmail.com>
Date: Wed, 29 Mar 2017 11:34:57 +0100
Subject: [PATCH 0482/1519] Use the objectid in the test

---
 tests/fields/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 5f49596a3..f4ad0fa29 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2113,7 +2113,7 @@ class Person(Document):
         Person.drop_collection()
 
         p1 = Person(name="John").save()
-        Person(name="Ross", parent=p1).save()
+        Person(name="Ross", parent=p1.pk).save()
 
         p = Person.objects.get(name="Ross")
         self.assertEqual(p.parent, p1)

From d8b238d5f172ec058952046b50921d879e7bc826 Mon Sep 17 00:00:00 2001
From: Hiroyasu OHYAMA <user.localhost2000@gmail.com>
Date: Thu, 6 Apr 2017 00:42:11 +0000
Subject: [PATCH 0483/1519] Refactored the implementation of DynamicField
 extension for storing data in order

---
 mongoengine/dereference.py | 2 +-
 mongoengine/fields.py      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index c11449b9b..f30b2c156 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -202,7 +202,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
             as_tuple = isinstance(items, tuple)
             iterator = enumerate(items)
             data = []
-        elif type(items) == OrderedDict:
+        elif isinstance(items, OrderedDict):
             is_list = False
             iterator = items.iteritems()
             data = OrderedDict()
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 70061e086..a3b0f883e 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -5,6 +5,7 @@
 import time
 import uuid
 import warnings
+from collections import Mapping
 from operator import itemgetter
 
 from bson import Binary, DBRef, ObjectId, SON
@@ -621,7 +622,7 @@ class DynamicField(BaseField):
 
     def __init__(self, container_class=dict, *args, **kwargs):
         self._container_cls = container_class
-        if not issubclass(self._container_cls, dict):
+        if not issubclass(self._container_cls, Mapping):
             self.error('The class that is specified in `container_class` parameter '
                        'must be a subclass of `dict`.')
 

From 888a6da4a58b0b0e6d62ba626af18e0993102f57 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Fri, 7 Apr 2017 10:18:39 -0400
Subject: [PATCH 0484/1519] update the changelog and bump the version to
 v0.12.0

---
 docs/changelog.rst      | 12 +++++++++++-
 docs/upgrade.rst        |  3 +++
 mongoengine/__init__.py |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0da97e905..8764b8e90 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,11 +5,21 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- Fixed using sets in field choices #1481
+
+Changes in 0.12.0
+=================
 - POTENTIAL BREAKING CHANGE: Fixed limit/skip/hint/batch_size chaining #1476
 - POTENTIAL BREAKING CHANGE: Changed a public `QuerySet.clone_into` method to a private `QuerySet._clone_into` #1476
 - Fixed connecting to a replica set with PyMongo 2.x #1436
+- Fixed using sets in field choices #1481
+- Fixed deleting items from a `ListField` #1318
 - Fixed an obscure error message when filtering by `field__in=non_iterable`. #1237
+- Fixed behavior of a `dec` update operator #1450
+- Added a `rename` update operator #1454
+- Added validation for the `db_field` parameter #1448
+- Fixed the error message displayed when querying an `EmbeddedDocumentField` by an invalid value #1440
+- Fixed the error message displayed when validating unicode URLs #1486
+- Raise an error when trying to save an abstract document #1449
 
 Changes in 0.11.0
 =================
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 17b1c4ac5..a9a547e41 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -6,6 +6,9 @@ Development
 ***********
 (Fill this out whenever you introduce breaking changes to MongoEngine)
 
+
+0.12.0
+******
 This release includes various fixes for the `BaseQuerySet` methods and how they
 are chained together. Since version 0.10.1 applying limit/skip/hint/batch_size
 to an already-existing queryset wouldn't modify the underlying PyMongo cursor.
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index f8969592b..0feb49e08 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 11, 0)
+VERSION = (0, 12, 0)
 
 
 def get_version():

From b52d3e3a7ba36b65b18952a2ce114c4a07a42151 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Fri, 7 Apr 2017 10:34:04 -0400
Subject: [PATCH 0485/1519] added one more item to the v0.12.0 changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8764b8e90..2b07ed53c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Changes in 0.12.0
 =================
 - POTENTIAL BREAKING CHANGE: Fixed limit/skip/hint/batch_size chaining #1476
 - POTENTIAL BREAKING CHANGE: Changed a public `QuerySet.clone_into` method to a private `QuerySet._clone_into` #1476
+- Fixed the way `Document.objects.create` works with duplicate IDs #1485
 - Fixed connecting to a replica set with PyMongo 2.x #1436
 - Fixed using sets in field choices #1481
 - Fixed deleting items from a `ListField` #1318

From 466935e9a3d3d45551efa42927035eba9077bd3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 16 Apr 2017 13:58:58 -0400
Subject: [PATCH 0486/1519] Unicode support in EmailField (#1527)

---
 mongoengine/fields.py      | 103 +++++++++++++++++++++++++++++++++----
 tests/document/instance.py |   2 +-
 tests/fields/fields.py     | 101 +++++++++++++++++++++++++++++++-----
 3 files changed, 182 insertions(+), 24 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 06c56f06c..b631fc48f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2,6 +2,7 @@
 import decimal
 import itertools
 import re
+import socket
 import time
 import uuid
 import warnings
@@ -154,21 +155,105 @@ class EmailField(StringField):
 
     .. versionadded:: 0.4
     """
+    USER_REGEX = re.compile(
+        # `dot-atom` defined in RFC 5322 Section 3.2.3.
+        r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*\Z"
+        # `quoted-string` defined in RFC 5322 Section 3.2.4.
+        r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"\Z)',
+        re.IGNORECASE
+    )
+
+    UTF8_USER_REGEX = re.compile(
+        six.u(
+            # RFC 6531 Section 3.3 extends `atext` (used by dot-atom) to
+            # include `UTF8-non-ascii`.
+            r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z\u0080-\U0010FFFF]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z\u0080-\U0010FFFF]+)*\Z"
+            # `quoted-string`
+            r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"\Z)'
+        ), re.IGNORECASE | re.UNICODE
+    )
 
-    EMAIL_REGEX = re.compile(
-        # dot-atom
-        r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*"
-        # quoted-string
-        r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"'
-        # domain (max length of an ICAAN TLD is 22 characters)
-        r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}|[A-Z0-9-]{2,}(?<!-))$', re.IGNORECASE
+    DOMAIN_REGEX = re.compile(
+        r'((?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+)(?:[A-Z0-9-]{2,63}(?<!-))\Z',
+        re.IGNORECASE
     )
 
+    error_msg = u'Invalid email address: %s'
+
+    def __init__(self, domain_whitelist=None, allow_utf8_user=False,
+                 allow_ip_domain=False, *args, **kwargs):
+        """Initialize the EmailField.
+
+        Args:
+            domain_whitelist (list) - list of otherwise invalid domain
+                                      names which you'd like to support.
+            allow_utf8_user (bool) - if True, the user part of the email
+                                     address can contain UTF8 characters.
+                                     False by default.
+            allow_ip_domain (bool) - if True, the domain part of the email
+                                     can be a valid IPv4 or IPv6 address.
+        """
+        self.domain_whitelist = domain_whitelist or []
+        self.allow_utf8_user = allow_utf8_user
+        self.allow_ip_domain = allow_ip_domain
+        super(EmailField, self).__init__(*args, **kwargs)
+
+    def validate_user_part(self, user_part):
+        """Validate the user part of the email address. Return True if
+        valid and False otherwise.
+        """
+        if self.allow_utf8_user:
+            return self.UTF8_USER_REGEX.match(user_part)
+        return self.USER_REGEX.match(user_part)
+
+    def validate_domain_part(self, domain_part):
+        """Validate the domain part of the email address. Return True if
+        valid and False otherwise.
+        """
+        # Skip domain validation if it's in the whitelist.
+        if domain_part in self.domain_whitelist:
+            return True
+
+        if self.DOMAIN_REGEX.match(domain_part):
+            return True
+
+        # Validate IPv4/IPv6, e.g. user@[192.168.0.1]
+        if (
+            self.allow_ip_domain and
+            domain_part[0] == '[' and
+            domain_part[-1] == ']'
+        ):
+            for addr_family in (socket.AF_INET, socket.AF_INET6):
+                try:
+                    socket.inet_pton(addr_family, domain_part[1:-1])
+                    return True
+                except (socket.error, UnicodeEncodeError):
+                    pass
+
+        return False
+
     def validate(self, value):
-        if not EmailField.EMAIL_REGEX.match(value):
-            self.error('Invalid email address: %s' % value)
         super(EmailField, self).validate(value)
 
+        if '@' not in value:
+            self.error(self.error_msg % value)
+
+        user_part, domain_part = value.rsplit('@', 1)
+
+        # Validate the user part.
+        if not self.validate_user_part(user_part):
+            self.error(self.error_msg % value)
+
+        # Validate the domain and, if invalid, see if it's IDN-encoded.
+        if not self.validate_domain_part(domain_part):
+            try:
+                domain_part = domain_part.encode('idna').decode('ascii')
+            except UnicodeError:
+                self.error(self.error_msg % value)
+            else:
+                if not self.validate_domain_part(domain_part):
+                    self.error(self.error_msg % value)
+
 
 class IntField(BaseField):
     """32-bit integer field."""
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 78d326fc6..c59de96fe 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -844,7 +844,7 @@ def test_save(self):
         class Recipient(Document):
             email = EmailField(required=True)
 
-        recipient = Recipient(email='root@localhost')
+        recipient = Recipient(email='not-an-email')
         self.assertRaises(ValidationError, recipient.save)
         recipient.save(validate=False)
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 4017377d1..806062561 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -6,6 +6,7 @@
 import itertools
 import re
 import pymongo
+import sys
 
 from nose.plugins.skip import SkipTest
 from collections import OrderedDict
@@ -342,8 +343,6 @@ def test_url_validation(self):
         class Link(Document):
             url = URLField()
 
-        Link.drop_collection()
-
         link = Link()
         link.url = 'google'
         self.assertRaises(ValidationError, link.validate)
@@ -356,8 +355,6 @@ def test_unicode_url_validation(self):
         class Link(Document):
             url = URLField()
 
-        Link.drop_collection()
-
         link = Link()
         link.url = u'http://xn--b1agh1afp.com/'
 
@@ -3456,23 +3453,99 @@ def test_email_field(self):
         class User(Document):
             email = EmailField()
 
-        user = User(email="ross@example.com")
-        self.assertTrue(user.validate() is None)
+        user = User(email='ross@example.com')
+        user.validate()
 
-        user = User(email="ross@example.co.uk")
-        self.assertTrue(user.validate() is None)
+        user = User(email='ross@example.co.uk')
+        user.validate()
 
-        user = User(email=("Kofq@rhom0e4klgauOhpbpNdogawnyIKvQS0wk2mjqrgGQ5S"
-                           "aJIazqqWkm7.net"))
-        self.assertTrue(user.validate() is None)
+        user = User(email=('Kofq@rhom0e4klgauOhpbpNdogawnyIKvQS0wk2mjqrgGQ5S'
+                           'aJIazqqWkm7.net'))
+        user.validate()
 
-        user = User(email="new-tld@example.technology")
-        self.assertTrue(user.validate() is None)
+        user = User(email='new-tld@example.technology')
+        user.validate()
+
+        user = User(email='ross@example.com.')
+        self.assertRaises(ValidationError, user.validate)
+
+        # unicode domain
+        user = User(email=u'user@пример.рф')
+        user.validate()
+
+        # invalid unicode domain
+        user = User(email=u'user@пример')
+        self.assertRaises(ValidationError, user.validate)
+
+        # invalid data type
+        user = User(email=123)
+        self.assertRaises(ValidationError, user.validate)
+
+    def test_email_field_unicode_user(self):
+        # Don't run this test on pypy3, which doesn't support unicode regex:
+        # https://bitbucket.org/pypy/pypy/issues/1821/regular-expression-doesnt-find-unicode
+        if sys.version_info[:2] == (3, 2):
+            raise SkipTest('unicode email addresses are not supported on PyPy 3')
+
+        class User(Document):
+            email = EmailField()
+
+        # unicode user shouldn't validate by default...
+        user = User(email=u'Dörte@Sörensen.example.com')
+        self.assertRaises(ValidationError, user.validate)
+
+        # ...but it should be fine with allow_utf8_user set to True
+        class User(Document):
+            email = EmailField(allow_utf8_user=True)
 
+        user = User(email=u'Dörte@Sörensen.example.com')
+        user.validate()
+
+    def test_email_field_domain_whitelist(self):
+        class User(Document):
+            email = EmailField()
+
+        # localhost domain shouldn't validate by default...
         user = User(email='me@localhost')
         self.assertRaises(ValidationError, user.validate)
 
-        user = User(email="ross@example.com.")
+        # ...but it should be fine if it's whitelisted
+        class User(Document):
+            email = EmailField(domain_whitelist=['localhost'])
+
+        user = User(email='me@localhost')
+        user.validate()
+
+    def test_email_field_ip_domain(self):
+        class User(Document):
+            email = EmailField()
+
+        valid_ipv4 = 'email@[127.0.0.1]'
+        valid_ipv6 = 'email@[2001:dB8::1]'
+        invalid_ip = 'email@[324.0.0.1]'
+
+        # IP address as a domain shouldn't validate by default...
+        user = User(email=valid_ipv4)
+        self.assertRaises(ValidationError, user.validate)
+
+        user = User(email=valid_ipv6)
+        self.assertRaises(ValidationError, user.validate)
+
+        user = User(email=invalid_ip)
+        self.assertRaises(ValidationError, user.validate)
+
+        # ...but it should be fine with allow_ip_domain set to True
+        class User(Document):
+            email = EmailField(allow_ip_domain=True)
+
+        user = User(email=valid_ipv4)
+        user.validate()
+
+        user = User(email=valid_ipv6)
+        user.validate()
+
+        # invalid IP should still fail validation
+        user = User(email=invalid_ip)
         self.assertRaises(ValidationError, user.validate)
 
     def test_email_field_honors_regex(self):

From 824ec420056a2676ef43e0bd6b5d4ae81900332f Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 16 Apr 2017 14:08:42 -0400
Subject: [PATCH 0487/1519] bump version to v0.13.0 and fill in the changelog
 and the upgrade docs

---
 docs/changelog.rst      |  5 +++++
 docs/upgrade.rst        | 11 +++++++++++
 mongoengine/__init__.py |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2b07ed53c..46d47b97d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,11 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.13.0
+=================
+- POTENTIAL BREAKING CHANGE: Added Unicode support to the `EmailField`, see
+  docs/upgrade.rst for details.
+
 Changes in 0.12.0
 =================
 - POTENTIAL BREAKING CHANGE: Fixed limit/skip/hint/batch_size chaining #1476
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index a9a547e41..d612df880 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -6,6 +6,17 @@ Development
 ***********
 (Fill this out whenever you introduce breaking changes to MongoEngine)
 
+0.13.0
+******
+This release adds Unicode support to the `EmailField` and changes its
+structure significantly. Previously, email addresses containing Unicode
+characters didn't work at all. Starting with v0.13.0, domains with Unicode
+characters are supported out of the box, meaning some emails that previously
+didn't pass validation now do. Make sure the rest of your application can
+accept such email addresses. Additionally, if you subclassed the `EmailField`
+in your application and overrode `EmailField.EMAIL_REGEX`, you will have to
+adjust your code to override `EmailField.USER_REGEX`, `EmailField.DOMAIN_REGEX`,
+and potentially `EmailField.UTF8_USER_REGEX`.
 
 0.12.0
 ******
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 0feb49e08..840c90d7d 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 12, 0)
+VERSION = (0, 13, 0)
 
 
 def get_version():

From 358b80d782e488a614b2e6ee125a5205dc1ed285 Mon Sep 17 00:00:00 2001
From: Jason <jmphry@gmail.com>
Date: Thu, 20 Apr 2017 08:11:38 -0500
Subject: [PATCH 0488/1519] Make the tutorial slightly more intuitive (#1530)

---
 docs/tutorial.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index fc92ce0ce..cc5b647df 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -206,7 +206,10 @@ object::
         ross.last_name = 'Lawley'
         ross.save()
 
-Now that we've got our user in the database, let's add a couple of posts::
+Assign another user to a variable called ``john``, just like we did above with
+``ross``.
+
+Now that we've got our users in the database, let's add a couple of posts::
 
     post1 = TextPost(title='Fun with MongoEngine', author=john)
     post1.content = 'Took a look at MongoEngine today, looks pretty cool.'

From bd4a603e16187478af6950a182cb2d1dabfeb025 Mon Sep 17 00:00:00 2001
From: Artemiy <wertins71@gmail.com>
Date: Thu, 20 Apr 2017 17:27:37 +0300
Subject: [PATCH 0489/1519] Use De Morgan's laws to simplify an expression.
 (#1531)

---
 mongoengine/fields.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index b631fc48f..0010f8185 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -608,9 +608,9 @@ class EmbeddedDocumentField(BaseField):
     """
 
     def __init__(self, document_type, **kwargs):
-        if (
-            not isinstance(document_type, six.string_types) and
-            not issubclass(document_type, EmbeddedDocument)
+        if not (
+            isinstance(document_type, six.string_types) or
+            issubclass(document_type, EmbeddedDocument)
         ):
             self.error('Invalid embedded document class provided to an '
                        'EmbeddedDocumentField')

From 1a3c70ce1b32088a83ef40ae81b439a337e0441b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 30 Apr 2017 13:30:21 -0400
Subject: [PATCH 0490/1519] make EmbeddedDocument not hashable by default
 (#1528)

---
 mongoengine/base/document.py |  7 -------
 mongoengine/document.py      | 15 +++++++++++++++
 tests/document/instance.py   | 28 ++++++++++++++++++++--------
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index ce96837aa..99c8af87e 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -272,13 +272,6 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not self.__eq__(other)
 
-    def __hash__(self):
-        if getattr(self, 'pk', None) is None:
-            # For new object
-            return super(BaseDocument, self).__hash__()
-        else:
-            return hash(self.pk)
-
     def clean(self):
         """
         Hook for doing document level data cleaning before validation is run.
diff --git a/mongoengine/document.py b/mongoengine/document.py
index b79e5e976..0b903d202 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -60,6 +60,12 @@ class EmbeddedDocument(BaseDocument):
     my_metaclass = DocumentMetaclass
     __metaclass__ = DocumentMetaclass
 
+    # A generic embedded document doesn't have any immutable properties
+    # that describe it uniquely, hence it shouldn't be hashable. You can
+    # define your own __hash__ method on a subclass if you need your
+    # embedded documents to be hashable.
+    __hash__ = None
+
     def __init__(self, *args, **kwargs):
         super(EmbeddedDocument, self).__init__(*args, **kwargs)
         self._instance = None
@@ -160,6 +166,15 @@ def pk(self, value):
         """Set the primary key."""
         return setattr(self, self._meta['id_field'], value)
 
+    def __hash__(self):
+        """Return the hash based on the PK of this document. If it's new
+        and doesn't have a PK yet, return the default object hash instead.
+        """
+        if self.pk is None:
+            return super(BaseDocument, self).__hash__()
+        else:
+            return hash(self.pk)
+
     @classmethod
     def _get_db(cls):
         """Some Model using other db_alias"""
diff --git a/tests/document/instance.py b/tests/document/instance.py
index c59de96fe..c98b14055 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2164,7 +2164,7 @@ class User(Document):
         class BlogPost(Document):
             pass
 
-        # Clear old datas
+        # Clear old data
         User.drop_collection()
         BlogPost.drop_collection()
 
@@ -2176,17 +2176,18 @@ class BlogPost(Document):
         b1 = BlogPost.objects.create()
         b2 = BlogPost.objects.create()
 
-        # in List
+        # Make sure docs are properly identified in a list (__eq__ is used
+        # for the comparison).
         all_user_list = list(User.objects.all())
-
         self.assertTrue(u1 in all_user_list)
         self.assertTrue(u2 in all_user_list)
         self.assertTrue(u3 in all_user_list)
-        self.assertFalse(u4 in all_user_list)  # New object
-        self.assertFalse(b1 in all_user_list)  # Other object
-        self.assertFalse(b2 in all_user_list)  # Other object
+        self.assertTrue(u4 not in all_user_list)  # New object
+        self.assertTrue(b1 not in all_user_list)  # Other object
+        self.assertTrue(b2 not in all_user_list)  # Other object
 
-        # in Dict
+        # Make sure docs can be used as keys in a dict (__hash__ is used
+        # for hashing the docs).
         all_user_dic = {}
         for u in User.objects.all():
             all_user_dic[u] = "OK"
@@ -2198,9 +2199,20 @@ class BlogPost(Document):
         self.assertEqual(all_user_dic.get(b1, False), False)  # Other object
         self.assertEqual(all_user_dic.get(b2, False), False)  # Other object
 
-        # in Set
+        # Make sure docs are properly identified in a set (__hash__ is used
+        # for hashing the docs).
         all_user_set = set(User.objects.all())
         self.assertTrue(u1 in all_user_set)
+        self.assertTrue(u4 not in all_user_set)
+        self.assertTrue(b1 not in all_user_list)
+        self.assertTrue(b2 not in all_user_list)
+
+        # Make sure duplicate docs aren't accepted in the set
+        self.assertEqual(len(all_user_set), 3)
+        all_user_set.add(u1)
+        all_user_set.add(u2)
+        all_user_set.add(u3)
+        self.assertEqual(len(all_user_set), 3)
 
     def test_picklable(self):
         pickle_doc = PickleTest(number=1, string="One", lists=['1', '2'])

From de18e256cebd46e9412274dd73704c0b8fc18cb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 30 Apr 2017 14:35:33 -0400
Subject: [PATCH 0491/1519] clean up the Document._get_collection code (#1540)

---
 mongoengine/document.py | 80 +++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 31 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 0b903d202..ad9762169 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -182,45 +182,63 @@ def _get_db(cls):
 
     @classmethod
     def _get_collection(cls):
-        """Returns the collection for the document."""
-        # TODO: use new get_collection() with PyMongo3 ?
+        """Return a PyMongo collection for the document."""
         if not hasattr(cls, '_collection') or cls._collection is None:
-            db = cls._get_db()
-            collection_name = cls._get_collection_name()
-            # Create collection as a capped collection if specified
+
+            # Get the collection, either capped or regular.
             if cls._meta.get('max_size') or cls._meta.get('max_documents'):
-                # Get max document limit and max byte size from meta
-                max_size = cls._meta.get('max_size') or 10 * 2 ** 20  # 10MB default
-                max_documents = cls._meta.get('max_documents')
-                # Round up to next 256 bytes as MongoDB would do it to avoid exception
-                if max_size % 256:
-                    max_size = (max_size // 256 + 1) * 256
-
-                if collection_name in db.collection_names():
-                    cls._collection = db[collection_name]
-                    # The collection already exists, check if its capped
-                    # options match the specified capped options
-                    options = cls._collection.options()
-                    if options.get('max') != max_documents or \
-                            options.get('size') != max_size:
-                        msg = (('Cannot create collection "%s" as a capped '
-                                'collection as it already exists')
-                               % cls._collection)
-                        raise InvalidCollectionError(msg)
-                else:
-                    # Create the collection as a capped collection
-                    opts = {'capped': True, 'size': max_size}
-                    if max_documents:
-                        opts['max'] = max_documents
-                    cls._collection = db.create_collection(
-                        collection_name, **opts
-                    )
+                cls._collection = cls._get_capped_collection()
             else:
+                db = cls._get_db()
+                collection_name = cls._get_collection_name()
                 cls._collection = db[collection_name]
+
+            # Ensure indexes on the collection unless auto_create_index was
+            # set to False.
             if cls._meta.get('auto_create_index', True):
                 cls.ensure_indexes()
+
         return cls._collection
 
+    @classmethod
+    def _get_capped_collection(cls):
+        """Create a new or get an existing capped PyMongo collection."""
+        db = cls._get_db()
+        collection_name = cls._get_collection_name()
+
+        # Get max document limit and max byte size from meta.
+        max_size = cls._meta.get('max_size') or 10 * 2 ** 20  # 10MB default
+        max_documents = cls._meta.get('max_documents')
+
+        # MongoDB will automatically raise the size to make it a multiple of
+        # 256 bytes. We raise it here ourselves to be able to reliably compare
+        # the options below.
+        if max_size % 256:
+            max_size = (max_size // 256 + 1) * 256
+
+        # If the collection already exists and has different options
+        # (i.e. isn't capped or has different max/size), raise an error.
+        if collection_name in db.collection_names():
+            collection = db[collection_name]
+            options = collection.options()
+            if (
+                options.get('max') != max_documents or
+                options.get('size') != max_size
+            ):
+                raise InvalidCollectionError(
+                    'Cannot create collection "{}" as a capped '
+                    'collection as it already exists'.format(cls._collection)
+                )
+
+            return collection
+
+        # Create a new capped collection.
+        opts = {'capped': True, 'size': max_size}
+        if max_documents:
+            opts['max'] = max_documents
+
+        return db.create_collection(collection_name, **opts)
+
     def to_mongo(self, *args, **kwargs):
         data = super(Document, self).to_mongo(*args, **kwargs)
 

From 894e9818ac23ff8f5bd1a53e2afd880e4532fcf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 30 Apr 2017 15:38:21 -0400
Subject: [PATCH 0492/1519] use an external sphinx rtd theme (#1541)

Externalize Sphinx RTD theme
---
 CONTRIBUTING.rst                              |   4 +-
 docs/_themes/sphinx_rtd_theme/__init__.py     |  17 -
 .../_themes/sphinx_rtd_theme/breadcrumbs.html |  15 -
 docs/_themes/sphinx_rtd_theme/footer.html     |  30 --
 docs/_themes/sphinx_rtd_theme/layout.html     | 142 -------
 docs/_themes/sphinx_rtd_theme/layout_old.html | 205 ---------
 docs/_themes/sphinx_rtd_theme/search.html     |  50 ---
 docs/_themes/sphinx_rtd_theme/searchbox.html  |   5 -
 .../static/css/badge_only.css                 |   1 -
 .../sphinx_rtd_theme/static/css/theme.css     |   1 -
 .../sphinx_rtd_theme/static/favicon.ico       | Bin 6261 -> 0 bytes
 .../static/font/fontawesome_webfont.eot       | Bin 37405 -> 0 bytes
 .../static/font/fontawesome_webfont.svg       | 399 ------------------
 .../static/font/fontawesome_webfont.ttf       | Bin 79076 -> 0 bytes
 .../static/font/fontawesome_webfont.woff      | Bin 43572 -> 0 bytes
 .../sphinx_rtd_theme/static/js/theme.js       |  16 -
 docs/_themes/sphinx_rtd_theme/theme.conf      |   8 -
 docs/_themes/sphinx_rtd_theme/versions.html   |  37 --
 docs/conf.py                                  |  15 +-
 requirements.txt                              |   2 +
 20 files changed, 13 insertions(+), 934 deletions(-)
 delete mode 100755 docs/_themes/sphinx_rtd_theme/__init__.py
 delete mode 100755 docs/_themes/sphinx_rtd_theme/breadcrumbs.html
 delete mode 100755 docs/_themes/sphinx_rtd_theme/footer.html
 delete mode 100755 docs/_themes/sphinx_rtd_theme/layout.html
 delete mode 100755 docs/_themes/sphinx_rtd_theme/layout_old.html
 delete mode 100755 docs/_themes/sphinx_rtd_theme/search.html
 delete mode 100755 docs/_themes/sphinx_rtd_theme/searchbox.html
 delete mode 100755 docs/_themes/sphinx_rtd_theme/static/css/badge_only.css
 delete mode 100755 docs/_themes/sphinx_rtd_theme/static/css/theme.css
 delete mode 100644 docs/_themes/sphinx_rtd_theme/static/favicon.ico
 delete mode 100755 docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.eot
 delete mode 100755 docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.svg
 delete mode 100755 docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.ttf
 delete mode 100755 docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.woff
 delete mode 100755 docs/_themes/sphinx_rtd_theme/static/js/theme.js
 delete mode 100755 docs/_themes/sphinx_rtd_theme/theme.conf
 delete mode 100755 docs/_themes/sphinx_rtd_theme/versions.html

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 5707886ba..573d70605 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -77,4 +77,6 @@ You might also use the github `Edit <https://github.com/blog/844-forking-with-th
 button.
 
 If you want to test your documentation changes locally, you need to install
-the ``sphinx`` package.
+the ``sphinx`` and ``sphinx_rtd_theme`` packages. Once these are installed,
+go to the ``docs`` directory, run ``make html`` and inspect the updated docs
+by running ``open _build/html/index.html``.
diff --git a/docs/_themes/sphinx_rtd_theme/__init__.py b/docs/_themes/sphinx_rtd_theme/__init__.py
deleted file mode 100755
index 1440863d6..000000000
--- a/docs/_themes/sphinx_rtd_theme/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""Sphinx ReadTheDocs theme.
-
-From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
-
-"""
-import os
-
-VERSION = (0, 1, 5)
-
-__version__ = ".".join(str(v) for v in VERSION)
-__version_full__ = __version__
-
-
-def get_html_theme_path():
-    """Return list of HTML theme paths."""
-    cur_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-    return cur_dir
diff --git a/docs/_themes/sphinx_rtd_theme/breadcrumbs.html b/docs/_themes/sphinx_rtd_theme/breadcrumbs.html
deleted file mode 100755
index 3e4f359cd..000000000
--- a/docs/_themes/sphinx_rtd_theme/breadcrumbs.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<ul class="wy-breadcrumbs">
-  <li><a href="http://github.com/%7B%7B%20pathto(master_doc)%20%7D%7D">Docs</a> &raquo;</li>
-  <li><a href="">{{ title }}</a></li>
-    <li class="wy-breadcrumbs-aside">
-      {% if display_github %}
-        <a href="https://github.com/%7B%7B%20github_user%20%7D%7D/%7B%7B%20github_repo%20%7D%7D/blob/%7B%7B%20github_version%20%7D%7D%7B%7B%20conf_py_path%20%7D%7D%7B%7B%20pagename%20%7D%7D.rst" class="icon icon-github"> Edit on GitHub</a>
-      {% elif display_bitbucket %}
-        <a href="https://bitbucket.org/%7B%7B%20bitbucket_user%20%7D%7D/%7B%7B%20bitbucket_repo%20%7D%7D/src/%7B%7B%20bitbucket_version%7D%7D%7B%7B%20conf_py_path%20%7D%7D%7B%7B%20pagename%20%7D%7D.rst'" class="icon icon-bitbucket"> Edit on Bitbucket</a>
-      {% elif show_source and has_source and sourcename %}
-        <a href="http://github.com/%7B%7B%20pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
-      {% endif %}
-    </li>
-</ul>
-<hr/>
-
diff --git a/docs/_themes/sphinx_rtd_theme/footer.html b/docs/_themes/sphinx_rtd_theme/footer.html
deleted file mode 100755
index 1fa05eaad..000000000
--- a/docs/_themes/sphinx_rtd_theme/footer.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<footer>
-  {% if next or prev %}
-    <div class="rst-footer-buttons">
-      {% if next %}
-        <a href="http://github.com/%7B%7B%20next.link|e%20%7D%7D" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}">Next <span class="icon icon-circle-arrow-right"></span></a>
-      {% endif %}
-      {% if prev %}
-        <a href="http://github.com/%7B%7B%20prev.link|e%20%7D%7D" class="btn btn-neutral" title="{{ prev.title|striptags|e }}"><span class="icon icon-circle-arrow-left"></span> Previous</a>
-      {% endif %}
-    </div>
-  {% endif %}
-
-  <hr/>
-
-  <p>
-  {%- if show_copyright %}
-    {%- if hasdoc('copyright') %}
-      {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="http://github.com/%7B%7B%20path%20%7D%7D">Copyright</a> {{ copyright }}.{% endtrans %}
-    {%- else %}
-      {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
-    {%- endif %}
-  {%- endif %}
-
-  {%- if last_updated %}
-    {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-  {%- endif %}
-  </p>
-
-  {% trans %}<a href="https://www.github.com/snide/sphinx_rtd_theme">Sphinx theme</a> provided by <a href="http://readthedocs.org/">Read the Docs</a>{% endtrans %}
-</footer>
diff --git a/docs/_themes/sphinx_rtd_theme/layout.html b/docs/_themes/sphinx_rtd_theme/layout.html
deleted file mode 100755
index febe8eb0c..000000000
--- a/docs/_themes/sphinx_rtd_theme/layout.html
+++ /dev/null
@@ -1,142 +0,0 @@
-{# TEMPLATE VAR SETTINGS #}
-{%- set url_root = pathto('', 1) %}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-
-<!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  {% block htmltitle %}
-  <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-  {% endblock %}
-
-  {# FAVICON #}
-  {% if favicon %}
-    <link rel="shortcut icon" href="http://github.com/%7B%7B%20pathto('_static/' + favicon, 1) }}"/>
-  {% endif %}
-  {# CANONICAL #}
-  {%- if theme_canonical_url %}
-    <link rel="canonical" href="http://github.com/%7B%7B%20theme_canonical_url%20%7D%7D%7B%7B%20pagename%20%7D%7D.html"/>
-  {%- endif %}
-
-  {# CSS #}
-  <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
-
-  {# JS #}
-  {% if not embedded %}
-
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:'{{ url_root }}',
-        VERSION:'{{ release|e }}',
-        COLLAPSE_INDEX:false,
-        FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
-      };
-    </script>
-    {%- for scriptfile in script_files %}
-      <script type="text/javascript" src="http://github.com/%7B%7B%20pathto(scriptfile,%201)%20%7D%7D"></script>
-    {%- endfor %}
-
-    {% if use_opensearch %}
-      <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="http://github.com/%7B%7B%20pathto('_static/opensearch.xml', 1) }}"/>
-    {% endif %}
-
-  {% endif %}
-
-  {# RTD hosts these file themselves, so just load on non RTD builds #}
-  {% if not READTHEDOCS %}
-    <link rel="stylesheet" href="http://github.com/%7B%7B%20pathto('_static/' + style, 1) }}" type="text/css" />
-    <script type="text/javascript" src="http://github.com/_static/js/theme.js"></script>
-  {% endif %}
-
-  {% for cssfile in css_files %}
-    <link rel="stylesheet" href="http://github.com/%7B%7B%20pathto(cssfile,%201)%20%7D%7D" type="text/css" />
-  {% endfor %}
-
-  {%- block linktags %}
-    {%- if hasdoc('about') %}
-        <link rel="author" title="{{ _('About these documents') }}"
-              href="http://github.com/%7B%7B%20pathto('about') }}"/>
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-        <link rel="index" title="{{ _('Index') }}"
-              href="http://github.com/%7B%7B%20pathto('genindex') }}"/>
-    {%- endif %}
-    {%- if hasdoc('search') %}
-        <link rel="search" title="{{ _('Search') }}" href="http://github.com/%7B%7B%20pathto('search') }}"/>
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-        <link rel="copyright" title="{{ _('Copyright') }}" href="http://github.com/%7B%7B%20pathto('copyright') }}"/>
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="http://github.com/%7B%7B%20pathto('index') }}"/>
-    {%- if parents %}
-        <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="http://github.com/%7B%7B%20parents[-1].link|e%20%7D%7D"/>
-    {%- endif %}
-    {%- if next %}
-        <link rel="next" title="{{ next.title|striptags|e }}" href="http://github.com/%7B%7B%20next.link|e%20%7D%7D"/>
-    {%- endif %}
-    {%- if prev %}
-        <link rel="prev" title="{{ prev.title|striptags|e }}" href="http://github.com/%7B%7B%20prev.link|e%20%7D%7D"/>
-    {%- endif %}
-  {%- endblock %}
-  {%- block extrahead %} {% endblock %}
-
-  <script src="http://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
-
-</head>
-
-<body class="wy-body-for-nav">
-
-  <div class="wy-grid-for-nav">
-
-    {# SIDE NAV, TOGGLES ON MOBILE #}
-    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-nav-search">
-        <a href="http://github.com/%7B%7B%20pathto(master_doc)%20%7D%7D" class="icon icon-home"> {{ project }}</a>
-        {% include "searchbox.html" %}
-      </div>
-
-      <div class="wy-menu wy-menu-vertical" data-spy="affix">
-        {% set toctree = toctree(maxdepth=2, collapse=False, includehidden=True) %}
-        {% if toctree %}
-            {{ toctree }}
-        {% else %}
-            <!-- Local TOC -->
-            <div class="local-toc">{{ toc }}</div>
-        {% endif %}
-      </div>
-      &nbsp;
-    </nav>
-
-    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-
-      {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      <nav class="wy-nav-top">
-        <i data-toggle="wy-nav-top" class="icon icon-reorder"></i>
-        <a href="http://github.com/%7B%7B%20pathto(master_doc)%20%7D%7D">{{ project }}</a>
-      </nav>
-
-
-      {# PAGE CONTENT #}
-      <div class="wy-nav-content">
-        <div class="rst-content">
-          {% include "breadcrumbs.html" %}
-          {% block body %}{% endblock %}
-          {% include "footer.html" %}
-        </div>
-      </div>
-
-    </section>
-
-  </div>
-  {% include "versions.html" %}
-</body>
-</html>
diff --git a/docs/_themes/sphinx_rtd_theme/layout_old.html b/docs/_themes/sphinx_rtd_theme/layout_old.html
deleted file mode 100755
index deb8df2a1..000000000
--- a/docs/_themes/sphinx_rtd_theme/layout_old.html
+++ /dev/null
@@ -1,205 +0,0 @@
-{#
-    basic/layout.html
-    ~~~~~~~~~~~~~~~~~
-
-    Master layout template for Sphinx themes.
-
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{%- block doctype -%}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-{%- endblock %}
-{%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
-{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
-{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
-                         (sidebars != []) %}
-{%- set url_root = pathto('', 1) %}
-{# XXX necessary? #}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-
-{%- macro relbar() %}
-    <div class="related">
-      <h3>{{ _('Navigation') }}</h3>
-      <ul>
-        {%- for rellink in rellinks %}
-        <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
-          <a href="http://github.com/%7B%7B%20pathto(rellink[0])%20%7D%7D" title="{{ rellink[1]|striptags|e }}"
-             {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
-          {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
-        {%- endfor %}
-        {%- block rootrellink %}
-        <li><a href="http://github.com/%7B%7B%20pathto(master_doc)%20%7D%7D">{{ shorttitle|e }}</a>{{ reldelim1 }}</li>
-        {%- endblock %}
-        {%- for parent in parents %}
-          <li><a href="http://github.com/%7B%7B%20parent.link|e%20%7D%7D" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
-        {%- endfor %}
-        {%- block relbaritems %} {% endblock %}
-      </ul>
-    </div>
-{%- endmacro %}
-
-{%- macro sidebar() %}
-      {%- if render_sidebar %}
-      <div class="sphinxsidebar">
-        <div class="sphinxsidebarwrapper">
-          {%- block sidebarlogo %}
-          {%- if logo %}
-            <p class="logo"><a href="http://github.com/%7B%7B%20pathto(master_doc)%20%7D%7D">
-              <img class="logo" src="http://github.com/%7B%7B%20pathto('_static/' + logo, 1) }}" alt="Logo"/>
-            </a></p>
-          {%- endif %}
-          {%- endblock %}
-          {%- if sidebars != None %}
-            {#- new style sidebar: explicitly include/exclude templates #}
-            {%- for sidebartemplate in sidebars %}
-            {%- include sidebartemplate %}
-            {%- endfor %}
-          {%- else %}
-            {#- old style sidebars: using blocks -- should be deprecated #}
-            {%- block sidebartoc %}
-            {%- include "localtoc.html" %}
-            {%- endblock %}
-            {%- block sidebarrel %}
-            {%- include "relations.html" %}
-            {%- endblock %}
-            {%- block sidebarsourcelink %}
-            {%- include "sourcelink.html" %}
-            {%- endblock %}
-            {%- if customsidebar %}
-            {%- include customsidebar %}
-            {%- endif %}
-            {%- block sidebarsearch %}
-            {%- include "searchbox.html" %}
-            {%- endblock %}
-          {%- endif %}
-        </div>
-      </div>
-      {%- endif %}
-{%- endmacro %}
-
-{%- macro script() %}
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '{{ url_root }}',
-        VERSION:     '{{ release|e }}',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
-      };
-    </script>
-    {%- for scriptfile in script_files %}
-    <script type="text/javascript" src="http://github.com/%7B%7B%20pathto(scriptfile,%201)%20%7D%7D"></script>
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro css() %}
-    <link rel="stylesheet" href="http://github.com/%7B%7B%20pathto('_static/' + style, 1) }}" type="text/css" />
-    <link rel="stylesheet" href="http://github.com/%7B%7B%20pathto('_static/pygments.css', 1) }}" type="text/css" />
-    {%- for cssfile in css_files %}
-    <link rel="stylesheet" href="http://github.com/%7B%7B%20pathto(cssfile,%201)%20%7D%7D" type="text/css" />
-    {%- endfor %}
-{%- endmacro %}
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
-    {{ metatags }}
-    {%- block htmltitle %}
-    <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-    {%- endblock %}
-    {{ css() }}
-    {%- if not embedded %}
-    {{ script() }}
-    {%- if use_opensearch %}
-    <link rel="search" type="application/opensearchdescription+xml"
-          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
-          href="http://github.com/%7B%7B%20pathto('_static/opensearch.xml', 1) }}"/>
-    {%- endif %}
-    {%- if favicon %}
-    <link rel="shortcut icon" href="http://github.com/%7B%7B%20pathto('_static/' + favicon, 1) }}"/>
-    {%- endif %}
-    {%- endif %}
-{%- block linktags %}
-    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="http://github.com/%7B%7B%20pathto('about') }}" />
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="http://github.com/%7B%7B%20pathto('genindex') }}" />
-    {%- endif %}
-    {%- if hasdoc('search') %}
-    <link rel="search" title="{{ _('Search') }}" href="http://github.com/%7B%7B%20pathto('search') }}" />
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-    <link rel="copyright" title="{{ _('Copyright') }}" href="http://github.com/%7B%7B%20pathto('copyright') }}" />
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="http://github.com/%7B%7B%20pathto('index') }}" />
-    {%- if parents %}
-    <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="http://github.com/%7B%7B%20parents[-1].link|e%20%7D%7D" />
-    {%- endif %}
-    {%- if next %}
-    <link rel="next" title="{{ next.title|striptags|e }}" href="http://github.com/%7B%7B%20next.link|e%20%7D%7D" />
-    {%- endif %}
-    {%- if prev %}
-    <link rel="prev" title="{{ prev.title|striptags|e }}" href="http://github.com/%7B%7B%20prev.link|e%20%7D%7D" />
-    {%- endif %}
-{%- endblock %}
-{%- block extrahead %} {% endblock %}
-  </head>
-  <body>
-{%- block header %}{% endblock %}
-
-{%- block relbar1 %}{{ relbar() }}{% endblock %}
-
-{%- block content %}
-  {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
-
-    <div class="document">
-  {%- block document %}
-      <div class="documentwrapper">
-      {%- if render_sidebar %}
-        <div class="bodywrapper">
-      {%- endif %}
-          <div class="body">
-            {% block body %} {% endblock %}
-          </div>
-      {%- if render_sidebar %}
-        </div>
-      {%- endif %}
-      </div>
-  {%- endblock %}
-
-  {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
-      <div class="clearer"></div>
-    </div>
-{%- endblock %}
-
-{%- block relbar2 %}{{ relbar() }}{% endblock %}
-
-{%- block footer %}
-    <div class="footer">
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="http://github.com/%7B%7B%20path%20%7D%7D">Copyright</a> {{ copyright }}.{% endtrans %}
-      {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
-      {%- endif %}
-    {%- endif %}
-    {%- if last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-    {%- endif %}
-    {%- if show_sphinx %}
-      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
-    {%- endif %}
-    </div>
-    <p>asdf asdf asdf asdf 22</p>
-{%- endblock %}
-  </body>
-</html>
-
diff --git a/docs/_themes/sphinx_rtd_theme/search.html b/docs/_themes/sphinx_rtd_theme/search.html
deleted file mode 100755
index d8bbe6901..000000000
--- a/docs/_themes/sphinx_rtd_theme/search.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{#
-    basic/search.html
-    ~~~~~~~~~~~~~~~~~
-
-    Template for the search page.
-
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{%- extends "layout.html" %}
-{% set title = _('Search') %}
-{% set script_files = script_files + ['_static/searchtools.js'] %}
-{% block extrahead %}
-  <script type="text/javascript">
-    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
-  </script>
-  {# this is used when loading the search index using $.ajax fails,
-     such as on Chrome for documents on localhost #}
-  <script type="text/javascript" id="searchindexloader"></script>
-  {{ super() }}
-{% endblock %}
-{% block body %}
-  <noscript>
-  <div id="fallback" class="admonition warning">
-    <p class="last">
-      {% trans %}Please activate JavaScript to enable the search
-      functionality.{% endtrans %}
-    </p>
-  </div>
-  </noscript>
-
-  {% if search_performed %}
-    <h2>{{ _('Search Results') }}</h2>
-    {% if not search_results %}
-      <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
-    {% endif %}
-  {% endif %}
-  <div id="search-results">
-  {% if search_results %}
-    <ul>
-    {% for href, caption, context in search_results %}
-      <li>
-        <a href="http://github.com/%7B%7B%20pathto(item.href)%20%7D%7D">{{ caption }}</a>
-        <p class="context">{{ context|e }}</p>
-      </li>
-    {% endfor %}
-    </ul>
-  {% endif %}
-  </div>
-{% endblock %}
diff --git a/docs/_themes/sphinx_rtd_theme/searchbox.html b/docs/_themes/sphinx_rtd_theme/searchbox.html
deleted file mode 100755
index f62545ea5..000000000
--- a/docs/_themes/sphinx_rtd_theme/searchbox.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<form id ="rtd-search-form" class="wy-form" action="http://github.com/%7B%7B%20pathto('search') }}" method="get">
-  <input type="text" name="q" placeholder="Search docs" />
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-</form>
diff --git a/docs/_themes/sphinx_rtd_theme/static/css/badge_only.css b/docs/_themes/sphinx_rtd_theme/static/css/badge_only.css
deleted file mode 100755
index 7fccc414b..000000000
--- a/docs/_themes/sphinx_rtd_theme/static/css/badge_only.css
+++ /dev/null
@@ -1 +0,0 @@
-.font-smooth,.icon:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:fontawesome-webfont;font-weight:normal;font-style:normal;src:url("http://github.com/font/fontawesome_webfont.eot");src:url("http://github.com/font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("http://github.com/font/fontawesome_webfont.woff") format("woff"),url("http://github.com/font/fontawesome_webfont.ttf") format("truetype"),url("http://github.com/font/fontawesome_webfont.svg#fontawesome-webfont") format("svg")}.icon:before{display:inline-block;font-family:fontawesome-webfont;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .icon{display:inline-block;text-decoration:inherit}li .icon{display:inline-block}li .icon-large:before,li .icon-large:before{width:1.875em}ul.icons{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.icons li .icon{width:0.8em}ul.icons li .icon-large:before,ul.icons li .icon-large:before{vertical-align:baseline}.icon-book:before{content:"\f02d"}.icon-caret-down:before{content:"\f0d7"}.icon-caret-up:before{content:"\f0d8"}.icon-caret-left:before{content:"\f0d9"}.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .icon{color:#fcfcfc}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
diff --git a/docs/_themes/sphinx_rtd_theme/static/css/theme.css b/docs/_themes/sphinx_rtd_theme/static/css/theme.css
deleted file mode 100755
index a37f8d8c5..000000000
--- a/docs/_themes/sphinx_rtd_theme/static/css/theme.css
+++ /dev/null
@@ -1 +0,0 @@
-*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:0}dfn{font-style:italic}hr{display:block;height:1px;border:0;border-top:1px solid #ccc;margin:20px 0;padding:0}ins{background:#ff9;color:#000;text-decoration:none}mark{background:#ff0;color:#000;font-style:italic;font-weight:bold}pre,code,.rst-content tt,kbd,samp{font-family:monospace,serif;_font-family:"courier new",monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:before,q:after{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}ul,ol,dl{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:0;margin:0;padding:0}label{cursor:pointer}legend{border:0;*margin-left:-7px;padding:0;white-space:normal}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*width:13px;*height:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top;resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:0.2em 0;background:#ccc;color:#000;padding:0.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none !important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{html,body,section{background:none !important}*{box-shadow:none !important;text-shadow:none !important;filter:none !important;-ms-filter:none !important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}.font-smooth,.icon:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-tag-input-group .wy-tag .wy-tag-remove:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,.wy-tag-input-group,.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:fontawesome-webfont;font-weight:normal;font-style:normal;src:url("http://github.com/font/fontawesome_webfont.eot");src:url("http://github.com/font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("http://github.com/font/fontawesome_webfont.woff") format("woff"),url("http://github.com/font/fontawesome_webfont.ttf") format("truetype"),url("http://github.com/font/fontawesome_webfont.svg#fontawesome-webfont") format("svg")}.icon:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-tag-input-group .wy-tag .wy-tag-remove:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before{display:inline-block;font-family:fontawesome-webfont;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .icon,a .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success a .wy-input-context,a .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger a .wy-input-context,a .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning a .wy-input-context,a .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info a .wy-input-context,a .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag a .wy-tag-remove,a .rst-content .admonition-title,.rst-content a .admonition-title,a .rst-content h1 .headerlink,.rst-content h1 a .headerlink,a .rst-content h2 .headerlink,.rst-content h2 a .headerlink,a .rst-content h3 .headerlink,.rst-content h3 a .headerlink,a .rst-content h4 .headerlink,.rst-content h4 a .headerlink,a .rst-content h5 .headerlink,.rst-content h5 a .headerlink,a .rst-content h6 .headerlink,.rst-content h6 a .headerlink,a .rst-content dl dt .headerlink,.rst-content dl dt a .headerlink{display:inline-block;text-decoration:inherit}.icon-large:before{vertical-align:-10%;font-size:1.33333em}.btn .icon,.btn .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success .btn .wy-input-context,.btn .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .btn .wy-input-context,.btn .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .btn .wy-input-context,.btn .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info .btn .wy-input-context,.btn .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag .btn .wy-tag-remove,.btn .rst-content .admonition-title,.rst-content .btn .admonition-title,.btn .rst-content h1 .headerlink,.rst-content h1 .btn .headerlink,.btn .rst-content h2 .headerlink,.rst-content h2 .btn .headerlink,.btn .rst-content h3 .headerlink,.rst-content h3 .btn .headerlink,.btn .rst-content h4 .headerlink,.rst-content h4 .btn .headerlink,.btn .rst-content h5 .headerlink,.rst-content h5 .btn .headerlink,.btn .rst-content h6 .headerlink,.rst-content h6 .btn .headerlink,.btn .rst-content dl dt .headerlink,.rst-content dl dt .btn .headerlink,.nav .icon,.nav .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success .nav .wy-input-context,.nav .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .nav .wy-input-context,.nav .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .nav .wy-input-context,.nav .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info .nav .wy-input-context,.nav .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag .nav .wy-tag-remove,.nav .rst-content .admonition-title,.rst-content .nav .admonition-title,.nav .rst-content h1 .headerlink,.rst-content h1 .nav .headerlink,.nav .rst-content h2 .headerlink,.rst-content h2 .nav .headerlink,.nav .rst-content h3 .headerlink,.rst-content h3 .nav .headerlink,.nav .rst-content h4 .headerlink,.rst-content h4 .nav .headerlink,.nav .rst-content h5 .headerlink,.rst-content h5 .nav .headerlink,.nav .rst-content h6 .headerlink,.rst-content h6 .nav .headerlink,.nav .rst-content dl dt .headerlink,.rst-content dl dt .nav .headerlink{display:inline}.btn .icon.icon-large,.btn .wy-inline-validate.wy-inline-validate-success .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-success .btn .icon-large.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-danger .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-danger .btn .icon-large.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-warning .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-warning .btn .icon-large.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-info .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-info .btn .icon-large.wy-input-context,.btn .wy-tag-input-group .wy-tag .icon-large.wy-tag-remove,.wy-tag-input-group .wy-tag .btn .icon-large.wy-tag-remove,.btn .rst-content .icon-large.admonition-title,.rst-content .btn .icon-large.admonition-title,.btn .rst-content h1 .icon-large.headerlink,.rst-content h1 .btn .icon-large.headerlink,.btn .rst-content h2 .icon-large.headerlink,.rst-content h2 .btn .icon-large.headerlink,.btn .rst-content h3 .icon-large.headerlink,.rst-content h3 .btn .icon-large.headerlink,.btn .rst-content h4 .icon-large.headerlink,.rst-content h4 .btn .icon-large.headerlink,.btn .rst-content h5 .icon-large.headerlink,.rst-content h5 .btn .icon-large.headerlink,.btn .rst-content h6 .icon-large.headerlink,.rst-content h6 .btn .icon-large.headerlink,.btn .rst-content dl dt .icon-large.headerlink,.rst-content dl dt .btn .icon-large.headerlink,.nav .icon.icon-large,.nav .wy-inline-validate.wy-inline-validate-success .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-success .nav .icon-large.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-danger .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-danger .nav .icon-large.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-warning .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-warning .nav .icon-large.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-info .icon-large.wy-input-context,.wy-inline-validate.wy-inline-validate-info .nav .icon-large.wy-input-context,.nav .wy-tag-input-group .wy-tag .icon-large.wy-tag-remove,.wy-tag-input-group .wy-tag .nav .icon-large.wy-tag-remove,.nav .rst-content .icon-large.admonition-title,.rst-content .nav .icon-large.admonition-title,.nav .rst-content h1 .icon-large.headerlink,.rst-content h1 .nav .icon-large.headerlink,.nav .rst-content h2 .icon-large.headerlink,.rst-content h2 .nav .icon-large.headerlink,.nav .rst-content h3 .icon-large.headerlink,.rst-content h3 .nav .icon-large.headerlink,.nav .rst-content h4 .icon-large.headerlink,.rst-content h4 .nav .icon-large.headerlink,.nav .rst-content h5 .icon-large.headerlink,.rst-content h5 .nav .icon-large.headerlink,.nav .rst-content h6 .icon-large.headerlink,.rst-content h6 .nav .icon-large.headerlink,.nav .rst-content dl dt .icon-large.headerlink,.rst-content dl dt .nav .icon-large.headerlink{line-height:0.9em}.btn .icon.icon-spin,.btn .wy-inline-validate.wy-inline-validate-success .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-success .btn .icon-spin.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-danger .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-danger .btn .icon-spin.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-warning .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-warning .btn .icon-spin.wy-input-context,.btn .wy-inline-validate.wy-inline-validate-info .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-info .btn .icon-spin.wy-input-context,.btn .wy-tag-input-group .wy-tag .icon-spin.wy-tag-remove,.wy-tag-input-group .wy-tag .btn .icon-spin.wy-tag-remove,.btn .rst-content .icon-spin.admonition-title,.rst-content .btn .icon-spin.admonition-title,.btn .rst-content h1 .icon-spin.headerlink,.rst-content h1 .btn .icon-spin.headerlink,.btn .rst-content h2 .icon-spin.headerlink,.rst-content h2 .btn .icon-spin.headerlink,.btn .rst-content h3 .icon-spin.headerlink,.rst-content h3 .btn .icon-spin.headerlink,.btn .rst-content h4 .icon-spin.headerlink,.rst-content h4 .btn .icon-spin.headerlink,.btn .rst-content h5 .icon-spin.headerlink,.rst-content h5 .btn .icon-spin.headerlink,.btn .rst-content h6 .icon-spin.headerlink,.rst-content h6 .btn .icon-spin.headerlink,.btn .rst-content dl dt .icon-spin.headerlink,.rst-content dl dt .btn .icon-spin.headerlink,.nav .icon.icon-spin,.nav .wy-inline-validate.wy-inline-validate-success .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-success .nav .icon-spin.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-danger .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-danger .nav .icon-spin.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-warning .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-warning .nav .icon-spin.wy-input-context,.nav .wy-inline-validate.wy-inline-validate-info .icon-spin.wy-input-context,.wy-inline-validate.wy-inline-validate-info .nav .icon-spin.wy-input-context,.nav .wy-tag-input-group .wy-tag .icon-spin.wy-tag-remove,.wy-tag-input-group .wy-tag .nav .icon-spin.wy-tag-remove,.nav .rst-content .icon-spin.admonition-title,.rst-content .nav .icon-spin.admonition-title,.nav .rst-content h1 .icon-spin.headerlink,.rst-content h1 .nav .icon-spin.headerlink,.nav .rst-content h2 .icon-spin.headerlink,.rst-content h2 .nav .icon-spin.headerlink,.nav .rst-content h3 .icon-spin.headerlink,.rst-content h3 .nav .icon-spin.headerlink,.nav .rst-content h4 .icon-spin.headerlink,.rst-content h4 .nav .icon-spin.headerlink,.nav .rst-content h5 .icon-spin.headerlink,.rst-content h5 .nav .icon-spin.headerlink,.nav .rst-content h6 .icon-spin.headerlink,.rst-content h6 .nav .icon-spin.headerlink,.nav .rst-content dl dt .icon-spin.headerlink,.rst-content dl dt .nav .icon-spin.headerlink{display:inline-block}.btn.icon:before,.wy-inline-validate.wy-inline-validate-success .btn.wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .btn.wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .btn.wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .btn.wy-input-context:before,.wy-tag-input-group .wy-tag .btn.wy-tag-remove:before,.rst-content .btn.admonition-title:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content dl dt .btn.headerlink:before{opacity:0.5;-webkit-transition:opacity 0.05s ease-in;-moz-transition:opacity 0.05s ease-in;transition:opacity 0.05s ease-in}.btn.icon:hover:before,.wy-inline-validate.wy-inline-validate-success .btn.wy-input-context:hover:before,.wy-inline-validate.wy-inline-validate-danger .btn.wy-input-context:hover:before,.wy-inline-validate.wy-inline-validate-warning .btn.wy-input-context:hover:before,.wy-inline-validate.wy-inline-validate-info .btn.wy-input-context:hover:before,.wy-tag-input-group .wy-tag .btn.wy-tag-remove:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content dl dt .btn.headerlink:hover:before{opacity:1}.btn-mini .icon:before,.btn-mini .wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-success .btn-mini .wy-input-context:before,.btn-mini .wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .btn-mini .wy-input-context:before,.btn-mini .wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .btn-mini .wy-input-context:before,.btn-mini .wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .btn-mini .wy-input-context:before,.btn-mini .wy-tag-input-group .wy-tag .wy-tag-remove:before,.wy-tag-input-group .wy-tag .btn-mini .wy-tag-remove:before,.btn-mini .rst-content .admonition-title:before,.rst-content .btn-mini .admonition-title:before,.btn-mini .rst-content h1 .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.btn-mini .rst-content dl dt .headerlink:before,.rst-content dl dt .btn-mini .headerlink:before{font-size:14px;vertical-align:-15%}li .icon,li .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success li .wy-input-context,li .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger li .wy-input-context,li .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning li .wy-input-context,li .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info li .wy-input-context,li .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag li .wy-tag-remove,li .rst-content .admonition-title,.rst-content li .admonition-title,li .rst-content h1 .headerlink,.rst-content h1 li .headerlink,li .rst-content h2 .headerlink,.rst-content h2 li .headerlink,li .rst-content h3 .headerlink,.rst-content h3 li .headerlink,li .rst-content h4 .headerlink,.rst-content h4 li .headerlink,li .rst-content h5 .headerlink,.rst-content h5 li .headerlink,li .rst-content h6 .headerlink,.rst-content h6 li .headerlink,li .rst-content dl dt .headerlink,.rst-content dl dt li .headerlink{display:inline-block}li .icon-large:before,li .icon-large:before{width:1.875em}ul.icons{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.icons li .icon,ul.icons li .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success ul.icons li .wy-input-context,ul.icons li .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger ul.icons li .wy-input-context,ul.icons li .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning ul.icons li .wy-input-context,ul.icons li .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info ul.icons li .wy-input-context,ul.icons li .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag ul.icons li .wy-tag-remove,ul.icons li .rst-content .admonition-title,.rst-content ul.icons li .admonition-title,ul.icons li .rst-content h1 .headerlink,.rst-content h1 ul.icons li .headerlink,ul.icons li .rst-content h2 .headerlink,.rst-content h2 ul.icons li .headerlink,ul.icons li .rst-content h3 .headerlink,.rst-content h3 ul.icons li .headerlink,ul.icons li .rst-content h4 .headerlink,.rst-content h4 ul.icons li .headerlink,ul.icons li .rst-content h5 .headerlink,.rst-content h5 ul.icons li .headerlink,ul.icons li .rst-content h6 .headerlink,.rst-content h6 ul.icons li .headerlink,ul.icons li .rst-content dl dt .headerlink,.rst-content dl dt ul.icons li .headerlink{width:0.8em}ul.icons li .icon-large:before,ul.icons li .icon-large:before{vertical-align:baseline}.icon-glass:before{content:"\f000"}.icon-music:before{content:"\f001"}.icon-search:before{content:"\f002"}.icon-envelope-alt:before{content:"\f003"}.icon-heart:before{content:"\f004"}.icon-star:before{content:"\f005"}.icon-star-empty:before{content:"\f006"}.icon-user:before{content:"\f007"}.icon-film:before{content:"\f008"}.icon-th-large:before{content:"\f009"}.icon-th:before{content:"\f00a"}.icon-th-list:before{content:"\f00b"}.icon-ok:before{content:"\f00c"}.icon-remove:before,.wy-tag-input-group .wy-tag .wy-tag-remove:before{content:"\f00d"}.icon-zoom-in:before{content:"\f00e"}.icon-zoom-out:before{content:"\f010"}.icon-power-off:before,.icon-off:before{content:"\f011"}.icon-signal:before{content:"\f012"}.icon-gear:before,.icon-cog:before{content:"\f013"}.icon-trash:before{content:"\f014"}.icon-home:before{content:"\f015"}.icon-file-alt:before{content:"\f016"}.icon-time:before{content:"\f017"}.icon-road:before{content:"\f018"}.icon-download-alt:before{content:"\f019"}.icon-download:before{content:"\f01a"}.icon-upload:before{content:"\f01b"}.icon-inbox:before{content:"\f01c"}.icon-play-circle:before{content:"\f01d"}.icon-rotate-right:before,.icon-repeat:before{content:"\f01e"}.icon-refresh:before{content:"\f021"}.icon-list-alt:before{content:"\f022"}.icon-lock:before{content:"\f023"}.icon-flag:before{content:"\f024"}.icon-headphones:before{content:"\f025"}.icon-volume-off:before{content:"\f026"}.icon-volume-down:before{content:"\f027"}.icon-volume-up:before{content:"\f028"}.icon-qrcode:before{content:"\f029"}.icon-barcode:before{content:"\f02a"}.icon-tag:before{content:"\f02b"}.icon-tags:before{content:"\f02c"}.icon-book:before{content:"\f02d"}.icon-bookmark:before{content:"\f02e"}.icon-print:before{content:"\f02f"}.icon-camera:before{content:"\f030"}.icon-font:before{content:"\f031"}.icon-bold:before{content:"\f032"}.icon-italic:before{content:"\f033"}.icon-text-height:before{content:"\f034"}.icon-text-width:before{content:"\f035"}.icon-align-left:before{content:"\f036"}.icon-align-center:before{content:"\f037"}.icon-align-right:before{content:"\f038"}.icon-align-justify:before{content:"\f039"}.icon-list:before{content:"\f03a"}.icon-indent-left:before{content:"\f03b"}.icon-indent-right:before{content:"\f03c"}.icon-facetime-video:before{content:"\f03d"}.icon-picture:before{content:"\f03e"}.icon-pencil:before{content:"\f040"}.icon-map-marker:before{content:"\f041"}.icon-adjust:before{content:"\f042"}.icon-tint:before{content:"\f043"}.icon-edit:before{content:"\f044"}.icon-share:before{content:"\f045"}.icon-check:before{content:"\f046"}.icon-move:before{content:"\f047"}.icon-step-backward:before{content:"\f048"}.icon-fast-backward:before{content:"\f049"}.icon-backward:before{content:"\f04a"}.icon-play:before{content:"\f04b"}.icon-pause:before{content:"\f04c"}.icon-stop:before{content:"\f04d"}.icon-forward:before{content:"\f04e"}.icon-fast-forward:before{content:"\f050"}.icon-step-forward:before{content:"\f051"}.icon-eject:before{content:"\f052"}.icon-chevron-left:before{content:"\f053"}.icon-chevron-right:before{content:"\f054"}.icon-plus-sign:before{content:"\f055"}.icon-minus-sign:before{content:"\f056"}.icon-remove-sign:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:"\f057"}.icon-ok-sign:before{content:"\f058"}.icon-question-sign:before{content:"\f059"}.icon-info-sign:before{content:"\f05a"}.icon-screenshot:before{content:"\f05b"}.icon-remove-circle:before{content:"\f05c"}.icon-ok-circle:before{content:"\f05d"}.icon-ban-circle:before{content:"\f05e"}.icon-arrow-left:before{content:"\f060"}.icon-arrow-right:before{content:"\f061"}.icon-arrow-up:before{content:"\f062"}.icon-arrow-down:before{content:"\f063"}.icon-mail-forward:before,.icon-share-alt:before{content:"\f064"}.icon-resize-full:before{content:"\f065"}.icon-resize-small:before{content:"\f066"}.icon-plus:before{content:"\f067"}.icon-minus:before{content:"\f068"}.icon-asterisk:before{content:"\f069"}.icon-exclamation-sign:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.rst-content .admonition-title:before{content:"\f06a"}.icon-gift:before{content:"\f06b"}.icon-leaf:before{content:"\f06c"}.icon-fire:before{content:"\f06d"}.icon-eye-open:before{content:"\f06e"}.icon-eye-close:before{content:"\f070"}.icon-warning-sign:before{content:"\f071"}.icon-plane:before{content:"\f072"}.icon-calendar:before{content:"\f073"}.icon-random:before{content:"\f074"}.icon-comment:before{content:"\f075"}.icon-magnet:before{content:"\f076"}.icon-chevron-up:before{content:"\f077"}.icon-chevron-down:before{content:"\f078"}.icon-retweet:before{content:"\f079"}.icon-shopping-cart:before{content:"\f07a"}.icon-folder-close:before{content:"\f07b"}.icon-folder-open:before{content:"\f07c"}.icon-resize-vertical:before{content:"\f07d"}.icon-resize-horizontal:before{content:"\f07e"}.icon-bar-chart:before{content:"\f080"}.icon-twitter-sign:before{content:"\f081"}.icon-facebook-sign:before{content:"\f082"}.icon-camera-retro:before{content:"\f083"}.icon-key:before{content:"\f084"}.icon-gears:before,.icon-cogs:before{content:"\f085"}.icon-comments:before{content:"\f086"}.icon-thumbs-up-alt:before{content:"\f087"}.icon-thumbs-down-alt:before{content:"\f088"}.icon-star-half:before{content:"\f089"}.icon-heart-empty:before{content:"\f08a"}.icon-signout:before{content:"\f08b"}.icon-linkedin-sign:before{content:"\f08c"}.icon-pushpin:before{content:"\f08d"}.icon-external-link:before{content:"\f08e"}.icon-signin:before{content:"\f090"}.icon-trophy:before{content:"\f091"}.icon-github-sign:before{content:"\f092"}.icon-upload-alt:before{content:"\f093"}.icon-lemon:before{content:"\f094"}.icon-phone:before{content:"\f095"}.icon-unchecked:before,.icon-check-empty:before{content:"\f096"}.icon-bookmark-empty:before{content:"\f097"}.icon-phone-sign:before{content:"\f098"}.icon-twitter:before{content:"\f099"}.icon-facebook:before{content:"\f09a"}.icon-github:before{content:"\f09b"}.icon-unlock:before{content:"\f09c"}.icon-credit-card:before{content:"\f09d"}.icon-rss:before{content:"\f09e"}.icon-hdd:before{content:"\f0a0"}.icon-bullhorn:before{content:"\f0a1"}.icon-bell:before{content:"\f0a2"}.icon-certificate:before{content:"\f0a3"}.icon-hand-right:before{content:"\f0a4"}.icon-hand-left:before{content:"\f0a5"}.icon-hand-up:before{content:"\f0a6"}.icon-hand-down:before{content:"\f0a7"}.icon-circle-arrow-left:before{content:"\f0a8"}.icon-circle-arrow-right:before{content:"\f0a9"}.icon-circle-arrow-up:before{content:"\f0aa"}.icon-circle-arrow-down:before{content:"\f0ab"}.icon-globe:before{content:"\f0ac"}.icon-wrench:before{content:"\f0ad"}.icon-tasks:before{content:"\f0ae"}.icon-filter:before{content:"\f0b0"}.icon-briefcase:before{content:"\f0b1"}.icon-fullscreen:before{content:"\f0b2"}.icon-group:before{content:"\f0c0"}.icon-link:before{content:"\f0c1"}.icon-cloud:before{content:"\f0c2"}.icon-beaker:before{content:"\f0c3"}.icon-cut:before{content:"\f0c4"}.icon-copy:before{content:"\f0c5"}.icon-paperclip:before,.icon-paper-clip:before{content:"\f0c6"}.icon-save:before{content:"\f0c7"}.icon-sign-blank:before{content:"\f0c8"}.icon-reorder:before{content:"\f0c9"}.icon-list-ul:before{content:"\f0ca"}.icon-list-ol:before{content:"\f0cb"}.icon-strikethrough:before{content:"\f0cc"}.icon-underline:before{content:"\f0cd"}.icon-table:before{content:"\f0ce"}.icon-magic:before{content:"\f0d0"}.icon-truck:before{content:"\f0d1"}.icon-pinterest:before{content:"\f0d2"}.icon-pinterest-sign:before{content:"\f0d3"}.icon-google-plus-sign:before{content:"\f0d4"}.icon-google-plus:before{content:"\f0d5"}.icon-money:before{content:"\f0d6"}.icon-caret-down:before{content:"\f0d7"}.icon-caret-up:before{content:"\f0d8"}.icon-caret-left:before{content:"\f0d9"}.icon-caret-right:before{content:"\f0da"}.icon-columns:before{content:"\f0db"}.icon-sort:before{content:"\f0dc"}.icon-sort-down:before{content:"\f0dd"}.icon-sort-up:before{content:"\f0de"}.icon-envelope:before{content:"\f0e0"}.icon-linkedin:before{content:"\f0e1"}.icon-rotate-left:before,.icon-undo:before{content:"\f0e2"}.icon-legal:before{content:"\f0e3"}.icon-dashboard:before{content:"\f0e4"}.icon-comment-alt:before{content:"\f0e5"}.icon-comments-alt:before{content:"\f0e6"}.icon-bolt:before{content:"\f0e7"}.icon-sitemap:before{content:"\f0e8"}.icon-umbrella:before{content:"\f0e9"}.icon-paste:before{content:"\f0ea"}.icon-lightbulb:before{content:"\f0eb"}.icon-exchange:before{content:"\f0ec"}.icon-cloud-download:before{content:"\f0ed"}.icon-cloud-upload:before{content:"\f0ee"}.icon-user-md:before{content:"\f0f0"}.icon-stethoscope:before{content:"\f0f1"}.icon-suitcase:before{content:"\f0f2"}.icon-bell-alt:before{content:"\f0f3"}.icon-coffee:before{content:"\f0f4"}.icon-food:before{content:"\f0f5"}.icon-file-text-alt:before{content:"\f0f6"}.icon-building:before{content:"\f0f7"}.icon-hospital:before{content:"\f0f8"}.icon-ambulance:before{content:"\f0f9"}.icon-medkit:before{content:"\f0fa"}.icon-fighter-jet:before{content:"\f0fb"}.icon-beer:before{content:"\f0fc"}.icon-h-sign:before{content:"\f0fd"}.icon-plus-sign-alt:before{content:"\f0fe"}.icon-double-angle-left:before{content:"\f100"}.icon-double-angle-right:before{content:"\f101"}.icon-double-angle-up:before{content:"\f102"}.icon-double-angle-down:before{content:"\f103"}.icon-angle-left:before{content:"\f104"}.icon-angle-right:before{content:"\f105"}.icon-angle-up:before{content:"\f106"}.icon-angle-down:before{content:"\f107"}.icon-desktop:before{content:"\f108"}.icon-laptop:before{content:"\f109"}.icon-tablet:before{content:"\f10a"}.icon-mobile-phone:before{content:"\f10b"}.icon-circle-blank:before{content:"\f10c"}.icon-quote-left:before{content:"\f10d"}.icon-quote-right:before{content:"\f10e"}.icon-spinner:before{content:"\f110"}.icon-circle:before{content:"\f111"}.icon-mail-reply:before,.icon-reply:before{content:"\f112"}.icon-github-alt:before{content:"\f113"}.icon-folder-close-alt:before{content:"\f114"}.icon-folder-open-alt:before{content:"\f115"}.icon-expand-alt:before{content:"\f116"}.icon-collapse-alt:before{content:"\f117"}.icon-smile:before{content:"\f118"}.icon-frown:before{content:"\f119"}.icon-meh:before{content:"\f11a"}.icon-gamepad:before{content:"\f11b"}.icon-keyboard:before{content:"\f11c"}.icon-flag-alt:before{content:"\f11d"}.icon-flag-checkered:before{content:"\f11e"}.icon-terminal:before{content:"\f120"}.icon-code:before{content:"\f121"}.icon-reply-all:before{content:"\f122"}.icon-mail-reply-all:before{content:"\f122"}.icon-star-half-full:before,.icon-star-half-empty:before{content:"\f123"}.icon-location-arrow:before{content:"\f124"}.icon-crop:before{content:"\f125"}.icon-code-fork:before{content:"\f126"}.icon-unlink:before{content:"\f127"}.icon-question:before{content:"\f128"}.icon-info:before{content:"\f129"}.icon-exclamation:before{content:"\f12a"}.icon-superscript:before{content:"\f12b"}.icon-subscript:before{content:"\f12c"}.icon-eraser:before{content:"\f12d"}.icon-puzzle-piece:before{content:"\f12e"}.icon-microphone:before{content:"\f130"}.icon-microphone-off:before{content:"\f131"}.icon-shield:before{content:"\f132"}.icon-calendar-empty:before{content:"\f133"}.icon-fire-extinguisher:before{content:"\f134"}.icon-rocket:before{content:"\f135"}.icon-maxcdn:before{content:"\f136"}.icon-chevron-sign-left:before{content:"\f137"}.icon-chevron-sign-right:before{content:"\f138"}.icon-chevron-sign-up:before{content:"\f139"}.icon-chevron-sign-down:before{content:"\f13a"}.icon-html5:before{content:"\f13b"}.icon-css3:before{content:"\f13c"}.icon-anchor:before{content:"\f13d"}.icon-unlock-alt:before{content:"\f13e"}.icon-bullseye:before{content:"\f140"}.icon-ellipsis-horizontal:before{content:"\f141"}.icon-ellipsis-vertical:before{content:"\f142"}.icon-rss-sign:before{content:"\f143"}.icon-play-sign:before{content:"\f144"}.icon-ticket:before{content:"\f145"}.icon-minus-sign-alt:before{content:"\f146"}.icon-check-minus:before{content:"\f147"}.icon-level-up:before{content:"\f148"}.icon-level-down:before{content:"\f149"}.icon-check-sign:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:"\f14a"}.icon-edit-sign:before{content:"\f14b"}.icon-external-link-sign:before{content:"\f14c"}.icon-share-sign:before{content:"\f14d"}.icon-compass:before{content:"\f14e"}.icon-collapse:before{content:"\f150"}.icon-collapse-top:before{content:"\f151"}.icon-expand:before{content:"\f152"}.icon-euro:before,.icon-eur:before{content:"\f153"}.icon-gbp:before{content:"\f154"}.icon-dollar:before,.icon-usd:before{content:"\f155"}.icon-rupee:before,.icon-inr:before{content:"\f156"}.icon-yen:before,.icon-jpy:before{content:"\f157"}.icon-renminbi:before,.icon-cny:before{content:"\f158"}.icon-won:before,.icon-krw:before{content:"\f159"}.icon-bitcoin:before,.icon-btc:before{content:"\f15a"}.icon-file:before{content:"\f15b"}.icon-file-text:before{content:"\f15c"}.icon-sort-by-alphabet:before{content:"\f15d"}.icon-sort-by-alphabet-alt:before{content:"\f15e"}.icon-sort-by-attributes:before{content:"\f160"}.icon-sort-by-attributes-alt:before{content:"\f161"}.icon-sort-by-order:before{content:"\f162"}.icon-sort-by-order-alt:before{content:"\f163"}.icon-thumbs-up:before{content:"\f164"}.icon-thumbs-down:before{content:"\f165"}.icon-youtube-sign:before{content:"\f166"}.icon-youtube:before{content:"\f167"}.icon-xing:before{content:"\f168"}.icon-xing-sign:before{content:"\f169"}.icon-youtube-play:before{content:"\f16a"}.icon-dropbox:before{content:"\f16b"}.icon-stackexchange:before{content:"\f16c"}.icon-instagram:before{content:"\f16d"}.icon-flickr:before{content:"\f16e"}.icon-adn:before{content:"\f170"}.icon-bitbucket:before{content:"\f171"}.icon-bitbucket-sign:before{content:"\f172"}.icon-tumblr:before{content:"\f173"}.icon-tumblr-sign:before{content:"\f174"}.icon-long-arrow-down:before{content:"\f175"}.icon-long-arrow-up:before{content:"\f176"}.icon-long-arrow-left:before{content:"\f177"}.icon-long-arrow-right:before{content:"\f178"}.icon-apple:before{content:"\f179"}.icon-windows:before{content:"\f17a"}.icon-android:before{content:"\f17b"}.icon-linux:before{content:"\f17c"}.icon-dribbble:before{content:"\f17d"}.icon-skype:before{content:"\f17e"}.icon-foursquare:before{content:"\f180"}.icon-trello:before{content:"\f181"}.icon-female:before{content:"\f182"}.icon-male:before{content:"\f183"}.icon-gittip:before{content:"\f184"}.icon-sun:before{content:"\f185"}.icon-moon:before{content:"\f186"}.icon-archive:before{content:"\f187"}.icon-bug:before{content:"\f188"}.icon-vk:before{content:"\f189"}.icon-weibo:before{content:"\f18a"}.icon-renren:before{content:"\f18b"}.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso{padding:12px;line-height:24px;margin-bottom:24px}.wy-alert-title,.rst-content .admonition-title{color:#fff;font-weight:bold;display:block;color:#fff;background:transparent;margin:-12px;padding:6px 12px;margin-bottom:12px}.wy-alert.wy-alert-danger,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning,.rst-content .wy-alert-danger.seealso{background:#fdf3f2}.wy-alert.wy-alert-danger .wy-alert-title,.rst-content .wy-alert-danger.note .wy-alert-title,.rst-content .wy-alert-danger.attention .wy-alert-title,.rst-content .wy-alert-danger.caution .wy-alert-title,.rst-content .danger .wy-alert-title,.rst-content .error .wy-alert-title,.rst-content .wy-alert-danger.hint .wy-alert-title,.rst-content .wy-alert-danger.important .wy-alert-title,.rst-content .wy-alert-danger.tip .wy-alert-title,.rst-content .wy-alert-danger.warning .wy-alert-title,.rst-content .wy-alert-danger.seealso .wy-alert-title,.wy-alert.wy-alert-danger .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-danger .admonition-title,.rst-content .wy-alert-danger.note .admonition-title,.rst-content .wy-alert-danger.attention .admonition-title,.rst-content .wy-alert-danger.caution .admonition-title,.rst-content .danger .admonition-title,.rst-content .error .admonition-title,.rst-content .wy-alert-danger.hint .admonition-title,.rst-content .wy-alert-danger.important .admonition-title,.rst-content .wy-alert-danger.tip .admonition-title,.rst-content .wy-alert-danger.warning .admonition-title,.rst-content .wy-alert-danger.seealso .admonition-title{background:#f29f97}.wy-alert.wy-alert-warning,.rst-content .wy-alert-warning.note,.rst-content .attention,.rst-content .caution,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.tip,.rst-content .warning,.rst-content .wy-alert-warning.seealso{background:#ffedcc}.wy-alert.wy-alert-warning .wy-alert-title,.rst-content .wy-alert-warning.note .wy-alert-title,.rst-content .attention .wy-alert-title,.rst-content .caution .wy-alert-title,.rst-content .wy-alert-warning.danger .wy-alert-title,.rst-content .wy-alert-warning.error .wy-alert-title,.rst-content .wy-alert-warning.hint .wy-alert-title,.rst-content .wy-alert-warning.important .wy-alert-title,.rst-content .wy-alert-warning.tip .wy-alert-title,.rst-content .warning .wy-alert-title,.rst-content .wy-alert-warning.seealso .wy-alert-title,.wy-alert.wy-alert-warning .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-warning .admonition-title,.rst-content .wy-alert-warning.note .admonition-title,.rst-content .attention .admonition-title,.rst-content .caution .admonition-title,.rst-content .wy-alert-warning.danger .admonition-title,.rst-content .wy-alert-warning.error .admonition-title,.rst-content .wy-alert-warning.hint .admonition-title,.rst-content .wy-alert-warning.important .admonition-title,.rst-content .wy-alert-warning.tip .admonition-title,.rst-content .warning .admonition-title,.rst-content .wy-alert-warning.seealso .admonition-title{background:#f0b37e}.wy-alert.wy-alert-info,.rst-content .note,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .wy-alert-info.hint,.rst-content .wy-alert-info.important,.rst-content .wy-alert-info.tip,.rst-content .wy-alert-info.warning,.rst-content .seealso{background:#e7f2fa}.wy-alert.wy-alert-info .wy-alert-title,.rst-content .note .wy-alert-title,.rst-content .wy-alert-info.attention .wy-alert-title,.rst-content .wy-alert-info.caution .wy-alert-title,.rst-content .wy-alert-info.danger .wy-alert-title,.rst-content .wy-alert-info.error .wy-alert-title,.rst-content .wy-alert-info.hint .wy-alert-title,.rst-content .wy-alert-info.important .wy-alert-title,.rst-content .wy-alert-info.tip .wy-alert-title,.rst-content .wy-alert-info.warning .wy-alert-title,.rst-content .seealso .wy-alert-title,.wy-alert.wy-alert-info .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-info .admonition-title,.rst-content .note .admonition-title,.rst-content .wy-alert-info.attention .admonition-title,.rst-content .wy-alert-info.caution .admonition-title,.rst-content .wy-alert-info.danger .admonition-title,.rst-content .wy-alert-info.error .admonition-title,.rst-content .wy-alert-info.hint .admonition-title,.rst-content .wy-alert-info.important .admonition-title,.rst-content .wy-alert-info.tip .admonition-title,.rst-content .wy-alert-info.warning .admonition-title,.rst-content .seealso .admonition-title{background:#6ab0de}.wy-alert.wy-alert-success,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-success.warning,.rst-content .wy-alert-success.seealso{background:#dbfaf4}.wy-alert.wy-alert-success .wy-alert-title,.rst-content .wy-alert-success.note .wy-alert-title,.rst-content .wy-alert-success.attention .wy-alert-title,.rst-content .wy-alert-success.caution .wy-alert-title,.rst-content .wy-alert-success.danger .wy-alert-title,.rst-content .wy-alert-success.error .wy-alert-title,.rst-content .hint .wy-alert-title,.rst-content .important .wy-alert-title,.rst-content .tip .wy-alert-title,.rst-content .wy-alert-success.warning .wy-alert-title,.rst-content .wy-alert-success.seealso .wy-alert-title,.wy-alert.wy-alert-success .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-success .admonition-title,.rst-content .wy-alert-success.note .admonition-title,.rst-content .wy-alert-success.attention .admonition-title,.rst-content .wy-alert-success.caution .admonition-title,.rst-content .wy-alert-success.danger .admonition-title,.rst-content .wy-alert-success.error .admonition-title,.rst-content .hint .admonition-title,.rst-content .important .admonition-title,.rst-content .tip .admonition-title,.rst-content .wy-alert-success.warning .admonition-title,.rst-content .wy-alert-success.seealso .admonition-title{background:#1abc9c}.wy-alert.wy-alert-neutral,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning,.rst-content .wy-alert-neutral.seealso{background:#f3f6f6}.wy-alert.wy-alert-neutral strong,.rst-content .wy-alert-neutral.note strong,.rst-content .wy-alert-neutral.attention strong,.rst-content .wy-alert-neutral.caution strong,.rst-content .wy-alert-neutral.danger strong,.rst-content .wy-alert-neutral.error strong,.rst-content .wy-alert-neutral.hint strong,.rst-content .wy-alert-neutral.important strong,.rst-content .wy-alert-neutral.tip strong,.rst-content .wy-alert-neutral.warning strong,.rst-content .wy-alert-neutral.seealso strong{color:#404040}.wy-alert.wy-alert-neutral a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a,.rst-content .wy-alert-neutral.seealso a{color:#2980b9}.wy-tray-container{position:fixed;top:-50px;left:0;width:100%;-webkit-transition:top 0.2s ease-in;-moz-transition:top 0.2s ease-in;transition:top 0.2s ease-in}.wy-tray-container.on{top:0}.wy-tray-container li{display:none;width:100%;background:#343131;padding:12px 24px;color:#fff;margin-bottom:6px;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1),0px -1px 2px -1px rgba(255,255,255,0.5) inset}.wy-tray-container li.wy-tray-item-success{background:#27ae60}.wy-tray-container li.wy-tray-item-info{background:#2980b9}.wy-tray-container li.wy-tray-item-warning{background:#e67e22}.wy-tray-container li.wy-tray-item-danger{background:#e74c3c}.btn{display:inline-block;*display:inline;zoom:1;line-height:normal;white-space:nowrap;vertical-align:baseline;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;font-size:100%;padding:6px 12px;color:#fff;border:1px solid rgba(0,0,0,0.1);border-bottom:solid 3px rgba(0,0,0,0.1);background-color:#27ae60;text-decoration:none;font-weight:500;box-shadow:0px 1px 2px -1px rgba(255,255,255,0.5) inset;-webkit-transition:all 0.1s linear;-moz-transition:all 0.1s linear;transition:all 0.1s linear;outline-none:false}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;color:#fff;outline:0}.btn:active{border-top:solid 3px rgba(0,0,0,0.1);border-bottom:solid 1px rgba(0,0,0,0.1);box-shadow:0px 1px 2px -1px rgba(0,0,0,0.5) inset}.btn[disabled]{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled:hover,.btn-disabled:focus,.btn-disabled:active{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980b9 !important}.btn-info:hover{background-color:#2e8ece !important}.btn-neutral{background-color:#f3f6f6 !important;color:#404040 !important}.btn-neutral:hover{background-color:#e5ebeb !important;color:#404040}.btn-danger{background-color:#e74c3c !important}.btn-danger:hover{background-color:#ea6153 !important}.btn-warning{background-color:#e67e22 !important}.btn-warning:hover{background-color:#e98b39 !important}.btn-invert{background-color:#343131}.btn-invert:hover{background-color:#413d3d !important}.btn-link{background-color:transparent !important;color:#2980b9;border-color:transparent}.btn-link:hover{background-color:transparent !important;color:#409ad5;border-color:transparent}.btn-link:active{background-color:transparent !important;border-color:transparent;border-top:solid 1px transparent;border-bottom:solid 3px transparent}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:before,.wy-btn-group:after{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown:hover .wy-dropdown-menu{display:block}.wy-dropdown .caret:after{font-family:fontawesome-webfont;content:"\f0d7";font-size:70%}.wy-dropdown-menu{position:absolute;top:100%;left:0;display:none;float:left;min-width:100%;background:#fcfcfc;z-index:100;border:solid 1px #cfd7dd;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px}.wy-dropdown-menu>dd>a:hover{background:#2980b9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:solid 1px #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search input[type="search"]{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980b9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned input,.wy-form-aligned textarea,.wy-form-aligned select,.wy-form-aligned .wy-help-inline,.wy-form-aligned label{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:0.5em 1em 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:0.5em}fieldset{border:0;margin:0;padding:0}legend{display:block;width:100%;border:0;padding:0;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label{display:block;margin:0 0 0.3125em 0;color:#999;font-size:90%}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button{-webkit-appearance:button;cursor:pointer;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}button[disabled]{cursor:default}input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;*overflow:visible}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"]{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}input[type="datetime-local"]{padding:0.34375em 0.625em}input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin-right:0.3125em;*height:13px;*width:13px}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}input[type="text"]:focus,input[type="password"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus{outline:0;outline:thin dotted \9;border-color:#2980b9}input.no-focus:focus{border-color:#ccc !important}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:1px auto #129fea}input[type="text"][disabled],input[type="password"][disabled],input[type="email"][disabled],input[type="url"][disabled],input[type="date"][disabled],input[type="month"][disabled],input[type="time"][disabled],input[type="datetime"][disabled],input[type="datetime-local"][disabled],input[type="week"][disabled],input[type="number"][disabled],input[type="search"][disabled],input[type="tel"][disabled],input[type="color"][disabled]{cursor:not-allowed;background-color:#f3f6f6;color:#cad2d3}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#e74c3c;border:1px solid #e74c3c}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d}input[type="file"]:focus:invalid:focus,input[type="radio"]:focus:invalid:focus,input[type="checkbox"]:focus:invalid:focus{outline-color:#e9322d}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%}select,textarea{padding:0.5em 0.625em;display:inline-block;border:1px solid #ccc;font-size:0.8em;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}select{border:1px solid #ccc;background-color:#fff}select[multiple]{height:auto}select:focus,textarea:focus{outline:0}select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#fff;color:#cad2d3;border-color:transparent}.wy-checkbox,.wy-radio{margin:0.5em 0;color:#404040 !important;display:block}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{padding:6px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:solid 1px #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:0.5em 0.625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27ae60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#e74c3c}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#e67e22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980b9}.wy-control-group{margin-bottom:24px;*zoom:1}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error label{color:#e74c3c}.wy-control-group.wy-control-group-error input[type="text"],.wy-control-group.wy-control-group-error input[type="password"],.wy-control-group.wy-control-group-error input[type="email"],.wy-control-group.wy-control-group-error input[type="url"],.wy-control-group.wy-control-group-error input[type="date"],.wy-control-group.wy-control-group-error input[type="month"],.wy-control-group.wy-control-group-error input[type="time"],.wy-control-group.wy-control-group-error input[type="datetime"],.wy-control-group.wy-control-group-error input[type="datetime-local"],.wy-control-group.wy-control-group-error input[type="week"],.wy-control-group.wy-control-group-error input[type="number"],.wy-control-group.wy-control-group-error input[type="search"],.wy-control-group.wy-control-group-error input[type="tel"],.wy-control-group.wy-control-group-error input[type="color"]{border:solid 2px #e74c3c}.wy-control-group.wy-control-group-error textarea{border:solid 2px #e74c3c}.wy-control-group.fluid-input input[type="text"],.wy-control-group.fluid-input input[type="password"],.wy-control-group.fluid-input input[type="email"],.wy-control-group.fluid-input input[type="url"],.wy-control-group.fluid-input input[type="date"],.wy-control-group.fluid-input input[type="month"],.wy-control-group.fluid-input input[type="time"],.wy-control-group.fluid-input input[type="datetime"],.wy-control-group.fluid-input input[type="datetime-local"],.wy-control-group.fluid-input input[type="week"],.wy-control-group.fluid-input input[type="number"],.wy-control-group.fluid-input input[type="search"],.wy-control-group.fluid-input input[type="tel"],.wy-control-group.fluid-input input[type="color"]{width:100%}.wy-form-message-inline{display:inline-block;padding-left:0.3em;color:#666;vertical-align:middle;font-size:90%}.wy-form-message{display:block;color:#ccc;font-size:70%;margin-top:0.3125em;font-style:italic}.wy-tag-input-group{padding:4px 4px 0px 4px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}.wy-tag-input-group .wy-tag{display:inline-block;background-color:rgba(0,0,0,0.1);padding:0.5em 0.625em;border-radius:2px;position:relative;margin-bottom:4px}.wy-tag-input-group .wy-tag .wy-tag-remove{color:#ccc;margin-left:5px}.wy-tag-input-group .wy-tag .wy-tag-remove:hover{color:#e74c3c}.wy-tag-input-group label{margin-left:5px;display:inline-block;margin-bottom:0}.wy-tag-input-group input{border:none;font-size:100%;margin-bottom:4px;box-shadow:none}.wy-form-upload{border:solid 1px #ccc;border-bottom:solid 3px #ccc;background-color:#fff;padding:24px;display:inline-block;text-align:center;cursor:pointer;color:#404040;-webkit-transition:border-color 0.1s ease-in;-moz-transition:border-color 0.1s ease-in;transition:border-color 0.1s ease-in;*zoom:1}.wy-form-upload:before,.wy-form-upload:after{display:table;content:""}.wy-form-upload:after{clear:both}@media screen and (max-width: 480px){.wy-form-upload{width:100%}}.wy-form-upload .image-drop{display:none}.wy-form-upload .image-desktop{display:none}.wy-form-upload .image-loading{display:none}.wy-form-upload .wy-form-upload-icon{display:block;font-size:32px;color:#b3b3b3}.wy-form-upload .image-drop .wy-form-upload-icon{color:#27ae60}.wy-form-upload p{font-size:90%}.wy-form-upload .wy-form-upload-image{float:left;margin-right:24px}@media screen and (max-width: 480px){.wy-form-upload .wy-form-upload-image{width:100%;margin-bottom:24px}}.wy-form-upload img{max-width:125px;max-height:125px;opacity:0.9;-webkit-transition:opacity 0.1s ease-in;-moz-transition:opacity 0.1s ease-in;transition:opacity 0.1s ease-in}.wy-form-upload .wy-form-upload-content{float:left}@media screen and (max-width: 480px){.wy-form-upload .wy-form-upload-content{width:100%}}.wy-form-upload:hover{border-color:#b3b3b3;color:#404040}.wy-form-upload:hover .image-desktop{display:block}.wy-form-upload:hover .image-drag{display:none}.wy-form-upload:hover img{opacity:1}.wy-form-upload:active{border-top:solid 3px #ccc;border-bottom:solid 1px #ccc}.wy-form-upload.wy-form-upload-big{width:100%;text-align:center;padding:72px}.wy-form-upload.wy-form-upload-big .wy-form-upload-content{float:none}.wy-form-upload.wy-form-upload-file p{margin-bottom:0}.wy-form-upload.wy-form-upload-file .wy-form-upload-icon{display:inline-block;font-size:inherit}.wy-form-upload.wy-form-upload-drop{background-color:#ddf7e8}.wy-form-upload.wy-form-upload-drop .image-drop{display:block}.wy-form-upload.wy-form-upload-drop .image-desktop{display:none}.wy-form-upload.wy-form-upload-drop .image-drag{display:none}.wy-form-upload.wy-form-upload-loading .image-drag{display:none}.wy-form-upload.wy-form-upload-loading .image-desktop{display:none}.wy-form-upload.wy-form-upload-loading .image-loading{display:block}.wy-form-upload.wy-form-upload-loading .wy-input-prefix{display:none}.wy-form-upload.wy-form-upload-loading p{margin-bottom:0}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}.wy-form-gallery-manage{margin-left:-12px;margin-right:-12px}.wy-form-gallery-manage li{float:left;padding:12px;width:20%;cursor:pointer}@media screen and (max-width: 768px){.wy-form-gallery-manage li{width:25%}}@media screen and (max-width: 480px){.wy-form-gallery-manage li{width:50%}}.wy-form-gallery-manage li:active{cursor:move}.wy-form-gallery-manage li>a{padding:12px;background-color:#fff;border:solid 1px #e1e4e5;border-bottom:solid 3px #e1e4e5;display:inline-block;-webkit-transition:all 0.1s ease-in;-moz-transition:all 0.1s ease-in;transition:all 0.1s ease-in}.wy-form-gallery-manage li>a:active{border:solid 1px #ccc;border-top:solid 3px #ccc}.wy-form-gallery-manage img{width:100%;-webkit-transition:all 0.05s ease-in;-moz-transition:all 0.05s ease-in;transition:all 0.05s ease-in}li.wy-form-gallery-edit{position:relative;color:#fff;padding:24px;width:100%;display:block;background-color:#343131;border-radius:4px}li.wy-form-gallery-edit .arrow{position:absolute;display:block;top:-50px;left:50%;margin-left:-25px;z-index:500;height:0;width:0;border-color:transparent;border-style:solid;border-width:25px;border-bottom-color:#343131}@media only screen and (max-width: 480px){.wy-form button[type="submit"]{margin:0.7em 0 0}.wy-form input[type="text"],.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0.3em;display:block}.wy-form label{margin-bottom:0.3em;display:block}.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:0.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-controls{margin:1.5em 0 0 0}.wy-form .wy-help-inline,.wy-form-message-inline,.wy-form-message{display:block;font-size:80%;padding:0.2em 0 0.8em}}@media screen and (max-width: 768px){.tablet-hide{display:none}}@media screen and (max-width: 480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.wy-grid-one-col{*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;max-width:1066px;margin-top:1.618em}.wy-grid-one-col:before,.wy-grid-one-col:after{display:table;content:""}.wy-grid-one-col:after{clear:both}.wy-grid-one-col section{display:block;float:left;margin-right:2.35765%;width:100%;background:#fcfcfc;padding:1.618em;margin-right:0}.wy-grid-one-col section:last-child{margin-right:0}.wy-grid-index-card{*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;max-width:460px;margin-top:1.618em;background:#fcfcfc;padding:1.618em}.wy-grid-index-card:before,.wy-grid-index-card:after{display:table;content:""}.wy-grid-index-card:after{clear:both}.wy-grid-index-card header,.wy-grid-index-card section,.wy-grid-index-card aside{display:block;float:left;margin-right:2.35765%;width:100%}.wy-grid-index-card header:last-child,.wy-grid-index-card section:last-child,.wy-grid-index-card aside:last-child{margin-right:0}.wy-grid-index-card.twocol{max-width:768px}.wy-grid-index-card.twocol section{display:block;float:left;margin-right:2.35765%;width:48.82117%}.wy-grid-index-card.twocol section:last-child{margin-right:0}.wy-grid-index-card.twocol aside{display:block;float:left;margin-right:2.35765%;width:48.82117%}.wy-grid-index-card.twocol aside:last-child{margin-right:0}.wy-grid-search-filter{*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;margin-bottom:24px}.wy-grid-search-filter:before,.wy-grid-search-filter:after{display:table;content:""}.wy-grid-search-filter:after{clear:both}.wy-grid-search-filter .wy-grid-search-filter-input{display:block;float:left;margin-right:2.35765%;width:74.41059%}.wy-grid-search-filter .wy-grid-search-filter-input:last-child{margin-right:0}.wy-grid-search-filter .wy-grid-search-filter-btn{display:block;float:left;margin-right:2.35765%;width:23.23176%}.wy-grid-search-filter .wy-grid-search-filter-btn:last-child{margin-right:0}.wy-table,.rst-content table.docutils,.rst-content table.field-list{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.wy-table caption,.rst-content table.docutils caption,.rst-content table.field-list caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td,.wy-table th,.rst-content table.docutils th,.rst-content table.field-list th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.wy-table td:first-child,.rst-content table.docutils td:first-child,.rst-content table.field-list td:first-child,.wy-table th:first-child,.rst-content table.docutils th:first-child,.rst-content table.field-list th:first-child{border-left-width:0}.wy-table thead,.rst-content table.docutils thead,.rst-content table.field-list thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.wy-table thead th,.rst-content table.docutils thead th,.rst-content table.field-list thead th{font-weight:bold;border-bottom:solid 2px #e1e4e5}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td{background-color:transparent;vertical-align:middle}.wy-table td p,.rst-content table.docutils td p,.rst-content table.field-list td p{line-height:18px;margin-bottom:0}.wy-table .wy-table-cell-min,.rst-content table.docutils .wy-table-cell-min,.rst-content table.field-list .wy-table-cell-min{width:1%;padding-right:0}.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox],.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox]{margin:0}.wy-table-secondary{color:gray;font-size:90%}.wy-table-tertiary{color:gray;font-size:80%}.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td,.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td{background-color:#f3f6f6}.wy-table-backed{background-color:#f3f6f6}.wy-table-bordered-all,.rst-content table.docutils{border:1px solid #e1e4e5}.wy-table-bordered-all td,.rst-content table.docutils td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.wy-table-bordered-all tbody>tr:last-child td,.rst-content table.docutils tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0 !important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}html{height:100%;overflow-x:hidden}body{font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;font-weight:normal;color:#404040;min-height:100%;overflow-x:hidden;background:#edf0f2}a{color:#2980b9;text-decoration:none}a:hover{color:#3091d1}.link-danger{color:#e74c3c}.link-danger:hover{color:#d62c1a}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}h1,h2,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif}p{line-height:24px;margin:0;font-size:16px;margin-bottom:24px}h1{font-size:175%}h2{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}small{font-size:80%}code,.rst-content tt{white-space:nowrap;max-width:100%;background:#fff;border:solid 1px #e1e4e5;font-size:75%;padding:0 5px;font-family:"Incosolata","Consolata","Monaco",monospace;color:#e74c3c;overflow-x:auto}code.code-large,.rst-content tt.code-large{font-size:90%}.full-width{width:100%}.wy-plain-list-disc,.rst-content .section ul,.rst-content .toctree-wrapper ul{list-style:disc;line-height:24px;margin-bottom:24px}.wy-plain-list-disc li,.rst-content .section ul li,.rst-content .toctree-wrapper ul li{list-style:disc;margin-left:24px}.wy-plain-list-disc li ul,.rst-content .section ul li ul,.rst-content .toctree-wrapper ul li ul{margin-bottom:0}.wy-plain-list-disc li li,.rst-content .section ul li li,.rst-content .toctree-wrapper ul li li{list-style:circle}.wy-plain-list-disc li li li,.rst-content .section ul li li li,.rst-content .toctree-wrapper ul li li li{list-style:square}.wy-plain-list-decimal,.rst-content .section ol,.rst-content ol.arabic{list-style:decimal;line-height:24px;margin-bottom:24px}.wy-plain-list-decimal li,.rst-content .section ol li,.rst-content ol.arabic li{list-style:decimal;margin-left:24px}.wy-type-large{font-size:120%}.wy-type-normal{font-size:100%}.wy-type-small{font-size:100%}.wy-type-strike{text-decoration:line-through}.wy-text-warning{color:#e67e22 !important}a.wy-text-warning:hover{color:#eb9950 !important}.wy-text-info{color:#2980b9 !important}a.wy-text-info:hover{color:#409ad5 !important}.wy-text-success{color:#27ae60 !important}a.wy-text-success:hover{color:#36d278 !important}.wy-text-danger{color:#e74c3c !important}a.wy-text-danger:hover{color:#ed7669 !important}.wy-text-neutral{color:#404040 !important}a.wy-text-neutral:hover{color:#595959 !important}.codeblock-example{border:1px solid #e1e4e5;border-bottom:none;padding:24px;padding-top:48px;font-weight:500;background:#fff;position:relative}.codeblock-example:after{content:"Example";position:absolute;top:0px;left:0px;background:#9b59b6;color:#fff;padding:6px 12px}.codeblock-example.prettyprint-example-only{border:1px solid #e1e4e5;margin-bottom:24px}.codeblock,.rst-content .literal-block,div[class^='highlight']{border:1px solid #e1e4e5;padding:0px;overflow-x:auto;background:#fff;margin:1px 0 24px 0}.codeblock div[class^='highlight'],.rst-content .literal-block div[class^='highlight'],div[class^='highlight'] div[class^='highlight']{border:none;background:none;margin:0}div[class^='highlight'] td.code{width:100%}.linenodiv pre{border-right:solid 1px #e6e9ea;margin:0;padding:12px 12px;font-family:"Incosolata","Consolata","Monaco",monospace;font-size:12px;line-height:1.5;color:#d9d9d9}div[class^='highlight'] pre{white-space:pre;margin:0;padding:12px 12px;font-family:"Incosolata","Consolata","Monaco",monospace;font-size:12px;line-height:1.5;display:block;overflow:auto;color:#404040}pre.literal-block{@extends .codeblock;}@media print{.codeblock,.rst-content .literal-block,div[class^='highlight'],div[class^='highlight'] pre{white-space:pre-wrap}}.hll{background-color:#ffc;margin:0 -12px;padding:0 12px;display:block}.c{color:#998;font-style:italic}.err{color:#a61717;background-color:#e3d2d2}.k{font-weight:bold}.o{font-weight:bold}.cm{color:#998;font-style:italic}.cp{color:#999;font-weight:bold}.c1{color:#998;font-style:italic}.cs{color:#999;font-weight:bold;font-style:italic}.gd{color:#000;background-color:#fdd}.gd .x{color:#000;background-color:#faa}.ge{font-style:italic}.gr{color:#a00}.gh{color:#999}.gi{color:#000;background-color:#dfd}.gi .x{color:#000;background-color:#afa}.go{color:#888}.gp{color:#555}.gs{font-weight:bold}.gu{color:purple;font-weight:bold}.gt{color:#a00}.kc{font-weight:bold}.kd{font-weight:bold}.kn{font-weight:bold}.kp{font-weight:bold}.kr{font-weight:bold}.kt{color:#458;font-weight:bold}.m{color:#099}.s{color:#d14}.n{color:#333}.na{color:teal}.nb{color:#0086b3}.nc{color:#458;font-weight:bold}.no{color:teal}.ni{color:purple}.ne{color:#900;font-weight:bold}.nf{color:#900;font-weight:bold}.nn{color:#555}.nt{color:navy}.nv{color:teal}.ow{font-weight:bold}.w{color:#bbb}.mf{color:#099}.mh{color:#099}.mi{color:#099}.mo{color:#099}.sb{color:#d14}.sc{color:#d14}.sd{color:#d14}.s2{color:#d14}.se{color:#d14}.sh{color:#d14}.si{color:#d14}.sx{color:#d14}.sr{color:#009926}.s1{color:#d14}.ss{color:#990073}.bp{color:#999}.vc{color:teal}.vg{color:teal}.vi{color:teal}.il{color:#099}.gc{color:#999;background-color:#eaf2f5}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width: 480px){.wy-breadcrumbs-extra{display:none}.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:before,.wy-menu-horiz:after{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz ul,.wy-menu-horiz li{display:inline-block}.wy-menu-horiz li:hover{background:rgba(255,255,255,0.1)}.wy-menu-horiz li.divide-left{border-left:solid 1px #404040}.wy-menu-horiz li.divide-right{border-right:solid 1px #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical header{height:32px;display:inline-block;line-height:32px;padding:0 1.618em;display:block;font-weight:bold;text-transform:uppercase;font-size:80%;color:#2980b9;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:solid 1px #404040}.wy-menu-vertical li.divide-bottom{border-bottom:solid 1px #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:gray;border-right:solid 1px #c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a{color:#404040;padding:0.4045em 1.618em;font-weight:bold;position:relative;background:#fcfcfc;border:none;border-bottom:solid 1px #c9c9c9;border-top:solid 1px #c9c9c9;padding-left:1.618em -4px}.wy-menu-vertical li.on a:hover,.wy-menu-vertical li.current>a:hover{background:#fcfcfc}.wy-menu-vertical li.tocktree-l2.current>a{background:#c9c9c9}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical .local-toc li ul{display:block}.wy-menu-vertical li ul li a{margin-bottom:0;color:#b3b3b3;font-weight:normal}.wy-menu-vertical a{display:inline-block;line-height:18px;padding:0.4045em 1.618em;display:block;position:relative;font-size:90%;color:#b3b3b3}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:active{background-color:#2980b9;cursor:pointer;color:#fff}.wy-side-nav-search{z-index:200;background-color:#2980b9;text-align:center;padding:0.809em;display:block;color:#fcfcfc;margin-bottom:0.809em}.wy-side-nav-search input[type=text]{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto 0.809em auto;height:45px;width:45px;background-color:#2980b9;padding:5px;border-radius:100%}.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a{color:#fcfcfc;font-size:100%;font-weight:bold;display:inline-block;padding:4px 6px;margin-bottom:0.809em}.wy-side-nav-search>a:hover,.wy-side-nav-search .wy-dropdown>a:hover{background:rgba(255,255,255,0.1)}.wy-nav .wy-menu-vertical header{color:#2980b9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980b9;color:#fff}[data-menu-wrap]{-webkit-transition:all 0.2s ease-in;-moz-transition:all 0.2s ease-in;transition:all 0.2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}[data-menu-wrap].move-center{left:0;right:auto;opacity:1}[data-menu-wrap].move-left{right:auto;left:-100%;opacity:0}[data-menu-wrap].move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:left repeat-y #fcfcfc;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOERBMTRGRDBFMUUxMUUzODUwMkJCOThDMEVFNURFMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOERBMTRGRTBFMUUxMUUzODUwMkJCOThDMEVFNURFMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE4REExNEZCMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE4REExNEZDMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+EwrlwAAAAA5JREFUeNpiMDU0BAgwAAE2AJgB9BnaAAAAAElFTkSuQmCC);background-size:300px 1px}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:absolute;top:0;left:0;width:300px;overflow:hidden;min-height:100%;background:#343131;z-index:200}.wy-nav-top{display:none;background:#2980b9;color:#fff;padding:0.4045em 0.809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:before,.wy-nav-top:after{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:bold}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980b9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,0.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:#999}footer p{margin-bottom:12px}.rst-footer-buttons{*zoom:1}.rst-footer-buttons:before,.rst-footer-buttons:after{display:table;content:""}.rst-footer-buttons:after{clear:both}#search-results .search li{margin-bottom:24px;border-bottom:solid 1px #e1e4e5;padding-bottom:24px}#search-results .search li:first-child{border-top:solid 1px #e1e4e5;padding-top:24px}#search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}#search-results .context{color:gray;font-size:90%}@media screen and (max-width: 768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width: 1400px){.wy-nav-content-wrap{background:rgba(0,0,0,0.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.wy-nav-side{display:none}.wy-nav-content-wrap{margin-left:0}}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .icon,.rst-versions .rst-current-version .wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-success .rst-versions .rst-current-version .wy-input-context,.rst-versions .rst-current-version .wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .rst-versions .rst-current-version .wy-input-context,.rst-versions .rst-current-version .wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .rst-versions .rst-current-version .wy-input-context,.rst-versions .rst-current-version .wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-info .rst-versions .rst-current-version .wy-input-context,.rst-versions .rst-current-version .wy-tag-input-group .wy-tag .wy-tag-remove,.wy-tag-input-group .wy-tag .rst-versions .rst-current-version .wy-tag-remove,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-content dl dt .rst-versions .rst-current-version .headerlink{color:#fcfcfc}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}.rst-content img{max-width:100%;height:auto !important}.rst-content .section>img{margin-bottom:24px}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content .note .last,.rst-content .attention .last,.rst-content .caution .last,.rst-content .danger .last,.rst-content .error .last,.rst-content .hint .last,.rst-content .important .last,.rst-content .tip .last,.rst-content .warning .last,.rst-content .seealso .last{margin-bottom:0}.rst-content .admonition-title:before{margin-right:4px}.rst-content .admonition table{border-color:rgba(0,0,0,0.1)}.rst-content .admonition table td,.rst-content .admonition table th{background:transparent !important;border-color:rgba(0,0,0,0.1) !important}.rst-content .section ol.loweralpha,.rst-content .section ol.loweralpha li{list-style:lower-alpha}.rst-content .section ol.upperalpha,.rst-content .section ol.upperalpha li{list-style:upper-alpha}.rst-content .section ol p,.rst-content .section ul p{margin-bottom:12px}.rst-content .line-block{margin-left:24px}.rst-content .topic-title{font-weight:bold;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0px 0px 24px 24px}.rst-content .align-left{float:left;margin:0px 24px 24px 0px}.rst-content .align-center{margin:auto;display:block}.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink{display:none;visibility:hidden;font-size:14px}.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content dl dt .headerlink:after{visibility:visible;content:"\f0c1";font-family:fontawesome-webfont;display:inline-block}.rst-content h1:hover .headerlink,.rst-content h2:hover .headerlink,.rst-content h3:hover .headerlink,.rst-content h4:hover .headerlink,.rst-content h5:hover .headerlink,.rst-content h6:hover .headerlink,.rst-content dl dt:hover .headerlink{display:inline-block}.rst-content .sidebar{float:right;width:40%;display:block;margin:0 0 24px 24px;padding:24px;background:#f3f6f6;border:solid 1px #e1e4e5}.rst-content .sidebar p,.rst-content .sidebar ul,.rst-content .sidebar dl{font-size:90%}.rst-content .sidebar .last{margin-bottom:0}.rst-content .sidebar .sidebar-title{display:block;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif;font-weight:bold;background:#e1e4e5;padding:6px 12px;margin:-24px;margin-bottom:24px;font-size:100%}.rst-content .highlighted{background:#f1c40f;display:inline-block;font-weight:bold;padding:0 6px}.rst-content .footnote-reference,.rst-content .citation-reference{vertical-align:super;font-size:90%}.rst-content table.docutils.citation,.rst-content table.docutils.footnote{background:none;border:none;color:#999}.rst-content table.docutils.citation td,.rst-content table.docutils.citation tr,.rst-content table.docutils.footnote td,.rst-content table.docutils.footnote tr{border:none;background-color:transparent !important;white-space:normal}.rst-content table.docutils.citation td.label,.rst-content table.docutils.footnote td.label{padding-left:0;padding-right:0;vertical-align:top}.rst-content table.field-list{border:none}.rst-content table.field-list td{border:none}.rst-content table.field-list .field-name{padding-right:10px;text-align:left;white-space:nowrap}.rst-content table.field-list .field-body{text-align:left;padding-left:0}.rst-content tt{color:#000}.rst-content tt big,.rst-content tt em{font-size:100% !important;line-height:normal}.rst-content tt .xref,a .rst-content tt{font-weight:bold}.rst-content dl{margin-bottom:24px}.rst-content dl dt{font-weight:bold}.rst-content dl p,.rst-content dl table,.rst-content dl ul,.rst-content dl ol{margin-bottom:12px !important}.rst-content dl dd{margin:0 0 12px 24px}.rst-content dl:not(.docutils){margin-bottom:24px}.rst-content dl:not(.docutils) dt{display:inline-block;margin:6px 0;font-size:90%;line-height:normal;background:#e7f2fa;color:#2980b9;border-top:solid 3px #6ab0de;padding:6px;position:relative}.rst-content dl:not(.docutils) dt:before{color:#6ab0de}.rst-content dl:not(.docutils) dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dl dt{margin-bottom:6px;border:none;border-left:solid 3px #ccc;background:#f0f0f0;color:gray}.rst-content dl:not(.docutils) dl dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dt:first-child{margin-top:0}.rst-content dl:not(.docutils) tt{font-weight:bold}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descclassname{background-color:transparent;border:none;padding:0;font-size:100% !important}.rst-content dl:not(.docutils) tt.descname{font-weight:bold}.rst-content dl:not(.docutils) .optional{display:inline-block;padding:0 4px;color:#000;font-weight:bold}.rst-content dl:not(.docutils) .property{display:inline-block;padding-right:8px}.rst-content .viewcode-link,.rst-content .viewcode-back{display:inline-block;color:#27ae60;font-size:80%;padding-left:24px}.rst-content .viewcode-back{display:block;float:right}@media screen and (max-width: 480px){.rst-content .sidebar{width:100%}}span[id*='MathJax-Span']{color:#404040}
diff --git a/docs/_themes/sphinx_rtd_theme/static/favicon.ico b/docs/_themes/sphinx_rtd_theme/static/favicon.ico
deleted file mode 100644
index 6970cfde25f4158dcde472becc0e56d7eb26d10c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6261
zcmV-*7>ehKP)<h;3K|Lk000e1NJLTq001xm001x$1^@s62a+Yk00006VoOIv|NsC0
z|NjYC_uK#g010qNS#tmY07w7;07w8v$!k6U000Sga6xAP001xm001xm&hCs?000;O
zNkl<Zc-rmTcc4|(wJz}A+^293Ql%<_Ac`Uu#70mQ4Y8sq7DQu>8e8l=#*$c~#(-#0
zjImu?ED<#dVnJg8d!?vRK#G9W!>PNh`Tp4JAaG-HAtvO$_r^ctjCJ;2bFS~3W6Uwe
zTs!!`Mn;@`;KeK3F`v1)>|w&_!VPU^kU2H^>(*D{Ih}jg6R!%7_PUI4voV`pi><<m
z9Y+z5r0H$gLsCAHa0{iA(V8$CcaVRYcrFcR5H3}yJ`=mh&AXd;pzvuzIMPjDv>`MN
zmn_&0d&Tv`Mbu5spU`eGb;lJZSB?wo8n!i;;Zp}bzQU*^-jM58ay})`RE}>xi!iXX
z<wn;Lj}Lcuy9aM;vdR90zLs@Ag>aDAWqaa1+HNowz4dQbhvs^<=!W|wWxqsMh0=*Q
zSj_A|Xi6ALoFJEU!ZXTq4-iI$gR(~w)^~bULTGKs{81F<#hDA2Q2%rxTm2w)d*pTr
zUr^t_@NC?UT$g0`1+V-E6L9^lKYVzFQNgDz-Wjh2TkpKvgP9RzZVv4#h7*s>pWLp3
zFg}dwF`LjXGr!+HxZfdt2N1_<y7e`L=B{0T3&P!DQ27N|CKnz;5JEKw;ZfwUCjz!X
zsc1t)Q7M`$Gaub;<Q>9b=Np5)bc=@*&v#&~qG8*@=CK8}?Q>_D$?`$D?ZR!;-JIY3
z%MoNd6mA&*^U`$<^LNYqO~1Nkg;B|F^A8zi0ZVR~e`)Kbm|ik?=eC6FOFryB2WOkV
z!yXu5!bT?&9t-{2zeVV*y5-q8%!HDCv5Sp$L`#VsQecY`jYdgo<x^dk{(q5b2#+}g
zLT$JL;>GTO+$)7?0X0+eivwyp<+g*muk+I&H#unsg*M4SOP1p=hEDDCALIeUU)#6i
zDi<y++?tt#7fXgTJA-g?$;(|fBeW0AxBD-`{BYiYA($5*?AHxlOzrVLVP^PQ=6;-{
z52%+-brI5><Zn)(kOJMH05(bWVC^8>;t24Bd5}zumC$fU;UK7;m;VHo?~;21>IdWx
zfZXNDVo>T&pr8Ane+q?U+=vDL0Uj`7#GpaofzZ^J#AfAZ>rEJ1yHU$cP@UO!i(eCB
zxa{D^2#<x|4s1i%RI81TLf>#qiz!&9A@eqVq?<)pq(&RxuJHIB6KK3%Dg&Bn0uIpt
z;Ywu?eyK0y4~-W>-2?e%P&F|-9;)}vZ4S9>lOjQLViyQ^g<%k`DSA+RJf2(MkwVM(
z@Y3P`0Uj_syZ=1!nPsK-<9&-doj~S~VZ_dx6Xv*P-+?$W<aeHkQ^FNpI}m;;TTz0|
zWy0ggrop354&Scy)t|A^ZuEn%ioiHP4+u?M3SnmG2XR>373zOd*bQn%=I?@<dvc#b
zU6=e3keipxfY>FT3gHr4gIB}eMWW-g#^Kj~_V73gQwocJdDc4cfRPs+&}Wqk)s8D4
zfkS+@;VHyx&Fz0GVYZzH4a2P-*?U96H7;%WTa>4vr2UH6+!(F%tK9dy7FRZfz9e1o
zR~LZ_!)ycoYBJ<6Nk%}nXJJ2BK07xRs<+6ML*3T-93&m%u@IgLdqSpj7y%Bo2{^>2
z$tlF6J+XWP+!r5T_+z|b;<7W>MF?uE?JD*qrglFMH#uzY9%QZxHyv~nw(@oFF}Tkk
znlHyL#_Ei`HduM{Tr;UnV|zQLkU7RB5bsdjEXO1pLG@Po!LYnpb~4m$k}p8MZR$D?
zdji5&VK{^*wE|nE<1BM1D7AU^Y*hGqW*2l1?Pd-qvu~!b?BAIMjU0JEcQ8FZ-Q)>u
z5V~&sCPo@Da7V%b`whMZ2b#3)q3Eo0%O{Xe0n4T<JippX|3}hD)EqSs#u*5qm1804
zY9nZvUpN%1v$-9h`cJu|p>BSDKIHdK27|A?37L5zfpEXh;3w)pbvj<wY*4PD;Sqf8
z)oHsCpN}VfaWG*syXXFuS<uLlgZ5ZqY=T_b)xN~i{OO$vXkm|oIuh=5^^o2;IULfz
z0ZlY1d&SzX@J30}@0X=}!-mBb8t&B_yyj)7dp17;me0*S0L#W_UxS9j3&o{=Ks*7w
zU0l&&co?vPTBLz&)lI&Dyo?e|Hfio_#L8sEZQGMPkyJdnkZ@ACZOSVd|4Ny)Lcfd3
z>~-s(i3;_-zd|;QI&d4z3_sd_LzJp0TZB^o+_Gr=_I$OVg-Xbb5AQ(ICJut?&vR$N
zk~bRGgQYJvTm;z;g<pc>(!Jt=@K*>Yg~LFbG_747_{>UImSJohQ`nJsUOZ#|L}Ksw
zgO6V#|I_Ty8M{%qy3jd!>w64Azc_Q>y;ioH|333L%&#kSEv=>Ltnh<gSK|&PKRN<C
zDBETP9?`kwR!CA8PS$K(N&1b(5LH{W!&~+Tt%`e2{_<o1)XmN}g=LGg6;NGW%-b6-
zDfEC$|6<k>YFr6kHVkZU5?JK<l<4=<88i~oG`${7A&&Fh+((HU$AdolIdP(0zwAu=
zn>RXc`3z=s|E$!z-y;FdT4zpM*`9nzLrHjo4ok{vS}i4>A8y}$0AYbs2JKF`+LZOr
z$1$RDXq-!74F@hO=INTK08LW@UMj}=_<C`Ztvx%x43-tL_rvntbFV`Fo@5wgeiy!g
zkheJ)?5UK{FH&HyO!b!O$QPvgYY@|!*Qt+}Vw`c)vcx{I&xGSKD*ol0(^<Odq6np3
zOWXS3dkjHM>WTz3>P|z-mal&$WjlwiJ0C=N)a`xlBV6FZ&Lgp{4&~>g#Tss^`E<oM
zr1rM<gz%PoAQM9l@^{9uP~9@OD=eFw%|XqNbK66qL%OMM74Ly?w{oz@ih`_PI>M1D
z!0)B@oK#<y5<U=oV@BZ_;_u_AZwBMec+UqjNXnCKCw3q|KiO%?Z^(DZ&w%?s{-mqg
z@4*8`j@+jm=#U*^FOtogUuQg-dG()ea546>#h!I&V_?s1&@>D!uSBA)fxc}K{3B@$
zP3a1^Nio`oS5kns3Ohq#YMc$Vx90bQWu3D3LiMy<bI9#qxEeB#7W4KnJQM*uD7|mv
zIQ6=xe>EnSmxEwEP;jX{W_U*_##^v_1Wq&j{ilh?+xngHELpT{*Dp3_(+|3}DQwB7
zC;WBVw-5FGgrK=#LHIoEK&E_Yb@|<RuHxEm8{!o;yEP@;?VGNx@CzKg7Ng`+y>)Th
z3)eO3FaQe8Vl!CYGW!5j?N`iZs_S!|p)fp7hj2jH9(-(luzbY`t8c4Mr+Q+lXQY@F
zv#MHWdxv<ZMf&1WE#}-utn$g2BS_Bh<U7Z(_^XEV3inZcSM{6l@`Imu1N(k&1e9$6
z3X+m4Oe+1n^HVr2bnE#ZVJG``$>V^qWyQfL6hj98AkAF8WiUJKM&6=7gq@uN`InPN
zp>}A#CsbXYodz|zV(7{5mUM(LycjY<uW&ACo(8enbROZqjXZl5;H7&_c}i5JCCPJm
zO~srKiI>^n%~y$|w3>7%xv_;~X1_xBDIL!;hKA-vM_;<{$`82~1Pt0`RXfwU<V48#
z$d51WN#>?Zhb^8ZY-{UY58`qkRgOcuB5>mWFwbf1PBu2lhUf%d(h`!RTnlyQ<<Eg-
zbF<e%^?JFDAm1kW1~M;)F<@Jdr*N*?ocr#iw{#VqNk6$bCGIoT^{1dx)!Tbww8i6J
zB1|=7Mmw6EUUp0NXp-lWLEk;bS`hH*@>T62e<`~J79LesQuZhnt;*x(?TA(G-ST|G
z$Z&3XD>O;dwE7j>=iipb$u3Agw{bD%W<Ci|K+-q<5$dkVZva(w*>14>SJ`1u7#oj)
zFv(v)YcGPzl=!L@!K~~bQcwh5dY@wG`7fVjA13yUH_v&LxOwdUYFCo03bS4tkGXzb
z-J5W1cnyC4{G_+O+t=5EfTM2QeHDAh&9}M@#(n)pX|sOB2jgAceoB}fCT`pbb*f5l
zL)7~3-ng-HZ3O6iJt5pw+yrCC*c-A-3tvFhz1a>>U6<Pga-Ss+L1vl{A#@8r29wkF
z@-jQ5a5p~n+o`Tjb;&C8X{2YN;B(xe)Mmtk)XmwI_^L-H98J7EUijvPwC%CWC3B7;
z`^usZVETUdwuiK8`2Gl3?+?w-UD+P<&RgG<w_&~dvcuZ+BXkU>ZFmVja6;Qp5yj9(
zu|PTF@7%c2#VgYO`zHoLm|F}z*>{q|p!$~FsZdp)?GM>sC&xghRj7mTtYSepEQK%@
z4^#vvH9kVB&rJ2wzezwvs%MMIM#S!F>rNoPr_=lGNEX=c!JZV(x5t!WEZJ}7@vbF#
zub~$-d%0tp-Oc+uD6a(pCHKb9R<<i&P3~^88<}%THf}u*H@l_z`h=f^lfpaLU9l&W
zTjBbvO5=*(tXQ#ziH?JCP%#ZG4395D^`Km_EqrkHaL9E{PK8(*4~5K_Fcu6<fv-y|
zRO(ax%xXX{O!eOm5Fx!!Yt{8nU~atowOfggdgQs@Bv1N!%1quKZ2e^)(`U1J#s2?i
z#dC%GPM!BZKzD5j*fQ?0vYpw+ffbt(u8u?2zm0HX=vQ$W4skfhrY(lTchtD+rv&V)
z1%wIVDkzMKZ$Vw3LQAN=E_V*pR^>||z8{Z-u$Nxo(6skdmKI7`OI9P`p;Wg@b&pgp
zN&%mr>Y^vkRFiuS(|qyOPz-eD_&*T(Czrp{lG35!*d@2q?>C`?BN;vV_1D)N&9$h6
z!_MLEm33x9*rM`8!dDJ&+ZLVFR;=gS^l|m|m8_-@PV@O|)0H{EPLMsZa4RhB)bI|}
zevlsog&#Nw+z?KN@NpQI-sv|WZ?n{1-QyZPV%t>Tl<Gk#@Wq*?{t@r>{%50z%i=Gd
zyqtKfnG+5pj*mBg`3Yj2P&^BZ6RowZO&u^X?6|TS-!-bDJK-1Mk=Cc8M*k)aDHJPH
z(3opvQ%|TV0u<&KLynUyfL!0g=}_}hzBklN$X@`tJ(6OVa_`~_567kz>ag@FW~a@u
zVlQ%KiW{T(eyKjbs6uhCXc~)eU(8k8a4hkT`0mVsINM7vyiDBGX@B0GI6uDd<zT|k
zN_Nf_eX6gfjGp!Sf`2Ok@!~Lfl?$gUDSwlATNu;qc)|hU?6TXCvBxT(Ys~ALr9GFP
zY0ST>2u#u>wuai69|bjMWj}`OWrf`#?hxBUW_0KR`lm$B@mM;-pHkgOe4~Fi5^z8Y
z{Et$iYD~luv*I|sX4bqW=;WsH2NL_b`>9I&z(#M*A}k0O<X**oD?F?yqy2jcP#Z5=
z#jbN=W*TbZ^`-5Qvq9!o2*>-yN}o$tyaS8f#xU2pko?h&klizB1IwSzMX3F#P&~T)
zRWWM`yQJ;q4gC%*PVbvd>xHl)*fnmljfrG!s_y~i#Y1y>^>GyOD!=^vVtg2HoNyfR
zH^x7<Ju$|oKKPh$QP?FnWhK04zCM5L0slS-C`})vQOe>NhodBn3ipB|?1!-04zsAZ
z8HQbpM|fd$I0tes6n+IYPv-B0y2J8YK<>c8R0ubPVqtZ1C=xJWwWe8EEq!d1OnSX!
z#oH0@fO(#%zZ5UU3A1)Ym68{aB{sP7&o^S2r5|)9{2;uutm*d+_<x_|+DPkFbP`&}
zE0NKv@Fq%>$FaUWQf$mBx}^Dchm`iq6_5VL6}m!opWHIYUQsNlTwmN&!*OYLvR4Xd
zV=ncN4lHwW@~BbcEEG}?oEYDnJ(HM^nK3<x-Q(;B_dyriyws0aXKdB+*my;@^e>dP
zA)u)%R?&IaHN1%R!v#w(MvKtBVIr#22ToUF7^3+0atohBc2QwpsNJ{t>R#<9`As2N
z5R0C&Lz>3+PD4rAKj<N4Ry4^f!TUZ|O1vumJa-TArr7iC3B;Fd_~<<1?;JO#g19)A
zPregxB%|sp2py8n@fAit`1;%a<+3&*=;`p2mCbl%e6IFJ!pCMVd>u`^P~Q_R6?DUv
zMPS10a1<1Nl-vciv+~zM?GN%FK)zY>B{-s3nT8$09bjIuK2WuyhZI%;yfM^e<y2yh
z*}0z)pN>x~I|=7H;!9W@+dg$UIwoH}cNHOqjX#cr=+lPz+`e?;wf}m+SC_T$fcQo{
zd1ak6jZN$BCT?r=!X;Rsp}r2g7U>OFrk*e)PJ!Is@f4_Tmg@ucvkMPFd_LVQ_cRJ5
z&Pj)CY#roQg8y4xo_fe)i*wHrZ-_U{n};(D89$h~WAfQ=HzxLv?H<_&8+v@oFy!J>
z*(sPCpZxa&|4$I$;9`Z^sKai_g8J!%9&zKv1Bo5uX?5%4^|UEAxtM0=GjVUIKQTWP
z>N@3jg8Z$?QV7qef^cpc^J`5>0d73&9SRmW8QiU1GMRW;9RGD0@r?NMSEpb*zklc(
zVr{(g;ladnl6kMpqA)vm-t^-rbWBdGT|l94vR6EV+h3Tp{kkJyEkaPZEcs{^d-H}q
z4GlQ0GPm?x;`}hFs+=%M_x!K0kv&T`qoH?UQfN(0=VDJMdwOyK#EQ5bWCn%end`~L
z*S#%F6U{0GhojON`EpFryLKDm^`2hX61`mU*7d|);*94HqtM?cFP}hF5{J$@jOITJ
z+5Ahi{m2e+AC?p{yRAFGzXt+p9&R{iWqb4YH`yTnF0;md{lVg4l(os6KKpj;6FM*W
zhUC}D)b@+0yT0&LX=`fF&G&%hwOD-Jd!&89w6r2_o#r_&7CkK9>aJum3ffMejFUBg
z_gef}*VnEiPKo<`bP=|UTTGutW`Y+M<Z0dCfZS7z9yh6D`hG)EURl?muPp!cn{lP5
z+_K|=Zz%?flJ%Z7#Cdw1&?#x1baKQIy^<?(wMki@bBtL$w!X4rBul?;sDdOLHw3MU
zErc*eN%AXnGQH|L;)`+gHy7Y?Kb`e4W?1mvH7Ji$Cq`5z^WWSO8)SRVuf?*`^NL3_
zsN(k9-@1EU!}~wL@1MOv``^z0)ABd*Q9L<rTIf~ski{m>TDbh-lHZo}of(%e_k5<u
zHh(Id*KlrOtdZ_X&WaDm3oUV=qmwHo8Z;E%B5tU9X>ohM<&y$_=cqU4A&DEjdO2FF
z{d5U3VZU!~L`m4L;R#fijw`-I7+zR$v{ID+1qA%l9x!Ov{U6=5DF&Dx=T<&YIyote
zmmGBTHy5lovtsDbcJngL7B(IH!|98Lm)&3bZpF`+_05bc$<H4gZw+lUpK+rv%=gq6
zUlF%*+vl?hJuRK~C=QH&{JcLZlP$i=qg|3+ej=7<2Ie37b_TcKKI!9i4ddF&8hgNT
z_w~KB!>!-i<u}c(sd|jUW2Li{HW`rlB$*m7>~eh5QRR0w^w_v*v-az~)X<~k&a#EA
zez@KtGw!N6yLIV$*S~dK?yQoXGKas{MMjIb^ZPfG?4O_U>Dj~{N#>g>!e7F)Z1FI0
z8vOq2w~t@faDD%><{{`k?^&r3Yna}2UaTv5Ka9_BQgUbei<1Mx#$oK%pEr5AFgiJI
zi&r}CvHXeJU&IG0w#+rj|N5mr)ebMM%Y5`-6Tf+Uy&pH3J9Ec66|>5ATGF0;*JPLa
zr$~0p-%{vK=Gv0y)-^o;dRb!vV!ya`=H-<xw9GHgH0^Lu45D57O!8b96du{MOSnG1
z9J@3bTh=oFR8l>CO#8i;zg7SEhiB~n-jcDihrHLf{IrIj<`1v?VZ#FzzbJh#o^X5D
z53gO=*f!pDUBmM4lQs8%d%b4mBgv`$YU>X3EHzN`KHY5<wllR|b-dKGVcN3Z*%>8Q
zXU_j5>*#oc*)vXWad5+ee81Yym)zL=hKfHhw`X&eJ&U(mxW<$D-!E%i3CEKa;?$M&
zVA=SnUhz_5;#hMujc=4}9&7c|WN}a1WBS`CCS&}{Gqb*0Ft_Oe<-Z|!RJbWDVcfV0
z6Q)mJ*D$O*S#uA#M=1Vkuqg45O3hm|Fx)L44*jrsd^Nsrn{F4G>dAO{zDImJR>tSv
zeN&fYPOO|)9~Xsd!bvM-U+bU&_MaqcPCzAL{gv!j{aL@+FR8Id9RJLK*gReptG^!R
zaaTCA;>5V1u&nUfC+{Z9bA9r?s&)%UWUkDt@<R^ycwk+_u<qoat^<yqwBtSPcT#K$
zXTntL*+{3>*SRCcSYDDX9Nf^i;ipv#^P_8K*YwT~%?xjHVUzu0<111g-eBsJwQsCz
f82-QfKP&$S7nt98t(l#H00000NkvXXu0mjf=x=w2

diff --git a/docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.eot b/docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.eot
deleted file mode 100755
index 0662cb96bfb78cb2603df4bc9995314bd6806312..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 37405
zcmZ^pWl$VU@a7j-+}&YucXwahCAho06I>Q|cXxMpcMa|Y2qZwTkO24I)qVI^U0rug
zJw3mg>FTdj^N^+j0DLI`0Q7$e1pLo{0whBL{$omN|C9dj`ak@CLXyXN`Tv&xL+}7#
zfD6DG;0cfb_yDW`9{=r}{!;(|4WRL#+5o%&jsP=&`+tNQpz|Mb|L=_5|G5JKZ~<5W
zoc}F$0O&tu2XOpH007$mPfyVQ(-8oW)Rg^yCWe8+UI(PG0aCaC0oOPSSMf`$n0jT>
zNXqA6GJtPRak*%7-a)|uJ_cYiiNSybhhwHgZsoQT!Xm){KHAvM=U7}|U1LMC#O~E5
zr29c@hQt;YTG-}+NpnmSA-uodhzL6v(y*sW<N8bI4~Q~**Q=5UP0`EM)z~6iL(<gn
zB}i*G{tF2xA%9|X1Zxg4F0}Z4rEJQ7wULK_@pB)&Maf^&O>`M!ORS+=>yZEu#TCj!
zUy+<2^w9t}gp+uZf4of?Wu~aMPFG3*SSQZCNj%`3Bj@JX#iTZn)$zBBxIh!mQkTH^
z$w|djT}ESOe63Tg_77=K<XINwj=5_n?&O(nuWE~E1p5Y+aj&_wbo!n&T{FS~W}M_N
zuV}pCbLdcO^o`)%A9!O#fYfjw9IS{MqADX!<r9l=NEmjpxEVG*drAg@(rE5@A5tD=
zp^cLgfTn1&)=nxCZ@$0cwH*&)mMUR9a~ad}@dlrXWSdE(PJ_tG7Ec)zK?Gd>z*-Hv
z>{BQjmd06dHK(UTXP4msH0^JEhbcuu1K6tPKEA0hD-``i-8n+4m3HNWmvab<;8NlS
zDAsXXE>0tAwn8zMiXDesTOk`z05XDaMEI9&(8~|Nl;&D%6C@bNj6Gu2vaDayhS`Zv
z)W46=-5L8j*NC+e7!=_YpV7bPQMRXH``qc@*(&=}Hv2!d+a@yGe{WuVftGFtJwqZ$
zXlZnjCV5(O>mF@@5tL!3w)g9~xQ?h}eEhYFbmRT_ZQt*qoF)PNYv44JmY81?P^}^P
z8=vEU0?Y%~chU3Paw=H3G37{0tnbte`sP+RLWzaPDi<o4?y!kje6q)7kV^$IplqiU
z<GnDU@Km)lw1hSo*uq#akP%J<vXhlKLCd2wTuR!FocB@K8`%7Z6QKlpAv8!046-qq
zwHxI;#a;^}V{o-l1aHF=Q{U#M3g!eQ%!he-z67MCOQ%s-o~!&$nkw^uQ=EFjlWCq1
z9)Q(ullktZ4OMu?$fM5^ixm;1=>}WL*t<-xclAU8ZJHv)&RQ!WD+LZ5>G4Z=X5e8h
zI~8x0!V1~u)|J&aWqBxvnqxKNjU7WKjakJB?JgwDJ;`A0#&QZ24YnkX6JqgItAlG*
zRLYYB)iEk!%4Utz$Pj}CBp0IOR_!v_{WraEVmY*2lMhXyz|Y#Kn@J^k78Xp}MXlX!
z#-km>Z@<yTCb@kZJLz9{z}&tuxZiGc_XpzdAYIY^^cuWMztD8bFvMasUvOY#!?rDs
zD8H~t8YRLcC8EKqhVYC~EU}I(7dCnInfNSLw5W%mNg2Xuk9V5l9&CGybYhe#-!;fx
zH^FFbwen#Y8Day>u_epCJ>#)tNu1gnC6@;K`;vSCk$iDAA>&b2?}gR!L8pXBM4!14
ze;6nq#ODiF{jqqg#tUutCTo()dzY=JHPe%AjvZa0`EALGl~fc)-RVj0DM<^zLMS~l
z@*^OQT|><aJ1>5}r-!{<jCp<UoBey6An}1Z@~wI{WkwZy*98(kANUAT6Y(BD6nig`
zpWL)^+G|u;o-G$1tycY0c#Wc9#bwU9`;{)R>Xr-7{XlUR<6P8eid6%<WUVCEc@RW@
z`bXb~q2j!}v;S8P(96|;Gs8U3=5!E`ACq8T{0qbEki$)ConAiwdAw4dFr7zKvfV%%
zfutm&^v4j<9>K&py{Z%xF}oVHDmqq;=YeNf>Et=@Xf+&LGOx>6Lcxi0c1-J%%$n^Y
z0_!{mDCN%?pK^mdIsvt38PT8W%*)lsf0N4qZNLzTbty#wB22yjkXMe9B-#B4!aIc_
z!9NR;!Ca(NXBe_BfznV=fVI7$o~nEnFwh~jo}{rT^Cciw3wM)N%U?(q);-l1fiPvI
zT_PT$)0`lIxoF)w3ZzdS5P0PX4G{K1Lm^hsh&Qe<j)P}$AZfR(1uoqZML%ff;s9X{
z6iaPp%oVg18U0L28{lb>xk?=Ogwrq8`=nrk2L@k8QR+)bby7QXcZYX=B9u1NnfzZT
z9^K&T@)D)!?z3EbAhjD0M{<>|Z7p0K-N7#E#}gDb2%S|4f?3n}3o#KozgQ_3iUg{s
z{D=^3IRs&?ao>C_CFWZfjW&2i+w-i#u##w^NYV&Z6BlPPc+mXGpdl}etH?UUYq%0S
zVC>r!$*Csq6N2c=T^o(Fj9X&1X#mHDA7jK-HK~q*7QH0XeU#l0J3ZSubwz*fc8m~F
zc_*Wp2E+54uop~t!<lec3sEPI=Dex_3$`Sc<f%Ez8^0McY?r9~QDnZLhS?KWF!6Tc
z&Hi&h_mK;{hg9{(vhDHlA<@w)rQ!m5M%j-V3E7nOGvQZbGtQD6HARe)RKkR;@*X+A
zY+{TbT)5#X*M5nz&0t_eHFzHygQ2)jDYL;PE|1SZuq^c`0ZEH-RI)@q&g>Iq_kIi&
zx63!K&I(~un;B49{A0CaBro&v6H`-`uVO4?(ai;2Kwwsm>5v)j%fLUYH5IFXn4UZ~
zDmHrbVrHL!Z4|XWe+hEWIIf#<TkG5kIvtJmizh13x3#`^_a8%pt>B-p);T+>2JV$D
z@-si^D34!8SOg33#Da_Fs6#Bp;cy|f=w&UrH8|zrPlMc^CULm(w21K%9g>lu<AAi*
zJnB0)^8oM+BJ?74Pxx4I&e`5cHd!oX$<R_5!~FJ}HQYQJF8~IOKUre8_?(nS$ulqy
zn`2qaEhb`h%{MR&CCyS_zO#EpA6?ibHu*tl>29X7G)HxDeVKVJ#OmQIA3<<q@xLxh
z&iM)Ro1EhA)et*+nn7u6+z_Cy92B!S9rTKy=N~CIkii~9;$k}<6tPstsQakvgB6Vg
z$OLf4fDq1J_ku{qZCm4)6oR7k4H<}_jeOamB<Y@4;MqhIfaYufp=zV$m0ga-F<)*t
zFo%r7dR7m#tB0hLz=j3t|M4+>DB=wbw_C~hLLg*7e;3P;*kd`~+Fe^VU-Bt)ri!@*
z60eD^A_>i;O`?<lT-~a0v2^3PKaiU#{aMdl!+~<>=jo1}GX3pSuft>KR?qdNF4pwf
z|Dhr_u@*sXZ3}$DzEWTV5+>68ThA#>W<P9*SbL1Ai_~{++e!q%f>IaS>RwT7$TngT
zmn!yfa<XuGzRkZRBTwX4OdHddbEeSqF4aVO_$HcGfRQ&h_o9joxuy@=SjdrnS0bL8
z?lC_rmEZ(heu6@`(L_$$WzD&*q*1SbOTkh8rJ@^wEwGp(4@EzUQM3;V4N6Dk@TE=f
zpl+$bWE3XMOXDPCUtBgfvBD5vyv_(iwg<hrbmmiKlr!W<F13^Ck=t>4J)I7E|7i{o
z$ES{Y36>D>4<^w@_#p^iv&iB=DVOK~A0}(JLMV}IAksuBZD<Jzvu|I*4011|h}uG2
z*FMbqift7c-q9Xj`CBjy1kEIyr|x({ryqxbZ8Ih8&@~+1IP9TAnpBr0Kme`5-~l^M
z<v?6*nnS%hp$}WXmjWBR$TAzZC_@i~yb;3*dKutjo~i=9j-n3u!JD=XQbdyaGjWV8
zlsl|ethOgi^9q)zp{Q=2q=dO!05u^%6Yd=G#}#&}4t;}GI{69*E>FB-7M2dbloF&R
z$`TcBVy|{uo)$;eMk@!WK99jP{+x-7KrbBF{z#F|tA$r;e17{ti#2e5u6fOrPyoR}
z<=oO9fc(z7s9svZe@oWA*W&p5?|O<Hka%qrsffnQc_WtJQDKe#EPG3)I?-pAS`n^`
zV%UL?0s|x!Axoo>Zx+GPNp)pLb$fVONpeKj(agx~f06){dbByl{ObJJ)V8@)BW!-;
zz+|>i$>7w;aTDKmtSl#`vw;yV=0{|=qxYG~bIlYOPWv*EfT0t|s<3TOza|dH=*RhN
zd~|P5(@{QePE_>rM<jLp^;atD&Up&|*nQdO7ygBRNFo?D)}`NS%R=}X#8FPQ%nws4
ze`#U2Mk(q|*@kKKn*F1GdPnV3^P;z8Dc&zAB)HIR56L#6bsj@Nc@8H@$ZN3eTKg4}
zHVADyg1y;0xfMIN+6`}tOcsNQ1L#p}QDanuDLxhgNPP=adooNH^Fh9hV}ZIcp7<2P
z^K@pqjSJ>u7Khi!P?<Fy2=f?DPIhN49g-eqrdv=%;AEY|;}CQ=JGNP=oZlOa?k+g=
zgcs=~KmNhzs3QceDIO8-?f{kr&X*z5!TLUBwyZ&FGzZbpris|k2_2!DW6HQ;v@8Y!
zP|$vb)12xYtJIrHhp%SqhYA#H#Hi%794}!E_`kH5Vv9YhOWm>k`f1jXyoyaI6K6}q
z5w2l3gp{AWp@uyD-oYS)`Qs{rfTP-0v(24h5>HmtChQ9hsjPESIr#|9TfE&Nb4*5R
zSVxS$@V!;exgU4*F={h5$7NvFNNu7iIzl7k8cmir4O!A-_-V-)K#8f-v%Kv-P@sX1
zWLsZgy{93V>2Fa)DX!PbD5g(!-AM_~@=a7vu$In<=p$=9jMgju?Hs!{lcuOvn?m?-
z;9qquyPiv>Zv<A-|GkguU9)NafW@9<pp?w}aEtSba4WOv782!}&i3V$F;9MM5Aw+1
z)4+3<5frZ3X~U}8`cgrUkq*1FKHo#!!yU<yhZuNrGD@IXAX2RK%r3YI-}&?DFt;0U
z-7wK<JCOrJPFMN1)QLX3FN$51naUtRcj^(W?@`M?RI<J#Mx)o?!*Fp44xkDpiDVx5
zge*$Gm>{9T?bzoJPg(h^Qdomi*RWd;Rqo#0VAbET;7d-%Mfjg7$!7Jkf)728IE?nF
zuwW8}QZX7wm?(GU4)hlyp8cXC&cM>yAw3>Jv<m=Z$&*-C?y5xr!r56<4BQsnv+=Tp
z-4D8}=#RACF8u>?^S)sAh7AQAANE*ptw@b8w7$EoWE0B!5=X5u86kvtt9<D7x1J(W
z;42(zr;)h|Yx^N@GRex=(uaE<$0aYs_(u7%c0P7tIGQJ0<Aai~dj*sxnou<dw1gCK
zZ|~jLl<SLlLL9F4E0#^n$&98+d8NUt2#D}?7$MoE{!JznF1E=jpMA&6Kji4${Y!#y
zy#+03+CH;FjC`>eGosARbHb;g(0_IP)jbYe7NBor8KN(wT!`(<Qu2FVY73y`Q0tpZ
z4b`VzmprK)4LS5x(?m?%DA)5+sDK-u231?-lL+w3YAfYiD5|A!%LAq-)rpA0e?_4O
z7R?{!6@=S&JrTiO(WJ|v2~(Qp5pe3Oduiu!#3X6Oeep(YQ)hm6HF&{58GI7Q$RtS|
z#YZ|BK_<5@*eu^|ER)$<ZS%L5?%=GQfTEdX(uzK|cxRZoc@WlXi_`6vyFRiz>4$Ib
zIUJk+{=EZW8;GKKL{1fT!}p04oXjTyFpVoN9Ug>A{US@XYGFVQ<irXJ7b!FIC-Z3u
zrA3!@TtAXHs=#YEbz^+~I=k(olI%21FEn?!w)0aCK_D)%Y*Y$maP7CTBU_~ghK*i`
zpsnmD@*mduQzZH%^U$lQpjpfh1QOJXD{39C-q0|FppLH^u=Z4o%TkAq8D#N2s1*(v
z(7&ZyhGv=G$k8^=3EJ1{*jDi#Z8a0@^(AKR#AQQiT$?}LW^QC1VCAI=&2pbk{6^Ue
z#&v-0!fi*R+!Ou4cP@Tg96VGD%Lfh{rQz1iQ*2XJp;LU~kSnP!pl&w_&f7N?paq79
zvoPF_jR(yvSU*r0<HntE0|Ha7kg?%B7<>j&0O!NEH40o898J^8hCa^y6Qs|gtW{b%
zdtJWq?48pozNht0^0JhMasrmO8zMr=BT2!?by$zdZ=|H@<hxBm67uT&Taz#<#+&cD
zze#9g@i{7&=`)JfjbD_j?IzuPP(CMiaxppcF3032`m;CPdDKI8g=%C4uqv2(psAME
z9G<_4pK?x(@J6Ewekjr*Sx}eojqq9Qhoj{h%j<$$R8-~(`*HcS_TdJl<TIAf2>Xke
zI0d#9t})kW;F7|JHO*|@m!y46>bGSa2Ax(DdlNwZ@bR`iw;3NPI-)S(Q2}pC9P|7r
ziziW-Dlp^6-NgYpz{X93X(RL^M8H@@?W1$V{O|xx;-%hs!8Sgo^!S<R@{hh&&dWSj
zDT5L*1)(lyk&1TbbS!c!>Xb-@LT5jGD$|XcS=KCe{V^BGVzmAOs3s3BIS}l`@-)R1
zG?>~s>Wiy}Nc=2O%>HLI|1Yz`T5Y<Mnu>WjqLA*f=7o-tm1g?MkHtFtHBJUcQv|MG
zSYHQF8jW5^a;ez*RzoxP_3r~<L@e_cq%`)z^l7az!{P2u(;P*uI>Qhu@e+eC>bT61
zM!%+znz~09KgdtDhxDoCs!07c%{?>xwX!*{o;w4tD<MaH8^4(RdKa6-B9uIfjTTZt
z+LR#ebX8CZBD-U`LeKlk8E|jK8gCrnf$&XfjwtJX-+w>CV5q3foqA;2V3`X*a~_c~
zPsC^)uTL~$Q{~AlcP*e2AE69@OsS&UX^6=lpr}s*R{phnj{V9N%)DqEeBKi;YN*Lz
z=c;@?Z&WK+dn(W!0~Se<BZPUTwICR3sD9{NpDwfTz`??}+T`GK2B>4s_QAT)?U<P?
zqmp8rAy|urDgXH8<64prE&Q78!?%uI&!Vek_8R?yr=cf;mtyAC$7ub_jetJP4f~p2
zizUfuaitd{wheI)VI~>6&}E+Lhw!5N$nYe4FBNj2f7^@NA2Bv;xGx8lg*ujReEln#
zL*5Ay?Wf+Dr{(Q%s=5w&XgF<1v9EvH!zS-J-vkfik8-=&RRmS|QQ>oUx(0Sc*a|sW
z%%S33!=+A^cX2-EoPM<#N2*YUdgM7ES2ZzhBC{4^^(Mj9hx3F?oNWlkgD1Y?>j$^~
zdVoL{Cg}4_K}?7=FtwY{Y5)^MOP+_uZa0Wxv@rIHC5-*?RaxlFWIc`2rnV&*Kh<(x
zjC@1D*{SYh_IZVQf!_F0Y6FX9K$iEgEvY>!goU^g3A3&9N>z18C|am<M<m@c|J=?4
zXNd-M6D|hd%(<j$_${?M9afOH;QYG5>AL;G*Et>rlRrV48k*ER{0vazDox=PyAr+a
zEq`}2?4NUNPfMEjv5%wQ5!`m%EUwtJQbr4e4s%XI47Xepy2NM7;cG2_wF8){JGSIv
z9G9s`M1@fVKB7Wv6cyn_?K4TphQFuAsHPg6B^7^IY>BhfYvf)dEQY2^XCnU|s=Jol
zh+&iieR>ax{n+t_Im1%9Ng1Y$h)CsC!KF=n<(4H!y%JE9D-=hqmg5z`?>J&_KC5Ff
z!l`Rb=2OoGySCgr{*s(RoR`B}0l6g@+cWgmV^h1tFU_s+z|qJVkLpE|spVX1-tj^x
zp=Hijw{rfD;yeFcBgjt^VQCqDY+F9UeZu|3KlcX7Jhwt6GELR7e<^jTFD0?M<YD5j
zQBU$a1c3lY6GxMUX%CzE$_!OL1eE|S!qrfnOC04F7+oBVZc+j@q9|z}lA<NaZH?ON
zgo1!3wUj`(gNyCWn8Uz6X&rcUy7AIY>(ax>C)E75Zrq(=FZp|?e$VN+z<nKuiEKJ@
z5+}BQR9%?}At6xVh7@L-1OXo6$%*eg5b2l?Vweyqq`Du$=nmc$eu!hvO1I@3NiVPz
z{X)xRJHv~3^OtLhT}W2aBKxJnOcF6D!%zQ6m=eSUjsmIvQ0#=|^Cctj#n{oRF>5id
zMJ#<12q0U>hn9ag0fkZ8)MlojEn4tI`^8wwV!cBGIw$o1#`rQr*Exw%Em+oz`l48V
z>smox%zyVF+l8yt{*JbSb;`txVeDNw|B)Bp-iR)*BRb#elYSukwk$f!9rCPrDra~D
z0NuL>G>n!QX|DZ6ep}HGD=o7fb2G*%4F@3$H^Ohup2|>B%Clifwg0+ntVheV@qSx>
zo0IngEsKDM-Pg|#5>qpcv1*o-GAm8tx;np<b3foIeOjKxBbAx44MLvxg<vm}>8!Ds
zp#<j3jUrUUSjmko1LGCLc$<<}CjCRJ_>)8-HsN_|hG$I!BQFPlSn+Zy57k-oXRX!t
zH!R$Z4Ai<jcgYfnI5G`zN>?&(Pc~p>Z^D)p&w`P#phG@!i1fsKO)KIyjBQt4qajY=
za|XyFvW#RB%NUI37BqpI&cB|()<&6HYII9FQHE!Q1%`gQ=Ql4En7Qg4yso8TvSiRW
ze))y7RqzOl-M1o65}n>BsGR>5j=~n)lOu_kQeJJEirO#{YcFh^p%rF4m~=R7;aD2#
z17PaV6$(3c&t1|eV$7`6A8KBig#IY~2{T|nr?tVOBt)Oxx@~Yw#{ekrzsJa|#7@WH
zs#Y{(if9&R%_M~~ZWhyYqPjg7u?UPY8;jWu<|*uU(1@0j7`mpZgv&qwWm}TD2e2mc
z``MrubPsyLB@S*64<~`x_I)>uoU;ZJLdBak+%6w^<ov>n9Lu6t`8xT7<VP<rvz<Ex
zrxKlvfGGNMZS-56$!*NKzgVy-{Q}?*(1`?*=5_`Wh_CTLNit#4vW#6I{*G`JgbL;A
zm)czzRfj)pswv@3r*`lcR<;=L2KsFZ?nf$=SuHIynoFv&FcF3gPOv>PykuFA_&*6^
zY^7I%zP6pRxI`~95l7OWm(T8f_XCl4xLf3-_RD^&xKtV@$Oh$%>9!%%IKNT7N96bf
zo|9&wksUa->zFXOo4=S6*GkV2WYw#IdoHT2WIUNBexWJ<i?x(=9n75VKi;2aLX{?k
zqL2Cmhb9iYo7Dg=39p3J=a8(%w2S#$pt#ggQ7bHc{dBYL86t!xRBrj#)3PJ@rU_|I
zH{S-^BLv}wJ!#WIVQ!oss;~G+sv|LZhmB#Rn4%5BoENi^_u8PxK~d{jXHw`0LHlQ|
zll~_klV94JUuGQv$0u#&uQ8k!yE^4r5JSE3^loR7szR+SI#T^E6I~+2x{j_$n+A_W
zX`wc!gjH7UcSM?*1@t2x1J=bN0a{<OP{?gd`;Ai-(e7WVgAL@|ggq<bpZpIr)|8aO
zMqfk1(Db=>V1!^!zitVkii6*>3FIol+?C|<SjCKuVM$zV+8$8xNc%s&PRG1vN3-pF
zhw_X6QnV5NKwSKXTAw#YuUowQ_)_lh9w04ky9N);y*G)PHM3zbV)5E~t^?1|=RU6@
z-uLlBL;23B5w@_c^n}R$e!Saw2NcSf91cHFqDqk-_r+s8&og5~4uHW8s9DU$)Y7U3
zoWzqdja+`*AjM>sx6}!Y8>k3+^0roSAQif>ck3ay5G8B`AGsMO#0$IL)?b}s>g#x#
ztx@Pg@db<Rbz-@T_SiRnBy=e9Zkj`llcv0zwXDkAc8qPw&8WBd!3!4C1{LN!ht18@
zp(VD|pF3UgO>|YRrgZb<j3W>_Q+Pe7MG6vjx&fRL<LIccuM`a-#!=wtmM|Ul-R^p#
zF^|-gp5#b^+15_U^ihTyF4f2&LdbB<7t&@R`zOTAkp|R*>P@=UNG;=r_9NlW9ta<h
z5|4m4_|Xb9q8ma1%kPS<Xp@8e^N7tec9XA(VVBWYv?Ch!WpWf*j%k^6ivi+^nORGv
zqWr8Sc+t!5zOAEJlI+nHv(?pP#?GX^S$l@CblcgYI<ZO8OZ|JHQBG=IqiZ4bz5?55
z@tr#tR>1*##f?e^qd${n3Jjb-O~6|gSt#MU>b(5+ELlDd-X4yn1}(&XH;&EqtPwcZ
zzwJ;}TDd7~Ay{AhUJSu6%I3VSSoskfs*d!!a3VywPG7d9;L%#V`C$ti$_5zr45^5@
zHV@{el?YatwPeR*0%VKUA|*M0=7Tjolr#v)In@KpRz)ZoHNHMQoJ}^u#%rEr54)tl
zt6A}(0R&{A_~*8t^ds(HT021G8`3?dbb^n+<Z4dgR7x}of}nG&*wC6U;b)Uu9_gzK
zy6cu{z_#u=<{CHy2=QeD*)tN?2E3?ia~B=GuFdnVTauK3<@DrhbZJMj#Fh)qlVN*_
zd%+qRDQ!nqE%>{<cs%%I|7~*#&Xo{iMP)*{`N6vxtvOHtk8QO9XT53Zy|Bek{=$%1
zc#^Gng+8e$EUq8Ca`1Ls%H=&QEI!!c#IXuiny?wPw$+l!^*9PS<Nl-+gErHuv`}4o
z>1yk<;DV-HXh-`=D_r}0LPYNDy5n`%Xmttr+<PT&TboRx=<IgwdNxkwJ}lcP&9W5|
z);oCQP&@3TRGxF$ZSkBd1^{tXF3MZVH3|UNl5rV(wa&zpjC%8Cd|e%a)T?xGrWk>O
z>l-Er93NUC6)1HtX)XLH2QAx|nX%|Vrs&Ij=*Q}tWM<o(NoP^>=2=WAdf9N{klAS1
z)v@hyE#_5d-Bz6mY*8b&3DYiC&myy%xF>vv;Djuqi?0BzoR$OL#9U}e(NgYZOx-TE
zXN>BPBCi?5(d~S`h}<sx<Mwp*Em5kI!x*|18m!6{Q>H{<^c9<m_Ax{zyoJCbB?K+l
zkPNVopInvpcsX-#lJ*WMd_#2u((7s^*v*BG+fL*DHgzHaPYGiadnNh5kG>@)TWJuB
zk^l41mEVC(+coUjUoy1<ewMhe>$~9wT1um%Sr|i=F`_{YQTf`0zQ})K>4tL3*uECr
zp>N0x$16t%7&GIC`w=S4-n?DwqSYXI;eayjxPL)e?)(-CvSkiWoqYJSYlueR6in@1
zHjDmu06Ce>FDtG6b5I@i@|I4QrhG7^fVqYQ6?by`8wT9M*>KT17Ph`Q*Jv$qdisnI
z=83pw&?*Q`Lw<pGM5PSY#>?V6Sx65VRmneXMDYVV657^k&Qwy^1T}1Ng0K&M$mSrl
z7a5&-0^4#GrOND_-rn31$@MMTx*DPC9<M_ikk?KMj<88(hysfsDN1gN@>62Llwj^G
zT2$OETczZY3Y1n>dM0jr5=&2Swe+IEhaDk08f8~)B0MVJ-6r7|3QV}a3!EV=YIq*q
z2K^27*a<*NS~*;_oQ`}$>4UFnm)cMJ=6Zob*>0F3Aeq_H`=BJQd`nQY^G2v{YoC~(
z-|L%*G4o-zoiJd&Zrh}vw2Hzm5Cr>o8^JA=$T_)Ac&j+B<(cWFzlmpcO_A1iu2t)A
zCZqqmU=dBKK@uD{w|Sl^_H_Lg^e-q{vfhjY@-ZOofR?6r;biWmDPJo>*~g`t`<H)y
zAKaK|hL=||1oJZU8Kt#8UQ|<nmQ!{qSHqi;yZC}daK%k7nT5qtEv)z0d@ftP5{`o&
zQo?G!g7?>J$Q%I5QH?OV2pw#$W1!@PD>@oVVfJ&7yu*4tJS*hqS*{>y&vxB#f9b+L
zGv%mj%KkkH=D%{Q8o}K^xaeVyUAe#W%V#D~#aqe_O3_Y|XWf!<9W;qUR7xr}Ba2bY
z13ZLb9p_iY*5*BtH@<&q+xo6FtV_4&-64$7KYdq8oXH$o4yh&r>-Do)ZGX>F_HSj6
z$~k9R&n5rZBfavw&W~*)t&x2FKw^*cHJY#|wQ4fbFuXi|GoA2yj%AgBZm6n(XGNUt
z`%#%wA}O3l)KAVkIC7ooehzC7+8K)$7&#0-A&iY%khEsGVMaq&$BJA^QAs8x>7-g_
z%a|Cu`#=j-hMK0t0lC$!Nr;nh>V934W<NH9mTGTqcn2ET!B4qjyMrdg&9q{*J!@(t
zi!hd6T=p|o^NngSoj$%v)KP7!Mvu~CLk~3q72*->*5m7WvAqofBHSANk`JbJQ*t$U
zwQgIEy~F9FW8C8!NIl{&c@{l{Priv(mk(uBQcp1xb~$O3f(xlI1ScJ_B&AIw<pfC7
zv>$)w?M;Wtan~MCVv2uecOjC8#5{IUKyw2hLV2GGd5ET@5iCT%iO#hM4oG0Jo56Ro
z|BN4>5npfnR`(o^UFwEDo@L$IK0;tXbm70bZ9*tq4&C^5xYF${9%s*7C;ATszyXJo
zTwo%Guzw@Ib68RYOQpBH7i$CKldh9-3Wo5@OIyezUj8aJI`JLuKBW6=oSZNJZ1(I2
ziq<M-%cU&%+27XS$%TixlLa_9whz=b3Adb#QWVz?$w2!vrP{5RW?_o5-pMVXPy;KH
z5IuyZW-^a{&F@Ki0`06(@ckt&UFMTwibr%!dKnp`g!LEU0r3Qz`gPOo#&Y_>YBfj9
zB6>Z#sdF3F{=5OVO3>iYeiL61>s!Y^SC#ta>1z-Mv-5dNKu5cKcZ~)qvX)tOb4%S{
ztbY?Zc=^V{J(sqqTi!7gKZ6i<afVQ9UZi9Y4shn6C8VwtIujlH7qF;zB6@3zt^Q?C
z4nU>yBZQCSr+mRfiPO%dzlAC*=c!<B2MWx?Z(3IHvusl++Fw1=XSXpSYUz4+=JJB8
zveK+nMwK`dm2S|i84#N)q98zPvRcFsKx8yaa3UEO#Ef~ZT&W)oGdH?;Th|uR+&H!S
zOj|M!^-S%AN*)L{K)|*j%T_Eo$80#G|2qE*KuLiqSE8-$u3G`Nf{fBMu~z@Bh%-`>
zmc9_mR9hUjMYiO&?$bqcS5L-*bMtrgFJh;sVlwyk#Dd@zfPR*?rMM2dTyNdX=khz|
zmpzK_<s_Go$d((z8s+3e>JdiM10*(7=Tj@iRH*SXzD5Zlfmj#au=Uck4Ky#$5rs2U
zcztXZloO*$Rqd5C)pdVEESzivA+lI0VK&*wk?o0qp_A9+$Tob;6f>-vCTw`4?lg`|
zRLbE%b5hUU%eEz)>w<I+DdDc8R`F#tE|T#_9M`}k;2|_~6hTGN-Gn(J{dwrw)CS=I
zJEDp#7-5pD7+!<ajp#03DQ&&7Q&Q(BM$Q4*jtPv-Z-7Y>#0Bq2PHQJM*gjv@jZ`C@
zu7#yinEvDZA%dJKB~cfd`u+(VUnnhBU-50)AJx5vU;f7E+KW;6NIXW;3Bi3HfIgbw
z)LBrsem)%qD0EPgDG0MWi{A;TD^B57RX~zEu2*zL95=+o4Kc$`wdL2W0#ix*F&<JF
zExVizN&&|MRR!Vs6X8fm%bX{^-|G&`9#OcXQ&y(MNBPYH>C%?}&b;gRQJJp*3I8)|
zo!ZgT6C;j{@;XXZfkrH~Q02tgtcd6^&#V`>Oz+UZimT8))AR_cw^ONMQiX|-k<si*
z>WFi;bq;**f<Q^%Lw@KbW$DM4k^NSNJk)(_tV@*hm7edg*j8y8%S(4|_?GRg(`WSJ
zxLrxbhEn~@su)_AP=74v7)g&#IvCQ5m*p5kP&a0B5j|A82$|LI>=|y`a~A!9eHVZQ
zlxDiPhvX7R$>OH61^-oA%H+cHnO6<uOP4L~!6Y&~3RpiOY-mYIg}=2~sz#)!qj!9!
zD^ZC|o&qo;2z<EBY4K0n0-Wvcg&NXhKmQR18kUCyW4ka1wM0`S|Kz`Gd_vXXuE+Xb
zP91=b_d1I_A*Z2Rhb9q&7f!2JzS@El3y9*64lQOzY=Sz8!_+VJz`YN3q*&D%W{EUt
z^PZD%`X?}NMK-2AC8K=XAP3bBevK{*ks)E|(2FyPGp994Lod6xHlI#P!%rbGnoi*G
zF+tt<SOaa28F66HtY`NHGGy18FvQ8RGQE;zS8z@l29%2t#_`ElonPirGoC1i+yPG}
zo}Tv9tlFa^opQB^89N`Sw-AkoDZkd|-PRgFKQc$v{EnN(<Wk*s=MGt|m6U3KX^~lw
z1pUQcSqa6WF-yTHH%m&MX42};90*eav0LNPQ;}y<I#iTI&6qSBb?n1-(5OkgX86U<
z5+~<T>#Y|nQynRtfoA&#MdTuC8jh|@i1TAui-8ZXwRq1;AcR=UTK1lcBl<DC*-Oiy
zk#!`GcbKX8)n+>wf6Y2m`<lr-r^9*grCv53QO0@YviZQtWlF|Qd>uQRVF|c5Kq}%t
zuoB7-?vh1>GpIFcESBSjh@tKV_)_I8$G5eq8{Y4TqKSz(rwr}=lR?&QCSRl}P%5o9
z???(=KI!Gc`{y}H2=8CT*yKd2#Y!37o(A0rv<GZ?JDLGWF4Z_e3y2OZ8)#PSNYrd!
z`@rdv9_UL5piXGP?DubH?UC0OGF9H`_ibPgxe}UOyX-D!%!rS4t1v?d%sI~w;X=4u
z^Vtg#45*$mYeLaEkeZZCg&&~t(~?;cF_e*O9Y_XR9BQxTIzo)etscBxK|nzL`*DmB
zNeJ`Vzg;oL7y-^t@8B_qa;ONg$~@NTJ{pGx8fmM>jNf@BcA8t7;>bpMzy>@hYO7AE
zB^|%*N7<;$;fN1dF#^Eb<2AT!_Nh%Cxjpk=np19(;*7G??NB~H)3)dR_RfRdX2ccZ
z63aF7W5|YX8+vtnVzk2<ZX(@jLE1qpX*|(Lt!&r*;mTqNgHT`>6HOO-H<ddbbXsQU
z7WN793aObS<{yuScOk1v-+m1>@$|rl#y}fS4}lJ;xD{M(EY{ZRpLH=_=bf}-DwJwt
zxRvv1<2+FRn*Db8q++R7)0Jk%MHIVx%XHQGU@uSPv;#R`c0DqXJ4^XU-}Z0}N=~;9
zGWgo;VE?|aak$PrjpBg(6)pV&4p6iE*PhoD#t{M3K7$1bMfouQ;3*s${~G}y&Z<%Y
z5aD<hp)C+|v0*M9Oq3$m;2J89dgHmeXRoIYFOeXIx}Cq>(_yAS5~*6E1TgS$v<Bte
zd5s@(EU9GzEwFDL@u##dq~ro#=ujB<QG_sC)*pqXPglmSi2$|M%igU$F|(q-t%OBK
z2f3e|34Tuiw69&hzPdG%En;%OrT}CCC(69)_8STX-Rj#~LFi!3yQaooOcMA%S9N{j
z7mfDT%2`dXaV)9-pt<<m(4VwBoZ1rzR&M3y?^E=IlS8!0C-3f#>u>Z4^u_;q@-q|6
z>}UGTQz!2l;WU&|tktoqcZFTJY}`Xn3+Gv#APh_Q0wCifTJ*-e9ZQR-iw)h_2VC|1
z9o>@^6hoL%VyB2wRc4XcxT|1$H$I&^$_FX~9d_EBS(EXt)OWG>ep2H5>f!erw-~+K
z9s~4=v5YxU0{x(xI7VUwN;>J!fPYXH&4|Sd#rhamWn5h&AfI{UpEr*u91LV8E+_S^
z+h<sYcT;y`>dfG1QetE*he)JCyH56Hl#%pf++Q&5CzugYtt_2pMGp@fkoAP2J8D}6
zW4SGDKU=7u1Y_HDgV3q?m_R<oH5~kD7(Qh4?_BYxaGp<zSd4b#4TS3DHg>(RR!Q=~
zEfMsdG-gM~G#U}3HKqKAT(Vl)g|%J&)JMv_SBzg%A}2!>GFQHJIA?lgqezx;UoN(3
ztg;Bk3AxR0;ti}E<<P_AEDMD$sgGwftV5-7$Pj>E=GL&h1<AC&;{AHx%1`vSOOEa2
zW?UZBf*8V`WW(YLe=IJ{{k|${ui^RCIh7Q-yh33$XgwINipS;?Us%HsoH{EYGd|by
z&kuZYGwgX>%;qU-ENjf%tc^OEza3{s;i2NKnM?hT;^C5b9o+9WKJFq3;4Du8<rnOm
zs=i!Wg{GWbi1TcwG`R~IXxBE>A~&!GQi`D`FH$Uo5S*`m+KY?8au8|!hAoMOIdZ6R
z2n@Uq{WlP>PQ%jMI3@B77^SOngMKYFkLpC3!OVrA@Qz~U<<=Mc3PE}BbXGJ9h~biJ
zJH3`%K!H8#*_(y;W_Au^h>?oDr~}|)Or#hEW@@R+K_Z09uw}7klzq943d|8<@JK<p
zn9F!-m#2YruQx5IjM3lVmMDIAG7-3u`Rw6%;uq$OKjITPhb%!TXaZGngdz?wc)!VS
z*eU;6&D)_L*!yOwgEnH-$1ZueZ+&H`Qi0Kb8WJ9Ox&tsTHwlMXSLDdYR2pA89n_*J
zO3l2|BOGOSpO*2x8Q!W{_G^q$8n);))N6JdXd_fp`u4^{9Vih59Jm*s+4k&a`3%6?
z2y$GzJcdatwkAsa>h!Ew-CkL#7+!+)@&03H!1k|bv@FI~pm8x%T+51^g^b@%x?Pg+
zraV<CboQ6J#SN($4oVEzbG(j9ZUC0*4;I3XqP-Zhz?f7`@-cpkUHwAgBoUG+(AjOq
z?E```ccrJ;?@psRsP<j~P;eoW0vBGtlqFJS0n3GDf1@tNECqZ_x4w=B%qj+^4GLbt
zYx#Lf>O@|B9Kw8Sy&-^q$N1q7#Re7hNTV;#j$LtQpUE_#^kfcej9{E}Z7f$x+=!*l
zo|8|XzT<JnT2YUmWFU!WOQHr&R30{(#4T462Z87=b&2+(BS{qRt+-Gu%<;BK-5Iy1
z1Vt;?_rR;CX(m^LGl@a+NQa-<n-{wH5~X;f4yxc>&&oY#j3M~+TURyuNvww$-ftP}
zlpn3tmwapyupHG45}o2Y$-~GL9Iy0<C>c`XceTiucC3ty<JfAtQgmU+#<E(%$8Vul
zX=oN%r^=EH3A-9lk<%N~)7Aa^or5B|M166j<p<a5_vt3Ysf<RDrY|(#r9y*<uwL?C
z61j9lN$`@1kbe?G2JfTM7F7+|?(c5`s?c%ynDq)>*4Bh&R4J=pFUMniu)JGLF~9p3
z_bnU+?I2w8yt9$!$J;GZ$}4F-I{^y4lKdCYIK_`IwKlL`rhBUyw@@f}qY$Yy6)vQ1
zJyjI!jIt$<GkM6<+%Ky>bpC3<;m_ZNN?$WyrrU*eaEEhGD^k~7Rl|0sz&cehDl!sj
zuy!=ud=~fn@WZ%(I*;nOh>Djg`{K=vWsJ5$%9n7tK$E!c#NKa&eHu}Ckvdf`94(>q
zt1`rSluzF)*i(Ye>q+NW?v#L$BN7Ak^hnX4D%#DJ5`lTMq^P7!5#nyqZxEgK(JPAT
zM8<eQ0dfr`PR1l`Jy#M4R*<Gq7v1(H+VUk~DkCP^CL*tAGmZL<?){{FA}CDik<ZkZ
z(d#{{VN-y7wgvlAhZWdAv29P-dbAU{1cP^+8nR&HV(}P%Lao0v_9O98*9Zt79&EOy
zZPYQ=4_mQd(rx!c4?%jC+NQPUa$hokHc;b2-o7ayt4N7buVu{Z0wnJ$e)U_N*=izs
zEbB%Om>1_Wp)*a5GAcXemr_i`e1>3hU`C=23`JoixYPTPROl$*`=vyXg_!?L{um_Q
zl(DNNA@O#Ca_?!Cum5t=9|RE#R-6nLz8U4--a2MiGICt=A`0#nw<a1@=l!SSTt7B0
z=yP`q?Fj2yPvvo<d4}}?G<+z9Ihe_h3S})mFFzlX)T0p|ilB0`vR(-W*A^Emi)YQB
zP0V8?u_q?LdG>EL63;w%S0GK_duOj%&R{;;;aa8cT53c6raq}o&nA(@$ffOQ0|?r?
zi3TFHN=<p7_~sU8Q@AC7Q8DkfTEiZ?E>2C+XGIA|H?zTbB0H3S3T@_$g?l0Hr`pVx
zv;7<;9qP~l6!E&c;%UO4(ud?MZnNTKeC;Qf*RMfWRAteO<K74U@2+h=E3uxxUUDQ|
z&<HOrhx48%4su73{aG7+g0wl3PKIB`wNPQu)d>{Nwx&sR{m$dU{F9#8c(;ftR-=vh
zHEUbR-MvM^(5qH7r{^YHjNxi#c)lU*%h4zUYqqFdO-W^1QB`aVrgBKB@$4fH3$(XV
z6bG_JFDA0j1lPYjma5@}G8R27N-8JkNe0g}y^k^RPUlQT+I?neynh4O`2BNVqG2;u
zKB~mR(I(v=CWkvs3ecu8N3RAY9*odm$F7o??+KV=0@$o}=xx)(UoZn<9VDGcdXUG5
z!8(eeMerskRP-$<3gM&-Il$Lk8^utly5VxB!W${%3VJn27Gt|}A~)1Sta$5RGUi<s
z2b&Ps4z1nUH(y<g3|<>HfqGq4W*Fb`gn#E4Il|x{YSp!T{~DyE1zP9t{i+&~$qH4Z
zQL?lP>B9+Npi9(+a61HvNmMP@^l*Sz3hoGjG&R!{xyNym2;>ujoCtzAS{BP<kWZ4(
zJ^M;1?<yqR1U36r0W(rSp}8*z7wv}@h7?A&zMU)?KCD$4;&i@h*fN=U0dP+uNi&pP
z<uO0=2JR?kyO<J6>Gi^O6P;+EQVRh$$jbEhIx<sVhDNwUCJAT}^ySn)TFuY<@BKpS
z4iLYMy^rce5NFgp7Sne4j)di6M`*a?EmLAs;`C8RJfdUmO(BYZ68XIIUu7Fp+g`NC
zukVoy_<K$?FGTzNd-SsZQZFSiSFM6kH%B}n8b5Pumgz;@qRqAgbp`X)z?rYP8ruU@
zIaPXzM;-7g->rPr_TP}5OfNBfG!&Bk!@!i*ML>rJrCAAg^SJ@@V6#9dUuoI3Xp+Xj
zjBZ{(=?xj2K^E>tApTE7i_Ke9H^UPrsI4gX@vNCSJ-4c+$#{<ivL>C_Gka`<&-ZkA
z1f$Z3-zFgD64G5*WssT|O|EaCa<ZG4Mt;D{!%Ab>t5gaY`tGAF!@ZibpS4;;0r-2y
z>25XCM?a?TD3dt$1Pz=GW(WA6?%wk@FHcoD8CDKlBXBg3z9F5V;J8H(Ta#1n<Ta1q
zGla=$?)taPFvA&~Ue>q}KS8r$CNDAe^2X|5MJ+WsL0gmtzcJibIfu-QgzOV^b$Daa
zGI^CUw&7}^{VOMWF-+_4{l{`;-z-U=bKX|SmHov7_Pw(eGhPb=@ZLXwQ0^1jNX+Vd
zE3Z~MRsCHa#zT8+k#s1Mq&kd^ea1EgzTzh6W}?7j<o#w!9lo30cL;Q$Im0(sv4pYA
z-SwYY`s(FdMKfW{*ewTk_UUn5b4;B}1bLuh?%u|A6~*cUd{hFA*g!(RybTpygn+E>
zCmgKlhP;r$6257#yX5jt8TJqvE0y0&RpO74=>GO1y1Vbc$=G$#ru$?O%Nm_@uCBbF
zG?_h?<V<AVO8e?zgm-SG<@4F4;K%KvT6T?)qP{5KaIQRO(LI*Nx6&j>e?m|6!pCRA
zM(<0DH1|flh0tK|m@<EIqD&vwtuQ)dJbm?&2{_Ks!-o_IhxEv7UWRq3dCz`ru=jL^
zT43**VCQ~!XpH3N-_TDU<R8KDU=1a^z(1qWP`v71|AliSEe<1wRBvQs10jQR?1x}R
z7$G92w3xMOfqRj^KY!k5VX>zo9!c#Zj4&dMin=kaTAGn+Dpj4Ojc>CGbpIav7W2B~
z*xe)0a7B8(g@O_AZlzU*_Ylhg^(|^pwl+$(x-%vDAH#yL8NMvlreV{_Zx!mPi(K!}
zZ%L+#@z24eq0q;kf#^Fb+FTo(4hn(#ZUThK{u~r^6O?}}gNBNdK=mlY-N}Al3N!D3
zay>sAFdGiI%ist6xO;srz=&Cut^w=Rg4~lE<0TJfEIvKo2fGxJchEu(aMSi_N*kc5
zW;MH+`NwISj?JEL>6SaLK=$Mf5L0d+C^}z5k0c|p_w;5hYMv6YqUZ$#xjT2EbS)8@
z=UNO29or~M2_^H}xl1JBa-^}n9)j#c2C;)${p7_jwF2iX)z<l!B69F0{)n72gb0th
z6k{=(23i}wsayJ^T|qb9rLepns7l2SPp<7WRhfVLSaQW{{rlZ|cGqw_X7=~BJ5!E)
zix7@L27>B<G?0a=jl#0~$PLY~6_{+wG1f^vch70|CmIW{<xcNb6ZQ&tGtUwpg!KA%
zU&*aJN}_;(Wl!Kt9!=w66iU`P3g$Y3ssvUVn@U}oFKfo#5T4S3cNUROh{>R(253~_
z^Ueh)uSh)rRhQVKdw196P!8E;$&%wM9v%cSiP8|!{r%xgfr{&}YMOwrD>7m=>U3?)
z-iNRe4{f)`60&_HEAbs(Ir?=h@R&=t-_<Dt7ONLyQbujQo~sm=9kWYk&lp<u{xI~B
zxpDzcQvFo;QodQ-V}{dX92*#yS32?Y4xp@#<G-IwYY-^kB=PA_zl!Q4?-B)f+anH+
z_Ppp2y5tc?VMc2I=1r_2mM1P2^m=He5jD|<4tLtnxJYliHo_h0(lq?&^HHemr)a<1
zDJY2eKsqlm!rF9y=k2ytvBZf+-Mimiul6HLD*B<|bvSpwMA3QBL-r^62pSh}mkLOB
zY9;bjbuv{!=chmv-n#_MAxw2_)Z`8wWqwu0uF^l9sM_GI$rtG(VO9E3U=4<ba8+le
zQ^Fze9Fyj1ici8x1fv%<3XzZDA1{OXYIc|dT!?uL`7EjW_{=hrtZ&+P^%J<yaTm2{
zoPAP>+xBfB1nz;-Xf1sFPhSXykW{2cA*OMSSCsQTy@^D5X@>{GT=i@*YrEI5@@i}y
zpDdHia%Gzvr>V>keTzVR6y38N!>ZC_5Y#`JIbrJC%YQoHjkKisT^p>s!RE*(_ds_M
z@3hv#4gU>ZavCh-2){(v-7c8&8UdiIDmu;Iu5vWNp9`(9_(Q;CfL)+>701a}qn7Qj
z>x`8xXhwV&t$vz2q>(?Hp~xCF-vgQ=+F$2q3O}l=tC{8sv|~^hW%@h$x^C{`ze;CU
z)O)`sh!5E~?roEo$yI&es^T1zRJhF+oFq=_amU`ELLI1Rg&wR^#E5>hkWYEa65;r5
z`(0B>zQW?`N-v3}Sl3E3@882^Ds1)O#TzpfazkIH&LKDRRVc(c1K!1S1O&bcifu&!
z0rZ2EsVJUjWKVGx*7D|{*U6Mm(auj9zX^nAu^1(!s<+=rrtZHsXeST4ql$8gPPE={
zktU(p*^^Evu$NCA!XPj{Hd-IV=TK~3J;TDEb_%xvXh-Y5X?*qeKd3wx7-<vbQ5?SG
zNtDPd<NVFt7<Uj$TSYZJnC+`R3ImvZWmvfB7B5e+-DC33?uf`%h0)@V&O=XxMIoM`
zjkGBPR$6*f54m)YR?~wAw+URgfw8#X)#r=~sy=R#ar#1xx$o37wA3&J1-XF|<$k|Z
zw>s}Hm%kwVK4=$1P%MRS8ld~BIH*eESCj40`zg1k`+kHg{^RR!1!xpf=7Kh<nuauy
zcUJz?Qb7`2OSp={qeS3;F0aRC$<OU(;WHN$#HG{KJd2|{;MeG%=2JxHP?&fSc9{qe
zVO5{~A@2D6vA0&>*;UjG4tn}!JEnIMVN;|0V}4J6ugNkD;PGlH&R?xsF4K`RakmQc
zh4Qz(SV3WKAM&sS7~~l{dY^J&E?A#}NV$BrhfFuJYh;S;a(3x)L6S334h6tvB}THc
zS>|G{si9v(zif8Z)*zz+NMo1B^SH_Hmoca%-;FCtSZY|td%B1?q)EQ=5ny&X;yfnz
z5VsvyT8P-M{j*aw|89Z3pTSQ=ow=%#U?r#7j*t?xjrPka!gJfMSd{J(xgA`%`j{16
zCHsfYnR9JMq4E|4&!xmd1EZRO7|H=r`s*Ec5Utcs+!1r(f^yFi8arJh4Xba$k`3o!
z0ZftaVB1R@S%tIz8*Icxxm6!?=?77d<R|g-LzXg)9XnDM)Ya@?b%-~ryH{?V7R;`R
zNvK%(;$})sAamK1joR`Wpo_y-*kP^iE|C5ueUCSxxPc6_{Lon3Q=M85+-_~_IqQ6{
zsOTJ0L7yU5Y#<cW%0`vGd}|#@t;J0C9Uiw@9ICbLf?xc`c7vB6>VfS}L$PJ$bg(In
z_c=g@26-yS9Y<VQ?hIx3y*z788m#b;ECymcyIzG3A4x=CNZkAmutkrT9M|L~oNm#w
z%4P;5bxW2@rt<y8KSUT4-{>757;Z2IV$F$<hR*SWKp$>glt+oGa@CG1D2&~hc8~oB
zQm`xoca|?c9Tmzc$!ZLIB^-N_wFcxQTMw$+C@!$v1t>0jTz51i75@u0K+3<ELI&ZG
znKKBOacE0fwh`fe^^b^U7YFwHNw!dJGUMKNk0PM+b>9d);&}^mTxNr;g-dw3#w7u0
zi@-~!J!_KzaT|auh=tnNIKbQmKqO|vOCXI>5vk<e5u)fw;C3)10fz-(jfJQKU*+En
z$EI@yf?dr_k#*FiaRqUlTQX**g2_xz6j2%~Yn}QL6>ahhiHbc`&FS_u)Uf%ng5@G|
zbiicnL?|pE4j56EQ5GTHg9e7#L4<M3g=q;>qTztW1o|XCgb>P<>JeVPi7G4rJ51Vc
z@8miaQ1ODql8LnL_UOKXp}yoI2rMIJT_hayS3ZN`2xKI~rdR`tsd03Pwf<}rwq#^o
zOePCnf1iA(fxr4{CIbN<NAU=c{WA}zvRrHpgy4<Vn`~7DF6}@~j*eVzDHW620T_h;
zts|V1GC>u`ydR)R&l0zC18$j-l03$f9|U)xq*R0CdN6L>%7bz&C<xSECLO%v(v?@m
zm@qhk<;nnd9TYrq4rbAB9Ls6jc3x7p>QUkj%F%4PlE=r5pe-f@EuJct^nd^Xx$8WN
zRPpZ9%!f+b4a2$6=;p(05PH1ZFNpASr77Y;6|{x?oPuMynFFsj$2{F0)OZx7N1N7|
zYXTCaGW$+os|A%8?sl@rMgTSnba?pF{x|DI=ax=U3cm8N6ols3j_gIkAV&y9YTKAP
zF=2&W#1#sUr~_v#$erBp!Yh5IVMrZf1H-7S^Ss?bQ%{Zn8te!qbSQmU)_{w7oiZ52
z*JJ@{oP;873!Ux=5Es?Ow-t<}z}230<{_a_J%m=eG$luqPkunt3=@?3KiOImE90b8
zlfo+6n_;K<acV#~V6gGfFznvY+OM}p`VWg>5xW-XHUPg^)!|HyWGF9U#~b?Y!#PAd
zQKGRc`B~=S>#sa#lQeD+vQeHjl}^u9M7<(gQZ~}%zJduQ*p^mH02u~JAPX%TZZhYc
ziOiH96KZihNO6qmID%#23svzBwDqn*HTf};^5%NE+(=<4dzX%gk~s$ByLc?UCx5cB
z$>y7>+ie|C8}uH6d=)#vKHtLCqqFJ-B9HfW{?DCbAAPby<J>Ah@kuP&*AjP{_W>}2
z*V%cPDZ~l4765ZM0T!F+CuIl*WHK^*H2qLN(vOvE`)G(}d9&^cA(s=G@5P%h5NAiP
zgsKH2lc}gW!deCY81ZdA&Xj%%aZX+7<_RUg6?kA(ob0OC=wRr;m&Y<AYNI$(V}Xtv
zTpov9dl%`50yq&&)!T^dLlyk!+RQDCT-UGm&~B)=#ZQbxVD&uoaZDWkM~r2{m_+&u
z3~woAM3x27bf>x8xl0HT5{0FeO>V7sxJ*%S`7E1Pj?HvkWt)DyvV(G)?v|756SOQl
z4FXJ$G^hd`W?;A`thXOa^H`^2@p36fi@3FrA7_Q6MGer2aMoHjBzTn(@vhdcZdCaN
zrg_vrlMSA{ldIbZw>Y4zTm~1%kmH4XE+z+fy&T4R4h-MjinLlnB{}%9M1(*$-<-UG
z=Y5<F5E2A+5xJ-#xwJwO<=}MEo}U?c?YU>=pt)<2mpMh!3?K0>2o>3k7PbSA+7d3W
zY556%8q{sTZrco+?4Y&_%Yg~=*3R^chTnM=Mj-oWo&<`9cPXwxnzA{_2UwKBvDlLt
zlruL~6u5V)A%D+x_Z1Q?Y2D7U)8>I~tcf6HBDhA27z*jVGz#GwBv}E#5(mXCO~R0o
z24jw(QIykO9Fv(r@G)N78(D~^8i9+2>0sU-NA2C10T-zRcT8?G=s-ngzR)+QuVK2p
zIBCRi$M@&}Op~5iJx5dN4TB0r23bBPQfynYXHa00oNG2c1%TD55hZD>e#k**ibRpC
zK+nk9XrKcVpzz{P6T>KGH;%s5SiK?F-6<rXVmVW^U|2{CWgvdx2BOEfK$Zplg1}hj
z)|3}xC_qz#ja8qVu9S)YIQS)@QP&Jn;(8xVrp6N}6x@m0MtwlD-#5#!?s4;R+Zad=
zdo_PqG}es@PRv0`Zyn{>#e5Q;7=6Dj2}JNFJ_d^~eSD2W2oBlcTO>M{5jXpy5{d%U
zD(rMDq)`5F@Mw}CX-&L@w=E!XG=xq`7&#4xmjsJf?B@aF;?R22NHH!Wx++e3bcG~S
zT!ay{Fys=<F3mD2`oC@|F0K0*um#!U#&;|na<>=H%c6e}Te%PpJFY5!TomJQNc4`c
zECoNs{ePBmI3&a1_spMRKJ9y?I88l>qfbc~x<R0s0s-=XIWj=DJ?Vmc$&V?Wg}<(s
zz6e-o<k@keE$ANbSpS_E)er1wEmiovGR0y@t92aTqy(8AmOi4+Y{8q-PfDD<?<Yk#
zVt{J@Y6?oS_C`VW*DHYs*%eK`CiJ|l=M7i@&y_Gb5bLL5wX%@dj8H6pFVrXlZ2jYP
zDZeF>#1bRQ1#;;E=9|q3`z)7cwns$DJZ6dsvbg&Or*8?5OmBn_c{jhP!i4!JKXlRy
zo~L~q(6q{GYC)&c2B|;;j2`85yt4l`mhc7mHust_OzvLTw-p5RJEToHT+AV?z<Z8m
z>J_F=ID;V&HAyKmsvX}AZNp?545q`r+&1wux!2uEHCIrjzK<`jIhM?p9b8p=#%06=
zy?*FuSck}X;x1|Ftf-C|wiVq|YARm7RxnHK1lP8#<3ixObIRq>tx(l1ow@}WKoI9-
zyJ?2gJn&18N*#fbQZzDoloXN?RGoRRcCd2p1Vse53_JFzPggcV%{lCbz)vH3eTL!_
z`SE9>Gnc_1=!8aC6g3JPP@{k}0ySO*3okt3@}>u5fk5%SukC|+GhjFX+TO{U)YugB
zn9p$uecCQ=PhWbLGsQW!4oKhdPTM1b(=%hOn+{QwC#qr9(i+qFS<nz5zQLCM0}*AZ
zNz(=Iw*nkdy~$`QZf07ig|KE09IQPY8!x(<qpLzlgBb^S&S1Y2Xdi#Bt({H71|}~6
zsRn94P-NEfytO$NF*fB#;m;b=QI<xWqy&^G34=-iaX-kFhFvwt_Xt({kpM^zMZ4!2
zo)?%gCLhphe;$ZnHwH)`?EgsorexL-MF8#>+obmeFDc#3?6w~B((OXgm_lNwriB|3
zbaX^P7i&0BfG$X*6Ma(b_A!!jnkX_aX+KYBB(+$>35{S>|FW-Tv92*mjCU5bP#zLN
zwm_>1*r=`Ev^~q&Hz4^)L&Q&4Eggf@b-FJX<dh`%kZ$#d1wOZ<L|#~f_$BsH8`K%6
zqkD|>X&M5q=m83N_@V@0)X#>Cn~h*(5YZGGQIbh`!yp++(e=0o9Q*YdJz<YW))@G{
ze>Tt|#K>nP{izR-*bZ3;O{O%qlBBm;2thGTfldzSwuG9tC^T`f0=ykrY=imgR~-BS
zXX(B-B!&u#qoxV_%c#VwS&5Yj;Hsb{p^zmU+VEhwC$C;cHrW-&wQ+65?BYmiDsE{k
z`C|uuV7)ZRm$2OgH0u+eX9*L}B)DOrDtO`z;E1n+J@qomFq4Z&0z%PIr9g)@NU5`r
z6=-x-8%zR`;Yv0c5ea1}L*P6(11*n<GJ3-y5$J@J;=*^*5O5IIj#$Mi$}y*s=2~2a
zyY(Gn{|4iiLzRnVrOQ78`6B=e5tJKAFxC;N9Px7a%tL9$f~6nFKdQr6%N>j5-}(xT
zFkEkI2Z@uug(7=3OSJncpXZ0@gx(@Lavohjs#rN51rR_RBZnrDW3p*MLxXN~Co0XA
z4S^Q-PzNRqv@i?on3)K4fNm$;>o%&WFKD1yI~+VD;$rhLsnI_@h2YkSl#jtHL|8bo
z2UL*8{L#*&wrL>!(SMO$IJwubk-~zC?VB#wR)9G)wu*5EO{z?Tbfc;?h#FwZDGFhh
z-D}9}K($E#c5WChk~HUl0gbW)Ut>Qfrktw!0hv%MgpyU*lLusS7~r3eMd6p=ayskT
zXWxXb>m0wx$k{ngO@*6!ii~|3w5rdnnir#O7ft|xmDgA@2v8D=2eCyUJJFGFfU;4t
z8bVL>0n-l2vw6rsREdu1RZkp8_nh)@KgfH5Ig!XGM)h(O+9!{T)j*^(3TDAW!UR5d
zQt?!3K#JQxBg+!~DSOStfb)VTy?~*~L~|Mwa)`46e?BntD?Z6OohIO-4Kap6WG4ZC
z=T2rYT%6hJLRyqifM7I7za^+cr5Hd4vpEf9A|Mh$qEa%eoup*uSA7=Ln0Q7wSxrsZ
zLowrNLKfQ-gAcSO|NefL4e@Q5h7<>Y5$RU{lf{yy(Xv;VuV;P4E;Wa9#d~<Mnl1)*
zVeetEUhNSQ&1<szoKdI}X3hz<2btOS0>oTJYQ<9he@9PJVrRah<+?~0<d?kw*h$w2
zL1K)~!UIK^*TKo;n>UJfkJm*em@57e@THEh^yh^MmqFu0^DZ1@f#TewYZm&8+@`s*
z+WSw_35~^60;0OG*<Ob(Mm%>qlRjwUF?GiTHH}`0DCt?sfxya?Nh5QTxzjWXhF+0U
zYwW+_iE7;j?TBV|<fdp1gJ(dwSY#i;Ng-xaG!}dJLFp+E5BC!mZr|ei7W$g2%Sxd_
zcCGb@E`|FvKHi3MInyj@^~`i8r+_Pny>d2&2Dvj``}x9wpfrUxln6bcO$Z?STiSNu
zVW3eJ%7PUrMUnJpbydJSCbY6LJs{J-Be;RV5f%U#mGn$-L@as?c|^chcErfAX`?Hf
z$$KPt<cWiV^(}QqP=mo;a}da>L`{y6C^YPO&d|_oA+ur;mEjOV(y;ZKR)b2i7vK{g
z%Zh6}@{L{uCst;lM_*79u`or+{4=fSd}2X3#PcOlg`U(?<LULMJtx3%0lqdRGg;~L
z`aa>RAOy|RpDdnn;W;)+%y#W8NW=4Fdez9|Ok1L7k~{Z41`#D0$n$)Ddq=)(e&2X8
zKv_CXR0dSk*!m=5iiAP6efJa&tR(fa9CD&ewC97QPYsof&K~x}jjzKOJpCX}7*++K
zwjqqJ5iiS|8)@I-Md70bk7bVCG!l;RmR;$Oq+DI1xH(Z0-7SiEOZyO!oKq+o;Ta<~
zfdXWgLP8Yn@(&p-CxSbNQ_!ej<Z^Ss6V>^CxaLW-EaopStH%p_6$Aq1N(a$OV3hxS
zt%d+n?1qqF&op$?_9Wu?9Vd58r3n9KpYpNGFyMe!u#n?`*ZX$jBW;Uw8Sw>8bpUZP
z7X=Nbh)gK+LyxuzNK;x!^LzsVdWcYPfI*7Vl=kib@zM6;)Pw^3$;UK3ZlqQ<YXW66
z{I^}M4J)HkQU_#(%nMx`M2I)`*KsV6djlEBLPqey&Jk#c5I|B#ex!S2NM;|Ohz#~r
z;%tT%kI^b6x{U5_DgXdD;C5b*T2WCKTd)Up{esj{93|Ze3k-AHInrJqxjmkQ7m^~>
zMHz~EQ#6EVD<%9`zrE<bXyzRxHUNr1h{I~AFsvu#3iv-Ph#@ohXob*|VFo~LM%8na
zkXQ@VIds?6A(WCR^)$V8w?2Y1P~r>RJP+LPU)zd;d^E4Z6jK%^XMC&05x8;^JC*$g
z;Oa~tgay(r;!(0X<Zuf_W=X*Y;83T;Lmk^R32*+)k7VW#?MQ4aaI^k@gSnvnWE>3?
z3&Qcta2y5C{T2}gh_&89?r+;f3os}w1Hp|Euw;Z#{o<Pd+%|e-p4=995P6%Qpn`<>
z8&sp8?C?B*ayUmiK9`jABc{<7=<a7+VQt+Mgk=xtc|`PU1p8oOy3m+@$3f1@)PfQ`
zGHN0oNCq0-GfuHg!2-O$LKI^Ht}T7d+|@6IJ=jOF@9Ui&_Yu3UsnPno-uxoq+RL}x
zhR#KVIBv{UI3~kc+1rl;o<Ekg|GfrRCdhVfIIC{0oyCvTGTGZQ2BvxwT<&XZ?OPf8
zNWWB+W&JZ;`~adr?z|?{xWXkI=aAImOzg%*m|;-w9JGit3~XvonDuo@aEM?r_8LH?
zi|rvMHZvTrmQ*q46hFc{`l7k8$Nw8fxCA?+-d)F3LbFZnk9iiO0|`6EiHB@%bR<~Q
z_I7kKOvEr-P_bzloeLp7Bg#RLFjSM>6iYAEEyR)AclZI^pD?#B6OsiqBB@t~%<*jl
zG&dnaXQp0Ik)=XLln4%-+=~2kNc-V5cw;!G>ia|*XymB#MT%$eWdo*&GX!Yr6!O`6
zSMz4K#tRI>2uNU$lp<N#8BmBaOL}WN3Xpe=z=HKj+lT<+!CWFSF}|+_@c;+miJir*
zV)Tjxm%<hO6QUDbIFn;edIYeJmq;Rl#Mf%|eeePT+d9Y>XUhR~igFi(yq^Qqnoj>L
zSv>p3GySc>DEs!HuF!N2b9@~oQnvEu74fEGE!2=~rpc<6$K^(#rEs1r0KZ@x0ss~>
z6p(QogLA09-{Hk3&(-p1_PN0`03h-nDuSy9pT!`~Fw3#NLs}z?xD5?GtB{FdwC-pM
zpg03-hjtcRSXhuzA~7r-gLn!E;-kSjfAqg_ZF-6!KESG$QjA0=rV{GqO->UBA`#np
zi!BMR3^OD5?Mkc>vwLL_DvxeF-?W6m4|ygB#i>GEofvJC?JDFvY?j^CurdxPG<XmO
zy_Q*|vN(j&q{^l8WGqF;eE`x#9?qDP(X<ovf{!=gf7rcB^!LJu$|pqW$7o`-;jH3Q
z&Vi~wNEoM+nd3_BDiiK3ObC8=L4S<e5$3B3l2|meFU~8+wDI2-B@VpL3%+k|bFG=H
z3gu#A$3(Pn8yqJz&jmThIePmOT)>=Pt|bM5e9J}Bd0!;3E9CN?Dy6=?3*WM8`;FIg
zHw!px@14}boBg^~eP9$Y%epa|Lu>8+(l)tpm_Z^FY3o*{<(IIH_t5c(TiWTJ$T=t8
z*xj&r!th0tj+cA_LMQeb<&Z00Liq}Y5XYzsaO;@@QwKOTI!~$?G%r#-!hgt782puH
zK7{g_zFS5Oq=*pr*iY#%Y+nA>y5~U^2U{Yb_{b^v?l1!VhsXC+tU$pVSPz#(0o*uZ
zFDMFpy|B;~9al($qqYu0Lbcf`Gl(;y3dfQR1hIbeB&w>&dpZWXj5<Cb_F6I;V_qI6
z7xMhX979}IfZP6nXxfcSr|{g))M?ZcB}uR>6LCMlGUFk!ET@5Cu{QWL%Nc094CVGD
zzaP_gunGv@5a!+NXb#88xO<@wij8_;u}6OZsDTE{dBE%se|Aq3ZG&Ejl8?n&&M{C{
z9_s3p$>s(cIs6d;zHD9dho9{m!_>W^eN5TDIw0=9TzJ1iZu>*}6%&>2f4{IkHLj9B
z@*tmBw4W>uKyWJfc#SwiKDE8Ib~}Y$2nyay>(0kCrEq;EcuT0UnaolPsT8GZlQc(K
z=#bo3u^o{M5R5R}0Hn)xJPIyCkUJRkj5H!Ix)FE;T=fRd7>LS6V|?QfeNF2t7|L_q
zONu=Sa?obM_#<`3Zep@A+0Q(%1kMT074h8(@M<qSByKYBD&LxzEVk3_U{Zi?P(w-!
z8eN4gfC|9Ka36EKZ^ap52n<AkWVY@ijw}J<9}HfE0gIfdUHUo#Ix%B+USGMElQakW
zv8Rn${TkI8ASYV#q}>{lL*YspLetXhDR*YJk((D2EXZ7HK7@|H9W2VYeMsD`nm4=2
z80iU?3Xnkm1htF+AXY}!eq=}UxG2AIc`z3&e4AX6Au5{fwi^&;)zHo23O7U$6NsKJ
zrZ4&cLeLYCybp#cr-0m@7+V3SLe(eXEL4j7zT!N6pTh0j<jP`WQ>YAH?=CeXV&Z3b
zP^OrGOViAfnPEf;4>kdb@n%<^9*PoW{w9;Pv6gR|<(#`H8__Ds>?<H0P}CFS!{sUh
zIO-wjU!!J%k)~?|&=zMaZPb63gVNT<nY_Ynxnhb<z%Pmc8e~U)3k)ije#k8<{1|rz
zA|E}a@f<}t5qw9@>5GVt)K~N%Ne<~XBFtbmIxgRWs{c&zf=JAbDjgIT0E4vdm3bA1
z2>_wRfrWZruntauhvhE#;X<a-oR^vHGI-r(2&ozf{pBSX?YuQEJHd7<BtmPPQic2B
zP)NOo7c0i3nX3ZEk>5a=U_Xfo;q-vAy;B&~U7SMVR(y1NaM(lAhhkWZ6*yG09Uc*R
znM>w7`&61u1O$c&ETKa&Iqa|{4Guzt;JnPVxFTW6#=b8zSEUM@BJ0YBS>0ygH3#;6
z=1CWcEIqO|H%Uw%$)Al9BNM=TBp35cG*&sM3%a%MRvSEro9N$iZuT~yWW01=(?A=@
zpq2+a*Sc=u1KKbIlDQ$4z8y&(D?%m1NQs*3M!jZaS`5m_FH+QGUmWoQ<PZ))9qQwN
zNsCuza&fi)&MPYzVUC&;P+5jqs3b3m+gNRbqE<hyupR+d*2>KE4Sj6F5o}<<D_E5v
zkQFn)<C0~OW=BAg&-ib*ABY4VZt<VeI>z*YEY`0IiCh#QB&FA88Tv0YN`$5eQ)wY&
zkKddfAf(CnsQv7tCF<(XtA|$WoM@DJ?KQg+PyFBLY&a*xs~hhWDQE+<i2Kpv1SoqG
z8zn}^ic9CV7J8~Zc3WUN`lAca6eMdDAotHDMifC^<56A`s6|zf4O!rv(g`b@kQ!h5
z^VOrT>VXCQIv?rC>KV@zmBLXRRVhbVR2(D|&oMbvD%F{}y2yY9A58YMea4)UU;H2?
z?v~O6k?NmL)GRX*_C4$RB;Pm$1p|guoS^JP<Kb=sj}vl$M4zUaSl~d$GK9#8;U`+6
zk$a%%UUA*j)?Qdd^0?2hm^a*I;^@Z^_G?tf9Aq?w&)N@_a1Q0GvBw{gJ=Sykvl}a3
z5r9e0)R&BpoQl2_XLMi{tgmS__ayWxDxzs?l{uNN<xM1i&28K&p)7cqQol`5Pm_*R
zt?IIL#sWI!z*I+Xkd@o-8wDBr>Y_&SFufQjI(+b`RF7`-Wiu~KE#4|^q6{<;r>~*1
z9$e}|1rJY+r7eN8gpK0XVYj|vk%KEbHxc63aVX12=wOl6#&(|z&_`ED38z1f_jS)S
z>y2COpvEeK%x@*+n)q2CDeiwjFvfhPp|d1_gB4r_i^eo?rMV5)8$uNTBkjM2I#|^Z
zu+<QGlf2*)0p%GeYH_hs393;sCCt;2z&CshG*o-mHtc74R1eQg4>D_g>oeOZjR@}L
z4wYg4+QJ!=%{+J&lkH%<(>j>uoEb4S1*)&EYNnxwQ%d0=%k~b_bKsT|`k40B(F)u2
z7&ORF)v^aIMKX}b_y3AzAHGM%c9Dne*t>Y~c=(n`?`+&~qL?~(Dy~7D0x;UC1$C@z
zZx7XEC0OJ#-p!uaAi(&MtzkXQ?S&KPI<R)I+lHJ#dHBer8<ZWLdD%$=CuUXeCHSTK
zaA5+)i2dErDSV7$uu6_}XMi0Zjz%*LhRO_or<$-$HIpg%&>U0N#YH81Q-%CMVZ==$
zxsN5ydy!qStU`(z5cv8bULS6!^p=|Rud5mBD%=DD0mDe|BdRbkk5z!|pD8z7q#NyO
zPq2!tCM6?``Y?kAU0(hLdwfCHOo}2zm#XJ`6>!?cFoKNB`Ho-_Zu#4FLNTP60CJW*
zT3C>k7oxyAivz(^6qQ0sgu#&_V975ysBmv*5*yT+Ie1hnv>4IW9`Od3PM*b!#G=;=
zJp|MX$55!9C|wbzUq^EwOL&!T*o*LTyW>pu=$<Ac`hF5pMyDZN;qRei>pFe*cO0}A
zDWDMn?~<8>c%FNVP1bH2C<yEqAx&vvVAMTj<&MO~$(9VQA<0b#QcpM0QaDy*L74eg
z>|FQz7Jiwk`0PQ-s!aT$Zms-Zr_AUmEHG>9G(P*PbEFUp3>mKS@Y$43UNy8zX-6aq
zi47MF!Iulh-U{aU`8<`uRaD-m<+VxI7v(S-M3`q^iap`O7+%y8^I^ZQnn(8ShhHF>
z)}w@i3MeVeFFX6G^BHDiQ-_d^4RaEGrdJIdBq3k+U2j714Y!w%k?todsK6RgbytD_
zw??XC_&|v;lCKMhTa+k*=xH)|iMf2d`gh4O3JiA1xrYdI8EX&27w5K9tiXq(&Vx)Y
z;%=)$+2vmz?VwXNzqUWguCI^UHwkecKP2q9(yeF1EE|*2T4*L);W;D{Ku7$Qiwm*O
z9kItf8?$hhfZ0AKq1kqg28KQcq=Q~;6yxDQU<e0XQ!6fJZ^15yUBYx98juQYdZ`r2
zjT}+VeU=^Ng82F^e%n!HV!IB<1WElv#s-=+5rurRND#&xwZdVtS$#3#%6yE#8@LYW
zzykQ!1{kc%le+CcO*>MTen;dIG?*7jILYT$04<Flu`P7UU0ClD;fN9B=!wG|)IK{Z
z?)CD+cPH_7$H62tb|ha)jeF52$X}S;6<Yyw9L9A)EY|KRdMm)s-+Cb0MFE8a@wbnD
zQ8cvJ*2PJ1xjWJTFU-x5&y`0H&pgTBt;BA|<a6S7F&jZdQ<aqkQr)mFsP7McEbh{V
zxSD2ABJj`Qi|GC$5M$_)=jO>na^VS<I*3aQ#5QBF$b1XCh9mP4t_Ugriw`rxVKwPc
zazTRy=DiFZLa?NQ4%L9Wdg96nkZ-CBAcbbh3ybR5*^t`{2Jg-dycsFvvBE?jx<f`u
zYL?v>W?@7lm}MU$^;|e&)Tlno_*ROd<g<Sx)9CKC*pBSMQy~={!3p~vR=B0@s_U+3
zh+fsmFuEfGv3Lj$5J)1|vVN=J0ZZ4M1>K~#B!g7MpzfWk1cxtMT!D9vb-E#R3LVSt
zb9-1pvrX&hA`b=?M;u(od%p`}b+efv=ECi})j7GiNtkx68ISR;$0LQ=2O^+yFlkQN
zQb#v5gjd*O*gWMsOp9-BQ6$wshhK$u2VE3A4+LK$xi|@YP5NdWmSx63P%F|MT49$v
z;3X1&*gli5xfI#s8|OmUi2|r&C`Wr!<7Y#siuie2VNlBQ19rvCN)Z@?q_8W!2w`7V
z&(};4xE7~9x&r^s;9ZX_UijV&$Iy}&K%@`TuHp(2MRqHzW^*~;OmKm!U>A4>K}g01
zyn#kw*KOWd&9q+93LGqS9l>h0=F8NaEeaIWr>+PJ5nA@7q7h?^2t?>N@eA=mK|kQm
zWR`<){3|I_0?2O5^N&0rN<s?*isylZ_Fj<uf`T!u><-=(1{K^-*IV^m=jo77z#zL;
zq6cC~3V=i9P!~F2S4ru9>6k-U<5Q@i7F9PgN6xHR*0q+^Mc5A`k}`BiMH|&~VD)$L
zE5Vl9M7KS4#TR}KVsu+yPRI_cD0T+Ri)<)D6XEKFy*wyGLcl^BvA`q1pe+r4gBr$N
zEY*7Xvz0)Y+9{hM*2n%EuUvdj7hlX2PmPM}x9~Ig{o%_-O)as4kN3)<6#C;vxYLLW
z4hKo$HhIo}b?XL>dvF9#omnR$?UKsm9uwRx?9BWBfut_5{Uc;^7Uv=B;Y>$w!*(Q&
ze)x`EPzX)~vU|Sn0vt|nV94WdV*Q28`0uM`ERSRNx`XOCXNtTtnseWeO6a?F^jH=w
zdQ1d0iy@pjw{-k*@J2QItUp*`>Coi2+Xb>ywJY-`1vABACe$3`vl0!*6-dBjH>&m$
zf^=Ub)NZRp6cx55L_xkP;7D;QSUm#q`^QgDrteQ``t;vYi~%@!iX=2v*mahCQ3N`m
z?EIvqT`V9qGvyl15lMlNVfpyUFn?bLCM-JLoEt;|J(mX*oW@5BmJZRwvV}2K1zrv;
zQPbe-KJ=oB3Es2|2~3f;HLXC)iQ+0RUda@0U@<XKRf72(6IE+-oQv#3c!=-5hesg@
za)#zMxN~`UNo0Q6jmks<T^X%sJ{)JwSb@Yv+j%p?0s?LqkOQfEu~-2U$j<YI$;i<2
z!bni`SGc{{2R;km*eB>907M?!^0JwScts|!A|`7%jQK=8oEF|E%pn>NL9_$){>`y1
zw6F5eoiwe~xJy$!Wn0(dQMFI&cPC9MzcIHVlPRd?N_$=(AHNCZcxgz+2u39PgSku*
zy-{PABHI;Hb|xj{yu1uc5Ib=XezlZBN7NX7hl2*m-A4}UJ`CH8R0F^PyCMp-Em!Yk
zNCvL<d0mJ$#g2~V1Pz#Zv1g!LK$iel*+3ozi4J_cgJ5x^>0i2GF|H|$!a8h_G;>_r
zFGR@+3$a8mwWikfHA%{22Mkp;zu(zfkc;X?O&Uj^+7Srtn@+4q-hF8WWv`Q(p=<qU
zk{59TU}_Dal9)$N7zp1D(D{V<IWiTmL&qoB78->Ps~kGgpxKs$8Dd~+3W@xC!;X+$
z?20kVM$ik1fvbB!I2ihg2X|>=x_FINk12}gD^WR~WM-zXf_soalwvF*J3^Xc7)1Ws
zQIWSf{AGwvR3?#y%U;g{{W4H*P8l#ZE;jLhd2P3;jjK$|LNwxA6yy+MfrcNUC@Q;7
z9r;30u&7kbA}!&uhdc?23^g#3w8rs*AJ}<zhFgf30t0{q;uZD=xro1E+n*DwTwluo
z(A*|)G<z6iBFTb?T93V|oaCi=0UQtjIVXdVYt`(@M;`HD2%K7!`x4>2A4K>DaplA~
z42tw4*vvRU;{Zf3L9A<rdPF9j;_Y$rp$<dxo~1xH!;E(N{%}D=QC2AeKnR)W4qOn{
zDI8F=t$WvBT;m!Qh3=deDIkE9X+YBfvZGVGP;SgfVSf;_s6KIF5KcnzP@wC4qEwxc
zDI~_FmFqC)N5caxDhr|_UfzL$*QQMWk1Xu`xk3;yeW9S|<NO@Tfp9{&Gf;>2iq6tE
z)doTw)ht-Z><V!(+dJHhA3OwjEE>!z0z2pTj4vlX>a%iUVWDD#C|Jv3Y37iS&1=QV
zE=~lI6-?;H)4+swW6X)?&QN?zC|F4bLxPiJVN6ye<Py4}CjdXON&@P=N~pE{R4j}E
zAF6Q2nfN6__{F=)tb92I7+LCL61CH!ec@9R;{zi$p9E5D$v#<lxq^HP1+CluP#{&L
z4uLq0AT*pHRt@up)BeV#7DL;#Xy~!fkpUyuCn{g@;ELA0;2{G7bn7m%rMS7r?u^6d
z<twkTA_(ctnk{<5Ux-FvP&B}ca{JoTigA_s5T3t*eWU12fHcc0gD?-yies<D2qDyn
zG5{xn+~C}W9yzW-MQ=)1q!+Y=cg8zw!5hK3{`q<v1bCVbbGTR!sBLIsNObdPZb)c9
zquaazJIqZ<dJda9u=Zge-ZD6Pn9T&xh<);klBq<~@&LenhFqVk*z5;arJ7Lwg(x+E
z^J9&Pz^4hmgi?J&C^OC*TIngos|EnOqCK(jBZ#(&gTWIM?g+rEi)m+(Hi_WoQk(<{
zpd@kFnn>8rEIurE(&5=uT{kd-(V-~m*)(mmAh{&~r*I{T>$_dfjLylUceqy(PJtpN
zr&%};bUw64JR5n{A->D)2GmL{v;KLjZ3ona6s@A};a8NIl5aL(Qwa`Hz!1r62LW*<
z3yuyMVKw+?oAhI_h!MU6MDpKO@k95VA4`w*ODZOTjVK2ZqvIQ7s%n}zDu7oEKkR!_
zRh2W3c){&QXk|Z1kxK@Yfv{A%SeWGJ#v?|Ko1|jM<|Di$g@X8zP{_%=P$Lswjf=tE
z7m$s$T>yEUxZy%Nh@g;Qc=FrEA4@Qw0Hdi2_mr3L{F0yz>9nV7U3BXPza%u&!mM~>
zr2jv}zu*)ISN}<~2_=iefw}3TKsZ~1ux`y^D6FS&mk?vuMpI-&^yM5gU(1MAb^|Xn
zX&+u@Vsm(!!u@J9(*EPE_25~hxif6sGz!x#6tE7u2$q{gtIa)gTv-yx@6ZC?23o2K
z1i=bxT^a{#@yj%ktLkm1>@slGzsf763x2I}^&tctQK~-cr3rL@yB>;n<-nkg{VZJ5
zoBnJ~b3hN1{U-`}$iksGnP}iiQ~Em9Fv{%KlHW(0*m_I9f}O)|c#D?HMj7*L!P|rg
zG@0^l;TE?zk$*@@#0nssy}>pxe)_5r)gc>f|0Vbi8FUP(?7Crr56ZN>0Qv@0F0>R<
zqIhMU=uR0x9=!752hwm2Vb40|y8+i}B^tIvp!Y2>d-E|lO!Z5XY^_U8$Oso6In-+O
zga=80mp=w+(ZrR^Mq@t#XaU?=yupKP4QyVWsyg-n_7bZH{_$Govu%xW>Gw>oweFhG
z$&e)KDi0@+e`XWtpc_~QuVp-dxAgkFO^k6tW{jg19Cy|i>Lu>P>zZLi2vurYBE&LR
zuvplL-3mtrpCDKY1$1yb{3+BwIB0Pw^dXjBDZ6*@PCkIl#zru;7s+mh5>pgx<NvKg
zTpL^17#=JE(^EiG20&x$g@8lC1Rg#D`}e!G*I)+^0Qm{4|5{`JG#RPTO)SRef6`F*
z#jVXX0ltLE9r<FodM)6%Hc@sR$vEUM=0I$j*~?3ArM535w=mc_{YRBUqY+G8CIEx!
zW&rzr>Of-6cPyCzNlQ6G3@UgPl)H_|G(zt&BAaUnYpXKa!@@*Kc<-Bs3Z5`(<i{4l
zp5?sGZsqL`$}l(MXN$Wakl2uvNG=DHQw(;h6%S2Z3MQ0mGnKdlcuyrFm9bJJ!bS;!
z;L9dn>N1}-dJ~d0yW}PcoX^>=#@*c_UC7WGYe<>6zj*xuCRH!*F-d{;w69iEdr4l}
z#WKctn%r>s*wmEPfd@CaXMI9Q<dAyC3(f#*cdaf*rzirLM5vIXim?r_-Po!DZL0BX
zgoVvBqxBZnXP#6^S+9+k)@e1Whn=?~VNBz(?Tw{EIUwfA5#_8b0w|uBj)y}9D<Yc&
z&X#9`o?QLX)5ha(r%E15lT%_mpCx1a0!C=5w`#;H1X-`l%Gw!&YhpmUGfg}NGh?;S
z7`^$G`7{9ySniWbad{F!Je^7$y9<#K4i!lSgQX9KADUOG&pn}uLs<vhufD3`f1Qm4
zIFV^~{>7W|d<XZC*nm*@=<)2wFaXx?wfZbZ>_h-+c7fmHrryYDC;{`0qdf_hDmbq8
zrNMB=B7%Uoa&8z{iBX9>b=!|-@tnp4I8Y;%Lv}{77tWDIB!D{MvF<3A<ve7AGZz)o
zKn5=)fH?75f*ukCFA2zSTlg=gV@^B@(1b;*)*~npXj=!+85)QJvXtXZ)4qrDK=d+H
z!Qu~W@^)8ISW0hwk6aLtApLkY>7;Vf;H{s@OR*t*b#{bckk6syg%$zx6Q%LtEmVM{
zwL}U?Q!~AS5L*RkP$vod*ia{vko>BwP*PffcNK^WE&wdAPfR?JKbAQq9=@({$c~`J
z{29ep*59Qfl*$U-T5wcpjQ(95R`=l3@(>*H?(%pNUO{{(NQ)e2{jwr6hr)9=P2`?|
zV6r%G_9E)}5#+<o*PBD^4Lel|7=;17REpNoLjTBGD<`5T*0T;Hw4NX)l$=s&F|moo
zRJa1s$!|Qs2WtYTJgthgM4|Mw-t17`I$#?T9|?43p;T*|!r>u{W}sdP(=smTG@-w<
zG+JwRaRMEm09nrabofmHd-V9hE%7BZu#M=YwntH8QpJ9E{Wyc^%)j*tPk5laymQEA
zP0qA;JX+j76@>35Mand5#AcB}&<X?a91<hxU$)levT--aJYT8M9rBc*w;sIPkxT&8
zil6ognZz+!0AAkeA)*aimq&OAiFSiy`T@fMQD7ma@E0Zr*-d+{)zUC3ZnsVe1TL7+
zL=qjCk-mZH(-bN}I`l~e-SP<e=uF{aI|91|C{TEh{lL$h3K2o^vyM!U4#I7LQ>y8y
zVE^rp>#^YDtN>QJ7`a2PJqd2Iu_3a0tSiGxwLv%?NR8J2JzmiU?ZN<%gLcn|nK>0{
zh<t;_Ms&u8)$~Et3?7CDyX%p?i1B46W+#K$n+qA#GJM5g5C|tM<iL~usxv#Xgn}sL
zyQrtn=71m=2~B*5fMDCX{EEa}Yp6(G+*Uk>r{*v|>ViNu_oiJR74lG5^HO?;0O-eQ
zAK}$~<7Tje9p>(6Y0nMENZY(bft}EqTeVTah$+^r2N@ZP;$)E1(q#4w*F_B+{G8eC
zBo56Wngb<D!yky%zgki$By$jvjU86tLzL)wmW7TjKw36j0qXqcT?gn8r8uU<Y>bPG
z277_DJ;#?cr$oXBJ3+dA=I@Yjnt?Y7FFQwDfdHut3PR{eq9X0)vog{t#D4!YE!A%b
zT7rS=KQWz~48*SNRt`o6_p&QQ$0E+g*;EnbE36JAdNS)Sz~Y%4IWxV9vt&CP{K638
zA?qqtr8&%*FQvlfhv1_@xg!xF>_mIw!EMMQeqdO-aiAC$jNI2#uSE#QYaB3<y}F{)
zw==TN_Ff8Vet;6N7UQua>%F+H+X6l>G1^#tZi<?Mny6GcJEHe-LQ`hX7ZLJ-=?-$U
z4I;2+2iDB@I~xE8>z|mBDEl~DiTH{I<&Pp$TDTKDQZp?#o!QiEM48xlAAuLuN1<(C
ztIzh-t^i?vj-{uDTx+l6SzjPVhD=*8>7Z=1mHuT6v4dDd0Wn4gbd}vi%Q~i{c7uBU
zl#t}RDeXL$oX(2)HKnA8Owoe2awZ%u3gtmqX#Q2=J`IK$#~-bnwwOy`_)n__G*2OL
z5M(!4Ku$L^pGD13>=~7VIC7{?Bb{d)Z45<*WXds$)>h}L#*l7a2E>yrLZJXGg}bwL
z7i_NaCYT|dnDLJYf=g@!Z3NS<(YHmW#Sec&is^g=ZR%=@udh(8Xx2Ya0``~8Ah-n(
zreHGAl*o{RIeNXK%cw)0nlwRixU(X_AC<U^Dcy<!ifa8&9q1)v%y&u_96Z8Etu7NT
zECq8b&%j#s-*F~ZO>==>f(G2hahL+V9434%{OvB%J)JB^0u#bwjPVfWT)Hs7ie&W*
z&7657`VR9Gi2~cP50^DwU>1EZ4V=<=H1Re7QNap_>ijy37yt`|<6jeP51HyWHD8&R
z<#OyXr|dpOe1HSUATT<aO~B4}l*xUDghRs!AjwMzm(6w+AuEl{Bu8PxQ~G;*4ee{p
zO8h*M2`{uAi9521k{?&@G_;|*m_<B?ub|c&Eo=2S%;?)9J0mxAwZVk{1&s}?uhyFT
zsC=#nP`fgufpR_M%M5rFv^^5Wu2P53moIO1V&=~!V$<C(aZknnTNfGvHd`ObX0>l<
zt^JiE0C*^{9UX;$F4NzWK%nLcO6+33kAO37nXc9R=kcelL7)Is6C`K|q3~i_uB4a|
zo+K9hz*q<B5X=Ff*yVV(J6hj2$O5B|71H|QjCW2%NmHRngjM-Xo260{G0Y>$@qcw|
zzL-vQTP9j+caTx#Wq<5A1F~RqNigrCxnU5HR>pAygq^Q#_>q-(A+q)#nwi@<7s&?w
z|GxJwq9eY<P{p24ckJ~mlcm@TJd81gHH}5~wHxUI9$8bc{|4CR@6y(s36hG_3aS6%
z7CK|oct>RP38$8J4rTy7?rE0_$IrYWzROI=KCZ=qo)iEM=SgH&31Etjabn>N|AIbD
zE*DFjIZyD~e2Lc>hOsV+F+*uKlmNCk!~03H#?F#u1Rn&_M-vVwn!8F&jv3MtTf<rB
zfsA%08!H%;zkyJU`HvU|S)T*|O<_V!HMqfI8l*$#^;JR3M{PY&Q_7<y$Iy)o-JojB
zKpd-<=Bt^hs<X3YOz179Rwi}E=PlvOktpTxOsBxwOX47)4zKt$Zb#zmz@_GBWva=J
z2BFnw@((*|rI|+V%}>FpXEI|XcuIxHqpguESf?-nO=M=Uzs-TJselD%DsYvChNgV^
z74)N8C`Mn5z$YtSPuXUhnvq3>wDq}ZR>T7k7@9(Jbp(|?vYE1gAB44eSt3*{u2iu<
z5e$5K377==Y(_sd?VatlJ`7T9Pft5pA0288Nk1;IIHmbEZzhNFGgXJ7;oyInVUz*D
z3IO8<4)3gA-OiQh(v(a;1dZWL8deL#vZ*bU$t9Y`l}4`{(6sHshSw&wp-=&y1<1qv
zS%M~*!|V*M(_L5dP{jTdND1m6B9+x<|9wBH^8u5DVqo<rL3WzmUn2>jfC6(|)}ql?
zkf*K>i8)t?rP&M1!o8*(&NG@7%8p&;l=tKwaTZJt?ZZD|ep60S!gO9Rgld;|MN+}?
z@63aYf5f#y46IUQbDLoE{q-ljLFTvw63tcz3L}#(D&-3vRtq4gXlqoyRjo1!Dga9=
z-5wkTY@owcqtiS9L21$1pO14SJcsZR=xq1FlNE=Jn7iO~*dCZS{=p`YN-OF!ji0hV
zoPh@F?<{8dOa_OhlZh2H^wxwc>e?l9o!`I_HnZe;7AkGAhB;7r%UdWIEy43c!38^z
zRBG8Syh#L64vTMJYi@}jRQeg}6wIPPGXrSllPh|~+ZWINk0YaC5gV<k<!7p#vUXJj
z0+c&&hHis;Xkz_Be~Ds*BavP};DGOMT#yxEhX*~%U2r{ZG#@3wMrk&(l#TVot|8{C
z-CIT-_K=(1jwO}54_X1C@KPOx&wI^;@=eJ|;E{boQS)AQd2L=j3!1hEa>vh(dx{`d
z0kUKQz6(k|XU3xi8JUg<tyFeyUPI*QfK&Pv%Y?d8D6$o$a0Y?)k`Vg~n_7_}s5Ba}
zvsy5cC_US<Oc+_q1)uI<Mr6$$j0(%PFS`vEZ~%bIZ6h$t@n-1+4+7q)_Wjbj3jB1>
zqj6<GTgMl%ROSgT1;*-mBm~ai8}9S8-*RYRKs`Dqm^c?!ss^A0!Om7-<*l&LOTjS>
zN1egsed;6=H!!)Pl7@3>S;8`pKYD=#eM<B}*~|unB6rwY<@l`tdRli`AfWGd1t&=U
zyYn_5<^-q2Bsj#0*gv+t18FDO%SC7dp{9M44Y{F>MPfAt`R9Ln7J*;B2p0q$@#<5e
z(-*l8QkL=c6J>G55DHkWj0zXA{z@R!L}+mgKKd}j;<=o<f(tM5!%%*Yix<Fckb&Th
z5lz{#HsY3o(-xDVg_8b<z{fCg2Bx&KU@-;_k)c5bn}hsj(HUmGY5p3;)x0*JByG?y
z%Fv~O<_J!;s&M40Xtm`Bg7nR981X}bHNU(7R+AsA;f+g0OXNI;d`4$zr5M<F<f;Mc
z=Cx-!ptpyCpBy82{8{Txoo@VfxHC88fcqX#)<So7(?ag-Ew~qEdI+IN%R}3r5<kKI
zL@a2S)B2D|@LTx^Op5-Ec$IXZPg$n+tzfSiufTGs_aJMewj``A-vrn*mDw}~r`v#J
zKuCg1Df0WmEwMw21v*`AOF)+9$-t}8*qao$W==DP|6y7TSYv&AHe;o0`D+R<shgWH
zmC{sB397uJ7g~W`Ml2mWv^WVx(;37{&nd8aS@@Ed%HMFQ36LlN21G)#Fxja`|M5Tw
zfefxInN<K1H5rIbK;)WmgrBg$$K5T(;!1FD@Q&~$(t0`0fpG0GY{j#%mPtM$dtzYz
z-bL6?=$DBk_tdTo!JOFIX(5LW)5t+=*Z`r1Ty-o#1MJt=T?2tV@*=@6fN3DHWAs1o
zsMgfbmttA1Bw{0z(L>>pGw0X)+>K@`Y6<`k$V5hl>TCuFd^2LRNyRDe{|Rmm2XHcn
z9N(Sm#NjJ(rU<b*CRP&G^0$Y-cfq&R4@n5rde2n~nRz;qiqwAxr&oP8)%#`wBbI2A
z1WV_!LnAiw>~4rqw=w`qw9g88hU~t1$0mmbv6envfao}1x)~Tkg$|@}&r%E&U_TpY
zV~s|Nq&ZfKCVwPN`NRR=U_t_3a#exx5_v&=G$$9$`u6?ds*00t7T^lxiIwzw5>F5=
zgmP70Oa^2jsC<B9BUElrBzDQyfa!D(!*EjGcdnAKilAP`Y=rzOysz6J5`lxmHSA0;
zrrBGV^(fzV;{sImb;hCDGiV4%mX`;J;B-47WM`2L^49|b1L{U31iKBqQilXYZeC?v
z1G`tMoG-^~6wzPj-rZlESfeLuN=>E;Oc#+_ve^J;Y|%96k<pt*myYO+ofE2rV87Dr
zpH3t!Er1QO6y+&M_`Sg*0R)}v@4~1%Hr&$9I*@kIX(w8&J`(yz+U6+nL2!%X!Pv1i
zYGs1nSgaw&9z>!QLf8{fl?u(EIR_yOl`Oyb(_~btuvCTMhA3vt?%ZgP?CM!q=L>Vm
zhBzZfkWs`&GsdlM&o|yYSR_jKwnuKHQ;1o?>Avx^EOOkr+f~$&lr#o>07u5)kau~w
zx_5k5qbjkMRbaB0jYGN=4@qGixeF0|#<dHxuJ>rS-~dce{BHn634~7+-R9-Jd=4Mr
zMda22NqO<j@x#<${<HaTX1@=b4K=(R?vnTFvDBk*D!efXN(E|SCTe<b9e_sh$9c5L
zY3k?H%m{OqxYXk^FSYK`2h?L@P%xkbwNbRc-YZllwm=Nb!u0`8y-W=;GSEeu#+lTq
zV$nDwCSOxS&fm%iR_|FPBL7Z~)!sQtFrHNwV%ykJb6v|zksnGd$v{d+KdVsaAmweq
zCI|mrP4M7b8QwmX*<wX>?~rW`rP7FW&ZMNg!TAxK&&B$PKu?Fi&DTg9GTT(Z--87U
z{&r6t4yAM><=O5%$|Mt^#p;Hr@@6z-?GH~e4UomNq-M(MC?gT7WqE+0bYR2&TfDXb
z9m+N(lfL=@_E%K{k_Da-chbeeT%<TEY{8N^)KN-cDDwE8LhB>n@LY&r0sy=XB=kE?
z2M&R-|Fiy$PWJ;nF-~0$;nEoji4iq47OP23sXoE^tSAr67YmIr%=w@Q)mIMDtU0=&
zaH_bj>*G0W!x|mHq;&z^7S3RYRJ9rWfRz+d!2k}Lt=th9$^$E=zgSxeh7K|kTb`o|
ztT{hZ%5>$|qhfY!%fx~eHO3x4fc!2Tk#WPi&0Ox`d?ID1H59naSOBwK01<aolF5ey
z&5!DrAfhRXFPMIa7n?zRz+HlV0Uf6|)dJg8eR?m?46)@*$;LyFLRbzAtY?`cCugfL
z09#T4>Go+Ve}j3f@$I|S;T>e(qEUwWDf9~`cSPf@U9t3Wlx6oNQwCqIff;;M^R<nw
zcaU%x;6G4~$7w90+vEhsk7@kv8@>(^>P&<dj}B4I?PSSFAduo9<RhP}%rd$F?8rx8
z>hp?>9VX%S;jh}j7HMxRnRkE}-J$ssC2HbXuxG0uqAJGlnBu3X-X`W02cQg@r13-7
z&mF+p5XUFopdhE2^8cJ+nwyGgUade|3(Hs<T}G;iXABmh$1&y1wlr|>#U)$IZ?8};
zX5=i+U*2C!ZOI9G?J_kW*u3B<+bNUCR>PGT<XVI^fO!%C+rajSc%Un@6b5N*Y$Rwz
zVCgugl@EGG0yAVhUc)T!II}e8dv@H|ez4`5aEmaBX2#2Kx8ui1Yy(CKsZ_s!dQgfm
z7+Y*Ft6KWBHD-n0APTLog@~dN%})WrF9Q;ouK+zLR3JC0&^P$(R6@Rc6u30E_5<kD
z=nu_tpm)K6?3h>p&?W}#W9PP#bzjPv5Hp!?p_c34PEbubnAN)#Rpaa5%%5Yx3;@JE
z7(9m0(p|muQZJY)q5O{6YVYR;U;4oV8O8)bPrN^zsG4Vej;#Qh3^K=)xaDOy8$Ef*
z^frJ8s%z-Ns=Ww$5{Oc`;J8|5#6{$?sS*PrMcozfHuR9^a19&vr*1`n@vX96f08KS
z>q2SOlD^axCu~b<4)$21xK{vpHe_2a%aW)wp-NG#-Lvdjw4H7UkRs#yP$mA?WEPkJ
z*HHn!R{>0bo<l`0p4FBW^eP<LkJu9g0ghiC?ZUkt!B)=IaZ00VkyOVI0T<7&JOOz6
zdHA$~DLagbty-ue7||2R930R{M=A@|!P}9<C1{V!tzdVQ5}9c8YH_fhr<V?KL6>&|
zeULX${oT0tQ~8I3SJmLc&;<N8ytKT-WmOYv_Cn3+zyVjQsVYJ<CP^q?3?_6qrtTN{
z0bmiI?kxW(M-z%VN)jvN9Wl0e`QpoLju-`JfHC4D$T3|)jLO{X#s*>cEl9fSFE<-n
zi_72zCuyuAUMTaOc2HOabD<ry>JxZ^c!T6g(!0?QRN613=T8eY@CJ_iok29lHgdeK
zXf&-6x{0G{_Cg;YPf=(wB_)D#<}B!A;o6RLzEim0M!@<t3>LgvdZ!Ca>=*0U+!Jf~
z0@7}Zk;wgqpv*kTvX2Etqr)ug?X62LQ1B(Q?aly57!rwC<6Hx%^x~Aj&7YmikXy(R
zf51I%FBlBHtSEe3*tn-648_CsP&3kjK;C>64Rn%Fpg%!hEhKT>o&c<~;qg@4dxWY(
zm06IGwM2-hICL0Ty?Kb>Y-~_)n$iGtb_7`hEf}=^xyWRp*GrW{R~_ze^3MvQDHy~-
zI@xEI>?xnSo6x5U9S=3EiQ<@@qGEW}Ogu5KIcJt}zheUb_m90DQ8-YV9uT3-sZdIT
zkamw>-(202AaVs*;!WYUcm;=8$^$whkgd6rBKWz2Mu&tk&hg;@eT%F3*ITj?<zFZ>
zQWi!PE(`^sN{$OW0%y+UWK;@Id*0mj0+YaDWQj#-giJx`Lz}c3bAk>n%drLMel-G-
zVT$uCH^{~1gDc0daD$IIwcglZ2_z(>cG-#c#;El1OHu876fYCDs}Lr`gQALAwtl<^
zIh>Nakt&Dhv;on|2X-x}uwjL&TZ=kXOOc7bMRr*^wI*XwL@6$*7bda-b;2Z>#t9la
zC*V2T0sJT5Fq(n$U~Flq=zbVTM%xeh2pjA>bwb+m?1a8(=ZeVK;FRcJkmA{F>F%!K
zS~_Ta&KWzS!n*;5vgp@TME?Rh#4;`eB5)ZT;8cW`G-IAG>srl~?Jh(rZ&!BEfK-sm
zTU5E}K`f$4PzGdN3VkmUBGh7S<JcWR3J-~fV=|!|`H@pJdW6or3o~#E1Mr#OHA4Uu
z3OpnAxg;bqwZlXS2T=#CZtE?m+E!Gus-Ui6rf;T-n<PHNx~$4h1Gh{9YfI=A%WJju
zj_42EV!00f@tmK%bL@0}qMvdK^{EuG1_5Bh1?rz2l2_9Y54J7|k&qY+jS{9J0l~1;
zxGw_$>SW;Y9O@m$2zWxS`8YdNXf|4pjH=_%|2$gfYn)Ne=WEc^BMa9T_!k8Eq?W=~
z2w*j8MYYQ|VULL)ZzhtM=p-hE2Rlx|i<xWP=hx5LfFgi7^PLn*gH?{Q?BFULd^l{X
zKb`p*9wKknGifKxWCP@91zBQ7Y_{D86dI<@k;|?jK;l`aW~+lK&?ghVsnjz%)<cwl
zp(JJ7kO&86LN!=47)+5)S_fhTXAnwY_R%2Xj{(CF1cJFumjHmb`R9>Ai*eA7K=}MT
zjpYKD7;5Q(W+q*JeU7iOEP%>dqg;r7@M^x+wN70**e=g@?_pwCM6wOhsB9Z)^ns{H
zs?P6<A*7ji!F6`p0nY|16V2CCU8SU+v7*s^13l+Bn-Q}BgIod9iR?%jzWz~&tnSK<
z6`&@e*J;6X_tD_hi8o$h9_({<#=@>^K)0wsQ*d>@C_D>bcsd09`@#VQH~#Hv^Z-Fd
ztb@6+g)T_+XyCsaVtvRoWEdq<u#i=N80K|SQG~oB%J778rk~9Pu*ex9k^se&yN+mM
zrK!D2=tCs;c2&ou*%a~$!&t#pJSzeBVak<JHGL6O8te2pt@~41Ify&zQ_plKp=Z+;
zJ_aPjLN^0Dw~_>qG7=R@WtkZA2!xPBH<o!`mtdJmYd0z4B$ODTy{*xV`BBRq-AoXe
zxY<*E(Iu<RB5@$VO^GZFi*A)ny4;G-*mH9lQ;+fCux+F+{?Yv7AsLglEfMNcyJPy2
zwz5FIYod!!%yj*^ddHdq(5$gfj%fj?0p{cCl{?5OMQ;z;>K5(XfHG^;#unSNWL=Yb
zAkvCc$O*{qFp`_4g<{qrm@wNMszKKcy*^kF!=?0^DGoZs9Bh6ogXUy35*VUH<Thui
zb^!RpIBF0G>2b<)U3|#Wvz<!&cUaL0D=b-zBIZzPyk))pD0I4+v_y6~rszPN;J7po
zJa6w8+Ul_&y6s-L758Ax28VP#E*{C2qA)NH25f|c^1!i@BK$T$-ciPttp=oTX}~d#
zca>=~#>m1n18Mz30+NiKOnJYQND-EFTzo~_mCMBqe#?0-x){TYMlJ6MYLC2RKpJBy
zA{qeAi)k5R{C16DjW^@mToAq|!}qDkwo}oKrCp0Mb<rvisM3LoCuEZAg*_yALWa^A
z9yd^d?5S57vm+%SH5IuQ-jK_b27atZ@?*q((IzsT<uA&lDAfBz;*Dg_d-|I$ljibM
z-I~OiqFP;7Uvzi&5E8n33wc|VSmN4pi%2lPh=*Las90#q-ure8(%1WR=<tFwLrZ{E
zEoh9@dXs?7E#0KLi8N?=xr7ev2?k?7CkKuv*#{YDgJ&CA9P+It_7<ht6uxm5k_=5~
z5mtpK@KJ`IH{1wJsjrR;rU+<8+;5Y`NW9R;^0Q*dGXuL9$r^emG51R5Ju7IAaCwmN
zwYbT%+W&*8!g+hnWkhLK5`J24;7J+?xmhf)LP%lqfnO?l$F;F@)*E%ow6=cXcS?zN
zOa)qd<c|_$N~D(%G}cD30PH28O!PcP;37W~MhTWD{Fx$T$y^10Or%+mY9g$JF${7S
zq%}wnk;Xv#C>%Etph;Ydf(ax$NGOl|J#glO*bMM$pwxkap@arTG62T`NkY3t3WbCV
zRTXY3q(dPH#BT_h6TT$eM(BqD8G=<rRuU*lkl2H}4){D^{KKP$Y7PP)@NI#)L+gh}
z4Av0rE+C1a2tpnN4GY*Ls8Il-!6X821vd%;3v?2QEf88DQ-Df<m;q7;xELRmKXmwu
z>ECL6r~F&>U(>!2ej)#>;<xY~OTBdU``XVFUS#<87ocsK;g1!1k0t=e{|cTjeJb=T
z>!ZcbuiXfCW6@i*o{HT-x?T5++xw)?uFq8-CHy(~J@8lM|H7Y+Zw=mFTxqx?c!6-)
zaVzGZw?4@h&0g{S%>=7}j0iz3#Pi@IZgxAVO#p!!yhrLoOIlgWHf}Ov&2~>YU*%PX
zUIduv!4n01Twsfa{t3X9lMJ#;w-%EasLywI=u5AO<>^N|Bez9H=!woqK;XI@5h1}#
zw~ip%#)!JDmf4B3E+njLjHlc?mZKH7SdS_gus1NdCaI_doV$tFubBV_tY>!JOG+rE
zxP^v*D!DkK0J2p}pv}cKl8XFKV@ykLPWFVPtCEJ!szjx57$NMNWEe1dkSHikj0<MK
zm6nSNYE;Cv)bwHzlvq7%Oh7`4q^JFbQb;ykNe(qq!#{9DR^LW|cxesz0fEq`m*MD9
zt5nok+SDjaYJLHJSo2mehLMqC;aozUE`rIt5Md_Psckn#W&Dq1)={`qm&ElqS=6;g
zI~I5B>Y{pxWzLKPne;l-K5b3@PmQ4T!cHBE;QeDyQ9s`c35YRH{lBI?|95qp%x5E#
zh;tFM%v5j!rM|nU1W})au9V`vGmJ_or8gJJ<B@Z_5Ck;I*pXu|+~qz54MY6PXI`aa
zd?CQ;8^?1=x}2sRFZi^$f3>bG;ICXt_6AUl`~Ohy$jJ)7JrEXSMs9?B=$HTS7y+;~
zBe{^Qi@9|w!)GW}=)B?vGT%2j)I9wxP6Eh9;C|Cu*I08ldM(NwB_fIDg_}y`voGWu
z;ELHI_rsDi0HS-o<HqG|MUn#+O7G=_9Zi1_iQ*C)bI2!`gS$@Fe`SJxAqEMD8P{R2
zi(0!ecppHNgKJ;`DLamA%%qQYc?o$<Kr7c9XJ#MDJo_-#Oj?HMV<mWs@O^RPMU%Vz
za8b=jyk21|A#tOhTo?Kq?JodbY@UsV1*tWa0oi~VFTIOqyCWE^fcr0?R0K2emwSoI
zjiP`yXi?GJwprA$aRzh`DOE15Xe!c#Bw2&Px9QgO7`2$L_R<{~;M01*pe3a=&~=0{
zT}iP;k6bCA84gP3Q$uEEGHM!hK!N@cvz=Ld^_tRLN%VeIg$)+w<RY^ZoS7HD?pEGU
zWtA<o=SaB7$ab#9v<x(zZ4pI)A{D;nfOWr#9uOkLAi48NK9!)PIsjVrkH?Y1)=!=R
zAI=*;o%b5VvC{<dwC+HV6_2|ool)GCrDSU=Y2#bU5WsL=e8*)NZY_B|qAulu#H&9i
zE{k407<5taoNakBy9R*=gm#2*<0W*Hjao$!w^;%#*6|RD9e+!7RqcTg&Ya0Qk>PM5
zBDsr$G}xQYieJlb54HqQ@3ILZVGqcfFD~}C86X*1BYz+Vo~$QjhF0SQ$#}%JK^I3J
zn8|MpBbxfdeSq$1x3ctja>@0&`xAUJKe-<G>ngjUhjS>{`yf!81L6KV{Uhc(Z8-3f
z%kequZPQA##?BucVOnN3Z~7gK!4BBVeUPh97^guo-@l!=3FsoRdA!A=n@hR%8{R(-
zB8JQ85hS|qAQh`(gJ=gW!gtK!1-2a(n+_1^cG4@dUMEx^@V_6$E@`$Nx6s+SU{r@V
zTAVknjspdh{QpgrH3Si=iNTG8U*y|EjSI>O1h+ekhRhE;96of6d)MmY&MNI^>^D~~
zS{>t#nbil#%AB_A*-Dv}C~-^Tzgd>x0vzKG8QnO-DLScHm#LjlVx~=Z5lu9{-m3$o
z`wN>pYD<EeV+7JIi2>1WeTfpzqCU#osj?16h*%@hF50L>j^t^ttbVCO!-HaBv@@!6
zpQ)+h-b0g?qWR>l(_hLHoq381=&u18zGzO&E|`gCzG&k}*c#(5=TTP8l}lr?6Qsws
zliG1G_MBr18GMZv6dK=4-UbDZXxFZek1XKWTwY}_6)^&wt$~?Qwtv4pl4einrA#?}
za-h{|#WNR4!o?9ol2D^bT=QZzv~FU`+cO7_cyo6tF*-B9(0X$$K(_hC9wV;*Vy>2r
z#_N>>39Gb=Rgu>P$O90ZFe=!Y#wj2I*u&Zi(xD7&B1y_^FvGOQaohd9L~`^Mo7E*O
z(^m&#XXzn?aOegfMiW8<-JWTNzzHh-5jMHzA~?rY$rva<4B=zQueYsaHrei2BrxZg
z4i8vtK$-^EW$BqqK7y>qfo;eLl9c1vu@p*H%CMA3<52BjMjT}oy(FZ1<=&)6qtEK!
z3krmBvkinW9no9%jm(COJr3!&k?&%isIuQ|vqSdAbdf8YWC)n6f&i6!%z`N(ypVl(
z=_HO2*Qc`$y(Y4`g)gsZ?lyU->NU7hr$vfJM$=rgGh=N%aRT};VOkj&QktT<^<^a;
z3=7Qt7k59h$_A<jR-m~VC^|~ri<ygS=*IZOqJmyBP#s!JC1dgy1M2xEEvwBL#}!7V
z>_AH+#*YYzJ|&W{icQry9t%!9h=NuZE&?s`Y?s5-`d;7^C5%`SShk71;Q?rYt<mot
z2#*5-qH4_IDLj&5-T4%K31oRgR$4si16lODXzJz^uMN(HBlggvvBQQK|B%Rypimnp
zG<ufoz-mg_(}PcqgK@4&fZWLYC*K;0B&JVf4>_Sg)ud8qM#>V~8*!b63$@BW6PK^K
zk$}5S08e70{XeP*tv6NB%l#<a<OZD8Cm^9SQ)M)PIc{KJgr@_QDQ~pg%x@;!N_(UQ
zI1{uDlcor^S;3+t0u1!RXxK?&Lh~ouFy`f=T9f2>o`YLLm7<T7`kup#07dok1KD3s
zM#vz*kOgcS8Y^ivkKvpZM6#o;8iwn-e$TbB(oaB2&74&RAaAeldQzup*%m57o;EaR
zc_Lsu>Qe^zln36!XQBDryvgDR9G@9!iVovu*;*y{Pv@9SC+oo~TuctqL!}W=lw1eo
k3oQ<F?<@u&u0R%lmA5A-3ZOcHko};|fB*mh0000009pAr4gdfE

diff --git a/docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.svg b/docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.svg
deleted file mode 100755
index 2edb4ec34..000000000
--- a/docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.svg
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf117;" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1708 881l-188 -881h-304l181 849q4 21 1 43q-4 20 -16 35q-10 14 -28 24q-18 9 -40 9h-197l-205 -960h-303l204 960h-304l-205 -960h-304l272 1280h1139q157 0 245 -118q86 -116 52 -281z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1664" d="M1664 352v-32q0 -132 -94 -226t-226 -94h-128q-132 0 -226 94t-94 226v480h-224q-2 -102 -14.5 -190.5t-30.5 -156t-48.5 -126.5t-57 -99.5t-67.5 -77.5t-69.5 -58.5t-74 -44t-69 -32t-65.5 -25.5q-4 -2 -32 -13q-8 -2 -12 -2q-22 0 -30 20l-71 178q-5 13 0 25t17 17 q7 3 20 7.5t18 6.5q31 12 46.5 18.5t44.5 20t45.5 26t42 32.5t40.5 42.5t34.5 53.5t30.5 68.5t22.5 83.5t17 103t6.5 123h-256q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h1216q14 0 23 -9t9 -23v-160q0 -14 -9 -23t-23 -9h-224v-512q0 -26 19 -45t45 -19h128q26 0 45 19t19 45 v64q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1280 1376v-160q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h960q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
-<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" horiz-adv-x="1920" d="M805 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM453 1176v-344q0 -179 -89.5 -326t-234.5 -217q-129 152 -129 351q0 200 129.5 352t323.5 184zM958 991q-128 -152 -128 -351q0 -201 128 -351q-145 70 -234.5 218t-89.5 328 v341q196 -33 324 -185zM1638 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM1286 1176v-344q0 -179 -91 -326t-237 -217v0q133 154 133 351q0 195 -133 351q129 151 328 185zM1920 640q0 -201 -129 -351q-145 70 -234.5 218 t-89.5 328v341q194 -32 323.5 -184t129.5 -352z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1792" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf18e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.ttf b/docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.ttf
deleted file mode 100755
index d3659246915cacb0c9204271f1f9fc5f77049eac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 79076
zcmd4434B!5y$62Jx!dgfl1wJaOp=*N2qchXlCUL1*hxS(6#+4z2!bdGh~hR1qKGS6
zYHii1)k;^p*w+o;)K<I7v#nkA^~JW@zE^9(_Sp)V%m4d3cP5zx(6;~g`G5Xd?mg$;
zbI(1?@BGehzY>!q$t7haS?ZrNXZgbQTi5;wSKh*ZbndL#bJ&+8MUt2W`Pezjnp+O=
z-9F^&k?+5F%i68~oqpyW<ZqWGzG=hS?OSo(BT4dKakgx@{Mt)zZn^Dm$PY=(|Lu+I
z*IvR`f2&4f;T-O_Z^Q-XE&A)o{~h_djaznH^UJqfUWt`OB}ofie&xk$w|SoZABk19
zp$^ZMwbyKA|H-2gi_b#&*cEHHte?i$KZN`xc>h<nUb%fo%S-CNORNshd!F01e%+;a
zE?x2!iM73k@*4iBx6%)%KmH$d{=xEFCerz(Ur+myxZ^^mjIKx=dB*nPh~6WI*Q>9y
zdnHv;lslDH<oB6pzFk@=^0;*7pRLzkwOz_cvHwK_PN9e<v09u&OA1fKL{3JI{?R|W
z&MrZYQc+1^^Kf2-T2#zcOd605OP`g#B)u53#hPOm#cOJ+YWfGIW3FRW$GVO!I=1H6
z6~}HocK5MIj(zsn7mgi0_UmJBA2W`-j#nLTI^K1B(eX9MuQ-0=@w@+5Iz<hl`kpS-
zCylC4I_5bRKbASR_*nn3t;e#*?maee?3rV^V=o^YJa+83blh`1c6{RT%<;v?`;Tuu
zo~8Ou{r1!)r!G8o!Kvk^W)9l^>&^fAw_pG7f1dcyuf`&t3QxpS<_UX3o}ee-@q2t8
zugBw&J>0`QlKYg~aOd4a?vw5l?)Th(cmK^nqyK;W!vF)tN*T>6{g?jWCQZTrAAWQ#
zY*EXt1%NzLiwHFTr60gHX5Nk7W4+2A42mr2lGG9R#$|8ZJIHcIW-A}qs>V)i)ua>R
z9mQc2nMpK^7oL)|C)BJ|iA+Fe-grwWpw-4}l5Op+aW6}z+qzh5yrqh1Pc-IlXPHPc
z85zpbk!A9?H`djM)oi%FPMuSW+j%M3mc*Yd@oO4u!xa`wg_tV5L&7^6k?{sxyrzk_
zb@A4guvZ<OZENpf?X4{#O`5fF!^#aCXW=yAvh(w!v&kws<M7mXs<D#;EsGk1!Nx_G
z;FRL!f67lSy&!+5y48lo-$@XHHe}HTU5cag9w|ou3|*~BF&yfW+~aGnizy*r5W^5s
zvc`MH-Nt)NXIII3Ut4>farld`-D8|Qa^;mrn98b{dgRLM+4%{M0!%jx8`-wLBs=f=
zkrG!PF;3p|+82$(2?3I)vN{&O6p^M&3neMx)pSL7@kR^?OC=M@ls6E<Shstp@g^B_
zpalcrP`FB&%3HeRj`of&*5NfLC+(%_!9ZnW3FEJiv}U$UWNhM=OzR`YUlTFEQ_VU3
zOw}Bg6B(!f{%^jlO{wW<3NRLE>ZqBbz5LDg3$tr_PGox4tm#p6J!@jJR9AI$Z{x&C
zlO{IqJz7<lmz;jTQqO%>uf?YNoloz0@JV%2B;oTVB9qi7A8fp@|0JGU)1y!w<{VSs
zvcPkaf+1~E(r95z6%TjGm{1y1`Jpyn{$5*c-?V09u<Pb47uVG-zVha-LF0}5eOVu0
zX{o#DlDlWV_V>p5nYy~n{Kmh(_MdO$pEm3M4CZc7szC-7`B5FsTSCPV0NUXvFzrbA
z+grkZ6=M=HK6D-n2K+&z+vvuG2Kjl$1Ld9U-Piro{I9cjJLPLb5#tfVp*w?>j<?=&
zR0cH{`zu>l5lmR;v+p!C7?bB)X^jxvnD4d{^jcZMj>(r3YOx(>Z-%mswHPap95Gh1
zmicTqyOw=Nw5#Fl&Ef&p(8X>vZs{_9ZmjywcVt_!nJw?rN@^n@8)IKBr2th02x;q5
zY5ZGgp;f7pM~fvr?J+fb@Y<n6*B;b^vGzIZr(1iL-Ma7AWj)sE>*ut`g1V7=-FW`>
z*ICz|YYrT^CcS>=B^S-CZ%jAhuYTr5m+V|G|K7a+x+K|YP3iPrH{RSVbxY?+7fDx2
zH%a$Mk4m4DBsJZZY-BZBB@2Y6GJy35<e9fEDWJZv4A_|Rr{zDO{0F^n>|$csWJF-L
zvm6vD8Ock8`eYo3kSi8cOP(~49x3%fbz&L5Cl->1g_J4Qmt+r}DVdLOyf_&#=%|bo
zIXRM)ON$sI*Uwzx*G`Cct6~w0jY#0g;(QXe7JESv-INo;#NJTMf6#qd>T5Hkw!XeL
zE{-E<IeWG{Tp~2u*T(3`e^`<kD$R_#BZ<W-@K3SrBd{m|6^K?(XC~70j>(U`|9_ny
z`#vsp)*HF{&dz$4q2oxJXG?SWQMu9gM(5tIWND2oCSFSi_KV?Uek3W6BulQAB+p!+
zq%xC2$2L0#FZ`d+!aqK$D#m+AjI@kCpBy#%qwkfL`xnP*)KExFx>j;&w<%wcLfB2P
zcj;P9Gh@lNZidauibFNiZj0u}-yU5Yz1=tzjZ%Uo`Ms2v-&rhfMQ>-DC?Aa)zvTC!
z4C=k&)Z400IVgb(sSCK7R+F;g(2S}(tfT7>1#~M@eWGULSH`c*nphI4!rNG~Q2VcN
zRlMhHcg-iL7L%SaX{uW6jkB;fV_h|xhnnPchP|0q+*F`#99lw^3>y)c1VMR8SdwR?
zycEgr9P~RuwhV#<8A*<!$9mIeqsRE*X-`rmZ<Y{g&u;2H3z1gZC$|)qz*mmJ1^-z4
z^EqldM@#;hR*O#m!!0#wldJ~HT56EeL>X~SiGhwyxA{8SL*bC7yU=<;0bnCdH8IeS
z;gFATwu!-s&fb00_?_`x<9A1QKX$P3vg(+7+`7$6?l|)Dkvo=bUN_DitKKy3;A8o0
z-^M=t@$AQ_<nE&^`mrywo-Hv~<G9OW3x0O(Mij?W8?XJ@g4ku_8eOq1#&di@Uf^*~
zN1~-b_zL>BlwOb$0%nSk(h^Fbb)Xr<4nsgQHczcDy?<I>^0{&@pE$7WKbP(=KIps3
z5J{FnP4DDInp2uxHAE+uOqbX@Cqzc2Oo3L!d;st1(iO<JC2O=msD&U1>r=;!1TZ7D
zSfiSbU+M*xYf7hukW3K;3;G_Hniwq`Ac&6Q)mC7McF_M~8CA1TxC5j$I0GW9T}%&E
zgB?+%L$4e<^a?-ZaeUPusGVoCR@@tMxb7I=>~ZRqzjg&#bW+1zHn+=uV@kKU=lLpJ
z|K{{~>|b-0*Uz+BBlm@z&e4VMwz{2;o9jg3h#Q4@h~99BZTYn$#G~zrmKBbOEpfN?
z^052%mZ;bH6;E)p)qYjG&FQcQSCzL+s^CGVDBILDd5ObebJpEs+gw`MwyV|RG7C?P
z@}Sr|3bd@bk583mN*e&%V`d#}<0vQ?oA-nN4O9`|+QnELqZ`+BRX`dZGzpjjc501d
z)QOX-W;k#_kC;;&*jduqp{&a-%Ng12%J;L}MBQe5%cjd$`ds~MdWJwx^%I1!^c?ph
z+TRzs=diTPC&x;_$aR)<zDoYmP#<94n@|?)v~q6!5E?Snx9r-T%jB<!rhOvO)|U7L
zfg5;}2nOs@RhIl>{fn-l;|2OGZDpYj02-hRJ41?Kjks%oQUM<ay<u>%pjM6SDbQSz
zB;(z@oBdap#VI>2`M!Lg!{M}aS-6e=M{GsxuVOL1YU4a+#85a(gf1Io3S+-Al6=Mj
zE7$pq{J&cmw=S?%Soryo$Pd3oV_|IkGRXlTlEK{4`mlgwz`h0ff@o`;#gi$l1e)bi
z>M{(l&MK18U*Bm+Jj<@JIgIZ(Dv5kLDTo)It?!Sr&S<@iOKiZ%Ryx>Zht1eHlqI@K
z&D3|+M~&}B`^|TYwHd(vGv0(KdY8FFftw~|BYB!w%*8xaEY>c0IIt;%0+0#FKqMwc
z7!;Gh1`eJuesSX9!4s_h1iR{}@u;!Jc=YH|ww684*2;s%Fboka<PDTUS@8tFsI=(O
zqhcOgBuQTc^yme&ODrunF=Cr^IjDt*Z(@O32nABOj27dv1|dNW&;=vNts&$hiV@~O
z!B7~|i}TA^!1*<2fR!<y<F5`Mf43>0ar#&QmyKh%9$-FaKGPIok6G#hY#FY&apfr#
zaia)Z7O1nZ$09tcFzjM}r;$?}9uK%;zmrLH;S`SZ+q;y2Kk9epXqIzMBu~E8C1kCj
z3$QQgnCAp!9a3EZ7Z%U{Q8OJ5wRF?!V<DaB7?uQjix&hOK?tN&Q>w&BvXpFls<ZwC
zCKeO^quZu@Y|8EIWq`-mz12p>*X}bi)n4y7CIK?RBQa^*Q$ikPN~KtAgwnpfv-9>&
z?ro?vGJZeHRW_tpPOw&)5?Cpd>I4k{x~<Tzso+rss06)`YVZQEbTLm-DS;QI-)4N%
zUS>CPZi^+96AK4p^uuA8Ie73isNww%hw)9Tm1R8s03*0@83R7vQUYm5P6M4Yv=w*}
zgKKV)rgVfTO?LLSt|@7ujdi2hEaU$1`!@A~fH6P~Wc@yu!@;_(RwL(O@4Zh`A)_GV
z4j6aR%4cy1yyUoy%_|;`(;i<~_Z@x{8;AWN`4pSRWcEsa+ABD*X&12!?@vZf08y2{
zZA(YwOeAf4yPRiao6L?G9`4||$BinQME0Am>Ab$Yrlvgqi|Hj}<d!N(LPB)7*mS|h
zcC=$`&a&*4fmnXf4e@p?7O&>9_g(b-$pt<mXSMhfJe%<Q{6_8v@3-n1;X;9rpoJ*l
zy;QQBC2MP395h>N3+?y7)m7jalwt8?Ym0)tAEX@s+{ldcdaLhv;Cn^lYu79Db&t!w
z-^wgojPHMXgjBnq`8VGJ2v;Q|6G_&ms_xidAn`U{WaHL5EakSn_YqOYI$8AS?km^d
zj72m|Ujkp(NpsQ4fX=0OO&ti95di==4{Wodv0_;i7dH4CbY+;%na+GtT(rF<r2d{|
zjE%<I2aP{(zS)oE8KITu-#_<DYxn(Oj(r@!(djRz{^2URSGf2cr+)@}i1`n)z~)=<
z7#mc%@mJ%ES6q6t->f3p=HK5l@0P2)mxTSYpB~4RJNBCwoH}!`h3J|;NuX$<!)ZJ!
z$*u}qOmSyu38lwSsAKbEI0R9?xU&#pLFG&H{xMRk;*br?RI(-`KrGOiQVQ-5iF+~z
z>TGEgBGIoY2_7ZuW&Ohy|K$v+{FyF}T+6r0;-R4&DpwYk3W3EMSF(T?9r8el#ldwz
zgk8F;6EBGUmpH)?mNSv8a;C_1$C!m}WtLcdr!3_*9Xhnh7|iDg(Q}~t+*g>z`1@CK
zodlPe0w3X(Is{w}BRmk%?SL@kiK=emwKb-QnASPb%pjRtg+LT<&xpaz^ls`^bLAC3
ze`xv*s}Ic28OOYyNU}OO<*l!7{@RVnmiC)2T;_}<RcT)Gq>IK=c_%q9-P^k}ua;N1
zc8qTuf6$tY@Hb;&SLHQRruxUVjUxcV`UbwEvFN21x;Y5{0vypi6R}Z=e=O#78wZ8K
zgMn(=&WA}e6NOJF9)Y7*1=WO>ofi0NX#a{4Ds}GFHM1(8fw=e!#?POroK<u6+>v`L
z_J_V2n6___wXr_dHn@-9@zev8;>$M22zLv9#ub}8&2iDX2blJ;j~OQ(Sa*?Q+FWth
zBv50Um&GSN@YIJ{*-N{3zhwNu>{m>dltIv(0&iivF3_8;acndp8GE(g_@Z$_;9-p|
z#8OoTPSOfz3$aeK*p(NWYmne2resB36V6;4qy#jP7=SLhtx3k{5Z`mAcd+cab8PNN
zvaF`2jQ*1mw{6ZDUTpXt+!Iw36~W42dDE<>a-1s?DyUPaEr651iaDE$zD<zkOPl|h
zHevfOv{dM6z;6rYO|-Y<9ymMzqR+!|n{+<^Y>(KvpS;uQs7R(d0}GZdTM+0>B_mGf
zo$QmwPn-bLlwPej)m?YT9oN-0At`SD<R2e}4&$hipQ<J!sX(Q>{fVzU(eADcqyYU>
zzihM_H?6{*y0GF@$|I|ohqW-zsz^Dq;W`vqB{^sig&u<Rkap01e#lTNfD3A&9cUG6
zHCUVW<3Emn2I`-F>CBK|h3nwm(zV`NZ#>wVrt9>}viOm+V7-X#pnoXUaXcmEvq}~h
zvdD;YKAXp?%Zp30glpL$#%^Nb8HVfmEYBL^I?0*w6h{$RqRaG8U4Z37VQ)CSA1O$>
z%)U&8zC&uQ^|t!|U;KCDCl*^%UHvfry1H(xuI?6p4|jLt??&;rrn~#dnl)6cyIakk
zxLLjFU-~CpWbWx7QvZmwP8#1~8AX920tZpthCmjv9FSx0Cgtjc5lpqE6Zv#94Y~Y4
zI-BG_NGNu?*=uCd2_uk5@E<0!X*ST-mrmx}iO7;<tfvp@n+xxPgzEj@rkZU48wi{T
z1tO~@eEmVKU|G?)x~3}jvjnv;n;!fJ+K1kt(a~x=gqQK}C(~xLWyuD*>{_&WxpaxN
z0~i2232--XTq@ZC^>ll(ql=TEh7u%E8=b%{Ev$omX(>Jj0|2mVppaO5Dx?zY)<UwK
zB&sa1awU0fLw(5jlYje+q4f*ziI#;lhCPuxf?9aIMOL{Sm4o9HrYlOF;%`=%g>zR(
zvv{5UKs*Jhv6H{IU~$NJyKe4<Lm#cM+ihjn$RDk2x3KX#PoDgf;&AbPXSotYB0qq{
z#?!7SHIwHJU7b09^P-v4lqQ#@LbC@dY{|_@TfN0zqt$J#u{NpBS~apWX{ohZ0uhTN
z5l@wem?m4dE*QFc*KD_^Vor5Lel=9<uA==?Pzwf83uY2S3b^>NkOM$h%vvCX2o^SM
z5>!B3VFDrcYvs;xFrG@q{pAyDjk(6$x@I#Ugw27~*;#YqZ#A7xON>2jtcX)ywIVN6
zL4?b*V*izamjco>2uV$3BIG{tA}EpyP>8He3XQfJu{{^KPolpCr^kSOhVVa7-$@w9
zWJDoYHffhZr+?cypkw#|<Pi@>>oezUW57==+gU%5H+j#D(eL!*X<PvdJ#fx89wXtz
zgVFx_Q_?oER<e3l@XT?@b0vw)FkplMB7sJSnrF6bSX?EUa&(V8|Lwzv-##o463KKT
zOUJ=h|N1nS((C=L`3)nIZ@C}k4!_OkAKEk|%E>t1K56dUNw=TOlA(iX$AFiE#ww1V
zRa$~slEIRYIFi-U{)JyZo65kXkq~m^7ve~WGHYwxob($V?QP9Gfel<(F+lV$<droE
zUE@Ff<ow4Lx+-JS()scr4^6os7>NFfmG!3WFKq~>CPz|b4IyW!xw%tgi??3be@^Fj
zrzm?m9S*H|wb51C8}>#P%E45S@gC!iiA&@k8C{Gse$m0bCyjG-yT|Qm;~V)aK_m7~
z$ECMU*)((MB#U3sf+?`877MrY3Gt}Y=BV;s^*cV}N0~siBWPDNIa=kl1uQP=KjAK5
zOyB`OBpB<VRR`gS9syZk6l!bqpzaUIbd9bc4?_(IPQ>m`<CB(YhZn!iYy#_O0U<y_
z8ZlOYDWYpgB8(BE6n-I|!@xB5W%hhBk!+Z<Z1E=+R4|!0_I&OO=Pv(L+alPRu>9}%
zgz&;9uVUq@!fed$Ypq(YKmvFD1l6aqhQNXq8yeG-CyXDL>5g3g`IW0HgDpJ^=HIe(
z#|z7U7I(*%&YN@PRXuBBG26YLG2U_Wm-Jg6-P+sh93S8P@VdsK^=quM!(UO>lV!)5
z^uYNc#o~~;eVOKDj8!-zmCemp&6u;JIWW25vQ4-2o!iwhudc4ltti}y@e=DA;yR4k
z0!a#*aMI2E9bHPgTTathbf_3H0^mZQ3w@W}97qzsbh*Zqhl}CxD)am5D;*V`4vWua
z*DF0COT&h!&CjN%YI+`s&tY8AwT|{o!r`zg<3rPvjSennI_hAoq;sEI=Ck_!H@?_#
z>w+84WqyAkkvYH|nej`~^+EP<_iZi7kjD827sqJ&{golV!{e@=JU;oI&Bpg0`QrpV
z;MP>Nva;I7xU4uibLho&aRPn3OuAK){9#OLHw(wZq4sXx5{|NJrqh&yx)T6U1AL}y
z)y(UseIP6rfjR3W^rw5Z$#g1BD+<3UIoWPfj>J2=IH?O@6qE)MAPpZ$a3O#KlEUhO
zY#>Cko+a&pf4{}Q{pT!E<BIC~I5$m}lBz7Pw74zY>C)%k-dGd2agw1pCe`y;r@Jbk
z%C5i_3+Fwx;=YL?&Vo}81gx@!t9Ve+EXgYxuktv35xZ8Qk9TM<$9;ht15@zti!WYW
zno)16P*E#q9*c#s$iwMNro{Yix$)exh3(v}aIUURJ!pK%_{jZDsdC-sQ7pCzDrV1S
zaVa4sVvT!}j$m!>IQw+hw$&j;Wm<*ZI`PuDKT_dk4d<QYiOAy-{3R5rm>MeJrhP(o
zvQgSQJO}Cr&O!PgngegjW3JmVQxGC0E5yZdtX)h5Avmyb;Bni-g(+aqv97bs!G_N^
ztU22pEdB6=^5Pt5D(7MbTK?o3o&oiBF$hD$gFwUa4~>1>8HV1ejtu>NRzIFuopu`f
zsI6q^PyFSK6Hc=)_@pti6QRX3cTm&9VysN$gYr7$S?_^0Oh#b5l_bT&Nr`eQjwH-I
zA#xgy;$D{SDLCdtiVp134@mxh)Na!>QbuD$yG5f^9EDYo$Z;J1uiHJ=7UF~QqsO~+
zv`fbt*F}r}>5=}2#`=TWIQIV7HjltdDeRP{|EW=aUzy-oEj6``MC_*as3kNue<pY@
zEkE}D*uIX<GYLu-BB9T6&~X2RxTj{E{u3poN8c$eRhk|gu9s~;Q*!7p!&jA&0wq_^
z{Fu=BkHHn^fKVWUmh?POVG&*Q&yL1vqm%VJT~=cd%9EHCLOK=s_b?8ArzV<xQXCa=
zr8GTKMjj-S4SGCE2mc55tfapZlp3e^v7loxE#=742M|+=A;<RNgYvAOIw&NNE;La+
z{LglgAB|ECrdbM7hE<FT9ZEWL=A@wQL?0y~+4X|Np$RPXsVFk2WHg=OkS?Vlqw*PB
z4)4lmb{#&vi|2M7X7~Fl9L^L8qsDnvKfC{_;+@00o@598Dl`tJ3=Vt{=qnvQ5>-+Y
zt_eP<y#?%BnqeTpH-jS*d^BF143}_6#CG%S)`6{C2b8TRvMe*e!O6TQI;v&R)B8)U
zEfo(H+?t1(d`=W)F~9R96>}<hBzBUlB6}3Fkdy>J3AxE;Ndq@o4xT`Ycck=SYml{p
zieun$K-q%DNBg{x_cCw-WVI1un^*mDRhC~Jvg!HX=s5B!y`2pV<&1vykBO&@{-^5N
z)5$+3P-=5l9tcq>TZl@1-{>F8u>n4qPCUg1o=hhH2T~QmmkAnMhiq+>M8ySsgf%4u
z?6PSL!Vbla2Rz;Ly4}Y8aW<Yk&Bn_G8xCp9oS_r(WHK&mbGE#~#v88`cs`=vb&~ET
zyfs1<K1vZTJwTdl`GGMi?|vm?D*yQL({+@lUO-ZFQV?=giM6Gg<W#aocge&WhFaPa
zq?0G}7a6<(WIk1L7?v0TRvC)wN{ymNL1+aaYJ$Y>6=Q|*$`Wnc1y@9^Ep4rq=oJ@i
z)0VJoU7R(>JHj4MxFg=k;&qVFKl_S-e!X(vE!HOv{PMyoc-LI`%L7kXZ!*`b_ILDC
z1B^|Ux}<q%l{uSI5_1{qVE)mdP235{KTzx?&<EsCM4&9DT*rjdd<W!fc09PFpGz^X
z@whkUWowok-ZcdHKfFuMbhpEB#4*X`3x~*1WKE9@5VL07_5CcC?>7dO)vJxc)v(2T
zFv|K-O=myP4cC+ZkLS!<b{#I)Jzi9!X{N!+nw}e-sKvuyg2n_@@#tz6TOCC$ivc1u
zucV8BY@tzFS-`#paYAc+lCaGO<3$z+#dU?A5jzqN`At13Z24lk<`0QgPnP{%I%#qU
z#37&ysM%r{rBhCSWMQXG+gj|MFB<XqgMTuzV)YLgN4D>pAcrlA$7Tyn9#^XeYo{){
z@{VUW4FF|C{4DF|wMM?!PrtK5jnpW`UjEE)bC!85R`!~a1-=-U+q2(zCTs_jQ?sFe
zZ|9`t{fn2)n34(!1cM@QH#7Tw6Xv>ESSXH07KLdQtk`K2OPCD(7yA_PTLo*)((Vq=
zsLd&Zy(^tln^V&QzaRQ>Sx=d<w5;q3oSDvV!|94LzQ%aI*hO<HZG3nt4NRp?wy;<5
zY#IBkc%aO9506qMG?fgp2`o{}=S<{;Z36KnWRM^-w6PMO7zYd&cUe+5#ffvIEmuq$
z@s7m3AcN(8N`jsS@^GkWC`kucw}WUENk8ZhXk5i@N>U!TVcSkg{?I>H-aq<nqCZ)I
z)5r&@UC6u82ROqB8p{-Wkr=GKL;i_B67lD!Sd|gmd&R15_d6mdG7*QLzi74PR|?KS
zP_Frvc8giR(DlNDV|4vzd5tL4-k}Y@?eur@7yXgb-aO?jO+aBsBtJ#8Wp_a?S$>AL
z(Bz1IYRk-iT2y+oAN}%2RLhutns38wj8rfBdcAs+x|h5&AWaqYhghQ<PrMwC$HVHx
zFkhRmat0!5E)sAeRYx#|b%J(DSSMt6XHsaxIKtGZ67^Et>4p7)MB_{j2}9u5jNzP`
zArlSoZsJ&yruPu+7T<H)Td3BN@}ue*c~(OkF?QkMu7x41r5*xtqkWn_frgI1NJEE#
zq2a^O5rm+_4rDEM{-Q`=<Z#mw;V;^(!}S;8<h1(fHKevBX{>2oqn+`M7AVO?&v8&K
zXMa1I@e~b{*<t>a&05+RF;2xbF}f{d8!_D9()W(;@0b^%v*Z~oY48vOoIv^MH<5y%
zP+7@5Q)gWm#R81c8dF~!nW7}0P#oe&{!M6iCF;>B9L@1epZc<5SAPJCNm5N}Uu=;u
zM;FqR8vbT}2Q)`_CN?K}6A2^2-b^5|Il&K@2az!%Mn!THl4hMdPd%&jqE1jh<bx%o
zV%Umc^PZ;dm~flYn?Svr5`BpTd((&{5`A@-*WoQZ*Otof#4AXd#olCZ(7896#5JmW
zWDStMQo;s@?H&}SxieyaAU`G;rkT!6X&9!BG7?mB)O9flGy*glB1411GGhoPp2?Dg
zz#Oj8&#=ZZB-BW|$bPBNu3~FWZ$pXi(HY-rg2`!bDeZrw(ABmzGZJ`1*ae9`bk%eO
z!3GJZIEGqbwMX_881+&bQMtkY?6ZFVN`FO!5|IidPrt(Uj2RL3$omy9RKSj&b!@`I
zu8dj>avbEPXe)q$$a2`{jTm#Pif<JF+SvFT99O}NdlR*hSNn#>v`DUr`p|UavfrRL
zz9<-)L%_t<z6E32Aan%<+&M*>1Il@<-&z}#nL-RqtpQ<$of>;Hq`O7WIPAj^lh>8B
zl1xr>!mN@kk*|E}{J&(~;k~-UV@=0v+9vkaPwc)-lxU2{YNk||v+S7G4-}vF@z1U}
zwDhNCzDqR6tg^DUc(N%J-8r+4D)&$K`+}327fc`1C26Ej#Dh&K_NidHWHuY*L}5v^
zw8Jz*tdnAgMp;8jFpVx6(DwHW!$CBzq=Wpl#t*oBT%wXl7&&qB$#)}TCcinhy(4R+
z89s>8i0=uEEHKoj>;=|_7<n`id1#|B=%yVGY{W$w+#fEB=Y*z^%0S6GTo%uv4&^gj
zXz6Z=J$AWRPM1Fx8+(CmPe$%Z{P8hy|FJ(N?x6?9T;L{#IK$J!)v@tF6lZz7P#@v0
zk@+IrH5DTu9F4?*WYsCt<ER=dTA*MzR&JpEY<7?H585KO{rhn^XrnVuqw+76SbCmj
z$jZKV=7)wWDSto1$WeVM*lLqw6A`t9-m4*F5Is1n(dPZeN?P8(^7}8v8Mco&Uh3cd
zeof{-!833o7A3_a^eh>7zmM7W@R;8U??a#PO@`S5R(KZ_DL|Iwd;`2_`s5UR%hlNV
zdDs4dE5CQ}yrFXbm)o8MJFUiGTJ>A_;QW@1tbh_aS>;Q7&tv=Y?hDR8_=9iocUB!7
zdf;)^ZM<mwMmXP8u_>&QQkZ7g!li+GdZidLfZp1;xwi`W8rg^g*$`W*lYzA+&1lPK
zSR$G1C9?<G3;6-;n@Mbf#;e#KXTTaJ-D~^``z1C{Y?)*naYr(_Ah`(z$dnEATUyN(
z-bec{`LhsL0jhzdp|AoI6D2r9HJ8ZmOtrP9P(MrLGi@_wwDFwrD&C)LODFk(1kbdi
z2)1OrfF*j<csont?P6E1rT3*lFZQY#^4cf43f?FD1WXcac>5QECn&^vQ4{%w{Yq3N
zI)bYB0jRBss^IDOX$!TL))Kw*S-dk_^fwppG|3C<)-WMh7+buQdI|fOofs)WTO|A1
z;Pu3kG=9CHJ8(}BIwb2MO6OM?Yq+>#E|Nr!nB$rS?U^IrgaS{O27-0LYb6{g_`5@;
z2<NU2U%VAfF!?rv7_-53AN|O-bzQZp>UDb@y2CBslzyClZxGxWm*92pM=2sl9M$dT
z?i^U(F-xnpx&vNo1UqHrQ{UOg?k7qFrAldlFwsEN5+Dje7ZUAXTz(|M#k`xtkI4sm
z!OTPW_7|J+rF-$Rg7xjatPhyuDmjd%+-rP^(l#6GqY`BF%l;G*<%f-csXU6$7q-9j
z0Ln+i11N&#fJSqkx=a0wx*hZ%(P(FB$JyE~EC<ifkh8R#XU^CVe*YPpP3^<_0Iiz^
z>=5vZ^*GEg46l%30K$l=un{r(JL_|BV(1rM4Fe*>U@Ib%x9(|IMft+JINl`_&sKO>
zaSfXFp3G2%3MvsbiF#o_%Ov7KiH{<$!74a>xLAs8@Xa-)YNo5u1ejoTWA6*A!|hG9
z!%Yf)g{u1friw@=vZ2X%S3tV)Zqo+jE1H-MN%I!7nTx<yxMjS{-oz7E;Pyw1mxPCR
z>qqd&6}bP<L&ZC+mF^fX4c{r<+lW_z1QAxFu%I-(bBIbO0=-Ch$bQ&k-~wn=ze%X`
zW^&3oI!qq%FZiHF2?TKPai7iRdd+3CAq>e^U4C^e9dh!|&$;{o=X1`0pIyqgI5dkz
zbL8*0xiR7rWWwN~B;Y0|ynCz3>LHQ#!nP5z{17OMcGgNnGkgHy_CmySYm4cphM_i@
z>4LctoOo#cU~vi3knX~ecEHHhMRU<Qqw`xgMjA1b{1=_|jgcFkuV>GIpfY`+`UN%h
zl?(Umxp4FJY<Bu)O0loFd|&EhujF#Z_|Ec*3VHow)t!qw@mKvAY6V5rZ$cV8I5IBZ
zp0Dj$_~erdaq<xlRM2Gv5zT?*%e6HMq=V>@u-xcquWM}q-=#^WED(g23s%;kmdHA{
z3+M@U9+Ut%i$4lL0q>p2r;XQsyBmwXELgE7u%GE)j__ol$@t@|KO21D4)?*Zr@67K
zvT9tw%Pq3pwV*4?t>=IExh)-E`r;Qpl(MA)HL0>xcg!Qhmg?few*||9t;*K;uiwbD
zi`ESq&u_WBSzVCn%Y-78ic53qwF}#)_?20<*7WutKf0^V=a#Lhge~O_TUYPhA^1G3
z8_3Vxuu7H4FOa6g+`XWU3J9c|3JXD}3Je}jRVk!X8qu(wk|v$g-+#`enF?EZ=l+!)
zX0Asza|1$$KnKOYXzzu~=FMBx+Mi{tVfl`mKfSJaWz8*xD>USw-)P*GEPTM?5(VZ-
zrhxUO7|F$9DFk2_b72b1L5;Sy0LN*#57gVyj&oScKKRCTGY-x4Hy*r|-N#;G_vN3B
z25$Ibv_87~ynuXp;7%izf5%AO83^3TehHiOU*5?xZ|&T8?N=$#%~!A8xbv--{_+<-
zxjy>E8v@a2;Jn?&k7w1sY5b9e-l&~b`vwac|MLdP&rc1Yt%IO@%HiELQ#u!r-vO&V
zYN~H+I}_ASbK?eNpqSa>c#H62C0V~8yb!o{lp|jkfEX;zIzVXi#zp6^Ltj3@_mA{~
z-Nr66R&SbQ^Eq~V#@};%MIi7I_9Am$u&UkWQzLa%aoLl2<Q7(DVYxtR&LLyxuNS<+
zF1vR7C%P~C+~n`w)t%c+{WJ`I#Yi{*tn+W=9Y-$k%t5uiGk&qZy07|=%;R0_aln^{
z+l+|^-e_U(PS`uACbQ(z&+YZS{f#ef-<tUXSPhyx5Af+R0Z(y)DD3(lfRkjHl@42#
z0>^@*kVcfdz)DX0Yj$S=E5W#`HsPIGb3&?_>P^(jl6TsiX^#Oh`CW8id)W^hy4|k3
zj1HUADL-=}+udDRQ&UOi!qs(k!1wr3FIO*@;AaT*?M48d!hAqoB@`QtjNA;!0ZE`C
z2vbBltU@89_K(l>JvN|vv${i(-J0>=Mn0`N`>ihSwjLR>b7n(Y<IgkMP+YJV%ep-L
zBLjUowZARb_gH?O-_@@%*~x~C{PSK{zm?mEj_4kzW382?VU-lNzzaF+R39Da%g|0n
zahfoer`ukW1vyz=pCfID{4Z`=jwi;PA>|ep<>LCV@TP!|aj#guW6Zr0A2e`$!|Yys
zI0ddR3kSkM)(`ikoG~yq%?HKxEFEE-j*>7`7bQoWcu;2eI?O|nhQ_goEEpo9oFHHM
zHn{6RFT~6fu85K>mZ9q4x58qG!xv*Y^Ng!J#$u$kGzM`T`iv-ohQ?50`0~P&5>>6@
z*iX8de)HHTnfoi&vpNVarUSO960GN%6e0!)C1N8J^r+y5!PGQqsrHU4rIkj8s9~SU
z1ds*-TLG4^OVAO8N3jt=vY`!^<_}F<7^-S*?HxZzJJ;X|RfF#!>9u2<I#;&!we+-2
zshC<QLLS&f_d+UiN}9N6+PJb<Q)R=<>E~Z~%`CHyF&B$ZDb=f=ozO9_p;CxRhFnm8
z=b--1F(&J-a81+n)P-LX_pu?uT~ppwEKoJAyQynS&&q2SpVt}}50AQH7RR_@U6CFJ
z=#WTL5F}ttG!-~3nMx<yle7n_9TbkCi(%7Lbm^FJ$zSL6zG$47G{ak=$SSkJXHlOR
zY$&U;Km6?7$5`K&|H?ilHyIx{e)%cO=VrPr9N`)ikK&eH+>#D=HqEQQfN6(r`O~M@
zf6AOUtQ3`K%~s(#91IAmsJN4XCaRJVIjoo$b{E*`ic)-{Mn+5ZUoajs<{6K@0P-AS
zhvsQZo5nRQoz`q-Dc}*giJLhJhBT7nx$O6h=bn9*^?Xm10MsT!iV`A52v6`!M~ap{
zMgxa&OiMepUZq!Pv<o~Q@%&&cv0<33-7setF(M{^2zE|zr)(#L!{9I9fS5ShOB@#N
zfEN?>rctk*^aVmzTwsa?mLqkZV2uU)Moi-f`}QUT(Smc6;oLx%`GF$mX3D6+u?b!Y
zdv;dI!Wsaqu^D%(NuGxA4WwxkO($_Q=nK-d5gTqwtRc$~Xa(NyqKm{jRmoAX{-ncG
zu@eksEOuStxk%E@GKg6QkKAM=$1@)5fX=gSBM0+5I2YquK1bL5PB~Y60&8BeX<jYB
z2G{^dE;!GGLPpjLqRGhGb9Q#9%xh%BVJ0rItRrW&k33@Zi#Y*3f;}w@*d`xt$dl>{
zRv1d*OkRt+S_Qu~9mHw@jsWQ$GP*99!73$;J3I@;eeWju2jcXDSoz7fn68$|4-y;=
zNs(kI!9V{)0aTKw+-+BMrhGn<Obg!<@l3CrGo-SFyj!m<vw0?xIeo;{I!lo|kaYU0
zLkT@eYZ0_~7Ha{zhOuxC)h9*D+q?Q?X7%2^s~L`bVD(;kATRQAj;_XFN?M%L^HGmq
z8fQX{xlhw<!f+WCu^?0d2;|c?ypBZu`uWwyGmRhZIhm_TSF^=PDVdtIad;@V=IC_e
zb1EymIEI(ctFAS6w9buGRoAjRab{BnE}CcT&=jvy(ioEMNIZwV5E?mH!2pN=9)xa%
zGz^%Tz>F3Mpp54rXv9)0Ro_y!psrPZ)kXo!O0>CHze10T2k?XOV;NnNbLP9~9fZ*V
zx}!A609#Y;AoRs&tZ+mdT=II5{)NWjUFZ<}H)*bldpt#t!>qw_X4L=aXmDfwWI3=e
z&yM`VcECAe>VwU5B(55{da*2*$b*Ai#yE0A;NMOTkfBe(=tp^})Zhp09FZwclrm_a
zrb8vH6GsP`49HkIB_Umg-8v8p=v6v}ApZj=lxiOfga|Y>V^;Z$+0$2_f1P^sZ_cS)
z)ttU$er3oR32vUX<Gx7Q1E1ac?K{^`0?$1T<`lwiN`~Et{7AXAeqqwtbKUusetpN<
zmd>lDvvS_M(`8Y*m$H@enz_3^dU(0dI)U+#rw)&5zh6irI%);hNei)kZLn30_2?Zy
ztq8wZ-Fe059^AWU57XEKr48YmUfnV&_3FKM?RhnSE5DAtTlzL#%&CMqrMO8IcwY*7
zgD$j!ILH#NrM-YZU^yL^Jjs~m3B@Qa#{q77X(#|8P?86HuAVi%sIRl$^$xs+54|#U
zh+>&4*+QJcq1VX|Fsn&J-_GQ(*Rs9o6B3MnAQMgZ@-IYvYkG*zsPD9h&^1HPXJMh=
z^*TMQz!5Na^&Q#lN%4S6M=|H~wENMIAo;wb^<uWE4`iu?iNyqqsG$(X>14@IlTK1e
zpmZO$d0c@hP|;PjN|7@#G4nT!TTG^Abe6xh&TCE8G|K(2MHh{$kLK4tbL5Gao?|To
zPrS5;UED7>)x_3$oi=Up@(U)*&%i`&@wf&*9u{Xq@~(^3G||KL;}%8vqkCR@Vt}<g
z_tFzbo-rQomm3l6#k<a?EnK>?2hA62&5gBo40zm&dAUhCBAqPsi((U*{X@?{4i~10
zq*h=L3f?Kee%Pcy)Qk;S1cV4|4^h!S9Igl>Qw&ywcc4ZZD;l{JkPN*?#6SY)0eS^g
zBW<7*yD}68&VkDu%yCd2hFB1<{Ob?PSph}zA%wHS_F^85tjqdQd$6Wc*TcK~cH8zu
zz1^XQzh?Kba81M2y3=mESGRR}!j1=RuHmAgYp7^VV`))~gNiz)xx;o8<=GE8e67lE
zZs~Ic0s&W_h3{5ceU1-($mwlWl&;Rgjn)QDxkhRAIzRN!mM?^4IwgpE05EK`K;<K0
z-1}8{T9nl`Oq^-6IrOSs`bxj!^5!zP?IX6}1-j+d3aibvC^SA<#=Q37qIRppQgyYy
z(&xIoX;e{9Uua@Yn0xbscY53v<=e^?dG4AZ=fO2|Wd+#^w+A;W!*m1w>=)wJ+y*{}
z?u9Ge^09yADS}^tg9VM95b`Jw1;a=YI1=0>5#y8uO(c4t*u7YoI>?SHjUY{UacH$M
zTCsJ2RjgeKck~V8>;Hb<%IhDhYmx1K4rYL>G7KT=Je5J)^>=@R&1N^U*?ijF*V}@X
zo;o;2kl!VW1spAP4_&|VJmdKHrc^z~>UZ3*FMRVM`GE01Z|(Q2sJDWng*~ID=rT6X
zWH3=*Ht)x~4!pI0e}4ZpKbluop9m&3hMS6}>9WhibZh+z&t7Ha^3})oE$p59vtfE3
z+oKMD#VsRIbFfNl<844b$=YEK3#0&gN@7Ozs|z-jbQ_5dED>5J^sgbXFa~La#3v^s
zuqB{-$pwv+p|DW^J=LZ>wW!4y=+E>=$`TEs4kcMWzOEsKxF^m;Wpj9<`jb7^=G3ZM
zUpnB9HD)JSlb~`xeOKLu{a?RsN5~i?gv)$&>!(aA3nv>>t;_e#nfT1c2cM#<lRVqH
zaLNy+u3Hni`qswqEVU(;uC4RsvzqR<c=`NKM5;XV7sOg-mrwVy)pZvvh}SKg84Rso
zc;K-KjrF~0o=x|b?deUIU%Pi)V#XaiFTD6czy;B#KyJX(IwVkte=RVziP10$v;ku{
zXiP{J>{12oRHee;4-tt8k0;aQlS@Pu4VAz?WR;5F5e5lBLkeO&I6R`m!_^pb2hzUU
zDs|oY**!mjQB`wg!WoNsQVn(E%ack+s3B1n!FaO%mPOeIH$F45wszn0)>KWsz05yx
z>iRn4Z82uC(2neLmu<cCGi;iiv`$jQWF!r#b~W=(FQ45KTQJ{K6*+h5eD1ZlbuFLu
z)zzkBE$Xar<E>Xm)~uWQgDDGJHavLog;&p-JtGlcx9q%N%fdbIqoh%*A3y$){p!N?
zq2SDgb@2s6<DL49oKcC-2eoxt@MJkNHdwMcc;bcAgCm!&ON#eA8MPregW&$*yo-bk
z$_VTgU{TPjBuFKgE5w4<vW+wQS8u##{k$??m#=Kz`fE0>?w{HCbv~QV`bHMPpnYeF
z6D@yw$@TM_Jgp07Mnj?K%!RF<ruo+|dHU=5mwEFyo~B^YzB7f9F0>b$VGR6Cy_6wd
zEd;Uk$V_8`%?kw+*eSe97E%vlmWPX(S~s5MOm!n77MXBTbgV*_q$(^16y()xiag-Y
z50Xh`MzA(HQpLskl~^$1G|k~*V@{bhJ$Z<F;Kpd@EigwLB*j?FWUyHb<a>UwU=uH3
zT?TcPAgxVDtG5<dPwd#HrhzOoYV_80ZAgZ85Rlv2GAi;4aV~%Q{qNspb9T(1JDE+L
z$LIh4;5E0;=f9Wb-|Oya<9D!EN~yiw{L4RUn>DMgb@uF`Pq4cmdSvJNp8TC`Z_-yg
z>0!RTl=dSWEh$9L+sR%Z`cWb!U?xS8%OGGtlqW30luY9YIPezuLt+}ez(9kb?(oOK
zs~XE%x!1ue)IQ_#Nb=!}X)hDuBik;1m=7>WUSLL&!O{3EnAu8)w}QQqj9m8um(2K-
zhV%j^8|@(!3Ot&k7!6|yakBrw)DIgw7wt=_97r8g?oguB9I<ZZq5(8vrscL73oeVf
zeI~!d)NS%RpTQK8Q6%p-Aw&ixFA5f|m`Ua0lb0GOBc2l~PI``1oTBZRYX~@{47wp!
z&}lGe9qv;b#7vmlc60)GejLKa1GR}uA>~XU$hIHeMb7vFW|`;-B!wo-7Ow3&Of1})
zK#{eQJI65O@|+2|789%mPR<G*T!ThzK1Lo$77Htpjt6w?OhH8c$Hq-|5!jN29S$u)
zA)OK^8OXP(Agm%l0mKT<ntgx4Dd~vvty9v1yN+a+-SyJ8ap`2`^qIXoeXb!)$<E%H
z(<_tdaob+HYZ;=##n$w2bd1I7JNaFY|EPb_)9?2G=<&*@k7noIyW<?Sy`g4dYx{y#
zvuPS!nc1rrw6`v-X=qo^*>UgOY<*|Hkd8u4N-?4!12Oj)7c_iTSbGy7X}b&fLqjwO
z*vF?}5|2cxkPVldaW@>O)zWRPNKql0GpvIqjt-~b6OAn@l?0^?d$lHvOBhU2l?)eX
z;m6U$nz6d8z^sUWxf`a37(ZG_!(s<^hsEKvS{#lRtJUJOTGOh<Cd)QkRI^!i{O?xW
z*fl)U@PQ8R6dqIXm5vt=?;7-YL$<cbtJcnFI43b7x+#^s@Wl%~>8mQoC(dcetX(y^
z-Wr_PGb8Mu8VCeEnnTw^jW(OJYu-!>#t{k)3d?mMzpq#wb_@Q~4qc0=dNZ`bx+<#;
zy3G!uu6?INgOji7fqA~2%Qj1y%;nD$+TfO;_s?r5Xl3o^>^b+^b60J%)|Zt<BKFt>
z>$X+6aLeNMGOZ3&Yhy#KUXiUXm#W%2!{KDJ6Yj~$TjWq!hBF0P047)X<pAb#SnzIh
zy%%E)7SE&Q22~`(Y40F84zR$m05lHf!xW@I{w8)|Mzl+5w82jWFP_e%=@$ptr$oTP
zab)aCmY%013dF{82tUYj)#es%9wFg}^1Tq|d)_>#aQo|vI|9P6u^g-mGgSaJTK9-I
za0)nd65@_vKP3lpECN6Y@H#O`P_)9P3r^u!J>bx231Lsg5xCyhf!M!-l`_kU2Z3yf
z))Ojavn(DHFa|RCCYRk|v)F8k)xRh(?GIBMH_YtZKcoMqN#&ukP}$n@$*)g-cEim-
z-Icv_=%d$vfAViSac%zkP<h?_?0JhGdVcq`-%s)P1(qzZaRtE$JU;&7_yZMH(Fu|8
zs!+nmtP{g!q4r7h|NGB3*AFy=&mUhIs;-;xa~3%8r1ABW9pfu2ubf}DB3%Di!<9ch
z`sEo@r!SglTfaQKGHmmDZ6U4xVHy+AD+OB$Xrh6m(0dGoNu@#UnIf`+2wH4)CS6C;
zNE#my8j!|R;ky&WKT?vDr-zyi*n{iWtgdLyR4=x!TbMQee9pvLxytU-TRU6I&#!Rl
zzFK=S=9Vj6lV?u0=|R@_?ftyQRblmYwoD7SD#t11ljr#7Xfms>IKRB5vsL%mtK`~=
z=P++};X3Q$>P&0J>NV?w_5i%9{BtIkE8{9%foUzBK5K=mhVTD&9}DU>)a|O2-La&-
z)(5$XiSvcch-rI2dT%<-!A<EO@iSTT>!RlkZ8NG=++)bEXrSnIL<@!B%Z$0A30V+C
zZ5?6ef8XFM5RtJ@TyO#VgyXDHSfrClcIe!5jZNyx_m9US;9KC**`zHdA247z3eZNR
zH)JU#76g=3LClEg)!=cYa238}0YDz!^+1Tx?x0Fso|{gq(U8qIrPHJP9U=MRdpfvN
z(;Fr=*aEU#7O4o^>=V;XvsBfo`}j0A`QzF|UqgAFXY&0)a6hFa4?EwkS{kF3a=<pD
zN7tOZ<DQG<ki)M#8|oU}wop{nCNxdL7h;0<PxjQ6H~1!MA2+@;jr(+`s?KUk%aco~
zB7$Goa%s!4my<qUh&!NiS4@tS^x(93NqQ0r3*C802@3)V(hkTO+qLC0FJgTk{h9IO
zPaDTyuWfw&naiH4jz=5EZM}ciqMk+LuVt%Vv>e%YXaAP|#AO#M8`sTtMQ<_kZ~xnt
z`;<HQ4Qo|<`13oJq&)uaWh;6=^hH~;Zr_nhgOj&++sw6fDl1En3kA`(xQuXH2)Sj3
zpChv~9%QE&tNN|+sZW0L(=Yt??o@M7lV34@H}qW@F(N<p<*ysRbJo<xXpNrwgqYW*
zs3!oc5ZcfG#qABdC(Iov;I2=Tj933qQU0&)Q;~{47_Sz>@gC*blg5<`5e?)g|N5?T
zsq8CL7qa_K{>U^XBGe@Clc0AJ$e6o3ZO)*6MSw$co*3aVgkPqXO~Onn2@#aAz%f5c
z0LoUx-jQ=fzX6Kjlk2Q6iGKK13eAIe0+<T2b2qeFBxP;HyG^f@;dce80npDTL0^M1
z#4Z<V?Eop(ihpg8=o?cs?(}PrnLGXO;n>flEX%48n~zArad~ji=|3sKX}BK&qx@O=
zAv&*sm+4zdi0(V=p$lq=2oy{s*0Ye}O@&<tV$Q3>ceqqHa?b(l10ORTcKKHB_f_6j
zUdKbm*WW0I6;(tXV0GKBx{W(|z!$wIl3<Q6z)<#vpO@DLd=VM)>HqrL*MG)5!i(2<
zAsPtA%imzLL%gp1wo0GZdD~UnjMpBo2n1@&f6n%>$}c!sqWm5(8_u77{cA>?#*zf2
zI1%koji^iD7K(i->bc<d1HyWQTfkarGQ%*JV55?#wTh>?r@6U@;U9mGmO2!lY*9Y;
zuu|q4ddF3!D4#b++Vg^Ub%*TgSnYkm!`9L>g}-CPz{^ljus^ZiIK5tH{zfAw*vw3M
z3tyA&=}G4wZxOhC4`gIna9?nF1T+w5g?}mG0&a0JY=16TbTldL9UvqGy&aDc(8yj%
z^(q=<1-%IDW?W?KoYJEt1DbDAbF%WuPdCArszSDTcZ+upvM(~2?PZOtjXT)2GU@f`
z+bnEV+`ndXDn6riYD3kOmWpxVo2Om9d|UgP9yFC~8iwlRuNgmXFy4VaP4Ebku<x(~
z^B{Vs0{3ZPy&B>PSRC4NPs|(ODy<yS6u{X5s#zZpKFNa-UlPI^$gVs-d9i2exv>rN
z^Se~v$Dhn+pHvg*K?W<!$h7r6_k8YY3+&x2Pv@S0CU)*rk7xb{Ht|{ZlEJ{M8b<50
zZGE)J`r002zhv5z&j);dBGml8!1GTUCk&zAg=ZsZGDE#V@G@{~2eD4aW}?GDiO`wC
zs?(7y?9F2bMAgI`kTIWm48v%Wm<4(o&#V1+RM{N$-$*;ED;vHx(bnM5s{^;)79H1M
zoA|Yc%4$dY8}$xb)g5C>HB{bqTV=!OGCVuxF&?7F><uH8kBg43y20kCK5(GQZW~ob
z%u80lkPi96#<8+TVc175EatB%O#|IkDtj!-(@eR32m@3qdTfEDmV8`5vSJFcc^5=!
zDkP8jTvc7w1#{u*>a3qPw`%s>SZv;NFDyAykT|klK;4HgJFLWo)bZ9MAD>zfImT>Z
zSQNU-_>5X-eNA(B@`fiu?CMg%V_<T6S>w#<2gV08OO}*R&Sx{3Qh{S%`mzVRCY#d6
z*;7rinbq%&x})-fj^NU+Ozpniv!+4dDD>fCd^&(7V1JZ=1V+#;oF*P?OK7=3ffB9&
zEXRp@34=^0z788bY(QvZfKa5sj|g%dQIbK!Cdt)AaJ=FOTL7YGVKf60r#}{}oiVMx
zl0ytVuijP0{Jv1oGWP<ESU%UX2;mreO-ZD(_Wb29KF2niTuX1-7@Yd?=We?D8OEl|
zapmx3AAWEnyE^p54ax52ntEsL3|{7{2$qFyESB!g@@!elxVS89d`Tt*3Ok+*PoLSi
zEIm1}5caskqR6t?xl1z{leeLGnd#oCvp;&L+IMLvIJxV=%QieXZPxC6wVAG^!Hxwo
z2GQ%c!Z4yBs}*u>0b5FOBq($Oq*ywb8%-xfOL!KeD#nr)3;l|%ObE6~WK-Nxo74ga
z049iBGlf6_sv_jti!9tzqo%s8b>SFj;DClKO*{4E4AZ`01UOa-QMNp-6eiCGxaa)?
z5IPLb!#I)TRc(;_LzWF`Dt1qZPK3OK)|^W*frz)#UQU}jjvWxNbx@8M#uGdeRCPi>
zBJ`3VMvwzcb;-2$w4&V)hLO0TOeQa;-Kw5x(wiom;%Az3h`7KCvt(he+h@>Rw=cN%
zwlQ-p#LiP^^9&$yUIB0|%2~j+mgMKkT6ww{+WagNRIBv&2h{>#W7x#LXUb=)1r<aD
zPn?1d3Ku|KgQp^+FALBWAg59vMY2gYY)Aa?|HC%}4#5j>72AX)5=Yp(<e52aF3!X^
z9XR=G9)W)lN>F(eH4fn^B#tEC*OyYXO+pjUDyUV_C}0S(R&R}qCWhdj*iq{Fr>dfE
zvoVHE$dBJGG?i^y#hhcCwjM>%`a)wOBMn7qV~nHR2p?8xR|=aI+9euBgEj2kDn80E
zs$I(IJs*A<bB%4)rI3bfqJhOYo!*!H2epeP(M_Uc5R_Q=rbA~Sj4c$6WTWO1{+wbO
zh8sgZonngErqkPXiP;#M<uky5bZSh)3hUE^GdueQFT<5m{{u*6fZS=X#~zO_taQPE
z0~UY**avA81W+)x#N{Tjno$@+KfOJfY8AJ1i1>mb+9Bwc25bkTT6!G6I{i~=sIyQl
zuMMH@j&=yJLWm?QN@(Gv3(PW0)lik~NTC`Mc2Mj<Eu<5VNpeKggvKF<y;)Qe?g)jG
zz$+-i@h}pQk#vOgc0#y#3=el;v(m#jQ`|z-N%k!v9ik{9Pl3!6n;uI+se?Yy-C7FV
zLQ)qx5@u>gRUPKNFc{hpe2KMGTN4M0Mq{Zl7$q%OlR~e$WNHmHn(mOrq`1mLAp1Z?
zgwU>zwq!@BL%bYVkJ{M<qh;2X#sf4wXi-ZC91&{U=~28*oZ3kh0u+G3YfsS_(K#u%
z6Z?%EO@ge|A`}fQd72<Y!z?6Gz=hAUG94|UzMy4VIDkJs#*;*z#oZcLp(FOVk~Ll)
zhQLAQ4m;Ce8*Q^`jJpwbQC2kzK7OiUbCvC~+hfzLvaT|BK(@5utTSg+kt4FI>zrw-
z0<E;7Tf>@KS02|i9RWBIV8)@#wQkj^SZ#jQC0iX<Rd%>7Hs<wMm{qk{WCX>m&?_{R
z*=<e^V{E4lZ&X!_tjBChnO9X5Cc`+pX(If7JiNxDx-=af(z)VxSv=ao3v^Y1l-8=T
zMn8wGwg*PCI$FnNuhSVv%Y6<-aaed5ns6qU%ZR+G@rawK5^lj$vdsk%Bx19KU;)dy
z(-Dx>3X9F*Rozj&&d*i5&ee#Df(Wo$?NepMIka+wHwLXAQe{NflsU6%+zxRIBNcg#
zjyPUWzB?3zI>jf3WSQxWnp;;nj0ekA89h^N+-}hkc@jTv9e!mluM)%;bs2`+3Td=z
zg=AW-mUV>h3~{e4`<yn9?6AsS?hbj69KBEW%RcDjtsa@%6uYL=R3Q?hTXk6Nh{TA+
zq{?oq3$Z^jcihhvS@&0P$kAa&Fb3TjFEB5&IhbzIG>e~y7{DULJWhZV$Ix5LWYw+$
zyj2?_apDWI9Lg3Aky~NUU`60ftD;%`vgT5CuhW7!nL&*!G)8L3U9MWJPN!96_~?`t
zripbs6t`N2v9ytsgAXsTVuZqgyK?5XxR?W>H&xw=DACNOFwCnGP}Fk8Dl>)a77Qqc
z+Z{m@tjwjW9;+g2nnROa7|F$VBg(7?U9hvLSHYaQFpVshQkY|cEY~9zwcV<zwVD>i
z$DUmD3=fPeSJa>)<86A-6XIG$z-Fn_bf<<dMR{d}mgF^x-@=?eyR7*%MYWW1xzZhH
zR=|z!Q=k~IazHU4pb}w$oDQ_WFT3Ff#1+dpk1g)?a5oGvAo~Y2%2v(pgzmb+C&SPL
zGpo96P!e#jUAI6BBKr`;O|>X~j}>pS<E!M5a$9r+*2So*7G_7NTJ!)bjd7c%4&74s
z5xfV+oDOQO1=CEBCgTNIR$Nm7#pN1SuAN(D#e>eswiai#x7;04^a=|oHdzXu3Tiik
z_twGB!iup-<%>wx!n(HuDjeATlAIHv<w2*?ci_}uSlBi(leFTW%%4XV$D3ekd^q)C
z{#v;Ck9V0)Ia6*Lj}I@s`c3tL>#S~XL9g&T6i-|(Y@H9U`!KsRHFMu5Od(Rd%3fnX
zJh)k2H5Zn!L{yS^1MM?yEh|7N!J0P#i#xKq6aOPbwUDZg{l@Fqydn|lZ)6o|2r06@
zBRBRBj>ecpS^68w6vbTFf!Uj9%YY1)RPf)|K|Vt=O2ktyhMfalYkniDMZFH+ee#QF
zbFfG?{PgiBRT`)K65n<5=OZG}oaBeiHv1F4e}kcbzKF&{%pBP%lHDnd!|)i8!jd#Z
z2zeDmyg3NZNY*Tvvw}Jj`hUrg6iCYG``M(nW)SK1Lj^9q2LU{TXC8g9g!T8VQKf8N
zGGeCqWPk{c0Sv()8KXizPXdR5HPp|do)H#@R%~Q2bTivS5(V<m0k24M5c-NqH7*eA
z2wOQ*3QlqbtB^PlzlaCLT~#(7W*6U!PJ_r19}2qHc-VOOUK$|MKtcO-FS{5Q{1Jzv
z9$i4pEN?X~;UVz_tsFikK@qv+-=6uos??aLC?FU4^is{@-J%4&TlEV#gs(&v<L-qt
ze6ln{S|+VR*M%Kd+Cy3zFf<^9z{7~Xj`@0Z!D_Vl6>F4&%M#i52!mTZ%L^s=lE*jf
zTe|gnt@oO#Gka8J^yjW^J&X6<zHf1lt?;?)Au~>%d|tttRE}?5x^KhdOVpm3Q?KdO
zt~ZSZIiPUKBDQv1V>nTHAn!WMr?J%*VPk4k7rv04e{|83>(reGDih(xacq;gN#IBR
zV)trWA$yO*YvVGE0<kP$g{#2jVQQOXGA)L;fC#NpxCyGTaIK?gP9ulgCDU8N#4{;8
zixh=P5RMIyvk*UA&D3Y2FT-54N{-q6dS|`6JmRR9<I$rP4fWCcqxl)pqtW_Q<^9p<
z%M}e{OUXB#d;hX)u3dI?*@_kC?Y?ID%ge{)@rgs!9+Rsbk#cu^r|!2S4ZGI=sE8bl
z@;@LEtvDD>p-@Hj=tB9|k1ad6?A-rYcFlF?tyqDYM`vkWV6A3>yDBh70xqB)5Q0FU
zQHA<uiUalR>yMty0bSm`gCpYKBaBU*)4%CZ!_7~#?4z&4v2pLK?NK*^0X}ng*P%_l
z-BmvV@3<YheJAP;V-^tIT|ixjX;ClGps=@BS)8Tdhwlxlf9ssR>11}(>`wMKtRK_H
z1HydcE#nyfu5m1oU2(xpH(el?vwKV&ZETxmEMuRkPOy87Z3)p8iHYwP5dvByt(G=P
z*GT)MJ8_F7wy=s(f#k^a7ONX;9K<<jP|AoeO`x}A1q-T`E)n_KPO4o&ZPOP(3zH6H
zp@Pm$lCTatO>2t`TAFe$;1QTEBkBn%p_=iBrx3&wX3VGs=?;3U{FLCw+2!nHR9369
zPLJ1>Uvz~<0ZqJa+1~qZKX0X7U$=Dc!DX|o&fUA6)>+FA?p?Z0R~s77-GATSW$Sd5
zv|Pcz;PQH$*(z0zo?PA3vSjro3sUB(X-P{{YQZI|%@cF=$6e<{WS0s$>F51?5EyfS
z!rQx)h}@se|NZj_*Kcl;5#y>rU9Berl5bCs!X`~zcvpJ)qUG21-JM=u?X=FHZ*^8L
zPv6})_43p?%iHc=IB^nFde|O|p7GSy1@0KPw{>bA9r9CK_l~O*2R<;xUKg-5M`RDk
zBKF@gp2-+Xw)I<}*7hh7BbQ+h-XUYtz$OIzMf*lIqCzBK1%fY1kO+Nb;}8fMpZS13
zS|H-~R>a&uY)C(CA_To+FB#5g0{@c+C_hMFf?)J12=e-$H7#rWlr>_D#qry0nvo@s
ze=gO_zc7;uE|{+UELQmD1Rh2m##icpYW$Rc%J`}AaeO;(fZV+CB^;@~f9UT@*31Fg
zn53NAt6r~OPx=n>S^~J4f=AO?N#sot9N{2BvV@+1e@gDtj!4c;>h+K8yzP>qzioT%
z(MPuP3vJUqPFw!*b1vO<uuryhFU>6P&VM~pQ<*Gh55a&M-{!ou`>LfYrt{gCe0b+0
zm&lgwAA9uI+wzaw9G>Yme$m21n=b1c`djz%%+hW?yDV85t1vFby)GMjX!?q!SD~_X
zw1*e$a%8OCNz!cd+a3&dZwP=24sdu*pwTop$q;PeilPM57j&%e8+~gOANi2-5<W8&
zuo=I%O>~<YxGaWS#xx<I<Z$?9`uh5b9Btt80DXeAELu;5keqc*vaxbopy*(KQlc5f
zBuORO9RCpJW%%o)e~9*rIVtwZjR_j=fT`!!MyaWx|A(%B*aAk#R||S9(qe(4p=i~#
ziJF=oGdlJA<wwWeD~6;~vxMeOh$E$QB1H%G=9!YTI8Nn2Yi1-<pO%7t2NX@wbIe!R
zp&=I^)w-g_ZS3{25s?deLh_^7I-nja)vTQ`RfwZ6mKJzf=m^=p;*=kN0h~FP@^8mp
zVIz^QF)iqmo7TPhH&}m7llp+QFPE+dIuNTy2w&4}dJ58qG$bS916EK^`GavGbR~gg
z4eo+G!A1q?20mytrt@$nOSiTWwW;YTSapuQf7&42uw}`np2?FYS2kW2u}rG-duDhx
zv4t14PUFTQt+}VCxw5>e_S~|Irp&)&*3#MRCiQ>Jaqzjw)#*gm`21$ZE#v0izDa$n
z^iJt$EnmF4XT^ldXvWfMo7v!FJpJH`?T!UJ^Jtx~b$MIk_;7i}l&P(gm(6Wi*3?lx
z&G@D{pe~<ZzWU;e8y>HBcoTg$8J8P34Br?tt|R&sH}p;G1uiWZW}0A|z#c~CJqQzk
zZH!z$+%Om^Y;3?p;$m2i69qsLa{LPFM|h7A-JI?qK^Xmlu*6mgESA&;$>#4pVfn|t
z6%9|^cPmp`cJ^Fpv%6Hsa#u@w#qO(S&Fty<>FkYD5^u4O>J8zEiFu3XFTU=oC3jB7
z_cXvaUh1xLtF;pvyQa?1^e&vxyrhOBl$mKw=<;Q1C#+rdZ1yI<qb|Alx@o=&@RT3w
zTs3vdiup5Vb_JTEWv8Un|HIpx07g~a`{Q%&GW)(~vdxm230cW931nkP!oCG$6@&-~
zVNrGg6&wLYaYsemO0-({rFDO$ZQ5#UYqjdr*G=2_YW-PTm-=dJA#?eCzUR&)lMvMR
z{_p>T%w5hs_uR97&v*YOHl5d46R8^O^!Q5cX1&$2acog6S|Nm|$MoZ)B_3~npry5Q
z{<K2iDOtF%ilk01aJ&fas%@%m)cHJUwho}#>+z}4c+}RaEhZfsbQzrYHP(TH#tmqA
zS5ba1`SZ>89I+EQNfD2M{T2hX$ndCZ8^%WUq9wnj{y=!)yzNEfikQ%nY(WeoX4O_k
zS{E<rSv0PEtfR!?(b+(AyTawGt-}0QX6^#5Um2gKwTXJG)`Q4=(`Rfr|M2}gcDA&7
z?T$Qoq0>4PK3xt8!eR#73DEe~q`{D9z0eZZ{z>`ZlG)9n>H=q|q+ndrv^(dlylG)`
zhbIC?z(OOq7%_{^Z)PT~Eubqkxs-!HK7VG_#HR7VP*wGenLE4gVzZ9tm7Lg@9UG{<
zlkSU#>ujj7lDrA5&`{jZ>ovy!IY+eJG2(t?-~4aikNn<n-9=c_!XjP`M9sB`bFPO!
zQHJFk{%rW&m*vd;7LmJsM99iXkgk2Sj_AOy8@yD8F2zCDh0dJRoXgQO<P^qc=SCJK
zIGlg#j*MRj7wCZq_!xEM;Wo}nxQ;XtKBT}|%%VPm6c7@e;VgZNMK{3PS()?13CIn8
z;&jSdI-huX<;tQW{MaQgywK8upZNPsO8Og_3-P=B-M1R(UA)>r?>c{SBY&@Gr82<Z
zYk48PJd+|6WiBx7q)gmW!vF0Wzh>4Dw}?UeiljrHK{FOOB$8qg+A^U%O-CSLD&Yr2
zrVaYQWSf#<O9&~h{;vFjrM_V?{MaC?>hNr)-enD$<02_V5G9)w<K~dnr3bmsp!jL|
ziEBbW*cXx}5L5N%!Oqd(eM|bWo|#CI`UW&MpB0QlM#>WO1AEM1^<g!$q`tvhogYRa
zfj-~_Xdmdc3|=-Jcd9=G0ABFyN&KDQPB6(d1R$9UAqc<&m;r(VhEZ5OzF!iW2}URR
zO(0D$ElJ{D-?X9GWvFzoZ{7X<o}K@B-MVKkU0U8Xt4I(330g<p>kr=g;8h!1r(5+=
z*b25S%v<G<URAQu*ynPIPVk&5;cv&sU-jvctuO6u>fUojN6$Bc=AdpY`1-A9-};+-
z_doRUqSnZcCB?PvTNg~LQI=2Mu#{c$XRhy++ctR27{vRtt#hJrq{^r^j#42*_>#tv
zP?iu=sh<$Jbom0Gp~ADS<>^07zWAB-Jx}jByL`?pi$^lbT1V|K@4w~#gX>$Uao$8t
z>jM8uzvEeYjoT#v6TE0~`0@BS7XQ!rckP}wzWd_K+t=I~l#SL3htJiv_{dxLT=u|U
z7qx_UEGn*<xaF*=HOk7>x2xDApOe`!^MS6Z)2t=jMhDz6-UjtqUlG`tIxcI*u)s|Z
zF(-JtiUieR3bs|6m59y?`H2{>YsAK(Q?XXa?RgYWI3{<%y|Hp&#clcivoGjr3_7$m
zj!IXFBhP41e)r+6Yaa^6JbztuZr!rvSl`-n+Sj)Q#W!H4P!X@_nAK5H)jqK*QKPjR
zO!C2l%8WyA&AewXX@8&6q)uVZrN+lXTb5Q%gwCQAHisSIypm9yP1nt4-@Z_8&Ff%~
zuHIdLR!>iL_n~=vuP90fcRo06e*2bblWLobN|Mc!w;#T-N^1lgIXP>^-p3x?*-aWk
zykv9_r#005q5!)8tFTjOqV-jJqNr)Ki=bcJCLlDes<J>T#|>gg2N@agJ$er3QaWvj
z_Zo#aAhb|ur0I@cghH!_cTs}6NZe>J<~d4Sm5v&%Bh=8dd49u`ZF`f=8<scj3bk%%
zKWB|^Y;sxMxr_F*rw<;SGP|n1y(*MQCKI7+jw*j|-hJ`%mS`|_&&@NF5_s9AMYp{5
z{i~Nt8?(JM#S;&e<e_`aVM(x-j9cE)xuLZvFR@&_tL5O{d55~IdwR~Q-z`j-Q+dzg
z>DwkZPbdl0R@JsnSv9`*qW$jbN#}R8PEVdw;}gzmH~Z}QdijN$uX(4~oh_ewP3<qv
zv(X^xVgdADiAv_-T)~PWqoop{!BFr(FM#96U<yRgjm&^NFmN2X+fj_y)YhA4m05`A
zS~hF%k-f9Z)RR!Q{>aG`!6Yel<U_EZ0mEVe9gZy3&HAqDin^8l_piC(lG(E_xj{WC
zWr#P87ZiRJlP6R33dJ@8@B-{&Nl7E7V7USvK-F$d^<x3gOiB`xe;i@~1a=b7=GQK0
z@7EL9<L_dkh~x(j?{eZM<CTG&qzvE-JTnfA>ygkMic{ZBYEnW<;@>5@k7#lJGCXI%
zum~SjKO`k{%i#f(QD?lHRNo!66yhElge0#sls51-ne${T4=;~N4gPWbd(c(~e)r+m
z8e9r*6i0BsM~*}<^gj`D;e5DG=!P0-E-oOYPWHlkkJNoK<r?lnfpFJ8_%Nq_0S9k*
zuYwvRl60`2czuVeIilNso6{4c^dbKaKKGSl$8rmzen20J7&~6auNXUwyV{@GvE#To
zXhV%AKpv8ZsCKUpHpoJ=!1V&64dmWT0~H=v;{rs+NdJ{!D40Y#$O}k_P%)mZKRABM
zg>{V8T{va@Lu~5!@|Dw+E0-B3mbb#WJ@YlRmQOS;RUQhrU2xVcxo_eMv1#CaLdV2F
zP3#}5%BpK>s>?3^eVi?vb3>hSGO4RBEO9zZ3afR=kNjmfO_<%YoR9ev(0AR4D;w}9
z)EH&}6hx4NBdFvNhYFAlRDs74a@wIb<B8Bd;AQ71&#)D2?R;V0>b2imEnTlXJ9puP
z1s;>~EJz|Y4N|}<YbQMXnt1&{Nc;n<owjo2wCU%bJMd2WCBeCF=cKx#y7aHu_3YEJ
zV{ZtK9asFvOy6hl1!%1TUm(-&60kLie@z@o0<9`!1&0#k9i~f01VT;-C9hU<(W}aP
zcRr&0{CpkLUuCq}b<^J5+4H?abLSrVUeC&>CSR2!?bx@0xo*0X6}&1Iz}4=1uU>TH
z0b`#2kU=o6=t1_^@Ya;}Lpf57%g);b2fJXNLB97F`PbwZE0py=3+PR}QaJs<wg@S4
zhJyx6bl@|vGR{ovDlPK0!FGZ3&A>mU{Zo#U?|V+gq3{0^-9Qdwm0M!vr!;%5rBJ*F
z;}P<FG2aw$1}vooN>72o;Dwn<QOsy}7~$7Puv*!&(XxUIczV{oOjAxAybaMrbR!(%
zlhm-B;agUSOi-TP7(>}6ufaep$WjZwYRbp=A&Zqf0zQLpot_o78YS!AQ<`$LB~BPF
z@Cv>*h!;c=ZAt0_Wxy<gn>{mELltlg*ocxY4EDrWR)U(%k<}Jtc0LE<F-N_VjQvS-
zoI40&CiV2s^R)T3Rl4(9mfPK3w;yubD}<H&Nm_M2BxLekeXT2U;);mtTJpFBKKIN|
zuVXyl48f#^v_8i61}d%j0cD>&t7X=q(ym!8Tdn+&@G?K`Q1kUECx2g9_zu%PLxo)T
zsqz%fYk~{t0Kf$=?SIe~BKn-%=Ib!GiFPk(u*b+lI_3>I3<Eka!eba=zS2ykN4e|u
z>-R0n_g5XgxP1Ji)?ctyufNXb=J*klZT{07iG9lMWFN3Qr4+mmY<_uqZTHf-6E?=Q
z`m6uSoPYi4kaIDQV-(+FkFof}4`=oV-Uc^d+v?m_47Q;@Mx*d09vRq|`(gmzFD^mE
z`G4HCzWdxrxS%32d&X_dc-LL&Z;%g$<6q&aL2mk59vZHbQa#^UGw<lQar51-VxzU^
zJHPnO2Uq>|E8I4m{Nk%UHe9^xb-)L9N+Vt(r$~xKGHNVw!1qQMS=U2w<H|?_+&VD|
z*dXq3n$quC3MJUNNiQnvCB4()lz%4q?QAN-lswF?f$oC%bGQHG#d(5UU>8fzV<wwl
z9B*~zIrK)QW+f&U_AI`(Qrwa%hgS@O5Jn!kLJ4x;H)<N~KOiZyLgY+T6A$(zZn~n=
zK$^h$+ue$WbE`+agLSt06hc67w7UhkAwlk3v&X)^Y)O=7#9jSNJXPPN^804i_l+CE
zP5R)2YmR1#y0d1sC@dt>er>2#Ij~^%W4FqP$siLWllWn`d^6+dHk_o=u0aZ2%mbTS
zY{77{n>za1QON6Nubv%h6GJYG$y~FzsdHDk&Lf!|PLt%(mG8WAC%<(%`0cLFro}a8
zcuZrJnp14S_pf1={`*2KttqQ0LrKC5>Ek^|kM<C5Svz}nt<Y(TSzN}ds_8Ap60O6b
zEitxC&%LgyGP*3X@GNs&*>%$&4++8>D+OUCA*Cee02~2ZT@P+SK3Pl1z|LsULZ>mF
zAZg0X1ZWQDjw`Hoi<qbpx%>y32QcPICyD<pfH#ZjTMmg4MmsBrg1=~tlgCDT0T5FR
zPcIAd{B%g4kNgYL7-Og|s3Hs!J6UYl54r&)RJ@YMt+B(?!ZM5<XI>Ci!Cf4q`>~~y
zeVLm}E`4>--6QQuY@@=E=MrKGa64!kcA}d2588UTB+@|;`dtCn#(HW;?W!5QlQtbZ
zba2z8PU9G3%JQBig>z?WZDn(dRGpVsX_-*v?pogEu9{$}%*(5mTAC}@F1hj9?>~Fv
z5)qx?vQ*WgwBXG8sh7;DtekVn)br+;DonTCc;jt2%{lLmEj2T@)fO~F^Yf$ig+6~(
zZAE>3MQxSeS6EMJ4F$E^X4Y)EW7Wf3CQjV)Fo*xW+&^xB+v9MSKWB1qIU9Fqs9Lt$
ziO@jL@F7#BHJrNUA-OCkdR-Q?S@|KtS|)i|%Wj0IRGnp>=%s4Q-Ku{~){R!+&xm{o
zgoz`h8!jP~b!f?D9pKZ!%O#BwKnSPND2@_*Nx;?^_8eL17#0kd^HDHEZiN#bUFI%>
z!`ROY?x(<+-4r-;g;B^#;;*@oB=L7Lv3bf0NaFY1FLWc0NjKG6L9-C8vlq=;VSba#
z=l8wcSY&~G{;?Y%pP$)QO!D~=bwt;xVHV-?W>7~N)Hdc95W_Rokv@Z7xZ9Xh*)OSM
zFFLQ=fc$1NoMiV>ZCSTV`RELlL=`z5#cg+Wn#G##A!(P|cQjqaMzGSk(*qKvVyCZf
z^adL-0f@y;m;slta&R>4J{GSh{nR39Q0YY#gG;f)y9bW!K5U9M^>lihCPN-JWqjTN
zHu*r_`XfOYJq5wK<L61u;PV;voseail)j9L3mgFgOzqiy=+N%Yy+^h!wbggN>|Wgp
z|72aQtKBcR75DTMw<V9PUs6~`tGujm33=fdy6fB-Hcl+AFLT+JZacCUGU*?^`z}1H
zp)UyUNoD#1yv;2B1}8f@hZ_#8TOpg}Y_D1$7l~oy!U*!_4FaIkD!`sZ&b~4m7(%h|
zC!AO!TVK=~=J->_t1hnZeH*c&jgFQG*{+3(k2C%8;t*X&S{z1gAoljXlr(+{dWXD*
z<1g8^(xdD+_U^mK4!D1P19#C;R06!usa(K0n}?maDJc@5Fr~TS*X{#6@oLY?HgpY#
z#VO!JDU3K#vr()Y=#9x>+h+Dq&`xANOJrRkBk3|Xk^&V^+G0vC_cST>4rl;UNj*%^
z99Wh_q6CY|leiXfeG)ihF9)st1AWU5$eIJZPc<2Pxk|93a;@cP=5y#u@czqe<izAx
zn#O&VIUJwox+HK~!so+$ba?|Asz8((CTV$Ac$v{m)223eC6itM`cwyw%Sp}pBf8|f
z$C3w@k=IRPyc`q9_HI^E=|1$dWWYQMk{?c?pQ4A+TtaVS@2k|bqp#7Qm_#b6>QJW<
z$8$I~!0iGtkq9%OYqj@jU<OBr9Fa~L&jS*SpQ6r(!K0|*>40O$4^SWsxi6i<QW*H0
zCcbFG;-HY-m=@i1WW6J=|JBF+)L>&3g9nbs2=T`{pt(Xarcy}cJJ15Y3k=ER6C>`y
zEY0lfA&TP4W1M6tUOuO27ncBY(@7G&WIfSjuLn|+hI9@T4OsZQjArGh=0e)lPxjGt
z5>lk2Fb+Bj-TZAjd^UKMJ}e?9v_(>dW;Pxg8a)FkdP`1{T8i=#-`Jr`ni-GL<Ytd+
zexUiK<`0@rfDzfCNmR*T6--(P#9E+zjofHai*xVE?|$z6$o$k}U-o=t{*m|puiyWw
z?~QCPjX00M$<>9j*jr}pc*&b-k~W}W2g2U62~c<)ycTn=bJNds{r^XP;S6;cUT2m%
znWDCF$64Txp2UJftVkUDvki0o*WlG)19Q^SLyy1w>VGSvGTLW`YIfo#a!A^*B4jyg
z(8P`Wk~Q<J=69OU|KG2Y|H&-HLL^WGEOltU=5e%<P#AcXjbWXVaVEJVgf2@Rwr;vo
zMMQ%eq`EnRvj~17X29u#Jbb1M<@h?Y_3O^QQ-E~}AR9zSnOVrclT#n{l62bDxyh1%
zj)0@2<^8`jN55i54csK9f&_wtCsTZ0iG8a2Sa&x^p!?{^uPcX^5Ba-7)B0)uNoIUR
zsB-2O$gKwL5-^4l(lOO#(K8nxzRVb6G*!iqX3Uf9XadRRTd#_1@S}>YVY5}`&>1DW
zjIVFyWyqne`X9sMM+1~<#`>3meRFkze%h}FFJS>5=*!BcQv?PAuAjJ)fnHTA!(W|2
zB56VQW3w^+DCfB$l9AOpyc{Z0s3LI=p=|WS){bpDiPE@kKJW>?Cv*Ibd}h=@^O5|M
zeVwL%Ei8{yL!&ei@)E-SQXI39`cC%s4q<;mBr?*Z7^O8Ie<@N3?2F;2(WRsmmpo`K
zOcx<7GwhgR0%A5@B%Y|l|9GM?5y5|`{~$F1kpyL7tj;IHEr%|}ly{Zh{-pA|N!0z_
zy~$*6Uw1H=>g!7dgWY{}-%U>@v1qcNbu$@eL&+figRZg~f~>bc*ca6MQ+_?p{j4{L
zRN%V7CPXO#4wua6+GxSQ&@gOwu&p4CH*!OfaKsx!jUk`TA*4=eW+Wg-0xEp$-DHsU
z2gSZ%l59&(X%LMr+1J<i?lDBQNTvFM1N|H~1ZD{QisBw1PJI^skn|!K5~;3FxPL@U
z;9P79)C5_JD(Z<}(}G9RaF;-RkoTea6n2BoB!VMz52X)h@!v-1VG_=oQ!kZ8Ggu`E
z##O7|446da)P*&&UP_-@H~I#?rPd0cA6_#diMpt@8u^0IG`wO0aOhd$e@S)ljX#Dc
zR4o5NF(Z!+XkgN4iNZExE!-L^Rj{pl0~fVMqq37-#SV>{{3y@BGvc6T*{SSQ-#aZC
z(^tR_IZOQaY`s+ZAlKtT{23nX(T94GD0W1ma2C}`{oGaf0{<3!1N9m$S(v3ZftrHK
zQ&dZ82o*pr8<|Y?nx(l`s*}zd)?b-`6d8e~Q|+(eiBjEHwK`L2>P+?qg5RMcET;uj
zEq39k$-KX2X&yzrwyE_RlBYsomW@u&qp|S8%}GSP&e+^hdO^TQQqSa$Ir@nzHcB$V
zBFryg8y`oK@@AtugN)(5Rm?DvXyRlh#bD7QdO#UvilD8G=7w<AV3}Wg5}awYd6~1A
zMXD2NTv1QH3clU|vh&Y0CQLJnRiaE96KZ>AWqpm#7c0-uohp3ewo*23p9T;D7{T!?
zkO~>uyqi=^RG0>9Y3?Q`vkU7qBjO;W`-4GZY6N1zV7i}###+dng`mhWumQp*#95?n
z7oFQ`A)sSz>545!_zGl2qcq?{bABPkOCzrVfVm*+vV;n^fB=HvrMe-J*OgE}UO6Cx
za&0|;vb&D;(x-W;?I(NTMU;R3Bt9>9_o^<bdd1CldoS#3Ar}`=A=Nvs*geFsb`6}>
zO?XZ>b}6bBwi#3~g}p!rOCAUwv(iJ_6;AK9p=xJrO4zp$Y=wHjLcIaSh9Td2YdF`a
zU*!-FP-VqehAAcTet{1);)(cF&HFQbUEp2N%!Xscz=L1o{+=|az!ud|EdUc;ebfcL
zY%G{Ikf)H0rGDlL?iT7(;@M~T_u{NzFgU<7NOUB)mEC_#sE<Yyv@&}U3nKV67d8e<
z;HME1JMm`a*A&;5N4GsKdau-*6Daq4r#VBwH!^!V*{)$vAKX{l1S0ZDhnu!w+Un?@
zSTUImZuAVIW^<R4>e@^qdu(#Bs9JwyTxoyTW)a+@Q6C6NO5WTh^pU8aZ;waT1Nl|6
zkCIMRKE2*n0rku>CqT4t)M0Q|quyVhLDZa9<IP<R6%$iucp&wqlOt<PFKq5QLps%4
zpBd9W#M*O!U!RqvPvo3t6%9vxF0vkLIO92MfsxIZwUuO_E@*C<Kfk3}kU6rQ{>$<M
z%a<RJE@)rY-o7j?tUbJT?O~x2EY!`t!VNrv<WW9f2X@V$ziYnoCytQ|?ex;}^sDqz
zySRj2THDR-Dh58_Q774DeD+d%Sk4^fI-=QG$@M&Qr<<tiZDyVLy_$I!I6RM$%iJOa
zM#MG-(=|bAh~(oP9g*F2AkwT0Ld9Kksc1t?T)WL7%aOK~TW-5!Wj`raX%Nd@L&0-}
zpWTySz28#)s0#-S4!6w^(RMbT*SljuL$R5RlX*5ekhfRm{3{3^0?$if-P1a&0pA~x
zAJVES21txZemU1Z5`2-O2u@)27l~LCZK4apF3A3?Bob$F$(G9ZCbl@)Gk{l_*E+v7
zj}F3ZgO|@Ax^T?xQy!UewEV(D$(4t%nD@ZED-N$r_P53k-t@yG%VwwUKXm2#P}`OH
zbsO*9aML|EA6R$qhPwPKSx?ve&d&M650~tEz+*Cb9@w>b|BOnjwQ|OOrvK$7vo^Ox
z3|iNiw$&3ae(j@U^A>MkGiQDzIB)iv?ThC2()bOnBOiIU%s^RMMqdhTp$kgUr(sZ)
z<Wy=O9VswvYGhERet|#Z*|>W|;e(M;nmEkY?EuVo0OC)=#Hc4okG<F9rcDTvE7-U5
z3guJ`3e(VRg&-yajxwBj)Qd~JeO~S739w6-29)1A6Oe%}%VRO;$*YMss`_Ch2{l}L
z-XM>!Qhrl@xZ`BsU@$3Aa(xYFdu_rwk@8~Y7Qa1GQOq`YpX#M%s!e&AH76#0v#m+F
zB{2!ye*SLoz_Q+&svz}iW*?JsW4Qs44zfTo&s9DuX1fY!LG8J|VviG3oZ3zfk(lab
zDmxC;*Qx#Iq>~giR_Hrtzd#J)EIm4Osccn8g^yl#Kq&wI;dNJe!$bPfneCROi@AHT
zsO}Rq5Y(tTv6sHD)<O*CR<4&A2I)RJO1z?6LVynsbm!EFy)<Nhg9>q4pVNnK=%6BQ
zswRm!!o|sCGfS#vm?UjrsAmCU*4d-RUL^#rg1tz<t~nTDm~?S2i2hvpc~tKY<W=kQ
z4nA-&Pd~QSuNXPl6u{!ZADgk};g6Joj~-rwGm}1g`27(+Lf9+2Z@zgq3P3Skt5$Ud
z{LrxbC5NFZuOqF{YxH`i7;JURm1D2wz`)Vl=H>1kvF$?lfwWHu4E;CSruWy5&9tgI
zFW}cxTb0KDUfb&Os_ofk>GjolXsTfNpSH~e%@6Wa0gVSVgXRh69e({LrDB0J=wn!E
zrvggszt<8~K+2x}Z&f~nBjco6rgUJ&eGTqXR<|w7j4QEgAQO#XTO(H?p;|EsrjpZ|
zvO4)17`zmcnJJe!DQ~{nclhnYeQzp|qQ5Do-ei5Jy+b9f<&DZ{yS=F_R^Eg^iVF4s
z11tx2kAIw}MEhC<v_~`SH_w87)CSE?&3<kn^-ax_Xqm?i+zCq;kO*G=2d@zeZSWd-
zFmA|$RzNZ{m_8!USElEFEB6}Gl)-m_tYxngR3{fWO*xn;hx9CE@3!MFW$(A+FLMXk
z`T&q^vD=;=e9p5CWgm8%O;$8&X>dfQKG#sOo2mSNrF7tC{R<ui5rhm!wwdSnH0PMk
zy-}}~+@#D+=ET%Tc3yy8>7`bDY9~8o3THRKKP1wThEL4c7^R?lSf*Ksu_DnrU;@w(
z2Sn>d0{1HcEPa?bH6u06T2YcY1J_msf<nPWNCh}+M~RIx_25<WCaiv7`J?ZDe!TJA
zRgH}W72|iEJU@a+t4XV~FoH=b_eG4l-`=`-azS$P=B72u=PPVZyFFMOS#<5a(>DKT
zbFA*7<6c8?aWVUg(6cmH(|Bq6!7a9EUcS{UZizHGPFgw4|IE=u0{$IoIqsCD?GbCJ
zs9<rELGOwR??>F8^43^eqieHSwmU(7YX{pd12Zc_wByN|t+WocI!}X(A8`#$%XpOm
z-9egiFc0;3>uT{3odkd2|6jUAOg{bcD^EW1=C8y*|K%39OCD#bbyWo_A{Aa=z_sS-
z4K8<C&8|luys9#E^T|j4M|~yu`|RgE-_4$QQGen0HYwwt+g{lZXJQ3fzs{vKNs{>c
zri4Lz+#%?`w^aW^8T<Hu){(@Q(`Zwi_fkSOcBe7mylyN-4ww1<4IE0C#yLzQ`B_pW
zLUdqGIISW8m@tO;M<W?-#(+}Ev(Q1E!<DCQ(w!xJ1fEI>MHh+^20h43g7+liFu{2h
zd60+GiZ&i4W7KL2>*#Bzajk?&%GHw3+-9*zY=?RwTsvw5uA&yH?79s1iu0?a(239S
zvP1G&WRrT4?isyt8M+*F%Xi_&sF_1gqFXWzBLAjvzUV{Ld4vx`a;(vb<q9x4ERzSH
z0$IR49jT-XT>B{7TrRC8T%IV<>Y+=UCzRikeCzJvdDtDtA7nq7OkQ}1+`)mA;wLFv
z$)aUe)2(~<j59l!KEQ6cZ^|6Y$r1UK69qqfl*UAWFXTtz=c*qTw54c6CHh`;_+$|g
z#9iFiZ<I7%q43IpV?|v6H9nUNm4$m4Q|@dpI@ZkETFmTo<(7rA*XQsl6O;)!dF6%5
z%|T}+`^UTP!UE5`2(j)II!@FZTUh%*Yw-hYRXa;4-%!k<sQIsdHAh42?`&nTQ8$hK
zbj%oK{4^b52&$iEqQ|^^wsLp}_BseMq6Nr|jmf*yDMzVn^ya7gyb+_*Eo&_He5Xw(
zee<LyBFGW1kj$?rg#w$-Wd)NQ_&CKO2aO>BpM+8><Yw^YLDN15D+gl2bxdd#aBEBz
zHHQ;Ym}rB+Nby>QO5rSsfzC=lDyir=7Q#U95SEQw@vMJfmKqHI?1zq=23dcLUpF4$
zo@4N0caCi7p9TYR|6|}$S}dFv<@%PSm*XQ1`z#O2nehsn#W6?^3luX@#6qCHXb2~r
z8%djnE6@<^16nL6G6`@l!l`$D6rNMb|N07{zw=<~tcrSY1?np@r-s#y6K9si9sJhM
z-;$o=r>XqdUB4txdH2#-d1>3EK;DviVtOD+tRK2oYytRHi<Y&_$s}fZACRbMtgx_&
z!DrMt@Rqa#m<YinS}H0t-s|=e;m>(DwO+U{A4C{sV)F8(7AG%k;L4IEL?Z>Vfw#1n
zYI2LUrz4dca*RWh1s>~jir_qjOwlrNcLzVpo;{^8TFfTsF=}Y|det~q{W(_CvY<Lk
zQoiHye8L?0^YY<jN%`0r@vyG>>03WhKFK&<VoszfPh@;6vDqHsx}0LtpQ%N&TTf|B
z{=pA2!zm4)3ozQnl&H%w4DaV5wR(4ve<e1@6LBgZ=QGs}6LWpy!KW4q%bm=bam}QB
z{HX_3T6iIULHV|4of?u$lT+k<!#<|Mgl;U90jxV4xAPk$R#g&}Lp0KRB!(a-^gx#o
zSq_E>!8Q)Oorrub2z`EFG=6?yEyeLE74b2RxU+fo&2Fwer*&d^WU9q!w%lux_27$k
z-Lr2V^Jic13sW1GH@D<_ee?4i#Zgz~SvN)Uo2tu_g?VS&^?Qs(7G`YgxfK=WybFQW
zbP>fVBYh#7DeB@SRk7@52F?*w!*d=3hXwFedFbF!ay}&mNXG?IhdkKzahd}MhGc%7
z?u$ul`iK&t1Jz+A4n?Q~(aNW3g}Gn{Lv@OaF^;v8P;#jFq5>AD+c+y=QIc#&S+JkV
zrh}wSYv@{}BZpcV_^#ie36l?&s3$_6AR^>m3JynHVk8mb&N1p5CI~R{5?v6>a^-3m
z^Qt2h2dRv1fE}v@za`>jUmWwpC!@h=yF*b@FFt=2V)+Ojq=@>wYZ%+}+%JR=(~2n7
z&pvy0ee;;QDyw&0AbQri3$Co0v3O>q_`&`650n|q9=HF*{Vc-l54<PE;K$Tl_TB@^
z=gO~z`(Mp3a3<GxOsHxL#cJZF{AJO?i91(~Ti)DM-V*9k=bKD1AH{uW)8wzyCi%>5
z62E4f{+d=Kad?}$HePV$q*be@OJC8X-@KY%$xd%k`?`*%&Nwv)PJuvgU5fQ10&;7j
z<SoieY%D$lu#Ey7Vd9A?)&(zuPiQ~4neqlwv8J>pHo=Z-5!WKFQ{;L`N`z+=3}`CG
zgmIQ|rhQR!>TRw&+JhTRcJ5gndL23s+<^hbC+*}xqkA689eIF!z-4eeoN$o;6!IoQ
z#_gop$|nO9_mSAp=ppVa`C%a|Jv`E;mdqJ5t+F$EL6CV(;Y)j}TIWZ`L^jTye_>Iy
zs4CjE;)o$?u)yo6P#hJHtmukXA^pMyT^o^WerxiBY6eHT{zyfocYIA(`Mjm<nYr}n
zlK9cM3{=CI7$5DdoHl08lBM&?yK2UJD=Q*?L4qGus6~!=HB*!E34oSiU*j;~R7#>f
zCC=qo9)zqRtCt~&pNMG)4saHgCYZUVT_DJJfuI+jw0`p&(i6?{7?|ca%5O;Jghz3~
z#VO5k<%{E_e=H_b?<mjv4<HeL2mEZxJ1KfGrTX@yYqmzw95{ab02G3cAID6vKzDQ-
z>Suy{1-m)+rorkMIMyAG>(J>rl{~Ehap22C{xH1mC>U@we9U$pnW#wXlv|G<Xl&>{
zcO$~eAmOz3?70Ab$Bpw49*j`mc}C@;^i9VPthrB^bKcrbY6B8Nk#cM5z;Rc19USbb
zX}L|cbSg%?8K5HQj1s7Y7pibLqaUlqO6GbYfHg2VhWlG=u&|oUNHV3QlH9rcFMS=W
zuG+pgVK*0;?TNkHuUgfiDhLTlME1FU!u03FC(@dQ5AMHY-n4)Yu7d;9=3TP?!G$Uy
z#P<kC(hT|zi4Z*WL6dDrZzQX&He7ooS5}vc+~sm$v6-B}@*845ikhKo3Vw1TMG`#7
z6(LMz>Io?+Nz=!Igxo0{#ml*#eUgjxWE{Im0NSk{A>ISL5YcZb;NUuVq8ik%M?E>I
z5Cz^A@&L0N61g=%`v-ms_+w%VN+fJhgQ$eye}F8~Kvk%k_2Re8@C_^~Nt5-IX48%8
zX18ZmuzB;8R=4CRwOf1+v+No-aoxB)h<mK8%4%YLBAh~-Wp#RYD}8o@j&%!8(;D9s
z+Xnh+ri;P#4;F2zZk`^}M|9>|zcDyt;v{ET1+^_yY;p?SaKKD$D>)V9__hw(1cPmZ
zduSjFqE<)51*SB}i@__Ze`7-l7O&jPkyGZs^*eL7!aP<<=@6GNX^|Hw|3~?&sI?lB
z4s*ZJ&MxlmI?m=Z+3J>5ES07HrQGslSGRJx-PkV~lEA;+EN=lbBwcQng4yfVx!=9c
zh57)Nf+l_huo{q>!BUL;pW}ZyU5CUF<Qrg&JaSxl?P<6|HXEHz?~AV}um3`M?G@!U
zW|y|zwRoYpW#D>ot_OsH)o2(<ihTn~S##lbv^^`gbpzmNq6lFCswx}DfM`Q+ZLY(6
z@!B;oL4SqSxm;_Aife+4fS<VPg)2tzn~@FX|8>Y$kBpR$XBK`nf~h?6`}j1_VRA=9
zQG6+4!SL@3ui$fPaVVD6DX;K~h?7TtpK3)_Q>*z3@=-;;>ie(;<KM?d$UohPU2$0Z
zCEor_Yk1jeBiYCfU}_JHtSlSZ0T|j*`T)}{3{FF)BSzFgtURq<>L83{`hUbb0sS;=
zz=WNnj6ssy&NzsQWsR6s<i;rClIs#t7d)DTL^&$0w+~!XEv)vw_=4qeFIz9MwYBL>
zY|1z}l}dj<{Uh<=$I~Camq=Wre7Kse5`s^&w@$3Q=N`0=Y0RgR+P}+$cWQuW2(FM$
zM!7Di;4zo{uJVt8x6_lSurY<~TkQSLlT(|d=VK?Q0=&Jfe9la4^-Xu*&CX(Devs)a
zyAGHb;LrlxXQPj(aHyJTVe5k}hzPU{Bqtxmu>8y7*np-vL?`j#RJ8#IECIp)P_dpq
z4phW7ZoOnNp0iWgqSPx}cAf)w?0UD;%DTOJy=`^J=eP6`l<8}l3`Nq(P3p}ppLeXb
z>GfXLZFNfT^R0KFSLyZY1;aVl-+%x0=fL4Of9Q7ES1;Y;77lW3{hQ$(lSzAY@{aH~
zc|v-(d(YC<c9+|!u78d<M9_cS^n{~n)Ib=d)nnmi2p!<hq^lzZN%qGjn5DrCW)Mj7
z&~HN`MeZj$$z!`cPtBmOD}Crv4FF9>mr$kaIku9Oe`xHnpw{jULPn7Jok?t^x;JLt
zjO`aYSK&;5&hmd`NX|5>xJvj?b!U7oth?xaVLr(VRB1ta?^jByI1dHP6Y!`xty7JD
z%b^8{Q!>&bV&px8pb`>Fejsa>(XPc{Hg)KE&K30~csclXiqC!SA9G|q$jM@sMx}a<
zyw9yiPT7O?VMBFbzaFek&Si#A!)1~>NVXCrwa)TsqKK9k;|eom5nDtd=NqCip^Cv5
zhE7fQN>25`=`k<`RmGY;WKo{`!0L8bZhzavoR*Zu4d0JzzWrzA-P^4Oqto&Ww(NBs
ze_%AR;@q&8FLRkt_yac8!rXY#$xLtGZgIFRx3l6ue|wG05dD`@b+0S;{=(uk8pKyd
z>X&BcstIk=42zD!K{*HoiZ}#XLKqoA<2$61RvZcj?RJOlw5ST{Tb<LLEa`H(qUluB
zr8i(K8%`y(FUvp2m5a3F4D!%!K^vvY25!J2)MZ#T#n?v>WCsj65DG2n7nB#+I$=Ek
zGR37yAHfcW$UoxM13RJ{qI<_}?j5%$8Wpd`%^teh8<kp=7t-X1m)^pDhDbYj3tQ<C
zr*Qqi_9$NJ-Hd!2qT-<_Uc$|u=mzw|(4L~w`b1enPeIiJ9$oiWRWK%{<59GIRhGhV
z?Or~&`M!~ry^mm9e3gy>F(oO8HaPUaeugQ)r7%n2XA8c<;AKqc$72<@RUnom^o^^^
ziTj4~JcwmRt4%y1Ukb@Pyt{Li95k97assSl0|0y{ZB^zKPdH2a$ezuk*PD9{c9!fb
zbvnS+aJFH{^Tqq3#3hBEZ6EwUN2A3o<@G|5o|ZD<!T5%TW}6H6ALrKqT_B!%BZ1=(
z#}ylbq%PN2T9U8yp-?DoJMc-cv`oDg1Dxc!tOIvX4=N~^rHW%wA!X{bx`FHsjT^}y
zK$mAxvB4lj-rAAkMd48adpt+SD*v6MIWC4faZT<@`v`edR1A64%(uJ5D{@!U5Zu=S
zx_eZuLgv$v5<hn@!TS#(ObAON48?Z3PT|c*>&JDoH>?ij9f!s0fInpAq!3j4)BR#<
zSwX?kg06yPLT_%x*ds^lyT`GAv(PJ63%!y~3PFaosq_oo%kak0f`Vn;xi!u0r##Xt
z&uDq*wD2UJ!Q8mBlha`qY2PbB9&jN2q1q9G_XcOa*%BWy?Ymh&;t-4}yaD-m&mkWI
z4G3kqH5nSODA}_U>Wqm%pfha6mZCB-;sUsj&`PDdk%K3G#JT|wdg1+N=a2TEJ1%6r
z-)MvTbg^Q6)dSa*n#}<rHmtjzM1DYmZW5*R#wV=kzUaJ`r~hC^m>0HkXMJ@qq$mQg
z`y4OLoKMf;zW~I^2@WL5P#DD2&^ZD5$2B#Fg(xG#7cx>(G-5DECG#|eO-TAvY)<+=
zPl2tdyu+0`PjCfKVZ{g>6Du==Q&=>GL}l>_r7jvUnnps3k-a4CcKVb)SG!B;^En-4
zRC*M;vq@4&B^}w}BPX5{DOQsC`3Q&}iKK(WlxTB1=JYxdS~UnHzPe71(sZiS;q+mb
zXm_!sZ^xPI#J(AcL=dMvKVL}}E5H5vb>e#6swf=JxW2MZNh%+oqHp~!SN=J?i-fy#
zx)Lo=`qF<TDQV^n@zvaZVt{)Z@xOq>bOR!R)U+XX541$$gNk9XY;4zN)`0K`#N9<6
z5|PT#J=76>O2Uwk)~8+)qq&HDY)JskKCk#%L^PXZ$>Q?oV*p$qD)&rSL1Wu4h#gd^
zl^yKd{x!=GJx44Ty%tHbx%2Xit$SapWpCOIM$s?lD}IE|dD#XG!4DpQvS;kempV&|
z3p@zDW3ib3bj<9b5IzV?g_uN4e#d3mVsVWh>$GmQI^SR#AHHunMj}~+szOwr)Mj{L
z*cym-n$5P&Cfkmy5PnBS0SJ^udjR#v0QzGBL7ve#`J89Ng@0(bPK)qf+_nw-1yLL1
zjz7c65eLxaop4@lId=uMbj3e^@ca>w2x}2{$tag~S1#ybHPjW#FWEPo)_cGtxL&!D
zavs67ztm;fZ*~6R;otAk=NT_GF~J}glq{e5E2nk8#id;SG+sninWi3og5Chlv=TQE
zwGE=2qy>r*K-8D9G-ll2KHS7r=~27JL0%I)DbeszGoU$2s-$o+rxoA$=`pAEpvBdG
zaaU)a?69rX*=+`4%f4uI?!`sXuKI>}<?QPAF;#hv7w&Rd4qBb#H*~Z(wGQ)Kz0GP7
zeT{94%2w=hltpJ$RVT)EH%@|BVa09l1Rkf}c-&A?S?9;M4k9*^Nmv!oFPu|Q8y@3B
z_}xf;#hCHU)5jcot>`I>%V~W=8xED(wNCe88)AWp&PbteVP~Kso*zL-U0-#qZQ|n0
znC-)uwV@Aq2f%ZWmx5jZ`;G$(Rz)%3E@#9tbs;cVhU79TmFV?>U=;T`tq=I#eCU2w
zVm0bLKeii`SNq`hWb=W$y~+X_8+O<Df4`BcMtF_W`sZrL!=MJs)>xf4Jmvn5a=YE>
zG_y^=Fjy|NxE9WHTJd0u%W^s8#bxVRMDqb^i>FXuVCx}bmy?OUDkLI<3$?Z?$^mJ&
z*9Y>|McSFLtRrJQb(*O@mH32nYlWqcU{dtcWP+0<e*O>T2YS8H`6HL{SFWgWjP3_|
z&kr0%gI@XRulSt%JqxR6G=)ufTGv`!3!K&-i%V#?+wD$eQEZWav4h>~vRfVL@3|~J
zR_6kjWi9-dJY#VImnlB=e>h)_eAf?BV31l{^;t0-Bn_x}n_;Ne2MO}54QNK9Hv+fR
zrj8!~3%Fm%D``#48^5%=Oe)YzUi}o=Xx0Vf;^L-IT~XZYGr>m|^{d38TR+ERxj<VX
z<dY8%0Y26pBt|&vU-RvQ7tWntUg@%9+PS}D@yiGiX13(#l~%URShls@Y3-%ra3G@=
z2;^`lewIz+IwV+V#Gb&|>EVgg4$b*O%>`(`E8>E<7_LTPc^ImTM<@XfiPZ#^{uKFa
z6eIi$N!%cW9fGwYM>8?z-~-ZlXU|?8X-cWnREH};n0ssn{3C9UC~pVZ-B(8@vtzUG
znTwQ7A>~(L0nLBwUY-A#U-zxo@5kBX5PDyurad0Ij!x$<LA*HoRRQ^Iw)R||f3IJ+
zlAV8!9JtDEG|EdiQI;FSPon1*z%A3843JZ1kHCsD4Kf|kLuANC*rTab5FM00>h}vh
zI9iQD569#2aip`wHjCM>9A!Oz^=O7Orw1|_F#R>Kl$Jg~Kh|lc@)_hsfCH$n>k#Z9
z9QQ=v!nK?=g0yqgA>2H!6TaHUM4hLh4u>KUu5l$qMu3CY+BPlSVB5h>n^wBsdCQLN
z7G2%!?U&BGy{qhY=Tz5A#hYpojL>MAx#`Vh==OP~x6iq#r}g!siYYCNYv<_oO|j0J
ziB&a4t|@sXEw$6iC+g(paC=2_ti&m%o|##2<mxFKCs%u=QzzK~JW)Jb#||@A+<7l!
z1OF60AJ7#ypPRm`WL!y}St}@yF;O<#15gtAB2*XhAzC8?i;lrty|1`Rr2)7P4~J^I
zs_rl<KZ}f=q9F&V5kNO2>trJc)80ZwoL9@n)ry*deqvmZ4-E?Ml45CFt@2VWmqnxo
zeS_4HX31CjoX_FsgM=FT_L<#*u+eMPOACcZDq#GmUS4p9s-mu8$W8WODH%ZrwQJ^K
z{nUZxNJMnlz!1_dqg%mAE)_y>N(^Gx1cPNbg~Y&G!bAyq7!Vc@WlSJAMgj{@S4U@8
zolCm^+f&UHT2V@W3I|oBQK9q^_YTBiAJ=;oJJZjxEr`j8Abe)$2fKtu<$A5nWHorc
zcth!*QT<=lGn98HzkkpBQqOOz?UI{?%_obpj<dkMle?+eCwiTi|M_ge;WWUXxw!35
zOVS_fohAqfcZ!#-Uw^|5>(>iM((4Iq3~zTmwL3c0ZZaYu-e!i>%xO1SHs`iX{L+5-
z8tuMoSnFJ8?1jN*|L16}RtAQeCtZ447Z`!F?bOIL);i+p5-m3#*75MW7d>NB2~q-2
z&uoULD@%-2o)~#A^p8H&QV<&gMqS;tF$2;mx)E^1jgq7rhUd6Zw-lzaI=e?}^-wSZ
z_8DH_bICdSC5`z|`)xz*AKA(?_Xiiu=JbbaME{JumxeV!369<yLhpz+59^JgehLmY
zaO-GY!L|-QKVt{*IWNDOS?e97IUFTL5U|dGk)C<ZN1?VzOr1ECswih;1OT2C3mOPX
zqXhv5IilN;;t9pKk=qwH*SAgUteu?x#u*y@abR56j!A7*erMcfkH+SoXBRwkE7o6e
z!}%BATcniV&k)4a**355;y+ASKYi=WhJ~ZGxv_2M`SWV*dfgVCWZALES8)A#>kfZU
zsNTAjJ)!f<cC*FVwD9@#*1`2Y*!D)QH9ge!FNbp@n&<km?)VyQe=WCtKmL-AkTQ)w
z`Os*s9~jw8xo*_{p#7bA0!i%e#JdHCsE)d-<T26<IHm!@#vm>o#irBh$e%UEqk}95
zgG@Li4q&q&f+cxDhUO3u1p$<&mppysN2B?HST8s~VClfIK`;=LdK+zGmBV3+8=8`r
zm&|mu-??bk#gRa)B+uVd(;0FG3<jO4!0ifDO{)&splRxIBIK;ZJhQj<Q6VT($R9NH
zK*GWa6~URU<66f@H&2==6z2!v>mnKuF3XDw!q()Xkh3LP7O!Y=yFA6Ur7cDN*vyKs
z*6+6Rc|d)kL0^#W1@8;4Gn1LiBdPwV*TX4jguaGK40izyXMOmi{>XL-^+&Uam4W!$
z)Nk%Hb;P<xwq>^R7fEjw!SZAVTc~<kRlwygFzF12fHTxt)8o%8i3K7T&sub6yJKd_
z<;f;P+~#mpiDI@V(tlFjl=1#}ymj&HtyZ^R8!ep`^B1+0))sqQ?v{#pS+vC&T9n)>
z2+=&@GH8&o@<4vEFmux8=y-J8%piI0&+>^3klgrShtrCgu^KUQuF-r$^Bv8PFiR3}
zM5iOw`9?Us3wxknhFA}g1pMJ8GJ?Ol49nkviNJ+{$U<l#aV9856%c}k;>xmcJOkss
z+Q#~ZdWw-nh9kACp1Lv?3UZIGVBJAH0?&yw&w#e;;uMJ-W!0fFWM9c;B`UMe2WKbT
z?g1nlqQUXRER!H3lJttV7CInwD15HHJ^f<WbcBoOh(|*PZ94)RxxH+H&O9a(>gWiT
zj4|s@3ZgkbQD5kB7p}?oTpsponQ~b&DR^AQ_VOzc0`j9PD<&G<Zn$f|N{C$rSMBb!
z<?I=CiP`#~E@GO_LY~5!x_pl(zpkdx^K?fCcLCm^HKBC&&s^5xpYN)LCCS6#y1EZ0
zD@)k@llLk&mR1(nV=SzE<`-<m%)jYyy{BwU3H#{o(lXC8hC-{?SsKf4zN|Sv7At6)
zIk7Il%pQ|C?#{ZpJL}Wpx6i6*mTfk<xnj|yPs}fGq3f3N`LIMS{qc`|%Y17af3|C1
zQ(-Jt*u+oyEo`gur((O{X9znSbwY_vpUa8js{?+m{)D|^Xnrh(kD)!9t2B3L9_Lgh
z_5?CFk%9cx*GB8e2eG3rG|I4K2QPuyk)Zk15KTn*gn{dT(*_nJkLd;itCmMp)@g%$
ziolANW<`+C5LPE*&`CR^&Xt{egs2cy@*%*%=`&P(Iqvg%eQ`GL?6U`&HYhKxTg`$?
zmJ}h#G+UxKSB-68j~d`}xO~Zy%CQa51E04PV6E!O{CG!ayr3{XX(|X1A>F%hq43Lq
zb#c>k>A-VMODq9gH$N-9&#wmpYj&@;R!0lgPhrm#L??B`3JPK!lcEJ|&eB9}l|{dl
ziO&2YR`Ty1URLSttg7lfvV3{^r|e_piZYKFWE+*;HU4Pp@)xHC#x?vVy>4t{WByr|
zI%CPCMQi6o>*}I&9>pn<pKlO<^v0w~Z%j@v`fz)5m)7Iab~SJQn67nhw+`2m6~gqt
zG28S*Yv(Kfn*8`&ydCR$yo(B%r&t=>qW(H|NVzd2c+1%y;`6I<nEwHZTO6Z{c-X|1
zX>`>>O_gwZ66ffcC(FoT4U7_n1;&5o$3F46jcLa2hMu(VlhT0rbCW6kDeE#Bjowen
z{K}(Ff#t>j<`vI#D$}dN6e0tQ+GeX{tL>hFvswB!x5HK`To4qmBekH+enoUW)uj=&
z!P-Y{Nb2B0*dQ-H+{kzebiDapL!5yeAr*1LShLGtcyzC)_&F!y$M1Oofy3?37rVqp
zo#VSjF6BIs(eB`LPDB(}2H0)--{me)V9W1>O=ichner{G)lwqPHAm8MK?y}bIJ38z
z@bC63hc6eRB{?sG^rRuN)Tq*ltVk5`t7xBucX&RRDK-ijaAsyREEhCIil#Um3fXON
zNdP9lV6)lRPx<}8-rrBzV7J<Y%)PiTbH8-DgC*TgXDpqHIrZ=fe57yVeG{jx*5~Ev
zS5KRG-^Ss$g!?9e1N6y<(7P_c`+U+&Hb@@kiR%)e=keF*F_=M2f2=&Dc;yPk3tHKC
z6I%#I#-j9Gwoq{@kI7YRp5jv;WQ*9JmB$pP*sA<e`6HX4yth&L9Wr7g-q_6wpsy(?
z?@7N_{s_G&tMZxhH|2+{P~5BhQ2C6F1qp&ZSl$cRLNO|`wTWQI@yLkA4OPcD1@#O$
z;PEQzlJSH37y`IQT{=<hO}C0qv6DAP*lw|R;Mb7;r6<f29*(CM{9HJ9R{9uwnq7B^
zvPEd$ear5Hx3XK=(sV}z_32L^5!NrBcw{1b<JrT{vQLzw`&bWqCH?FIVd|gLQv$;C
zpb4{kqAHUE*BOw6w4;IU!uxO|wiz#kC=Jkt$zaW->yDYp<-M4d4UHpapgixOJN5Ry
z7nKj(*G2+TWnPK$9s&nG{q&_N_IhdIV}+&s@YwdbClAftzJ0EA;oR*P2v<(%-22ug
z%+}XAA-yXQiLfWXc>M7%9v5!9uVBoWg8T5&M?=}S=d2gn$uX`_Z^%^;tjlWeWVI30
zkW}gnX18DR#3h$JAw0oPGRcDnWm*Fd(4)*>?z$APD|ql7S4gfiu)4<3Fx559&y)*<
zhUH2^Ni6RXjO^qHoiXvS@@l{EWO`OFLkO<ZZJ)d3%j9o@A3@fQ9Tcq!8q?SUz&-~u
zP(|wqdjOV?3z%4m4D6GXn1O}4pasc|q!EB6K7j#^C}LWdmiv%Es7Wy4!E>kh9gQWh
zPlChrYW<Exys#ivGOclw^(QMQ%n+rUmMy*LJ@?d#8s#13qw=bxvuIgk%X@E6NGw~Z
zw^=Gm7XI?ZwN+E*CEa;Jt@95;W4}jhe>$*0t|$);D7Sxc*ygdwI>8X}1Po$fcw9-*
zp5yFdHs+2NI}`4kFf-_wH_zcTH#;_Ltti+%X=zHYKPp_5A2H~wYjnnNpdez<6&C3A
zkpXAmypCz^vDKnO?+zy--7nY;H{Yxcj}xD}U-1{!7dZCD@;93c$K=-=YG1nek*R^o
zq9U8A${Af$HPhWjM1DpNsOM0$3AFw?f~1g{0#9vd<mTky3O9IN=t1<aKoL$Gfa$vG
z5nCF7%EpjU?O3h|i69ngUl)l;mxu;%o`!IB%_}Kq<?;E`^@|Uz7lp>k$=5&Q?ub|1
z@nA))!(*um7yaaoP)Y4LlWe<N>AA-&2W-`M{p-nak?o+tQNH=t%HIwwkCoR+dT)uA
z>9tPFx+j_Vw7<Am8p}#^=caIbd6n0_&WWfw?H8Drb<`|&7tdo&o`6<%gL9SVcKLM>
zipjdXw5W^cN$b~Z&9{%6n_socHF3T0(}cG%G$G#{wz<a^bzbxH61m<THg&lRmRj5~
z4|L&bhgJbJ9?)@`+0ZGcJqd6MQHVo`>IIyWW1XH1o{L#WxM%{M3LNH&-(fqy*=mW`
zcI?=;X6CH!b#rI8G<m!aElnolaXF=2@;BweD@&rj;+da~b-42LYU>&rHVFB@DQak(
zHJiRUB=c5%;Hg+QeFOdq;o*_+Ygo9d^-z)Gk>eq)TD-6>S_pL@SO?u}DlDuS+j%Jj
z+U2cnvpd?xvk!B-^wOut`5XmBt62PL7CC$T__9*pH<gXE%gailZnxDU$*1*+cq%ER
zG1Z_itI5R07|AjdKDS$xdyE#VQMt>aH@N#%D>o2Hb|nS7%aq;alKP2xb25lhNbf@<
zq~$&;GoxEVhzK{qQw{x?S4a<*<FQ-Vaw?szvPdr1$sm;^^~dZCg)1pLibR=7Ch9a|
znwQDBHaLK}2arx;QSP`zr=c2*sFctTu1f#VH&$AC3wW8(5Z3l($|N2dNwx;LL*R`7
zU()tb6-Lxb*pIG&>&)CHpo35*A8&aJ`ZLC@5i`?@sGdkzgn5RF-4g!HDJ(n(4G$z)
zoe4DU03h97c}sl$WvQB_3n#YDom+SGmYcS0eq`#po^a*LHB)vjudkmInRrNfx3FkJ
zLqoJfoH6|ghTxBE;+{P(1cRY4ZsgD2JA6Y?Q8+xYB-v57e9I+2kuGYTF=Il5)1<v+
z<AyP!9qP}6I`>!;BKC9>_HsyRqfmDs%Y5}LJd|EYKW%DY2dQ5P&h(Duu$KHk>GOp|
zdgs8$dxTrW3kKd7?n3(sW?_ZNdr_JVx<!rf(YF-owWR5#bxWDEtnO|qng_Q4KvXfD
z#HR##iJpojNQjegkO3rVz(diXp_ufM0NpT2X@^$d1^0@*6ZH9lUUod_^#*+dC(Bxz
z7q+xWbCQ)aS{Ak(YAG*kVbiOU!ebj!1FKRSr|8TU-P9Ftu9&K`n04$3J#Q&1Z;=Xp
zRF3-h%a$@_UU^GPIeV<E#g$%DmHZ>!{ZTz8tAyLxEsZbk*zscHev3|PK2TP6z^v6-
z(zj&aDsOJa{%S&B{0m*8M_+`YT<T^etcFctpP-k4kZ3U-YJJ+64vk_lLM?T`jKPc$
zTUZPTa~nM31Ezzx29TnM#IfKzU<}}$vo8qvV>f`3Q34wyVq``Tr74c5F=WRMi|0C+
zsl^(6F#SOh9EJ4}^rtX~*eW2aRzDn%sXGO>RWk6f5{D#4v(qa0C<i`6DUA&fZ{s!f
zPm6uq(}0Z!TRDov*VKw~8EXS=O?7R+@2Nf>udi081*u6bg3|&tsUeP7qts;lcTZrr
z0e`>>@&ups5^4?QyCQ)qLkI)y{DiaVtdP3%j-c`hr$AO%Eb<DXv?38=50prCBrX?~
zN-aU%+i;IoH{zbE)<Bu~_mLNyDK8mfejq2*shNW5Tlh$kEZk}`AaJt0OtKkaW2f99
zNwO&FbXwS#!(Iw16AKy<8d(IIYhcFd5r1e=$P_QOF_XdLv{;xmoadD!w<&IG*6Ow1
zyl8>Z<OHta$n)AaIGJHgp2)%l`Go>AICMs>WYRepbNd}`#=Hi7oLLYo)N9Q5RyPV|
z`9T?RHbsNkJ<U)N$ZIe%X3r~g#KNI`uSF2FT9eKq7R+hzddj>aD=M@&eRB{MTdVg3
zB?NGjrIISSRB}IHu#3e-`Z8-(T(W4H=r&gEy1c??G7I>m)+71^!6A5UC9Gq1`fkyr
zH3(1|5KSWcreJVrWrM60L~EJTV0y}E7Ogr#fY$do*&^DYw<ikBC`e$H>6zUsG`hWl
z&hLu`V*1#M0>_$|(`O79RV;MPbXQC%sVgYFH|a{2l>234m_d`38LbN)MSf2rSQj=}
zoPrq|C1FtvyDy9QS5Nenmy1rfarfBHN|OY@=Pc48>T1k=fz>Pt^<D9aiS;GpC&7<c
zcva&P8&D9FF+aZ{?96u>tb#Y@w7Xr#ac7q{w@yopHN}IWkZ5IATfm+#oyS~Ei>5G}
zXtHRPc}x#?WO}2(>_$Xd!*C1A?M}ZfFW+8h4C~6}u@|`A6YkkwDoB+VRmEG1p{vj~
zuc*Z9nHbiKh@4ql&&2jT7wp%Qa#5+rAnNzp45FkP5BAmgVp~PAAes!U(B&;+WhIi$
zYW6W}K-T+gP*8C&v%z7oYEctWTP(RGV5Ly!L6||a-DNXK1_63DS`ogoS^{QMTd_gZ
z<xLpdS*U$rymO7-?<t;8PyjoeiRYPvlJB6wR#ht6nro{3oqD@okPW(eyKQPrudT}K
z@D(!G_Mm6ol7KTBG>K)7fB^LvW^?~Yk5J#D5mH3K-Y79=zsaG8)*$57`J((+L8}*R
z%wo|>78%S2v&f_qFPZavUN5wgosw&MzFp@u6nZg@F-Qf$JjPlqnAT>8$+yU49~&((
zm?fh#9G(_(%c8|rruCb>CR?Y~VbJF3wLz<>t*D<EcYMEodf4E%dkZNN`<jMM_x1Ig
ze{%N4<sMd;Uv{i>#m+73nqON~Go@4z!cla(-eoS7qt^M2llM%VB8O@sd1zLi$uxb6
zxwx(<--Jyr>#r{boAn?#6jks-(gumbO3;fjF+zg#IJjJ5EG~s;hxVzVoB>GyCW3Md
zjN&#1c1D8?kVH3<D;B4>INX6>C+Ph&AaY#RZJwklTPX<khMV_Z8L>V0;el39Q2Cj1
zge~r>z3I@!v8d!+yX%reeL+?wzWv5e7me9;^T6M*p$l`K|6=Bx{o5v8G^NG%o_LrU
z+#NIaOv-aX#9A_Ia%W4TyvT^?ipO$kuo8Mx>zTFax>=?p!c8@8=jg1Lyt`z{9m_kd
z7AF74TlY=;?AA|Oia&XO#-GIV8N2ab*F$dxCN;Epl<)`NVdlK#_-O@+GOZ8OO9aIr
z3oqps|LUt*JcsK^wrQ4QH><A_p}_{DWJnY!xGro_L2y&}DDKIIBHCliu7V7TdXsEX
z)xcm#ETIt6+~5ru5wIcz3?$!r(k=0(#j|R9iVDh{wj0VjOG_#O)#Eom(%qTb)DfG$
zu;uXC-eA|ny16xFwS~2He}8b=6`R`GhIfzc>zOs}dgbKzHrcx}H%z7*_M6(X8Y=uI
zzfNbj2OP8fp|C$$*|?;tc*3S>txH>?))KGPT^g?oR#paEDwpk#PTq0Dv3I-do4&{7
z>!;1?*{9wpC+TLe4<t@cw2(gQkoObVW6@rPtrF~ThM0mt_^_$CvF~zOZ4HUyGR~8s
zhKn$1FQ=cbzcrD5I*|}&B#tDQLD_n|Y<%;WU1eqLNKsT<&=MCm2#I~Wtk!f4VR{6o
zSy^Yb?zU7|2ZS~oV&)FMivkkLKb0-V%f{?3ZEh-~$du9;VS|`BBDC(ZmD$oU8xzdz
zsIAPp%Vrx8CfJ7YAGqzsNWZKZt>F>gZ8Jz1L`MQ7r3%N~87KiR5gojPFzG~!<Ulfx
zeUgUo`vE$#>x2~DaCxa{9m*6#_i|hsOfR_~z8m3PhD&*%=HqeEWa1j@gH#13kShUA
zATH8W?Xl7ASvwq3{-`VbW92^$us~|B>aA*rEXMH9%0Cv?m5zfG+i7cAYV9=mh*G-u
z|J(lk|HhyRQqC3}P|mYC;e7m43gHartO2Ku-Ely9xO`k`p`WETY*12uv727luhtc`
zWj`Vgk;X1CRO%aWn?^lD?210i)=$#FE;0$HocxDtI7fxUQKg^PModz~7{oT{9@xxl
z@|rT1&f*P9FHi4<n-2EMP(4z7U3%by6gu&3a3=tShD&j(1fWq~Ur7#J5@og=!j<aM
zg{}UQmgW+F>%uWr5V%N-M*x)%*>AklyNd(BP)bV+!YokSJ>7fVC~%<yvbi_m0Ki6`
z`!#A1IRF8~*o^{|knLHV`~<;_92i-`0j3VrDhaP_#FPX6C<E;)W>FxL9tUtyXj8)b
zOyANw-um#ZJC>>^wn?%pZ(D3u<?W}8LE}@(+g6)Jc^m4hhNqq~$da9v;2|q{$`Cd@
z1;s;~g_UF;3Z|iAP+Gz!cPp<#OG~@_3ybB8<yxq5vD$9g<}iQpg~g7itX6$$HmgsS
zSMk(t`Qi&RAM=#_eb`VqF+(*`f@K8Cv>fUodT5kK$|dlIK&TuwCN~?T%!?cN-1)d+
z+%wA0pX&M9DVTWey8)YIY`JoI|D6=}cH4{0d0U0U8CtmX@QIr*ykJbRRrhDKrs0{s
z`&yL8ezgw{2rvHe%l~!JtE}M8+nDbcd$husF~zfgx$Wi?hwGfh)>5o#m0zsNjLT^>
zVqmS4szB&8-TIL-WGR{B(Lz|0yMpoLgoc*07DwS*+-{F)29lJ-rJU?rL%uMuk_Aoh
zRIj!h{D5}orfD$i%R%rGB&2Bo535)vaCuOjnWS+40@WpQB?t=<*ap#b2w_rW9Q82J
zgF&yh8{RZJUW1^y!TA%}oort@HdS}tv}UXAS$BaSE}$JhZ|bKC^*`!@7uiR}nUBJU
ztn1PKfHFCq`YtnmS3sEPhj+dX`v8~gMcF<kh?wC6sr-1{V*Mo)XA|x}ZtaC>Ba5jo
zs>LY36*QNB_q$l&r=at%+apcUT!9-<3o7mAt1A|O0SF-OWNi#PBDk57&kdytM32={
z8>>VRR@{RPFcnzrVjdK;BC!@m-yk!fwZ)eLW<Tf{Fs%XUz!@!Kpj?O?K^PCg7X{s-
z+v9uGKW4VsQS3+(o^Wj~2oZf5TpIY3Zg)}F_=$ee=y%zePLiCFZBveHIme%8jBM<=
zwnZySwld~4du7?Kch}qOg$?DU1r|Z;G#F*Us?+ARSey<|;@{>a-1)%ifyZkdR=qP^
z))sB4mVk*1TDOq}<F#7xi{$&k#OmTPrJhz)V*lB)Emo8#$!@dRvv5+ip2_~mq;gxH
zR(6Tfn28;Jzp?bXUZ%a)?v=GJ;FywV^3-l9C~R3=Qy?>aNmI|X(sqkEY!JLIQ$S#5
z*-;#7s$UW_wS}vT4T2OXU)t8Q+h~J$2Y-TWGmywebLt`OKjj(VHxtyWhPCTDNWnGH
zK{^=J9y%6-1fmnvEP5K9iEf20ehKI|T8uDJhms6oY-IE5#4Qnl2z3mlZ_*UDl4UF$
zRghLCFQ5T5B??8+7)hj|OnjsYvzYU_y}~!)S}{D^<8^k<-L6N#$3mT>$XfJt<$rG4
zFt@t;_4S)pfHLe=P96S(@;j@cm$ActU{MyEe!~xywDP|4_qX<4oqCWhnLe>n(pqg=
z?bZKLRaq&>R-<|Rvd-=E^IZCJA1dZvJi%Wk$pL>0Td=4uZm4Yt=nG2P+8$X{FxFgL
zaPemY;mI~@AQYYy%)i5uFT)X9u~jxLU(;O@etyL{%km4KZt1>xveoy|VfA!f=k@!0
z+B$YVyKx(nQV(7+J$a+mjA<Y=w@%n*vBH6!vuT~MV)@16@O9K-LbnB9_m7b+bGp;p
z@&nG={CQ7xPD(hn#p9~A0XWCtd?8IYd{!O>SHuavPz(?gvDgV_#zDS=k?(*D0dVs)
zGNDX>nGP>k-y3>ZLr$R(M^eWhYQ*S8S6{np<)OU1L&}pkUdBY>yQ$QTPre|Q4y8YH
z`0~py6DMAF<C8yP;x{`wTAx_E_6hMh<$))a-%dXI)0f!T+m8P9XGbQp(x=#h&_KnA
z9Jjyt<2!FvjM)r9<u&jjNrtljwKa+M6}FboH6~0x{Cnm1Ew5+KrvMswQ~;tf1pXKx
zg1SI?2a`30=cjZjUQ*^Eo!9{}rP)kZ0&KNepZcTHNB%^lfv1FOsAu{FOW{Xn{4{+y
z*Wpa%;7reQ%V2-!_vcU<+MH)}O+T5^GS@lp?MC_q**x?vJ)<+_M>=AIsrPudmgmdd
z^Y7$b(|b~izn`Rh)D8(}y5`^343<M_MqVzSW$Q$FAm$tVeoh^SwR12X`Kb={PWH^}
zPU-mZ`ruh6?IPZuOy1n*TKEByQkn#QJ4UwYOYW2W8Qw!#3H}YWYzuvde=DWADEmG=
zr!+cee)deB>^*M-mBq_LUaBMgsDIFxN&X(CY1H3fS(GP}M$g3TJ<fD5;XL>p*Zlp=
zIa}B47~^{tG;Y~E^le^Gr13J;_XN5gEECr}|HyMn<DoowU(V*G^6(9N=DZE*ER#pd
zErZhVv(Y(Q7rd8``($puZ2!<4pr4S^B=Mtf@cV4~U^&Qx>r%SU{=}482VNG^=^g$o
zg)@HHKBBbj_jnra2cO})*>{j<u#PCJ5<iQS(#)bC>Q;&0;60U3KRlx`)@bR6YyJzW
z_u21ezb)Z8{ditYCJ*j;SsGrCB=TBtUzvGVKs^O|pW2o=ccUH}{8pkInSRL6_%oy<
zza_gqaV;XfgqKC{=lrPsNH^0n3D@+D(pcu2?(wW4n~v{`^vf+{v}>wo=2s7YV;V`+
zNT@?GeFya#M|I28FO2js()kZ%h50X~wlh<9KI%kmRL2#4M0LzO8>}<k<D0YTjIj{u
zhjRJ2^89!w^PXw&-Ap-D7pgC%<DH7knZ_YVI|J1l{mZ|P%j`cd<mmt1|3#WE&0)=(
ztetIUk3k=$MJy5bNmHd)r4w?C{4IGvJOBT-btPa{Tv_>@`}U<52!UovXgY)~5qg29
z!Gtu>bf9V0L3Vgl)w}ho`qir{YUwQmFq4E#CX+$Ld@+u3WSEE%<A{D^R78w1GBIk5
zF~(6x#1UhROpIfU`6A<gtLin~&NRHb=iGOfbI<+HIk&d^Qm>}f^k<nJnNyjo+4b3T
z*_+q_>SXTQ_%-e43O$A4!s~UNb^Ghi*7ww(Yna;5-|#}??#3q@uT5Gs>BY%ClfQY}
z@RY78r>A^)d*AJ6r*58ld0P84b=rk#A2-cy+S>H&^v3B=Pyb}bp&2J<yfZU3vt{Pa
zncmE^GvA*zV^;sH!C7Z#eR#**JC5FQ`OZamJ~Erl)@EOveY3f<*=#=7d~MFWIfHXv
zoAX&qQ;Xel@veDyJ$u(RybyBv?#8>-dCl`K&iicsq4`hEzqnx0f=3p-u;7D*Eem%q
zJin;0Xw9M*?y0}my!X4f96M$4%EhM^f4HQ3$rDSixAwH2Z#&v{t=(w9+A+Cfd&e6~
zXDnT{^y1Qwmvt@sN@uKdXXp9lEz2+9?EC79BP(8CId!GH@*DSGT2;TwSoO@Rs}F2{
z;N5Pc`?>D7S6^7uv}SnCwY9OeJ!@a;+1qnt-7~#T@7oXdJa}RKo$FuP(7WNxhRYki
zv*EM88GZeI$NQe|ySQ=6#{C;#>hJ5nvT4z#OPfB~tZn{aOYfE|Tbs5HY`wItXWNBs
zH@3HLAJ~57bL~6c*qPaRYUiiB`gaZQdUbc>?)|&Z?f(9r?mYv0PVc$2=e@nHdynqD
zxG%A<bKj|bH}>z`@9ls2K<9zs1J@3AAAI8A$Hh|dl|yr-l=P^)K-T0pm3HO0@}hFH
zWbpg=Y5tCyQ$6+X%7yYX<?GsR?WFd7UDhw?R|lF04h@_cxK^25>8f0)yl?ayCylqN
z-POVB8`Ya;uQ_a<Gp}3sS;wun>?!s^`<(sJ;nBlyIXj&5ZoT`Yx7d5pd&j@mKR4Ji
zcxI?&=&Qqb4xb%aFxvG{>qCPNy?Lbhh<fD0!}SlZdDuJJboBDkPmlE-^Nu}#?8>o^
zj`tmRj(_s`*B(_Leebc&k3IX?jmO&`cOHN5MAwNUC$2wn{tHLHaIN+)M(`Ua*mUeV
zEdCfiB=Tb2_=JCTu`@7DO5o%G*L8)N3YuU;?Gepz-FJON$73zH@*9>(U}ZWS(Mh~b
z^L#|7Q1_LHPNVgABRUgnqS1)X#-`Azh{nFw^g={miQ)HyBKljgR=SS8+BaZlu;$nn
ztoS(IcWaLI#w?^BsD7NgC_%1^V>8yti}9&_zZyHd^O%d$RixYTDPyNqBPL-7?OwFE
zIkp2Wtj3x4N^m=nw+_F1vK939fD3z>*h=&NYiB1~b<l?%$kdEC%EZ<2#j#dM(~e^s
za(=WtTOkRDETQBMXf<f786&e$+ly)7oAE@Dg^`b-7aj6z!MH^o1yrq96=j@pbp#)3
z$V0w_=bSloAjVxmDG4=2zK$#S{<v05)Dmq9jk*|vklR5{GjudwlRao*Fp%v*P$pU*
z3FPu1=SrMWF2P8`{-p`^76<a~LQQ$BL^x-yF_BwBPkoR`%yApECyuRXaT)H6uLR$Q
zoSIGrlJWP0(b(RQns}rW;IZv+4ClSEr(<7?JsJB_Ok6Zd;03}I?k;D<ZAU!!QXt%G
zqy{_%ek%55YQ*LRlW|uITY=+F>@;ek=`@38Vrx>dz3^;mra9Dtoj&J^b5EL23uqxN
zqI<A^(2wDib_uoOj&(aW?pi9I&crU>U9^H$V)L8(=zd&We1N)XHDb(K>Y;Vii+kJa
zX#@4qM(U?cw3)WhR@z3}u_e_Gy!^Nm4;}8NJ+znh(SABW2dPMhNFtdODiJ4@%6Onp
zrva*vK~*xzLi9QeTm4?FjvR8yBcBFoh=yr|M)6eE5qg-8(lI(tKS__!=jl;;j2@>G
z^aSDO59y2a6n%-FrZ3Y;`YAjY`O|coeukdG6NS&x&(d@BbMzJZd3v6Hfxb$=NN4D4
zbe6u3jkSIWzqIhn^dkKVou^-=m+05%8}#dRfqsL26VE1olYWa{rr)ODq2Hy8^m}xP
zejks+{sFy0e@L&=AJJ>{$8?3hMX%GJ&>Qrp^k?+v^d|iUe)#Y&>23NedWZg+-le~x
zZ`0r6LDave@6bQcRr*J|M*l?LrGKXD^e^-t{VTms|3)9sztau+9(_pvK_Ah7Vq5M1
zqL1mn=@a@N`jqhgB>gYlq#q!@;|?^=(Gx7mQY_7|g%-=<t=s~uWA&_oHR3+*WOf^y
z!ft0%*|b;-Yhu&c3^tR^Vt3$K)!D3>&0#I<E;g6l&E~QBYyn%y7O{KSy?E3E7p_<<
zYh&%KgDqvtSSMS~y4VV~lKnWlkKNB!u?JW;Tg}$6wXBD&W4-J_ww`TZeQYD^XPek&
zwuNnF+t_yYIktoS1l!4WvE6JB+spQ`{p<ic$cpR`lb9TPiz%$cI8#}fX$(90;HHPc
zs?1~-v)N(hFqe7EXM?fRY2VaaTUWP=w7s>pmbOKFdz5xW>Cz}&7Nwn0x;#p|qI5-+
zt`5`o-Y{Jjr0dX6vTR7Mo2>e-uB2QpIf|Cy<{&pLn<q8!Uc&VxCnpX?UbVfEgzs`E
zq3T98<7q`ha>|@}T3XP$>oKd6a(LAm<mpk%sup!K6Qq{!#Vu7$xq8`@jJRTzlb$2F
zT0*m`JcHJFQ8K)Qr&oExv7}O=WDS`H2$7wsF)7~`c}d-rt>L_FNFzl>cNBx8Pn%0#
z+Tp6hT`eO-2^uskrIJt$shq=LO15U1+|3PIhF|4H$divq(Lpw%eLHp7QLGYA%TNc>
zxF?kp__zt#vML#Is7g*HX*;^<r4*^k9Vww&ribs1QcCwELs#-1ANGnG*UOrh3+N%e
z<Y_s4S2l|VSG__=D%|wAlMfk36t4^E0pIm>btECilGn`=%7yhJIw)JON(vWRD-P-<
zZl!Hq@qCA;Y;G#Lk*i8}QOL@jlvEN8Lc@@gmvk@bYLdf~ipHTKF=2JC$L*plDU~6~
zDb=YGR9NFOH6kIDp0p)^0Kl;9v}!q`cp)fWV}h0<Cdmi5;uX-(pksw2ud6Y^5VE%6
zyF~$vTvazCG9Q8{$WB|8Agw#>bEpK3h{9RjRIRX@t2msSu4Z|4QMC{iSyT+EoGh6&
zQgR$?D9~g+Bm*fjA?@3_kO&YFs7T-l;<)-KFRH#_6e8NKN`}$MhZRGrN@HRr%DU<$
z3@)j#5r=2^2!Mv!$O=L+ESDFcFH<+mf$T}>)8rXNGPqfioRlM(C99fNtZEhWovKP@
zlY6<EzI=O3k3v4c-5cWEtHaQ3TQsS_U<)cx$epmWe8dP58Y005x#Q{RaZ<!<mZOgX
zzLJpz;)@D!;T60g-2*N|#S4%L*auu8M0^pQJ662HM-s4RHxr5M)_Iy=mEEFm3&k}=
zoDf&=*}#!#lA-1U?-Kfyw3tx1h&n?zD*$IW!)e=hH4Li`mc$*n4R{!{61WiEOrdjI
z8_Ab-^dN^g2)%>oCTYM2naRN3^8v)ej_Pa18?w2eKu|dy4LDO9YbtCx<--jrl{_E@
zqY(-&#U0m;Yo$^~1{$C|Ga+-s$SXpvDirJSoQ7#EhUgARVejdH^6hMp3WZDx!CAb8
z$jK9Of(9BUWcl{QN}?I~a7*T?AqO_EB|XWlxG8v4=qxKcI#(6R<vD@e&`y$N$MS8s
z6|<5AApKHG<`O(aT=6|jr9G0fB|E^6ZYNx6kmtng6lDOl0>oJkz{PxnSq40YqgS}6
zp~142_2Hu&G|M4_Z15z&t1EExzEa6z8X*tNw|<NY)ZSROtTLScm=DO0%Sd7l`A7~r
z=U!2a6m}v=7->idwdO-I&=u?kp51g4uH^t~I0V(w0R`i!MK%Eu#E1}U3CL{$FlFGs
zgped#nB#l|XHl|HgSKFVkN1FAkHfcSfOH3QFTo?i=jGtrH8@S*kTdWLnCCLD4^$k8
zAwpLnWJ9E;MJO#+OL^4wG|PqZdB*j1Ps~_GfJ*e3QV^&(M})E9l|`fs!igAy?CS=s
zrJO-!Tg08LR7LNSsqj>lmnyoKSA|IEWq?C;jyRwNdQYgWDxXxcd`wgka^fhIIe9`(
zh`$M0z~2O3%u4Q7{d`CU6*D0%JZjLsD4H&Dw}P;dG9+6h0Z_a`)sn@y0&6Tpcn|QF
zJM3FtC|W)w!+FMNO%sC&%O(;1jgegB3ZR(A@h(v4uwk4V6nu^k+rmUaVs<fswi_%!
zl5Q1(BvnKRGhXFdx{T;<OQj6lT!4#=SWAd%^#KvM7T~&+fsPTqBm)*y;@LnT6f+ve
z{9WXL;7r0`5g2_!ffvh)Dn*3Lif}eSWun-=d_{g-WXZceEE49c+kmw%hZKr+brfuW
zbX4e0=L$yv6%C42PW>%XEOb(?rgNiIUkfy$G?PS#D#E=2L%!~6(5M4v$3@^7R!VSC
zQPd7RKmd>lIUztMWC;f~zEa?zG_PtbODL|}kped1GIOC<6^abJsEg=$8}P2%uI?6Z
z1*A!1d9|RGD0Z}VV99``pAagANCtT^+S<xNv>CblATwidEN6w!2#El(5K#%ESvGL%
zqA9f8)}9MPzTia=hFOcq76RlJQUG01dU>4tPP{DJao;V)b<>Ft*duYp9En$)p}6cR
zVwuddV>a6u_#t@&BHEfH!y=0v?JFja<$7?ZvhQ(s>JMj$Vb#^L10OtT0w=yla~(^?
zVOe1W(bSiD7}_ExF^p->ibIe+Rz@f@T>@^fsD?|&0<h-1u*L#kcBE=b#hSL_#HEs%
zP}`Qb)yujk!?D8~htmL0XgGN<NP?^e!$L>57E^WOc;6oXt-w{|xNk!fAHp)%8gkPx
zQ^(RvNf?Gd3^8?C#1^+QVk4+ozT+PD5frc-0934$3b$<VggA%*?&)^i^~Kb7cBaM2
pjXucZvR`I{mE;iDWeX<`CjO(q@^*3P5QnAW+Qhb(pV}6S{U0j67!d#f

diff --git a/docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.woff b/docs/_themes/sphinx_rtd_theme/static/font/fontawesome_webfont.woff
deleted file mode 100755
index b9bd17e158d87fb1477f7ac3ddbb5a676f3c26d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43572
zcmY(Jb8se4wD-d&+L#;LwzDxd*x0shZEV}NZQIrp+xA9pe($~i+^+gg_xbcWbE>9m
zrn;t&tDKk^2q?&RD`y2k`0hYi5B|sgkNw{!CZ;6w?I7|^asQLCo&KD-h^W{%)BCmw
zzC{Sy2m&Fe$iV!~{(js1-_nZ!^FT4Q*0=j+z271P0Rgi(Wvjh2)pz`6U^^fnAkhCS
zBvUJQlW%qc0+L(<0*X55#~ku(W~^@n0+N>c?Zfmfb}+30VzY1f%_hI?|MHT;`$O%T
zSv$FXvy1N>{U9I!jI|2{WGh?4Z@-M%?|VLifPf>}BQ>2_>$`pD%`W}lSVGWEFkBmb
zYvXS=`W^dU{#ITv<8(V)M<)=FTt*NOm{$-Gq;BRZ$R1Z?gYWrr+V5Dve~MI)Z~gB7
z{}Y_#%b)okgG?y-f5(7;Ol|Sbxd9FJjP&$&zztvkNO}g}V<Ri@cv?Mta1dB5kam#&
z=1sguIsN>S{DO)?hEo0f^5BJ7&{;(MUO5E?jpdmFzytbK0qntFzxZ*$3z%aKL=^IS
zd!a$V6kt$5zT>Cjx}?D6k%EqGd=?2kN45tkCrk)_dHW;P)@dlLs$sQA;N3wGB^lqq
zkQT8Eio`mpB=5nIsw2@JN+U0pw%KSQqgf61gF6O;ht#AJ<wFcLh*3KzEK!y{XDY4F
zJ(Y=2)sGdiXZ;D8J{_NG#kun7yT@gKhGEA=+b!_N#x~o9#>?Er_TDh0ZRV_}7riYa
zW;2(tlo%G-fVqAN5Z85s5CbJkM9z&SN0=L?qPGt~LPEh%WiKK%hAE_<f|=P!FJEKn
zFd4B5O6%L)$rreY^3dj(smMIWHFZx*af`!r%RWx!>cgNRw|-FTIm7&@6#pkFa2B!_
z@Pgn=l~gQOT2I{2jk$;U4kc66uuzutbNpjf;xqgWu*d9V^Sv^lUtb`IZotki7%!#6
zB}Sha$Cfmnw+;39F(c+TBR^83W)St@+60I-2#CSZd}#Vy!tiy<&^>zUqGpT5@}dgu
zixrF8ETDy|x3#6}$8&^r(}zw~Q?r03k>l(1{YKgtDQUj<*ELj{XO1`D%zdU~w&V06
zbW7I0TSp+G>`|-LDDoa2(FinJ<Aw`!r}hv0b$a^|&VPul<-RPXUz4br52dNcXLI}U
zeaL4wt%VYlxN^qvL{NhZW%v@o++c)!K!whq4&81W9O)%;qv*CaVeB45oh?k%^r3oA
zaS<hZFC&fz;mM&b(|V<b&IWk6%X9wtArn&lRisP8@pw8RoLd>=Mnnl0Hxe72bjLM3
zz7xD&GCg`S_MIH~JB}uvh9y|M{2O(RLzgz{9`xNPg-;AaYfGT-&p7e0c0v^5YB+bR
zfHXM$l}oMIPmm65SrGnwdjnUKe8Ikbr+r4Zz|JQ>myjpWQ9CLI#6o8I%h45`4n-cH
zhxp&o{?MREF**)xm0`%zAoba56D5GX+J9$tXeqc$(c7=Ul|~XKZk~;>&dD&`<NfwF
z!RQDsQuWxXLP&8Clv_34T|0NXN|tE)`SE>R37eFaeR${wNpZxSDI-t9^H~at%iM(k
z@Fc|HMql34N$o|1Ss!`&*W9NVwLeXvkP)!?M(nr~>WiM;_w}qanbyvrtr`ux>hlxZ
zW0`5&tFE*wE%t^vYA5Sh2W@6MMc#CmEGCUD7oJo|bPgEG=-6QkCybQ&7Oxl612JJN
zUQ8t{M;S!?F0F@GdHay*nz_a&j?!<*$M3ilJF(5M=2rURf89LYGXHQFzkg7f-qMpX
z&n^{5J!tuk)tfo3k*z#On%SaVPxFj%3qMpkUZ=hRdo(bP^XE49l6||LzPjY!D|MbQ
z?XSdIYY_^lF~pDQ$oEh|St}G6r-m1$LsZf2rM-aO6@8Zqn;JFC5vXV66-}O&Ji8w&
zOZ1P<ZaoP-^ZN_<i<9+3+O|G#){b48_5A{Ridj4+T0gdJE#^(=+2_fGsGV`B9<Yf_
z`pXUt4chP&IfPe1@qq0G;!V!8by!cmNjKih)x~8QqFS?y;42m!4`w~{%f4T4oeDN4
zBO#6P&B#PJBi(+#36+uvNta0GZ?AJ{Xb2r#sIXd0{S7{Mk_tkqc_}*r(jYTBqP%Hr
zH+=WU`3;|sAk%U+mtkuxXSzPQA1=D~mNjc6Y`2`R)E#j&=jmQnIG-yWU9FG43P*aT
z?aAAVjWlZDEp7Ha+7?<HT7S2mxAL@wv@$qmrpgX!64EXOOt9b}Rm$x`iBnJKb~pae
zGk717_AUQMPES5M;%#M`u}5TQuNzl@kDpVpp%$r@q&T5k!mXUv`a?huPO?8Ju|lNp
zBY`V|zaMt_L=g*4fdA;ABEjrAC%?BOrmkJIITRB1M&Z$Ge$!(EdZ|AUnMag&2ELG$
zo{ce<_=4-`=w5LMDcYt0oGMrDE`fUHM6Nh|ch$i7ZDy=?)KAk^nd79&LHcIktJc@R
zJMi3U5jH9-D=M~NhKXZL^)39hY@gp_+=2rlErEY$1>Mwsa!d}}V;n*`hzMGS8}qAY
zreB;u8QD-w9V<qEq^)efeDmu_EeZ#gx1;)?a$cril?(CT&17tm9nLS_B{(-JtlK$|
zd700>#*B}NcMi*tcb~JroNW>RUZ0ceD8Hs^lm319Tyh-PJQ%cL=D3MF!9uk`kBDls
z$M(aJ%+~LhRoZ*K;-^?a%#BGc`&4|WFu?4cP%i;)6;6AGW)Y(vRi)-`e|q<X?yPaj
z<?Ld72$qoL&rDfuB;U^MmO=4`<_5akE9&cjm1u}5!R6DDg!)HvjqDnJoR-}%F*_*8
zo_RIEN_tvYexXTdIOkYprdSHVSO{pmML=rMjCpseG(7nnBqvXMhtao?)5|cC5W@&s
z$#5S|n(*qxkZRUF{s8X{V3>mq74YDbZ8tsVVI69C?kxO}fAf19NqOS+sy*}%&aHA^
zXg+Mg^?p5}n`p7NXokdTW+(7!O(j@m{_9KnWuERZ^Lyv(fg|@iKewsq)qf{mSEmg!
z!LXW6_0vJ}#{USz@`m_Qy}odi-K?M8?43fzZm`bVFG9Ij6e>Pd_<7+;<|st*m8+yl
z&$%AzKp@+*^ukW3oQdM#=2a)I4aRw(sNli)&>X4LHPT(=>}Lj|n4wnWrxGu18!sN3
zzn%9uCkcIK9CWq3<nUMHQmYm!Gi0Hge|~i6w&5R|*}h)LOu7(qdvsHzFH^oj$jd2W
zi>O3U(TXZU!#^OqSF<!B2wg%5Yg5|_+Hs=cbyxH;YaSDg>>Z-jUs+4=pFd?<XxJ-G
zfq_=FbPmhvUnxU29DLSQ)|nMp-mads$+uzGj6m9>^8(tsnc%RnkYzh)`hQt#!tZHn
zBN`2IVVnA$vz8rg1J|`)3s+kvtlH`Fv?d9j-qs_L+<VQnja5}FDH&7YWF95;Ror#;
zJm$4$Ve21*Q`6BX^c4f6RyOpm-O(XRGxct;J>d^EG`~)l@&A6mBogtW0CV&}G6kIl
zb+PR|ta_F~b7RMF#MJ&Qf+<aF-kg2w<vk=cpt0y%HSv84XO%F{n;3Eqwn1)!j-IBJ
zTxwA>WNb6{s~$R*dWjt-`1^`D6w(nMll~Yz3DNKyqnnf7VN!?6-L_Ga0P^o513Ave
z$Lj%59=QXqq$=NKwhK3yFDab91kqm+wFyLm`cVoi&{9PotCu%>#r`j4$pU_yn0w`g
zDG&W$S4?Vd5qX?{a2Ye`g7LxSM|}Y+fUmyf;R;wHK{^R!&G3_cXlRh0r9Go*6q2~H
z%spSMzgQ`h&Vc&i<F_$a^X*2u?OZPqv9E9^Z!9~P+YPB?Ah!P>UOyUrV)j$f+G)5<
z_QlmQds0MIN|VdCBM*;R0@D!MF%E>+yoK#iL!=*;uO2LutTe#nIo>FYTUy%(OMx52
zQ|E@J)BY|`AeKqRH4j<s?nM<+qdy-=-w#uY){MR7Xda%JjKFS^$desLubb4Tb3-UZ
z{D5IYyVKu5VW8M$UW$%?!!9ys2EiP)ov?mhseXAt5$-|dSs_E$;87j;ZBbDxA2$+^
zOX9xj*BDxw>u>I?{cu9(gkC+V%hArjMOiEkKyEBfaR%IPG1q8l9QK&nVt`h12_1bY
zXvr&q359!4Q)&ZeUr-;g1M3Q`q$t($v2P%_6i&q;6kZsAgp^$xj7D1?ocDsn2Xu9;
z5FMgnGy0*}0(2a^HnaD5Pda8t;iFu1n}hCz_tQl#EjpGG#cba|i^G7jsH^r}Wn`*x
zWnu2ODuJ6(_{cBb-|BMQKU(qf5af@k1v9(wudR58V_9ELWg7VT&Q08Y_U-=^4@h=2
z$<(Os+cg7_PW?sE)w<uO;=}w1*umOzb)@)27FX;_R#c{3<RHuKJt@{guUxc~4+d|g
zzAXP6z8*JtnGZqBrxydKd_(+$3g{}$MqZ`Ig2fBjY<F`_fu73cc0*c9By7^~gjay<
z;IcHdGh7bOBPotvh{p%xL~dTuJ#w0nH=UfDN+`X#9HmUBl#7`G&$T|o-&pqC-l*R^
z2G3Px!t#I}rO}5#;3c65695wqrgkzO@`r}>1t}&(brdH&N>Es3$<?stY*+3V=FN>%
z-8s6K;EH-IiLm`P(?+Sqw){Ll|M72{>&1B7nwy(y6ABXrHxW3->4R&}c1c5PPA$!M
zXV)dHwN~zNqC7WF9w+mlpST%R$z6=Nw9%`$E}o277KD9>+7AbHWU^IytffrxF=evK
zH1971Dtt=7#L5fNFgJ!l5`7xMOu99}nKuNF+KKo-g3JkcVA&s`KzlTW47})I&8rXn
zpRd4=af3A*HatfEUE)h|T`b|HD^TZkc<5c?l0&cCVUe9=a56O833XVeErU|!r%f3}
zA&M7WpySxlxjnM-K8w5!ktSpyTu?!1ZKU;_g!>NDy1bz5I2_MVyF#C1d*4`)+WKwf
zC+a~X9gqjAsmG>6M`rG{KdA&??d7rI`ODp}>}TIx{_^~%KBY?y+KYDtH`Eo>BVlXv
z=HE3v5mKN)V~w`g)?>Mj2yYSoiKf#)QM6+hb<O+*mcs-nUoUaMPe7feMW%ngzLXCr
z6e{EV1Jyg~>3`QVi0UK{6ig`!h++?DEP-)eUJ@2^SHpb6Nnx(OeYY+~C913Igw}B1
zubUInnT>)*e*M~Xn91eV-1}9W6KuJK%`I*3azzcK8C@wD4?8Z!#H5*|uq#3=JsvFo
zs4QO9RgaTd73;!Mf_p6O7jmpdU+;!l$z5jEd=gx(<UV8Lfq_f<0>c2b3LCPx+Ubm<
z^US@;P-cps!f2K=bqI(5TAm_;fbF`Q+ul>bnwXf4u6QoGoqc@gm$ufP|A21dN9`=C
z8eaBsnrH$xMR=H75e!n#&)3x9P0q_%3knMe*!%o<CbO1RJqF8GO<YU34BHKi-1Rxl
zvtmfMt}!F>=eHqn#973xOGqshe)z}ei<LhNB}kAil*4)x@3gCJ-4QDB2E;IR@UvCF
z3ZG~$D}XiGl{uK*Ub|`=K=5qaw)Ur(U$6i|w)&inyO%B&A(|G*k=U7?e)@a$j4Q~~
zg`DN+&5l!A$CdsaECuY1W@gs?tq}oGHioOU`}`-<E?vQFR57Guqc;rv2=vvVfZ>6C
z^(qV9h3GnOHGe^^^8Oq9_I`aNVajx_(i%Zn20@~k@pOK7^GyD@#I&gr4R@EKovcQL
z(VXsIb+3DDyLRv&L*DGheWd7?(*vF#29?v=*VWcpD;g2k?Wt-bzc8OWY<Dy1j4stD
zt=~AU`$?M6#;?p{w@e1t2RRFGkdU%m;&UO~$%e$QkTXBq)@hI0-SQWjj1I@is;5OZ
zOzSoPISW2Ef{Zew@D7#_<(f8a)WC3AjMw`ZepvNOvMNr^$TyT~56z=FTmJOAr4AJ6
zkA|MSqQ>)OL+M2twLpz+k6K}<)s;7kx$`K4_{YpN<X5z#Q@%nNSCypuy|DGa6h1iF
zj!sqWB<AS8MDL&l%9M980#3iEaLrqs29fOpH^x{`BynR$e7*1`8Khih31;SwVX9Lx
z@7%Gg4%a$DzeL~X2(t^;#6YV96!@`!-(ka*c$xelr6qzd7Kq-2Po4=*c#GT7kn&EG
zdEFliB`N#l@acMCz}i@yy#e`re9&5-ot^l^Ke-(0v0U38-r6d_;g~n->N5CTecW^Y
zT8^2H@G0J==pK4H`A3Z}3PU0UYY_Qz_Y0I`<g=>(kZCGQqR4Q_iI*?df7gj$)(00=
znzdecqR23v27^Q(>~MiG6I)^=B2DBcN0;1|N;!>pIZ%WTZS2<us<{^FE3yWtI|i;b
zd@q9`D}4_BEA-{>x?jHFCjH~1F?;4+YrG|d(~e}#?&z-cEvQ5o<|s5p9d=x%imfjD
zYxw=i_L=+?+>BCp<CVXQyy_2(M|kshVPYtmTp5h^3=6fAbh&%x3O+=;tfo(n`glIr
z@L_JGNljV~vP^bF``_GM8$jv_MIf7GK){JqVvOw6lvF8qLt2BpYK_vwJt^96Cg<dq
z(xj!P(BDhWSOBTy2`{%j&?YoL>la~doX|q%>JAH$h<F|6P7d4H)|00%Q8cQ8xyKI5
z75CQnqzd}blJnOGhE?WJki9$hf<xza?tV_z{mEYjN3q@LHhQ?*ytjU8hlJ<<RF)gW
zD9xqQ$lF`Ib`&5=z6#G9zyWbR?JbUk^*Yn@J8rVeSizGb6|%7Q6wxfDi)=piX;GcT
zq08De{QBXl@k8*XvYB1vBOm!=_)aG~<)LddlGPV;gzYo~X8$d4JU7)jQEiz!7=wyn
zhOD;mg`?mB#5G6$9e$w$gQx~IzuZ`4L|csZEP4SchG-y4_;cWMc*C6MZ-J+*>AszO
z37;b{Rur#zb&@fDcA(^vP;fkx^Mb&Fx9^g23~<8g7;4#%|A*<vV8QRvUMw(WebuCw
zSr?yM9`Wc-$3TKS%7r>!?`YDcDf9j!j*79pSHpKBpA%>qDGUN2_xSwnOQ-vAe-Mie
ze|AVX?f{l;T69jFW^}_KiKNh49MTxGmOw?n)i2^Ho~xd9G7@xDn04qb-%%3<YtmrU
zi9#%Huw07JF_hP#V+;XavnoWFqKGD&y)@_G^}{c?#fK6ZhU{zE$p<ovbY2WOP0bRB
ziRK(GCyir76BtjPDU&kmfMvz)Yv&h$yK6sup`2%dH`kY96%=%A1Hu(gbryNX1-oas
z6;VxV(~jrby-jA5^HumyfO6~x45=zSz<_u`*eAjOfs_7&B<+47v!d^U9R}qZkrOSY
zPb05lO}*HG$%bWQh&OV)Z;Dvfld{8jX=s5F+u!FRA71MZc9wK{2?g)lHei8hT`*2=
z@M4t{lCpO!k|YwG`1EU?FdBS;Id=W6O|8>>dE8izwhTPG@xlAGqNL`ZmjzWEXt*!w
zLRUZ)LZ5^PC>kSIf}b)NwB4iA9F<Ul<rwf@bDpI{&T{(kU-jpBJN)BSbT?Uqty<mv
zt8&keHGdimy4HjF?x?<8hZW4GXR8Cz*Wi%m=V#60peNqiGGnKEF%nyqbBlj>Hyk@x
z+WW{qOtMo|q%c5A8(z-Vf%I7odZrncCJT_7wpg596djb<Rdq06bvIg)0Fm5t515g*
zNBa{<wsn$1&sSEwh{{kBF;KPmim!Wi;yS;)?AmEW(}7(i3`ExDjC1ZOK*<v6$~s?g
z@%=|Q>}HtVc2^$cF9`K<69=Y-HA?AwrxDG`z!~EL&{(5AG|Nme<*uioVw@B$Pwvuk
zn&b}j$u{$eg(w@h+~?xxR&nA3FPgqNr6rFTi{^D~6WIt~-;AdLsO@z64y$;|<rNOf
zUv7Ouy|gJSLrfR@kQ-6BB_8$)o_#oX9?V^Z1Lq-t*waK}mk|)c$gH>`fL-YW?kuJs
z|2cBA!VR7r#XMQ5<jrklG?xN!P3pv1kat&NpImQ&;rV1aFhi-vr%v3RZ-S-zt5vY;
zLKO*4^P_&lsvv=k^vv=co*leS?J$U=B~TbPj~DGeQVivy5mJlT)>)gk_2jn6wZ#*<
z)pYZW`3^vAASTE>$Y9g9Xk-6RS|N*fina^ap}pF9sy~ON(Mr8Zyt7(%PyuEY9ssfp
ze(Gonsf@Gj;4!5ayb2*S*nk?+RAZUbS;8hyL*vqyD~)OYgchKD1I=$ZiqFwO64cX&
z>EU8^15GU9Om6t*PPC+Y{I_^%L~`;u6!FUdOw}bS`KkCLlA$hWT{R8-HqkNmQ^Ija
zVih$(2GrPD;^CyXX}wstmKY|4)n-^T9n1~Gqc}C-zGtz~zMM<#Hte+NkSkV1X!VEF
z`;bN&=<TDzN=3*%NtCxmd|peap|CFqc8TAdLB8;{YI*SI>NZ7|-Px|w=N0D`OvljM
z^~T|Z*2Xhvf>fLo3hPK3TEu8->-V<#D4|sW_czr}10(sO!xmNMR}8Q!LhSBUp(9O>
z_BSLG!7G7T%f8{ik(LgR#)^@D+xVwn6xRGrZ-&jU!fyVkwq<xFH*x?D0u0~sZtxNf
zELgrF;r<uHNfP3C@5l^l6Y6J)BGy(b=HruX8d?4M*|CN?p09*qrDNBHx5PyHOSmtY
z(Og``3V9qRY$CHp4JG6cf?9m3N~)1H#Zeijn4(?r(ow+FRY{EEb7gx%!c(2oNbY@9
zDe1ItON?-1KqR>N5P7&bzYXTtZyybR`ec9lsTZd9(tDP)3kUEF0T-9#Hzo4Db5Jaf
z-$y7Ij#-KwC!<#eHqUV+9g_Ob$gLylrp=_3EahuN<#sdshp8kT1OWl%C#AF2_0z)5
z4xrUZ(WFHI%y<&rMW9gi;m*<MBVDMg$D}>pZf{Te`fqi-2f;7~a0InJ5>BL7Wy#HG
z7p%Ka27(jlY6{SMJ9VI_jK6O<4b$L);;l&M!EM9VIbq7iGzwu_|F9EvB-lt00YD}8
z2~8qM`I~1zL#aWGIY`0*>&rb&{Brcqln%Gg%>0tSrh9M91aVNd!}+S=`S7O-_icw5
zmzsG6F7nFI5M>@otj!uh28>AYJaK~wB1XPw<og96wTB0JvI`6#$9ck706aBt0lj&#
zE;U`Q@-;FY6c7vFYaYcgW@m><hsB2xJ|f)NxRbA{m;N-)`HG$-RT8q6wb~kCcctS|
zGPKRJ`(!CGddi`FU`w$rfA$QPskXBbIg=sPco&*9rji{WoE<G4xizMEL>bd42sJO>
zxgyMox#;;`kAz_)Ae3C;YbmhXsM^>Bq?stfGu67_a4C!jd<~gi#3l>#WBVunS+;EP
zY{<ia7G3!Gkn76V@6l;{1MC;Hd>&2y;>6{==V;-#=#<s1neVC1LFr$Wt`5-*teQ7X
zh}hTisLzdtvJPhimLiEh4#CsQghSj}jT>j$kz0=F*4^Js6ZJ#l0ZF2B!P)5r>OB($
zxpK~@R^7IE2hJWm#C~GkK^qKbR@p=Q4-r|5tkw$RtnKI?30#B_(H1*~qER2Bech{f
zC2opa7<Yh2#F1+67#VIiVbBiA>MV+dtD)W6{@noxB-d9me_rr+2WfK17rTmyhXIOE
zpp^LvN^4gN&YlZ5kzmH-&-5#@rJkNgAIL)_iS$#3yxJl*U?R?NE|dx{54X5J_&d%%
zBa%%keARe7)~-%FR|r?phgcf8h&xCcQgj?96g5NaCvM7G6B0sIXrC3E7Q?!0|6Cn1
zC=V$Za$xPU(Z#%pI_h78UP{)$AYa_P3cqoiR$^;3J4{ywhFCMEk}6-lIdiU9OAF00
ztu-<;?-Yg=@uZb+zr~~!<DT0Xi=o3YMCB+B5ldDJM158k*NAD#D>^cD3zBo}p6_AT
z%X`|qD^V9RCt=GL_2cZIPilhe8vL|qL}a9)D=Zvv1WTcuKHiw;8c@?nlu^b|(xau7
zDod18Z|7p!QdP(OJ0>K52FcgDA!la+Yp)~{l$yYg#3WRh#HGBm8UztlEc>t5EO)Lq
z?oB|)!`aJP*$ccpAW{FFo*IEwuz2Ef)aW&*f<H$i(-^J1@Gff4xO~l(_L!yO0J1<q
zOLe#nd0)qrS?RR6QJU5_+(Ip1TBUr^#Ubkea>-R;s-f5njGX-~yg^O#De=XkDWQ=}
zxy-#tr$Mk#PPwQlELhTVU=EKa`|;7@mfN0SX_}F^PpV^R`6Stp!Bd#1X7!596cZdH
zMUM7G3&TmY&AvXOc^*dK>JK_aIi5WkJb1A+V|vX~SQ}G$Njg|~ihhgMjAWC<K4r1}
zVdP=bL*2bf`w`vaACs=6gHxxIQ8=d)JH3;e-PyUg0fdax)bvrfNk5Vh#D<v8Tr8Ty
zl-+~EyRPV4)rQ9MF$>mEWecL<GE4E1eM4{&eAURMsGlw5!!5=JB-Bl+D?Hu9Fz9u!
z!`P%qWPu6X(Ta~Uep3LYDd?&ZZh#@$(;#Mfaga0vVqMKkF})-Db5?H&fA%TrHj?yS
z46@<g;5@$)in!@UBBOglD+>lm%TV*sKSQP|DBI!LIyy0%C4$L<*T(i26{j=fEAHFG
z*%)Jw2?up+>GN@koGuTJz)!5?4mNhAh`x+;1`M1~9jqY@38Ey*tA2&kN5oDT+gVp%
z-e~>(6_Bo)gHm>R(t}y$;Em|mYL3JoTuz61jo@<O_VYrJKxg((idD|PSNi^DZDD&t
zZ3>fP?zx9XYh~20MG76`Ra|ZG%I)F_%NqIKn&ff9v?~k!R~CxazkY66E5(lhB5UMs
zHvq9~3keq|kPM#DwgYTuigIOV+)dNsc-`Di*|=by6pirs@3jX-NN(oib+^oI%s>s1
z5#%l->&JN&1+KC3r!ap<KCs5-!{-;RYo~q{4M=mlXxYU5A8%P|4K97xbrvNAFzLe7
zGA%|zIOT^ECiZYhj@hLp$rg}Vkdm4OaQU-1AT)`JJ6xHU$oZ%uvNX(R8)Pvxubx{+
zn-m$B!%mc$7T2~`*Ij=_n*;rK)#00Bb7ueThBNZK&I5&MeB}3eRhefh$|QsKs_?(6
z+vKsUTq<OrBb&)KQT_BQ<q`oI%2x@7KOV41+Q9<f1L<QD7!NX+^Xfq^W9jjtuF4VO
z6R-s${cxj1Lsaw_D11lks0LrN!Y=Uw0@#Z!mFD=&gG7R!4IsHBk%`U_|F+~O&x3RO
z0`_UlnRJUH@kdqW4ftt=U-m?uh_unXUWA%6>Ag5PnLy|x-mW6M9vScX-&HPTu?2|!
z+9@7ZL-aP5HKc$IPxy(YF7lSpV2`zn{b8UFP4qGSldoXa>Y$xgc7TsbpyV~~2mZoY
zI@`kB_q7)yDb$ZhF{5<5;?v6cFjfy7rl#!#l?oY66v}uuJ3qPmtSZkAx%T`ubnJeX
zjflSW&UGYDG_6oi%X(cGvpS8#MRIJ^K2`?7_{tnNW>5S_f50g#Gd?&LOG~j4AFKNy
z1WGk#IlgE60V{sNz-}f2NYF@N=9?>|(n{te^buinJ@6LM%(9I8e%mtUd5##p^#=W5
z!C=;7ijoDI3i-GwIy0~l#@d`mAYNWrQJ7N|*^|8d)9PXpGFWd)65SCgV&tuC6`T)l
ztSXf{Iwbdr8b8KSf<NbK#V6wU5QHbS%x;kG_9gyBMS8YopUk}OPr2N&JyRA-=}q}V
zm_cHmS}3|JnZg)EGGd(pJ)5a)I9j7>-KQHh-Uw>;0W*^esUalNxt!r8(g<*^40p~x
zv~!W+sC1b>kw>M^hkC@fOsI_DcfN*7kFjW7w4VIIvIM&@GHm>3Z1Ze$@@;ZS?X;Kr
zb|-IYk&Uul?fj}iQDcg^*PaB^1~Gr^cnN?|cBF>jHrh#A+=;R##DKeJs16@1*Acno
zWEAU4J@-Z@|FrbIS$R-+QhDChmJG(<+c`Ksnt8KWUdqB~p@hH9P*F|<4UfG;oqhe~
zd_E?YAeyjAloP*<B`RLGHw}lm<QjV`GmAnrl09YMWFVpb^Y;2W#FLWTzpT~%*gRtk
zrN;EfZw3Yda?BNgagcC(*U4l{4-IhTTETf&yYiDBt5?*Q>bl70@_ez1lF?38(g5>w
z&+wE+sF#(GTzAsQ*Bl^yZTM5+HhwbqaPV?(duZa}NoFa!3^;XgL2f>Zc1hkQi6eBC
z*0_fLhMixHs;&`(u2)qV3kxDY9)5O)z~n7oek`=4mI@V&!}Gdhlt=4bM(^)@%T34T
zrz<_dH$7+(Bve*duTU-<puin&0T0<545e!zJtLdwq?~u^26)<AJ4UCuj502LN+XTf
zi_tju;@W<#0>1s2Z+h085%<-mp*&eE_%(;=rw~5B6~e*vVi5UR_(ZI@DeHqWz%cys
zcFi#IE8aYyM=h+3ACa<(IZHB%dxGavB+FMvhRh6Pue2Or2>3wP(Rr9q!%YVnF%g7F
zVNV_Y$X1chskLmYu53??@9<tTqoJH~s2=e<=zdhxWK1u1a>x@cqsnU}=yKd1V>&?T
z9wnTNYo4fOK)e4f{sLp|FsvBsF7smcak1Qa)=4TtT~oirQGugpes?#dNoY~`M!aeI
zTIbxdFO8(<%F60i`(BHLH_R=u8obC*ahuoidW)sS`S^Zwy%et7+}WoKRfh_#(LAfk
z+4=n_1cy7tc~5s>U;quCW+1V8xApn7D<FoCJ(Qtj`uoRJZN{d-Y%rX3pm@s0r~)3u
z1}d5CF(lZMYUrPPG9?rhRo0^TI*2*-_W}T=h=@aXZr4)?Uu&nuhBJ;f)UVIrm_h9-
zpk~dd!@-uO6;#(#b8_~-Ukww2KX|tr3P<E3E%|RRMAvG3FDstO5(8;6OC=uwmtMT+
z0>`5=SJ+yPY&c65Eq|Ssi;*weBIvD9Qw{(Q__|$sNwf||j4Z#=kEq5Tj0HT+To=vv
zqry_-?cAbpo-P-y`$7{5EDC^_dxIGmnCnicI>RSu_E68{U|?N}*c}W!eN&v)W+#n5
z9U;|R*ZrK;H&;f^yLZDIJ9FtbU5~~^BbF&b?m%QJTy(yIWDaAaI1+`VS|RXU{l*(Z
zQuVXlz+Anv80g3FAzauoxd$>O;T@eY{BdpE*M4+&DSY1GY_{jBKI4Sg26pVCw|2ZF
zZaYt{yhnZVRcOBlRj)US-15=cXG}Qbya%i8a<s&4tamhPz0#HEzgN+;TzI?<^?YSb
zT0Qt)VyA3hYjlaft#yuO05x~qNthY#0B((69s#Gf2op+xjnO5C%?+(9r@(hBn%ZJ+
zie?tEb@jb^16b-uX-(WSJ&nr5l^SBYKqVeSVK_Gh@rGLw3}oy1dZ#J!iwV?&UNwdt
z^44GLwa&qN-=Au^j(b~6?P|GxI6W>yZ!!DuZZpEcbwk805H<j1D+(Nfd52HS0eb7s
z_(b*z-}wZKubZc>KF(!Haa_bm`>Sf2SBDwDN3b_2#=5}q3KTW~dkd^%->O61xm;up
zXzN`7zLnE$E6CaM4mWe<*nNLlqutE+ywvc}*0BHiKp#+o6jZuO^-PM->mXW=c2X4b
z$JsQZBYx;1eM|wEM9YgA#$^%`W52r=trmEUs}0wVKO805G!JzVK#*aaAlYo8K4h?)
z!<&44S%nyKUe;<S%&NhiK##^y=n>rNz5a{Nu?tm95BCNm*8-pf8fGmlHoK{VoYKk3
zO2=_?Q+qNxVdB>!3H+K1H=koRYDCGnJt+<Q>u(dr3)M-k=58>qd3lg901jzSsf^{;
z+A7h6Ala*_r$oblT#N8C%>1F$swH)XT?pIl2K&NAaf_Irl{dD4Vh!e_de3O>yngY~
ze8U*`m`*Z!guF8ksH?w~__SZ{v<72e2ctnv=D?t2+|ip5lFJSz9J>Guyb<B}sei@m
zeTNG_w+XySJwqri3k0X3<HUe@^;={rX3E)KO*vnO{s$-g;1R%;OqUX{Lz#>S`4N>z
z3N1)({5uLS(kG5A?<cHsU%*J3A3Ac5@I$)3gfBwk36|E(9<&0Jx((D4QKDuLwSCZ?
zwhITL`~o!@^V;9oAE)JTJC!2AH<Z0(R#nMPy#a&?mvPi(V;|Z9*}s_A1grzg7VuHY
z3RH5Rfqhk3=L+C>-eu~}4ZkHzmz~wSV#&GsniwuEs$rU!Ii@ak9FNfNADGD@k{w~-
zakA61wHK9U)P5AG2+%>UV1h7ccI_@-4W{Xu-YQ+ozajK=WD?FUtpgq9x7%rwt7L=K
zj_ip%?&>_THV~*R!l7ZRDJ2K_XtO0oSnNFj;p!IAc~GT$*^^xrS#L3r9}H$ACX@Dy
zFrCn_OsH*}n@XsRd^d}D*ZsX5pP)HMnoToiJ+Ga+6OL7YJ$rvWOsmc$tog0!Wzi_p
zzfLE?Jzo0v$0G~xlEqvXE=-lBUh%u1s5?9!FXLk_Qq`aLzyTof<?gYwOk8s{deu}F
zO*_zufz7S(G<jQUICj{pF!n3&=|WLXa2wGX!_b283K;^CERZtirL(SZX>Hugz$Rsp
z;h_QN5+%ws^A}K=k|*bg2GyC{8MdQYft<cGZ;6OboQgIp+3>KqP7Afek}E8lMJ2(u
z@r3E_QpQcOWaA}Mb}3GCA~9pSKvwBW`H(kzjj8;wXnoV-up<{|*nI2E1xiR7JJ(Av
zW!d)Rfu4DQxRXHA*CT|&K`CZNFCNmrF$mtlA_bO9b3>JotHWN6+&x3ZZpy(N5?h6K
zma+U^b=uET=MQPffxkYMSmFezdyM!5k3}g`dYPWTFdG8h^&=RZe`lK>Yn1U^aQTa*
zyZp*-wv6@Ui2|0;sZ0}wG1IRN`ZfcmSRs$(n3G~~9x(ruFhj;m_|K7x$9=ua+ZI6#
z%a?)4Xu|lcY^>LDIj7~8u4NMxBc$%Vh?2Cc;Lj0E)@t(M>$r1EG*2G%l4tdVdkFpr
z*@%Wd)P#NIe=gMt*GXqTuSt4r2W~flz2DeD_{VO7z2EKPUSGky0nbrWr`Y7ro0Y;*
zKC&rGmt~D8ON$^}Y~5b&G67FU6D9wmG5b#eYQgkGn6j4QVsJRRXUpBRLS=h|pBQW+
zjag$s-M@q(Yz8<cvH30IniWxSg_I2`Z9_;P!^Sr3euR?i+(v7k#Dmed!>qI@uhjJ0
zDms0rY)->!9WtwIPY_Z#dI{E4c$M(p0^HxdZwn!#Hvw|3A9R~f$yQ#YOCARB+;jvE
zkzd}e*|dF|DF-7yO0ZVai>8^{Y~^Q=?)~!c(WufZaCZd~J$M8dPN!7C6+LQnH!RVZ
z^V5f`WvPPiD&jU>p~Lg4yndn8DK@mBHS?H<UqobyqnV9s4q1*zOVerFUHVhXdyhQ=
zRX*OD|2Bpm@grusthc5+yxE?8%-^1E)_K9ruZ~DM#M3s=bXUCteQTFjIk8$Ew3~``
zl3cSl=iJRX7UMs)RRU%^z?N@uFt0ur<CJChod^xvq9ZMP##@ospx2$}BdrPSDb}#$
z%#5<0gMz0cdc54Wx4H=Xx|ZOHG<Cbo#P*gtY_{JlZp9qXJ9V`)w2aq7_AHeYtCP;D
z<YSc=e-+bCp-Y8udh$}P@d=(C2}9dBG*N+U{>7ayRSF$kTQl>H8DovY&u^9v@*0!f
zJvmouK<wc9*QIr9LA9O3KV0<owt&Jvrus1*<&7q8cEQS6S2A~eHw(g7voHxZW*IbL
zJ9Zq?@PpX9o=KB*bKqn<i0qY`dnz*0bQ~XF>WlesFYtnn>Bvd4Cy_;?-YJc)A_xG%
z-{S4o0bJ~~@;sgLbxjyZg>JbKu6a#i=lB<4D&YPwhnW);y(_M}0eAf4wrY2WJVZ1u
zxr*D6{OjQ6>2e}HWAU=6WtfW{@;0__GHUAg$3b2f13&i<yqWHolR1hesNfe2UM{>0
zG;_P5_U^my0#6N3Ow&=ndj~w%L>?V7j^bxT&!f`T@(c7ffkC~w5e`))<4Wk%NqI?t
zKz6T8@bW<YNLec~x`2VPys|aJ6_;AK4p{T}?e^H@@lUkd5J2;fowa;{rp~1ossx@5
zs)?=5a>+K@Wi#f9tr8j8o8S!k6gu)ldiB#f&#4e}OR}<K*mTwng{(!rV#z6O_8ORk
z_;+s;Q-xLGAK)q}6UKOqv3x@F=H1u)5hPU5d|5@IMhT=^M5K7hZ~Qj@;w6hwf3%5%
zV9b++xU96Gp<58kTsoo;(L%XQoGaZ2S+lVpCWOEJShF+ClCPtGl#W>WJD?<K!JH27
zH*x4JdmdD^9}k4$z0_y0M-#VcSU<CHU4(t_kFpWkz`?u&^EkJ1i7b7dhem<V4wHw=
z7zM*Vu4=ix{^V(+_GBEWGmIoKPQgl^n#A5UDnS~!LdH7x+p5{=Pei_imOz_N#Rx%z
znMcPFEgfw7J%#73>3JleQq%G8(+tY?yCfZ4<bVvR;K`%K;Sp~;_|=YXl0w^6tE%<<
zQXZMK+%;@W>nQr<L$yY;>f<t`0Sr-if7<fNvqoTWyZmEi9qPgoCrV=OuAUTzS#C&Z
zqi#4|RAAlvd>sk_4N>cML6j|u$yEz15{*>ysLCZaD$4TmEzr4wy|cr&)_0eI=7o0w
z^kR=5yCEI?fl%7`q{}y`Uq}hWQ%X|xLKShxPgvcyl~~)#xHe}|=!7upvcySVAv_Ye
zI{=~dputf^!rR>_jDtT8|7u|%lU<2alZ9a|wHhG!yRv&~o&MA7Ith{q$-Y>-S?{+`
zFjKVJ6{by0HrK<XG7ldRdQ+h9=O(YESQN)ryhJsyC--BFF2s4AhcpK_^KpMIgZ&?U
zPu&oY+y!(oiM%Nj!x(!&0Ig3yW-Wsb%0;T~`sH8vIhN$W`~b(z?5Thje%`L4Isuux
z)6ev-k5eGcGuz0~M*aDuBZ8wbk9T{e1xJ&wc2fb_s+OW?dE|6xTva~59<g#aiB5aW
z$bu3@3bFE`cC=)Xf}(!X0+e6ym0o=ZbAHmU1q@Kj+?15iMk8VS&9QECU4@_lBH&3x
z(MiKvYt$p%fQ=tl4(m)UU7+)D>`B7ttK5iq!>n9>-PAVP;<}az&co#>r%Uh6S~rlM
z-zJmjq&*)Sa}6Z=3iyiGM;37jx_wH6ff~|B{(GpC1zQq|XV85s8HeH7dV}?CqyfM)
zE#NhsmNJteK!E{lbZF`@w6l%kw}@IO=5zanyK!MZgBKZ`eBzS$id%4xyv{vl!IYC>
zmZXNu_4Gbw5>l~3wzQiiY0IzaF7~k?|3lNAmpQI;JlSpura8CBYhoi0UbA|&vvhcE
zzf!&NHJlD7_^6pz_$a}Bd%8!ybDb+F%j^?wqDE)KLJnd2(UbSHEkM%qe6J$K_bF{}
zqVRG(r)W4oD<LfoKfw=vkAGgmzAbgakZj2<xC8A^Kf7rhh;Ca@1?htArbPB%vj#J1
zutbd!YImwD=*9e2VFd^uHM;0OMB*k4c(4!D^qiy+oBR><57io}riQw4dnNu>#CTNc
zkf>0<U9kN_88OAj+b7%kz%1lwrtH@WN&GwTdFmcB0O7PDheq6cyK_?r`p+U4R}8-Y
z7T#+0j`xCC^q+|9U*w=_THTpmQD?p+o1JCWVQQ2NJv~P`eA3c67?Lstd>>$1_dlUr
zt*>ad0B?KKqmfXf#!IaP`z0(L4CK@`h}_h>daV%FAhtzElPJ6e`OK2yVf=+61>ml^
z$b(lmF@#m+RnjOSKhFk1FNJj9{T!)}NEDBGe+B!6MKG>g08?U9t2lVhcA{FZ%a377
z)=L&!k7-zOH^osC))=c-tkG0ykd<g9WnEG@$*+E^frqz+Td}a*iUn!p&|WRppp99}
zmA7M&{+x$3Celr=rQMl`l)9rS?IoQUvB5Cs_ZZ?bp_ur+>jaC%s`4)}oFrLsJ}@*e
z9Y&P*kuZkwCv?BDxQn8(7oefnBR?upuNf^k_46YkfS5F*je3*}63+piTTRsspj5rp
zPgm@UWnM_gSLZZJwm){@a$15}J5hMYd-6<g^}Co|UTU)33Edc8K*PbGhuZ5IqUGSJ
z;5DhGr?r3!ujV>?y=TH4Z-{DbNuZ^JKig*OcJGpg2Ztz>uHa%p&yb?+BQ6Jl?&IQ3
zSirmRvw`6dbF1l|m1zMDU)m(OGN(p!EUm{!lAH_6W<0dyveQz(yH4>q!sYCr9=bO)
z&G9Z+>r=6#<dw^YK%q$H_y`4WePFc6*m;%5LJAFWk)ou<_X*Z-1-Pn2zLXQ>6Xc{&
zl43l>i7HNd9jyt_t=}UQ($)iwyJrX>qRF=-&tT|adT{2Ge-`Ng4MS#(89b3<0Sji*
z5rCj$^dSZ+v7f%45IEV`PxKuFSE-`@{+rW1c1F*ko4fJ~EGs#DC8v$6PG8F+?~|C*
zjU^0KIT$=uRIX3|(xSv%J-2adxYrLI*2!4*+UUX!PSsgcu=j7=#Kz&iGQ=9j{`NGg
zCwt{@kVoXx-WeoRrizT20gaO(VhDjUg9gN%2Bo_&U+C@DNCE4&D-9*T+0quCvV9Iu
z&t0)_EG@kF746#XM?8MC>Z=!vg%d9W=h3Xt+zOVc!=*}AaBLg?5)Rt#@ac359VB1!
zqG9EPS3M)Pu#HCgo76kKJaoA8g=^^2)SVaCv%k1Mb8YrI=j;d1uml85DcL1RS!eH*
z60uWqvdB`h4wf)-uC|%Un^OF=pk){l8x(^pFFyoJx>w@$t7Q-1Ny#oza_7pTR>#bx
zU_+<OuLx;P<Al~0dZ<s`9OrJJ&&MH~U#O4#$5u&iU0O0^^<x+bzI)n&nFb(=9C@ao
zx{_nsk}1$~-<z3tZnEfM!OLd4GVSGkq<F0R6|wocE+*jo7-RC;jXHo~`?M&Ad92FN
z_0`6w?VDbN(3;F3A4-T7wkfHT>SC$gE3kR2eI3Ttw|Z4|Yh*(EDd5}HZQnZ9VWQDh
zLd5-{y3_v1beXolX8!n?LR+nVZtc~28n4^=5XIHdk<v_)q3XWkjvgX>D-nelnNpO?
z9WZGCR@Ct`d3df%i1MeVL9-olNA89MH~%8c7D!FTzkFFCHon2miG!_9dtq(nmD<Tx
zbH<vF$HpgU0!FSwBUACqbnc3a$kaVS99`QiF4tn>4*eZZD2Y`KQzsV}r?$$+DWS_r
z$TP68kl}W=CcG@kHFMaTxTl5QID!o$t>xI?%hs!{Yt|08D8(7-G^{I{+S+(ovW8h~
z(g<F*ARG1m#+v8unv6E#oQHSr%60A&SyFv6SlA0JYcCy4%HPM4BGq2Qv#q;z&>xY@
z*3}a2AEHo3UAaD`w@L4mP;!~}0ABs<d004CUW5=?0qu3_>Nh)2TEouL*N5iRv%k9t
z;_!{~iycX%<)qN1iXukA>NR56A@=|g6R&-vWb9qc;)VR}0!~wBpz+eh?o1oYZ`$|`
z)&fcUTd$~^>55d~Le;&<95Ih1=Hz?i;+0i-6wq{QU(Bf+`_PY#d~SBH=2&|?lV80)
z_9E-}2ETz?Gd-V<eP|!E=(LK(-+#n=M%uHnd2Ef|TkOpT(|#O7K654g$Ta%62Q=w0
zUM1{bhzr(;znb7Im4XLibx(WWzOm~uexGJNl-O(JPxGaX2E84{o<*N0$V=NAaSa{c
zJO2?Jq0i)_%jZc=V2cwlsrD0cVD6&@UYixIV@FzlqWD$i3tr<k>&tm=v!CuDy+JhL
znWiI<Q{XZ>$@1;`EgdE1O28xA^T@bMO1<ar@t`XgM-YHth;E<L>E2Q4BC>TC;@1u$
z@L1rvje++oga^giCd^m#ZT|%EMfS$`6KBTEw=s}JP-Pm`N=J2;ZG3D|q`$|rbGK|v
zo?hdRomA%2S<bn|*QVpR>a*$PQhhD?7{Lnt&+qyhfv;z|ta~@pC{Acsg0C`qsllj*
zTTC3&JZ{<7im_W4PfD=?NG9ivkhiZqRRs7bZz~WcO%u-$hD2wOQtNCXQ^Tak0bBV6
zUUZzZe>(D-_2R=awaAH13xGf85uv(@e30#FMhlDC8l!Ykvmb({QJP9rH5#;MP%pS(
z^oVL#!`)2uoPd}}wZ;8R3nJkm{RpY4;zMV3^tyMtqAO~6?U-rO!gZE?SOo+^p{5Zk
z6$5BYya*N+&xiJY`ZZZ4(+`;@`MtSp_X73<mzP2P(5u!5aswjzk}p}^ACtOEpSjxi
z6~NGm(|tkzua5_o9tiCSRnM(!hY*YHzpwZxRb6FUr?neSrwEr#;%8db5|=f442!-?
zV0A#AxYgSCyR?#~Kaz-vG@JHpb~0$5JLDUV?i4<T<Vx%VKN2*m&@ZgLt*yOhhjkE@
zY0wC+k@!FU{xQV!p3xwI)}0dves&rPC%2ezaAvm*ta*E||9hs7RG;?m>Aj{y2q|*2
z4x5}@`rbpIc6U47#vwGfTp2gI(WDs6{-UCJw`ZccqEqSJpMibooHU|QnF&BMbAzJb
zhM<yjM+T?5q_tkD<R`j{&tw7aJ;r$FDQ8zN--a6^Ryaa*0~m?{cfdm+ogG<@sn^0H
zNF`z!P79fkV|+sfSOfQ2de@4pcDIGNi6KD~TRMS6l-O%YQx2Q?HJj=SyHfW+Adegd
zax2<^YJVd6-#?j!mx3V?p-yINrm!a<rkM{S^VXj2+RXUsE)+eJ{BI9CuMrU)qQ|EA
zG)DxehN}U%)wFae*ltg4{ig6)6Ws7QbiB_-HxFwrZ+rK7A5?Dg;FY=y@p46g6Ji_*
zz8^iHr*+3#vPso!OQ#-JOqZ!D@!;g43Fdojk;%8j(Ce!S;Y$<JSL!AvOQ#JfbvUO9
zK;HZrfC*eUe;59TxuJ`xk^M>XUjv(W7vRR9?FXlhd81?;Eso6tTN?#nj!n5OV@c1Z
znF?5ow8WB<?}E&u%>F{`d!W^za6?-9a6Q}G2<B#CDvnJTo1VgOQJGgpWc4X)i!t$a
z9L$qEI!2ol>aRBQ))D1<{E2tgvOzCe^QC0DbNskH3x6MBlyW=#p^+39G&n!AoyZ_I
zZ?@!NQ8@5>Oh7<Hwztpg9LfmtKjbrh`#xl%!PaOF{Ex{ClnJI%H_Hv@Wo%{&1M?p(
zkHa<Yi{L4$Ecn_i3pAQXF5BEwS(@FQE+$Ml6Ur>OQ1h6$S7~LAIL9-~YbIh#yDhJ;
zWa`i1*;+<l+3wmQZRNLPd-V1{75++wM7Nx{bZbDmOax(3zFFYdprd)-N<BEl#&z&9
z`r+%Jcrcu_U~o@o|2RDsND8|LkOuGlfDDM^(vErz#2m{PvxF~|jajd~`GH$!kY{-M
z3-+J0Y@yv#x-tVVoTgKGkw8_{<mY6=%H}QUFAf5fXsw&D0nHtUnSzx;&-MPO<WXD&
z!z#xWH+1OYw|i3Eg*n_k_b}QScccM?p{`9wO_gHPc0fXzA1qBhx!b>REqWd7O=5)Q
zi`SfX8C=ep{p>Zz7yo-i*Qxaef%tRv-D&z=dnCN_x}N?DV=rrfrjR>n>1m(}bOVp_
zTHZDqcj}tXrU~xbOf>WGYI3=3n@XJssL{hUfH~NIWTLi&8Rq$=wM;e(0v;ldNUo%d
z^R+QY0Dyb`FoW%)JaC}&x8onlFEhx@wzFGFd+o#&na82kL!SMV*)J7ADB^f0#(sv&
z+|~jpRout8aCGR63{n??{wuOF53{j9bP4_C^Jj&Nf9O?>7HrTcG9H%G3>~u><Ohq|
zrYG|pv(z09Wl)dOt8&)vB@u}1<zejL`_c4p=JJxSO@uWwO9Cu@ecJt@1ATH!&-c?8
zlxB#>#xtV+TYq2ylB<i6ON9DBS|(jzjH|r#_>ch_vdoipu1~`~XOFg3lAe}eE{nf}
z4lwtSF30QFI^q1c+n!iytrhO`5OzjtP(a<DQ5lvUO>0!a_9YURRK+2th$Z&oQ&v{%
z%%?`qZtWP{)V+wcttQOW#9q{GRHhB1t%~wc{P6z(KtR90LPfikeUu?OUT^ZGo>wXZ
z>%>-_$6D*0qA$f$wX2N{S4BuuSLk$kfi-KKO%kflIZ4l*Y*bEe*STY}JP8bNCq7Ic
z%>=(DH52p?tRQ#vl<Yow<CGoI3sOAcl2dUhQ6_9Dl^bWq<Yc6Z<V-w~WKlBGKyD8`
zA!w9@yPcI#GjsGzk?D`7?twJDwu^X}{5>AKo=n2SQb^vo6=)4%T4aV6$gn*RHC!io
zWJ+UFLMzVLl2l|x)(i1wJ>EFIL`T{z5oV?+10?H_GYmta?eb)COOd_!mP*VOK#v@j
zB8;Ds&FBWKI|5h{i;YmjEtKm*pLA!UpP<U>ag?C-WHV_gk!mHB*~{|MQIgzYdTH6i
z#~E*n%1%;RxCdA$c$iQ@#Dne1rs7#omQ{|s9&Kk2Ao7(;V+Q?JGtrR^BW|9dS+O?u
z%B0wYWFj<xjuCyw`3w_7Ph{vM@KQv!@?OetqtvM!#{^b^y09eyhVkJ*yYO$KCJ8@}
z*d!u~Ala?)u!DGczJ@1e6G%oYQ4|S?jR4P!l0gPu!o!s}@ix068F^U*n~OK3@GXPI
zFYrEIlw|^vDDWm#kd0nRjMj!ENjCF@H-cH_BR0_@7!_5t@<y{!<jppN0uH+YjH1E7
z`xUiLu9HMCDHdXth(*B~MbW^^K}D!>h=KsTVC7reB}ufCutBs+GImHNg3W5MO9#)8
zMS<{&QGyng@D{KGFU#0E!aFRM5VqWD76h|_cma6eYk44oM0_@il@J5w;uWilNOptK
zBZ(3r7PE^N>kNw7A=><MR3)NGCZbQogf4@%!71{D2u30SAg=Ebc?*sc0i#4rW>p4y
zMIM$dD!qI+3xqZvhY{o!$tH_Ltl?`#9(yJ##AJ{SK>yifMFFcra7(fPINU~A6h)(1
zmc#~LCcNMw4xV>f6gzJ=@(yD2IF7z_H?Q(e31p+4CyHQ_WI9y@+&0l{G)W@C#U%1J
zqgAjFoI9ctftS@fBG~P4lA@6IJUBoxgKUr_gGxMrVBrC~1wo47&>L%b(Ig^xi;6-3
za9jz9k^q8T5{w2S8U@Ly@{(1Q9TtOKFt{Zm&@mD{wp!6(v{;NHSZ%!Ir4ws23pTL^
z$5Nq64o<AVh$G}hxT^)5!3t&@j+tzfF;Ecz=T&eCVy$50K_IdL2NZ|f=EEi!!77V(
zqrgj&S>mlYlFROp0qocX6Zjnh&Y2ab5rPQ;%+q<k(E!9`l*EW6`Hi@l(LBV}Tq}rf
zfydfpx7|aeI+tRIO0q>#2oAb{eGLn$0W3}vFF7SaG}I8j-WCEQ!j0?{3^lxwAQU46
zAg*Ayn6U*aZ!_>b5e&_CCFHOZ8&B<N3J8t7Q8HP;A=Wv0fk*J=MXS<?E{91r7>x$r
zsTx5v2&&zPHJNxjF)IdxEK3AORWyJ}AQtQat~4NuB#zz?{Up|d$by-+)_~JYA&tih
za9I&aL@2J6aOIkakr(XP8D8nIG&pK)9zm`%Ff9f53Ac1Dqnq4Rim{C48%vt8RBkkY
zV9rDgI6KF_LE(}`w^#oRg^pU0&lOiwiQ}#DI60E|1bNNd_SWsXQqHXFrrGV<tKSjt
zy~=2Fl<pP&h{<CYGFj&%n?3=zCFbsbLT4g{0;aI($jCN+{X!R4{Vh&i*0K&y*V#zD
zgwi1>|4#7@*NJ|Cqo}`@7r0USQ7&pi|07vuWajztZ!}kCb5S!CZ%*Z*^tXug_f;at
zc$6NwVs?%y{<3dGb%<9v8Z?zzn>)d&no2+ZBy!EdZ<^{gwdiAp<~Y>{Z^B>dn-XJo
zDcQ_XImI^iosz0C2)WBPpd#)N`~JYh>qtVs9KZ>sZ>rF1Yx+_2p%Ym42i(R!7}8mG
zFx0nE<nl#M3+n8XVcNA}90IBUlJDE78w1~1Z4+l9#~BG_6}ZQ~2xMd@P?^z`p~^XO
z`Qt^p4J#W4CG_#28Ck5zYY)IVcVVZ?9}2oldq8{OE;>M^j{w~T=U{;9Gn*UfeH2Rr
z=U^uG1+9WF&Mb2Af0#U9ATc2qHONJC(G;w1mV(wTs=6E^$LyOsxEb6`ZVtDSThF-S
zlt8iT+=MJ5LNNK)t4rLt@>i^x2?r+M!vt<IFDa!U%O5#^|BCHbOZ`{Op4%r1<3D$;
z^ex+e^ZsRhO6hagqq?0uesxKjln-rRvH$!>mWzFJXJ64TU9AfX5`@C#OX2M17H_Qn
z)}nQaPh*Q6OcqaTD19Nj_|VejSBblBt&e$Inqe!8EbEKiC2beq<wD$C?t+rl5+sEK
z0wddy6dN<Jl7X@TmU39OEKb9FGbL>aeV<8`bn#0{T$In^WiIha|I7Zy<^Ufwsd8td
zt=4C5;6whG>Y5t;_xOu*{4e<%6ZQA_{V&%wO-#jKcltdmuefsMODor|UA^auRWGla
z;D=lzmLB9A%)VM%W2dZ|(B0hV|Ia$#K|lF3I{bA9{RvD|*DyX&@%49C9$b0)f3CdZ
zs?}@PV#(vZC7Y9!&s@ju{}3*?w9W|R=!dZMD@{27a{l#)ju&vdykjSUX|Fs8Fnht!
z)<aF#e-`o&y^ee6zE?AT+bb~b$vb)uZSC(3{1oYp%W%zEn4WuxT6bqqm(?ZeOVTMV
z^cV<1BJGGc+~Pkw=Wjip-#Wh&{+TPAx{CX9+S}T@<OkZjuKe0FuDk9Gz83B*332V1
zr>%r9HpJjgZAVPscAzB7D054>4cu1l3T{7l+nB9?5g3n=?Qsk_x0aSV!`YKekd?_a
zhS|4c*wrq>wy98UY0@c!F{7KPm)O^i_#S4u2g{;9YV`yQp(W!V=1PEDW+v&;ou#$%
zI`a%JgyVi*4CF0#hqbu$VuOG<@urpg?!I~TI+MI<#lC|p=NT<~_E?PbRvz59Vv{U3
zwVZz7?tLpa$(Yh`G5M<1VYlQ1BJV%Gp|xZAhI5xB^jGWhj@HDIb2sQOunvW+r}=oR
zh<MVkhR6u+n8Vb(y;bn>L;2#rzCuhyKO}wHrLJhio<o#xZ=V1&+6Qk>uUfk5s)0Mw
zs~RlE#fy!WhE?f124-KFIBiwxj=}aBAoRgrgPgNRqOMz-_a$dX>7zJ1xvx3O9%Oiy
zDe5w``FJ~`Meu)uB$v~c?-()=L9h!xt&oGmxA1~~@1ma@4P2OuaY_0`iE;NXr4zEO
zCE|8uk}`yh5K`$OQu;J!DpT=D!{r;G;t2f`1kg`GQ2qXSU3u*n&{Aa2??IQwECdj)
zk^i;s6e_Cy5G;Lj0yAS7+BX}2q5Xn<Ui*di8R(+AJoIZ7z%>qy{!7T~KE~G;PV5t}
z7O!SjnO$YADBXfaNua%?<p8BG9E|zh6Vi)UKe+3rb4UNV<F$t#yo{WwblWXT@sZQc
z+j?+-H}tN^t?Dg4;|tfvYvF#S$8J`%^Lj5`v9_DcKlc;69z2&fT=waQez&9eh+?*P
zE99)fLt8Hx82xAOs@#fRGQTEXAFR{P!?+#=?(bf^;!-SZ(>QrJsw+KT|F#E{fn(o|
z8Pl(KB+D$XiMpWTB;OhZ`XL~W&*xo=_9vy?rr*HjakzOLZY^J>p^IV1*zFw8hQG$&
z$UaJxx6V+YR&kXT?2mK0#RkGv-R7vHLsefV{j-1Q)OPWzuc?Kh@z>1yeH^>TDrwSu
zTua;I?e0zGuCk{6=44KG#usF24?(|AOK@3=(UdjEoaI}>3AJ-mgr98XncWlWf8x8<
zH*3f8lLS_~UuN0hF5TeoaK*4O|A&bo@b@aK$8=b2Ovm$|TmV=60Pflsa#!Paz*a$4
zUmbFyhh)=XDZ)Nrh3Ap#4l$;yerJ;CVVA*_nVU?XY#2P0PNpcfDana!(s9Z`xaOke
zTl;3tm|5R)fzL1_s@mt+x5D6A$u6QDlG^(E+UjdtBd6D#HEZ#?^H$7<>%{-k$H8gU
z2TJ?OHXw%Pg*R^%->#0S9<5c&HuSBXUhmHtI+eLiP9W*SYcDe|A-RX5&g808%QSCo
z-K^QknJX7|tZdEJc4^<y$IR+f`OD8ar|FSKvm-WeopzyiO(kN&xbju{LTUPa6__9p
z7}J$WGP;pgs=Z+Ys(iu@w#wxIAFBF-3d4Sw0tm&M(^*~W$6K<wMkT2vrZD^gll+74
z`n~P@Zv>%ZSKlRy$ts#xSv%5e_gp$}ZeQOo=5Lu5dmBC_H+kD*i<T{3cGacJZ<}c|
zP`dFvTfinprnmIWUYzS6oZhxPO!8yj+{;C#pS}L6{B^218eeu*m$MFO%KJLk&z`k*
z@!YvRu2z4|2`-VoWOH^#q_y4Y_BPth2CL=5_CP!~jf9uP4Krg=x2Mk6)je<3;`%DS
z=sEP(NsYJZhG|)!I<m6YE$IW|ahJZvqxV+tajQOLHbBtwda`4mo1y7Fs%LEE^iN*k
zhLea-v@h5mGw_zWuGGHp>J>W!odF<Sxh~ZLV3npvy4RkuWld*GyCdpw%QmFB)o{zX
zR<i2Ffh&;KpPpDO*?5Cha@&0ICH>njI{3t{-Cf-tyQ5ZI?X-@4K3xnEvK9oHM;hOn
zGa75Hms=9j8`__*UOGF}=68mo{?1v8KYiM!dsfe$>y7~7S1Y`Q#4U1-8BCJRCpVf@
z?WXTuG|)O{*34k2wXJ_(_p%3I@Y}V~V>guN#>sI?MP_57jsH8jhjhyg)qQtN@WcPG
ze`0+n>pYh2=rJkcD);ypjhi~|qo=HPQ*xKd9*9)5tYTXb?x;AmF(+@GEcBEKstSXp
z)n68+`*7WfPnGOKs7$}Gg<9G`!WW`tE1)I&qA@SsDS82>cngn1Y@7BfX?7kv=FB)>
za5_bazK{KQ)22WGe{l8pzSq@-KmK>6km7?S2mcJq`-=?Ci&--?uk(ewS!7_7Hp=pK
zeXqE&6hZ<e2je~DD)_&htKkN#ZrQ1AW=i5!)L0xYs}PUqA`t9}2$)XzAtKYmQ^QQm
zOoeXpo{7I}KY{#%7UOq~qAm^(0|wO^GADRSlu}AI$0y7ot7<^P9R#Clc|q;18;<(~
zq-1pYd4k9y=C>5T#Joabl(TuQMjn6)OVA$xZ?t-C)V8Q0<7ul4V<EnRuE;-z!z`)T
zL!cWGCGDw74l@?SQ+-+e5~B3=OC6=8-_A>ybVa?q<fV2K=<SX~Z{mJ>$+p?5ak^`3
z_m$6X+5P)FF8IcE>syu$1`NbZBuDb6M?P`nz_#usRzu92>F8NqdyYeRNh@3NT+aBk
z!7~?zzmk}F;N3%){@~hKL)Yw|yXC>4IViVFURU?JPyFUHdq4Nin(oN1GaCMHbMFBk
zM{)NL@649#dw09nPr6=IPnJ%1r>;|RZ*sS>v4w4Hxqv&iF*b*7FgDE?Fs233tAPYe
zNu1=8Kte*O4?Jm*h$n=H5L(DXAXvA4XJ)VIBxCZt@BjaK!Mbg;voo`^Gr#$j@3*0Q
z^SsIR($Wd*7K2Ov`nqfdD%5RSk=&oFoq#F_^OcjSoW7}YIov0PI8$e;=UG)X<~406
z{xV_L(`yG#>^`S@=5(EzQL~(};nfFjdf>p?He5MNtiFAoZMn_(48D!TB_K)g;)TA)
z!%ZOkUvux+Ik~xi*X7--ZuhWizQ$-3I~E>&>+Z`Q{AfX&Z`%TQeb=Trlj^1AD{qyh
zN2)ls#ERB6QED}oZ4?-n28ZfcT`IsSh^-lwT$Gg)*;pPqQWsA$3}HgWzWd>50((Z~
zm1Ts*(~E>~c)wcOzw8#L?VJk-5*{O0Z>$vqM!Q-i{o%u#S3m3tnLk=^UUW%voOSiN
z-D^8M^cxRtmukW_J=1$?BHdk)SUqP@Y1jh?q^XDAns)adT>8@#4*I52%^~lm#kE~N
z9x^_y&*-xUykRg!F#~+}BDUS$1CFoU**IrlpsxSW>^)bwGM?=ZO`hAmY4Z4nR#za|
zI$`UP>m!_+<<-gQ%l16>(Dr`pAw+V{@lnY0MHy9#=HLxzj%bW1u^58iHYV!sfOKQl
zWdXY!$7!#^kHhQ8br#RKUeaoq-az)r&bnwP;z;_#O%%gTM6Xw=?Z$vuYpmyt-uS@A
zx$%ix_9R=^Eluq3wy*0xca?Qqa!K^O1^d8>0|zF~h;(;Hys>05=Dqru^gpdTcP(uT
zdQx}aI4#L=YFOdA>8&4KwUk+(Yo&?ius2{w&7<`(kPkF1ZR=gv?y|?0(s#5S*faZ3
zf8D^qoW`B7b7t+`3#V+E(ApVrG(;NOC$4B7ym+6fZu|v3?NgHH)?4A6ZmreeRI<<C
zc=bDOQ!anpYI*%C#*NUT7ONqvWJ2evu*PxFQUHm;z6eCE(16xkMtO9@VL)bY<EYsV
zbG)WD-#EQWhjp%1)At<RGrdaQz^b)JPo?mf#H5aX7;^lJXk!!@^f=WI(g*v3CTZyX
zs}El?W5y+i<&9JYDSU%Oe(7X^+bER9KVZ<>kJ9C$ZV1K#Dh5M|QW7JICPhN*M4v<U
zMUWO7bGYPaNlnp7`Cgg-Tn;9{ASuHH2O*7d5YmA7k%+S6zkF|!N<oYvqRX=lXW<sG
z)}!zsCRv=1nB$mE!6Z{uW*O|z3Sg3yS$-A{=gAd5lzr~VSe<f;ih7BkXb^K`j+Q$H
zVSgqivKM4huwSMV&&vW#>eQf4^f3LWQY8=ySawY_GCrQOv{i+Yb{g5np^|3%eNjt{
z(T3zX=y7L#cOx>&-b+*2GM?q#(WTEV#3nm1LULi%Zm}{}7i@*ZFCZAl@Me^PXR09y
zUI-8icb3vhHX_tCgS7{mCtef<AbQcn=7+(g=IZ5>r7M@HyQ<scRwTN_+pD|Oi=~Hs
z9T(1-&ZfJT(JjO86Hk9fedwPns_N?N>#BDBF%0I<JRFryB^7n$0YM0q*C~=8+p2Ep
zoH4MJyz?i}Sihdc5msjrH!QN-GWM+`)(+x}h4Ib>Lmlv%{Ul@)oGU#ImVwoC;p~;G
z?_bGWCp|N3e&;;1MtTM<iNIuNs+zdE^O4u+>xRAbpFqRp<;y2eIq$sTcQP+RVa@jO
zQCBqc8*m-?Y}~lRo^eg?Kab=BXe9Ci4($$vLl{aRiZzmWXq87+MTrRngAg(nj=K02
z>Al+@m40=B0w@ov^#;Y{H@6S`@X)MThkiJ){HX~Ci>wxV*8%Z{+d<hYbeZ&`^xi8M
zU%y{%R~}M9^|Aq!{55pf#O^~yR*lQf-*E9OsEie-&D`JE-(p-W?+9RB9PH}iaPTmj
zJ=ejI&}!D2?LrX_kNRv@uf{VZe1#2TeBK;h?cajy2p929q3YAr9=?KyX2!rM=`z}>
zaR?4wMVT~ErczlnF4`4R8;oirXM#KrmW-7Y92+C)9za!N4c@w7EVw=x1lVd=4bZcA
zXyQ;JgF1w6&{$L|qD9o9tTaxPsS;&whUhWqS)-GpQjL*x&uOX})g?^j@jztXYRqVh
ztv*u=aoTx7SByshj)*6|FqmICP?93&EeH$>*(PRel);n*AY%&wjlB8te9qYrQJmkl
z)L`nn^^nO>1DBI485w*CX474Djp+aS3cq*_M%)7H!L-k=1v1hQ%u+_*3HCT@d8b3#
z%T8~beyE~vdfR4RPVo}iY?ITarBi<_FMkJcPvcCk{Y-i)H!jGyU=}?8QAmhIav_Gz
zSHxw+{6O3gVhVs^7|LKIVi*Cko+b@Qcf5Yx-UUuu<k+t2=JD;n1}k2F9n31i5o7hX
zQ9xp!f!o0c;C3c;)kg<6zBHwwfAOr&^&w7q)ki@1=obZWF|%<DY_Z2c_>o5n`WZAP
zqOomdaV_$7Xbj=E@C}Fz;G3}+kZ4RVl3tPidB@uR^ZdTDn%In~w*d7WcVxbUF&Ivs
z1*w5;`Bn%G*D|Sr@2#4Btf^_PNp!3Ef$#nLdmkM9=q#`er@lHnV#BT-ucPq+oTlhY
z&=}^GZPc=HCLyx2;U*gxfJO;Ah(39Go1n?Orz>aFMkDirw3bl{I)VKqV>5tBqJw<|
zT&-k8`d22~sa<x+mKo@Z^MOWhqnmlbZd9tJ`sJ{gr)1tpT`^h^dd<;N!ss#25u>($
zB+*AT5=XO0hYG5xLJnQ*mnfpG9`k5gBb1LxfMZ2J#OQ(*O~ql4>2xmj7)OoM(z$!_
z+4Qu=bW=e#Nu!niOlnb9F3P$8V-y}^yg}B$;w2@QGm~LYJ5X{+CNml5AWq>~1Dnf$
zIpkB2?C8|7*N%l6Lo-&+@OIE%QK!+?FKp@EQLQjD8l#|L%!=ymS8gYVf{`5V=xte8
zuhr;8P)nT#^L}(S&<)+^1sSTUrV6`7Kc6`{aO~Is7GWA@%xHkUnvhOZM<P?&)B(<D
z<O1rpDaHGdh+5RK@EKsdvhRjJAA<0W<q$5%LMfBCIVmX{lAsc3ZRVBjOx{t7ByT<@
zynQ5r3$bj_NV3H?2`Pn{Br`<Q3)83$6sVTof>gl})l|WtJ+mIq1u1Oi0E57j$Ft2`
zfYQ&)kas>Pn=r81NvB8iL4RJZB)l~Ss)AZV?6xFKUAC*@U`#Zn<M=WYv0PfCaiR-I
zn6UR>9%lounn|D-d2_ix>}ww*O9u#tM2EP(5tplB#ni#^8x9;guwi_!x>B9ey{Ai|
zZEtFIZEG7-XSdhtIwPjOrG2JIr>@p+uVdO;YgaG2{+S;=bNwQkXr&_!C^yfv#z~jV
ztgW4S$)xjVYHBpMTz~y7XfyNt+cwot+tN@L4?3N}#&WAI(ooabSkn-(S<4&oxp-N_
zmTC2yZd>ulrmn6{kC5?S#>aJ#cpRd_FWAjw&P(D-VkpAS3>5<3Wr#K1*Mp)?tCfDD
zQh_9)wd}{ljRXnv>p_A<+%F?tf__vB^iPe_VRpzQMzIv3HwS1*)b4rM${cPX;Zcf_
zSmWw~bu4G+!(@i+H`v@+O5le`#zUAmvmX;@E>pvtCI0G*uqFO>K(|g@w)SY{-Unbm
zFMxhx0~;i4or9=a%d~G2`~2Rw6E5AGpysi|9Y@zr>u|q5x{P7s)Ggy(<b9N*S%ir*
zmJvS&wZdKMqQZVd83%b>6O>-7<pqhfG3XbikIzuZ5j^n<Y9ZBMuy(O|KNdQHzET2u
zAcGv>NKa1!bpZVJ=8)0CWH=ge911sL|5O)~cY2Y{;7mw%Y0(5*26`<m6E+TRoY-vN
z4<_uluRZE%>TB{$8<<A6<68k>)XLt0mY_yTXI)%=Pt5zfcOE*lvv<$YEsOPyy)T(o
zw)bt^*w?<&^iqd=V8GpxJi2yKc@_S+tI8K){Efm<?{=TM%iUNd>KAW0x`+O4*4ZT=
z!!EbQ^n#?9K+7MaiSYz5sY;d(m6*iH7lGcTCoab+5Pg~a_HanDS-wIfiH3Yg$HZnC
z;`-jVLk>=DZ1dxg0I&NbP@Z&q@xH&!sOB7@x9`QLnkS;xp=F1RWXE!|wC&D!-@S9c
z>9>aoM29PYq&PvkkZ3lK2<RZ-f|$$f@NZ4~$;qqC%R5lhWO+$tn=@X`24%l7wgBOd
z)=ts9n^+d-J(}|tlLiUWBr`ZnrDXRoNbO&eL?@XP2B6!&ghu<Pkh~>(g$)g-m+WV$
z{jw~XjhCw}iI)4;F>-YBtf6sd3x|{C!DLpR_mQ_tDhRxCM@OBsx`YpwOKt2+Cj0*N
znSwgH_7t`Ds3Q69oyq-6FzO~&yxd8T8{8<RGHLW^Muqy32e%O%!t7xMjP_cpTb2M6
z`3PIN8<B2ek?~tb?z8!n{$gI(iOqzNpm}03L<5fMp~!hOG@RUzT@TrGCWStQ;V*E<
zr#0x~fHG`tKXFbREZzSX;qriJ#HKy_Pln_eT{g$1S3%Wfv3W-ra$}{2-Tch%#VoF2
zFou5uCQ`}}yG#y=CbvI~=3FwrV~@-oYOVAOZ8@IRPstI)DeR-rR8|4{^QN%R^Lv>i
zG=-;mDOIio&04iIFq|s#Pk50`?4}~j{Lyx^$EhDvuTp=aK1C9d9=Jg*Xdlg)9V<Cz
zOOAtMaAbee_2B={?mt`l()!{zZp?X>j>2lfXr_6wtAG(s74}aT?bByCfBOGodU%HO
zBg+g@r&73X1UQQ-W}Y9)*YqEwD_(Ri^N%r3{^S2(Lg^phShBBgz<{JfvOrek`iwP-
z-|)>mL;ZpJ;{X0v^1tb&`Jt+)zuG~L<G>#q=~>kdqUO<<`cZFwMe={7cYoX7cN(v3
z(a0v_1%uqBqVlA&`Q`d1NTSgZbMGYoKkK7s=~2TsFewinf<32Fq+ii#xuE_1c_%V?
zzqauC0CI;kgy)}Ro<kkmncJupBQ4DY-ZdwliRAU=87urb+6r_2Z8l_~t40{3L&Opt
zm+jE`DVC_wq?bVIJG}B|3dmA2>Nk?UiCJI9>(A|Ce#~^vHch@8hxl_b=@^u)GFg=z
zTCqaK&$Q~yaTyHUGb$gv3nSQ^le1D||J6Z966HpG^Fuk@3>hmwOx2@rak3mSde*9c
zD=CkxhQ_F3Mwb3kM6zMhr_zH3>Cb~sg2AzC^T{^~g*ogIf<2Ed51bAt{IW=0O~;}}
zzrr7mMbZD^SR&>}|0kkWbT-xsWxr++wX%%WqDTShU1@MADg9wQZvOtkWO6Xw@A0J4
z>6FLQpT@^T&>0VcNz8V^Isi<1(En&%#j8AEaLAMPC~Ya55^aaTphtyQc1cf*pT;s=
zGV5!@p<YO=4Onb7dt(XGp5cTy;k7D^7`%IGj6oAaDs|_(Ne>wE&}mN+$CjL?VpFAL
zI-P#^PLNEdQfbfd&<LJZ%(haXXf5&al%Y=uKH@0kAmXzqQ3cLim}6@#_O(pQwkS-y
zk+VtR0YSnZ5A^p-{4h((^=<fL$10bUmdlowpCy+nSz0ogKsG6tZsZNHr4$FemYPog
zgNY(3t`e_M^`Ky8%<}OvW1WOs)D3EfT8gOE;0?6XpjJ!U!9j3n%+tro9yx=4<Rsgr
z?dq{l%Uo`#T>p_P7gg}%QROJtQMtxA3FqL4%lRHePav6sH&D68It{1GWhF-k!NF{a
zBkHkF<8n=>u3@6goDuD%DsnQytS4ifWTI!Q^@!6Sk18sDKDcPi)0AAU<EUI)ircG%
zon9F0Br4Y#t2@SNczpEBMJaH>#yE|~BGkX&7V;i(sdDVjh2DfZQa1I7enWpec4Lw8
z4fPE;C!goH?gVFg+a%BFK*vPsIdY!=#tQ@&oavq5JZn*&TMFg;mW@x>o}oFjc4b*^
ztdsFnNAn<<T=~^@V+V*8jUiZdID!WuGvx8e1nnMAW+=~z;Gv03F--iRr(<`!;H-8X
z9z*!HzEHvSuE?iDPonej*f!E~;0Hx`b-1ip1kB2eQMREGjew>o7|c8Lb)Om(bqsm@
zsWet>4$6>JgY-s&VbEXzl#DJaqvO*31%<UZJclTs`_U|w_kCw%S;vZI_Pm@EJR5sN
z7SrPXYzydUxv>iPd8>$WU`W;w591QhFOP6aWaI)6orqQTyg$>^A!&kEP)ctAUL#;n
z)M+HuQKXLOH;tQM5R9AFC{eOzp>f(W854>$fvmr$r+Yk}VUmEszs2*9hA`=5*>O97
zY;4RkOW&9$!aZ_i6csKrSVWZj!?AEJvU9qZXf+D;>42>uN3NWwJ}age8an|^ZS0d$
zeH*dKp3G*+wMUyOhWa+rsWV)FNql-^A53FYKbiWDu0_JHoP3P))R^VwVbL-N$$Dg-
zE~ZBM<^(h~s$d)YKnj=p3>TPmCRtiyKuUau^HdQAZJJV1M#`SIq<0Zbb5?1ZkB&UU
zHc)b$i<JbQ&1-F&JGZSBva+50Z%g+tUAmvSuzN{&_mT`;ePs3OBQPPuvmGW3lE+AY
z9o{i_?vA<AUt|fr8{f1v^9sJHn_h%(THR0LDuzEGtdrm}(tAhxd}w4J(Oj?ON)cDG
zew#&|Zv;m!Fwqz;A`5nk-4NO8k^WO=W7H#}(eP4QuT^LbdLzsFJC<*{<+kOR7+0c1
zyk<lnIQ-?^F)(<)^k;?7p)#8EDnHkoIDc^4ytrG7<B>@+{DaY6r3<deW6o0KJFBM_
z;*p;Rz6fX}OnycCRv9(R7Y=3p12H8UEt(WO<M&0FaL%$N>%FmBoS460%HBS=-Hw0Y
zE&1K&4qa4v>%>PV9;?3SP;&W^D`r19`-&sWlSA#H12_ES=#m+!2M%4i*4uHVGrIoX
zbvN97<Nh`Gu8TUa1Ot6@dwb`O{JCVugJzA!{NRp-`=-|NeC^bIK>6w=(>J#HRh(Ga
zv9fE|Yaib^d*RkqGw1p}vuCW@x?tAe$nVIC-$Hhr!(Yiaj<zxb6Iyy_k_GcICZ-)l
z$}|MYwPYS15q?n0(j;?bZeuZ5W*A3*fkqjS54A7>_XY8wH&$9Ov`}RWY)-}HA{K9}
zh5I6QDqXSIA^l#6G0BQ0b`TOyU4?a{G7cjyG@xn@v&|9dchyIFPNnnZMk~2={2YrO
zp6jo6OE=jJ{u(z}XL)L{P?bkOYi#^I9WByLvGIk<EE%ki6whN!F_)XHP?raxJQsa2
zAE9`bIgU<|b!D=!#FTeax%YtEI<@cIOcJxk!t}ZOVE?GZcvspizm-h!3&H94jVybP
z$*Ba7vQ&bhOJaTKLHvBV6tt(faDzn6O_bdXDQND&!~I1i0xuTgZ*mx!S^oGkDnK<7
z_9kLZ4iQ)y7aGqK9l!-j!5%3?1bTRAa6vR{3dN-I7Y2VN{VJ%mIqY>x`+)}!*p=fN
zY?4~`E0TH2z|>Wbd@K!r{KzV_1<c2fyk9b+ftPpQc;il#0m`Ot#fm<M%}@tkEh0M0
zNcgr@g>2ANS26~UT{jDXca(h}u=fcbdj5^NDQykovbCzSJ8Vi^S1IxD)h%kTGvunJ
zMA@LKLe>AaZW<EfQH?zwaz2^3Lx1}!r9zGjS*yd8Lkj(SHIWUZ;KaXG_^gbKHgaT2
z&$rVqF(tlk0R!dth5eii72<86lLDU>_!KY5kukYln9NotyOG{}GkxUkBk4D#H$lyt
zbm~oz9(51iT}`T!^>%wxS}47lN`V^iAi%8i`n*mF&uf14CAU%&sX5d#Y8|zm+DEk3
z_fSugu?f`)eY&U~iK6{*(LPFp-W%FSwFsU$%~{W%X`e0LH|F<a_*fi+*$ku%{RZ?e
zWf(G`f7v63G7KYOo9;Jc^4G}*jD48fN>ui^utnK!#5ep4i6~QJ|00;G7+Do;Bq=^C
z`ptYc>XbCbL3RV=P4=HONYWW_oHC}f8zv8;@vl4<C$oA^3sptU$C7T&PfB4VaT^3f
z0+g6jvsTkw6eV`LW%4K^3E~2ri!4MFW$K}WvpZKlxb*n@Uz|*ww<3`!t7+bG>H>c`
z8G+0FsBf`pzgqG8n-@+fOHSC>vP$}5nO-m$JZ}GjYwn%A@uwR@(Th)7RBpE${0$B)
z_S7dX%{;V8AGAAp3%$wTVm!r@G5>R83pVg?%dlaAWw!cxud8ffi%Ka5;ro7*xw<{n
zkq|d(S%YB0F=Dy8v#1AGQ4Q1tYBT;0IfXecl3%nRj-jDag_^@mDrGgJdZCM`u4c>s
zt7f5-CtiB_$w%M(4gJ@@-DDEkCS8LVan$&0ELMlO>cl$HR8_y@_(KP4y*HkE^ncY>
z(3Uow|6D(K;sxbJKinWSJ-fAbh*QyJoJ}Ee8it|&*b-B5Cyh|?!^O(ytH3A!yN1Mi
zIV9r|-Ae$+*p1S?SWKnnY&dx=WsI7s75HH?HPd+1svKJbCDj&1XyQIxd-?{&9Oh&4
z{AMI&Dn_X$EhZJ3(J}cP23)`};$s#Qt{F>HsfOdFs~D@cL#JcFHhBkLGiC)2j;+OG
zykCETZZ<Mj9jlRdG6Q2*t`H~i1ImoCmw-73V}vV&@l6S^p^2xnU>^c@T`WmtMo&P?
z0)liTFI~zj!_pQ}<aEC3SQ)1@akL#)-;{jou90cLZ6_ZBKc9e6c(Usl>=Zv<+Ki(j
zrnlU@dv}x82$T+R_`ZoVb*D<wNne-!<hU&N!_&vPJ?s#rrYcY!YEj$MMk`B)RX`+I
zzd^z$h1sOym`n<-W<=Hnn7aXxZtr&8*$O(^wBQTrrunSJYP3q7QYYG2*!j|p9-$We
z^IcPUnfYDt&sqWYeBG#S1Kq>z?gzn&ZV;2cBWb-s?MEMJgI>%-<w+<o4OOMoJXw**
z<20v;zcp1LG4T2@Fd&dIQrMlDl(B+UTb!A+#jh4jETuCz1-*i~=M?3Ktlt8Y&YB7}
zOesXZGLKV@#uA7|lP1ELpaR|!sob0OF)0zvy$RI&unv?s0M)`dnH2gv&ZKf?p5eg}
zRv&uKKT&^CslFseF_iT8=&!%XGDP<mS%<z<sZi>F4j&hC@q3Jn+l-kvrxtWjLW%!8
z_QR6-cgg`#9?C&zxpB^n$37$$v$5<6;2|r1`5$~%Uj8@Mz@gp)sW~-`XnEgQlikEu
zCc36og^lFUMs8uAC7Vg)x4&_bU3&M@P<2Jec!zyaBUXB#Q*>itU(!3=MtiWTZD#gl
zPWOTJpgiTELR1%ZF13c*h9r^fTh6L&Ehek%AWWQpLPY{2n-ACsV-z+tD&R<n1SYZp
ziae^46(~YQywCux;0sxRqO4i0-OWD~Jad{->$Dn`3Q+j<4az)LLq$>3ER?~Lr0<!{
zp8}(Ew)2LvGU*e+Zw7sHGdF)KeVPSc0s=ZGJ(0y$0yE6;+M;YSpUYW;n@>|3TmFGS
zb($i50gz3!C~$j-q#xXY0hPc^vtN)taRM2J35cJX(WB<Wr2-JL&`i=NpP5mS=3hi^
zkiKhPBU5rwMOofA;$iZb(2qWpVWJmq%dJ?8JO}WI#uuL@j{jL0aWbERgy6-_ylESf
zXl&#Mw7J6*Yr>TYbfh=$ozdEGZhKd?f09nn>h9IC%0V!$@9w>`fh~7~4Ni(LZEbT}
ztaI%~cTlXIbA#X6QdgBMx1VEB?pC{WK;1ELb53^w@i*<lJY~fwDKeFEZZb3D@0Ko|
z;Zm{=J>*CxbM)nCCna+L$)I(4h!l{@8WuC@5VMLH=Hwu0NG(S{t~}RE$wNe1)=z}#
zP&VGbID1za2;;*rC<8%k*$x8F5Wa|i7%oE+(gZvYk6IKfvFj)w#$XAW{TK<tkKv`f
zv8YJ<V_pJ|5si03uh~zF!0aW?)lBXUg=OX-61NnM(U*O7r%g%IDz*MLNlLx&+(BTv
z3YyUwT4}!;fZfmj8h)6OXr^(-IWrntE29zKvc?gdv*yAp>!&W9mY_d);DO;PmDX&s
zef<FN1H*&wF(H*!rLB7JLFo(WxA1{ioMl3CZBJ*U!yBp(Yn)4h<z3rXG%amysc!T3
z$^DJRIN9`GRHq5wrcUgc>qLLcI(?Lp7<y!#`qp1~<@gmVr!Z%!((hhz)`HPB>R!{+
z(i`q0^#N$Tbtx-j5mG_y!*9WAEYbr)WbPtb9MG4cq$jv9^cwqcD%6spLY)S*PosSr
z?Gp?}Cgz)3HcZu2`p}j^TUlTFHW@z$Wc)OOtd6mU%{~PWWn}PtTson0m*>tp;0ya=
zMvR|=g<Bllo(pCt^i!CO$BebF7>7kBSwf3~MKdcW*Y*Z4^Z<*-cj-W+eXhUKzkb%-
zi(ElhB-pp?s4A$^0SKWxNFQC+7mT3u7tQNik5bKTPkvAbSQgm)HMN%J`o8Mfi^0>g
z@TE(_$HFWUHPo@@U~lc@%9)E6&#vyPZ?@Fd_-&AZ5CDcMxiwpo=9sJGX<1o}NfB<q
zDEa;<g*i`PPaN<=6#g2Cii+}N_wg*?A+vzT!lb0%{f<CXW_1jJ`knMUtTG?~oM`7X
zbyE83B=$e1lc{&4=WP3BN7MZ_F!3FEh>)>834+opiQ0ei<bH^Mv3D_&WwsE1-yS@h
zqYU%KQ2{xMK!F;)sF0&75LOi9VOUH-AOqwB{rNaVg;^urd~$yx-hbZu=SX=+)o1sG
z5*q1etJTaKWGh{qx#8sgRrkS}=da!%S0Dym(#@&;C&m6~wjz!ZRn_%MYILUqXMwjU
z2VBF8@_ynn7nM);3qjwdXf*LGArQ^u)H6vbxqa#1(mg8<Zru|zXv?&Q*q*HiSM<mZ
zLNEzar>^Uq@+|#ChMND-zDs6Lb|^Sb;g~%8l6?=&mj}W^41X3o#E-{AtJmlamUxSd
zJ}!xv$_jVI8dx-$e2qT8g8GrB3j3J+<ZHrSnOfS7842YLI)fy(H1H6B6(Z9W?aw$x
zOnNMiq#{g&^6xa#ZZwf|hmfo{t>9lD%tC$!BRJGc=JU#xI}yV;1=-IU$K~Z6#J%WZ
zkU$AR*|VO$U#rwIw3O8Fr>PCs%ah&i6`t0O6WdLUvBIFU8nvw0)U~F`zI6Xm9z=Kz
zNYf0ui<RGbzmztp6rdjpnpM^(whWW0iT130$hD!ab&6N%S7;k-YR}ZJ@j_J%u9erV
z5nw-1sBql^r#+l($E_`5^EF|KmF5(zjP8V%7x_J0{zN>0jdg=WI0d$wzc*{M3Gz}(
zq0(xSI(DA)-_l1k$E%V??U334cJ=q21akq)n;2P21*v~YH$B<cFI{d>4>2nI(oDcU
z52%u&38Z*v+C1wA*NS<rr$-4dCk1G)7?%-~s`0*;_5zGk#XWjbdhG;*+C(h~mKR=@
zUjMc9+RM^wz`$&|W8r*y)9`ilEHhdd@M_g?l1>jNS?Z##MRr>};84Ltyb-Ocay$kc
ziN+~5mC@I%5=H4{5EaE$coo+ois0vBBfO$SlX(rk3Zf`oqloWlkrTt;oDq9pem;71
zI7?PwRb`0*ik}Z(Mvs%TL)n6;^fD<3J)!jZxKy}kaxq^<>F^zAdp=0SbJ0FBJ%Xy_
z`OGy%wGj)I1f>lC<Q6C`Ecnf6jQ=s(fHc1<*AS)epmtQf<d;yYPX3rQLg@>G+s9~w
zB#E6d;#Dk2pk9UHiu@uQjRi$-7<g$m$gDLCUtI@RT3&cw_qYYDWx(o&%q4oMiA|+4
zKg#@+e&q4YhwsH=S4$tR1S_ED1bFM~<#*pr`mgqMlKY=5zMxkHMX!QI`HJ3z7l`b;
z(m#ja&P<pHD$BwB;QiiHlUkVPLZ>F7;q4{q3!nijZ@B9&Fb7orINMeRh0NzNujpHq
z$DumFp;iiy!YFnDYtd4<Xwhko=DY%o9UzedGN#k=sI<zYWOV9tw@aI(MrqUbb5%T}
zG@%i*-=b9NSN42ylPp}fOgQ@H(FrZ`!A)QEtkf%&7SPWN%==_)8XlAeElQ|5_qqoj
zxb9pPlrNe@!^*|GP4EDb*6;Ccn}EGXCv5ZGLr!FNnszT<X%J0<{QVQT!9U8rh5cVq
zr^zmKVlw+N<0%lld9sp0minz=QY1LhNy6>+94<M2x|F6y*s$bvJ&{%lD99lXXRvrE
z1C{+dlO05cHwKn$>=!ssB1(Uv@_+O!h7kCn3}<{E=y(_359j7@t;y^;t2Kw{P>{%;
zq6>Dxv-p~i@;y&ARgiW{V~^Rf_i0aVZ_J;(eG(Kf-$s?gc$VYha*Xu@3S|Jl9c#B3
zXGuXhsTj6e=Y54RnJKXi5&jH7WRDPxfB<IrAm=TNAYT~GfeB?7Yw)m6diDd}WYpdI
zwgw2gl+FY$WmkRouhP4>@+!5U`!!hdx`JF#Yk<4hlT=1D@O=O#>3|7c7l7vNTXja0
z?pEOb>vvbNK&>Wc6|YP8{#qxfRrJfH{-p)GowI};g$(6{xQVPKMloo754)tfy&jLj
zVAPLdRmj{dOc6j*6vSXA6%>^!^e*G4W86#ZuZS#%-ld8y%occ%mes&<)V7LnP68&{
zFRR6b77A^d=cVVt8n_k>$e5QVa}<r+YlS#{)$q39y5OFsje||QgF*T#bg&yA><Kb$
z((@UN!;9}~#HsOJjre|e-SE~Rx@mADO1CaZ9}1$I(82EDx)JRnuk}kqw#V@Ol^u-f
z)R^ABvPxm3cP~AHJGO2Njlx-c1h7(am}q%u8Rf6w0GBG}mW4xk9lg{*sAuJr^xk5c
zSu{?f6476?mr`ZeFTENRfb6mNyuU!ROn)s@q;U+JS*g?xsth2Rt`Lk4kQ6%5D|gcO
z1+kV?FzM48m<k5nAZ4*gDG!;;kQ|JjLE+ve=JYjL*Go(*Y4j2aG48?ca_NeIQ%a*u
zrL@C{9x0`H&7e-DVkwayzH5p{LivJ}I~0T|O`11}BV~a=kt_hh1zBL!XLua0%Fgb!
z|B)33uuQb7_$_`6S7l`ZltxZ`t4Lo_{5}igK8HqjbM~ED71)WNz)O(!Q_)6{CA!j&
z_9?vaSYuN^c!M`e?-+Hw5%`VLDd>@gGDCD~Nm<#kvc9q<aBu|k?W4yU`<uY`b@&!u
zhi}Owp$DLEQyPN(OVAz1%F34XpXs}|V}InVmxqFL=h&nYKvp1(>E-Sr)B%|f<%WQk
z!-7+*3zu~Jet;Gc;mUHHj<g&~C$dIZRa}xnIf6J=T$LMi%7Kq(Wfest9)_4GT0SZ*
z5B)LdM=xd26|UI+(|zYPdDRc7^$N~H*Q|{^cy)zV>wuvV&GjTok4A!iY$6#9cP{I{
z`24mLf6~$_8(6-*v2L)+$ino9#wv{e5WQJ}auFK}Fajf*yg}Aea|A^hB#>$#B~i4e
z$R%@>!zM_lQebB0zfMzVMg9(P>XcK%WhGN`fyW9Xe${62O5~3QHACr0QQAt(PQfar
z#cokbTLmKyDm|9<i`CHtN}{-l=yUyUDd}{AwA=5`ct$wUmW*E|Ws--B>>zRWG8ro}
zsS2ZDMYBY=2$I%qXD$=C$M5&MLE7n*l5Xku-@Z)5uUoeH#;xG2WlG}w{qnQ^P;CD!
z>D+e}HKh@^ZRR7IjKt&)`jz4`5&4t;2P#uP8j;XaQxABB-$#Y>B6TQ{-;Gm*5giHL
z#6-$s5ENMmM+N1q@-9|16O1jU6B`)m*Zj0r!!kP2=0q<*{7|~Pa~W=+Zb<jwLM`tB
z=MAk|qET^lHEq!`jNW8-y7@gXHh?z`Dm86mosx~F!Ap81A=sdxk#>)J=~5x!E;Ab#
zR;Sbc<xZ^`Q}}Q!%Q6tK?})lhI<a}2z;EV-HvnZt&)40FO|pPyXd0$AYPI}kN3d6`
z)o;}3w;iMzbR&SQLXlmM)5EAeItyONBQ^Ol$_+OD;cz$1#YS9kygBDHV@{Jp52GgU
z<poi9-ZEU%WncdIxua-_uv(?lsoARj+Ia(@o&?^#3ce%occT}1ope1;c@%ZAOGVv2
zUii}^f84FKt1s06sA9_kOQ-!t;P>f7>GBgY;5DEcPgC?8X#KEU=CaR=nAi)n69Zpa
z$I0-`Sl>#ABT8(X%j=pj4|=v5S*B48twg`^i#rAWfKKe*)z@ohjr!FJgI)zU?F|NJ
z?Q#YC8sp*G8Fk&25xepEJ4D?9UT9v|(<X36?JT99*U{EQ$AYS5JB(Gqsgb%^Q-5N7
z&;gd+@{Z$i+!~LoYHFi4^sEDF2sLnpLpgtDS%a_AYBmUdXH8{u>y*kvueqMW5aLg8
zK5vzQ6HG_+fL7CjzuY>%*HII8`bEKHtqXN@EzG{Nz382F<YaIjC@fjl=r9$|J6k96
z0!%0;hey4+Ried;tuuQC{z2=T4?h3`yjp4gnL#DJg0W6E?!U_-%_BOsJDUIFdR#P`
ze1CtfGd_Y=gH@||;qX(Y?@6~B1VIZn{92{ER42}#E%4~VCQ)}ePK$Qi=LiJU5s4av
zv!3$$vm_5$n3jBZlSPgOjJ}PQuOit;<7zb5&CG=kXX4=EM^UFBF`d98Z~s&Ju~MlP
zek!VeBL>x#iXSV@KQ^jWO6eEBA${(Tz$b4}RlpR1U#%183H*Rggxv;%L68=N7T6XV
z!M&n^H)eh)>IQgWo~T>R3)0g%5zRL4)BjEMYSRcBk2#Nwz$^2Z=>&qOLzVEBHg!It
zw-7r#f;S*_a(`<7$suSDw8v&QFRrU%%9M;nIgwRs6%N+zZt+H4VT)A*PE*7Sg^X@P
zM2;l}Z7DTkc<lFJMK~B*_1yy(&6-kOD;iL@Gks5IV`&xC>YVn9+K#D9Hg^j=@e3Wq
z=+(p^hlk70bLRwV1n-rS(jrO9jz;neQT;`~XfatE<6^>V^+v;fd;%@7<P-AxlP0~9
z_R}(BIh`L)3S%vud*@zp#MYvq^U4ebw*A9dcTNQWZ1qcTd%#^+`6qxoXWTsto!Q`(
zenW8M-?~>}yVIt)|MdsZR%3*Nui<Ju?!6XoE?C5>)rNx(_8hSKJcVtKO|cwYa4zdO
zXi%%!#T#&v>wQn6mYWBv(bAm3%yN&WQmG7Drb}<319a+mD&;{9lsRUz!2$HktKk5V
z<7KTiSg6-&ZPGC?V3U8fI=%E@HUVBcH=U-K4^TTssY#><Suo)a&nV3Pm@jPh8-3^#
zO&|%&7!CQ2*x}LIkcdUi@hJLn(R5>k@ezR6h7JxNplJskba2dd!cE(@>J-r#TQ8k`
zYhTr^!X)uU_l5?gfm7?IZFn>3y>)iQturqkXn);RGqG)9!%U^JCDdEr6{&ZL6YYVv
zhRM}k3bxhPUDFy02z2V{X=O*Rnz(*KorO7l3Jg=H!81{C1ORvMy#Ne<3BMRtxLeQ5
z+!1IB*tHy#9s@M1H8^|`@Rc{}wW>J)q?gguqvWmbNRf@gD95gjh-60-f6$AOwU8*A
z2id?}EaehCy8$#c(A4ly4nqT@YNbF%-ypr%Aj^SyY>;~FS#nm)`7=HH%y1xJ>{1Qp
zmvDeD>|S_=qN1|;PE*`&4x{D=sBUUDYKJJMn(`~q1O{a6s@#%G9wEp|jK#!h@lJp#
zF|fA`X2k$VU@_x_F%dIfg#C&r-ilF?dEmQ~w3u3v$$X}keu6zJq%_vvrO6P1-D7$)
z&w@=_6(-@+3Lor%3F$gcui;hZuilV`rq=zVZmRU|g!k`$pBealoq;g{pZ1h12b^UP
zO>94|>(_(A<$pZ~8U>Y#2K1J{EXsVM6f_XR?et}9*B(B+b}c-bSu5L%itF8o>m4lA
zn>}N_K}pT%Z)}HeQSUoO)J{BOE99&FUt`r;8ZK0ixpY($sFBRJ9j!ZkS*$s{mTRUa
zW8A&qH@xDJGXec?9>bxrtIT+cwGmi7kRp9LMGhpHxFbyt<S7N9-~O>`T|_1D`B`>l
zeQU1%`a=CnYZ?58S6`xaIm<CKq5_g<?ACyTC3POr8ijW9<g2oItfl~)&)xu}&$F*&
z`+N`f91ar40AlSwbDs~Ic$%<>BxKn&;m16eS?qiK0br1bc0imoFux7ky|A^hV{&i9
zgv@u&Q0Y$`O?}(OcSLMLSZ@f1=ALhW=2<msuQ+_cu6tcl^#cGZltRbs^sYa3uAQ=Z
zT73Rkbxw3_zhHK~L8;iJV07CSSj(<Ef6b8}!n)0y!4nD_YtZV1mif<RHdCYOo*-V+
zg}Q(9I9F0V@td0CTh#rv;`;sU8ybSiR{qq(W7U4Rw3=*m%=XA(Z6>q2+a<ZTE<1UY
z>Izwm%xF<q2sa(4z<Abx&_EMYGl6l$5VlZ8K{lH($sAN*l@t|nID<i_BQzLtNW?A-
zJdO}En9$P^qfsALwInYOOfz=hzF_(;zatc|+Xm`;y@ErfQfSIdq9Zc7&Z}1eQ50xi
z$pG_=&BW4!@`TQOpa=S$-&y0C*51_K9Naj58gx4y)c^z?@G^T4!p+GAUZE{m6|QMB
z0c0tg)`@0!Lq(g*7MfP$<7_5=a}LXo;*un;&zZ%p%)h+SRe#W8CM#%Y#f~!s0veM^
zLzxyk+a$O>T4~J5NB$J1Gd0AT1lTk~`WvI<X+banmEK!7IpPpaWg3M_<q*8R^#eA0
zAms4xn!e!nZsWAT<;fORSZ_2&Xgb#tnZL+wK-%N+_JuPx^ClY?te76Mx!Nik+-A|#
zRuirYwh7(^$;}W3?eH>35P)ij(+#JM-xzF04L8k$k^6J{4;8UJRa5P#HC9rWQdd*o
zp}t4`l*laDgC1+vq8N@Yhy+3Oe~d+cS;Jp6tMWIpS-&Eb1dD}OGhsI6SclMnNStNM
zf!}OGsT<>sm?H}Zb2NZPLUZW#5JcB3V5o=mGbFYv!hQlEYK~&!T;kt_Bqmwehrv#a
z*>d=^<rt;(ySdzGFc{09?e5OJ&^KiU_-;=)=v8su0PrRY=u~Jc{obA)PoPq(I0b2~
zGuBvcHkGe(nlJa+I3Qh?OhU7$?ykO4`bhft%9<{<$)xV8J_thxtI>W&ch1ykY=+XK
z@N1?3uerQF>NK03(fV@piJl$;0p7!DQ10N%Vx`bu?`SX#86NRPqaRF=7J&yQ?2)do
zs4X*ufKU3|2K8=W+i;}OTvZtWAKz6`Wqw*!&Rc|vkhAr&R%a+w)-tUt>Hu1^hHkn&
z8oj+SLw|QpO)IO{v#m7?jz2NCx()BQRnMhcLB-F0W?f=ko%rRBy)EUTP<ad4INQKx
z=`U^rv;l+khoIoB1<H|nU-WgL@$xTdye#yO#ncLFH+7J@je4A{GBL6vde<xxdKw#o
zQH()sjC#j-ExDH$L%kzLUS2TfCmp68L`S{Y1ZGU~p~D8ksI1^Tq>Esfb<`_7q=$eg
zjdI7{8BsCU_vC(t`(AL29!kFywpuLKFqnPLIm0dMq!-t$1fE5UTuy-oi<H{PxHvej
zGR7OK7cHtC7dNWF?8RtUi#+KJ_w<I#%ERL)p#=!c49=eqUv=;cTb|80o^4sAbD;g!
zXW;u}f7r2V=SsdVShjW|c)Bb&z9&>x7U~%vECVwa#~LC!<zhe!P8SILM~?;6T6!aq
z-lI#GW_|%ak*=sR(;l#1+F5T4wl95QvZE>fyUdz#iG*{GE~*ZUU$A;+Fd7ZcJdQRo
zr&C4$^o{Z3-<XhD@Zr|hKF)0B`dT-Bg7+0BlLGBCytGOBJJ3%#w0f@euL+OOLU)Jy
z9`D1M%$9VCj-V|H4oTO0p`{w^mi;a<5A#1M5hE-BPF@)&#D;KgA&fQ2=A0r2!~s4D
z=c&JRhCVf$)ENNo(rQ%JPb(bsuQZy>XP{4`R$D%;vPs7U2<+j%Tj=uzX-dS0xgO9f
z)az@(N`ra$9FV!iWYpKf3qAC;wFTY^JT{4hUl1e1VjU5-I+$tBiuDx<K+XUQAV={q
zKw`Lcl)+|?+5N1bR48{puTm)u&$&f9p)mfyB}(U`Wwgojte{Y;q+xK2@(&{v+cbE`
zr_maJ3#9vbUKgNeY5kcnl)Qela0YJ!_#cKVN8<ufG9Em^^PonWL_xqLld;Nu8FQn6
zLT|<(wl0Zs`@CL*-o!%+x}aWfSUd5L!+ZWXah-wJ!|XA=H+#HziV-ADf)L82LV{8a
zl1J0)@9UbpQfap<S5EG_Z~e$aO2!N0((EB(Q^l;<ZuDt0W?&90VrV^&{w2&REm}-}
zB0Vfw*c!=#*2>l!z<dC}g3K&1UlOFp*a(;{S*3@-0`OPqF-f4?rB|gtgHGwa_0k^z
z{x7(`ACzGRJ?TB>x6+@b*8nelF8y8l2`H!cNI#K22jd8D0LAVhzIyt6Y5dsRmyH3V
z!t4!WQctf@2NXe(MSnn{f(j566*N7VX{Vn8r*8Cvo%G=FZ(&-O>6{H831{a03Z6GT
zb0;_fuDwLs1iN?MwDZ8t;AXHm)8j|w8Oj`mYZrDM?E-H+bL1KDsdQ{F7yvJ4o|y+H
z{WUYu0iP?f-<Y#leiRx>utO}Sbw}fmKPwkddC9R5`YCJC5~b4A>;tCM+k0P-J}_P5
zcQCc~fb`yp)TJj*T$%!}SCl_iUO|2y+dAvip;=qE&SEZ_we>=HWoPf6w=MztbZ=*7
zhr{m&Pk#0I<6k`vZ@90lva;+xbkoO$<Xelr7d^o!85NtIk37vqix5gGxd($=FL~mU
zOP+vFkWG$nO77Xi58`v#f5qP=M6&|sYZtw2R0X05?+CXk>X*`mFuqiZNwK8^Pz_F%
zqCOmvUKxT<W~L8<`my4J``F9adyt%tqZ@lLTNSWyVI1cZM;}WBe@Ez(L7$I^B(VUC
zq)+U`jHED;#3B%ms!+HSATh!PIFTb55<zsD!B;SUM<T#tKMcA~xh)nhFAD`GCpPdu
zU*0*DW^P!r_~Q3WlWOXvcchQ2BT2!vB+>TX+nuo`^ObsCO<?}3FRYGCoSih;J)H0-
zm>4p1h7*o?Y)!RySi1GABYLxrRX~;B>`>9=zNUa{_ern|RNmHR0Pw!fX&&S3*+xOz
zYFxLurflc<#VMuo7`)i&S1If26>6WO%&$_EmnoJ0VZm{J&t%iMI@+i-`C|V5=MAbG
zZ{&PU^s^60HdkYraZkv(QCnW=Y*aP8xa-kLj#`&XuZal31(9i{4#LwazbhpfMO)BX
zm#~nB2xW9ULBh#NsJw{V2TQeBs7I2n*ccCm(LkjKgliHvEOCTnIfdNTE*hO@@ESlE
zC2;l44pf8c@Z2fNh5OgiFi|_<x~EM&;hNhXstNU&brGNI=Wloe4NV$Wf0s0Hx0ZG2
z>+bm1lRlUJfXZ0C@wd|7_b&}qM;WChzyT#E=+-<5=o2=#n;8cxMp)Kvt&UhsYXob&
zz57D#lAij7CiiU6Vs>z>$;2t_Cefxq0z0d)XJ|#(&a7R_X>V<s<&3NlyVk;A#4HJK
zr&H_Go5s0%ul`klZ8Z5beWtR-I#b9DG@zkmd<WEwYz!9m4T}=WGgFp|(>#J*(;p+;
zaNvqRpy~WZUKeiY*|ufXwCVk8X3c18F<Ty9oJ@wpY)ZQ1@6ttA27*@iw9m&GMW?+X
z8jr7o&fmG>iRm-Oz?uujvQLQ-HZi}<>uHV}O$7?nQFh7|3+G3J<!TKOq)+bEl$Y0!
z>%G)ytg3GBn9<YG3_dJw(o0V?S&e0`6(D>9_|Iu>uBx!!BdwoNT@?tLOuUX^N3{uk
zIteoz@t376V=tlM7Y3blw_3-mr8{&=l_`sXh!#l(DWz6}ltC03;vju0=l4Ou44WoC
zxUz3a9_BfbjopHod_HD_4lKpFgB3bP6i*Q+Yi1~904Q@QWytbx0a`)P8IorXsXvF)
zZ<PT;6cjE&Nul7-$Y(6)Ne!}mU^JJ`<|*5bM<V=V=ASe!LP@FMKGYQ7;g!WzKn;}l
zncsxkGen{hv)u{{$9^9TV_E4Izh|<-k~v;MjvH4dDzus`?56PC%To1==XbTwniV~E
z(+!(8K00a5fUkD>s)^f|Ha5=mcO8=6Eq8Us<G~(!>Xat{jb`qy-MgRnc)UJzz<&PT
zk;5*R&({@5_C%L%y5#4~#qCq4cE$w_chmZHm9&9ow8gx6G@8>jGOKmaNEoNGTljEh
zKK|oU!`ra?6%;btmcm;2-<b<wEVF(1lilzp`oiJ&;T^I)2V?27dx$?|8It^_qcsOb
zHN?rh#bmdvJiE!AT!!Z)fsXBXc}W)YVPeO_0g%`O9($X*v8w?N;8u_?B>RChSin0T
ztJPxxCp{L6$2xqfs;zZ?TN^VoSv$3De%qn8>Z&#{C6a`XtxFBBNUfi!(CQSEmc6-b
zl0v6dfTQ?&TUB)%Q*Ooi$p2n#tCD6{x3yJ+$Ew=I%&JK8&-m!i@^3N%Zv{6cUf8zn
zg~UFcg46D=s@kvR6uQh!xx1=cThaWgL2dCb!V99Od_VzAAOPyYMDQuWIq_rKsRk<-
zQlLtK5Ed;J93Iy@=r#~S0&@o)YQ)M45XNc=bP>y)WCjeyv+4^x_@mh%ftKUwG-oyW
zBd8mrt04~aG~rQ9L4uU54Hk|Bm6EBK#&ZIVrwSnRu%Ou^B+nFRTEzh#Jl2q4@fQiR
zR-D3uli>HD2b?VNlAB%797humn#$45B)%SJMr^EcJT*l-kbIBJW42fu6dYP=;u<mX
z3>I!gq5wyRK2s-X#7jg!kCrFskrtdmLmapuE({=mDKvp+Qt)(GZU~$|ZUQ2R$4CKD
zZZ2A3!g=BXVl5ZZeTDEvqV+<xPRO%nlt9cVvS}^&AvDPrwGeL9Y{uDkcCqkgjf!DK
zb_t_b+my6)8^f?Ptx#}`kpU0_NY6_!NW4X2t_rB9_-)<=UQO7o2O5=G(CGm0vs)O(
zqzUU=IVESY2g}qN0m&LhyT!0h0IEtm4SZ$JatKsLg_>hD3L^j}o6!V-MWqY_9joRo
zYNw?x0jr!IR;6KSmDV&_RpYS7)c_dmRmPCd>$K<~<T#B&N0-fvTg+7!8o0`Jf_0`6
z0#0f6Fpy(dCJ<pO7}J9)1MPMxtN2Km(Q$w_sUtfsud!;h5IvGJ(^d$L(4r53o*9|D
zXbq==w3?<hG`I(<j2x?CIY{$Wf=ct0T1)c^2zf@?#Oi3hO2yI;s3F5Bc_lFLFk!Ml
zh0Pjtgp{FWWyVz@!K(JTYUYd6Of?e&(X#S;lVUPZZDZ9w0MPKQ=I0w-Hgn7q^{I3M
z)Upil(X`KWncudu%UWGc3nul>alN$~1`T|IOQ8%}LZ%COEdv|-!d<bof#&fnk{wng
z7U_`)qES1Yai8E6R6MkV1cOObH=R?_+CDipP80Tcy)+May~E&S&IcmkP*s4Q*628C
zHc%Q_R;h--pr)1hbwlY^!KSx64drT|qM99dp~=*F_tpx?)LtA3x48u^=$P#aSj=5M
zCG7&Bp%KvCc2TcjlB}!3tfG~B^eUQBG<O5g?AF(~A+1q?a?#=fRRKoNYpsBHuu7|5
z1E3LTRYn!hp_0&?n-Li#l`@Rp3V_xi>Q#&ivMj^V3c$BHw3-gLidNV=$Mu$T4>k*{
zls2=wv#d-6Y}ff(4`V%`(nl(2eQSNh)~hrqA*)g}8uXJwN-kpWv6cgItH-=%kwXZ2
zG<22G0ilWodecvp3YwwSoB}{Yf&s#i#;62<1AuYT>_?DOLOsywI7Y{EG-@`$eEp)<
zZnap9CY`{DQ=A5cpenbZZj4@1na2)5n+|nrtx;oLpfQXK22@%`E%<zsy(X5{>8m)K
z)}qn(@<tVBS8^Vn=4u+d!p0vpPVuR121_|+VqX>SHC@-Z@#p94sy2giXVsm(%eHS?
z)B4(i`iT_~`huv@m7=zs4f1mn6Lxn^WWDu%JF1plqnR>M>yEmd8hrt;FGcZ`2g%kE
zs)6dD=3}p)V2Ji(!#U<aqeEfFi)U!7Oy!J55;RPB*pLE`aKNXCvv_Vt2aFgB<GaXM
z(g7M=j5R*O!@p`dgogNyd#?2BpZ#!uyV)cCQaTD2_BGsaXjdr62&;EoawzQq5&G>n
zezBl(!;Qm#M-w`n`P^62X71ZE{^E&k`uFG~KxOKgx_i7`gep2PeL`<rtlFi%xMXb>
zz;|-y=?ku%t~m;CsP8ye!C&(3qD8kY?d5fV{m-}V>-zlWPutv|zCZOZ^aTK1f3NuP
zn~w4EHnZgW;Cn!8Pc~03i&b$})V*l5VqoEmW8q6?+pmLKiq|9&x(;B5;b;RP*Uhp>
zLmaQ_#)}ZMOiG-yS#&^|7!3UdFp*wDR^MZEJ;ownY(3_taLdB!^#iW5DnWm^y0;=w
z<EU%i_-KD`YC}(G%KWw?=U6;_UC~+fRSo40(f@g9@)aAp!Mb<v+&eIR@^#XwA8s)8
zWe)(055Vsl=EQ4k8k<64FgT3UZC;-(S({iCad&Q*+`hOi$OkOEsUjTp)Yf|1YM1N_
zPS|$%&UgC^8-57b>n2Yh*ef4Mr|?0(4HzQZx5@Y`IrI~&3QuJ@*aC|iM2VBF3C+92
zOjVB;0a^SLH$Xq^OPLdmH^(w3Vlg;1b~FZ5(&m#@&8?L?s;a<ISCA`f3&V9Vws!~5
zXF^630|l+LhUa(cYWQK;p|65e{$BJGlfINTovf<dS<%{3g_$XtO1O@W9fj>X^i}#y
zNDrVE9Mf0vJM{Wt*r^|(e;~fh!BO6mXTfR3c3&bRgQ2WNG=DT0a(qop9xVDzGsK=c
zOc5e^NGzqqUP|+YM4>!CBTKPE1W8l2@`P!>S+tl<C94Y5fy9`f&N9f6cx=?{xi}o`
z{1GkxbM2R^kR#n48H{wN9U;}1wSO*;Rx}v^HF-5it)2`hgVew8`}_8N9}HDARfBo^
zrStWIBP4x>DV%{J<Ph}Ww*As0)lC)UHjrAkPD<J6etg3|xvUH>Ymj)yW`$e-8Mbnp
z<#E!eroN_R_mXb%hxRx2!BpQyX^51DPD(O&U;pq%Qj*uCad=A~mI!Vk80_1)5xiU|
zM^69c#Xj*JSVfRy+Ji`pvRDJfiXIj$H5kk5D(1J_0&T4UTl@UVNV(C#EG!vRJ_NtB
zOzC$!kc3iEQRV{<cmEX2wPTD6HE2EYCVLw7qsdr@N=W3;AkfeOf@mngv1j2RiF;;=
zt8Ora-72wMnFtcUT{eL~i6Ft!VTp6B)xxG1-}csrZ{4<7-hd5^L3&%K=cTuwQhU@-
zNpJIdo%FVWVO38(rD7Qa2%w7~@RZ7@dI|*4MG(kdgqlJ&XcN=3{n9H2wVGS{l}`87
zQckTlfQEinZ`6MEmCk^!f(H4jRx4kXUO`t4y05;{X4iT@VlSlx)I+Ht9?S4h#zC2I
zJP;&Ixr8S)9w4GIhS|W*yhQS5K8ZIyE&b}LfnT0p^~lG252Hykv{br$=yptdyX6HS
z+)`r{yz>_y`TE9-F06F(ioc@T#Gg*z*Csvoo4p@DvTE1QUi!zyuYj`KZvoa{@8)1-
zrF+J!TW<XNNK|n16*9&cm(JRZt4RbP{)EW~T&iUl6>pL(LbQOZioalV<!f?<!`xi=
z%P@S@FhScOR!(q#0Skj*X?RW#a{X+Y>ZT@<=(uXM;Kd^$?gl)AO_II{tjp0sc7iN%
zMJq6d@%P~-NIhAg9^l2n{ak;@G1T*#C<<}m=d3B&y?k6Mdj8~AUjK}#%qEJo@mDP}
z<i>F^)F>XOryUm?L*nrvhcqFR`T<b?0G`trdSv_SVxuUEFR+G6j{}3WIm2Nc|Ek#_
z#7uwQJcuh6l5do=k$w-U%YX0#^nsr~O##JjW+HV3@wMaRwVO5ShDZW{XmQ7KAv7b>
zNG7nF2$6@M!*z_%XkkSVY>=daXGZ+%q8kz&3_)}tODx=1&^pFMP+73H4q&|=T8khV
z1X_b=-J;lSJ#MR<p*6aVNh~K^(|{Ht%Bs+5%9b>lTz$=5Hd<{H^+3Tef`7}zqnpmP
z+138_1J|^1G^4Kqg4V*a2BoP{ZzzvfSCr`>C#cjc<Q1H~O(z)5vG320nVd+bM{+!8
z<duT2sw3D|#~?`@awawKgc~^etK|Eh*h+V0g}EISV&6HeKIF19tVydi&mUi>1gy<J
zzFKeRSdnHbyLxOkb;Y%VfV;+EVL1`Wm<+8kH>@iwZ(CSj#sX!aWngkew@&L*L5rwy
zK%ixfZf{HDqL8M;SLaqi#!<bvV_>IRPtySXgREX9a~MC&eaTLx)MV7Fqvla-s7uio
znO_HEzGAYA7M<1{_9kl9U<3rv`VD`KiFhE0*1Bk9#4)b|I>d`W7j_K8hHv!gk_9Dn
zfh>4u9IYwkg=CPNBd5Z6K`SrI;XT;AI>T%cdS`7_s&st0!sy~%Cu;v|!@5~@b+518
zunesX2c^?T{v`c@R}BJi<WC?7LQ@X^M9N6-OaJrM-m6j%fkjigY8j5#bKF(`8L6#>
zEU(r!FX`Pn*Dflnt*Bt8g`Ku4hIQE5z`O;~u&N>MP?iNcIv!n6Hcsm<+x7XdZ-Sn8
zczxqN&f9cOmeuIoJgZr{sz2a+ZrQm@oaHCl`fr@TTR%P`Z?5gVZr?yh&-Q25Zvjl|
zp(~~&ujjR>8^G4~&Mi7#gL+iU8n|rft|s(!REExe9eTR0lGV-Z&unozga+sAr+UZ7
z1kT-5$2q3v{CxWrDdrfZLZf9F6+$Csi#%qA(JI>oXrl=#Ff$~JMJ6<68ZBVt#d-`1
zh24C}MT!nyeAP8OmLIa)4@pm6e;J_R4^pY?pM0LKD4c)#$mN$`Mt5Cy{gXch^gTU2
z?N6*;{RI82^x%`y?<XAl#fxCvEysTG%cB!O#ZzFOceth`#jP*=?Dm@_buNKNdhP!K
z7fY+P0C?JCU}RumU}k8(kY?%>&u{aUft#HH1kT>Gxd@~G|Nqax-oOUpaxgG~C;(^V
z4C(*?0C?JCU}RumWB7NMfq}i@KM=4tFaSl60b>gQsZ$4Y0C?JkRJ~5bFbsB^q>+FM
z78V#lh=GAy_!DDa05(P>!~-BC!~j#olkrgO@cCjlPVP=r`sCKJ9s9Fgm*|!7^bbVc
zcSfXDIAAcc2f74M2C?rY<U^KxX8pULrF>-H!JP3sBd{*jXTS&aFKRQW4`qAk4uX8c
z_d;#ff&F}rJ+YmW@A>W$hjm*)^E5Wz+#mmg<l?DFTW_p&pTXvC&WD~l<arIeZ>nt#
zCW&*+h($k!G;{Z9xd}Dzd!gw?6)%}OGMAIBd1!br_mfM8htiX|ZYwp{P|nYt<w$Fx
zDrR5hya|c+rS8!5eoy2Z^qtuFc9wwMD(^&xQF(82^wP^d(bNlXs`E{*ct5N5F6A8B
znTe+UU^tD2vrzV`^e2@Z5o-aA=)oNWxh;VCTkr6x?ESop#|`hs);D{oablhm-oFvw
z3-RrdW3QZud}5w}XZQyO?7Kl?!+zBL#Jht$UDt2nWk+{kbzMEDH>$_Ij`81qnciKw
zFGz>^NOZKE6{6cfGP8+J7|<^<D9ry1IOG{Lb2WvuT8G?wFaKc25I%LE)oy!e_9>YE
z5bV!IavzRk`u(+gnx8)a?q!Jp0C?JCU|<j<1IjT3Fic{&!sx_Uz_^Zyfysthg}I5v
zgXJ8{FIF4YWvqYLLfDS5r?LOx2;rE-@qp8Va|P!=t{|=nT(`J&xM%UW@Ko@e;x*%q
z;a$S#!ncB7jNgZUnLva<m%t-IEx}bnE<)RcD?}_rrigqH^%7ko<|lSQ+(<l4e3SS$
z2^EO|i5Zdtl6{gtq!OeiNL`a=lU9-rlP-~7BK=B6O2$W~OlFD92U!)_I@tqqT5?VD
zO!67>d*uHqm?`8btWbEQsHRw^cuet+l7v!$(jH|s<r&J4R4h~us0yg2sVS)KQTwBw
zpx&dtM?*`aNn@GD8%-t62+cKGJX%g#%e47)@^qf)R_Tf8S?NvE`=IZj-=Y7^z{OyV
zVV&V4qa33L#zMwH#%D~VOzcedn0zy}Fr8z@U>0V!#$3sKlSP2V1IrrAQ&wVDNmd(d
z_u28;<=9QLdte`Af5RciVV1)c$4yQWP8Cj%oEe;5oY%QTxx90o=2ql(#ofhylZTwg
zI!`yxMV<#d?|J_5lJfHLYVexpwZ~h;JH~sRkC)F0UoGE#zCZjj{NDJx`JV`o2*?W9
z7w8hWDezs8QBYRUiD09UGhrNIlfr(5`-E47ABhl%h>2Jc@g>qBGAnXQ<i5xkQ3g?U
zQG23UqRpZwMZb#)iz$iO5o;D(5&J04A+96tTYO6Vp#+sgw#1esjiijE3&}>w4auvL
z|E1)l+N4fNy_Uw6R+4rnohN--`m>CPj0qWEGLtelWj@GK$V$jsl=UcEDBB`?Q}(MI
zpPUIfmvS9)%W}`;{>yXAtH@iC_blHgzajrpfk;7I!HR-Ug;j-@ib9Ik6!R5#mFShM
zD!EpwQ@Wx|scccXQu%@kxr!x~8dVn62GwQN7itu0(rPx<^3^)kmefhq9jN<N?^Rz?
zKd=5o{ig=6hN6Za&Bt2OT3)pJwa#dL*JjjK)b^s?qP?d5S;v~ry3R*12mk<%9Yg>C
z0C?JCU}RumY-f^W5MclTCLm@6LIws0FrNVc6$1eM0C?JMkjqZOKoo}m5xfwiD??m1
z#<*~SZH+Nu2P$4dgdjn;<x(L^A#J_jWB33rT=*cabm!71@HzZ@Iz=#KGH1T?&&+?$
z41g89A_bMs0I)e@R>(4oc@C>M(VW5t8k*DC!lUMSY~n@p0`I<SUZnfC<|VAFC(RkG
zsb|g0*j8_vKaf>lnm=KxA6(!RWf-Vnhz>kb2?MSnsf-?4q6UlxEaW(o{Q@4S2F&_g
zYn<1(!z~>6JX66r>U1ceh&;18wIf`iO0G#Z%f<NT(_rRvw<o6!?6L!!(<IxB7M0mf
zRXTL&5qIu0y5eQ<<UnFqb`F>gG2%{-b-VKJ=uV52RCT%f6L;M44~5hnw5j%`-y3QU
z)lmGJe8-=Q$2HVH8t@GzagAK2J3pkuz0^4-d2}C1Um^R<V}~QD?@ZmxNu^6tbD~2_
zek)Sj%+A=6C#o&cq~jj;8Et0cKm7%1;%L?Y0C?JMR|Rw=#}VCMJIlL*Gjq&r>!iEW
zo%zhnOyhyxow=Qvo*R&~3ZoNq9EX{inVH#PW(J2jajJV}1uxN)x~h5_s;htfYE`JB
ze;!<}TwnP=Ke$yj6{=K0mAfjpS8l7^S-A&Q7^tC+2AXK0jSjl#VFHttJ1X~9?#2|R
zu>reaSL}w}u?P0VUf3J^U|;Nq{c!*uf&+074#puk6o=t(9DyTo6pqF*I2Om@c+6lU
zW-*6N*o-Zh$5w2^2{;ia;bfeGQ*j!$<8+*XGjSHq#yL0_=iz)@fD3UEF2*Ie6qn(0
zT!AZb6|TlLxE9ypdfb2;aT9KaiCbX7h65J@eGK5i#|{h;AVdU-7&|Kyl?N(4BuJ4V
z#{w3ygb|kUP&^C|$0P7aJPMD-WAIo!4v)tZa4VjOC*d~SjyrHC?!w);2T#Vmcna>r
zQ}HxB9nZis@hm(W&%tx?JUkySzzgvrycjRROYt(i9IwDD@hZF;ufc2aI=milz#H)<
zycuu7Tk$r$9q+(9@h-d@@4<WVKD-|vzz6Xmd>9|WNAWRy9G}1^@hN;7pTTGGIeZ>p
zz!z~pzJxF1EBGqDhOgrr_$I!EZ{s`oF20BF;|KU5euN+6C-^CThM(gX_$7XYU*k9U
zEgrz{@O%6Lf5e~gXZ!_!#ozFE`~&~QzwmGT2M<z(KtxqCs77^aP?K8JrVe$fM-wzj
zQ#4H*XcyX*cB9>CkIF%`C+$Uh(>}B>?MM650rU_$kPf1Q=@2@U4x_{A2s)CEqNC{;
zI+l*3<7tLA(k#u<CfZC}Xr8vxHadY$q?71mI)zT9(`Y-LPG``WbQYaW=g_%y9-U7Y
z(1mmnT}+qIrF0oxPFK*CbQN7q*U+_e9bHd1(2aBx-ApFkLKfMT`^h1f1ode^9{IF`
zh7?dp5lM<^Cnc0pMma51?rY?cKQps^M#<TknX%kh%GpxRm2y)lH<xltDd$VMwUpaR
zxxJ9HXBTp_mS^!kwLxH|X)VlC->Ij<N*u2#q6HDiSkyeWGb7Ecq^%lLgmE@9@>C>7
z-w(oO=9z(&3<PCfL+O5+ksQ_&5y}P8Se7z0{ivy>%(JTO_v@)Yh^(OM$U!Yjtkg3+
z8Hy&aCQK{HjLZ*(kx0w!x^giJSW(^0u~E-sC2D?T%cV{nSR>Q%6DJV7XDqC&k%)dG
zQm?68(F+FB85;e-8npQ^ZtTfOr0oS6<e@OxpH8W&4O*q1$Mv0wBVEz3EiJ2=H8A)u
zHEbz|P1S@}GOWdkA7ypN3PoZWeHmr^J#g!OW(B^}$;47-dcq%gSzGIizMFY%{x*or
zK=iY2p*kYUMA9jYL=Ep1`i?x!{Qk&LXX*Hn%j1f9rLM<L^esoIsF@4CD`X?~oh(m8
zJr<GU2kp>`P35ad>Xxe(<Os8$!u7LS>RE}XIiBDMsSE3+nTSo>a)ygm;`aI$hj45)
z$BLnXUW+XT0RuzEjlN7&e^(D58+xVEsEHlI$-2DHLL!Tk_r``kLMsmP)KtJ|hkjJ5
zodQH!Z^)sRy`8z>knlWZwfv|ri)pEo2oa^8%zEXt0u?QuSZHnAipHvyByv&v(J55z
zMYGWJxcsgWp+lr_#O|d2vM~F35OhmD4Xq%U5=%~Ch1QB&#=!40?1a_l97#k|j2LKq
z8!e?cflNi0qZ0YiKo75RJR{L`tUyGrmDCd}a%I?XWEk=t*F$R%iL5=2S01m#QTfMk
z&lZKqdVKUaR!cgZu-!hRP$b1>ozhS)OqPx>h$QoQ$LZ4cWa2L~e666xh&LTiEs`zz
z8RN1DyaJhmy|%gq;!WN>k=3CX8Jx{&vvfJ_WnLcIDf_AdH(6TBU1hg4k$6_n?`U=@
zIHjT1Ws2wpel%oo7NKm!dFt`8dYnBXVcIa&XH6k~ROiiOZ`2w1yn|ifpkN2JO)X#?
zaBx+=cQnL{jV8v)TbOM<pxCTDaC3atda-gnj}(V=7-F0>D!^_vNz<z5a#AoFICzm^
ziy-JYDy)4DY$n<sUt@`GttzxNw3f$3j|#|ifk<-|ksH?a=mjR%b>;E;NopD9aA}MB
zV!}D^)iNs`rgdgiK1|C_e9?ETRJ0Xxi#(|f5}C(_ie-&4lDl<VSj-SrC(rmQV~&ay
zYy9}Jky;C)t>R<a4AdbbP9}^e$^()CGe+VMMdtB>1Fw}cFD1OJU?1#2)EK<J!!(~e
z!xmp7`@`uwv7+g)PYt9T@M%^!ptGi<#&;-2ZH~Ff^hukA%1K%%I*AKa$BOfYDLhJz
zR3;2HZi+n78Yj=Vvgx8S#+t!?O9sq<@$Yg;vL)Yfr-ZW_*&Rb$R}|*>jPaTY=GG=-
zJK?*xm=T%t+JSPyWLVfu<^{gzftb)CHpdmLTbKn>8>*C=q1)lPnI}^YzG$YopQ#&b
zDp08%>kbzxA-KXwW@S|=bvaQ-uya4)6AYR>IaYP2Wre)E6*;0F3U}ydoxXC3ciAD>
zb-{JOD`=`e(-+gO%xwjwNJU)ZZ(UD;zja-Vzjd}cS9^7SXU)Xsct(45Xu}ohkjq9r
zuwo@NP_k|)ZFMf4jolL88gK2Lxy;I?3$?gsK5Z27VT!ReuKvNOT~YxDW@;@3Y8qNY
zgUW7;rC4QQal3qhaWSrzhU`eK&#4tvL*X?B%yqHlHksx$E}H5sp+-(<MN<o-*==%+
zxq4ZFp<WCv?GO(OCRg~bBp@b}qFCtsH5_KKmYSl<<xr6gqtY;E=eKp%RF+Pfb4GId
z`Z2>gw+oGjZJq1J`SP-goi7~01yn7l!Z@+2n)>18`66&9#)YQvW?GdflhMQ&%Kg;i
zh$c*SLKU7R$7O;lt4%t7v}{<{QxeqLE=5plZB0;K76zLQCr#(-j7_G@cEPG8h?$wV
zI_|=F_v6%0*A%4bmA-M&GR(P|xt4zVsrBpJ$^K5Pz8rM9E+}7jHUq&)uV7dx8nMN9
z{fyAGu2aIC+c?`UO1`cLoc5g7s<IUTSw#v%SB;*piae<f?6{hzZq<*H>W+9+b)r#q
zm@HQ9%u&x|(OSvbDa}K+0!HjvHfN+cH@j`aN^iz=YUi0qcmLlmb*$dFTXXRAI!kkt
zIXAaSHJiI5uBN$N9;7skCBEj?()j7IGDZcn;WAkGQO%UjFTF8&@f(ZnL1KmVKEG*)
zN!4<hIyTO4oUr}O&Q<8kYhWe}l1?FX*JL1hqtz<aTVv<(+OG;%Q)}!Z#TWURD;LuS
zr)eU6x5kN)FR`1xt!hg;9K~GJWS*oubG|Wt4lq<?z0b592tzfhfM<SOO>=d%TedXR
wKR5n@sM`5}7KXJ&;oFk`aftYr2h7i^W==Jm{tIe%siXh^0003|xQtN%02oC%ivR!s

diff --git a/docs/_themes/sphinx_rtd_theme/static/js/theme.js b/docs/_themes/sphinx_rtd_theme/static/js/theme.js
deleted file mode 100755
index 58e514c0c..000000000
--- a/docs/_themes/sphinx_rtd_theme/static/js/theme.js
+++ /dev/null
@@ -1,16 +0,0 @@
-$( document ).ready(function() {
-  // Shift nav in mobile when clicking the menu.
-  $("[data-toggle='wy-nav-top']").click(function() {
-    $("[data-toggle='wy-nav-shift']").toggleClass("shift");
-    $("[data-toggle='rst-versions']").toggleClass("shift");
-  });
-  // Close menu when you click a link.
-  $(".wy-menu-vertical .current ul li a").click(function() {
-    $("[data-toggle='wy-nav-shift']").removeClass("shift");
-    $("[data-toggle='rst-versions']").toggleClass("shift");
-  });
-  $("[data-toggle='rst-current-version']").click(function() {
-    $("[data-toggle='rst-versions']").toggleClass("shift-up");
-  });
-  $("table.docutils:not(.field-list").wrap("<div class='wy-table-responsive'></div>");
-});
diff --git a/docs/_themes/sphinx_rtd_theme/theme.conf b/docs/_themes/sphinx_rtd_theme/theme.conf
deleted file mode 100755
index 173ca698f..000000000
--- a/docs/_themes/sphinx_rtd_theme/theme.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[theme]
-inherit = basic
-stylesheet = css/theme.css
-
-[options]
-typekit_id = hiw1hhg
-analytics_id =
-canonical_url =
\ No newline at end of file
diff --git a/docs/_themes/sphinx_rtd_theme/versions.html b/docs/_themes/sphinx_rtd_theme/versions.html
deleted file mode 100755
index 93319be89..000000000
--- a/docs/_themes/sphinx_rtd_theme/versions.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% if READTHEDOCS %}
-{# Add rst-badge after rst-versions for small badge style. #}
-  <div class="rst-versions" data-toggle="rst-versions">
-    <span class="rst-current-version" data-toggle="rst-current-version">
-      <span class="icon icon-book"> Read the Docs</span>
-      v: {{ current_version }} 
-      <span class="icon icon-caret-down"></span>
-    </span>
-    <div class="rst-other-versions">
-      <dl>
-        <dt>Versions</dt>
-        {% for slug, url in versions %}
-          <dd><a href="http://github.com/%7B%7B%20url%20%7D%7D">{{ slug }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>Downloads</dt>
-        {% for type, url in downloads %}
-          <dd><a href="http://github.com/%7B%7B%20url%20%7D%7D">{{ type }}</a></dd>
-        {% endfor %}
-      </dl>
-      <dl>
-        <dt>On Read the Docs</dt>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/?fromdocs={{ slug }}">Project Home</a>
-          </dd>
-          <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/builds/{{ slug }}/?fromdocs={{ slug }}">Builds</a>
-          </dd>
-      </dl>
-      <hr/>
-      Free document hosting provided by <a href="http://www.readthedocs.org/">Read the Docs</a>.
-
-    </div>
-  </div>
-{% endif %}
-
diff --git a/docs/conf.py b/docs/conf.py
index cddd35dbf..468e71e06 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,6 +13,10 @@
 
 import sys, os
 
+import sphinx_rtd_theme
+
+import mongoengine
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -44,7 +48,6 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-import mongoengine
 # The short X.Y version.
 version = mongoengine.get_version()
 # The full version, including alpha/beta/rc tags.
@@ -97,10 +100,12 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+    'canonical_url': 'http://docs.mongoengine.org/en/latest/'
+}
 
 # Add any paths that contain custom themes here, relative to this directory.
-html_theme_path = ['_themes']
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
@@ -199,7 +204,3 @@
 #latex_use_modindex = True
 
 autoclass_content = 'both'
-
-html_theme_options = dict(
-    canonical_url='http://docs.mongoengine.org/en/latest/'
-)
diff --git a/requirements.txt b/requirements.txt
index 854ed26d5..4e3ea9402 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,5 @@ pymongo>=2.7.1
 six==1.10.0
 flake8
 flake8-import-order
+Sphinx==1.5.5
+sphinx-rtd-theme==0.2.4

From e2a0b42d03a00f1295d1313abe05fdc4f9e66dad Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 30 Apr 2017 18:29:17 -0400
Subject: [PATCH 0493/1519] clarify test_get_changed_fields_query_count

---
 tests/queryset/queryset.py | 48 ++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 3ae3fb423..7b12625c4 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -917,7 +917,9 @@ class Author(Document):
         self.assertEqual(Blog.objects.count(), 3)
 
     def test_get_changed_fields_query_count(self):
-
+        """Make sure we don't perform unnecessary db operations when
+        none of document's fields were updated.
+        """
         class Person(Document):
             name = StringField()
             owns = ListField(ReferenceField('Organization'))
@@ -925,8 +927,8 @@ class Person(Document):
 
         class Organization(Document):
             name = StringField()
-            owner = ReferenceField('Person')
-            employees = ListField(ReferenceField('Person'))
+            owner = ReferenceField(Person)
+            employees = ListField(ReferenceField(Person))
 
         class Project(Document):
             name = StringField()
@@ -945,35 +947,35 @@ class Project(Document):
         with query_counter() as q:
             self.assertEqual(q, 0)
 
-            fresh_o1 = Organization.objects.get(id=o1.id)
-            self.assertEqual(1, q)
-            fresh_o1._get_changed_fields()
-            self.assertEqual(1, q)
-
-        with query_counter() as q:
-            self.assertEqual(q, 0)
-
-            fresh_o1 = Organization.objects.get(id=o1.id)
-            fresh_o1.save()   # No changes, does nothing
+            # Fetching a document should result in a query.
+            org = Organization.objects.get(id=o1.id)
+            self.assertEqual(q, 1)
 
+            # Checking changed fields of a newly fetched document should not
+            # result in a query.
+            org._get_changed_fields()
             self.assertEqual(q, 1)
 
+        # Saving a doc without changing any of its fields should not result
+        # in a query (with or without cascade=False).
+        org = Organization.objects.get(id=o1.id)
         with query_counter() as q:
+            org.save()
             self.assertEqual(q, 0)
 
-            fresh_o1 = Organization.objects.get(id=o1.id)
-            fresh_o1.save(cascade=False)  # No changes, does nothing
-
-            self.assertEqual(q, 1)
-
+        org = Organization.objects.get(id=o1.id)
         with query_counter() as q:
+            org.save(cascade=False)
             self.assertEqual(q, 0)
 
-            fresh_o1 = Organization.objects.get(id=o1.id)
-            fresh_o1.employees.append(p2)  # Dereferences
-            fresh_o1.save(cascade=False)   # Saves
-
-            self.assertEqual(q, 3)
+        # Saving a doc after you append a reference to it should result in
+        # two db operations (a query for the reference and an update).
+        # TODO dereferencing of p2 shouldn't be necessary.
+        org = Organization.objects.get(id=o1.id)
+        with query_counter() as q:
+            org.employees.append(p2)  # dereferences p2
+            org.save()  # saves the org
+            self.assertEqual(q, 2)
 
     @skip_pymongo3
     def test_slave_okay(self):

From 2cf23e33e343ab4b717f220dd6400078b81c51c8 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 7 May 2017 19:26:10 -0400
Subject: [PATCH 0494/1519] Document._get_update_doc helper method

---
 mongoengine/document.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index ad9762169..4babd1b90 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -300,7 +300,7 @@ def save(self, force_insert=False, validate=True, clean=True,
         created.
 
         :param force_insert: only try to create a new document, don't allow
-            updates of existing documents
+            updates of existing documents.
         :param validate: validates the document; set to ``False`` to skip.
         :param clean: call the document clean method, requires `validate` to be
             True.
@@ -441,6 +441,21 @@ def _save_create(self, doc, force_insert, write_concern):
 
         return object_id
 
+    def _get_update_doc(self):
+        """Return a dict containing all the $set and $unset operations
+        that should be sent to MongoDB based on the changes made to this
+        Document.
+        """
+        updates, removals = self._delta()
+
+        update_doc = {}
+        if updates:
+            update_doc['$set'] = updates
+        if removals:
+            update_doc['$unset'] = removals
+
+        return update_doc
+
     def _save_update(self, doc, save_condition, write_concern):
         """Update an existing document.
 
@@ -466,15 +481,10 @@ def _save_update(self, doc, save_condition, write_concern):
                 val = val[ak]
             select_dict['.'.join(actual_key)] = val
 
-        updates, removals = self._delta()
-        update_query = {}
-        if updates:
-            update_query['$set'] = updates
-        if removals:
-            update_query['$unset'] = removals
-        if updates or removals:
+        update_doc = self._get_update_doc()
+        if update_doc:
             upsert = save_condition is None
-            last_error = collection.update(select_dict, update_query,
+            last_error = collection.update(select_dict, update_doc,
                                            upsert=upsert, **write_concern)
             if not upsert and last_error['n'] == 0:
                 raise SaveConditionError('Race condition preventing'

From 944d1c0a4ab817a9f0dcd124bbf8456520367e8b Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 7 May 2017 19:54:58 -0400
Subject: [PATCH 0495/1519] use a newer pypy3
 (https://github.com/travis-ci/travis-ci/issues/6277)

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 474489508..bb6cd7218 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,8 @@ python:
 - 2.7
 - 3.5
 - pypy
-- pypy3
+- pypy3.3-5.2-alpha1
+
 
 env:
 - MONGODB=2.6 PYMONGO=2.7

From c00914bea2951d53a9b8021e3facf406e8d9109e Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 7 May 2017 20:32:52 -0400
Subject: [PATCH 0496/1519] fix tox.ini

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 7f0d36e41..54f0cc2e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg30}
+envlist = {py27,py35,pypy,pypy33-52-alpha1}-{mg27,mg28,mg30}
 
 [testenv]
 commands =

From 03ff61d11339ac2dccead188a0afaaf1ea6b7066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 7 May 2017 21:11:14 -0400
Subject: [PATCH 0497/1519] better db_field validation (#1547)

---
 mongoengine/base/fields.py | 9 ++++++++-
 tests/document/instance.py | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 5658b1856..e2b5d3210 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -81,7 +81,14 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self.sparse = sparse
         self._owner_document = None
 
-        # Validate the db_field
+        # Make sure db_field is a string (if it's explicitly defined).
+        if (
+            self.db_field is not None and
+            not isinstance(self.db_field, six.string_types)
+        ):
+            raise TypeError('db_field should be a string.')
+
+        # Make sure db_field doesn't contain any forbidden characters.
         if isinstance(self.db_field, six.string_types) and (
             '.' in self.db_field or
             '\0' in self.db_field or
diff --git a/tests/document/instance.py b/tests/document/instance.py
index c98b14055..37bbe3373 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -242,7 +242,7 @@ class Zoo(Document):
         Zoo.drop_collection()
 
         class Zoo(Document):
-            animals = ListField(GenericReferenceField(Animal))
+            animals = ListField(GenericReferenceField())
 
         # Save a reference to each animal
         zoo = Zoo(animals=Animal.objects)

From 009059def407b63db38c317258db1df88084e2eb Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 7 May 2017 21:29:13 -0400
Subject: [PATCH 0498/1519] revert #1497

---
 mongoengine/dereference.py |  5 ---
 mongoengine/fields.py      | 11 +-----
 tests/fields/fields.py     | 70 ++------------------------------------
 tests/test_dereference.py  | 70 --------------------------------------
 4 files changed, 3 insertions(+), 153 deletions(-)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index f30b2c156..59204d4d6 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -1,4 +1,3 @@
-from collections import OrderedDict
 from bson import DBRef, SON
 import six
 
@@ -202,10 +201,6 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
             as_tuple = isinstance(items, tuple)
             iterator = enumerate(items)
             data = []
-        elif isinstance(items, OrderedDict):
-            is_list = False
-            iterator = items.iteritems()
-            data = OrderedDict()
         else:
             is_list = False
             iterator = items.iteritems()
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 0010f8185..c34fe1b1c 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -6,7 +6,6 @@
 import time
 import uuid
 import warnings
-from collections import Mapping
 from operator import itemgetter
 
 from bson import Binary, DBRef, ObjectId, SON
@@ -705,14 +704,6 @@ class DynamicField(BaseField):
 
     Used by :class:`~mongoengine.DynamicDocument` to handle dynamic data"""
 
-    def __init__(self, container_class=dict, *args, **kwargs):
-        self._container_cls = container_class
-        if not issubclass(self._container_cls, Mapping):
-            self.error('The class that is specified in `container_class` parameter '
-                       'must be a subclass of `dict`.')
-
-        super(DynamicField, self).__init__(*args, **kwargs)
-
     def to_mongo(self, value, use_db_field=True, fields=None):
         """Convert a Python type to a MongoDB compatible type.
         """
@@ -738,7 +729,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
             is_list = True
             value = {k: v for k, v in enumerate(value)}
 
-        data = self._container_cls()
+        data = {}
         for k, v in value.iteritems():
             data[k] = self.to_mongo(v, use_db_field, fields)
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 806062561..60c8370a2 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -5,11 +5,9 @@
 import math
 import itertools
 import re
-import pymongo
 import sys
 
 from nose.plugins.skip import SkipTest
-from collections import OrderedDict
 import six
 
 try:
@@ -28,12 +26,9 @@
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.base import (BaseDict, BaseField, EmbeddedDocumentList,
-                              _document_registry, TopLevelDocumentMetaclass)
+                              _document_registry)
 
-from tests.utils import MongoDBTestCase, MONGO_TEST_DB
-from mongoengine.python_support import IS_PYMONGO_3
-if IS_PYMONGO_3:
-    from bson import CodecOptions
+from tests.utils import MongoDBTestCase
 
 __all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")
 
@@ -4188,67 +4183,6 @@ class CustomData(Document):
         self.assertTrue(hasattr(CustomData.c_field, 'custom_data'))
         self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
 
-    def test_dynamicfield_with_container_class(self):
-        """
-        Tests that object can be stored in order by DynamicField class
-        with container_class parameter.
-        """
-        raw_data = [('d', 1), ('c', 2), ('b', 3), ('a', 4)]
-
-        class Doc(Document):
-            ordered_data = DynamicField(container_class=OrderedDict)
-            unordered_data = DynamicField()
-
-        Doc.drop_collection()
-
-        doc = Doc(ordered_data=OrderedDict(raw_data), unordered_data=dict(raw_data)).save()
-
-        # checks that the data is in order
-        self.assertEqual(type(doc.ordered_data), OrderedDict)
-        self.assertEqual(type(doc.unordered_data), dict)
-        self.assertEqual(','.join(doc.ordered_data.keys()), 'd,c,b,a')
-
-        # checks that the data is stored to the database in order
-        pymongo_db = pymongo.MongoClient()[MONGO_TEST_DB]
-        if IS_PYMONGO_3:
-            codec_option = CodecOptions(document_class=OrderedDict)
-            db_doc = pymongo_db.doc.with_options(codec_options=codec_option).find_one()
-        else:
-            db_doc = pymongo_db.doc.find_one(as_class=OrderedDict)
-
-        self.assertEqual(','.join(doc.ordered_data.keys()), 'd,c,b,a')
-
-    def test_dynamicfield_with_wrong_container_class(self):
-        with self.assertRaises(ValidationError):
-            class DocWithInvalidField:
-                data = DynamicField(container_class=list)
-
-    def test_dynamicfield_with_wrong_container_class_and_reload_docuemnt(self):
-        # This is because 'codec_options' is supported on pymongo3 or later
-        if IS_PYMONGO_3:
-            class OrderedDocument(Document):
-                my_metaclass = TopLevelDocumentMetaclass
-                __metaclass__ = TopLevelDocumentMetaclass
-
-                @classmethod
-                def _get_collection(cls):
-                    collection = super(OrderedDocument, cls)._get_collection()
-                    opts = CodecOptions(document_class=OrderedDict)
-
-                    return collection.with_options(codec_options=opts)
-
-            raw_data = [('d', 1), ('c', 2), ('b', 3), ('a', 4)]
-
-            class Doc(OrderedDocument):
-                data = DynamicField(container_class=OrderedDict)
-
-            Doc.drop_collection()
-
-            doc = Doc(data=OrderedDict(raw_data)).save()
-            doc.reload()
-
-            self.assertEqual(type(doc.data), OrderedDict)
-            self.assertEqual(','.join(doc.data.keys()), 'd,c,b,a')
 
 class CachedReferenceFieldTest(MongoDBTestCase):
 
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 9a9766112..7f58a85b0 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -2,15 +2,10 @@
 import unittest
 
 from bson import DBRef, ObjectId
-from collections import OrderedDict
 
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.context_managers import query_counter
-from mongoengine.python_support import IS_PYMONGO_3
-from mongoengine.base import TopLevelDocumentMetaclass
-if IS_PYMONGO_3:
-    from bson import CodecOptions
 
 
 class FieldTest(unittest.TestCase):
@@ -1292,70 +1287,5 @@ class Playlist(Document):
 
             self.assertEqual(q, 2)
 
-    def test_dynamic_field_dereference(self):
-        class Merchandise(Document):
-            name = StringField()
-            price = IntField()
-
-        class Store(Document):
-            merchandises = DynamicField()
-
-        Merchandise.drop_collection()
-        Store.drop_collection()
-
-        merchandises = {
-            '#1': Merchandise(name='foo', price=100).save(),
-            '#2': Merchandise(name='bar', price=120).save(),
-            '#3': Merchandise(name='baz', price=110).save(),
-        }
-        Store(merchandises=merchandises).save()
-
-        store = Store.objects().first()
-        for obj in store.merchandises.values():
-            self.assertFalse(isinstance(obj, Merchandise))
-
-        store.select_related()
-        for obj in store.merchandises.values():
-            self.assertTrue(isinstance(obj, Merchandise))
-
-    def test_dynamic_field_dereference_with_ordering_guarantee_on_pymongo3(self):
-        # This is because 'codec_options' is supported on pymongo3 or later
-        if IS_PYMONGO_3:
-            class OrderedDocument(Document):
-                my_metaclass = TopLevelDocumentMetaclass
-                __metaclass__ = TopLevelDocumentMetaclass
-
-                @classmethod
-                def _get_collection(cls):
-                    collection = super(OrderedDocument, cls)._get_collection()
-                    opts = CodecOptions(document_class=OrderedDict)
-
-                    return collection.with_options(codec_options=opts)
-
-            class Merchandise(Document):
-                name = StringField()
-                price = IntField()
-
-            class Store(OrderedDocument):
-                merchandises = DynamicField(container_class=OrderedDict)
-
-            Merchandise.drop_collection()
-            Store.drop_collection()
-
-            merchandises = OrderedDict()
-            merchandises['#1'] = Merchandise(name='foo', price=100).save()
-            merchandises['#2'] = Merchandise(name='bar', price=120).save()
-            merchandises['#3'] = Merchandise(name='baz', price=110).save()
-
-            Store(merchandises=merchandises).save()
-
-            store = Store.objects().first()
-
-            store.select_related()
-
-            # confirms that the load data order is same with the one at storing
-            self.assertTrue(type(store.merchandises), OrderedDict)
-            self.assertEqual(','.join(store.merchandises.keys()), '#1,#2,#3')
-
 if __name__ == '__main__':
     unittest.main()

From b82d026f394daffaa62641af3b73e8c2ae8b1fcc Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 7 May 2017 21:37:05 -0400
Subject: [PATCH 0499/1519] Revert "fix tox.ini"

This reverts commit c00914bea2951d53a9b8021e3facf406e8d9109e.
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 54f0cc2e2..7f0d36e41 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,pypy,pypy33-52-alpha1}-{mg27,mg28,mg30}
+envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg30}
 
 [testenv]
 commands =

From 689fe4ed9ab58980a9d6cc4ef7a8be045004aa47 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 7 May 2017 21:37:14 -0400
Subject: [PATCH 0500/1519] Revert "use a newer pypy3
 (https://github.com/travis-ci/travis-ci/issues/6277)"

This reverts commit 944d1c0a4ab817a9f0dcd124bbf8456520367e8b.
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb6cd7218..474489508 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,7 @@ python:
 - 2.7
 - 3.5
 - pypy
-- pypy3.3-5.2-alpha1
-
+- pypy3
 
 env:
 - MONGODB=2.6 PYMONGO=2.7

From 33e9ef21067d887013b9ab7bfd0571c19f6d06f1 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 7 May 2017 21:37:38 -0400
Subject: [PATCH 0501/1519] dont test pypy3 temporarily

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 474489508..8f846ab1f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ python:
 - 2.7
 - 3.5
 - pypy
-- pypy3
 
 env:
 - MONGODB=2.6 PYMONGO=2.7

From 3b88712402a5c4c7ddab45a1853ed37696942dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 8 May 2017 00:02:42 -0400
Subject: [PATCH 0502/1519] Cleaner as_pymongo (#1549)

---
 mongoengine/queryset/base.py | 90 +++++++++++-------------------------
 tests/queryset/queryset.py   | 87 ++++++++++++++++++++++++++++------
 2 files changed, 101 insertions(+), 76 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 7c60a4893..f7c32d20c 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -67,7 +67,6 @@ def __init__(self, document, collection):
         self._scalar = []
         self._none = False
         self._as_pymongo = False
-        self._as_pymongo_coerce = False
         self._search_text = None
 
         # If inheritance is allowed, only return instances and instances of
@@ -728,11 +727,12 @@ def _clone_into(self, new_qs):
                 '%s is not a subclass of BaseQuerySet' % new_qs.__name__)
 
         copy_props = ('_mongo_query', '_initial_query', '_none', '_query_obj',
-                      '_where_clause', '_loaded_fields', '_ordering', '_snapshot',
-                      '_timeout', '_class_check', '_slave_okay', '_read_preference',
-                      '_iter', '_scalar', '_as_pymongo', '_as_pymongo_coerce',
+                      '_where_clause', '_loaded_fields', '_ordering',
+                      '_snapshot', '_timeout', '_class_check', '_slave_okay',
+                      '_read_preference', '_iter', '_scalar', '_as_pymongo',
                       '_limit', '_skip', '_hint', '_auto_dereference',
-                      '_search_text', 'only_fields', '_max_time_ms', '_comment')
+                      '_search_text', 'only_fields', '_max_time_ms',
+                      '_comment')
 
         for prop in copy_props:
             val = getattr(self, prop)
@@ -939,7 +939,8 @@ def fields(self, _only_called=False, **kwargs):
 
             posts = BlogPost.objects(...).fields(slice__comments=5)
 
-        :param kwargs: A set keywors arguments identifying what to include.
+        :param kwargs: A set of keyword arguments identifying what to
+            include, exclude, or slice.
 
         .. versionadded:: 0.5
         """
@@ -1128,16 +1129,15 @@ def values_list(self, *fields):
         """An alias for scalar"""
         return self.scalar(*fields)
 
-    def as_pymongo(self, coerce_types=False):
+    def as_pymongo(self):
         """Instead of returning Document instances, return raw values from
         pymongo.
 
-        :param coerce_types: Field types (if applicable) would be use to
-            coerce types.
+        This method is particularly useful if you don't need dereferencing
+        and care primarily about the speed of data retrieval.
         """
         queryset = self.clone()
         queryset._as_pymongo = True
-        queryset._as_pymongo_coerce = coerce_types
         return queryset
 
     def max_time_ms(self, ms):
@@ -1799,59 +1799,25 @@ def lookup(obj, name):
 
         return tuple(data)
 
-    def _get_as_pymongo(self, row):
-        # Extract which fields paths we should follow if .fields(...) was
-        # used. If not, handle all fields.
-        if not getattr(self, '__as_pymongo_fields', None):
-            self.__as_pymongo_fields = []
-
-            for field in self._loaded_fields.fields - set(['_cls']):
-                self.__as_pymongo_fields.append(field)
-                while '.' in field:
-                    field, _ = field.rsplit('.', 1)
-                    self.__as_pymongo_fields.append(field)
-
-        all_fields = not self.__as_pymongo_fields
-
-        def clean(data, path=None):
-            path = path or ''
-
-            if isinstance(data, dict):
-                new_data = {}
-                for key, value in data.iteritems():
-                    new_path = '%s.%s' % (path, key) if path else key
-
-                    if all_fields:
-                        include_field = True
-                    elif self._loaded_fields.value == QueryFieldList.ONLY:
-                        include_field = new_path in self.__as_pymongo_fields
-                    else:
-                        include_field = new_path not in self.__as_pymongo_fields
+    def _get_as_pymongo(self, doc):
+        """Clean up a PyMongo doc, removing fields that were only fetched
+        for the sake of MongoEngine's implementation, and return it.
+        """
+        # Always remove _cls as a MongoEngine's implementation detail.
+        if '_cls' in doc:
+            del doc['_cls']
+
+        # If the _id was not included in a .only or was excluded in a .exclude,
+        # remove it from the doc (we always fetch it so that we can properly
+        # construct documents).
+        fields = self._loaded_fields
+        if fields and '_id' in doc and (
+            (fields.value == QueryFieldList.ONLY and '_id' not in fields.fields) or
+            (fields.value == QueryFieldList.EXCLUDE and '_id' in fields.fields)
+        ):
+            del doc['_id']
 
-                    if include_field:
-                        new_data[key] = clean(value, path=new_path)
-                data = new_data
-            elif isinstance(data, list):
-                data = [clean(d, path=path) for d in data]
-            else:
-                if self._as_pymongo_coerce:
-                    # If we need to coerce types, we need to determine the
-                    # type of this field and use the corresponding
-                    # .to_python(...)
-                    EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
-
-                    obj = self._document
-                    for chunk in path.split('.'):
-                        obj = getattr(obj, chunk, None)
-                        if obj is None:
-                            break
-                        elif isinstance(obj, EmbeddedDocumentField):
-                            obj = obj.document_type
-                    if obj and data is not None:
-                        data = obj.to_python(data)
-            return data
-
-        return clean(row)
+        return doc
 
     def _sub_js_fields(self, code):
         """When fields are specified with [~fieldname] syntax, where
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 7b12625c4..d97b307d7 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4047,6 +4047,35 @@ class Person(Document):
         plist = list(Person.objects.scalar('name', 'state'))
         self.assertEqual(plist, [(u'Wilson JR', s1)])
 
+    def test_generic_reference_field_with_only_and_as_pymongo(self):
+        class TestPerson(Document):
+            name = StringField()
+
+        class TestActivity(Document):
+            name = StringField()
+            owner = GenericReferenceField()
+
+        TestPerson.drop_collection()
+        TestActivity.drop_collection()
+
+        person = TestPerson(name='owner')
+        person.save()
+
+        a1 = TestActivity(name='a1', owner=person)
+        a1.save()
+
+        activity = TestActivity.objects(owner=person).scalar('id', 'owner').no_dereference().first()
+        self.assertEqual(activity[0], a1.pk)
+        self.assertEqual(activity[1]['_ref'], DBRef('test_person', person.pk))
+
+        activity = TestActivity.objects(owner=person).only('id', 'owner')[0]
+        self.assertEqual(activity.pk, a1.pk)
+        self.assertEqual(activity.owner, person)
+
+        activity = TestActivity.objects(owner=person).only('id', 'owner').as_pymongo().first()
+        self.assertEqual(activity['_id'], a1.pk)
+        self.assertTrue(activity['owner']['_ref'], DBRef('test_person', person.pk))
+
     def test_scalar_db_field(self):
 
         class TestDoc(Document):
@@ -4392,21 +4421,44 @@ class Doc(Document):
         self.assertEqual(doc_objects, Doc.objects.from_json(json_data))
 
     def test_as_pymongo(self):
-
         from decimal import Decimal
 
+        class LastLogin(EmbeddedDocument):
+            location = StringField()
+            ip = StringField()
+
         class User(Document):
             id = ObjectIdField('_id')
             name = StringField()
             age = IntField()
             price = DecimalField()
+            last_login = EmbeddedDocumentField(LastLogin)
 
         User.drop_collection()
-        User(name="Bob Dole", age=89, price=Decimal('1.11')).save()
-        User(name="Barack Obama", age=51, price=Decimal('2.22')).save()
+
+        User.objects.create(name="Bob Dole", age=89, price=Decimal('1.11'))
+        User.objects.create(
+            name="Barack Obama",
+            age=51,
+            price=Decimal('2.22'),
+            last_login=LastLogin(
+                location='White House',
+                ip='104.107.108.116'
+            )
+        )
+
+        results = User.objects.as_pymongo()
+        self.assertEqual(
+            set(results[0].keys()),
+            set(['_id', 'name', 'age', 'price'])
+        )
+        self.assertEqual(
+            set(results[1].keys()),
+            set(['_id', 'name', 'age', 'price', 'last_login'])
+        )
 
         results = User.objects.only('id', 'name').as_pymongo()
-        self.assertEqual(sorted(results[0].keys()), sorted(['_id', 'name']))
+        self.assertEqual(set(results[0].keys()), set(['_id', 'name']))
 
         users = User.objects.only('name', 'price').as_pymongo()
         results = list(users)
@@ -4417,16 +4469,20 @@ class User(Document):
         self.assertEqual(results[1]['name'], 'Barack Obama')
         self.assertEqual(results[1]['price'], 2.22)
 
-        # Test coerce_types
-        users = User.objects.only(
-            'name', 'price').as_pymongo(coerce_types=True)
+        users = User.objects.only('name', 'last_login').as_pymongo()
         results = list(users)
         self.assertTrue(isinstance(results[0], dict))
         self.assertTrue(isinstance(results[1], dict))
-        self.assertEqual(results[0]['name'], 'Bob Dole')
-        self.assertEqual(results[0]['price'], Decimal('1.11'))
-        self.assertEqual(results[1]['name'], 'Barack Obama')
-        self.assertEqual(results[1]['price'], Decimal('2.22'))
+        self.assertEqual(results[0], {
+            'name': 'Bob Dole'
+        })
+        self.assertEqual(results[1], {
+            'name': 'Barack Obama',
+            'last_login': {
+                'location': 'White House',
+                'ip': '104.107.108.116'
+            }
+        })
 
     def test_as_pymongo_json_limit_fields(self):
 
@@ -4590,7 +4646,6 @@ def __unicode__(self):
 
     def test_no_cache(self):
         """Ensure you can add meta data to file"""
-
         class Noddy(Document):
             fields = DictField()
 
@@ -4608,15 +4663,19 @@ class Noddy(Document):
 
         self.assertEqual(len(list(docs)), 100)
 
+        # Can't directly get a length of a no-cache queryset.
         with self.assertRaises(TypeError):
             len(docs)
 
+        # Another iteration over the queryset should result in another db op.
         with query_counter() as q:
-            self.assertEqual(q, 0)
             list(docs)
             self.assertEqual(q, 1)
+
+        # ... and another one to double-check.
+        with query_counter() as q:
             list(docs)
-            self.assertEqual(q, 2)
+            self.assertEqual(q, 1)
 
     def test_nested_queryset_iterator(self):
         # Try iterating the same queryset twice, nested.

From e52603b4a7ab540aaa74e3fafcbe432d1c15fb70 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 8 May 2017 00:12:26 -0400
Subject: [PATCH 0503/1519] ver bump to v0.14.0 + changelog/upgrade docs update

---
 docs/changelog.rst      |  6 ++++++
 docs/upgrade.rst        | 12 ++++++++++++
 mongoengine/__init__.py |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 46d47b97d..b50b1b32c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,12 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.14.0
+=================
+- BREAKING CHANGE: Removed the `coerce_types` param from `QuerySet.as_pymongo`.
+- POTENTIAL BREAKING CHANGE: Made EmbeddedDocument not hashable by default #1528
+- Improved code quality #1531, #1540, #1541, #1547
+
 Changes in 0.13.0
 =================
 - POTENTIAL BREAKING CHANGE: Added Unicode support to the `EmailField`, see
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index d612df880..a433db7d7 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -6,6 +6,18 @@ Development
 ***********
 (Fill this out whenever you introduce breaking changes to MongoEngine)
 
+0.14.0
+******
+This release includes a few bug fixes and another significant code cleanup.
+The most important change is that `QuerySet.as_pymongo` no longer supports a
+`coerce_types` mode. If you used it in the past, a) please let us know of your
+use case, b) you'll need to override `as_pymongo` to get the desired outcome.
+
+This release also makes the EmbeddedDocument not hashable by default. If you
+use embedded documents in sets or dictionaries, you might have to override
+`__hash__` and implement a hashing logic specific to your use case. See #1528
+for the reason behind this change.
+
 0.13.0
 ******
 This release adds Unicode support to the `EmailField` and changes its
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 840c90d7d..b41e87e7c 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 13, 0)
+VERSION = (0, 14, 0)
 
 
 def get_version():

From 0bc7aa52d8a3a8ec324f47b2daac79688578001e Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 8 May 2017 00:14:42 -0400
Subject: [PATCH 0504/1519] more docs tweaks [ci skip]

---
 docs/changelog.rst | 2 +-
 docs/upgrade.rst   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b50b1b32c..c60bbf098 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,7 +8,7 @@ Development
 
 Changes in 0.14.0
 =================
-- BREAKING CHANGE: Removed the `coerce_types` param from `QuerySet.as_pymongo`.
+- BREAKING CHANGE: Removed the `coerce_types` param from `QuerySet.as_pymongo` #1549
 - POTENTIAL BREAKING CHANGE: Made EmbeddedDocument not hashable by default #1528
 - Improved code quality #1531, #1540, #1541, #1547
 
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index a433db7d7..65d133594 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -8,8 +8,8 @@ Development
 
 0.14.0
 ******
-This release includes a few bug fixes and another significant code cleanup.
-The most important change is that `QuerySet.as_pymongo` no longer supports a
+This release includes a few bug fixes and a significant code cleanup. The most
+important change is that `QuerySet.as_pymongo` no longer supports a
 `coerce_types` mode. If you used it in the past, a) please let us know of your
 use case, b) you'll need to override `as_pymongo` to get the desired outcome.
 

From 24d15d427482f39f7cfa0e9ac0a8b44393aa9ddf Mon Sep 17 00:00:00 2001
From: lanf0n <lanfon72@gmail.com>
Date: Thu, 11 May 2017 22:06:36 +0800
Subject: [PATCH 0505/1519] fix typo in the save() method's docstring (#1551)

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 4babd1b90..f1622934f 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -320,7 +320,7 @@ def save(self, force_insert=False, validate=True, clean=True,
         :param save_condition: only perform save if matching record in db
             satisfies condition(s) (e.g. version number).
             Raises :class:`OperationError` if the conditions are not satisfied
-        :parm signal_kwargs: (optional) kwargs dictionary to be passed to
+        :param signal_kwargs: (optional) kwargs dictionary to be passed to
             the signal calls.
 
         .. versionchanged:: 0.5

From 2f1fe5468edaa0922e67ce659e4cf75b2cf35df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Enrique=20Carrillo=20Pino?=
 <quique0194@gmail.com>
Date: Fri, 12 May 2017 11:59:14 -0500
Subject: [PATCH 0506/1519] Fix empty string casted to datetime today in
 DateTimeField (#1533)

---
 mongoengine/fields.py  |  4 ++++
 tests/fields/fields.py | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index c34fe1b1c..0d402712f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -483,6 +483,10 @@ def to_mongo(self, value):
         if not isinstance(value, six.string_types):
             return None
 
+        value = value.strip()
+        if not value:
+            return None
+
         # Attempt to parse a datetime:
         if dateutil:
             try:
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 60c8370a2..7a0ccc251 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -35,6 +35,28 @@
 
 class FieldTest(MongoDBTestCase):
 
+    def test_datetime_from_empty_string(self):
+        """
+        Ensure an exception is raised when trying to
+        cast an empty string to datetime.
+        """
+        class MyDoc(Document):
+            dt = DateTimeField()
+
+        md = MyDoc(dt='')
+        self.assertRaises(ValidationError, md.save)
+
+    def test_datetime_from_whitespace_string(self):
+        """
+        Ensure an exception is raised when trying to
+        cast a whitespace-only string to datetime.
+        """
+        class MyDoc(Document):
+            dt = DateTimeField()
+
+        md = MyDoc(dt='   ')
+        self.assertRaises(ValidationError, md.save)
+
     def test_default_values_nothing_set(self):
         """Ensure that default field values are used when creating
         a document.

From 54d8c64ad5c643c1a3acda82e1b9f6da22e73146 Mon Sep 17 00:00:00 2001
From: Freyr <fr3yr@gmail.com>
Date: Thu, 25 May 2017 10:44:29 -0400
Subject: [PATCH 0507/1519] Fixes query operations on BinaryFields

Overrides prepare_query_value in BinaryField to wrap the query value in
bson.binary.Binary. This was already done in the to_mongo call when
saving a document, but query operations required the user to convert the
value manually.

Fixes https://github.com/MongoEngine/mongoengine/issues/1127
---
 mongoengine/fields.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 0d402712f..c52c6786c 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1393,6 +1393,12 @@ def validate(self, value):
         if self.max_bytes is not None and len(value) > self.max_bytes:
             self.error('Binary value is too long')
 
+    def prepare_query_value(self, op, value):
+        if value is None:
+            return value
+        return super(BinaryField, self).prepare_query_value(
+            op, self.to_mongo(value))
+
 
 class GridFSError(Exception):
     pass

From b9e922c658f6275fc8446bf1ffdedf688f708f25 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 12 Jun 2017 04:50:13 +0000
Subject: [PATCH 0508/1519] support multiple operator #1510

---
 AUTHORS                    |  1 +
 mongoengine/base/common.py |  7 ++++---
 tests/queryset/queryset.py | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1d724718c..88d4bbe1f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -243,3 +243,4 @@ that much better:
  * Victor Varvaryuk
  * Stanislav Kaledin (https://github.com/sallyruthstruik)
  * Dmitry Yantsen (https://github.com/mrTable)
+ * Erdenezul Batmunkh (https://github.com/erdenezul)
diff --git a/mongoengine/base/common.py b/mongoengine/base/common.py
index b9971ff71..f80471efa 100644
--- a/mongoengine/base/common.py
+++ b/mongoengine/base/common.py
@@ -3,9 +3,10 @@
 __all__ = ('UPDATE_OPERATORS', 'get_document', '_document_registry')
 
 
-UPDATE_OPERATORS = set(['set', 'unset', 'inc', 'dec', 'pop', 'push',
-                        'push_all', 'pull', 'pull_all', 'add_to_set',
-                        'set_on_insert', 'min', 'max', 'rename'])
+UPDATE_OPERATORS = set(['set', 'unset', 'inc', 'dec', 'mul',
+                        'pop', 'push', 'push_all', 'pull',
+                        'pull_all', 'add_to_set', 'set_on_insert',
+                        'min', 'max', 'rename'])
 
 
 _document_registry = {}
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index d97b307d7..7666d030b 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -589,6 +589,20 @@ class Scores(Document):
         Scores.objects(id=scores.id).update(max__high_score=500)
         self.assertEqual(Scores.objects.get(id=scores.id).high_score, 1000)
 
+    @needs_mongodb_v26
+    def test_update_multiple(self):
+        class Product(Document):
+            item = StringField()
+            price = FloatField()
+
+        product = Product.objects.create(item='ABC', price=10.99)
+        product = Product.objects.create(item='ABC', price=10.99)
+        Product.objects(id=product.id).update(mul__price=1.25)
+        self.assertEqual(Product.objects.get(id=product.id).price, 13.7375)
+        unknown_product = Product.objects.create(item='Unknown')
+        Product.objects(id=unknown_product.id).update(mul__price=100)
+        self.assertEqual(Product.objects.get(id=unknown_product.id).price, 0)
+
     def test_updates_can_have_match_operators(self):
 
         class Comment(EmbeddedDocument):

From 6903eed4e770bcb605df948728121ce75149d0fa Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Thu, 15 Jun 2017 06:08:40 +0000
Subject: [PATCH 0509/1519] support position in 'push' #1565

---
 mongoengine/queryset/transform.py | 16 +++++++++++++---
 tests/queryset/queryset.py        | 23 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index bb04ee376..2c1b7fdc7 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -284,9 +284,11 @@ def update(_doc_cls=None, **update):
             if isinstance(field, GeoJsonBaseField):
                 value = field.to_mongo(value)
 
-            if op in (None, 'set', 'push', 'pull'):
+            if op == 'push' and isinstance(value, (list, tuple, set)):
+                value = [field.prepare_query_value(op, v) for v in value]
+            elif op in (None, 'set', 'push', 'pull'):
                 if field.required or value is not None:
-                    value = field.prepare_query_value(op, value)
+                        value = field.prepare_query_value(op, value)
             elif op in ('pushAll', 'pullAll'):
                 value = [field.prepare_query_value(op, v) for v in value]
             elif op in ('addToSet', 'setOnInsert'):
@@ -302,6 +304,10 @@ def update(_doc_cls=None, **update):
             value = {match: value}
 
         key = '.'.join(parts)
+        position = None
+        if parts[-1].isdigit() and isinstance(value, (list, tuple, set)):
+            key = parts[0]
+            position = int(parts[-1])
 
         if not op:
             raise InvalidQueryError('Updates must supply an operation '
@@ -333,10 +339,14 @@ def update(_doc_cls=None, **update):
                 value = {key: value}
         elif op == 'addToSet' and isinstance(value, list):
             value = {key: {'$each': value}}
+        elif op == 'push' and isinstance(value, list):
+            if position is not None:
+                value = {key: {'$each': value, '$position': position}}
+            else:
+                value = {key: {'$each': value}}
         else:
             value = {key: value}
         key = '$' + op
-
         if key not in mongo_update:
             mongo_update[key] = value
         elif key in mongo_update and isinstance(mongo_update[key], dict):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index d97b307d7..9341a2146 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1903,6 +1903,29 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
+    def test_update_push_with_position(self):
+        """Ensure that the 'push' update with position works properly.
+        """
+        class BlogPost(Document):
+            slug = StringField()
+            tags = ListField(StringField())
+
+        BlogPost.drop_collection()
+
+        post = BlogPost(slug="test")
+        post.save()
+
+        BlogPost.objects.filter(id=post.id).update(push__tags="code")
+        BlogPost.objects.filter(id=post.id).update(push__tags__0=["mongodb", "python"])
+        post.reload()
+        self.assertEqual(post.tags[0], "mongodb")
+        self.assertEqual(post.tags[1], "python")
+        self.assertEqual(post.tags[2], "code")
+
+        BlogPost.objects.filter(id=post.id).update(set__tags__2="java")
+        post.reload()
+        self.assertEqual(post.tags[2], "java")
+
     def test_update_push_and_pull_add_to_set(self):
         """Ensure that the 'pull' update operation works correctly.
         """

From f63ad2dd69c40d87962fe05137e618c09418ed5e Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Thu, 15 Jun 2017 07:36:14 +0000
Subject: [PATCH 0510/1519] dont test in mongoDB v2.4 #1565

---
 tests/queryset/queryset.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 9341a2146..7be3f8d7b 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1903,6 +1903,7 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
+    @needs_mongodb_v26
     def test_update_push_with_position(self):
         """Ensure that the 'push' update with position works properly.
         """

From 1d4b1870cfb50e3b91b0fe187874c31d5373ea65 Mon Sep 17 00:00:00 2001
From: Danil <elephanter@users.noreply.github.com>
Date: Mon, 19 Jun 2017 05:04:46 +0500
Subject: [PATCH 0511/1519] to_db_fields fix (#1553)

---
 mongoengine/queryset/base.py | 4 ++--
 tests/queryset/field_list.py | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index f7c32d20c..41a10acea 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1731,14 +1731,14 @@ def _fields_to_dbfields(self, fields):
                           for x in document._subclasses][1:]
         for field in fields:
             try:
-                field = '.'.join(f.db_field for f in
+                field = '.'.join(f if isinstance(f, six.string_types) else f.db_field for f in
                                  document._lookup_field(field.split('.')))
                 ret.append(field)
             except LookUpError as err:
                 found = False
                 for subdoc in subclasses:
                     try:
-                        subfield = '.'.join(f.db_field for f in
+                        subfield = '.'.join(f if isinstance(f, six.string_types) else f.db_field for f in
                                             subdoc._lookup_field(field.split('.')))
                         ret.append(subfield)
                         found = True
diff --git a/tests/queryset/field_list.py b/tests/queryset/field_list.py
index d1277e062..c07cec3e8 100644
--- a/tests/queryset/field_list.py
+++ b/tests/queryset/field_list.py
@@ -197,14 +197,18 @@ class Comment(EmbeddedDocument):
             title = StringField()
             text = StringField()
 
+        class VariousData(EmbeddedDocument):
+            some = BooleanField()
+
         class BlogPost(Document):
             content = StringField()
             author = EmbeddedDocumentField(User)
             comments = ListField(EmbeddedDocumentField(Comment))
+            various = MapField(field=EmbeddedDocumentField(VariousData))
 
         BlogPost.drop_collection()
 
-        post = BlogPost(content='Had a good coffee today...')
+        post = BlogPost(content='Had a good coffee today...', various={'test_dynamic':{'some': True}})
         post.author = User(name='Test User')
         post.comments = [Comment(title='I aggree', text='Great post!'), Comment(title='Coffee', text='I hate coffee')]
         post.save()
@@ -215,6 +219,9 @@ class BlogPost(Document):
         self.assertEqual(obj.author.name, 'Test User')
         self.assertEqual(obj.comments, [])
 
+        obj = BlogPost.objects.only('various.test_dynamic.some').get()
+        self.assertEqual(obj.various["test_dynamic"].some, True)
+
         obj = BlogPost.objects.only('content', 'comments.title',).get()
         self.assertEqual(obj.content, 'Had a good coffee today...')
         self.assertEqual(obj.author, None)

From a8d6e59a7a0434edebcb52ca63e40be5466548fa Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 18 Jun 2017 17:25:39 -0700
Subject: [PATCH 0512/1519] minor tweaks to code quality in _fields_to_dbfields

---
 mongoengine/queryset/base.py | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 41a10acea..6f9c372c6 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1722,25 +1722,33 @@ def _item_frequencies_exec_js(self, field, normalize=False):
         return frequencies
 
     def _fields_to_dbfields(self, fields):
-        """Translate fields paths to its db equivalents"""
-        ret = []
+        """Translate fields' paths to their db equivalents."""
         subclasses = []
-        document = self._document
-        if document._meta['allow_inheritance']:
+        if self._document._meta['allow_inheritance']:
             subclasses = [get_document(x)
-                          for x in document._subclasses][1:]
+                          for x in self._document._subclasses][1:]
+
+        db_field_paths = []
         for field in fields:
+            field_parts = field.split('.')
             try:
-                field = '.'.join(f if isinstance(f, six.string_types) else f.db_field for f in
-                                 document._lookup_field(field.split('.')))
-                ret.append(field)
+                field = '.'.join(
+                    f if isinstance(f, six.string_types) else f.db_field
+                    for f in self._document._lookup_field(field_parts)
+                )
+                db_field_paths.append(field)
             except LookUpError as err:
                 found = False
+
+                # If a field path wasn't found on the main document, go
+                # through its subclasses and see if it exists on any of them.
                 for subdoc in subclasses:
                     try:
-                        subfield = '.'.join(f if isinstance(f, six.string_types) else f.db_field for f in
-                                            subdoc._lookup_field(field.split('.')))
-                        ret.append(subfield)
+                        subfield = '.'.join(
+                            f if isinstance(f, six.string_types) else f.db_field
+                            for f in subdoc._lookup_field(field_parts)
+                        )
+                        db_field_paths.append(subfield)
                         found = True
                         break
                     except LookUpError:
@@ -1748,7 +1756,8 @@ def _fields_to_dbfields(self, fields):
 
                 if not found:
                     raise err
-        return ret
+
+        return db_field_paths
 
     def _get_order_by(self, keys):
         """Given a list of MongoEngine-style sort keys, return a list

From f3ee4a5dac9a6bcccdd11f9be3afc702e344e8a2 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 19 Jun 2017 02:59:17 +0000
Subject: [PATCH 0513/1519] add tests for push operator #1565

---
 AUTHORS                    |  1 +
 tests/document/instance.py | 41 ++++++++++++++++++++++++++++++++++++++
 tests/queryset/modify.py   | 25 ++++++++++++++++++++++-
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 1d724718c..88d4bbe1f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -243,3 +243,4 @@ that much better:
  * Victor Varvaryuk
  * Stanislav Kaledin (https://github.com/sallyruthstruik)
  * Dmitry Yantsen (https://github.com/mrTable)
+ * Erdenezul Batmunkh (https://github.com/erdenezul)
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 37bbe3373..1456f0a19 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -22,6 +22,8 @@
 from mongoengine.context_managers import switch_db, query_counter
 from mongoengine import signals
 
+from tests.utils import needs_mongodb_v26
+
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__),
                                '../fields/mongoengine.png')
 
@@ -775,6 +777,7 @@ def test_modify_empty(self):
 
         self.assertDbEqual([dict(doc.to_mongo())])
 
+
     def test_modify_invalid_query(self):
         doc1 = self.Person(name="bob", age=10).save()
         doc2 = self.Person(name="jim", age=20).save()
@@ -826,6 +829,27 @@ def test_modify_update(self):
 
         self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
 
+    @needs_mongodb_v26
+    def test_modity_push_position(self):
+        class BlogPost(Document):
+            slug = StringField()
+            tags = ListField(StringField())
+
+        other_blog = BlogPost(slug="ABC", tags=["code", "java", "python"]).save()
+
+        blog = BlogPost(slug="ABC", tags=["python"]).save()
+        blog_copy = blog._from_son(blog.to_mongo())
+
+        assert blog.modify(push__tags__0=["code", "java"])
+        blog_copy.tags = ["code", "java", "python"]
+        assert blog.to_json() == blog_copy.to_json()
+        assert blog._get_changed_fields() == []
+
+        docs = [dict(other_blog.to_mongo()), dict(blog.to_mongo())]
+        self.assertEqual(
+            list(BlogPost._get_collection().find().sort("id")),
+            sorted(docs, key=lambda doc: doc["_id"]))
+
     def test_save(self):
         """Ensure that a document may be saved in the database."""
 
@@ -3149,6 +3173,23 @@ class Person(Document):
 
         person.update(set__height=2.0)
 
+    @needs_mongodb_v26
+    def test_push_with_position(self):
+        """Ensure that push with position works properly for an instance."""
+        class BlogPost(Document):
+            slug = StringField()
+            tags = ListField(StringField())
+
+        blog = BlogPost()
+        blog.slug = "ABC"
+        blog.tags = ["python"]
+        blog.save()
+
+        blog.update(push__tags__0=["mongodb", "code"])
+        blog.reload()
+        self.assertEqual(blog.tags[0], "mongodb")
+        self.assertEqual(blog.tags[2], "python")
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/queryset/modify.py b/tests/queryset/modify.py
index 607937f68..4bda9718a 100644
--- a/tests/queryset/modify.py
+++ b/tests/queryset/modify.py
@@ -1,6 +1,6 @@
 import unittest
 
-from mongoengine import connect, Document, IntField
+from mongoengine import connect, Document, IntField, StringField, ListField
 
 __all__ = ("FindAndModifyTest",)
 
@@ -94,6 +94,29 @@ def test_modify_with_fields(self):
         self.assertEqual(old_doc.to_mongo(), {"_id": 1})
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
+    def test_modify_with_push(self):
+        class BlogPost(Document):
+            id = StringField(primary_key=True)
+            tags = ListField(StringField())
+
+        BlogPost.drop_collection()
+
+        BlogPost(id="ABC").save()
+        BlogPost(id="BCD").save()
+        blog = BlogPost.objects(id="ABC").modify(push__tags="code")
+
+        self.assertEqual(blog.to_mongo(), {"_id": "ABC", "tags": []})
+        docs = [{"_id": "ABC", "tags":["code"]}, {"_id": "BCD", "tags":[]}]
+        self.assertEqual(list(BlogPost._collection.find().sort("id")), docs)
+
+        another_blog = BlogPost.objects(id="BCD").modify(push__tags="java")
+        self.assertEqual(another_blog.to_mongo(), {"_id": "BCD", "tags": []})
+        another_blog = BlogPost.objects(id="BCD").modify(push__tags__0=["python"])
+        self.assertEqual(another_blog.to_mongo(), {"_id": "BCD", "tags": ["java"]})
+        docs = [{"_id": "ABC", "tags":["code"]},
+                {"_id": "BCD", "tags":["python", "java"]}]
+        self.assertEqual(list(BlogPost._collection.find().sort("id")), docs)
+
 
 if __name__ == '__main__':
     unittest.main()

From 7782aa7379306c8223edd33aeec6b47f2f145b83 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 19 Jun 2017 03:11:59 +0000
Subject: [PATCH 0514/1519] do not test position push in mongodb_v2.4 #1565

---
 tests/document/instance.py | 1 -
 tests/queryset/modify.py   | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 1456f0a19..26ab0d977 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -777,7 +777,6 @@ def test_modify_empty(self):
 
         self.assertDbEqual([dict(doc.to_mongo())])
 
-
     def test_modify_invalid_query(self):
         doc1 = self.Person(name="bob", age=10).save()
         doc2 = self.Person(name="jim", age=20).save()
diff --git a/tests/queryset/modify.py b/tests/queryset/modify.py
index 4bda9718a..44bdc3ffb 100644
--- a/tests/queryset/modify.py
+++ b/tests/queryset/modify.py
@@ -2,6 +2,8 @@
 
 from mongoengine import connect, Document, IntField, StringField, ListField
 
+from tests.utils import needs_mongodb_v26
+
 __all__ = ("FindAndModifyTest",)
 
 
@@ -94,6 +96,7 @@ def test_modify_with_fields(self):
         self.assertEqual(old_doc.to_mongo(), {"_id": 1})
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
+    @needs_mongodb_v26
     def test_modify_with_push(self):
         class BlogPost(Document):
             id = StringField(primary_key=True)

From fb00b79d1945a05c08f642aa35efbba5e92558a8 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 19 Jun 2017 03:28:34 +0000
Subject: [PATCH 0515/1519] add docs for positional push operator #1565

---
 docs/guide/querying.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 0bb196581..f1594dd29 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -565,6 +565,15 @@ cannot use the `$` syntax in keyword arguments it has been mapped to `S`::
     >>> post.tags
     ['database', 'mongodb']
 
+From MongoDB version 2.6, push operator supports $position value which allows
+to push values with index.
+    >>> post = BlogPost(title="Test", tags=["mongo"])
+    >>> post.save()
+    >>> post.update(push__tags__0=["database", "code"])
+    >>> post.reload()
+    >>> post.tags
+    ['database', 'code', 'mongo']
+
 .. note::
     Currently only top level lists are handled, future versions of mongodb /
     pymongo plan to support nested positional operators.  See `The $ positional

From 99a5f2cd9d5ea4ea84ed8ed421b29cc149cdacdc Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 19 Jun 2017 05:06:07 +0000
Subject: [PATCH 0516/1519] EmbeddedDocument should not have save method #1552

---
 mongoengine/document.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index f1622934f..2efb5c5c3 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -88,9 +88,6 @@ def to_mongo(self, *args, **kwargs):
 
         return data
 
-    def save(self, *args, **kwargs):
-        self._instance.save(*args, **kwargs)
-
     def reload(self, *args, **kwargs):
         self._instance.reload(*args, **kwargs)
 

From 71c3c632d7efb673aad2f1e79e564537df202e7b Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 19 Jun 2017 06:00:21 +0000
Subject: [PATCH 0517/1519] add test case for reverse_delete_rule with pull
 #1519

---
 tests/document/instance.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 37bbe3373..f9f4285e9 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1866,6 +1866,25 @@ class BlogPost(Document):
         author.delete()
         self.assertEqual(BlogPost.objects.count(), 0)
 
+    def test_reverse_delete_rule_pull(self):
+        """Ensure that a referenced document is also deleted with
+        pull.
+        """
+        class Record(Document):
+            name = StringField()
+            children = ListField(ReferenceField('self', reverse_delete_rule=PULL))
+
+        Record.drop_collection()
+
+        parent_record = Record(name='parent').save()
+        child_record = Record(name='child').save()
+        parent_record.children.append(child_record)
+        parent_record.save()
+
+        child_record.delete()
+        self.assertEqual(Record.objects(name='parent').get().children, [])
+
+
     def test_reverse_delete_rule_with_custom_id_field(self):
         """Ensure that a referenced document with custom primary key
         is also deleted upon deletion.

From 0bc6507df34710de0a8fb16b0b45f48d8d6aec5b Mon Sep 17 00:00:00 2001
From: Benoit Larroque <benoit@sqreen.io>
Date: Tue, 27 Jun 2017 00:43:41 +0200
Subject: [PATCH 0518/1519] Make queryset aggregates obey read_preference

---
 mongoengine/queryset/base.py |  4 ++++
 tests/queryset/queryset.py   | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 6f9c372c6..090ed906c 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1182,6 +1182,10 @@ def aggregate(self, *pipeline, **kwargs):
 
         pipeline = initial_pipeline + list(pipeline)
 
+        if IS_PYMONGO_3 and self._read_preference is not None:
+            return self._collection.with_options(read_preference=self._read_preference) \
+                       .aggregate(pipeline, cursor={}, **kwargs)
+
         return self._collection.aggregate(pipeline, cursor={}, **kwargs)
 
     # JS functionality
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index d97b307d7..e0eb7d385 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4353,6 +4353,26 @@ class Bar(Document):
         self.assertEqual(bars._cursor._Cursor__read_preference,
                          ReadPreference.SECONDARY_PREFERRED)
 
+    @needs_mongodb_v26
+    def test_read_preference_aggregation_framework(self):
+        class Bar(Document):
+            txt = StringField()
+
+            meta = {
+                'indexes': ['txt']
+            }
+        # Aggregates with read_preference
+        bars = Bar.objects \
+                    .read_preference(ReadPreference.SECONDARY_PREFERRED) \
+                    .aggregate()
+        if IS_PYMONGO_3:
+            self.assertEqual(bars._CommandCursor__collection.read_preference,
+                             ReadPreference.SECONDARY_PREFERRED)
+        else:
+            self.assertNotEqual(bars._CommandCursor__collection.read_preference,
+                             ReadPreference.SECONDARY_PREFERRED)
+
+
     def test_json_simple(self):
 
         class Embedded(EmbeddedDocument):

From e6a30f899c9bb6cdb28e2302967e6dc96ceac055 Mon Sep 17 00:00:00 2001
From: "Bo.Yi" <bo.yi@kankanapp.com.cn>
Date: Thu, 6 Jul 2017 14:57:03 +0800
Subject: [PATCH 0519/1519] [fix]validation list field with multi choice values

---
 mongoengine/base/document.py |  6 +++++-
 mongoengine/base/fields.py   |  6 ++++--
 tests/fields/fields.py       | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 99c8af87e..431581335 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1080,5 +1080,9 @@ def __get_field_display(self, field):
         """Return the display value for a choice field"""
         value = getattr(self, field.name)
         if field.choices and isinstance(field.choices[0], (list, tuple)):
-            return dict(field.choices).get(value, value)
+            sep = getattr(field, 'display_sep', u' ')
+            values = value if field.__name__ == 'ListField' else [value]
+            return sep.join([
+                dict(field.choices).get(val, val)
+                for val in values])
         return value
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index e2b5d3210..69034d5db 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -213,8 +213,10 @@ def _validate_choices(self, value):
                     )
                 )
         # Choices which are types other than Documents
-        elif value not in choice_list:
-            self.error('Value must be one of %s' % six.text_type(choice_list))
+        else:
+            values = value if isinstance(value, (list, tuple)) else [value]
+            if len(set(values) - set(choice_list)):
+                self.error('Value must be one of %s' % six.text_type(choice_list))
 
     def _validate(self, value, **kwargs):
         # Check the Choices Constraint
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7a0ccc251..b6628ab09 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -920,6 +920,12 @@ class LogEntry(Document):
 
     def test_list_validation(self):
         """Ensure that a list field only accepts lists with valid elements."""
+        AccessLevelChoices = (
+            ('a', u'Administrator'),
+            ('b', u'Manager'),
+            ('c', u'Staff'),
+        )
+
         class User(Document):
             pass
 
@@ -932,6 +938,7 @@ class BlogPost(Document):
             tags = ListField(StringField())
             authors = ListField(ReferenceField(User))
             generic = ListField(GenericReferenceField())
+            access_list = ListField(required=False, default=[], choices=AccessLevelChoices, display_sep=u',')
 
         User.drop_collection()
         BlogPost.drop_collection()
@@ -949,6 +956,17 @@ class BlogPost(Document):
         post.tags = ('fun', 'leisure')
         post.validate()
 
+        post.access_list = 'a,b'
+        self.assertRaises(ValidationError, post.validate())
+
+        post.access_list = ['c', 'd']
+        self.assertRaises(ValidationError, post.validate())
+
+        post.access_list = ['a', 'b']
+        post.validate()
+
+        self.assertEqual(post.get_access_list_display(), u'Administrator,Manager')
+
         post.comments = ['a']
         self.assertRaises(ValidationError, post.validate)
         post.comments = 'yay'

From 820b5cbb86a0cc9dff65db35b0f806fb811a512b Mon Sep 17 00:00:00 2001
From: "Bo.Yi" <bo.yi@kankanapp.com.cn>
Date: Thu, 6 Jul 2017 16:07:51 +0800
Subject: [PATCH 0520/1519] [fix]pass test case and fix field type error

---
 mongoengine/base/document.py | 6 ++++--
 tests/fields/fields.py       | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 431581335..42a8bb4b2 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1080,9 +1080,11 @@ def __get_field_display(self, field):
         """Return the display value for a choice field"""
         value = getattr(self, field.name)
         if field.choices and isinstance(field.choices[0], (list, tuple)):
+            if value is None:
+                return None
             sep = getattr(field, 'display_sep', u' ')
-            values = value if field.__name__ == 'ListField' else [value]
+            values = value if field.__class__.__name__ == 'ListField' else [value]
             return sep.join([
                 dict(field.choices).get(val, val)
-                for val in values])
+                for val in values or []])
         return value
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index b6628ab09..336e116c9 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -957,10 +957,10 @@ class BlogPost(Document):
         post.validate()
 
         post.access_list = 'a,b'
-        self.assertRaises(ValidationError, post.validate())
+        self.assertRaises(ValidationError, post.validate)
 
         post.access_list = ['c', 'd']
-        self.assertRaises(ValidationError, post.validate())
+        self.assertRaises(ValidationError, post.validate)
 
         post.access_list = ['a', 'b']
         post.validate()

From 437b11af9ac3f2a160868265337a22eb6fcb6ff5 Mon Sep 17 00:00:00 2001
From: Alex Xu <ax2@princeton.edu>
Date: Mon, 10 Jul 2017 16:43:24 -0400
Subject: [PATCH 0521/1519] docs: use explicit register_delete_rule example

The previous example of creating bi-directional delete rules was vague since the example defined only one class and the relationship between "Foo" and "Bar" wasn't clear. I added a more explicit example where the relationship between the two classes is explicit.
---
 mongoengine/fields.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 0d402712f..0029d68b1 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -971,11 +971,13 @@ class ReferenceField(BaseField):
 
     .. code-block:: python
 
-        class Bar(Document):
-            content = StringField()
-            foo = ReferenceField('Foo')
+        class Org(Document):
+            owner = ReferenceField('User')
 
-        Foo.register_delete_rule(Bar, 'foo', NULLIFY)
+        class User(Document):
+            org = ReferenceField('Org', reverse_delete_rule=CASCADE)
+
+        User.register_delete_rule(Org, 'owner', DENY)
 
     .. versionchanged:: 0.5 added `reverse_delete_rule`
     """

From a7cab513695ba1814d9316719429d63249fb97dc Mon Sep 17 00:00:00 2001
From: Davidrjx <1058960881@qq.com>
Date: Thu, 13 Jul 2017 18:07:36 +0800
Subject: [PATCH 0522/1519] Use a set literal in _clean_settings (#1585)

---
 AUTHORS                   |  1 +
 mongoengine/connection.py | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 1d724718c..96a7850ee 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -243,3 +243,4 @@ that much better:
  * Victor Varvaryuk
  * Stanislav Kaledin (https://github.com/sallyruthstruik)
  * Dmitry Yantsen (https://github.com/mrTable)
+ * Renjianxin (https://github.com/Davidrjx)
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 7eae810f1..34ff4dc31 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -146,13 +146,14 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
         raise MongoEngineConnectionError(msg)
 
     def _clean_settings(settings_dict):
-        irrelevant_fields = set([
-            'name', 'username', 'password', 'authentication_source',
-            'authentication_mechanism'
-        ])
+        # set literal more efficient than calling set function
+        irrelevant_fields_set = {
+            'name', 'username', 'password',
+            'authentication_source', 'authentication_mechanism'
+        }
         return {
             k: v for k, v in settings_dict.items()
-            if k not in irrelevant_fields
+            if k not in irrelevant_fields_set
         }
 
     # Retrieve a copy of the connection settings associated with the requested

From 3dcc9bc1433e550a3151ade5f31efef7e39f2be3 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezulbatmunkh@Erdenezuls-iMac.local>
Date: Thu, 13 Jul 2017 22:59:21 +0800
Subject: [PATCH 0523/1519] use explicit tests and fix unneccessary indent
 #1565

---
 mongoengine/queryset/transform.py |  2 +-
 tests/document/instance.py        | 26 ++++++++++----------------
 tests/queryset/queryset.py        |  6 ++----
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 2c1b7fdc7..b9c8b130c 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -288,7 +288,7 @@ def update(_doc_cls=None, **update):
                 value = [field.prepare_query_value(op, v) for v in value]
             elif op in (None, 'set', 'push', 'pull'):
                 if field.required or value is not None:
-                        value = field.prepare_query_value(op, value)
+                    value = field.prepare_query_value(op, value)
             elif op in ('pushAll', 'pullAll'):
                 value = [field.prepare_query_value(op, v) for v in value]
             elif op in ('addToSet', 'setOnInsert'):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 26ab0d977..609bc9000 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -829,25 +829,20 @@ def test_modify_update(self):
         self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
 
     @needs_mongodb_v26
-    def test_modity_push_position(self):
+    def test_modify_with_positional_push(self):
         class BlogPost(Document):
-            slug = StringField()
             tags = ListField(StringField())
 
-        other_blog = BlogPost(slug="ABC", tags=["code", "java", "python"]).save()
-
-        blog = BlogPost(slug="ABC", tags=["python"]).save()
-        blog_copy = blog._from_son(blog.to_mongo())
+        post = BlogPost.objects.create(tags=['python'])
+        self.assertEqual(post.tags, ['python'])
+        post.modify(push__tags__0=['code', 'mongo'])
+        self.assertEqual(post.tags, ['code', 'mongo', 'python'])
 
-        assert blog.modify(push__tags__0=["code", "java"])
-        blog_copy.tags = ["code", "java", "python"]
-        assert blog.to_json() == blog_copy.to_json()
-        assert blog._get_changed_fields() == []
-
-        docs = [dict(other_blog.to_mongo()), dict(blog.to_mongo())]
+        # Assert same order of the list items is maintained in the db
         self.assertEqual(
-            list(BlogPost._get_collection().find().sort("id")),
-            sorted(docs, key=lambda doc: doc["_id"]))
+            BlogPost._get_collection().find_one({'_id': post.pk})['tags'],
+            ['code', 'mongo', 'python']
+        )
 
     def test_save(self):
         """Ensure that a document may be saved in the database."""
@@ -3186,8 +3181,7 @@ class BlogPost(Document):
 
         blog.update(push__tags__0=["mongodb", "code"])
         blog.reload()
-        self.assertEqual(blog.tags[0], "mongodb")
-        self.assertEqual(blog.tags[2], "python")
+        self.assertEqual(blog.tags, ['mongodb', 'code', 'python'])
 
 
 if __name__ == '__main__':
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 7be3f8d7b..f4e4670d5 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1919,13 +1919,11 @@ class BlogPost(Document):
         BlogPost.objects.filter(id=post.id).update(push__tags="code")
         BlogPost.objects.filter(id=post.id).update(push__tags__0=["mongodb", "python"])
         post.reload()
-        self.assertEqual(post.tags[0], "mongodb")
-        self.assertEqual(post.tags[1], "python")
-        self.assertEqual(post.tags[2], "code")
+        self.assertEqual(post.tags, ['mongodb', 'python', 'code'])
 
         BlogPost.objects.filter(id=post.id).update(set__tags__2="java")
         post.reload()
-        self.assertEqual(post.tags[2], "java")
+        self.assertEqual(post.tags, ['mongodb', 'python', 'java'])
 
     def test_update_push_and_pull_add_to_set(self):
         """Ensure that the 'pull' update operation works correctly.

From 9f02f71c52f5f9c02cbd3db797ae80aea36d0639 Mon Sep 17 00:00:00 2001
From: "Bo.Yi" <bo.yi@kankanapp.com.cn>
Date: Sun, 16 Jul 2017 18:47:20 +0800
Subject: [PATCH 0524/1519] [fix]fix some personal hobby

---
 mongoengine/base/document.py | 4 ++--
 tests/fields/fields.py       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 42a8bb4b2..bb8d3a163 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1082,8 +1082,8 @@ def __get_field_display(self, field):
         if field.choices and isinstance(field.choices[0], (list, tuple)):
             if value is None:
                 return None
-            sep = getattr(field, 'display_sep', u' ')
-            values = value if field.__class__.__name__ == 'ListField' else [value]
+            sep = getattr(field, 'display_sep', ' ')
+            values = value if field.__class__.__name__ in ('ListField', 'SortedListField') else [value]
             return sep.join([
                 dict(field.choices).get(val, val)
                 for val in values or []])
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 336e116c9..1dc25d12f 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -921,7 +921,7 @@ class LogEntry(Document):
     def test_list_validation(self):
         """Ensure that a list field only accepts lists with valid elements."""
         AccessLevelChoices = (
-            ('a', u'Administrator'),
+            ('a', u'Administration'),
             ('b', u'Manager'),
             ('c', u'Staff'),
         )
@@ -938,7 +938,7 @@ class BlogPost(Document):
             tags = ListField(StringField())
             authors = ListField(ReferenceField(User))
             generic = ListField(GenericReferenceField())
-            access_list = ListField(required=False, default=[], choices=AccessLevelChoices, display_sep=u',')
+            access_list = ListField(choices=AccessLevelChoices, display_sep=', ')
 
         User.drop_collection()
         BlogPost.drop_collection()
@@ -965,7 +965,7 @@ class BlogPost(Document):
         post.access_list = ['a', 'b']
         post.validate()
 
-        self.assertEqual(post.get_access_list_display(), u'Administrator,Manager')
+        self.assertEqual(post.get_access_list_display(), u'Administration, Manager')
 
         post.comments = ['a']
         self.assertRaises(ValidationError, post.validate)

From 433f10ef93cbfa2d2f0a8cb704e8333704ebf362 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 31 Jul 2017 05:15:23 +0000
Subject: [PATCH 0525/1519] position support singular value #1565

---
 mongoengine/queryset/transform.py | 17 ++++++++++-------
 tests/queryset/queryset.py        |  5 +++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index b9c8b130c..b01d3d41c 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -304,10 +304,6 @@ def update(_doc_cls=None, **update):
             value = {match: value}
 
         key = '.'.join(parts)
-        position = None
-        if parts[-1].isdigit() and isinstance(value, (list, tuple, set)):
-            key = parts[0]
-            position = int(parts[-1])
 
         if not op:
             raise InvalidQueryError('Updates must supply an operation '
@@ -339,11 +335,18 @@ def update(_doc_cls=None, **update):
                 value = {key: value}
         elif op == 'addToSet' and isinstance(value, list):
             value = {key: {'$each': value}}
-        elif op == 'push' and isinstance(value, list):
-            if position is not None:
+        elif op == 'push':
+            if parts[-1].isdigit() and op == 'push':
+                key = parts[0]
+                position = int(parts[-1])
+                # position modifier must appear with each.
+                if not isinstance(value, (set, tuple, list)):
+                    value = [value]
                 value = {key: {'$each': value, '$position': position}}
-            else:
+            elif isinstance(value, list):
                 value = {key: {'$each': value}}
+            else:
+                value = {key: value}
         else:
             value = {key: value}
         key = '$' + op
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index f4e4670d5..fe97b7657 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1925,6 +1925,11 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.tags, ['mongodb', 'python', 'java'])
 
+        #test push with singular value
+        BlogPost.objects.filter(id=post.id).update(push__tags__0='scala')
+        post.reload()
+        self.assertEqual(post.tags, ['scala', 'mongodb', 'python', 'java'])
+
     def test_update_push_and_pull_add_to_set(self):
         """Ensure that the 'pull' update operation works correctly.
         """

From 34fca9d6f5cb8ea09af7dc63a480354c8ecbc06d Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezulbatmunkh@Erdenezuls-iMac.local>
Date: Mon, 31 Jul 2017 18:32:34 +0800
Subject: [PATCH 0526/1519] Add clear comment and tests for positional push
 #1565

---
 mongoengine/queryset/transform.py |  5 +++--
 tests/queryset/modify.py          | 37 ++++++++++++++++++-------------
 tests/queryset/queryset.py        |  3 +--
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index b01d3d41c..a9907adac 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -336,10 +336,11 @@ def update(_doc_cls=None, **update):
         elif op == 'addToSet' and isinstance(value, list):
             value = {key: {'$each': value}}
         elif op == 'push':
-            if parts[-1].isdigit() and op == 'push':
+            if parts[-1].isdigit():
                 key = parts[0]
                 position = int(parts[-1])
-                # position modifier must appear with each.
+                # $position expects an iterable. If pushing a single value,
+                # wrap it in a list.
                 if not isinstance(value, (set, tuple, list)):
                     value = [value]
                 value = {key: {'$each': value, '$position': position}}
diff --git a/tests/queryset/modify.py b/tests/queryset/modify.py
index 44bdc3ffb..fe410d19a 100644
--- a/tests/queryset/modify.py
+++ b/tests/queryset/modify.py
@@ -99,26 +99,33 @@ def test_modify_with_fields(self):
     @needs_mongodb_v26
     def test_modify_with_push(self):
         class BlogPost(Document):
-            id = StringField(primary_key=True)
             tags = ListField(StringField())
 
         BlogPost.drop_collection()
 
         BlogPost(id="ABC").save()
-        BlogPost(id="BCD").save()
-        blog = BlogPost.objects(id="ABC").modify(push__tags="code")
-
-        self.assertEqual(blog.to_mongo(), {"_id": "ABC", "tags": []})
-        docs = [{"_id": "ABC", "tags":["code"]}, {"_id": "BCD", "tags":[]}]
-        self.assertEqual(list(BlogPost._collection.find().sort("id")), docs)
-
-        another_blog = BlogPost.objects(id="BCD").modify(push__tags="java")
-        self.assertEqual(another_blog.to_mongo(), {"_id": "BCD", "tags": []})
-        another_blog = BlogPost.objects(id="BCD").modify(push__tags__0=["python"])
-        self.assertEqual(another_blog.to_mongo(), {"_id": "BCD", "tags": ["java"]})
-        docs = [{"_id": "ABC", "tags":["code"]},
-                {"_id": "BCD", "tags":["python", "java"]}]
-        self.assertEqual(list(BlogPost._collection.find().sort("id")), docs)
+
+        # Push a new tag via modify with new=False (default).
+        blog = BlogPost(pk='ABC').modify(push__tags='code')
+        self.assertEqual(blog.tags, [])
+        blog.reload()
+        self.assertEqual(blog.tags, ['code'])
+
+        # Push a new tag via modify with new=True.
+        blog = BlogPost.objects(pk='ABC').modify(push__tags='java', new=True)
+        self.assertEqual(blog.tags, ['code', 'java'])
+
+        # Push a new tag with a positional argument.
+        blog = BlogPost.objects(pk='ABC').modify(
+            push__tags__0='python',
+            new=True)
+        self.assertEqual(blog.tags, ['python', 'code', 'java'])
+
+        # Push multiple new tags with a positional argument.
+        blog = BlogPost.objects(pk='ABC').modify(
+            push__tags__1=['go', 'rust'],
+            new=True)
+        self.assertEqual(blog.tags, ['python', 'go', 'rust', 'code', 'java'])
 
 
 if __name__ == '__main__':
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index fe97b7657..c78ed9857 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1913,8 +1913,7 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post = BlogPost(slug="test")
-        post.save()
+        post = BlogPost.objects.create(slug="test")
 
         BlogPost.objects.filter(id=post.id).update(push__tags="code")
         BlogPost.objects.filter(id=post.id).update(push__tags__0=["mongodb", "python"])

From f09256a24e83623b194792234f6a9e4c6944e2a6 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezulbatmunkh@Erdenezuls-iMac.local>
Date: Mon, 31 Jul 2017 18:49:52 +0800
Subject: [PATCH 0527/1519] Fix modify tests #1565

---
 tests/queryset/modify.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/queryset/modify.py b/tests/queryset/modify.py
index fe410d19a..b37f9b734 100644
--- a/tests/queryset/modify.py
+++ b/tests/queryset/modify.py
@@ -103,26 +103,26 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        BlogPost(id="ABC").save()
+        blog = BlogPost.objects.create()
 
         # Push a new tag via modify with new=False (default).
-        blog = BlogPost(pk='ABC').modify(push__tags='code')
+        BlogPost(id=blog.id).modify(push__tags='code')
         self.assertEqual(blog.tags, [])
         blog.reload()
         self.assertEqual(blog.tags, ['code'])
 
         # Push a new tag via modify with new=True.
-        blog = BlogPost.objects(pk='ABC').modify(push__tags='java', new=True)
+        blog = BlogPost.objects(id=blog.id).modify(push__tags='java', new=True)
         self.assertEqual(blog.tags, ['code', 'java'])
 
         # Push a new tag with a positional argument.
-        blog = BlogPost.objects(pk='ABC').modify(
+        blog = BlogPost.objects(id=blog.id).modify(
             push__tags__0='python',
             new=True)
         self.assertEqual(blog.tags, ['python', 'code', 'java'])
 
         # Push multiple new tags with a positional argument.
-        blog = BlogPost.objects(pk='ABC').modify(
+        blog = BlogPost.objects(id=blog.id).modify(
             push__tags__1=['go', 'rust'],
             new=True)
         self.assertEqual(blog.tags, ['python', 'go', 'rust', 'code', 'java'])

From 2a795e91381053294cc9bf312f785b5ed9f1ab49 Mon Sep 17 00:00:00 2001
From: Ali <aliturki.at@gmail.com>
Date: Fri, 4 Aug 2017 11:31:29 +0100
Subject: [PATCH 0528/1519] QuerySet limit function now returns all docs in
 cursor when 0 is passed

---
 docs/changelog.rst           | 1 +
 mongoengine/queryset/base.py | 7 ++++---
 tests/queryset/queryset.py   | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c60bbf098..aa8584a71 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Development
 ===========
+- QuerySet limit function behaviour: Passing 0 as parameter will return all the documents in the cursor #1611
 - (Fill this out as you fix issues and develop your features).
 
 Changes in 0.14.0
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 6f9c372c6..be4b9d662 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -384,7 +384,7 @@ def count(self, with_limit_and_skip=False):
             :meth:`skip` that has been applied to this cursor into account when
             getting the count
         """
-        if self._limit == 0 and with_limit_and_skip or self._none:
+        if self._limit == 0 and with_limit_and_skip is False or self._none:
             return 0
         return self._cursor.count(with_limit_and_skip=with_limit_and_skip)
 
@@ -759,10 +759,11 @@ def limit(self, n):
         """Limit the number of returned documents to `n`. This may also be
         achieved using array-slicing syntax (e.g. ``User.objects[:5]``).
 
-        :param n: the maximum number of objects to return
+        :param n: the maximum number of objects to return if n is greater than 0. 
+        When 0 is passed, returns all the documents in the cursor
         """
         queryset = self.clone()
-        queryset._limit = n if n != 0 else 1
+        queryset._limit = n
 
         # If a cursor object has already been created, apply the limit to it.
         if queryset._cursor_obj:
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c78ed9857..ac545629b 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -124,6 +124,11 @@ def test_limit(self):
         self.assertEqual(len(people2), 1)
         self.assertEqual(people2[0], user_a)
 
+        # Test limit with 0 as parameter
+        people = self.Person.objects.limit(0)
+        self.assertEqual(people.count(with_limit_and_skip=True), 2)
+        self.assertEqual(len(people), 2)
+
         # Test chaining of only after limit
         person = self.Person.objects().limit(1).only('name').first()
         self.assertEqual(person, user_a)

From ee5686e91ab9dec45c0d98d22d20c17864f02e0f Mon Sep 17 00:00:00 2001
From: Ali Turki <aliturki.at@gmail.com>
Date: Mon, 7 Aug 2017 11:12:15 +0100
Subject: [PATCH 0529/1519] test case for #1602

---
 tests/queryset/queryset.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index ac545629b..57126ac07 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -5133,6 +5133,16 @@ class BlogPost(Document):
         # in a way we'd expect) should raise a TypeError, too
         self.assertRaises(TypeError, BlogPost.objects(authors__in=author).count)
 
+    def test_create_count(self):
+        self.Person.drop_collection()
+        self.Person.objects.create(name="Foo")
+        self.Person.objects.create(name="Bar")
+        self.Person.objects.create(name="Baz")
+        self.assertEqual(self.Person.objects.count(with_limit_and_skip=True), 3)
+
+        newPerson = self.Person.objects.create(name="Foo_1")
+        self.assertEqual(self.Person.objects.count(with_limit_and_skip=True), 4)
+
 
 if __name__ == '__main__':
     unittest.main()

From c4de879b207e4e7087b099459ff801b8897620f1 Mon Sep 17 00:00:00 2001
From: Paulo Matos <paulo@matos-sorge.com>
Date: Fri, 11 Aug 2017 09:09:33 +0200
Subject: [PATCH 0530/1519] Clarify comment in validation example

---
 docs/guide/document-instances.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/guide/document-instances.rst b/docs/guide/document-instances.rst
index 0e9fcef62..64f17c08a 100644
--- a/docs/guide/document-instances.rst
+++ b/docs/guide/document-instances.rst
@@ -57,7 +57,8 @@ document values for example::
 
         def clean(self):
             """Ensures that only published essays have a `pub_date` and
-            automatically sets the pub_date if published and not set"""
+            automatically sets `pub_date` if essay is published and `pub_date`
+            is not set"""
             if self.status == 'Draft' and self.pub_date is not None:
                 msg = 'Draft entries should not have a publication date.'
                 raise ValidationError(msg)

From b9f3991d03fcd78ad5b81011d8420ab0287b29bd Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Fri, 18 Aug 2017 09:31:26 +0800
Subject: [PATCH 0531/1519] added as_pymongo test for PointField #1311

---
 tests/queryset/geo.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 51a323821..38c0377ed 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -510,6 +510,24 @@ class Road(Document):
         roads = Road.objects.filter(poly__geo_intersects={"$geometry": polygon}).count()
         self.assertEqual(1, roads)
 
+    def test_aspymongo_with_only(self):
+        """Ensure as_pymongo works with only"""
+        class Place(Document):
+            location = PointField()
+
+        Place.drop_collection()
+        p = Place(location=[24.946861267089844, 60.16311983618494])
+        p.save()
+        qs = Place.objects().only('location')
+        self.assertDictEqual(
+            qs.as_pymongo()[0]['location'],
+            {u'type': u'Point',
+             u'coordinates': [
+                24.946861267089844,
+                60.16311983618494]
+            }
+        )
+
     def test_2dsphere_point_sets_correctly(self):
         class Location(Document):
             loc = PointField()

From 21d1faa7938e4585fa12325037f0695e3572ee80 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Thu, 24 Aug 2017 18:03:08 +0200
Subject: [PATCH 0532/1519] Fix .install_mongodb_on_travis.sh script (all
 credit to @erdenezul)

---
 .install_mongodb_on_travis.sh | 6 +++++-
 .travis.yml                   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.install_mongodb_on_travis.sh b/.install_mongodb_on_travis.sh
index 8563ae744..f2018411e 100644
--- a/.install_mongodb_on_travis.sh
+++ b/.install_mongodb_on_travis.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+sudo apt-get remove mongodb-org-server
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 
 if [ "$MONGODB" = "2.4" ]; then
@@ -13,7 +14,7 @@ elif [ "$MONGODB" = "2.6" ]; then
     sudo apt-get install mongodb-org-server=2.6.12
     # service should be started automatically
 elif [ "$MONGODB" = "3.0" ]; then
-    echo "deb http://repo.mongodb.org/apt/ubuntu precise/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb.list
+    echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb.list
     sudo apt-get update
     sudo apt-get install mongodb-org-server=3.0.14
     # service should be started automatically
@@ -21,3 +22,6 @@ else
     echo "Invalid MongoDB version, expected 2.4, 2.6, or 3.0."
     exit 1
 fi;
+
+mkdir db
+1>db/logs mongod --dbpath=db &
diff --git a/.travis.yml b/.travis.yml
index 8f846ab1f..5e90660d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,8 @@ matrix:
 
 before_install:
 - bash .install_mongodb_on_travis.sh
+- sleep 15  # https://docs.travis-ci.com/user/database-setup/#MongoDB-does-not-immediately-accept-connections
+- mongo --eval 'db.version();'
 
 install:
 - sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev

From 4f59c7f77fdda587386ec3a03b4de9caf1b0dadf Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 25 Jul 2017 16:26:07 +0200
Subject: [PATCH 0533/1519] Expose to user mongoengine.base.NON_FIELD_ERRORS

This variable is used to set the field containing the errors raised in a
clean function. Given those function are user-defined, users should be
able to get the name of the field to easily retreive their custom errors.
---
 mongoengine/base/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 99c8af87e..d05c7695c 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -19,7 +19,7 @@
 from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError,
                                 LookUpError, OperationError, ValidationError)
 
-__all__ = ('BaseDocument',)
+__all__ = ('BaseDocument', 'NON_FIELD_ERRORS')
 
 NON_FIELD_ERRORS = '__all__'
 

From bce859569f924fe051441b99c36d11795b5953a9 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Tue, 25 Jul 2017 19:37:21 +0200
Subject: [PATCH 0534/1519] Remove SemiStrictDict to improve perfs

---
 docs/changelog.rst                 |  2 +-
 mongoengine/base/datastructures.py | 39 ----------------------------
 mongoengine/base/document.py       |  5 ++--
 tests/test_datastructures.py       | 41 +-----------------------------
 4 files changed, 4 insertions(+), 83 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c60bbf098..1dcbfb51b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 
 Development
 ===========
-- (Fill this out as you fix issues and develop your features).
+- Improve performances by removing SemiStrictDict
 
 Changes in 0.14.0
 =================
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index b9aca8fae..cd6ac6415 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -445,42 +445,3 @@ def __repr__(self):
 
             cls._classes[allowed_keys] = SpecificStrictDict
         return cls._classes[allowed_keys]
-
-
-class SemiStrictDict(StrictDict):
-    __slots__ = ('_extras', )
-    _classes = {}
-
-    def __getattr__(self, attr):
-        try:
-            super(SemiStrictDict, self).__getattr__(attr)
-        except AttributeError:
-            try:
-                return self.__getattribute__('_extras')[attr]
-            except KeyError as e:
-                raise AttributeError(e)
-
-    def __setattr__(self, attr, value):
-        try:
-            super(SemiStrictDict, self).__setattr__(attr, value)
-        except AttributeError:
-            try:
-                self._extras[attr] = value
-            except AttributeError:
-                self._extras = {attr: value}
-
-    def __delattr__(self, attr):
-        try:
-            super(SemiStrictDict, self).__delattr__(attr)
-        except AttributeError:
-            try:
-                del self._extras[attr]
-            except KeyError as e:
-                raise AttributeError(e)
-
-    def __iter__(self):
-        try:
-            extras_iter = iter(self.__getattribute__('_extras'))
-        except AttributeError:
-            extras_iter = ()
-        return itertools.chain(super(SemiStrictDict, self).__iter__(), extras_iter)
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index d05c7695c..f8ab73d0d 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -13,7 +13,7 @@
 from mongoengine.base.common import get_document
 from mongoengine.base.datastructures import (BaseDict, BaseList,
                                              EmbeddedDocumentList,
-                                             SemiStrictDict, StrictDict)
+                                             StrictDict)
 from mongoengine.base.fields import ComplexBaseField
 from mongoengine.common import _import_class
 from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError,
@@ -79,8 +79,7 @@ def __init__(self, *args, **values):
         if self.STRICT and not self._dynamic:
             self._data = StrictDict.create(allowed_keys=self._fields_ordered)()
         else:
-            self._data = SemiStrictDict.create(
-                allowed_keys=self._fields_ordered)()
+            self._data = {}
 
         self._dynamic_fields = SON()
 
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 6830a188f..79381c5ac 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,6 +1,6 @@
 import unittest
 
-from mongoengine.base.datastructures import StrictDict, SemiStrictDict
+from mongoengine.base.datastructures import StrictDict
 
 
 class TestStrictDict(unittest.TestCase):
@@ -76,44 +76,5 @@ def test_mappings_protocol(self):
         assert dict(**d) == {'a': 1, 'b': 2}
 
 
-class TestSemiSrictDict(TestStrictDict):
-    def strict_dict_class(self, *args, **kwargs):
-        return SemiStrictDict.create(*args, **kwargs)
-
-    def test_init_fails_on_nonexisting_attrs(self):
-        # disable irrelevant test
-        pass
-
-    def test_setattr_raises_on_nonexisting_attr(self):
-        # disable irrelevant test
-        pass
-
-    def test_setattr_getattr_nonexisting_attr_succeeds(self):
-        d = self.dtype()
-        d.x = 1
-        self.assertEqual(d.x, 1)
-
-    def test_init_succeeds_with_nonexisting_attrs(self):
-        d = self.dtype(a=1, b=1, c=1, x=2)
-        self.assertEqual((d.a, d.b, d.c, d.x), (1, 1, 1, 2))
-
-    def test_iter_with_nonexisting_attrs(self):
-        d = self.dtype(a=1, b=1, c=1, x=2)
-        self.assertEqual(list(d), ['a', 'b', 'c', 'x'])
-
-    def test_iteritems_with_nonexisting_attrs(self):
-        d = self.dtype(a=1, b=1, c=1, x=2)
-        self.assertEqual(list(d.iteritems()), [('a', 1), ('b', 1), ('c', 1), ('x', 2)])
-
-    def tets_cmp_with_strict_dicts(self):
-        d = self.dtype(a=1, b=1, c=1)
-        dd = StrictDict.create(("a", "b", "c"))(a=1, b=1, c=1)
-        self.assertEqual(d, dd)
-
-    def test_cmp_with_strict_dict_with_nonexisting_attrs(self):
-        d = self.dtype(a=1, b=1, c=1, x=2)
-        dd = StrictDict.create(("a", "b", "c", "x"))(a=1, b=1, c=1, x=2)
-        self.assertEqual(d, dd)
-
 if __name__ == '__main__':
     unittest.main()

From 66429ce331822c29e69770386785dfa0412dd02b Mon Sep 17 00:00:00 2001
From: Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>
Date: Sun, 6 Aug 2017 13:35:01 +0530
Subject: [PATCH 0535/1519] Add python 3.6 support

---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 5e90660d7..9362dcc21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ language: python
 python:
 - 2.7
 - 3.5
+- 3.6
 - pypy
 
 env:
@@ -39,6 +40,10 @@ matrix:
     env: MONGODB=2.4 PYMONGO=3.0
   - python: 3.5
     env: MONGODB=3.0 PYMONGO=3.0
+  - python: 3.6
+    env: MONGODB=2.4 PYMONGO=3.0
+  - python: 3.6
+    env: MONGODB=3.0 PYMONGO=3.0
 
 before_install:
 - bash .install_mongodb_on_travis.sh

From 7c0cfb1da2dd4bdcd24332a3ca08d561fa1e93da Mon Sep 17 00:00:00 2001
From: Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>
Date: Sun, 6 Aug 2017 13:23:47 +0530
Subject: [PATCH 0536/1519] Add six.moves.range instead of xrange

---
 mongoengine/base/datastructures.py | 2 +-
 mongoengine/queryset/queryset.py   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index b9aca8fae..c727ec78f 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -127,7 +127,7 @@ def __getitem__(self, key, *args, **kwargs):
         return value
 
     def __iter__(self):
-        for i in xrange(self.__len__()):
+        for i in six.moves.range(self.__len__()):
             yield self[i]
 
     def __setitem__(self, key, value, *args, **kwargs):
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index b5d2765b4..cf913b01c 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -1,3 +1,5 @@
+import six
+
 from mongoengine.errors import OperationError
 from mongoengine.queryset.base import (BaseQuerySet, CASCADE, DENY, DO_NOTHING,
                                        NULLIFY, PULL)
@@ -112,7 +114,7 @@ def _populate_cache(self):
         # Pull in ITER_CHUNK_SIZE docs from the database and store them in
         # the result cache.
         try:
-            for _ in xrange(ITER_CHUNK_SIZE):
+            for _ in six.moves.range(ITER_CHUNK_SIZE):
                 self._result_cache.append(self.next())
         except StopIteration:
             # Getting this exception means there are no more docs in the
@@ -166,7 +168,7 @@ def __repr__(self):
             return '.. queryset mid-iteration ..'
 
         data = []
-        for _ in xrange(REPR_OUTPUT_SIZE + 1):
+        for _ in six.moves.range(REPR_OUTPUT_SIZE + 1):
             try:
                 data.append(self.next())
             except StopIteration:

From 9b3fe09508e6bd5fc7fe8ed6fff97f515841bede Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Fri, 18 Aug 2017 09:31:26 +0800
Subject: [PATCH 0537/1519] added as_pymongo test for PointField #1311

---
 tests/queryset/geo.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 51a323821..38c0377ed 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -510,6 +510,24 @@ class Road(Document):
         roads = Road.objects.filter(poly__geo_intersects={"$geometry": polygon}).count()
         self.assertEqual(1, roads)
 
+    def test_aspymongo_with_only(self):
+        """Ensure as_pymongo works with only"""
+        class Place(Document):
+            location = PointField()
+
+        Place.drop_collection()
+        p = Place(location=[24.946861267089844, 60.16311983618494])
+        p.save()
+        qs = Place.objects().only('location')
+        self.assertDictEqual(
+            qs.as_pymongo()[0]['location'],
+            {u'type': u'Point',
+             u'coordinates': [
+                24.946861267089844,
+                60.16311983618494]
+            }
+        )
+
     def test_2dsphere_point_sets_correctly(self):
         class Location(Document):
             loc = PointField()

From dc8a64fa7d00364956560d47a7b753aee84fa561 Mon Sep 17 00:00:00 2001
From: Srinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>
Date: Fri, 25 Aug 2017 22:02:47 +0530
Subject: [PATCH 0538/1519] Add missing dunder method  - __ne__ to the class
 GridFSProxy class

---
 mongoengine/fields.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 0d402712f..fffba7acf 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1465,6 +1465,9 @@ def __eq__(self, other):
         else:
             return False
 
+    def __ne__(self, other):
+        return not self == other
+
     @property
     def fs(self):
         if not self._fs:

From 1eae97731f2a384cb7b27404aa9b59741155f7bc Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Wed, 30 Aug 2017 12:04:04 +0800
Subject: [PATCH 0539/1519] Fix Document.modify fail on sharded collection
 #1569

---
 mongoengine/document.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index f1622934f..71929cf1a 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -280,6 +280,9 @@ def modify(self, query=None, **update):
         elif query[id_field] != self.pk:
             raise InvalidQueryError('Invalid document modify query: it must modify only this document.')
 
+        # Need to add shard key to query, or you get an error
+        query.update(self._object_key)
+
         updated = self._qs(**query).modify(new=True, **update)
         if updated is None:
             return False

From 44732a5dd904da5224ae1ab7ab45ca4a247d82c1 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Sat, 2 Sep 2017 02:05:27 +0900
Subject: [PATCH 0540/1519] add fix for reload(fields) affect changed fields
 #1371

---
 mongoengine/document.py    |  5 +++--
 tests/document/instance.py | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index f1622934f..cb901c82c 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -702,7 +702,6 @@ def reload(self, *fields, **kwargs):
             obj = obj[0]
         else:
             raise self.DoesNotExist('Document does not exist')
-
         for field in obj._data:
             if not fields or field in fields:
                 try:
@@ -718,7 +717,9 @@ def reload(self, *fields, **kwargs):
                         # i.e. obj.update(unset__field=1) followed by obj.reload()
                         delattr(self, field)
 
-        self._changed_fields = obj._changed_fields
+        self._changed_fields = list(
+            set(self._changed_fields) - set(fields)
+            ) if fields else obj._changed_fields
         self._created = False
         return self
 
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 609bc9000..2a7467092 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -476,6 +476,24 @@ class Animal(Document):
         doc.save()
         doc.reload()
 
+    def test_reload_with_changed_fields(self):
+        """Ensures reloading will not affect changed fields"""
+        class User(Document):
+            name = StringField()
+            number = IntField()
+        User.drop_collection()
+
+        user = User(name="Bob", number=1).save()
+        user.name = "John"
+        user.number = 2
+
+        self.assertEqual(user._get_changed_fields(), ['name', 'number'])
+        user.reload('number')
+        self.assertEqual(user._get_changed_fields(), ['name'])
+        user.save()
+        user.reload()
+        self.assertEqual(user.name, "John")
+
     def test_reload_referencing(self):
         """Ensures reloading updates weakrefs correctly."""
         class Embedded(EmbeddedDocument):
@@ -521,7 +539,7 @@ class Doc(Document):
         doc.save()
         doc.dict_field['extra'] = 1
         doc = doc.reload(10, 'list_field')
-        self.assertEqual(doc._get_changed_fields(), [])
+        self.assertEqual(doc._get_changed_fields(), ['dict_field.extra'])
         self.assertEqual(len(doc.list_field), 5)
         self.assertEqual(len(doc.dict_field), 3)
         self.assertEqual(len(doc.embedded_field.list_field), 4)

From 02733e6e5849bd60cd938fc05db2f73f8a561036 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Sat, 2 Sep 2017 12:00:57 +0900
Subject: [PATCH 0541/1519] fix flake8 error #1371

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index cb901c82c..a30dd0dfd 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -719,7 +719,7 @@ def reload(self, *fields, **kwargs):
 
         self._changed_fields = list(
             set(self._changed_fields) - set(fields)
-            ) if fields else obj._changed_fields
+        ) if fields else obj._changed_fields
         self._created = False
         return self
 

From 70088704e202c38ed7265cbb1929a38d383c8a3d Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Sun, 10 Sep 2017 01:37:17 +0900
Subject: [PATCH 0542/1519] add tests to increase code coverage

---
 tests/fields/fields.py     | 10 +++++++++-
 tests/queryset/geo.py      |  4 ++++
 tests/queryset/queryset.py |  6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7a0ccc251..dbf148e1b 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -334,7 +334,7 @@ class Person(Document):
     def test_string_validation(self):
         """Ensure that invalid values cannot be assigned to string fields."""
         class Person(Document):
-            name = StringField(max_length=20)
+            name = StringField(max_length=20, min_length=5)
             userid = StringField(r'[0-9a-z_]+$')
 
         person = Person(name=34)
@@ -352,6 +352,10 @@ class Person(Document):
         person = Person(name='Name that is more than twenty characters')
         self.assertRaises(ValidationError, person.validate)
 
+        # Test max length validation on name
+        person = Person(name='aa')
+        self.assertRaises(ValidationError, person.validate)
+
         person.name = 'Shorter name'
         person.validate()
 
@@ -437,6 +441,10 @@ class TestDocument(Document):
         doc.age = 'ten'
         self.assertRaises(ValidationError, doc.validate)
 
+        # Test max_value validation
+        doc.value = 200
+        self.assertRaises(ValidationError, doc.validate)
+
     def test_float_validation(self):
         """Ensure that invalid values cannot be assigned to float fields.
         """
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 38c0377ed..acfd93640 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -429,6 +429,10 @@ class Road(Document):
         roads = Road.objects.filter(line__geo_within=polygon).count()
         self.assertEqual(1, roads)
 
+        sphere = [[-1, 42,], 2]
+        roads = Road.objects.filter(line__geo_within_sphere=sphere).count()
+        self.assertEqual(0, roads)
+
         roads = Road.objects.filter(line__geo_within={"$geometry": polygon}).count()
         self.assertEqual(1, roads)
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c78ed9857..5fc73a541 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1882,6 +1882,12 @@ class BlogPost(Document):
         post.reload()
         self.assertTrue('mongo' in post.tags)
 
+        # Push with arrays
+        BlogPost.objects.update(push__tags=['python', 'scala'])
+        post.reload()
+        self.assertTrue('python' in post.tags)
+        self.assertTrue('scala' in post.tags)
+
         BlogPost.objects.update_one(push_all__tags=['db', 'nosql'])
         post.reload()
         self.assertTrue('db' in post.tags and 'nosql' in post.tags)

From ba99190f535ba16ed3c9d6fe5acfc4836c64b48d Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Sun, 10 Sep 2017 13:09:20 +0900
Subject: [PATCH 0543/1519] add tests to increase coverage

---
 tests/fields/fields.py     | 26 ++++++++++++++++++++++++++
 tests/queryset/queryset.py |  4 ++++
 2 files changed, 30 insertions(+)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index dbf148e1b..d25f2e257 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -312,6 +312,27 @@ class TestDocument(Document):
 
         self.assertEqual(1, TestDocument.objects(long_fld__ne=None).count())
 
+    def test_callable_validation(self):
+        """Ensure that callable validation works"""
+        def check_even(value):
+            return value % 2 == 0
+
+        class Order(Document):
+            number = IntField(validation=check_even)
+
+        Order.drop_collection()
+
+        order = Order(number=3)
+        self.assertRaises(ValidationError, order.validate)
+
+        class User(Document):
+            name = StringField(validation=1)
+
+        User.drop_collection()
+
+        user = User(name='test')
+        self.assertRaises(ValidationError, user.validate)
+
     def test_object_id_validation(self):
         """Ensure that invalid values cannot be assigned to an
         ObjectIdField.
@@ -527,6 +548,11 @@ class User(Document):
             class User(Document):
                 name = StringField(db_field='name\0')
 
+        # db field should be a string
+        with self.assertRaises(TypeError):
+            class User(Document):
+                name = StringField(db_field=1)
+
     def test_decimal_comparison(self):
         class Person(Document):
             money = DecimalField()
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 5fc73a541..9c61513a9 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1861,6 +1861,10 @@ class BlogPost(Document):
         post = BlogPost(name="Test Post", hits=5, tags=['test'])
         post.save()
 
+        BlogPost.objects.update(hits=11)
+        post.reload()
+        self.assertEqual(post.hits, 11)
+
         BlogPost.objects.update(set__hits=10)
         post.reload()
         self.assertEqual(post.hits, 10)

From be8f1b9fdd522888527f871c1fbc2a0f6f0af279 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Thu, 14 Sep 2017 22:24:27 +0900
Subject: [PATCH 0544/1519] add failing test for generic_emdedded_document
 query #1651

---
 tests/queryset/queryset.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c78ed9857..4bc5fef61 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4790,6 +4790,30 @@ class C(B):
         for obj in C.objects.no_sub_classes():
             self.assertEqual(obj.__class__, C)
 
+    def test_query_generic_embedded_document(self):
+        """Ensure that querying sub field on generic_embedded_field works
+        """
+        class A(EmbeddedDocument):
+            a_name = StringField()
+
+        class B(EmbeddedDocument):
+            b_name = StringField()
+
+        class Doc(Document):
+            document = GenericEmbeddedDocumentField(choices=(A, B))
+
+        Doc.drop_collection()
+        Doc(document=A(a_name='A doc')).save()
+        Doc(document=B(b_name='B doc')).save()
+
+        # Using raw in filter working fine
+        self.assertEqual(Doc.objects(
+            __raw__={'document.a_name': 'A doc'}).count(), 1)
+        self.assertEqual(Doc.objects(
+            __raw__={'document.b_name': 'B doc'}).count(), 1)
+        self.assertEqual(Doc.objects(document__a_name='A doc').count(), 1)
+        self.assertEqual(Doc.objects(document__b_name='B doc').count(), 1)
+
     def test_query_reference_to_custom_pk_doc(self):
 
         class A(Document):

From e90f6a2fa3766872b44edad29a21527659984ae3 Mon Sep 17 00:00:00 2001
From: Andy Yankovsky <weratt@gmail.com>
Date: Thu, 14 Sep 2017 20:28:15 +0300
Subject: [PATCH 0545/1519] Fix update via pull__something__in=[]

---
 mongoengine/queryset/transform.py | 46 +++++++++++++++++++------------
 tests/queryset/transform.py       |  7 +++++
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index a9907adac..1f70a48b2 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -101,21 +101,8 @@ def query(_doc_cls=None, **kwargs):
                         value = value['_id']
 
             elif op in ('in', 'nin', 'all', 'near') and not isinstance(value, dict):
-                # Raise an error if the in/nin/all/near param is not iterable. We need a
-                # special check for BaseDocument, because - although it's iterable - using
-                # it as such in the context of this method is most definitely a mistake.
-                BaseDocument = _import_class('BaseDocument')
-                if isinstance(value, BaseDocument):
-                    raise TypeError("When using the `in`, `nin`, `all`, or "
-                                    "`near`-operators you can\'t use a "
-                                    "`Document`, you must wrap your object "
-                                    "in a list (object -> [object]).")
-                elif not hasattr(value, '__iter__'):
-                    raise TypeError("The `in`, `nin`, `all`, or "
-                                    "`near`-operators must be applied to an "
-                                    "iterable (e.g. a list).")
-                else:
-                    value = [field.prepare_query_value(op, v) for v in value]
+                # Raise an error if the in/nin/all/near param is not iterable.
+                value = _prepare_query_for_iterable(field, op, value)
 
             # If we're querying a GenericReferenceField, we need to alter the
             # key depending on the value:
@@ -284,9 +271,15 @@ def update(_doc_cls=None, **update):
             if isinstance(field, GeoJsonBaseField):
                 value = field.to_mongo(value)
 
-            if op == 'push' and isinstance(value, (list, tuple, set)):
+            if op == 'pull':
+                if field.required or value is not None:
+                    if match == 'in' and not isinstance(value, dict):
+                        value = _prepare_query_for_iterable(field, op, value)
+                    else:
+                        value = field.prepare_query_value(op, value)
+            elif op == 'push' and isinstance(value, (list, tuple, set)):
                 value = [field.prepare_query_value(op, v) for v in value]
-            elif op in (None, 'set', 'push', 'pull'):
+            elif op in (None, 'set', 'push'):
                 if field.required or value is not None:
                     value = field.prepare_query_value(op, value)
             elif op in ('pushAll', 'pullAll'):
@@ -439,3 +432,22 @@ def _infer_geometry(value):
 
     raise InvalidQueryError('Invalid $geometry data. Can be either a '
                             'dictionary or (nested) lists of coordinate(s)')
+
+
+def _prepare_query_for_iterable(field, op, value):
+    # We need a special check for BaseDocument, because - although it's iterable - using
+    # it as such in the context of this method is most definitely a mistake.
+    BaseDocument = _import_class('BaseDocument')
+
+    if isinstance(value, BaseDocument):
+        raise TypeError("When using the `in`, `nin`, `all`, or "
+                        "`near`-operators you can\'t use a "
+                        "`Document`, you must wrap your object "
+                        "in a list (object -> [object]).")
+
+    if not hasattr(value, '__iter__'):
+        raise TypeError("The `in`, `nin`, `all`, or "
+                        "`near`-operators must be applied to an "
+                        "iterable (e.g. a list).")
+
+    return [field.prepare_query_value(op, v) for v in value]
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 20ab0b3fc..a043a6472 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -28,12 +28,16 @@ def test_transform_query(self):
                          {'name': {'$exists': True}})
 
     def test_transform_update(self):
+        class LisDoc(Document):
+            foo = ListField(StringField())
+
         class DicDoc(Document):
             dictField = DictField()
 
         class Doc(Document):
             pass
 
+        LisDoc.drop_collection()
         DicDoc.drop_collection()
         Doc.drop_collection()
 
@@ -51,6 +55,9 @@ class Doc(Document):
         update = transform.update(DicDoc, pull__dictField__test=doc)
         self.assertTrue(isinstance(update["$pull"]["dictField"]["test"], dict))
 
+        update = transform.update(LisDoc, pull__foo__in=['a'])
+        self.assertEqual(update, {'$pull': {'foo': {'$in': ['a']}}})
+
     def test_query_field_name(self):
         """Ensure that the correct field name is used when querying.
         """

From 2f4e2bde6bb1d892ac22928870e01889fa983833 Mon Sep 17 00:00:00 2001
From: Andy Yankovsky <weratt@gmail.com>
Date: Thu, 14 Sep 2017 21:02:53 +0300
Subject: [PATCH 0546/1519] Update AUTHORS

---
 AUTHORS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 4eac5eb2d..2e7b56fcb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -244,4 +244,5 @@ that much better:
  * Stanislav Kaledin (https://github.com/sallyruthstruik)
  * Dmitry Yantsen (https://github.com/mrTable)
  * Renjianxin (https://github.com/Davidrjx)
- * Erdenezul Batmunkh (https://github.com/erdenezul)
\ No newline at end of file
+ * Erdenezul Batmunkh (https://github.com/erdenezul)
+ * Andy Yankovsky (https://github.com/werat)

From aa4996ef28bec2614cb11c055b5d184fee6b9549 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Fri, 15 Sep 2017 11:18:24 +0800
Subject: [PATCH 0547/1519] fix bug query subfield in generic_embedded_document
 #1651

---
 mongoengine/fields.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index fffba7acf..cc66008ba 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -692,6 +692,14 @@ def validate(self, value, clean=True):
 
         value.validate(clean=clean)
 
+    def lookup_member(self, member_name):
+        if self.choices:
+            for choice in self.choices:
+                field = choice._fields.get(member_name)
+                if field:
+                    return field
+        return None
+
     def to_mongo(self, document, use_db_field=True, fields=None):
         if document is None:
             return None

From 091a02f73737ccd028aa256e2f50cc30d84621a7 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 1 Oct 2017 16:09:10 -0400
Subject: [PATCH 0548/1519] minor .travis.yml comment correction [ci skip]

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9362dcc21..78a9f787b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -97,7 +97,7 @@ deploy:
   distributions: "sdist bdist_wheel"
 
   # only deploy on tagged commits (aka GitHub releases) and only for the
-  # parent repo's builds running Python 2.7 along with dev PyMongo (we run
+  # parent repo's builds running Python 2.7 along with PyMongo v3.0 (we run
   # Travis against many different Python and PyMongo versions and we don't
   # want the deploy to occur multiple times).
   on:

From 01526a7b373b954ef053238331f84ef1193bb564 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 1 Oct 2017 16:32:02 -0400
Subject: [PATCH 0549/1519] v0.14.1 version bump + updated changelog

---
 docs/changelog.rst      | 10 +++++++++-
 mongoengine/__init__.py |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1dcbfb51b..f04ab3140 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,15 @@ Changelog
 
 Development
 ===========
-- Improve performances by removing SemiStrictDict
+- (Fill this out as you fix issues and develop your features).
+
+Changes in 0.14.1
+=================
+- Removed SemiStrictDict and started using a regular dict for `BaseDocument._data` #1630
+- Added support for the `$position` param in the `$push` operator #1566
+- Fixed `DateTimeField` interpreting an empty string as today #1533
+- Added a missing `__ne__` method to the `GridFSProxy` class #1632
+- Fixed `BaseQuerySet._fields_to_db_fields` #1553
 
 Changes in 0.14.0
 =================
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index b41e87e7c..4b60f1b7e 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 14, 0)
+VERSION = (0, 14, 1)
 
 
 def get_version():

From d79ab5ffeb421abe4c145af77633283f4d20d942 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 1 Oct 2017 17:05:28 -0400
Subject: [PATCH 0550/1519] remove {nospam} from author_email &
 maintainer_email (PyPI doesnt validate those anymore)

---
 setup.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index fa682d208..98964d199 100644
--- a/setup.py
+++ b/setup.py
@@ -70,9 +70,9 @@ def get_version(version_tuple):
     name='mongoengine',
     version=VERSION,
     author='Harry Marr',
-    author_email='harry.marr@{nospam}gmail.com',
-    maintainer="Ross Lawley",
-    maintainer_email="ross.lawley@{nospam}gmail.com",
+    author_email='harry.marr@gmail.com',
+    maintainer="Stefan Wojcik",
+    maintainer_email="wojcikstefan@gmail.com",
     url='http://mongoengine.org/',
     download_url='https://github.com/MongoEngine/mongoengine/tarball/master',
     license='MIT',

From a1494c4c93cce608d8d9450c9ef76c07559248c9 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Sun, 1 Oct 2017 17:31:10 -0400
Subject: [PATCH 0551/1519] v0.14.3 version bump

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 4b60f1b7e..c7c6f707d 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 14, 1)
+VERSION = (0, 14, 3)
 
 
 def get_version():

From 2f075be6f8857d297d9e939d9150417158d93d5a Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 2 Oct 2017 22:46:27 +0800
Subject: [PATCH 0552/1519] parse read_preference from conn_host #1665

---
 mongoengine/connection.py | 11 +++++++++++
 tests/test_connection.py  |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 34ff4dc31..ef815343c 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -103,6 +103,17 @@ def register_connection(alias, name=None, host=None, port=None,
                 conn_settings['authentication_source'] = uri_options['authsource']
             if 'authmechanism' in uri_options:
                 conn_settings['authentication_mechanism'] = uri_options['authmechanism']
+            if 'readpreference' in uri_options:
+                read_preferences = (ReadPreference.NEAREST,
+                                    ReadPreference.PRIMARY,
+                                    ReadPreference.PRIMARY_PREFERRED,
+                                    ReadPreference.SECONDARY,
+                                    ReadPreference.SECONDARY_PREFERRED)
+                read_pf_mode = uri_options['readpreference']
+                for preference in read_preferences:
+                    if preference.mode == read_pf_mode:
+                        conn_settings['read_preference'] = preference
+                        break
         else:
             resolved_hosts.append(entity)
     conn_settings['host'] = resolved_hosts
diff --git a/tests/test_connection.py b/tests/test_connection.py
index cdcf13773..f0c272e45 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -364,6 +364,11 @@ class DateDoc(Document):
         date_doc = DateDoc.objects.first()
         self.assertEqual(d, date_doc.the_date)
 
+    def test_read_preference_from_parse(self):
+        from pymongo import ReadPreference
+        conn = connect(host="mongodb://a1.vpc,a2.vpc,a3.vpc/prod?readPreference=secondaryPreferred")
+        self.assertEqual(conn.read_preference, ReadPreference.SECONDARY_PREFERRED)
+
     def test_multiple_connection_settings(self):
         connect('mongoenginetest', alias='t1', host="localhost")
 

From 416486c370cbe565128b04e9fadcc65e643d12d9 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 2 Oct 2017 23:13:25 +0800
Subject: [PATCH 0553/1519] use read_preference only pymongo3.x #1665

---
 mongoengine/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index ef815343c..419af6bc3 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -103,7 +103,7 @@ def register_connection(alias, name=None, host=None, port=None,
                 conn_settings['authentication_source'] = uri_options['authsource']
             if 'authmechanism' in uri_options:
                 conn_settings['authentication_mechanism'] = uri_options['authmechanism']
-            if 'readpreference' in uri_options:
+            if IS_PYMONGO_3 and 'readpreference' in uri_options:
                 read_preferences = (ReadPreference.NEAREST,
                                     ReadPreference.PRIMARY,
                                     ReadPreference.PRIMARY_PREFERRED,

From 5c4ce8754e29d435a621a1780ef96c3a6bb60ebf Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Mon, 2 Oct 2017 23:15:37 +0800
Subject: [PATCH 0554/1519] run tests only pymongo3 #1565

---
 tests/test_connection.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index f0c272e45..f58b1a3e0 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -365,9 +365,10 @@ class DateDoc(Document):
         self.assertEqual(d, date_doc.the_date)
 
     def test_read_preference_from_parse(self):
-        from pymongo import ReadPreference
-        conn = connect(host="mongodb://a1.vpc,a2.vpc,a3.vpc/prod?readPreference=secondaryPreferred")
-        self.assertEqual(conn.read_preference, ReadPreference.SECONDARY_PREFERRED)
+        if IS_PYMONGO_3:
+            from pymongo import ReadPreference
+            conn = connect(host="mongodb://a1.vpc,a2.vpc,a3.vpc/prod?readPreference=secondaryPreferred")
+            self.assertEqual(conn.read_preference, ReadPreference.SECONDARY_PREFERRED)
 
     def test_multiple_connection_settings(self):
         connect('mongoenginetest', alias='t1', host="localhost")

From 6e2db1ced6a8621e35cf38f27993751fe5ea1e6b Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Tue, 3 Oct 2017 09:23:17 +0800
Subject: [PATCH 0555/1519] read_preference from parse_uri only PYMONGO_3 #1665

---
 mongoengine/connection.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 419af6bc3..feba0b581 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -104,14 +104,15 @@ def register_connection(alias, name=None, host=None, port=None,
             if 'authmechanism' in uri_options:
                 conn_settings['authentication_mechanism'] = uri_options['authmechanism']
             if IS_PYMONGO_3 and 'readpreference' in uri_options:
-                read_preferences = (ReadPreference.NEAREST,
-                                    ReadPreference.PRIMARY,
-                                    ReadPreference.PRIMARY_PREFERRED,
-                                    ReadPreference.SECONDARY,
-                                    ReadPreference.SECONDARY_PREFERRED)
-                read_pf_mode = uri_options['readpreference']
+                read_preferences = (
+                    ReadPreference.NEAREST,
+                    ReadPreference.PRIMARY,
+                    ReadPreference.PRIMARY_PREFERRED,
+                    ReadPreference.SECONDARY,
+                    ReadPreference.SECONDARY_PREFERRED)
+                read_pf_mode = uri_options['readpreference'].lower()
                 for preference in read_preferences:
-                    if preference.mode == read_pf_mode:
+                    if preference.name.lower() == read_pf_mode:
                         conn_settings['read_preference'] = preference
                         break
         else:

From 9ab856e186b438bc28f12cae8274ea1bb2ff3614 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Tue, 10 Oct 2017 10:34:34 +0800
Subject: [PATCH 0556/1519] use each modifier only with  #1673

---
 mongoengine/queryset/transform.py |  2 --
 tests/document/instance.py        | 11 +++++++++++
 tests/queryset/queryset.py        | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index a9907adac..3eadaf640 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -344,8 +344,6 @@ def update(_doc_cls=None, **update):
                 if not isinstance(value, (set, tuple, list)):
                     value = [value]
                 value = {key: {'$each': value, '$position': position}}
-            elif isinstance(value, list):
-                value = {key: {'$each': value}}
             else:
                 value = {key: value}
         else:
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 609bc9000..721aa95f9 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -3183,6 +3183,17 @@ class BlogPost(Document):
         blog.reload()
         self.assertEqual(blog.tags, ['mongodb', 'code', 'python'])
 
+    def test_push_nested_list(self):
+        """Ensure that push update works in nested list"""
+        class BlogPost(Document):
+            slug = StringField()
+            tags = ListField()
+
+        blog = BlogPost(slug="test").save()
+        blog.update(push__tags=["value1", 123])
+        blog.reload()
+        self.assertEqual(blog.tags, [["value1", 123]])
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c78ed9857..d633b8b2f 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1929,6 +1929,21 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.tags, ['scala', 'mongodb', 'python', 'java'])
 
+    def test_update_push_list_of_list(self):
+        """Ensure that the 'push' update operation works in the list of list
+        """
+        class BlogPost(Document):
+            slug = StringField()
+            tags = ListField()
+
+        BlogPost.drop_collection()
+
+        post = BlogPost(slug="test").save()
+
+        BlogPost.objects.filter(slug="test").update(push__tags=["value1", 123])
+        post.reload()
+        self.assertEqual(post.tags, [["value1", 123]])
+
     def test_update_push_and_pull_add_to_set(self):
         """Ensure that the 'pull' update operation works correctly.
         """

From 15451ff42b7cc7b5a9a76190b60e96d062ecff81 Mon Sep 17 00:00:00 2001
From: Mandeep Singh <mandeep25894@gmail.com>
Date: Tue, 17 Oct 2017 00:11:47 +0530
Subject: [PATCH 0557/1519] return instead of raising StopIteration

---
 mongoengine/queryset/base.py     | 2 +-
 mongoengine/queryset/queryset.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 6f9c372c6..2dcfdbea1 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1461,7 +1461,7 @@ def next(self):
         """Wrap the result in a :class:`~mongoengine.Document` object.
         """
         if self._limit == 0 or self._none:
-            raise StopIteration
+            return
 
         raw_doc = self._cursor.next()
 
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index cf913b01c..1aadfb768 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -89,10 +89,10 @@ def _iter_results(self):
                 yield self._result_cache[pos]
                 pos += 1
 
-            # Raise StopIteration if we already established there were no more
+            # return if we already established there were no more
             # docs in the db cursor.
             if not self._has_more:
-                raise StopIteration
+                return
 
             # Otherwise, populate more of the cache and repeat.
             if len(self._result_cache) <= pos:

From e6c0280b40f18074c0a6267b29f2a77f21c1c779 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Mon, 30 Oct 2017 18:15:51 +0100
Subject: [PATCH 0558/1519] Add LazyReferenceField

---
 docs/changelog.rst                 |   6 +-
 mongoengine/base/__init__.py       |   2 +-
 mongoengine/base/datastructures.py |  42 ++++-
 mongoengine/fields.py              | 139 ++++++++++++++-
 tests/fields/fields.py             | 276 ++++++++++++++++++++++++++++-
 5 files changed, 456 insertions(+), 9 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f04ab3140..834fbee28 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,9 +2,9 @@
 Changelog
 =========
 
-Development
-===========
-- (Fill this out as you fix issues and develop your features).
+Changes in 0.15.0
+=================
+- Add LazyReferenceField to address #1230
 
 Changes in 0.14.1
 =================
diff --git a/mongoengine/base/__init__.py b/mongoengine/base/__init__.py
index da31b9227..e069a147a 100644
--- a/mongoengine/base/__init__.py
+++ b/mongoengine/base/__init__.py
@@ -15,7 +15,7 @@
     'UPDATE_OPERATORS', '_document_registry', 'get_document',
 
     # datastructures
-    'BaseDict', 'BaseList', 'EmbeddedDocumentList',
+    'BaseDict', 'BaseList', 'EmbeddedDocumentList', 'LazyReference',
 
     # document
     'BaseDocument',
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 14fe95e9e..043df4719 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -2,11 +2,12 @@
 import weakref
 
 import six
+from bson import DBRef
 
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
 
-__all__ = ('BaseDict', 'BaseList', 'EmbeddedDocumentList')
+__all__ = ('BaseDict', 'BaseList', 'EmbeddedDocumentList', 'LazyReference')
 
 
 class BaseDict(dict):
@@ -445,3 +446,42 @@ def __repr__(self):
 
             cls._classes[allowed_keys] = SpecificStrictDict
         return cls._classes[allowed_keys]
+
+
+class LazyReference(DBRef):
+    __slots__ = ('_cached_doc', 'passthrough', 'document_type')
+
+    def fetch(self, force=False):
+        if not self._cached_doc or force:
+            self._cached_doc = self.document_type.objects.get(pk=self.pk)
+            if not self._cached_doc:
+                raise DoesNotExist('Trying to dereference unknown document %s' % (self))
+        return self._cached_doc
+
+    @property
+    def pk(self):
+        return self.id
+
+    def __init__(self, document_type, pk, cached_doc=None, passthrough=False):
+        self.document_type = document_type
+        self._cached_doc = cached_doc
+        self.passthrough = passthrough
+        super(LazyReference, self).__init__(self.document_type._get_collection_name(), pk)
+
+    def __getitem__(self, name):
+        if not self.passthrough:
+            raise KeyError()
+        document = self.fetch()
+        return document[name]
+
+    def __getattr__(self, name):
+        if not object.__getattribute__(self, 'passthrough'):
+            raise AttributeError()
+        document = self.fetch()
+        try:
+            return document[name]
+        except KeyError:
+            raise AttributeError()
+
+    def __repr__(self):
+        return "<LazyReference(%s, %r)>" % (self.document_type, self.pk)
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index fffba7acf..73a62bc59 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -26,7 +26,8 @@
     Int64 = long
 
 from mongoengine.base import (BaseDocument, BaseField, ComplexBaseField,
-                              GeoJsonBaseField, ObjectIdField, get_document)
+                              GeoJsonBaseField, ObjectIdField, get_document,
+                              LazyReference)
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
@@ -46,6 +47,8 @@
     'GenericEmbeddedDocumentField', 'DynamicField', 'ListField',
     'SortedListField', 'EmbeddedDocumentListField', 'DictField',
     'MapField', 'ReferenceField', 'CachedReferenceField',
+    'LazyReferenceField',
+    # 'GenericLazyReferenceField',
     'GenericReferenceField', 'BinaryField', 'GridFSError', 'GridFSProxy',
     'FileField', 'ImageGridFsProxy', 'ImproperlyConfigured', 'ImageField',
     'GeoPointField', 'PointField', 'LineStringField', 'PolygonField',
@@ -953,6 +956,15 @@ class ReferenceField(BaseField):
     """A reference to a document that will be automatically dereferenced on
     access (lazily).
 
+    Note this means you will get a database I/O access everytime you access
+    this field. This is necessary because the field returns a :class:`~mongoengine.Document`
+    which precise type can depend of the value of the `_cls` field present in the
+    document in database.
+    In short, using this type of field can lead to poor performances (especially
+    if you access this field only to retrieve it `pk` field which is already
+    known before dereference). To solve this you should consider using the
+    :class:`~mongoengine.fields.LazyReferenceField`.
+
     Use the `reverse_delete_rule` to handle what should happen if the document
     the field is referencing is deleted.  EmbeddedDocuments, DictFields and
     MapFields does not support reverse_delete_rule and an `InvalidDocumentError`
@@ -1087,8 +1099,8 @@ def prepare_query_value(self, op, value):
 
     def validate(self, value):
 
-        if not isinstance(value, (self.document_type, DBRef, ObjectId)):
-            self.error('A ReferenceField only accepts DBRef, ObjectId or documents')
+        if not isinstance(value, (self.document_type, LazyReference, DBRef, ObjectId)):
+            self.error('A ReferenceField only accepts DBRef, LazyReference, ObjectId or documents')
 
         if isinstance(value, Document) and value.id is None:
             self.error('You can only reference documents once they have been '
@@ -2141,3 +2153,124 @@ class MultiPolygonField(GeoJsonBaseField):
     .. versionadded:: 0.9
     """
     _type = 'MultiPolygon'
+
+
+class LazyReferenceField(BaseField):
+    """A really lazy reference to a document.
+    Unlike the :class:`~mongoengine.fields.ReferenceField` it must be manually
+    dereferenced using it ``fetch()`` method.
+    """
+
+    def __init__(self, document_type, passthrough=False, dbref=False,
+                 reverse_delete_rule=DO_NOTHING, **kwargs):
+        """Initialises the Reference Field.
+
+        :param dbref:  Store the reference as :class:`~pymongo.dbref.DBRef`
+          or as the :class:`~pymongo.objectid.ObjectId`.id .
+        :param reverse_delete_rule: Determines what to do when the referring
+          object is deleted
+        :param passthrough: When trying to access unknown fields, the
+        :class:`~mongoengine.base.datastructure.LazyReference` instance will
+        automatically call `fetch()` and try to retrive the field on the fetched
+        document. Note this only work getting field (not setting or deleting).
+        """
+        if (
+            not isinstance(document_type, six.string_types) and
+            not issubclass(document_type, Document)
+        ):
+            self.error('Argument to LazyReferenceField constructor must be a '
+                       'document class or a string')
+
+        self.dbref = dbref
+        self.passthrough = passthrough
+        self.document_type_obj = document_type
+        self.reverse_delete_rule = reverse_delete_rule
+        super(LazyReferenceField, self).__init__(**kwargs)
+
+    @property
+    def document_type(self):
+        if isinstance(self.document_type_obj, six.string_types):
+            if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
+                self.document_type_obj = self.owner_document
+            else:
+                self.document_type_obj = get_document(self.document_type_obj)
+        return self.document_type_obj
+
+    def __get__(self, instance, owner):
+        """Descriptor to allow lazy dereferencing."""
+        if instance is None:
+            # Document class being used rather than a document object
+            return self
+
+        value = instance._data.get(self.name)
+        if isinstance(value, LazyReference):
+            if value.passthrough != self.passthrough:
+                instance._data[self.name] = LazyReference(
+                    value.document_type, value.pk, passthrough=self.passthrough)
+        elif value is not None:
+            if isinstance(value, self.document_type):
+                value = LazyReference(self.document_type, value.pk, passthrough=self.passthrough)
+            elif isinstance(value, DBRef):
+                value = LazyReference(self.document_type, value.id, passthrough=self.passthrough)
+            else:
+                # value is the primary key of the referenced document
+                value = LazyReference(self.document_type, value, passthrough=self.passthrough)
+            instance._data[self.name] = value
+
+        return super(LazyReferenceField, self).__get__(instance, owner)
+
+    def to_mongo(self, value):
+        if isinstance(value, LazyReference):
+            pk = value.pk
+        elif isinstance(value, self.document_type):
+            pk = value.pk
+        elif isinstance(value, DBRef):
+            pk = value.id
+        else:
+            # value is the primary key of the referenced document
+            pk = value
+        id_field_name = self.document_type._meta['id_field']
+        id_field = self.document_type._fields[id_field_name]
+        pk = id_field.to_mongo(pk)
+        if self.dbref:
+            return DBRef(self.document_type._get_collection_name(), pk)
+        else:
+            return pk
+
+    def validate(self, value):
+        if isinstance(value, LazyReference):
+            if not issubclass(value.document_type, self.document_type):
+                self.error('Reference must be on a `%s` document.' % self.document_type)
+            pk = value.pk
+        elif isinstance(value, self.document_type):
+            pk = value.pk
+        elif isinstance(value, DBRef):
+            # TODO: check collection ?
+            collection = self.document_type._get_collection_name()
+            if value.collection != collection:
+                self.error("DBRef on bad collection (must be on `%s`)" % collection)
+            pk = value.id
+        else:
+            # value is the primary key of the referenced document
+            id_field_name = self.document_type._meta['id_field']
+            id_field = getattr(self.document_type, id_field_name)
+            pk = value
+            try:
+                id_field.validate(pk)
+            except ValidationError:
+                self.error("value should be `{0}` document, LazyReference or DBRef on `{0}` "
+                           "or `{0}`'s primary key (i.e. `{1}`)".format(
+                            self.document_type.__name__, type(id_field).__name__))
+
+        if pk is None:
+            self.error('You can only reference documents once they have been '
+                       'saved to the database')
+
+    def prepare_query_value(self, op, value):
+        if value is None:
+            return None
+        super(LazyReferenceField, self).prepare_query_value(op, value)
+        return self.to_mongo(value)
+
+    def lookup_member(self, member_name):
+        return self.document_type._fields.get(member_name)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7a0ccc251..841566222 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -26,7 +26,7 @@
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.base import (BaseDict, BaseField, EmbeddedDocumentList,
-                              _document_registry)
+                              _document_registry, LazyReference)
 
 from tests.utils import MongoDBTestCase
 
@@ -931,7 +931,9 @@ class BlogPost(Document):
             comments = ListField(EmbeddedDocumentField(Comment))
             tags = ListField(StringField())
             authors = ListField(ReferenceField(User))
+            authors_as_lazy = ListField(LazyReferenceField(User))
             generic = ListField(GenericReferenceField())
+            # generic_as_lazy = ListField(LazyGenericReferenceField())
 
         User.drop_collection()
         BlogPost.drop_collection()
@@ -969,6 +971,15 @@ class BlogPost(Document):
         post.authors = [user]
         post.validate()
 
+        post.authors_as_lazy = [Comment()]
+        self.assertRaises(ValidationError, post.validate)
+
+        post.authors_as_lazy = [User()]
+        self.assertRaises(ValidationError, post.validate)
+
+        post.authors_as_lazy = [user]
+        post.validate()
+
         post.generic = [1, 2]
         self.assertRaises(ValidationError, post.validate)
 
@@ -981,6 +992,18 @@ class BlogPost(Document):
         post.generic = [user]
         post.validate()
 
+        # post.generic_as_lazy = [1, 2]
+        # self.assertRaises(ValidationError, post.validate)
+
+        # post.generic_as_lazy = [User(), Comment()]
+        # self.assertRaises(ValidationError, post.validate)
+
+        # post.generic_as_lazy = [Comment()]
+        # self.assertRaises(ValidationError, post.validate)
+
+        # post.generic_as_lazy = [user]
+        # post.validate()
+
     def test_sorted_list_sorting(self):
         """Ensure that a sorted list field properly sorts values.
         """
@@ -4598,5 +4621,256 @@ class Ocorrence(Document):
         self.assertTrue(isinstance(ocorrence.animal, Animal))
 
 
+class LazyReferenceFieldTest(MongoDBTestCase):
+    def test_lazy_reference_config(self):
+        # Make sure ReferenceField only accepts a document class or a string
+        # with a document class name.
+        self.assertRaises(ValidationError, LazyReferenceField, EmbeddedDocument)
+
+    def test_lazy_reference_simple(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        Ocurrence(person="test", animal=animal).save()
+        p = Ocurrence.objects.get()
+        self.assertIsInstance(p.animal, LazyReference)
+        fetched_animal = p.animal.fetch()
+        self.assertEqual(fetched_animal, animal)
+        # `fetch` keep cache on referenced document by default...
+        animal.tag = "not so heavy"
+        animal.save()
+        double_fetch = p.animal.fetch()
+        self.assertIs(fetched_animal, double_fetch)
+        self.assertEqual(double_fetch.tag, "heavy")
+        # ...unless specified otherwise
+        fetch_force = p.animal.fetch(force=True)
+        self.assertIsNot(fetch_force, fetched_animal)
+        self.assertEqual(fetch_force.tag, "not so heavy")
+
+    def test_lazy_reference_fetch_invalid_ref(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        Ocurrence(person="test", animal=animal).save()
+        animal.delete()
+        p = Ocurrence.objects.get()
+        self.assertIsInstance(p.animal, LazyReference)
+        with self.assertRaises(DoesNotExist):
+            p.animal.fetch()
+
+    def test_lazy_reference_set(self):
+        class Animal(Document):
+            meta = {'allow_inheritance': True}
+
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        class SubAnimal(Animal):
+            nick = StringField()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        sub_animal = SubAnimal(nick='doggo', name='dog').save()
+        for ref in (
+                animal,
+                animal.pk,
+                DBRef(animal._get_collection_name(), animal.pk),
+                LazyReference(Animal, animal.pk),
+
+                sub_animal,
+                sub_animal.pk,
+                DBRef(sub_animal._get_collection_name(), sub_animal.pk),
+                LazyReference(SubAnimal, sub_animal.pk),
+                ):
+            p = Ocurrence(person="test", animal=ref).save()
+            p.reload()
+            self.assertIsInstance(p.animal, LazyReference)
+            p.animal.fetch()
+
+    def test_lazy_reference_bad_set(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        class BadDoc(Document):
+            pass
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        baddoc = BadDoc().save()
+        for bad in (
+                42,
+                'foo',
+                baddoc,
+                DBRef(baddoc._get_collection_name(), animal.pk),
+                LazyReference(BadDoc, animal.pk)
+                ):
+            with self.assertRaises(ValidationError):
+                p = Ocurrence(person="test", animal=bad).save()
+
+    def test_lazy_reference_query_conversion(self):
+        """Ensure that LazyReferenceFields can be queried using objects and values
+        of the type of the primary key of the referenced object.
+        """
+        class Member(Document):
+            user_num = IntField(primary_key=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            author = LazyReferenceField(Member, dbref=False)
+
+        Member.drop_collection()
+        BlogPost.drop_collection()
+
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
+
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
+
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
+
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
+
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
+
+        # Same thing by passing a LazyReference instance
+        post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
+        self.assertEqual(post.id, post2.id)
+
+    def test_lazy_reference_query_conversion_dbref(self):
+        """Ensure that LazyReferenceFields can be queried using objects and values
+        of the type of the primary key of the referenced object.
+        """
+        class Member(Document):
+            user_num = IntField(primary_key=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            author = LazyReferenceField(Member, dbref=True)
+
+        Member.drop_collection()
+        BlogPost.drop_collection()
+
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
+
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
+
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
+
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
+
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
+
+        # Same thing by passing a LazyReference instance
+        post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
+        self.assertEqual(post.id, post2.id)
+
+    def test_lazy_reference_passthrough(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            animal = LazyReferenceField(Animal, passthrough=False)
+            animal_passthrough = LazyReferenceField(Animal, passthrough=True)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        Ocurrence(animal=animal, animal_passthrough=animal).save()
+        p = Ocurrence.objects.get()
+        self.assertIsInstance(p.animal, LazyReference)
+        with self.assertRaises(KeyError):
+            p.animal['name']
+        with self.assertRaises(AttributeError):
+            p.animal.name
+        self.assertEqual(p.animal.pk, animal.pk)
+
+        self.assertEqual(p.animal_passthrough.name, "Leopard")
+        self.assertEqual(p.animal_passthrough['name'], "Leopard")
+
+        # Should not be able to access referenced document's methods
+        with self.assertRaises(AttributeError):
+            p.animal.save
+        with self.assertRaises(KeyError):
+            p.animal['save']
+
+    def test_lazy_reference_not_set(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        Ocurrence(person='foo').save()
+        p = Ocurrence.objects.get()
+        self.assertIs(p.animal, None)
+
+    def test_lazy_reference_equality(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        Animal.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        animalref = LazyReference(Animal, animal.pk)
+        self.assertEqual(animal, animalref)
+        self.assertEqual(animalref, animal)
+
+        other_animalref = LazyReference(Animal, ObjectId("54495ad94c934721ede76f90"))
+        self.assertNotEqual(animal, other_animalref)
+        self.assertNotEqual(other_animalref, animal)
+
+
 if __name__ == '__main__':
     unittest.main()

From 35d04582280c189ce7433864686fda20ae859b02 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Mon, 6 Nov 2017 12:17:31 +0100
Subject: [PATCH 0559/1519] Add GenericLazyReferenceField

---
 docs/changelog.rst     |   2 +-
 mongoengine/fields.py  |  73 ++++++++++++++-
 tests/fields/fields.py | 198 +++++++++++++++++++++++++++++++++++++++--
 3 files changed, 261 insertions(+), 12 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 834fbee28..1e9ac7fc0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 
 Changes in 0.15.0
 =================
-- Add LazyReferenceField to address #1230
+- Add LazyReferenceField and GenericLazyReferenceField to address #1230
 
 Changes in 0.14.1
 =================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 73a62bc59..61e0cb690 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -47,8 +47,7 @@
     'GenericEmbeddedDocumentField', 'DynamicField', 'ListField',
     'SortedListField', 'EmbeddedDocumentListField', 'DictField',
     'MapField', 'ReferenceField', 'CachedReferenceField',
-    'LazyReferenceField',
-    # 'GenericLazyReferenceField',
+    'LazyReferenceField', 'GenericLazyReferenceField',
     'GenericReferenceField', 'BinaryField', 'GridFSError', 'GridFSProxy',
     'FileField', 'ImageGridFsProxy', 'ImproperlyConfigured', 'ImageField',
     'GeoPointField', 'PointField', 'LineStringField', 'PolygonField',
@@ -1275,6 +1274,12 @@ class GenericReferenceField(BaseField):
     """A reference to *any* :class:`~mongoengine.document.Document` subclass
     that will be automatically dereferenced on access (lazily).
 
+    Note this field works the same way as :class:`~mongoengine.document.ReferenceField`,
+    doing database I/O access the first time it is accessed (even if it's to access
+    it ``pk`` or ``id`` field).
+    To solve this you should consider using the
+    :class:`~mongoengine.fields.GenericLazyReferenceField`.
+
     .. note ::
         * Any documents used as a generic reference must be registered in the
           document registry.  Importing the model will automatically register
@@ -2159,6 +2164,8 @@ class LazyReferenceField(BaseField):
     """A really lazy reference to a document.
     Unlike the :class:`~mongoengine.fields.ReferenceField` it must be manually
     dereferenced using it ``fetch()`` method.
+
+    .. versionadded:: 0.15
     """
 
     def __init__(self, document_type, passthrough=False, dbref=False,
@@ -2274,3 +2281,65 @@ def prepare_query_value(self, op, value):
 
     def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
+
+
+class GenericLazyReferenceField(GenericReferenceField):
+    """A reference to *any* :class:`~mongoengine.document.Document` subclass
+    that will be automatically dereferenced on access (lazily).
+    Unlike the :class:`~mongoengine.fields.GenericReferenceField` it must be
+    manually dereferenced using it ``fetch()`` method.
+
+    .. note ::
+        * Any documents used as a generic reference must be registered in the
+          document registry.  Importing the model will automatically register
+          it.
+
+        * You can use the choices param to limit the acceptable Document types
+
+    .. versionadded:: 0.15
+    """
+
+    def __init__(self, *args, **kwargs):
+        self.passthrough = kwargs.pop('passthrough', False)
+        super(GenericLazyReferenceField, self).__init__(*args, **kwargs)
+
+    def _validate_choices(self, value):
+        if isinstance(value, LazyReference):
+            value = value.document_type
+        super(GenericLazyReferenceField, self)._validate_choices(value)
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+
+        value = instance._data.get(self.name)
+        if isinstance(value, LazyReference):
+            if value.passthrough != self.passthrough:
+                instance._data[self.name] = LazyReference(
+                    value.document_type, value.pk, passthrough=self.passthrough)
+        elif value is not None:
+            if isinstance(value, (dict, SON)):
+                value = LazyReference(get_document(value['_cls']), value['_ref'].id, passthrough=self.passthrough)
+            elif isinstance(value, Document):
+                value = LazyReference(type(value), value.pk, passthrough=self.passthrough)
+            instance._data[self.name] = value
+
+        return super(GenericLazyReferenceField, self).__get__(instance, owner)
+
+    def validate(self, value):
+        if isinstance(value, LazyReference) and value.pk is None:
+            self.error('You can only reference documents once they have been'
+                       ' saved to the database')
+        return super(GenericLazyReferenceField, self).validate(value)
+
+    def to_mongo(self, document):
+        if document is None:
+            return None
+
+        if isinstance(document, LazyReference):
+            return SON((
+                ('_cls', document.document_type._class_name),
+                ('_ref', document)
+            ))
+        else:
+            return super(GenericLazyReferenceField, self).to_mongo(document)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 841566222..632f54042 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -933,7 +933,7 @@ class BlogPost(Document):
             authors = ListField(ReferenceField(User))
             authors_as_lazy = ListField(LazyReferenceField(User))
             generic = ListField(GenericReferenceField())
-            # generic_as_lazy = ListField(LazyGenericReferenceField())
+            generic_as_lazy = ListField(GenericLazyReferenceField())
 
         User.drop_collection()
         BlogPost.drop_collection()
@@ -992,17 +992,17 @@ class BlogPost(Document):
         post.generic = [user]
         post.validate()
 
-        # post.generic_as_lazy = [1, 2]
-        # self.assertRaises(ValidationError, post.validate)
+        post.generic_as_lazy = [1, 2]
+        self.assertRaises(ValidationError, post.validate)
 
-        # post.generic_as_lazy = [User(), Comment()]
-        # self.assertRaises(ValidationError, post.validate)
+        post.generic_as_lazy = [User(), Comment()]
+        self.assertRaises(ValidationError, post.validate)
 
-        # post.generic_as_lazy = [Comment()]
-        # self.assertRaises(ValidationError, post.validate)
+        post.generic_as_lazy = [Comment()]
+        self.assertRaises(ValidationError, post.validate)
 
-        # post.generic_as_lazy = [user]
-        # post.validate()
+        post.generic_as_lazy = [user]
+        post.validate()
 
     def test_sorted_list_sorting(self):
         """Ensure that a sorted list field properly sorts values.
@@ -4872,5 +4872,185 @@ class Animal(Document):
         self.assertNotEqual(other_animalref, animal)
 
 
+class GenericLazyReferenceFieldTest(MongoDBTestCase):
+    def test_generic_lazy_reference_simple(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        Ocurrence(person="test", animal=animal).save()
+        p = Ocurrence.objects.get()
+        self.assertIsInstance(p.animal, LazyReference)
+        fetched_animal = p.animal.fetch()
+        self.assertEqual(fetched_animal, animal)
+        # `fetch` keep cache on referenced document by default...
+        animal.tag = "not so heavy"
+        animal.save()
+        double_fetch = p.animal.fetch()
+        self.assertIs(fetched_animal, double_fetch)
+        self.assertEqual(double_fetch.tag, "heavy")
+        # ...unless specified otherwise
+        fetch_force = p.animal.fetch(force=True)
+        self.assertIsNot(fetch_force, fetched_animal)
+        self.assertEqual(fetch_force.tag, "not so heavy")
+
+    def test_generic_lazy_reference_choices(self):
+        class Animal(Document):
+            name = StringField()
+
+        class Vegetal(Document):
+            name = StringField()
+
+        class Mineral(Document):
+            name = StringField()
+
+        class Ocurrence(Document):
+            living_thing = GenericLazyReferenceField(choices=[Animal, Vegetal])
+            thing = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Vegetal.drop_collection()
+        Mineral.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard").save()
+        vegetal = Vegetal(name="Oak").save()
+        mineral = Mineral(name="Granite").save()
+
+        occ_animal = Ocurrence(living_thing=animal, thing=animal).save()
+        occ_vegetal = Ocurrence(living_thing=vegetal, thing=vegetal).save()
+        with self.assertRaises(ValidationError):
+            Ocurrence(living_thing=mineral).save()
+
+        occ = Ocurrence.objects.get(living_thing=animal)
+        self.assertEqual(occ, occ_animal)
+        self.assertIsInstance(occ.thing, LazyReference)
+        self.assertIsInstance(occ.living_thing, LazyReference)
+
+        occ.thing = vegetal
+        occ.living_thing = vegetal
+        occ.save()
+
+        occ.thing = mineral
+        occ.living_thing = mineral
+        with self.assertRaises(ValidationError):
+            occ.save()
+
+    def test_generic_lazy_reference_set(self):
+        class Animal(Document):
+            meta = {'allow_inheritance': True}
+
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        class SubAnimal(Animal):
+            nick = StringField()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        sub_animal = SubAnimal(nick='doggo', name='dog').save()
+        for ref in (
+                animal,
+                LazyReference(Animal, animal.pk),
+                {'_cls': 'Animal', '_ref': DBRef(animal._get_collection_name(), animal.pk)},
+
+                sub_animal,
+                LazyReference(SubAnimal, sub_animal.pk),
+                {'_cls': 'SubAnimal', '_ref': DBRef(sub_animal._get_collection_name(), sub_animal.pk)},
+                ):
+            p = Ocurrence(person="test", animal=ref).save()
+            p.reload()
+            self.assertIsInstance(p.animal, (LazyReference, Document))
+            p.animal.fetch()
+
+    def test_generic_lazy_reference_bad_set(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = GenericLazyReferenceField(choices=['Animal'])
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        class BadDoc(Document):
+            pass
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        baddoc = BadDoc().save()
+        for bad in (
+                42,
+                'foo',
+                baddoc,
+                LazyReference(BadDoc, animal.pk)
+                ):
+            with self.assertRaises(ValidationError):
+                p = Ocurrence(person="test", animal=bad).save()
+
+    def test_generic_lazy_reference_query_conversion(self):
+        class Member(Document):
+            user_num = IntField(primary_key=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            author = GenericLazyReferenceField()
+
+        Member.drop_collection()
+        BlogPost.drop_collection()
+
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
+
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
+
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
+
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
+
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
+
+        # Same thing by passing a LazyReference instance
+        post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
+        self.assertEqual(post.id, post2.id)
+
+    def test_generic_lazy_reference_not_set(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        Ocurrence(person='foo').save()
+        p = Ocurrence.objects.get()
+        self.assertIs(p.animal, None)
+
+
 if __name__ == '__main__':
     unittest.main()

From da33cb54fe3e80490e55957da914fec6bbde92ba Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Mon, 6 Nov 2017 14:11:11 +0100
Subject: [PATCH 0560/1519] Correct style

---
 mongoengine/base/datastructures.py |  2 +-
 mongoengine/fields.py              | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 043df4719..43f328108 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,8 +1,8 @@
 import itertools
 import weakref
 
-import six
 from bson import DBRef
+import six
 
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 61e0cb690..62d9b9415 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -26,8 +26,8 @@
     Int64 = long
 
 from mongoengine.base import (BaseDocument, BaseField, ComplexBaseField,
-                              GeoJsonBaseField, ObjectIdField, get_document,
-                              LazyReference)
+                              GeoJsonBaseField, LazyReference, ObjectIdField,
+                              get_document)
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
@@ -2265,9 +2265,10 @@ def validate(self, value):
             try:
                 id_field.validate(pk)
             except ValidationError:
-                self.error("value should be `{0}` document, LazyReference or DBRef on `{0}` "
-                           "or `{0}`'s primary key (i.e. `{1}`)".format(
-                            self.document_type.__name__, type(id_field).__name__))
+                self.error(
+                    "value should be `{0}` document, LazyReference or DBRef on `{0}` "
+                    "or `{0}`'s primary key (i.e. `{1}`)".format(
+                        self.document_type.__name__, type(id_field).__name__))
 
         if pk is None:
             self.error('You can only reference documents once they have been '

From ea25972257fd75ddf6a5cee674e1b9ed67f80ad7 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Mon, 6 Nov 2017 14:39:10 +0100
Subject: [PATCH 0561/1519] Bump version to 0.15.0

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index c7c6f707d..a1b7d6825 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 14, 3)
+VERSION = (0, 15, 0)
 
 
 def get_version():

From 4f5b0634ad944534012a7752f26dfbe541160a2c Mon Sep 17 00:00:00 2001
From: Ryan Scott <ryan@strongarm.io>
Date: Tue, 7 Nov 2017 16:26:01 -0500
Subject: [PATCH 0562/1519] Add documentation for auto_create_index to the
 Indexing section of the Docs

---
 docs/guide/defining-documents.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index d41ae7e63..5ff7a56b3 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -526,8 +526,9 @@ There are a few top level defaults for all indexes that can be set::
         meta = {
             'index_options': {},
             'index_background': True,
+            'index_cls': False,
+            'auto_create_index': True,
             'index_drop_dups': True,
-            'index_cls': False
         }
 
 
@@ -540,6 +541,12 @@ There are a few top level defaults for all indexes that can be set::
 :attr:`index_cls` (Optional)
     A way to turn off a specific index for _cls.
 
+:attr:`auto_create_index` (Optional)
+    When this is True (default), MongoEngine will ensure that the correct
+    indexes exist in MongoDB each time a command is run. This can be disabled
+    in systems where indexes are managed separately. Disabling this will improve
+    performance.
+
 :attr:`index_drop_dups` (Optional)
     Set the default value for if an index should drop duplicates
 

From 6b38ef3c9f0a69420fe4305dda226a0faf9f0528 Mon Sep 17 00:00:00 2001
From: kcarretto <kcarretto@gmail.com>
Date: Sat, 11 Nov 2017 03:36:28 -0500
Subject: [PATCH 0563/1519] Fixed format string issue in mongoengine error
 message.

---
 mongoengine/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 62d9b9415..8692e3a73 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1108,7 +1108,7 @@ def validate(self, value):
         if self.document_type._meta.get('abstract') and \
                 not isinstance(value, self.document_type):
             self.error(
-                '%s is not an instance of abstract reference type %s' % (
+                '%s is not an instance of abstract reference type %s' % (value,
                     self.document_type._class_name)
             )
 

From 47c7cb932741098e264dc9000e1ddf4fe3ed76fb Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 15 Nov 2017 20:44:36 +0100
Subject: [PATCH 0564/1519] Ignore style I202 rule (see
 https://github.com/PyCQA/flake8-import-order/issues/122)

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index eabe32719..46edff3bc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ tests=tests
 cover-package=mongoengine
 
 [flake8]
-ignore=E501,F401,F403,F405,I201
+ignore=E501,F401,F403,F405,I201,I202
 exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
 max-complexity=47
 application-import-names=mongoengine,tests

From c1c09fa6b4c832b99afeea83d19d290468689fe4 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Tue, 21 Nov 2017 21:56:26 +0800
Subject: [PATCH 0565/1519] fix validatione error for invalid embedded document
 instance #1067

---
 mongoengine/fields.py      |  6 +++++-
 tests/queryset/queryset.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 6c4a06c93..0aa51b2d1 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -688,6 +688,11 @@ def to_python(self, value):
         return value
 
     def validate(self, value, clean=True):
+        if self.choices and isinstance(value, SON):
+            for choice in self.choices:
+                if value['_cls'] == choice._class_name:
+                    return True
+
         if not isinstance(value, EmbeddedDocument):
             self.error('Invalid embedded document instance provided to an '
                        'GenericEmbeddedDocumentField')
@@ -705,7 +710,6 @@ def lookup_member(self, member_name):
     def to_mongo(self, document, use_db_field=True, fields=None):
         if document is None:
             return None
-
         data = document.to_mongo(use_db_field, fields)
         if '_cls' not in data:
             data['_cls'] = document._class_name
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 28e84af47..43800fff0 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2086,6 +2086,23 @@ class Site(Document):
             Site.objects(id=s.id).update_one(
                 pull_all__collaborators__helpful__user=['Ross'])
 
+    def test_pull_in_genericembedded_field(self):
+
+        class Foo(EmbeddedDocument):
+            name = StringField()
+
+        class Bar(Document):
+            foos = ListField(GenericEmbeddedDocumentField(
+                choices=[Foo, ]))
+
+        Bar.drop_collection()
+
+        foo = Foo(name="bar")
+        bar = Bar(foos=[foo]).save()
+        Bar.objects(id=bar.id).update(pull__foos=foo)
+        bar.reload()
+        self.assertEqual(len(bar.foos), 0)
+
     def test_update_one_pop_generic_reference(self):
 
         class BlogTag(Document):
@@ -2179,6 +2196,24 @@ class Message(Document):
         self.assertEqual(message.authors[1].name, "Ross")
         self.assertEqual(message.authors[2].name, "Adam")
 
+    def test_set_generic_embedded_documents(self):
+
+        class Bar(EmbeddedDocument):
+            name = StringField()
+
+        class User(Document):
+            username = StringField()
+            bar = GenericEmbeddedDocumentField(choices=[Bar,])
+
+        User.drop_collection()
+
+        User(username='abc').save()
+        User.objects(username='abc').update(
+            set__bar=Bar(name='test'), upsert=True)
+
+        user = User.objects(username='abc').first()
+        self.assertEqual(user.bar.name, "test")
+
     def test_reload_embedded_docs_instance(self):
 
         class SubDoc(EmbeddedDocument):

From e74f65901565f64b39a51edc22a1564d8f9fed9a Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 8 Nov 2017 18:05:30 +0100
Subject: [PATCH 0566/1519] Improve LazyReferenceField and
 GenericLazyReferenceField with nested fields

---
 mongoengine/base/document.py |  3 +-
 mongoengine/dereference.py   |  9 +++-
 mongoengine/fields.py        | 56 +++++++++++++++--------
 setup.cfg                    |  2 +-
 tests/fields/fields.py       | 86 ++++++++++++++++++++++++++++++++++++
 5 files changed, 134 insertions(+), 22 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index f8ab73d0d..658d0c790 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -13,6 +13,7 @@
 from mongoengine.base.common import get_document
 from mongoengine.base.datastructures import (BaseDict, BaseList,
                                              EmbeddedDocumentList,
+                                             LazyReference,
                                              StrictDict)
 from mongoengine.base.fields import ComplexBaseField
 from mongoengine.common import _import_class
@@ -488,7 +489,7 @@ def _clear_changed_fields(self):
                 else:
                     data = getattr(data, part, None)
 
-                if hasattr(data, '_changed_fields'):
+                if not isinstance(data, LazyReference) and hasattr(data, '_changed_fields'):
                     if getattr(data, '_is_document', False):
                         continue
 
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 59204d4d6..7fe34e431 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -3,6 +3,7 @@
 
 from mongoengine.base import (BaseDict, BaseList, EmbeddedDocumentList,
                               TopLevelDocumentMetaclass, get_document)
+from mongoengine.base.datastructures import LazyReference
 from mongoengine.connection import get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.fields import DictField, ListField, MapField, ReferenceField
@@ -99,7 +100,10 @@ def _find_references(self, items, depth=0):
             if isinstance(item, (Document, EmbeddedDocument)):
                 for field_name, field in item._fields.iteritems():
                     v = item._data.get(field_name, None)
-                    if isinstance(v, DBRef):
+                    if isinstance(v, LazyReference):
+                        # LazyReference inherits DBRef but should not be dereferenced here !
+                        continue
+                    elif isinstance(v, DBRef):
                         reference_map.setdefault(field.document_type, set()).add(v.id)
                     elif isinstance(v, (dict, SON)) and '_ref' in v:
                         reference_map.setdefault(get_document(v['_cls']), set()).add(v['_ref'].id)
@@ -110,6 +114,9 @@ def _find_references(self, items, depth=0):
                             if isinstance(field_cls, (Document, TopLevelDocumentMetaclass)):
                                 key = field_cls
                             reference_map.setdefault(key, set()).update(refs)
+            elif isinstance(item, LazyReference):
+                # LazyReference inherits DBRef but should not be dereferenced here !
+                continue
             elif isinstance(item, DBRef):
                 reference_map.setdefault(item.collection, set()).add(item.id)
             elif isinstance(item, (dict, SON)) and '_ref' in item:
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 6c4a06c93..8ca2b17fc 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -28,6 +28,7 @@
 from mongoengine.base import (BaseDocument, BaseField, ComplexBaseField,
                               GeoJsonBaseField, LazyReference, ObjectIdField,
                               get_document)
+from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
@@ -789,6 +790,17 @@ def __init__(self, field=None, **kwargs):
         kwargs.setdefault('default', lambda: [])
         super(ListField, self).__init__(**kwargs)
 
+    def __get__(self, instance, owner):
+        if instance is None:
+            # Document class being used rather than a document object
+            return self
+        value = instance._data.get(self.name)
+        LazyReferenceField = _import_class('LazyReferenceField')
+        GenericLazyReferenceField = _import_class('GenericLazyReferenceField')
+        if isinstance(self.field, (LazyReferenceField, GenericLazyReferenceField)) and value:
+            instance._data[self.name] = [self.field.build_lazyref(x) for x in value]
+        return super(ListField, self).__get__(instance, owner)
+
     def validate(self, value):
         """Make sure that a list of valid fields is being used."""
         if (not isinstance(value, (list, tuple, QuerySet)) or
@@ -2211,17 +2223,10 @@ def document_type(self):
                 self.document_type_obj = get_document(self.document_type_obj)
         return self.document_type_obj
 
-    def __get__(self, instance, owner):
-        """Descriptor to allow lazy dereferencing."""
-        if instance is None:
-            # Document class being used rather than a document object
-            return self
-
-        value = instance._data.get(self.name)
+    def build_lazyref(self, value):
         if isinstance(value, LazyReference):
             if value.passthrough != self.passthrough:
-                instance._data[self.name] = LazyReference(
-                    value.document_type, value.pk, passthrough=self.passthrough)
+                value = LazyReference(value.document_type, value.pk, passthrough=self.passthrough)
         elif value is not None:
             if isinstance(value, self.document_type):
                 value = LazyReference(self.document_type, value.pk, passthrough=self.passthrough)
@@ -2230,6 +2235,16 @@ def __get__(self, instance, owner):
             else:
                 # value is the primary key of the referenced document
                 value = LazyReference(self.document_type, value, passthrough=self.passthrough)
+        return value
+
+    def __get__(self, instance, owner):
+        """Descriptor to allow lazy dereferencing."""
+        if instance is None:
+            # Document class being used rather than a document object
+            return self
+
+        value = self.build_lazyref(instance._data.get(self.name))
+        if value:
             instance._data[self.name] = value
 
         return super(LazyReferenceField, self).__get__(instance, owner)
@@ -2254,7 +2269,7 @@ def to_mongo(self, value):
 
     def validate(self, value):
         if isinstance(value, LazyReference):
-            if not issubclass(value.document_type, self.document_type):
+            if value.collection != self.document_type._get_collection_name():
                 self.error('Reference must be on a `%s` document.' % self.document_type)
             pk = value.pk
         elif isinstance(value, self.document_type):
@@ -2314,23 +2329,26 @@ def __init__(self, *args, **kwargs):
 
     def _validate_choices(self, value):
         if isinstance(value, LazyReference):
-            value = value.document_type
+            value = value.document_type._class_name
         super(GenericLazyReferenceField, self)._validate_choices(value)
 
-    def __get__(self, instance, owner):
-        if instance is None:
-            return self
-
-        value = instance._data.get(self.name)
+    def build_lazyref(self, value):
         if isinstance(value, LazyReference):
             if value.passthrough != self.passthrough:
-                instance._data[self.name] = LazyReference(
-                    value.document_type, value.pk, passthrough=self.passthrough)
+                value = LazyReference(value.document_type, value.pk, passthrough=self.passthrough)
         elif value is not None:
             if isinstance(value, (dict, SON)):
                 value = LazyReference(get_document(value['_cls']), value['_ref'].id, passthrough=self.passthrough)
             elif isinstance(value, Document):
                 value = LazyReference(type(value), value.pk, passthrough=self.passthrough)
+        return value
+
+    def __get__(self, instance, owner):
+        if instance is None:
+            return self
+
+        value = self.build_lazyref(instance._data.get(self.name))
+        if value:
             instance._data[self.name] = value
 
         return super(GenericLazyReferenceField, self).__get__(instance, owner)
@@ -2348,7 +2366,7 @@ def to_mongo(self, document):
         if isinstance(document, LazyReference):
             return SON((
                 ('_cls', document.document_type._class_name),
-                ('_ref', document)
+                ('_ref', DBRef(document.document_type._get_collection_name(), document.pk))
             ))
         else:
             return super(GenericLazyReferenceField, self).to_mongo(document)
diff --git a/setup.cfg b/setup.cfg
index 46edff3bc..fd6192b8e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [nosetests]
 verbosity=2
 detailed-errors=1
-tests=tests
+#tests=tests
 cover-package=mongoengine
 
 [flake8]
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 632f54042..ffee25e69 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -4871,6 +4871,48 @@ class Animal(Document):
         self.assertNotEqual(animal, other_animalref)
         self.assertNotEqual(other_animalref, animal)
 
+    def test_lazy_reference_embedded(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class EmbeddedOcurrence(EmbeddedDocument):
+            in_list = ListField(LazyReferenceField(Animal))
+            direct = LazyReferenceField(Animal)
+
+        class Ocurrence(Document):
+            in_list = ListField(LazyReferenceField(Animal))
+            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)
+            direct = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal1 = Animal('doggo').save()
+        animal2 = Animal('cheeta').save()
+
+        def check_fields_type(occ):
+            self.assertIsInstance(occ.direct, LazyReference)
+            for elem in occ.in_list:
+                self.assertIsInstance(elem, LazyReference)
+            self.assertIsInstance(occ.in_embedded.direct, LazyReference)
+            for elem in occ.in_embedded.in_list:
+                self.assertIsInstance(elem, LazyReference)
+
+        occ = Ocurrence(
+            in_list=[animal1, animal2],
+            in_embedded={'in_list': [animal1, animal2], 'direct': animal1},
+            direct=animal1
+        ).save()
+        check_fields_type(occ)
+        occ.reload()
+        check_fields_type(occ)
+        occ.direct = animal1.id
+        occ.in_list = [animal1.id, animal2.id]
+        occ.in_embedded.direct = animal1.id
+        occ.in_embedded.in_list = [animal1.id, animal2.id]
+        check_fields_type(occ)
+
 
 class GenericLazyReferenceFieldTest(MongoDBTestCase):
     def test_generic_lazy_reference_simple(self):
@@ -5051,6 +5093,50 @@ class Ocurrence(Document):
         p = Ocurrence.objects.get()
         self.assertIs(p.animal, None)
 
+    def test_generic_lazy_reference_embedded(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class EmbeddedOcurrence(EmbeddedDocument):
+            in_list = ListField(GenericLazyReferenceField())
+            direct = GenericLazyReferenceField()
+
+        class Ocurrence(Document):
+            in_list = ListField(GenericLazyReferenceField())
+            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)
+            direct = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal1 = Animal('doggo').save()
+        animal2 = Animal('cheeta').save()
+
+        def check_fields_type(occ):
+            self.assertIsInstance(occ.direct, LazyReference)
+            for elem in occ.in_list:
+                self.assertIsInstance(elem, LazyReference)
+            self.assertIsInstance(occ.in_embedded.direct, LazyReference)
+            for elem in occ.in_embedded.in_list:
+                self.assertIsInstance(elem, LazyReference)
+
+        occ = Ocurrence(
+            in_list=[animal1, animal2],
+            in_embedded={'in_list': [animal1, animal2], 'direct': animal1},
+            direct=animal1
+        ).save()
+        check_fields_type(occ)
+        occ.reload()
+        check_fields_type(occ)
+        animal1_ref = {'_cls': 'Animal', '_ref': DBRef(animal1._get_collection_name(), animal1.pk)}
+        animal2_ref = {'_cls': 'Animal', '_ref': DBRef(animal2._get_collection_name(), animal2.pk)}
+        occ.direct = animal1_ref
+        occ.in_list = [animal1_ref, animal2_ref]
+        occ.in_embedded.direct = animal1_ref
+        occ.in_embedded.in_list = [animal1_ref, animal2_ref]
+        check_fields_type(occ)
+
 
 if __name__ == '__main__':
     unittest.main()

From 60758dd76b4ae1831e4f3f389c71b95b0e77abd2 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Wed, 22 Nov 2017 18:56:12 +0800
Subject: [PATCH 0567/1519] add changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1e9ac7fc0..b48521787 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230
+- Fix validation error for invalid embedded document instance #1067
 
 Changes in 0.14.1
 =================

From 79486e33936d6302e1cb898c38a9535648563343 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Wed, 22 Nov 2017 19:27:35 +0800
Subject: [PATCH 0568/1519] change description in changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b48521787..249d46594 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,7 @@ Changelog
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230
-- Fix validation error for invalid embedded document instance #1067
+- Fix validation error instance in GenericEmbeddedDocumentField #1067
 
 Changes in 0.14.1
 =================

From 0ce081323fd66ad00b00eb4bc9edc6b888a5fa2d Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Wed, 22 Nov 2017 22:19:50 +0800
Subject: [PATCH 0569/1519] move changes to development

---
 docs/changelog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 249d46594..f96fc11b4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,10 +2,13 @@
 Changelog
 =========
 
+Development
+===========
+- Fix validation error instance in GenericEmbeddedDocumentField #1067
+
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230
-- Fix validation error instance in GenericEmbeddedDocumentField #1067
 
 Changes in 0.14.1
 =================

From c45dfacb411a062dc75acd27e784693fb6c0898a Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Wed, 29 Nov 2017 16:41:42 +0100
Subject: [PATCH 0570/1519] Update changelog

---
 docs/changelog.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1e9ac7fc0..151fdd08f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,13 @@
 Changelog
 =========
 
+dev
+===
+-  Subfield resolve error in generic_emdedded_document query #1651 #1652
+-  use each modifier only with $position #1673 #1675
+-  Improve LazyReferenceField and GenericLazyReferenceField with nested fields #1704
+
+
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230

From b35efb9f7205ab9b07d5b21c5cdb26d4c6d07201 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Tue, 21 Nov 2017 21:56:26 +0800
Subject: [PATCH 0571/1519] fix validatione error for invalid embedded document
 instance #1067

---
 mongoengine/fields.py      |  6 +++++-
 tests/queryset/queryset.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 8ca2b17fc..4e941c4e3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -689,6 +689,11 @@ def to_python(self, value):
         return value
 
     def validate(self, value, clean=True):
+        if self.choices and isinstance(value, SON):
+            for choice in self.choices:
+                if value['_cls'] == choice._class_name:
+                    return True
+
         if not isinstance(value, EmbeddedDocument):
             self.error('Invalid embedded document instance provided to an '
                        'GenericEmbeddedDocumentField')
@@ -706,7 +711,6 @@ def lookup_member(self, member_name):
     def to_mongo(self, document, use_db_field=True, fields=None):
         if document is None:
             return None
-
         data = document.to_mongo(use_db_field, fields)
         if '_cls' not in data:
             data['_cls'] = document._class_name
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 28e84af47..43800fff0 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2086,6 +2086,23 @@ class Site(Document):
             Site.objects(id=s.id).update_one(
                 pull_all__collaborators__helpful__user=['Ross'])
 
+    def test_pull_in_genericembedded_field(self):
+
+        class Foo(EmbeddedDocument):
+            name = StringField()
+
+        class Bar(Document):
+            foos = ListField(GenericEmbeddedDocumentField(
+                choices=[Foo, ]))
+
+        Bar.drop_collection()
+
+        foo = Foo(name="bar")
+        bar = Bar(foos=[foo]).save()
+        Bar.objects(id=bar.id).update(pull__foos=foo)
+        bar.reload()
+        self.assertEqual(len(bar.foos), 0)
+
     def test_update_one_pop_generic_reference(self):
 
         class BlogTag(Document):
@@ -2179,6 +2196,24 @@ class Message(Document):
         self.assertEqual(message.authors[1].name, "Ross")
         self.assertEqual(message.authors[2].name, "Adam")
 
+    def test_set_generic_embedded_documents(self):
+
+        class Bar(EmbeddedDocument):
+            name = StringField()
+
+        class User(Document):
+            username = StringField()
+            bar = GenericEmbeddedDocumentField(choices=[Bar,])
+
+        User.drop_collection()
+
+        User(username='abc').save()
+        User.objects(username='abc').update(
+            set__bar=Bar(name='test'), upsert=True)
+
+        user = User.objects(username='abc').first()
+        self.assertEqual(user.bar.name, "test")
+
     def test_reload_embedded_docs_instance(self):
 
         class SubDoc(EmbeddedDocument):

From ce9ea7baad2870145203a51e069f6a6f57526518 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Wed, 22 Nov 2017 18:56:12 +0800
Subject: [PATCH 0572/1519] add changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 151fdd08f..69e57e0b6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,7 @@ dev
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230
+- Fix validation error for invalid embedded document instance #1067
 
 Changes in 0.14.1
 =================

From 08a4deca17b511974125e26a7151e165231b58de Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Wed, 22 Nov 2017 19:27:35 +0800
Subject: [PATCH 0573/1519] change description in changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 69e57e0b6..c44f84321 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,7 +12,7 @@ dev
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230
-- Fix validation error for invalid embedded document instance #1067
+- Fix validation error instance in GenericEmbeddedDocumentField #1067
 
 Changes in 0.14.1
 =================

From 2cbebf9c99dd5ebd368ca775b60fc25149ea5634 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Wed, 22 Nov 2017 22:19:50 +0800
Subject: [PATCH 0574/1519] move changes to development

---
 docs/changelog.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c44f84321..efd2e0f69 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,12 +7,11 @@ dev
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652
 -  use each modifier only with $position #1673 #1675
 -  Improve LazyReferenceField and GenericLazyReferenceField with nested fields #1704
-
+-  Fix validation error instance in GenericEmbeddedDocumentField #1067
 
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230
-- Fix validation error instance in GenericEmbeddedDocumentField #1067
 
 Changes in 0.14.1
 =================

From 9e0ca51c2f47618b539c2724ecfe656e454eb062 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Fri, 1 Dec 2017 08:40:51 +0800
Subject: [PATCH 0575/1519] remove merge conflict after rebase #1067

---
 docs/changelog.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1bd932d6b..efd2e0f69 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,7 +2,6 @@
 Changelog
 =========
 
-<<<<<<< HEAD
 dev
 ===
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652

From 7674dc9b344f99e47a6df3b1c44d72faf57ff137 Mon Sep 17 00:00:00 2001
From: Esmail <esmail@users.noreply.github.com>
Date: Tue, 5 Dec 2017 15:14:15 -0500
Subject: [PATCH 0576/1519] One-character typo fix ("that" -> "than")

---
 docs/tutorial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index cc5b647df..ea1a04c1d 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -153,7 +153,7 @@ post. This works, but there is no real reason to be storing the comments
 separately from their associated posts, other than to work around the
 relational model. Using MongoDB we can store the comments as a list of
 *embedded documents* directly on a post document. An embedded document should
-be treated no differently that a regular document; it just doesn't have its own
+be treated no differently than a regular document; it just doesn't have its own
 collection in the database. Using MongoEngine, we can define the structure of
 embedded documents, along with utility methods, in exactly the same way we do
 with regular documents::

From 22a8ad2fde14b0c5eb2cf3cbc0fd4e0de98d67c5 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Wed, 20 Dec 2017 15:17:54 +0800
Subject: [PATCH 0577/1519] update fields argument when given #1172

---
 mongoengine/fields.py  |  6 +++++-
 tests/fields/fields.py | 45 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 8ca2b17fc..17003974c 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1256,7 +1256,11 @@ def prepare_query_value(self, op, value):
             if value.pk is None:
                 self.error('You can only reference documents once they have'
                            ' been saved to the database')
-            return {'_id': value.pk}
+            value_dict = {'_id': value.pk}
+            for field in self.fields:
+                value_dict.update({field: value[field]})
+
+            return value_dict
 
         raise NotImplementedError
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index ffee25e69..f86ffdb45 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -4379,6 +4379,51 @@ class SocialData(Document):
         self.assertEqual(SocialData.objects(person__group=g2).count(), 1)
         self.assertEqual(SocialData.objects(person__group=g2).first(), s2)
 
+    def test_cached_reference_field_push_with_fields(self):
+        class Product(Document):
+            name = StringField()
+
+        Product.drop_collection()
+
+        class Basket(Document):
+            products = ListField(CachedReferenceField(Product, fields=['name']))
+
+        Basket.drop_collection()
+        product1 = Product(name='abc').save()
+        product2 = Product(name='def').save()
+        basket = Basket(products=[product1]).save()
+        self.assertEqual(
+            Basket.objects._collection.find_one(),
+            {
+                '_id': basket.pk,
+                'products': [
+                    {
+                        '_id': product1.pk,
+                        'name': product1.name
+                    }
+                ]
+            }
+        )
+        # push to list
+        basket.update(push__products=product2)
+        basket.reload()
+        self.assertEqual(
+            Basket.objects._collection.find_one(),
+            {
+                '_id': basket.pk,
+                'products': [
+                    {
+                        '_id': product1.pk,
+                        'name': product1.name
+                    },
+                    {
+                        '_id': product2.pk,
+                        'name': product2.name
+                    }
+                ]
+            }
+        )
+
     def test_cached_reference_field_update_all(self):
         class Person(Document):
             TYPES = (

From 6621c318db9fc5d3395d9ceb9d0900cc0fef0e68 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Wed, 20 Dec 2017 15:28:33 +0800
Subject: [PATCH 0578/1519] add changelog #1712

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 151fdd08f..7b9378228 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ dev
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652
 -  use each modifier only with $position #1673 #1675
 -  Improve LazyReferenceField and GenericLazyReferenceField with nested fields #1704
+-  Update cached fields when fields argument is given #1712
 
 
 Changes in 0.15.0

From 18a5fba42b2af5e0835293b1e7201747100014c9 Mon Sep 17 00:00:00 2001
From: erdenezul <erdenezul@shine.mn>
Date: Fri, 22 Dec 2017 20:19:21 +0800
Subject: [PATCH 0579/1519] Revert "add tests to increase code coverage"

---
 tests/fields/fields.py     | 36 +-----------------------------------
 tests/queryset/geo.py      |  4 ----
 tests/queryset/queryset.py | 10 ----------
 3 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 4360f2985..ffee25e69 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -312,27 +312,6 @@ class TestDocument(Document):
 
         self.assertEqual(1, TestDocument.objects(long_fld__ne=None).count())
 
-    def test_callable_validation(self):
-        """Ensure that callable validation works"""
-        def check_even(value):
-            return value % 2 == 0
-
-        class Order(Document):
-            number = IntField(validation=check_even)
-
-        Order.drop_collection()
-
-        order = Order(number=3)
-        self.assertRaises(ValidationError, order.validate)
-
-        class User(Document):
-            name = StringField(validation=1)
-
-        User.drop_collection()
-
-        user = User(name='test')
-        self.assertRaises(ValidationError, user.validate)
-
     def test_object_id_validation(self):
         """Ensure that invalid values cannot be assigned to an
         ObjectIdField.
@@ -355,7 +334,7 @@ class Person(Document):
     def test_string_validation(self):
         """Ensure that invalid values cannot be assigned to string fields."""
         class Person(Document):
-            name = StringField(max_length=20, min_length=5)
+            name = StringField(max_length=20)
             userid = StringField(r'[0-9a-z_]+$')
 
         person = Person(name=34)
@@ -373,10 +352,6 @@ class Person(Document):
         person = Person(name='Name that is more than twenty characters')
         self.assertRaises(ValidationError, person.validate)
 
-        # Test max length validation on name
-        person = Person(name='aa')
-        self.assertRaises(ValidationError, person.validate)
-
         person.name = 'Shorter name'
         person.validate()
 
@@ -462,10 +437,6 @@ class TestDocument(Document):
         doc.age = 'ten'
         self.assertRaises(ValidationError, doc.validate)
 
-        # Test max_value validation
-        doc.value = 200
-        self.assertRaises(ValidationError, doc.validate)
-
     def test_float_validation(self):
         """Ensure that invalid values cannot be assigned to float fields.
         """
@@ -548,11 +519,6 @@ class User(Document):
             class User(Document):
                 name = StringField(db_field='name\0')
 
-        # db field should be a string
-        with self.assertRaises(TypeError):
-            class User(Document):
-                name = StringField(db_field=1)
-
     def test_decimal_comparison(self):
         class Person(Document):
             money = DecimalField()
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index acfd93640..38c0377ed 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -429,10 +429,6 @@ class Road(Document):
         roads = Road.objects.filter(line__geo_within=polygon).count()
         self.assertEqual(1, roads)
 
-        sphere = [[-1, 42,], 2]
-        roads = Road.objects.filter(line__geo_within_sphere=sphere).count()
-        self.assertEqual(0, roads)
-
         roads = Road.objects.filter(line__geo_within={"$geometry": polygon}).count()
         self.assertEqual(1, roads)
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 984314eda..43800fff0 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1861,10 +1861,6 @@ class BlogPost(Document):
         post = BlogPost(name="Test Post", hits=5, tags=['test'])
         post.save()
 
-        BlogPost.objects.update(hits=11)
-        post.reload()
-        self.assertEqual(post.hits, 11)
-
         BlogPost.objects.update(set__hits=10)
         post.reload()
         self.assertEqual(post.hits, 10)
@@ -1886,12 +1882,6 @@ class BlogPost(Document):
         post.reload()
         self.assertTrue('mongo' in post.tags)
 
-        # Push with arrays
-        BlogPost.objects.update(push__tags=['python', 'scala'])
-        post.reload()
-        self.assertTrue('python' in post.tags)
-        self.assertTrue('scala' in post.tags)
-
         BlogPost.objects.update_one(push_all__tags=['db', 'nosql'])
         post.reload()
         self.assertTrue('db' in post.tags and 'nosql' in post.tags)

From 12b846586c4e72d712920d32e595146911c4f9e2 Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Fri, 22 Dec 2017 13:23:03 +0100
Subject: [PATCH 0580/1519] Fix travis tests with mongodb 2.4 & pymongo 3

---
 .travis.yml | 14 +++++++-------
 tox.ini     |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 78a9f787b..a70c711e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ python:
 env:
 - MONGODB=2.6 PYMONGO=2.7
 - MONGODB=2.6 PYMONGO=2.8
-- MONGODB=2.6 PYMONGO=3.0
+- MONGODB=2.6 PYMONGO=3.x
 
 matrix:
   # Finish the build as soon as one job fails
@@ -31,19 +31,19 @@ matrix:
   - python: 2.7
     env: MONGODB=2.4 PYMONGO=2.7
   - python: 2.7
-    env: MONGODB=2.4 PYMONGO=3.0
+    env: MONGODB=2.4 PYMONGO=3.5
   - python: 2.7
-    env: MONGODB=3.0 PYMONGO=3.0
+    env: MONGODB=3.0 PYMONGO=3.x
   - python: 3.5
     env: MONGODB=2.4 PYMONGO=2.7
   - python: 3.5
-    env: MONGODB=2.4 PYMONGO=3.0
+    env: MONGODB=2.4 PYMONGO=3.5
   - python: 3.5
-    env: MONGODB=3.0 PYMONGO=3.0
+    env: MONGODB=3.0 PYMONGO=3.x
   - python: 3.6
-    env: MONGODB=2.4 PYMONGO=3.0
+    env: MONGODB=2.4 PYMONGO=3.5
   - python: 3.6
-    env: MONGODB=3.0 PYMONGO=3.0
+    env: MONGODB=3.0 PYMONGO=3.x
 
 before_install:
 - bash .install_mongodb_on_travis.sh
diff --git a/tox.ini b/tox.ini
index 7f0d36e41..9bb0c5ecd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg30}
+envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg35,mg3x}
 
 [testenv]
 commands =
@@ -8,6 +8,7 @@ deps =
     nose
     mg27: PyMongo<2.8
     mg28: PyMongo>=2.8,<2.9
-    mg30: PyMongo>=3.0
+    mg35: PyMongo==3.5
+    mg3x: PyMongo>=3.0
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From aa5510531df9eed361e34c5130bc19ce15b1185e Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Wed, 20 Dec 2017 15:17:54 +0800
Subject: [PATCH 0581/1519] update fields argument when given #1172

---
 mongoengine/fields.py  |  6 +++++-
 tests/fields/fields.py | 45 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 4e941c4e3..7932f73ac 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1260,7 +1260,11 @@ def prepare_query_value(self, op, value):
             if value.pk is None:
                 self.error('You can only reference documents once they have'
                            ' been saved to the database')
-            return {'_id': value.pk}
+            value_dict = {'_id': value.pk}
+            for field in self.fields:
+                value_dict.update({field: value[field]})
+
+            return value_dict
 
         raise NotImplementedError
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index ffee25e69..f86ffdb45 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -4379,6 +4379,51 @@ class SocialData(Document):
         self.assertEqual(SocialData.objects(person__group=g2).count(), 1)
         self.assertEqual(SocialData.objects(person__group=g2).first(), s2)
 
+    def test_cached_reference_field_push_with_fields(self):
+        class Product(Document):
+            name = StringField()
+
+        Product.drop_collection()
+
+        class Basket(Document):
+            products = ListField(CachedReferenceField(Product, fields=['name']))
+
+        Basket.drop_collection()
+        product1 = Product(name='abc').save()
+        product2 = Product(name='def').save()
+        basket = Basket(products=[product1]).save()
+        self.assertEqual(
+            Basket.objects._collection.find_one(),
+            {
+                '_id': basket.pk,
+                'products': [
+                    {
+                        '_id': product1.pk,
+                        'name': product1.name
+                    }
+                ]
+            }
+        )
+        # push to list
+        basket.update(push__products=product2)
+        basket.reload()
+        self.assertEqual(
+            Basket.objects._collection.find_one(),
+            {
+                '_id': basket.pk,
+                'products': [
+                    {
+                        '_id': product1.pk,
+                        'name': product1.name
+                    },
+                    {
+                        '_id': product2.pk,
+                        'name': product2.name
+                    }
+                ]
+            }
+        )
+
     def test_cached_reference_field_update_all(self):
         class Person(Document):
             TYPES = (

From b66621f9c648d6fffbfd770688d918559bc6b7fb Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Wed, 20 Dec 2017 15:28:33 +0800
Subject: [PATCH 0582/1519] add changelog #1712

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index efd2e0f69..219d60df7 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ dev
 -  use each modifier only with $position #1673 #1675
 -  Improve LazyReferenceField and GenericLazyReferenceField with nested fields #1704
 -  Fix validation error instance in GenericEmbeddedDocumentField #1067
+-  Update cached fields when fields argument is given #1712
 
 Changes in 0.15.0
 =================

From 101947da8bec04b532b55c7a252dfff5921b3f0f Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Wed, 20 Dec 2017 15:17:54 +0800
Subject: [PATCH 0583/1519] update fields argument when given #1172

---
 mongoengine/fields.py  |  6 +++++-
 tests/fields/fields.py | 45 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 4e941c4e3..7932f73ac 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1260,7 +1260,11 @@ def prepare_query_value(self, op, value):
             if value.pk is None:
                 self.error('You can only reference documents once they have'
                            ' been saved to the database')
-            return {'_id': value.pk}
+            value_dict = {'_id': value.pk}
+            for field in self.fields:
+                value_dict.update({field: value[field]})
+
+            return value_dict
 
         raise NotImplementedError
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index ffee25e69..f86ffdb45 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -4379,6 +4379,51 @@ class SocialData(Document):
         self.assertEqual(SocialData.objects(person__group=g2).count(), 1)
         self.assertEqual(SocialData.objects(person__group=g2).first(), s2)
 
+    def test_cached_reference_field_push_with_fields(self):
+        class Product(Document):
+            name = StringField()
+
+        Product.drop_collection()
+
+        class Basket(Document):
+            products = ListField(CachedReferenceField(Product, fields=['name']))
+
+        Basket.drop_collection()
+        product1 = Product(name='abc').save()
+        product2 = Product(name='def').save()
+        basket = Basket(products=[product1]).save()
+        self.assertEqual(
+            Basket.objects._collection.find_one(),
+            {
+                '_id': basket.pk,
+                'products': [
+                    {
+                        '_id': product1.pk,
+                        'name': product1.name
+                    }
+                ]
+            }
+        )
+        # push to list
+        basket.update(push__products=product2)
+        basket.reload()
+        self.assertEqual(
+            Basket.objects._collection.find_one(),
+            {
+                '_id': basket.pk,
+                'products': [
+                    {
+                        '_id': product1.pk,
+                        'name': product1.name
+                    },
+                    {
+                        '_id': product2.pk,
+                        'name': product2.name
+                    }
+                ]
+            }
+        )
+
     def test_cached_reference_field_update_all(self):
         class Person(Document):
             TYPES = (

From 19b18d3d0ab8be238d16a2c41734b6d5dba4adb6 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Wed, 20 Dec 2017 15:28:33 +0800
Subject: [PATCH 0584/1519] add changelog #1712

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index efd2e0f69..219d60df7 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ dev
 -  use each modifier only with $position #1673 #1675
 -  Improve LazyReferenceField and GenericLazyReferenceField with nested fields #1704
 -  Fix validation error instance in GenericEmbeddedDocumentField #1067
+-  Update cached fields when fields argument is given #1712
 
 Changes in 0.15.0
 =================

From 919f221be9738dc278f08c31c7421267bfd4f2de Mon Sep 17 00:00:00 2001
From: Chuan-Heng Hsiao <hsiao.chuanheng@gmail.com>
Date: Thu, 11 Jan 2018 07:28:25 -0500
Subject: [PATCH 0585/1519] defensive programming for v as an instance of DBRef
 when accessing v.collection in dereference

---
 mongoengine/dereference.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 7fe34e431..18b365ccd 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -237,7 +237,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
             elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                 item_name = '%s.%s' % (name, k) if name else name
                 data[k] = self._attach_objects(v, depth - 1, instance=instance, name=item_name)
-            elif hasattr(v, 'id'):
+            elif isinstance(v, DBRef) and hasattr(v, 'id'):
                 data[k] = self.object_map.get((v.collection, v.id), v)
 
         if instance and name:

From 22e75c1691e67a487d90166c37f3cf08531226ac Mon Sep 17 00:00:00 2001
From: Ivan Pogrebkov <chezhik@gmail.com>
Date: Fri, 26 Jan 2018 10:55:44 +0300
Subject: [PATCH 0586/1519] Insert null values fix

https://stackoverflow.com/questions/42601950/how-to-store-a-null-value-in-mongodb-via-mongoengine
---
 mongoengine/base/document.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 658d0c790..956e9b0e1 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -337,11 +337,10 @@ def to_mongo(self, use_db_field=True, fields=None):
                 value = field.generate()
                 self._data[field_name] = value
 
-            if value is not None:
-                if use_db_field:
-                    data[field.db_field] = value
-                else:
-                    data[field.name] = value
+            if use_db_field:
+                data[field.db_field] = value
+            else:
+                data[field.name] = value
 
         # Only add _cls if allow_inheritance is True
         if not self._meta.get('allow_inheritance'):

From fb213f6e7432e2b9aca4eb4ce619a9db0c521f28 Mon Sep 17 00:00:00 2001
From: Ivan Pogrebkov <chezhik@gmail.com>
Date: Fri, 26 Jan 2018 11:12:02 +0300
Subject: [PATCH 0587/1519] Update document.py

---
 mongoengine/base/document.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 956e9b0e1..2115a2525 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -147,6 +147,7 @@ def __setattr__(self, name, value):
 
             if not hasattr(self, name) and not name.startswith('_'):
                 DynamicField = _import_class('DynamicField')
+                field = DynamicField(db_field=name,null=True)
                 field = DynamicField(db_field=name)
                 field.name = name
                 self._dynamic_fields[name] = field
@@ -337,10 +338,11 @@ def to_mongo(self, use_db_field=True, fields=None):
                 value = field.generate()
                 self._data[field_name] = value
 
-            if use_db_field:
-                data[field.db_field] = value
-            else:
-                data[field.name] = value
+            if (value is not None) or (field.null):
+                if use_db_field:
+                    data[field.db_field] = value
+                else:
+                    data[field.name] = value
 
         # Only add _cls if allow_inheritance is True
         if not self._meta.get('allow_inheritance'):

From 7e8c62104a31bc7168d24e6030437338664340cd Mon Sep 17 00:00:00 2001
From: Ivan Pogrebkov <chezhik@gmail.com>
Date: Fri, 26 Jan 2018 11:15:12 +0300
Subject: [PATCH 0588/1519] null=True now usefull

---
 mongoengine/document.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index f1622934f..d635d62e5 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1010,6 +1010,7 @@ def __delattr__(self, *args, **kwargs):
         field_name = args[0]
         if field_name in self._dynamic_fields:
             setattr(self, field_name, None)
+            self._dynamic_fields[field_name].null = False
         else:
             super(DynamicDocument, self).__delattr__(*args, **kwargs)
 

From fdda27abd1ce957d0bb0e3053027ff0a5ce7b9de Mon Sep 17 00:00:00 2001
From: Esmail <esmail@users.noreply.github.com>
Date: Thu, 1 Feb 2018 12:58:10 -0500
Subject: [PATCH 0589/1519] Update `post_save` signal documentation to reflect
 #594

---
 docs/guide/signals.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/guide/signals.rst b/docs/guide/signals.rst
index 30277966f..eed382c45 100644
--- a/docs/guide/signals.rst
+++ b/docs/guide/signals.rst
@@ -43,10 +43,10 @@ Available signals include:
   has taken place but before saving.
 
 `post_save`
-  Called within :meth:`~mongoengine.Document.save` after all actions
-  (validation, insert/update, cascades, clearing dirty flags) have completed
-  successfully.  Passed the additional boolean keyword argument `created` to
-  indicate if the save was an insert or an update.
+  Called within :meth:`~mongoengine.Document.save` after most actions
+  (validation, insert/update, and cascades, but not clearing dirty flags) have 
+  completed successfully.  Passed the additional boolean keyword argument 
+  `created` to indicate if the save was an insert or an update.
 
 `pre_delete`
   Called within :meth:`~mongoengine.Document.delete` prior to

From 8f6c0796e3c66de67110b9f6cf6ac7e4e92e8915 Mon Sep 17 00:00:00 2001
From: Arto Jantunen <arto@vainu.io>
Date: Fri, 2 Feb 2018 08:20:53 +0200
Subject: [PATCH 0590/1519] Add db parameter to register_connection

This is done to make it compatible with the connect function.
---
 docs/changelog.rst        | 1 +
 mongoengine/connection.py | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 219d60df7..294714639 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,7 @@ dev
 -  Improve LazyReferenceField and GenericLazyReferenceField with nested fields #1704
 -  Fix validation error instance in GenericEmbeddedDocumentField #1067
 -  Update cached fields when fields argument is given #1712
+-  Add a db parameter to register_connection for compatibility with connect
 
 Changes in 0.15.0
 =================
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 34ff4dc31..705dc25b5 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -28,7 +28,7 @@ class MongoEngineConnectionError(Exception):
 _dbs = {}
 
 
-def register_connection(alias, name=None, host=None, port=None,
+def register_connection(alias, db=None, name=None, host=None, port=None,
                         read_preference=READ_PREFERENCE,
                         username=None, password=None,
                         authentication_source=None,
@@ -39,6 +39,7 @@ def register_connection(alias, name=None, host=None, port=None,
     :param alias: the name that will be used to refer to this connection
         throughout MongoEngine
     :param name: the name of the specific database to use
+    :param db: the name of the database to use, for compatibility with connect
     :param host: the host name of the :program:`mongod` instance to connect to
     :param port: the port that the :program:`mongod` instance is running on
     :param read_preference: The read preference for the collection
@@ -58,7 +59,7 @@ def register_connection(alias, name=None, host=None, port=None,
     .. versionchanged:: 0.10.6 - added mongomock support
     """
     conn_settings = {
-        'name': name or 'test',
+        'name': name or db or 'test',
         'host': host or 'localhost',
         'port': port or 27017,
         'read_preference': read_preference,

From 9e80da705a8dae9336be7df02169f36607769fb8 Mon Sep 17 00:00:00 2001
From: Calgary Michael <cseth.michael@gmail.com>
Date: Fri, 2 Feb 2018 21:47:04 -0600
Subject: [PATCH 0591/1519] removed usage of 'pushAll' operator

---
 mongoengine/queryset/transform.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 3eadaf640..a9874ddf5 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -335,7 +335,7 @@ def update(_doc_cls=None, **update):
                 value = {key: value}
         elif op == 'addToSet' and isinstance(value, list):
             value = {key: {'$each': value}}
-        elif op == 'push':
+        elif op in ('push', 'pushAll'):
             if parts[-1].isdigit():
                 key = parts[0]
                 position = int(parts[-1])
@@ -345,7 +345,13 @@ def update(_doc_cls=None, **update):
                     value = [value]
                 value = {key: {'$each': value, '$position': position}}
             else:
-                value = {key: value}
+                if op == 'pushAll':
+                    op = 'push'  # convert to non-deprecated keyword
+                    if not isinstance(value, (set, tuple, list)):
+                        value = [value]
+                    value = {key: {'$each': value}}
+                else:
+                    value = {key: value}
         else:
             value = {key: value}
         key = '$' + op

From 4d5c6d11ab8665f77aef8ac6e9b2e58843188b75 Mon Sep 17 00:00:00 2001
From: Calgary Michael <cseth.michael@gmail.com>
Date: Fri, 2 Feb 2018 22:04:30 -0600
Subject: [PATCH 0592/1519] removed deprecated warning for 'update' method

---
 mongoengine/context_managers.py | 11 ++++++++++-
 mongoengine/queryset/base.py    | 17 ++++++++++-------
 tests/queryset/queryset.py      | 11 ++++++-----
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index c477575e8..e62955706 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,9 +1,11 @@
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
+from pymongo.write_concern import WriteConcern
+from contextlib import contextmanager
 
 
 __all__ = ('switch_db', 'switch_collection', 'no_dereference',
-           'no_sub_classes', 'query_counter')
+           'no_sub_classes', 'query_counter', 'set_write_concern')
 
 
 class switch_db(object):
@@ -215,3 +217,10 @@ def _get_count(self):
         count = self.db.system.profile.find(ignore_query).count() - self.counter
         self.counter += 1
         return count
+
+
+@contextmanager
+def set_write_concern(collection, write_concerns):
+    yield collection.with_options(write_concern=WriteConcern(
+        **dict(collection.write_concern.document.items()),
+        **write_concerns))
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 6f9c372c6..c6e2137c3 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -18,7 +18,7 @@
 from mongoengine.base import get_document
 from mongoengine.common import _import_class
 from mongoengine.connection import get_db
-from mongoengine.context_managers import switch_db
+from mongoengine.context_managers import switch_db, set_write_concern
 from mongoengine.errors import (InvalidQueryError, LookUpError,
                                 NotUniqueError, OperationError)
 from mongoengine.python_support import IS_PYMONGO_3
@@ -510,12 +510,15 @@ def update(self, upsert=False, multi=True, write_concern=None,
             else:
                 update['$set'] = {'_cls': queryset._document._class_name}
         try:
-            result = queryset._collection.update(query, update, multi=multi,
-                                                 upsert=upsert, **write_concern)
+            with set_write_concern(queryset._collection, write_concern) as collection:
+                update_func = collection.update_one
+                if multi:
+                    update_func = collection.update_many
+                result = update_func(query, update, upsert=upsert)
             if full_result:
                 return result
-            elif result:
-                return result['n']
+            elif result.raw_result:
+                return result.raw_result['n']
         except pymongo.errors.DuplicateKeyError as err:
             raise NotUniqueError(u'Update failed (%s)' % six.text_type(err))
         except pymongo.errors.OperationFailure as err:
@@ -544,10 +547,10 @@ def upsert_one(self, write_concern=None, **update):
                                     write_concern=write_concern,
                                     full_result=True, **update)
 
-        if atomic_update['updatedExisting']:
+        if atomic_update.raw_result['updatedExisting']:
             document = self.get()
         else:
-            document = self._document.objects.with_id(atomic_update['upserted'])
+            document = self._document.objects.with_id(atomic_update.upserted_id)
         return document
 
     def update_one(self, upsert=False, write_concern=None, **update):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 43800fff0..848fe35d4 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -9,6 +9,7 @@
 import pymongo
 from pymongo.errors import ConfigurationError
 from pymongo.read_preferences import ReadPreference
+from pymongo.results import UpdateResult
 import six
 
 from mongoengine import *
@@ -656,14 +657,14 @@ def test_update_results(self):
 
         result = self.Person(name="Bob", age=25).update(
             upsert=True, full_result=True)
-        self.assertTrue(isinstance(result, dict))
-        self.assertTrue("upserted" in result)
-        self.assertFalse(result["updatedExisting"])
+        self.assertTrue(isinstance(result, UpdateResult))
+        self.assertTrue("upserted" in result.raw_result)
+        self.assertFalse(result.raw_result["updatedExisting"])
 
         bob = self.Person.objects.first()
         result = bob.update(set__age=30, full_result=True)
-        self.assertTrue(isinstance(result, dict))
-        self.assertTrue(result["updatedExisting"])
+        self.assertTrue(isinstance(result, UpdateResult))
+        self.assertTrue(result.raw_result["updatedExisting"])
 
         self.Person(name="Bob", age=20).save()
         result = self.Person.objects(name="Bob").update(

From fa38bfd4e8884fe2d6c641fa185c90641c5a24c8 Mon Sep 17 00:00:00 2001
From: Calgary Michael <cseth.michael@gmail.com>
Date: Fri, 2 Feb 2018 22:30:06 -0600
Subject: [PATCH 0593/1519] made set_write_concern python2.7 compatible

---
 mongoengine/context_managers.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index e62955706..cc35cdd76 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -221,6 +221,6 @@ def _get_count(self):
 
 @contextmanager
 def set_write_concern(collection, write_concerns):
-    yield collection.with_options(write_concern=WriteConcern(
-        **dict(collection.write_concern.document.items()),
-        **write_concerns))
+    old_concerns = dict(collection.write_concern.document.items())
+    combined_concerns = old_concerns.update(write_concerns)
+    yield collection.with_options(write_concern=WriteConcern(**combined_concerns))

From 6835c15d9b0a0379036417e642516f7cdef76840 Mon Sep 17 00:00:00 2001
From: Calgary Michael <cseth.michael@gmail.com>
Date: Fri, 2 Feb 2018 22:41:07 -0600
Subject: [PATCH 0594/1519] fixing bug in previous commit

---
 mongoengine/context_managers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index cc35cdd76..c6d0d40fe 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -221,6 +221,6 @@ def _get_count(self):
 
 @contextmanager
 def set_write_concern(collection, write_concerns):
-    old_concerns = dict(collection.write_concern.document.items())
-    combined_concerns = old_concerns.update(write_concerns)
+    combined_concerns = dict(collection.write_concern.document.items())
+    combined_concerns.update(write_concerns)
     yield collection.with_options(write_concern=WriteConcern(**combined_concerns))

From 38fdf264051430babc8e324f878dc265471b4dea Mon Sep 17 00:00:00 2001
From: Calgary Michael <cseth.michael@gmail.com>
Date: Sun, 4 Feb 2018 10:23:50 -0600
Subject: [PATCH 0595/1519] added tests for push and push_all

---
 tests/queryset/transform.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 20ab0b3fc..20a0c2784 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -51,6 +51,17 @@ class Doc(Document):
         update = transform.update(DicDoc, pull__dictField__test=doc)
         self.assertTrue(isinstance(update["$pull"]["dictField"]["test"], dict))
 
+    def test_transform_update_push(self):
+        """Ensure the differences in behvaior between 'push' and 'push_all'"""
+        class BlogPost(Document):
+            tags = ListField(StringField())
+
+        update = transform.update(BlogPost, push__tags=['mongo', 'db'])
+        self.assertEqual(update, {'$push': {'tags': ['mongo', 'db']}})
+
+        update = transform.update(BlogPost, push_all__tags=['mongo', 'db'])
+        self.assertEqual(update, {'$push': {'tags': {'$each': ['mongo', 'db']}}})
+
     def test_query_field_name(self):
         """Ensure that the correct field name is used when querying.
         """

From 0d854ce906abf87d99ec0a102540570cf800237a Mon Sep 17 00:00:00 2001
From: Ivan Pogrebkov <chezhik@gmail.com>
Date: Mon, 5 Feb 2018 03:24:53 +0300
Subject: [PATCH 0596/1519] style fix

---
 mongoengine/base/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 2115a2525..172e052ff 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -147,7 +147,7 @@ def __setattr__(self, name, value):
 
             if not hasattr(self, name) and not name.startswith('_'):
                 DynamicField = _import_class('DynamicField')
-                field = DynamicField(db_field=name,null=True)
+                field = DynamicField(db_field=name, null=True)
                 field = DynamicField(db_field=name)
                 field.name = name
                 self._dynamic_fields[name] = field

From 6b04ddfad1b2b6574c03ed842e8020feb361d9ce Mon Sep 17 00:00:00 2001
From: Ivan Pogrebkov <chezhik@gmail.com>
Date: Mon, 5 Feb 2018 04:24:03 +0300
Subject: [PATCH 0597/1519] ><

---
 mongoengine/base/document.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 172e052ff..f31c22ce9 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -147,7 +147,6 @@ def __setattr__(self, name, value):
 
             if not hasattr(self, name) and not name.startswith('_'):
                 DynamicField = _import_class('DynamicField')
-                field = DynamicField(db_field=name, null=True)
                 field = DynamicField(db_field=name)
                 field.name = name
                 self._dynamic_fields[name] = field

From de360c61dd239ef44e2d2abd9c4ce835f1144cf8 Mon Sep 17 00:00:00 2001
From: Ivan Pogrebkov <chezhik@gmail.com>
Date: Mon, 5 Feb 2018 04:26:25 +0300
Subject: [PATCH 0598/1519] removed useless lines

---
 mongoengine/document.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index d635d62e5..f1622934f 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1010,7 +1010,6 @@ def __delattr__(self, *args, **kwargs):
         field_name = args[0]
         if field_name in self._dynamic_fields:
             setattr(self, field_name, None)
-            self._dynamic_fields[field_name].null = False
         else:
             super(DynamicDocument, self).__delattr__(*args, **kwargs)
 

From d69808c20414d316fcc6f5a1a6e0d8f751b04a9b Mon Sep 17 00:00:00 2001
From: Ivan Pogrebkov <chezhik@gmail.com>
Date: Mon, 5 Feb 2018 12:33:58 +0300
Subject: [PATCH 0599/1519] oh, ok...

---
 mongoengine/base/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index f31c22ce9..348ee9775 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -147,7 +147,7 @@ def __setattr__(self, name, value):
 
             if not hasattr(self, name) and not name.startswith('_'):
                 DynamicField = _import_class('DynamicField')
-                field = DynamicField(db_field=name)
+                field = DynamicField(db_field=name, null=True)
                 field.name = name
                 self._dynamic_fields[name] = field
                 self._fields_ordered += (name,)

From 7efa67e7e6a6bf32d208c6628b3b43a4c0d89bab Mon Sep 17 00:00:00 2001
From: Ivan Pogrebkov <chezhik@gmail.com>
Date: Mon, 5 Feb 2018 12:35:06 +0300
Subject: [PATCH 0600/1519] reverse to 'style fix'

---
 mongoengine/document.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index f1622934f..d635d62e5 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1010,6 +1010,7 @@ def __delattr__(self, *args, **kwargs):
         field_name = args[0]
         if field_name in self._dynamic_fields:
             setattr(self, field_name, None)
+            self._dynamic_fields[field_name].null = False
         else:
             super(DynamicDocument, self).__delattr__(*args, **kwargs)
 

From 8b5df3ca1733a6fb6d6fcc03273f0545f617732b Mon Sep 17 00:00:00 2001
From: swathi <swathi@uncommon.co>
Date: Mon, 22 Jan 2018 17:21:28 -0800
Subject: [PATCH 0601/1519] fix - allow url with underscore in domain

---
 mongoengine/fields.py  |  2 +-
 tests/fields/fields.py | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index d812a762a..eec31829a 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -121,7 +121,7 @@ class URLField(StringField):
 
     _URL_REGEX = re.compile(
         r'^(?:[a-z0-9\.\-]*)://'  # scheme is validated separately
-        r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}(?<!-)\.?)|'  # domain...
+        r'(?:(?:[A-Z0-9](?:[A-Z0-9-_]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}(?<!-)\.?)|'  # domain...
         r'localhost|'  # localhost...
         r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|'  # ...or ipv4
         r'\[?[A-F0-9]*:[A-F0-9:]+\]?)'  # ...or ipv6
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 678786fa1..482f21d55 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -361,6 +361,16 @@ class SchemeLink(Document):
         scheme_link.url = 'ws://google.com'
         scheme_link.validate()
 
+    def test_url_allowed_domains(self):
+        """Allow underscore in domain names.
+        """
+        class Link(Document):
+            url = URLField()
+
+        link = Link()
+        link.url = 'https://san_leandro-ca.geebo.com/'
+        link.validate()
+
     def test_int_validation(self):
         """Ensure that invalid values cannot be assigned to int fields.
         """

From 7d8916b6e9f60995f905885beac32be321417f1a Mon Sep 17 00:00:00 2001
From: Sangmin In <sm372181@gmail.com>
Date: Sun, 11 Feb 2018 00:59:47 +0900
Subject: [PATCH 0602/1519] fix case inconsistent casing of "MongoDB" (#1744)

---
 docs/tutorial.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index ea1a04c1d..bcd0d17f4 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -86,7 +86,7 @@ of them stand out as particularly intuitive solutions.
 Posts
 ^^^^^
 
-Happily mongoDB *isn't* a relational database, so we're not going to do it that
+Happily MongoDB *isn't* a relational database, so we're not going to do it that
 way. As it turns out, we can use MongoDB's schemaless nature to provide us with
 a much nicer solution. We will store all of the posts in *one collection* and
 each post type will only store the fields it needs. If we later want to add

From 0bd2103a8cb10c63371b2d4cefc8809a5d0adc55 Mon Sep 17 00:00:00 2001
From: Andy Yankovsky <weratt@gmail.com>
Date: Tue, 20 Feb 2018 00:02:12 +0300
Subject: [PATCH 0603/1519] Add test for document update

---
 tests/document/instance.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 609bc9000..22c44ffa1 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1341,6 +1341,23 @@ class Site(Document):
         site = Site.objects.first()
         self.assertEqual(site.page.log_message, "Error: Dummy message")
 
+    def test_update_list_field(self):
+        """Test update on `ListField` with $pull + $in.
+        """
+        class Doc(Document):
+            foo = ListField(StringField())
+
+        Doc.drop_collection()
+        doc = Doc(foo=['a', 'b', 'c'])
+        doc.save()
+
+        # Update
+        doc = Doc.objects.first()
+        doc.update(pull__foo__in=['a', 'c'])
+
+        doc = Doc.objects.first()
+        self.assertEqual(doc.foo, ['b'])
+
     def test_embedded_update_db_field(self):
         """Test update on `EmbeddedDocumentField` fields when db_field
         is other than default.

From 2d76aebb8e9d1ee995eb8945968ca13a2b1b2777 Mon Sep 17 00:00:00 2001
From: KCarretto <Kcarretto@gmail.com>
Date: Wed, 21 Feb 2018 05:02:35 -0500
Subject: [PATCH 0604/1519] Fixed formatting issue

---
 mongoengine/fields.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 8692e3a73..d75286f03 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1108,8 +1108,8 @@ def validate(self, value):
         if self.document_type._meta.get('abstract') and \
                 not isinstance(value, self.document_type):
             self.error(
-                '%s is not an instance of abstract reference type %s' % (value,
-                    self.document_type._class_name)
+                '%s is not an instance of abstract reference type %s' % (
+                    value, self.document_type._class_name)
             )
 
     def lookup_member(self, member_name):

From aa683226416dac3fa4d5fd757091e2c795cf2ff7 Mon Sep 17 00:00:00 2001
From: estein-de <eric_stein@discovery.com>
Date: Tue, 27 Feb 2018 08:43:09 -0600
Subject: [PATCH 0605/1519] MongoDB wants dates stored in UTC, but the
 functions used in this documentation to generate datetime objects would use
 server's local timezone - fix it! (#1662)

---
 docs/guide/defining-documents.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index d41ae7e63..33b5292fc 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -22,7 +22,7 @@ objects** as class attributes to the document class::
 
     class Page(Document):
         title = StringField(max_length=200, required=True)
-        date_modified = DateTimeField(default=datetime.datetime.now)
+        date_modified = DateTimeField(default=datetime.datetime.utcnow)
 
 As BSON (the binary format for storing data in mongodb) is order dependent,
 documents are serialized based on their field order.
@@ -224,7 +224,7 @@ store; in this situation a :class:`~mongoengine.fields.DictField` is appropriate
         user = ReferenceField(User)
         answers = DictField()
 
-    survey_response = SurveyResponse(date=datetime.now(), user=request.user)
+    survey_response = SurveyResponse(date=datetime.utcnow(), user=request.user)
     response_form = ResponseForm(request.POST)
     survey_response.answers = response_form.cleaned_data()
     survey_response.save()
@@ -618,7 +618,7 @@ collection after a given period. See the official
 documentation for more information.  A common usecase might be session data::
 
     class Session(Document):
-        created = DateTimeField(default=datetime.now)
+        created = DateTimeField(default=datetime.utcnow)
         meta = {
             'indexes': [
                 {'fields': ['created'], 'expireAfterSeconds': 3600}

From a34fd9ac89c3ebd294f57d4b471fb6f5b31e1e91 Mon Sep 17 00:00:00 2001
From: Thomas Erker <35792856+th-erker@users.noreply.github.com>
Date: Thu, 8 Mar 2018 11:25:36 +0000
Subject: [PATCH 0606/1519] Add testcase for #1751

---
 tests/document/class_methods.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index dd3addb76..8701b4b27 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -187,6 +187,19 @@ class BlogPostWithCustomField(BlogPost):
         self.assertEqual(BlogPostWithTags.compare_indexes(), { 'missing': [], 'extra': [] })
         self.assertEqual(BlogPostWithCustomField.compare_indexes(), { 'missing': [], 'extra': [] })
 
+    def test_compare_indexes_for_text_indexes(self):
+        """ Ensure that compare_indexes behaves correctly for text indexes """
+
+        class Doc(Document):
+            a = StringField()
+            meta = { 'indexes': ['$a']}
+
+        Doc.drop_collection()
+        Doc.ensure_indexes()
+        actual = Doc.compare_indexes()
+        expected = {'missing': [], 'extra': []}
+        self.assertEqual(actual, expected)
+
     def test_list_indexes_inheritance(self):
         """ ensure that all of the indexes are listed regardless of the super-
         or sub-class that we call it from

From a0947d0c544a58516650a48b73b84d171e693ffc Mon Sep 17 00:00:00 2001
From: John Dupuy <john@cattailcreek9.com>
Date: Sat, 10 Mar 2018 23:24:04 -0600
Subject: [PATCH 0607/1519] Edit EmbeddedDocumentListField update() doc

---
 mongoengine/base/datastructures.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 43f328108..fddd945a2 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -351,7 +351,8 @@ def delete(self):
 
     def update(self, **update):
         """
-        Updates the embedded documents with the given update values.
+        Updates the embedded documents with the given replacement values. This
+        function does not support mongoDB update operators such as ``inc__``.
 
         .. note::
             The embedded document changes are not automatically saved

From dabe8c1bb7e189d0dc8bdceb54eb1ca982a1f6b5 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 14 Mar 2018 14:26:06 -0400
Subject: [PATCH 0608/1519] highlight places where ValidationError is raised
 outside of validate() method

---
 mongoengine/fields.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 7932f73ac..f169f0f14 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -614,6 +614,7 @@ class EmbeddedDocumentField(BaseField):
     """
 
     def __init__(self, document_type, **kwargs):
+        # XXX ValidationError raised outside of the "validate" method.
         if not (
             isinstance(document_type, six.string_types) or
             issubclass(document_type, EmbeddedDocument)
@@ -919,8 +920,11 @@ def __init__(self, basecls=None, field=None, *args, **kwargs):
         self.field = field
         self._auto_dereference = False
         self.basecls = basecls or BaseField
+
+        # XXX ValidationError raised outside of the "validate" method.
         if not issubclass(self.basecls, BaseField):
             self.error('DictField only accepts dict values')
+
         kwargs.setdefault('default', lambda: {})
         super(DictField, self).__init__(*args, **kwargs)
 
@@ -969,6 +973,7 @@ class MapField(DictField):
     """
 
     def __init__(self, field=None, *args, **kwargs):
+        # XXX ValidationError raised outside of the "validate" method.
         if not isinstance(field, BaseField):
             self.error('Argument to MapField constructor must be a valid '
                        'field')
@@ -1028,6 +1033,7 @@ def __init__(self, document_type, dbref=False,
             A reference to an abstract document type is always stored as a
             :class:`~pymongo.dbref.DBRef`, regardless of the value of `dbref`.
         """
+        # XXX ValidationError raised outside of the "validate" method.
         if (
             not isinstance(document_type, six.string_types) and
             not issubclass(document_type, Document)
@@ -1082,6 +1088,8 @@ def to_mongo(self, document):
         if isinstance(document, Document):
             # We need the id from the saved object to create the DBRef
             id_ = document.pk
+
+            # XXX ValidationError raised outside of the "validate" method.
             if id_ is None:
                 self.error('You can only reference documents once they have'
                            ' been saved to the database')
@@ -1121,7 +1129,6 @@ def prepare_query_value(self, op, value):
         return self.to_mongo(value)
 
     def validate(self, value):
-
         if not isinstance(value, (self.document_type, LazyReference, DBRef, ObjectId)):
             self.error('A ReferenceField only accepts DBRef, LazyReference, ObjectId or documents')
 
@@ -1129,11 +1136,14 @@ def validate(self, value):
             self.error('You can only reference documents once they have been '
                        'saved to the database')
 
-        if self.document_type._meta.get('abstract') and \
-                not isinstance(value, self.document_type):
+        if (
+            self.document_type._meta.get('abstract') and
+            not isinstance(value, self.document_type)
+        ):
             self.error(
                 '%s is not an instance of abstract reference type %s' % (
-                    self.document_type._class_name)
+                    self.document_type._class_name
+                )
             )
 
     def lookup_member(self, member_name):
@@ -1156,6 +1166,7 @@ def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
         if fields is None:
             fields = []
 
+        # XXX ValidationError raised outside of the "validate" method.
         if (
             not isinstance(document_type, six.string_types) and
             not issubclass(document_type, Document)
@@ -1230,6 +1241,7 @@ def to_mongo(self, document, use_db_field=True, fields=None):
         id_field_name = self.document_type._meta['id_field']
         id_field = self.document_type._fields[id_field_name]
 
+        # XXX ValidationError raised outside of the "validate" method.
         if isinstance(document, Document):
             # We need the id from the saved object to create the DBRef
             id_ = document.pk
@@ -1238,7 +1250,6 @@ def to_mongo(self, document, use_db_field=True, fields=None):
                            ' been saved to the database')
         else:
             self.error('Only accept a document object')
-            # TODO: should raise here or will fail next statement
 
         value = SON((
             ('_id', id_field.to_mongo(id_)),
@@ -1256,6 +1267,7 @@ def prepare_query_value(self, op, value):
         if value is None:
             return None
 
+        # XXX ValidationError raised outside of the "validate" method.
         if isinstance(value, Document):
             if value.pk is None:
                 self.error('You can only reference documents once they have'
@@ -1269,7 +1281,6 @@ def prepare_query_value(self, op, value):
         raise NotImplementedError
 
     def validate(self, value):
-
         if not isinstance(value, self.document_type):
             self.error('A CachedReferenceField only accepts documents')
 
@@ -1330,6 +1341,8 @@ def __init__(self, *args, **kwargs):
                 elif isinstance(choice, type) and issubclass(choice, Document):
                     self.choices.append(choice._class_name)
                 else:
+                    # XXX ValidationError raised outside of the "validate"
+                    # method.
                     self.error('Invalid choices provided: must be a list of'
                                'Document subclasses and/or six.string_typess')
 
@@ -1393,6 +1406,7 @@ def to_mongo(self, document):
             # We need the id from the saved object to create the DBRef
             id_ = document.id
             if id_ is None:
+                # XXX ValidationError raised outside of the "validate" method.
                 self.error('You can only reference documents once they have'
                            ' been saved to the database')
         else:
@@ -2209,6 +2223,7 @@ def __init__(self, document_type, passthrough=False, dbref=False,
         automatically call `fetch()` and try to retrive the field on the fetched
         document. Note this only work getting field (not setting or deleting).
         """
+        # XXX ValidationError raised outside of the "validate" method.
         if (
             not isinstance(document_type, six.string_types) and
             not issubclass(document_type, Document)

From e46779f87b8c6cc154d90939f10d35ffd06469ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malthe=20J=C3=B8rgensen?= <malthe.jorgensen@gmail.com>
Date: Tue, 27 Mar 2018 14:14:08 +0200
Subject: [PATCH 0609/1519] Docs, queryset.update: `full_result`-arg not
 clearly described

The documentation for the `full_result`-argument to `queryset.update()`
can be read as returning the update documents/objects, whereas it's
really returning just the full "PyMongo result dictionary".

This commit adds some wording and an example dictionary,
to make it clear what the behavior is.
---
 mongoengine/queryset/base.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 6f9c372c6..bf8a5b55f 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -486,8 +486,9 @@ def update(self, upsert=False, multi=True, write_concern=None,
             ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
             wait until at least two servers have recorded the write and
             will force an fsync on the primary server.
-        :param full_result: Return the full result rather than just the number
-            updated.
+        :param full_result: Return the full result dictionary rather than just the number
+            updated, e.g. return
+            `{u'n': 2, u'nModified': 2, u'ok': 1.0, 'updatedExisting': True}`.
         :param update: Django-style update keyword arguments
 
         .. versionadded:: 0.2

From 727778b7305cd01c81e3b198fd20079fcb66b0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malthe=20J=C3=B8rgensen?= <malthe.jorgensen@gmail.com>
Date: Fri, 30 Mar 2018 20:41:39 +0200
Subject: [PATCH 0610/1519] Docs, queryset.update(): Fix backtick mistake

Code should be marked with double backticks
---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index bf8a5b55f..e5611226a 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -488,7 +488,7 @@ def update(self, upsert=False, multi=True, write_concern=None,
             will force an fsync on the primary server.
         :param full_result: Return the full result dictionary rather than just the number
             updated, e.g. return
-            `{u'n': 2, u'nModified': 2, u'ok': 1.0, 'updatedExisting': True}`.
+            ``{'n': 2, 'nModified': 2, 'ok': 1.0, 'updatedExisting': True}``.
         :param update: Django-style update keyword arguments
 
         .. versionadded:: 0.2

From c6f0d5e4785571980cd8a53c71c27172cb63c7d0 Mon Sep 17 00:00:00 2001
From: Kushal Mitruka <kushal.mit16@gmail.com>
Date: Sun, 1 Apr 2018 20:11:22 +0530
Subject: [PATCH 0611/1519] fixed pull queries for embeddeddocumentlistfields

Updated mongoengine.queryset.transform.update method to handle EmbeddedDocuementListField during pull operations in DB using mongoegning ORM
fixed : .udpate(pull__emb_doc__emb_doc_list=doc)
---
 mongoengine/queryset/transform.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 057218508..f96f993cf 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -314,11 +314,17 @@ def update(_doc_cls=None, **update):
             field_classes = [c.__class__ for c in cleaned_fields]
             field_classes.reverse()
             ListField = _import_class('ListField')
-            if ListField in field_classes:
-                # Join all fields via dot notation to the last ListField
+            EmbeddedDocumentListField = _import_class('EmbeddedDocumentListField')
+            if ListField in field_classes or EmbeddedDocumentListField in field_classes:
+                # Join all fields via dot notation to the last ListField or EmbeddedDocumentListField
                 # Then process as normal
+                if ListField in field_classes:
+                    _check_field = ListField
+                else:
+                    _check_field = EmbeddedDocumentListField
+
                 last_listField = len(
-                    cleaned_fields) - field_classes.index(ListField)
+                    cleaned_fields) - field_classes.index(_check_field)
                 key = '.'.join(parts[:last_listField])
                 parts = parts[last_listField:]
                 parts.insert(0, key)

From 806a80cef16ea08b5a33b4ae663b573e7f9a20c4 Mon Sep 17 00:00:00 2001
From: Victor <victor.varvaryuk@mindojo.com>
Date: Thu, 14 Sep 2017 20:31:50 +0300
Subject: [PATCH 0612/1519] Fixes #1641 There's no need to explicitly raise
 StopIteration as that's what a bare return statement does for a generator
 function - so yes they're the same. As of late 2014 return is correct and
 raise StopIteration for ending a generator is on a depreciation schedule. See
 PEP 479 for full details. https://stackoverflow.com/q/14183803/248296
 https://www.python.org/dev/peps/pep-0479/

---
 mongoengine/queryset/queryset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index cf913b01c..60de19a29 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -92,7 +92,7 @@ def _iter_results(self):
             # Raise StopIteration if we already established there were no more
             # docs in the db cursor.
             if not self._has_more:
-                raise StopIteration
+                return
 
             # Otherwise, populate more of the cache and repeat.
             if len(self._result_cache) <= pos:

From 49bff5d544c30ba0a8433b07cda8f7d4e50c9d73 Mon Sep 17 00:00:00 2001
From: Benjamin Chrobot <benjamin.chrobot@alum.mit.edu>
Date: Thu, 12 Apr 2018 10:47:52 -0400
Subject: [PATCH 0613/1519] Add documentation for LazyReference and
 GenericLazyReference fields.

---
 docs/apireference.rst             |  2 ++
 docs/guide/defining-documents.rst |  2 ++
 mongoengine/fields.py             | 17 +++++++++++------
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/docs/apireference.rst b/docs/apireference.rst
index 625d4a8bd..05ba3f733 100644
--- a/docs/apireference.rst
+++ b/docs/apireference.rst
@@ -87,7 +87,9 @@ Fields
 .. autoclass:: mongoengine.fields.DictField
 .. autoclass:: mongoengine.fields.MapField
 .. autoclass:: mongoengine.fields.ReferenceField
+.. autoclass:: mongoengine.fields.LazyReferenceField
 .. autoclass:: mongoengine.fields.GenericReferenceField
+.. autoclass:: mongoengine.fields.GenericLazyReferenceField
 .. autoclass:: mongoengine.fields.CachedReferenceField
 .. autoclass:: mongoengine.fields.BinaryField
 .. autoclass:: mongoengine.fields.FileField
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 33b5292fc..3ced284e2 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -80,6 +80,7 @@ are as follows:
 * :class:`~mongoengine.fields.FloatField`
 * :class:`~mongoengine.fields.GenericEmbeddedDocumentField`
 * :class:`~mongoengine.fields.GenericReferenceField`
+* :class:`~mongoengine.fields.GenericLazyReferenceField`
 * :class:`~mongoengine.fields.GeoPointField`
 * :class:`~mongoengine.fields.ImageField`
 * :class:`~mongoengine.fields.IntField`
@@ -87,6 +88,7 @@ are as follows:
 * :class:`~mongoengine.fields.MapField`
 * :class:`~mongoengine.fields.ObjectIdField`
 * :class:`~mongoengine.fields.ReferenceField`
+* :class:`~mongoengine.fields.LazyReferenceField`
 * :class:`~mongoengine.fields.SequenceField`
 * :class:`~mongoengine.fields.SortedListField`
 * :class:`~mongoengine.fields.StringField`
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f169f0f14..a661874a5 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2204,8 +2204,11 @@ class MultiPolygonField(GeoJsonBaseField):
 
 class LazyReferenceField(BaseField):
     """A really lazy reference to a document.
-    Unlike the :class:`~mongoengine.fields.ReferenceField` it must be manually
-    dereferenced using it ``fetch()`` method.
+    Unlike the :class:`~mongoengine.fields.ReferenceField` it will
+    **not** be automatically (lazily) dereferenced on access.
+    Instead, access will return a :class:`~mongoengine.base.LazyReference` class
+    instance, allowing access to `pk` or manual dereference by using
+    ``fetch()`` method.
 
     .. versionadded:: 0.15
     """
@@ -2331,10 +2334,12 @@ def lookup_member(self, member_name):
 
 
 class GenericLazyReferenceField(GenericReferenceField):
-    """A reference to *any* :class:`~mongoengine.document.Document` subclass
-    that will be automatically dereferenced on access (lazily).
-    Unlike the :class:`~mongoengine.fields.GenericReferenceField` it must be
-    manually dereferenced using it ``fetch()`` method.
+    """A reference to *any* :class:`~mongoengine.document.Document` subclass.
+    Unlike the :class:`~mongoengine.fields.GenericReferenceField` it will
+    **not** be automatically (lazily) dereferenced on access.
+    Instead, access will return a :class:`~mongoengine.base.LazyReference` class
+    instance, allowing access to `pk` or manual dereference by using
+    ``fetch()`` method.
 
     .. note ::
         * Any documents used as a generic reference must be registered in the

From faca8512c53102c201cc9b13519ca2ef3c5eb0c5 Mon Sep 17 00:00:00 2001
From: Emmanuel Nosa Evbuomwan <emmanuelnosa.e@gmail.com>
Date: Sun, 29 Apr 2018 17:32:03 +0100
Subject: [PATCH 0614/1519] Updated text-indexes.rst

The search statement under the `Ordering by text score` section uses `search` on the QuerySet object instead of `search_text` and thus raised an `AttributeError`

AttributeError: 'QuerySet' object has no attribute 'search'
---
 docs/guide/text-indexes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/text-indexes.rst b/docs/guide/text-indexes.rst
index 725ad3699..92a4471a9 100644
--- a/docs/guide/text-indexes.rst
+++ b/docs/guide/text-indexes.rst
@@ -48,4 +48,4 @@ Ordering by text score
 
 ::
 
-  objects = News.objects.search('mongo').order_by('$text_score')
+  objects = News.objects.search_text('mongo').order_by('$text_score')

From 65e4fea4efbb2f888bcf15850777457aafbd5720 Mon Sep 17 00:00:00 2001
From: Kushal Mitruka <kushal.mit16@gmail.com>
Date: Tue, 1 May 2018 20:32:38 +0530
Subject: [PATCH 0615/1519] added test cases for update pull queries

---
 tests/queryset/transform.py | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index a043a6472..a26361226 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -247,7 +247,31 @@ class Event(Document):
         events = Event.objects(location__within=box)
         with self.assertRaises(InvalidQueryError):
             events.count()
-
-
+    
+    def test_update_pull_for_list_fields(self):
+        """ 
+        Test added to check pull operation in update for 
+        EmbeddedDocumentListField which is inside a EmbeddedDocumentField
+        """
+        class Word(EmbeddedDocument):
+            word = StringField()
+            index = IntField()
+        
+        class SubDoc(EmbeddedDocument):
+            heading = ListField(StringField())
+            text = EmbeddedDocumentListField(Word)
+        
+        class MainDoc(Document):
+            title = StringField()
+            content = EmbeddedDocumentField(SubDoc)
+        
+        word = Word(word='abc', index=1)
+        update = transform.update(MainDoc, pull__content__text=word)
+        self.assertEqual(update, {'$pull': {'content.text': SON([('word', u'abc'), ('index', 1)])}})
+
+        update = transform.update(MainDoc, pull__content__heading='xyz')
+        self.assertEqual(update, {'$pull': {'content.heading': 'xyz'}})
+        
+        
 if __name__ == '__main__':
     unittest.main()

From b1f62a27353a1c2bd8d69b4697dab16caa8056cf Mon Sep 17 00:00:00 2001
From: Kushal Mitruka <kushal.mit16@gmail.com>
Date: Tue, 1 May 2018 21:08:43 +0530
Subject: [PATCH 0616/1519] added import in tests/queryset/transform.py for SON
 object

---
 tests/queryset/transform.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index a26361226..a1f060d55 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -1,5 +1,7 @@
 import unittest
 
+from bson.son import SON
+
 from mongoengine import *
 from mongoengine.queryset import Q, transform
 

From 5a6d4387ea7cbc6eea6176d7c3d67cdcc64c2b31 Mon Sep 17 00:00:00 2001
From: Andy Yankovsky <weratt@gmail.com>
Date: Mon, 7 May 2018 23:17:12 +0300
Subject: [PATCH 0617/1519] Restore comment from cached value after cursor copy

---
 mongoengine/queryset/base.py |  3 +++
 tests/queryset/queryset.py   | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index e5611226a..b1d3342bb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1579,6 +1579,9 @@ def _cursor(self):
         if self._batch_size is not None:
             self._cursor_obj.batch_size(self._batch_size)
 
+        if self._comment is not None:
+            self._cursor_obj.comment(self._comment)
+
         return self._cursor_obj
 
     def __deepcopy__(self, memo):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 43800fff0..c9b87eeb7 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2383,14 +2383,19 @@ class User(Document):
             age = IntField()
 
         with db_ops_tracker() as q:
-            adult = (User.objects.filter(age__gte=18)
+            adult1 = (User.objects.filter(age__gte=18)
                 .comment('looking for an adult')
                 .first())
+
+            adult2 = (User.objects.comment('looking for an adult')
+                .filter(age__gte=18)
+                .first())
+
             ops = q.get_ops()
-            self.assertEqual(len(ops), 1)
-            op = ops[0]
-            self.assertEqual(op['query']['$query'], {'age': {'$gte': 18}})
-            self.assertEqual(op['query']['$comment'], 'looking for an adult')
+            self.assertEqual(len(ops), 2)
+            for op in ops:
+                self.assertEqual(op['query']['$query'], {'age': {'$gte': 18}})
+                self.assertEqual(op['query']['$comment'], 'looking for an adult')
 
     def test_map_reduce(self):
         """Ensure map/reduce is both mapping and reducing.

From 85d621846d521e2662d420983393b49737a22ae3 Mon Sep 17 00:00:00 2001
From: Benjamin Jiang <jbjsnow@outlook.com>
Date: Wed, 16 May 2018 11:37:32 +0800
Subject: [PATCH 0618/1519] Fix typo

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index c948dac2f..a8061749a 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -579,7 +579,7 @@ def delete(self, signal_kwargs=None, **write_concern):
         """Delete the :class:`~mongoengine.Document` from the database. This
         will only take effect if the document has been previously saved.
 
-        :parm signal_kwargs: (optional) kwargs dictionary to be passed to
+        :param signal_kwargs: (optional) kwargs dictionary to be passed to
             the signal calls.
         :param write_concern: Extra keyword arguments are passed down which
             will be used as options for the resultant

From 08b64338439a33a1b869ef0c77f09fd9b50bae2c Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 11:03:13 +0800
Subject: [PATCH 0619/1519] fix compare_indexes for text indexes #1751

---
 mongoengine/document.py         | 12 ++++++++++--
 tests/document/class_methods.py |  8 +++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index c948dac2f..18c52d9de 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -967,8 +967,16 @@ def compare_indexes(cls):
         """
 
         required = cls.list_indexes()
-        existing = [info['key']
-                    for info in cls._get_collection().index_information().values()]
+
+        existing = []
+        for info in cls._get_collection().index_information().values():
+            if '_fts' in info['key'][0]:
+                index_type = info['key'][0][1]
+                text_index_fields = info.get('weights').keys()
+                existing.append(
+                    [(key, index_type) for key in text_index_fields])
+            else:
+                existing.append(info['key'])
         missing = [index for index in required if index not in existing]
         extra = [index for index in existing if index not in required]
 
diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index 8701b4b27..3f052d452 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -192,7 +192,13 @@ def test_compare_indexes_for_text_indexes(self):
 
         class Doc(Document):
             a = StringField()
-            meta = { 'indexes': ['$a']}
+            b = StringField()
+            meta = {'indexes': [
+                {'fields': ['$a', "$b"],
+                 'default_language': 'english',
+                 'weights': {'a': 10, 'b': 2}
+                }
+            ]}
 
         Doc.drop_collection()
         Doc.ensure_indexes()

From e50d66b3032df29331f72f6ce238b3813ae35b50 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 11:26:30 +0800
Subject: [PATCH 0620/1519] skip mongodb 2.4

---
 tests/document/class_methods.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index 3f052d452..2fab1f724 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -5,6 +5,7 @@
 
 from mongoengine.queryset import NULLIFY, PULL
 from mongoengine.connection import get_db
+from tests.utils import needs_mongodb_v26
 
 __all__ = ("ClassMethodsTest", )
 
@@ -187,6 +188,7 @@ class BlogPostWithCustomField(BlogPost):
         self.assertEqual(BlogPostWithTags.compare_indexes(), { 'missing': [], 'extra': [] })
         self.assertEqual(BlogPostWithCustomField.compare_indexes(), { 'missing': [], 'extra': [] })
 
+    @needs_mongodb_v26
     def test_compare_indexes_for_text_indexes(self):
         """ Ensure that compare_indexes behaves correctly for text indexes """
 

From 257a43298b93785d9280d3942745aab7149bf627 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 12:31:27 +0800
Subject: [PATCH 0621/1519] use MongoClient.is_mongos in ensure indexes #1759

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 2de0b1a3a..865bb0631 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -854,7 +854,7 @@ def ensure_indexes(cls):
         collection = cls._get_collection()
         # 746: when connection is via mongos, the read preference is not necessarily an indication that
         # this code runs on a secondary
-        if not collection.is_mongos and collection.read_preference > 1:
+        if not collection.database.client.is_mongos and collection.read_preference > 1:
             return
 
         # determine if an index which we are creating includes

From fd02d77c59aa6c427581c9903d158c1d77cbfa26 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 12:43:24 +0800
Subject: [PATCH 0622/1519] drop pymongo 2.x support in update

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a70c711e6..29a72d1c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,6 @@ python:
 - pypy
 
 env:
-- MONGODB=2.6 PYMONGO=2.7
-- MONGODB=2.6 PYMONGO=2.8
 - MONGODB=2.6 PYMONGO=3.x
 
 matrix:
@@ -28,14 +26,10 @@ matrix:
   fast_finish: true
 
   include:
-  - python: 2.7
-    env: MONGODB=2.4 PYMONGO=2.7
   - python: 2.7
     env: MONGODB=2.4 PYMONGO=3.5
   - python: 2.7
     env: MONGODB=3.0 PYMONGO=3.x
-  - python: 3.5
-    env: MONGODB=2.4 PYMONGO=2.7
   - python: 3.5
     env: MONGODB=2.4 PYMONGO=3.5
   - python: 3.5

From f605eb14e8b9e4c02d8279a54035f1c00791cf22 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 12:54:24 +0800
Subject: [PATCH 0623/1519] fix style

---
 mongoengine/context_managers.py | 4 ++--
 mongoengine/document.py         | 2 +-
 tox.ini                         | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index c6d0d40fe..150f9657b 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,7 +1,7 @@
 from mongoengine.common import _import_class
-from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
-from pymongo.write_concern import WriteConcern
 from contextlib import contextmanager
+from pymongo.write_concern import WriteConcern
+from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 
 
 __all__ = ('switch_db', 'switch_collection', 'no_dereference',
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 865bb0631..2de0b1a3a 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -854,7 +854,7 @@ def ensure_indexes(cls):
         collection = cls._get_collection()
         # 746: when connection is via mongos, the read preference is not necessarily an indication that
         # this code runs on a secondary
-        if not collection.database.client.is_mongos and collection.read_preference > 1:
+        if not collection.is_mongos and collection.read_preference > 1:
             return
 
         # determine if an index which we are creating includes
diff --git a/tox.ini b/tox.ini
index 9bb0c5ecd..2f2b1757a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,11 @@
 [tox]
-envlist = {py27,py35,pypy,pypy3}-{mg27,mg28,mg35,mg3x}
+envlist = {py27,py35,pypy,pypy3}-{mg35,mg3x}
 
 [testenv]
 commands =
     python setup.py nosetests {posargs}
 deps =
     nose
-    mg27: PyMongo<2.8
-    mg28: PyMongo>=2.8,<2.9
     mg35: PyMongo==3.5
     mg3x: PyMongo>=3.0
 setenv =

From c83c6350676af155a8c204a0593e74ee8b674e6b Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 13:04:51 +0800
Subject: [PATCH 0624/1519] fix import order

---
 mongoengine/context_managers.py | 2 +-
 mongoengine/queryset/base.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 150f9657b..ec2e9e8b9 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,6 +1,6 @@
-from mongoengine.common import _import_class
 from contextlib import contextmanager
 from pymongo.write_concern import WriteConcern
+from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 2a1bf3ad9..f78ee8826 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -18,7 +18,7 @@
 from mongoengine.base import get_document
 from mongoengine.common import _import_class
 from mongoengine.connection import get_db
-from mongoengine.context_managers import switch_db, set_write_concern
+from mongoengine.context_managers import set_write_concern, switch_db
 from mongoengine.errors import (InvalidQueryError, LookUpError,
                                 NotUniqueError, OperationError)
 from mongoengine.python_support import IS_PYMONGO_3

From 843fc03bf490b6c6346a22f8599046f718631beb Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 13:16:25 +0800
Subject: [PATCH 0625/1519] add changelog for update_one,update_many

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 294714639..cb31da213 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ dev
 -  Fix validation error instance in GenericEmbeddedDocumentField #1067
 -  Update cached fields when fields argument is given #1712
 -  Add a db parameter to register_connection for compatibility with connect
+-  Use new update_one, update_many on document/queryset update #1491
 
 Changes in 0.15.0
 =================

From 3e0d84383e4a0f9c52d6840ff1d4a882e7eeb6cb Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 13:41:20 +0800
Subject: [PATCH 0626/1519] use insert_one, insert_many and remove deprecated
 one #1491

---
 docs/changelog.rst           | 1 +
 mongoengine/queryset/base.py | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 294714639..4dec42ce4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ dev
 -  Fix validation error instance in GenericEmbeddedDocumentField #1067
 -  Update cached fields when fields argument is given #1712
 -  Add a db parameter to register_connection for compatibility with connect
+-  Use insert_one, insert_many in Document.insert #1491
 
 Changes in 0.15.0
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index b1d3342bb..95b25d06f 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -350,8 +350,14 @@ def insert(self, doc_or_docs, load_bulk=True,
                                      documents=docs, **signal_kwargs)
 
         raw = [doc.to_mongo() for doc in docs]
+        insert_func = self._collection.insert_many
+        if return_one:
+            raw = raw[0]
+            insert_func = self._collection.insert_one
+
         try:
-            ids = self._collection.insert(raw, **write_concern)
+            inserted_result = insert_func(raw, **write_concern)
+            ids = inserted_result.inserted_id if return_one else inserted_result.inserted_ids
         except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'
             raise NotUniqueError(message % six.text_type(err))

From f9a887c8c6665a77dda33ca785acf2ece8158337 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 14:33:12 +0800
Subject: [PATCH 0627/1519] fix inserted_ids

---
 mongoengine/queryset/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 95b25d06f..eec7df18e 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -357,7 +357,8 @@ def insert(self, doc_or_docs, load_bulk=True,
 
         try:
             inserted_result = insert_func(raw, **write_concern)
-            ids = inserted_result.inserted_id if return_one else inserted_result.inserted_ids
+            ids = return_one and inserted_result.inserted_id or\
+                  inserted_result.inserted_ids
         except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'
             raise NotUniqueError(message % six.text_type(err))
@@ -374,7 +375,6 @@ def insert(self, doc_or_docs, load_bulk=True,
             signals.post_bulk_insert.send(
                 self._document, documents=docs, loaded=False, **signal_kwargs)
             return return_one and ids[0] or ids
-
         documents = self.in_bulk(ids)
         results = []
         for obj_id in ids:

From 1d3f20b666bfe0ef8dcdea06a2341e460d13c486 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 14:41:25 +0800
Subject: [PATCH 0628/1519] fix style and ids need to be an array

---
 mongoengine/queryset/base.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 2f2d38dd8..0634dcebc 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -357,8 +357,7 @@ def insert(self, doc_or_docs, load_bulk=True,
 
         try:
             inserted_result = insert_func(raw, **write_concern)
-            ids = return_one and inserted_result.inserted_id or\
-                  inserted_result.inserted_ids
+            ids = return_one and [inserted_result.inserted_id] or inserted_result.inserted_ids
         except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'
             raise NotUniqueError(message % six.text_type(err))

From 1aebc9514564a9ba1c58cb52fa4552ace6d2066a Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 13:41:20 +0800
Subject: [PATCH 0629/1519] use insert_one, insert_many and remove deprecated
 one #1491

---
 docs/changelog.rst           | 1 +
 mongoengine/queryset/base.py | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index cb31da213..e3d366b33 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,7 @@ dev
 -  Update cached fields when fields argument is given #1712
 -  Add a db parameter to register_connection for compatibility with connect
 -  Use new update_one, update_many on document/queryset update #1491
+-  Use insert_one, insert_many in Document.insert #1491
 
 Changes in 0.15.0
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index f78ee8826..ff7afa96f 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -350,8 +350,14 @@ def insert(self, doc_or_docs, load_bulk=True,
                                      documents=docs, **signal_kwargs)
 
         raw = [doc.to_mongo() for doc in docs]
+        insert_func = self._collection.insert_many
+        if return_one:
+            raw = raw[0]
+            insert_func = self._collection.insert_one
+
         try:
-            ids = self._collection.insert(raw, **write_concern)
+            inserted_result = insert_func(raw, **write_concern)
+            ids = inserted_result.inserted_id if return_one else inserted_result.inserted_ids
         except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'
             raise NotUniqueError(message % six.text_type(err))

From 5c0bd8a81090aa39a74b347adb7afde9edb202b6 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 14:33:12 +0800
Subject: [PATCH 0630/1519] fix inserted_ids

---
 mongoengine/queryset/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ff7afa96f..2f2d38dd8 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -357,7 +357,8 @@ def insert(self, doc_or_docs, load_bulk=True,
 
         try:
             inserted_result = insert_func(raw, **write_concern)
-            ids = inserted_result.inserted_id if return_one else inserted_result.inserted_ids
+            ids = return_one and inserted_result.inserted_id or\
+                  inserted_result.inserted_ids
         except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'
             raise NotUniqueError(message % six.text_type(err))
@@ -374,7 +375,6 @@ def insert(self, doc_or_docs, load_bulk=True,
             signals.post_bulk_insert.send(
                 self._document, documents=docs, loaded=False, **signal_kwargs)
             return return_one and ids[0] or ids
-
         documents = self.in_bulk(ids)
         results = []
         for obj_id in ids:

From 0fc55451c2aaad6a612d28ead0b58898a2236e40 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 14:41:25 +0800
Subject: [PATCH 0631/1519] fix style and ids need to be an array

---
 mongoengine/queryset/base.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 2f2d38dd8..0634dcebc 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -357,8 +357,7 @@ def insert(self, doc_or_docs, load_bulk=True,
 
         try:
             inserted_result = insert_func(raw, **write_concern)
-            ids = return_one and inserted_result.inserted_id or\
-                  inserted_result.inserted_ids
+            ids = return_one and [inserted_result.inserted_id] or inserted_result.inserted_ids
         except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'
             raise NotUniqueError(message % six.text_type(err))

From acba86993dd92b04fff289a151cb8882913bbf20 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 15:43:19 +0800
Subject: [PATCH 0632/1519] set_write_concern pymongo3

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 0634dcebc..0a3f65fbf 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -356,7 +356,7 @@ def insert(self, doc_or_docs, load_bulk=True,
             insert_func = self._collection.insert_one
 
         try:
-            inserted_result = insert_func(raw, **write_concern)
+            inserted_result = insert_func(raw, set_write_concern(write_concern))
             ids = return_one and [inserted_result.inserted_id] or inserted_result.inserted_ids
         except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'

From fa4ac95ecc245c59040664905c935d3c85b49429 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 17:49:49 +0800
Subject: [PATCH 0633/1519] catch bulkwriteerror

---
 mongoengine/queryset/base.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 008e7f158..391cc8192 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -371,6 +371,11 @@ def insert(self, doc_or_docs, load_bulk=True,
                 message = u'Tried to save duplicate unique keys (%s)'
                 raise NotUniqueError(message % six.text_type(err))
             raise OperationError(message % six.text_type(err))
+        except pymongo.error.BulkWriteError as err:
+            # inserting documents that already have an _id field will
+            # give huge performance debt or raise
+            message = u'Document must not have _id value before bulk write (%s)'
+            raise NotUniqueError(message % sx.text_type(err))
 
         if not load_bulk:
             signals.post_bulk_insert.send(

From 78601d90c9fd13b20d1e6cfe2342ddb23a520e33 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 17:54:13 +0800
Subject: [PATCH 0634/1519] fix typo

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 391cc8192..4c8309a79 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -375,7 +375,7 @@ def insert(self, doc_or_docs, load_bulk=True,
             # inserting documents that already have an _id field will
             # give huge performance debt or raise
             message = u'Document must not have _id value before bulk write (%s)'
-            raise NotUniqueError(message % sx.text_type(err))
+            raise NotUniqueError(message % six.text_type(err))
 
         if not load_bulk:
             signals.post_bulk_insert.send(

From 94cda90a6ead7a64059328c58dafa6154436c951 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 17:56:19 +0800
Subject: [PATCH 0635/1519] fix syntax

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 4c8309a79..bba63da06 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -371,7 +371,7 @@ def insert(self, doc_or_docs, load_bulk=True,
                 message = u'Tried to save duplicate unique keys (%s)'
                 raise NotUniqueError(message % six.text_type(err))
             raise OperationError(message % six.text_type(err))
-        except pymongo.error.BulkWriteError as err:
+        except pymongo.errors.BulkWriteError as err:
             # inserting documents that already have an _id field will
             # give huge performance debt or raise
             message = u'Document must not have _id value before bulk write (%s)'

From 088fd6334bfe8316c2df2466ad93ee568e3013c6 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 18:06:59 +0800
Subject: [PATCH 0636/1519] bulkwriteerror does not trigger

---
 mongoengine/queryset/base.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index bba63da06..647eafc69 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -363,6 +363,11 @@ def insert(self, doc_or_docs, load_bulk=True,
         except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'
             raise NotUniqueError(message % six.text_type(err))
+        except pymongo.errors.BulkWriteError as err:
+            # inserting documents that already have an _id field will
+            # give huge performance debt or raise
+            message = u'Document must not have _id value before bulk write (%s)'
+            raise NotUniqueError(message % six.text_type(err))
         except pymongo.errors.OperationFailure as err:
             message = 'Could not save document (%s)'
             if re.match('^E1100[01] duplicate key', six.text_type(err)):
@@ -371,11 +376,6 @@ def insert(self, doc_or_docs, load_bulk=True,
                 message = u'Tried to save duplicate unique keys (%s)'
                 raise NotUniqueError(message % six.text_type(err))
             raise OperationError(message % six.text_type(err))
-        except pymongo.errors.BulkWriteError as err:
-            # inserting documents that already have an _id field will
-            # give huge performance debt or raise
-            message = u'Document must not have _id value before bulk write (%s)'
-            raise NotUniqueError(message % six.text_type(err))
 
         if not load_bulk:
             signals.post_bulk_insert.send(

From 506168ab83a11dc22c706dd308f77f6233543d57 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 18:25:50 +0800
Subject: [PATCH 0637/1519] use write_concern class

---
 tests/queryset/queryset.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 5c3f179f9..4c0085d08 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -927,8 +927,7 @@ class Author(Document):
 
         self.assertEqual(Blog.objects.count(), 2)
 
-        Blog.objects.insert([blog2, blog3],
-                            write_concern={"w": 0, 'continue_on_error': True})
+        Blog.objects.insert([blog2, blog3], write_concern={"w": 0})
         self.assertEqual(Blog.objects.count(), 3)
 
     def test_get_changed_fields_query_count(self):

From fc5d9ae10033e7e083931d9a64b7137feadc6eb6 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Sun, 20 May 2018 18:39:22 +0800
Subject: [PATCH 0638/1519] pymongo3 does not support continue_on_error

---
 tests/queryset/queryset.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 4c0085d08..3fa86a58c 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -927,9 +927,6 @@ class Author(Document):
 
         self.assertEqual(Blog.objects.count(), 2)
 
-        Blog.objects.insert([blog2, blog3], write_concern={"w": 0})
-        self.assertEqual(Blog.objects.count(), 3)
-
     def test_get_changed_fields_query_count(self):
         """Make sure we don't perform unnecessary db operations when
         none of document's fields were updated.

From 2adb640821123439c9b611375d01aba1d86b3b26 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 21 May 2018 09:19:03 +0800
Subject: [PATCH 0639/1519] modify bulk_insert test for pymongo3

---
 tests/queryset/queryset.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 3fa86a58c..50825e5cc 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -846,10 +846,10 @@ class Blog(Document):
 
             Blog.objects.insert(blogs, load_bulk=False)
             if mongodb_version < (2, 6):
-                self.assertEqual(q, 1)
+                self.assertEqual(q, 99)
             else:
                 # profiling logs each doc now in the bulk op
-                self.assertEqual(q, 99)
+                self.assertEqual(q, 1)
 
         Blog.drop_collection()
         Blog.ensure_indexes()
@@ -859,7 +859,7 @@ class Blog(Document):
 
             Blog.objects.insert(blogs)
             if mongodb_version < (2, 6):
-                self.assertEqual(q, 2)  # 1 for insert, and 1 for in bulk fetch
+                self.assertEqual(q, 101)  # 100 for insert, and 1 for in bulk fetch
             else:
                 # 99 for insert, and 1 for in bulk fetch
                 self.assertEqual(q, 100)

From e4451ccaf8616e27c3479e97bcb75daf76396488 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 21 May 2018 09:22:33 +0800
Subject: [PATCH 0640/1519] insert_many uses only one insert

---
 tests/queryset/queryset.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 50825e5cc..8e91feae5 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -845,11 +845,8 @@ class Blog(Document):
                 blogs.append(Blog(title="post %s" % i, posts=[post1, post2]))
 
             Blog.objects.insert(blogs, load_bulk=False)
-            if mongodb_version < (2, 6):
-                self.assertEqual(q, 99)
-            else:
-                # profiling logs each doc now in the bulk op
-                self.assertEqual(q, 1)
+            # profiling logs each doc now in the bulk op
+            self.assertEqual(q, 99)
 
         Blog.drop_collection()
         Blog.ensure_indexes()
@@ -861,8 +858,8 @@ class Blog(Document):
             if mongodb_version < (2, 6):
                 self.assertEqual(q, 101)  # 100 for insert, and 1 for in bulk fetch
             else:
-                # 99 for insert, and 1 for in bulk fetch
-                self.assertEqual(q, 100)
+                # 1 for insert, and 1 for in bulk fetch
+                self.assertEqual(q, 2)
 
         Blog.drop_collection()
 

From f7a3acfaf45673ee379fc09de86f4fa484e907bc Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 21 May 2018 09:34:44 +0800
Subject: [PATCH 0641/1519] query profiler test fix

---
 tests/queryset/queryset.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 8e91feae5..9c7ac0e4d 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -855,11 +855,7 @@ class Blog(Document):
             self.assertEqual(q, 0)
 
             Blog.objects.insert(blogs)
-            if mongodb_version < (2, 6):
-                self.assertEqual(q, 101)  # 100 for insert, and 1 for in bulk fetch
-            else:
-                # 1 for insert, and 1 for in bulk fetch
-                self.assertEqual(q, 2)
+            self.assertEqual(q, 100) # 99 for insert 1 for fetch
 
         Blog.drop_collection()
 

From 3f9ff7254f206e0926c6ab31cc3a1a1efe39ad2d Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 21 May 2018 09:46:23 +0800
Subject: [PATCH 0642/1519] fix queryset tests

---
 tests/queryset/queryset.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 9c7ac0e4d..dea5b1104 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -970,7 +970,10 @@ class Project(Document):
         org = Organization.objects.get(id=o1.id)
         with query_counter() as q:
             org.save(cascade=False)
-            self.assertEqual(q, 0)
+            if mongodb_version >= (3, 0):
+                self.assertEqual(q, 1)
+            else:
+                self.assertEqual(q, 0)
 
         # Saving a doc after you append a reference to it should result in
         # two db operations (a query for the reference and an update).

From 6fb5c312c3a8d753c4a49a6e65bbc9db3d84f5bb Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 21 May 2018 09:54:19 +0800
Subject: [PATCH 0643/1519] fix test error

---
 tests/queryset/queryset.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index dea5b1104..2b12d2618 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -967,6 +967,11 @@ class Project(Document):
             org.save()
             self.assertEqual(q, 0)
 
+        # get MongoDB version info
+        connection = get_connection()
+        info = connection.test.command('buildInfo')
+        mongodb_version = tuple([int(i) for i in info['version'].split('.')])
+
         org = Organization.objects.get(id=o1.id)
         with query_counter() as q:
             org.save(cascade=False)

From 9bd328e147122133a64f00a71c5829c8803217ed Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 21 May 2018 10:04:59 +0800
Subject: [PATCH 0644/1519] query_counter fix

---
 tests/queryset/queryset.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 2b12d2618..9c7ac0e4d 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -967,18 +967,10 @@ class Project(Document):
             org.save()
             self.assertEqual(q, 0)
 
-        # get MongoDB version info
-        connection = get_connection()
-        info = connection.test.command('buildInfo')
-        mongodb_version = tuple([int(i) for i in info['version'].split('.')])
-
         org = Organization.objects.get(id=o1.id)
         with query_counter() as q:
             org.save(cascade=False)
-            if mongodb_version >= (3, 0):
-                self.assertEqual(q, 1)
-            else:
-                self.assertEqual(q, 0)
+            self.assertEqual(q, 0)
 
         # Saving a doc after you append a reference to it should result in
         # two db operations (a query for the reference and an update).

From 290b821a3ae2e130192a90bb62ad5ae8d5461005 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Sat, 2 Sep 2017 02:05:27 +0900
Subject: [PATCH 0645/1519] add fix for reload(fields) affect changed fields
 #1371

---
 mongoengine/document.py    |  5 +++--
 tests/document/instance.py | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 2de0b1a3a..182733c73 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -705,7 +705,6 @@ def reload(self, *fields, **kwargs):
             obj = obj[0]
         else:
             raise self.DoesNotExist('Document does not exist')
-
         for field in obj._data:
             if not fields or field in fields:
                 try:
@@ -721,7 +720,9 @@ def reload(self, *fields, **kwargs):
                         # i.e. obj.update(unset__field=1) followed by obj.reload()
                         delattr(self, field)
 
-        self._changed_fields = obj._changed_fields
+        self._changed_fields = list(
+            set(self._changed_fields) - set(fields)
+            ) if fields else obj._changed_fields
         self._created = False
         return self
 
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 38c7fcafb..b255e8a68 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -476,6 +476,24 @@ class Animal(Document):
         doc.save()
         doc.reload()
 
+    def test_reload_with_changed_fields(self):
+        """Ensures reloading will not affect changed fields"""
+        class User(Document):
+            name = StringField()
+            number = IntField()
+        User.drop_collection()
+
+        user = User(name="Bob", number=1).save()
+        user.name = "John"
+        user.number = 2
+
+        self.assertEqual(user._get_changed_fields(), ['name', 'number'])
+        user.reload('number')
+        self.assertEqual(user._get_changed_fields(), ['name'])
+        user.save()
+        user.reload()
+        self.assertEqual(user.name, "John")
+
     def test_reload_referencing(self):
         """Ensures reloading updates weakrefs correctly."""
         class Embedded(EmbeddedDocument):
@@ -521,7 +539,7 @@ class Doc(Document):
         doc.save()
         doc.dict_field['extra'] = 1
         doc = doc.reload(10, 'list_field')
-        self.assertEqual(doc._get_changed_fields(), [])
+        self.assertEqual(doc._get_changed_fields(), ['dict_field.extra'])
         self.assertEqual(len(doc.list_field), 5)
         self.assertEqual(len(doc.dict_field), 3)
         self.assertEqual(len(doc.embedded_field.list_field), 4)

From d424583cbf26de5c9b4f3ac47ec9b4cb52549fd5 Mon Sep 17 00:00:00 2001
From: Erdenezul <erdenezul@shine.mn>
Date: Sat, 2 Sep 2017 12:00:57 +0900
Subject: [PATCH 0646/1519] fix flake8 error #1371

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 182733c73..109f8f825 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -722,7 +722,7 @@ def reload(self, *fields, **kwargs):
 
         self._changed_fields = list(
             set(self._changed_fields) - set(fields)
-            ) if fields else obj._changed_fields
+        ) if fields else obj._changed_fields
         self._created = False
         return self
 

From 784386fddcc3d171791fb710e332d72d29c009a5 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 21 May 2018 16:07:08 +0800
Subject: [PATCH 0647/1519] add changelog #1371

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d8765d176..08e5a4905 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,7 @@ dev
 -  Use insert_one, insert_many in Document.insert #1491
 -  Use new update_one, update_many on document/queryset update #1491
 -  Use insert_one, insert_many in Document.insert #1491
+-  Fix reload(fields) affect changed fields #1371
 
 Changes in 0.15.0
 =================

From 446c1010185bd7ca836e686d6513f8d7c07828c5 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Wed, 23 May 2018 15:53:30 +0800
Subject: [PATCH 0648/1519] dont call ensure_indexes on slave #1338

---
 mongoengine/document.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 109f8f825..7d03bd607 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -195,7 +195,9 @@ def _get_collection(cls):
 
             # Ensure indexes on the collection unless auto_create_index was
             # set to False.
-            if cls._meta.get('auto_create_index', True):
+            # Also there is no need to ensure indexes on slave.
+            if cls._meta.get('auto_create_index', True) and\
+                    db.client.is_primary:
                 cls.ensure_indexes()
 
         return cls._collection

From e8e47c39d78b25a6af9e6c77da1c2ce6fb5b88f7 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Wed, 23 May 2018 15:54:44 +0800
Subject: [PATCH 0649/1519] add changelog #1338

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 08e5a4905..d5ee2b23f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,6 +14,7 @@ dev
 -  Use new update_one, update_many on document/queryset update #1491
 -  Use insert_one, insert_many in Document.insert #1491
 -  Fix reload(fields) affect changed fields #1371
+-  Fix Read-only access to database fails when trying to create indexes #1338
 
 Changes in 0.15.0
 =================

From 8739ab9c66e2cf84c3c206b95a5468263967b9d9 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Wed, 23 May 2018 15:59:18 +0800
Subject: [PATCH 0650/1519] fix syntax #1338

---
 mongoengine/document.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 7d03bd607..0d471c3a5 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -196,6 +196,7 @@ def _get_collection(cls):
             # Ensure indexes on the collection unless auto_create_index was
             # set to False.
             # Also there is no need to ensure indexes on slave.
+            db = cls._get_db()
             if cls._meta.get('auto_create_index', True) and\
                     db.client.is_primary:
                 cls.ensure_indexes()

From 080226dd7289bb3973c46b76eba15174dd8c6977 Mon Sep 17 00:00:00 2001
From: Tal Yalon <tal.yalon@gmail.com>
Date: Fri, 22 Jun 2018 14:16:17 +0300
Subject: [PATCH 0651/1519] Fix issue #1286 and #844.: when building a query
 set from filters that reference the same field several times, do not assume
 each value is a dict

---
 mongoengine/queryset/transform.py | 2 +-
 tests/queryset/queryset.py        | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 5f777f413..f450c8a3c 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -147,7 +147,7 @@ def query(_doc_cls=None, **kwargs):
         if op is None or key not in mongo_query:
             mongo_query[key] = value
         elif key in mongo_query:
-            if isinstance(mongo_query[key], dict):
+            if isinstance(mongo_query[key], dict) and isinstance(value, dict):
                 mongo_query[key].update(value)
                 # $max/minDistance needs to come last - convert to SON
                 value_dict = mongo_query[key]
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 497a0d231..9b1b3256c 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1202,6 +1202,14 @@ def published(doc_cls, queryset):
         BlogPost.drop_collection()
         Blog.drop_collection()
 
+    def test_filter_chaining_with_regex(self):
+        person = self.Person(name='Guido van Rossum')
+        person.save()
+
+        people = self.Person.objects
+        people = people.filter(name__startswith='Gui').filter(name__not__endswith='tum')
+        self.assertEqual(people.count(), 1)
+
     def assertSequence(self, qs, expected):
         qs = list(qs)
         expected = list(expected)

From d0741946c7f982286cb709c23850f95769414ec6 Mon Sep 17 00:00:00 2001
From: Tony Narlock <tony@git-pull.com>
Date: Thu, 28 Jun 2018 10:19:48 -0500
Subject: [PATCH 0652/1519] Fix a typo (#1813)

an -> a
---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 0d471c3a5..c8532e5b9 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -715,7 +715,7 @@ def reload(self, *fields, **kwargs):
                 except (KeyError, AttributeError):
                     try:
                         # If field is a special field, e.g. items is stored as _reserved_items,
-                        # an KeyError is thrown. So try to retrieve the field from _data
+                        # a KeyError is thrown. So try to retrieve the field from _data
                         setattr(self, field, self._reload(field, obj._data.get(field)))
                     except KeyError:
                         # If field is removed from the database while the object

From b070e7de0765f5d364474c832fb28d91e04a884e Mon Sep 17 00:00:00 2001
From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
Date: Fri, 29 Jun 2018 15:47:28 +0200
Subject: [PATCH 0653/1519] Fix travis's pypi release trigger

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 29a72d1c6..381f73854 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,11 +91,11 @@ deploy:
   distributions: "sdist bdist_wheel"
 
   # only deploy on tagged commits (aka GitHub releases) and only for the
-  # parent repo's builds running Python 2.7 along with PyMongo v3.0 (we run
+  # parent repo's builds running Python 2.7 along with PyMongo v3.x (we run
   # Travis against many different Python and PyMongo versions and we don't
   # want the deploy to occur multiple times).
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: "$PYMONGO = 3.0"
+    condition: "$PYMONGO = 3.x"
     python: 2.7

From fdba648afb4141a7dbd768435a3847c265713cbe Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 16 Jul 2018 09:19:50 +0800
Subject: [PATCH 0654/1519] fix pypi trigger

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index a1b7d6825..e6dc6b9d8 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 15, 0)
+VERSION = (0, 15, 3)
 
 
 def get_version():

From 1241a902e3a0d5b1fac919d77dc191fd47a4d966 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 16 Jul 2018 09:49:16 +0800
Subject: [PATCH 0655/1519] fix changelog

---
 docs/changelog.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d5ee2b23f..7eaed75ab 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,8 +2,8 @@
 Changelog
 =========
 
-dev
-===
+Changes in 0.15.3
+=================
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652
 -  use each modifier only with $position #1673 #1675
 -  Improve LazyReferenceField and GenericLazyReferenceField with nested fields #1704

From ae783d4f45bc65daeae9f2fbbf1364ac4161e0e6 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 16 Jul 2018 17:25:29 +0800
Subject: [PATCH 0656/1519] tweak tox.ini to pass tests

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 2f2b1757a..815d2acc4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,6 @@ commands =
 deps =
     nose
     mg35: PyMongo==3.5
-    mg3x: PyMongo>=3.0
+    mg3x: PyMongo>=3.0,<3.7
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 62eadbc17468b079b2da40ef151b190202e98b1d Mon Sep 17 00:00:00 2001
From: Gram <master_fess@mail.ru>
Date: Fri, 20 Jul 2018 17:21:57 +0300
Subject: [PATCH 0657/1519] +date field

---
 mongoengine/fields.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index a661874a5..d631e8827 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -525,6 +525,22 @@ def prepare_query_value(self, op, value):
         return super(DateTimeField, self).prepare_query_value(op, self.to_mongo(value))
 
 
+class DateField(DateTimeField):
+    def to_mongo(self, value):
+        value = super(DateField, self).to_mongo(value)
+        # drop hours, minutes, seconds
+        if isinstance(value, datetime.datetime):
+            value = datetime.datetime(value.year, value.month, value.day)
+        return value
+
+    def to_python(self, value):
+        value = super(DateField, self).to_python(value)
+        # convert datetime to date
+        if isinstance(value, datetime.datetime):
+            value = datetime.date(value.year, value.month, value.day)
+        return value
+
+
 class ComplexDateTimeField(StringField):
     """
     ComplexDateTimeField handles microseconds exactly instead of rounding

From 19a6e324c45a2bb4307802d7b40e3805084b567d Mon Sep 17 00:00:00 2001
From: Gram <master_fess@mail.ru>
Date: Fri, 20 Jul 2018 17:37:23 +0300
Subject: [PATCH 0658/1519] +tests for date field

---
 mongoengine/fields.py  |   2 +-
 tests/fields/fields.py | 145 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 144 insertions(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index d631e8827..f9622b316 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -43,7 +43,7 @@
 
 __all__ = (
     'StringField', 'URLField', 'EmailField', 'IntField', 'LongField',
-    'FloatField', 'DecimalField', 'BooleanField', 'DateTimeField',
+    'FloatField', 'DecimalField', 'BooleanField', 'DateTimeField', 'DateField',
     'ComplexDateTimeField', 'EmbeddedDocumentField', 'ObjectIdField',
     'GenericEmbeddedDocumentField', 'DynamicField', 'ListField',
     'SortedListField', 'EmbeddedDocumentListField', 'DictField',
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 0b9710c37..7352d2422 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -46,6 +46,17 @@ class MyDoc(Document):
         md = MyDoc(dt='')
         self.assertRaises(ValidationError, md.save)
 
+    def test_date_from_empty_string(self):
+        """
+        Ensure an exception is raised when trying to
+        cast an empty string to datetime.
+        """
+        class MyDoc(Document):
+            dt = DateField()
+
+        md = MyDoc(dt='')
+        self.assertRaises(ValidationError, md.save)
+
     def test_datetime_from_whitespace_string(self):
         """
         Ensure an exception is raised when trying to
@@ -57,6 +68,17 @@ class MyDoc(Document):
         md = MyDoc(dt='   ')
         self.assertRaises(ValidationError, md.save)
 
+    def test_date_from_whitespace_string(self):
+        """
+        Ensure an exception is raised when trying to
+        cast a whitespace-only string to datetime.
+        """
+        class MyDoc(Document):
+            dt = DateField()
+
+        md = MyDoc(dt='   ')
+        self.assertRaises(ValidationError, md.save)
+
     def test_default_values_nothing_set(self):
         """Ensure that default field values are used when creating
         a document.
@@ -66,13 +88,14 @@ class Person(Document):
             age = IntField(default=30, required=False)
             userid = StringField(default=lambda: 'test', required=True)
             created = DateTimeField(default=datetime.datetime.utcnow)
+            day = DateField(default=datetime.date.today)
 
         person = Person(name="Ross")
 
         # Confirm saving now would store values
         data_to_be_saved = sorted(person.to_mongo().keys())
         self.assertEqual(data_to_be_saved,
-            ['age', 'created', 'name', 'userid']
+            ['age', 'created', 'day', 'name', 'userid']
         )
 
         self.assertTrue(person.validate() is None)
@@ -81,16 +104,18 @@ class Person(Document):
         self.assertEqual(person.age, person.age)
         self.assertEqual(person.userid, person.userid)
         self.assertEqual(person.created, person.created)
+        self.assertEqual(person.day, person.day)
 
         self.assertEqual(person._data['name'], person.name)
         self.assertEqual(person._data['age'], person.age)
         self.assertEqual(person._data['userid'], person.userid)
         self.assertEqual(person._data['created'], person.created)
+        self.assertEqual(person._data['day'], person.day)
 
         # Confirm introspection changes nothing
         data_to_be_saved = sorted(person.to_mongo().keys())
         self.assertEqual(
-            data_to_be_saved, ['age', 'created', 'name', 'userid'])
+            data_to_be_saved, ['age', 'created', 'day', 'name', 'userid'])
 
     def test_default_values_set_to_None(self):
         """Ensure that default field values are used even when
@@ -662,6 +687,32 @@ class LogEntry(Document):
         log.time = 'ABC'
         self.assertRaises(ValidationError, log.validate)
 
+    def test_date_validation(self):
+        """Ensure that invalid values cannot be assigned to datetime
+        fields.
+        """
+        class LogEntry(Document):
+            time = DateField()
+
+        log = LogEntry()
+        log.time = datetime.datetime.now()
+        log.validate()
+
+        log.time = datetime.date.today()
+        log.validate()
+
+        log.time = datetime.datetime.now().isoformat(' ')
+        log.validate()
+
+        if dateutil:
+            log.time = datetime.datetime.now().isoformat('T')
+            log.validate()
+
+        log.time = -1
+        self.assertRaises(ValidationError, log.validate)
+        log.time = 'ABC'
+        self.assertRaises(ValidationError, log.validate)
+
     def test_datetime_tz_aware_mark_as_changed(self):
         from mongoengine import connection
 
@@ -733,6 +784,51 @@ class LogEntry(Document):
             self.assertNotEqual(log.date, d1)
             self.assertEqual(log.date, d2)
 
+    def test_date(self):
+        """Tests showing pymongo date fields
+
+        See: http://api.mongodb.org/python/current/api/bson/son.html#dt
+        """
+        class LogEntry(Document):
+            date = DateField()
+
+        LogEntry.drop_collection()
+
+        # Test can save dates
+        log = LogEntry()
+        log.date = datetime.date.today()
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, datetime.date.today())
+
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
+        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1)
+        log = LogEntry()
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1.date())
+        self.assertEqual(log.date, d2.date())
+
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
+        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9000)
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1.date())
+        self.assertEqual(log.date, d2.date())
+
+        if not six.PY3:
+            # Pre UTC dates microseconds below 1000 are dropped
+            # This does not seem to be true in PY3
+            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
+            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)
+            log.date = d1
+            log.save()
+            log.reload()
+            self.assertEqual(log.date, d1.date())
+            self.assertEqual(log.date, d2.date())
+
     def test_datetime_usage(self):
         """Tests for regular datetime fields"""
         class LogEntry(Document):
@@ -787,6 +883,51 @@ class LogEntry(Document):
         )
         self.assertEqual(logs.count(), 5)
 
+    def test_date_usage(self):
+        """Tests for regular datetime fields"""
+        class LogEntry(Document):
+            date = DateField()
+
+        LogEntry.drop_collection()
+
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1)
+        log = LogEntry()
+        log.date = d1
+        log.validate()
+        log.save()
+
+        for query in (d1, d1.isoformat(' ')):
+            log1 = LogEntry.objects.get(date=query)
+            self.assertEqual(log, log1)
+
+        if dateutil:
+            log1 = LogEntry.objects.get(date=d1.isoformat('T'))
+            self.assertEqual(log, log1)
+
+        # create additional 19 log entries for a total of 20
+        for i in range(1971, 1990):
+            d = datetime.datetime(i, 1, 1, 0, 0, 1)
+            LogEntry(date=d).save()
+
+        self.assertEqual(LogEntry.objects.count(), 20)
+
+        # Test ordering
+        logs = LogEntry.objects.order_by("date")
+        i = 0
+        while i < 19:
+            self.assertTrue(logs[i].date <= logs[i + 1].date)
+            i += 1
+
+        logs = LogEntry.objects.order_by("-date")
+        i = 0
+        while i < 19:
+            self.assertTrue(logs[i].date >= logs[i + 1].date)
+            i += 1
+
+        # Test searching
+        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
+        self.assertEqual(logs.count(), 10)
+
     def test_complexdatetime_storage(self):
         """Tests for complex datetime fields - which can handle
         microseconds without rounding.

From 6da27e59760d8498344ddb1628b7f5d3d5ca3d5f Mon Sep 17 00:00:00 2001
From: Gram <master_fess@mail.ru>
Date: Fri, 27 Jul 2018 12:31:27 +0300
Subject: [PATCH 0659/1519] +changelog

---
 docs/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7eaed75ab..9d9fa9762 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,6 +2,10 @@
 Changelog
 =========
 
+Changes in 0.15.4
+=================
+- Added `DateField` #513
+
 Changes in 0.15.3
 =================
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652

From 3d45cdc339a08717267b94c7cfe47cb99c2afec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 12 Jun 2018 20:59:12 +0200
Subject: [PATCH 0660/1519] Implemented lazy regex compiling in Field classes
 to improve 'import mongoengine' performance

---
 mongoengine/base/utils.py     | 22 ++++++++++++++++++++
 mongoengine/common.py         |  1 +
 mongoengine/fields.py         | 10 ++++-----
 mongoengine/python_support.py |  6 +-----
 tests/test_utils.py           | 38 +++++++++++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 10 deletions(-)
 create mode 100644 mongoengine/base/utils.py
 create mode 100644 tests/test_utils.py

diff --git a/mongoengine/base/utils.py b/mongoengine/base/utils.py
new file mode 100644
index 000000000..288c2f3e6
--- /dev/null
+++ b/mongoengine/base/utils.py
@@ -0,0 +1,22 @@
+import re
+
+
+class LazyRegexCompiler(object):
+    """Descriptor to allow lazy compilation of regex"""
+
+    def __init__(self, pattern, flags=0):
+        self._pattern = pattern
+        self._flags = flags
+        self._compiled_regex = None
+
+    @property
+    def compiled_regex(self):
+        if self._compiled_regex is None:
+            self._compiled_regex = re.compile(self._pattern, self._flags)
+        return self._compiled_regex
+
+    def __get__(self, obj, objtype):
+        return self.compiled_regex
+
+    def __set__(self, instance, value):
+        raise AttributeError("Can not set attribute LazyRegexCompiler")
diff --git a/mongoengine/common.py b/mongoengine/common.py
index bde7e78c4..2e64130fd 100644
--- a/mongoengine/common.py
+++ b/mongoengine/common.py
@@ -56,3 +56,4 @@ class from the :data:`mongoengine.common._class_registry_cache`.
         _class_registry_cache[cls] = getattr(module, cls)
 
     return _class_registry_cache.get(cls_name)
+
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f9622b316..28ab25c7f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -5,7 +5,6 @@
 import socket
 import time
 import uuid
-import warnings
 from operator import itemgetter
 
 from bson import Binary, DBRef, ObjectId, SON
@@ -28,6 +27,7 @@
 from mongoengine.base import (BaseDocument, BaseField, ComplexBaseField,
                               GeoJsonBaseField, LazyReference, ObjectIdField,
                               get_document)
+from mongoengine.base.utils import LazyRegexCompiler
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
@@ -123,7 +123,7 @@ class URLField(StringField):
     .. versionadded:: 0.3
     """
 
-    _URL_REGEX = re.compile(
+    _URL_REGEX = LazyRegexCompiler(
         r'^(?:[a-z0-9\.\-]*)://'  # scheme is validated separately
         r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}(?<!-)\.?)|'  # domain...
         r'localhost|'  # localhost...
@@ -157,7 +157,7 @@ class EmailField(StringField):
 
     .. versionadded:: 0.4
     """
-    USER_REGEX = re.compile(
+    USER_REGEX = LazyRegexCompiler(
         # `dot-atom` defined in RFC 5322 Section 3.2.3.
         r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*\Z"
         # `quoted-string` defined in RFC 5322 Section 3.2.4.
@@ -165,7 +165,7 @@ class EmailField(StringField):
         re.IGNORECASE
     )
 
-    UTF8_USER_REGEX = re.compile(
+    UTF8_USER_REGEX = LazyRegexCompiler(
         six.u(
             # RFC 6531 Section 3.3 extends `atext` (used by dot-atom) to
             # include `UTF8-non-ascii`.
@@ -175,7 +175,7 @@ class EmailField(StringField):
         ), re.IGNORECASE | re.UNICODE
     )
 
-    DOMAIN_REGEX = re.compile(
+    DOMAIN_REGEX = LazyRegexCompiler(
         r'((?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+)(?:[A-Z0-9-]{2,63}(?<!-))\Z',
         re.IGNORECASE
     )
diff --git a/mongoengine/python_support.py b/mongoengine/python_support.py
index e51e1bc98..e884b4ead 100644
--- a/mongoengine/python_support.py
+++ b/mongoengine/python_support.py
@@ -6,11 +6,7 @@
 import six
 
 
-if pymongo.version_tuple[0] < 3:
-    IS_PYMONGO_3 = False
-else:
-    IS_PYMONGO_3 = True
-
+IS_PYMONGO_3 = pymongo.version_tuple[0] >= 3
 
 # six.BytesIO resolves to StringIO.StringIO in Py2 and io.BytesIO in Py3.
 StringIO = six.BytesIO
diff --git a/tests/test_utils.py b/tests/test_utils.py
new file mode 100644
index 000000000..562cc1ff0
--- /dev/null
+++ b/tests/test_utils.py
@@ -0,0 +1,38 @@
+import unittest
+import re
+
+from mongoengine.base.utils import LazyRegexCompiler
+
+signal_output = []
+
+
+class LazyRegexCompilerTest(unittest.TestCase):
+
+    def test_lazy_regex_compiler_verify_laziness_of_descriptor(self):
+        class UserEmail(object):
+            EMAIL_REGEX = LazyRegexCompiler('@', flags=32)
+
+        descriptor = UserEmail.__dict__['EMAIL_REGEX']
+        self.assertIsNone(descriptor._compiled_regex)
+
+        regex = UserEmail.EMAIL_REGEX
+        self.assertEqual(regex, re.compile('@', flags=32))
+        self.assertEqual(regex.search('user@domain.com').group(), '@')
+
+        user_email = UserEmail()
+        self.assertIs(user_email.EMAIL_REGEX, UserEmail.EMAIL_REGEX)
+
+    def test_lazy_regex_compiler_verify_cannot_set_descriptor_on_instance(self):
+        class UserEmail(object):
+            EMAIL_REGEX = LazyRegexCompiler('@')
+
+        user_email = UserEmail()
+        with self.assertRaises(AttributeError):
+            user_email.EMAIL_REGEX = re.compile('@')
+
+    def test_lazy_regex_compiler_verify_can_override_class_attr(self):
+        class UserEmail(object):
+            EMAIL_REGEX = LazyRegexCompiler('@')
+
+        UserEmail.EMAIL_REGEX = re.compile('cookies')
+        self.assertEqual(UserEmail.EMAIL_REGEX.search('Cake & cookies').group(), 'cookies')

From 727866f090668881e425b8a90491be1f23563737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 5 Aug 2018 22:30:51 +0200
Subject: [PATCH 0661/1519] fix styling flake8 error from CI

---
 mongoengine/common.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mongoengine/common.py b/mongoengine/common.py
index 2e64130fd..bde7e78c4 100644
--- a/mongoengine/common.py
+++ b/mongoengine/common.py
@@ -56,4 +56,3 @@ class from the :data:`mongoengine.common._class_registry_cache`.
         _class_registry_cache[cls] = getattr(module, cls)
 
     return _class_registry_cache.get(cls_name)
-

From 820f7b4d9375d35bdadb1d6b49b0b0429faea3b5 Mon Sep 17 00:00:00 2001
From: JoschSan <santanaelectronica@hotmail.com>
Date: Tue, 7 Aug 2018 14:29:15 -0400
Subject: [PATCH 0662/1519] Update connecting.rst

My suggest is append the parameter in authentication_source in authentication example, because was included in https://github.com/MongoEngine/mongoengine/pull/590/files
---
 docs/guide/connecting.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index f40ed4c50..5dac6ae98 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -18,10 +18,10 @@ provide the :attr:`host` and :attr:`port` arguments to
 
     connect('project1', host='192.168.1.35', port=12345)
 
-If the database requires authentication, :attr:`username` and :attr:`password`
-arguments should be provided::
+If the database requires authentication, :attr:`username`, :attr:`password`
+and :attr:`authentication_source` arguments should be provided::
 
-    connect('project1', username='webapp', password='pwd123')
+    connect('project1', username='webapp', password='pwd123', authentication_source='admin')
 
 URI style connections are also supported -- just supply the URI as
 the :attr:`host` to

From 1a2b1f283bc4dac8cd853fc6207d63185be3c012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bast.gerard@gmail.com>
Date: Mon, 13 Aug 2018 21:21:33 +0200
Subject: [PATCH 0663/1519] Update signals doc - clarification on
 EmbeddedDocument

Since there is a .save() method on EmbeddedDocument, you could be tempted to attach a pre_save event to an EmbeddedDocument (#1720). This update is an attempt to make this clearer.
---
 docs/guide/signals.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/guide/signals.rst b/docs/guide/signals.rst
index eed382c45..06bccb3bd 100644
--- a/docs/guide/signals.rst
+++ b/docs/guide/signals.rst
@@ -113,6 +113,10 @@ handlers within your subclass::
     signals.pre_save.connect(Author.pre_save, sender=Author)
     signals.post_save.connect(Author.post_save, sender=Author)
 
+.. warning::
+
+    Note that EmbeddedDocument only supports pre/post_init signals. pre/post_save, etc should be attached to Document's class only. Attaching pre_save to an EmbeddedDocument is ignored silently.
+
 Finally, you can also use this small decorator to quickly create a number of
 signals and attach them to your :class:`~mongoengine.Document` or
 :class:`~mongoengine.EmbeddedDocument` subclasses as class decorators::

From 364813dd73f7deecaf197bbc5c25a1b63833f655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 13 Aug 2018 22:34:37 +0200
Subject: [PATCH 0664/1519] Clarify that you should use python 2 when
 developing on mongoengine #1837

---
 CONTRIBUTING.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 573d70605..f7b15c854 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -22,8 +22,11 @@ Supported Interpreters
 
 MongoEngine supports CPython 2.7 and newer. Language
 features not supported by all interpreters can not be used.
-Please also ensure that your code is properly converted by
-`2to3 <http://docs.python.org/library/2to3.html>`_ for Python 3 support.
+The codebase is written in python 2 so you must be using python 2
+when developing new features. Compatibility of the library with Python 3
+relies on the 2to3 package that gets executed as part of the installation
+build. You should ensure that your code is properly converted by
+`2to3 <http://docs.python.org/library/2to3.html>`_.
 
 Style Guide
 -----------

From c09bfca6342a60ee20f931c16731282969c378bc Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Wed, 15 Aug 2018 12:36:13 -0700
Subject: [PATCH 0665/1519] add __repr__ to Q and QCombination

---
 mongoengine/queryset/visitor.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index bcf93a13e..3ae053b82 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -131,6 +131,10 @@ def __init__(self, operation, children):
             else:
                 self.children.append(node)
 
+    def __repr__(self):
+        op = ' & ' if self.operation is self.AND else ' | '
+        return '(%s)' % op.join([repr(node) for node in self.children])
+
     def accept(self, visitor):
         for i in range(len(self.children)):
             if isinstance(self.children[i], QNode):
@@ -151,6 +155,9 @@ class Q(QNode):
     def __init__(self, **query):
         self.query = query
 
+    def __repr__(self):
+        return 'Q(**%s)' % repr(self.query)
+
     def accept(self, visitor):
         return visitor.visit_query(self)
 

From 1bcdcce93abdbf1c20410dcde395e20b6987cc2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 18 Aug 2018 00:03:17 +0200
Subject: [PATCH 0666/1519] remove dead code

---
 mongoengine/base/document.py | 4 +---
 mongoengine/document.py      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 4181bcd54..f03ce848e 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -100,13 +100,11 @@ def __init__(self, *args, **values):
             for key, value in values.iteritems():
                 if key in self._fields or key == '_id':
                     setattr(self, key, value)
-                elif self._dynamic:
+                else:
                     dynamic_data[key] = value
         else:
             FileField = _import_class('FileField')
             for key, value in values.iteritems():
-                if key == '__auto_convert':
-                    continue
                 key = self._reverse_db_field_map.get(key, key)
                 if key in self._fields or key in ('id', 'pk', '_cls'):
                     if __auto_convert and value is not None:
diff --git a/mongoengine/document.py b/mongoengine/document.py
index c8532e5b9..b9db8bc6b 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1000,7 +1000,7 @@ def compare_indexes(cls):
 class DynamicDocument(Document):
     """A Dynamic Document class allowing flexible, expandable and uncontrolled
     schemas.  As a :class:`~mongoengine.Document` subclass, acts in the same
-    way as an ordinary document but has expando style properties.  Any data
+    way as an ordinary document but has expanded style properties.  Any data
     passed or set against the :class:`~mongoengine.DynamicDocument` that is
     not a field is automatically converted into a
     :class:`~mongoengine.fields.DynamicField` and data can be attributed to that

From b71ff6fbb8f91c903d498ff0024f35ee47e128af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 18 Aug 2018 23:04:46 +0200
Subject: [PATCH 0667/1519] fix validator of BinaryField. In fact bson.Binary
 fails if we give it unicode in input #273

---
 mongoengine/fields.py  |  4 ++--
 tests/fields/fields.py | 35 ++++++++++++++++-------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f9622b316..75686e570 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1460,10 +1460,10 @@ def to_mongo(self, value):
         return Binary(value)
 
     def validate(self, value):
-        if not isinstance(value, (six.binary_type, six.text_type, Binary)):
+        if not isinstance(value, (six.binary_type, Binary)):
             self.error('BinaryField only accepts instances of '
                        '(%s, %s, Binary)' % (
-                           six.binary_type.__name__, six.text_type.__name__))
+                           six.binary_type.__name__, Binary.__name__))
 
         if self.max_bytes is not None and len(value) > self.max_bytes:
             self.error('Binary value is too long')
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7352d2422..96b77ee78 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2967,37 +2967,34 @@ class Attachment(Document):
         self.assertEqual(MIME_TYPE, attachment_1.content_type)
         self.assertEqual(BLOB, six.binary_type(attachment_1.blob))
 
-    def test_binary_validation(self):
-        """Ensure that invalid values cannot be assigned to binary fields.
+    def test_binary_validation_succeeds(self):
+        """Ensure that valid values can be assigned to binary fields.
         """
-        class Attachment(Document):
-            blob = BinaryField()
-
         class AttachmentRequired(Document):
             blob = BinaryField(required=True)
 
         class AttachmentSizeLimit(Document):
             blob = BinaryField(max_bytes=4)
 
-        Attachment.drop_collection()
-        AttachmentRequired.drop_collection()
-        AttachmentSizeLimit.drop_collection()
-
-        attachment = Attachment()
-        attachment.validate()
-        attachment.blob = 2
-        self.assertRaises(ValidationError, attachment.validate)
-
         attachment_required = AttachmentRequired()
         self.assertRaises(ValidationError, attachment_required.validate)
         attachment_required.blob = Binary(six.b('\xe6\x00\xc4\xff\x07'))
         attachment_required.validate()
 
-        attachment_size_limit = AttachmentSizeLimit(
-            blob=six.b('\xe6\x00\xc4\xff\x07'))
-        self.assertRaises(ValidationError, attachment_size_limit.validate)
-        attachment_size_limit.blob = six.b('\xe6\x00\xc4\xff')
-        attachment_size_limit.validate()
+        _5_BYTES = six.b('\xe6\x00\xc4\xff\x07')
+        _4_BYTES = six.b('\xe6\x00\xc4\xff')
+        self.assertRaises(ValidationError, AttachmentSizeLimit(blob=_5_BYTES).validate)
+        AttachmentSizeLimit(blob=_4_BYTES).validate()
+
+    def test_binary_validation_fails(self):
+        """Ensure that invalid values cannot be assigned to binary fields."""
+
+        class Attachment(Document):
+            blob = BinaryField()
+
+        for invalid_data in (2, u'Im_a_unicode', ['some_str']):
+            self.assertRaises(ValidationError, Attachment(blob=invalid_data).validate)
+
 
     def test_binary_field_primary(self):
         class Attachment(Document):

From 461b789515306d2e339310aef691367c52204c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bast.gerard@gmail.com>
Date: Sun, 19 Aug 2018 22:54:37 +0200
Subject: [PATCH 0668/1519] relates to (#710) - Update gridfs.rst to make it
 clearer that you should save the Document hosting the GridFSProxy after
 calling .delete() or .replace() on the GridFSProxy - updated
 GridFSProxy.__str__ so that it would always print both the filename and the
 grid_id. This should improve debugging

---
 docs/guide/gridfs.rst | 6 ++++--
 mongoengine/fields.py | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/guide/gridfs.rst b/docs/guide/gridfs.rst
index 68e7a6d28..f7380e89f 100644
--- a/docs/guide/gridfs.rst
+++ b/docs/guide/gridfs.rst
@@ -53,7 +53,8 @@ Deletion
 
 Deleting stored files is achieved with the :func:`delete` method::
 
-    marmot.photo.delete()
+    marmot.photo.delete()    # Deletes the GridFS document
+    marmot.save()            # Saves the GridFS reference (being None) contained in the marmot instance
 
 .. warning::
 
@@ -71,4 +72,5 @@ Files can be replaced with the :func:`replace` method. This works just like
 the :func:`put` method so even metadata can (and should) be replaced::
 
     another_marmot = open('another_marmot.png', 'rb')
-    marmot.photo.replace(another_marmot, content_type='image/png')
+    marmot.photo.replace(another_marmot, content_type='image/png')  # Replaces the GridFS document
+    marmot.save()                                                   # Replaces the GridFS reference contained in marmot instance
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f9622b316..9648bb0b9 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1528,9 +1528,9 @@ def __repr__(self):
         return '<%s: %s>' % (self.__class__.__name__, self.grid_id)
 
     def __str__(self):
-        name = getattr(
-            self.get(), 'filename', self.grid_id) if self.get() else '(no file)'
-        return '<%s: %s>' % (self.__class__.__name__, name)
+        gridout = self.get()
+        filename = getattr(gridout, 'filename') if gridout else '<no file>'
+        return '<%s: %s (%s)>' % (self.__class__.__name__, filename, self.grid_id)
 
     def __eq__(self, other):
         if isinstance(other, GridFSProxy):

From 48a85ee6e000d744490faf5128e069d4094a4cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 20 Aug 2018 00:10:27 +0200
Subject: [PATCH 0669/1519] update related tests

---
 tests/fields/file_tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 8364d5ef9..841e7c7d4 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -54,7 +54,7 @@ class PutFile(Document):
 
         result = PutFile.objects.first()
         self.assertTrue(putfile == result)
-        self.assertEqual("%s" % result.the_file, "<GridFSProxy: hello>")
+        self.assertEqual("%s" % result.the_file, "<GridFSProxy: hello (%s)>" % result.the_file.grid_id)
         self.assertEqual(result.the_file.read(), text)
         self.assertEqual(result.the_file.content_type, content_type)
         result.the_file.delete()  # Remove file from GridFS

From a7658c75735a5593a99e4b59895d09ecee30cb8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 21 Aug 2018 18:01:12 +0200
Subject: [PATCH 0670/1519] fix BaseList.__iter__ operator (#1305) + minor
 improvements

---
 AUTHORS                            |  1 +
 mongoengine/base/datastructures.py |  8 ++++----
 tests/test_datastructures.py       | 17 ++++++++++++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2e7b56fcb..b38825dca 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -246,3 +246,4 @@ that much better:
  * Renjianxin (https://github.com/Davidrjx)
  * Erdenezul Batmunkh (https://github.com/erdenezul)
  * Andy Yankovsky (https://github.com/werat)
+ * Bastien Gérard (https://github.com/bagerard)
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index fddd945a2..8948243e4 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -128,8 +128,8 @@ def __getitem__(self, key, *args, **kwargs):
         return value
 
     def __iter__(self):
-        for i in six.moves.range(self.__len__()):
-            yield self[i]
+        for v in super(BaseList, self).__iter__():
+            yield v
 
     def __setitem__(self, key, value, *args, **kwargs):
         if isinstance(key, slice):
@@ -138,7 +138,7 @@ def __setitem__(self, key, value, *args, **kwargs):
             self._mark_as_changed(key)
         return super(BaseList, self).__setitem__(key, value)
 
-    def __delitem__(self, key, *args, **kwargs):
+    def __delitem__(self, key):
         self._mark_as_changed()
         return super(BaseList, self).__delitem__(key)
 
@@ -187,7 +187,7 @@ def remove(self, *args, **kwargs):
         self._mark_as_changed()
         return super(BaseList, self).remove(*args, **kwargs)
 
-    def reverse(self, *args, **kwargs):
+    def reverse(self):
         self._mark_as_changed()
         return super(BaseList, self).reverse()
 
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 79381c5ac..1ea562a52 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,6 +1,21 @@
 import unittest
 
-from mongoengine.base.datastructures import StrictDict
+from mongoengine.base.datastructures import StrictDict, BaseList
+
+
+class TestBaseList(unittest.TestCase):
+
+    def test_iter_simple(self):
+        values = [True, False, True, False]
+        base_list = BaseList(values, instance=None, name='my_name')
+        self.assertEqual(values, list(base_list))
+
+    def test_iter_allow_modification_while_iterating_withou_error(self):
+        # regular list allows for this, thus this subclass must comply to that
+        base_list = BaseList([True, False, True, False], instance=None, name='my_name')
+        for idx, val in enumerate(base_list):
+            if val:
+                base_list.pop(idx)
 
 
 class TestStrictDict(unittest.TestCase):

From d72daf5f39c2234207181362e5d3befd43106cc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 26 Aug 2018 19:52:17 +0200
Subject: [PATCH 0671/1519] Fix BaseList bug with marked_as_changed getting
 called on error + Fix BaseDict as well since it suffers from the same problem

---
 mongoengine/base/datastructures.py | 169 +++++++--------
 tests/test_datastructures.py       | 329 ++++++++++++++++++++++++++++-
 2 files changed, 399 insertions(+), 99 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 8948243e4..6340dcdd9 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,4 +1,3 @@
-import itertools
 import weakref
 
 from bson import DBRef
@@ -7,7 +6,25 @@
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
 
-__all__ = ('BaseDict', 'BaseList', 'EmbeddedDocumentList', 'LazyReference')
+__all__ = ('BaseDict', 'StrictDict', 'BaseList', 'EmbeddedDocumentList', 'LazyReference')
+
+
+def mark_as_changed_wrapper(parent_method):
+    """Decorators that ensures _mark_as_changed method gets called"""
+    def wrapper(self, *args, **kwargs):
+        result = parent_method(self, *args, **kwargs)   # Can't use super() in the decorator
+        self._mark_as_changed()
+        return result
+    return wrapper
+
+
+def mark_key_as_changed_wrapper(parent_method):
+    """Decorators that ensures _mark_as_changed method gets called with the key argument"""
+    def wrapper(self, key, *args, **kwargs):
+        result = parent_method(self, key, *args, **kwargs)   # Can't use super() in the decorator
+        self._mark_as_changed(key)
+        return result
+    return wrapper
 
 
 class BaseDict(dict):
@@ -42,22 +59,6 @@ def __getitem__(self, key, *args, **kwargs):
             value._instance = self._instance
         return value
 
-    def __setitem__(self, key, value, *args, **kwargs):
-        self._mark_as_changed(key)
-        return super(BaseDict, self).__setitem__(key, value)
-
-    def __delete__(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseDict, self).__delete__(*args, **kwargs)
-
-    def __delitem__(self, key, *args, **kwargs):
-        self._mark_as_changed(key)
-        return super(BaseDict, self).__delitem__(key)
-
-    def __delattr__(self, key, *args, **kwargs):
-        self._mark_as_changed(key)
-        return super(BaseDict, self).__delattr__(key)
-
     def __getstate__(self):
         self.instance = None
         self._dereferenced = False
@@ -67,25 +68,14 @@ def __setstate__(self, state):
         self = state
         return self
 
-    def clear(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseDict, self).clear()
-
-    def pop(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseDict, self).pop(*args, **kwargs)
-
-    def popitem(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseDict, self).popitem()
-
-    def setdefault(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseDict, self).setdefault(*args, **kwargs)
-
-    def update(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseDict, self).update(*args, **kwargs)
+    __setitem__ = mark_key_as_changed_wrapper(dict.__setitem__)
+    __delattr__ = mark_key_as_changed_wrapper(dict.__delattr__)
+    __delitem__ = mark_key_as_changed_wrapper(dict.__delitem__)
+    pop = mark_as_changed_wrapper(dict.pop)
+    clear = mark_as_changed_wrapper(dict.clear)
+    update = mark_as_changed_wrapper(dict.update)
+    popitem = mark_as_changed_wrapper(dict.popitem)
+    setdefault = mark_as_changed_wrapper(dict.setdefault)
 
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, '_mark_as_changed'):
@@ -111,17 +101,24 @@ def __init__(self, list_items, instance, name):
         self._name = name
         super(BaseList, self).__init__(list_items)
 
-    def __getitem__(self, key, *args, **kwargs):
+    def __getitem__(self, key):
         value = super(BaseList, self).__getitem__(key)
 
+        if isinstance(key, slice):
+            # When receiving a slice operator, we don't convert the structure and bind
+            # to parent's instance. This is buggy for now but would require more work to be handled properly
+            return value
+
         EmbeddedDocument = _import_class('EmbeddedDocument')
         if isinstance(value, EmbeddedDocument) and value._instance is None:
             value._instance = self._instance
         elif not isinstance(value, BaseDict) and isinstance(value, dict):
+            # Replace dict by BaseDict
             value = BaseDict(value, None, '%s.%s' % (self._name, key))
             super(BaseList, self).__setitem__(key, value)
             value._instance = self._instance
         elif not isinstance(value, BaseList) and isinstance(value, list):
+            # Replace list by BaseList
             value = BaseList(value, None, '%s.%s' % (self._name, key))
             super(BaseList, self).__setitem__(key, value)
             value._instance = self._instance
@@ -131,25 +128,6 @@ def __iter__(self):
         for v in super(BaseList, self).__iter__():
             yield v
 
-    def __setitem__(self, key, value, *args, **kwargs):
-        if isinstance(key, slice):
-            self._mark_as_changed()
-        else:
-            self._mark_as_changed(key)
-        return super(BaseList, self).__setitem__(key, value)
-
-    def __delitem__(self, key):
-        self._mark_as_changed()
-        return super(BaseList, self).__delitem__(key)
-
-    def __setslice__(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseList, self).__setslice__(*args, **kwargs)
-
-    def __delslice__(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseList, self).__delslice__(*args, **kwargs)
-
     def __getstate__(self):
         self.instance = None
         self._dereferenced = False
@@ -159,41 +137,40 @@ def __setstate__(self, state):
         self = state
         return self
 
-    def __iadd__(self, other):
-        self._mark_as_changed()
-        return super(BaseList, self).__iadd__(other)
-
-    def __imul__(self, other):
-        self._mark_as_changed()
-        return super(BaseList, self).__imul__(other)
-
-    def append(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseList, self).append(*args, **kwargs)
-
-    def extend(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseList, self).extend(*args, **kwargs)
-
-    def insert(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseList, self).insert(*args, **kwargs)
-
-    def pop(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseList, self).pop(*args, **kwargs)
-
-    def remove(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseList, self).remove(*args, **kwargs)
-
-    def reverse(self):
-        self._mark_as_changed()
-        return super(BaseList, self).reverse()
-
-    def sort(self, *args, **kwargs):
-        self._mark_as_changed()
-        return super(BaseList, self).sort(*args, **kwargs)
+    def __setitem__(self, key, value):
+        changed_key = key
+        if isinstance(key, slice):
+            # In case of slice, we don't bother to identify the exact elements being updated
+            # instead, we simply marks the whole list as changed
+            changed_key = None
+
+        result = super(BaseList, self).__setitem__(key, value)
+        self._mark_as_changed(changed_key)
+        return result
+
+    append = mark_as_changed_wrapper(list.append)
+    extend = mark_as_changed_wrapper(list.extend)
+    insert = mark_as_changed_wrapper(list.insert)
+    pop = mark_as_changed_wrapper(list.pop)
+    remove = mark_as_changed_wrapper(list.remove)
+    reverse = mark_as_changed_wrapper(list.reverse)
+    sort = mark_as_changed_wrapper(list.sort)
+    __delitem__ = mark_as_changed_wrapper(list.__delitem__)
+    __iadd__ = mark_as_changed_wrapper(list.__iadd__)
+    __imul__ = mark_as_changed_wrapper(list.__imul__)
+
+    if six.PY2:
+        # Under py3 __setslice__, __delslice__ and __getslice__
+        # are replaced by __setitem__, __delitem__ and __getitem__ with a slice as parameter
+        # so we mimic this under python 2
+        def __setslice__(self, i, j, sequence):
+            return self.__setitem__(slice(i, j), sequence)
+
+        def __delslice__(self, i, j):
+            return self.__delitem__(slice(i, j))
+
+        def __getslice__(self, i, j):
+            return self.__getitem__(slice(i, j))
 
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, '_mark_as_changed'):
@@ -207,6 +184,10 @@ def _mark_as_changed(self, key=None):
 
 class EmbeddedDocumentList(BaseList):
 
+    def __init__(self, list_items, instance, name):
+        super(EmbeddedDocumentList, self).__init__(list_items, instance, name)
+        self._instance = instance
+
     @classmethod
     def __match_all(cls, embedded_doc, kwargs):
         """Return True if a given embedded doc matches all the filter
@@ -225,10 +206,6 @@ def __only_matches(cls, embedded_docs, kwargs):
             return embedded_docs
         return [doc for doc in embedded_docs if cls.__match_all(doc, kwargs)]
 
-    def __init__(self, list_items, instance, name):
-        super(EmbeddedDocumentList, self).__init__(list_items, instance, name)
-        self._instance = instance
-
     def filter(self, **kwargs):
         """
         Filters the list by only including embedded documents with the
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 1ea562a52..f2ec098e0 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,22 +1,345 @@
 import unittest
 
-from mongoengine.base.datastructures import StrictDict, BaseList
+from mongoengine import Document
+from mongoengine.base.datastructures import StrictDict, BaseList, BaseDict
+
+
+class DocumentStub(object):
+    def __init__(self):
+        self._changed_fields = []
+
+    def _mark_as_changed(self, key):
+        self._changed_fields.append(key)
+
+
+class TestBaseDict(unittest.TestCase):
+
+    @staticmethod
+    def _get_basedict(dict_items):
+        """Get a BaseList bound to a fake document instance"""
+        fake_doc = DocumentStub()
+        base_list = BaseDict(dict_items, instance=None, name='my_name')
+        base_list._instance = fake_doc  # hack to inject the mock, it does not work in the constructor
+        return base_list
+
+    def test___init___(self):
+        class MyDoc(Document):
+            pass
+
+        dict_items = {'k': 'v'}
+        doc = MyDoc()
+        base_dict = BaseDict(dict_items, instance=doc, name='my_name')
+        self.assertIsInstance(base_dict._instance, Document)
+        self.assertEqual(base_dict._name, 'my_name')
+        self.assertEqual(base_dict, dict_items)
+
+    def test_setdefault_calls_mark_as_changed(self):
+        base_dict = self._get_basedict({})
+        base_dict.setdefault('k', 'v')
+        self.assertEqual(base_dict._instance._changed_fields, [base_dict._name])
+
+    def test_popitems_calls_mark_as_changed(self):
+        base_dict = self._get_basedict({'k': 'v'})
+        self.assertEqual(base_dict.popitem(), ('k', 'v'))
+        self.assertEqual(base_dict._instance._changed_fields, [base_dict._name])
+        self.assertFalse(base_dict)
+
+    def test_pop_calls_mark_as_changed(self):
+        base_dict = self._get_basedict({'k': 'v'})
+        self.assertEqual(base_dict.pop('k'), 'v')
+        self.assertEqual(base_dict._instance._changed_fields, [base_dict._name])
+        self.assertFalse(base_dict)
+
+    def test_pop_calls_does_not_mark_as_changed_when_it_fails(self):
+        base_dict = self._get_basedict({'k': 'v'})
+        with self.assertRaises(KeyError):
+            base_dict.pop('X')
+        self.assertFalse(base_dict._instance._changed_fields)
+
+    def test_clear_calls_mark_as_changed(self):
+        base_dict = self._get_basedict({'k': 'v'})
+        base_dict.clear()
+        self.assertEqual(base_dict._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_dict, {})
+
+    def test___delitem___calls_mark_as_changed(self):
+        base_dict = self._get_basedict({'k': 'v'})
+        del base_dict['k']
+        self.assertEqual(base_dict._instance._changed_fields, ['my_name.k'])
+        self.assertEqual(base_dict, {})
+
+    def test___getitem____simple_value(self):
+        base_dict = self._get_basedict({'k': 'v'})
+        base_dict['k'] = 'v'
+
+    def test___getitem____sublist_gets_converted_to_BaseList(self):
+        base_dict = self._get_basedict({'k': [0, 1, 2]})
+        sub_list = base_dict['k']
+        self.assertEqual(sub_list, [0, 1, 2])
+        self.assertIsInstance(sub_list, BaseList)
+        self.assertIs(sub_list._instance, base_dict._instance)
+        self.assertEqual(sub_list._name, 'my_name.k')
+        self.assertEqual(base_dict._instance._changed_fields, [])
+
+        # Challenge mark_as_changed from sublist
+        sub_list[1] = None
+        self.assertEqual(base_dict._instance._changed_fields, ['my_name.k.1'])
+
+    def test___getitem____subdict_gets_converted_to_BaseDict(self):
+        base_dict = self._get_basedict({'k': {'subk': 'subv'}})
+        sub_dict = base_dict['k']
+        self.assertEqual(sub_dict, {'subk': 'subv'})
+        self.assertIsInstance(sub_dict, BaseDict)
+        self.assertIs(sub_dict._instance, base_dict._instance)
+        self.assertEqual(sub_dict._name, 'my_name.k')
+        self.assertEqual(base_dict._instance._changed_fields, [])
+
+        # Challenge mark_as_changed from subdict
+        sub_dict['subk'] = None
+        self.assertEqual(base_dict._instance._changed_fields, ['my_name.k.subk'])
+
+    def test___setitem___calls_mark_as_changed(self):
+        base_dict = self._get_basedict({})
+        base_dict['k'] = 'v'
+        self.assertEqual(base_dict._instance._changed_fields, ['my_name.k'])
+        self.assertEqual(base_dict, {'k': 'v'})
+
+    def test_update_calls_mark_as_changed(self):
+        base_dict = self._get_basedict({})
+        base_dict.update({'k': 'v'})
+        self.assertEqual(base_dict._instance._changed_fields, ['my_name'])
+
+    def test___setattr____not_tracked_by_changes(self):
+        base_dict = self._get_basedict({})
+        base_dict.a_new_attr = 'test'
+        self.assertEqual(base_dict._instance._changed_fields, [])
+
+    def test___delattr____tracked_by_changes(self):
+        # This is probably a bug as __setattr__ is not tracked
+        # This is even bad because it could be that there is an attribute
+        # with the same name as a key
+        base_dict = self._get_basedict({})
+        base_dict.a_new_attr = 'test'
+        del base_dict.a_new_attr
+        self.assertEqual(base_dict._instance._changed_fields, ['my_name.a_new_attr'])
 
 
 class TestBaseList(unittest.TestCase):
 
-    def test_iter_simple(self):
+    @staticmethod
+    def _get_baselist(list_items):
+        """Get a BaseList bound to a fake document instance"""
+        fake_doc = DocumentStub()
+        base_list = BaseList(list_items, instance=None, name='my_name')
+        base_list._instance = fake_doc  # hack to inject the mock, it does not work in the constructor
+        return base_list
+
+    def test___init___(self):
+        class MyDoc(Document):
+            pass
+
+        list_items = [True]
+        doc = MyDoc()
+        base_list = BaseList(list_items, instance=doc, name='my_name')
+        self.assertIsInstance(base_list._instance, Document)
+        self.assertEqual(base_list._name, 'my_name')
+        self.assertEqual(base_list, list_items)
+
+    def test___iter__(self):
         values = [True, False, True, False]
         base_list = BaseList(values, instance=None, name='my_name')
         self.assertEqual(values, list(base_list))
 
-    def test_iter_allow_modification_while_iterating_withou_error(self):
+    def test___iter___allow_modification_while_iterating_withou_error(self):
         # regular list allows for this, thus this subclass must comply to that
         base_list = BaseList([True, False, True, False], instance=None, name='my_name')
         for idx, val in enumerate(base_list):
             if val:
                 base_list.pop(idx)
 
+    def test_append_calls_mark_as_changed(self):
+        base_list = self._get_baselist([])
+        self.assertFalse(base_list._instance._changed_fields)
+        base_list.append(True)
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test_subclass_append(self):
+        # Due to the way mark_as_changed_wrapper is implemented
+        # it is good to test subclasses
+        class SubBaseList(BaseList):
+            pass
+
+        base_list = SubBaseList([], instance=None, name='my_name')
+        base_list.append(True)
+
+    def test___getitem__using_simple_index(self):
+        base_list = self._get_baselist([0, 1, 2])
+        self.assertEqual(base_list[0], 0)
+        self.assertEqual(base_list[1], 1)
+        self.assertEqual(base_list[-1], 2)
+
+    def test___getitem__using_slice(self):
+        base_list = self._get_baselist([0, 1, 2])
+        self.assertEqual(base_list[1:3], [1,2])
+        self.assertEqual(base_list[0:3:2], [0, 2])
+
+    def test___getitem___using_slice_returns_list(self):
+        # Bug: using slice does not properly handles the instance
+        # and mark_as_changed behaviour.
+        base_list = self._get_baselist([0, 1, 2])
+        sliced = base_list[1:3]
+        self.assertEqual(sliced, [1, 2])
+        self.assertIsInstance(sliced, list)
+        self.assertEqual(base_list._instance._changed_fields, [])
+
+    def test___getitem__sublist_returns_BaseList_bound_to_instance(self):
+        base_list = self._get_baselist(
+            [
+                [1,2],
+                [3, 4]
+            ]
+        )
+        sub_list = base_list[0]
+        self.assertEqual(sub_list, [1, 2])
+        self.assertIsInstance(sub_list, BaseList)
+        self.assertIs(sub_list._instance, base_list._instance)
+        self.assertEqual(sub_list._name, 'my_name.0')
+        self.assertEqual(base_list._instance._changed_fields, [])
+
+        # Challenge mark_as_changed from sublist
+        sub_list[1] = None
+        self.assertEqual(base_list._instance._changed_fields, ['my_name.0.1'])
+
+    def test___getitem__subdict_returns_BaseList_bound_to_instance(self):
+        base_list = self._get_baselist(
+            [
+                {'subk': 'subv'}
+            ]
+        )
+        sub_dict = base_list[0]
+        self.assertEqual(sub_dict, {'subk': 'subv'})
+        self.assertIsInstance(sub_dict, BaseDict)
+        self.assertIs(sub_dict._instance, base_list._instance)
+        self.assertEqual(sub_dict._name, 'my_name.0')
+        self.assertEqual(base_list._instance._changed_fields, [])
+
+        # Challenge mark_as_changed from subdict
+        sub_dict['subk'] = None
+        self.assertEqual(base_list._instance._changed_fields, ['my_name.0.subk'])
+
+    def test_extend_calls_mark_as_changed(self):
+        base_list = self._get_baselist([])
+        base_list.extend([True])
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test_insert_calls_mark_as_changed(self):
+        base_list = self._get_baselist([])
+        base_list.insert(0, True)
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test_remove_calls_mark_as_changed(self):
+        base_list = self._get_baselist([True])
+        base_list.remove(True)
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test_remove_not_mark_as_changed_when_it_fails(self):
+        base_list = self._get_baselist([True])
+        try:
+            base_list.remove(False)
+        except ValueError:
+            self.assertFalse(base_list._instance._changed_fields)
+
+    def test_pop_calls_mark_as_changed(self):
+        base_list = self._get_baselist([True])
+        base_list.pop()
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test_reverse_calls_mark_as_changed(self):
+        base_list = self._get_baselist([True, False])
+        base_list.reverse()
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test___delitem___calls_mark_as_changed(self):
+        base_list = self._get_baselist([True])
+        del base_list[0]
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test___setitem___calls_with_full_slice_mark_as_changed(self):
+        base_list = self._get_baselist([])
+        base_list[:] = [0, 1]      # Will use __setslice__ under py2 and __setitem__ under py3
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list, [0, 1])
+
+    def test___setitem___calls_with_partial_slice_mark_as_changed(self):
+        base_list = self._get_baselist([0, 1, 2])
+        base_list[0:2] = [1, 0]     # Will use __setslice__ under py2 and __setitem__ under py3
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list, [1, 0, 2])
+
+    def test___setitem___calls_with_step_slice_mark_as_changed(self):
+        base_list = self._get_baselist([0, 1, 2])
+        base_list[0:3:2] = [-1, -2]   # uses __setitem__ in both py2 & 3
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list, [-1, 1, -2])
+
+    def test___setitem___with_slice(self):
+        base_list = self._get_baselist([0,1,2,3,4,5])
+        base_list[0:6:2] = [None, None, None]
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list, [None,1,None,3,None,5])
+
+    def test___setitem___item_0_calls_mark_as_changed(self):
+        base_list = self._get_baselist([True])
+        base_list[0] = False
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list, [False])
+
+    def test___setitem___item_1_calls_mark_as_changed(self):
+        base_list = self._get_baselist([True, True])
+        base_list[1] = False
+        self.assertEqual(base_list._instance._changed_fields, ['my_name.1'])
+        self.assertEqual(base_list, [True, False])
+
+    def test___delslice___calls_mark_as_changed(self):
+        base_list = self._get_baselist([0, 1])
+        del base_list[0:1]
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list, [1])
+
+    def test___iadd___calls_mark_as_changed(self):
+        base_list = self._get_baselist([True])
+        base_list += [False]
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test___iadd___not_mark_as_changed_when_it_fails(self):
+        base_list = self._get_baselist([True])
+        try:
+            base_list += None
+        except TypeError:
+            self.assertFalse(base_list._instance._changed_fields)
+
+    def test___imul___calls_mark_as_changed(self):
+        base_list = self._get_baselist([True])
+        base_list *= 2
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test___imul___not_mark_as_changed_when_it_fails(self):
+        base_list = self._get_baselist([True])
+        try:
+            base_list *= None
+        except TypeError:
+            self.assertFalse(base_list._instance._changed_fields)
+
+    def test_sort_calls_mark_as_changed(self):
+        base_list = self._get_baselist([True, False])
+        base_list.sort()
+        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+
+    def test_sort_calls_with_key(self):
+        base_list = self._get_baselist([1, 2, 11])
+        base_list.sort(key=lambda i: str(i))
+        self.assertEqual(base_list, [1, 11, 2])
+
 
 class TestStrictDict(unittest.TestCase):
     def strict_dict_class(self, *args, **kwargs):

From b3b4d992fefaf3ae3e61465818c1dc3e6bdd9256 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Mon, 27 Aug 2018 19:24:24 -0700
Subject: [PATCH 0672/1519] add Q repr tests

---
 tests/queryset/visitor.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/queryset/visitor.py b/tests/queryset/visitor.py
index 6f020e881..6186e726c 100644
--- a/tests/queryset/visitor.py
+++ b/tests/queryset/visitor.py
@@ -296,6 +296,18 @@ def test_q_regex(self):
         obj = self.Person.objects(Q(name__not=re.compile('^Gui'))).first()
         self.assertEqual(obj, None)
 
+    def test_q_repr(self):
+        self.assertEqual(repr(Q()), 'Q(**{})')
+        self.assertEqual(repr(Q(name='test')), "Q(**{'name': 'test'})")
+
+        self.assertEqual(
+            repr(Q(name='test') & Q(age__gte=18)),
+            "(Q(**{'name': 'test'}) & Q(**{'age__gte': 18}))")
+
+        self.assertEqual(
+            repr(Q(name='test') | Q(age__gte=18)),
+            "(Q(**{'name': 'test'}) | Q(**{'age__gte': 18}))")
+
     def test_q_lists(self):
         """Ensure that Q objects query ListFields correctly.
         """

From 86548fc7bfcd73d75f5cf6fbc8cba690294d8253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 28 Aug 2018 22:42:51 +0200
Subject: [PATCH 0673/1519] Document the  attribute of .from_json

---
 mongoengine/base/document.py | 10 +++-
 tests/document/instance.py   | 92 ++++++++++++++++++++++++++++--------
 tests/queryset/queryset.py   |  1 -
 3 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index f03ce848e..85906a3e4 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -404,7 +404,15 @@ def to_json(self, *args, **kwargs):
 
     @classmethod
     def from_json(cls, json_data, created=False):
-        """Converts json data to an unsaved document instance"""
+        """Converts json data to a Document instance
+
+        :param json_data: The json data to load into the Document
+        :param created: If True, the document will be considered as a brand new document
+                        If False and an id is provided, it will consider that the data being
+                        loaded corresponds to what's already in the database (This has an impact of subsequent call to .save())
+                        If False and no id is provided, it will consider the data as a new document
+                        (default ``False``)
+        """
         return cls._from_son(json_util.loads(json_data), created=created)
 
     def __expand_dynamic_values(self, name, value):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index b255e8a68..ca0a5ad03 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -550,21 +550,14 @@ class Foo(Document):
             pass
 
         f = Foo()
-        try:
+        with self.assertRaises(Foo.DoesNotExist):
             f.reload()
-        except Foo.DoesNotExist:
-            pass
-        except Exception:
-            self.assertFalse("Threw wrong exception")
 
         f.save()
         f.delete()
-        try:
+
+        with self.assertRaises(Foo.DoesNotExist):
             f.reload()
-        except Foo.DoesNotExist:
-            pass
-        except Exception:
-            self.assertFalse("Threw wrong exception")
 
     def test_reload_of_non_strict_with_special_field_name(self):
         """Ensures reloading works for documents with meta strict == False."""
@@ -734,12 +727,12 @@ def clean(self):
 
         t = TestDocument(status="draft", pub_date=datetime.now())
 
-        try:
+        with self.assertRaises(ValidationError) as cm:
             t.save()
-        except ValidationError as e:
-            expect_msg = "Draft entries may not have a publication date."
-            self.assertTrue(expect_msg in e.message)
-            self.assertEqual(e.to_dict(), {'__all__': expect_msg})
+
+        expected_msg = "Draft entries may not have a publication date."
+        self.assertIn(expected_msg, cm.exception.message)
+        self.assertEqual(cm.exception.to_dict(), {'__all__': expected_msg})
 
         t = TestDocument(status="published")
         t.save(clean=False)
@@ -773,12 +766,13 @@ class TestDocument(Document):
         TestDocument.drop_collection()
 
         t = TestDocument(doc=TestEmbeddedDocument(x=10, y=25, z=15))
-        try:
+
+        with self.assertRaises(ValidationError) as cm:
             t.save()
-        except ValidationError as e:
-            expect_msg = "Value of z != x + y"
-            self.assertTrue(expect_msg in e.message)
-            self.assertEqual(e.to_dict(), {'doc': {'__all__': expect_msg}})
+
+        expected_msg = "Value of z != x + y"
+        self.assertIn(expected_msg, cm.exception.message)
+        self.assertEqual(cm.exception.to_dict(), {'doc': {'__all__': expected_msg}})
 
         t = TestDocument(doc=TestEmbeddedDocument(x=10, y=25)).save()
         self.assertEqual(t.doc.z, 35)
@@ -3148,6 +3142,64 @@ class MyPerson(self.Person):
         self.assertEquals(p.id, None)
         p.id = "12345"  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
 
+    def test_from_son_created_False_without_id(self):
+        class MyPerson(Document):
+            name = StringField()
+
+        MyPerson.objects.delete()
+
+        p = MyPerson.from_json('{"name": "a_fancy_name"}', created=False)
+        self.assertFalse(p._created)
+        self.assertIsNone(p.id)
+        p.save()
+        self.assertIsNotNone(p.id)
+        saved_p = MyPerson.objects.get(id=p.id)
+        self.assertEqual(saved_p.name, 'a_fancy_name')
+
+    def test_from_son_created_False_with_id(self):
+        # 1854
+        class MyPerson(Document):
+            name = StringField()
+
+        MyPerson.objects.delete()
+
+        p = MyPerson.from_json('{"_id": "5b85a8b04ec5dc2da388296e", "name": "a_fancy_name"}', created=False)
+        self.assertFalse(p._created)
+        self.assertEqual(p._changed_fields, [])
+        self.assertEqual(p.name, 'a_fancy_name')
+        self.assertEqual(p.id, ObjectId('5b85a8b04ec5dc2da388296e'))
+        p.save()
+
+        with self.assertRaises(DoesNotExist):
+            # Since created=False and we gave an id in the json and _changed_fields is empty
+            # mongoengine assumes that the document exits with that structure already
+            # and calling .save() didn't save anything
+            MyPerson.objects.get(id=p.id)
+
+        self.assertFalse(p._created)
+        p.name = 'a new fancy name'
+        self.assertEqual(p._changed_fields, ['name'])
+        p.save()
+        saved_p = MyPerson.objects.get(id=p.id)
+        self.assertEqual(saved_p.name, p.name)
+
+    def test_from_son_created_True_with_an_id(self):
+        class MyPerson(Document):
+            name = StringField()
+
+        MyPerson.objects.delete()
+
+        p = MyPerson.from_json('{"_id": "5b85a8b04ec5dc2da388296e", "name": "a_fancy_name"}', created=True)
+        self.assertTrue(p._created)
+        self.assertEqual(p._changed_fields, [])
+        self.assertEqual(p.name, 'a_fancy_name')
+        self.assertEqual(p.id, ObjectId('5b85a8b04ec5dc2da388296e'))
+        p.save()
+
+        saved_p = MyPerson.objects.get(id=p.id)
+        self.assertEqual(saved_p, p)
+        self.assertEqual(p.name, 'a_fancy_name')
+
     def test_null_field(self):
         # 734
         class User(Document):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 497a0d231..a405e8926 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4457,7 +4457,6 @@ class Bar(Document):
             self.assertNotEqual(bars._CommandCursor__collection.read_preference,
                              ReadPreference.SECONDARY_PREFERRED)
 
-
     def test_json_simple(self):
 
         class Embedded(EmbeddedDocument):

From 576f23d5fb371315e2b54b6798915d8a103c3e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 28 Aug 2018 22:58:13 +0200
Subject: [PATCH 0674/1519] Fix .delete doc of **write_concern as suggested by
 #1779

---
 mongoengine/document.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index b9db8bc6b..25af273d5 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -585,9 +585,8 @@ def delete(self, signal_kwargs=None, **write_concern):
         :param signal_kwargs: (optional) kwargs dictionary to be passed to
             the signal calls.
         :param write_concern: Extra keyword arguments are passed down which
-            will be used as options for the resultant
-            ``getLastError`` command.  For example,
-            ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
+            will be used as options for the resultant ``getLastError`` command.
+            For example, ``save(..., w: 2, fsync: True)`` will
             wait until at least two servers have recorded the write and
             will force an fsync on the primary server.
 

From b4860de34dd922936b290d98c95e575c12c713d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 29 Aug 2018 23:04:18 +0200
Subject: [PATCH 0675/1519] Fix index creation error that was swallowed by
 hasattr under python2 (#1688)

---
 mongoengine/dereference.py |  7 ++++++-
 tests/document/instance.py | 25 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 18b365ccd..40bc72b21 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -133,7 +133,12 @@ def _fetch_objects(self, doc_type=None):
         """
         object_map = {}
         for collection, dbrefs in self.reference_map.iteritems():
-            if hasattr(collection, 'objects'):  # We have a document class for the refs
+
+            # we use getattr instead of hasattr because as hasattr swallows any exception under python2
+            # so it could hide nasty things without raising exceptions (cfr bug #1688))
+            ref_document_cls_exists = (getattr(collection, 'objects', None) is not None)
+
+            if ref_document_cls_exists:
                 col_name = collection._get_collection_name()
                 refs = [dbref for dbref in dbrefs
                         if (col_name, dbref) not in object_map]
diff --git a/tests/document/instance.py b/tests/document/instance.py
index b255e8a68..c933eaf4c 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -8,9 +8,12 @@
 
 from datetime import datetime
 from bson import DBRef, ObjectId
+from pymongo.errors import DuplicateKeyError
+
 from tests import fixtures
 from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
                             PickleDynamicEmbedded, PickleDynamicTest)
+from tests.utils import MongoDBTestCase
 
 from mongoengine import *
 from mongoengine.base import get_document, _document_registry
@@ -30,12 +33,9 @@
 __all__ = ("InstanceTest",)
 
 
-class InstanceTest(unittest.TestCase):
+class InstanceTest(MongoDBTestCase):
 
     def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
-
         class Job(EmbeddedDocument):
             name = StringField()
             years = IntField()
@@ -3248,6 +3248,23 @@ class BlogPost(Document):
         blog.reload()
         self.assertEqual(blog.tags, [["value1", 123]])
 
+    def test_accessing_objects_with_indexes_error(self):
+        insert_result = self.db.company.insert_many([{'name': 'Foo'},
+                                                     {'name': 'Foo'}])  # Force 2 doc with same name
+        REF_OID = insert_result.inserted_ids[0]
+        self.db.user.insert_one({'company': REF_OID})   # Force 2 doc with same name
+
+        class Company(Document):
+            name = StringField(unique=True)
+
+        class User(Document):
+            company = ReferenceField(Company)
+
+
+        # Ensure index creation exception aren't swallowed (#1688)
+        with self.assertRaises(DuplicateKeyError):
+            User.objects().select_related()
+
 
 if __name__ == '__main__':
     unittest.main()

From 7ddbea697e84dc8a9b06dbc144a03a27706a21d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 30 Aug 2018 14:33:57 +0200
Subject: [PATCH 0676/1519] fix CI that fails due to pypi + override
 BaseDict.get as it was missing

---
 mongoengine/base/datastructures.py |  9 +++++-
 tests/test_datastructures.py       | 46 ++++++++++++++++++++----------
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 6340dcdd9..d5faa71b0 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -43,7 +43,14 @@ def __init__(self, dict_items, instance, name):
         self._name = name
         super(BaseDict, self).__init__(dict_items)
 
-    def __getitem__(self, key, *args, **kwargs):
+    def get(self, key, default=None):
+        # get does not use __getitem__ by default so we must override it as well
+        try:
+            return self.__getitem__(key)
+        except KeyError:
+            return default
+
+    def __getitem__(self, key):
         value = super(BaseDict, self).__getitem__(key)
 
         EmbeddedDocument = _import_class('EmbeddedDocument')
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index f2ec098e0..2f1277e68 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -68,6 +68,11 @@ def test___delitem___calls_mark_as_changed(self):
         self.assertEqual(base_dict._instance._changed_fields, ['my_name.k'])
         self.assertEqual(base_dict, {})
 
+    def test___getitem____KeyError(self):
+        base_dict = self._get_basedict({})
+        with self.assertRaises(KeyError):
+            base_dict['new']
+
     def test___getitem____simple_value(self):
         base_dict = self._get_basedict({'k': 'v'})
         base_dict['k'] = 'v'
@@ -98,6 +103,24 @@ def test___getitem____subdict_gets_converted_to_BaseDict(self):
         sub_dict['subk'] = None
         self.assertEqual(base_dict._instance._changed_fields, ['my_name.k.subk'])
 
+    def test_get_sublist_gets_converted_to_BaseList_just_like__getitem__(self):
+        base_dict = self._get_basedict({'k': [0, 1, 2]})
+        sub_list = base_dict.get('k')
+        self.assertEqual(sub_list, [0, 1, 2])
+        self.assertIsInstance(sub_list, BaseList)
+
+    def test_get_returns_the_same_as___getitem__(self):
+        base_dict = self._get_basedict({'k': [0, 1, 2]})
+        get_ = base_dict.get('k')
+        getitem_ = base_dict['k']
+        self.assertEqual(get_, getitem_)
+
+    def test_get_default(self):
+        base_dict = self._get_basedict({})
+        sentinel = object()
+        self.assertEqual(base_dict.get('new'), None)
+        self.assertIs(base_dict.get('new', sentinel), sentinel)
+
     def test___setitem___calls_mark_as_changed(self):
         base_dict = self._get_basedict({})
         base_dict['k'] = 'v'
@@ -244,10 +267,9 @@ def test_remove_calls_mark_as_changed(self):
 
     def test_remove_not_mark_as_changed_when_it_fails(self):
         base_list = self._get_baselist([True])
-        try:
+        with self.assertRaises(ValueError):
             base_list.remove(False)
-        except ValueError:
-            self.assertFalse(base_list._instance._changed_fields)
+        self.assertFalse(base_list._instance._changed_fields)
 
     def test_pop_calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
@@ -311,24 +333,18 @@ def test___iadd___calls_mark_as_changed(self):
         base_list += [False]
         self.assertEqual(base_list._instance._changed_fields, ['my_name'])
 
-    def test___iadd___not_mark_as_changed_when_it_fails(self):
-        base_list = self._get_baselist([True])
-        try:
-            base_list += None
-        except TypeError:
-            self.assertFalse(base_list._instance._changed_fields)
-
     def test___imul___calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
+        self.assertEqual(base_list._instance._changed_fields, [])
         base_list *= 2
         self.assertEqual(base_list._instance._changed_fields, ['my_name'])
 
-    def test___imul___not_mark_as_changed_when_it_fails(self):
+    def test_sort_calls_not_marked_as_changed_when_it_fails(self):
         base_list = self._get_baselist([True])
-        try:
-            base_list *= None
-        except TypeError:
-            self.assertFalse(base_list._instance._changed_fields)
+        with self.assertRaises(TypeError):
+            base_list.sort(key=1)
+
+        self.assertEqual(base_list._instance._changed_fields, [])
 
     def test_sort_calls_mark_as_changed(self):
         base_list = self._get_baselist([True, False])

From 4779106139306257fb9dfd8203ed7cc7c3310385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 30 Aug 2018 21:50:03 +0200
Subject: [PATCH 0677/1519] Improve doc of EmbeddedDocumentList.filter and
 clarify that it does not supports operators like __lte, __gte, etc

---
 mongoengine/base/datastructures.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 8948243e4..db292f144 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -234,6 +234,9 @@ def filter(self, **kwargs):
         Filters the list by only including embedded documents with the
         given keyword arguments.
 
+        This method only supports simple comparison (e.g: .filter(name='John Doe'))
+        and does not support operators like __gte, __lte, __icontains like queryset.filter does
+
         :param kwargs: The keyword arguments corresponding to the fields to
          filter on. *Multiple arguments are treated as if they are ANDed
          together.*

From 5dbee2a2708722a4e9835ac5738991ba394954c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 30 Aug 2018 16:03:16 +0200
Subject: [PATCH 0678/1519] Ensures EmbeddedDocumentField does not accepts
 references to Document classes in its constructor

---
 mongoengine/fields.py  | 12 +++++++++--
 tests/fields/fields.py | 47 ++++++++++++++++++++++++++++++++++++++++++
 tests/utils.py         |  8 +++++--
 3 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 16f3185fa..a54d3a52d 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -645,9 +645,17 @@ def __init__(self, document_type, **kwargs):
     def document_type(self):
         if isinstance(self.document_type_obj, six.string_types):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
-                self.document_type_obj = self.owner_document
+                resolved_document_type = self.owner_document
             else:
-                self.document_type_obj = get_document(self.document_type_obj)
+                resolved_document_type = get_document(self.document_type_obj)
+
+            if not issubclass(resolved_document_type, EmbeddedDocument):
+                # Due to the late resolution of the document_type
+                # There is a chance that it won't be an EmbeddedDocument (#1661)
+                self.error('Invalid embedded document class provided to an '
+                           'EmbeddedDocumentField')
+            self.document_type_obj = resolved_document_type
+
         return self.document_type_obj
 
     def to_python(self, value):
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7352d2422..362acec43 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2147,6 +2147,15 @@ class A(Document):
         ]))
         self.assertEqual(a.b.c.txt, 'hi')
 
+    def test_embedded_document_field_cant_reference_using_a_str_if_it_does_not_exist_yet(self):
+        raise SkipTest("Using a string reference in an EmbeddedDocumentField does not work if the class isnt registerd yet")
+
+        class MyDoc2(Document):
+            emb = EmbeddedDocumentField('MyDoc')
+
+        class MyDoc(EmbeddedDocument):
+            name = StringField()
+
     def test_embedded_document_validation(self):
         """Ensure that invalid embedded documents cannot be assigned to
         embedded document fields.
@@ -4388,6 +4397,44 @@ class CustomData(Document):
         self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
 
 
+class TestEmbeddedDocumentField(MongoDBTestCase):
+    def test___init___(self):
+        class MyDoc(EmbeddedDocument):
+            name = StringField()
+
+        field = EmbeddedDocumentField(MyDoc)
+        self.assertEqual(field.document_type_obj, MyDoc)
+
+        field2 = EmbeddedDocumentField('MyDoc')
+        self.assertEqual(field2.document_type_obj, 'MyDoc')
+
+    def test___init___throw_error_if_document_type_is_not_EmbeddedDocument(self):
+        with self.assertRaises(ValidationError):
+            EmbeddedDocumentField(dict)
+
+    def test_document_type_throw_error_if_not_EmbeddedDocument_subclass(self):
+
+        class MyDoc(Document):
+            name = StringField()
+
+        emb = EmbeddedDocumentField('MyDoc')
+        with self.assertRaises(ValidationError) as ctx:
+            emb.document_type
+        self.assertIn('Invalid embedded document class provided to an EmbeddedDocumentField', str(ctx.exception))
+
+    def test_embedded_document_field_only_allow_subclasses_of_embedded_document(self):
+        # Relates to #1661
+        class MyDoc(Document):
+            name = StringField()
+
+        with self.assertRaises(ValidationError):
+            class MyFailingDoc(Document):
+                emb = EmbeddedDocumentField(MyDoc)
+
+        with self.assertRaises(ValidationError):
+            class MyFailingdoc2(Document):
+                emb = EmbeddedDocumentField('MyDoc')
+
 class CachedReferenceFieldTest(MongoDBTestCase):
 
     def test_cached_reference_field_get_and_save(self):
diff --git a/tests/utils.py b/tests/utils.py
index 4566d8644..acd318c5c 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -7,12 +7,12 @@
 from mongoengine.python_support import IS_PYMONGO_3
 
 
-MONGO_TEST_DB = 'mongoenginetest'
+MONGO_TEST_DB = 'mongoenginetest'   # standard name for the test database
 
 
 class MongoDBTestCase(unittest.TestCase):
     """Base class for tests that need a mongodb connection
-    db is being dropped automatically
+    It ensures that the db is clean at the beginning and dropped at the end automatically
     """
 
     @classmethod
@@ -32,6 +32,7 @@ def get_mongodb_version():
     """
     return tuple(get_connection().server_info()['versionArray'])
 
+
 def _decorated_with_ver_requirement(func, ver_tuple):
     """Return a given function decorated with the version requirement
     for a particular MongoDB version tuple.
@@ -50,18 +51,21 @@ def _inner(*args, **kwargs):
 
     return _inner
 
+
 def needs_mongodb_v26(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v2.6.
     """
     return _decorated_with_ver_requirement(func, (2, 6))
 
+
 def needs_mongodb_v3(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v3.0.
     """
     return _decorated_with_ver_requirement(func, (3, 0))
 
+
 def skip_pymongo3(f):
     """Raise a SkipTest exception if we're running a test against
     PyMongo v3.x.

From d9fce49b082d774163f355d17ad432f0627ae086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 30 Aug 2018 22:46:37 +0200
Subject: [PATCH 0679/1519] minor improvement to DateTimeField doc

---
 mongoengine/fields.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 9648bb0b9..ead862918 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -462,6 +462,8 @@ class DateTimeField(BaseField):
     installed you can utilise it to convert varying types of date formats into valid
     python datetime objects.
 
+    Note: To default the field to the current datetime, use: DateTimeField(default=datetime.utcnow)
+
     Note: Microseconds are rounded to the nearest millisecond.
       Pre UTC microsecond support is effectively broken.
       Use :class:`~mongoengine.fields.ComplexDateTimeField` if you

From bd524d2e1e51f2c9ea4bc971003eeb34e8e7a090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 30 Aug 2018 23:13:10 +0200
Subject: [PATCH 0680/1519] Documented that it is possible to specify a name
 when using a dict to define an index

---
 docs/guide/defining-documents.rst | 3 +++
 mongoengine/context_managers.py   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 2a8d5418c..366d12c7d 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -513,6 +513,9 @@ If a dictionary is passed then the following options are available:
     Allows you to automatically expire data from a collection by setting the
     time in seconds to expire the a field.
 
+:attr:`name` (Optional)
+    Allows you to specify a name for the index
+
 .. note::
 
     Inheritance adds extra fields indices see: :ref:`document-inheritance`.
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index ec2e9e8b9..0343e1638 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -215,7 +215,7 @@ def _get_count(self):
         """Get the number of queries."""
         ignore_query = {'ns': {'$ne': '%s.system.indexes' % self.db.name}}
         count = self.db.system.profile.find(ignore_query).count() - self.counter
-        self.counter += 1
+        self.counter += 1       # Account for the query we just fired
         return count
 
 

From a7852a89cc5d8a9bf0f976c99cd42eacade4ef85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 1 Sep 2018 23:30:50 +0200
Subject: [PATCH 0681/1519] Fixes 2 bugs in no_subclasses context mgr (__exit__
 swallows exception + repair feature)

---
 mongoengine/context_managers.py |  9 +++----
 tests/test_context_managers.py  | 44 +++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index ec2e9e8b9..cfc0cdd41 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -145,18 +145,17 @@ def __init__(self, cls):
         :param cls: the class to turn querying sub classes on
         """
         self.cls = cls
+        self.cls_initial_subclasses = None
 
     def __enter__(self):
         """Change the objects default and _auto_dereference values."""
-        self.cls._all_subclasses = self.cls._subclasses
-        self.cls._subclasses = (self.cls,)
+        self.cls_initial_subclasses = self.cls._subclasses
+        self.cls._subclasses = (self.cls._class_name,)
         return self.cls
 
     def __exit__(self, t, value, traceback):
         """Reset the default and _auto_dereference values."""
-        self.cls._subclasses = self.cls._all_subclasses
-        delattr(self.cls, '_all_subclasses')
-        return self.cls
+        self.cls._subclasses = self.cls_initial_subclasses
 
 
 class query_counter(object):
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 0f6bf815e..8c96016cc 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -140,8 +140,6 @@ class Group(Document):
     def test_no_sub_classes(self):
         class A(Document):
             x = IntField()
-            y = IntField()
-
             meta = {'allow_inheritance': True}
 
         class B(A):
@@ -152,29 +150,29 @@ class C(B):
 
         A.drop_collection()
 
-        A(x=10, y=20).save()
-        A(x=15, y=30).save()
-        B(x=20, y=40).save()
-        B(x=30, y=50).save()
-        C(x=40, y=60).save()
+        A(x=10).save()
+        A(x=15).save()
+        B(x=20).save()
+        B(x=30).save()
+        C(x=40).save()
 
         self.assertEqual(A.objects.count(), 5)
         self.assertEqual(B.objects.count(), 3)
         self.assertEqual(C.objects.count(), 1)
 
-        with no_sub_classes(A) as A:
+        with no_sub_classes(A):
             self.assertEqual(A.objects.count(), 2)
 
             for obj in A.objects:
                 self.assertEqual(obj.__class__, A)
 
-        with no_sub_classes(B) as B:
+        with no_sub_classes(B):
             self.assertEqual(B.objects.count(), 2)
 
             for obj in B.objects:
                 self.assertEqual(obj.__class__, B)
 
-        with no_sub_classes(C) as C:
+        with no_sub_classes(C):
             self.assertEqual(C.objects.count(), 1)
 
             for obj in C.objects:
@@ -185,6 +183,32 @@ class C(B):
         self.assertEqual(B.objects.count(), 3)
         self.assertEqual(C.objects.count(), 1)
 
+    def test_no_sub_classes_modification_to_document_class_are_temporary(self):
+        class A(Document):
+            x = IntField()
+            meta = {'allow_inheritance': True}
+
+        class B(A):
+            z = IntField()
+
+        self.assertEqual(A._subclasses, ('A', 'A.B'))
+        with no_sub_classes(A):
+            self.assertEqual(A._subclasses, ('A',))
+        self.assertEqual(A._subclasses, ('A', 'A.B'))
+
+        self.assertEqual(B._subclasses, ('A.B',))
+        with no_sub_classes(B):
+            self.assertEqual(B._subclasses, ('A.B',))
+        self.assertEqual(B._subclasses, ('A.B',))
+
+    def test_no_subclass_context_manager_does_not_swallow_exception(self):
+        class User(Document):
+            name = StringField()
+
+        with self.assertRaises(TypeError):
+            with no_sub_classes(User):
+                raise TypeError()
+
     def test_query_counter(self):
         connect('mongoenginetest')
         db = get_db()

From 8ff82996fb76314f799e9a153f32a4adc37485d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 3 Sep 2018 11:11:15 +0200
Subject: [PATCH 0682/1519] Fix few things related to query_counter context
 manager: - Improve doc - Fix the fact that the context was modifying the
 initial profiling_level in case it was != 0 - Ignores 'killcursors' to fix
 flaky test that were impacted by killcursors queries (#1869)

---
 mongoengine/context_managers.py | 58 ++++++++++++++-------
 tests/queryset/queryset.py      | 29 +++++++----
 tests/test_context_managers.py  | 91 +++++++++++++++++++++++++++++++--
 3 files changed, 144 insertions(+), 34 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 67c835813..ee1f5e01a 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -159,51 +159,69 @@ def __exit__(self, t, value, traceback):
 
 
 class query_counter(object):
-    """Query_counter context manager to get the number of queries."""
+    """Query_counter context manager to get the number of queries.
+    This works by updating the `profiling_level` of the database so that all queries get logged,
+    resetting the db.system.profile collection at the beginnig of the context and counting the new entries.
+
+    This was designed for debugging purpose. In fact it is a global counter so queries issued by other threads/processes
+    can interfere with it
+
+    Be aware that:
+    - Iterating over large amount of documents (>101) makes pymongo issue `getmore` queries to fetch the next batch of
+        documents (https://docs.mongodb.com/manual/tutorial/iterate-a-cursor/#cursor-batches)
+    - Some queries are ignored by default by the counter (killcursors, db.system.indexes)
+    """
 
     def __init__(self):
-        """Construct the query_counter."""
-        self.counter = 0
+        """Construct the query_counter
+        """
         self.db = get_db()
-
-    def __enter__(self):
-        """On every with block we need to drop the profile collection."""
+        self.initial_profiling_level = None
+        self._ctx_query_counter = 0             # number of queries issued by the context
+
+        self._ignored_query = {
+            'ns':
+                {'$ne': '%s.system.indexes' % self.db.name},
+            'op':
+                {'$ne': 'killcursors'}
+        }
+
+    def _turn_on_profiling(self):
+        self.initial_profiling_level = self.db.profiling_level()
         self.db.set_profiling_level(0)
         self.db.system.profile.drop()
         self.db.set_profiling_level(2)
+
+    def _resets_profiling(self):
+        self.db.set_profiling_level(self.initial_profiling_level)
+
+    def __enter__(self):
+        self._turn_on_profiling()
         return self
 
     def __exit__(self, t, value, traceback):
-        """Reset the profiling level."""
-        self.db.set_profiling_level(0)
+        self._resets_profiling()
 
     def __eq__(self, value):
-        """== Compare querycounter."""
         counter = self._get_count()
         return value == counter
 
     def __ne__(self, value):
-        """!= Compare querycounter."""
         return not self.__eq__(value)
 
     def __lt__(self, value):
-        """< Compare querycounter."""
         return self._get_count() < value
 
     def __le__(self, value):
-        """<= Compare querycounter."""
         return self._get_count() <= value
 
     def __gt__(self, value):
-        """> Compare querycounter."""
         return self._get_count() > value
 
     def __ge__(self, value):
-        """>= Compare querycounter."""
         return self._get_count() >= value
 
     def __int__(self):
-        """int representation."""
         return self._get_count()
 
     def __repr__(self):
@@ -211,10 +229,12 @@ def __repr__(self):
         return u"%s" % self._get_count()
 
     def _get_count(self):
-        """Get the number of queries."""
-        ignore_query = {'ns': {'$ne': '%s.system.indexes' % self.db.name}}
-        count = self.db.system.profile.find(ignore_query).count() - self.counter
-        self.counter += 1       # Account for the query we just fired
+        """Get the number of queries by counting the current number of entries in db.system.profile
+        and substracting the queries issued by this context. In fact everytime this is called, 1 query is
+        issued so we need to balance that
+        """
+        count = self.db.system.profile.find(self._ignored_query).count() - self._ctx_query_counter
+        self._ctx_query_counter += 1    # Account for the query we just issued to gather the information
         return count
 
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index a405e8926..ff5407df4 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4714,18 +4714,27 @@ class Person(Document):
         for i in range(100):
             Person(name="No: %s" % i).save()
 
-        with query_counter() as q:
-            self.assertEqual(q, 0)
-            people = Person.objects.no_cache()
+            with query_counter() as q:
+                try:
+                    self.assertEqual(q, 0)
+                    people = Person.objects.no_cache()
 
-            [x for x in people]
-            self.assertEqual(q, 1)
+                    [x for x in people]
+                    self.assertEqual(q, 1)
 
-            list(people)
-            self.assertEqual(q, 2)
+                    list(people)
+                    self.assertEqual(q, 2)
+
+                    people.count()
+                    self.assertEqual(q, 3)
+                except AssertionError as exc:
+                    db = get_db()
+                    msg = ''
+                    for q in list(db.system.profile.find())[-50:]:
+                        msg += str([q['ts'], q['ns'], q.get('query'), q['op']])+'\n'
+                        msg += str(q)
+                    raise AssertionError(str(exc) + '\n'+msg)
 
-            people.count()
-            self.assertEqual(q, 3)
 
     def test_cache_not_cloned(self):
 
@@ -5053,7 +5062,7 @@ class Person(Document):
                                            {"$ne": "%s.system.indexes" % q.db.name}})[0]
 
             self.assertFalse('$orderby' in op['query'],
-                             'BaseQuerySet must remove orderby from meta in boolen test')
+                             'BaseQuerySet must remove orderby from meta in boolean test')
 
             self.assertEqual(Person.objects.first().name, 'A')
             self.assertTrue(Person.objects._has_data(),
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 8c96016cc..2b265cbde 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -209,18 +209,99 @@ class User(Document):
             with no_sub_classes(User):
                 raise TypeError()
 
+    def test_query_counter_does_not_swallow_exception(self):
+
+        with self.assertRaises(TypeError):
+            with query_counter() as q:
+                raise TypeError()
+
+    def test_query_counter_temporarily_modifies_profiling_level(self):
+        connect('mongoenginetest')
+        db = get_db()
+
+        initial_profiling_level = db.profiling_level()
+
+        try:
+            NEW_LEVEL = 1
+            db.set_profiling_level(NEW_LEVEL)
+            self.assertEqual(db.profiling_level(), NEW_LEVEL)
+            with query_counter() as q:
+                self.assertEqual(db.profiling_level(), 2)
+            self.assertEqual(db.profiling_level(), NEW_LEVEL)
+        except Exception:
+            db.set_profiling_level(initial_profiling_level)    # Ensures it gets reseted no matter the outcome of the test
+            raise
+
     def test_query_counter(self):
         connect('mongoenginetest')
         db = get_db()
-        db.test.find({})
+
+        collection = db.query_counter
+        collection.drop()
+
+        def issue_1_count_query():
+            collection.find({}).count()
+
+        def issue_1_insert_query():
+            collection.insert_one({'test': 'garbage'})
+
+        def issue_1_find_query():
+            collection.find_one()
+
+        counter = 0
+        with query_counter() as q:
+            self.assertEqual(q, counter)
+            self.assertEqual(q, counter)    # Ensures previous count query did not get counted
+
+            for _ in range(10):
+                issue_1_insert_query()
+                counter += 1
+            self.assertEqual(q, counter)
+
+            for _ in range(4):
+                issue_1_find_query()
+                counter += 1
+            self.assertEqual(q, counter)
+
+            for _ in range(3):
+                issue_1_count_query()
+                counter += 1
+            self.assertEqual(q, counter)
+
+    def test_query_counter_counts_getmore_queries(self):
+        connect('mongoenginetest')
+        db = get_db()
+
+        collection = db.query_counter
+        collection.drop()
+
+        many_docs = [{'test': 'garbage %s' % i} for i in range(150)]
+        collection.insert_many(many_docs)   # first batch of documents contains 101 documents
+
+        with query_counter() as q:
+            self.assertEqual(q, 0)
+            list(collection.find())
+            self.assertEqual(q, 2)  # 1st select + 1 getmore
+
+    def test_query_counter_ignores_particular_queries(self):
+        connect('mongoenginetest')
+        db = get_db()
+
+        collection = db.query_counter
+        collection.insert_many([{'test': 'garbage %s' % i} for i in range(10)])
 
         with query_counter() as q:
-            self.assertEqual(0, q)
+            self.assertEqual(q, 0)
+            cursor = collection.find()
+            self.assertEqual(q, 0)      # cursor wasn't opened yet
+            _ = next(cursor)            # opens the cursor and fires the find query
+            self.assertEqual(q, 1)
 
-            for i in range(1, 51):
-                db.test.find({}).count()
+            cursor.close()              # issues a `killcursors` query that is ignored by the context
+            self.assertEqual(q, 1)
 
-            self.assertEqual(50, q)
+            _ = db.system.indexes.find_one()    # queries on db.system.indexes are ignored as well
+            self.assertEqual(q, 1)
 
 if __name__ == '__main__':
     unittest.main()

From 408274152baf75485f17eee9cc0550fd7bb82960 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Tue, 4 Sep 2018 20:24:34 +0800
Subject: [PATCH 0683/1519] reduce cycle complexity using logic map

---
 mongoengine/queryset/transform.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 5f777f413..555be6f91 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -214,17 +214,20 @@ def update(_doc_cls=None, **update):
         if parts[0] in UPDATE_OPERATORS:
             op = parts.pop(0)
             # Convert Pythonic names to Mongo equivalents
-            if op in ('push_all', 'pull_all'):
-                op = op.replace('_all', 'All')
-            elif op == 'dec':
+            operator_map = {
+                'push_all': 'pushAll',
+                'pull_all': 'pullAll',
+                'dec': 'inc',
+                'add_to_set': 'addToSet',
+                'set_on_insert': 'setOnInsert'
+            }
+            # If operator doesn't found from operator map, op value will stay
+            # unchanged
+            op = operator_map.get(op, op)
+            if op == 'dec':
                 # Support decrement by flipping a positive value's sign
                 # and using 'inc'
-                op = 'inc'
                 value = -value
-            elif op == 'add_to_set':
-                op = 'addToSet'
-            elif op == 'set_on_insert':
-                op = 'setOnInsert'
 
         match = None
         if parts[-1] in COMPARISON_OPERATORS:

From e83b529f1c8cc032968797057d7791169fc9bba5 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Tue, 4 Sep 2018 20:38:42 +0800
Subject: [PATCH 0684/1519] flip value before changing op to inc

---
 mongoengine/queryset/transform.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 555be6f91..a86705433 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -221,13 +221,13 @@ def update(_doc_cls=None, **update):
                 'add_to_set': 'addToSet',
                 'set_on_insert': 'setOnInsert'
             }
-            # If operator doesn't found from operator map, op value will stay
-            # unchanged
-            op = operator_map.get(op, op)
             if op == 'dec':
                 # Support decrement by flipping a positive value's sign
                 # and using 'inc'
                 value = -value
+            # If operator doesn't found from operator map, op value will stay
+            # unchanged
+            op = operator_map.get(op, op)
 
         match = None
         if parts[-1] in COMPARISON_OPERATORS:

From b65478e7d9c8f09d915a102a367e8da52ad6bdf4 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Tue, 4 Sep 2018 20:44:44 +0800
Subject: [PATCH 0685/1519] trigger ci

---
 mongoengine/queryset/transform.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index a86705433..6021d464a 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -225,8 +225,8 @@ def update(_doc_cls=None, **update):
                 # Support decrement by flipping a positive value's sign
                 # and using 'inc'
                 value = -value
-            # If operator doesn't found from operator map, op value will stay
-            # unchanged
+            # If the operator doesn't found from operator map, the op value
+            # will stay unchanged
             op = operator_map.get(op, op)
 
         match = None

From ab08e67eaf3f6b809a58740c0cfbbb24e1a3ef0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 30 Aug 2018 23:57:16 +0200
Subject: [PATCH 0686/1519] fix inc/dec operator with decimal

---
 mongoengine/fields.py             |  7 ++-
 mongoengine/queryset/transform.py |  6 +++
 tests/queryset/queryset.py        | 79 ++++++++++++++++++++++++++-----
 3 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 89b901e79..d8eaec4e8 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -364,7 +364,8 @@ def prepare_query_value(self, op, value):
 
 
 class DecimalField(BaseField):
-    """Fixed-point decimal number field.
+    """Fixed-point decimal number field. Stores the value as a float by default unless `force_string` is used.
+    If using floats, beware of Decimal to float conversion (potential precision loss)
 
     .. versionchanged:: 0.8
     .. versionadded:: 0.3
@@ -375,7 +376,9 @@ def __init__(self, min_value=None, max_value=None, force_string=False,
         """
         :param min_value: Validation rule for the minimum acceptable value.
         :param max_value: Validation rule for the maximum acceptable value.
-        :param force_string: Store as a string.
+        :param force_string: Store the value as a string (instead of a float).
+         Be aware that this affects query sorting and operation like lte, gte (as string comparison is applied)
+         and some query operator won't work (e.g: inc, dec)
         :param precision: Number of decimal places to store.
         :param rounding: The rounding rule from the python decimal library:
 
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 6021d464a..25bd68e02 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -201,14 +201,18 @@ def update(_doc_cls=None, **update):
     format.
     """
     mongo_update = {}
+
     for key, value in update.items():
         if key == '__raw__':
             mongo_update.update(value)
             continue
+
         parts = key.split('__')
+
         # if there is no operator, default to 'set'
         if len(parts) < 3 and parts[0] not in UPDATE_OPERATORS:
             parts.insert(0, 'set')
+
         # Check for an operator and transform to mongo-style if there is
         op = None
         if parts[0] in UPDATE_OPERATORS:
@@ -294,6 +298,8 @@ def update(_doc_cls=None, **update):
                     value = field.prepare_query_value(op, value)
             elif op == 'unset':
                 value = 1
+            elif op == 'inc':
+                value = field.prepare_query_value(op, value)
 
         if match:
             match = '$' + match
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index a405e8926..b0dd354dc 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -3,6 +3,7 @@
 import datetime
 import unittest
 import uuid
+from decimal import Decimal
 
 from bson import DBRef, ObjectId
 from nose.plugins.skip import SkipTest
@@ -1851,21 +1852,16 @@ class BlogPost(Document):
         self.assertEqual(
             1, BlogPost.objects(author__in=["%s" % me.pk]).count())
 
-    def test_update(self):
-        """Ensure that atomic updates work properly.
-        """
+    def test_update_intfield_operator(self):
         class BlogPost(Document):
-            name = StringField()
-            title = StringField()
             hits = IntField()
-            tags = ListField(StringField())
 
         BlogPost.drop_collection()
 
-        post = BlogPost(name="Test Post", hits=5, tags=['test'])
+        post = BlogPost(hits=5)
         post.save()
 
-        BlogPost.objects.update(set__hits=10)
+        BlogPost.objects.update_one(set__hits=10)
         post.reload()
         self.assertEqual(post.hits, 10)
 
@@ -1882,6 +1878,55 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.hits, 11)
 
+    def test_update_decimalfield_operator(self):
+        class BlogPost(Document):
+            review = DecimalField()
+
+        BlogPost.drop_collection()
+
+        post = BlogPost(review=3.5)
+        post.save()
+
+        BlogPost.objects.update_one(inc__review=0.1)             # test with floats
+        post.reload()
+        self.assertEqual(float(post.review), 3.6)
+
+        BlogPost.objects.update_one(dec__review=0.1)
+        post.reload()
+        self.assertEqual(float(post.review), 3.5)
+
+        BlogPost.objects.update_one(inc__review=Decimal(0.12))   # test with Decimal
+        post.reload()
+        self.assertEqual(float(post.review), 3.62)
+
+        BlogPost.objects.update_one(dec__review=Decimal(0.12))
+        post.reload()
+        self.assertEqual(float(post.review), 3.5)
+
+    def test_update_decimalfield_operator_not_working_with_force_string(self):
+        class BlogPost(Document):
+            review = DecimalField(force_string=True)
+
+        BlogPost.drop_collection()
+
+        post = BlogPost(review=3.5)
+        post.save()
+
+        with self.assertRaises(OperationError):
+            BlogPost.objects.update_one(inc__review=0.1)             # test with floats
+
+    def test_update_listfield_operator(self):
+        """Ensure that atomic updates work properly.
+        """
+        class BlogPost(Document):
+            tags = ListField(StringField())
+
+        BlogPost.drop_collection()
+
+        post = BlogPost(tags=['test'])
+        post.save()
+
+        # ListField operator
         BlogPost.objects.update(push__tags='mongo')
         post.reload()
         self.assertTrue('mongo' in post.tags)
@@ -1900,13 +1945,23 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.tags.count('unique'), 1)
 
-        self.assertNotEqual(post.hits, None)
-        BlogPost.objects.update_one(unset__hits=1)
-        post.reload()
-        self.assertEqual(post.hits, None)
+        BlogPost.drop_collection()
+
+    def test_update_unset(self):
+        class BlogPost(Document):
+            title = StringField()
 
         BlogPost.drop_collection()
 
+        post = BlogPost(title='garbage').save()
+
+        self.assertNotEqual(post.title, None)
+        BlogPost.objects.update_one(unset__title=1)
+        post.reload()
+        self.assertEqual(post.title, None)
+        pymongo_doc = BlogPost.objects.as_pymongo().first()
+        self.assertNotIn('title', pymongo_doc)
+
     @needs_mongodb_v26
     def test_update_push_with_position(self):
         """Ensure that the 'push' update with position works properly.

From cf9df548ca1280a34f6bf5bbce1971400bb07656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Sep 2018 19:18:40 +0200
Subject: [PATCH 0687/1519] reverted back to the StopIteration in queryset.next
 that one didnt have to be changed (test stalled)

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index a4e640183..2c80218cc 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1481,7 +1481,7 @@ def next(self):
         """Wrap the result in a :class:`~mongoengine.Document` object.
         """
         if self._limit == 0 or self._none:
-            return
+            raise StopIteration
 
         raw_doc = self._cursor.next()
 

From a25d127f368b7dfba1f697d34d27ee0b54a29df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Sep 2018 20:51:06 +0200
Subject: [PATCH 0688/1519] Remove DictField.basecls related code, it is
 useless

---
 mongoengine/fields.py      |  9 ++-------
 tests/queryset/queryset.py | 27 ---------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 6994b315a..91604a165 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -945,14 +945,9 @@ class DictField(ComplexBaseField):
     .. versionchanged:: 0.5 - Can now handle complex / varying types of data
     """
 
-    def __init__(self, basecls=None, field=None, *args, **kwargs):
+    def __init__(self, field=None, *args, **kwargs):
         self.field = field
         self._auto_dereference = False
-        self.basecls = basecls or BaseField
-
-        # XXX ValidationError raised outside of the "validate" method.
-        if not issubclass(self.basecls, BaseField):
-            self.error('DictField only accepts dict values')
 
         kwargs.setdefault('default', lambda: {})
         super(DictField, self).__init__(*args, **kwargs)
@@ -972,7 +967,7 @@ def validate(self, value):
         super(DictField, self).validate(value)
 
     def lookup_member(self, member_name):
-        return DictField(basecls=self.basecls, db_field=member_name)
+        return DictField(db_field=member_name)
 
     def prepare_query_value(self, op, value):
         match_operators = ['contains', 'icontains', 'startswith',
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 77308c262..c6aa35943 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -3618,33 +3618,6 @@ class Group(Document):
 
         Group.drop_collection()
 
-    def test_dict_with_custom_baseclass(self):
-        """Ensure DictField working with custom base clases.
-        """
-        class Test(Document):
-            testdict = DictField()
-
-        Test.drop_collection()
-
-        t = Test(testdict={'f': 'Value'})
-        t.save()
-
-        self.assertEqual(
-            Test.objects(testdict__f__startswith='Val').count(), 1)
-        self.assertEqual(Test.objects(testdict__f='Value').count(), 1)
-        Test.drop_collection()
-
-        class Test(Document):
-            testdict = DictField(basecls=StringField)
-
-        t = Test(testdict={'f': 'Value'})
-        t.save()
-
-        self.assertEqual(Test.objects(testdict__f='Value').count(), 1)
-        self.assertEqual(
-            Test.objects(testdict__f__startswith='Val').count(), 1)
-        Test.drop_collection()
-
     def test_bulk(self):
         """Ensure bulk querying by object id returns a proper dict.
         """

From 193656e71be15c6b84c4d22bccf6fcf184893da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Sep 2018 22:25:53 +0200
Subject: [PATCH 0689/1519] detect when EmbeddedDocumentListField receives an
 EmbeddedDocument instance instead of a list. It is a common mistake and the
 error wasn't meaningful (was fired from _from_son) (relates to #1464)

---
 mongoengine/base/fields.py |  7 ++++++-
 tests/fields/fields.py     | 40 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 69034d5db..906f7ff23 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -313,11 +313,16 @@ def to_python(self, value):
         if hasattr(value, 'to_python'):
             return value.to_python()
 
+        BaseDocument = _import_class('BaseDocument')
+        if isinstance(value, BaseDocument):
+            # Something is wrong, return the value as it is
+            return value
+
         is_list = False
         if not hasattr(value, 'items'):
             try:
                 is_list = True
-                value = {k: v for k, v in enumerate(value)}
+                value = {idx: v for idx, v in enumerate(value)}
             except TypeError:  # Not iterable return the value
                 return value
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 362acec43..84877be38 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -3868,7 +3868,7 @@ class ToEmbedChild(ToEmbedParent):
         assert isinstance(doc.field, ToEmbedChild)
         assert doc.field == to_embed_child
 
-    def test_invalid_dict_value(self):
+    def test_dict_field_invalid_dict_value(self):
         class DictFieldTest(Document):
             dictionary = DictField(required=True)
 
@@ -3882,6 +3882,22 @@ class DictFieldTest(Document):
         test.dictionary  # Just access to test getter
         self.assertRaises(ValidationError, test.validate)
 
+    def test_dict_field_raises_validation_error_if_wrongly_assign_embedded_doc(self):
+        class DictFieldTest(Document):
+            dictionary = DictField(required=True)
+
+        DictFieldTest.drop_collection()
+
+        class Embedded(EmbeddedDocument):
+            name = StringField()
+
+        embed = Embedded(name='garbage')
+        doc = DictFieldTest(dictionary=embed)
+        with self.assertRaises(ValidationError) as ctx_err:
+            doc.validate()
+        self.assertIn("'dictionary'", str(ctx_err.exception))
+        self.assertIn('Only dictionaries may be used in a DictField', str(ctx_err.exception))
+
     def test_cls_field(self):
         class Animal(Document):
             meta = {'allow_inheritance': True}
@@ -3980,6 +3996,28 @@ class BlogPost(Document):
             self.Comments(author='user3', message='message1')
         ]).save()
 
+    def test_fails_upon_validate_if_provide_a_doc_instead_of_a_list_of_doc(self):
+        # Relates to Issue #1464
+        comment = self.Comments(author='John')
+
+        class Title(Document):
+            content = StringField()
+
+        # Test with an embeddedDocument instead of a list(embeddedDocument)
+        # It's an edge case but it used to fail with a vague error, making it difficult to troubleshoot it
+        post = self.BlogPost(comments=comment)
+        with self.assertRaises(ValidationError) as ctx_err:
+            post.validate()
+        self.assertIn("'comments'", str(ctx_err.exception))
+        self.assertIn('Only lists and tuples may be used in a list field', str(ctx_err.exception))
+
+        # Test with a Document
+        post = self.BlogPost(comments=Title(content='garbage'))
+        with self.assertRaises(ValidationError) as e:
+            post.validate()
+        self.assertIn("'comments'", str(ctx_err.exception))
+        self.assertIn('Only lists and tuples may be used in a list field', str(ctx_err.exception))
+
     def test_no_keyword_filter(self):
         """
         Tests the filter method of a List of Embedded Documents

From 282b83ac08a3b4cf680b6f81627187b7a08a2889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Sep 2018 23:48:07 +0200
Subject: [PATCH 0690/1519] Fix default value of ComplexDateTime + fixed
 descriptor .__get__ for class attribute

---
 mongoengine/base/fields.py |   3 +-
 mongoengine/fields.py      |  20 ++-
 tests/fields/fields.py     | 327 +++++++++++++++++++++----------------
 3 files changed, 199 insertions(+), 151 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 69034d5db..d25d43056 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -55,7 +55,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
             field.  Generally this is deprecated in favour of the
             `FIELD.validate` method
         :param choices: (optional) The valid choices
-        :param null: (optional) Is the field value can be null. If no and there is a default value
+        :param null: (optional) If the field value can be null. If no and there is a default value
             then the default value is set
         :param sparse: (optional) `sparse=True` combined with `unique=True` and `required=False`
             means that uniqueness won't be enforced for `None` values
@@ -130,7 +130,6 @@ def __get__(self, instance, owner):
     def __set__(self, instance, value):
         """Descriptor for assigning a value to a field in a document.
         """
-
         # If setting to None and there is a default
         # Then set the value to the default value
         if value is None:
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 6994b315a..bc632ac9a 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -562,11 +562,15 @@ class ComplexDateTimeField(StringField):
     The `,` as the separator can be easily modified by passing the `separator`
     keyword when initializing the field.
 
+    Note: To default the field to the current datetime, use: DateTimeField(default=datetime.utcnow)
+
     .. versionadded:: 0.5
     """
 
     def __init__(self, separator=',', **kwargs):
-        self.names = ['year', 'month', 'day', 'hour', 'minute', 'second', 'microsecond']
+        """
+        :param separator: Allows to customize the separator used for storage (default ``,``)
+        """
         self.separator = separator
         self.format = separator.join(['%Y', '%m', '%d', '%H', '%M', '%S', '%f'])
         super(ComplexDateTimeField, self).__init__(**kwargs)
@@ -597,16 +601,20 @@ def _convert_from_string(self, data):
         return datetime.datetime(*values)
 
     def __get__(self, instance, owner):
+        if instance is None:
+            return self
+
         data = super(ComplexDateTimeField, self).__get__(instance, owner)
-        if data is None:
-            return None if self.null else datetime.datetime.now()
-        if isinstance(data, datetime.datetime):
+
+        if isinstance(data, datetime.datetime) or data is None:
             return data
         return self._convert_from_string(data)
 
     def __set__(self, instance, value):
-        value = self._convert_from_datetime(value) if value else value
-        return super(ComplexDateTimeField, self).__set__(instance, value)
+        super(ComplexDateTimeField, self).__set__(instance, value)
+        value = instance._data[self.name]
+        if value is not None:
+            instance._data[self.name] = self._convert_from_datetime(value)
 
     def validate(self, value):
         value = self.to_python(value)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 362acec43..4bfd7c748 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -264,12 +264,11 @@ class HandleNoneFields(Document):
 
         # Retrive data from db and verify it.
         ret = HandleNoneFields.objects.all()[0]
-        self.assertEqual(ret.str_fld, None)
-        self.assertEqual(ret.int_fld, None)
-        self.assertEqual(ret.flt_fld, None)
+        self.assertIsNone(ret.str_fld)
+        self.assertIsNone(ret.int_fld)
+        self.assertIsNone(ret.flt_fld)
 
-        # Return current time if retrived value is None.
-        self.assertTrue(isinstance(ret.comp_dt_fld, datetime.datetime))
+        self.assertIsNone(ret.comp_dt_fld)
 
     def test_not_required_handles_none_from_database(self):
         """Ensure that every field can handle null values from the
@@ -287,7 +286,7 @@ class HandleNoneFields(Document):
         doc.str_fld = u'spam ham egg'
         doc.int_fld = 42
         doc.flt_fld = 4.2
-        doc.com_dt_fld = datetime.datetime.utcnow()
+        doc.comp_dt_fld = datetime.datetime.utcnow()
         doc.save()
 
         # Unset all the fields
@@ -302,12 +301,10 @@ class HandleNoneFields(Document):
 
         # Retrive data from db and verify it.
         ret = HandleNoneFields.objects.first()
-        self.assertEqual(ret.str_fld, None)
-        self.assertEqual(ret.int_fld, None)
-        self.assertEqual(ret.flt_fld, None)
-
-        # ComplexDateTimeField returns current time if retrived value is None.
-        self.assertTrue(isinstance(ret.comp_dt_fld, datetime.datetime))
+        self.assertIsNone(ret.str_fld)
+        self.assertIsNone(ret.int_fld)
+        self.assertIsNone(ret.flt_fld)
+        self.assertIsNone(ret.comp_dt_fld)
 
         # Retrieved object shouldn't pass validation when a re-save is
         # attempted.
@@ -928,137 +925,6 @@ class LogEntry(Document):
         logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
         self.assertEqual(logs.count(), 10)
 
-    def test_complexdatetime_storage(self):
-        """Tests for complex datetime fields - which can handle
-        microseconds without rounding.
-        """
-        class LogEntry(Document):
-            date = ComplexDateTimeField()
-            date_with_dots = ComplexDateTimeField(separator='.')
-
-        LogEntry.drop_collection()
-
-        # Post UTC - microseconds are rounded (down) nearest millisecond and
-        # dropped - with default datetimefields
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
-        log = LogEntry()
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertEqual(log.date, d1)
-
-        # Post UTC - microseconds are rounded (down) nearest millisecond - with
-        # default datetimefields
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertEqual(log.date, d1)
-
-        # Pre UTC dates microseconds below 1000 are dropped - with default
-        # datetimefields
-        d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertEqual(log.date, d1)
-
-        # Pre UTC microseconds above 1000 is wonky - with default datetimefields
-        # log.date has an invalid microsecond value so I can't construct
-        # a date to compare.
-        for i in range(1001, 3113, 33):
-            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, i)
-            log.date = d1
-            log.save()
-            log.reload()
-            self.assertEqual(log.date, d1)
-            log1 = LogEntry.objects.get(date=d1)
-            self.assertEqual(log, log1)
-
-        # Test string padding
-        microsecond = map(int, [math.pow(10, x) for x in range(6)])
-        mm = dd = hh = ii = ss = [1, 10]
-
-        for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
-            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']
-            self.assertTrue(re.match('^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$', stored) is not None)
-
-        # Test separator
-        stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()['date_with_dots']
-        self.assertTrue(re.match('^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$', stored) is not None)
-
-    def test_complexdatetime_usage(self):
-        """Tests for complex datetime fields - which can handle
-        microseconds without rounding.
-        """
-        class LogEntry(Document):
-            date = ComplexDateTimeField()
-
-        LogEntry.drop_collection()
-
-        d1 = datetime.datetime(1950, 1, 1, 0, 0, 1, 999)
-        log = LogEntry()
-        log.date = d1
-        log.save()
-
-        log1 = LogEntry.objects.get(date=d1)
-        self.assertEqual(log, log1)
-
-        # create extra 59 log entries for a total of 60
-        for i in range(1951, 2010):
-            d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)
-            LogEntry(date=d).save()
-
-        self.assertEqual(LogEntry.objects.count(), 60)
-
-        # Test ordering
-        logs = LogEntry.objects.order_by("date")
-        i = 0
-        while i < 59:
-            self.assertTrue(logs[i].date <= logs[i + 1].date)
-            i += 1
-
-        logs = LogEntry.objects.order_by("-date")
-        i = 0
-        while i < 59:
-            self.assertTrue(logs[i].date >= logs[i + 1].date)
-            i += 1
-
-        # Test searching
-        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 30)
-
-        logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 30)
-
-        logs = LogEntry.objects.filter(
-            date__lte=datetime.datetime(2011, 1, 1),
-            date__gte=datetime.datetime(2000, 1, 1),
-        )
-        self.assertEqual(logs.count(), 10)
-
-        LogEntry.drop_collection()
-
-        # Test microsecond-level ordering/filtering
-        for microsecond in (99, 999, 9999, 10000):
-            LogEntry(
-                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)
-            ).save()
-
-        logs = list(LogEntry.objects.order_by('date'))
-        for next_idx, log in enumerate(logs[:-1], start=1):
-            next_log = logs[next_idx]
-            self.assertTrue(log.date < next_log.date)
-
-        logs = list(LogEntry.objects.order_by('-date'))
-        for next_idx, log in enumerate(logs[:-1], start=1):
-            next_log = logs[next_idx]
-            self.assertTrue(log.date > next_log.date)
-
-        logs = LogEntry.objects.filter(
-            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))
-        self.assertEqual(logs.count(), 4)
-
     def test_list_validation(self):
         """Ensure that a list field only accepts lists with valid elements."""
         AccessLevelChoices = (
@@ -5389,5 +5255,180 @@ def check_fields_type(occ):
         check_fields_type(occ)
 
 
+class ComplexDateTimeFieldTest(MongoDBTestCase):
+    def test_complexdatetime_storage(self):
+        """Tests for complex datetime fields - which can handle
+        microseconds without rounding.
+        """
+        class LogEntry(Document):
+            date = ComplexDateTimeField()
+            date_with_dots = ComplexDateTimeField(separator='.')
+
+        LogEntry.drop_collection()
+
+        # Post UTC - microseconds are rounded (down) nearest millisecond and
+        # dropped - with default datetimefields
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
+        log = LogEntry()
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1)
+
+        # Post UTC - microseconds are rounded (down) nearest millisecond - with
+        # default datetimefields
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1)
+
+        # Pre UTC dates microseconds below 1000 are dropped - with default
+        # datetimefields
+        d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1)
+
+        # Pre UTC microseconds above 1000 is wonky - with default datetimefields
+        # log.date has an invalid microsecond value so I can't construct
+        # a date to compare.
+        for i in range(1001, 3113, 33):
+            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, i)
+            log.date = d1
+            log.save()
+            log.reload()
+            self.assertEqual(log.date, d1)
+            log1 = LogEntry.objects.get(date=d1)
+            self.assertEqual(log, log1)
+
+        # Test string padding
+        microsecond = map(int, [math.pow(10, x) for x in range(6)])
+        mm = dd = hh = ii = ss = [1, 10]
+
+        for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
+            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']
+            self.assertTrue(re.match('^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$', stored) is not None)
+
+        # Test separator
+        stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()['date_with_dots']
+        self.assertTrue(re.match('^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$', stored) is not None)
+
+    def test_complexdatetime_usage(self):
+        """Tests for complex datetime fields - which can handle
+        microseconds without rounding.
+        """
+        class LogEntry(Document):
+            date = ComplexDateTimeField()
+
+        LogEntry.drop_collection()
+
+        d1 = datetime.datetime(1950, 1, 1, 0, 0, 1, 999)
+        log = LogEntry()
+        log.date = d1
+        log.save()
+
+        log1 = LogEntry.objects.get(date=d1)
+        self.assertEqual(log, log1)
+
+        # create extra 59 log entries for a total of 60
+        for i in range(1951, 2010):
+            d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)
+            LogEntry(date=d).save()
+
+        self.assertEqual(LogEntry.objects.count(), 60)
+
+        # Test ordering
+        logs = LogEntry.objects.order_by("date")
+        i = 0
+        while i < 59:
+            self.assertTrue(logs[i].date <= logs[i + 1].date)
+            i += 1
+
+        logs = LogEntry.objects.order_by("-date")
+        i = 0
+        while i < 59:
+            self.assertTrue(logs[i].date >= logs[i + 1].date)
+            i += 1
+
+        # Test searching
+        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
+        self.assertEqual(logs.count(), 30)
+
+        logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1))
+        self.assertEqual(logs.count(), 30)
+
+        logs = LogEntry.objects.filter(
+            date__lte=datetime.datetime(2011, 1, 1),
+            date__gte=datetime.datetime(2000, 1, 1),
+        )
+        self.assertEqual(logs.count(), 10)
+
+        LogEntry.drop_collection()
+
+        # Test microsecond-level ordering/filtering
+        for microsecond in (99, 999, 9999, 10000):
+            LogEntry(
+                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)
+            ).save()
+
+        logs = list(LogEntry.objects.order_by('date'))
+        for next_idx, log in enumerate(logs[:-1], start=1):
+            next_log = logs[next_idx]
+            self.assertTrue(log.date < next_log.date)
+
+        logs = list(LogEntry.objects.order_by('-date'))
+        for next_idx, log in enumerate(logs[:-1], start=1):
+            next_log = logs[next_idx]
+            self.assertTrue(log.date > next_log.date)
+
+        logs = LogEntry.objects.filter(
+            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))
+        self.assertEqual(logs.count(), 4)
+
+    def test_no_default_value(self):
+        class Log(Document):
+            timestamp = ComplexDateTimeField()
+
+        Log.drop_collection()
+
+        log = Log()
+        self.assertIsNone(log.timestamp)
+        log.save()
+
+        fetched_log = Log.objects.with_id(log.id)
+        self.assertIsNone(fetched_log.timestamp)
+
+    def test_default_static_value(self):
+        NOW = datetime.datetime.utcnow()
+        class Log(Document):
+            timestamp = ComplexDateTimeField(default=NOW)
+
+        Log.drop_collection()
+
+        log = Log()
+        self.assertEqual(log.timestamp, NOW)
+        log.save()
+
+        fetched_log = Log.objects.with_id(log.id)
+        self.assertEqual(fetched_log.timestamp, NOW)
+
+    def test_default_callable(self):
+        NOW = datetime.datetime.utcnow()
+
+        class Log(Document):
+            timestamp = ComplexDateTimeField(default=datetime.datetime.utcnow)
+
+        Log.drop_collection()
+
+        log = Log()
+        self.assertGreaterEqual(log.timestamp, NOW)
+        log.save()
+
+        fetched_log = Log.objects.with_id(log.id)
+        self.assertGreaterEqual(fetched_log.timestamp, NOW)
+
+
 if __name__ == '__main__':
     unittest.main()

From b15673c52566dbf1fb1f29005901fda35bd97373 Mon Sep 17 00:00:00 2001
From: Sergey Tereschenko <serg.partizan@gmail.com>
Date: Wed, 5 Sep 2018 11:53:15 +0300
Subject: [PATCH 0691/1519] fixed TypeError on translated choices

join expect strings, but if we use django ugettext_lazy like this:

    choices=[(1, _("One")), (2, _("Two"))]

there will be TypeError: sequence item 0: expected string, __proxy__ found

this commif fixes error by converting label to string
---
 mongoengine/base/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 85906a3e4..aaf99ace3 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1091,6 +1091,6 @@ def __get_field_display(self, field):
             sep = getattr(field, 'display_sep', ' ')
             values = value if field.__class__.__name__ in ('ListField', 'SortedListField') else [value]
             return sep.join([
-                dict(field.choices).get(val, val)
+                six.text_type(dict(field.choices).get(val, val))
                 for val in values or []])
         return value

From 003827e91600dc49c4504eba4cf4e419b406a820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 6 Sep 2018 21:47:06 +0200
Subject: [PATCH 0692/1519] rewrote some poorly written assertions like:
 assertTrue(isinstance(a, b)) assertTrue(a==b) assertTrue(a!=b) assertTrue(a
 in b)

---
 tests/document/class_methods.py |   8 +-
 tests/document/delta.py         |   4 +-
 tests/document/dynamic.py       |   6 +-
 tests/document/indexes.py       |  36 ++++-----
 tests/document/inheritance.py   |  12 +--
 tests/document/instance.py      | 101 ++++++++++++------------
 tests/document/validation.py    |  28 +++----
 tests/fields/fields.py          |  67 ++++++++--------
 tests/fields/file_tests.py      |  18 ++---
 tests/fields/geo.py             |  16 ++--
 tests/queryset/field_list.py    |   2 +-
 tests/queryset/geo.py           |  12 +--
 tests/queryset/queryset.py      | 131 ++++++++++++++++----------------
 tests/queryset/transform.py     |  34 ++++-----
 tests/queryset/visitor.py       |   2 +-
 tests/test_connection.py        |  60 +++++++--------
 tests/test_context_managers.py  |  24 +++---
 tests/test_dereference.py       |  48 ++++++------
 18 files changed, 301 insertions(+), 308 deletions(-)

diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index 2fab1f724..5289e483c 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -66,10 +66,10 @@ def test_drop_collection(self):
         """
         collection_name = 'person'
         self.Person(name='Test').save()
-        self.assertTrue(collection_name in self.db.collection_names())
+        self.assertIn(collection_name,  self.db.collection_names())
 
         self.Person.drop_collection()
-        self.assertFalse(collection_name in self.db.collection_names())
+        self.assertNotIn(collection_name, self.db.collection_names())
 
     def test_register_delete_rule(self):
         """Ensure that register delete rule adds a delete rule to the document
@@ -340,7 +340,7 @@ class Person(Document):
             meta = {'collection': collection_name}
 
         Person(name="Test User").save()
-        self.assertTrue(collection_name in self.db.collection_names())
+        self.assertIn(collection_name, self.db.collection_names())
 
         user_obj = self.db[collection_name].find_one()
         self.assertEqual(user_obj['name'], "Test User")
@@ -349,7 +349,7 @@ class Person(Document):
         self.assertEqual(user_obj.name, "Test User")
 
         Person.drop_collection()
-        self.assertFalse(collection_name in self.db.collection_names())
+        self.assertNotIn(collection_name, self.db.collection_names())
 
     def test_collection_name_and_primary(self):
         """Ensure that a collection with a specified name may be used.
diff --git a/tests/document/delta.py b/tests/document/delta.py
index add4fe8d3..302969567 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -694,7 +694,7 @@ def test_delta_with_dbref_true(self):
         organization.employees.append(person)
         updates, removals = organization._delta()
         self.assertEqual({}, removals)
-        self.assertTrue('employees' in updates)
+        self.assertIn('employees', updates)
 
     def test_delta_with_dbref_false(self):
         person, organization, employee = self.circular_reference_deltas_2(Document, Document, False)
@@ -709,7 +709,7 @@ def test_delta_with_dbref_false(self):
         organization.employees.append(person)
         updates, removals = organization._delta()
         self.assertEqual({}, removals)
-        self.assertTrue('employees' in updates)
+        self.assertIn('employees', updates)
 
     def test_nested_nested_fields_mark_as_changed(self):
         class EmbeddedDoc(EmbeddedDocument):
diff --git a/tests/document/dynamic.py b/tests/document/dynamic.py
index a478df421..94cea134d 100644
--- a/tests/document/dynamic.py
+++ b/tests/document/dynamic.py
@@ -174,8 +174,8 @@ class Employee(self.Person):
 
         Employee.drop_collection()
 
-        self.assertTrue('name' in Employee._fields)
-        self.assertTrue('salary' in Employee._fields)
+        self.assertIn('name', Employee._fields)
+        self.assertIn('salary', Employee._fields)
         self.assertEqual(Employee._get_collection_name(),
                          self.Person._get_collection_name())
 
@@ -189,7 +189,7 @@ class Employee(self.Person):
         self.assertEqual(1, Employee.objects(age=20).count())
 
         joe_bloggs = self.Person.objects.first()
-        self.assertTrue(isinstance(joe_bloggs, Employee))
+        self.assertIsInstance(joe_bloggs, Employee)
 
     def test_embedded_dynamic_document(self):
         """Test dynamic embedded documents"""
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 58e09199e..1cbb4ec3b 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -70,7 +70,7 @@ class BlogPost(InheritFrom):
         self.assertEqual(len(info), 4)
         info = [value['key'] for key, value in info.iteritems()]
         for expected in expected_specs:
-            self.assertTrue(expected['fields'] in info)
+            self.assertIn(expected['fields'], info)
 
     def _index_test_inheritance(self, InheritFrom):
 
@@ -102,7 +102,7 @@ class BlogPost(InheritFrom):
         self.assertEqual(len(info), 4)
         info = [value['key'] for key, value in info.iteritems()]
         for expected in expected_specs:
-            self.assertTrue(expected['fields'] in info)
+            self.assertIn(expected['fields'], info)
 
         class ExtendedBlogPost(BlogPost):
             title = StringField()
@@ -117,7 +117,7 @@ class ExtendedBlogPost(BlogPost):
         info = ExtendedBlogPost.objects._collection.index_information()
         info = [value['key'] for key, value in info.iteritems()]
         for expected in expected_specs:
-            self.assertTrue(expected['fields'] in info)
+            self.assertIn(expected['fields'], info)
 
     def test_indexes_document_inheritance(self):
         """Ensure that indexes are used when meta[indexes] is specified for
@@ -226,7 +226,7 @@ class Person(Document):
         list(Person.objects)
         info = Person.objects._collection.index_information()
         info = [value['key'] for key, value in info.iteritems()]
-        self.assertTrue([('rank.title', 1)] in info)
+        self.assertIn([('rank.title', 1)], info)
 
     def test_explicit_geo2d_index(self):
         """Ensure that geo2d indexes work when created via meta[indexes]
@@ -246,7 +246,7 @@ class Place(Document):
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
         info = [value['key'] for key, value in info.iteritems()]
-        self.assertTrue([('location.point', '2d')] in info)
+        self.assertIn([('location.point', '2d')], info)
 
     def test_explicit_geo2d_index_embedded(self):
         """Ensure that geo2d indexes work when created via meta[indexes]
@@ -269,7 +269,7 @@ class Place(Document):
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
         info = [value['key'] for key, value in info.iteritems()]
-        self.assertTrue([('current.location.point', '2d')] in info)
+        self.assertIn([('current.location.point', '2d')], info)
 
     def test_explicit_geosphere_index(self):
         """Ensure that geosphere indexes work when created via meta[indexes]
@@ -289,7 +289,7 @@ class Place(Document):
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
         info = [value['key'] for key, value in info.iteritems()]
-        self.assertTrue([('location.point', '2dsphere')] in info)
+        self.assertIn([('location.point', '2dsphere')], info)
 
     def test_explicit_geohaystack_index(self):
         """Ensure that geohaystack indexes work when created via meta[indexes]
@@ -311,7 +311,7 @@ class Place(Document):
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
         info = [value['key'] for key, value in info.iteritems()]
-        self.assertTrue([('location.point', 'geoHaystack')] in info)
+        self.assertIn([('location.point', 'geoHaystack')], info)
 
     def test_create_geohaystack_index(self):
         """Ensure that geohaystack indexes can be created
@@ -323,7 +323,7 @@ class Place(Document):
         Place.create_index({'fields': (')location.point', 'name')}, bucketSize=10)
         info = Place._get_collection().index_information()
         info = [value['key'] for key, value in info.iteritems()]
-        self.assertTrue([('location.point', 'geoHaystack'), ('name', 1)] in info)
+        self.assertIn([('location.point', 'geoHaystack'), ('name', 1)], info)
 
     def test_dictionary_indexes(self):
         """Ensure that indexes are used when meta[indexes] contains
@@ -356,7 +356,7 @@ class BlogPost(Document):
                  value.get('unique', False),
                  value.get('sparse', False))
                 for key, value in info.iteritems()]
-        self.assertTrue(([('addDate', -1)], True, True) in info)
+        self.assertIn(([('addDate', -1)], True, True), info)
 
         BlogPost.drop_collection()
 
@@ -803,7 +803,7 @@ class BlogPost(Document):
         info = BlogPost.objects._collection.index_information()
         info = [value['key'] for key, value in info.iteritems()]
         index_item = [('_id', 1), ('comments.comment_id', 1)]
-        self.assertTrue(index_item in info)
+        self.assertIn(index_item, info)
 
     def test_compound_key_embedded(self):
 
@@ -850,8 +850,8 @@ class MyDoc(Document):
 
         info = MyDoc.objects._collection.index_information()
         info = [value['key'] for key, value in info.iteritems()]
-        self.assertTrue([('provider_ids.foo', 1)] in info)
-        self.assertTrue([('provider_ids.bar', 1)] in info)
+        self.assertIn([('provider_ids.foo', 1)], info)
+        self.assertIn([('provider_ids.bar', 1)], info)
 
     def test_sparse_compound_indexes(self):
 
@@ -876,9 +876,9 @@ class Book(Document):
             }
 
         indexes = Book.objects._collection.index_information()
-        self.assertTrue("title_text" in indexes)
+        self.assertIn("title_text", indexes)
         key = indexes["title_text"]["key"]
-        self.assertTrue(('_fts', 'text') in key)
+        self.assertIn(('_fts', 'text'), key)
 
     def test_hashed_indexes(self):
 
@@ -889,8 +889,8 @@ class Book(Document):
             }
 
         indexes = Book.objects._collection.index_information()
-        self.assertTrue("ref_id_hashed" in indexes)
-        self.assertTrue(('ref_id', 'hashed') in indexes["ref_id_hashed"]["key"])
+        self.assertIn("ref_id_hashed", indexes)
+        self.assertIn(('ref_id', 'hashed'), indexes["ref_id_hashed"]["key"])
 
     def test_indexes_after_database_drop(self):
         """
@@ -1013,7 +1013,7 @@ class TestDoc(Document):
         TestDoc.ensure_indexes()
 
         index_info = TestDoc._get_collection().index_information()
-        self.assertTrue('shard_1_1__cls_1_txt_1_1' in index_info)
+        self.assertIn('shard_1_1__cls_1_txt_1_1', index_info)
 
 
 if __name__ == '__main__':
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index 2897e1d15..b2ab1b52b 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -268,7 +268,7 @@ class Dog(Animal):
 
         collection = self.db[Animal._get_collection_name()]
         obj = collection.find_one()
-        self.assertFalse('_cls' in obj)
+        self.assertNotIn('_cls', obj)
 
     def test_cant_turn_off_inheritance_on_subclass(self):
         """Ensure if inheritance is on in a subclass you cant turn it off.
@@ -298,7 +298,7 @@ class Mammal(Animal):
 
         # Check that _cls isn't present in simple documents
         doc = Animal(name='dog')
-        self.assertFalse('_cls' in doc.to_mongo())
+        self.assertNotIn('_cls', doc.to_mongo())
 
     def test_abstract_handle_ids_in_metaclass_properly(self):
 
@@ -374,14 +374,14 @@ class SpecialComment(Comment):
                 pass
 
         doc = Comment(content='test')
-        self.assertFalse('_cls' in doc.to_mongo())
+        self.assertNotIn('_cls', doc.to_mongo())
 
         class Comment(EmbeddedDocument):
             content = StringField()
             meta = {'allow_inheritance': True}
 
         doc = Comment(content='test')
-        self.assertTrue('_cls' in doc.to_mongo())
+        self.assertIn('_cls', doc.to_mongo())
 
     def test_document_inheritance(self):
         """Ensure mutliple inheritance of abstract documents
@@ -434,8 +434,8 @@ class Human(Mammal): pass
             for cls in [Animal, Fish, Guppy]:
                 self.assertEqual(cls._meta[k], v)
 
-        self.assertFalse('collection' in Animal._meta)
-        self.assertFalse('collection' in Mammal._meta)
+        self.assertNotIn('collection', Animal._meta)
+        self.assertNotIn('collection', Mammal._meta)
 
         self.assertEqual(Animal._get_collection_name(), None)
         self.assertEqual(Mammal._get_collection_name(), None)
diff --git a/tests/document/instance.py b/tests/document/instance.py
index cffe4f306..e637b3e60 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -357,7 +357,7 @@ class EmailUser(User):
 
         user_son = User.objects._collection.find_one()
         self.assertEqual(user_son['_id'], 'test')
-        self.assertTrue('username' not in user_son['_id'])
+        self.assertNotIn('username', user_son['_id'])
 
         User.drop_collection()
 
@@ -370,7 +370,7 @@ class EmailUser(User):
 
         user_son = User.objects._collection.find_one()
         self.assertEqual(user_son['_id'], 'mongo')
-        self.assertTrue('username' not in user_son['_id'])
+        self.assertNotIn('username', user_son['_id'])
 
     def test_document_not_registered(self):
         class Place(Document):
@@ -594,10 +594,10 @@ def test_dictionary_access(self):
         # Length = length(assigned fields + id)
         self.assertEqual(len(person), 5)
 
-        self.assertTrue('age' in person)
+        self.assertIn('age', person)
         person.age = None
-        self.assertFalse('age' in person)
-        self.assertFalse('nationality' in person)
+        self.assertNotIn('age', person)
+        self.assertNotIn('nationality', person)
 
     def test_embedded_document_to_mongo(self):
         class Person(EmbeddedDocument):
@@ -627,8 +627,8 @@ def test_embedded_document(self):
         class Comment(EmbeddedDocument):
             content = StringField()
 
-        self.assertTrue('content' in Comment._fields)
-        self.assertFalse('id' in Comment._fields)
+        self.assertIn('content', Comment._fields)
+        self.assertNotIn('id', Comment._fields)
 
     def test_embedded_document_instance(self):
         """Ensure that embedded documents can reference parent instance."""
@@ -1455,9 +1455,9 @@ class UserSubscription(Document):
         user = User.objects.first()
         # Even if stored as ObjectId's internally mongoengine uses DBRefs
         # As ObjectId's aren't automatically derefenced
-        self.assertTrue(isinstance(user._data['orgs'][0], DBRef))
-        self.assertTrue(isinstance(user.orgs[0], Organization))
-        self.assertTrue(isinstance(user._data['orgs'][0], Organization))
+        self.assertIsInstance(user._data['orgs'][0], DBRef)
+        self.assertIsInstance(user.orgs[0], Organization)
+        self.assertIsInstance(user._data['orgs'][0], Organization)
 
         # Changing a value
         with query_counter() as q:
@@ -1837,9 +1837,8 @@ class BlogPost(Document):
         post_obj = BlogPost.objects.first()
 
         # Test laziness
-        self.assertTrue(isinstance(post_obj._data['author'],
-                                   bson.DBRef))
-        self.assertTrue(isinstance(post_obj.author, self.Person))
+        self.assertIsInstance(post_obj._data['author'], bson.DBRef)
+        self.assertIsInstance(post_obj.author, self.Person)
         self.assertEqual(post_obj.author.name, 'Test User')
 
         # Ensure that the dereferenced object may be changed and saved
@@ -2245,12 +2244,12 @@ class BlogPost(Document):
         # Make sure docs are properly identified in a list (__eq__ is used
         # for the comparison).
         all_user_list = list(User.objects.all())
-        self.assertTrue(u1 in all_user_list)
-        self.assertTrue(u2 in all_user_list)
-        self.assertTrue(u3 in all_user_list)
-        self.assertTrue(u4 not in all_user_list)  # New object
-        self.assertTrue(b1 not in all_user_list)  # Other object
-        self.assertTrue(b2 not in all_user_list)  # Other object
+        self.assertIn(u1, all_user_list)
+        self.assertIn(u2, all_user_list)
+        self.assertIn(u3, all_user_list)
+        self.assertNotIn(u4, all_user_list)  # New object
+        self.assertNotIn(b1, all_user_list)  # Other object
+        self.assertNotIn(b2, all_user_list)  # Other object
 
         # Make sure docs can be used as keys in a dict (__hash__ is used
         # for hashing the docs).
@@ -2268,10 +2267,10 @@ class BlogPost(Document):
         # Make sure docs are properly identified in a set (__hash__ is used
         # for hashing the docs).
         all_user_set = set(User.objects.all())
-        self.assertTrue(u1 in all_user_set)
-        self.assertTrue(u4 not in all_user_set)
-        self.assertTrue(b1 not in all_user_list)
-        self.assertTrue(b2 not in all_user_list)
+        self.assertIn(u1, all_user_set)
+        self.assertNotIn(u4, all_user_set)
+        self.assertNotIn(b1, all_user_list)
+        self.assertNotIn(b2, all_user_list)
 
         # Make sure duplicate docs aren't accepted in the set
         self.assertEqual(len(all_user_set), 3)
@@ -2972,7 +2971,7 @@ class Person(Document):
         Person(name="Harry Potter").save()
 
         person = Person.objects.first()
-        self.assertTrue('id' in person._data.keys())
+        self.assertIn('id', person._data.keys())
         self.assertEqual(person._data.get('id'), person.id)
 
     def test_complex_nesting_document_and_embedded_document(self):
@@ -3064,36 +3063,36 @@ class Test(Document):
 
         dbref2 = f._data['test2']
         obj2 = f.test2
-        self.assertTrue(isinstance(dbref2, DBRef))
-        self.assertTrue(isinstance(obj2, Test2))
-        self.assertTrue(obj2.id == dbref2.id)
-        self.assertTrue(obj2 == dbref2)
-        self.assertTrue(dbref2 == obj2)
+        self.assertIsInstance(dbref2, DBRef)
+        self.assertIsInstance(obj2, Test2)
+        self.assertEqual(obj2.id, dbref2.id)
+        self.assertEqual(obj2, dbref2)
+        self.assertEqual(dbref2, obj2)
 
         dbref3 = f._data['test3']
         obj3 = f.test3
-        self.assertTrue(isinstance(dbref3, DBRef))
-        self.assertTrue(isinstance(obj3, Test3))
-        self.assertTrue(obj3.id == dbref3.id)
-        self.assertTrue(obj3 == dbref3)
-        self.assertTrue(dbref3 == obj3)
-
-        self.assertTrue(obj2.id == obj3.id)
-        self.assertTrue(dbref2.id == dbref3.id)
-        self.assertFalse(dbref2 == dbref3)
-        self.assertFalse(dbref3 == dbref2)
-        self.assertTrue(dbref2 != dbref3)
-        self.assertTrue(dbref3 != dbref2)
-
-        self.assertFalse(obj2 == dbref3)
-        self.assertFalse(dbref3 == obj2)
-        self.assertTrue(obj2 != dbref3)
-        self.assertTrue(dbref3 != obj2)
-
-        self.assertFalse(obj3 == dbref2)
-        self.assertFalse(dbref2 == obj3)
-        self.assertTrue(obj3 != dbref2)
-        self.assertTrue(dbref2 != obj3)
+        self.assertIsInstance(dbref3, DBRef)
+        self.assertIsInstance(obj3, Test3)
+        self.assertEqual(obj3.id, dbref3.id)
+        self.assertEqual(obj3, dbref3)
+        self.assertEqual(dbref3, obj3)
+
+        self.assertEqual(obj2.id, obj3.id)
+        self.assertEqual(dbref2.id, dbref3.id)
+        self.assertNotEqual(dbref2, dbref3)
+        self.assertNotEqual(dbref3, dbref2)
+        self.assertNotEqual(dbref2, dbref3)
+        self.assertNotEqual(dbref3, dbref2)
+
+        self.assertNotEqual(obj2, dbref3)
+        self.assertNotEqual(dbref3, obj2)
+        self.assertNotEqual(obj2, dbref3)
+        self.assertNotEqual(dbref3, obj2)
+
+        self.assertNotEqual(obj3, dbref2)
+        self.assertNotEqual(dbref2, obj3)
+        self.assertNotEqual(obj3, dbref2)
+        self.assertNotEqual(dbref2, obj3)
 
     def test_default_values(self):
         class Person(Document):
diff --git a/tests/document/validation.py b/tests/document/validation.py
index 105bc8b0b..30a285b2c 100644
--- a/tests/document/validation.py
+++ b/tests/document/validation.py
@@ -20,16 +20,16 @@ def test_to_dict(self):
 
         # 1st level error schema
         error.errors = {'1st': ValidationError('bad 1st'), }
-        self.assertTrue('1st' in error.to_dict())
+        self.assertIn('1st', error.to_dict())
         self.assertEqual(error.to_dict()['1st'], 'bad 1st')
 
         # 2nd level error schema
         error.errors = {'1st': ValidationError('bad 1st', errors={
             '2nd': ValidationError('bad 2nd'),
         })}
-        self.assertTrue('1st' in error.to_dict())
-        self.assertTrue(isinstance(error.to_dict()['1st'], dict))
-        self.assertTrue('2nd' in error.to_dict()['1st'])
+        self.assertIn('1st', error.to_dict())
+        self.assertIsInstance(error.to_dict()['1st'], dict)
+        self.assertIn('2nd', error.to_dict()['1st'])
         self.assertEqual(error.to_dict()['1st']['2nd'], 'bad 2nd')
 
         # moar levels
@@ -40,10 +40,10 @@ def test_to_dict(self):
                 }),
             }),
         })}
-        self.assertTrue('1st' in error.to_dict())
-        self.assertTrue('2nd' in error.to_dict()['1st'])
-        self.assertTrue('3rd' in error.to_dict()['1st']['2nd'])
-        self.assertTrue('4th' in error.to_dict()['1st']['2nd']['3rd'])
+        self.assertIn('1st', error.to_dict())
+        self.assertIn('2nd', error.to_dict()['1st'])
+        self.assertIn('3rd', error.to_dict()['1st']['2nd'])
+        self.assertIn('4th', error.to_dict()['1st']['2nd']['3rd'])
         self.assertEqual(error.to_dict()['1st']['2nd']['3rd']['4th'],
                          'Inception')
 
@@ -58,7 +58,7 @@ class User(Document):
         try:
             User().validate()
         except ValidationError as e:
-            self.assertTrue("User:None" in e.message)
+            self.assertIn("User:None", e.message)
             self.assertEqual(e.to_dict(), {
                 'username': 'Field is required',
                 'name': 'Field is required'})
@@ -68,7 +68,7 @@ class User(Document):
         try:
             user.save()
         except ValidationError as e:
-            self.assertTrue("User:RossC0" in e.message)
+            self.assertIn("User:RossC0", e.message)
             self.assertEqual(e.to_dict(), {
                 'name': 'Field is required'})
 
@@ -116,7 +116,7 @@ class Doc(Document):
         try:
             Doc(id="bad").validate()
         except ValidationError as e:
-            self.assertTrue("SubDoc:None" in e.message)
+            self.assertIn("SubDoc:None", e.message)
             self.assertEqual(e.to_dict(), {
                 "e": {'val': 'OK could not be converted to int'}})
 
@@ -127,14 +127,14 @@ class Doc(Document):
         doc = Doc.objects.first()
         keys = doc._data.keys()
         self.assertEqual(2, len(keys))
-        self.assertTrue('e' in keys)
-        self.assertTrue('id' in keys)
+        self.assertIn('e', keys)
+        self.assertIn('id', keys)
 
         doc.e.val = "OK"
         try:
             doc.save()
         except ValidationError as e:
-            self.assertTrue("Doc:test" in e.message)
+            self.assertIn("Doc:test", e.message)
             self.assertEqual(e.to_dict(), {
                 "e": {'val': 'OK could not be converted to int'}})
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 4bfd7c748..d6df061dd 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -175,7 +175,7 @@ class Person(Document):
         self.assertEqual(person.name, None)
         self.assertEqual(person.age, 30)
         self.assertEqual(person.userid, 'test')
-        self.assertTrue(isinstance(person.created, datetime.datetime))
+        self.assertIsInstance(person.created, datetime.datetime)
 
         self.assertEqual(person._data['name'], person.name)
         self.assertEqual(person._data['age'], person.age)
@@ -211,7 +211,7 @@ class Person(Document):
         self.assertEqual(person.name, None)
         self.assertEqual(person.age, 30)
         self.assertEqual(person.userid, 'test')
-        self.assertTrue(isinstance(person.created, datetime.datetime))
+        self.assertIsInstance(person.created, datetime.datetime)
         self.assertNotEqual(person.created, datetime.datetime(2014, 6, 12))
 
         self.assertEqual(person._data['name'], person.name)
@@ -1602,8 +1602,8 @@ class Simple(Document):
         e.save()
 
         e2 = Simple.objects.get(id=e.id)
-        self.assertTrue(isinstance(e2.mapping[0], StringSetting))
-        self.assertTrue(isinstance(e2.mapping[1], IntegerSetting))
+        self.assertIsInstance(e2.mapping[0], StringSetting)
+        self.assertIsInstance(e2.mapping[1], IntegerSetting)
 
         # Test querying
         self.assertEqual(
@@ -1772,8 +1772,8 @@ class Simple(Document):
         e.save()
 
         e2 = Simple.objects.get(id=e.id)
-        self.assertTrue(isinstance(e2.mapping['somestring'], StringSetting))
-        self.assertTrue(isinstance(e2.mapping['someint'], IntegerSetting))
+        self.assertIsInstance(e2.mapping['somestring'], StringSetting)
+        self.assertIsInstance(e2.mapping['someint'], IntegerSetting)
 
         # Test querying
         self.assertEqual(
@@ -1857,8 +1857,8 @@ class Extensible(Document):
         e.save()
 
         e2 = Extensible.objects.get(id=e.id)
-        self.assertTrue(isinstance(e2.mapping['somestring'], StringSetting))
-        self.assertTrue(isinstance(e2.mapping['someint'], IntegerSetting))
+        self.assertIsInstance(e2.mapping['somestring'], StringSetting)
+        self.assertIsInstance(e2.mapping['someint'], IntegerSetting)
 
         with self.assertRaises(ValidationError):
             e.mapping['someint'] = 123
@@ -2563,7 +2563,7 @@ class Bookmark(Document):
         bm = Bookmark.objects(bookmark_object=post_1).first()
 
         self.assertEqual(bm.bookmark_object, post_1)
-        self.assertTrue(isinstance(bm.bookmark_object, Post))
+        self.assertIsInstance(bm.bookmark_object, Post)
 
         bm.bookmark_object = link_1
         bm.save()
@@ -2571,7 +2571,7 @@ class Bookmark(Document):
         bm = Bookmark.objects(bookmark_object=link_1).first()
 
         self.assertEqual(bm.bookmark_object, link_1)
-        self.assertTrue(isinstance(bm.bookmark_object, Link))
+        self.assertIsInstance(bm.bookmark_object, Link)
 
     def test_generic_reference_list(self):
         """Ensure that a ListField properly dereferences generic references.
@@ -2818,7 +2818,7 @@ class Doc(Document):
         doc1 = Doc.objects.create()
         doc2 = Doc.objects.create(ref=doc1)
 
-        self.assertTrue(isinstance(doc1.pk, ObjectId))
+        self.assertIsInstance(doc1.pk, ObjectId)
 
         doc = Doc.objects.get(ref=doc1.pk)
         self.assertEqual(doc, doc2)
@@ -3421,13 +3421,13 @@ class Person(Document):
         person.save()
 
         person = Person.objects.first()
-        self.assertTrue(isinstance(person.like, Car))
+        self.assertIsInstance(person.like, Car)
 
         person.like = Dish(food="arroz", number=15)
         person.save()
 
         person = Person.objects.first()
-        self.assertTrue(isinstance(person.like, Dish))
+        self.assertIsInstance(person.like, Dish)
 
     def test_generic_embedded_document_choices(self):
         """Ensure you can limit GenericEmbeddedDocument choices."""
@@ -3452,7 +3452,7 @@ class Person(Document):
         person.save()
 
         person = Person.objects.first()
-        self.assertTrue(isinstance(person.like, Dish))
+        self.assertIsInstance(person.like, Dish)
 
     def test_generic_list_embedded_document_choices(self):
         """Ensure you can limit GenericEmbeddedDocument choices inside
@@ -3479,7 +3479,7 @@ class Person(Document):
         person.save()
 
         person = Person.objects.first()
-        self.assertTrue(isinstance(person.likes[0], Dish))
+        self.assertIsInstance(person.likes[0], Dish)
 
     def test_recursive_validation(self):
         """Ensure that a validation result to_dict is available."""
@@ -3505,18 +3505,17 @@ class Post(Document):
         except ValidationError as error:
             # ValidationError.errors property
             self.assertTrue(hasattr(error, 'errors'))
-            self.assertTrue(isinstance(error.errors, dict))
-            self.assertTrue('comments' in error.errors)
-            self.assertTrue(1 in error.errors['comments'])
-            self.assertTrue(isinstance(error.errors['comments'][1]['content'],
-                                       ValidationError))
+            self.assertIsInstance(error.errors, dict)
+            self.assertIn('comments', error.errors)
+            self.assertIn(1, error.errors['comments'])
+            self.assertIsInstance(error.errors['comments'][1]['content'], ValidationError)
 
             # ValidationError.schema property
             error_dict = error.to_dict()
-            self.assertTrue(isinstance(error_dict, dict))
-            self.assertTrue('comments' in error_dict)
-            self.assertTrue(1 in error_dict['comments'])
-            self.assertTrue('content' in error_dict['comments'][1])
+            self.assertIsInstance(error_dict, dict)
+            self.assertIn('comments', error_dict)
+            self.assertIn(1, error_dict['comments'])
+            self.assertIn('content', error_dict['comments'][1])
             self.assertEqual(error_dict['comments'][1]['content'],
                              u'Field is required')
 
@@ -3632,7 +3631,7 @@ class User(Document):
 
         # Passes regex validation
         user = User(email='me@example.com')
-        self.assertTrue(user.validate() is None)
+        self.assertIsNone(user.validate())
 
     def test_tuples_as_tuples(self):
         """Ensure that tuples remain tuples when they are inside
@@ -3659,10 +3658,10 @@ class TestDoc(Document):
         doc.items = tuples
         doc.save()
         x = TestDoc.objects().get()
-        self.assertTrue(x is not None)
-        self.assertTrue(len(x.items) == 1)
-        self.assertTrue(tuple(x.items[0]) in tuples)
-        self.assertTrue(x.items[0] in tuples)
+        self.assertIsNotNone(x)
+        self.assertEqual(len(x.items), 1)
+        self.assertIn(tuple(x.items[0]), tuples)
+        self.assertIn(x.items[0], tuples)
 
     def test_dynamic_fields_class(self):
         class Doc2(Document):
@@ -3812,8 +3811,8 @@ class TestLongFieldConsideredAsInt64(Document):
 
         doc = TestLongFieldConsideredAsInt64(some_long=42).save()
         db = get_db()
-        self.assertTrue(isinstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64))
-        self.assertTrue(isinstance(doc.some_long, six.integer_types))
+        self.assertIsInstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64)
+        self.assertIsInstance(doc.some_long, six.integer_types)
 
 
 class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):
@@ -4364,7 +4363,7 @@ class Ocorrence(Document):
 
         ocorrence = Ocorrence.objects(animal__tag='heavy').first()
         self.assertEqual(ocorrence.person, "teste")
-        self.assertTrue(isinstance(ocorrence.animal, Animal))
+        self.assertIsInstance(ocorrence.animal, Animal)
 
     def test_cached_reference_field_decimal(self):
         class PersonAuto(Document):
@@ -4681,7 +4680,7 @@ class Ocorrence(Document):
             animal__tag='heavy',
             animal__owner__tp='u').first()
         self.assertEqual(ocorrence.person, "teste")
-        self.assertTrue(isinstance(ocorrence.animal, Animal))
+        self.assertIsInstance(ocorrence.animal, Animal)
 
     def test_cached_reference_embedded_list_fields(self):
         class Owner(EmbeddedDocument):
@@ -4735,7 +4734,7 @@ class Ocorrence(Document):
             animal__tag='heavy',
             animal__owner__tags='cool').first()
         self.assertEqual(ocorrence.person, "teste 2")
-        self.assertTrue(isinstance(ocorrence.animal, Animal))
+        self.assertIsInstance(ocorrence.animal, Animal)
 
 
 class LazyReferenceFieldTest(MongoDBTestCase):
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 841e7c7d4..213e889cb 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -53,7 +53,7 @@ class PutFile(Document):
         putfile.save()
 
         result = PutFile.objects.first()
-        self.assertTrue(putfile == result)
+        self.assertEqual(putfile, result)
         self.assertEqual("%s" % result.the_file, "<GridFSProxy: hello (%s)>" % result.the_file.grid_id)
         self.assertEqual(result.the_file.read(), text)
         self.assertEqual(result.the_file.content_type, content_type)
@@ -71,7 +71,7 @@ class PutFile(Document):
         putfile.save()
 
         result = PutFile.objects.first()
-        self.assertTrue(putfile == result)
+        self.assertEqual(putfile, result)
         self.assertEqual(result.the_file.read(), text)
         self.assertEqual(result.the_file.content_type, content_type)
         result.the_file.delete()
@@ -96,7 +96,7 @@ class StreamFile(Document):
         streamfile.save()
 
         result = StreamFile.objects.first()
-        self.assertTrue(streamfile == result)
+        self.assertEqual(streamfile, result)
         self.assertEqual(result.the_file.read(), text + more_text)
         self.assertEqual(result.the_file.content_type, content_type)
         result.the_file.seek(0)
@@ -132,7 +132,7 @@ class StreamFile(Document):
         streamfile.save()
 
         result = StreamFile.objects.first()
-        self.assertTrue(streamfile == result)
+        self.assertEqual(streamfile, result)
         self.assertEqual(result.the_file.read(), text + more_text)
         # self.assertEqual(result.the_file.content_type, content_type)
         result.the_file.seek(0)
@@ -161,7 +161,7 @@ class SetFile(Document):
         setfile.save()
 
         result = SetFile.objects.first()
-        self.assertTrue(setfile == result)
+        self.assertEqual(setfile, result)
         self.assertEqual(result.the_file.read(), text)
 
         # Try replacing file with new one
@@ -169,7 +169,7 @@ class SetFile(Document):
         result.save()
 
         result = SetFile.objects.first()
-        self.assertTrue(setfile == result)
+        self.assertEqual(setfile, result)
         self.assertEqual(result.the_file.read(), more_text)
         result.the_file.delete()
 
@@ -231,8 +231,8 @@ class TestFile(Document):
         test_file_dupe = TestFile()
         data = test_file_dupe.the_file.read()  # Should be None
 
-        self.assertTrue(test_file.name != test_file_dupe.name)
-        self.assertTrue(test_file.the_file.read() != data)
+        self.assertNotEqual(test_file.name, test_file_dupe.name)
+        self.assertNotEqual(test_file.the_file.read(), data)
 
         TestFile.drop_collection()
 
@@ -291,7 +291,7 @@ class TestFile(Document):
             the_file = FileField()
 
         test_file = TestFile()
-        self.assertFalse(test_file.the_file in [{"test": 1}])
+        self.assertNotIn(test_file.the_file, [{"test": 1}])
 
     def test_file_disk_space(self):
         """ Test disk space usage when we delete/replace a file """
diff --git a/tests/fields/geo.py b/tests/fields/geo.py
index 1c5bccc0b..754f42036 100644
--- a/tests/fields/geo.py
+++ b/tests/fields/geo.py
@@ -298,9 +298,9 @@ class Event(Document):
             polygon = PolygonField()
 
         geo_indicies = Event._geo_indices()
-        self.assertTrue({'fields': [('line', '2dsphere')]} in geo_indicies)
-        self.assertTrue({'fields': [('polygon', '2dsphere')]} in geo_indicies)
-        self.assertTrue({'fields': [('point', '2dsphere')]} in geo_indicies)
+        self.assertIn({'fields': [('line', '2dsphere')]}, geo_indicies)
+        self.assertIn({'fields': [('polygon', '2dsphere')]}, geo_indicies)
+        self.assertIn({'fields': [('point', '2dsphere')]}, geo_indicies)
 
     def test_indexes_2dsphere_embedded(self):
         """Ensure that indexes are created automatically for GeoPointFields.
@@ -316,9 +316,9 @@ class Event(Document):
             venue = EmbeddedDocumentField(Venue)
 
         geo_indicies = Event._geo_indices()
-        self.assertTrue({'fields': [('venue.line', '2dsphere')]} in geo_indicies)
-        self.assertTrue({'fields': [('venue.polygon', '2dsphere')]} in geo_indicies)
-        self.assertTrue({'fields': [('venue.point', '2dsphere')]} in geo_indicies)
+        self.assertIn({'fields': [('venue.line', '2dsphere')]}, geo_indicies)
+        self.assertIn({'fields': [('venue.polygon', '2dsphere')]}, geo_indicies)
+        self.assertIn({'fields': [('venue.point', '2dsphere')]}, geo_indicies)
 
     def test_geo_indexes_recursion(self):
 
@@ -335,9 +335,9 @@ class Parent(Document):
 
         Parent(name='Berlin').save()
         info = Parent._get_collection().index_information()
-        self.assertFalse('location_2d' in info)
+        self.assertNotIn('location_2d', info)
         info = Location._get_collection().index_information()
-        self.assertTrue('location_2d' in info)
+        self.assertIn('location_2d', info)
 
         self.assertEqual(len(Parent._geo_indices()), 0)
         self.assertEqual(len(Location._geo_indices()), 1)
diff --git a/tests/queryset/field_list.py b/tests/queryset/field_list.py
index c07cec3e8..b111238a8 100644
--- a/tests/queryset/field_list.py
+++ b/tests/queryset/field_list.py
@@ -181,7 +181,7 @@ class Employee(self.Person):
         employee.save()
 
         obj = self.Person.objects(id=employee.id).only('age').get()
-        self.assertTrue(isinstance(obj, Employee))
+        self.assertIsInstance(obj, Employee)
 
         # Check field names are looked up properly
         obj = Employee.objects(id=employee.id).only('salary').get()
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 38c0377ed..fea225b22 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -95,9 +95,9 @@ def test_within_distance(self):
             location__within_distance=point_and_distance)
         self.assertEqual(events.count(), 2)
         events = list(events)
-        self.assertTrue(event2 not in events)
-        self.assertTrue(event1 in events)
-        self.assertTrue(event3 in events)
+        self.assertNotIn(event2, events)
+        self.assertIn(event1, events)
+        self.assertIn(event3, events)
 
         # find events within 10 degrees of san francisco
         point_and_distance = [[-122.415579, 37.7566023], 10]
@@ -285,9 +285,9 @@ def test_2dsphere_geo_within_center(self):
             location__geo_within_center=point_and_distance)
         self.assertEqual(events.count(), 2)
         events = list(events)
-        self.assertTrue(event2 not in events)
-        self.assertTrue(event1 in events)
-        self.assertTrue(event3 in events)
+        self.assertNotIn(event2, events)
+        self.assertIn(event1, events)
+        self.assertIn(event3, events)
 
     def _test_embedded(self, point_field_class):
         """Helper test method ensuring given point field class works
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c6aa35943..16268cbf8 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -59,11 +59,10 @@ class Person(Document):
     def test_initialisation(self):
         """Ensure that a QuerySet is correctly initialised by QuerySetManager.
         """
-        self.assertTrue(isinstance(self.Person.objects, QuerySet))
+        self.assertIsInstance(self.Person.objects, QuerySet)
         self.assertEqual(self.Person.objects._collection.name,
                          self.Person._get_collection_name())
-        self.assertTrue(isinstance(self.Person.objects._collection,
-                                   pymongo.collection.Collection))
+        self.assertIsInstance(self.Person.objects._collection, pymongo.collection.Collection)
 
     def test_cannot_perform_joins_references(self):
 
@@ -89,8 +88,8 @@ def test_find(self):
         self.assertEqual(people.count(), 2)
         results = list(people)
 
-        self.assertTrue(isinstance(results[0], self.Person))
-        self.assertTrue(isinstance(results[0].id, (ObjectId, str, unicode)))
+        self.assertIsInstance(results[0], self.Person)
+        self.assertIsInstance(results[0].id, (ObjectId, str, unicode))
 
         self.assertEqual(results[0], user_a)
         self.assertEqual(results[0].name, 'User A')
@@ -225,7 +224,7 @@ def test_find_one(self):
 
         # Retrieve the first person from the database
         person = self.Person.objects.first()
-        self.assertTrue(isinstance(person, self.Person))
+        self.assertIsInstance(person, self.Person)
         self.assertEqual(person.name, "User A")
         self.assertEqual(person.age, 20)
 
@@ -672,13 +671,13 @@ def test_update_results(self):
 
         result = self.Person(name="Bob", age=25).update(
             upsert=True, full_result=True)
-        self.assertTrue(isinstance(result, UpdateResult))
-        self.assertTrue("upserted" in result.raw_result)
+        self.assertIsInstance(result, UpdateResult)
+        self.assertIn("upserted", result.raw_result)
         self.assertFalse(result.raw_result["updatedExisting"])
 
         bob = self.Person.objects.first()
         result = bob.update(set__age=30, full_result=True)
-        self.assertTrue(isinstance(result, UpdateResult))
+        self.assertIsInstance(result, UpdateResult)
         self.assertTrue(result.raw_result["updatedExisting"])
 
         self.Person(name="Bob", age=20).save()
@@ -994,7 +993,7 @@ def test_slave_okay(self):
 
         # Retrieve the first person from the database
         person = self.Person.objects.slave_okay(True).first()
-        self.assertTrue(isinstance(person, self.Person))
+        self.assertIsInstance(person, self.Person)
         self.assertEqual(person.name, "User A")
         self.assertEqual(person.age, 20)
 
@@ -1061,10 +1060,10 @@ def __repr__(self):
         self.assertEqual(docs.count(), 1000)
 
         docs_string = "%s" % docs
-        self.assertTrue("Doc: 0" in docs_string)
+        self.assertIn("Doc: 0", docs_string)
 
         self.assertEqual(docs.count(), 1000)
-        self.assertTrue('(remaining elements truncated)' in "%s" % docs)
+        self.assertIn('(remaining elements truncated)', "%s" % docs)
 
         # Limit and skip
         docs = docs[1:4]
@@ -1281,7 +1280,7 @@ class BlogPost(Document):
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title='whatever').order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertFalse('$orderby' in q.get_ops()[0]['query'])
+            self.assertNotIn('$orderby', q.get_ops()[0]['query'])
 
         # calling an explicit order_by should use a specified sort
         with db_ops_tracker() as q:
@@ -1297,7 +1296,7 @@ class BlogPost(Document):
             qs = BlogPost.objects.filter(title='whatever').order_by('published_date')
             qs.order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertFalse('$orderby' in q.get_ops()[0]['query'])
+            self.assertNotIn('$orderby', q.get_ops()[0]['query'])
 
     def test_no_ordering_for_get(self):
         """ Ensure that Doc.objects.get doesn't use any ordering.
@@ -1316,13 +1315,13 @@ class BlogPost(Document):
         with db_ops_tracker() as q:
             BlogPost.objects.get(title='whatever')
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertFalse('$orderby' in q.get_ops()[0]['query'])
+            self.assertNotIn('$orderby', q.get_ops()[0]['query'])
 
         # Ordering should be ignored for .get even if we set it explicitly
         with db_ops_tracker() as q:
             BlogPost.objects.order_by('-title').get(title='whatever')
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertFalse('$orderby' in q.get_ops()[0]['query'])
+            self.assertNotIn('$orderby', q.get_ops()[0]['query'])
 
     def test_find_embedded(self):
         """Ensure that an embedded document is properly returned from
@@ -1344,15 +1343,15 @@ class BlogPost(Document):
         )
 
         result = BlogPost.objects.first()
-        self.assertTrue(isinstance(result.author, User))
+        self.assertIsInstance(result.author, User)
         self.assertEqual(result.author.name, 'Test User')
 
         result = BlogPost.objects.get(author__name=user.name)
-        self.assertTrue(isinstance(result.author, User))
+        self.assertIsInstance(result.author, User)
         self.assertEqual(result.author.name, 'Test User')
 
         result = BlogPost.objects.get(author={'name': user.name})
-        self.assertTrue(isinstance(result.author, User))
+        self.assertIsInstance(result.author, User)
         self.assertEqual(result.author.name, 'Test User')
 
         # Fails, since the string is not a type that is able to represent the
@@ -1470,7 +1469,7 @@ class BlogPost(Document):
         code_chunks = ['doc["cmnts"];', 'doc["doc-name"],',
                        'doc["cmnts"][i]["body"]']
         for chunk in code_chunks:
-            self.assertTrue(chunk in sub_code)
+            self.assertIn(chunk, sub_code)
 
         results = BlogPost.objects.exec_js(code)
         expected_results = [
@@ -1937,11 +1936,12 @@ class BlogPost(Document):
         # ListField operator
         BlogPost.objects.update(push__tags='mongo')
         post.reload()
-        self.assertTrue('mongo' in post.tags)
+        self.assertIn('mongo', post.tags)
 
         BlogPost.objects.update_one(push_all__tags=['db', 'nosql'])
         post.reload()
-        self.assertTrue('db' in post.tags and 'nosql' in post.tags)
+        self.assertIn('db', post.tags)
+        self.assertIn('nosql', post.tags)
 
         tags = post.tags[:-1]
         BlogPost.objects.update(pop__tags=1)
@@ -3274,8 +3274,8 @@ class News(Document):
 
         News.drop_collection()
         info = News.objects._collection.index_information()
-        self.assertTrue('title_text_content_text' in info)
-        self.assertTrue('textIndexVersion' in info['title_text_content_text'])
+        self.assertIn('title_text_content_text', info)
+        self.assertIn('textIndexVersion', info['title_text_content_text'])
 
         News(title="Neymar quebrou a vertebra",
              content="O Brasil sofre com a perda de Neymar").save()
@@ -3309,15 +3309,15 @@ class News(Document):
                 '$search': 'dilma', '$language': 'pt'},
                 'is_active': False})
 
-        self.assertEqual(new.is_active, False)
-        self.assertTrue('dilma' in new.content)
-        self.assertTrue('planejamento' in new.title)
+        self.assertFalse(new.is_active)
+        self.assertIn('dilma', new.content)
+        self.assertIn('planejamento', new.title)
 
         query = News.objects.search_text("candidata")
         self.assertEqual(query._search_text, "candidata")
         new = query.first()
 
-        self.assertTrue(isinstance(new.get_text_score(), float))
+        self.assertIsInstance(new.get_text_score(), float)
 
         # count
         query = News.objects.search_text('brasil').order_by('$text_score')
@@ -3612,7 +3612,7 @@ class Group(Document):
         Group.objects(id=group.id).update(set__members=[user1, user2])
         group.reload()
 
-        self.assertTrue(len(group.members) == 2)
+        self.assertEqual(len(group.members), 2)
         self.assertEqual(group.members[0].name, user1.name)
         self.assertEqual(group.members[1].name, user2.name)
 
@@ -3643,13 +3643,13 @@ class BlogPost(Document):
 
         self.assertEqual(len(objects), 3)
 
-        self.assertTrue(post_1.id in objects)
-        self.assertTrue(post_2.id in objects)
-        self.assertTrue(post_5.id in objects)
+        self.assertIn(post_1.id, objects)
+        self.assertIn(post_2.id, objects)
+        self.assertIn(post_5.id, objects)
 
-        self.assertTrue(objects[post_1.id].title == post_1.title)
-        self.assertTrue(objects[post_2.id].title == post_2.title)
-        self.assertTrue(objects[post_5.id].title == post_5.title)
+        self.assertEqual(objects[post_1.id].title, post_1.title)
+        self.assertEqual(objects[post_2.id].title, post_2.title)
+        self.assertEqual(objects[post_5.id].title, post_5.title)
 
         BlogPost.drop_collection()
 
@@ -3669,7 +3669,7 @@ class Post(Document):
 
         Post.drop_collection()
 
-        self.assertTrue(isinstance(Post.objects, CustomQuerySet))
+        self.assertIsInstance(Post.objects, CustomQuerySet)
         self.assertFalse(Post.objects.not_empty())
 
         Post().save()
@@ -3694,7 +3694,7 @@ class Post(Document):
 
         Post.drop_collection()
 
-        self.assertTrue(isinstance(Post.objects, CustomQuerySet))
+        self.assertIsInstance(Post.objects, CustomQuerySet)
         self.assertFalse(Post.objects.not_empty())
 
         Post().save()
@@ -3741,7 +3741,7 @@ class Post(Base):
             pass
 
         Post.drop_collection()
-        self.assertTrue(isinstance(Post.objects, CustomQuerySet))
+        self.assertIsInstance(Post.objects, CustomQuerySet)
         self.assertFalse(Post.objects.not_empty())
 
         Post().save()
@@ -3769,7 +3769,7 @@ class Post(Base):
             pass
 
         Post.drop_collection()
-        self.assertTrue(isinstance(Post.objects, CustomQuerySet))
+        self.assertIsInstance(Post.objects, CustomQuerySet)
         self.assertFalse(Post.objects.not_empty())
 
         Post().save()
@@ -3860,17 +3860,17 @@ class Number(Document):
 
         test = Number.objects
         test2 = test.clone()
-        self.assertFalse(test == test2)
+        self.assertNotEqual(test, test2)
         self.assertEqual(test.count(), test2.count())
 
         test = test.filter(n__gt=11)
         test2 = test.clone()
-        self.assertFalse(test == test2)
+        self.assertNotEqual(test, test2)
         self.assertEqual(test.count(), test2.count())
 
         test = test.limit(10)
         test2 = test.clone()
-        self.assertFalse(test == test2)
+        self.assertNotEqual(test, test2)
         self.assertEqual(test.count(), test2.count())
 
         Number.drop_collection()
@@ -3960,7 +3960,7 @@ class Comment(Document):
                  value.get('unique', False),
                  value.get('sparse', False))
                 for key, value in info.iteritems()]
-        self.assertTrue(([('_cls', 1), ('message', 1)], False, False) in info)
+        self.assertIn(([('_cls', 1), ('message', 1)], False, False), info)
 
     def test_where(self):
         """Ensure that where clauses work.
@@ -3984,13 +3984,13 @@ class IntPair(Document):
             'this["fielda"] >= this["fieldb"]', query._where_clause)
         results = list(query)
         self.assertEqual(2, len(results))
-        self.assertTrue(a in results)
-        self.assertTrue(c in results)
+        self.assertIn(a, results)
+        self.assertIn(c, results)
 
         query = IntPair.objects.where('this[~fielda] == this[~fieldb]')
         results = list(query)
         self.assertEqual(1, len(results))
-        self.assertTrue(a in results)
+        self.assertIn(a, results)
 
         query = IntPair.objects.where(
             'function() { return this[~fielda] >= this[~fieldb] }')
@@ -3998,8 +3998,8 @@ class IntPair(Document):
             'function() { return this["fielda"] >= this["fieldb"] }', query._where_clause)
         results = list(query)
         self.assertEqual(2, len(results))
-        self.assertTrue(a in results)
-        self.assertTrue(c in results)
+        self.assertIn(a, results)
+        self.assertIn(c, results)
 
         with self.assertRaises(TypeError):
             list(IntPair.objects.where(fielda__gte=3))
@@ -4381,7 +4381,7 @@ class Test(Document):
 
         Test.drop_collection()
         Test.objects(test='foo').update_one(upsert=True, set__test='foo')
-        self.assertFalse('_cls' in Test._collection.find_one())
+        self.assertNotIn('_cls', Test._collection.find_one())
 
         class Test(Document):
             meta = {'allow_inheritance': True}
@@ -4390,7 +4390,7 @@ class Test(Document):
         Test.drop_collection()
 
         Test.objects(test='foo').update_one(upsert=True, set__test='foo')
-        self.assertTrue('_cls' in Test._collection.find_one())
+        self.assertIn('_cls', Test._collection.find_one())
 
     def test_update_upsert_looks_like_a_digit(self):
         class MyDoc(DynamicDocument):
@@ -4602,8 +4602,8 @@ class User(Document):
 
         users = User.objects.only('name', 'price').as_pymongo()
         results = list(users)
-        self.assertTrue(isinstance(results[0], dict))
-        self.assertTrue(isinstance(results[1], dict))
+        self.assertIsInstance(results[0], dict)
+        self.assertIsInstance(results[1], dict)
         self.assertEqual(results[0]['name'], 'Bob Dole')
         self.assertEqual(results[0]['price'], 1.11)
         self.assertEqual(results[1]['name'], 'Barack Obama')
@@ -4611,8 +4611,8 @@ class User(Document):
 
         users = User.objects.only('name', 'last_login').as_pymongo()
         results = list(users)
-        self.assertTrue(isinstance(results[0], dict))
-        self.assertTrue(isinstance(results[1], dict))
+        self.assertIsInstance(results[0], dict)
+        self.assertIsInstance(results[1], dict)
         self.assertEqual(results[0], {
             'name': 'Bob Dole'
         })
@@ -4669,12 +4669,10 @@ class User(Document):
         User(name="Bob Dole", organization=whitehouse).save()
 
         qs = User.objects()
-        self.assertTrue(isinstance(qs.first().organization, Organization))
-        self.assertFalse(isinstance(qs.no_dereference().first().organization,
-                                    Organization))
-        self.assertFalse(isinstance(qs.no_dereference().get().organization,
-                                    Organization))
-        self.assertTrue(isinstance(qs.first().organization, Organization))
+        self.assertIsInstance(qs.first().organization, Organization)
+        self.assertNotIsInstance(qs.no_dereference().first().organization, Organization)
+        self.assertNotIsInstance(qs.no_dereference().get().organization, Organization)
+        self.assertIsInstance(qs.first().organization, Organization)
 
     def test_no_dereference_embedded_doc(self):
 
@@ -4707,9 +4705,9 @@ class Organization(Document):
 
         result = Organization.objects().no_dereference().first()
 
-        self.assertTrue(isinstance(result.admin[0], (DBRef, ObjectId)))
-        self.assertTrue(isinstance(result.member.user, (DBRef, ObjectId)))
-        self.assertTrue(isinstance(result.members[0].user, (DBRef, ObjectId)))
+        self.assertIsInstance(result.admin[0], (DBRef, ObjectId))
+        self.assertIsInstance(result.member.user, (DBRef, ObjectId))
+        self.assertIsInstance(result.members[0].user, (DBRef, ObjectId))
 
     def test_cached_queryset(self):
         class Person(Document):
@@ -5052,7 +5050,7 @@ class Person(Document):
             op = q.db.system.profile.find({"ns":
                                            {"$ne": "%s.system.indexes" % q.db.name}})[0]
 
-            self.assertFalse('$orderby' in op['query'],
+            self.assertNotIn('$orderby', op['query'],
                              'BaseQuerySet cannot use orderby in if stmt')
 
         with query_counter() as p:
@@ -5063,8 +5061,7 @@ class Person(Document):
             op = p.db.system.profile.find({"ns":
                                            {"$ne": "%s.system.indexes" % q.db.name}})[0]
 
-            self.assertTrue('$orderby' in op['query'],
-                            'BaseQuerySet cannot remove orderby in for loop')
+            self.assertIn('$orderby', op['query'], 'BaseQuerySet cannot remove orderby in for loop')
 
     def test_bool_with_ordering_from_meta_dict(self):
 
@@ -5088,7 +5085,7 @@ class Person(Document):
             op = q.db.system.profile.find({"ns":
                                            {"$ne": "%s.system.indexes" % q.db.name}})[0]
 
-            self.assertFalse('$orderby' in op['query'],
+            self.assertNotIn('$orderby', op['query'],
                              'BaseQuerySet must remove orderby from meta in boolen test')
 
             self.assertEqual(Person.objects.first().name, 'A')
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 380984320..8064f09c6 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -48,15 +48,15 @@ class Doc(Document):
 
         for k, v in (("set", "$set"), ("set_on_insert", "$setOnInsert"), ("push", "$push")):
             update = transform.update(DicDoc, **{"%s__dictField__test" % k: doc})
-            self.assertTrue(isinstance(update[v]["dictField.test"], dict))
+            self.assertIsInstance(update[v]["dictField.test"], dict)
 
         # Update special cases
         update = transform.update(DicDoc, unset__dictField__test=doc)
         self.assertEqual(update["$unset"]["dictField.test"], 1)
 
         update = transform.update(DicDoc, pull__dictField__test=doc)
-        self.assertTrue(isinstance(update["$pull"]["dictField"]["test"], dict))
-        
+        self.assertIsInstance(update["$pull"]["dictField"]["test"], dict)
+
         update = transform.update(LisDoc, pull__foo__in=['a'])
         self.assertEqual(update, {'$pull': {'foo': {'$in': ['a']}}})
 
@@ -88,17 +88,15 @@ class BlogPost(Document):
         post = BlogPost(**data)
         post.save()
 
-        self.assertTrue('postTitle' in
-                        BlogPost.objects(title=data['title'])._query)
+        self.assertIn('postTitle', BlogPost.objects(title=data['title'])._query)
         self.assertFalse('title' in
                          BlogPost.objects(title=data['title'])._query)
         self.assertEqual(BlogPost.objects(title=data['title']).count(), 1)
 
-        self.assertTrue('_id' in BlogPost.objects(pk=post.id)._query)
+        self.assertIn('_id', BlogPost.objects(pk=post.id)._query)
         self.assertEqual(BlogPost.objects(pk=post.id).count(), 1)
 
-        self.assertTrue('postComments.commentContent' in
-                        BlogPost.objects(comments__content='test')._query)
+        self.assertIn('postComments.commentContent', BlogPost.objects(comments__content='test')._query)
         self.assertEqual(BlogPost.objects(comments__content='test').count(), 1)
 
         BlogPost.drop_collection()
@@ -116,8 +114,8 @@ class BlogPost(Document):
         post = BlogPost(**data)
         post.save()
 
-        self.assertTrue('_id' in BlogPost.objects(pk=data['title'])._query)
-        self.assertTrue('_id' in BlogPost.objects(title=data['title'])._query)
+        self.assertIn('_id', BlogPost.objects(pk=data['title'])._query)
+        self.assertIn('_id', BlogPost.objects(title=data['title'])._query)
         self.assertEqual(BlogPost.objects(pk=data['title']).count(), 1)
 
         BlogPost.drop_collection()
@@ -260,31 +258,31 @@ class Event(Document):
         events = Event.objects(location__within=box)
         with self.assertRaises(InvalidQueryError):
             events.count()
-    
+
     def test_update_pull_for_list_fields(self):
-        """ 
-        Test added to check pull operation in update for 
+        """
+        Test added to check pull operation in update for
         EmbeddedDocumentListField which is inside a EmbeddedDocumentField
         """
         class Word(EmbeddedDocument):
             word = StringField()
             index = IntField()
-        
+
         class SubDoc(EmbeddedDocument):
             heading = ListField(StringField())
             text = EmbeddedDocumentListField(Word)
-        
+
         class MainDoc(Document):
             title = StringField()
             content = EmbeddedDocumentField(SubDoc)
-        
+
         word = Word(word='abc', index=1)
         update = transform.update(MainDoc, pull__content__text=word)
         self.assertEqual(update, {'$pull': {'content.text': SON([('word', u'abc'), ('index', 1)])}})
 
         update = transform.update(MainDoc, pull__content__heading='xyz')
         self.assertEqual(update, {'$pull': {'content.heading': 'xyz'}})
-        
-        
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/queryset/visitor.py b/tests/queryset/visitor.py
index 6f020e881..7b68cfb07 100644
--- a/tests/queryset/visitor.py
+++ b/tests/queryset/visitor.py
@@ -196,7 +196,7 @@ class TestDoc(Document):
 
         test2 = test.clone()
         self.assertEqual(test2.count(), 3)
-        self.assertFalse(test2 == test)
+        self.assertNotEqual(test2, test)
 
         test3 = test2.filter(x=6)
         self.assertEqual(test3.count(), 1)
diff --git a/tests/test_connection.py b/tests/test_connection.py
index f58b1a3e0..88d63cdb5 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -39,15 +39,15 @@ def test_connect(self):
         connect('mongoenginetest')
 
         conn = get_connection()
-        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
-        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertIsInstance(db, pymongo.database.Database)
         self.assertEqual(db.name, 'mongoenginetest')
 
         connect('mongoenginetest2', alias='testdb')
         conn = get_connection('testdb')
-        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
     def test_connect_in_mocking(self):
         """Ensure that the connect() method works properly in mocking.
@@ -59,31 +59,31 @@ def test_connect_in_mocking(self):
 
         connect('mongoenginetest', host='mongomock://localhost')
         conn = get_connection()
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect('mongoenginetest2', host='mongomock://localhost', alias='testdb2')
         conn = get_connection('testdb2')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect('mongoenginetest3', host='mongodb://localhost', is_mock=True, alias='testdb3')
         conn = get_connection('testdb3')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect('mongoenginetest4', is_mock=True, alias='testdb4')
         conn = get_connection('testdb4')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect(host='mongodb://localhost:27017/mongoenginetest5', is_mock=True, alias='testdb5')
         conn = get_connection('testdb5')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect(host='mongomock://localhost:27017/mongoenginetest6', alias='testdb6')
         conn = get_connection('testdb6')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect(host='mongomock://localhost:27017/mongoenginetest7', is_mock=True, alias='testdb7')
         conn = get_connection('testdb7')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
     def test_connect_with_host_list(self):
         """Ensure that the connect() method works when host is a list
@@ -97,27 +97,27 @@ def test_connect_with_host_list(self):
 
         connect(host=['mongomock://localhost'])
         conn = get_connection()
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect(host=['mongodb://localhost'], is_mock=True,  alias='testdb2')
         conn = get_connection('testdb2')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect(host=['localhost'], is_mock=True,  alias='testdb3')
         conn = get_connection('testdb3')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect(host=['mongomock://localhost:27017', 'mongomock://localhost:27018'], alias='testdb4')
         conn = get_connection('testdb4')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect(host=['mongodb://localhost:27017', 'mongodb://localhost:27018'], is_mock=True,  alias='testdb5')
         conn = get_connection('testdb5')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
         connect(host=['localhost:27017', 'localhost:27018'], is_mock=True,  alias='testdb6')
         conn = get_connection('testdb6')
-        self.assertTrue(isinstance(conn, mongomock.MongoClient))
+        self.assertIsInstance(conn, mongomock.MongoClient)
 
     def test_disconnect(self):
         """Ensure that the disconnect() method works properly
@@ -163,10 +163,10 @@ def test_connect_uri(self):
         connect("testdb_uri", host='mongodb://username:password@localhost/mongoenginetest')
 
         conn = get_connection()
-        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
-        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertIsInstance(db, pymongo.database.Database)
         self.assertEqual(db.name, 'mongoenginetest')
 
         c.admin.system.users.remove({})
@@ -179,10 +179,10 @@ def test_connect_uri_without_db(self):
         connect("mongoenginetest", host='mongodb://localhost/')
 
         conn = get_connection()
-        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
-        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertIsInstance(db, pymongo.database.Database)
         self.assertEqual(db.name, 'mongoenginetest')
 
     def test_connect_uri_default_db(self):
@@ -192,10 +192,10 @@ def test_connect_uri_default_db(self):
         connect(host='mongodb://localhost/')
 
         conn = get_connection()
-        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
-        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertIsInstance(db, pymongo.database.Database)
         self.assertEqual(db.name, 'test')
 
     def test_uri_without_credentials_doesnt_override_conn_settings(self):
@@ -242,7 +242,7 @@ def test_connect_uri_with_authsource(self):
                   'mongoenginetest?authSource=admin')
         )
         db = get_db('test2')
-        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertIsInstance(db, pymongo.database.Database)
         self.assertEqual(db.name, 'mongoenginetest')
 
         # Clear all users
@@ -255,10 +255,10 @@ def test_register_connection(self):
 
         self.assertRaises(MongoEngineConnectionError, get_connection)
         conn = get_connection('testdb')
-        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db('testdb')
-        self.assertTrue(isinstance(db, pymongo.database.Database))
+        self.assertIsInstance(db, pymongo.database.Database)
         self.assertEqual(db.name, 'mongoenginetest2')
 
     def test_register_connection_defaults(self):
@@ -267,7 +267,7 @@ def test_register_connection_defaults(self):
         register_connection('testdb', 'mongoenginetest', host=None, port=None)
 
         conn = get_connection('testdb')
-        self.assertTrue(isinstance(conn, pymongo.mongo_client.MongoClient))
+        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
     def test_connection_kwargs(self):
         """Ensure that connection kwargs get passed to pymongo."""
@@ -326,7 +326,7 @@ def test_connect_with_replicaset_via_uri(self):
         if IS_PYMONGO_3:
             c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
             db = get_db()
-            self.assertTrue(isinstance(db, pymongo.database.Database))
+            self.assertIsInstance(db, pymongo.database.Database)
             self.assertEqual(db.name, 'test')
         else:
             # PyMongo < v3.x raises an exception:
@@ -343,7 +343,7 @@ def test_connect_with_replicaset_via_kwargs(self):
             self.assertEqual(c._MongoClient__options.replica_set_name,
                              'local-rs')
             db = get_db()
-            self.assertTrue(isinstance(db, pymongo.database.Database))
+            self.assertIsInstance(db, pymongo.database.Database)
             self.assertEqual(db.name, 'test')
         else:
             # PyMongo < v3.x raises an exception:
@@ -377,8 +377,8 @@ def test_multiple_connection_settings(self):
 
         mongo_connections = mongoengine.connection._connections
         self.assertEqual(len(mongo_connections.items()), 2)
-        self.assertTrue('t1' in mongo_connections.keys())
-        self.assertTrue('t2' in mongo_connections.keys())
+        self.assertIn('t1', mongo_connections.keys())
+        self.assertIn('t2', mongo_connections.keys())
         if not IS_PYMONGO_3:
             self.assertEqual(mongo_connections['t1'].host, 'localhost')
             self.assertEqual(mongo_connections['t2'].host, '127.0.0.1')
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 8c96016cc..3c93b96fe 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -89,15 +89,15 @@ class Group(Document):
 
         with no_dereference(Group) as Group:
             group = Group.objects.first()
-            self.assertTrue(all([not isinstance(m, User)
-                                for m in group.members]))
-            self.assertFalse(isinstance(group.ref, User))
-            self.assertFalse(isinstance(group.generic, User))
+            for m in group.members:
+                self.assertNotIsInstance(m, User)
+            self.assertNotIsInstance(group.ref, User)
+            self.assertNotIsInstance(group.generic, User)
 
-        self.assertTrue(all([isinstance(m, User)
-                             for m in group.members]))
-        self.assertTrue(isinstance(group.ref, User))
-        self.assertTrue(isinstance(group.generic, User))
+        for m in group.members:
+            self.assertIsInstance(m, User)
+        self.assertIsInstance(group.ref, User)
+        self.assertIsInstance(group.generic, User)
 
     def test_no_dereference_context_manager_dbref(self):
         """Ensure that DBRef items in ListFields aren't dereferenced.
@@ -129,13 +129,13 @@ class Group(Document):
             group = Group.objects.first()
             self.assertTrue(all([not isinstance(m, User)
                                 for m in group.members]))
-            self.assertFalse(isinstance(group.ref, User))
-            self.assertFalse(isinstance(group.generic, User))
+            self.assertNotIsInstance(group.ref, User)
+            self.assertNotIsInstance(group.generic, User)
 
         self.assertTrue(all([isinstance(m, User)
                              for m in group.members]))
-        self.assertTrue(isinstance(group.ref, User))
-        self.assertTrue(isinstance(group.generic, User))
+        self.assertIsInstance(group.ref, User)
+        self.assertIsInstance(group.generic, User)
 
     def test_no_sub_classes(self):
         class A(Document):
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 7f58a85b0..8b8bcfb27 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -200,8 +200,8 @@ class Group(Document):
         group = Group(author=user, members=[user]).save()
 
         raw_data = Group._get_collection().find_one()
-        self.assertTrue(isinstance(raw_data['author'], DBRef))
-        self.assertTrue(isinstance(raw_data['members'][0], DBRef))
+        self.assertIsInstance(raw_data['author'], DBRef)
+        self.assertIsInstance(raw_data['members'][0], DBRef)
         group = Group.objects.first()
 
         self.assertEqual(group.author, user)
@@ -224,8 +224,8 @@ class Group(Document):
         self.assertEqual(group.members, [user])
 
         raw_data = Group._get_collection().find_one()
-        self.assertTrue(isinstance(raw_data['author'], ObjectId))
-        self.assertTrue(isinstance(raw_data['members'][0], ObjectId))
+        self.assertIsInstance(raw_data['author'], ObjectId)
+        self.assertIsInstance(raw_data['members'][0], ObjectId)
 
     def test_recursive_reference(self):
         """Ensure that ReferenceFields can reference their own documents.
@@ -469,7 +469,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for m in group_obj.members:
-                self.assertTrue('User' in m.__class__.__name__)
+                self.assertIn('User', m.__class__.__name__)
 
         # Document select_related
         with query_counter() as q:
@@ -485,7 +485,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for m in group_obj.members:
-                self.assertTrue('User' in m.__class__.__name__)
+                self.assertIn('User', m.__class__.__name__)
 
         # Queryset select_related
         with query_counter() as q:
@@ -502,7 +502,7 @@ class Group(Document):
                 self.assertEqual(q, 4)
 
                 for m in group_obj.members:
-                    self.assertTrue('User' in m.__class__.__name__)
+                    self.assertIn('User', m.__class__.__name__)
 
         UserA.drop_collection()
         UserB.drop_collection()
@@ -560,7 +560,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for m in group_obj.members:
-                self.assertTrue('User' in m.__class__.__name__)
+                self.assertIn('User', m.__class__.__name__)
 
         # Document select_related
         with query_counter() as q:
@@ -576,7 +576,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for m in group_obj.members:
-                self.assertTrue('User' in m.__class__.__name__)
+                self.assertIn('User', m.__class__.__name__)
 
         # Queryset select_related
         with query_counter() as q:
@@ -593,7 +593,7 @@ class Group(Document):
                 self.assertEqual(q, 4)
 
                 for m in group_obj.members:
-                    self.assertTrue('User' in m.__class__.__name__)
+                    self.assertIn('User', m.__class__.__name__)
 
         UserA.drop_collection()
         UserB.drop_collection()
@@ -633,7 +633,7 @@ class Group(Document):
             self.assertEqual(q, 2)
 
             for k, m in group_obj.members.iteritems():
-                self.assertTrue(isinstance(m, User))
+                self.assertIsInstance(m, User)
 
         # Document select_related
         with query_counter() as q:
@@ -646,7 +646,7 @@ class Group(Document):
             self.assertEqual(q, 2)
 
             for k, m in group_obj.members.iteritems():
-                self.assertTrue(isinstance(m, User))
+                self.assertIsInstance(m, User)
 
        # Queryset select_related
         with query_counter() as q:
@@ -660,7 +660,7 @@ class Group(Document):
                 self.assertEqual(q, 2)
 
                 for k, m in group_obj.members.iteritems():
-                    self.assertTrue(isinstance(m, User))
+                    self.assertIsInstance(m, User)
 
         User.drop_collection()
         Group.drop_collection()
@@ -715,7 +715,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for k, m in group_obj.members.iteritems():
-                self.assertTrue('User' in m.__class__.__name__)
+                self.assertIn('User', m.__class__.__name__)
 
         # Document select_related
         with query_counter() as q:
@@ -731,7 +731,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for k, m in group_obj.members.iteritems():
-                self.assertTrue('User' in m.__class__.__name__)
+                self.assertIn('User', m.__class__.__name__)
 
         # Queryset select_related
         with query_counter() as q:
@@ -748,7 +748,7 @@ class Group(Document):
                 self.assertEqual(q, 4)
 
                 for k, m in group_obj.members.iteritems():
-                    self.assertTrue('User' in m.__class__.__name__)
+                    self.assertIn('User', m.__class__.__name__)
 
         Group.objects.delete()
         Group().save()
@@ -806,7 +806,7 @@ class Group(Document):
             self.assertEqual(q, 2)
 
             for k, m in group_obj.members.iteritems():
-                self.assertTrue(isinstance(m, UserA))
+                self.assertIsInstance(m, UserA)
 
         # Document select_related
         with query_counter() as q:
@@ -822,7 +822,7 @@ class Group(Document):
             self.assertEqual(q, 2)
 
             for k, m in group_obj.members.iteritems():
-                self.assertTrue(isinstance(m, UserA))
+                self.assertIsInstance(m, UserA)
 
         # Queryset select_related
         with query_counter() as q:
@@ -839,7 +839,7 @@ class Group(Document):
                 self.assertEqual(q, 2)
 
                 for k, m in group_obj.members.iteritems():
-                    self.assertTrue(isinstance(m, UserA))
+                    self.assertIsInstance(m, UserA)
 
         UserA.drop_collection()
         Group.drop_collection()
@@ -894,7 +894,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for k, m in group_obj.members.iteritems():
-                self.assertTrue('User' in m.__class__.__name__)
+                self.assertIn('User', m.__class__.__name__)
 
         # Document select_related
         with query_counter() as q:
@@ -910,7 +910,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for k, m in group_obj.members.iteritems():
-                self.assertTrue('User' in m.__class__.__name__)
+                self.assertIn('User', m.__class__.__name__)
 
         # Queryset select_related
         with query_counter() as q:
@@ -927,7 +927,7 @@ class Group(Document):
                 self.assertEqual(q, 4)
 
                 for k, m in group_obj.members.iteritems():
-                    self.assertTrue('User' in m.__class__.__name__)
+                    self.assertIn('User', m.__class__.__name__)
 
         Group.objects.delete()
         Group().save()
@@ -1209,10 +1209,10 @@ class Book(Document):
 
         # Can't use query_counter across databases - so test the _data object
         book = Book.objects.first()
-        self.assertFalse(isinstance(book._data['author'], User))
+        self.assertNotIsInstance(book._data['author'], User)
 
         book.select_related()
-        self.assertTrue(isinstance(book._data['author'], User))
+        self.assertIsInstance(book._data['author'], User)
 
     def test_non_ascii_pk(self):
         """

From a86092fb6450df0911aea761230451d88027ae60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 6 Sep 2018 22:33:24 +0200
Subject: [PATCH 0693/1519] fix doc for meta index_options

---
 docs/guide/defining-documents.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 366d12c7d..62cbcd673 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -529,7 +529,7 @@ There are a few top level defaults for all indexes that can be set::
         title = StringField()
         rating = StringField()
         meta = {
-            'index_options': {},
+            'index_opts': {},
             'index_background': True,
             'index_cls': False,
             'auto_create_index': True,
@@ -537,7 +537,7 @@ There are a few top level defaults for all indexes that can be set::
         }
 
 
-:attr:`index_options` (Optional)
+:attr:`index_opts` (Optional)
     Set any default index options - see the `full options list <http://docs.mongodb.org/manual/reference/method/db.collection.ensureIndex/#db.collection.ensureIndex>`_
 
 :attr:`index_background` (Optional)

From 7fc5ced3af3380ffec60787a508a7a049180d194 Mon Sep 17 00:00:00 2001
From: Stefan VanBuren <vanburenstefan@gmail.com>
Date: Thu, 6 Sep 2018 16:50:31 -0400
Subject: [PATCH 0694/1519] Update link to index options

---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 366d12c7d..06666022d 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -538,7 +538,7 @@ There are a few top level defaults for all indexes that can be set::
 
 
 :attr:`index_options` (Optional)
-    Set any default index options - see the `full options list <http://docs.mongodb.org/manual/reference/method/db.collection.ensureIndex/#db.collection.ensureIndex>`_
+    Set any default index options - see the `full options list <https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#ensureindex-options>`_
 
 :attr:`index_background` (Optional)
     Set the default value for if an index should be indexed in the background

From aa49283fa9394ede764c26a0329ccae3c62b5375 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Fri, 7 Sep 2018 15:39:55 +0800
Subject: [PATCH 0695/1519] fix trailing whitespace

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index eb0fd669d..6fddc381d 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -775,7 +775,7 @@ def limit(self, n):
         """Limit the number of returned documents to `n`. This may also be
         achieved using array-slicing syntax (e.g. ``User.objects[:5]``).
 
-        :param n: the maximum number of objects to return if n is greater than 0. 
+        :param n: the maximum number of objects to return if n is greater than 0.
         When 0 is passed, returns all the documents in the cursor
         """
         queryset = self.clone()

From f89214f9cf39d2a06fd3611ffb6e1647e6fce4b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 8 Sep 2018 22:20:49 +0200
Subject: [PATCH 0696/1519] Fixes bug where an EmbeddedDocument that shares the
 same id of its parent Document could be missing updates when .save was called
 Fixes #1768, Fixes #1685

---
 mongoengine/base/document.py | 53 +++++++++++++++++------------------
 tests/document/instance.py   | 54 ++++++++++++++++++++++++++++++++++++
 tests/test_dereference.py    |  1 -
 3 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 85906a3e4..7a3e22f93 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -503,7 +503,13 @@ def _clear_changed_fields(self):
 
         self._changed_fields = []
 
-    def _nestable_types_changed_fields(self, changed_fields, key, data, inspected):
+    def _nestable_types_changed_fields(self, changed_fields, base_key, data):
+        """Inspect nested data for changed fields
+
+        :param changed_fields: Previously collected changed fields
+        :param base_key: The base key that must be used to prepend changes to this data
+        :param data: data to inspect for changes
+        """
         # Loop list / dict fields as they contain documents
         # Determine the iterator to use
         if not hasattr(data, 'items'):
@@ -511,57 +517,48 @@ def _nestable_types_changed_fields(self, changed_fields, key, data, inspected):
         else:
             iterator = data.iteritems()
 
-        for index, value in iterator:
-            list_key = '%s%s.' % (key, index)
+        for index_or_key, value in iterator:
+            item_key = '%s%s.' % (base_key, index_or_key)
             # don't check anything lower if this key is already marked
             # as changed.
-            if list_key[:-1] in changed_fields:
+            if item_key[:-1] in changed_fields:
                 continue
+
             if hasattr(value, '_get_changed_fields'):
-                changed = value._get_changed_fields(inspected)
-                changed_fields += ['%s%s' % (list_key, k)
-                                   for k in changed if k]
+                changed = value._get_changed_fields()
+                changed_fields += ['%s%s' % (item_key, k) for k in changed if k]
             elif isinstance(value, (list, tuple, dict)):
                 self._nestable_types_changed_fields(
-                    changed_fields, list_key, value, inspected)
+                    changed_fields, item_key, value)
 
-    def _get_changed_fields(self, inspected=None):
+    def _get_changed_fields(self):
         """Return a list of all fields that have explicitly been changed.
         """
         EmbeddedDocument = _import_class('EmbeddedDocument')
-        DynamicEmbeddedDocument = _import_class('DynamicEmbeddedDocument')
         ReferenceField = _import_class('ReferenceField')
         SortedListField = _import_class('SortedListField')
 
         changed_fields = []
         changed_fields += getattr(self, '_changed_fields', [])
 
-        inspected = inspected or set()
-        if hasattr(self, 'id') and isinstance(self.id, Hashable):
-            if self.id in inspected:
-                return changed_fields
-            inspected.add(self.id)
-
         for field_name in self._fields_ordered:
             db_field_name = self._db_field_map.get(field_name, field_name)
             key = '%s.' % db_field_name
             data = self._data.get(field_name, None)
             field = self._fields.get(field_name)
 
-            if hasattr(data, 'id'):
-                if data.id in inspected:
-                    continue
-            if isinstance(field, ReferenceField):
+            if db_field_name in changed_fields:
+                # Whole field already marked as changed, no need to go further
+                continue
+
+            if isinstance(field, ReferenceField):   # Don't follow referenced documents
                 continue
-            elif (
-                isinstance(data, (EmbeddedDocument, DynamicEmbeddedDocument)) and
-                db_field_name not in changed_fields
-            ):
+
+            if isinstance(data, EmbeddedDocument):
                 # Find all embedded fields that have been changed
-                changed = data._get_changed_fields(inspected)
+                changed = data._get_changed_fields()
                 changed_fields += ['%s%s' % (key, k) for k in changed if k]
-            elif (isinstance(data, (list, tuple, dict)) and
-                    db_field_name not in changed_fields):
+            elif isinstance(data, (list, tuple, dict)):
                 if (hasattr(field, 'field') and
                         isinstance(field.field, ReferenceField)):
                     continue
@@ -572,7 +569,7 @@ def _get_changed_fields(self, inspected=None):
                         continue
 
                 self._nestable_types_changed_fields(
-                    changed_fields, key, data, inspected)
+                    changed_fields, key, data)
         return changed_fields
 
     def _delta(self):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index e637b3e60..d8ff8b43a 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1422,6 +1422,60 @@ class User(self.Person):
         self.assertEqual(person.age, 21)
         self.assertEqual(person.active, False)
 
+    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop(self):
+        # Refers to Issue #1685
+        class EmbeddedChildModel(EmbeddedDocument):
+            id = DictField(primary_key=True)
+
+        class ParentModel(Document):
+            child = EmbeddedDocumentField(
+                EmbeddedChildModel)
+
+        emb = EmbeddedChildModel(id={'1': [1]})
+        ParentModel(children=emb)._get_changed_fields()
+
+    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop(self):
+        class User(Document):
+            id = IntField(primary_key=True)
+            name = StringField()
+
+        class Message(Document):
+            id = IntField(primary_key=True)
+            author = ReferenceField(User)
+
+        Message.drop_collection()
+
+        # All objects share the same id, but each in a different collection
+        user = User(id=1, name='user-name').save()
+        message = Message(id=1, author=user).save()
+
+        message.author.name = 'tutu'
+        self.assertEqual(message._get_changed_fields(), [])
+        self.assertEqual(user._get_changed_fields(), ['name'])
+
+    def test__get_changed_fields_same_ids_embedded(self):
+        # Refers to Issue #1768
+        class User(EmbeddedDocument):
+            id = IntField()
+            name = StringField()
+
+        class Message(Document):
+            id = IntField(primary_key=True)
+            author = EmbeddedDocumentField(User)
+
+        Message.drop_collection()
+
+        # All objects share the same id, but each in a different collection
+        user = User(id=1, name='user-name')#.save()
+        message = Message(id=1, author=user).save()
+
+        message.author.name = 'tutu'
+        self.assertEqual(message._get_changed_fields(), ['author.name'])
+        message.save()
+
+        message_fetched = Message.objects.with_id(message.id)
+        self.assertEqual(message_fetched.author.name, 'tutu')
+
     def test_query_count_when_saving(self):
         """Ensure references don't cause extra fetches when saving"""
         class Organization(Document):
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 8b8bcfb27..5cf089f47 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -1029,7 +1029,6 @@ class Baz(Document):
         self.assertEqual(type(foo.bar), Bar)
         self.assertEqual(type(foo.baz), Baz)
 
-
     def test_document_reload_reference_integrity(self):
         """
         Ensure reloading a document with multiple similar id

From d6e39b362b7837aa4ca3f84f5b9eccb3adf3e808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bast.gerard@gmail.com>
Date: Fri, 7 Sep 2018 22:51:17 +0200
Subject: [PATCH 0697/1519] Updating inheritance doc

Fixes #429
---
 docs/guide/defining-documents.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 62cbcd673..bf74ad8cf 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -736,6 +736,9 @@ document.::
 
 .. note:: From 0.8 onwards :attr:`allow_inheritance` defaults
           to False, meaning you must set it to True to use inheritance.
+          
+          Setting :attr:`allow_inheritance` to True should also be used in
+          :class:`~mongoengine.EmbeddedDocument` class in case you need to subclass it
 
 Working with existing data
 --------------------------

From 4314fa883fffbbfee056028a4846f98333748e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 9 Sep 2018 15:50:48 +0200
Subject: [PATCH 0698/1519] improve 2-3 codebase compatibility

---
 docs/code/tumblelog.py             | 26 +++++++++++++-------------
 mongoengine/base/common.py         |  8 ++++----
 mongoengine/base/datastructures.py |  2 +-
 mongoengine/base/document.py       |  4 ++--
 mongoengine/base/fields.py         |  2 +-
 mongoengine/dereference.py         |  2 +-
 mongoengine/document.py            | 12 ++++--------
 mongoengine/fields.py              | 13 +++++++++++--
 mongoengine/queryset/base.py       | 17 ++++++++---------
 mongoengine/queryset/field_list.py |  4 +++-
 mongoengine/queryset/manager.py    |  2 +-
 mongoengine/queryset/queryset.py   |  4 ++--
 setup.py                           |  3 +--
 tests/__init__.py                  |  8 ++++----
 tests/document/__init__.py         | 16 ++++++++--------
 tests/fields/__init__.py           |  6 +++---
 tests/queryset/__init__.py         | 12 ++++++------
 17 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/docs/code/tumblelog.py b/docs/code/tumblelog.py
index c10160ea6..796336e61 100644
--- a/docs/code/tumblelog.py
+++ b/docs/code/tumblelog.py
@@ -45,27 +45,27 @@ class LinkPost(Post):
 post2.tags = ['mongoengine']
 post2.save()
 
-print 'ALL POSTS'
-print
+print('ALL POSTS')
+print()
 for post in Post.objects:
-    print post.title
+    print(post.title)
     #print '=' * post.title.count()
-    print "=" * 20
+    print("=" * 20)
 
     if isinstance(post, TextPost):
-        print post.content
+        print(post.content)
 
     if isinstance(post, LinkPost):
-        print 'Link:', post.link_url
+        print('Link:', post.link_url)
 
-    print
-print
+    print()
+print()
 
-print 'POSTS TAGGED \'MONGODB\''
-print
+print('POSTS TAGGED \'MONGODB\'')
+print()
 for post in Post.objects(tags='mongodb'):
-    print post.title
-print
+    print(post.title)
+print()
 
 num_posts = Post.objects(tags='mongodb').count()
-print 'Found %d posts with tag "mongodb"' % num_posts
+print('Found %d posts with tag "mongodb"' % num_posts)
diff --git a/mongoengine/base/common.py b/mongoengine/base/common.py
index f80471efa..dd177920f 100644
--- a/mongoengine/base/common.py
+++ b/mongoengine/base/common.py
@@ -3,10 +3,10 @@
 __all__ = ('UPDATE_OPERATORS', 'get_document', '_document_registry')
 
 
-UPDATE_OPERATORS = set(['set', 'unset', 'inc', 'dec', 'mul',
-                        'pop', 'push', 'push_all', 'pull',
-                        'pull_all', 'add_to_set', 'set_on_insert',
-                        'min', 'max', 'rename'])
+UPDATE_OPERATORS = {'set', 'unset', 'inc', 'dec', 'mul',
+                    'pop', 'push', 'push_all', 'pull',
+                    'pull_all', 'add_to_set', 'set_on_insert',
+                    'min', 'max', 'rename'}
 
 
 _document_registry = {}
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index db292f144..0197ad10e 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -377,7 +377,7 @@ def update(self, **update):
 
 class StrictDict(object):
     __slots__ = ()
-    _special_fields = set(['get', 'pop', 'iteritems', 'items', 'keys', 'create'])
+    _special_fields = {'get', 'pop', 'iteritems', 'items', 'keys', 'create'}
     _classes = {}
 
     def __init__(self, **kwargs):
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 85906a3e4..fdebab239 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -302,7 +302,7 @@ def to_mongo(self, use_db_field=True, fields=None):
         data['_cls'] = self._class_name
 
         # only root fields ['test1.a', 'test2'] => ['test1', 'test2']
-        root_fields = set([f.split('.')[0] for f in fields])
+        root_fields = {f.split('.')[0] for f in fields}
 
         for field_name in self:
             if root_fields and field_name not in root_fields:
@@ -567,7 +567,7 @@ def _get_changed_fields(self, inspected=None):
                     continue
                 elif isinstance(field, SortedListField) and field._ordering:
                     # if ordering is affected whole list is changed
-                    if any(map(lambda d: field._ordering in d._changed_fields, data)):
+                    if any(field._ordering in d._changed_fields for d in data):
                         changed_fields.append(db_field_name)
                         continue
 
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index d25d43056..a0726aa67 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -501,7 +501,7 @@ def __init__(self, auto_index=True, *args, **kwargs):
     def validate(self, value):
         """Validate the GeoJson object based on its type."""
         if isinstance(value, dict):
-            if set(value.keys()) == set(['type', 'coordinates']):
+            if set(value.keys()) == {'type', 'coordinates'}:
                 if value['type'] != self._type:
                     self.error('%s type must be "%s"' %
                                (self._name, self._type))
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 40bc72b21..6c9932230 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -146,7 +146,7 @@ def _fetch_objects(self, doc_type=None):
                 for key, doc in references.iteritems():
                     object_map[(col_name, key)] = doc
             else:  # Generic reference: use the refs data to convert to document
-                if isinstance(doc_type, (ListField, DictField, MapField,)):
+                if isinstance(doc_type, (ListField, DictField, MapField)):
                     continue
 
                 refs = [dbref for dbref in dbrefs
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 25af273d5..cdeed4c6e 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -39,7 +39,7 @@ class InvalidCollectionError(Exception):
     pass
 
 
-class EmbeddedDocument(BaseDocument):
+class EmbeddedDocument(six.with_metaclass(DocumentMetaclass, BaseDocument)):
     """A :class:`~mongoengine.Document` that isn't stored in its own
     collection.  :class:`~mongoengine.EmbeddedDocument`\ s should be used as
     fields on :class:`~mongoengine.Document`\ s through the
@@ -58,7 +58,6 @@ class EmbeddedDocument(BaseDocument):
     # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
     my_metaclass = DocumentMetaclass
-    __metaclass__ = DocumentMetaclass
 
     # A generic embedded document doesn't have any immutable properties
     # that describe it uniquely, hence it shouldn't be hashable. You can
@@ -95,7 +94,7 @@ def reload(self, *args, **kwargs):
         self._instance.reload(*args, **kwargs)
 
 
-class Document(BaseDocument):
+class Document(six.with_metaclass(TopLevelDocumentMetaclass, BaseDocument)):
     """The base class used for defining the structure and properties of
     collections of documents stored in MongoDB. Inherit from this class, and
     add fields as class attributes to define a document's structure.
@@ -150,7 +149,6 @@ class Document(BaseDocument):
     # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
     my_metaclass = TopLevelDocumentMetaclass
-    __metaclass__ = TopLevelDocumentMetaclass
 
     __slots__ = ('__objects',)
 
@@ -996,7 +994,7 @@ def compare_indexes(cls):
         return {'missing': missing, 'extra': extra}
 
 
-class DynamicDocument(Document):
+class DynamicDocument(six.with_metaclass(TopLevelDocumentMetaclass, Document)):
     """A Dynamic Document class allowing flexible, expandable and uncontrolled
     schemas.  As a :class:`~mongoengine.Document` subclass, acts in the same
     way as an ordinary document but has expanded style properties.  Any data
@@ -1013,7 +1011,6 @@ class DynamicDocument(Document):
     # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
     my_metaclass = TopLevelDocumentMetaclass
-    __metaclass__ = TopLevelDocumentMetaclass
 
     _dynamic = True
 
@@ -1029,7 +1026,7 @@ def __delattr__(self, *args, **kwargs):
             super(DynamicDocument, self).__delattr__(*args, **kwargs)
 
 
-class DynamicEmbeddedDocument(EmbeddedDocument):
+class DynamicEmbeddedDocument(six.with_metaclass(DocumentMetaclass, EmbeddedDocument)):
     """A Dynamic Embedded Document class allowing flexible, expandable and
     uncontrolled schemas. See :class:`~mongoengine.DynamicDocument` for more
     information about dynamic documents.
@@ -1038,7 +1035,6 @@ class DynamicEmbeddedDocument(EmbeddedDocument):
     # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
     my_metaclass = DocumentMetaclass
-    __metaclass__ = DocumentMetaclass
 
     _dynamic = True
 
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 244551d2d..f794edff3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -24,6 +24,7 @@
 except ImportError:
     Int64 = long
 
+
 from mongoengine.base import (BaseDocument, BaseField, ComplexBaseField,
                               GeoJsonBaseField, LazyReference, ObjectIdField,
                               get_document)
@@ -41,6 +42,12 @@
     Image = None
     ImageOps = None
 
+if six.PY3:
+    # Useless as long as 2to3 gets executed
+    # as it turns `long` into `int` blindly
+    long = int
+
+
 __all__ = (
     'StringField', 'URLField', 'EmailField', 'IntField', 'LongField',
     'FloatField', 'DecimalField', 'BooleanField', 'DateTimeField', 'DateField',
@@ -597,7 +604,7 @@ def _convert_from_string(self, data):
         >>> ComplexDateTimeField()._convert_from_string(a)
         datetime.datetime(2011, 6, 8, 20, 26, 24, 92284)
         """
-        values = map(int, data.split(self.separator))
+        values = [int(d) for d in data.split(self.separator)]
         return datetime.datetime(*values)
 
     def __get__(self, instance, owner):
@@ -1525,9 +1532,11 @@ def __getattr__(self, name):
     def __get__(self, instance, value):
         return self
 
-    def __nonzero__(self):
+    def __bool__(self):
         return bool(self.grid_id)
 
+    __nonzero__ = __bool__  # For Py2 support
+
     def __getstate__(self):
         self_dict = self.__dict__
         self_dict['_fs'] = None
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 6fddc381d..0be486542 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -2,7 +2,6 @@
 
 import copy
 import itertools
-import operator
 import pprint
 import re
 import warnings
@@ -209,14 +208,12 @@ def _has_data(self):
         queryset = self.order_by()
         return False if queryset.first() is None else True
 
-    def __nonzero__(self):
-        """Avoid to open all records in an if stmt in Py2."""
-        return self._has_data()
-
     def __bool__(self):
         """Avoid to open all records in an if stmt in Py3."""
         return self._has_data()
 
+    __nonzero__ = __bool__  # For Py2 support
+
     # Core functions
 
     def all(self):
@@ -269,13 +266,13 @@ def get(self, *q_objs, **query):
         queryset = queryset.filter(*q_objs, **query)
 
         try:
-            result = queryset.next()
+            result = six.next(queryset)
         except StopIteration:
             msg = ('%s matching query does not exist.'
                    % queryset._document._class_name)
             raise queryset._document.DoesNotExist(msg)
         try:
-            queryset.next()
+            six.next(queryset)
         except StopIteration:
             return result
 
@@ -1478,13 +1475,13 @@ def item_frequencies(self, field, normalize=False, map_reduce=True):
 
     # Iterator helpers
 
-    def next(self):
+    def __next__(self):
         """Wrap the result in a :class:`~mongoengine.Document` object.
         """
         if self._limit == 0 or self._none:
             raise StopIteration
 
-        raw_doc = self._cursor.next()
+        raw_doc = six.next(self._cursor)
 
         if self._as_pymongo:
             return self._get_as_pymongo(raw_doc)
@@ -1498,6 +1495,8 @@ def next(self):
 
         return doc
 
+    next = __next__     # For Python2 support
+
     def rewind(self):
         """Rewind the cursor to its unevaluated state.
 
diff --git a/mongoengine/queryset/field_list.py b/mongoengine/queryset/field_list.py
index 0524c3bbb..dba724af9 100644
--- a/mongoengine/queryset/field_list.py
+++ b/mongoengine/queryset/field_list.py
@@ -63,9 +63,11 @@ def __add__(self, f):
             self._only_called = True
         return self
 
-    def __nonzero__(self):
+    def __bool__(self):
         return bool(self.fields)
 
+    __nonzero__ = __bool__  # For Py2 support
+
     def as_dict(self):
         field_list = {field: self.value for field in self.fields}
         if self.slice:
diff --git a/mongoengine/queryset/manager.py b/mongoengine/queryset/manager.py
index 199205e92..f93dbb436 100644
--- a/mongoengine/queryset/manager.py
+++ b/mongoengine/queryset/manager.py
@@ -36,7 +36,7 @@ def __get__(self, instance, owner):
         queryset_class = owner._meta.get('queryset_class', self.default)
         queryset = queryset_class(owner, owner._get_collection())
         if self.get_queryset:
-            arg_count = self.get_queryset.func_code.co_argcount
+            arg_count = self.get_queryset.__code__.co_argcount
             if arg_count == 1:
                 queryset = self.get_queryset(queryset)
             elif arg_count == 2:
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 1aadfb768..f9fed7b73 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -115,7 +115,7 @@ def _populate_cache(self):
         # the result cache.
         try:
             for _ in six.moves.range(ITER_CHUNK_SIZE):
-                self._result_cache.append(self.next())
+                self._result_cache.append(six.next(self))
         except StopIteration:
             # Getting this exception means there are no more docs in the
             # db cursor. Set _has_more to False so that we can use that
@@ -170,7 +170,7 @@ def __repr__(self):
         data = []
         for _ in six.moves.range(REPR_OUTPUT_SIZE + 1):
             try:
-                data.append(self.next())
+                data.append(six.next(self))
             except StopIteration:
                 break
 
diff --git a/setup.py b/setup.py
index 98964d199..c7632ce31 100644
--- a/setup.py
+++ b/setup.py
@@ -44,9 +44,8 @@ def get_version(version_tuple):
     "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.3",
-    "Programming Language :: Python :: 3.4",
     "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     'Topic :: Database',
diff --git a/tests/__init__.py b/tests/__init__.py
index eab0ddc7c..08db71864 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
-from all_warnings import AllWarnings
-from document import *
-from queryset import *
-from fields import *
+from .all_warnings import AllWarnings
+from .document import *
+from .queryset import *
+from .fields import *
diff --git a/tests/document/__init__.py b/tests/document/__init__.py
index f71376ea6..dc35c969e 100644
--- a/tests/document/__init__.py
+++ b/tests/document/__init__.py
@@ -1,13 +1,13 @@
 import unittest
 
-from class_methods import *
-from delta import *
-from dynamic import *
-from indexes import *
-from inheritance import *
-from instance import *
-from json_serialisation import *
-from validation import *
+from .class_methods import *
+from .delta import *
+from .dynamic import *
+from .indexes import *
+from .inheritance import *
+from .instance import *
+from .json_serialisation import *
+from .validation import *
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/fields/__init__.py b/tests/fields/__init__.py
index 8e0640db6..4994d0c67 100644
--- a/tests/fields/__init__.py
+++ b/tests/fields/__init__.py
@@ -1,3 +1,3 @@
-from fields import *
-from file_tests import *
-from geo import *
+from .fields import *
+from .file_tests import *
+from .geo import *
diff --git a/tests/queryset/__init__.py b/tests/queryset/__init__.py
index c36b26845..31016966b 100644
--- a/tests/queryset/__init__.py
+++ b/tests/queryset/__init__.py
@@ -1,6 +1,6 @@
-from transform import *
-from field_list import *
-from queryset import *
-from visitor import *
-from geo import *
-from modify import *
\ No newline at end of file
+from .transform import *
+from .field_list import *
+from .queryset import *
+from .visitor import *
+from .geo import *
+from .modify import *

From f83ae5789b26b09192b4bdbefedd5cfffa6cc04c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 16 Sep 2018 21:27:09 +0200
Subject: [PATCH 0699/1519] fix side effect from queryset's no_dereference
 #1677

---
 mongoengine/base/document.py |  2 +-
 mongoengine/base/fields.py   |  8 ++--
 mongoengine/fields.py        |  5 ++-
 tests/queryset/queryset.py   | 84 +++++++++++++++++++++++++++++++-----
 4 files changed, 83 insertions(+), 16 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 84acb5a2e..c82d670e4 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -700,7 +700,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
 
         fields = cls._fields
         if not _auto_dereference:
-            fields = copy.copy(fields)
+            fields = copy.deepcopy(fields)
 
         for field_name, field in fields.iteritems():
             field._auto_dereference = _auto_dereference
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index a0726aa67..6c1bf4f1f 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -266,13 +266,15 @@ def __get__(self, instance, owner):
         ReferenceField = _import_class('ReferenceField')
         GenericReferenceField = _import_class('GenericReferenceField')
         EmbeddedDocumentListField = _import_class('EmbeddedDocumentListField')
-        dereference = (self._auto_dereference and
+
+        auto_dereference = instance._fields[self.name]._auto_dereference
+
+        dereference = (auto_dereference and
                        (self.field is None or isinstance(self.field,
                                                          (GenericReferenceField, ReferenceField))))
 
         _dereference = _import_class('DeReference')()
 
-        self._auto_dereference = instance._fields[self.name]._auto_dereference
         if instance._initialised and dereference and instance._data.get(self.name):
             instance._data[self.name] = _dereference(
                 instance._data.get(self.name), max_depth=1, instance=instance,
@@ -293,7 +295,7 @@ def __get__(self, instance, owner):
             value = BaseDict(value, instance, self.name)
             instance._data[self.name] = value
 
-        if (self._auto_dereference and instance._initialised and
+        if (auto_dereference and instance._initialised and
                 isinstance(value, (BaseList, BaseDict)) and
                 not value._dereferenced):
             value = _dereference(
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f794edff3..731ab06bb 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1104,9 +1104,9 @@ def __get__(self, instance, owner):
 
         # Get value from document instance if available
         value = instance._data.get(self.name)
-        self._auto_dereference = instance._fields[self.name]._auto_dereference
+        auto_dereference = instance._fields[self.name]._auto_dereference
         # Dereference DBRefs
-        if self._auto_dereference and isinstance(value, DBRef):
+        if auto_dereference and isinstance(value, DBRef):
             if hasattr(value, 'cls'):
                 # Dereference using the class type specified in the reference
                 cls = get_document(value.cls)
@@ -1267,6 +1267,7 @@ def __get__(self, instance, owner):
         # Get value from document instance if available
         value = instance._data.get(self.name)
         self._auto_dereference = instance._fields[self.name]._auto_dereference
+
         # Dereference DBRefs
         if self._auto_dereference and isinstance(value, DBRef):
             dereferenced = self.document_type._get_db().dereference(value)
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 0f2364f7e..35ebe24d8 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4674,11 +4674,69 @@ class User(Document):
         User(name="Bob Dole", organization=whitehouse).save()
 
         qs = User.objects()
+        qs_user = qs.first()
+
         self.assertIsInstance(qs.first().organization, Organization)
-        self.assertNotIsInstance(qs.no_dereference().first().organization, Organization)
-        self.assertNotIsInstance(qs.no_dereference().get().organization, Organization)
+
+        self.assertIsInstance(qs.no_dereference().first().organization, DBRef)
+
+        self.assertIsInstance(qs_user.organization, Organization)
         self.assertIsInstance(qs.first().organization, Organization)
 
+    def test_no_dereference_internals(self):
+        # Test the internals on which queryset.no_dereference relies on
+        class Organization(Document):
+            name = StringField()
+
+        class User(Document):
+            organization = ReferenceField(Organization)
+
+        User.drop_collection()
+        Organization.drop_collection()
+
+        cls_organization_field = User.organization
+        self.assertTrue(cls_organization_field._auto_dereference, True)  # default
+
+        org = Organization(name="whatever").save()
+        User(organization=org).save()
+
+        qs_no_deref = User.objects().no_dereference()
+        user_no_deref = qs_no_deref.first()
+        self.assertFalse(qs_no_deref._auto_dereference)
+
+        # Make sure the instance field is different from the class field
+        instance_org_field = user_no_deref._fields['organization']
+        self.assertIsNot(instance_org_field, cls_organization_field)
+        self.assertFalse(instance_org_field._auto_dereference)
+
+        self.assertIsInstance(user_no_deref.organization, DBRef)
+        self.assertTrue(cls_organization_field._auto_dereference, True)  # Make sure the class Field wasn't altered
+
+    def test_no_dereference_no_side_effect_on_existing_instance(self):
+        # Relates to issue #1677 - ensures no regression of the bug
+
+        class Organization(Document):
+            name = StringField()
+
+        class User(Document):
+            organization = ReferenceField(Organization)
+
+        User.drop_collection()
+        Organization.drop_collection()
+
+        org = Organization(name="whatever").save()
+        User(organization=org).save()
+
+        qs = User.objects()
+        user = qs.first()
+
+        qs_no_deref = User.objects().no_dereference()
+        user_no_deref = qs_no_deref.first()
+
+        no_derf_org = user_no_deref.organization    # was triggering the bug
+        self.assertIsInstance(no_derf_org, DBRef)
+        self.assertIsInstance(user.organization, Organization)
+
     def test_no_dereference_embedded_doc(self):
 
         class User(Document):
@@ -4693,7 +4751,7 @@ class Organization(Document):
             members = ListField(EmbeddedDocumentField(Member))
             ceo = ReferenceField(User)
             member = EmbeddedDocumentField(Member)
-            admin = ListField(ReferenceField(User))
+            admins = ListField(ReferenceField(User))
 
         Organization.drop_collection()
         User.drop_collection()
@@ -4703,16 +4761,22 @@ class Organization(Document):
 
         member = Member(name="Flash", user=user)
 
-        company = Organization(name="Mongo Inc", ceo=user, member=member)
-        company.admin.append(user)
-        company.members.append(member)
+        company = Organization(name="Mongo Inc",
+                               ceo=user,
+                               member=member,
+                               admins=[user],
+                               members=[member])
         company.save()
 
-        result = Organization.objects().no_dereference().first()
+        org = Organization.objects().no_dereference().first()
+
+        self.assertNotEqual(id(org._fields['admins']), id(Organization.admins))
+        self.assertFalse(org._fields['admins']._auto_dereference)
 
-        self.assertIsInstance(result.admin[0], (DBRef, ObjectId))
-        self.assertIsInstance(result.member.user, (DBRef, ObjectId))
-        self.assertIsInstance(result.members[0].user, (DBRef, ObjectId))
+        admin = org.admins[0]
+        self.assertIsInstance(admin, DBRef)
+        self.assertIsInstance(org.member.user, DBRef)
+        self.assertIsInstance(org.members[0].user, DBRef)
 
     def test_cached_queryset(self):
         class Person(Document):

From 45c2151d0fe26d4d17ff671650f0028ffe5a1921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 25 Sep 2018 22:56:57 +0200
Subject: [PATCH 0700/1519] Fix side effect of no_dereference on
 GenericReferenceField

---
 mongoengine/fields.py      |  8 ++++----
 tests/queryset/queryset.py | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 648940d25..856022159 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1266,10 +1266,10 @@ def __get__(self, instance, owner):
 
         # Get value from document instance if available
         value = instance._data.get(self.name)
-        self._auto_dereference = instance._fields[self.name]._auto_dereference
+        auto_dereference = instance._fields[self.name]._auto_dereference
 
         # Dereference DBRefs
-        if self._auto_dereference and isinstance(value, DBRef):
+        if auto_dereference and isinstance(value, DBRef):
             dereferenced = self.document_type._get_db().dereference(value)
             if dereferenced is None:
                 raise DoesNotExist('Trying to dereference unknown document %s' % value)
@@ -1402,8 +1402,8 @@ def __get__(self, instance, owner):
 
         value = instance._data.get(self.name)
 
-        self._auto_dereference = instance._fields[self.name]._auto_dereference
-        if self._auto_dereference and isinstance(value, (dict, SON)):
+        auto_dereference = instance._fields[self.name]._auto_dereference
+        if auto_dereference and isinstance(value, (dict, SON)):
             dereferenced = self.dereference(value)
             if dereferenced is None:
                 raise DoesNotExist('Trying to dereference unknown document %s' % value)
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 35ebe24d8..4706305fa 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4720,12 +4720,14 @@ class Organization(Document):
 
         class User(Document):
             organization = ReferenceField(Organization)
+            organization_gen = GenericReferenceField()
 
         User.drop_collection()
         Organization.drop_collection()
 
         org = Organization(name="whatever").save()
-        User(organization=org).save()
+        User(organization=org,
+             organization_gen=org).save()
 
         qs = User.objects()
         user = qs.first()
@@ -4733,10 +4735,16 @@ class User(Document):
         qs_no_deref = User.objects().no_dereference()
         user_no_deref = qs_no_deref.first()
 
+        # ReferenceField
         no_derf_org = user_no_deref.organization    # was triggering the bug
         self.assertIsInstance(no_derf_org, DBRef)
         self.assertIsInstance(user.organization, Organization)
 
+        # GenericReferenceField
+        no_derf_org_gen = user_no_deref.organization_gen
+        self.assertIsInstance(no_derf_org_gen, dict)
+        self.assertIsInstance(user.organization_gen, Organization)
+
     def test_no_dereference_embedded_doc(self):
 
         class User(Document):

From 96f09196337718699e73d7e55679affec48304a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 28 Sep 2018 22:39:08 +0200
Subject: [PATCH 0701/1519] - Fixed tests to allow support of MongoDB 3.2 -
 Replaced MongoDB 2.4 tests in CI by MongoDB 3.2

---
 .install_mongodb_on_travis.sh   |   6 ++
 .travis.yml                     |  12 ++--
 README.rst                      |   4 +-
 mongoengine/context_managers.py |   6 +-
 tests/document/indexes.py       |  39 ++++++-----
 tests/queryset/queryset.py      | 120 +++++++++++++++++---------------
 tests/test_context_managers.py  |   1 -
 tests/utils.py                  |  31 ++++++---
 8 files changed, 125 insertions(+), 94 deletions(-)

diff --git a/.install_mongodb_on_travis.sh b/.install_mongodb_on_travis.sh
index f2018411e..a4ff085b8 100644
--- a/.install_mongodb_on_travis.sh
+++ b/.install_mongodb_on_travis.sh
@@ -18,6 +18,12 @@ elif [ "$MONGODB" = "3.0" ]; then
     sudo apt-get update
     sudo apt-get install mongodb-org-server=3.0.14
     # service should be started automatically
+elif [ "$MONGODB" = "3.2" ]; then
+    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv EA312927
+    echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.2.list
+    sudo apt-get update
+    sudo apt-get install mongodb-org-server=3.2.20
+    # service should be started automatically
 else
     echo "Invalid MongoDB version, expected 2.4, 2.6, or 3.0."
     exit 1
diff --git a/.travis.yml b/.travis.yml
index 381f73854..f9c7db1eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,17 +27,17 @@ matrix:
 
   include:
   - python: 2.7
-    env: MONGODB=2.4 PYMONGO=3.5
+    env: MONGODB=3.0 PYMONGO=3.5
   - python: 2.7
-    env: MONGODB=3.0 PYMONGO=3.x
+    env: MONGODB=3.2 PYMONGO=3.x
   - python: 3.5
-    env: MONGODB=2.4 PYMONGO=3.5
+    env: MONGODB=3.0 PYMONGO=3.5
   - python: 3.5
-    env: MONGODB=3.0 PYMONGO=3.x
+    env: MONGODB=3.2 PYMONGO=3.x
   - python: 3.6
-    env: MONGODB=2.4 PYMONGO=3.5
+    env: MONGODB=3.0 PYMONGO=3.5
   - python: 3.6
-    env: MONGODB=3.0 PYMONGO=3.x
+    env: MONGODB=3.2 PYMONGO=3.x
 
 before_install:
 - bash .install_mongodb_on_travis.sh
diff --git a/README.rst b/README.rst
index e1e2aef69..17cb3e33b 100644
--- a/README.rst
+++ b/README.rst
@@ -26,10 +26,10 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v2.4, v2.6, and v3.0. Future
+MongoEngine is currently tested against MongoDB v2.6, v3.0 and v3.2. Future
 versions should be supported as well, but aren't actively tested at the moment.
 Make sure to open an issue or submit a pull request if you experience any
-problems with MongoDB v3.2+.
+problems with MongoDB v3.4+.
 
 Installation
 ============
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index ee1f5e01a..c26b0a793 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -182,8 +182,10 @@ def __init__(self):
         self._ignored_query = {
             'ns':
                 {'$ne': '%s.system.indexes' % self.db.name},
-            'op':
-                {'$ne': 'killcursors'}
+            'op':                       # MONGODB < 3.2
+                {'$ne': 'killcursors'},
+            'command.killCursors':      # MONGODB >= 3.2
+                {'$exists': False}
         }
 
     def _turn_on_profiling(self):
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 1cbb4ec3b..b3129fc8f 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 import unittest
-import sys
+from datetime import datetime
 
 from nose.plugins.skip import SkipTest
-from datetime import datetime
+from pymongo.errors import OperationFailure
 import pymongo
 
 from mongoengine import *
 from mongoengine.connection import get_db
-
-from tests.utils import get_mongodb_version, needs_mongodb_v26
+from tests.utils import get_mongodb_version, needs_mongodb_v26, MONGODB_32, MONGODB_3
 
 __all__ = ("IndexesTest", )
 
@@ -19,6 +18,7 @@ class IndexesTest(unittest.TestCase):
     def setUp(self):
         self.connection = connect(db='mongoenginetest')
         self.db = get_db()
+        self.mongodb_version = get_mongodb_version()
 
         class Person(Document):
             name = StringField()
@@ -491,7 +491,7 @@ class Test(Document):
         obj = Test(a=1)
         obj.save()
 
-        IS_MONGODB_3 = get_mongodb_version()[0] >= 3
+        IS_MONGODB_3 = get_mongodb_version() >= MONGODB_3
 
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
@@ -541,19 +541,24 @@ class BlogPost(Document):
                                  [('categories', 1), ('_id', 1)])
 
     def test_hint(self):
+        MONGO_VER = self.mongodb_version
 
+        TAGS_INDEX_NAME = 'tags_1'
         class BlogPost(Document):
             tags = ListField(StringField())
             meta = {
                 'indexes': [
-                    'tags',
+                    {
+                        'fields': ['tags'],
+                        'name': TAGS_INDEX_NAME
+                    }
                 ],
             }
 
         BlogPost.drop_collection()
 
-        for i in range(0, 10):
-            tags = [("tag %i" % n) for n in range(0, i % 2)]
+        for i in range(10):
+            tags = [("tag %i" % n) for n in range(i % 2)]
             BlogPost(tags=tags).save()
 
         self.assertEqual(BlogPost.objects.count(), 10)
@@ -563,18 +568,18 @@ class BlogPost(Document):
         if pymongo.version != '3.0':
             self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
 
+        if MONGO_VER == MONGODB_32:
+            # Mongo32 throws an error if an index exists (i.e `tags` in our case)
+            # and you use hint on an index name that does not exist
+            with self.assertRaises(OperationFailure):
+                BlogPost.objects.hint([('ZZ', 1)]).count()
+        else:
             self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10)
 
-        if pymongo.version >= '2.8':
-            self.assertEqual(BlogPost.objects.hint('tags').count(), 10)
-        else:
-            def invalid_index():
-                BlogPost.objects.hint('tags').next()
-            self.assertRaises(TypeError, invalid_index)
+        self.assertEqual(BlogPost.objects.hint(TAGS_INDEX_NAME ).count(), 10)
 
-        def invalid_index_2():
-            return BlogPost.objects.hint(('tags', 1)).next()
-        self.assertRaises(Exception, invalid_index_2)
+        with self.assertRaises(Exception):
+            BlogPost.objects.hint(('tags', 1)).next()
 
     def test_unique(self):
         """Ensure that uniqueness constraints are applied to fields.
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 35ebe24d8..050f65d9b 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -21,8 +21,7 @@
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
 
-from tests.utils import needs_mongodb_v26, skip_pymongo3
-
+from tests.utils import needs_mongodb_v26, skip_pymongo3, get_mongodb_version, MONGODB_32
 
 __all__ = ("QuerySetTest",)
 
@@ -30,10 +29,8 @@
 class db_ops_tracker(query_counter):
 
     def get_ops(self):
-        ignore_query = {
-            'ns': {'$ne': '%s.system.indexes' % self.db.name},
-            'command.count': {'$ne': 'system.profile'}
-        }
+        ignore_query = dict(self._ignored_query)
+        ignore_query['command.count'] = {'$ne': 'system.profile'}   # Ignore the query issued by query_counter
         return list(self.db.system.profile.find(ignore_query))
 
 
@@ -56,6 +53,8 @@ class Person(Document):
         self.PersonMeta = PersonMeta
         self.Person = Person
 
+        self.mongodb_version = get_mongodb_version()
+
     def test_initialisation(self):
         """Ensure that a QuerySet is correctly initialised by QuerySetManager.
         """
@@ -813,8 +812,8 @@ class B(Document):
         self.assertEqual(record.embed.field, 2)
 
     def test_bulk_insert(self):
-        """Ensure that bulk insert works
-        """
+        """Ensure that bulk insert works"""
+        MONGO_VER = self.mongodb_version
 
         class Comment(EmbeddedDocument):
             name = StringField()
@@ -832,35 +831,41 @@ class Blog(Document):
         # get MongoDB version info
         connection = get_connection()
         info = connection.test.command('buildInfo')
-        mongodb_version = tuple([int(i) for i in info['version'].split('.')])
 
         # Recreates the collection
         self.assertEqual(0, Blog.objects.count())
 
+        comment1 = Comment(name='testa')
+        comment2 = Comment(name='testb')
+        post1 = Post(comments=[comment1, comment2])
+        post2 = Post(comments=[comment2, comment2])
+        blogs = [Blog(title="post %s" % i, posts=[post1, post2])
+                 for i in range(99)]
+
+        # Check bulk insert using load_bulk=False
         with query_counter() as q:
             self.assertEqual(q, 0)
+            Blog.objects.insert(blogs, load_bulk=False)
 
-            comment1 = Comment(name='testa')
-            comment2 = Comment(name='testb')
-            post1 = Post(comments=[comment1, comment2])
-            post2 = Post(comments=[comment2, comment2])
+            if MONGO_VER == MONGODB_32:
+                self.assertEqual(q, 1)      # 1 entry containing the list of inserts
+            else:
+                self.assertEqual(q, len(blogs))    # 1 entry per doc inserted
 
-            blogs = []
-            for i in range(1, 100):
-                blogs.append(Blog(title="post %s" % i, posts=[post1, post2]))
-
-            Blog.objects.insert(blogs, load_bulk=False)
-            # profiling logs each doc now in the bulk op
-            self.assertEqual(q, 99)
+        self.assertEqual(Blog.objects.count(), len(blogs))
 
         Blog.drop_collection()
         Blog.ensure_indexes()
 
+        # Check bulk insert using load_bulk=True
         with query_counter() as q:
             self.assertEqual(q, 0)
-
             Blog.objects.insert(blogs)
-            self.assertEqual(q, 100) # 99 for insert 1 for fetch
+
+            if MONGO_VER == MONGODB_32:
+                self.assertEqual(q, 2)              # 1 for insert 1 for fetch
+            else:
+                self.assertEqual(q, len(blogs)+1)    # + 1 to fetch all docs
 
         Blog.drop_collection()
 
@@ -1262,6 +1267,9 @@ def test_clear_ordering(self):
         """Ensure that the default ordering can be cleared by calling
         order_by() w/o any arguments.
         """
+        MONGO_VER = self.mongodb_version
+        ORDER_BY_KEY = 'sort' if MONGO_VER == MONGODB_32 else '$orderby'
+
         class BlogPost(Document):
             title = StringField()
             published_date = DateTimeField()
@@ -1277,7 +1285,7 @@ class BlogPost(Document):
             BlogPost.objects.filter(title='whatever').first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertEqual(
-                q.get_ops()[0]['query']['$orderby'],
+                q.get_ops()[0]['query'][ORDER_BY_KEY],
                 {'published_date': -1}
             )
 
@@ -1285,14 +1293,14 @@ class BlogPost(Document):
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title='whatever').order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn('$orderby', q.get_ops()[0]['query'])
+            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0]['query'])
 
         # calling an explicit order_by should use a specified sort
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title='whatever').order_by('published_date').first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertEqual(
-                q.get_ops()[0]['query']['$orderby'],
+                q.get_ops()[0]['query'][ORDER_BY_KEY],
                 {'published_date': 1}
             )
 
@@ -1301,11 +1309,14 @@ class BlogPost(Document):
             qs = BlogPost.objects.filter(title='whatever').order_by('published_date')
             qs.order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn('$orderby', q.get_ops()[0]['query'])
+            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0]['query'])
 
     def test_no_ordering_for_get(self):
         """ Ensure that Doc.objects.get doesn't use any ordering.
         """
+        MONGO_VER = self.mongodb_version
+        ORDER_BY_KEY = 'sort' if MONGO_VER == MONGODB_32 else '$orderby'
+
         class BlogPost(Document):
             title = StringField()
             published_date = DateTimeField()
@@ -1320,13 +1331,13 @@ class BlogPost(Document):
         with db_ops_tracker() as q:
             BlogPost.objects.get(title='whatever')
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn('$orderby', q.get_ops()[0]['query'])
+            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0]['query'])
 
         # Ordering should be ignored for .get even if we set it explicitly
         with db_ops_tracker() as q:
             BlogPost.objects.order_by('-title').get(title='whatever')
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn('$orderby', q.get_ops()[0]['query'])
+            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0]['query'])
 
     def test_find_embedded(self):
         """Ensure that an embedded document is properly returned from
@@ -2450,7 +2461,11 @@ class Author(Document):
         self.assertEqual(names, ['User A', 'User B', 'User C'])
 
     def test_comment(self):
-        """Make sure adding a comment to the query works."""
+        """Make sure adding a comment to the query gets added to the query"""
+        MONGO_VER = self.mongodb_version
+        QUERY_KEY = 'filter' if MONGO_VER == MONGODB_32 else '$query'
+        COMMENT_KEY = 'comment' if MONGO_VER == MONGODB_32 else '$comment'
+
         class User(Document):
             age = IntField()
 
@@ -2466,8 +2481,8 @@ class User(Document):
             ops = q.get_ops()
             self.assertEqual(len(ops), 2)
             for op in ops:
-                self.assertEqual(op['query']['$query'], {'age': {'$gte': 18}})
-                self.assertEqual(op['query']['$comment'], 'looking for an adult')
+                self.assertEqual(op['query'][QUERY_KEY], {'age': {'$gte': 18}})
+                self.assertEqual(op['query'][COMMENT_KEY], 'looking for an adult')
 
     def test_map_reduce(self):
         """Ensure map/reduce is both mapping and reducing.
@@ -4817,27 +4832,18 @@ class Person(Document):
         for i in range(100):
             Person(name="No: %s" % i).save()
 
-            with query_counter() as q:
-                try:
-                    self.assertEqual(q, 0)
-                    people = Person.objects.no_cache()
-
-                    [x for x in people]
-                    self.assertEqual(q, 1)
+        with query_counter() as q:
+            self.assertEqual(q, 0)
+            people = Person.objects.no_cache()
 
-                    list(people)
-                    self.assertEqual(q, 2)
+            [x for x in people]
+            self.assertEqual(q, 1)
 
-                    people.count()
-                    self.assertEqual(q, 3)
-                except AssertionError as exc:
-                    db = get_db()
-                    msg = ''
-                    for q in list(db.system.profile.find())[-50:]:
-                        msg += str([q['ts'], q['ns'], q.get('query'), q['op']])+'\n'
-                        msg += str(q)
-                    raise AssertionError(str(exc) + '\n'+msg)
+            list(people)
+            self.assertEqual(q, 2)
 
+            people.count()
+            self.assertEqual(q, 3)
 
     def test_cache_not_cloned(self):
 
@@ -5111,35 +5117,39 @@ class Person(Document):
             self.assertEqual(op['nreturned'], 1)
 
     def test_bool_with_ordering(self):
+        MONGO_VER = self.mongodb_version
+        ORDER_BY_KEY = 'sort' if MONGO_VER == MONGODB_32 else '$orderby'
 
         class Person(Document):
             name = StringField()
 
         Person.drop_collection()
+
         Person(name="Test").save()
 
+        # Check that bool(queryset) does not uses the orderby
         qs = Person.objects.order_by('name')
-
         with query_counter() as q:
 
-            if qs:
+            if bool(qs):
                 pass
 
             op = q.db.system.profile.find({"ns":
                                            {"$ne": "%s.system.indexes" % q.db.name}})[0]
 
-            self.assertNotIn('$orderby', op['query'],
-                             'BaseQuerySet cannot use orderby in if stmt')
+            self.assertNotIn(ORDER_BY_KEY, op['query'])
 
+        # Check that normal query uses orderby
+        qs2 = Person.objects.order_by('name')
         with query_counter() as p:
 
-            for x in qs:
+            for x in qs2:
                 pass
 
             op = p.db.system.profile.find({"ns":
                                            {"$ne": "%s.system.indexes" % q.db.name}})[0]
 
-            self.assertIn('$orderby', op['query'], 'BaseQuerySet cannot remove orderby in for loop')
+            self.assertIn(ORDER_BY_KEY, op['query'])
 
     def test_bool_with_ordering_from_meta_dict(self):
 
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index df5e52125..8fb7bc78a 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -299,7 +299,6 @@ def test_query_counter_ignores_particular_queries(self):
 
             cursor.close()              # issues a `killcursors` query that is ignored by the context
             self.assertEqual(q, 1)
-
             _ = db.system.indexes.find_one()    # queries on db.system.indexes are ignored as well
             self.assertEqual(q, 1)
 
diff --git a/tests/utils.py b/tests/utils.py
index acd318c5c..39d3681eb 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -10,6 +10,13 @@
 MONGO_TEST_DB = 'mongoenginetest'   # standard name for the test database
 
 
+# Constant that can be used to compare the version retrieved with
+# get_mongodb_version()
+MONGODB_26 = (2, 6)
+MONGODB_3 = (3,0)
+MONGODB_32 = (3, 2)
+
+
 class MongoDBTestCase(unittest.TestCase):
     """Base class for tests that need a mongodb connection
     It ensures that the db is clean at the beginning and dropped at the end automatically
@@ -27,24 +34,26 @@ def tearDownClass(cls):
 
 
 def get_mongodb_version():
-    """Return the version tuple of the MongoDB server that the default
-    connection is connected to.
+    """Return the version of the connected mongoDB (first 2 digits)
+
+    :return: tuple(int, int)
     """
-    return tuple(get_connection().server_info()['versionArray'])
+    version_list = get_connection().server_info()['versionArray'][:2]     # e.g: (3, 2)
+    return tuple(version_list)
 
 
-def _decorated_with_ver_requirement(func, ver_tuple):
+def _decorated_with_ver_requirement(func, version):
     """Return a given function decorated with the version requirement
     for a particular MongoDB version tuple.
+
+    :param version: The version required (tuple(int, int))
     """
     def _inner(*args, **kwargs):
-        mongodb_ver = get_mongodb_version()
-        if mongodb_ver >= ver_tuple:
+        MONGODB_V = get_mongodb_version()
+        if MONGODB_V >= version:
             return func(*args, **kwargs)
 
-        raise SkipTest('Needs MongoDB v{}+'.format(
-            '.'.join([str(v) for v in ver_tuple])
-        ))
+        raise SkipTest('Needs MongoDB v{}+'.format('.'.join(str(n) for n in version)))
 
     _inner.__name__ = func.__name__
     _inner.__doc__ = func.__doc__
@@ -56,14 +65,14 @@ def needs_mongodb_v26(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v2.6.
     """
-    return _decorated_with_ver_requirement(func, (2, 6))
+    return _decorated_with_ver_requirement(func, MONGODB_26)
 
 
 def needs_mongodb_v3(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v3.0.
     """
-    return _decorated_with_ver_requirement(func, (3, 0))
+    return _decorated_with_ver_requirement(func, MONGODB_3)
 
 
 def skip_pymongo3(f):

From 9b6c972e0f177e1ce049034588fb4c43fa3c0fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 2 Oct 2018 22:03:55 +0200
Subject: [PATCH 0702/1519] renamed decorator needs_mongodb_x in test + fixes
 ref to mongo 2.4 from travis files

---
 .install_mongodb_on_travis.sh   |  9 ++-------
 .travis.yml                     |  8 +++-----
 mongoengine/queryset/visitor.py |  2 +-
 tests/document/class_methods.py |  4 ++--
 tests/document/indexes.py       |  6 +++---
 tests/document/instance.py      |  6 +++---
 tests/queryset/geo.py           |  8 ++++----
 tests/queryset/modify.py        |  4 ++--
 tests/queryset/queryset.py      | 18 +++++++++---------
 tests/utils.py                  |  4 ++--
 10 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/.install_mongodb_on_travis.sh b/.install_mongodb_on_travis.sh
index a4ff085b8..057ccf74b 100644
--- a/.install_mongodb_on_travis.sh
+++ b/.install_mongodb_on_travis.sh
@@ -3,12 +3,7 @@
 sudo apt-get remove mongodb-org-server
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 
-if [ "$MONGODB" = "2.4" ]; then
-    echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" | sudo tee /etc/apt/sources.list.d/mongodb.list
-    sudo apt-get update
-    sudo apt-get install mongodb-10gen=2.4.14
-    sudo service mongodb start
-elif [ "$MONGODB" = "2.6" ]; then
+if [ "$MONGODB" = "2.6" ]; then
     echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" | sudo tee /etc/apt/sources.list.d/mongodb.list
     sudo apt-get update
     sudo apt-get install mongodb-org-server=2.6.12
@@ -25,7 +20,7 @@ elif [ "$MONGODB" = "3.2" ]; then
     sudo apt-get install mongodb-org-server=3.2.20
     # service should be started automatically
 else
-    echo "Invalid MongoDB version, expected 2.4, 2.6, or 3.0."
+    echo "Invalid MongoDB version, expected 2.6, 3.0, or 3.2"
     exit 1
 fi;
 
diff --git a/.travis.yml b/.travis.yml
index f9c7db1eb..4f77f4e03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,10 @@
 # PyMongo combinations. However, that would result in an overly long build
 # with a very large number of jobs, hence we only test a subset of all the
 # combinations:
-# * MongoDB v2.4 & v3.0 are only tested against Python v2.7 & v3.5.
-# * MongoDB v2.4 is tested against PyMongo v2.7 & v3.x.
-# * MongoDB v3.0 is tested against PyMongo v3.x.
 # * MongoDB v2.6 is currently the "main" version tested against Python v2.7,
-#   v3.5, PyPy & PyPy3, and PyMongo v2.7, v2.8 & v3.x.
-#
+#   v3.5, v3.6, PyPy, and PyMongo v3.x.
+# * MongoDB v3.0 & v3.2 are tested against Python v2.7, v3.5 & v3.6
+#   and Pymongo v3.5 & v3.x
 # Reminder: Update README.rst if you change MongoDB versions we test.
 
 language: python
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index bcf93a13e..dbe3bf2f2 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -3,7 +3,7 @@
 from mongoengine.errors import InvalidQueryError
 from mongoengine.queryset import transform
 
-__all__ = ('Q',)
+__all__ = ('Q', 'QNode')
 
 
 class QNodeVisitor(object):
diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index 5289e483c..2632d38f1 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -5,7 +5,7 @@
 
 from mongoengine.queryset import NULLIFY, PULL
 from mongoengine.connection import get_db
-from tests.utils import needs_mongodb_v26
+from tests.utils import requires_mongodb_gte_26
 
 __all__ = ("ClassMethodsTest", )
 
@@ -188,7 +188,7 @@ class BlogPostWithCustomField(BlogPost):
         self.assertEqual(BlogPostWithTags.compare_indexes(), { 'missing': [], 'extra': [] })
         self.assertEqual(BlogPostWithCustomField.compare_indexes(), { 'missing': [], 'extra': [] })
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_compare_indexes_for_text_indexes(self):
         """ Ensure that compare_indexes behaves correctly for text indexes """
 
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index b3129fc8f..757d8037c 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -8,7 +8,7 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from tests.utils import get_mongodb_version, needs_mongodb_v26, MONGODB_32, MONGODB_3
+from tests.utils import get_mongodb_version, requires_mongodb_gte_26, MONGODB_32, MONGODB_3
 
 __all__ = ("IndexesTest", )
 
@@ -754,7 +754,7 @@ class Customer(Document):
         except NotUniqueError:
             pass
 
-    def test_unique_and_primary(self):
+    def test_primary_save_duplicate_update_existing_object(self):
         """If you set a field as primary, then unexpected behaviour can occur.
         You won't create a duplicate but you will update an existing document.
         """
@@ -872,7 +872,7 @@ class MyDoc(Document):
                          info['provider_ids.foo_1_provider_ids.bar_1']['key'])
         self.assertTrue(info['provider_ids.foo_1_provider_ids.bar_1']['sparse'])
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_text_indexes(self):
         class Book(Document):
             title = DictField()
diff --git a/tests/document/instance.py b/tests/document/instance.py
index e637b3e60..f432fab13 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -25,7 +25,7 @@
 from mongoengine.context_managers import switch_db, query_counter
 from mongoengine import signals
 
-from tests.utils import needs_mongodb_v26
+from tests.utils import requires_mongodb_gte_26
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__),
                                '../fields/mongoengine.png')
@@ -840,7 +840,7 @@ def test_modify_update(self):
 
         self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_modify_with_positional_push(self):
         class BlogPost(Document):
             tags = ListField(StringField())
@@ -3272,7 +3272,7 @@ class Person(Document):
 
         person.update(set__height=2.0)
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_push_with_position(self):
         """Ensure that push with position works properly for an instance."""
         class BlogPost(Document):
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index fea225b22..fd8c9b0f2 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -3,7 +3,7 @@
 
 from mongoengine import *
 
-from tests.utils import MongoDBTestCase, needs_mongodb_v3
+from tests.utils import MongoDBTestCase, requires_mongodb_gte_3
 
 
 __all__ = ("GeoQueriesTest",)
@@ -72,7 +72,7 @@ def test_near_and_max_distance(self):
 
     # $minDistance was added in MongoDB v2.6, but continued being buggy
     # until v3.0; skip for older versions
-    @needs_mongodb_v3
+    @requires_mongodb_gte_3
     def test_near_and_min_distance(self):
         """Ensure the "min_distance" operator works alongside the "near"
         operator.
@@ -245,7 +245,7 @@ def test_2dsphere_geo_within_polygon(self):
 
     # $minDistance was added in MongoDB v2.6, but continued being buggy
     # until v3.0; skip for older versions
-    @needs_mongodb_v3
+    @requires_mongodb_gte_3
     def test_2dsphere_near_and_min_max_distance(self):
         """Ensure "min_distace" and "max_distance" operators work well
         together with the "near" operator in a 2dsphere index.
@@ -329,7 +329,7 @@ def test_2dsphere_point_embedded(self):
         self._test_embedded(point_field_class=PointField)
 
     # Needs MongoDB > 2.6.4 https://jira.mongodb.org/browse/SERVER-14039
-    @needs_mongodb_v3
+    @requires_mongodb_gte_3
     def test_spherical_geospatial_operators(self):
         """Ensure that spherical geospatial queries are working."""
         class Point(Document):
diff --git a/tests/queryset/modify.py b/tests/queryset/modify.py
index b37f9b734..4b7c3da27 100644
--- a/tests/queryset/modify.py
+++ b/tests/queryset/modify.py
@@ -2,7 +2,7 @@
 
 from mongoengine import connect, Document, IntField, StringField, ListField
 
-from tests.utils import needs_mongodb_v26
+from tests.utils import requires_mongodb_gte_26
 
 __all__ = ("FindAndModifyTest",)
 
@@ -96,7 +96,7 @@ def test_modify_with_fields(self):
         self.assertEqual(old_doc.to_mongo(), {"_id": 1})
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_modify_with_push(self):
         class BlogPost(Document):
             tags = ListField(StringField())
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 1d062853f..c5004ed29 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -21,7 +21,7 @@
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
 
-from tests.utils import needs_mongodb_v26, skip_pymongo3, get_mongodb_version, MONGODB_32
+from tests.utils import requires_mongodb_gte_26, skip_pymongo3, get_mongodb_version, MONGODB_32
 
 __all__ = ("QuerySetTest",)
 
@@ -576,7 +576,7 @@ class BlogPost(Document):
         self.assertEqual(post.comments[0].by, 'joe')
         self.assertEqual(post.comments[0].votes.score, 4)
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_update_min_max(self):
         class Scores(Document):
             high_score = IntField()
@@ -594,7 +594,7 @@ class Scores(Document):
         Scores.objects(id=scores.id).update(max__high_score=500)
         self.assertEqual(Scores.objects.get(id=scores.id).high_score, 1000)
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_update_multiple(self):
         class Product(Document):
             item = StringField()
@@ -1007,7 +1007,7 @@ def test_slave_okay(self):
         self.assertEqual(person.name, "User A")
         self.assertEqual(person.age, 20)
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     @skip_pymongo3
     def test_cursor_args(self):
         """Ensures the cursor args can be set as expected
@@ -1986,7 +1986,7 @@ class BlogPost(Document):
         pymongo_doc = BlogPost.objects.as_pymongo().first()
         self.assertNotIn('title', pymongo_doc)
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_update_push_with_position(self):
         """Ensure that the 'push' update with position works properly.
         """
@@ -3278,7 +3278,7 @@ class Bar(Document):
 
         self.assertEqual(Foo.objects.distinct("bar"), [bar])
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_text_indexes(self):
         class News(Document):
             title = StringField()
@@ -3365,7 +3365,7 @@ class News(Document):
             'brasil').order_by('$text_score').first()
         self.assertEqual(item.get_text_score(), max_text_score)
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_distinct_handles_references_to_alias(self):
         register_connection('testdb', 'mongoenginetest2')
 
@@ -4494,7 +4494,7 @@ class Bar(Document):
         self.assertEqual(bars._cursor._Cursor__read_preference,
                          ReadPreference.SECONDARY_PREFERRED)
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_read_preference_aggregation_framework(self):
         class Bar(Document):
             txt = StringField()
@@ -5188,7 +5188,7 @@ class Person(Document):
             self.assertTrue(Person.objects._has_data(),
                             'Cursor has data and returned False')
 
-    @needs_mongodb_v26
+    @requires_mongodb_gte_26
     def test_queryset_aggregation_framework(self):
         class Person(Document):
             name = StringField()
diff --git a/tests/utils.py b/tests/utils.py
index 39d3681eb..5345f75e7 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -61,14 +61,14 @@ def _inner(*args, **kwargs):
     return _inner
 
 
-def needs_mongodb_v26(func):
+def requires_mongodb_gte_26(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v2.6.
     """
     return _decorated_with_ver_requirement(func, MONGODB_26)
 
 
-def needs_mongodb_v3(func):
+def requires_mongodb_gte_3(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v3.0.
     """

From 89416d9856a2233b8f0c309720d9d746f2ac1e47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 5 Oct 2018 14:16:22 +0200
Subject: [PATCH 0703/1519] Fix deprecation warning about Hashable in py3.7

---
 mongoengine/base/document.py  | 2 +-
 mongoengine/python_support.py | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index c82d670e4..ccbfa3d6d 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1,6 +1,5 @@
 import copy
 import numbers
-from collections import Hashable
 from functools import partial
 
 from bson import ObjectId, json_util
@@ -19,6 +18,7 @@
 from mongoengine.common import _import_class
 from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError,
                                 LookUpError, OperationError, ValidationError)
+from mongoengine.python_support import Hashable
 
 __all__ = ('BaseDocument', 'NON_FIELD_ERRORS')
 
diff --git a/mongoengine/python_support.py b/mongoengine/python_support.py
index e884b4ead..7e8e108fb 100644
--- a/mongoengine/python_support.py
+++ b/mongoengine/python_support.py
@@ -19,3 +19,10 @@
         pass
     else:
         StringIO = cStringIO.StringIO
+
+
+if six.PY3:
+    from collections.abc import Hashable
+else:
+    # raises DeprecationWarnings in Python >=3.7
+    from collections import Hashable

From adfb039ba636202ce034e6104dc27f5bf74601c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 6 Oct 2018 21:44:25 +0200
Subject: [PATCH 0704/1519] Improve overall code quality (based on pylint
 findings)

---
 docs/upgrade.rst                   |  5 ++++
 mongoengine/base/common.py         |  2 +-
 mongoengine/base/datastructures.py | 19 ++++++---------
 mongoengine/base/document.py       |  3 ---
 mongoengine/base/metaclasses.py    | 39 ++++++++++++++----------------
 mongoengine/base/utils.py          |  2 +-
 mongoengine/document.py            |  4 +--
 mongoengine/errors.py              |  1 +
 mongoengine/fields.py              | 25 +++++++++----------
 mongoengine/queryset/base.py       | 15 +++++-------
 mongoengine/queryset/queryset.py   |  7 ------
 mongoengine/queryset/transform.py  |  1 -
 12 files changed, 53 insertions(+), 70 deletions(-)

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 65d133594..082dbadcb 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -6,6 +6,11 @@ Development
 ***********
 (Fill this out whenever you introduce breaking changes to MongoEngine)
 
+URLField's constructor no longer takes `verify_exists`
+
+0.15.0
+******
+
 0.14.0
 ******
 This release includes a few bug fixes and a significant code cleanup. The most
diff --git a/mongoengine/base/common.py b/mongoengine/base/common.py
index dd177920f..d747c8cc7 100644
--- a/mongoengine/base/common.py
+++ b/mongoengine/base/common.py
@@ -19,7 +19,7 @@ def get_document(name):
         # Possible old style name
         single_end = name.split('.')[-1]
         compound_end = '.%s' % single_end
-        possible_match = [k for k in _document_registry.keys()
+        possible_match = [k for k in _document_registry
                           if k.endswith(compound_end) or k == single_end]
         if len(possible_match) == 1:
             doc = _document_registry.get(possible_match.pop(), None)
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 0197ad10e..17da7a2c8 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,4 +1,3 @@
-import itertools
 import weakref
 
 from bson import DBRef
@@ -18,10 +17,9 @@ class BaseDict(dict):
     _name = None
 
     def __init__(self, dict_items, instance, name):
-        Document = _import_class('Document')
-        EmbeddedDocument = _import_class('EmbeddedDocument')
+        BaseDocument = _import_class('BaseDocument')
 
-        if isinstance(instance, (Document, EmbeddedDocument)):
+        if isinstance(instance, BaseDocument):
             self._instance = weakref.proxy(instance)
         self._name = name
         super(BaseDict, self).__init__(dict_items)
@@ -32,11 +30,11 @@ def __getitem__(self, key, *args, **kwargs):
         EmbeddedDocument = _import_class('EmbeddedDocument')
         if isinstance(value, EmbeddedDocument) and value._instance is None:
             value._instance = self._instance
-        elif not isinstance(value, BaseDict) and isinstance(value, dict):
+        elif isinstance(value, dict) and not isinstance(value, BaseDict):
             value = BaseDict(value, None, '%s.%s' % (self._name, key))
             super(BaseDict, self).__setitem__(key, value)
             value._instance = self._instance
-        elif not isinstance(value, BaseList) and isinstance(value, list):
+        elif isinstance(value, list) and not isinstance(value, BaseList):
             value = BaseList(value, None, '%s.%s' % (self._name, key))
             super(BaseDict, self).__setitem__(key, value)
             value._instance = self._instance
@@ -103,10 +101,9 @@ class BaseList(list):
     _name = None
 
     def __init__(self, list_items, instance, name):
-        Document = _import_class('Document')
-        EmbeddedDocument = _import_class('EmbeddedDocument')
+        BaseDocument = _import_class('BaseDocument')
 
-        if isinstance(instance, (Document, EmbeddedDocument)):
+        if isinstance(instance, BaseDocument):
             self._instance = weakref.proxy(instance)
         self._name = name
         super(BaseList, self).__init__(list_items)
@@ -117,11 +114,11 @@ def __getitem__(self, key, *args, **kwargs):
         EmbeddedDocument = _import_class('EmbeddedDocument')
         if isinstance(value, EmbeddedDocument) and value._instance is None:
             value._instance = self._instance
-        elif not isinstance(value, BaseDict) and isinstance(value, dict):
+        elif isinstance(value, dict) and not isinstance(value, BaseDict):
             value = BaseDict(value, None, '%s.%s' % (self._name, key))
             super(BaseList, self).__setitem__(key, value)
             value._instance = self._instance
-        elif not isinstance(value, BaseList) and isinstance(value, list):
+        elif isinstance(value, list) and not isinstance(value, BaseList):
             value = BaseList(value, None, '%s.%s' % (self._name, key))
             super(BaseList, self).__setitem__(key, value)
             value._instance = self._instance
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index c82d670e4..b3b6c9744 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -91,9 +91,6 @@ def __init__(self, *args, **values):
             value = getattr(self, key, None)
             setattr(self, key, value)
 
-        if '_cls' not in values:
-            self._cls = self._class_name
-
         # Set passed values after initialisation
         if self._dynamic:
             dynamic_data = {}
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 481408bf0..a3220c6c9 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -18,14 +18,14 @@ class DocumentMetaclass(type):
     """Metaclass for all documents."""
 
     # TODO lower complexity of this method
-    def __new__(cls, name, bases, attrs):
-        flattened_bases = cls._get_bases(bases)
-        super_new = super(DocumentMetaclass, cls).__new__
+    def __new__(mcs, name, bases, attrs):
+        flattened_bases = mcs._get_bases(bases)
+        super_new = super(DocumentMetaclass, mcs).__new__
 
         # If a base class just call super
         metaclass = attrs.get('my_metaclass')
         if metaclass and issubclass(metaclass, DocumentMetaclass):
-            return super_new(cls, name, bases, attrs)
+            return super_new(mcs, name, bases, attrs)
 
         attrs['_is_document'] = attrs.get('_is_document', False)
         attrs['_cached_reference_fields'] = []
@@ -138,7 +138,7 @@ def __new__(cls, name, bases, attrs):
         attrs['_types'] = attrs['_subclasses']  # TODO depreciate _types
 
         # Create the new_class
-        new_class = super_new(cls, name, bases, attrs)
+        new_class = super_new(mcs, name, bases, attrs)
 
         # Set _subclasses
         for base in document_bases:
@@ -147,7 +147,7 @@ def __new__(cls, name, bases, attrs):
             base._types = base._subclasses  # TODO depreciate _types
 
         (Document, EmbeddedDocument, DictField,
-         CachedReferenceField) = cls._import_classes()
+         CachedReferenceField) = mcs._import_classes()
 
         if issubclass(new_class, Document):
             new_class._collection = None
@@ -219,29 +219,26 @@ def __new__(cls, name, bases, attrs):
 
         return new_class
 
-    def add_to_class(self, name, value):
-        setattr(self, name, value)
-
     @classmethod
-    def _get_bases(cls, bases):
+    def _get_bases(mcs, bases):
         if isinstance(bases, BasesTuple):
             return bases
         seen = []
-        bases = cls.__get_bases(bases)
+        bases = mcs.__get_bases(bases)
         unique_bases = (b for b in bases if not (b in seen or seen.append(b)))
         return BasesTuple(unique_bases)
 
     @classmethod
-    def __get_bases(cls, bases):
+    def __get_bases(mcs, bases):
         for base in bases:
             if base is object:
                 continue
             yield base
-            for child_base in cls.__get_bases(base.__bases__):
+            for child_base in mcs.__get_bases(base.__bases__):
                 yield child_base
 
     @classmethod
-    def _import_classes(cls):
+    def _import_classes(mcs):
         Document = _import_class('Document')
         EmbeddedDocument = _import_class('EmbeddedDocument')
         DictField = _import_class('DictField')
@@ -254,9 +251,9 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
     collection in the database.
     """
 
-    def __new__(cls, name, bases, attrs):
-        flattened_bases = cls._get_bases(bases)
-        super_new = super(TopLevelDocumentMetaclass, cls).__new__
+    def __new__(mcs, name, bases, attrs):
+        flattened_bases = mcs._get_bases(bases)
+        super_new = super(TopLevelDocumentMetaclass, mcs).__new__
 
         # Set default _meta data if base class, otherwise get user defined meta
         if attrs.get('my_metaclass') == TopLevelDocumentMetaclass:
@@ -319,7 +316,7 @@ def __new__(cls, name, bases, attrs):
                     not parent_doc_cls._meta.get('abstract', False)):
                 msg = 'Abstract document cannot have non-abstract base'
                 raise ValueError(msg)
-            return super_new(cls, name, bases, attrs)
+            return super_new(mcs, name, bases, attrs)
 
         # Merge base class metas.
         # Uses a special MetaDict that handles various merging rules
@@ -360,7 +357,7 @@ def __new__(cls, name, bases, attrs):
         attrs['_meta'] = meta
 
         # Call super and get the new class
-        new_class = super_new(cls, name, bases, attrs)
+        new_class = super_new(mcs, name, bases, attrs)
 
         meta = new_class._meta
 
@@ -394,7 +391,7 @@ def __new__(cls, name, bases, attrs):
                                            '_auto_id_field', False)
         if not new_class._meta.get('id_field'):
             # After 0.10, find not existing names, instead of overwriting
-            id_name, id_db_name = cls.get_auto_id_names(new_class)
+            id_name, id_db_name = mcs.get_auto_id_names(new_class)
             new_class._auto_id_field = True
             new_class._meta['id_field'] = id_name
             new_class._fields[id_name] = ObjectIdField(db_field=id_db_name)
@@ -419,7 +416,7 @@ def __new__(cls, name, bases, attrs):
         return new_class
 
     @classmethod
-    def get_auto_id_names(cls, new_class):
+    def get_auto_id_names(mcs, new_class):
         id_name, id_db_name = ('id', '_id')
         if id_name not in new_class._fields and \
                 id_db_name not in (v.db_field for v in new_class._fields.values()):
diff --git a/mongoengine/base/utils.py b/mongoengine/base/utils.py
index 288c2f3e6..8f27ee14d 100644
--- a/mongoengine/base/utils.py
+++ b/mongoengine/base/utils.py
@@ -15,7 +15,7 @@ def compiled_regex(self):
             self._compiled_regex = re.compile(self._pattern, self._flags)
         return self._compiled_regex
 
-    def __get__(self, obj, objtype):
+    def __get__(self, instance, owner):
         return self.compiled_regex
 
     def __set__(self, instance, value):
diff --git a/mongoengine/document.py b/mongoengine/document.py
index cdeed4c6e..0b07cfa2a 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -170,8 +170,8 @@ def __hash__(self):
         """
         if self.pk is None:
             return super(BaseDocument, self).__hash__()
-        else:
-            return hash(self.pk)
+
+        return hash(self.pk)
 
     @classmethod
     def _get_db(cls):
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 131596d19..986ebf736 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -71,6 +71,7 @@ class ValidationError(AssertionError):
     _message = None
 
     def __init__(self, message='', **kwargs):
+        super(ValidationError, self).__init__(message)
         self.errors = kwargs.get('errors', {})
         self.field_name = kwargs.get('field_name')
         self.message = message
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 856022159..e4e8ee2c3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -140,8 +140,7 @@ class URLField(StringField):
         r'(?:/?|[/?]\S+)$', re.IGNORECASE)
     _URL_SCHEMES = ['http', 'https', 'ftp', 'ftps']
 
-    def __init__(self, verify_exists=False, url_regex=None, schemes=None, **kwargs):
-        self.verify_exists = verify_exists
+    def __init__(self, url_regex=None, schemes=None, **kwargs):
         self.url_regex = url_regex or self._URL_REGEX
         self.schemes = schemes or self._URL_SCHEMES
         super(URLField, self).__init__(**kwargs)
@@ -274,14 +273,14 @@ def __init__(self, min_value=None, max_value=None, **kwargs):
     def to_python(self, value):
         try:
             value = int(value)
-        except ValueError:
+        except (TypeError, ValueError):
             pass
         return value
 
     def validate(self, value):
         try:
             value = int(value)
-        except Exception:
+        except (TypeError, ValueError):
             self.error('%s could not be converted to int' % value)
 
         if self.min_value is not None and value < self.min_value:
@@ -307,7 +306,7 @@ def __init__(self, min_value=None, max_value=None, **kwargs):
     def to_python(self, value):
         try:
             value = long(value)
-        except ValueError:
+        except (TypeError, ValueError):
             pass
         return value
 
@@ -317,7 +316,7 @@ def to_mongo(self, value):
     def validate(self, value):
         try:
             value = long(value)
-        except Exception:
+        except (TypeError, ValueError):
             self.error('%s could not be converted to long' % value)
 
         if self.min_value is not None and value < self.min_value:
@@ -416,7 +415,7 @@ def to_python(self, value):
         # Convert to string for python 2.6 before casting to Decimal
         try:
             value = decimal.Decimal('%s' % value)
-        except decimal.InvalidOperation:
+        except (TypeError, ValueError, decimal.InvalidOperation):
             return value
         return value.quantize(decimal.Decimal('.%s' % ('0' * self.precision)), rounding=self.rounding)
 
@@ -433,7 +432,7 @@ def validate(self, value):
                 value = six.text_type(value)
             try:
                 value = decimal.Decimal(value)
-            except Exception as exc:
+            except (TypeError, ValueError, decimal.InvalidOperation) as exc:
                 self.error('Could not convert value to decimal: %s' % exc)
 
         if self.min_value is not None and value < self.min_value:
@@ -852,8 +851,7 @@ def __get__(self, instance, owner):
 
     def validate(self, value):
         """Make sure that a list of valid fields is being used."""
-        if (not isinstance(value, (list, tuple, QuerySet)) or
-                isinstance(value, six.string_types)):
+        if not isinstance(value, (list, tuple, QuerySet)):
             self.error('Only lists and tuples may be used in a list field')
         super(ListField, self).validate(value)
 
@@ -1953,8 +1951,7 @@ def __init__(self, collection_name=None, db_alias=None, sequence_name=None,
         self.collection_name = collection_name or self.COLLECTION_NAME
         self.db_alias = db_alias or DEFAULT_CONNECTION_NAME
         self.sequence_name = sequence_name
-        self.value_decorator = (callable(value_decorator) and
-                                value_decorator or self.VALUE_DECORATOR)
+        self.value_decorator = value_decorator if callable(value_decorator) else self.VALUE_DECORATOR
         super(SequenceField, self).__init__(*args, **kwargs)
 
     def generate(self):
@@ -2063,7 +2060,7 @@ def to_python(self, value):
                 if not isinstance(value, six.string_types):
                     value = six.text_type(value)
                 return uuid.UUID(value)
-            except Exception:
+            except (ValueError, TypeError, AttributeError):
                 return original_value
         return value
 
@@ -2085,7 +2082,7 @@ def validate(self, value):
                 value = str(value)
             try:
                 uuid.UUID(value)
-            except Exception as exc:
+            except (ValueError, TypeError, AttributeError) as exc:
                 self.error('Could not convert to UUID: %s' % exc)
 
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 0be486542..d3a5f0507 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -38,8 +38,6 @@
 DENY = 3
 PULL = 4
 
-RE_TYPE = type(re.compile(''))
-
 
 class BaseQuerySet(object):
     """A set of results returned from a query. Wraps a MongoDB cursor,
@@ -356,7 +354,7 @@ def insert(self, doc_or_docs, load_bulk=True,
 
         try:
             inserted_result = insert_func(raw)
-            ids = return_one and [inserted_result.inserted_id] or inserted_result.inserted_ids
+            ids = [inserted_result.inserted_id] if return_one else inserted_result.inserted_ids
         except pymongo.errors.DuplicateKeyError as err:
             message = 'Could not save document (%s)'
             raise NotUniqueError(message % six.text_type(err))
@@ -377,14 +375,14 @@ def insert(self, doc_or_docs, load_bulk=True,
         if not load_bulk:
             signals.post_bulk_insert.send(
                 self._document, documents=docs, loaded=False, **signal_kwargs)
-            return return_one and ids[0] or ids
+            return ids[0] if return_one else ids
         documents = self.in_bulk(ids)
         results = []
         for obj_id in ids:
             results.append(documents.get(obj_id))
         signals.post_bulk_insert.send(
             self._document, documents=results, loaded=True, **signal_kwargs)
-        return return_one and results[0] or results
+        return results[0] if return_one else results
 
     def count(self, with_limit_and_skip=False):
         """Count the selected elements in the query.
@@ -974,11 +972,10 @@ def fields(self, _only_called=False, **kwargs):
         # explicitly included, and then more complicated operators such as
         # $slice.
         def _sort_key(field_tuple):
-            key, value = field_tuple
-            if isinstance(value, (int)):
+            _, value = field_tuple
+            if isinstance(value, int):
                 return value  # 0 for exclusion, 1 for inclusion
-            else:
-                return 2  # so that complex values appear last
+            return 2  # so that complex values appear last
 
         fields = sorted(cleaned_fields, key=_sort_key)
 
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index f9fed7b73..c7c593b15 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -186,10 +186,3 @@ def __iter__(self):
             queryset = self.clone()
         queryset.rewind()
         return queryset
-
-
-class QuerySetNoDeRef(QuerySet):
-    """Special no_dereference QuerySet"""
-
-    def __dereference(items, max_depth=1, instance=None, name=None):
-        return items
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 2effa2493..41f99bbce 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -429,7 +429,6 @@ def _infer_geometry(value):
                                 'type and coordinates keys')
     elif isinstance(value, (list, set)):
         # TODO: shouldn't we test value[0][0][0][0] to see if it is MultiPolygon?
-        # TODO: should both TypeError and IndexError be alike interpreted?
 
         try:
             value[0][0][0]

From 68c7764c63e3c7c5b854271cbdac29c748c55249 Mon Sep 17 00:00:00 2001
From: Luca Di Gaspero <l.digaspero@uniud.it>
Date: Mon, 8 Oct 2018 17:06:08 +0200
Subject: [PATCH 0705/1519] Small fix to ensure to use the right document after
 pre_save_post_validation hook, which might modify the document itself (e.g.,
 for adding a etag).

---
 mongoengine/document.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index cdeed4c6e..220047d8c 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -368,6 +368,8 @@ def save(self, force_insert=False, validate=True, clean=True,
 
         signals.pre_save_post_validation.send(self.__class__, document=self,
                                               created=created, **signal_kwargs)
+        # it might be refreshed by the pre_save_post_validation hook, e.g., for etag generation
+        doc = self.to_mongo()
 
         if self._meta.get('auto_create_index', True):
             self.ensure_indexes()

From 3c5c3b50261e92fb94e3573e8d301c843a49615b Mon Sep 17 00:00:00 2001
From: Arto Jantunen <arto@vainu.io>
Date: Wed, 3 Oct 2018 09:56:59 +0300
Subject: [PATCH 0706/1519] Fix invalid isinstance check in ListField.validate

Using QuerySet directly would fail if QuerySetNoCache was used. Sadly the
test suite does not have a case where QuerySet would appear here, so adding
a test for this special case is not trivial.
---
 mongoengine/fields.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e4e8ee2c3..04e892561 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -34,7 +34,8 @@
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
 from mongoengine.python_support import StringIO
-from mongoengine.queryset import DO_NOTHING, QuerySet
+from mongoengine.queryset import DO_NOTHING
+from mongoengine.queryset.base import BaseQuerySet
 
 try:
     from PIL import Image, ImageOps
@@ -851,7 +852,7 @@ def __get__(self, instance, owner):
 
     def validate(self, value):
         """Make sure that a list of valid fields is being used."""
-        if not isinstance(value, (list, tuple, QuerySet)):
+        if not isinstance(value, (list, tuple, BaseQuerySet)):
             self.error('Only lists and tuples may be used in a list field')
         super(ListField, self).validate(value)
 

From 556f7e85fce9703bb3325af1534f861a01867f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 10 Oct 2018 23:13:34 +0200
Subject: [PATCH 0707/1519] Improve the error message that mentions that
 Document cant be subclassed

---
 mongoengine/base/metaclasses.py | 3 ++-
 tests/document/inheritance.py   | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 481408bf0..ae1917067 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -121,7 +121,8 @@ def __new__(cls, name, bases, attrs):
                 # inheritance of classes where inheritance is set to False
                 allow_inheritance = base._meta.get('allow_inheritance')
                 if not allow_inheritance and not base._meta.get('abstract'):
-                    raise ValueError('Document %s may not be subclassed' %
+                    raise ValueError('Document %s may not be subclassed. '
+                                     'To enable inheritance, use the "allow_inheritance" meta attribute.' %
                                      base.__name__)
 
         # Get superclasses from last base superclass
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index b2ab1b52b..2789ad8e2 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -258,9 +258,10 @@ class Animal(Document):
             name = StringField()
 
         # can't inherit because Animal didn't explicitly allow inheritance
-        with self.assertRaises(ValueError):
+        with self.assertRaises(ValueError) as cm:
             class Dog(Animal):
                 pass
+        self.assertIn("Document Animal may not be subclassed", str(cm.exception))
 
         # Check that _cls etc aren't present on simple documents
         dog = Animal(name='dog').save()
@@ -277,9 +278,10 @@ class Animal(Document):
             name = StringField()
             meta = {'allow_inheritance': True}
 
-        with self.assertRaises(ValueError):
+        with self.assertRaises(ValueError) as cm:
             class Mammal(Animal):
                 meta = {'allow_inheritance': False}
+        self.assertEqual(str(cm.exception), 'Only direct subclasses of Document may set "allow_inheritance" to False')
 
     def test_allow_inheritance_abstract_document(self):
         """Ensure that abstract documents can set inheritance rules and that
@@ -292,7 +294,7 @@ class FinalDocument(Document):
         class Animal(FinalDocument):
             name = StringField()
 
-        with self.assertRaises(ValueError):
+        with self.assertRaises(ValueError) as cm:
             class Mammal(Animal):
                 pass
 

From 59a06a242d5d7681bac6280291ba1c97f5f2b621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 15 Oct 2018 22:32:11 +0200
Subject: [PATCH 0708/1519] Fix a bug when using a
 ReferenceField(AbstractClass) #1920

---
 mongoengine/fields.py         |  9 -------
 tests/document/inheritance.py | 48 +++++++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 04e892561..284c614d3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1176,15 +1176,6 @@ def validate(self, value):
             self.error('You can only reference documents once they have been '
                        'saved to the database')
 
-        if (
-            self.document_type._meta.get('abstract') and
-            not isinstance(value, self.document_type)
-        ):
-            self.error(
-                '%s is not an instance of abstract reference type %s' % (
-                    value, self.document_type._class_name)
-            )
-
     def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
 
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index b2ab1b52b..735c68dae 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -2,14 +2,11 @@
 import unittest
 import warnings
 
-from datetime import datetime
-
 from tests.fixtures import Base
 
-from mongoengine import Document, EmbeddedDocument, connect
+from mongoengine import Document, EmbeddedDocument, connect, ReferenceField,\
+    BooleanField, GenericReferenceField, IntField, StringField
 from mongoengine.connection import get_db
-from mongoengine.fields import (BooleanField, GenericReferenceField,
-                                IntField, StringField)
 
 __all__ = ('InheritanceTest', )
 
@@ -300,6 +297,41 @@ class Mammal(Animal):
         doc = Animal(name='dog')
         self.assertNotIn('_cls', doc.to_mongo())
 
+    def test_using_abstract_class_in_reference_field(self):
+        # Ensures no regression of #1920
+        class AbstractHuman(Document):
+            meta = {'abstract': True}
+
+        class Dad(AbstractHuman):
+            name = StringField()
+
+        class Home(Document):
+            dad = ReferenceField(AbstractHuman)  # Referencing the abstract class
+            address = StringField()
+
+        dad = Dad(name='5').save()
+        Home(dad=dad, address='street').save()
+
+        home = Home.objects.first()
+        home.address = 'garbage'
+        home.save()     # Was failing with ValidationError
+
+    def test_abstract_class_referencing_self(self):
+        # Ensures no regression of #1920
+        class Human(Document):
+            meta = {'abstract': True}
+            creator = ReferenceField('self', dbref=True)
+
+        class User(Human):
+            name = StringField()
+
+        user = User(name='John').save()
+        user2 = User(name='Foo', creator=user).save()
+
+        user2 = User.objects.with_id(user2.id)
+        user2.name = 'Bar'
+        user2.save()    # Was failing with ValidationError
+
     def test_abstract_handle_ids_in_metaclass_properly(self):
 
         class City(Document):
@@ -358,11 +390,11 @@ class City(Document):
             meta = {'abstract': True,
                     'allow_inheritance': False}
 
-        bkk = City(continent='asia')
-        self.assertEqual(None, bkk.pk)
+        city = City(continent='asia')
+        self.assertEqual(None, city.pk)
         # TODO: expected error? Shouldn't we create a new error type?
         with self.assertRaises(KeyError):
-            setattr(bkk, 'pk', 1)
+            setattr(city, 'pk', 1)
 
     def test_allow_inheritance_embedded_document(self):
         """Ensure embedded documents respect inheritance."""

From 0fa6610fdb3ceec259d28598903ce8363074c156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 5 Oct 2018 14:13:46 +0200
Subject: [PATCH 0709/1519] Fix complex combinations of
 DictField(ListField(ReferenceField)) (#1453)

---
 mongoengine/base/document.py |  4 +--
 mongoengine/dereference.py   | 50 +++++++++++++++++++++++-------------
 tests/fields/fields.py       | 47 +++++++++++++++++++++++++++++++--
 3 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index c82d670e4..fd8fec803 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -3,9 +3,7 @@
 from collections import Hashable
 from functools import partial
 
-from bson import ObjectId, json_util
-from bson.dbref import DBRef
-from bson.son import SON
+from bson import DBRef, ObjectId, SON, json_util
 import pymongo
 import six
 
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 6c9932230..dbcbc0367 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -52,26 +52,40 @@ def __call__(self, items, max_depth=1, instance=None, name=None):
                         [i.__class__ == doc_type for i in items.values()]):
                     return items
                 elif not field.dbref:
-                    if not hasattr(items, 'items'):
+                    # We must turn the ObjectIds into DBRefs
+
+                    # Recursively dig into the sub items of a list/dict
+                    # to turn the ObjectIds into DBRefs
+                    def _get_items_from_list(items):
+                        new_items = []
+                        for v in items:
+                            value = v
+                            if isinstance(v, dict):
+                                value = _get_items_from_dict(v)
+                            elif isinstance(v, list):
+                                value = _get_items_from_list(v)
+                            elif not isinstance(v, (DBRef, Document)):
+                                value = field.to_python(v)
+                            new_items.append(value)
+                        return new_items
 
-                        def _get_items(items):
-                            new_items = []
-                            for v in items:
-                                if isinstance(v, list):
-                                    new_items.append(_get_items(v))
-                                elif not isinstance(v, (DBRef, Document)):
-                                    new_items.append(field.to_python(v))
-                                else:
-                                    new_items.append(v)
-                            return new_items
-
-                        items = _get_items(items)
+                    def _get_items_from_dict(items):
+                        new_items = {}
+                        for k, v in items.iteritems():
+                            value = v
+                            if isinstance(v, list):
+                                value = _get_items_from_list(v)
+                            elif isinstance(v, dict):
+                                value = _get_items_from_dict(v)
+                            elif not isinstance(v, (DBRef, Document)):
+                                value = field.to_python(v)
+                            new_items[k] = value
+                        return new_items
+
+                    if not hasattr(items, 'items'):
+                        items = _get_items_from_list(items)
                     else:
-                        items = {
-                            k: (v if isinstance(v, (DBRef, Document))
-                                else field.to_python(v))
-                            for k, v in items.iteritems()
-                        }
+                        items = _get_items_from_dict(items)
 
         self.reference_map = self._find_references(items)
         self.object_map = self._fetch_objects(doc_type=doc_type)
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index b375822e6..8abe32fc4 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1187,7 +1187,7 @@ def reset_post():
         # aka 'del list[index]'
         # aka 'operator.delitem(list, index)'
         reset_post()
-        del post.info[2] # del from middle ('2')
+        del post.info[2]  # del from middle ('2')
         self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
         post.save()
         post.reload()
@@ -1197,7 +1197,7 @@ def reset_post():
         # aka 'del list[i:j]'
         # aka 'operator.delitem(list, slice(i,j))'
         reset_post()
-        del post.info[1:3] # removes '1', '2'
+        del post.info[1:3]  # removes '1', '2'
         self.assertEqual(post.info, ['0', '3', '4', '5'])
         post.save()
         post.reload()
@@ -1826,6 +1826,48 @@ class Simple(Document):
         with self.assertRaises(ValueError):
             e.update(set__mapping={"somestrings": ["foo", "bar", ]})
 
+    def test_dictfield_with_referencefield_complex_nesting_cases(self):
+        """Ensure complex nesting inside DictField handles dereferencing of ReferenceField(dbref=True | False)"""
+        # Relates to Issue #1453
+        class Doc(Document):
+            s = StringField()
+
+        class Simple(Document):
+            mapping0 = DictField(ReferenceField(Doc, dbref=True))
+            mapping1 = DictField(ReferenceField(Doc, dbref=False))
+            mapping2 = DictField(ListField(ReferenceField(Doc, dbref=True)))
+            mapping3 = DictField(ListField(ReferenceField(Doc, dbref=False)))
+            mapping4 = DictField(DictField(field=ReferenceField(Doc, dbref=True)))
+            mapping5 = DictField(DictField(field=ReferenceField(Doc, dbref=False)))
+            mapping6 = DictField(ListField(DictField(ReferenceField(Doc, dbref=True))))
+            mapping7 = DictField(ListField(DictField(ReferenceField(Doc, dbref=False))))
+            mapping8 = DictField(ListField(DictField(ListField(ReferenceField(Doc, dbref=True)))))
+            mapping9 = DictField(ListField(DictField(ListField(ReferenceField(Doc, dbref=False)))))
+
+        Doc.drop_collection()
+        Simple.drop_collection()
+
+        d = Doc(s='aa').save()
+        e = Simple()
+        e.mapping0['someint'] = e.mapping1['someint'] = d
+        e.mapping2['someint'] = e.mapping3['someint'] = [d]
+        e.mapping4['someint'] = e.mapping5['someint'] = {'d': d}
+        e.mapping6['someint'] = e.mapping7['someint'] = [{'d': d}]
+        e.mapping8['someint'] = e.mapping9['someint'] = [{'d': [d]}]
+        e.save()
+
+        s = Simple.objects.first()
+        self.assertIsInstance(s.mapping0['someint'], Doc)
+        self.assertIsInstance(s.mapping1['someint'], Doc)
+        self.assertIsInstance(s.mapping2['someint'][0], Doc)
+        self.assertIsInstance(s.mapping3['someint'][0], Doc)
+        self.assertIsInstance(s.mapping4['someint']['d'], Doc)
+        self.assertIsInstance(s.mapping5['someint']['d'], Doc)
+        self.assertIsInstance(s.mapping6['someint'][0]['d'], Doc)
+        self.assertIsInstance(s.mapping7['someint'][0]['d'], Doc)
+        self.assertIsInstance(s.mapping8['someint'][0]['d'][0], Doc)
+        self.assertIsInstance(s.mapping9['someint'][0]['d'][0], Doc)
+
     def test_mapfield(self):
         """Ensure that the MapField handles the declared type."""
         class Simple(Document):
@@ -4348,6 +4390,7 @@ class MyFailingDoc(Document):
             class MyFailingdoc2(Document):
                 emb = EmbeddedDocumentField('MyDoc')
 
+
 class CachedReferenceFieldTest(MongoDBTestCase):
 
     def test_cached_reference_field_get_and_save(self):

From 4939a7dd7cee37d90b1d257129c9db7072cbc0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 16 Oct 2018 22:19:41 +0200
Subject: [PATCH 0710/1519] update input document ids during bulk insert #1919

---
 docs/changelog.rst           |   2 +
 mongoengine/queryset/base.py |   9 ++-
 tests/queryset/queryset.py   | 142 +++++++++++++++++++++++------------
 3 files changed, 100 insertions(+), 53 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index edc0fb1a3..1757be3e3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,12 +5,14 @@ Changelog
 Development
 ===========
 - QuerySet limit function behaviour: Passing 0 as parameter will return all the documents in the cursor #1611
+- bulk insert updates the ids of the input documents #1919
 - (Fill this out as you fix issues and develop your features).
 =======
 Changes in 0.15.4
 =================
 - Added `DateField` #513
 
+
 Changes in 0.15.3
 =================
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index d3a5f0507..9ea214cc0 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -372,14 +372,17 @@ def insert(self, doc_or_docs, load_bulk=True,
                 raise NotUniqueError(message % six.text_type(err))
             raise OperationError(message % six.text_type(err))
 
+        # Apply inserted_ids to documents
+        for doc, doc_id in zip(docs, ids):
+            doc.pk = doc_id
+
         if not load_bulk:
             signals.post_bulk_insert.send(
                 self._document, documents=docs, loaded=False, **signal_kwargs)
             return ids[0] if return_one else ids
+
         documents = self.in_bulk(ids)
-        results = []
-        for obj_id in ids:
-            results.append(documents.get(obj_id))
+        results = [documents.get(obj_id) for obj_id in ids]
         signals.post_bulk_insert.send(
             self._document, documents=results, loaded=True, **signal_kwargs)
         return results[0] if return_one else results
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c5004ed29..ad405bb11 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -704,38 +704,38 @@ class Doc(Document):
         self.assertRaises(ValidationError, Doc.objects().update, ed_f__str_f=1, upsert=True)
 
     def test_update_related_models(self):
-            class TestPerson(Document):
-                name = StringField()
+        class TestPerson(Document):
+            name = StringField()
 
-            class TestOrganization(Document):
-                name = StringField()
-                owner = ReferenceField(TestPerson)
+        class TestOrganization(Document):
+            name = StringField()
+            owner = ReferenceField(TestPerson)
 
-            TestPerson.drop_collection()
-            TestOrganization.drop_collection()
+        TestPerson.drop_collection()
+        TestOrganization.drop_collection()
 
-            p = TestPerson(name='p1')
-            p.save()
-            o = TestOrganization(name='o1')
-            o.save()
+        p = TestPerson(name='p1')
+        p.save()
+        o = TestOrganization(name='o1')
+        o.save()
 
-            o.owner = p
-            p.name = 'p2'
+        o.owner = p
+        p.name = 'p2'
 
-            self.assertEqual(o._get_changed_fields(), ['owner'])
-            self.assertEqual(p._get_changed_fields(), ['name'])
+        self.assertEqual(o._get_changed_fields(), ['owner'])
+        self.assertEqual(p._get_changed_fields(), ['name'])
 
-            o.save()
+        o.save()
 
-            self.assertEqual(o._get_changed_fields(), [])
-            self.assertEqual(p._get_changed_fields(), ['name'])  # Fails; it's empty
+        self.assertEqual(o._get_changed_fields(), [])
+        self.assertEqual(p._get_changed_fields(), ['name'])  # Fails; it's empty
 
-            # This will do NOTHING at all, even though we changed the name
-            p.save()
+        # This will do NOTHING at all, even though we changed the name
+        p.save()
 
-            p.reload()
+        p.reload()
 
-            self.assertEqual(p.name, 'p2')  # Fails; it's still `p1`
+        self.assertEqual(p.name, 'p2')  # Fails; it's still `p1`
 
     def test_upsert(self):
         self.Person.drop_collection()
@@ -839,18 +839,18 @@ class Blog(Document):
         comment2 = Comment(name='testb')
         post1 = Post(comments=[comment1, comment2])
         post2 = Post(comments=[comment2, comment2])
-        blogs = [Blog(title="post %s" % i, posts=[post1, post2])
-                 for i in range(99)]
 
         # Check bulk insert using load_bulk=False
+        blogs = [Blog(title="%s" % i, posts=[post1, post2])
+                 for i in range(99)]
         with query_counter() as q:
             self.assertEqual(q, 0)
             Blog.objects.insert(blogs, load_bulk=False)
 
             if MONGO_VER == MONGODB_32:
-                self.assertEqual(q, 1)      # 1 entry containing the list of inserts
+                self.assertEqual(q, 1)              # 1 entry containing the list of inserts
             else:
-                self.assertEqual(q, len(blogs))    # 1 entry per doc inserted
+                self.assertEqual(q, len(blogs))     # 1 entry per doc inserted
 
         self.assertEqual(Blog.objects.count(), len(blogs))
 
@@ -858,14 +858,16 @@ class Blog(Document):
         Blog.ensure_indexes()
 
         # Check bulk insert using load_bulk=True
+        blogs = [Blog(title="%s" % i, posts=[post1, post2])
+                 for i in range(99)]
         with query_counter() as q:
             self.assertEqual(q, 0)
             Blog.objects.insert(blogs)
 
             if MONGO_VER == MONGODB_32:
-                self.assertEqual(q, 2)              # 1 for insert 1 for fetch
+                self.assertEqual(q, 2)                  # 1 for insert 1 for fetch
             else:
-                self.assertEqual(q, len(blogs)+1)    # + 1 to fetch all docs
+                self.assertEqual(q, len(blogs)+1)       # + 1 to fetch all docs
 
         Blog.drop_collection()
 
@@ -886,26 +888,10 @@ class Blog(Document):
             blog = Blog.objects.first()
             Blog.objects.insert(blog)
 
-        # test inserting a query set
-        with self.assertRaises(OperationError):
-            blogs = Blog.objects
-            Blog.objects.insert(blogs)
-
-        # insert a new doc
+        # insert 1 new doc
         new_post = Blog(title="code123", id=ObjectId())
         Blog.objects.insert(new_post)
 
-        class Author(Document):
-            pass
-
-        # try inserting a different document class
-        with self.assertRaises(OperationError):
-            Blog.objects.insert(Author())
-
-        # try inserting a non-document
-        with self.assertRaises(OperationError):
-            Blog.objects.insert("HELLO WORLD")
-
         Blog.drop_collection()
 
         blog1 = Blog(title="code", posts=[post1, post2])
@@ -916,20 +902,76 @@ class Author(Document):
         Blog.drop_collection()
         blog1 = Blog(title="code", posts=[post1, post2])
         obj_id = Blog.objects.insert(blog1, load_bulk=False)
-        self.assertEqual(obj_id.__class__.__name__, 'ObjectId')
+        self.assertIsInstance(obj_id, ObjectId)
 
         Blog.drop_collection()
         post3 = Post(comments=[comment1, comment1])
         blog1 = Blog(title="foo", posts=[post1, post2])
         blog2 = Blog(title="bar", posts=[post2, post3])
-        blog3 = Blog(title="baz", posts=[post1, post2])
         Blog.objects.insert([blog1, blog2])
 
         with self.assertRaises(NotUniqueError):
-            Blog.objects.insert([blog2, blog3])
+            Blog.objects.insert(Blog(title=blog2.title))
 
         self.assertEqual(Blog.objects.count(), 2)
 
+    def test_bulk_insert_different_class_fails(self):
+        class Blog(Document):
+            pass
+
+        class Author(Document):
+            pass
+
+        # try inserting a different document class
+        with self.assertRaises(OperationError):
+            Blog.objects.insert(Author())
+
+    def test_bulk_insert_with_wrong_type(self):
+        class Blog(Document):
+            name = StringField()
+
+        Blog.drop_collection()
+        Blog(name='test').save()
+
+        with self.assertRaises(OperationError):
+            Blog.objects.insert("HELLO WORLD")
+
+        with self.assertRaises(OperationError):
+            Blog.objects.insert({'name': 'garbage'})
+
+        # test inserting a query set
+        with self.assertRaises(OperationError) as cm:
+            blogs_qs = Blog.objects
+            Blog.objects.insert(blogs_qs)
+        self.assertEqual(cm.exception.message, 'Some documents have ObjectIds use doc.update() instead')
+
+    def test_bulk_insert_update_input_document_ids(self):
+        class Comment(Document):
+            idx = IntField()
+
+        Comment.drop_collection()
+
+        # Test with bulk
+        comments = [Comment(idx=idx) for idx in range(20)]
+        for com in comments:
+            self.assertIsNone(com.id)
+
+        returned_comments = Comment.objects.insert(comments, load_bulk=True)
+
+        for com in comments:
+            self.assertIsInstance(com.id, ObjectId)
+
+        input_mapping = {com.id: com.idx for com in comments}
+        saved_mapping = {com.id: com.idx for com in returned_comments}
+        self.assertEqual(input_mapping, saved_mapping)
+
+        Comment.drop_collection()
+
+        # Test with just one
+        comment = Comment(idx=0)
+        inserted_comment_id = Comment.objects.insert(comment, load_bulk=False)
+        self.assertEqual(comment.id, inserted_comment_id)
+
     def test_get_changed_fields_query_count(self):
         """Make sure we don't perform unnecessary db operations when
         none of document's fields were updated.
@@ -2007,7 +2049,7 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.tags, ['mongodb', 'python', 'java'])
 
-        #test push with singular value
+        # test push with singular value
         BlogPost.objects.filter(id=post.id).update(push__tags__0='scala')
         post.reload()
         self.assertEqual(post.tags, ['scala', 'mongodb', 'python', 'java'])
@@ -2286,7 +2328,7 @@ class Bar(EmbeddedDocument):
 
         class User(Document):
             username = StringField()
-            bar = GenericEmbeddedDocumentField(choices=[Bar,])
+            bar = GenericEmbeddedDocumentField(choices=[Bar, ])
 
         User.drop_collection()
 

From a1a93a4bdda7b5ab59072b2484a39f9a00fa4d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 16 Oct 2018 22:35:58 +0200
Subject: [PATCH 0711/1519] minor additions

---
 docs/changelog.rst         | 1 -
 tests/queryset/queryset.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1757be3e3..69581a4b1 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,7 +12,6 @@ Changes in 0.15.4
 =================
 - Added `DateField` #513
 
-
 Changes in 0.15.3
 =================
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index ad405bb11..0eed3e472 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2328,7 +2328,7 @@ class Bar(EmbeddedDocument):
 
         class User(Document):
             username = StringField()
-            bar = GenericEmbeddedDocumentField(choices=[Bar, ])
+            bar = GenericEmbeddedDocumentField(choices=[Bar])
 
         User.drop_collection()
 

From 26b70e9ed3a169fab4127404f93597631bdc5aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 16 Oct 2018 22:55:55 +0200
Subject: [PATCH 0712/1519] fix test

---
 tests/queryset/queryset.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 0eed3e472..f4bc1dcd2 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -884,9 +884,16 @@ class Blog(Document):
         self.assertEqual(Blog.objects.count(), 2)
 
         # test inserting an existing document (shouldn't be allowed)
-        with self.assertRaises(OperationError):
+        with self.assertRaises(OperationError) as cm:
             blog = Blog.objects.first()
             Blog.objects.insert(blog)
+        self.assertEqual(str(cm.exception), 'Some documents have ObjectIds use doc.update() instead')
+
+        # test inserting a query set
+        with self.assertRaises(OperationError) as cm:
+            blogs_qs = Blog.objects
+            Blog.objects.insert(blogs_qs)
+        self.assertEqual(str(cm.exception), 'Some documents have ObjectIds use doc.update() instead')
 
         # insert 1 new doc
         new_post = Blog(title="code123", id=ObjectId())
@@ -939,12 +946,6 @@ class Blog(Document):
         with self.assertRaises(OperationError):
             Blog.objects.insert({'name': 'garbage'})
 
-        # test inserting a query set
-        with self.assertRaises(OperationError) as cm:
-            blogs_qs = Blog.objects
-            Blog.objects.insert(blogs_qs)
-        self.assertEqual(cm.exception.message, 'Some documents have ObjectIds use doc.update() instead')
-
     def test_bulk_insert_update_input_document_ids(self):
         class Comment(Document):
             idx = IntField()

From 598d6bf4c5e75ad78a8562efda1aa7e4f7c1b3ba Mon Sep 17 00:00:00 2001
From: __ROLLER__ <techangel428@gmail.com>
Date: Sun, 21 Oct 2018 12:47:23 -0600
Subject: [PATCH 0713/1519] Update README.rst

Added information on using pipenv to the Installation section
---
 README.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 17cb3e33b..4e186a856 100644
--- a/README.rst
+++ b/README.rst
@@ -36,9 +36,11 @@ Installation
 We recommend the use of `virtualenv <https://virtualenv.pypa.io/>`_ and of
 `pip <https://pip.pypa.io/>`_. You can then use ``pip install -U mongoengine``.
 You may also have `setuptools <http://peak.telecommunity.com/DevCenter/setuptools>`_
-and thus you can use ``easy_install -U mongoengine``. Otherwise, you can download the
-source from `GitHub <http://github.com/MongoEngine/mongoengine>`_ and run ``python
-setup.py install``.
+and thus you can use ``easy_install -U mongoengine``. Another option is 
+`pipenv <https://docs.pipenv.org/>`_. You can then use ``pipenv install mongoengine``
+to both create the virtual environment and install the package. Otherwise, you can
+download the source from `GitHub <http://github.com/MongoEngine/mongoengine>`_ and
+run ``python setup.py install``.
 
 Dependencies
 ============

From 83fe7f7eefba10e2ad71fa68b25235d226860811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 22 Oct 2018 21:54:46 +0200
Subject: [PATCH 0714/1519] Document the  index option and the fact that
 additional options gets forwarded to pymongo's create_index method

---
 docs/guide/defining-documents.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index bf74ad8cf..be8d9a152 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -492,7 +492,9 @@ the field name with a **#**::
             ]
         }
 
-If a dictionary is passed then the following options are available:
+If a dictionary is passed then additional options become available. Valid options include,
+but are not limited to:
+
 
 :attr:`fields` (Default: None)
     The fields to index. Specified in the same format as described above.
@@ -516,8 +518,12 @@ If a dictionary is passed then the following options are available:
 :attr:`name` (Optional)
     Allows you to specify a name for the index
 
+:attr:`collation` (Optional)
+    Allows to create case insensitive indexes (MongoDB v3.4+ only)
+
 .. note::
 
+    Additional options are forwarded as **kwargs to pymongo's create_index method.
     Inheritance adds extra fields indices see: :ref:`document-inheritance`.
 
 Global index default options
@@ -736,7 +742,7 @@ document.::
 
 .. note:: From 0.8 onwards :attr:`allow_inheritance` defaults
           to False, meaning you must set it to True to use inheritance.
-          
+
           Setting :attr:`allow_inheritance` to True should also be used in
           :class:`~mongoengine.EmbeddedDocument` class in case you need to subclass it
 

From f23b0faf4189a820827c4cc9efd75503b49a276a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 23 Oct 2018 22:10:34 +0200
Subject: [PATCH 0715/1519] fix some asserts in no_dereference doc

---
 docs/guide/querying.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index f1594dd29..089878350 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -456,14 +456,14 @@ data. To turn off dereferencing of the results of a query use
 :func:`~mongoengine.queryset.QuerySet.no_dereference` on the queryset like so::
 
     post = Post.objects.no_dereference().first()
-    assert(isinstance(post.author, ObjectId))
+    assert(isinstance(post.author, DBRef))
 
 You can also turn off all dereferencing for a fixed period by using the
 :class:`~mongoengine.context_managers.no_dereference` context manager::
 
     with no_dereference(Post) as Post:
         post = Post.objects.first()
-        assert(isinstance(post.author, ObjectId))
+        assert(isinstance(post.author, DBRef))
 
     # Outside the context manager dereferencing occurs.
     assert(isinstance(post.author, User))

From c685ace32795fad8a320707e178581a90f642887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 23 Oct 2018 23:55:55 +0200
Subject: [PATCH 0716/1519] minor improvement to index doc

---
 docs/guide/defining-documents.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index be8d9a152..14f2ff1b5 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -544,7 +544,7 @@ There are a few top level defaults for all indexes that can be set::
 
 
 :attr:`index_opts` (Optional)
-    Set any default index options - see the `full options list <http://docs.mongodb.org/manual/reference/method/db.collection.ensureIndex/#db.collection.ensureIndex>`_
+    Set any default index options - see the `full options list <https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#db.collection.createIndex>`_
 
 :attr:`index_background` (Optional)
     Set the default value for if an index should be indexed in the background
@@ -560,8 +560,7 @@ There are a few top level defaults for all indexes that can be set::
 
 :attr:`index_drop_dups` (Optional)
     Set the default value for if an index should drop duplicates
-
-.. note:: Since MongoDB 3.0 drop_dups is not supported anymore. Raises a Warning
+    Since MongoDB 3.0 drop_dups is not supported anymore. Raises a Warning
     and has no effect
 
 

From f6cd349a1698efe85f9501e369d26d8f6ec0b7a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 30 Oct 2018 22:52:50 +0100
Subject: [PATCH 0717/1519] Fix bug when using GenericReferenceField,
 modifications to the referenced document are tracked in the parent #1934

---
 docs/changelog.rst           |  2 ++
 mongoengine/base/document.py |  3 ++-
 tests/fields/fields.py       | 32 +++++++++++++++++++++++++++++---
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 69581a4b1..255d37431 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,8 @@ Development
 ===========
 - QuerySet limit function behaviour: Passing 0 as parameter will return all the documents in the cursor #1611
 - bulk insert updates the ids of the input documents #1919
+- Fix an harmless bug related to GenericReferenceField where modifications in the generic-referenced document
+    were tracked in the parent (#1934)
 - (Fill this out as you fix issues and develop your features).
 =======
 Changes in 0.15.4
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 662179211..aad027e54 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -528,6 +528,7 @@ def _get_changed_fields(self, inspected=None):
         EmbeddedDocument = _import_class('EmbeddedDocument')
         DynamicEmbeddedDocument = _import_class('DynamicEmbeddedDocument')
         ReferenceField = _import_class('ReferenceField')
+        GenericReferenceField = _import_class('GenericReferenceField')
         SortedListField = _import_class('SortedListField')
 
         changed_fields = []
@@ -560,7 +561,7 @@ def _get_changed_fields(self, inspected=None):
             elif (isinstance(data, (list, tuple, dict)) and
                     db_field_name not in changed_fields):
                 if (hasattr(field, 'field') and
-                        isinstance(field.field, ReferenceField)):
+                        isinstance(field.field, (ReferenceField, GenericReferenceField))):
                     continue
                 elif isinstance(field, SortedListField) and field._ordering:
                     # if ordering is affected whole list is changed
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index b375822e6..084be71f5 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1187,7 +1187,7 @@ def reset_post():
         # aka 'del list[index]'
         # aka 'operator.delitem(list, index)'
         reset_post()
-        del post.info[2] # del from middle ('2')
+        del post.info[2]  # del from middle ('2')
         self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
         post.save()
         post.reload()
@@ -1197,7 +1197,7 @@ def reset_post():
         # aka 'del list[i:j]'
         # aka 'operator.delitem(list, slice(i,j))'
         reset_post()
-        del post.info[1:3] # removes '1', '2'
+        del post.info[1:3]  # removes '1', '2'
         self.assertEqual(post.info, ['0', '3', '4', '5'])
         post.save()
         post.reload()
@@ -2816,7 +2816,32 @@ class Doc(Document):
         doc = Doc.objects.get(ref=DBRef('doc', doc1.pk))
         self.assertEqual(doc, doc2)
 
-    def test_generic_reference_filter_by_objectid(self):
+    def test_generic_reference_is_not_tracked_in_parent_doc(self):
+        """Ensure that modifications of related documents (through generic reference) don't influence
+        the owner changed fields (#1934)
+        """
+        class Doc1(Document):
+            name = StringField()
+
+        class Doc2(Document):
+            ref = GenericReferenceField()
+            refs = ListField(GenericReferenceField())
+
+        Doc1.drop_collection()
+        Doc2.drop_collection()
+
+        doc1 = Doc1(name='garbage1').save()
+        doc11 = Doc1(name='garbage11').save()
+        doc2 = Doc2(ref=doc1, refs=[doc11]).save()
+
+        doc2.ref.name = 'garbage2'
+        self.assertEqual(doc2._get_changed_fields(), [])
+
+        doc2.refs[0].name = 'garbage3'
+        self.assertEqual(doc2._get_changed_fields(), [])
+        self.assertEqual(doc2._delta(), ({}, {}))
+
+    def test_generic_reference_field(self):
         """Ensure we can search for a specific generic reference by
         providing its DBRef.
         """
@@ -4348,6 +4373,7 @@ class MyFailingDoc(Document):
             class MyFailingdoc2(Document):
                 emb = EmbeddedDocumentField('MyDoc')
 
+
 class CachedReferenceFieldTest(MongoDBTestCase):
 
     def test_cached_reference_field_get_and_save(self):

From 983474b2bdc33cc5550d8c9e2c45b166c64bd029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 30 Oct 2018 23:40:46 +0100
Subject: [PATCH 0718/1519] Ignore 2 more flake8 warnings (introduced in latest
 flake8 3.6.0 release)

---
 mongoengine/queryset/base.py | 4 ++--
 setup.cfg                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 9ea214cc0..6c36d9840 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1872,8 +1872,8 @@ def field_path_sub(match):
             # Substitute the correct name for the field into the javascript
             return '.'.join([f.db_field for f in fields])
 
-        code = re.sub(u'\[\s*~([A-z_][A-z_0-9.]+?)\s*\]', field_sub, code)
-        code = re.sub(u'\{\{\s*~([A-z_][A-z_0-9.]+?)\s*\}\}', field_path_sub,
+        code = re.sub(r'\[\s*~([A-z_][A-z_0-9.]+?)\s*\]', field_sub, code)
+        code = re.sub(r'\{\{\s*~([A-z_][A-z_0-9.]+?)\s*\}\}', field_path_sub,
                       code)
         return code
 
diff --git a/setup.cfg b/setup.cfg
index fd6192b8e..840866011 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ detailed-errors=1
 cover-package=mongoengine
 
 [flake8]
-ignore=E501,F401,F403,F405,I201,I202
+ignore=E501,F401,F403,F405,I201,I202,W504, W605
 exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
 max-complexity=47
 application-import-names=mongoengine,tests

From 8e18484898d15ddefd9f74c9ff5aaef2e80e0b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 1 Nov 2018 22:28:12 +0100
Subject: [PATCH 0719/1519] Add a comment on a suspicious line (#1322)

---
 mongoengine/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index d035ff017..dca4e84b5 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -991,7 +991,7 @@ def prepare_query_value(self, op, value):
         if op in match_operators and isinstance(value, six.string_types):
             return StringField().prepare_query_value(op, value)
 
-        if hasattr(self.field, 'field'):
+        if hasattr(self.field, 'field'):    # Used for instance when using DictField(ListField(IntField()))
             if op in ('set', 'unset') and isinstance(value, dict):
                 return {
                     k: self.field.prepare_query_value(op, v)

From 424b3ca30806772021e888fe7214d9eb67c095bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 27 Oct 2018 23:01:14 +0200
Subject: [PATCH 0720/1519] update changelog with changes since 0.15.3

---
 docs/changelog.rst         | 42 +++++++++++++++++++++++++++++++-------
 mongoengine/dereference.py |  2 +-
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 255d37431..222c6ea89 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,15 +4,43 @@ Changelog
 
 Development
 ===========
-- QuerySet limit function behaviour: Passing 0 as parameter will return all the documents in the cursor #1611
-- bulk insert updates the ids of the input documents #1919
-- Fix an harmless bug related to GenericReferenceField where modifications in the generic-referenced document
-    were tracked in the parent (#1934)
 - (Fill this out as you fix issues and develop your features).
 =======
-Changes in 0.15.4
-=================
-- Added `DateField` #513
+Changes in 0.16.0
+=================
+- Various improvements to the doc
+- Improvement to code quality
+- POTENTIAL BREAKING CHANGES:
+    - EmbeddedDocumentField will no longer accept references to Document classes in its constructor #1661
+    - Get rid of the `basecls` parameter from the DictField constructor (dead code) #1876
+    - default value of ComplexDateTime is now None (and no longer the current datetime) #1368
+- Fix unhashable TypeError when referencing a Document with a compound key in an EmbeddedDocument #1685
+- Fix bug where an EmbeddedDocument with the same id as its parent would not be tracked for changes #1768
+- Fix the fact that bulk `insert()` was not setting primary keys of inserted documents instances #1919
+- Fix bug when referencing the abstract class in a ReferenceField #1920
+- Allow modification to the document made in pre_save_post_validation to be taken into account #1202
+- Replaced MongoDB 2.4 tests in CI by MongoDB 3.2 #1903
+- Fix side effects of using queryset.`no_dereference` on other documents #1677
+- Fix TypeError when using lazy django translation objects as translated choices #1879
+- Improve 2-3 codebase compatibility #1889
+- Fix the support for changing the default value of ComplexDateTime #1368
+- Improves error message in case an EmbeddedDocumentListField receives an EmbeddedDocument instance
+    instead of a list #1877
+- Fix the Decimal operator inc/dec #1517 #1320
+- Ignore killcursors queries in `query_counter` context manager #1869
+- Fix the fact that `query_counter` was modifying the initial profiling_level in case it was != 0 #1870
+- Repaired the `no_sub_classes` context manager + fix the fact that it was swallowing exceptions #1865
+- Fix index creation error that was swallowed by hasattr under python2 #1688
+- QuerySet limit function behaviour: Passing 0 as parameter will return all the documents in the cursor #1611
+- bulk insert updates the ids of the input documents instances #1919
+- Fix an harmless bug related to GenericReferenceField where modifications in the generic-referenced document
+    were tracked in the parent #1934
+- Improve validator of BinaryField #273
+- Implemented lazy regex compiling in Field classes to improve 'import mongoengine' performance #1806
+- Updated GridFSProxy.__str__  so that it would always print both the filename and grid_id #710
+- Add __repr__ to Q and QCombination #1843
+- fix bug in BaseList.__iter__ operator (was occuring when modifying a BaseList while iterating over it) #1676
+- Added field `DateField`#513
 
 Changes in 0.15.3
 =================
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 6c9932230..44266613a 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -134,7 +134,7 @@ def _fetch_objects(self, doc_type=None):
         object_map = {}
         for collection, dbrefs in self.reference_map.iteritems():
 
-            # we use getattr instead of hasattr because as hasattr swallows any exception under python2
+            # we use getattr instead of hasattr because hasattr swallows any exception under python2
             # so it could hide nasty things without raising exceptions (cfr bug #1688))
             ref_document_cls_exists = (getattr(collection, 'objects', None) is not None)
 

From 17fa9a3b7707fa5071cc0a13c21e0cdc60d4c663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 3 Nov 2018 21:48:12 +0100
Subject: [PATCH 0721/1519] bump version to 0.16.0

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index e6dc6b9d8..6e15d8b92 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 15, 3)
+VERSION = (0, 16, 0)
 
 
 def get_version():

From 23324f0f8767b9fa268f7cf37f5f62d605074f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 4 Nov 2018 22:13:54 +0100
Subject: [PATCH 0722/1519] minor fix in ImageField docstring

---
 mongoengine/fields.py  | 9 +++------
 tests/fields/fields.py | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index dca4e84b5..e9a5e4b25 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1867,12 +1867,9 @@ class ImageField(FileField):
     """
     A Image File storage field.
 
-    @size (width, height, force):
-        max size to store images, if larger will be automatically resized
-        ex: size=(800, 600, True)
-
-    @thumbnail (width, height, force):
-        size to generate a thumbnail
+    :param size: max size to store images, provided as (width, height, force)
+        if larger, it will be automatically resized (ex: size=(800, 600, True))
+    :param thumbnail_size: size to generate a thumbnail, provided as (width, height, force)
 
     .. versionadded:: 0.6
     """
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 7500bbadb..ccf67031e 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -618,6 +618,8 @@ class Person(Document):
         self.assertRaises(ValidationError, person.validate)
         person.admin = 'Yes'
         self.assertRaises(ValidationError, person.validate)
+        person.admin = 'False'
+        self.assertRaises(ValidationError, person.validate)
 
     def test_uuid_field_string(self):
         """Test UUID fields storing as String
@@ -2905,7 +2907,6 @@ class Attachment(Document):
         for invalid_data in (2, u'Im_a_unicode', ['some_str']):
             self.assertRaises(ValidationError, Attachment(blob=invalid_data).validate)
 
-
     def test_binary_field_primary(self):
         class Attachment(Document):
             id = BinaryField(primary_key=True)

From 34e3e45843ef0475824b79b3405285a2d75d7648 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Thu, 8 Nov 2018 23:47:12 +0800
Subject: [PATCH 0723/1519] Use insert_one instead of deprecated one #1899

---
 mongoengine/document.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index fc379b617..37d60628b 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -12,7 +12,11 @@
                               TopLevelDocumentMetaclass, get_document)
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
-from mongoengine.context_managers import switch_collection, switch_db
+from mongoengine.context_managers import (
+    set_write_concern,
+    switch_collection,
+    switch_db
+)
 from mongoengine.errors import (InvalidDocumentError, InvalidQueryError,
                                 SaveConditionError)
 from mongoengine.python_support import IS_PYMONGO_3
@@ -429,11 +433,11 @@ def _save_create(self, doc, force_insert, write_concern):
         Helper method, should only be used inside save().
         """
         collection = self._get_collection()
+        with set_write_concern(collection, write_concern) as wc_collection:
+            if force_insert:
+                return wc_collection.insert_one(doc).inserted_id
 
-        if force_insert:
-            return collection.insert(doc, **write_concern)
-
-        object_id = collection.save(doc, **write_concern)
+            object_id = wc_collection.insert_one(doc).inserted_id
 
         # In PyMongo 3.0, the save() call calls internally the _update() call
         # but they forget to return the _id value passed back, therefore getting it back here

From 47577f2f47cfc6974baa795ff217f29351f919e8 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Fri, 9 Nov 2018 01:44:30 +0800
Subject: [PATCH 0724/1519] Update existing document #1899

---
 mongoengine/document.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 37d60628b..4abecaa97 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -436,6 +436,13 @@ def _save_create(self, doc, force_insert, write_concern):
         with set_write_concern(collection, write_concern) as wc_collection:
             if force_insert:
                 return wc_collection.insert_one(doc).inserted_id
+            # insert_one will provoke UniqueError alongside save does not
+            # therefore, it need to catch and call replace_one.
+            if '_id' in doc:
+                raw_object = wc_collection.find_one_and_replace(
+                    {'_id': doc['_id']}, doc)
+                if raw_object:
+                    return doc['_id']
 
             object_id = wc_collection.insert_one(doc).inserted_id
 

From 2a8579a6a50b88bbd5507746a93376f7c032b3fe Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Fri, 9 Nov 2018 09:12:29 +0800
Subject: [PATCH 0725/1519] Update changelog #1899

---
 docs/changelog.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 222c6ea89..47af2b1b2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-=======
+- Remove deprecated `save()` method and used `insert_one()` #1899
+
+=================
 Changes in 0.16.0
 =================
 - Various improvements to the doc

From 611094e92e7994c03ba54e68ded8a9a2d7db9175 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Fri, 9 Nov 2018 09:20:55 +0800
Subject: [PATCH 0726/1519] Refactor write_concern #1945

---
 mongoengine/document.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index fc379b617..f2e3664cb 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -297,7 +297,7 @@ def modify(self, query=None, **update):
         return True
 
     def save(self, force_insert=False, validate=True, clean=True,
-             write_concern=None, cascade=None, cascade_kwargs=None,
+             write_concern={'w': 1}, cascade=None, cascade_kwargs=None,
              _refs=None, save_condition=None, signal_kwargs=None, **kwargs):
         """Save the :class:`~mongoengine.Document` to the database. If the
         document already exists, it will be updated, otherwise it will be
@@ -359,9 +359,6 @@ def save(self, force_insert=False, validate=True, clean=True,
         if validate:
             self.validate(clean=clean)
 
-        if write_concern is None:
-            write_concern = {'w': 1}
-
         doc = self.to_mongo()
 
         created = ('_id' not in doc or self._created or force_insert)

From b47c5b5bfcad03d2b64ef8161f60dc288e28fd72 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Mon, 12 Nov 2018 09:53:39 +0800
Subject: [PATCH 0727/1519] Adhere imports into existing one #1899

---
 mongoengine/document.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 4abecaa97..0945a8edd 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -12,11 +12,9 @@
                               TopLevelDocumentMetaclass, get_document)
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
-from mongoengine.context_managers import (
-    set_write_concern,
-    switch_collection,
-    switch_db
-)
+from mongoengine.context_managers import (set_write_concern,
+                                          switch_collection,
+                                          switch_db)
 from mongoengine.errors import (InvalidDocumentError, InvalidQueryError,
                                 SaveConditionError)
 from mongoengine.python_support import IS_PYMONGO_3

From e31558318e48a5734818360e9632239efdb1a762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 12 Nov 2018 23:12:35 +0100
Subject: [PATCH 0728/1519] BugFix - _cls not set in constructor #1950

---
 docs/changelog.rst            |  1 +
 mongoengine/base/document.py  |  3 +++
 tests/document/inheritance.py | 29 +++++++++++++++++++++++++----
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 47af2b1b2..1e223aa10 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Fix `_cls` that is not set properly in Document constructor (regression) #1950
 - Remove deprecated `save()` method and used `insert_one()` #1899
 
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 348ab24bf..11b3a49a3 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -91,6 +91,9 @@ def __init__(self, *args, **values):
             value = getattr(self, key, None)
             setattr(self, key, value)
 
+        if '_cls' not in values:
+            self._cls = self._class_name
+
         # Set passed values after initialisation
         if self._dynamic:
             dynamic_data = {}
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index b4ba60589..32e3ed297 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -2,11 +2,11 @@
 import unittest
 import warnings
 
-from tests.fixtures import Base
-
-from mongoengine import Document, EmbeddedDocument, connect, ReferenceField,\
-    BooleanField, GenericReferenceField, IntField, StringField
+from mongoengine import (BooleanField, Document, EmbeddedDocument,
+                         EmbeddedDocumentField, GenericReferenceField,
+                         IntField, ReferenceField, StringField, connect)
 from mongoengine.connection import get_db
+from tests.fixtures import Base
 
 __all__ = ('InheritanceTest', )
 
@@ -23,6 +23,27 @@ def tearDown(self):
                 continue
             self.db.drop_collection(collection)
 
+    def test_constructor_cls(self):
+        # Ensures _cls is properly set during construction
+        # and when object gets reloaded (prevent regression of #1950)
+        class EmbedData(EmbeddedDocument):
+            data = StringField()
+            meta = {'allow_inheritance': True}
+
+        class DataDoc(Document):
+            name = StringField()
+            embed = EmbeddedDocumentField(EmbedData)
+            meta = {'allow_inheritance': True}
+
+        test_doc = DataDoc(name='test', embed=EmbedData(data='data'))
+        assert test_doc._cls == 'DataDoc'
+        assert test_doc.embed._cls == 'EmbedData'
+        test_doc.save()
+        saved_doc = DataDoc.objects.with_id(test_doc.id)
+        assert test_doc._cls == saved_doc._cls
+        assert test_doc.embed._cls == saved_doc.embed._cls
+        test_doc.delete()
+
     def test_superclasses(self):
         """Ensure that the correct list of superclasses is assembled.
         """

From c306d42d08cce474fa4f46070404c221255150e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 11 Nov 2018 22:42:15 +0100
Subject: [PATCH 0729/1519] Fix bug #1733 of _delta method (Issue with
 DynamicDocument and default value) + add test case

---
 docs/changelog.rst           |  1 +
 mongoengine/base/document.py | 34 +++++++++++++++-------------------
 tests/fields/fields.py       | 25 +++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 47af2b1b2..7fdf5e9c4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Fix bug in _delta method - Update of a ListField depends on an unrelated dynamic field update #1733
 - Remove deprecated `save()` method and used `insert_one()` #1899
 
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 348ab24bf..c2f839322 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -579,7 +579,6 @@ def _delta(self):
 
         set_fields = self._get_changed_fields()
         unset_data = {}
-        parts = []
         if hasattr(self, '_changed_fields'):
             set_data = {}
             # Fetch each set item from its path
@@ -589,15 +588,13 @@ def _delta(self):
                 new_path = []
                 for p in parts:
                     if isinstance(d, (ObjectId, DBRef)):
+                        # Don't dig in the references
                         break
-                    elif isinstance(d, list) and p.lstrip('-').isdigit():
-                        if p[0] == '-':
-                            p = str(len(d) + int(p))
-                        try:
-                            d = d[int(p)]
-                        except IndexError:
-                            d = None
+                    elif isinstance(d, list) and p.isdigit():
+                        # An item of a list (identified by its index) is updated
+                        d = d[int(p)]
                     elif hasattr(d, 'get'):
+                        # dict-like (dict, embedded document)
                         d = d.get(p)
                     new_path.append(p)
                 path = '.'.join(new_path)
@@ -609,26 +606,26 @@ def _delta(self):
 
         # Determine if any changed items were actually unset.
         for path, value in set_data.items():
-            if value or isinstance(value, (numbers.Number, bool)):
+            if value or isinstance(value, (numbers.Number, bool)):  # Account for 0 and True that are truthy
                 continue
 
-            # If we've set a value that ain't the default value don't unset it.
-            default = None
+            parts = path.split('.')
+
             if (self._dynamic and len(parts) and parts[0] in
                     self._dynamic_fields):
                 del set_data[path]
                 unset_data[path] = 1
                 continue
-            elif path in self._fields:
+
+            # If we've set a value that ain't the default value don't unset it.
+            default = None
+            if path in self._fields:
                 default = self._fields[path].default
             else:  # Perform a full lookup for lists / embedded lookups
                 d = self
-                parts = path.split('.')
                 db_field_name = parts.pop()
                 for p in parts:
-                    if isinstance(d, list) and p.lstrip('-').isdigit():
-                        if p[0] == '-':
-                            p = str(len(d) + int(p))
+                    if isinstance(d, list) and p.isdigit():
                         d = d[int(p)]
                     elif (hasattr(d, '__getattribute__') and
                           not isinstance(d, dict)):
@@ -646,10 +643,9 @@ def _delta(self):
                         default = None
 
             if default is not None:
-                if callable(default):
-                    default = default()
+                default = default() if callable(default) else default
 
-            if default != value:
+            if value != default:
                 continue
 
             del set_data[path]
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index ccf67031e..a1b586ced 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -186,6 +186,31 @@ class Person(Document):
         data_to_be_saved = sorted(person.to_mongo().keys())
         self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
 
+    def test_default_value_is_not_used_when_changing_value_to_empty_list_for_strict_doc(self):
+        """List field with default can be set to the empty list (strict)"""
+        # Issue #1733
+        class Doc(Document):
+            x = ListField(IntField(), default=lambda: [42])
+
+        doc = Doc(x=[1]).save()
+        doc.x = []
+        doc.save()
+        reloaded = Doc.objects.get(id=doc.id)
+        self.assertEqual(reloaded.x, [])
+
+    def test_default_value_is_not_used_when_changing_value_to_empty_list_for_dyn_doc(self):
+        """List field with default can be set to the empty list (dynamic)"""
+        # Issue #1733
+        class Doc(DynamicDocument):
+            x = ListField(IntField(), default=lambda: [42])
+
+        doc = Doc(x=[1]).save()
+        doc.x = []
+        doc.y = 2   # Was triggering the bug
+        doc.save()
+        reloaded = Doc.objects.get(id=doc.id)
+        self.assertEqual(reloaded.x, [])
+
     def test_default_values_when_deleting_value(self):
         """Ensure that default field values are used after non-default
         values are explicitly deleted.

From 8807c0dbef50abafbcbdfa0cc27b5864369b89a3 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Wed, 14 Nov 2018 17:10:17 +0800
Subject: [PATCH 0730/1519] bump version 0.16.1

---
 docs/changelog.rst      | 4 ++++
 mongoengine/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 33578f018..202520392 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,10 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+=================
+Changes in 0.16.1
+=================
 - Fix `_cls` that is not set properly in Document constructor (regression) #1950
 - Fix bug in _delta method - Update of a ListField depends on an unrelated dynamic field update #1733
 - Remove deprecated `save()` method and used `insert_one()` #1899
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 6e15d8b92..2a7019a35 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 16, 0)
+VERSION = (0, 16, 1)
 
 
 def get_version():

From fcbabbe35721669d3d954565a79b1787bffa31bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 20 Nov 2018 23:56:39 +0100
Subject: [PATCH 0731/1519] Fix but with save(write_concern=None) - introduced
 in 0.16.1

---
 docs/changelog.rst         | 5 +++++
 mongoengine/document.py    | 5 ++++-
 tests/queryset/queryset.py | 8 ++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 202520392..d9742d6fa 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,11 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+=================
+Changes in 0.16.2
+=================
+- Fix .save() that fails when called with write_concern=None (regression of 0.16.1) #1958
+
 =================
 Changes in 0.16.1
 =================
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 53814961d..0945a8edd 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -299,7 +299,7 @@ def modify(self, query=None, **update):
         return True
 
     def save(self, force_insert=False, validate=True, clean=True,
-             write_concern={'w': 1}, cascade=None, cascade_kwargs=None,
+             write_concern=None, cascade=None, cascade_kwargs=None,
              _refs=None, save_condition=None, signal_kwargs=None, **kwargs):
         """Save the :class:`~mongoengine.Document` to the database. If the
         document already exists, it will be updated, otherwise it will be
@@ -361,6 +361,9 @@ def save(self, force_insert=False, validate=True, clean=True,
         if validate:
             self.validate(clean=clean)
 
+        if write_concern is None:
+            write_concern = {'w': 1}
+
         doc = self.to_mongo()
 
         created = ('_id' not in doc or self._created or force_insert)
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index f4bc1dcd2..9e251af71 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -400,13 +400,17 @@ def test_update_write_concern(self):
         self.Person.drop_collection()
 
         write_concern = {"fsync": True}
-
         author = self.Person.objects.create(name='Test User')
         author.save(write_concern=write_concern)
 
+        # Ensure no regression of #1958
+        author = self.Person(name='Test User2')
+        author.save(write_concern=None)  # will default to {w: 1}
+
         result = self.Person.objects.update(
             set__name='Ross', write_concern={"w": 1})
-        self.assertEqual(result, 1)
+
+        self.assertEqual(result, 2)
         result = self.Person.objects.update(
             set__name='Ross', write_concern={"w": 0})
         self.assertEqual(result, None)

From 1894003f8a704f516a1f246fd463f78a1bcc0bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 21 Nov 2018 12:37:42 +0100
Subject: [PATCH 0732/1519] bump version to 0.16.2

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 2a7019a35..4b4dddc9b 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 16, 1)
+VERSION = (0, 16, 2)
 
 
 def get_version():

From 352b23331b8486761415a117f9c017efb90569c6 Mon Sep 17 00:00:00 2001
From: Trevor Hall <trevor.jacob.hall@gmail.com>
Date: Wed, 5 Dec 2018 20:18:48 -0600
Subject: [PATCH 0733/1519] Fix bug #1965 of $position and $push operators do
 not work with list in an EmbeddedDocument. Set key value to joined parts
 excluding the index at the end. Added test case

---
 AUTHORS                           |  1 +
 mongoengine/queryset/transform.py |  2 +-
 tests/document/instance.py        | 18 +++++++++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b38825dca..5998520a2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -247,3 +247,4 @@ that much better:
  * Erdenezul Batmunkh (https://github.com/erdenezul)
  * Andy Yankovsky (https://github.com/werat)
  * Bastien Gérard (https://github.com/bagerard)
+ * Trevor Hall (https://github.com/tjhall13)
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 41f99bbce..2d22c3507 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -345,7 +345,7 @@ def update(_doc_cls=None, **update):
             value = {key: {'$each': value}}
         elif op in ('push', 'pushAll'):
             if parts[-1].isdigit():
-                key = parts[0]
+                key = '.'.join(parts[0:-1])
                 position = int(parts[-1])
                 # $position expects an iterable. If pushing a single value,
                 # wrap it in a list.
diff --git a/tests/document/instance.py b/tests/document/instance.py
index ad22c0863..5319ace41 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -842,10 +842,16 @@ def test_modify_update(self):
 
     @requires_mongodb_gte_26
     def test_modify_with_positional_push(self):
+        class Content(EmbeddedDocument):
+            keywords = ListField(StringField())
+
         class BlogPost(Document):
             tags = ListField(StringField())
+            content = EmbeddedDocumentField(Content)
+
+        post = BlogPost.objects.create(
+            tags=['python'], content=Content(keywords=['ipsum']))
 
-        post = BlogPost.objects.create(tags=['python'])
         self.assertEqual(post.tags, ['python'])
         post.modify(push__tags__0=['code', 'mongo'])
         self.assertEqual(post.tags, ['code', 'mongo', 'python'])
@@ -856,6 +862,16 @@ class BlogPost(Document):
             ['code', 'mongo', 'python']
         )
 
+        self.assertEqual(post.content.keywords, ['ipsum'])
+        post.modify(push__content__keywords__0=['lorem'])
+        self.assertEqual(post.content.keywords, ['lorem', 'ipsum'])
+
+        # Assert same order of the list items is maintained in the db
+        self.assertEqual(
+            BlogPost._get_collection().find_one({'_id': post.pk})['content']['keywords'],
+            ['lorem', 'ipsum']
+        )
+
     def test_save(self):
         """Ensure that a document may be saved in the database."""
 

From d3b4af116eb9bdc0f1ec280b79a9be0a9920b22a Mon Sep 17 00:00:00 2001
From: Trevor Hall <trevor.jacob.hall@gmail.com>
Date: Wed, 5 Dec 2018 23:35:36 -0600
Subject: [PATCH 0734/1519] Add fix to changelog.rst #1965

---
 docs/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d9742d6fa..30b881650 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,11 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+=================
+Changes in 0.16.3
+=================
+- Fix $push with $position operator not working with lists in embedded document #1965
+
 =================
 Changes in 0.16.2
 =================

From a03fe234d0cd5b1f4054536b074b14e0a8e7488e Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Thu, 6 Dec 2018 16:22:00 +0800
Subject: [PATCH 0735/1519] bump version 0.16.3

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 4b4dddc9b..2b78d4e63 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 16, 2)
+VERSION = (0, 16, 3)
 
 
 def get_version():

From 48a691e722460a3bfb130a08a3c863c9fd7170ef Mon Sep 17 00:00:00 2001
From: amir-almusawi <amir.almusawi@gmail.com>
Date: Fri, 7 Dec 2018 22:08:05 -0600
Subject: [PATCH 0736/1519] fixed small typographical error

---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 14f2ff1b5..4449b00b8 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -155,7 +155,7 @@ arguments can be set on all fields:
     An iterable (e.g. list, tuple or set) of choices to which the value of this
     field should be limited.
 
-    Can be either be a nested tuples of value (stored in mongo) and a
+    Can either be nested tuples of value (stored in mongo) and a
     human readable key ::
 
         SIZE = (('S', 'Small'),

From 72ebaa52e9330a063d7d45a72ce65710498ef99f Mon Sep 17 00:00:00 2001
From: Tom Floyer <tomfloyer@icloud.com>
Date: Sat, 8 Dec 2018 22:10:10 +0300
Subject: [PATCH 0737/1519] Ensure that QuerySet.only() works correctly after
 QuerySet.count()

This test checks if .only() method of QuerySet instance works after
using .count() method.
---
 tests/queryset/queryset.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 9e251af71..b44c36df1 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4720,6 +4720,28 @@ class User(Document):
             'password_salt').only('email').to_json()
         self.assertEqual('[{"email": "ross@example.com"}]', serialized_user)
 
+    def test_only_after_count(self):
+        """Test that only() works after count()"""
+
+        class User(Document):
+            name = StringField()
+            age = IntField()
+            address = StringField()
+        User.drop_collection()
+        User(name="User", age=50,
+             address="Moscow, Russia").save()
+
+        user_queryset = User.objects(age=50)
+
+        result = user_queryset.only("name", "age").as_pymongo().first()
+        self.assertEqual(result, {"name": "User", "age": 50})
+
+        result = user_queryset.count()
+        self.assertEqual(result, 1)
+
+        result = user_queryset.only("name", "age").as_pymongo().first()
+        self.assertEqual(result, {"name": "User", "age": 50})
+
     def test_no_dereference(self):
 
         class Organization(Document):

From 3194a37fcb9654458373ffe0a738038003f7e521 Mon Sep 17 00:00:00 2001
From: Tom Floyer <tomfloyer@icloud.com>
Date: Sat, 8 Dec 2018 22:14:43 +0300
Subject: [PATCH 0738/1519] Reset cursor object after .count()

This change fixes incorrect result of .only() method of QuerySet
instance after using .count().
---
 mongoengine/queryset/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 6c36d9840..862a18269 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -396,7 +396,9 @@ def count(self, with_limit_and_skip=False):
         """
         if self._limit == 0 and with_limit_and_skip is False or self._none:
             return 0
-        return self._cursor.count(with_limit_and_skip=with_limit_and_skip)
+        count = self._cursor.count(with_limit_and_skip=with_limit_and_skip)
+        self._cursor_obj = None
+        return count
 
     def delete(self, write_concern=None, _from_doc_delete=False,
                cascade_refs=None):

From c88ea40b576157d6e886b1d26ef99ea09502f0c3 Mon Sep 17 00:00:00 2001
From: Tom Floyer <tomfloyer@icloud.com>
Date: Sat, 8 Dec 2018 22:32:46 +0300
Subject: [PATCH 0739/1519] Updated AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 5998520a2..880dfad1d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -248,3 +248,4 @@ that much better:
  * Andy Yankovsky (https://github.com/werat)
  * Bastien Gérard (https://github.com/bagerard)
  * Trevor Hall (https://github.com/tjhall13)
+ * Gleb Voropaev (https://github.com/buggyspace)
\ No newline at end of file

From 1319e422ea236d914b72c4a90835e6f4e18d80d8 Mon Sep 17 00:00:00 2001
From: Tom Floyer <tomfloyer@icloud.com>
Date: Sat, 8 Dec 2018 22:33:17 +0300
Subject: [PATCH 0740/1519] Updated docs/changelog.rst

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 30b881650..def5cc34b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Fix .only() working improperly after using .count() of the same instance of QuerySet
 
 =================
 Changes in 0.16.3

From a32c89307828c49958cfed75ddcf2d24b9055ebc Mon Sep 17 00:00:00 2001
From: Hendri Karisma <hendri.karisma@gdn-commerce.com>
Date: Thu, 22 Mar 2018 20:07:52 +0700
Subject: [PATCH 0741/1519] in the mid DictField key can accept dollar sign

---
 mongoengine/fields.py  |    4 +-
 tags                   | 6449 ++++++++++++++++++++++++++++++++++++++++
 tests/fields/fields.py |    9 +-
 3 files changed, 6459 insertions(+), 3 deletions(-)
 create mode 100644 tags

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e9a5e4b25..9062333ee 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -944,7 +944,7 @@ def key_has_dot_or_dollar(d):
     dictionary contains a dot or a dollar sign.
     """
     for k, v in d.items():
-        if ('.' in k or '$' in k) or (isinstance(v, dict) and key_has_dot_or_dollar(v)):
+        if ('.' in k or k.startswith('$')) or (isinstance(v, dict) and key_has_dot_or_dollar(v)):
             return True
 
 
@@ -977,7 +977,7 @@ def validate(self, value):
             self.error(msg)
         if key_has_dot_or_dollar(value):
             self.error('Invalid dictionary key name - keys may not contain "."'
-                       ' or "$" characters')
+                       ' or startswith "$" characters')
         super(DictField, self).validate(value)
 
     def lookup_member(self, member_name):
diff --git a/tags b/tags
new file mode 100644
index 000000000..88c92b071
--- /dev/null
+++ b/tags
@@ -0,0 +1,6449 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
+!_TAG_PROGRAM_NAME	Exuberant Ctags	//
+!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
+!_TAG_PROGRAM_VERSION	5.9~svn20110310	//
+A	mongoengine/tests/document/indexes.py	/^        class A(Document):$/;"	c	function:IndexesTest.test_index_no_cls
+A	mongoengine/tests/document/indexes.py	/^        class A(Document):$/;"	c	function:IndexesTest.test_inherited_index
+A	mongoengine/tests/document/inheritance.py	/^        class A(Document):$/;"	c	function:InheritanceTest.test_indexes_and_multiple_inheritance
+A	mongoengine/tests/document/inheritance.py	/^        class A(EmbeddedDocument):$/;"	c	function:InheritanceTest.test_abstract_embedded_documents
+A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.subclasses_and_unique_keys_works
+A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.test_db_alias_overrides
+A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.test_db_alias_propagates
+A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.test_list_iter
+A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.test_mutating_documents
+A	mongoengine/tests/fields/fields.py	/^        class A(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
+A	mongoengine/tests/fields/fields.py	/^        class A(Document):$/;"	c	function:FieldTest.test_double_embedded_db_field
+A	mongoengine/tests/fields/fields.py	/^        class A(Document):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
+A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_batch_size
+A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_chaining
+A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_count_list_embedded
+A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_no_sub_classes
+A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_none
+A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_query_reference_to_custom_pk_doc
+A	mongoengine/tests/queryset/queryset.py	/^        class A(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_query_generic_embedded_document
+A	mongoengine/tests/queryset/transform.py	/^        class A(Document):$/;"	c	function:TransformTest.test_chaining
+A	mongoengine/tests/test_context_managers.py	/^        class A(Document):$/;"	c	function:ContextManagersTest.test_no_sub_classes
+A	tests/fields/fields.py	/^        class A(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
+A	tests/fields/fields.py	/^        class A(Document):$/;"	c	function:FieldTest.test_double_embedded_db_field
+A	tests/fields/fields.py	/^        class A(Document):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
+ALLSPHINXOPTS	mongoengine/docs/Makefile	/^ALLSPHINXOPTS   = -d $(BUILDDIR)\/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .$/;"	m
+AND	mongoengine/mongoengine/queryset/visitor.py	/^    AND = 0$/;"	v	class:QNode
+AbstractBlogPost	mongoengine/tests/queryset/queryset.py	/^        class AbstractBlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document
+AbstractBlogPost	mongoengine/tests/queryset/queryset.py	/^        class AbstractBlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document
+AbstractBlogPost	mongoengine/tests/queryset/queryset.py	/^        class AbstractBlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document
+AbstractBlogPost	mongoengine/tests/queryset/queryset.py	/^        class AbstractBlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents
+AbstractDoc	mongoengine/tests/fields/fields.py	/^        class AbstractDoc(Document):$/;"	c	function:FieldTest.test_drop_abstract_document
+AbstractDoc	tests/fields/fields.py	/^        class AbstractDoc(Document):$/;"	c	function:FieldTest.test_drop_abstract_document
+Account	mongoengine/tests/document/instance.py	/^        class Account(Document):$/;"	c	function:InstanceTest.test_instance_is_set_on_setattr
+Account	mongoengine/tests/document/instance.py	/^        class Account(Document):$/;"	c	function:InstanceTest.test_instance_is_set_on_setattr_on_embedded_document_list
+AcloholicDrink	mongoengine/tests/document/inheritance.py	/^            class AcloholicDrink(Drink):$/;"	c	class:InheritanceTest.test_inherited_collections.Drinker
+Action	mongoengine/tests/fields/fields.py	/^        class Action(EmbeddedDocument):$/;"	c	function:FieldTest.test_map_field_lookup
+Action	tests/fields/fields.py	/^        class Action(EmbeddedDocument):$/;"	c	function:FieldTest.test_map_field_lookup
+Actor	mongoengine/tests/document/instance.py	/^        class Actor(self.Person):$/;"	c	function:InstanceTest.test_queryset_resurrects_dropped_collection
+Address	mongoengine/tests/document/dynamic.py	/^        class Address(DynamicEmbeddedDocument):$/;"	c	function:DynamicTest.test_dynamic_embedded_works_with_only
+Address	mongoengine/tests/document/dynamic.py	/^        class Address(EmbeddedDocument):$/;"	c	function:DynamicTest.test_dynamic_and_embedded
+Address	mongoengine/tests/document/dynamic.py	/^        class Address(EmbeddedDocument):$/;"	c	function:DynamicTest.test_dynamic_and_embedded_dict_access
+AlcoholicDrink	mongoengine/tests/document/inheritance.py	/^            class AlcoholicDrink(Drink):$/;"	c	class:InheritanceTest.test_inherited_collections.Drinker
+AllWarnings	mongoengine/tests/all_warnings/__init__.py	/^class AllWarnings(unittest.TestCase):$/;"	c
+Animal	mongoengine/tests/document/class_methods.py	/^        class Animal(Document):$/;"	c	function:ClassMethodsTest.test_register_delete_rule_inherited
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Base): pass$/;"	c	function:InheritanceTest.test_external_subclasses
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Base): pass$/;"	c	function:InheritanceTest.test_external_superclasses
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_abstract_documents
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_allow_inheritance
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_cant_turn_off_inheritance_on_subclass
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_dynamic_declarations
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_polymorphic_queries
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_subclasses
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_superclasses
+Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(FinalDocument):$/;"	c	function:InheritanceTest.test_allow_inheritance_abstract_document
+Animal	mongoengine/tests/document/instance.py	/^        class Animal(Document):$/;"	c	function:InstanceTest.test_polymorphic_references
+Animal	mongoengine/tests/document/instance.py	/^        class Animal(Document):$/;"	c	function:InstanceTest.test_reload_sharded
+Animal	mongoengine/tests/document/instance.py	/^        class Animal(Document):$/;"	c	function:InstanceTest.test_reload_sharded_nested
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_get_and_save
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_cls_field
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields_on_docs
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_sequence_fields_reload
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_equality
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_not_set
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_passthrough
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
+Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_simple
+Animal	mongoengine/tests/fields/file_tests.py	/^        class Animal(Document):$/;"	c	function:FileTest.test_complex_field_filefield
+Animal	mongoengine/tests/fields/file_tests.py	/^        class Animal(Document):$/;"	c	function:FileTest.test_file_saving
+Animal	mongoengine/tests/queryset/queryset.py	/^        class Animal(Document):$/;"	c	function:QuerySetTest.test_cls_query_in_subclassed_docs
+Animal	mongoengine/tests/queryset/queryset.py	/^        class Animal(Document):$/;"	c	function:QuerySetTest.test_subclass_field_query
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_get_and_save
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_cls_field
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields_on_docs
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_sequence_fields_reload
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_equality
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_not_set
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_passthrough
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
+Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_simple
+Anon	mongoengine/tests/queryset/field_list.py	/^        class Anon(Base):$/;"	c	function:OnlyExcludeAllTest.test_exclude_from_subclasses_docs
+Another	mongoengine/tests/test_signals.py	/^        class Another(Document):$/;"	c	function:SignalTests.setUp
+Area	mongoengine/tests/document/instance.py	/^        class Area(Location):$/;"	c	function:InstanceTest.test_document_registry_regressions
+Article	mongoengine/tests/document/instance.py	/^        class Article(Document):$/;"	c	function:InstanceTest.test_repr
+Article	mongoengine/tests/document/instance.py	/^        class Article(Document):$/;"	c	function:InstanceTest.test_repr_none
+Asset	mongoengine/tests/test_dereference.py	/^        class Asset(Document):$/;"	c	function:FieldTest.test_multidirectional_lists
+Attachment	mongoengine/tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_field_primary
+Attachment	mongoengine/tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_field_primary_filter_by_binary_pk_as_str
+Attachment	mongoengine/tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_fields
+Attachment	mongoengine/tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_validation
+Attachment	mongoengine/tests/queryset/field_list.py	/^        class Attachment(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_exclude_only_combining
+Attachment	tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_field_primary
+Attachment	tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_field_primary_filter_by_binary_pk_as_str
+Attachment	tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_fields
+Attachment	tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_validation
+AttachmentRequired	mongoengine/tests/fields/fields.py	/^        class AttachmentRequired(Document):$/;"	c	function:FieldTest.test_binary_validation
+AttachmentRequired	tests/fields/fields.py	/^        class AttachmentRequired(Document):$/;"	c	function:FieldTest.test_binary_validation
+AttachmentSizeLimit	mongoengine/tests/fields/fields.py	/^        class AttachmentSizeLimit(Document):$/;"	c	function:FieldTest.test_binary_validation
+AttachmentSizeLimit	tests/fields/fields.py	/^        class AttachmentSizeLimit(Document):$/;"	c	function:FieldTest.test_binary_validation
+Author	mongoengine/tests/fields/fields.py	/^        class Author(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_validation
+Author	mongoengine/tests/queryset/queryset.py	/^        class Author(Document):$/;"	c	function:QuerySetTest.test_bulk_insert
+Author	mongoengine/tests/queryset/queryset.py	/^        class Author(Document):$/;"	c	function:QuerySetTest.test_confirm_order_by_reference_wont_work
+Author	mongoengine/tests/queryset/queryset.py	/^        class Author(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField
+Author	mongoengine/tests/queryset/queryset.py	/^        class Author(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField
+Author	mongoengine/tests/queryset/queryset.py	/^        class Author(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_set_list_embedded_documents
+Author	mongoengine/tests/test_signals.py	/^        class Author(Document):$/;"	c	function:SignalTests.setUp
+Author	tests/fields/fields.py	/^        class Author(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_validation
+AuthorBooks	mongoengine/tests/document/instance.py	/^        class AuthorBooks(Document):$/;"	c	function:InstanceTest.test_db_alias_tests
+B	mongoengine/tests/document/indexes.py	/^        class B(A):$/;"	c	function:IndexesTest.test_index_no_cls
+B	mongoengine/tests/document/indexes.py	/^        class B(A):$/;"	c	function:IndexesTest.test_inherited_index
+B	mongoengine/tests/document/inheritance.py	/^        class B(A):$/;"	c	function:InheritanceTest.test_abstract_embedded_documents
+B	mongoengine/tests/document/inheritance.py	/^        class B(Document):$/;"	c	function:InheritanceTest.test_indexes_and_multiple_inheritance
+B	mongoengine/tests/document/instance.py	/^        class B(A):$/;"	c	function:InstanceTest.subclasses_and_unique_keys_works
+B	mongoengine/tests/document/instance.py	/^        class B(A):$/;"	c	function:InstanceTest.test_db_alias_overrides
+B	mongoengine/tests/document/instance.py	/^        class B(A):$/;"	c	function:InstanceTest.test_db_alias_propagates
+B	mongoengine/tests/document/instance.py	/^        class B(EmbeddedDocument):$/;"	c	function:InstanceTest.test_list_iter
+B	mongoengine/tests/document/instance.py	/^        class B(EmbeddedDocument):$/;"	c	function:InstanceTest.test_mutating_documents
+B	mongoengine/tests/fields/fields.py	/^        class B(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
+B	mongoengine/tests/fields/fields.py	/^        class B(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field
+B	mongoengine/tests/fields/fields.py	/^        class B(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
+B	mongoengine/tests/queryset/queryset.py	/^        class B(A):$/;"	c	function:QuerySetTest.test_no_sub_classes
+B	mongoengine/tests/queryset/queryset.py	/^        class B(Document):$/;"	c	function:QuerySetTest.test_chaining
+B	mongoengine/tests/queryset/queryset.py	/^        class B(Document):$/;"	c	function:QuerySetTest.test_query_reference_to_custom_pk_doc
+B	mongoengine/tests/queryset/queryset.py	/^        class B(Document):$/;"	c	function:QuerySetTest.test_save_and_only_on_fields_with_default
+B	mongoengine/tests/queryset/queryset.py	/^        class B(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_count_list_embedded
+B	mongoengine/tests/queryset/queryset.py	/^        class B(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_query_generic_embedded_document
+B	mongoengine/tests/queryset/transform.py	/^        class B(Document):$/;"	c	function:TransformTest.test_chaining
+B	mongoengine/tests/test_context_managers.py	/^        class B(A):$/;"	c	function:ContextManagersTest.test_no_sub_classes
+B	tests/fields/fields.py	/^        class B(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
+B	tests/fields/fields.py	/^        class B(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field
+B	tests/fields/fields.py	/^        class B(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
+BUILDDIR	mongoengine/docs/Makefile	/^BUILDDIR      = _build$/;"	m
+BadDoc	mongoengine/tests/fields/fields.py	/^        class BadDoc(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
+BadDoc	mongoengine/tests/fields/fields.py	/^        class BadDoc(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
+BadDoc	tests/fields/fields.py	/^        class BadDoc(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
+BadDoc	tests/fields/fields.py	/^        class BadDoc(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
+Bar	mongoengine/tests/document/instance.py	/^        class Bar(Document):$/;"	c	function:InstanceTest.test_shard_key_in_embedded_document
+Bar	mongoengine/tests/document/instance.py	/^        class Bar(Document):$/;"	c	function:InstanceTest.test_two_way_reverse_delete_rule
+Bar	mongoengine/tests/document/instance.py	/^        class Bar(Document, NameMixin):$/;"	c	function:InstanceTest.test_object_mixins
+Bar	mongoengine/tests/fields/fields.py	/^        class Bar(Base):$/;"	c	function:FieldTest.test_inherited_sequencefield
+Bar	mongoengine/tests/fields/fields.py	/^        class Bar(Base):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
+Bar	mongoengine/tests/fields/fields.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_list_field_passed_in_value
+Bar	mongoengine/tests/fields/fields.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_reference_miss
+Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_distinct_ListField_ReferenceField
+Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_references
+Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_references_to_alias
+Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_elem_match
+Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_pull_in_genericembedded_field
+Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_read_preference
+Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_set_generic_embedded_documents
+Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Foo):$/;"	c	function:QuerySetTest.test_inherit_objects
+Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Foo):$/;"	c	function:QuerySetTest.test_inherit_objects_override
+Bar	mongoengine/tests/test_dereference.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_document_reload_no_inheritance
+Bar	tests/fields/fields.py	/^        class Bar(Base):$/;"	c	function:FieldTest.test_inherited_sequencefield
+Bar	tests/fields/fields.py	/^        class Bar(Base):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
+Bar	tests/fields/fields.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_list_field_passed_in_value
+Bar	tests/fields/fields.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_reference_miss
+Base	mongoengine/tests/fields/fields.py	/^        class Base(Document):$/;"	c	function:FieldTest.test_inherited_sequencefield
+Base	mongoengine/tests/fields/fields.py	/^        class Base(Document):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
+Base	mongoengine/tests/fixtures.py	/^class Base(Document):$/;"	c
+Base	mongoengine/tests/queryset/field_list.py	/^        class Base(Document):$/;"	c	function:OnlyExcludeAllTest.test_exclude_from_subclasses_docs
+Base	mongoengine/tests/queryset/queryset.py	/^        class Base(Document):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited
+Base	mongoengine/tests/queryset/queryset.py	/^        class Base(Document):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited_direct
+Base	tests/fields/fields.py	/^        class Base(Document):$/;"	c	function:FieldTest.test_inherited_sequencefield
+Base	tests/fields/fields.py	/^        class Base(Document):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
+BaseDict	mongoengine/mongoengine/base/datastructures.py	/^class BaseDict(dict):$/;"	c
+BaseDocument	mongoengine/mongoengine/base/document.py	/^class BaseDocument(object):$/;"	c
+BaseDocument	mongoengine/tests/document/class_methods.py	/^        class BaseDocument(Document):$/;"	c	function:ClassMethodsTest.test_collection_naming
+BaseDocument	mongoengine/tests/document/class_methods.py	/^        class BaseDocument(Document, BaseMixin):$/;"	c	function:ClassMethodsTest.test_collection_naming
+BaseField	mongoengine/mongoengine/base/fields.py	/^class BaseField(object):$/;"	c
+BaseList	mongoengine/mongoengine/base/datastructures.py	/^class BaseList(list):$/;"	c
+BaseMixIn	mongoengine/tests/document/instance.py	/^        class BaseMixIn(object):$/;"	c	function:InstanceTest.test_mixin_inheritance
+BaseMixin	mongoengine/tests/document/class_methods.py	/^        class BaseMixin(object):$/;"	c	function:ClassMethodsTest.test_collection_naming
+BasePerson	mongoengine/tests/document/validation.py	/^        class BasePerson(Document):$/;"	c	function:ValidatorErrorTest.test_fields_rewrite
+BaseQuerySet	mongoengine/mongoengine/queryset/base.py	/^class BaseQuerySet(object):$/;"	c
+Basedoc	mongoengine/tests/fields/fields.py	/^        class Basedoc(Document):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
+Basedoc	tests/fields/fields.py	/^        class Basedoc(Document):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
+BasesTuple	mongoengine/mongoengine/base/metaclasses.py	/^class BasesTuple(tuple):$/;"	c
+Basket	mongoengine/tests/fields/fields.py	/^        class Basket(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields
+Basket	tests/fields/fields.py	/^        class Basket(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields
+Baz	mongoengine/tests/test_dereference.py	/^        class Baz(Document):$/;"	c	function:FieldTest.test_document_reload_no_inheritance
+BigPerson	mongoengine/tests/fields/fields.py	/^        class BigPerson(Document):$/;"	c	function:FieldTest.test_float_validation
+BigPerson	tests/fields/fields.py	/^        class BigPerson(Document):$/;"	c	function:FieldTest.test_float_validation
+BinaryField	mongoengine/fields.py	/^class BinaryField(BaseField):$/;"	c
+BinaryField	mongoengine/mongoengine/fields.py	/^class BinaryField(BaseField):$/;"	c
+Blog	mongoengine/tests/document/instance.py	/^            class Blog(Document):$/;"	c	function:InstanceTest.test_invalid_reverse_delete_rule_raise_errors
+Blog	mongoengine/tests/document/instance.py	/^            class Blog(Document):$/;"	c	function:InstanceTest.test_override_method_with_field
+Blog	mongoengine/tests/queryset/queryset.py	/^        class Blog(Document):$/;"	c	function:QuerySetTest.test_bulk_insert
+Blog	mongoengine/tests/queryset/queryset.py	/^        class Blog(Document):$/;"	c	function:QuerySetTest.test_filter_chaining
+Blog	mongoengine/tests/queryset/queryset.py	/^        class Blog(Document):$/;"	c	function:QuerySetTest.test_find_array_position
+Blog	mongoengine/tests/queryset/queryset.py	/^        class Blog(Document):$/;"	c	function:QuerySetTest.test_update_array_position
+BlogPost	mongoengine/tests/document/class_methods.py	/^        class BlogPost(Document):$/;"	c	function:ClassMethodsTest.test_compare_indexes
+BlogPost	mongoengine/tests/document/class_methods.py	/^        class BlogPost(Document):$/;"	c	function:ClassMethodsTest.test_compare_indexes_inheritance
+BlogPost	mongoengine/tests/document/class_methods.py	/^        class BlogPost(Document):$/;"	c	function:ClassMethodsTest.test_compare_indexes_multiple_subclasses
+BlogPost	mongoengine/tests/document/class_methods.py	/^        class BlogPost(Document):$/;"	c	function:ClassMethodsTest.test_list_indexes_inheritance
+BlogPost	mongoengine/tests/document/indexes.py	/^            class BlogPost(Document):$/;"	c	class:IndexesTest.test_index_with_pk.Comment
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_dictionary_indexes
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_embedded_document_index
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_hint
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_index_on_id
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_indexes_after_database_drop
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_list_embedded_document_index
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique_embedded_document
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique_embedded_document_in_list
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique_with
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique_with_embedded_document_and_embedded_unique
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(InheritFrom):$/;"	c	function:IndexesTest._index_test
+BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(InheritFrom):$/;"	c	function:IndexesTest._index_test_inheritance
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_document_hash
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_modify_with_positional_push
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_push_nested_list
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_push_with_position
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_and_nullify
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_and_nullify_complex_field
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_recurs
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_deny
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_document_inheritance
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_save_list
+BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_save_reference
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.setUp
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_dict_field
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_embedded_document_inheritance
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_assignment
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_invalid_operators
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_lexicographic_operators
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_manipulative_operators
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_validation
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_map_field_unicode
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_query_conversion
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_query_conversion_dbref
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_validation
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_sorted_list_sorting
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion
+BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref
+BlogPost	mongoengine/tests/queryset/field_list.py	/^        class BlogPost(Document):$/;"	c	function:OnlyExcludeAllTest.test_exclude
+BlogPost	mongoengine/tests/queryset/field_list.py	/^        class BlogPost(Document):$/;"	c	function:OnlyExcludeAllTest.test_only_with_subfields
+BlogPost	mongoengine/tests/queryset/modify.py	/^        class BlogPost(Document):$/;"	c	function:FindAndModifyTest.test_modify_with_push
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(AbstractBlogPost):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(AbstractBlogPost):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(AbstractBlogPost):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(AbstractBlogPost):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_bulk
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_cannot_perform_joins_references
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_clear_ordering
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_custom_manager
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_delete_with_limit_handles_delete_rules
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_editting_embedded_objects
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_exec_js_field_sub
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_exec_js_query
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_filter_chaining
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_find_dict_item
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_find_embedded
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_find_empty_embedded
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_in_operator_on_non_iterable
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_item_frequencies
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_map_reduce
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_map_reduce_with_custom_object_ids
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_no_ordering_for_get
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_order_by_list
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_order_by_optional
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_ordering
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_query_value_conversion
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reference_field_find
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reference_field_find_dbref
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_deny
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_nullify
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_pull
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_one_pop_generic_reference
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_push_and_pull_add_to_set
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_push_list_of_list
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_push_with_position
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_using_positional_operator
+BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_using_positional_operator_embedded_document
+BlogPost	mongoengine/tests/queryset/transform.py	/^        class BlogPost(Document):$/;"	c	function:TransformTest.test_query_field_name
+BlogPost	mongoengine/tests/queryset/transform.py	/^        class BlogPost(Document):$/;"	c	function:TransformTest.test_query_pk_field_name
+BlogPost	mongoengine/tests/queryset/visitor.py	/^        class BlogPost(Document):$/;"	c	function:QTest.test_q
+BlogPost	mongoengine/tests/queryset/visitor.py	/^        class BlogPost(Document):$/;"	c	function:QTest.test_q_lists
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.setUp
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_dict_field
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_embedded_document_inheritance
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_assignment
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_invalid_operators
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_lexicographic_operators
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_manipulative_operators
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_validation
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_map_field_unicode
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_query_conversion
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_query_conversion_dbref
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_validation
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_sorted_list_sorting
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion
+BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref
+BlogPostWithCustomField	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithCustomField(BlogPost):$/;"	c	function:ClassMethodsTest.test_compare_indexes_multiple_subclasses
+BlogPostWithTags	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithTags(BlogPost):$/;"	c	function:ClassMethodsTest.test_compare_indexes_inheritance
+BlogPostWithTags	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithTags(BlogPost):$/;"	c	function:ClassMethodsTest.test_compare_indexes_multiple_subclasses
+BlogPostWithTags	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithTags(BlogPost):$/;"	c	function:ClassMethodsTest.test_list_indexes_inheritance
+BlogPostWithTagsAndExtraText	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithTagsAndExtraText(BlogPostWithTags):$/;"	c	function:ClassMethodsTest.test_list_indexes_inheritance
+BlogTag	mongoengine/tests/queryset/queryset.py	/^        class BlogTag(Document):$/;"	c	function:QuerySetTest.test_update_one_pop_generic_reference
+BlogTag	mongoengine/tests/queryset/queryset.py	/^        class BlogTag(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_editting_embedded_objects
+Book	mongoengine/tests/document/indexes.py	/^        class Book(Document):$/;"	c	function:IndexesTest.test_hashed_indexes
+Book	mongoengine/tests/document/indexes.py	/^        class Book(Document):$/;"	c	function:IndexesTest.test_text_indexes
+Book	mongoengine/tests/document/instance.py	/^        class Book(Document):$/;"	c	function:InstanceTest.test_db_alias_tests
+Book	mongoengine/tests/document/instance.py	/^        class Book(Document):$/;"	c	function:InstanceTest.test_db_ref_usage
+Book	mongoengine/tests/document/instance.py	/^        class Book(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_custom_id_field
+Book	mongoengine/tests/document/instance.py	/^        class Book(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections
+Book	mongoengine/tests/queryset/queryset.py	/^        class Book(Document):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField
+Book	mongoengine/tests/queryset/queryset.py	/^        class Book(Document):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField
+Book	mongoengine/tests/test_dereference.py	/^        class Book(Document):$/;"	c	function:FieldTest.test_objectid_reference_across_databases
+Bookmark	mongoengine/tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference
+Bookmark	mongoengine/tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
+Bookmark	mongoengine/tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_choices_no_dereference
+Bookmark	mongoengine/tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
+Bookmark	tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference
+Bookmark	tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
+Bookmark	tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_choices_no_dereference
+Bookmark	tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
+BooleanField	mongoengine/fields.py	/^class BooleanField(BaseField):$/;"	c
+BooleanField	mongoengine/mongoengine/fields.py	/^class BooleanField(BaseField):$/;"	c
+Brand	mongoengine/tests/test_dereference.py	/^        class Brand(Document):$/;"	c	function:FieldTest.test_non_ascii_pk
+BrandGroup	mongoengine/tests/test_dereference.py	/^        class BrandGroup(Document):$/;"	c	function:FieldTest.test_non_ascii_pk
+Brother	mongoengine/tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_abstract_reference_base_type
+Brother	mongoengine/tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_reference_abstract_class
+Brother	mongoengine/tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
+Brother	tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_abstract_reference_base_type
+Brother	tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_reference_abstract_class
+Brother	tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
+C	mongoengine/tests/document/inheritance.py	/^        class C(A, B):$/;"	c	function:InheritanceTest.test_indexes_and_multiple_inheritance
+C	mongoengine/tests/document/instance.py	/^        class C(EmbeddedDocument):$/;"	c	function:InstanceTest.test_mutating_documents
+C	mongoengine/tests/fields/fields.py	/^        class C(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field
+C	mongoengine/tests/fields/fields.py	/^        class C(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
+C	mongoengine/tests/queryset/queryset.py	/^        class C(B):$/;"	c	function:QuerySetTest.test_no_sub_classes
+C	mongoengine/tests/test_context_managers.py	/^        class C(B):$/;"	c	function:ContextManagersTest.test_no_sub_classes
+C	tests/fields/fields.py	/^        class C(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field
+C	tests/fields/fields.py	/^        class C(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
+CASCADE	mongoengine/mongoengine/queryset/base.py	/^CASCADE = 2$/;"	v
+CLASSIFIERS	mongoengine/setup.py	/^CLASSIFIERS = [$/;"	v
+COLLECTION_NAME	mongoengine/fields.py	/^    COLLECTION_NAME = 'mongoengine.counters'$/;"	v	class:SequenceField
+COLLECTION_NAME	mongoengine/mongoengine/fields.py	/^    COLLECTION_NAME = 'mongoengine.counters'$/;"	v	class:SequenceField
+COMPARISON_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^COMPARISON_OPERATORS = ('ne', 'gt', 'gte', 'lt', 'lte', 'in', 'nin', 'mod',$/;"	v
+CONN_CLASS	mongoengine/tests/test_replicaset_connection.py	/^    CONN_CLASS = MongoClient$/;"	v
+CONN_CLASS	mongoengine/tests/test_replicaset_connection.py	/^    CONN_CLASS = ReplicaSetConnection$/;"	v
+CUSTOM_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^CUSTOM_OPERATORS = ('match',)$/;"	v
+CachedReferenceField	mongoengine/fields.py	/^class CachedReferenceField(BaseField):$/;"	c
+CachedReferenceField	mongoengine/mongoengine/fields.py	/^class CachedReferenceField(BaseField):$/;"	c
+CachedReferenceFieldTest	mongoengine/tests/fields/fields.py	/^class CachedReferenceFieldTest(MongoDBTestCase):$/;"	c
+CachedReferenceFieldTest	tests/fields/fields.py	/^class CachedReferenceFieldTest(MongoDBTestCase):$/;"	c
+Car	mongoengine/tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document
+Car	mongoengine/tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
+Car	mongoengine/tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
+Car	tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document
+Car	tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
+Car	tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
+Cat	mongoengine/tests/document/class_methods.py	/^        class Cat(Animal):$/;"	c	function:ClassMethodsTest.test_register_delete_rule_inherited
+Cat	mongoengine/tests/queryset/queryset.py	/^        class Cat(Animal):$/;"	c	function:QuerySetTest.test_cls_query_in_subclassed_docs
+Cat	mongoengine/tests/queryset/queryset.py	/^        class Cat(Animal):$/;"	c	function:QuerySetTest.test_subclass_field_query
+Category	mongoengine/tests/fields/fields.py	/^        class Category(EmbeddedDocument):$/;"	c	function:FieldTest.test_reverse_list_sorting
+Category	mongoengine/tests/queryset/queryset.py	/^        class Category(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle
+Category	mongoengine/tests/queryset/queryset.py	/^        class Category(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing
+Category	mongoengine/tests/queryset/queryset.py	/^        class Category(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_nullify
+Category	tests/fields/fields.py	/^        class Category(EmbeddedDocument):$/;"	c	function:FieldTest.test_reverse_list_sorting
+CategoryList	mongoengine/tests/fields/fields.py	/^        class CategoryList(Document):$/;"	c	function:FieldTest.test_reverse_list_sorting
+CategoryList	tests/fields/fields.py	/^        class CategoryList(Document):$/;"	c	function:FieldTest.test_reverse_list_sorting
+Child	mongoengine/tests/document/validation.py	/^        class Child(Parent):$/;"	c	function:ValidatorErrorTest.test_parent_reference_in_child_document
+Child	mongoengine/tests/document/validation.py	/^        class Child(Parent):$/;"	c	function:ValidatorErrorTest.test_parent_reference_set_as_attribute_in_child_document
+City	mongoengine/tests/document/inheritance.py	/^        class City(Document):$/;"	c	function:InheritanceTest.test_abstract_document_creation_does_not_fail
+City	mongoengine/tests/document/inheritance.py	/^        class City(Document):$/;"	c	function:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly
+City	mongoengine/tests/document/inheritance.py	/^        class City(Document):$/;"	c	function:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class
+City	mongoengine/tests/document/inheritance.py	/^        class City(Document):$/;"	c	function:InheritanceTest.test_auto_id_vs_non_pk_id_field
+ClassMethodsTest	mongoengine/tests/document/class_methods.py	/^class ClassMethodsTest(unittest.TestCase):$/;"	c
+Club	mongoengine/tests/queryset/queryset.py	/^        class Club(Document):$/;"	c	function:QuerySetTest.test_dictfield_update
+Club	mongoengine/tests/queryset/queryset.py	/^        class Club(Document):$/;"	c	function:QuerySetTest.test_mapfield_update
+Collaborator	mongoengine/tests/queryset/queryset.py	/^        class Collaborator(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_from_nested_embedded
+Collaborator	mongoengine/tests/queryset/queryset.py	/^        class Collaborator(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_from_nested_mapfield
+Collaborator	mongoengine/tests/queryset/queryset.py	/^        class Collaborator(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_nested
+Comment	mongoengine/docs/code/tumblelog.py	/^class Comment(EmbeddedDocument):$/;"	c
+Comment	mongoengine/tests/document/indexes.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:IndexesTest.test_index_with_pk
+Comment	mongoengine/tests/document/inheritance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InheritanceTest.test_allow_inheritance_embedded_document
+Comment	mongoengine/tests/document/instance.py	/^        class Comment(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_recurs
+Comment	mongoengine/tests/document/instance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document
+Comment	mongoengine/tests/document/instance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InstanceTest.test_list_search_by_embedded
+Comment	mongoengine/tests/document/instance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InstanceTest.test_save_list
+Comment	mongoengine/tests/document/instance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InstanceTest.test_save_only_changed_fields_recursive
+Comment	mongoengine/tests/document/validation.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:ValidatorErrorTest.test_embedded_document_validation
+Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_validation
+Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_sequence_field
+Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_list_validation
+Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_validation
+Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_sorted_list_sorting
+Comment	mongoengine/tests/queryset/field_list.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_exclude
+Comment	mongoengine/tests/queryset/field_list.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_only_with_subfields
+Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(Document):$/;"	c	function:QuerySetTest.test_ensure_index
+Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(Document):$/;"	c	function:QuerySetTest.test_unset_reference
+Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_bulk_insert
+Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_exec_js_field_sub
+Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_find_array_position
+Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_array_position
+Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_using_positional_operator
+Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_using_positional_operator_embedded_document
+Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_updates_can_have_match_operators
+Comment	mongoengine/tests/queryset/transform.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:TransformTest.test_query_field_name
+Comment	mongoengine/tests/test_dereference.py	/^        class Comment(Document):$/;"	c	function:FieldTest.test_list_lookup_not_checked_in_map
+Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_validation
+Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_sequence_field
+Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_list_validation
+Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_validation
+Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_sorted_list_sorting
+Comments	mongoengine/tests/fields/fields.py	/^        class Comments(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.setUp
+Comments	mongoengine/tests/fields/fields.py	/^        class Comments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
+Comments	tests/fields/fields.py	/^        class Comments(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.setUp
+Comments	tests/fields/fields.py	/^        class Comments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
+Company	mongoengine/tests/fields/fields.py	/^        class Company(Document):$/;"	c	function:FieldTest.test_undefined_reference
+Company	tests/fields/fields.py	/^        class Company(Document):$/;"	c	function:FieldTest.test_undefined_reference
+CompareStats	mongoengine/tests/document/instance.py	/^        class CompareStats(Document):$/;"	c	function:InstanceTest.test_reference_inheritance
+ComplexBaseField	mongoengine/mongoengine/base/fields.py	/^class ComplexBaseField(BaseField):$/;"	c
+ComplexDateTimeField	mongoengine/fields.py	/^class ComplexDateTimeField(StringField):$/;"	c
+ComplexDateTimeField	mongoengine/mongoengine/fields.py	/^class ComplexDateTimeField(StringField):$/;"	c
+CompoundKey	mongoengine/tests/document/indexes.py	/^        class CompoundKey(EmbeddedDocument):$/;"	c	function:IndexesTest.test_compound_key_embedded
+ConnectionTest	mongoengine/tests/test_connection.py	/^class ConnectionTest(unittest.TestCase):$/;"	c
+ConnectionTest	mongoengine/tests/test_replicaset_connection.py	/^class ConnectionTest(unittest.TestCase):$/;"	c
+ContextManagersTest	mongoengine/tests/test_context_managers.py	/^class ContextManagersTest(unittest.TestCase):$/;"	c
+Continent	mongoengine/tests/queryset/queryset.py	/^        class Continent(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField
+Country	mongoengine/tests/queryset/queryset.py	/^        class Country(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField
+CustomData	mongoengine/tests/fields/fields.py	/^        class CustomData(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_custom_data
+CustomData	tests/fields/fields.py	/^        class CustomData(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_custom_data
+CustomNamingTest	mongoengine/tests/document/class_methods.py	/^        class CustomNamingTest(Document):$/;"	c	function:ClassMethodsTest.test_collection_naming
+CustomQuerySet	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySet(QuerySet):$/;"	c	function:QuerySetTest.test_custom_querysets
+CustomQuerySet	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySet(QuerySet):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited
+CustomQuerySet	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySet(QuerySet):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited_direct
+CustomQuerySet	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySet(QuerySet):$/;"	c	function:QuerySetTest.test_custom_querysets_set_manager_directly
+CustomQuerySetManager	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySetManager(QuerySetManager):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited_direct
+CustomQuerySetManager	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySetManager(QuerySetManager):$/;"	c	function:QuerySetTest.test_custom_querysets_managers_directly
+CustomQuerySetManager	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySetManager(QuerySetManager):$/;"	c	function:QuerySetTest.test_custom_querysets_set_manager_directly
+Customer	mongoengine/tests/document/indexes.py	/^        class Customer(Document):$/;"	c	function:IndexesTest.test_unique_and_indexes
+D	mongoengine/tests/fields/fields.py	/^        class D(Document):$/;"	c	function:FieldTest.test_ensure_unique_default_instances
+D	tests/fields/fields.py	/^        class D(Document):$/;"	c	function:FieldTest.test_ensure_unique_default_instances
+DEFAULT_CONNECTION_NAME	mongoengine/mongoengine/connection.py	/^DEFAULT_CONNECTION_NAME = 'default'$/;"	v
+DENY	mongoengine/mongoengine/queryset/base.py	/^DENY = 3$/;"	v
+DESCRIPTION	mongoengine/setup.py	/^DESCRIPTION = ($/;"	v
+DOMAIN_REGEX	mongoengine/fields.py	/^    DOMAIN_REGEX = re.compile($/;"	v	class:EmailField
+DOMAIN_REGEX	mongoengine/mongoengine/fields.py	/^    DOMAIN_REGEX = re.compile($/;"	v	class:EmailField
+DO_NOTHING	mongoengine/mongoengine/queryset/base.py	/^DO_NOTHING = 0$/;"	v
+Data	mongoengine/tests/queryset/queryset.py	/^        class Data(Document):$/;"	c	function:QuerySetTest.test_iteration_within_iteration
+Data	mongoengine/tests/queryset/queryset.py	/^        class Data(Document):$/;"	c	function:QuerySetTest.test_len_during_iteration
+Data	mongoengine/tests/queryset/queryset.py	/^        class Data(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_item_frequencies_with_null_embedded
+Date	mongoengine/tests/document/indexes.py	/^        class Date(EmbeddedDocument):$/;"	c	function:IndexesTest.test_embedded_document_index
+Date	mongoengine/tests/document/indexes.py	/^        class Date(EmbeddedDocument):$/;"	c	function:IndexesTest.test_unique_with
+DateCreatedDocument	mongoengine/tests/document/inheritance.py	/^        class DateCreatedDocument(Document):$/;"	c	function:InheritanceTest.test_document_inheritance
+DateDoc	mongoengine/tests/test_connection.py	/^        class DateDoc(Document):$/;"	c	function:ConnectionTest.test_datetime
+DateTimeField	mongoengine/fields.py	/^class DateTimeField(BaseField):$/;"	c
+DateTimeField	mongoengine/mongoengine/fields.py	/^class DateTimeField(BaseField):$/;"	c
+DateUpdatedDocument	mongoengine/tests/document/inheritance.py	/^        class DateUpdatedDocument(Document):$/;"	c	function:InheritanceTest.test_document_inheritance
+DeReference	mongoengine/mongoengine/dereference.py	/^class DeReference(object):$/;"	c
+DecimalField	mongoengine/fields.py	/^class DecimalField(BaseField):$/;"	c
+DecimalField	mongoengine/mongoengine/fields.py	/^class DecimalField(BaseField):$/;"	c
+DefaultNamingTest	mongoengine/tests/document/class_methods.py	/^        class DefaultNamingTest(Document):$/;"	c	function:ClassMethodsTest.test_collection_naming
+DeltaTest	mongoengine/tests/document/delta.py	/^class DeltaTest(unittest.TestCase):$/;"	c
+DemoFile	mongoengine/tests/fields/file_tests.py	/^        class DemoFile(Document):$/;"	c	function:FileTest.test_file_field_optional
+DicDoc	mongoengine/tests/queryset/transform.py	/^        class DicDoc(Document):$/;"	c	function:TransformTest.test_transform_update
+DictField	mongoengine/fields.py	/^class DictField(ComplexBaseField):$/;"	c
+DictField	mongoengine/mongoengine/fields.py	/^class DictField(ComplexBaseField):$/;"	c
+DictFieldTest	mongoengine/tests/fields/fields.py	/^        class DictFieldTest(Document):$/;"	c	function:FieldTest.test_invalid_dict_value
+DictFieldTest	tests/fields/fields.py	/^        class DictFieldTest(Document):$/;"	c	function:FieldTest.test_invalid_dict_value
+Dish	mongoengine/tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document
+Dish	mongoengine/tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
+Dish	mongoengine/tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
+Dish	tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document
+Dish	tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
+Dish	tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
+Doc	mongoengine/tests/document/delta.py	/^        class Doc(DocClass):$/;"	c	function:DeltaTest.delta
+Doc	mongoengine/tests/document/delta.py	/^        class Doc(DocClass):$/;"	c	function:DeltaTest.delta_db_field
+Doc	mongoengine/tests/document/delta.py	/^        class Doc(DocClass):$/;"	c	function:DeltaTest.delta_recursive
+Doc	mongoengine/tests/document/delta.py	/^        class Doc(DocClass):$/;"	c	function:DeltaTest.delta_recursive_db_field
+Doc	mongoengine/tests/document/delta.py	/^        class Doc(Document):$/;"	c	function:DeltaTest.test_delta_for_nested_map_fields
+Doc	mongoengine/tests/document/delta.py	/^        class Doc(DynamicDocument):$/;"	c	function:DeltaTest.test_dynamic_delta
+Doc	mongoengine/tests/document/dynamic.py	/^        class Doc(DynamicDocument):$/;"	c	function:DynamicTest.test_complex_embedded_document_validation
+Doc	mongoengine/tests/document/dynamic.py	/^        class Doc(DynamicDocument):$/;"	c	function:DynamicTest.test_complex_embedded_documents
+Doc	mongoengine/tests/document/dynamic.py	/^        class Doc(DynamicDocument):$/;"	c	function:DynamicTest.test_embedded_dynamic_document
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_can_save_false_values
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_can_save_if_not_included
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_embedded_document_complex_instance
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_embedded_document_complex_instance_no_use_db_field
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_embedded_document_instance
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_kwargs_complex
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_kwargs_simple
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_reload_referencing
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_save_abstract_document
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_update_list_field
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_update_unique_field
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(DynamicDocument):$/;"	c	function:InstanceTest.test_can_save_false_values_dynamic
+Doc	mongoengine/tests/document/instance.py	/^        class Doc(DynamicDocument):$/;"	c	function:InstanceTest.test_spaces_in_keys
+Doc	mongoengine/tests/document/json_serialisation.py	/^        class Doc(Document):$/;"	c	function:TestJson.test_json_complex
+Doc	mongoengine/tests/document/json_serialisation.py	/^        class Doc(Document):$/;"	c	function:TestJson.test_json_names
+Doc	mongoengine/tests/document/json_serialisation.py	/^        class Doc(Document):$/;"	c	function:TestJson.test_json_simple
+Doc	mongoengine/tests/document/validation.py	/^        class Doc(Document):$/;"	c	function:ValidatorErrorTest.test_embedded_db_field_validate
+Doc	mongoengine/tests/document/validation.py	/^        class Doc(Document):$/;"	c	function:ValidatorErrorTest.test_embedded_weakref
+Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
+Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamic_fields_class
+Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamic_fields_embedded_class
+Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
+Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_generic_reference_filter_by_dbref
+Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_generic_reference_filter_by_objectid
+Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_sparse_field
+Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_undefined_field_exception
+Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_undefined_field_exception_with_strict
+Doc	mongoengine/tests/queryset/modify.py	/^class Doc(Document):$/;"	c
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_array_average
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_array_sum
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_embedded_array_average
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_embedded_array_sum
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_embedded_average
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_embedded_sum
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_json_complex
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_json_simple
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_query_generic_embedded_document
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_reload_embedded_docs_instance
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_reload_list_embedded_docs_instance
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_repr
+Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_update_validate
+Doc	mongoengine/tests/queryset/transform.py	/^        class Doc(Document):$/;"	c	function:TransformTest.test_last_field_name_like_operator
+Doc	mongoengine/tests/queryset/transform.py	/^        class Doc(Document):$/;"	c	function:TransformTest.test_raw_and_merging
+Doc	mongoengine/tests/queryset/transform.py	/^        class Doc(Document):$/;"	c	function:TransformTest.test_transform_update
+Doc	mongoengine/tests/queryset/transform.py	/^        class Doc(Document):$/;"	c	function:TransformTest.test_type
+Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
+Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamic_fields_class
+Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamic_fields_embedded_class
+Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
+Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_generic_reference_filter_by_dbref
+Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_generic_reference_filter_by_objectid
+Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_sparse_field
+Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_undefined_field_exception
+Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_undefined_field_exception_with_strict
+Doc2	mongoengine/tests/fields/fields.py	/^        class Doc2(Document):$/;"	c	function:FieldTest.test_dynamic_fields_class
+Doc2	tests/fields/fields.py	/^        class Doc2(Document):$/;"	c	function:FieldTest.test_dynamic_fields_class
+Document	mongoengine/mongoengine/document.py	/^class Document(BaseDocument):$/;"	c
+DocumentMetaclass	mongoengine/mongoengine/base/metaclasses.py	/^class DocumentMetaclass(type):$/;"	c
+DoesNotExist	mongoengine/mongoengine/errors.py	/^class DoesNotExist(Exception):$/;"	c
+Dog	mongoengine/tests/document/inheritance.py	/^            class Dog(Animal):$/;"	c	class:InheritanceTest.test_allow_inheritance.Animal
+Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_external_subclasses
+Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_external_superclasses
+Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_polymorphic_queries
+Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_subclasses
+Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_superclasses
+Dog	mongoengine/tests/document/instance.py	/^        class Dog(Mammal):$/;"	c	function:InstanceTest.test_polymorphic_references
+Dog	mongoengine/tests/fields/fields.py	/^        class Dog(Mammal):$/;"	c	function:FieldTest.test_cls_field
+Dog	mongoengine/tests/queryset/queryset.py	/^        class Dog(Animal):$/;"	c	function:QuerySetTest.test_cls_query_in_subclassed_docs
+Dog	tests/fields/fields.py	/^        class Dog(Mammal):$/;"	c	function:FieldTest.test_cls_field
+DoubleMixIn	mongoengine/tests/document/instance.py	/^        class DoubleMixIn(BaseMixIn):$/;"	c	function:InstanceTest.test_mixin_inheritance
+Drink	mongoengine/tests/document/inheritance.py	/^        class Drink(Document):$/;"	c	function:InheritanceTest.test_inherited_collections
+Drinker	mongoengine/tests/document/inheritance.py	/^        class Drinker(Document):$/;"	c	function:InheritanceTest.test_inherited_collections
+Dummy	mongoengine/tests/queryset/queryset.py	/^        class Dummy(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle
+Dummy	mongoengine/tests/queryset/queryset.py	/^        class Dummy(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_cycle
+DuplicateQueryConditionsError	mongoengine/mongoengine/queryset/visitor.py	/^class DuplicateQueryConditionsError(InvalidQueryError):$/;"	c
+DynamicDocument	mongoengine/mongoengine/document.py	/^class DynamicDocument(Document):$/;"	c
+DynamicEmbeddedDocument	mongoengine/mongoengine/document.py	/^class DynamicEmbeddedDocument(EmbeddedDocument):$/;"	c
+DynamicField	mongoengine/fields.py	/^class DynamicField(BaseField):$/;"	c
+DynamicField	mongoengine/mongoengine/fields.py	/^class DynamicField(BaseField):$/;"	c
+DynamicNamingTest	mongoengine/tests/document/class_methods.py	/^        class DynamicNamingTest(Document):$/;"	c	function:ClassMethodsTest.test_collection_naming
+DynamicTest	mongoengine/tests/document/dynamic.py	/^class DynamicTest(unittest.TestCase):$/;"	c
+EXCLUDE	mongoengine/mongoengine/queryset/field_list.py	/^    EXCLUDE = 0$/;"	v	class:QueryFieldList
+Editor	mongoengine/tests/document/instance.py	/^        class Editor(self.Person):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal
+EmDoc	mongoengine/tests/queryset/queryset.py	/^        class EmDoc(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_validate
+Email	mongoengine/tests/document/instance.py	/^        class Email(EmbeddedDocument):$/;"	c	function:InstanceTest.test_instance_is_set_on_setattr
+Email	mongoengine/tests/document/instance.py	/^        class Email(EmbeddedDocument):$/;"	c	function:InstanceTest.test_instance_is_set_on_setattr_on_embedded_document_list
+Email	mongoengine/tests/queryset/field_list.py	/^        class Email(Document):$/;"	c	function:OnlyExcludeAllTest.test_all_fields
+Email	mongoengine/tests/queryset/field_list.py	/^        class Email(Document):$/;"	c	function:OnlyExcludeAllTest.test_exclude_only_combining
+EmailField	mongoengine/fields.py	/^class EmailField(StringField):$/;"	c
+EmailField	mongoengine/mongoengine/fields.py	/^class EmailField(StringField):$/;"	c
+EmailUser	mongoengine/tests/document/instance.py	/^            class EmailUser(User):$/;"	c	class:InstanceTest.test_custom_id_field.User
+EmailUser	mongoengine/tests/document/instance.py	/^        class EmailUser(User):$/;"	c	function:InstanceTest.test_custom_id_field
+Embed	mongoengine/tests/fields/fields.py	/^        class Embed(EmbeddedDocument):$/;"	c	function:FieldTest.test_dynamic_fields_embedded_class
+Embed	mongoengine/tests/queryset/queryset.py	/^        class Embed(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_save_and_only_on_fields_with_default
+Embed	tests/fields/fields.py	/^        class Embed(EmbeddedDocument):$/;"	c	function:FieldTest.test_dynamic_fields_embedded_class
+Embedded	mongoengine/tests/document/delta.py	/^        class Embedded(EmbeddedClass):$/;"	c	function:DeltaTest.delta_recursive
+Embedded	mongoengine/tests/document/delta.py	/^        class Embedded(EmbeddedClass):$/;"	c	function:DeltaTest.delta_recursive_db_field
+Embedded	mongoengine/tests/document/dynamic.py	/^        class Embedded(DynamicEmbeddedDocument):$/;"	c	function:DynamicTest.test_complex_embedded_document_validation
+Embedded	mongoengine/tests/document/dynamic.py	/^        class Embedded(DynamicEmbeddedDocument):$/;"	c	function:DynamicTest.test_complex_embedded_documents
+Embedded	mongoengine/tests/document/dynamic.py	/^        class Embedded(DynamicEmbeddedDocument):$/;"	c	function:DynamicTest.test_embedded_dynamic_document
+Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(DynamicEmbeddedDocument):$/;"	c	function:InstanceTest.test_spaces_in_keys
+Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_complex_instance
+Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_complex_instance_no_use_db_field
+Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_equality
+Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_instance
+Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_kwargs_complex
+Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_kwargs_simple
+Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_reload_referencing
+Embedded	mongoengine/tests/document/json_serialisation.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:TestJson.test_json_names
+Embedded	mongoengine/tests/document/json_serialisation.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:TestJson.test_json_simple
+Embedded	mongoengine/tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_db_field
+Embedded	mongoengine/tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_mapfield_db_field
+Embedded	mongoengine/tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_mapfield_numerical_index
+Embedded	mongoengine/tests/queryset/queryset.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_json_simple
+Embedded	tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_db_field
+Embedded	tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_mapfield_db_field
+Embedded	tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_mapfield_numerical_index
+EmbeddedDoc	mongoengine/tests/document/delta.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:DeltaTest.test_lower_level_mark_as_changed
+EmbeddedDoc	mongoengine/tests/document/delta.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:DeltaTest.test_nested_nested_fields_mark_as_changed
+EmbeddedDoc	mongoengine/tests/document/delta.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:DeltaTest.test_upper_level_mark_as_changed
+EmbeddedDoc	mongoengine/tests/document/instance.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:InstanceTest.test_can_save_if_not_included
+EmbeddedDoc	mongoengine/tests/document/json_serialisation.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:TestJson.test_json_complex
+EmbeddedDoc	mongoengine/tests/queryset/queryset.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_json_complex
+EmbeddedDocument	mongoengine/mongoengine/document.py	/^class EmbeddedDocument(BaseDocument):$/;"	c
+EmbeddedDocumentField	mongoengine/fields.py	/^class EmbeddedDocumentField(BaseField):$/;"	c
+EmbeddedDocumentField	mongoengine/mongoengine/fields.py	/^class EmbeddedDocumentField(BaseField):$/;"	c
+EmbeddedDocumentList	mongoengine/mongoengine/base/datastructures.py	/^class EmbeddedDocumentList(BaseList):$/;"	c
+EmbeddedDocumentListField	mongoengine/fields.py	/^class EmbeddedDocumentListField(ListField):$/;"	c
+EmbeddedDocumentListField	mongoengine/mongoengine/fields.py	/^class EmbeddedDocumentListField(ListField):$/;"	c
+EmbeddedDocumentListFieldTestCase	mongoengine/tests/fields/fields.py	/^class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):$/;"	c
+EmbeddedDocumentListFieldTestCase	tests/fields/fields.py	/^class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):$/;"	c
+EmbeddedItem	mongoengine/tests/queryset/transform.py	/^        class EmbeddedItem(EmbeddedDocument):$/;"	c	function:TransformTest.test_last_field_name_like_operator
+EmbeddedLocation	mongoengine/tests/document/indexes.py	/^        class EmbeddedLocation(EmbeddedDocument):$/;"	c	function:IndexesTest.test_explicit_geo2d_index_embedded
+EmbeddedNumber	mongoengine/tests/queryset/field_list.py	/^        class EmbeddedNumber(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_slicing_nested_fields
+EmbeddedOcurrence	mongoengine/tests/fields/fields.py	/^        class EmbeddedOcurrence(EmbeddedDocument):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
+EmbeddedOcurrence	mongoengine/tests/fields/fields.py	/^        class EmbeddedOcurrence(EmbeddedDocument):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
+EmbeddedOcurrence	tests/fields/fields.py	/^        class EmbeddedOcurrence(EmbeddedDocument):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
+EmbeddedOcurrence	tests/fields/fields.py	/^        class EmbeddedOcurrence(EmbeddedDocument):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
+EmbeddedRole	mongoengine/tests/document/delta.py	/^        class EmbeddedRole(EmbeddedDocument):$/;"	c	function:DeltaTest.test_delta_for_nested_map_fields
+EmbeddedUser	mongoengine/tests/document/delta.py	/^        class EmbeddedUser(EmbeddedDocument):$/;"	c	function:DeltaTest.test_delta_for_nested_map_fields
+EmbeddedWithSparseUnique	mongoengine/tests/fields/fields.py	/^        class EmbeddedWithSparseUnique(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
+EmbeddedWithSparseUnique	tests/fields/fields.py	/^        class EmbeddedWithSparseUnique(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
+EmbeddedWithUnique	mongoengine/tests/fields/fields.py	/^        class EmbeddedWithUnique(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
+EmbeddedWithUnique	tests/fields/fields.py	/^        class EmbeddedWithUnique(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
+Employee	mongoengine/tests/document/dynamic.py	/^        class Employee(self.Person):$/;"	c	function:DynamicTest.test_inheritance
+Employee	mongoengine/tests/document/inheritance.py	/^        class Employee(Person):$/;"	c	function:InheritanceTest.test_inheritance_meta_data
+Employee	mongoengine/tests/document/inheritance.py	/^        class Employee(Person):$/;"	c	function:InheritanceTest.test_inheritance_to_mongo_keys
+Employee	mongoengine/tests/document/instance.py	/^        class Employee(Person):$/;"	c	function:InstanceTest.test_embedded_document_to_mongo
+Employee	mongoengine/tests/document/instance.py	/^        class Employee(self.Person):$/;"	c	function:InstanceTest.test_save_embedded_document
+Employee	mongoengine/tests/document/instance.py	/^        class Employee(self.Person):$/;"	c	function:InstanceTest.test_updating_an_embedded_document
+Employee	mongoengine/tests/fields/fields.py	/^        class Employee(Document):$/;"	c	function:FieldTest.test_recursive_reference
+Employee	mongoengine/tests/queryset/field_list.py	/^        class Employee(self.Person):$/;"	c	function:OnlyExcludeAllTest.test_only
+Employee	mongoengine/tests/test_dereference.py	/^        class Employee(Document):$/;"	c	function:FieldTest.test_recursive_reference
+Employee	tests/fields/fields.py	/^        class Employee(Document):$/;"	c	function:FieldTest.test_recursive_reference
+EmployeeDetails	mongoengine/tests/document/instance.py	/^        class EmployeeDetails(EmbeddedDocument):$/;"	c	function:InstanceTest.test_save_embedded_document
+EmployeeDetails	mongoengine/tests/document/instance.py	/^        class EmployeeDetails(EmbeddedDocument):$/;"	c	function:InstanceTest.test_updating_an_embedded_document
+EnumField	mongoengine/tests/fields/fields.py	/^        class EnumField(BaseField):$/;"	c	function:FieldTest.test_tuples_as_tuples
+EnumField	tests/fields/fields.py	/^        class EnumField(BaseField):$/;"	c	function:FieldTest.test_tuples_as_tuples
+EuropeanCity	mongoengine/tests/document/inheritance.py	/^        class EuropeanCity(City):$/;"	c	function:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly
+EuropeanCity	mongoengine/tests/document/inheritance.py	/^        class EuropeanCity(City):$/;"	c	function:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class
+EuropeanCity	mongoengine/tests/document/inheritance.py	/^        class EuropeanCity(City):$/;"	c	function:InheritanceTest.test_auto_id_vs_non_pk_id_field
+Event	mongoengine/tests/fields/geo.py	/^        class Event(Document):$/;"	c	function:GeoFieldTest.test_geopoint_embedded_indexes
+Event	mongoengine/tests/fields/geo.py	/^        class Event(Document):$/;"	c	function:GeoFieldTest.test_indexes_2dsphere
+Event	mongoengine/tests/fields/geo.py	/^        class Event(Document):$/;"	c	function:GeoFieldTest.test_indexes_2dsphere_embedded
+Event	mongoengine/tests/fields/geo.py	/^        class Event(Document):$/;"	c	function:GeoFieldTest.test_indexes_geopoint
+Event	mongoengine/tests/queryset/geo.py	/^        class Event(Document):$/;"	c	function:GeoQueriesTest._create_event_data
+Event	mongoengine/tests/queryset/geo.py	/^        class Event(Document):$/;"	c	function:GeoQueriesTest._test_embedded
+Event	mongoengine/tests/queryset/transform.py	/^        class Event(Document):$/;"	c	function:TransformTest.test_understandable_error_raised
+EvilHuman	mongoengine/tests/document/inheritance.py	/^            class EvilHuman(Human):$/;"	c	class:InheritanceTest.test_abstract_documents.Human
+Example	mongoengine/tests/queryset/queryset.py	/^        class Example(Document):$/;"	c	function:QuerySetTest.test_can_have_field_same_name_as_query_operator
+ExplicitId	mongoengine/tests/test_signals.py	/^        class ExplicitId(Document):$/;"	c	function:SignalTests.setUp
+ExtendedBlogPost	mongoengine/tests/document/indexes.py	/^        class ExtendedBlogPost(BlogPost):$/;"	c	function:IndexesTest._index_test_inheritance
+Extensible	mongoengine/tests/fields/fields.py	/^        class Extensible(Document):$/;"	c	function:FieldTest.test_complex_mapfield
+Extensible	tests/fields/fields.py	/^        class Extensible(Document):$/;"	c	function:FieldTest.test_complex_mapfield
+Extra	mongoengine/tests/queryset/queryset.py	/^        class Extra(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_item_frequencies_with_null_embedded
+Family	mongoengine/tests/queryset/queryset.py	/^        class Family(Document):$/;"	c	function:QuerySetTest.test_map_reduce_custom_output
+Feed	mongoengine/tests/document/instance.py	/^        class Feed(Document):$/;"	c	function:InstanceTest.test_query_count_when_saving
+FieldDoesNotExist	mongoengine/mongoengine/errors.py	/^class FieldDoesNotExist(Exception):$/;"	c
+FieldTest	mongoengine/tests/fields/fields.py	/^class FieldTest(MongoDBTestCase):$/;"	c
+FieldTest	mongoengine/tests/test_dereference.py	/^class FieldTest(unittest.TestCase):$/;"	c
+FieldTest	tests/fields/fields.py	/^class FieldTest(MongoDBTestCase):$/;"	c
+FileField	mongoengine/fields.py	/^class FileField(BaseField):$/;"	c
+FileField	mongoengine/mongoengine/fields.py	/^class FileField(BaseField):$/;"	c
+FileTest	mongoengine/tests/fields/file_tests.py	/^class FileTest(MongoDBTestCase):$/;"	c
+FinalDocument	mongoengine/tests/document/inheritance.py	/^        class FinalDocument(Document):$/;"	c	function:InheritanceTest.test_allow_inheritance_abstract_document
+FindAndModifyTest	mongoengine/tests/queryset/modify.py	/^class FindAndModifyTest(unittest.TestCase):$/;"	c
+Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_abstract_documents
+Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_external_subclasses
+Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_external_superclasses
+Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_polymorphic_queries
+Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_subclasses
+Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_superclasses
+Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal):$/;"	c	function:InheritanceTest.test_dynamic_declarations
+Fish	mongoengine/tests/document/instance.py	/^        class Fish(Animal):$/;"	c	function:InstanceTest.test_polymorphic_references
+Fish	mongoengine/tests/fields/fields.py	/^        class Fish(Animal):$/;"	c	function:FieldTest.test_cls_field
+Fish	tests/fields/fields.py	/^        class Fish(Animal):$/;"	c	function:FieldTest.test_cls_field
+FloatField	mongoengine/fields.py	/^class FloatField(BaseField):$/;"	c
+FloatField	mongoengine/mongoengine/fields.py	/^class FloatField(BaseField):$/;"	c
+Foo	mongoengine/tests/document/instance.py	/^            class Foo(Document):$/;"	c	function:InstanceTest.test_duplicate_db_fields_raise_invalid_document_error
+Foo	mongoengine/tests/document/instance.py	/^        class Foo(Document):$/;"	c	function:InstanceTest.test_reload_doesnt_exist
+Foo	mongoengine/tests/document/instance.py	/^        class Foo(Document):$/;"	c	function:InstanceTest.test_save_max_recursion_not_hit_with_file_field
+Foo	mongoengine/tests/document/instance.py	/^        class Foo(Document):$/;"	c	function:InstanceTest.test_two_way_reverse_delete_rule
+Foo	mongoengine/tests/document/instance.py	/^        class Foo(EmbeddedDocument):$/;"	c	function:InstanceTest.test_shard_key_in_embedded_document
+Foo	mongoengine/tests/document/instance.py	/^        class Foo(EmbeddedDocument, NameMixin):$/;"	c	function:InstanceTest.test_object_mixins
+Foo	mongoengine/tests/fields/fields.py	/^        class Foo(Base):$/;"	c	function:FieldTest.test_inherited_sequencefield
+Foo	mongoengine/tests/fields/fields.py	/^        class Foo(Base):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
+Foo	mongoengine/tests/fields/fields.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_list_field_passed_in_value
+Foo	mongoengine/tests/fields/fields.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_reference_miss
+Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_custom_manager_overriding_objects_works
+Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_distinct_ListField_ReferenceField
+Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_references
+Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_references_to_alias
+Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_inherit_objects
+Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_inherit_objects_override
+Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_elem_match
+Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_in_genericembedded_field
+Foo	mongoengine/tests/queryset/transform.py	/^        class Foo(Document):$/;"	c	function:TransformTest.test_raw_query_and_Q_objects
+Foo	mongoengine/tests/test_dereference.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_document_reload_no_inheritance
+Foo	tests/fields/fields.py	/^        class Foo(Base):$/;"	c	function:FieldTest.test_inherited_sequencefield
+Foo	tests/fields/fields.py	/^        class Foo(Base):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
+Foo	tests/fields/fields.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_list_field_passed_in_value
+Foo	tests/fields/fields.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_reference_miss
+FooBar	mongoengine/tests/document/instance.py	/^        class FooBar(Document):$/;"	c	function:InstanceTest.test_set_unset_one_operation
+GEO_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^GEO_OPERATORS = ('within_distance', 'within_spherical_distance',$/;"	v
+GenericEmbeddedDocumentField	mongoengine/fields.py	/^class GenericEmbeddedDocumentField(BaseField):$/;"	c
+GenericEmbeddedDocumentField	mongoengine/mongoengine/fields.py	/^class GenericEmbeddedDocumentField(BaseField):$/;"	c
+GenericLazyReferenceField	mongoengine/fields.py	/^class GenericLazyReferenceField(GenericReferenceField):$/;"	c
+GenericLazyReferenceField	mongoengine/mongoengine/fields.py	/^class GenericLazyReferenceField(GenericReferenceField):$/;"	c
+GenericLazyReferenceFieldTest	mongoengine/tests/fields/fields.py	/^class GenericLazyReferenceFieldTest(MongoDBTestCase):$/;"	c
+GenericLazyReferenceFieldTest	tests/fields/fields.py	/^class GenericLazyReferenceFieldTest(MongoDBTestCase):$/;"	c
+GenericReferenceField	mongoengine/fields.py	/^class GenericReferenceField(BaseField):$/;"	c
+GenericReferenceField	mongoengine/mongoengine/fields.py	/^class GenericReferenceField(BaseField):$/;"	c
+GeoFieldTest	mongoengine/tests/fields/geo.py	/^class GeoFieldTest(unittest.TestCase):$/;"	c
+GeoJsonBaseField	mongoengine/mongoengine/base/fields.py	/^class GeoJsonBaseField(BaseField):$/;"	c
+GeoPointField	mongoengine/fields.py	/^class GeoPointField(BaseField):$/;"	c
+GeoPointField	mongoengine/mongoengine/fields.py	/^class GeoPointField(BaseField):$/;"	c
+GeoQueriesTest	mongoengine/tests/queryset/geo.py	/^class GeoQueriesTest(MongoDBTestCase):$/;"	c
+GridDocument	mongoengine/tests/fields/file_tests.py	/^        class GridDocument(Document):$/;"	c	function:FileTest.test_file_field_no_default
+GridFSError	mongoengine/fields.py	/^class GridFSError(Exception):$/;"	c
+GridFSError	mongoengine/mongoengine/fields.py	/^class GridFSError(Exception):$/;"	c
+GridFSProxy	mongoengine/fields.py	/^class GridFSProxy(object):$/;"	c
+GridFSProxy	mongoengine/mongoengine/fields.py	/^class GridFSProxy(object):$/;"	c
+Group	mongoengine/tests/document/instance.py	/^        class Group(Document):$/;"	c	function:InstanceTest.test_switch_db_instance
+Group	mongoengine/tests/fields/fields.py	/^        class Group(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
+Group	mongoengine/tests/fields/fields.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference
+Group	mongoengine/tests/fields/fields.py	/^        class Group(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
+Group	mongoengine/tests/queryset/queryset.py	/^        class Group(Document):$/;"	c	function:QuerySetTest.test_update_value_conversion
+Group	mongoengine/tests/test_context_managers.py	/^        class Group(Document):$/;"	c	function:ContextManagersTest.test_no_dereference_context_manager_dbref
+Group	mongoengine/tests/test_context_managers.py	/^        class Group(Document):$/;"	c	function:ContextManagersTest.test_no_dereference_context_manager_object_id
+Group	mongoengine/tests/test_context_managers.py	/^        class Group(Document):$/;"	c	function:ContextManagersTest.test_switch_collection_context_manager
+Group	mongoengine/tests/test_context_managers.py	/^        class Group(Document):$/;"	c	function:ContextManagersTest.test_switch_db_context_manager
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_dict_field
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_dict_field_no_field_inheritance
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_generic_reference
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_generic_reference_map_field
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_handle_old_style_references
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_field_complex
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false_stores_as_type
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_map_field_reference
+Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_migrate_references
+Group	tests/fields/fields.py	/^        class Group(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
+Group	tests/fields/fields.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference
+Group	tests/fields/fields.py	/^        class Group(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
+Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_abstract_documents
+Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_external_subclasses
+Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_external_superclasses
+Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_subclasses
+Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_superclasses
+HAS_PIL	mongoengine/tests/fields/file_tests.py	/^    HAS_PIL = False$/;"	v
+HAS_PIL	mongoengine/tests/fields/file_tests.py	/^    HAS_PIL = True$/;"	v
+HandleNoneFields	mongoengine/tests/fields/fields.py	/^        class HandleNoneFields(Document):$/;"	c	function:FieldTest.test_not_required_handles_none_from_database
+HandleNoneFields	mongoengine/tests/fields/fields.py	/^        class HandleNoneFields(Document):$/;"	c	function:FieldTest.test_not_required_handles_none_in_update
+HandleNoneFields	tests/fields/fields.py	/^        class HandleNoneFields(Document):$/;"	c	function:FieldTest.test_not_required_handles_none_from_database
+HandleNoneFields	tests/fields/fields.py	/^        class HandleNoneFields(Document):$/;"	c	function:FieldTest.test_not_required_handles_none_in_update
+Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_abstract_documents
+Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_external_subclasses
+Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_external_superclasses
+Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_polymorphic_queries
+Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_subclasses
+Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_superclasses
+Human	mongoengine/tests/document/instance.py	/^        class Human(Mammal):$/;"	c	function:InstanceTest.test_polymorphic_references
+Human	mongoengine/tests/fields/fields.py	/^        class Human(Mammal):$/;"	c	function:FieldTest.test_cls_field
+Human	tests/fields/fields.py	/^        class Human(Mammal):$/;"	c	function:FieldTest.test_cls_field
+IS_PYMONGO_3	mongoengine/mongoengine/python_support.py	/^    IS_PYMONGO_3 = False$/;"	v
+IS_PYMONGO_3	mongoengine/mongoengine/python_support.py	/^    IS_PYMONGO_3 = True$/;"	v
+ITER_CHUNK_SIZE	mongoengine/mongoengine/queryset/queryset.py	/^ITER_CHUNK_SIZE = 100$/;"	v
+Image	mongoengine/fields.py	/^    Image = None$/;"	v
+Image	mongoengine/mongoengine/fields.py	/^    Image = None$/;"	v
+ImageField	mongoengine/fields.py	/^class ImageField(FileField):$/;"	c
+ImageField	mongoengine/mongoengine/fields.py	/^class ImageField(FileField):$/;"	c
+ImageGridFsProxy	mongoengine/fields.py	/^class ImageGridFsProxy(GridFSProxy):$/;"	c
+ImageGridFsProxy	mongoengine/mongoengine/fields.py	/^class ImageGridFsProxy(GridFSProxy):$/;"	c
+ImageOps	mongoengine/fields.py	/^    ImageOps = None$/;"	v
+ImageOps	mongoengine/mongoengine/fields.py	/^    ImageOps = None$/;"	v
+ImagePost	mongoengine/docs/code/tumblelog.py	/^class ImagePost(Post):$/;"	c
+ImproperlyConfigured	mongoengine/fields.py	/^class ImproperlyConfigured(Exception):$/;"	c
+ImproperlyConfigured	mongoengine/mongoengine/fields.py	/^class ImproperlyConfigured(Exception):$/;"	c
+IndexesTest	mongoengine/tests/document/indexes.py	/^class IndexesTest(unittest.TestCase):$/;"	c
+Info	mongoengine/tests/fields/fields.py	/^        class Info(EmbeddedDocument):$/;"	c	function:FieldTest.test_map_field_unicode
+Info	tests/fields/fields.py	/^        class Info(EmbeddedDocument):$/;"	c	function:FieldTest.test_map_field_unicode
+InheritanceTest	mongoengine/tests/document/inheritance.py	/^class InheritanceTest(unittest.TestCase):$/;"	c
+InheritedAbstractNamingTest	mongoengine/tests/document/class_methods.py	/^        class InheritedAbstractNamingTest(BaseDocument):$/;"	c	function:ClassMethodsTest.test_collection_naming
+InheritedDocumentFailTest	mongoengine/tests/all_warnings/__init__.py	/^        class InheritedDocumentFailTest(NonAbstractBase):$/;"	c	function:AllWarnings.test_document_collection_syntax_warning
+InstanceTest	mongoengine/tests/document/instance.py	/^class InstanceTest(unittest.TestCase):$/;"	c
+Int64	mongoengine/fields.py	/^    Int64 = long$/;"	v
+Int64	mongoengine/mongoengine/fields.py	/^    Int64 = long$/;"	v
+Int64	mongoengine/tests/fields/fields.py	/^    Int64 = long$/;"	v
+Int64	tests/fields/fields.py	/^    Int64 = long$/;"	v
+IntField	mongoengine/fields.py	/^class IntField(BaseField):$/;"	c
+IntField	mongoengine/mongoengine/fields.py	/^class IntField(BaseField):$/;"	c
+IntPair	mongoengine/tests/queryset/queryset.py	/^        class IntPair(Document):$/;"	c	function:QuerySetTest.test_where
+IntegerSetting	mongoengine/tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_complex_mapfield
+IntegerSetting	mongoengine/tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_dictfield_complex
+IntegerSetting	mongoengine/tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_list_field_complex
+IntegerSetting	tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_complex_mapfield
+IntegerSetting	tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_dictfield_complex
+IntegerSetting	tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_list_field_complex
+InvalidCollectionError	mongoengine/mongoengine/document.py	/^class InvalidCollectionError(Exception):$/;"	c
+InvalidDocumentError	mongoengine/mongoengine/errors.py	/^class InvalidDocumentError(Exception):$/;"	c
+InvalidQueryError	mongoengine/mongoengine/errors.py	/^class InvalidQueryError(Exception):$/;"	c
+Item	mongoengine/tests/queryset/queryset.py	/^        class Item(Document):$/;"	c	function:QuerySetTest.test_add_to_set_each
+Item	mongoengine/tests/queryset/visitor.py	/^        class Item(Document):$/;"	c	function:QTest.test_chained_q_or_filtering
+Job	mongoengine/tests/document/class_methods.py	/^        class Job(Document):$/;"	c	function:ClassMethodsTest.test_register_delete_rule
+Job	mongoengine/tests/document/instance.py	/^        class Job(Document):$/;"	c	function:InstanceTest.test_do_not_save_unchanged_references
+Job	mongoengine/tests/document/instance.py	/^        class Job(EmbeddedDocument):$/;"	c	function:InstanceTest.setUp
+LONG_DESCRIPTION	mongoengine/setup.py	/^        LONG_DESCRIPTION = fin.read()$/;"	v
+LONG_DESCRIPTION	mongoengine/setup.py	/^    LONG_DESCRIPTION = None$/;"	v
+LastLogin	mongoengine/tests/queryset/queryset.py	/^        class LastLogin(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_as_pymongo
+LazyReference	mongoengine/mongoengine/base/datastructures.py	/^class LazyReference(DBRef):$/;"	c
+LazyReferenceField	mongoengine/fields.py	/^class LazyReferenceField(BaseField):$/;"	c
+LazyReferenceField	mongoengine/mongoengine/fields.py	/^class LazyReferenceField(BaseField):$/;"	c
+LazyReferenceFieldTest	mongoengine/tests/fields/fields.py	/^class LazyReferenceFieldTest(MongoDBTestCase):$/;"	c
+LazyReferenceFieldTest	tests/fields/fields.py	/^class LazyReferenceFieldTest(MongoDBTestCase):$/;"	c
+LineStringField	mongoengine/fields.py	/^class LineStringField(GeoJsonBaseField):$/;"	c
+LineStringField	mongoengine/mongoengine/fields.py	/^class LineStringField(GeoJsonBaseField):$/;"	c
+Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference
+Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
+Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_document_not_registered
+Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_list
+Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
+Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
+Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_unicode_url_validation
+Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_url_scheme_validation
+Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_url_validation
+Link	mongoengine/tests/queryset/queryset.py	/^        class Link(Document):$/;"	c	function:QuerySetTest.test_map_reduce_finalize
+Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference
+Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
+Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_document_not_registered
+Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_list
+Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
+Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
+Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_unicode_url_validation
+Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_url_scheme_validation
+Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_url_validation
+LinkPost	mongoengine/docs/code/tumblelog.py	/^class LinkPost(Post):$/;"	c
+LisDoc	mongoengine/tests/queryset/transform.py	/^        class LisDoc(Document):$/;"	c	function:TransformTest.test_transform_update
+ListField	mongoengine/fields.py	/^class ListField(ComplexBaseField):$/;"	c
+ListField	mongoengine/mongoengine/fields.py	/^class ListField(ComplexBaseField):$/;"	c
+Locale	mongoengine/tests/queryset/queryset.py	/^        class Locale(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_scalar_embedded
+Location	mongoengine/tests/document/instance.py	/^        class Location(Document):$/;"	c	function:InstanceTest.test_document_registry_regressions
+Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_geo_indexes_recursion
+Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_geopoint_validation
+Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_linestring_validation
+Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_multilinestring_validation
+Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_multipoint_validation
+Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_multipolygon_validation
+Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_point_validation
+Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_polygon_validation
+Location	mongoengine/tests/queryset/geo.py	/^        class Location(Document):$/;"	c	function:GeoQueriesTest.test_2dsphere_linestring_sets_correctly
+Location	mongoengine/tests/queryset/geo.py	/^        class Location(Document):$/;"	c	function:GeoQueriesTest.test_2dsphere_point_sets_correctly
+Location	mongoengine/tests/queryset/geo.py	/^        class Location(Document):$/;"	c	function:GeoQueriesTest.test_geojson_PolygonField
+Location	mongoengine/tests/queryset/transform.py	/^        class Location(Document):$/;"	c	function:TransformTest.test_geojson_LineStringField
+Location	mongoengine/tests/queryset/transform.py	/^        class Location(Document):$/;"	c	function:TransformTest.test_geojson_PointField
+Location	mongoengine/tests/queryset/transform.py	/^        class Location(Document):$/;"	c	function:TransformTest.test_geojson_PolygonField
+Log	mongoengine/tests/document/indexes.py	/^        class Log(Document):$/;"	c	function:IndexesTest.test_ttl_indexes
+Log	mongoengine/tests/document/instance.py	/^        class Log(Document):$/;"	c	function:InstanceTest.test_capped_collection
+Log	mongoengine/tests/document/instance.py	/^        class Log(Document):$/;"	c	function:InstanceTest.test_capped_collection_default
+Log	mongoengine/tests/document/instance.py	/^        class Log(Document):$/;"	c	function:InstanceTest.test_capped_collection_no_max_size_problems
+Log	mongoengine/tests/fields/fields.py	/^        class Log(Document):$/;"	c	function:FieldTest.test_map_field_lookup
+Log	mongoengine/tests/fields/geo.py	/^        class Log(Document):$/;"	c	function:GeoFieldTest.test_geo_indexes_auto_index
+Log	mongoengine/tests/queryset/queryset.py	/^        class Log(Document):$/;"	c	function:QuerySetTest.test_delete_with_limits
+Log	tests/fields/fields.py	/^        class Log(Document):$/;"	c	function:FieldTest.test_map_field_lookup
+LogEntry	mongoengine/tests/document/instance.py	/^        class LogEntry(Document):$/;"	c	function:InstanceTest.test_shard_key
+LogEntry	mongoengine/tests/document/instance.py	/^        class LogEntry(Document):$/;"	c	function:InstanceTest.test_shard_key_primary
+LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_complexdatetime_storage
+LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_complexdatetime_usage
+LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime
+LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_tz_aware_mark_as_changed
+LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_usage
+LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_validation
+LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_complexdatetime_storage
+LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_complexdatetime_usage
+LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime
+LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_tz_aware_mark_as_changed
+LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_usage
+LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_validation
+LongField	mongoengine/fields.py	/^class LongField(BaseField):$/;"	c
+LongField	mongoengine/mongoengine/fields.py	/^class LongField(BaseField):$/;"	c
+LookUpError	mongoengine/mongoengine/errors.py	/^class LookUpError(AttributeError):$/;"	c
+MATCH_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^MATCH_OPERATORS = (COMPARISON_OPERATORS + GEO_OPERATORS +$/;"	v
+MONGO_TEST_DB	mongoengine/tests/utils.py	/^MONGO_TEST_DB = 'mongoenginetest'$/;"	v
+Macro	mongoengine/tests/document/instance.py	/^        class Macro(EmbeddedDocument):$/;"	c	function:InstanceTest.test_complex_nesting_document_and_embedded_document
+Mammal	mongoengine/tests/document/inheritance.py	/^            class Mammal(Animal):$/;"	c	class:InheritanceTest.test_allow_inheritance_abstract_document.Animal
+Mammal	mongoengine/tests/document/inheritance.py	/^            class Mammal(Animal):$/;"	c	class:InheritanceTest.test_cant_turn_off_inheritance_on_subclass.Animal
+Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_external_subclasses
+Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_external_superclasses
+Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_polymorphic_queries
+Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_subclasses
+Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_superclasses
+Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal):$/;"	c	function:InheritanceTest.test_abstract_documents
+Mammal	mongoengine/tests/document/instance.py	/^        class Mammal(Animal):$/;"	c	function:InstanceTest.test_polymorphic_references
+Mammal	mongoengine/tests/fields/fields.py	/^        class Mammal(Animal):$/;"	c	function:FieldTest.test_cls_field
+Mammal	tests/fields/fields.py	/^        class Mammal(Animal):$/;"	c	function:FieldTest.test_cls_field
+MapField	mongoengine/fields.py	/^class MapField(DictField):$/;"	c
+MapField	mongoengine/mongoengine/fields.py	/^class MapField(DictField):$/;"	c
+MapReduceDocument	mongoengine/mongoengine/document.py	/^class MapReduceDocument(object):$/;"	c
+Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:FieldTest.test_reference_query_conversion
+Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:FieldTest.test_reference_query_conversion_dbref
+Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion
+Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion
+Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref
+Member	mongoengine/tests/queryset/queryset.py	/^        class Member(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_mapfield_update
+Member	mongoengine/tests/queryset/queryset.py	/^        class Member(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_no_dereference_embedded_doc
+Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:FieldTest.test_reference_query_conversion
+Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:FieldTest.test_reference_query_conversion_dbref
+Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion
+Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion
+Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref
+Message	mongoengine/tests/queryset/queryset.py	/^        class Message(Document):$/;"	c	function:QuerySetTest.test_set_list_embedded_documents
+Message	mongoengine/tests/test_dereference.py	/^        class Message(Document):$/;"	c	function:FieldTest.test_document_reload_reference_integrity
+Message	mongoengine/tests/test_dereference.py	/^        class Message(Document):$/;"	c	function:FieldTest.test_list_lookup_not_checked_in_map
+MetaDict	mongoengine/mongoengine/base/metaclasses.py	/^class MetaDict(dict):$/;"	c
+Mineral	mongoengine/tests/fields/fields.py	/^        class Mineral(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
+Mineral	tests/fields/fields.py	/^        class Mineral(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
+Mixin	mongoengine/tests/fixtures.py	/^class Mixin(object):$/;"	c
+ModeratorComments	mongoengine/tests/fields/fields.py	/^        class ModeratorComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
+ModeratorComments	tests/fields/fields.py	/^        class ModeratorComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
+MongoDBTestCase	mongoengine/tests/utils.py	/^class MongoDBTestCase(unittest.TestCase):$/;"	c
+MongoEngineConnectionError	mongoengine/mongoengine/connection.py	/^class MongoEngineConnectionError(Exception):$/;"	c
+MongoUser	mongoengine/tests/document/indexes.py	/^        class MongoUser(User):$/;"	c	function:IndexesTest.test_disable_index_creation
+Mother	mongoengine/tests/fields/fields.py	/^        class Mother(Document):$/;"	c	function:FieldTest.test_abstract_reference_base_type
+Mother	tests/fields/fields.py	/^        class Mother(Document):$/;"	c	function:FieldTest.test_abstract_reference_base_type
+MultiLineStringField	mongoengine/fields.py	/^class MultiLineStringField(GeoJsonBaseField):$/;"	c
+MultiLineStringField	mongoengine/mongoengine/fields.py	/^class MultiLineStringField(GeoJsonBaseField):$/;"	c
+MultiPointField	mongoengine/fields.py	/^class MultiPointField(GeoJsonBaseField):$/;"	c
+MultiPointField	mongoengine/mongoengine/fields.py	/^class MultiPointField(GeoJsonBaseField):$/;"	c
+MultiPolygonField	mongoengine/fields.py	/^class MultiPolygonField(GeoJsonBaseField):$/;"	c
+MultiPolygonField	mongoengine/mongoengine/fields.py	/^class MultiPolygonField(GeoJsonBaseField):$/;"	c
+MultipleObjectsReturned	mongoengine/mongoengine/errors.py	/^class MultipleObjectsReturned(Exception):$/;"	c
+MyDoc	mongoengine/tests/document/delta.py	/^        class MyDoc(Document):$/;"	c	function:DeltaTest.test_lower_level_mark_as_changed
+MyDoc	mongoengine/tests/document/delta.py	/^        class MyDoc(Document):$/;"	c	function:DeltaTest.test_nested_nested_fields_mark_as_changed
+MyDoc	mongoengine/tests/document/delta.py	/^        class MyDoc(Document):$/;"	c	function:DeltaTest.test_upper_level_mark_as_changed
+MyDoc	mongoengine/tests/document/indexes.py	/^        class MyDoc(Document):$/;"	c	function:IndexesTest.test_build_index_spec_is_not_destructive
+MyDoc	mongoengine/tests/document/indexes.py	/^        class MyDoc(Document):$/;"	c	function:IndexesTest.test_sparse_compound_indexes
+MyDoc	mongoengine/tests/document/indexes.py	/^        class MyDoc(Document):$/;"	c	function:IndexesTest.test_string_indexes
+MyDoc	mongoengine/tests/fields/fields.py	/^        class MyDoc(Document):$/;"	c	function:FieldTest.test_datetime_from_empty_string
+MyDoc	mongoengine/tests/fields/fields.py	/^        class MyDoc(Document):$/;"	c	function:FieldTest.test_datetime_from_whitespace_string
+MyDoc	mongoengine/tests/queryset/field_list.py	/^        class MyDoc(Document):$/;"	c	function:OnlyExcludeAllTest.test_mix_slice_with_other_fields
+MyDoc	mongoengine/tests/queryset/field_list.py	/^        class MyDoc(Document):$/;"	c	function:OnlyExcludeAllTest.test_mixing_only_exclude
+MyDoc	mongoengine/tests/queryset/field_list.py	/^        class MyDoc(Document):$/;"	c	function:OnlyExcludeAllTest.test_slicing
+MyDoc	mongoengine/tests/queryset/queryset.py	/^        class MyDoc(Document):$/;"	c	function:QuerySetTest.test_count_and_none
+MyDoc	mongoengine/tests/queryset/queryset.py	/^        class MyDoc(Document):$/;"	c	function:QuerySetTest.test_dictfield_key_looks_like_a_digit
+MyDoc	mongoengine/tests/queryset/queryset.py	/^        class MyDoc(DynamicDocument):$/;"	c	function:QuerySetTest.test_update_upsert_looks_like_a_digit
+MyDoc	tests/fields/fields.py	/^        class MyDoc(Document):$/;"	c	function:FieldTest.test_datetime_from_empty_string
+MyDoc	tests/fields/fields.py	/^        class MyDoc(Document):$/;"	c	function:FieldTest.test_datetime_from_whitespace_string
+MyDocument	mongoengine/tests/document/class_methods.py	/^        class MyDocument(BaseDocument):$/;"	c	function:ClassMethodsTest.test_collection_naming
+MyDocument	mongoengine/tests/document/inheritance.py	/^            class MyDocument(DateCreatedDocument, DateUpdatedDocument):$/;"	c	class:InheritanceTest.test_document_inheritance.DateUpdatedDocument
+MyPerson	mongoengine/tests/document/instance.py	/^        class MyPerson(self.Person):$/;"	c	function:InstanceTest.test_from_son
+NON_FIELD_ERRORS	mongoengine/mongoengine/base/document.py	/^NON_FIELD_ERRORS = '__all__'$/;"	v
+NULLIFY	mongoengine/mongoengine/queryset/base.py	/^NULLIFY = 1$/;"	v
+NameMixin	mongoengine/tests/document/instance.py	/^        class NameMixin(object):$/;"	c	function:InstanceTest.test_object_mixins
+Namespace	mongoengine/mongoengine/signals.py	/^    class Namespace(object):$/;"	c
+NewDocumentPickleTest	mongoengine/tests/fixtures.py	/^class NewDocumentPickleTest(Document):$/;"	c
+News	mongoengine/tests/queryset/queryset.py	/^        class News(Document):$/;"	c	function:QuerySetTest.test_text_indexes
+NicePlace	mongoengine/tests/document/instance.py	/^        class NicePlace(Place):$/;"	c	function:InstanceTest.test_document_not_registered
+NoDeclaredType	mongoengine/tests/fields/fields.py	/^            class NoDeclaredType(Document):$/;"	c	class:FieldTest.test_mapfield.Simple
+NoDeclaredType	tests/fields/fields.py	/^            class NoDeclaredType(Document):$/;"	c	class:FieldTest.test_mapfield.Simple
+Noddy	mongoengine/tests/queryset/queryset.py	/^        class Noddy(Document):$/;"	c	function:QuerySetTest.test_no_cache
+Node	mongoengine/tests/document/instance.py	/^        class Node(Document):$/;"	c	function:InstanceTest.test_complex_nesting_document_and_embedded_document
+NodesSystem	mongoengine/tests/document/instance.py	/^        class NodesSystem(Document):$/;"	c	function:InstanceTest.test_complex_nesting_document_and_embedded_document
+NonAbstractBase	mongoengine/tests/all_warnings/__init__.py	/^        class NonAbstractBase(Document):$/;"	c	function:AllWarnings.test_document_collection_syntax_warning
+NotRegistered	mongoengine/mongoengine/errors.py	/^class NotRegistered(Exception):$/;"	c
+NotUniqueError	mongoengine/mongoengine/errors.py	/^class NotUniqueError(OperationError):$/;"	c
+Number	mongoengine/tests/queryset/queryset.py	/^        class Number(Document):$/;"	c	function:QuerySetTest.test_clone
+Number	mongoengine/tests/queryset/queryset.py	/^        class Number(Document):$/;"	c	function:QuerySetTest.test_order_then_filter
+Number	mongoengine/tests/queryset/queryset.py	/^        class Number(Document):$/;"	c	function:QuerySetTest.test_order_works_with_custom_db_field_names
+Number	mongoengine/tests/queryset/queryset.py	/^        class Number(Document):$/;"	c	function:QuerySetTest.test_order_works_with_primary
+Number2	mongoengine/tests/queryset/queryset.py	/^        class Number2(Document):$/;"	c	function:QuerySetTest.test_using
+Numbers	mongoengine/tests/queryset/field_list.py	/^        class Numbers(Document):$/;"	c	function:OnlyExcludeAllTest.test_slicing_fields
+Numbers	mongoengine/tests/queryset/field_list.py	/^        class Numbers(Document):$/;"	c	function:OnlyExcludeAllTest.test_slicing_nested_fields
+ONLY	mongoengine/mongoengine/queryset/field_list.py	/^    ONLY = 1$/;"	v	class:QueryFieldList
+OR	mongoengine/mongoengine/queryset/visitor.py	/^    OR = 1$/;"	v	class:QNode
+ObjectIdField	mongoengine/mongoengine/base/fields.py	/^class ObjectIdField(BaseField):$/;"	c
+Occurrence	mongoengine/tests/document/instance.py	/^        class Occurrence(EmbeddedDocument):$/;"	c	function:InstanceTest.test_invalid_son
+Ocorrence	mongoengine/tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
+Ocorrence	mongoengine/tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
+Ocorrence	mongoengine/tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_get_and_save
+Ocorrence	mongoengine/tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields
+Ocorrence	tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
+Ocorrence	tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
+Ocorrence	tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_get_and_save
+Ocorrence	tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_not_set
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_passthrough
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
+Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_simple
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_not_set
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_passthrough
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
+Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_simple
+OldMixinNamingConvention	mongoengine/tests/document/class_methods.py	/^        class OldMixinNamingConvention(Document, BaseMixin):$/;"	c	function:ClassMethodsTest.test_collection_naming
+OldNamingConvention	mongoengine/tests/document/class_methods.py	/^        class OldNamingConvention(BaseDocument):$/;"	c	function:ClassMethodsTest.test_collection_naming
+OnlyExcludeAllTest	mongoengine/tests/queryset/field_list.py	/^class OnlyExcludeAllTest(unittest.TestCase):$/;"	c
+OperationError	mongoengine/mongoengine/errors.py	/^class OperationError(Exception):$/;"	c
+Organization	mongoengine/tests/document/delta.py	/^        class Organization(DocClass2):$/;"	c	function:DeltaTest.circular_reference_deltas
+Organization	mongoengine/tests/document/delta.py	/^        class Organization(DocClass2):$/;"	c	function:DeltaTest.circular_reference_deltas_2
+Organization	mongoengine/tests/document/delta.py	/^        class Organization(Document):$/;"	c	function:DeltaTest.test_referenced_object_changed_attributes
+Organization	mongoengine/tests/document/instance.py	/^        class Organization(Document):$/;"	c	function:InstanceTest.test_query_count_when_saving
+Organization	mongoengine/tests/queryset/queryset.py	/^        class Organization(Document):$/;"	c	function:QuerySetTest.test_get_changed_fields_query_count
+Organization	mongoengine/tests/queryset/queryset.py	/^        class Organization(Document):$/;"	c	function:QuerySetTest.test_no_dereference
+Organization	mongoengine/tests/queryset/queryset.py	/^        class Organization(Document):$/;"	c	function:QuerySetTest.test_no_dereference_embedded_doc
+Organization	mongoengine/tests/queryset/queryset.py	/^        class Organization(Document):$/;"	c	function:QuerySetTest.test_scalar
+Other	mongoengine/tests/test_dereference.py	/^        class Other(EmbeddedDocument):$/;"	c	function:FieldTest.test_circular_tree_reference
+Owner	mongoengine/tests/fields/fields.py	/^        class Owner(EmbeddedDocument):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
+Owner	mongoengine/tests/fields/fields.py	/^        class Owner(EmbeddedDocument):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
+Owner	tests/fields/fields.py	/^        class Owner(EmbeddedDocument):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
+Owner	tests/fields/fields.py	/^        class Owner(EmbeddedDocument):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
+PAPER	mongoengine/docs/Makefile	/^PAPER         =$/;"	m
+PAPEROPT_a4	mongoengine/docs/Makefile	/^PAPEROPT_a4     = -D latex_paper_size=a4$/;"	m
+PAPEROPT_letter	mongoengine/docs/Makefile	/^PAPEROPT_letter = -D latex_paper_size=letter$/;"	m
+PULL	mongoengine/mongoengine/queryset/base.py	/^PULL = 4$/;"	v
+Page	mongoengine/tests/document/instance.py	/^        class Page(Document):$/;"	c	function:InstanceTest.test_list_search_by_embedded
+Page	mongoengine/tests/document/instance.py	/^        class Page(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_update
+Page	mongoengine/tests/document/instance.py	/^        class Page(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_update_after_save
+Page	mongoengine/tests/document/instance.py	/^        class Page(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_update_db_field
+Page	mongoengine/tests/test_dereference.py	/^        class Page(Document):$/;"	c	function:FieldTest.test_dereferencing_embedded_listfield_referencefield
+Parameter	mongoengine/tests/document/instance.py	/^        class Parameter(EmbeddedDocument):$/;"	c	function:InstanceTest.test_complex_nesting_document_and_embedded_document
+Parent	mongoengine/tests/document/validation.py	/^        class Parent(Document):$/;"	c	function:ValidatorErrorTest.test_parent_reference_in_child_document
+Parent	mongoengine/tests/document/validation.py	/^        class Parent(Document):$/;"	c	function:ValidatorErrorTest.test_parent_reference_set_as_attribute_in_child_document
+Parent	mongoengine/tests/fields/geo.py	/^        class Parent(Document):$/;"	c	function:GeoFieldTest.test_geo_indexes_recursion
+Parents	mongoengine/tests/document/instance.py	/^            class Parents(EmbeddedDocument):$/;"	c	function:InstanceTest.test_invalid_reverse_delete_rule_raise_errors
+Pay	mongoengine/tests/queryset/queryset.py	/^        class Pay(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_embedded_array_average
+Pay	mongoengine/tests/queryset/queryset.py	/^        class Pay(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_embedded_array_sum
+Pay	mongoengine/tests/queryset/queryset.py	/^        class Pay(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_embedded_average
+Pay	mongoengine/tests/queryset/queryset.py	/^        class Pay(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_embedded_sum
+Person	mongoengine/tests/document/class_methods.py	/^        class Person(Document):$/;"	c	function:ClassMethodsTest.setUp
+Person	mongoengine/tests/document/class_methods.py	/^        class Person(Document):$/;"	c	function:ClassMethodsTest.test_collection_name_and_primary
+Person	mongoengine/tests/document/class_methods.py	/^        class Person(Document):$/;"	c	function:ClassMethodsTest.test_custom_collection_name_operations
+Person	mongoengine/tests/document/delta.py	/^        class Person(DocClass1):$/;"	c	function:DeltaTest.circular_reference_deltas
+Person	mongoengine/tests/document/delta.py	/^        class Person(DocClass1):$/;"	c	function:DeltaTest.circular_reference_deltas_2
+Person	mongoengine/tests/document/delta.py	/^        class Person(Document):$/;"	c	function:DeltaTest.setUp
+Person	mongoengine/tests/document/delta.py	/^        class Person(DynamicDocument):$/;"	c	function:DeltaTest.test_delta_for_dynamic_documents
+Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.setUp
+Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.test_complex_dynamic_document_queries
+Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.test_dynamic_and_embedded
+Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.test_dynamic_and_embedded_dict_access
+Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.test_dynamic_embedded_works_with_only
+Person	mongoengine/tests/document/indexes.py	/^        class Person(Document):$/;"	c	function:IndexesTest.setUp
+Person	mongoengine/tests/document/indexes.py	/^        class Person(Document):$/;"	c	function:IndexesTest.test_embedded_document_index_meta
+Person	mongoengine/tests/document/indexes.py	/^        class Person(UserBase):$/;"	c	function:IndexesTest.test_abstract_index_inheritance
+Person	mongoengine/tests/document/inheritance.py	/^        class Person(Document):$/;"	c	function:InheritanceTest.test_inheritance_meta_data
+Person	mongoengine/tests/document/inheritance.py	/^        class Person(Document):$/;"	c	function:InheritanceTest.test_inheritance_to_mongo_keys
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.setUp
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_data_contains_id_field
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_db_embedded_doc_field_load
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_db_field_load
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_default_values
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_do_not_save_unchanged_references
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_falsey_pk
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_not_saved_eq
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascade_kwargs
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascade_meta_false
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascade_meta_true
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascades
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascades_generically
+Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_max_recursion_not_hit
+Person	mongoengine/tests/document/instance.py	/^        class Person(DynamicDocument):$/;"	c	function:InstanceTest.test_mixed_creation_dynamic
+Person	mongoengine/tests/document/instance.py	/^        class Person(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_to_mongo
+Person	mongoengine/tests/document/validation.py	/^        class Person(BasePerson):$/;"	c	function:ValidatorErrorTest.test_fields_rewrite
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_auto_sync
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_update_all
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_boolean_validation
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dbref_reference_fields
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dbref_to_mongo
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_comparison
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_storage
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_validation
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_nothing_set
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_set_to_None
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_when_deleting_value
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_when_setting_to_None
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_embedded_document_validation
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_float_validation
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_embedded_document
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_reference_is_none
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_int_validation
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields_on_docs
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_object_id_validation
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_objectid_reference_fields
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_required_values
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_get_next_value
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_sequence_name
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_value_decorator
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_string_validation
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_uuid_field_binary
+Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_uuid_field_string
+Person	mongoengine/tests/queryset/field_list.py	/^        class Person(Document):$/;"	c	function:OnlyExcludeAllTest.setUp
+Person	mongoengine/tests/queryset/pickable.py	/^class Person(Document):$/;"	c
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.setUp
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_bool_performance
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_bool_with_ordering
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_bool_with_ordering_from_meta_dict
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_cached_queryset
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_get_changed_fields_query_count
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_null_values
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_on_embedded
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_with_null_embedded
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_loop_over_invalid_id_does_not_crash
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_map_reduce_custom_output
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_no_cached_queryset
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_queryset_aggregation_framework
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_scalar_decimal
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_scalar_embedded
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_scalar_generic_reference_field
+Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_scalar_reference_field
+Person	mongoengine/tests/queryset/visitor.py	/^        class Person(Document):$/;"	c	function:QTest.setUp
+Person	mongoengine/tests/queryset/visitor.py	/^        class Person(Document):$/;"	c	function:QTest.test_empty_q
+Person	mongoengine/tests/test_dereference.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_circular_reference
+Person	mongoengine/tests/test_dereference.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_circular_reference_on_self
+Person	mongoengine/tests/test_dereference.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_circular_tree_reference
+Person	mongoengine/tests/test_dereference.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dict_in_dbref_instance
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_auto_sync
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_update_all
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_boolean_validation
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dbref_reference_fields
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dbref_to_mongo
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_comparison
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_storage
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_validation
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_nothing_set
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_set_to_None
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_when_deleting_value
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_when_setting_to_None
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_embedded_document_validation
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_float_validation
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_embedded_document
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_reference_is_none
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_int_validation
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields_on_docs
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_object_id_validation
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_objectid_reference_fields
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_required_values
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_get_next_value
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_sequence_name
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_value_decorator
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_string_validation
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_uuid_field_binary
+Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_uuid_field_string
+PersonAuto	mongoengine/tests/fields/fields.py	/^        class PersonAuto(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_decimal
+PersonAuto	tests/fields/fields.py	/^        class PersonAuto(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_decimal
+PersonMeta	mongoengine/tests/queryset/queryset.py	/^        class PersonMeta(EmbeddedDocument):$/;"	c	function:QuerySetTest.setUp
+PersonPreferences	mongoengine/tests/fields/fields.py	/^        class PersonPreferences(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_validation
+PersonPreferences	tests/fields/fields.py	/^        class PersonPreferences(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_validation
+Persone	mongoengine/tests/fields/fields.py	/^        class Persone(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled
+Persone	tests/fields/fields.py	/^        class Persone(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled
+Phone	mongoengine/tests/queryset/queryset.py	/^        class Phone(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_item_frequencies_on_embedded
+PickleDynamicEmbedded	mongoengine/tests/fixtures.py	/^class PickleDynamicEmbedded(DynamicEmbeddedDocument):$/;"	c
+PickleDynamicTest	mongoengine/tests/fixtures.py	/^class PickleDynamicTest(DynamicDocument):$/;"	c
+PickleEmbedded	mongoengine/tests/fixtures.py	/^class PickleEmbedded(EmbeddedDocument):$/;"	c
+PickleSignalsTest	mongoengine/tests/fixtures.py	/^class PickleSignalsTest(Document):$/;"	c
+PickleTest	mongoengine/tests/fixtures.py	/^class PickleTest(Document):$/;"	c
+Pike	mongoengine/tests/document/inheritance.py	/^        class Pike(Fish):$/;"	c	function:InheritanceTest.test_dynamic_declarations
+Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_create_geohaystack_index
+Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_explicit_geo2d_index
+Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_explicit_geo2d_index_embedded
+Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_explicit_geohaystack_index
+Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_explicit_geosphere_index
+Place	mongoengine/tests/document/instance.py	/^        class Place(Document):$/;"	c	function:InstanceTest.test_document_not_registered
+Place	mongoengine/tests/queryset/geo.py	/^        class Place(Document):$/;"	c	function:GeoQueriesTest.test_aspymongo_with_only
+Playlist	mongoengine/tests/test_dereference.py	/^        class Playlist(Document):$/;"	c	function:FieldTest.test_select_related_follows_embedded_referencefields
+PlaylistItem	mongoengine/tests/test_dereference.py	/^        class PlaylistItem(EmbeddedDocument):$/;"	c	function:FieldTest.test_select_related_follows_embedded_referencefields
+Point	mongoengine/tests/queryset/geo.py	/^        class Point(Document):$/;"	c	function:GeoQueriesTest.test_spherical_geospatial_operators
+PointField	mongoengine/fields.py	/^class PointField(GeoJsonBaseField):$/;"	c
+PointField	mongoengine/mongoengine/fields.py	/^class PointField(GeoJsonBaseField):$/;"	c
+PolygonField	mongoengine/fields.py	/^class PolygonField(GeoJsonBaseField):$/;"	c
+PolygonField	mongoengine/mongoengine/fields.py	/^class PolygonField(GeoJsonBaseField):$/;"	c
+Post	mongoengine/docs/code/tumblelog.py	/^class Post(Document):$/;"	c
+Post	mongoengine/tests/document/instance.py	/^        class Post(Document):$/;"	c	function:InstanceTest.test_reload_of_non_strict_with_special_field_name
+Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_embedded_sequence_field
+Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference
+Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
+Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_choices_no_dereference
+Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list
+Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
+Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list_item_modification
+Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
+Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_recursive_validation
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Base):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Base):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited_direct
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_call_after_limits_set
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_count_limit_and_skip
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_custom_querysets
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_custom_querysets_managers_directly
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_custom_querysets_set_manager_directly
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_unset_reference
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_updates_can_have_match_operators
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_bulk_insert
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_find_array_position
+Post	mongoengine/tests/queryset/queryset.py	/^        class Post(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_array_position
+Post	mongoengine/tests/queryset/visitor.py	/^        class Post(Document):$/;"	c	function:QTest.test_q_with_dbref
+Post	mongoengine/tests/queryset/visitor.py	/^        class Post(EmbeddedDocument):$/;"	c	function:QTest.test_chained_q_or_filtering
+Post	mongoengine/tests/test_dereference.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_list_of_lists_of_references
+Post	mongoengine/tests/test_dereference.py	/^        class Post(EmbeddedDocument):$/;"	c	function:FieldTest.test_dereferencing_embedded_listfield_referencefield
+Post	mongoengine/tests/test_signals.py	/^        class Post(Document):$/;"	c	function:SignalTests.setUp
+Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_embedded_sequence_field
+Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference
+Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
+Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_choices_no_dereference
+Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list
+Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
+Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list_item_modification
+Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
+Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_recursive_validation
+PowerUser	mongoengine/tests/fields/fields.py	/^        class PowerUser(User):$/;"	c	function:FieldTest.test_embedded_document_inheritance
+PowerUser	tests/fields/fields.py	/^        class PowerUser(User):$/;"	c	function:FieldTest.test_embedded_document_inheritance
+Product	mongoengine/tests/fields/fields.py	/^        class Product(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields
+Product	mongoengine/tests/fields/fields.py	/^        class Product(Document):$/;"	c	function:FieldTest.test_undefined_reference
+Product	mongoengine/tests/queryset/queryset.py	/^        class Product(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_db_field
+Product	tests/fields/fields.py	/^        class Product(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields
+Product	tests/fields/fields.py	/^        class Product(Document):$/;"	c	function:FieldTest.test_undefined_reference
+Profile	mongoengine/tests/queryset/queryset.py	/^        class Profile(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_scalar_embedded
+Project	mongoengine/tests/queryset/queryset.py	/^        class Project(Document):$/;"	c	function:QuerySetTest.test_get_changed_fields_query_count
+PutFile	mongoengine/tests/fields/file_tests.py	/^        class PutFile(Document):$/;"	c	function:FileTest.test_copyable
+PutFile	mongoengine/tests/fields/file_tests.py	/^        class PutFile(Document):$/;"	c	function:FileTest.test_file_fields
+Q	mongoengine/mongoengine/queryset/visitor.py	/^class Q(QNode):$/;"	c
+QCombination	mongoengine/mongoengine/queryset/visitor.py	/^class QCombination(QNode):$/;"	c
+QNode	mongoengine/mongoengine/queryset/visitor.py	/^class QNode(object):$/;"	c
+QNodeVisitor	mongoengine/mongoengine/queryset/visitor.py	/^class QNodeVisitor(object):$/;"	c
+QTest	mongoengine/tests/queryset/visitor.py	/^class QTest(unittest.TestCase):$/;"	c
+QueryCompilerVisitor	mongoengine/mongoengine/queryset/visitor.py	/^class QueryCompilerVisitor(QNodeVisitor):$/;"	c
+QueryFieldList	mongoengine/mongoengine/queryset/field_list.py	/^class QueryFieldList(object):$/;"	c
+QueryFieldListTest	mongoengine/tests/queryset/field_list.py	/^class QueryFieldListTest(unittest.TestCase):$/;"	c
+QuerySet	mongoengine/mongoengine/queryset/queryset.py	/^class QuerySet(BaseQuerySet):$/;"	c
+QuerySetManager	mongoengine/mongoengine/queryset/manager.py	/^class QuerySetManager(object):$/;"	c
+QuerySetNoCache	mongoengine/mongoengine/queryset/queryset.py	/^class QuerySetNoCache(BaseQuerySet):$/;"	c
+QuerySetNoDeRef	mongoengine/mongoengine/queryset/queryset.py	/^class QuerySetNoDeRef(QuerySet):$/;"	c
+QuerySetTest	mongoengine/tests/queryset/queryset.py	/^class QuerySetTest(unittest.TestCase):$/;"	c
+READ_PREF	mongoengine/tests/test_replicaset_connection.py	/^    READ_PREF = ReadPreference.SECONDARY$/;"	v
+READ_PREF	mongoengine/tests/test_replicaset_connection.py	/^    READ_PREF = ReadPreference.SECONDARY_ONLY$/;"	v
+READ_PREFERENCE	mongoengine/mongoengine/connection.py	/^    READ_PREFERENCE = False$/;"	v
+READ_PREFERENCE	mongoengine/mongoengine/connection.py	/^    READ_PREFERENCE = ReadPreference.PRIMARY$/;"	v
+RECURSIVE_REFERENCE_CONSTANT	mongoengine/fields.py	/^RECURSIVE_REFERENCE_CONSTANT = 'self'$/;"	v
+RECURSIVE_REFERENCE_CONSTANT	mongoengine/mongoengine/fields.py	/^RECURSIVE_REFERENCE_CONSTANT = 'self'$/;"	v
+REPR_OUTPUT_SIZE	mongoengine/mongoengine/queryset/queryset.py	/^REPR_OUTPUT_SIZE = 20$/;"	v
+RE_TYPE	mongoengine/mongoengine/queryset/base.py	/^RE_TYPE = type(re.compile(''))$/;"	v
+Rank	mongoengine/tests/document/indexes.py	/^        class Rank(EmbeddedDocument):$/;"	c	function:IndexesTest.test_embedded_document_index_meta
+Rank	mongoengine/tests/document/instance.py	/^        class Rank(EmbeddedDocument):$/;"	c	function:InstanceTest.test_db_embedded_doc_field_load
+Recipient	mongoengine/tests/document/instance.py	/^        class Recipient(Document):$/;"	c	function:InstanceTest.test_save
+Record	mongoengine/tests/document/instance.py	/^        class Record(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_pull
+RecursiveDocument	mongoengine/tests/document/indexes.py	/^        class RecursiveDocument(Document):$/;"	c	function:IndexesTest.test_recursive_embedded_objects_dont_break_indexes
+RecursiveObject	mongoengine/tests/document/indexes.py	/^        class RecursiveObject(EmbeddedDocument):$/;"	c	function:IndexesTest.test_recursive_embedded_objects_dont_break_indexes
+ReferenceField	mongoengine/fields.py	/^class ReferenceField(BaseField):$/;"	c
+ReferenceField	mongoengine/mongoengine/fields.py	/^class ReferenceField(BaseField):$/;"	c
+Relation	mongoengine/tests/test_dereference.py	/^        class Relation(EmbeddedDocument):$/;"	c	function:FieldTest.test_circular_reference
+ReportDictField	mongoengine/tests/document/indexes.py	/^        class ReportDictField(Document):$/;"	c	function:IndexesTest.test_compound_key_dictfield
+ReportEmbedded	mongoengine/tests/document/indexes.py	/^        class ReportEmbedded(Document):$/;"	c	function:IndexesTest.test_compound_key_embedded
+Road	mongoengine/tests/queryset/geo.py	/^        class Road(Document):$/;"	c	function:GeoQueriesTest.test_linestring
+Road	mongoengine/tests/queryset/geo.py	/^        class Road(Document):$/;"	c	function:GeoQueriesTest.test_polygon
+Room	mongoengine/tests/test_dereference.py	/^        class Room(Document):$/;"	c	function:FieldTest.test_dict_in_dbref_instance
+SPHINXBUILD	mongoengine/docs/Makefile	/^SPHINXBUILD   = sphinx-build$/;"	m
+SPHINXOPTS	mongoengine/docs/Makefile	/^SPHINXOPTS    =$/;"	m
+STRICT	mongoengine/mongoengine/base/document.py	/^    STRICT = False$/;"	v	class:BaseDocument
+STRING_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^STRING_OPERATORS = ('contains', 'icontains', 'startswith',$/;"	v
+SaveConditionError	mongoengine/mongoengine/errors.py	/^class SaveConditionError(OperationError):$/;"	c
+SchemeLink	mongoengine/tests/fields/fields.py	/^        class SchemeLink(Document):$/;"	c	function:FieldTest.test_url_scheme_validation
+SchemeLink	tests/fields/fields.py	/^        class SchemeLink(Document):$/;"	c	function:FieldTest.test_url_scheme_validation
+Scores	mongoengine/tests/queryset/queryset.py	/^        class Scores(Document):$/;"	c	function:QuerySetTest.test_update_min_max
+ScottishCat	mongoengine/tests/queryset/queryset.py	/^        class ScottishCat(Cat):$/;"	c	function:QuerySetTest.test_subclass_field_query
+SequenceField	mongoengine/fields.py	/^class SequenceField(BaseField):$/;"	c
+SequenceField	mongoengine/mongoengine/fields.py	/^class SequenceField(BaseField):$/;"	c
+SetFile	mongoengine/tests/fields/file_tests.py	/^        class SetFile(Document):$/;"	c	function:FileTest.test_file_fields_set
+SettingBase	mongoengine/tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_complex_mapfield
+SettingBase	mongoengine/tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_dictfield_complex
+SettingBase	mongoengine/tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_list_field_complex
+SettingBase	tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_complex_mapfield
+SettingBase	tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_dictfield_complex
+SettingBase	tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_list_field_complex
+SettingValue	mongoengine/tests/queryset/queryset.py	/^        class SettingValue(Document):$/;"	c	function:QuerySetTest.test_scalar_primary_key
+Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_allow_using_sets_as_choices
+Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_get_field_display
+Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_accept_possible_value
+Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_allow_no_value
+Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_reject_unknown_value
+Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_get_field_display
+Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_validation
+Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_validation_invalid_value
+Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_allow_using_sets_as_choices
+Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_get_field_display
+Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_accept_possible_value
+Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_allow_no_value
+Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_reject_unknown_value
+Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_get_field_display
+Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_validation
+Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_validation_invalid_value
+Sibling	mongoengine/tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_abstract_reference_base_type
+Sibling	mongoengine/tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_reference_abstract_class
+Sibling	mongoengine/tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
+Sibling	tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_abstract_reference_base_type
+Sibling	tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_reference_abstract_class
+Sibling	tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
+SignalTests	mongoengine/tests/test_signals.py	/^class SignalTests(unittest.TestCase):$/;"	c
+Simple	mongoengine/tests/document/instance.py	/^        class Simple(Document):$/;"	c	function:InstanceTest.test_can_save_if_not_included
+Simple	mongoengine/tests/document/json_serialisation.py	/^        class Simple(Document):$/;"	c	function:TestJson.test_json_complex
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_atomic_update_dict_field
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_complex_field_required
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_complex_field_same_value_not_changed
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_del_slice_marks_field_as_changed
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_dictfield_complex
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_dictfield_strict
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_complex
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_rejects_strings
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_strict
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_with_negative_indices
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_mapfield
+Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_slice_marks_field_as_changed
+Simple	mongoengine/tests/queryset/queryset.py	/^        class Simple(Document):$/;"	c	function:QuerySetTest.test_json_complex
+Simple	mongoengine/tests/queryset/queryset.py	/^        class Simple(Document):$/;"	c	function:QuerySetTest.test_update_using_positional_operator_matches_first
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_atomic_update_dict_field
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_complex_field_required
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_complex_field_same_value_not_changed
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_del_slice_marks_field_as_changed
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_dictfield_complex
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_dictfield_strict
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_complex
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_rejects_strings
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_strict
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_with_negative_indices
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_mapfield
+Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_slice_marks_field_as_changed
+SimpleList	mongoengine/tests/test_dereference.py	/^        class SimpleList(Document):$/;"	c	function:FieldTest.test_list_of_lists_of_references
+SimplificationVisitor	mongoengine/mongoengine/queryset/visitor.py	/^class SimplificationVisitor(QNodeVisitor):$/;"	c
+Sister	mongoengine/tests/fields/fields.py	/^        class Sister(Sibling):$/;"	c	function:FieldTest.test_reference_abstract_class
+Sister	mongoengine/tests/fields/fields.py	/^        class Sister(Sibling):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
+Sister	tests/fields/fields.py	/^        class Sister(Sibling):$/;"	c	function:FieldTest.test_reference_abstract_class
+Sister	tests/fields/fields.py	/^        class Sister(Sibling):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
+Site	mongoengine/tests/document/instance.py	/^        class Site(Document):$/;"	c	function:InstanceTest.test_embedded_update
+Site	mongoengine/tests/document/instance.py	/^        class Site(Document):$/;"	c	function:InstanceTest.test_embedded_update_after_save
+Site	mongoengine/tests/document/instance.py	/^        class Site(Document):$/;"	c	function:InstanceTest.test_embedded_update_db_field
+Site	mongoengine/tests/queryset/queryset.py	/^        class Site(Document):$/;"	c	function:QuerySetTest.test_pull_from_nested_embedded
+Site	mongoengine/tests/queryset/queryset.py	/^        class Site(Document):$/;"	c	function:QuerySetTest.test_pull_from_nested_mapfield
+Site	mongoengine/tests/queryset/queryset.py	/^        class Site(Document):$/;"	c	function:QuerySetTest.test_pull_nested
+Size	mongoengine/tests/queryset/queryset.py	/^        class Size(Document):$/;"	c	function:QuerySetTest.test_can_have_field_same_name_as_query_operator
+SocialData	mongoengine/tests/fields/fields.py	/^        class SocialData(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
+SocialData	tests/fields/fields.py	/^        class SocialData(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
+SocialTest	mongoengine/tests/fields/fields.py	/^        class SocialTest(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_decimal
+SocialTest	tests/fields/fields.py	/^        class SocialTest(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_decimal
+Song	mongoengine/tests/test_dereference.py	/^        class Song(Document):$/;"	c	function:FieldTest.test_select_related_follows_embedded_referencefields
+SortedListField	mongoengine/fields.py	/^class SortedListField(ListField):$/;"	c
+SortedListField	mongoengine/mongoengine/fields.py	/^class SortedListField(ListField):$/;"	c
+SpecialComment	mongoengine/tests/document/inheritance.py	/^            class SpecialComment(Comment):$/;"	c	class:InheritanceTest.test_allow_inheritance_embedded_document.Comment
+SpecificStrictDict	mongoengine/mongoengine/base/datastructures.py	/^            class SpecificStrictDict(cls):$/;"	c	function:StrictDict.create
+State	mongoengine/tests/queryset/queryset.py	/^        class State(Document):$/;"	c	function:QuerySetTest.test_scalar_generic_reference_field
+State	mongoengine/tests/queryset/queryset.py	/^        class State(Document):$/;"	c	function:QuerySetTest.test_scalar_reference_field
+Stats	mongoengine/tests/document/instance.py	/^        class Stats(Document):$/;"	c	function:InstanceTest.test_reference_inheritance
+StreamFile	mongoengine/tests/fields/file_tests.py	/^        class StreamFile(Document):$/;"	c	function:FileTest.test_file_fields_stream
+StreamFile	mongoengine/tests/fields/file_tests.py	/^        class StreamFile(Document):$/;"	c	function:FileTest.test_file_fields_stream_after_none
+StrictDict	mongoengine/mongoengine/base/datastructures.py	/^class StrictDict(object):$/;"	c
+StringField	mongoengine/fields.py	/^class StringField(BaseField):$/;"	c
+StringField	mongoengine/mongoengine/fields.py	/^class StringField(BaseField):$/;"	c
+StringIO	mongoengine/mongoengine/python_support.py	/^        StringIO = cStringIO.StringIO$/;"	v
+StringIO	mongoengine/mongoengine/python_support.py	/^StringIO = six.BytesIO$/;"	v
+StringSetting	mongoengine/tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_complex_mapfield
+StringSetting	mongoengine/tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_dictfield_complex
+StringSetting	mongoengine/tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_list_field_complex
+StringSetting	tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_complex_mapfield
+StringSetting	tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_dictfield_complex
+StringSetting	tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_list_field_complex
+SubAnimal	mongoengine/tests/fields/fields.py	/^        class SubAnimal(Animal):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
+SubAnimal	mongoengine/tests/fields/fields.py	/^        class SubAnimal(Animal):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
+SubAnimal	tests/fields/fields.py	/^        class SubAnimal(Animal):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
+SubAnimal	tests/fields/fields.py	/^        class SubAnimal(Animal):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
+SubDoc	mongoengine/tests/document/instance.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_to_mongo_id
+SubDoc	mongoengine/tests/document/validation.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:ValidatorErrorTest.test_embedded_db_field_validate
+SubDoc	mongoengine/tests/document/validation.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:ValidatorErrorTest.test_embedded_weakref
+SubDoc	mongoengine/tests/queryset/queryset.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_reload_embedded_docs_instance
+SubDoc	mongoengine/tests/queryset/queryset.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_reload_list_embedded_docs_instance
+SubDocument	mongoengine/tests/document/indexes.py	/^        class SubDocument(EmbeddedDocument):$/;"	c	function:IndexesTest.test_unique_embedded_document
+SubDocument	mongoengine/tests/document/indexes.py	/^        class SubDocument(EmbeddedDocument):$/;"	c	function:IndexesTest.test_unique_embedded_document_in_list
+SubDocument	mongoengine/tests/document/indexes.py	/^        class SubDocument(EmbeddedDocument):$/;"	c	function:IndexesTest.test_unique_with_embedded_document_and_embedded_unique
+SuperPhylum	mongoengine/tests/document/instance.py	/^        class SuperPhylum(EmbeddedDocument):$/;"	c	function:InstanceTest.test_reload_sharded_nested
+TEST_IMAGE2_PATH	mongoengine/tests/fields/file_tests.py	/^TEST_IMAGE2_PATH = os.path.join(os.path.dirname(__file__), 'mongodb_leaf.png')$/;"	v
+TEST_IMAGE_PATH	mongoengine/tests/document/instance.py	/^TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__),$/;"	v
+TEST_IMAGE_PATH	mongoengine/tests/fields/file_tests.py	/^TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), 'mongoengine.png')$/;"	v
+TPS	mongoengine/tests/fields/fields.py	/^            TPS = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+TPS	tests/fields/fields.py	/^            TPS = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+TYPES	mongoengine/tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+TYPES	mongoengine/tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+TYPES	mongoengine/tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+TYPES	tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+TYPES	tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+TYPES	tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+Tag	mongoengine/tests/document/indexes.py	/^        class Tag(EmbeddedDocument):$/;"	c	function:IndexesTest.test_list_embedded_document_index
+Tag	mongoengine/tests/test_dereference.py	/^        class Tag(Document):$/;"	c	function:FieldTest.test_dereferencing_embedded_listfield_referencefield
+Test	mongoengine/tests/document/indexes.py	/^        class Test(Document):$/;"	c	function:IndexesTest.test_covered_index
+Test	mongoengine/tests/document/instance.py	/^        class Test(Document):$/;"	c	function:InstanceTest.test_dbref_equality
+Test	mongoengine/tests/document/instance.py	/^        class Test(Document):$/;"	c	function:InstanceTest.test_embedded_document_equality
+Test	mongoengine/tests/fields/fields.py	/^            class Test(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields_on_embedded_documents
+Test	mongoengine/tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_embedded_db_field
+Test	mongoengine/tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_embedded_mapfield_db_field
+Test	mongoengine/tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_mapfield_numerical_index
+Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_cursor_in_an_if_stmt
+Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_dict_with_custom_baseclass
+Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_normalize
+Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_with_0_values
+Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_with_False_values
+Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_upsert_includes_cls
+Test	mongoengine/tests/queryset/visitor.py	/^        class Test(Document):$/;"	c	function:QTest.test_multiple_occurence_in_field
+Test	tests/fields/fields.py	/^            class Test(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields_on_embedded_documents
+Test	tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_embedded_db_field
+Test	tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_embedded_mapfield_db_field
+Test	tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_mapfield_numerical_index
+Test2	mongoengine/tests/document/instance.py	/^        class Test2(Document):$/;"	c	function:InstanceTest.test_dbref_equality
+Test3	mongoengine/tests/document/instance.py	/^        class Test3(Document):$/;"	c	function:InstanceTest.test_dbref_equality
+TestActivity	mongoengine/tests/queryset/queryset.py	/^        class TestActivity(Document):$/;"	c	function:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo
+TestChildDoc	mongoengine/tests/document/indexes.py	/^        class TestChildDoc(TestDoc):$/;"	c	function:IndexesTest.test_index_dont_send_cls_option
+TestDoc	mongoengine/tests/document/indexes.py	/^        class TestDoc(Document):$/;"	c	function:IndexesTest.test_compound_index_underscore_cls_not_overwritten
+TestDoc	mongoengine/tests/document/indexes.py	/^        class TestDoc(Document):$/;"	c	function:IndexesTest.test_index_dont_send_cls_option
+TestDoc	mongoengine/tests/document/instance.py	/^        class TestDoc(Document, DoubleMixIn):$/;"	c	function:InstanceTest.test_mixin_inheritance
+TestDoc	mongoengine/tests/fields/fields.py	/^        class TestDoc(Document):$/;"	c	function:FieldTest.test_tuples_as_tuples
+TestDoc	mongoengine/tests/queryset/queryset.py	/^        class TestDoc(Document):$/;"	c	function:QuerySetTest.test_scalar_db_field
+TestDoc	mongoengine/tests/queryset/queryset.py	/^        class TestDoc(Document):$/;"	c	function:QuerySetTest.test_scalar_simple
+TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_and_combination
+TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_and_or_combination
+TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_or_and_or_combination
+TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_or_combination
+TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_q_clone
+TestDoc	tests/fields/fields.py	/^        class TestDoc(Document):$/;"	c	function:FieldTest.test_tuples_as_tuples
+TestDocument	mongoengine/tests/document/instance.py	/^        class TestDocument(Document):$/;"	c	function:InstanceTest.test_document_clean
+TestDocument	mongoengine/tests/document/instance.py	/^        class TestDocument(Document):$/;"	c	function:InstanceTest.test_document_embedded_clean
+TestDocument	mongoengine/tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_int_and_float_ne_operator
+TestDocument	mongoengine/tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_long_ne_operator
+TestDocument	mongoengine/tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_long_validation
+TestDocument	tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_int_and_float_ne_operator
+TestDocument	tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_long_ne_operator
+TestDocument	tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_long_validation
+TestEmbeddedDocument	mongoengine/tests/document/instance.py	/^        class TestEmbeddedDocument(EmbeddedDocument):$/;"	c	function:InstanceTest.test_document_embedded_clean
+TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_copyable
+TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_boolean
+TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_cmp
+TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_disk_space
+TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_multidb
+TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_reassigning
+TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_uniqueness
+TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_image_field_reassigning
+TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_get_image_by_grid_id
+TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_image_field
+TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_image_field_resize
+TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_image_field_resize_force
+TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_image_field_thumbnail
+TestJson	mongoengine/tests/document/json_serialisation.py	/^class TestJson(unittest.TestCase):$/;"	c
+TestLongFieldConsideredAsInt64	mongoengine/tests/fields/fields.py	/^        class TestLongFieldConsideredAsInt64(Document):$/;"	c	function:FieldTest.test_long_field_is_considered_as_int64
+TestLongFieldConsideredAsInt64	tests/fields/fields.py	/^        class TestLongFieldConsideredAsInt64(Document):$/;"	c	function:FieldTest.test_long_field_is_considered_as_int64
+TestOrganization	mongoengine/tests/queryset/queryset.py	/^            class TestOrganization(Document):$/;"	c	function:QuerySetTest.test_update_related_models
+TestPerson	mongoengine/tests/queryset/queryset.py	/^            class TestPerson(Document):$/;"	c	function:QuerySetTest.test_update_related_models
+TestPerson	mongoengine/tests/queryset/queryset.py	/^        class TestPerson(Document):$/;"	c	function:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo
+TestQuerysetPickable	mongoengine/tests/queryset/pickable.py	/^class TestQuerysetPickable(unittest.TestCase):$/;"	c
+TestStrictDict	mongoengine/tests/test_datastructures.py	/^class TestStrictDict(unittest.TestCase):$/;"	c
+TextPost	mongoengine/docs/code/tumblelog.py	/^class TextPost(Post):$/;"	c
+Thing	mongoengine/tests/document/instance.py	/^        class Thing(EmbeddedDocument):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document
+Thing	mongoengine/tests/document/instance.py	/^        class Thing(EmbeddedDocument):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false
+Thing	mongoengine/tests/document/instance.py	/^        class Thing(EmbeddedDocument):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc
+Thing	mongoengine/tests/document/instance.py	/^        class Thing(EmbeddedDocument):$/;"	c	function:InstanceTest.test_save_to_a_value_that_equates_to_false
+ToEmbed	mongoengine/tests/fields/fields.py	/^        class ToEmbed(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
+ToEmbed	mongoengine/tests/fields/fields.py	/^        class ToEmbed(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
+ToEmbed	tests/fields/fields.py	/^        class ToEmbed(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
+ToEmbed	tests/fields/fields.py	/^        class ToEmbed(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
+ToEmbedChild	mongoengine/tests/fields/fields.py	/^        class ToEmbedChild(ToEmbedParent):$/;"	c	function:FieldTest.test_dictfield_dump_document
+ToEmbedChild	mongoengine/tests/fields/fields.py	/^        class ToEmbedChild(ToEmbedParent):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
+ToEmbedChild	tests/fields/fields.py	/^        class ToEmbedChild(ToEmbedParent):$/;"	c	function:FieldTest.test_dictfield_dump_document
+ToEmbedChild	tests/fields/fields.py	/^        class ToEmbedChild(ToEmbedParent):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
+ToEmbedParent	mongoengine/tests/fields/fields.py	/^        class ToEmbedParent(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
+ToEmbedParent	mongoengine/tests/fields/fields.py	/^        class ToEmbedParent(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
+ToEmbedParent	tests/fields/fields.py	/^        class ToEmbedParent(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
+ToEmbedParent	tests/fields/fields.py	/^        class ToEmbedParent(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
+TopLevelDocumentMetaclass	mongoengine/mongoengine/base/metaclasses.py	/^class TopLevelDocumentMetaclass(DocumentMetaclass):$/;"	c
+Topic	mongoengine/tests/test_dereference.py	/^        class Topic(Document):$/;"	c	function:FieldTest.test_document_reload_reference_integrity
+TransformTest	mongoengine/tests/queryset/transform.py	/^class TransformTest(unittest.TestCase):$/;"	c
+Tree	mongoengine/tests/fields/fields.py	/^        class Tree(Document):$/;"	c	function:FieldTest.test_recursive_embedding
+Tree	tests/fields/fields.py	/^        class Tree(Document):$/;"	c	function:FieldTest.test_recursive_embedding
+TreeNode	mongoengine/tests/fields/fields.py	/^        class TreeNode(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_embedding
+TreeNode	tests/fields/fields.py	/^        class TreeNode(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_embedding
+UInfoDocument	mongoengine/tests/document/delta.py	/^        class UInfoDocument(Document):$/;"	c	function:DeltaTest.test_delta_for_nested_map_fields
+UPDATE_OPERATORS	mongoengine/mongoengine/base/common.py	/^UPDATE_OPERATORS = set(['set', 'unset', 'inc', 'dec', 'pop', 'push',$/;"	v
+URLField	mongoengine/fields.py	/^class URLField(StringField):$/;"	c
+URLField	mongoengine/mongoengine/fields.py	/^class URLField(StringField):$/;"	c
+USER_REGEX	mongoengine/fields.py	/^    USER_REGEX = re.compile($/;"	v	class:EmailField
+USER_REGEX	mongoengine/mongoengine/fields.py	/^    USER_REGEX = re.compile($/;"	v	class:EmailField
+UTF8_USER_REGEX	mongoengine/fields.py	/^    UTF8_USER_REGEX = re.compile($/;"	v	class:EmailField
+UTF8_USER_REGEX	mongoengine/mongoengine/fields.py	/^    UTF8_USER_REGEX = re.compile($/;"	v	class:EmailField
+UUID	mongoengine/tests/document/instance.py	/^        def UUID(i):$/;"	f	function:InstanceTest.test_save_atomicity_condition
+UUIDField	mongoengine/fields.py	/^class UUIDField(BaseField):$/;"	c
+UUIDField	mongoengine/mongoengine/fields.py	/^class UUIDField(BaseField):$/;"	c
+User	mongoengine/docs/code/tumblelog.py	/^class User(Document):$/;"	c
+User	mongoengine/tests/document/delta.py	/^        class User(Document):$/;"	c	function:DeltaTest.test_referenced_object_changed_attributes
+User	mongoengine/tests/document/indexes.py	/^        class User(Document):$/;"	c	function:IndexesTest.test_disable_index_creation
+User	mongoengine/tests/document/indexes.py	/^        class User(Document):$/;"	c	function:IndexesTest.test_unique_and_primary
+User	mongoengine/tests/document/indexes.py	/^        class User(Document):$/;"	c	function:IndexesTest.test_unique_and_primary_create
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_custom_id_field
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_db_alias_tests
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_db_ref_usage
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_document_hash
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_list_search_by_embedded
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields_with_strict_false
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_null_field
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_query_count_when_saving
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_custom_id_field
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections
+User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_save_to_a_value_that_equates_to_false
+User	mongoengine/tests/document/instance.py	/^        class User(self.Person):$/;"	c	function:InstanceTest.test_save_only_changed_fields
+User	mongoengine/tests/document/instance.py	/^        class User(self.Person):$/;"	c	function:InstanceTest.test_save_only_changed_fields_recursive
+User	mongoengine/tests/document/validation.py	/^        class User(Document):$/;"	c	function:ValidatorErrorTest.test_model_validation
+User	mongoengine/tests/fields/fields.py	/^            class User(Document):$/;"	c	function:FieldTest.test_db_field_validation
+User	mongoengine/tests/fields/fields.py	/^        class User(Basedoc):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_domain_whitelist
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_honors_regex
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_ip_domain
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_unicode_user
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_document_not_registered
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list_item_modification
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_validation
+User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_reference_validation
+User	mongoengine/tests/fields/fields.py	/^        class User(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_inheritance
+User	mongoengine/tests/queryset/field_list.py	/^        class User(Base):$/;"	c	function:OnlyExcludeAllTest.test_exclude_from_subclasses_docs
+User	mongoengine/tests/queryset/field_list.py	/^        class User(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_exclude
+User	mongoengine/tests/queryset/field_list.py	/^        class User(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_only_with_subfields
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_as_pymongo
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_as_pymongo_json_limit_fields
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_cache_not_cloned
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_comment
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_in_operator_on_non_iterable
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_nested_queryset_iterator
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_no_dereference
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_no_dereference_embedded_doc
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_scalar
+User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_set_generic_embedded_documents
+User	mongoengine/tests/queryset/queryset.py	/^        class User(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_find_embedded
+User	mongoengine/tests/queryset/queryset.py	/^        class User(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_find_empty_embedded
+User	mongoengine/tests/queryset/queryset.py	/^        class User(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_from_nested_embedded
+User	mongoengine/tests/queryset/visitor.py	/^        class User(Document):$/;"	c	function:QTest.test_q_merge_queries_edge_case
+User	mongoengine/tests/queryset/visitor.py	/^        class User(Document):$/;"	c	function:QTest.test_q_with_dbref
+User	mongoengine/tests/test_context_managers.py	/^        class User(Document):$/;"	c	function:ContextManagersTest.test_no_dereference_context_manager_dbref
+User	mongoengine/tests/test_context_managers.py	/^        class User(Document):$/;"	c	function:ContextManagersTest.test_no_dereference_context_manager_object_id
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_document_reload_reference_integrity
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_handle_old_style_references
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false_stores_as_type
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_of_lists_of_references
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_map_field_reference
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_migrate_references
+User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_objectid_reference_across_databases
+User	tests/fields/fields.py	/^            class User(Document):$/;"	c	function:FieldTest.test_db_field_validation
+User	tests/fields/fields.py	/^        class User(Basedoc):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_domain_whitelist
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_honors_regex
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_ip_domain
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_unicode_user
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_document_not_registered
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list_item_modification
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_validation
+User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_reference_validation
+User	tests/fields/fields.py	/^        class User(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_inheritance
+UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_dict_field
+UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_dict_field_no_field_inheritance
+UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_generic_reference
+UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_generic_reference_map_field
+UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries
+UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_list_field_complex
+UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_dict_field
+UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_generic_reference
+UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_generic_reference_map_field
+UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries
+UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_list_field_complex
+UserBase	mongoengine/tests/document/indexes.py	/^        class UserBase(Document):$/;"	c	function:IndexesTest.test_abstract_index_inheritance
+UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_dict_field
+UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_generic_reference
+UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_generic_reference_map_field
+UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries
+UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_list_field_complex
+UserComments	mongoengine/tests/fields/fields.py	/^        class UserComments(Comments):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
+UserComments	mongoengine/tests/fields/fields.py	/^        class UserComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents
+UserComments	mongoengine/tests/fields/fields.py	/^        class UserComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
+UserComments	tests/fields/fields.py	/^        class UserComments(Comments):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
+UserComments	tests/fields/fields.py	/^        class UserComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents
+UserComments	tests/fields/fields.py	/^        class UserComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
+UserDoc	mongoengine/tests/queryset/queryset.py	/^        class UserDoc(Document):$/;"	c	function:QuerySetTest.test_scalar_simple
+UserSubscription	mongoengine/tests/document/instance.py	/^        class UserSubscription(Document):$/;"	c	function:InstanceTest.test_query_count_when_saving
+UserVisit	mongoengine/tests/queryset/queryset.py	/^        class UserVisit(Document):$/;"	c	function:QuerySetTest.test_average_over_db_field
+UserVisit	mongoengine/tests/queryset/queryset.py	/^        class UserVisit(Document):$/;"	c	function:QuerySetTest.test_sum_over_db_field
+VALUE_DECORATOR	mongoengine/fields.py	/^    VALUE_DECORATOR = int$/;"	v	class:SequenceField
+VALUE_DECORATOR	mongoengine/mongoengine/fields.py	/^    VALUE_DECORATOR = int$/;"	v	class:SequenceField
+VERSION	mongoengine/mongoengine/__init__.py	/^VERSION = (0, 15, 0)$/;"	v
+VERSION	mongoengine/setup.py	/^VERSION = get_version(eval(version_line.split('=')[-1]))$/;"	v
+Vaccine	mongoengine/tests/document/class_methods.py	/^        class Vaccine(Document):$/;"	c	function:ClassMethodsTest.test_register_delete_rule_inherited
+ValidationError	mongoengine/mongoengine/errors.py	/^class ValidationError(AssertionError):$/;"	c
+ValidatorErrorTest	mongoengine/tests/document/validation.py	/^class ValidatorErrorTest(unittest.TestCase):$/;"	c
+VariousData	mongoengine/tests/queryset/field_list.py	/^        class VariousData(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_only_with_subfields
+Vegetal	mongoengine/tests/fields/fields.py	/^        class Vegetal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
+Vegetal	tests/fields/fields.py	/^        class Vegetal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
+Venue	mongoengine/tests/fields/geo.py	/^        class Venue(EmbeddedDocument):$/;"	c	function:GeoFieldTest.test_geopoint_embedded_indexes
+Venue	mongoengine/tests/fields/geo.py	/^        class Venue(EmbeddedDocument):$/;"	c	function:GeoFieldTest.test_indexes_2dsphere_embedded
+Venue	mongoengine/tests/queryset/geo.py	/^        class Venue(EmbeddedDocument):$/;"	c	function:GeoQueriesTest._test_embedded
+Vote	mongoengine/tests/queryset/queryset.py	/^        class Vote(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_using_positional_operator_embedded_document
+Widget	mongoengine/tests/document/instance.py	/^        class Widget(Document):$/;"	c	function:InstanceTest.test_save_atomicity_condition
+Word	mongoengine/tests/document/instance.py	/^        class Word(Document):$/;"	c	function:InstanceTest.test_invalid_son
+Writer	mongoengine/tests/document/instance.py	/^        class Writer(self.Person):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_document_inheritance
+Zoo	mongoengine/tests/document/instance.py	/^        class Zoo(Document):$/;"	c	function:InstanceTest.test_polymorphic_references
+_FakeSignal	mongoengine/mongoengine/signals.py	/^    class _FakeSignal(object):$/;"	c
+_URL_REGEX	mongoengine/fields.py	/^    _URL_REGEX = re.compile($/;"	v	class:URLField
+_URL_REGEX	mongoengine/mongoengine/fields.py	/^    _URL_REGEX = re.compile($/;"	v	class:URLField
+_URL_SCHEMES	mongoengine/fields.py	/^    _URL_SCHEMES = ['http', 'https', 'ftp', 'ftps']$/;"	v	class:URLField
+_URL_SCHEMES	mongoengine/mongoengine/fields.py	/^    _URL_SCHEMES = ['http', 'https', 'ftp', 'ftps']$/;"	v	class:URLField
+__add__	mongoengine/mongoengine/queryset/field_list.py	/^    def __add__(self, f):$/;"	m	class:QueryFieldList	file:
+__all__	mongoengine/fields.py	/^__all__ = ($/;"	v
+__all__	mongoengine/mongoengine/__init__.py	/^__all__ = (list(document.__all__) + list(fields.__all__) +$/;"	v
+__all__	mongoengine/mongoengine/base/__init__.py	/^__all__ = ($/;"	v
+__all__	mongoengine/mongoengine/base/common.py	/^__all__ = ('UPDATE_OPERATORS', 'get_document', '_document_registry')$/;"	v
+__all__	mongoengine/mongoengine/base/datastructures.py	/^__all__ = ('BaseDict', 'BaseList', 'EmbeddedDocumentList', 'LazyReference')$/;"	v
+__all__	mongoengine/mongoengine/base/document.py	/^__all__ = ('BaseDocument', 'NON_FIELD_ERRORS')$/;"	v
+__all__	mongoengine/mongoengine/base/fields.py	/^__all__ = ('BaseField', 'ComplexBaseField', 'ObjectIdField',$/;"	v
+__all__	mongoengine/mongoengine/base/metaclasses.py	/^__all__ = ('DocumentMetaclass', 'TopLevelDocumentMetaclass')$/;"	v
+__all__	mongoengine/mongoengine/connection.py	/^__all__ = ['MongoEngineConnectionError', 'connect', 'register_connection',$/;"	v
+__all__	mongoengine/mongoengine/context_managers.py	/^__all__ = ('switch_db', 'switch_collection', 'no_dereference',$/;"	v
+__all__	mongoengine/mongoengine/document.py	/^__all__ = ('Document', 'EmbeddedDocument', 'DynamicDocument',$/;"	v
+__all__	mongoengine/mongoengine/errors.py	/^__all__ = ('NotRegistered', 'InvalidDocumentError', 'LookUpError',$/;"	v
+__all__	mongoengine/mongoengine/fields.py	/^__all__ = ($/;"	v
+__all__	mongoengine/mongoengine/queryset/__init__.py	/^__all__ = ($/;"	v
+__all__	mongoengine/mongoengine/queryset/base.py	/^__all__ = ('BaseQuerySet', 'DO_NOTHING', 'NULLIFY', 'CASCADE', 'DENY', 'PULL')$/;"	v
+__all__	mongoengine/mongoengine/queryset/field_list.py	/^__all__ = ('QueryFieldList',)$/;"	v
+__all__	mongoengine/mongoengine/queryset/manager.py	/^__all__ = ('queryset_manager', 'QuerySetManager')$/;"	v
+__all__	mongoengine/mongoengine/queryset/queryset.py	/^__all__ = ('QuerySet', 'QuerySetNoCache', 'DO_NOTHING', 'NULLIFY', 'CASCADE',$/;"	v
+__all__	mongoengine/mongoengine/queryset/transform.py	/^__all__ = ('query', 'update')$/;"	v
+__all__	mongoengine/mongoengine/queryset/visitor.py	/^__all__ = ('Q',)$/;"	v
+__all__	mongoengine/mongoengine/signals.py	/^__all__ = ('pre_init', 'post_init', 'pre_save', 'pre_save_post_validation',$/;"	v
+__all__	mongoengine/tests/all_warnings/__init__.py	/^__all__ = ('AllWarnings', )$/;"	v
+__all__	mongoengine/tests/document/class_methods.py	/^__all__ = ("ClassMethodsTest", )$/;"	v
+__all__	mongoengine/tests/document/delta.py	/^__all__ = ("DeltaTest",)$/;"	v
+__all__	mongoengine/tests/document/dynamic.py	/^__all__ = ("DynamicTest", )$/;"	v
+__all__	mongoengine/tests/document/indexes.py	/^__all__ = ("IndexesTest", )$/;"	v
+__all__	mongoengine/tests/document/inheritance.py	/^__all__ = ('InheritanceTest', )$/;"	v
+__all__	mongoengine/tests/document/instance.py	/^__all__ = ("InstanceTest",)$/;"	v
+__all__	mongoengine/tests/document/json_serialisation.py	/^__all__ = ("TestJson",)$/;"	v
+__all__	mongoengine/tests/document/validation.py	/^__all__ = ("ValidatorErrorTest",)$/;"	v
+__all__	mongoengine/tests/fields/fields.py	/^__all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")$/;"	v
+__all__	mongoengine/tests/fields/geo.py	/^__all__ = ("GeoFieldTest", )$/;"	v
+__all__	mongoengine/tests/queryset/field_list.py	/^__all__ = ("QueryFieldListTest", "OnlyExcludeAllTest")$/;"	v
+__all__	mongoengine/tests/queryset/geo.py	/^__all__ = ("GeoQueriesTest",)$/;"	v
+__all__	mongoengine/tests/queryset/modify.py	/^__all__ = ("FindAndModifyTest",)$/;"	v
+__all__	mongoengine/tests/queryset/queryset.py	/^__all__ = ("QuerySetTest",)$/;"	v
+__all__	mongoengine/tests/queryset/transform.py	/^__all__ = ("TransformTest",)$/;"	v
+__all__	mongoengine/tests/queryset/visitor.py	/^__all__ = ("QTest",)$/;"	v
+__all__	tests/fields/fields.py	/^__all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")$/;"	v
+__and__	mongoengine/mongoengine/queryset/visitor.py	/^    def __and__(self, other):$/;"	m	class:QNode	file:
+__author__	mongoengine/tests/queryset/pickable.py	/^__author__ = 'stas'$/;"	v
+__bool__	mongoengine/mongoengine/queryset/base.py	/^    def __bool__(self):$/;"	m	class:BaseQuerySet	file:
+__call__	mongoengine/mongoengine/dereference.py	/^    def __call__(self, items, max_depth=1, instance=None, name=None):$/;"	m	class:DeReference	file:
+__call__	mongoengine/mongoengine/queryset/base.py	/^    def __call__(self, q_obj=None, class_check=True, read_preference=None,$/;"	m	class:BaseQuerySet	file:
+__contains__	mongoengine/mongoengine/base/datastructures.py	/^    def __contains__(self, key):$/;"	m	class:StrictDict	file:
+__contains__	mongoengine/mongoengine/base/document.py	/^    def __contains__(self, name):$/;"	m	class:BaseDocument	file:
+__copy__	mongoengine/fields.py	/^    def __copy__(self):$/;"	m	class:GridFSProxy	file:
+__copy__	mongoengine/mongoengine/fields.py	/^    def __copy__(self):$/;"	m	class:GridFSProxy	file:
+__deepcopy__	mongoengine/fields.py	/^    def __deepcopy__(self, memo):$/;"	m	class:GridFSProxy	file:
+__deepcopy__	mongoengine/mongoengine/fields.py	/^    def __deepcopy__(self, memo):$/;"	m	class:GridFSProxy	file:
+__deepcopy__	mongoengine/mongoengine/queryset/base.py	/^    def __deepcopy__(self, memo):$/;"	m	class:BaseQuerySet	file:
+__delattr__	mongoengine/mongoengine/base/datastructures.py	/^    def __delattr__(self, key, *args, **kwargs):$/;"	m	class:BaseDict	file:
+__delattr__	mongoengine/mongoengine/base/document.py	/^    def __delattr__(self, *args, **kwargs):$/;"	m	class:BaseDocument	file:
+__delattr__	mongoengine/mongoengine/document.py	/^    def __delattr__(self, *args, **kwargs):$/;"	m	class:DynamicDocument	file:
+__delattr__	mongoengine/mongoengine/document.py	/^    def __delattr__(self, *args, **kwargs):$/;"	m	class:DynamicEmbeddedDocument	file:
+__delete__	mongoengine/mongoengine/base/datastructures.py	/^    def __delete__(self, *args, **kwargs):$/;"	m	class:BaseDict	file:
+__delitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __delitem__(self, key, *args, **kwargs):$/;"	m	class:BaseDict	file:
+__delitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __delitem__(self, key, *args, **kwargs):$/;"	m	class:BaseList	file:
+__delslice__	mongoengine/mongoengine/base/datastructures.py	/^    def __delslice__(self, *args, **kwargs):$/;"	m	class:BaseList	file:
+__dereference	mongoengine/mongoengine/queryset/base.py	/^    __dereference = False$/;"	v	class:BaseQuerySet
+__dereference	mongoengine/mongoengine/queryset/queryset.py	/^    def __dereference(items, max_depth=1, instance=None, name=None):$/;"	m	class:QuerySetNoDeRef	file:
+__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:no_dereference	file:
+__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:no_sub_classes	file:
+__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:query_counter	file:
+__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:switch_collection	file:
+__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:switch_db	file:
+__eq__	mongoengine/fields.py	/^    def __eq__(self, other):$/;"	m	class:GridFSProxy	file:
+__eq__	mongoengine/mongoengine/base/datastructures.py	/^    def __eq__(self, other):$/;"	m	class:StrictDict	file:
+__eq__	mongoengine/mongoengine/base/document.py	/^    def __eq__(self, other):$/;"	m	class:BaseDocument	file:
+__eq__	mongoengine/mongoengine/context_managers.py	/^    def __eq__(self, value):$/;"	m	class:query_counter	file:
+__eq__	mongoengine/mongoengine/document.py	/^    def __eq__(self, other):$/;"	m	class:EmbeddedDocument	file:
+__eq__	mongoengine/mongoengine/fields.py	/^    def __eq__(self, other):$/;"	m	class:GridFSProxy	file:
+__eq__	mongoengine/tests/document/instance.py	/^            def __eq__(self, other):$/;"	m	class:InstanceTest.test_kwargs_complex.Doc	file:
+__eq__	mongoengine/tests/document/instance.py	/^            def __eq__(self, other):$/;"	m	class:InstanceTest.test_kwargs_simple.Doc	file:
+__eq__	mongoengine/tests/document/json_serialisation.py	/^            def __eq__(self, other):$/;"	m	class:TestJson.test_json_complex.Doc	file:
+__eq__	mongoengine/tests/document/json_serialisation.py	/^            def __eq__(self, other):$/;"	m	class:TestJson.test_json_simple.Doc	file:
+__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:no_dereference	file:
+__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:no_sub_classes	file:
+__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:query_counter	file:
+__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:switch_collection	file:
+__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:switch_db	file:
+__expand_dynamic_values	mongoengine/mongoengine/base/document.py	/^    def __expand_dynamic_values(self, name, value):$/;"	m	class:BaseDocument	file:
+__ge__	mongoengine/mongoengine/context_managers.py	/^    def __ge__(self, value):$/;"	m	class:query_counter	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:CachedReferenceField	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ComplexDateTimeField	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:FileField	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:GenericLazyReferenceField	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:GenericReferenceField	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:LazyReferenceField	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ListField	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ReferenceField	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:SequenceField	file:
+__get__	mongoengine/fields.py	/^    def __get__(self, instance, value):$/;"	m	class:GridFSProxy	file:
+__get__	mongoengine/mongoengine/base/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:BaseField	file:
+__get__	mongoengine/mongoengine/base/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ComplexBaseField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:CachedReferenceField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ComplexDateTimeField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:FileField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:GenericLazyReferenceField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:GenericReferenceField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:LazyReferenceField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ListField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ReferenceField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:SequenceField	file:
+__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, value):$/;"	m	class:GridFSProxy	file:
+__get__	mongoengine/mongoengine/queryset/manager.py	/^    def __get__(self, instance, owner):$/;"	m	class:QuerySetManager	file:
+__get_bases	mongoengine/mongoengine/base/metaclasses.py	/^    def __get_bases(cls, bases):$/;"	m	class:DocumentMetaclass	file:
+__get_field_display	mongoengine/mongoengine/base/document.py	/^    def __get_field_display(self, field):$/;"	m	class:BaseDocument	file:
+__getattr__	mongoengine/fields.py	/^    def __getattr__(self, name):$/;"	m	class:GridFSProxy	file:
+__getattr__	mongoengine/mongoengine/base/datastructures.py	/^    def __getattr__(self, name):$/;"	m	class:LazyReference	file:
+__getattr__	mongoengine/mongoengine/fields.py	/^    def __getattr__(self, name):$/;"	m	class:GridFSProxy	file:
+__getattribute__	mongoengine/mongoengine/errors.py	/^    def __getattribute__(self, name):$/;"	m	class:ValidationError	file:
+__getitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __getitem__(self, key):$/;"	m	class:StrictDict	file:
+__getitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __getitem__(self, key, *args, **kwargs):$/;"	m	class:BaseDict	file:
+__getitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __getitem__(self, key, *args, **kwargs):$/;"	m	class:BaseList	file:
+__getitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __getitem__(self, name):$/;"	m	class:LazyReference	file:
+__getitem__	mongoengine/mongoengine/base/document.py	/^    def __getitem__(self, name):$/;"	m	class:BaseDocument	file:
+__getitem__	mongoengine/mongoengine/queryset/base.py	/^    def __getitem__(self, key):$/;"	m	class:BaseQuerySet	file:
+__getstate__	mongoengine/fields.py	/^    def __getstate__(self):$/;"	m	class:GridFSProxy	file:
+__getstate__	mongoengine/mongoengine/base/datastructures.py	/^    def __getstate__(self):$/;"	m	class:BaseDict	file:
+__getstate__	mongoengine/mongoengine/base/datastructures.py	/^    def __getstate__(self):$/;"	m	class:BaseList	file:
+__getstate__	mongoengine/mongoengine/base/document.py	/^    def __getstate__(self):$/;"	m	class:BaseDocument	file:
+__getstate__	mongoengine/mongoengine/fields.py	/^    def __getstate__(self):$/;"	m	class:GridFSProxy	file:
+__getstate__	mongoengine/mongoengine/queryset/base.py	/^    def __getstate__(self):$/;"	m	class:BaseQuerySet	file:
+__gt__	mongoengine/mongoengine/context_managers.py	/^    def __gt__(self, value):$/;"	m	class:query_counter	file:
+__hash__	mongoengine/mongoengine/document.py	/^    __hash__ = None$/;"	v	class:EmbeddedDocument
+__hash__	mongoengine/mongoengine/document.py	/^    def __hash__(self):$/;"	m	class:Document	file:
+__iadd__	mongoengine/mongoengine/base/datastructures.py	/^    def __iadd__(self, other):$/;"	m	class:BaseList	file:
+__imul__	mongoengine/mongoengine/base/datastructures.py	/^    def __imul__(self, other):$/;"	m	class:BaseList	file:
+__init__	mongoengine/fields.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:GenericLazyReferenceField
+__init__	mongoengine/fields.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:GenericReferenceField
+__init__	mongoengine/fields.py	/^    def __init__(self, basecls=None, field=None, *args, **kwargs):$/;"	m	class:DictField
+__init__	mongoengine/fields.py	/^    def __init__(self, binary=True, **kwargs):$/;"	m	class:UUIDField
+__init__	mongoengine/fields.py	/^    def __init__(self, collection_name=None, db_alias=None, sequence_name=None,$/;"	m	class:SequenceField
+__init__	mongoengine/fields.py	/^    def __init__(self, db_alias=DEFAULT_CONNECTION_NAME, collection_name='fs',$/;"	m	class:FileField
+__init__	mongoengine/fields.py	/^    def __init__(self, document_type, **kwargs):$/;"	m	class:EmbeddedDocumentField
+__init__	mongoengine/fields.py	/^    def __init__(self, document_type, **kwargs):$/;"	m	class:EmbeddedDocumentListField
+__init__	mongoengine/fields.py	/^    def __init__(self, document_type, dbref=False,$/;"	m	class:ReferenceField
+__init__	mongoengine/fields.py	/^    def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):$/;"	m	class:CachedReferenceField
+__init__	mongoengine/fields.py	/^    def __init__(self, document_type, passthrough=False, dbref=False,$/;"	m	class:LazyReferenceField
+__init__	mongoengine/fields.py	/^    def __init__(self, domain_whitelist=None, allow_utf8_user=False,$/;"	m	class:EmailField
+__init__	mongoengine/fields.py	/^    def __init__(self, field, **kwargs):$/;"	m	class:SortedListField
+__init__	mongoengine/fields.py	/^    def __init__(self, field=None, **kwargs):$/;"	m	class:ListField
+__init__	mongoengine/fields.py	/^    def __init__(self, field=None, *args, **kwargs):$/;"	m	class:MapField
+__init__	mongoengine/fields.py	/^    def __init__(self, grid_id=None, key=None,$/;"	m	class:GridFSProxy
+__init__	mongoengine/fields.py	/^    def __init__(self, max_bytes=None, **kwargs):$/;"	m	class:BinaryField
+__init__	mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:FloatField
+__init__	mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:IntField
+__init__	mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:LongField
+__init__	mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, force_string=False,$/;"	m	class:DecimalField
+__init__	mongoengine/fields.py	/^    def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):$/;"	m	class:StringField
+__init__	mongoengine/fields.py	/^    def __init__(self, separator=',', **kwargs):$/;"	m	class:ComplexDateTimeField
+__init__	mongoengine/fields.py	/^    def __init__(self, size=None, thumbnail_size=None,$/;"	m	class:ImageField
+__init__	mongoengine/fields.py	/^    def __init__(self, verify_exists=False, url_regex=None, schemes=None, **kwargs):$/;"	m	class:URLField
+__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, **kwargs):$/;"	m	class:StrictDict
+__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, dict_items, instance, name):$/;"	m	class:BaseDict
+__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, document_type, pk, cached_doc=None, passthrough=False):$/;"	m	class:LazyReference
+__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, list_items, instance, name):$/;"	m	class:BaseList
+__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, list_items, instance, name):$/;"	m	class:EmbeddedDocumentList
+__init__	mongoengine/mongoengine/base/document.py	/^    def __init__(self, *args, **values):$/;"	m	class:BaseDocument
+__init__	mongoengine/mongoengine/base/fields.py	/^    def __init__(self, auto_index=True, *args, **kwargs):$/;"	m	class:GeoJsonBaseField
+__init__	mongoengine/mongoengine/base/fields.py	/^    def __init__(self, db_field=None, name=None, required=False, default=None,$/;"	m	class:BaseField
+__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self):$/;"	m	class:query_counter
+__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self, cls):$/;"	m	class:no_dereference
+__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self, cls):$/;"	m	class:no_sub_classes
+__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self, cls, collection_name):$/;"	m	class:switch_collection
+__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self, cls, db_alias):$/;"	m	class:switch_db
+__init__	mongoengine/mongoengine/document.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:EmbeddedDocument
+__init__	mongoengine/mongoengine/document.py	/^    def __init__(self, document, collection, key, value):$/;"	m	class:MapReduceDocument
+__init__	mongoengine/mongoengine/errors.py	/^    def __init__(self, message='', **kwargs):$/;"	m	class:ValidationError
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:GenericLazyReferenceField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:GenericReferenceField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, basecls=None, field=None, *args, **kwargs):$/;"	m	class:DictField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, binary=True, **kwargs):$/;"	m	class:UUIDField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, collection_name=None, db_alias=None, sequence_name=None,$/;"	m	class:SequenceField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, db_alias=DEFAULT_CONNECTION_NAME, collection_name='fs',$/;"	m	class:FileField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, **kwargs):$/;"	m	class:EmbeddedDocumentField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, **kwargs):$/;"	m	class:EmbeddedDocumentListField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, dbref=False,$/;"	m	class:ReferenceField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):$/;"	m	class:CachedReferenceField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, passthrough=False, dbref=False,$/;"	m	class:LazyReferenceField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, domain_whitelist=None, allow_utf8_user=False,$/;"	m	class:EmailField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, field, **kwargs):$/;"	m	class:SortedListField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, field=None, **kwargs):$/;"	m	class:ListField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, field=None, *args, **kwargs):$/;"	m	class:MapField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, grid_id=None, key=None,$/;"	m	class:GridFSProxy
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, max_bytes=None, **kwargs):$/;"	m	class:BinaryField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:FloatField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:IntField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:LongField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, force_string=False,$/;"	m	class:DecimalField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):$/;"	m	class:StringField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, separator=',', **kwargs):$/;"	m	class:ComplexDateTimeField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, size=None, thumbnail_size=None,$/;"	m	class:ImageField
+__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, verify_exists=False, url_regex=None, schemes=None, **kwargs):$/;"	m	class:URLField
+__init__	mongoengine/mongoengine/queryset/base.py	/^    def __init__(self, document, collection):$/;"	m	class:BaseQuerySet
+__init__	mongoengine/mongoengine/queryset/field_list.py	/^    def __init__(self, fields=None, value=ONLY, always_include=None, _only_called=False):$/;"	m	class:QueryFieldList
+__init__	mongoengine/mongoengine/queryset/manager.py	/^    def __init__(self, queryset_func=None):$/;"	m	class:QuerySetManager
+__init__	mongoengine/mongoengine/queryset/visitor.py	/^    def __init__(self, **query):$/;"	m	class:Q
+__init__	mongoengine/mongoengine/queryset/visitor.py	/^    def __init__(self, document):$/;"	m	class:QueryCompilerVisitor
+__init__	mongoengine/mongoengine/queryset/visitor.py	/^    def __init__(self, operation, children):$/;"	m	class:QCombination
+__init__	mongoengine/mongoengine/signals.py	/^        def __init__(self, name, doc=None):$/;"	m	class:_FakeSignal
+__init__	mongoengine/tests/fields/fields.py	/^            def __init__(self, **kwargs):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
+__init__	tests/fields/fields.py	/^            def __init__(self, **kwargs):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
+__int__	mongoengine/mongoengine/context_managers.py	/^    def __int__(self):$/;"	m	class:query_counter	file:
+__iter__	mongoengine/mongoengine/base/datastructures.py	/^    def __iter__(self):$/;"	m	class:BaseList	file:
+__iter__	mongoengine/mongoengine/base/datastructures.py	/^    def __iter__(self):$/;"	m	class:StrictDict	file:
+__iter__	mongoengine/mongoengine/base/document.py	/^    def __iter__(self):$/;"	m	class:BaseDocument	file:
+__iter__	mongoengine/mongoengine/queryset/base.py	/^    def __iter__(self):$/;"	m	class:BaseQuerySet	file:
+__iter__	mongoengine/mongoengine/queryset/queryset.py	/^    def __iter__(self):$/;"	m	class:QuerySet	file:
+__iter__	mongoengine/mongoengine/queryset/queryset.py	/^    def __iter__(self):$/;"	m	class:QuerySetNoCache	file:
+__le__	mongoengine/mongoengine/context_managers.py	/^    def __le__(self, value):$/;"	m	class:query_counter	file:
+__len__	mongoengine/mongoengine/base/datastructures.py	/^    def __len__(self):$/;"	m	class:StrictDict	file:
+__len__	mongoengine/mongoengine/base/document.py	/^    def __len__(self):$/;"	m	class:BaseDocument	file:
+__len__	mongoengine/mongoengine/queryset/queryset.py	/^    def __len__(self):$/;"	m	class:QuerySet	file:
+__lt__	mongoengine/mongoengine/context_managers.py	/^    def __lt__(self, value):$/;"	m	class:query_counter	file:
+__match_all	mongoengine/mongoengine/base/datastructures.py	/^    def __match_all(cls, embedded_doc, kwargs):$/;"	m	class:EmbeddedDocumentList	file:
+__metaclass__	mongoengine/mongoengine/document.py	/^    __metaclass__ = DocumentMetaclass$/;"	v	class:DynamicEmbeddedDocument
+__metaclass__	mongoengine/mongoengine/document.py	/^    __metaclass__ = DocumentMetaclass$/;"	v	class:EmbeddedDocument
+__metaclass__	mongoengine/mongoengine/document.py	/^    __metaclass__ = TopLevelDocumentMetaclass$/;"	v	class:Document
+__metaclass__	mongoengine/mongoengine/document.py	/^    __metaclass__ = TopLevelDocumentMetaclass$/;"	v	class:DynamicDocument
+__ne__	mongoengine/fields.py	/^    def __ne__(self, other):$/;"	m	class:GridFSProxy	file:
+__ne__	mongoengine/mongoengine/base/datastructures.py	/^    def __ne__(self, other):$/;"	m	class:StrictDict	file:
+__ne__	mongoengine/mongoengine/base/document.py	/^    def __ne__(self, other):$/;"	m	class:BaseDocument	file:
+__ne__	mongoengine/mongoengine/context_managers.py	/^    def __ne__(self, value):$/;"	m	class:query_counter	file:
+__ne__	mongoengine/mongoengine/document.py	/^    def __ne__(self, other):$/;"	m	class:EmbeddedDocument	file:
+__ne__	mongoengine/mongoengine/fields.py	/^    def __ne__(self, other):$/;"	m	class:GridFSProxy	file:
+__new__	mongoengine/mongoengine/base/metaclasses.py	/^    def __new__(cls, name, bases, attrs):$/;"	m	class:DocumentMetaclass	file:
+__new__	mongoengine/mongoengine/base/metaclasses.py	/^    def __new__(cls, name, bases, attrs):$/;"	m	class:TopLevelDocumentMetaclass	file:
+__nonzero__	mongoengine/fields.py	/^    def __nonzero__(self):$/;"	m	class:GridFSProxy	file:
+__nonzero__	mongoengine/mongoengine/fields.py	/^    def __nonzero__(self):$/;"	m	class:GridFSProxy	file:
+__nonzero__	mongoengine/mongoengine/queryset/base.py	/^    def __nonzero__(self):$/;"	m	class:BaseQuerySet	file:
+__nonzero__	mongoengine/mongoengine/queryset/field_list.py	/^    def __nonzero__(self):$/;"	m	class:QueryFieldList	file:
+__only_matches	mongoengine/mongoengine/base/datastructures.py	/^    def __only_matches(cls, embedded_docs, kwargs):$/;"	m	class:EmbeddedDocumentList	file:
+__or__	mongoengine/mongoengine/queryset/visitor.py	/^    def __or__(self, other):$/;"	m	class:QNode	file:
+__raw__	mongoengine/tests/queryset/queryset.py	/^            __raw__={"$addToSet": {"tags": {"$each": ["code", "mongodb", "code"]}}})$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
+__raw__	mongoengine/tests/queryset/queryset.py	/^            __raw__={'document.a_name': 'A doc'}).count(), 1)$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.Doc
+__raw__	mongoengine/tests/queryset/queryset.py	/^            __raw__={'document.b_name': 'B doc'}).count(), 1)$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.Doc
+__repr__	mongoengine/fields.py	/^    def __repr__(self):$/;"	m	class:GridFSProxy	file:
+__repr__	mongoengine/mongoengine/base/datastructures.py	/^                def __repr__(self):$/;"	m	class:StrictDict.create.SpecificStrictDict	file:
+__repr__	mongoengine/mongoengine/base/datastructures.py	/^    def __repr__(self):$/;"	m	class:LazyReference	file:
+__repr__	mongoengine/mongoengine/base/document.py	/^    def __repr__(self):$/;"	m	class:BaseDocument	file:
+__repr__	mongoengine/mongoengine/context_managers.py	/^    def __repr__(self):$/;"	m	class:query_counter	file:
+__repr__	mongoengine/mongoengine/errors.py	/^    def __repr__(self):$/;"	m	class:ValidationError	file:
+__repr__	mongoengine/mongoengine/fields.py	/^    def __repr__(self):$/;"	m	class:GridFSProxy	file:
+__repr__	mongoengine/mongoengine/queryset/queryset.py	/^    def __repr__(self):$/;"	m	class:QuerySet	file:
+__repr__	mongoengine/mongoengine/queryset/queryset.py	/^    def __repr__(self):$/;"	m	class:QuerySetNoCache	file:
+__repr__	mongoengine/tests/queryset/queryset.py	/^            def __repr__(self):$/;"	m	class:QuerySetTest.test_repr.Doc	file:
+__repr__	mongoengine/tests/test_dereference.py	/^            def __repr__(self):$/;"	m	class:FieldTest.test_circular_reference.Person	file:
+__repr__	mongoengine/tests/test_dereference.py	/^            def __repr__(self):$/;"	m	class:FieldTest.test_circular_reference_on_self.Person	file:
+__repr__	mongoengine/tests/test_dereference.py	/^            def __repr__(self):$/;"	m	class:FieldTest.test_circular_tree_reference.Person	file:
+__set__	mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:BinaryField	file:
+__set__	mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:ComplexDateTimeField	file:
+__set__	mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:FileField	file:
+__set__	mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:SequenceField	file:
+__set__	mongoengine/mongoengine/base/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:BaseField	file:
+__set__	mongoengine/mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:BinaryField	file:
+__set__	mongoengine/mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:ComplexDateTimeField	file:
+__set__	mongoengine/mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:FileField	file:
+__set__	mongoengine/mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:SequenceField	file:
+__set_field_display	mongoengine/mongoengine/base/document.py	/^    def __set_field_display(self):$/;"	m	class:BaseDocument	file:
+__setattr__	mongoengine/mongoengine/base/document.py	/^    def __setattr__(self, name, value):$/;"	m	class:BaseDocument	file:
+__setitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __setitem__(self, key, value):$/;"	m	class:StrictDict	file:
+__setitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __setitem__(self, key, value, *args, **kwargs):$/;"	m	class:BaseDict	file:
+__setitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __setitem__(self, key, value, *args, **kwargs):$/;"	m	class:BaseList	file:
+__setitem__	mongoengine/mongoengine/base/document.py	/^    def __setitem__(self, name, value):$/;"	m	class:BaseDocument	file:
+__setslice__	mongoengine/mongoengine/base/datastructures.py	/^    def __setslice__(self, *args, **kwargs):$/;"	m	class:BaseList	file:
+__setstate__	mongoengine/mongoengine/base/datastructures.py	/^    def __setstate__(self, state):$/;"	m	class:BaseDict	file:
+__setstate__	mongoengine/mongoengine/base/datastructures.py	/^    def __setstate__(self, state):$/;"	m	class:BaseList	file:
+__setstate__	mongoengine/mongoengine/base/document.py	/^    def __setstate__(self, data):$/;"	m	class:BaseDocument	file:
+__setstate__	mongoengine/mongoengine/queryset/base.py	/^    def __setstate__(self, obj_dict):$/;"	m	class:BaseQuerySet	file:
+__slots__	mongoengine/mongoengine/base/datastructures.py	/^                __slots__ = allowed_keys_tuple$/;"	v	class:StrictDict.create.SpecificStrictDict
+__slots__	mongoengine/mongoengine/base/datastructures.py	/^    __slots__ = ('_cached_doc', 'passthrough', 'document_type')$/;"	v	class:LazyReference
+__slots__	mongoengine/mongoengine/base/datastructures.py	/^    __slots__ = ()$/;"	v	class:StrictDict
+__slots__	mongoengine/mongoengine/base/document.py	/^    __slots__ = ('_changed_fields', '_initialised', '_created', '_data',$/;"	v	class:BaseDocument
+__slots__	mongoengine/mongoengine/document.py	/^    __slots__ = ('__objects',)$/;"	v	class:Document
+__slots__	mongoengine/mongoengine/document.py	/^    __slots__ = ('_instance', )$/;"	v	class:EmbeddedDocument
+__str__	mongoengine/fields.py	/^    def __str__(self):$/;"	m	class:GridFSProxy	file:
+__str__	mongoengine/mongoengine/base/document.py	/^    def __str__(self):$/;"	m	class:BaseDocument	file:
+__str__	mongoengine/mongoengine/errors.py	/^    def __str__(self):$/;"	m	class:ValidationError	file:
+__str__	mongoengine/mongoengine/fields.py	/^    def __str__(self):$/;"	m	class:GridFSProxy	file:
+__str__	mongoengine/tests/document/instance.py	/^            def __str__(self):$/;"	m	class:InstanceTest.test_db_ref_usage.Book	file:
+__str__	mongoengine/tests/document/instance.py	/^            def __str__(self):$/;"	m	class:InstanceTest.test_repr_none.Article	file:
+__unicode__	mongoengine/tests/document/instance.py	/^            def __unicode__(self):$/;"	m	class:InstanceTest.test_db_ref_usage.Book	file:
+__unicode__	mongoengine/tests/document/instance.py	/^            def __unicode__(self):$/;"	m	class:InstanceTest.test_repr.Article	file:
+__unicode__	mongoengine/tests/queryset/geo.py	/^            def __unicode__(self):$/;"	m	class:GeoQueriesTest._create_event_data.Event	file:
+__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_cache_not_cloned.User	file:
+__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_nested_queryset_iterator.User	file:
+__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_pull_from_nested_embedded.User	file:
+__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_pull_from_nested_mapfield.Collaborator	file:
+__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_pull_nested.Collaborator	file:
+__unicode__	mongoengine/tests/test_signals.py	/^            def __unicode__(self):$/;"	m	class:SignalTests.setUp.Another	file:
+__unicode__	mongoengine/tests/test_signals.py	/^            def __unicode__(self):$/;"	m	class:SignalTests.setUp.Author	file:
+__unicode__	mongoengine/tests/test_signals.py	/^            def __unicode__(self):$/;"	m	class:SignalTests.setUp.Post	file:
+__version__	mongoengine/mongoengine/__init__.py	/^__version__ = get_version()$/;"	v
+_attach_objects	mongoengine/mongoengine/dereference.py	/^    def _attach_objects(self, items, depth=0, instance=None, name=None):$/;"	m	class:DeReference
+_auto_dereference	mongoengine/mongoengine/base/fields.py	/^    _auto_dereference = True$/;"	v	class:BaseField
+_auto_dereference	mongoengine/mongoengine/queryset/base.py	/^    _auto_dereference = True$/;"	v	class:BaseQuerySet
+_auto_gen	mongoengine/fields.py	/^    _auto_gen = True$/;"	v	class:SequenceField
+_auto_gen	mongoengine/mongoengine/base/fields.py	/^    _auto_gen = False  # Call `generate` to generate a value$/;"	v	class:BaseField
+_auto_gen	mongoengine/mongoengine/fields.py	/^    _auto_gen = True$/;"	v	class:SequenceField
+_binary	mongoengine/fields.py	/^    _binary = None$/;"	v	class:UUIDField
+_binary	mongoengine/mongoengine/fields.py	/^    _binary = None$/;"	v	class:UUIDField
+_build_index_spec	mongoengine/mongoengine/base/document.py	/^    def _build_index_spec(cls, spec):$/;"	m	class:BaseDocument
+_build_index_specs	mongoengine/mongoengine/base/document.py	/^    def _build_index_specs(cls, meta_indexes):$/;"	m	class:BaseDocument
+_chainable_method	mongoengine/mongoengine/queryset/base.py	/^    def _chainable_method(self, method_name, val):$/;"	m	class:BaseQuerySet
+_class_registry_cache	mongoengine/mongoengine/common.py	/^_class_registry_cache = {}$/;"	v
+_classes	mongoengine/mongoengine/base/datastructures.py	/^    _classes = {}$/;"	v	class:StrictDict
+_clean_settings	mongoengine/mongoengine/connection.py	/^    def _clean_settings(settings_dict):$/;"	f	function:get_connection
+_clean_slice	mongoengine/mongoengine/queryset/field_list.py	/^    def _clean_slice(self):$/;"	m	class:QueryFieldList
+_clear_changed_fields	mongoengine/mongoengine/base/document.py	/^    def _clear_changed_fields(self):$/;"	m	class:BaseDocument
+_clone_into	mongoengine/mongoengine/queryset/base.py	/^    def _clone_into(self, new_qs):$/;"	m	class:BaseQuerySet
+_collection	mongoengine/mongoengine/queryset/base.py	/^    def _collection(self):$/;"	m	class:BaseQuerySet
+_combine	mongoengine/mongoengine/queryset/visitor.py	/^    def _combine(self, other, operation):$/;"	m	class:QNode
+_connection_settings	mongoengine/mongoengine/connection.py	/^_connection_settings = {}$/;"	v
+_connections	mongoengine/mongoengine/connection.py	/^_connections = {}$/;"	v
+_convert_from_datetime	mongoengine/fields.py	/^    def _convert_from_datetime(self, val):$/;"	m	class:ComplexDateTimeField
+_convert_from_datetime	mongoengine/mongoengine/fields.py	/^    def _convert_from_datetime(self, val):$/;"	m	class:ComplexDateTimeField
+_convert_from_string	mongoengine/fields.py	/^    def _convert_from_string(self, data):$/;"	m	class:ComplexDateTimeField
+_convert_from_string	mongoengine/mongoengine/fields.py	/^    def _convert_from_string(self, data):$/;"	m	class:ComplexDateTimeField
+_create_event_data	mongoengine/tests/queryset/geo.py	/^    def _create_event_data(self, point_field_class=GeoPointField):$/;"	m	class:GeoQueriesTest
+_cursor	mongoengine/mongoengine/queryset/base.py	/^    def _cursor(self):$/;"	m	class:BaseQuerySet
+_cursor_args	mongoengine/mongoengine/queryset/base.py	/^    def _cursor_args(self):$/;"	m	class:BaseQuerySet
+_dbs	mongoengine/mongoengine/connection.py	/^_dbs = {}$/;"	v
+_decorated_with_ver_requirement	mongoengine/tests/utils.py	/^def _decorated_with_ver_requirement(func, ver_tuple):$/;"	f
+_delta	mongoengine/mongoengine/base/document.py	/^    def _delta(self):$/;"	m	class:BaseDocument
+_dereference	mongoengine/mongoengine/queryset/base.py	/^    def _dereference(self):$/;"	m	class:BaseQuerySet
+_dereferenced	mongoengine/mongoengine/base/datastructures.py	/^    _dereferenced = False$/;"	v	class:BaseDict
+_dereferenced	mongoengine/mongoengine/base/datastructures.py	/^    _dereferenced = False$/;"	v	class:BaseList
+_document_registry	mongoengine/mongoengine/base/common.py	/^_document_registry = {}$/;"	v
+_dynamic	mongoengine/mongoengine/base/document.py	/^    _dynamic = False$/;"	v	class:BaseDocument
+_dynamic	mongoengine/mongoengine/document.py	/^    _dynamic = True$/;"	v	class:DynamicDocument
+_dynamic	mongoengine/mongoengine/document.py	/^    _dynamic = True$/;"	v	class:DynamicEmbeddedDocument
+_dynamic_lock	mongoengine/mongoengine/base/document.py	/^    _dynamic_lock = True$/;"	v	class:BaseDocument
+_ensure_indexes	mongoengine/mongoengine/queryset/base.py	/^    def _ensure_indexes(self):$/;"	m	class:BaseQuerySet
+_fail	mongoengine/mongoengine/signals.py	/^        def _fail(self, *args, **kwargs):$/;"	m	class:_FakeSignal
+_fetch_objects	mongoengine/mongoengine/dereference.py	/^    def _fetch_objects(self, doc_type=None):$/;"	m	class:DeReference
+_field_list_cache	mongoengine/mongoengine/common.py	/^_field_list_cache = []$/;"	v
+_fields_to_dbfields	mongoengine/mongoengine/queryset/base.py	/^    def _fields_to_dbfields(self, fields):$/;"	m	class:BaseQuerySet
+_find_references	mongoengine/mongoengine/dereference.py	/^    def _find_references(self, items, depth=0):$/;"	m	class:DeReference
+_format_errors	mongoengine/mongoengine/errors.py	/^    def _format_errors(self):$/;"	m	class:ValidationError
+_from_son	mongoengine/mongoengine/base/document.py	/^    def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False):$/;"	m	class:BaseDocument
+_fs	mongoengine/fields.py	/^    _fs = None$/;"	v	class:GridFSProxy
+_fs	mongoengine/mongoengine/fields.py	/^    _fs = None$/;"	v	class:GridFSProxy
+_geo_index	mongoengine/fields.py	/^    _geo_index = pymongo.GEO2D$/;"	v	class:GeoPointField
+_geo_index	mongoengine/mongoengine/base/fields.py	/^    _geo_index = False$/;"	v	class:BaseField
+_geo_index	mongoengine/mongoengine/base/fields.py	/^    _geo_index = pymongo.GEOSPHERE$/;"	v	class:GeoJsonBaseField
+_geo_index	mongoengine/mongoengine/fields.py	/^    _geo_index = pymongo.GEO2D$/;"	v	class:GeoPointField
+_geo_indices	mongoengine/mongoengine/base/document.py	/^    def _geo_indices(cls, inspected=None, parent_field=None):$/;"	m	class:BaseDocument
+_geo_operator	mongoengine/mongoengine/queryset/transform.py	/^def _geo_operator(field, op, value):$/;"	f
+_get_as_pymongo	mongoengine/mongoengine/queryset/base.py	/^    def _get_as_pymongo(self, doc):$/;"	m	class:BaseQuerySet
+_get_bases	mongoengine/mongoengine/base/metaclasses.py	/^    def _get_bases(cls, bases):$/;"	m	class:DocumentMetaclass
+_get_capped_collection	mongoengine/mongoengine/document.py	/^    def _get_capped_collection(cls):$/;"	m	class:Document
+_get_changed_fields	mongoengine/mongoengine/base/document.py	/^    def _get_changed_fields(self, inspected=None):$/;"	m	class:BaseDocument
+_get_collection	mongoengine/mongoengine/document.py	/^    def _get_collection(cls):$/;"	m	class:Document
+_get_collection_name	mongoengine/mongoengine/base/document.py	/^    def _get_collection_name(cls):$/;"	m	class:BaseDocument
+_get_collection_name	mongoengine/mongoengine/context_managers.py	/^        def _get_collection_name(cls):$/;"	f	function:switch_collection.__enter__
+_get_connection	mongoengine/mongoengine/connection.py	/^_get_connection = get_connection$/;"	v
+_get_count	mongoengine/mongoengine/context_managers.py	/^    def _get_count(self):$/;"	m	class:query_counter
+_get_db	mongoengine/mongoengine/connection.py	/^_get_db = get_db$/;"	v
+_get_db	mongoengine/mongoengine/document.py	/^    def _get_db(cls):$/;"	m	class:Document
+_get_items	mongoengine/mongoengine/dereference.py	/^                        def _get_items(items):$/;"	f	function:DeReference.__call__
+_get_loaded	mongoengine/tests/queryset/pickable.py	/^    def _get_loaded(self, qs):$/;"	m	class:TestQuerysetPickable
+_get_message	mongoengine/mongoengine/errors.py	/^    def _get_message(self):$/;"	m	class:ValidationError
+_get_order_by	mongoengine/mongoengine/queryset/base.py	/^    def _get_order_by(self, keys):$/;"	m	class:BaseQuerySet
+_get_scalar	mongoengine/mongoengine/queryset/base.py	/^    def _get_scalar(self, doc):$/;"	m	class:BaseQuerySet
+_get_update_doc	mongoengine/mongoengine/document.py	/^    def _get_update_doc(self):$/;"	m	class:Document
+_has_data	mongoengine/mongoengine/queryset/base.py	/^    def _has_data(self):$/;"	m	class:BaseQuerySet
+_has_more	mongoengine/mongoengine/queryset/queryset.py	/^    _has_more = True$/;"	v	class:QuerySet
+_import_class	mongoengine/mongoengine/common.py	/^def _import_class(cls_name):$/;"	f
+_import_classes	mongoengine/mongoengine/base/metaclasses.py	/^    def _import_classes(cls):$/;"	m	class:DocumentMetaclass
+_index_test	mongoengine/tests/document/indexes.py	/^    def _index_test(self, InheritFrom):$/;"	m	class:IndexesTest
+_index_test_inheritance	mongoengine/tests/document/indexes.py	/^    def _index_test_inheritance(self, InheritFrom):$/;"	m	class:IndexesTest
+_infer_geometry	mongoengine/mongoengine/queryset/transform.py	/^def _infer_geometry(value):$/;"	f
+_inner	mongoengine/tests/utils.py	/^    def _inner(*args, **kwargs):$/;"	f	function:_decorated_with_ver_requirement
+_inner	mongoengine/tests/utils.py	/^    def _inner(*args, **kwargs):$/;"	f	function:skip_pymongo3
+_instance	mongoengine/mongoengine/base/datastructures.py	/^    _instance = None$/;"	v	class:BaseDict
+_instance	mongoengine/mongoengine/base/datastructures.py	/^    _instance = None$/;"	v	class:BaseList
+_item_frequencies_exec_js	mongoengine/mongoengine/queryset/base.py	/^    def _item_frequencies_exec_js(self, field, normalize=False):$/;"	m	class:BaseQuerySet
+_item_frequencies_map_reduce	mongoengine/mongoengine/queryset/base.py	/^    def _item_frequencies_map_reduce(self, field, normalize=False):$/;"	m	class:BaseQuerySet
+_iter_results	mongoengine/mongoengine/queryset/queryset.py	/^    def _iter_results(self):$/;"	m	class:QuerySet
+_len	mongoengine/mongoengine/queryset/queryset.py	/^    _len = None$/;"	v	class:QuerySet
+_lookup_field	mongoengine/mongoengine/base/document.py	/^    def _lookup_field(cls, parts):$/;"	m	class:BaseDocument
+_mark_as_changed	mongoengine/fields.py	/^    def _mark_as_changed(self):$/;"	m	class:GridFSProxy
+_mark_as_changed	mongoengine/mongoengine/base/datastructures.py	/^    def _mark_as_changed(self, key=None):$/;"	m	class:BaseDict
+_mark_as_changed	mongoengine/mongoengine/base/datastructures.py	/^    def _mark_as_changed(self, key=None):$/;"	m	class:BaseList
+_mark_as_changed	mongoengine/mongoengine/base/document.py	/^    def _mark_as_changed(self, key):$/;"	m	class:BaseDocument
+_mark_as_changed	mongoengine/mongoengine/fields.py	/^    def _mark_as_changed(self):$/;"	m	class:GridFSProxy
+_merge_options	mongoengine/mongoengine/base/metaclasses.py	/^    _merge_options = ('indexes',)$/;"	v	class:MetaDict
+_message	mongoengine/mongoengine/errors.py	/^    _message = None$/;"	v	class:ValidationError
+_name	mongoengine/mongoengine/base/datastructures.py	/^    _name = None$/;"	v	class:BaseDict
+_name	mongoengine/mongoengine/base/datastructures.py	/^    _name = None$/;"	v	class:BaseList
+_nestable_types_changed_fields	mongoengine/mongoengine/base/document.py	/^    def _nestable_types_changed_fields(self, changed_fields, key, data, inspected):$/;"	m	class:BaseDocument
+_object_key	mongoengine/mongoengine/document.py	/^    def _object_key(self):$/;"	m	class:Document
+_order_reverse	mongoengine/fields.py	/^    _order_reverse = False$/;"	v	class:SortedListField
+_order_reverse	mongoengine/mongoengine/fields.py	/^    _order_reverse = False$/;"	v	class:SortedListField
+_ordering	mongoengine/fields.py	/^    _ordering = None$/;"	v	class:SortedListField
+_ordering	mongoengine/mongoengine/fields.py	/^    _ordering = None$/;"	v	class:SortedListField
+_populate_cache	mongoengine/mongoengine/queryset/queryset.py	/^    def _populate_cache(self):$/;"	m	class:QuerySet
+_prepare_query_for_iterable	mongoengine/mongoengine/queryset/transform.py	/^def _prepare_query_for_iterable(field, op, value):$/;"	f
+_put_thumbnail	mongoengine/fields.py	/^    def _put_thumbnail(self, thumbnail, format, progressive, **kwargs):$/;"	m	class:ImageGridFsProxy
+_put_thumbnail	mongoengine/mongoengine/fields.py	/^    def _put_thumbnail(self, thumbnail, format, progressive, **kwargs):$/;"	m	class:ImageGridFsProxy
+_qs	mongoengine/mongoengine/document.py	/^    def _qs(self):$/;"	m	class:Document
+_query	mongoengine/mongoengine/queryset/base.py	/^    def _query(self):$/;"	m	class:BaseQuerySet
+_query_conjunction	mongoengine/mongoengine/queryset/visitor.py	/^    def _query_conjunction(self, queries):$/;"	m	class:SimplificationVisitor
+_rank	mongoengine/tests/document/instance.py	/^            _rank = StringField(required=False, db_field="rank")$/;"	v	class:InstanceTest.test_db_field_load.Person
+_reload	mongoengine/mongoengine/document.py	/^    def _reload(self, key, value):$/;"	m	class:Document
+_result_cache	mongoengine/mongoengine/queryset/queryset.py	/^    _result_cache = None$/;"	v	class:QuerySet
+_save_create	mongoengine/mongoengine/document.py	/^    def _save_create(self, doc, force_insert, write_concern):$/;"	m	class:Document
+_save_update	mongoengine/mongoengine/document.py	/^    def _save_update(self, doc, save_condition, write_concern):$/;"	m	class:Document
+_set_message	mongoengine/mongoengine/errors.py	/^    def _set_message(self, message):$/;"	m	class:ValidationError
+_set_owner_document	mongoengine/mongoengine/base/fields.py	/^    def _set_owner_document(self, owner_document):$/;"	m	class:BaseField
+_set_owner_document	mongoengine/mongoengine/base/fields.py	/^    def _set_owner_document(self, owner_document):$/;"	m	class:ComplexBaseField
+_signals	mongoengine/mongoengine/signals.py	/^_signals = Namespace()$/;"	v
+_sort_key	mongoengine/mongoengine/queryset/base.py	/^        def _sort_key(field_tuple):$/;"	f	function:BaseQuerySet.fields
+_special_fields	mongoengine/mongoengine/base/datastructures.py	/^    _special_fields = set(['get', 'pop', 'iteritems', 'items', 'keys', 'create'])$/;"	v	class:StrictDict
+_sub_js_fields	mongoengine/mongoengine/queryset/base.py	/^    def _sub_js_fields(self, code):$/;"	m	class:BaseQuerySet
+_test_embedded	mongoengine/tests/queryset/geo.py	/^    def _test_embedded(self, point_field_class):$/;"	m	class:GeoQueriesTest
+_test_for_expected_error	mongoengine/tests/fields/geo.py	/^    def _test_for_expected_error(self, Cls, loc, expected):$/;"	m	class:GeoFieldTest
+_to_mongo_safe_call	mongoengine/mongoengine/base/fields.py	/^    def _to_mongo_safe_call(self, value, use_db_field=True, fields=None):$/;"	m	class:BaseField
+_translate_field_name	mongoengine/mongoengine/base/document.py	/^    def _translate_field_name(cls, field, sep='.'):$/;"	m	class:BaseDocument
+_type	mongoengine/fields.py	/^    _type = 'LineString'$/;"	v	class:LineStringField
+_type	mongoengine/fields.py	/^    _type = 'MultiLineString'$/;"	v	class:MultiLineStringField
+_type	mongoengine/fields.py	/^    _type = 'MultiPoint'$/;"	v	class:MultiPointField
+_type	mongoengine/fields.py	/^    _type = 'MultiPolygon'$/;"	v	class:MultiPolygonField
+_type	mongoengine/fields.py	/^    _type = 'Point'$/;"	v	class:PointField
+_type	mongoengine/fields.py	/^    _type = 'Polygon'$/;"	v	class:PolygonField
+_type	mongoengine/mongoengine/base/fields.py	/^    _type = 'GeoBase'$/;"	v	class:GeoJsonBaseField
+_type	mongoengine/mongoengine/fields.py	/^    _type = 'LineString'$/;"	v	class:LineStringField
+_type	mongoengine/mongoengine/fields.py	/^    _type = 'MultiLineString'$/;"	v	class:MultiLineStringField
+_type	mongoengine/mongoengine/fields.py	/^    _type = 'MultiPoint'$/;"	v	class:MultiPointField
+_type	mongoengine/mongoengine/fields.py	/^    _type = 'MultiPolygon'$/;"	v	class:MultiPolygonField
+_type	mongoengine/mongoengine/fields.py	/^    _type = 'Point'$/;"	v	class:PointField
+_type	mongoengine/mongoengine/fields.py	/^    _type = 'Polygon'$/;"	v	class:PolygonField
+_unique_with_indexes	mongoengine/mongoengine/base/document.py	/^    def _unique_with_indexes(cls, namespace=''):$/;"	m	class:BaseDocument
+_validate	mongoengine/mongoengine/base/fields.py	/^    def _validate(self, value, **kwargs):$/;"	m	class:BaseField
+_validate_choices	mongoengine/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:GenericLazyReferenceField
+_validate_choices	mongoengine/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:GenericReferenceField
+_validate_choices	mongoengine/mongoengine/base/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:BaseField
+_validate_choices	mongoengine/mongoengine/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:GenericLazyReferenceField
+_validate_choices	mongoengine/mongoengine/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:GenericReferenceField
+_validate_linestring	mongoengine/mongoengine/base/fields.py	/^    def _validate_linestring(self, value, top_level=True):$/;"	m	class:GeoJsonBaseField
+_validate_multilinestring	mongoengine/mongoengine/base/fields.py	/^    def _validate_multilinestring(self, value, top_level=True):$/;"	m	class:GeoJsonBaseField
+_validate_multipoint	mongoengine/mongoengine/base/fields.py	/^    def _validate_multipoint(self, value):$/;"	m	class:GeoJsonBaseField
+_validate_multipolygon	mongoengine/mongoengine/base/fields.py	/^    def _validate_multipolygon(self, value):$/;"	m	class:GeoJsonBaseField
+_validate_point	mongoengine/mongoengine/base/fields.py	/^    def _validate_point(self, value):$/;"	m	class:GeoJsonBaseField
+_validate_polygon	mongoengine/mongoengine/base/fields.py	/^    def _validate_polygon(self, value, top_level=True):$/;"	m	class:GeoJsonBaseField
+a	mongoengine/tests/document/indexes.py	/^            a = IntField()$/;"	v	class:IndexesTest.test_covered_index.Test
+a	mongoengine/tests/document/inheritance.py	/^            a = StringField()$/;"	v	class:InheritanceTest.test_indexes_and_multiple_inheritance.A
+a	mongoengine/tests/queryset/field_list.py	/^            a = ListField()$/;"	v	class:OnlyExcludeAllTest.test_mix_slice_with_other_fields.MyDoc
+a	mongoengine/tests/queryset/field_list.py	/^            a = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
+a	mongoengine/tests/queryset/field_list.py	/^            a = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
+a	mongoengine/tests/queryset/queryset.py	/^            a = ReferenceField(A)$/;"	v	class:QuerySetTest.test_query_reference_to_custom_pk_doc.B
+a	mongoengine/tests/queryset/transform.py	/^            a = ReferenceField(A)$/;"	v	class:TransformTest.test_chaining.B
+a	mongoengine/tests/queryset/transform.py	/^            a = StringField()$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
+a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_dict_field.Group
+a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
+a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_generic_reference.Group
+a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
+a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_list_field_complex.Group
+a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i).save()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
+a_field	mongoengine/tests/fields/fields.py	/^            a_field = IntField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_custom_data.CustomData
+a_field	tests/fields/fields.py	/^            a_field = IntField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_custom_data.CustomData
+a_name	mongoengine/tests/queryset/queryset.py	/^            a_name = StringField()$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.A
+accept	mongoengine/mongoengine/queryset/visitor.py	/^    def accept(self, visitor):$/;"	m	class:Q
+accept	mongoengine/mongoengine/queryset/visitor.py	/^    def accept(self, visitor):$/;"	m	class:QCombination
+accept	mongoengine/mongoengine/queryset/visitor.py	/^    def accept(self, visitor):$/;"	m	class:QNode
+actions	mongoengine/tests/fields/fields.py	/^            actions = MapField(EmbeddedDocumentField(Action))$/;"	v	class:FieldTest.test_map_field_lookup.Log
+actions	mongoengine/tests/fields/fields.py	/^            actions={'friends': Action(operation='drink', object='beer')}).save()$/;"	v	class:FieldTest.test_map_field_lookup.Log
+actions	tests/fields/fields.py	/^            actions = MapField(EmbeddedDocumentField(Action))$/;"	v	class:FieldTest.test_map_field_lookup.Log
+actions	tests/fields/fields.py	/^            actions={'friends': Action(operation='drink', object='beer')}).save()$/;"	v	class:FieldTest.test_map_field_lookup.Log
+actions__friends__object	mongoengine/tests/fields/fields.py	/^            actions__friends__object='beer').count())$/;"	v	class:FieldTest.test_map_field_lookup.Log
+actions__friends__object	tests/fields/fields.py	/^            actions__friends__object='beer').count())$/;"	v	class:FieldTest.test_map_field_lookup.Log
+actions__friends__operation	mongoengine/tests/fields/fields.py	/^            actions__friends__operation='drink',$/;"	v	class:FieldTest.test_map_field_lookup.Log
+actions__friends__operation	tests/fields/fields.py	/^            actions__friends__operation='drink',$/;"	v	class:FieldTest.test_map_field_lookup.Log
+active	mongoengine/tests/document/instance.py	/^            active = BooleanField(default=True)$/;"	v	class:InstanceTest.test_save_only_changed_fields.User
+active	mongoengine/tests/document/instance.py	/^            active = BooleanField(default=True)$/;"	v	class:InstanceTest.test_save_only_changed_fields_recursive.User
+active	mongoengine/tests/queryset/queryset.py	/^            active = BooleanField(default=False)$/;"	v	class:QuerySetTest.test_custom_manager_overriding_objects_works.Foo
+active	mongoengine/tests/queryset/queryset.py	/^            active = BooleanField(default=True)$/;"	v	class:QuerySetTest.test_inherit_objects.Foo
+active	mongoengine/tests/queryset/queryset.py	/^            active = BooleanField(default=True)$/;"	v	class:QuerySetTest.test_inherit_objects_override.Foo
+active	mongoengine/tests/test_signals.py	/^            active = BooleanField(default=False)$/;"	v	class:SignalTests.setUp.Post
+actual	mongoengine/tests/fields/fields.py	/^            actual = list(Person.objects().scalar(field_name))$/;"	v	class:FieldTest.test_decimal_storage.Person
+actual	tests/fields/fields.py	/^            actual = list(Person.objects().scalar(field_name))$/;"	v	class:FieldTest.test_decimal_storage.Person
+add_to_class	mongoengine/mongoengine/base/metaclasses.py	/^    def add_to_class(self, name, value):$/;"	m	class:DocumentMetaclass
+address	mongoengine/tests/document/dynamic.py	/^            address = EmbeddedDocumentField(Address)$/;"	v	class:DynamicTest.test_dynamic_embedded_works_with_only.Person
+admin	mongoengine/tests/fields/fields.py	/^            admin = BooleanField()$/;"	v	class:FieldTest.test_boolean_validation.Person
+admin	mongoengine/tests/queryset/queryset.py	/^            admin = ListField(ReferenceField(User))$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
+admin	tests/fields/fields.py	/^            admin = BooleanField()$/;"	v	class:FieldTest.test_boolean_validation.Person
+adult	mongoengine/tests/queryset/queryset.py	/^            adult = (User.objects.filter(age__gte=18)$/;"	v	class:QuerySetTest.test_comment.User
+age	mongoengine/tests/document/class_methods.py	/^            age = IntField()$/;"	v	class:ClassMethodsTest.setUp.Person
+age	mongoengine/tests/document/delta.py	/^            age = IntField()$/;"	v	class:DeltaTest.setUp.Person
+age	mongoengine/tests/document/indexes.py	/^            age = IntField()$/;"	v	class:IndexesTest.setUp.Person
+age	mongoengine/tests/document/inheritance.py	/^            age = IntField()$/;"	v	class:InheritanceTest.test_inheritance_meta_data.Person
+age	mongoengine/tests/document/inheritance.py	/^            age = IntField()$/;"	v	class:InheritanceTest.test_inheritance_to_mongo_keys.Person
+age	mongoengine/tests/document/instance.py	/^            age = IntField()$/;"	v	class:InstanceTest.setUp.Person
+age	mongoengine/tests/document/instance.py	/^            age = IntField()$/;"	v	class:InstanceTest.test_do_not_save_unchanged_references.Person
+age	mongoengine/tests/document/instance.py	/^            age = IntField()$/;"	v	class:InstanceTest.test_embedded_document_to_mongo.Person
+age	mongoengine/tests/document/instance.py	/^            age = IntField()$/;"	v	class:InstanceTest.test_mixin_inheritance.TestDoc
+age	mongoengine/tests/document/instance.py	/^            age = IntField(primary_key=True)$/;"	v	class:InstanceTest.test_falsey_pk.Person
+age	mongoengine/tests/document/validation.py	/^            age = IntField()$/;"	v	class:ValidatorErrorTest.test_fields_rewrite.BasePerson
+age	mongoengine/tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
+age	mongoengine/tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
+age	mongoengine/tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+age	mongoengine/tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
+age	mongoengine/tests/fields/fields.py	/^            age = IntField(min_value=0, max_value=110)$/;"	v	class:FieldTest.test_int_validation.Person
+age	mongoengine/tests/fields/fields.py	/^            age = IntField(required=True)$/;"	v	class:FieldTest.test_required_values.Person
+age	mongoengine/tests/queryset/field_list.py	/^            age = IntField()$/;"	v	class:OnlyExcludeAllTest.setUp.Person
+age	mongoengine/tests/queryset/pickable.py	/^    age = IntField()$/;"	v	class:Person
+age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.setUp.Person
+age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_as_pymongo.User
+age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_comment.User
+age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_mapfield_update.Member
+age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_queryset_aggregation_framework.Person
+age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_scalar_embedded.Profile
+age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_scalar_simple.UserDoc
+age	mongoengine/tests/queryset/queryset.py	/^            age=51,$/;"	v	class:QuerySetTest.test_as_pymongo.User
+age	mongoengine/tests/queryset/visitor.py	/^            age = IntField()$/;"	v	class:QTest.setUp.Person
+age	mongoengine/tests/queryset/visitor.py	/^            age = IntField()$/;"	v	class:QTest.test_empty_q.Person
+age	tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
+age	tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
+age	tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+age	tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
+age	tests/fields/fields.py	/^            age = IntField(min_value=0, max_value=110)$/;"	v	class:FieldTest.test_int_validation.Person
+age	tests/fields/fields.py	/^            age = IntField(required=True)$/;"	v	class:FieldTest.test_required_values.Person
+aggregate	mongoengine/mongoengine/queryset/base.py	/^    def aggregate(self, *pipeline, **kwargs):$/;"	m	class:BaseQuerySet
+all	mongoengine/mongoengine/queryset/base.py	/^    def all(self):$/;"	m	class:BaseQuerySet
+all_fields	mongoengine/mongoengine/queryset/base.py	/^    def all_fields(self):$/;"	m	class:BaseQuerySet
+animal	mongoengine/tests/fields/fields.py	/^                  animal=Animal(name="Leopard", tag="heavy").save()).save()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Ocorrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = CachedReferenceField(Animal)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Ocurrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Ocurrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Ocurrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = GenericLazyReferenceField(choices=['Animal'])$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Ocurrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Ocurrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Ocurrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Ocurrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Ocurrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Ocurrence
+animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal, passthrough=False)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Ocurrence
+animal	tests/fields/fields.py	/^                  animal=Animal(name="Leopard", tag="heavy").save()).save()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
+animal	tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+animal	tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+animal	tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Ocorrence
+animal	tests/fields/fields.py	/^            animal = CachedReferenceField(Animal)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
+animal	tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Ocurrence
+animal	tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Ocurrence
+animal	tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Ocurrence
+animal	tests/fields/fields.py	/^            animal = GenericLazyReferenceField(choices=['Animal'])$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Ocurrence
+animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Ocurrence
+animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Ocurrence
+animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Ocurrence
+animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Ocurrence
+animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Ocurrence
+animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal, passthrough=False)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Ocurrence
+animal__owner__tags	mongoengine/tests/fields/fields.py	/^            animal__owner__tags='cool').first()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+animal__owner__tags	tests/fields/fields.py	/^            animal__owner__tags='cool').first()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+animal__owner__tp	mongoengine/tests/fields/fields.py	/^            animal__owner__tp='u').first()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+animal__owner__tp	tests/fields/fields.py	/^            animal__owner__tp='u').first()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+animal__tag	mongoengine/tests/fields/fields.py	/^            animal__tag='heavy',$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+animal__tag	mongoengine/tests/fields/fields.py	/^            animal__tag='heavy',$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+animal__tag	tests/fields/fields.py	/^            animal__tag='heavy',$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+animal__tag	tests/fields/fields.py	/^            animal__tag='heavy',$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+animal_passthrough	mongoengine/tests/fields/fields.py	/^            animal_passthrough = LazyReferenceField(Animal, passthrough=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Ocurrence
+animal_passthrough	tests/fields/fields.py	/^            animal_passthrough = LazyReferenceField(Animal, passthrough=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Ocurrence
+animals	mongoengine/tests/document/instance.py	/^            animals = ListField(GenericReferenceField())$/;"	v	class:InstanceTest.test_polymorphic_references.Zoo
+animals	mongoengine/tests/document/instance.py	/^            animals = ListField(ReferenceField(Animal))$/;"	v	class:InstanceTest.test_polymorphic_references.Zoo
+anon	mongoengine/tests/queryset/field_list.py	/^            anon = BooleanField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.Anon
+api_key	mongoengine/tests/fields/fields.py	/^            api_key = UUIDField(binary=False)$/;"	v	class:FieldTest.test_uuid_field_string.Person
+api_key	mongoengine/tests/fields/fields.py	/^            api_key = UUIDField(binary=True)$/;"	v	class:FieldTest.test_uuid_field_binary.Person
+api_key	tests/fields/fields.py	/^            api_key = UUIDField(binary=False)$/;"	v	class:FieldTest.test_uuid_field_string.Person
+api_key	tests/fields/fields.py	/^            api_key = UUIDField(binary=True)$/;"	v	class:FieldTest.test_uuid_field_binary.Person
+append	mongoengine/mongoengine/base/datastructures.py	/^    def append(self, *args, **kwargs):$/;"	m	class:BaseList
+append_to_warning_list	mongoengine/tests/all_warnings/__init__.py	/^    def append_to_warning_list(self, message, category, *args):$/;"	m	class:AllWarnings
+archived	mongoengine/tests/document/instance.py	/^            archived = BooleanField(default=False, required=True)$/;"	v	class:InstanceTest.test_can_save_false_values.Doc
+as_dict	mongoengine/mongoengine/queryset/field_list.py	/^    def as_dict(self):$/;"	m	class:QueryFieldList
+as_pymongo	mongoengine/mongoengine/queryset/base.py	/^    def as_pymongo(self):$/;"	m	class:BaseQuerySet
+assertDbEqual	mongoengine/tests/document/instance.py	/^    def assertDbEqual(self, docs):$/;"	m	class:InstanceTest
+assertDbEqual	mongoengine/tests/queryset/modify.py	/^    def assertDbEqual(self, docs):$/;"	m	class:FindAndModifyTest
+assertHasInstance	mongoengine/tests/document/instance.py	/^    def assertHasInstance(self, field, instance):$/;"	m	class:InstanceTest
+assertSequence	mongoengine/tests/queryset/queryset.py	/^    def assertSequence(self, qs, expected):$/;"	m	class:QuerySetTest
+attachments	mongoengine/tests/queryset/field_list.py	/^            attachments = ListField(EmbeddedDocumentField(Attachment))$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
+author	mongoengine/docs/code/tumblelog.py	/^    author = ReferenceField(User)$/;"	v	class:Post
+author	mongoengine/tests/document/class_methods.py	/^            author = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
+author	mongoengine/tests/document/class_methods.py	/^            author = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPost
+author	mongoengine/tests/document/class_methods.py	/^            author = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPost
+author	mongoengine/tests/document/class_methods.py	/^            author = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPost
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(User)$/;"	v	class:InstanceTest.test_db_alias_tests.AuthorBooks
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(User)$/;"	v	class:InstanceTest.test_db_ref_usage.Book
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(User, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_custom_id_field.Book
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(User, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections.Book
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person)$/;"	v	class:InstanceTest.test_save_reference.BlogPost
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify.BlogPost
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_recurs.BlogPost
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.BlogPost
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_document_inheritance.BlogPost
+author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=DENY)$/;"	v	class:InstanceTest.test_reverse_delete_rule_deny.BlogPost
+author	mongoengine/tests/fields/fields.py	/^            author = EmbeddedDocumentField(Author, required=True)$/;"	v	class:FieldTest.test_recursive_validation.Comment
+author	mongoengine/tests/fields/fields.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:FieldTest.test_embedded_document_inheritance.BlogPost
+author	mongoengine/tests/fields/fields.py	/^            author = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.BlogPost
+author	mongoengine/tests/fields/fields.py	/^            author = LazyReferenceField(Member, dbref=False)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.BlogPost
+author	mongoengine/tests/fields/fields.py	/^            author = LazyReferenceField(Member, dbref=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.BlogPost
+author	mongoengine/tests/fields/fields.py	/^            author = ReferenceField(Member, dbref=False)$/;"	v	class:FieldTest.test_reference_query_conversion.BlogPost
+author	mongoengine/tests/fields/fields.py	/^            author = ReferenceField(Member, dbref=True)$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.BlogPost
+author	mongoengine/tests/fields/fields.py	/^            author = ReferenceField(User)$/;"	v	class:FieldTest.test_reference_validation.BlogPost
+author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.Comments
+author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents.UserComments
+author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
+author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.ModeratorComments
+author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.UserComments
+author	mongoengine/tests/queryset/field_list.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:OnlyExcludeAllTest.test_exclude.BlogPost
+author	mongoengine/tests/queryset/field_list.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:QuerySetTest.test_find_embedded.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:QuerySetTest.test_find_empty_embedded.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person)$/;"	v	class:QuerySetTest.test_cannot_perform_joins_references.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person)$/;"	v	class:QuerySetTest.test_confirm_order_by_reference_wont_work.Author
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person)$/;"	v	class:QuerySetTest.test_query_value_conversion.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person)$/;"	v	class:QuerySetTest.test_reference_field_find.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, dbref=True)$/;"	v	class:QuerySetTest.test_reference_field_find_dbref.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_delete_with_limit_handles_delete_rules.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document.AbstractBlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=DENY)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny.BlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=DENY)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document.AbstractBlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=NULLIFY)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document.AbstractBlogPost
+author	mongoengine/tests/queryset/queryset.py	/^            author=user,$/;"	v	class:QuerySetTest.test_find_embedded.BlogPost
+author	mongoengine/tests/test_dereference.py	/^            author = ReferenceField(User)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.Message
+author	mongoengine/tests/test_dereference.py	/^            author = ReferenceField(User)$/;"	v	class:FieldTest.test_objectid_reference_across_databases.Book
+author	mongoengine/tests/test_dereference.py	/^            author = ReferenceField(User, dbref=False)$/;"	v	class:FieldTest.test_migrate_references.Group
+author	mongoengine/tests/test_dereference.py	/^            author = ReferenceField(User, dbref=True)$/;"	v	class:FieldTest.test_migrate_references.Group
+author	tests/fields/fields.py	/^            author = EmbeddedDocumentField(Author, required=True)$/;"	v	class:FieldTest.test_recursive_validation.Comment
+author	tests/fields/fields.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:FieldTest.test_embedded_document_inheritance.BlogPost
+author	tests/fields/fields.py	/^            author = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.BlogPost
+author	tests/fields/fields.py	/^            author = LazyReferenceField(Member, dbref=False)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.BlogPost
+author	tests/fields/fields.py	/^            author = LazyReferenceField(Member, dbref=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.BlogPost
+author	tests/fields/fields.py	/^            author = ReferenceField(Member, dbref=False)$/;"	v	class:FieldTest.test_reference_query_conversion.BlogPost
+author	tests/fields/fields.py	/^            author = ReferenceField(Member, dbref=True)$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.BlogPost
+author	tests/fields/fields.py	/^            author = ReferenceField(User)$/;"	v	class:FieldTest.test_reference_validation.BlogPost
+author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.Comments
+author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents.UserComments
+author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
+author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.ModeratorComments
+author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.UserComments
+author2	mongoengine/tests/queryset/queryset.py	/^            author2 = GenericReferenceField()$/;"	v	class:QuerySetTest.test_cannot_perform_joins_references.BlogPost
+authors	mongoengine/tests/document/instance.py	/^                authors = MapField(ReferenceField($/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
+authors	mongoengine/tests/document/instance.py	/^            authors = ListField(ReferenceField($/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify_complex_field.BlogPost
+authors	mongoengine/tests/fields/fields.py	/^            authors = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_validation.BlogPost
+authors	mongoengine/tests/queryset/queryset.py	/^                                       authors=[author])$/;"	v	class:QuerySetTest.test_in_operator_on_non_iterable.BlogPost
+authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(EmbeddedDocumentField('Author'))$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Message
+authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(EmbeddedDocumentField(Author))$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField.Book
+authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(EmbeddedDocumentField(Author))$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Book
+authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(ReferenceField(User))$/;"	v	class:QuerySetTest.test_in_operator_on_non_iterable.BlogPost
+authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(ReferenceField(self.Person,$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull.BlogPost
+authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(ReferenceField(self.Person,$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents.AbstractBlogPost
+authors	tests/fields/fields.py	/^            authors = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_validation.BlogPost
+authors_as_lazy	mongoengine/tests/fields/fields.py	/^            authors_as_lazy = ListField(LazyReferenceField(User))$/;"	v	class:FieldTest.test_list_validation.BlogPost
+authors_as_lazy	tests/fields/fields.py	/^            authors_as_lazy = ListField(LazyReferenceField(User))$/;"	v	class:FieldTest.test_list_validation.BlogPost
+auto_creation_counter	mongoengine/mongoengine/base/fields.py	/^    auto_creation_counter = -1$/;"	v	class:BaseField
+autoclass_content	mongoengine/docs/conf.py	/^autoclass_content = 'both'$/;"	v
+average	mongoengine/mongoengine/queryset/base.py	/^    def average(self, field):$/;"	m	class:BaseQuerySet
+b	mongoengine/tests/document/indexes.py	/^            b = IntField()$/;"	v	class:IndexesTest.test_covered_index.Test
+b	mongoengine/tests/document/inheritance.py	/^            b = StringField()$/;"	v	class:InheritanceTest.test_indexes_and_multiple_inheritance.B
+b	mongoengine/tests/document/instance.py	/^            b = EmbeddedDocumentField(B, default=lambda: B())$/;"	v	class:InstanceTest.test_mutating_documents.A
+b	mongoengine/tests/document/instance.py	/^            b = Foo.objects.with_id(a.id)$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit_with_file_field.Foo
+b	mongoengine/tests/fields/fields.py	/^            b = EmbeddedDocumentField(B, db_field='fb')$/;"	v	class:FieldTest.test_double_embedded_db_field.A
+b	mongoengine/tests/fields/fields.py	/^            b = EmbeddedDocumentField(B, db_field='fb')$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.A
+b	mongoengine/tests/fields/fields.py	/^            b=B($/;"	v	class:FieldTest.test_double_embedded_db_field.A
+b	mongoengine/tests/queryset/field_list.py	/^            b = ListField()$/;"	v	class:OnlyExcludeAllTest.test_mix_slice_with_other_fields.MyDoc
+b	mongoengine/tests/queryset/field_list.py	/^            b = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
+b	mongoengine/tests/queryset/field_list.py	/^            b = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
+b	mongoengine/tests/queryset/queryset.py	/^            b = ListField(EmbeddedDocumentField(B))$/;"	v	class:QuerySetTest.test_count_list_embedded.A
+b	mongoengine/tests/queryset/transform.py	/^            b = StringField()$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
+b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i)$/;"	v	class:FieldTest.test_dict_field.Group
+b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i)$/;"	v	class:FieldTest.test_generic_reference.Group
+b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i)$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
+b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i)$/;"	v	class:FieldTest.test_list_field_complex.Group
+b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i).save()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
+b	tests/fields/fields.py	/^            b = EmbeddedDocumentField(B, db_field='fb')$/;"	v	class:FieldTest.test_double_embedded_db_field.A
+b	tests/fields/fields.py	/^            b = EmbeddedDocumentField(B, db_field='fb')$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.A
+b	tests/fields/fields.py	/^            b=B($/;"	v	class:FieldTest.test_double_embedded_db_field.A
+b_name	mongoengine/tests/queryset/queryset.py	/^            b_name = StringField()$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.B
+bar	mongoengine/tests/document/instance.py	/^            bar = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit_with_file_field.Foo
+bar	mongoengine/tests/document/instance.py	/^            bar = ReferenceField(Bar)$/;"	v	class:InstanceTest.test_two_way_reverse_delete_rule.Foo
+bar	mongoengine/tests/document/instance.py	/^            bar = StringField()$/;"	v	class:InstanceTest.test_shard_key_in_embedded_document.Bar
+bar	mongoengine/tests/document/instance.py	/^            bar = StringField(default=None)$/;"	v	class:InstanceTest.test_set_unset_one_operation.FooBar
+bar	mongoengine/tests/queryset/queryset.py	/^            bar = GenericEmbeddedDocumentField(choices=[Bar,])$/;"	v	class:QuerySetTest.test_set_generic_embedded_documents.User
+bar	mongoengine/tests/queryset/queryset.py	/^            bar = ReferenceField("Bar")$/;"	v	class:QuerySetTest.test_distinct_handles_references.Foo
+bar	mongoengine/tests/queryset/queryset.py	/^            bar = ReferenceField("Bar")$/;"	v	class:QuerySetTest.test_distinct_handles_references_to_alias.Foo
+bar	mongoengine/tests/queryset/queryset.py	/^            bar = ReferenceField('Bar')$/;"	v	class:QuerySetTest.test_distinct_ListField_ReferenceField.Foo
+bar	mongoengine/tests/queryset/queryset.py	/^            bar = StringField(default='bar')$/;"	v	class:QuerySetTest.test_custom_manager_overriding_objects_works.Foo
+bar	mongoengine/tests/test_dereference.py	/^            bar = ReferenceField('Bar')$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Foo
+bar_lst	mongoengine/tests/queryset/queryset.py	/^            bar_lst = ListField(ReferenceField('Bar'))$/;"	v	class:QuerySetTest.test_distinct_ListField_ReferenceField.Foo
+bars	mongoengine/tests/fields/fields.py	/^            bars = ListField(ReferenceField("Bar"))$/;"	v	class:FieldTest.test_list_field_passed_in_value.Foo
+bars	tests/fields/fields.py	/^            bars = ListField(ReferenceField("Bar"))$/;"	v	class:FieldTest.test_list_field_passed_in_value.Foo
+batch_size	mongoengine/mongoengine/queryset/base.py	/^    def batch_size(self, size):$/;"	m	class:BaseQuerySet
+baz	mongoengine/tests/test_dereference.py	/^            baz = ReferenceField('Baz')$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Foo
+blob	mongoengine/tests/fields/fields.py	/^            blob = BinaryField()$/;"	v	class:FieldTest.test_binary_fields.Attachment
+blob	mongoengine/tests/fields/fields.py	/^            blob = BinaryField()$/;"	v	class:FieldTest.test_binary_validation.Attachment
+blob	mongoengine/tests/fields/fields.py	/^            blob = BinaryField(max_bytes=4)$/;"	v	class:FieldTest.test_binary_validation.AttachmentSizeLimit
+blob	mongoengine/tests/fields/fields.py	/^            blob = BinaryField(required=True)$/;"	v	class:FieldTest.test_binary_validation.AttachmentRequired
+blob	mongoengine/tests/fields/fields.py	/^            blob=six.b('\\xe6\\x00\\xc4\\xff\\x07'))$/;"	v	class:FieldTest.test_binary_validation.AttachmentSizeLimit
+blob	tests/fields/fields.py	/^            blob = BinaryField()$/;"	v	class:FieldTest.test_binary_fields.Attachment
+blob	tests/fields/fields.py	/^            blob = BinaryField()$/;"	v	class:FieldTest.test_binary_validation.Attachment
+blob	tests/fields/fields.py	/^            blob = BinaryField(max_bytes=4)$/;"	v	class:FieldTest.test_binary_validation.AttachmentSizeLimit
+blob	tests/fields/fields.py	/^            blob = BinaryField(required=True)$/;"	v	class:FieldTest.test_binary_validation.AttachmentRequired
+blob	tests/fields/fields.py	/^            blob=six.b('\\xe6\\x00\\xc4\\xff\\x07'))$/;"	v	class:FieldTest.test_binary_validation.AttachmentSizeLimit
+blog	mongoengine/tests/queryset/queryset.py	/^            blog = Blog.objects.first()$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+blog	mongoengine/tests/queryset/queryset.py	/^            blog = ReferenceField(Blog)$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+blog	mongoengine/tests/queryset/queryset.py	/^            blog=blog_1,$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+blog	mongoengine/tests/queryset/queryset.py	/^            blog=blog_2,$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+blog	mongoengine/tests/queryset/queryset.py	/^            blog=blog_3,$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+blogs	mongoengine/tests/queryset/queryset.py	/^            blogs = Blog.objects$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+blogs	mongoengine/tests/queryset/queryset.py	/^            blogs = []$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+body	mongoengine/tests/queryset/field_list.py	/^            body = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
+body	mongoengine/tests/queryset/field_list.py	/^            body = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
+body	mongoengine/tests/test_dereference.py	/^            body = StringField()$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Post
+book	mongoengine/tests/document/instance.py	/^            book = ReferenceField(Book)$/;"	v	class:InstanceTest.test_db_alias_tests.AuthorBooks
+bookmark_object	mongoengine/tests/fields/fields.py	/^            bookmark_object = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference.Bookmark
+bookmark_object	mongoengine/tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=('Post', Link))$/;"	v	class:FieldTest.test_generic_reference_string_choices.Bookmark
+bookmark_object	mongoengine/tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=(Post, ))$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Bookmark
+bookmark_object	mongoengine/tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=(Post,))$/;"	v	class:FieldTest.test_generic_reference_choices.Bookmark
+bookmark_object	tests/fields/fields.py	/^            bookmark_object = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference.Bookmark
+bookmark_object	tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=('Post', Link))$/;"	v	class:FieldTest.test_generic_reference_string_choices.Bookmark
+bookmark_object	tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=(Post, ))$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Bookmark
+bookmark_object	tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=(Post,))$/;"	v	class:FieldTest.test_generic_reference_choices.Bookmark
+bookmarks	mongoengine/tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_document_not_registered.User
+bookmarks	mongoengine/tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_list.User
+bookmarks	mongoengine/tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.User
+bookmarks	mongoengine/tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField(choices=(Post,)))$/;"	v	class:FieldTest.test_generic_reference_list_choices.User
+bookmarks	tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_document_not_registered.User
+bookmarks	tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_list.User
+bookmarks	tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.User
+bookmarks	tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField(choices=(Post,)))$/;"	v	class:FieldTest.test_generic_reference_list_choices.User
+bool_info	mongoengine/tests/fields/fields.py	/^            bool_info = ListField(BooleanField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
+bool_info	tests/fields/fields.py	/^            bool_info = ListField(BooleanField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
+boolean_field	mongoengine/tests/document/instance.py	/^            boolean_field = BooleanField(default=True)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+boolean_field	mongoengine/tests/document/json_serialisation.py	/^            boolean_field = BooleanField(default=True)$/;"	v	class:TestJson.test_json_complex.Doc
+boolean_field	mongoengine/tests/queryset/queryset.py	/^            boolean_field = BooleanField(default=True)$/;"	v	class:QuerySetTest.test_json_complex.Doc
+boolfield	mongoengine/tests/queryset/queryset.py	/^            boolfield = BooleanField(default=False)$/;"	v	class:QuerySetTest.test_chaining.B
+boss	mongoengine/tests/fields/fields.py	/^            boss = ReferenceField('self')$/;"	v	class:FieldTest.test_recursive_reference.Employee
+boss	mongoengine/tests/test_dereference.py	/^            boss = ReferenceField('self')$/;"	v	class:FieldTest.test_recursive_reference.Employee
+boss	tests/fields/fields.py	/^            boss = ReferenceField('self')$/;"	v	class:FieldTest.test_recursive_reference.Employee
+brands	mongoengine/tests/test_dereference.py	/^            brands = ListField(ReferenceField("Brand", dbref=True))$/;"	v	class:FieldTest.test_non_ascii_pk.BrandGroup
+build_dict	mongoengine/mongoengine/errors.py	/^        def build_dict(source):$/;"	f	function:ValidationError.to_dict
+build_lazyref	mongoengine/fields.py	/^    def build_lazyref(self, value):$/;"	m	class:GenericLazyReferenceField
+build_lazyref	mongoengine/fields.py	/^    def build_lazyref(self, value):$/;"	m	class:LazyReferenceField
+build_lazyref	mongoengine/mongoengine/fields.py	/^    def build_lazyref(self, value):$/;"	m	class:GenericLazyReferenceField
+build_lazyref	mongoengine/mongoengine/fields.py	/^    def build_lazyref(self, value):$/;"	m	class:LazyReferenceField
+bulk_create_author	mongoengine/tests/test_signals.py	/^        def bulk_create_author():$/;"	f	function:SignalTests.test_signal_kwargs
+bulk_create_author_with_load	mongoengine/tests/test_signals.py	/^        def bulk_create_author_with_load():$/;"	f	function:SignalTests.test_model_signals
+bulk_create_author_without_load	mongoengine/tests/test_signals.py	/^        def bulk_create_author_without_load():$/;"	f	function:SignalTests.test_model_signals
+bulk_set_active_post	mongoengine/tests/test_signals.py	/^        def bulk_set_active_post():$/;"	f	function:SignalTests.test_signals_bulk_insert
+by	mongoengine/tests/queryset/queryset.py	/^            by = StringField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator.Comment
+by	mongoengine/tests/queryset/queryset.py	/^            by = StringField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.Comment
+c	mongoengine/tests/document/indexes.py	/^            c = StringField()$/;"	v	class:IndexesTest.test_index_no_cls.B
+c	mongoengine/tests/fields/fields.py	/^                c=C(txt='hi')$/;"	v	class:FieldTest.test_double_embedded_db_field.A
+c	mongoengine/tests/fields/fields.py	/^            c = EmbeddedDocumentField(C, db_field='fc')$/;"	v	class:FieldTest.test_double_embedded_db_field.B
+c	mongoengine/tests/fields/fields.py	/^            c = EmbeddedDocumentField(C, db_field='fc')$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.B
+c	mongoengine/tests/queryset/field_list.py	/^            c = ListField()$/;"	v	class:OnlyExcludeAllTest.test_mix_slice_with_other_fields.MyDoc
+c	mongoengine/tests/queryset/field_list.py	/^            c = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
+c	mongoengine/tests/queryset/field_list.py	/^            c = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
+c	mongoengine/tests/queryset/queryset.py	/^            c = StringField()$/;"	v	class:QuerySetTest.test_count_list_embedded.B
+c	mongoengine/tests/queryset/transform.py	/^            c = StringField()$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
+c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i)$/;"	v	class:FieldTest.test_dict_field.Group
+c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i)$/;"	v	class:FieldTest.test_generic_reference.Group
+c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i)$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
+c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i)$/;"	v	class:FieldTest.test_list_field_complex.Group
+c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i).save()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
+c	tests/fields/fields.py	/^                c=C(txt='hi')$/;"	v	class:FieldTest.test_double_embedded_db_field.A
+c	tests/fields/fields.py	/^            c = EmbeddedDocumentField(C, db_field='fc')$/;"	v	class:FieldTest.test_double_embedded_db_field.B
+c	tests/fields/fields.py	/^            c = EmbeddedDocumentField(C, db_field='fc')$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.B
+c_field	mongoengine/tests/document/instance.py	/^            c_field = StringField(default='cfield')$/;"	v	class:InstanceTest.test_mutating_documents.C
+c_field	mongoengine/tests/fields/fields.py	/^            c_field = IntField(custom_data=custom_data)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_custom_data.CustomData
+c_field	tests/fields/fields.py	/^            c_field = IntField(custom_data=custom_data)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_custom_data.CustomData
+cache	mongoengine/mongoengine/queryset/queryset.py	/^    def cache(self):$/;"	m	class:QuerySetNoCache
+cascade_save	mongoengine/mongoengine/document.py	/^    def cascade_save(self, **kwargs):$/;"	m	class:Document
+cat	mongoengine/tests/queryset/queryset.py	/^            cat = ReferenceField(Category, reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle.Dummy
+categories	mongoengine/tests/document/indexes.py	/^            categories = ListField()$/;"	v	class:IndexesTest.test_index_on_id.BlogPost
+categories	mongoengine/tests/fields/fields.py	/^            categories = SortedListField(EmbeddedDocumentField(Category),$/;"	v	class:FieldTest.test_reverse_list_sorting.CategoryList
+categories	tests/fields/fields.py	/^            categories = SortedListField(EmbeddedDocumentField(Category),$/;"	v	class:FieldTest.test_reverse_list_sorting.CategoryList
+category	mongoengine/tests/document/indexes.py	/^            category = StringField()$/;"	v	class:IndexesTest._index_test.BlogPost
+category	mongoengine/tests/document/indexes.py	/^            category = StringField()$/;"	v	class:IndexesTest._index_test_inheritance.BlogPost
+category	mongoengine/tests/document/indexes.py	/^            category = StringField()$/;"	v	class:IndexesTest.test_dictionary_indexes.BlogPost
+category	mongoengine/tests/queryset/queryset.py	/^            category = ReferenceField(Category, reverse_delete_rule=NULLIFY)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify.BlogPost
+cdt_f	mongoengine/tests/queryset/queryset.py	/^            cdt_f = ComplexDateTimeField()$/;"	v	class:QuerySetTest.test_update_validate.Doc
+cdt_fld	mongoengine/tests/document/instance.py	/^            cdt_fld = ComplexDateTimeField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
+ceo	mongoengine/tests/queryset/queryset.py	/^            ceo = ReferenceField(User)$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
+check_fields_type	mongoengine/tests/fields/fields.py	/^        def check_fields_type(occ):$/;"	f	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
+check_fields_type	mongoengine/tests/fields/fields.py	/^        def check_fields_type(occ):$/;"	f	function:LazyReferenceFieldTest.test_lazy_reference_embedded
+check_fields_type	tests/fields/fields.py	/^        def check_fields_type(occ):$/;"	f	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
+check_fields_type	tests/fields/fields.py	/^        def check_fields_type(occ):$/;"	f	function:LazyReferenceFieldTest.test_lazy_reference_embedded
+child	mongoengine/tests/queryset/queryset.py	/^            child = Category(name=child_name, parent=base)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
+child_child	mongoengine/tests/queryset/queryset.py	/^                child_child = Category(name=child_child_name, parent=child)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
+child_child_name	mongoengine/tests/queryset/queryset.py	/^                child_child_name = 'Child-Child-%i' % i$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
+child_name	mongoengine/tests/queryset/queryset.py	/^            child_name = 'Child-%i' % i$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
+children	mongoengine/tests/document/instance.py	/^            children = ListField(ReferenceField('self', reverse_delete_rule=PULL))$/;"	v	class:InstanceTest.test_reverse_delete_rule_pull.Record
+children	mongoengine/tests/fields/fields.py	/^            children = ListField(EmbeddedDocumentField('TreeNode'))$/;"	v	class:FieldTest.test_recursive_embedding.Tree
+children	mongoengine/tests/fields/fields.py	/^            children = ListField(EmbeddedDocumentField('self'))$/;"	v	class:FieldTest.test_recursive_embedding.TreeNode
+children	mongoengine/tests/test_dereference.py	/^            children = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
+children	tests/fields/fields.py	/^            children = ListField(EmbeddedDocumentField('TreeNode'))$/;"	v	class:FieldTest.test_recursive_embedding.Tree
+children	tests/fields/fields.py	/^            children = ListField(EmbeddedDocumentField('self'))$/;"	v	class:FieldTest.test_recursive_embedding.TreeNode
+choices	mongoengine/tests/fields/fields.py	/^                                choices=('Small', 'Baggy', 'wide'),$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+choices	mongoengine/tests/fields/fields.py	/^                               choices=('S', 'M', 'L', 'XL', 'XXL'))$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+choices	mongoengine/tests/fields/fields.py	/^                               choices=('S', 'M', 'L', 'XL', 'XXL'))$/;"	v	class:FieldTest.test_simple_choices_validation.Shirt
+choices	mongoengine/tests/fields/fields.py	/^                choices=TPS)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+choices	mongoengine/tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+choices	mongoengine/tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+choices	mongoengine/tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+choices	mongoengine/tests/queryset/queryset.py	/^                choices=[Foo, ]))$/;"	v	class:QuerySetTest.test_pull_in_genericembedded_field.Bar
+choices	tests/fields/fields.py	/^                                choices=('Small', 'Baggy', 'wide'),$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+choices	tests/fields/fields.py	/^                               choices=('S', 'M', 'L', 'XL', 'XXL'))$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+choices	tests/fields/fields.py	/^                               choices=('S', 'M', 'L', 'XL', 'XXL'))$/;"	v	class:FieldTest.test_simple_choices_validation.Shirt
+choices	tests/fields/fields.py	/^                choices=TPS)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+choices	tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+choices	tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+choices	tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+circular_reference_deltas	mongoengine/tests/document/delta.py	/^    def circular_reference_deltas(self, DocClass1, DocClass2):$/;"	m	class:DeltaTest
+circular_reference_deltas_2	mongoengine/tests/document/delta.py	/^    def circular_reference_deltas_2(self, DocClass1, DocClass2, dbref=True):$/;"	m	class:DeltaTest
+city	mongoengine/tests/document/dynamic.py	/^            city = StringField()$/;"	v	class:DynamicTest.test_dynamic_and_embedded.Address
+city	mongoengine/tests/document/dynamic.py	/^            city = StringField()$/;"	v	class:DynamicTest.test_dynamic_and_embedded_dict_access.Address
+city	mongoengine/tests/document/dynamic.py	/^            city = StringField()$/;"	v	class:DynamicTest.test_dynamic_embedded_works_with_only.Address
+city	mongoengine/tests/fields/fields.py	/^            city = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_is_none.Person
+city	mongoengine/tests/queryset/queryset.py	/^            city = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_null_values.Person
+city	mongoengine/tests/queryset/queryset.py	/^            city = StringField()$/;"	v	class:QuerySetTest.test_scalar_embedded.Locale
+city	tests/fields/fields.py	/^            city = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_is_none.Person
+city_id	mongoengine/tests/document/inheritance.py	/^            city_id = IntField(primary_key=True)$/;"	v	class:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class.City
+clean	mongoengine/mongoengine/base/document.py	/^    def clean(self):$/;"	m	class:BaseDocument
+clean	mongoengine/tests/document/instance.py	/^            def clean(self):$/;"	m	class:InstanceTest.test_document_clean.TestDocument
+clean	mongoengine/tests/document/instance.py	/^            def clean(self):$/;"	m	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
+clear	mongoengine/mongoengine/base/datastructures.py	/^    def clear(self, *args, **kwargs):$/;"	m	class:BaseDict
+clone	mongoengine/mongoengine/queryset/base.py	/^    def clone(self):$/;"	m	class:BaseQuerySet
+close	mongoengine/fields.py	/^    def close(self):$/;"	m	class:GridFSProxy
+close	mongoengine/mongoengine/fields.py	/^    def close(self):$/;"	m	class:GridFSProxy
+collaborators	mongoengine/tests/queryset/queryset.py	/^            collaborators = EmbeddedDocumentField(Collaborator)$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Site
+collaborators	mongoengine/tests/queryset/queryset.py	/^            collaborators = ListField(EmbeddedDocumentField(Collaborator))$/;"	v	class:QuerySetTest.test_pull_nested.Site
+collaborators	mongoengine/tests/queryset/queryset.py	/^            collaborators = MapField($/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
+collection_name	mongoengine/tests/fields/file_tests.py	/^                                 collection_name="macumba")$/;"	v	class:FileTest.test_file_multidb.TestFile
+color	mongoengine/tests/fields/fields.py	/^            color = StringField(max_length=1, choices=COLORS)$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
+color	mongoengine/tests/queryset/queryset.py	/^            color = StringField()$/;"	v	class:QuerySetTest.test_elem_match.Foo
+color	tests/fields/fields.py	/^            color = StringField(max_length=1, choices=COLORS)$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
+comment	mongoengine/mongoengine/queryset/base.py	/^    def comment(self, text):$/;"	m	class:BaseQuerySet
+comment	mongoengine/tests/document/instance.py	/^            comment = StringField()$/;"	v	class:InstanceTest.test_list_search_by_embedded.Comment
+comment	mongoengine/tests/document/instance.py	/^            comment = StringField()$/;"	v	class:InstanceTest.test_mixin_inheritance.DoubleMixIn
+comment	mongoengine/tests/queryset/queryset.py	/^            comment = ReferenceField(Comment)$/;"	v	class:QuerySetTest.test_unset_reference.Post
+comment1	mongoengine/tests/queryset/queryset.py	/^            comment1 = Comment(name='testa')$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+comment2	mongoengine/tests/queryset/queryset.py	/^            comment2 = Comment(name='testb')$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+comment_id	mongoengine/tests/document/indexes.py	/^            comment_id = IntField(required=True)$/;"	v	class:IndexesTest.test_index_with_pk.Comment
+comments	mongoengine/docs/code/tumblelog.py	/^    comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:Post
+comments	mongoengine/tests/document/indexes.py	/^                comments = EmbeddedDocumentField(Comment)$/;"	v	class:IndexesTest.test_index_with_pk.Comment.BlogPost
+comments	mongoengine/tests/document/instance.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:InstanceTest.test_list_search_by_embedded.Page
+comments	mongoengine/tests/document/instance.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:InstanceTest.test_save_list.BlogPost
+comments	mongoengine/tests/document/instance.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:InstanceTest.test_save_only_changed_fields_recursive.User
+comments	mongoengine/tests/fields/fields.py	/^             comments=[Comment(content="NoSQL Rocks"),$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
+comments	mongoengine/tests/fields/fields.py	/^            comments = EmbeddedDocumentListField(Comments)$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.BlogPost
+comments	mongoengine/tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents.BlogPost
+comments	mongoengine/tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.BlogPost
+comments	mongoengine/tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents_invalid.BlogPost
+comments	mongoengine/tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
+comments	mongoengine/tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_list_validation.BlogPost
+comments	mongoengine/tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_recursive_validation.Post
+comments	mongoengine/tests/fields/fields.py	/^            comments = SortedListField(EmbeddedDocumentField(Comment),$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
+comments	mongoengine/tests/queryset/field_list.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:OnlyExcludeAllTest.test_exclude.BlogPost
+comments	mongoengine/tests/queryset/field_list.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.BlogPost
+comments	mongoengine/tests/queryset/queryset.py	/^             comments=[comm1, comm2]).save()$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Post
+comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField("Comment"))$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Post
+comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_bulk_insert.Post
+comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_find_array_position.Post
+comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_update_array_position.Post
+comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_update_using_positional_operator.BlogPost
+comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.BlogPost
+comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment),$/;"	v	class:QuerySetTest.test_exec_js_field_sub.BlogPost
+comments	mongoengine/tests/queryset/transform.py	/^            comments = ListField(EmbeddedDocumentField(Comment),$/;"	v	class:TransformTest.test_query_field_name.BlogPost
+comments	mongoengine/tests/test_dereference.py	/^            comments = ListField(ReferenceField(Comment))$/;"	v	class:FieldTest.test_list_lookup_not_checked_in_map.Message
+comments	tests/fields/fields.py	/^             comments=[Comment(content="NoSQL Rocks"),$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
+comments	tests/fields/fields.py	/^            comments = EmbeddedDocumentListField(Comments)$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.BlogPost
+comments	tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents.BlogPost
+comments	tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.BlogPost
+comments	tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents_invalid.BlogPost
+comments	tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
+comments	tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_list_validation.BlogPost
+comments	tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_recursive_validation.Post
+comments	tests/fields/fields.py	/^            comments = SortedListField(EmbeddedDocumentField(Comment),$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
+comments_dict	mongoengine/tests/document/instance.py	/^            comments_dict = DictField()$/;"	v	class:InstanceTest.test_save_only_changed_fields_recursive.User
+comp_dt_fld	mongoengine/tests/fields/fields.py	/^            comp_dt_fld = ComplexDateTimeField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+comp_dt_fld	mongoengine/tests/fields/fields.py	/^            comp_dt_fld = ComplexDateTimeField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
+comp_dt_fld	tests/fields/fields.py	/^            comp_dt_fld = ComplexDateTimeField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+comp_dt_fld	tests/fields/fields.py	/^            comp_dt_fld = ComplexDateTimeField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
+company	mongoengine/tests/fields/fields.py	/^            company = ReferenceField('Company')$/;"	v	class:FieldTest.test_undefined_reference.Product
+company	tests/fields/fields.py	/^            company = ReferenceField('Company')$/;"	v	class:FieldTest.test_undefined_reference.Product
+compare_indexes	mongoengine/mongoengine/document.py	/^    def compare_indexes(cls):$/;"	m	class:Document
+complex_datetime_field	mongoengine/tests/document/instance.py	/^            complex_datetime_field = ComplexDateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+complex_datetime_field	mongoengine/tests/document/json_serialisation.py	/^            complex_datetime_field = ComplexDateTimeField(default=datetime.now)$/;"	v	class:TestJson.test_json_complex.Doc
+complex_datetime_field	mongoengine/tests/queryset/queryset.py	/^            complex_datetime_field = ComplexDateTimeField(default=datetime.datetime.now)$/;"	v	class:QuerySetTest.test_json_complex.Doc
+connect	mongoengine/mongoengine/connection.py	/^def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):$/;"	f
+content	mongoengine/docs/code/tumblelog.py	/^    content = StringField()$/;"	v	class:Comment
+content	mongoengine/docs/code/tumblelog.py	/^    content = StringField()$/;"	v	class:TextPost
+content	mongoengine/tests/document/dynamic.py	/^            content = URLField()$/;"	v	class:DynamicTest.test_complex_embedded_document_validation.Embedded
+content	mongoengine/tests/document/inheritance.py	/^            content = StringField()$/;"	v	class:InheritanceTest.test_allow_inheritance_embedded_document.Comment
+content	mongoengine/tests/document/instance.py	/^                content = StringField()$/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_embedded_document.Comment
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify.BlogPost
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify_complex_field.BlogPost
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_recurs.BlogPost
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.BlogPost
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_deny.BlogPost
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_document_inheritance.BlogPost
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_save_list.BlogPost
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_save_list.Comment
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_save_reference.BlogPost
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_two_way_reverse_delete_rule.Bar
+content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_two_way_reverse_delete_rule.Foo
+content	mongoengine/tests/document/validation.py	/^            content = StringField(required=True)$/;"	v	class:ValidatorErrorTest.test_embedded_document_validation.Comment
+content	mongoengine/tests/fields/fields.py	/^            content = ListField(StringField())$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Group
+content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.BlogPost
+content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_embedded_document_validation.Comment
+content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_list_validation.BlogPost
+content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_list_validation.Comment
+content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_reference_validation.BlogPost
+content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
+content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_sorted_list_sorting.Comment
+content	mongoengine/tests/fields/fields.py	/^            content = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_sequence_field.Comment
+content	mongoengine/tests/fields/fields.py	/^            content = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Comment
+content	mongoengine/tests/queryset/field_list.py	/^            content = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.BlogPost
+content	mongoengine/tests/queryset/field_list.py	/^            content = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Attachment
+content	mongoengine/tests/queryset/field_list.py	/^            content = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^             content="Com o brasil nas quartas de finais teremos um "$/;"	v	class:QuerySetTest.test_text_indexes.News
+content	mongoengine/tests/queryset/queryset.py	/^             content="O Brasil sofre com a perda de Neymar").save()$/;"	v	class:QuerySetTest.test_text_indexes.News
+content	mongoengine/tests/queryset/queryset.py	/^             content=u"A candidata dilma roussef já começa o teu planejamento",$/;"	v	class:QuerySetTest.test_text_indexes.News
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_delete_with_limit_handles_delete_rules.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_find_embedded.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_find_empty_embedded.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_in_operator_on_non_iterable.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reference_field_find.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reference_field_find_dbref.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents.BlogPost
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_text_indexes.News
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Comment
+content	mongoengine/tests/queryset/queryset.py	/^            content = StringField(db_field='body')$/;"	v	class:QuerySetTest.test_exec_js_field_sub.Comment
+content	mongoengine/tests/queryset/queryset.py	/^            content='Had a good coffee today...'$/;"	v	class:QuerySetTest.test_find_embedded.BlogPost
+content	mongoengine/tests/queryset/transform.py	/^            content = StringField(db_field='commentContent')$/;"	v	class:TransformTest.test_query_field_name.Comment
+content	mongoengine/tests/test_signals.py	/^            content = StringField()$/;"	v	class:SignalTests.setUp.Post
+content	tests/fields/fields.py	/^            content = ListField(StringField())$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Group
+content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.BlogPost
+content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_embedded_document_validation.Comment
+content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_list_validation.BlogPost
+content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_list_validation.Comment
+content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_reference_validation.BlogPost
+content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
+content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_sorted_list_sorting.Comment
+content	tests/fields/fields.py	/^            content = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_sequence_field.Comment
+content	tests/fields/fields.py	/^            content = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Comment
+content_type	mongoengine/tests/fields/fields.py	/^            content_type = StringField()$/;"	v	class:FieldTest.test_binary_fields.Attachment
+content_type	mongoengine/tests/queryset/field_list.py	/^            content_type = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
+content_type	mongoengine/tests/queryset/field_list.py	/^            content_type = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
+content_type	tests/fields/fields.py	/^            content_type = StringField()$/;"	v	class:FieldTest.test_binary_fields.Attachment
+continent	mongoengine/tests/document/inheritance.py	/^            continent = StringField()$/;"	v	class:InheritanceTest.test_abstract_document_creation_does_not_fail.City
+continent	mongoengine/tests/document/inheritance.py	/^            continent = StringField()$/;"	v	class:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly.City
+continent	mongoengine/tests/document/inheritance.py	/^            continent = StringField()$/;"	v	class:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class.City
+continent	mongoengine/tests/document/inheritance.py	/^            continent = StringField()$/;"	v	class:InheritanceTest.test_auto_id_vs_non_pk_id_field.City
+continent	mongoengine/tests/queryset/queryset.py	/^            continent = EmbeddedDocumentField(Continent)$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Country
+continent_name	mongoengine/tests/queryset/queryset.py	/^            continent_name = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Continent
+copyright	mongoengine/docs/conf.py	/^copyright = u'2009, MongoEngine Authors'$/;"	v
+count	mongoengine/mongoengine/base/datastructures.py	/^    def count(self):$/;"	m	class:EmbeddedDocumentList
+count	mongoengine/mongoengine/queryset/base.py	/^    def count(self, with_limit_and_skip=False):$/;"	m	class:BaseQuerySet
+count	mongoengine/mongoengine/queryset/queryset.py	/^    def count(self, with_limit_and_skip=False):$/;"	m	class:QuerySet
+count	mongoengine/tests/document/instance.py	/^            count = IntField()$/;"	v	class:InstanceTest.test_mixin_inheritance.BaseMixIn
+count	mongoengine/tests/document/instance.py	/^            count = IntField()$/;"	v	class:InstanceTest.test_save_to_a_value_that_equates_to_false.Thing
+count	mongoengine/tests/document/instance.py	/^            count = IntField(default=0)$/;"	v	class:InstanceTest.test_save_atomicity_condition.Widget
+count	mongoengine/tests/document/instance.py	/^            count = IntField(default=1)$/;"	v	class:InstanceTest.test_invalid_son.Word
+count	mongoengine/tests/fields/fields.py	/^            count = IntField()$/;"	v	class:FieldTest.test_reverse_list_sorting.Category
+count	tests/fields/fields.py	/^            count = IntField()$/;"	v	class:FieldTest.test_reverse_list_sorting.Category
+counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
+counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
+counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Bar
+counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Foo
+counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_sequence_fields_reload.Animal
+counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
+counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
+counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Bar
+counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Foo
+counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_sequence_fields_reload.Animal
+country	mongoengine/tests/queryset/queryset.py	/^            country = EmbeddedDocumentField(Country)$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Author
+country	mongoengine/tests/queryset/queryset.py	/^            country = StringField()$/;"	v	class:QuerySetTest.test_scalar_embedded.Locale
+country_name	mongoengine/tests/queryset/queryset.py	/^            country_name = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Country
+create	mongoengine/mongoengine/base/datastructures.py	/^    def create(cls, allowed_keys):$/;"	m	class:StrictDict
+create	mongoengine/mongoengine/base/datastructures.py	/^    def create(self, **values):$/;"	m	class:EmbeddedDocumentList
+create	mongoengine/mongoengine/queryset/base.py	/^    def create(self, **kwargs):$/;"	m	class:BaseQuerySet
+create_author	mongoengine/tests/test_signals.py	/^        def create_author():$/;"	f	function:SignalTests.test_model_signals
+create_index	mongoengine/mongoengine/document.py	/^    def create_index(cls, keys, background=False, **kwargs):$/;"	m	class:Document
+created	mongoengine/tests/document/indexes.py	/^            created = DateTimeField(default=datetime.now)$/;"	v	class:IndexesTest.test_ttl_indexes.Log
+created	mongoengine/tests/document/instance.py	/^            created = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_reference_inheritance.Stats
+created	mongoengine/tests/fields/fields.py	/^                        created=datetime.datetime(2014, 6, 12))$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+created	mongoengine/tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
+created	mongoengine/tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
+created	mongoengine/tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+created	mongoengine/tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
+created	tests/fields/fields.py	/^                        created=datetime.datetime(2014, 6, 12))$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+created	tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
+created	tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
+created	tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+created	tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
+created_on	mongoengine/tests/document/instance.py	/^            created_on = DateTimeField(default=lambda: datetime.utcnow())$/;"	v	class:InstanceTest.test_default_values.Person
+created_user	mongoengine/tests/queryset/visitor.py	/^            created_user = ReferenceField(User)$/;"	v	class:QTest.test_q_with_dbref.Post
+creation_counter	mongoengine/mongoengine/base/fields.py	/^    creation_counter = 0$/;"	v	class:BaseField
+current	mongoengine/tests/document/indexes.py	/^            current = DictField(field=EmbeddedDocumentField('EmbeddedLocation'))$/;"	v	class:IndexesTest.test_explicit_geo2d_index_embedded.Place
+cursor_args_fields	mongoengine/tests/queryset/queryset.py	/^            cursor_args_fields = cursor_args['fields']$/;"	v	class:QuerySetTest.test_text_indexes.News
+cursor_args_fields	mongoengine/tests/queryset/queryset.py	/^            cursor_args_fields = cursor_args['projection']$/;"	v	class:QuerySetTest.test_text_indexes.News
+cust_id	mongoengine/tests/document/indexes.py	/^            cust_id = IntField(unique=True, required=True)$/;"	v	class:IndexesTest.test_unique_and_indexes.Customer
+custom	mongoengine/tests/document/class_methods.py	/^            custom = DictField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithCustomField
+d	mongoengine/tests/document/indexes.py	/^            d = StringField()$/;"	v	class:IndexesTest.test_index_no_cls.B
+d	mongoengine/tests/fields/fields.py	/^            d = datetime.datetime(i, 1, 1, 0, 0, 1)$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+d	mongoengine/tests/fields/fields.py	/^            d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+d	mongoengine/tests/queryset/field_list.py	/^            d = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
+d	mongoengine/tests/queryset/field_list.py	/^            d = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
+d	tests/fields/fields.py	/^            d = datetime.datetime(i, 1, 1, 0, 0, 1)$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+d	tests/fields/fields.py	/^            d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+d1	mongoengine/tests/fields/fields.py	/^            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)$/;"	v	class:FieldTest.test_datetime.LogEntry
+d1	mongoengine/tests/fields/fields.py	/^            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, i)$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+d1	tests/fields/fields.py	/^            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)$/;"	v	class:FieldTest.test_datetime.LogEntry
+d1	tests/fields/fields.py	/^            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, i)$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+d2	mongoengine/tests/fields/fields.py	/^            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)$/;"	v	class:FieldTest.test_datetime.LogEntry
+d2	tests/fields/fields.py	/^            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)$/;"	v	class:FieldTest.test_datetime.LogEntry
+data	mongoengine/tests/document/instance.py	/^            data = StringField()$/;"	v	class:InstanceTest.test_mixin_inheritance.BaseMixIn
+data	mongoengine/tests/fields/fields.py	/^            data = DictField()$/;"	v	class:FieldTest.test_ensure_unique_default_instances.D
+data	mongoengine/tests/queryset/queryset.py	/^            data = EmbeddedDocumentField(Data, required=True)$/;"	v	class:QuerySetTest.test_item_frequencies_with_null_embedded.Person
+data	tests/fields/fields.py	/^            data = DictField()$/;"	v	class:FieldTest.test_ensure_unique_default_instances.D
+data2	mongoengine/tests/fields/fields.py	/^            data2 = DictField(default=lambda: {})$/;"	v	class:FieldTest.test_ensure_unique_default_instances.D
+data2	tests/fields/fields.py	/^            data2 = DictField(default=lambda: {})$/;"	v	class:FieldTest.test_ensure_unique_default_instances.D
+date	mongoengine/tests/document/indexes.py	/^            date = DateTimeField(db_field='addDate', default=datetime.now)$/;"	v	class:IndexesTest._index_test.BlogPost
+date	mongoengine/tests/document/indexes.py	/^            date = DateTimeField(db_field='addDate', default=datetime.now)$/;"	v	class:IndexesTest._index_test_inheritance.BlogPost
+date	mongoengine/tests/document/indexes.py	/^            date = DateTimeField(db_field='addDate', default=datetime.now)$/;"	v	class:IndexesTest.test_dictionary_indexes.BlogPost
+date	mongoengine/tests/document/indexes.py	/^            date = EmbeddedDocumentField(Date)$/;"	v	class:IndexesTest.test_embedded_document_index.BlogPost
+date	mongoengine/tests/document/indexes.py	/^            date = EmbeddedDocumentField(Date)$/;"	v	class:IndexesTest.test_unique_with.BlogPost
+date	mongoengine/tests/document/instance.py	/^            date = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_capped_collection.Log
+date	mongoengine/tests/document/instance.py	/^            date = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_capped_collection_default.Log
+date	mongoengine/tests/document/instance.py	/^            date = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_capped_collection_no_max_size_problems.Log
+date	mongoengine/tests/document/validation.py	/^            date = DateTimeField()$/;"	v	class:ValidatorErrorTest.test_embedded_document_validation.Comment
+date	mongoengine/tests/fields/fields.py	/^                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date	mongoengine/tests/fields/fields.py	/^            date = ComplexDateTimeField()$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+date	mongoengine/tests/fields/fields.py	/^            date = ComplexDateTimeField()$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date	mongoengine/tests/fields/fields.py	/^            date = DateTimeField()$/;"	v	class:FieldTest.test_datetime.LogEntry
+date	mongoengine/tests/fields/fields.py	/^            date = DateTimeField()$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+date	mongoengine/tests/fixtures.py	/^    date = DateTimeField(default=datetime.now)$/;"	v	class:PickleDynamicEmbedded
+date	mongoengine/tests/fixtures.py	/^    date = DateTimeField(default=datetime.now)$/;"	v	class:PickleEmbedded
+date	mongoengine/tests/queryset/geo.py	/^            date = DateTimeField()$/;"	v	class:GeoQueriesTest._create_event_data.Event
+date	mongoengine/tests/queryset/geo.py	/^            date=datetime.datetime.now() - datetime.timedelta(days=1),$/;"	v	class:GeoQueriesTest._create_event_data.Event
+date	mongoengine/tests/queryset/geo.py	/^            date=datetime.datetime.now() - datetime.timedelta(days=10),$/;"	v	class:GeoQueriesTest._create_event_data.Event
+date	mongoengine/tests/queryset/geo.py	/^            date=datetime.datetime.now(),$/;"	v	class:GeoQueriesTest._create_event_data.Event
+date	mongoengine/tests/queryset/queryset.py	/^            date = DateTimeField(default=datetime.datetime.now)$/;"	v	class:QuerySetTest.test_custom_manager.BlogPost
+date	tests/fields/fields.py	/^                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date	tests/fields/fields.py	/^            date = ComplexDateTimeField()$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+date	tests/fields/fields.py	/^            date = ComplexDateTimeField()$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date	tests/fields/fields.py	/^            date = DateTimeField()$/;"	v	class:FieldTest.test_datetime.LogEntry
+date	tests/fields/fields.py	/^            date = DateTimeField()$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+date__gte	mongoengine/tests/fields/fields.py	/^            date__gte=datetime.datetime(1975, 1, 1),$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+date__gte	mongoengine/tests/fields/fields.py	/^            date__gte=datetime.datetime(2000, 1, 1),$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date__gte	tests/fields/fields.py	/^            date__gte=datetime.datetime(1975, 1, 1),$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+date__gte	tests/fields/fields.py	/^            date__gte=datetime.datetime(2000, 1, 1),$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date__lte	mongoengine/tests/fields/fields.py	/^            date__lte=datetime.datetime(1980, 1, 1),$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+date__lte	mongoengine/tests/fields/fields.py	/^            date__lte=datetime.datetime(2011, 1, 1),$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date__lte	mongoengine/tests/fields/fields.py	/^            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date__lte	tests/fields/fields.py	/^            date__lte=datetime.datetime(1980, 1, 1),$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+date__lte	tests/fields/fields.py	/^            date__lte=datetime.datetime(2011, 1, 1),$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date__lte	tests/fields/fields.py	/^            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+date_with_dots	mongoengine/tests/fields/fields.py	/^            date_with_dots = ComplexDateTimeField(separator='.')$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+date_with_dots	tests/fields/fields.py	/^            date_with_dots = ComplexDateTimeField(separator='.')$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+datetime	mongoengine/tests/fields/geo.py	/^            datetime = DateTimeField()$/;"	v	class:GeoFieldTest.test_geo_indexes_auto_index.Log
+datetime_field	mongoengine/tests/document/instance.py	/^            datetime_field = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+datetime_field	mongoengine/tests/document/json_serialisation.py	/^            datetime_field = DateTimeField(default=datetime.now)$/;"	v	class:TestJson.test_json_complex.Doc
+datetime_field	mongoengine/tests/queryset/queryset.py	/^            datetime_field = DateTimeField(default=datetime.datetime.now)$/;"	v	class:QuerySetTest.test_json_complex.Doc
+dateutil	mongoengine/fields.py	/^    dateutil = None$/;"	v
+dateutil	mongoengine/mongoengine/fields.py	/^    dateutil = None$/;"	v
+dateutil	mongoengine/tests/fields/fields.py	/^    dateutil = None$/;"	v
+dateutil	tests/fields/fields.py	/^    dateutil = None$/;"	v
+db_field	mongoengine/tests/document/delta.py	/^                                    db_field='db_embedded_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
+db_field	mongoengine/tests/document/instance.py	/^                                          db_field='rank')$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Person
+db_field	mongoengine/tests/document/instance.py	/^                                      db_field="page_log_message",$/;"	v	class:InstanceTest.test_embedded_update_db_field.Page
+db_field	mongoengine/tests/fields/fields.py	/^                              db_field='x')$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Test
+db_field	mongoengine/tests/fields/fields.py	/^                db_field="t",$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+db_field	mongoengine/tests/queryset/queryset.py	/^                                 db_field='cmnts')$/;"	v	class:QuerySetTest.test_exec_js_field_sub.BlogPost
+db_field	mongoengine/tests/queryset/transform.py	/^                                 db_field='postComments')$/;"	v	class:TransformTest.test_query_field_name.BlogPost
+db_field	tests/fields/fields.py	/^                              db_field='x')$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Test
+db_field	tests/fields/fields.py	/^                db_field="t",$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+db_ops_tracker	mongoengine/tests/queryset/queryset.py	/^class db_ops_tracker(query_counter):$/;"	c
+decimal_field	mongoengine/tests/document/instance.py	/^            decimal_field = DecimalField(default=1.0)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+decimal_field	mongoengine/tests/document/json_serialisation.py	/^            decimal_field = DecimalField(default=1.0)$/;"	v	class:TestJson.test_json_complex.Doc
+decimal_field	mongoengine/tests/queryset/queryset.py	/^            decimal_field = DecimalField(default=1.0)$/;"	v	class:QuerySetTest.test_json_complex.Doc
+default	mongoengine/mongoengine/queryset/manager.py	/^    default = QuerySet$/;"	v	class:QuerySetManager
+default	mongoengine/tests/document/instance.py	/^                                                default=lambda: [1, 2, 3])$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+default	mongoengine/tests/document/instance.py	/^                default=lambda: EmbeddedDoc())$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+default	mongoengine/tests/document/instance.py	/^                default=lambda: Simple().save())$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+default	mongoengine/tests/document/json_serialisation.py	/^                                                default=lambda: [1, 2, 3])$/;"	v	class:TestJson.test_json_complex.Doc
+default	mongoengine/tests/document/json_serialisation.py	/^                                            default=lambda: Simple().save())$/;"	v	class:TestJson.test_json_complex.Doc
+default	mongoengine/tests/document/json_serialisation.py	/^                                        default=lambda: EmbeddedDoc())$/;"	v	class:TestJson.test_json_complex.Doc
+default	mongoengine/tests/fields/fields.py	/^                                default='Small')$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+default	mongoengine/tests/queryset/queryset.py	/^                                                default=lambda: [1, 2, 3])$/;"	v	class:QuerySetTest.test_json_complex.Doc
+default	mongoengine/tests/queryset/queryset.py	/^                default=lambda: EmbeddedDoc())$/;"	v	class:QuerySetTest.test_json_complex.Doc
+default	mongoengine/tests/queryset/queryset.py	/^                default=lambda: Simple().save())$/;"	v	class:QuerySetTest.test_json_complex.Doc
+default	tests/fields/fields.py	/^                                default='Small')$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+delete	mongoengine/fields.py	/^    def delete(self):$/;"	m	class:GridFSProxy
+delete	mongoengine/fields.py	/^    def delete(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
+delete	mongoengine/mongoengine/base/datastructures.py	/^    def delete(self):$/;"	m	class:EmbeddedDocumentList
+delete	mongoengine/mongoengine/document.py	/^    def delete(self, signal_kwargs=None, **write_concern):$/;"	m	class:Document
+delete	mongoengine/mongoengine/fields.py	/^    def delete(self):$/;"	m	class:GridFSProxy
+delete	mongoengine/mongoengine/fields.py	/^    def delete(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
+delete	mongoengine/mongoengine/queryset/base.py	/^    def delete(self, write_concern=None, _from_doc_delete=False,$/;"	m	class:BaseQuerySet
+deleted	mongoengine/tests/queryset/queryset.py	/^            deleted = BooleanField(default=False)$/;"	v	class:QuerySetTest.test_custom_manager.BlogPost
+delta	mongoengine/tests/document/delta.py	/^    def delta(self, DocClass):$/;"	m	class:DeltaTest
+delta_db_field	mongoengine/tests/document/delta.py	/^    def delta_db_field(self, DocClass):$/;"	m	class:DeltaTest
+delta_recursive	mongoengine/tests/document/delta.py	/^    def delta_recursive(self, DocClass, EmbeddedClass):$/;"	m	class:DeltaTest
+delta_recursive_db_field	mongoengine/tests/document/delta.py	/^    def delta_recursive_db_field(self, DocClass, EmbeddedClass):$/;"	m	class:DeltaTest
+dereference	mongoengine/fields.py	/^    def dereference(self, value):$/;"	m	class:GenericReferenceField
+dereference	mongoengine/mongoengine/fields.py	/^    def dereference(self, value):$/;"	m	class:GenericReferenceField
+description	mongoengine/tests/document/class_methods.py	/^            description = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
+description	mongoengine/tests/document/class_methods.py	/^            description = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPost
+description	mongoengine/tests/document/class_methods.py	/^            description = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPost
+description	mongoengine/tests/document/class_methods.py	/^            description = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPost
+description	mongoengine/tests/document/indexes.py	/^            description = StringField()$/;"	v	class:IndexesTest.test_inherited_index.B
+description	mongoengine/tests/document/indexes.py	/^            description = StringField(required=True)$/;"	v	class:IndexesTest.test_index_on_id.BlogPost
+description	mongoengine/tests/fields/fields.py	/^            description = StringField()$/;"	v	class:FieldTest.test_map_field_unicode.Info
+description	mongoengine/tests/queryset/queryset.py	/^            description = StringField(max_length=50)$/;"	v	class:QuerySetTest.test_add_to_set_each.Item
+description	tests/fields/fields.py	/^            description = StringField()$/;"	v	class:FieldTest.test_map_field_unicode.Info
+details	mongoengine/tests/document/instance.py	/^            details = EmbeddedDocumentField(EmployeeDetails)$/;"	v	class:InstanceTest.test_save_embedded_document.Employee
+details	mongoengine/tests/document/instance.py	/^            details = EmbeddedDocumentField(EmployeeDetails)$/;"	v	class:InstanceTest.test_updating_an_embedded_document.Employee
+df	mongoengine/tests/queryset/transform.py	/^            df = DynamicField()$/;"	v	class:TransformTest.test_type.Doc
+dictField	mongoengine/tests/queryset/transform.py	/^            dictField = DictField()$/;"	v	class:TransformTest.test_transform_update.DicDoc
+dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField()$/;"	v	class:DeltaTest.delta.Doc
+dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField()$/;"	v	class:DeltaTest.delta_recursive.Doc
+dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
+dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField(db_field='db_dict_field')$/;"	v	class:DeltaTest.delta_db_field.Doc
+dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField(db_field='db_dict_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
+dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField(db_field='db_dict_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Embedded
+dict_field	mongoengine/tests/document/instance.py	/^            dict_field = DictField()$/;"	v	class:InstanceTest.test_reload_referencing.Doc
+dict_field	mongoengine/tests/document/instance.py	/^            dict_field = DictField()$/;"	v	class:InstanceTest.test_reload_referencing.Embedded
+dict_field	mongoengine/tests/document/instance.py	/^            dict_field = DictField(default=lambda: {"hello": "world"})$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+dict_field	mongoengine/tests/document/json_serialisation.py	/^            dict_field = DictField(default=lambda: {"hello": "world"})$/;"	v	class:TestJson.test_json_complex.Doc
+dict_field	mongoengine/tests/queryset/queryset.py	/^            dict_field = DictField(default=lambda: {"hello": "world"})$/;"	v	class:QuerySetTest.test_json_complex.Doc
+dictionary	mongoengine/tests/fields/fields.py	/^            dictionary = DictField(required=True)$/;"	v	class:FieldTest.test_invalid_dict_value.DictFieldTest
+dictionary	tests/fields/fields.py	/^            dictionary = DictField(required=True)$/;"	v	class:FieldTest.test_invalid_dict_value.DictFieldTest
+direct	mongoengine/tests/fields/fields.py	/^            direct = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.EmbeddedOcurrence
+direct	mongoengine/tests/fields/fields.py	/^            direct = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
+direct	mongoengine/tests/fields/fields.py	/^            direct = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.EmbeddedOcurrence
+direct	mongoengine/tests/fields/fields.py	/^            direct = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
+direct	tests/fields/fields.py	/^            direct = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.EmbeddedOcurrence
+direct	tests/fields/fields.py	/^            direct = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
+direct	tests/fields/fields.py	/^            direct = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.EmbeddedOcurrence
+direct	tests/fields/fields.py	/^            direct = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
+disconnect	mongoengine/mongoengine/connection.py	/^def disconnect(alias=DEFAULT_CONNECTION_NAME):$/;"	f
+distinct	mongoengine/mongoengine/queryset/base.py	/^    def distinct(self, field):$/;"	m	class:BaseQuerySet
+doc	mongoengine/tests/document/instance.py	/^            doc = EmbeddedDocumentField(Embedded)$/;"	v	class:InstanceTest.test_kwargs_simple.Doc
+doc	mongoengine/tests/document/instance.py	/^            doc = EmbeddedDocumentField(TestEmbeddedDocument)$/;"	v	class:InstanceTest.test_document_embedded_clean.TestDocument
+doc_a	mongoengine/tests/fields/file_tests.py	/^            doc_a = GridDocument()$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
+doc_b	mongoengine/tests/fields/file_tests.py	/^            doc_b = GridDocument.objects.with_id(doc_a.id)$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
+doc_c	mongoengine/tests/fields/file_tests.py	/^            doc_c = GridDocument.objects.with_id(doc_b.id)$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
+doc_d	mongoengine/tests/fields/file_tests.py	/^            doc_d = GridDocument(the_file=six.b(''))$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
+doc_e	mongoengine/tests/fields/file_tests.py	/^            doc_e = GridDocument.objects.with_id(doc_d.id)$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
+doc_f	mongoengine/tests/fields/file_tests.py	/^            doc_f = GridDocument.objects.with_id(doc_e.id)$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
+doc_name	mongoengine/tests/document/instance.py	/^            doc_name = StringField()$/;"	v	class:InstanceTest.test_kwargs_complex.Doc
+doc_name	mongoengine/tests/document/instance.py	/^            doc_name = StringField()$/;"	v	class:InstanceTest.test_kwargs_simple.Doc
+docs	mongoengine/tests/document/instance.py	/^            docs = ListField(EmbeddedDocumentField(Embedded))$/;"	v	class:InstanceTest.test_kwargs_complex.Doc
+doctype	mongoengine/tests/fields/fields.py	/^            doctype = StringField(require=True, default='userdata')$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.User
+doctype	tests/fields/fields.py	/^            doctype = StringField(require=True, default='userdata')$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.User
+document	mongoengine/tests/queryset/queryset.py	/^            document = GenericEmbeddedDocumentField(choices=(A, B))$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.Doc
+document_type	mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:CachedReferenceField
+document_type	mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:EmbeddedDocumentField
+document_type	mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:LazyReferenceField
+document_type	mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:ReferenceField
+document_type	mongoengine/mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:CachedReferenceField
+document_type	mongoengine/mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:EmbeddedDocumentField
+document_type	mongoengine/mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:LazyReferenceField
+document_type	mongoengine/mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:ReferenceField
+down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=105,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=124,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=13,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=17,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=530,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=553,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+down_votes	mongoengine/tests/queryset/queryset.py	/^            down_votes = IntField()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+drink	mongoengine/tests/document/inheritance.py	/^            drink = GenericReferenceField()$/;"	v	class:InheritanceTest.test_inherited_collections.Drinker
+drop_collection	mongoengine/mongoengine/document.py	/^    def drop_collection(cls):$/;"	m	class:Document
+dt	mongoengine/tests/fields/fields.py	/^            dt = DateTimeField()$/;"	v	class:FieldTest.test_datetime_from_empty_string.MyDoc
+dt	mongoengine/tests/fields/fields.py	/^            dt = DateTimeField()$/;"	v	class:FieldTest.test_datetime_from_whitespace_string.MyDoc
+dt	tests/fields/fields.py	/^            dt = DateTimeField()$/;"	v	class:FieldTest.test_datetime_from_empty_string.MyDoc
+dt	tests/fields/fields.py	/^            dt = DateTimeField()$/;"	v	class:FieldTest.test_datetime_from_whitespace_string.MyDoc
+dt_f	mongoengine/tests/queryset/queryset.py	/^            dt_f = DateTimeField()$/;"	v	class:QuerySetTest.test_update_validate.Doc
+dt_fld	mongoengine/tests/document/instance.py	/^            dt_fld = DateTimeField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
+dynamic_field	mongoengine/tests/document/instance.py	/^            dynamic_field = DynamicField(default=1)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+dynamic_field	mongoengine/tests/document/json_serialisation.py	/^            dynamic_field = DynamicField(default=1)$/;"	v	class:TestJson.test_json_complex.Doc
+dynamic_field	mongoengine/tests/queryset/queryset.py	/^            dynamic_field = DynamicField(default=1)$/;"	v	class:QuerySetTest.test_json_complex.Doc
+e	mongoengine/tests/document/validation.py	/^            e = EmbeddedDocumentField(SubDoc, db_field='eb')$/;"	v	class:ValidatorErrorTest.test_embedded_db_field_validate.Doc
+e	mongoengine/tests/document/validation.py	/^            e = EmbeddedDocumentField(SubDoc, db_field='eb')$/;"	v	class:ValidatorErrorTest.test_embedded_weakref.Doc
+e	mongoengine/tests/queryset/field_list.py	/^            e = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
+e	mongoengine/tests/queryset/field_list.py	/^            e = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
+ed_f	mongoengine/tests/queryset/queryset.py	/^            ed_f = EmbeddedDocumentField(EmDoc)$/;"	v	class:QuerySetTest.test_update_validate.Doc
+editor	mongoengine/tests/document/instance.py	/^            editor = ReferenceField(Editor)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.BlogPost
+email	mongoengine/docs/code/tumblelog.py	/^    email = StringField(required=True)$/;"	v	class:User
+email	mongoengine/tests/document/instance.py	/^                email = StringField(primary_key=True)$/;"	v	class:InstanceTest.test_custom_id_field.User.EmailUser
+email	mongoengine/tests/document/instance.py	/^            email = EmailField()$/;"	v	class:InstanceTest.test_instance_is_set_on_setattr.Email
+email	mongoengine/tests/document/instance.py	/^            email = EmailField()$/;"	v	class:InstanceTest.test_instance_is_set_on_setattr_on_embedded_document_list.Email
+email	mongoengine/tests/document/instance.py	/^            email = EmailField(required=True)$/;"	v	class:InstanceTest.test_save.Recipient
+email	mongoengine/tests/document/instance.py	/^            email = EmbeddedDocumentField(Email)$/;"	v	class:InstanceTest.test_instance_is_set_on_setattr.Account
+email	mongoengine/tests/document/instance.py	/^            email = StringField()$/;"	v	class:InstanceTest.test_custom_id_field.EmailUser
+email	mongoengine/tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field.User
+email	mongoengine/tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_domain_whitelist.User
+email	mongoengine/tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_ip_domain.User
+email	mongoengine/tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_unicode_user.User
+email	mongoengine/tests/fields/fields.py	/^            email = EmailField(allow_ip_domain=True)$/;"	v	class:FieldTest.test_email_field_ip_domain.User
+email	mongoengine/tests/fields/fields.py	/^            email = EmailField(allow_utf8_user=True)$/;"	v	class:FieldTest.test_email_field_unicode_user.User
+email	mongoengine/tests/fields/fields.py	/^            email = EmailField(domain_whitelist=['localhost'])$/;"	v	class:FieldTest.test_email_field_domain_whitelist.User
+email	mongoengine/tests/fields/fields.py	/^            email = EmailField(regex=r'\\w+@example.com')$/;"	v	class:FieldTest.test_email_field_honors_regex.User
+email	mongoengine/tests/queryset/field_list.py	/^            email = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.User
+email	mongoengine/tests/queryset/field_list.py	/^            email = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.User
+email	mongoengine/tests/queryset/queryset.py	/^            email = EmailField(unique=True, required=True)$/;"	v	class:QuerySetTest.test_as_pymongo_json_limit_fields.User
+email	mongoengine/tests/queryset/visitor.py	/^            email = EmailField(required=False)$/;"	v	class:QTest.test_q_merge_queries_edge_case.User
+email	tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field.User
+email	tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_domain_whitelist.User
+email	tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_ip_domain.User
+email	tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_unicode_user.User
+email	tests/fields/fields.py	/^            email = EmailField(allow_ip_domain=True)$/;"	v	class:FieldTest.test_email_field_ip_domain.User
+email	tests/fields/fields.py	/^            email = EmailField(allow_utf8_user=True)$/;"	v	class:FieldTest.test_email_field_unicode_user.User
+email	tests/fields/fields.py	/^            email = EmailField(domain_whitelist=['localhost'])$/;"	v	class:FieldTest.test_email_field_domain_whitelist.User
+email	tests/fields/fields.py	/^            email = EmailField(regex=r'\\w+@example.com')$/;"	v	class:FieldTest.test_email_field_honors_regex.User
+email_field	mongoengine/tests/document/instance.py	/^            email_field = EmailField(default="ross@example.com")$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+email_field	mongoengine/tests/document/json_serialisation.py	/^            email_field = EmailField(default="ross@example.com")$/;"	v	class:TestJson.test_json_complex.Doc
+email_field	mongoengine/tests/queryset/queryset.py	/^            email_field = EmailField(default="ross@example.com")$/;"	v	class:QuerySetTest.test_json_complex.Doc
+emails	mongoengine/tests/document/instance.py	/^            emails = EmbeddedDocumentListField(Email)$/;"	v	class:InstanceTest.test_instance_is_set_on_setattr_on_embedded_document_list.Account
+embed	mongoengine/tests/queryset/queryset.py	/^            embed = EmbeddedDocumentField(Embed, default=Embed)$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.B
+embed_me	mongoengine/tests/fields/fields.py	/^            embed_me = DynamicField(db_field='e')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
+embed_me	mongoengine/tests/fields/fields.py	/^            embed_me = DynamicField(db_field='e')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
+embed_me	tests/fields/fields.py	/^            embed_me = DynamicField(db_field='e')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
+embed_me	tests/fields/fields.py	/^            embed_me = DynamicField(db_field='e')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
+embed_no_default	mongoengine/tests/queryset/queryset.py	/^            embed_no_default = EmbeddedDocumentField(Embed)$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.B
+embedded	mongoengine/tests/document/json_serialisation.py	/^            embedded = EmbeddedDocumentField(Embedded, db_field='e')$/;"	v	class:TestJson.test_json_names.Doc
+embedded	mongoengine/tests/fields/fields.py	/^            embedded = EmbeddedDocumentField(Embedded, db_field='x')$/;"	v	class:FieldTest.test_embedded_db_field.Test
+embedded	mongoengine/tests/fixtures.py	/^    embedded = EmbeddedDocumentField(PickleEmbedded)$/;"	v	class:NewDocumentPickleTest
+embedded	mongoengine/tests/fixtures.py	/^    embedded = EmbeddedDocumentField(PickleEmbedded)$/;"	v	class:PickleSignalsTest
+embedded	mongoengine/tests/fixtures.py	/^    embedded = EmbeddedDocumentField(PickleEmbedded)$/;"	v	class:PickleTest
+embedded	mongoengine/tests/queryset/field_list.py	/^            embedded = EmbeddedDocumentField(EmbeddedNumber)$/;"	v	class:OnlyExcludeAllTest.test_slicing_nested_fields.Numbers
+embedded	mongoengine/tests/queryset/queryset.py	/^            embedded = EmbeddedDocumentField(SubDoc)$/;"	v	class:QuerySetTest.test_reload_embedded_docs_instance.Doc
+embedded	mongoengine/tests/queryset/queryset.py	/^            embedded = ListField(EmbeddedDocumentField(SubDoc))$/;"	v	class:QuerySetTest.test_reload_list_embedded_docs_instance.Doc
+embedded	tests/fields/fields.py	/^            embedded = EmbeddedDocumentField(Embedded, db_field='x')$/;"	v	class:FieldTest.test_embedded_db_field.Test
+embedded_document_field	mongoengine/tests/document/instance.py	/^            embedded_document_field = EmbeddedDocumentField($/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+embedded_document_field	mongoengine/tests/document/json_serialisation.py	/^            embedded_document_field = EmbeddedDocumentField(EmbeddedDoc,$/;"	v	class:TestJson.test_json_complex.Doc
+embedded_document_field	mongoengine/tests/queryset/queryset.py	/^            embedded_document_field = EmbeddedDocumentField($/;"	v	class:QuerySetTest.test_json_complex.Doc
+embedded_field	mongoengine/tests/document/delta.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:DeltaTest.delta_recursive.Doc
+embedded_field	mongoengine/tests/document/delta.py	/^            embedded_field = EmbeddedDocumentField(Embedded,$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
+embedded_field	mongoengine/tests/document/instance.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:InstanceTest.test_embedded_document_instance.Doc
+embedded_field	mongoengine/tests/document/instance.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:InstanceTest.test_reload_referencing.Doc
+embedded_field	mongoengine/tests/document/instance.py	/^            embedded_field = ListField(EmbeddedDocumentField(Embedded))$/;"	v	class:InstanceTest.test_embedded_document_complex_instance.Doc
+embedded_field	mongoengine/tests/document/instance.py	/^            embedded_field = ListField(EmbeddedDocumentField(Embedded))$/;"	v	class:InstanceTest.test_embedded_document_complex_instance_no_use_db_field.Doc
+embedded_field	mongoengine/tests/document/json_serialisation.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:TestJson.test_json_simple.Doc
+embedded_field	mongoengine/tests/queryset/queryset.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:QuerySetTest.test_json_simple.Doc
+employee	mongoengine/tests/document/class_methods.py	/^            employee = ReferenceField(self.Person)$/;"	v	class:ClassMethodsTest.test_register_delete_rule.Job
+employees	mongoengine/tests/document/delta.py	/^            employees = ListField(ReferenceField('Person', dbref=dbref))$/;"	v	class:DeltaTest.circular_reference_deltas_2.Organization
+employees	mongoengine/tests/queryset/queryset.py	/^            employees = ListField(ReferenceField(Person))$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Organization
+employees	mongoengine/tests/test_dereference.py	/^            employees = Employee.objects(boss=bill).select_related()$/;"	v	class:FieldTest.test_recursive_reference.Employee
+employer	mongoengine/tests/document/delta.py	/^            employer = ReferenceField('Organization', dbref=dbref)$/;"	v	class:DeltaTest.circular_reference_deltas_2.Person
+empty	mongoengine/mongoengine/queryset/visitor.py	/^    def empty(self):$/;"	m	class:Q
+empty	mongoengine/mongoengine/queryset/visitor.py	/^    def empty(self):$/;"	m	class:QCombination
+empty	mongoengine/mongoengine/queryset/visitor.py	/^    def empty(self):$/;"	m	class:QNode
+ensure_index	mongoengine/mongoengine/document.py	/^    def ensure_index(cls, key_or_list, drop_dups=False, background=False,$/;"	m	class:Document
+ensure_index	mongoengine/mongoengine/queryset/base.py	/^    def ensure_index(self, **kwargs):$/;"	m	class:BaseQuerySet
+ensure_indexes	mongoengine/mongoengine/document.py	/^    def ensure_indexes(cls):$/;"	m	class:Document
+error	mongoengine/mongoengine/base/fields.py	/^    def error(self, message='', errors=None, field_name=None):$/;"	m	class:BaseField
+error_class	mongoengine/tests/queryset/queryset.py	/^            error_class = ConfigurationError$/;"	v	class:QuerySetTest.test_read_preference.Bar
+error_class	mongoengine/tests/queryset/queryset.py	/^            error_class = TypeError$/;"	v	class:QuerySetTest.test_read_preference.Bar
+error_dict	mongoengine/tests/fields/fields.py	/^            error_dict = error.to_dict()$/;"	v	class:FieldTest.test_recursive_validation.Post
+error_dict	mongoengine/tests/fields/fields.py	/^            error_dict = error.to_dict()$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
+error_dict	tests/fields/fields.py	/^            error_dict = error.to_dict()$/;"	v	class:FieldTest.test_recursive_validation.Post
+error_dict	tests/fields/fields.py	/^            error_dict = error.to_dict()$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
+error_msg	mongoengine/fields.py	/^    error_msg = u'Invalid email address: %s'$/;"	v	class:EmailField
+error_msg	mongoengine/mongoengine/fields.py	/^    error_msg = u'Invalid email address: %s'$/;"	v	class:EmailField
+errors	mongoengine/mongoengine/errors.py	/^    errors = {}$/;"	v	class:ValidationError
+evil	mongoengine/tests/document/inheritance.py	/^                evil = BooleanField(default=True)$/;"	v	class:InheritanceTest.test_abstract_documents.Human.EvilHuman
+exclude	mongoengine/mongoengine/base/datastructures.py	/^    def exclude(self, **kwargs):$/;"	m	class:EmbeddedDocumentList
+exclude	mongoengine/mongoengine/queryset/base.py	/^    def exclude(self, *fields):$/;"	m	class:BaseQuerySet
+exclude_trees	mongoengine/docs/conf.py	/^exclude_trees = ['_build']$/;"	v
+exec_js	mongoengine/mongoengine/queryset/base.py	/^    def exec_js(self, code, *fields, **options):$/;"	m	class:BaseQuerySet
+expand	mongoengine/tests/document/instance.py	/^            def expand(self):$/;"	m	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Node
+expand	mongoengine/tests/document/instance.py	/^            def expand(self):$/;"	m	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Parameter
+expect_msg	mongoengine/tests/document/instance.py	/^            expect_msg = "Draft entries may not have a publication date."$/;"	v	class:InstanceTest.test_document_clean.TestDocument
+expected	mongoengine/tests/fields/geo.py	/^            expected = "Both values (%s) in point must be float or int" % repr(coord)$/;"	v	class:GeoFieldTest.test_geopoint_validation.Location
+expected	mongoengine/tests/fields/geo.py	/^            expected = "Both values (%s) in point must be float or int" % repr(coord)$/;"	v	class:GeoFieldTest.test_point_validation.Location
+expected	mongoengine/tests/fields/geo.py	/^            expected = "Both values (%s) in point must be float or int" % repr(coord[0])$/;"	v	class:GeoFieldTest.test_multipoint_validation.Location
+expected	mongoengine/tests/fields/geo.py	/^            expected = "Invalid LineString:\\nBoth values (%s) in point must be float or int" % repr(coord[0])$/;"	v	class:GeoFieldTest.test_linestring_validation.Location
+expected	mongoengine/tests/fields/geo.py	/^            expected = "Invalid MultiLineString:\\nBoth values (%s) in point must be float or int" % repr(coord[0][0])$/;"	v	class:GeoFieldTest.test_multilinestring_validation.Location
+expected	mongoengine/tests/fields/geo.py	/^            expected = "Value (%s) must be a two-dimensional point" % repr(coord)$/;"	v	class:GeoFieldTest.test_geopoint_validation.Location
+expected	mongoengine/tests/fields/geo.py	/^            expected = "Value (%s) must be a two-dimensional point" % repr(coord)$/;"	v	class:GeoFieldTest.test_point_validation.Location
+expected	mongoengine/tests/fields/geo.py	/^            expected = "Value (%s) must be a two-dimensional point" % repr(coord[0])$/;"	v	class:GeoFieldTest.test_multipoint_validation.Location
+explain	mongoengine/mongoengine/queryset/base.py	/^    def explain(self, format=False):$/;"	m	class:BaseQuerySet
+extend	mongoengine/mongoengine/base/datastructures.py	/^    def extend(self, *args, **kwargs):$/;"	m	class:BaseList
+extensions	mongoengine/docs/conf.py	/^extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo']$/;"	v
+extra	mongoengine/tests/document/instance.py	/^            extra = DictField()$/;"	v	class:InstanceTest.test_db_ref_usage.Book
+extra	mongoengine/tests/queryset/queryset.py	/^            extra = EmbeddedDocumentField(Extra)$/;"	v	class:QuerySetTest.test_item_frequencies_with_null_embedded.Person
+extra_opts	mongoengine/setup.py	/^extra_opts = {$/;"	v
+extra_text	mongoengine/tests/document/class_methods.py	/^            extra_text = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPostWithTagsAndExtraText
+f	mongoengine/tests/queryset/field_list.py	/^            f = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
+f	mongoengine/tests/queryset/field_list.py	/^            f = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
+fake_update	mongoengine/tests/document/instance.py	/^            def fake_update(*args, **kwargs):$/;"	m	class:InstanceTest.test_do_not_save_unchanged_references.Person
+family	mongoengine/tests/document/class_methods.py	/^            family = StringField(required=True)$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Animal
+family	mongoengine/tests/fields/file_tests.py	/^            family = StringField()$/;"	v	class:FileTest.test_complex_field_filefield.Animal
+family	mongoengine/tests/fields/file_tests.py	/^            family = StringField()$/;"	v	class:FileTest.test_file_saving.Animal
+family	mongoengine/tests/queryset/queryset.py	/^            family = ReferenceField(Family)$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+father	mongoengine/tests/document/instance.py	/^                father = ReferenceField('Person', reverse_delete_rule=DENY)$/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Parents
+father	mongoengine/tests/fields/fields.py	/^            father = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+father	mongoengine/tests/fields/fields.py	/^            father = CachedReferenceField('self', fields=('tp',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+father	mongoengine/tests/fields/fields.py	/^            father = CachedReferenceField('self', fields=('tp',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+father	tests/fields/fields.py	/^            father = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+father	tests/fields/fields.py	/^            father = CachedReferenceField('self', fields=('tp',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+father	tests/fields/fields.py	/^            father = CachedReferenceField('self', fields=('tp',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+feed	mongoengine/tests/document/instance.py	/^            feed = Feed.objects.first()$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
+feed	mongoengine/tests/document/instance.py	/^            feed = ReferenceField(Feed)$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
+fetch	mongoengine/mongoengine/base/datastructures.py	/^    def fetch(self, force=False):$/;"	m	class:LazyReference
+field	mongoengine/mongoengine/base/fields.py	/^    field = None$/;"	v	class:ComplexBaseField
+field	mongoengine/tests/document/instance.py	/^                    field=ReferenceField($/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
+field	mongoengine/tests/document/instance.py	/^            field = StringField(required=True)$/;"	v	class:InstanceTest.test_embedded_document_equality.Test
+field	mongoengine/tests/fields/fields.py	/^            field = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.Doc
+field	mongoengine/tests/fields/fields.py	/^            field = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.Doc
+field	mongoengine/tests/queryset/queryset.py	/^            field = IntField()$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.Embed
+field	mongoengine/tests/queryset/queryset.py	/^            field = IntField(default=1)$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.B
+field	tests/fields/fields.py	/^            field = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.Doc
+field	tests/fields/fields.py	/^            field = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.Doc
+field1	mongoengine/tests/document/instance.py	/^            field1 = StringField(default='field1')$/;"	v	class:InstanceTest.test_mutating_documents.B
+field2	mongoengine/tests/document/instance.py	/^            field2 = EmbeddedDocumentField(C, default=lambda: C())$/;"	v	class:InstanceTest.test_mutating_documents.B
+field_1	mongoengine/tests/fields/fields.py	/^            field_1 = StringField(db_field='f')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc2
+field_1	mongoengine/tests/fields/fields.py	/^            field_1 = StringField(db_field='f')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Embed
+field_1	tests/fields/fields.py	/^            field_1 = StringField(db_field='f')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc2
+field_1	tests/fields/fields.py	/^            field_1 = StringField(db_field='f')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Embed
+field_name	mongoengine/mongoengine/errors.py	/^    field_name = None$/;"	v	class:ValidationError
+field_path_sub	mongoengine/mongoengine/queryset/base.py	/^        def field_path_sub(match):$/;"	f	function:BaseQuerySet._sub_js_fields
+field_sub	mongoengine/mongoengine/queryset/base.py	/^        def field_sub(match):$/;"	f	function:BaseQuerySet._sub_js_fields
+field_x	mongoengine/tests/fields/fields.py	/^            field_x = StringField(db_field='x')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
+field_x	mongoengine/tests/fields/fields.py	/^            field_x = StringField(db_field='x')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
+field_x	tests/fields/fields.py	/^            field_x = StringField(db_field='x')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
+field_x	tests/fields/fields.py	/^            field_x = StringField(db_field='x')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
+fielda	mongoengine/tests/queryset/queryset.py	/^            fielda = IntField()$/;"	v	class:QuerySetTest.test_where.IntPair
+fieldb	mongoengine/tests/queryset/queryset.py	/^            fieldb = IntField()$/;"	v	class:QuerySetTest.test_where.IntPair
+fields	mongoengine/mongoengine/queryset/base.py	/^    def fields(self, _only_called=False, **kwargs):$/;"	m	class:BaseQuerySet
+fields	mongoengine/tests/fields/fields.py	/^                fields=('group',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
+fields	mongoengine/tests/fields/fields.py	/^                fields=('salary',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
+fields	mongoengine/tests/queryset/queryset.py	/^            fields = DictField()$/;"	v	class:QuerySetTest.test_no_cache.Noddy
+fields	tests/fields/fields.py	/^                fields=('group',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
+fields	tests/fields/fields.py	/^                fields=('salary',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
+filter	mongoengine/mongoengine/base/datastructures.py	/^    def filter(self, **kwargs):$/;"	m	class:EmbeddedDocumentList
+filter	mongoengine/mongoengine/queryset/base.py	/^    def filter(self, *q_objs, **query):$/;"	m	class:BaseQuerySet
+finalize_f	mongoengine/tests/queryset/queryset.py	/^                                     finalize_f=finalize_f,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+first	mongoengine/mongoengine/base/datastructures.py	/^    def first(self):$/;"	m	class:EmbeddedDocumentList
+first	mongoengine/mongoengine/queryset/base.py	/^    def first(self):$/;"	m	class:BaseQuerySet
+first_name	mongoengine/docs/code/tumblelog.py	/^    first_name = StringField(max_length=50)$/;"	v	class:User
+flip	mongoengine/tests/document/instance.py	/^        def flip(widget):$/;"	f	function:InstanceTest.test_save_atomicity_condition
+float_field	mongoengine/tests/document/instance.py	/^            float_field = FloatField(default=1.1)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+float_field	mongoengine/tests/document/json_serialisation.py	/^            float_field = FloatField(default=1.1)$/;"	v	class:TestJson.test_json_complex.Doc
+float_field	mongoengine/tests/queryset/queryset.py	/^            float_field = FloatField(default=1.1)$/;"	v	class:QuerySetTest.test_json_complex.Doc
+float_fld	mongoengine/tests/fields/fields.py	/^            float_fld = FloatField()$/;"	v	class:FieldTest.test_int_and_float_ne_operator.TestDocument
+float_fld	tests/fields/fields.py	/^            float_fld = FloatField()$/;"	v	class:FieldTest.test_int_and_float_ne_operator.TestDocument
+float_value	mongoengine/tests/fields/fields.py	/^            float_value = DecimalField(precision=4)$/;"	v	class:FieldTest.test_decimal_storage.Person
+float_value	tests/fields/fields.py	/^            float_value = DecimalField(precision=4)$/;"	v	class:FieldTest.test_decimal_storage.Person
+flt_fld	mongoengine/tests/document/instance.py	/^            flt_fld = FloatField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
+flt_fld	mongoengine/tests/fields/fields.py	/^            flt_fld = FloatField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+flt_fld	mongoengine/tests/fields/fields.py	/^            flt_fld = FloatField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
+flt_fld	tests/fields/fields.py	/^            flt_fld = FloatField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+flt_fld	tests/fields/fields.py	/^            flt_fld = FloatField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
+folded_ears	mongoengine/tests/queryset/queryset.py	/^            folded_ears = BooleanField()$/;"	v	class:QuerySetTest.test_subclass_field_query.ScottishCat
+foo	mongoengine/tests/document/instance.py	/^            foo = BooleanField(unique=True)$/;"	v	class:InstanceTest.subclasses_and_unique_keys_works.B
+foo	mongoengine/tests/document/instance.py	/^            foo = EmbeddedDocumentField(Foo)$/;"	v	class:InstanceTest.test_shard_key_in_embedded_document.Bar
+foo	mongoengine/tests/document/instance.py	/^            foo = ListField(StringField())$/;"	v	class:InstanceTest.test_update_list_field.Doc
+foo	mongoengine/tests/document/instance.py	/^            foo = ReferenceField('Foo')$/;"	v	class:InstanceTest.test_two_way_reverse_delete_rule.Bar
+foo	mongoengine/tests/document/instance.py	/^            foo = StringField()$/;"	v	class:InstanceTest.test_can_save_false_values.Doc
+foo	mongoengine/tests/document/instance.py	/^            foo = StringField()$/;"	v	class:InstanceTest.test_can_save_false_values_dynamic.Doc
+foo	mongoengine/tests/document/instance.py	/^            foo = StringField()$/;"	v	class:InstanceTest.test_shard_key_in_embedded_document.Foo
+foo	mongoengine/tests/document/instance.py	/^            foo = StringField(default=None)$/;"	v	class:InstanceTest.test_set_unset_one_operation.FooBar
+foo	mongoengine/tests/fields/fields.py	/^            foo = StringField()$/;"	v	class:FieldTest.test_undefined_field_exception.Doc
+foo	mongoengine/tests/fields/fields.py	/^            foo = StringField()$/;"	v	class:FieldTest.test_undefined_field_exception_with_strict.Doc
+foo	mongoengine/tests/queryset/queryset.py	/^            foo = ListField(EmbeddedDocumentField(Foo))$/;"	v	class:QuerySetTest.test_elem_match.Bar
+foo	mongoengine/tests/queryset/transform.py	/^            foo = ListField(StringField())$/;"	v	class:TransformTest.test_transform_update.LisDoc
+foo	tests/fields/fields.py	/^            foo = StringField()$/;"	v	class:FieldTest.test_undefined_field_exception.Doc
+foo	tests/fields/fields.py	/^            foo = StringField()$/;"	v	class:FieldTest.test_undefined_field_exception_with_strict.Doc
+food	mongoengine/tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_document_validation.PersonPreferences
+food	mongoengine/tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_embedded_document.Dish
+food	mongoengine/tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Dish
+food	mongoengine/tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Dish
+food	tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_document_validation.PersonPreferences
+food	tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_embedded_document.Dish
+food	tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Dish
+food	tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Dish
+foos	mongoengine/tests/queryset/queryset.py	/^            foos = ListField(GenericEmbeddedDocumentField($/;"	v	class:QuerySetTest.test_pull_in_genericembedded_field.Bar
+format	mongoengine/fields.py	/^    def format(self):$/;"	m	class:ImageGridFsProxy
+format	mongoengine/mongoengine/fields.py	/^    def format(self):$/;"	m	class:ImageGridFsProxy
+forms	mongoengine/tests/document/instance.py	/^            forms = ListField(StringField(), default=list)$/;"	v	class:InstanceTest.test_invalid_son.Word
+friend	mongoengine/tests/document/instance.py	/^            friend = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit.Person
+friends	mongoengine/tests/fields/fields.py	/^            friends = ListField(ReferenceField('self'))$/;"	v	class:FieldTest.test_recursive_reference.Employee
+friends	mongoengine/tests/test_dereference.py	/^            friends = ListField(ReferenceField('Person'))$/;"	v	class:FieldTest.test_circular_tree_reference.Other
+friends	mongoengine/tests/test_dereference.py	/^            friends = ListField(ReferenceField('self'))$/;"	v	class:FieldTest.test_recursive_reference.Employee
+friends	tests/fields/fields.py	/^            friends = ListField(ReferenceField('self'))$/;"	v	class:FieldTest.test_recursive_reference.Employee
+from_json	mongoengine/mongoengine/base/document.py	/^    def from_json(cls, json_data, created=False):$/;"	m	class:BaseDocument
+from_json	mongoengine/mongoengine/queryset/base.py	/^    def from_json(self, json_data):$/;"	m	class:BaseQuerySet
+fs	mongoengine/fields.py	/^    def fs(self):$/;"	m	class:GridFSProxy
+fs	mongoengine/mongoengine/fields.py	/^    def fs(self):$/;"	m	class:GridFSProxy
+gender	mongoengine/tests/queryset/queryset.py	/^            gender = StringField()$/;"	v	class:QuerySetTest.test_mapfield_update.Member
+generate	mongoengine/fields.py	/^    def generate(self):$/;"	m	class:SequenceField
+generate	mongoengine/mongoengine/fields.py	/^    def generate(self):$/;"	m	class:SequenceField
+generate_key	mongoengine/mongoengine/errors.py	/^        def generate_key(value, prefix=''):$/;"	f	function:ValidationError._format_errors
+generated	mongoengine/tests/document/instance.py	/^            generated = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_reference_inheritance.CompareStats
+generic	mongoengine/tests/fields/fields.py	/^            generic = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
+generic	mongoengine/tests/test_context_managers.py	/^            generic = GenericReferenceField()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.Group
+generic	mongoengine/tests/test_context_managers.py	/^            generic = GenericReferenceField()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.Group
+generic	tests/fields/fields.py	/^            generic = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
+generic_as_lazy	mongoengine/tests/fields/fields.py	/^            generic_as_lazy = ListField(GenericLazyReferenceField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
+generic_as_lazy	tests/fields/fields.py	/^            generic_as_lazy = ListField(GenericLazyReferenceField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
+generic_embedded_document_field	mongoengine/tests/document/instance.py	/^            generic_embedded_document_field = GenericEmbeddedDocumentField($/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+generic_embedded_document_field	mongoengine/tests/document/json_serialisation.py	/^            generic_embedded_document_field = GenericEmbeddedDocumentField($/;"	v	class:TestJson.test_json_complex.Doc
+generic_embedded_document_field	mongoengine/tests/queryset/queryset.py	/^            generic_embedded_document_field = GenericEmbeddedDocumentField($/;"	v	class:QuerySetTest.test_json_complex.Doc
+generic_ref	mongoengine/tests/fields/fields.py	/^            generic_ref = GenericReferenceField()$/;"	v	class:FieldTest.test_reference_miss.Bar
+generic_ref	tests/fields/fields.py	/^            generic_ref = GenericReferenceField()$/;"	v	class:FieldTest.test_reference_miss.Bar
+generic_reference_field	mongoengine/tests/document/instance.py	/^            generic_reference_field = GenericReferenceField($/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+generic_reference_field	mongoengine/tests/document/json_serialisation.py	/^            generic_reference_field = GenericReferenceField($/;"	v	class:TestJson.test_json_complex.Doc
+generic_reference_field	mongoengine/tests/queryset/queryset.py	/^            generic_reference_field = GenericReferenceField($/;"	v	class:QuerySetTest.test_json_complex.Doc
+genus	mongoengine/tests/fields/file_tests.py	/^            genus = StringField()$/;"	v	class:FileTest.test_complex_field_filefield.Animal
+genus	mongoengine/tests/fields/file_tests.py	/^            genus = StringField()$/;"	v	class:FileTest.test_file_saving.Animal
+geo_point_field	mongoengine/tests/document/instance.py	/^            geo_point_field = GeoPointField(default=lambda: [1, 2])$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+geo_point_field	mongoengine/tests/document/json_serialisation.py	/^            geo_point_field = GeoPointField(default=lambda: [1, 2])$/;"	v	class:TestJson.test_json_complex.Doc
+geo_point_field	mongoengine/tests/queryset/queryset.py	/^            geo_point_field = GeoPointField(default=lambda: [1, 2])$/;"	v	class:QuerySetTest.test_json_complex.Doc
+get	mongoengine/fields.py	/^    def get(self, grid_id=None):$/;"	m	class:GridFSProxy
+get	mongoengine/mongoengine/base/datastructures.py	/^    def get(self, **kwargs):$/;"	m	class:EmbeddedDocumentList
+get	mongoengine/mongoengine/base/datastructures.py	/^    def get(self, key, default=None):$/;"	m	class:StrictDict
+get	mongoengine/mongoengine/fields.py	/^    def get(self, grid_id=None):$/;"	m	class:GridFSProxy
+get	mongoengine/mongoengine/queryset/base.py	/^    def get(self, *q_objs, **query):$/;"	m	class:BaseQuerySet
+get_auto_id_names	mongoengine/mongoengine/base/metaclasses.py	/^    def get_auto_id_names(cls, new_class):$/;"	m	class:TopLevelDocumentMetaclass
+get_classes	mongoengine/mongoengine/document.py	/^        def get_classes(cls):$/;"	f	function:Document.list_indexes
+get_connection	mongoengine/mongoengine/connection.py	/^def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):$/;"	f
+get_db	mongoengine/mongoengine/connection.py	/^def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):$/;"	f
+get_document	mongoengine/mongoengine/base/common.py	/^def get_document(name):$/;"	f
+get_indexes_spec	mongoengine/mongoengine/document.py	/^        def get_indexes_spec(cls):$/;"	f	function:Document.list_indexes
+get_mongodb_version	mongoengine/tests/utils.py	/^def get_mongodb_version():$/;"	f
+get_next_value	mongoengine/fields.py	/^    def get_next_value(self):$/;"	m	class:SequenceField
+get_next_value	mongoengine/mongoengine/fields.py	/^    def get_next_value(self):$/;"	m	class:SequenceField
+get_ops	mongoengine/tests/queryset/queryset.py	/^    def get_ops(self):$/;"	m	class:db_ops_tracker
+get_proxy_obj	mongoengine/fields.py	/^    def get_proxy_obj(self, key, instance, db_alias=None, collection_name=None):$/;"	m	class:FileField
+get_proxy_obj	mongoengine/mongoengine/fields.py	/^    def get_proxy_obj(self, key, instance, db_alias=None, collection_name=None):$/;"	m	class:FileField
+get_queryset	mongoengine/mongoengine/queryset/manager.py	/^    get_queryset = None$/;"	v	class:QuerySetManager
+get_queryset	mongoengine/tests/queryset/queryset.py	/^            def get_queryset(doc_cls, queryset):$/;"	m	class:QuerySetTest.test_custom_querysets_managers_directly.CustomQuerySetManager
+get_sequence_name	mongoengine/fields.py	/^    def get_sequence_name(self):$/;"	m	class:SequenceField
+get_sequence_name	mongoengine/mongoengine/fields.py	/^    def get_sequence_name(self):$/;"	m	class:SequenceField
+get_signal_output	mongoengine/tests/test_signals.py	/^    def get_signal_output(self, fn, *args, **kwargs):$/;"	m	class:SignalTests
+get_text_score	mongoengine/mongoengine/base/document.py	/^    def get_text_score(self):$/;"	m	class:BaseDocument
+get_tz_awareness	mongoengine/tests/test_connection.py	/^def get_tz_awareness(connection):$/;"	f
+get_version	mongoengine/mongoengine/__init__.py	/^def get_version():$/;"	f
+get_version	mongoengine/setup.py	/^def get_version(version_tuple):$/;"	f
+group	mongoengine/tests/document/instance.py	/^            group = Group.objects.first()$/;"	v	class:InstanceTest.test_switch_db_instance.Group
+group	mongoengine/tests/fields/fields.py	/^            group = ReferenceField(Group)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Person
+group	mongoengine/tests/fields/fields.py	/^            group = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
+group	mongoengine/tests/test_context_managers.py	/^            group = Group.objects.first()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.Group
+group	mongoengine/tests/test_context_managers.py	/^            group = Group.objects.first()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.Group
+group	tests/fields/fields.py	/^            group = ReferenceField(Group)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Person
+group	tests/fields/fields.py	/^            group = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_dict_field.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_generic_reference.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_field_complex.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_item_dereference.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_map_field_reference.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_dict_field.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_generic_reference.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_list_field_complex.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_list_item_dereference.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
+group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_map_field_reference.Group
+group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_dict_field.Group
+group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
+group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_generic_reference.Group
+group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
+group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_list_field_complex.Group
+group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_list_item_dereference.Group
+group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
+group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_map_field_reference.Group
+groups	mongoengine/tests/fields/fields.py	/^            groups = ListField(EmbeddedDocumentField(Group))$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Basedoc
+groups	tests/fields/fields.py	/^            groups = ListField(EmbeddedDocumentField(Group))$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Basedoc
+height	mongoengine/tests/document/instance.py	/^            height = FloatField()$/;"	v	class:InstanceTest.test_falsey_pk.Person
+height	mongoengine/tests/document/instance.py	/^            height = IntField(default=184, null=True)$/;"	v	class:InstanceTest.test_null_field.User
+height	mongoengine/tests/document/instance.py	/^            height = IntField(default=189)$/;"	v	class:InstanceTest.test_default_values.Person
+height	mongoengine/tests/fields/fields.py	/^            height = DecimalField(min_value=Decimal('0.1'),$/;"	v	class:FieldTest.test_decimal_validation.Person
+height	mongoengine/tests/fields/fields.py	/^            height = FloatField()$/;"	v	class:FieldTest.test_float_validation.BigPerson
+height	mongoengine/tests/fields/fields.py	/^            height = FloatField(min_value=0.1, max_value=3.5)$/;"	v	class:FieldTest.test_float_validation.Person
+height	tests/fields/fields.py	/^            height = DecimalField(min_value=Decimal('0.1'),$/;"	v	class:FieldTest.test_decimal_validation.Person
+height	tests/fields/fields.py	/^            height = FloatField()$/;"	v	class:FieldTest.test_float_validation.BigPerson
+height	tests/fields/fields.py	/^            height = FloatField(min_value=0.1, max_value=3.5)$/;"	v	class:FieldTest.test_float_validation.Person
+helpful	mongoengine/tests/queryset/queryset.py	/^            helpful = ListField(EmbeddedDocumentField(User))$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Collaborator
+high_score	mongoengine/tests/queryset/queryset.py	/^            high_score = IntField()$/;"	v	class:QuerySetTest.test_update_min_max.Scores
+hint	mongoengine/mongoengine/queryset/base.py	/^    def hint(self, index=None):$/;"	m	class:BaseQuerySet
+hits	mongoengine/tests/queryset/queryset.py	/^            hits = IntField()$/;"	v	class:QuerySetTest.test_exec_js_query.BlogPost
+hits	mongoengine/tests/queryset/queryset.py	/^            hits = IntField()$/;"	v	class:QuerySetTest.test_item_frequencies.BlogPost
+hits	mongoengine/tests/queryset/queryset.py	/^            hits = IntField()$/;"	v	class:QuerySetTest.test_update.BlogPost
+html_favicon	mongoengine/docs/conf.py	/^html_favicon = "favicon.ico"$/;"	v
+html_sidebars	mongoengine/docs/conf.py	/^html_sidebars = {$/;"	v
+html_theme	mongoengine/docs/conf.py	/^html_theme = 'sphinx_rtd_theme'$/;"	v
+html_theme_options	mongoengine/docs/conf.py	/^html_theme_options = {$/;"	v
+html_theme_path	mongoengine/docs/conf.py	/^html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]$/;"	v
+html_use_smartypants	mongoengine/docs/conf.py	/^html_use_smartypants = True$/;"	v
+htmlhelp_basename	mongoengine/docs/conf.py	/^htmlhelp_basename = 'MongoEnginedoc'$/;"	v
+id	mongoengine/tests/document/delta.py	/^            id = StringField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
+id	mongoengine/tests/document/inheritance.py	/^            id = IntField()$/;"	v	class:InheritanceTest.test_auto_id_vs_non_pk_id_field.City
+id	mongoengine/tests/document/instance.py	/^            id = IntField(primary_key=True)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections.Book
+id	mongoengine/tests/document/instance.py	/^            id = IntField(primary_key=True)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections.User
+id	mongoengine/tests/document/instance.py	/^            id = StringField(required=True)$/;"	v	class:InstanceTest.test_embedded_document_to_mongo_id.SubDoc
+id	mongoengine/tests/document/validation.py	/^            id = StringField(primary_key=True)$/;"	v	class:ValidatorErrorTest.test_embedded_db_field_validate.Doc
+id	mongoengine/tests/fields/fields.py	/^            id = BinaryField(primary_key=True)$/;"	v	class:FieldTest.test_binary_field_primary.Attachment
+id	mongoengine/tests/fields/fields.py	/^            id = BinaryField(primary_key=True)$/;"	v	class:FieldTest.test_binary_field_primary_filter_by_binary_pk_as_str.Attachment
+id	mongoengine/tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbed
+id	mongoengine/tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
+id	mongoengine/tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbed
+id	mongoengine/tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
+id	mongoengine/tests/fields/fields.py	/^            id = SequenceField()$/;"	v	class:FieldTest.test_embedded_sequence_field.Comment
+id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
+id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Animal
+id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Person
+id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_sequence_field.Person
+id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
+id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True, sequence_name='jelly')$/;"	v	class:FieldTest.test_sequence_field_sequence_name.Person
+id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True, value_decorator=str)$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
+id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True, value_decorator=str)$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
+id	mongoengine/tests/queryset/modify.py	/^    id = IntField(primary_key=True)$/;"	v	class:Doc
+id	mongoengine/tests/queryset/queryset.py	/^            id = IntField($/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Family
+id	mongoengine/tests/queryset/queryset.py	/^            id = IntField($/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+id	mongoengine/tests/queryset/queryset.py	/^            id = ObjectIdField('_id')$/;"	v	class:QuerySetTest.test_as_pymongo.User
+id	mongoengine/tests/queryset/queryset.py	/^            id = StringField(unique=True, primary_key=True)$/;"	v	class:QuerySetTest.test_filter_chaining.Blog
+id	mongoengine/tests/queryset/queryset.py	/^            id = StringField(unique=True, primary_key=True)$/;"	v	class:QuerySetTest.test_query_reference_to_custom_pk_doc.A
+id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.Message
+id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.Topic
+id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.User
+id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_list_lookup_not_checked_in_map.Comment
+id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_list_lookup_not_checked_in_map.Message
+id	mongoengine/tests/test_signals.py	/^            id = IntField(primary_key=True)$/;"	v	class:SignalTests.setUp.ExplicitId
+id	mongoengine/tests/test_signals.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:SignalTests.setUp.Author
+id	tests/fields/fields.py	/^            id = BinaryField(primary_key=True)$/;"	v	class:FieldTest.test_binary_field_primary.Attachment
+id	tests/fields/fields.py	/^            id = BinaryField(primary_key=True)$/;"	v	class:FieldTest.test_binary_field_primary_filter_by_binary_pk_as_str.Attachment
+id	tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbed
+id	tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
+id	tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbed
+id	tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
+id	tests/fields/fields.py	/^            id = SequenceField()$/;"	v	class:FieldTest.test_embedded_sequence_field.Comment
+id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
+id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Animal
+id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Person
+id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_sequence_field.Person
+id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
+id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True, sequence_name='jelly')$/;"	v	class:FieldTest.test_sequence_field_sequence_name.Person
+id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True, value_decorator=str)$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
+id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True, value_decorator=str)$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
+image	mongoengine/tests/fields/file_tests.py	/^            image = ImageField()$/;"	v	class:FileTest.test_image_field.TestImage
+image	mongoengine/tests/fields/file_tests.py	/^            image = ImageField(size=(185, 37))$/;"	v	class:FileTest.test_image_field_resize.TestImage
+image	mongoengine/tests/fields/file_tests.py	/^            image = ImageField(size=(185, 37, True))$/;"	v	class:FileTest.test_image_field_resize_force.TestImage
+image	mongoengine/tests/fields/file_tests.py	/^            image = ImageField(thumbnail_size=(92, 18))$/;"	v	class:FileTest.test_image_field_thumbnail.TestImage
+image1	mongoengine/tests/fields/file_tests.py	/^            image1 = ImageField()$/;"	v	class:FileTest.test_get_image_by_grid_id.TestImage
+image2	mongoengine/tests/fields/file_tests.py	/^            image2 = ImageField()$/;"	v	class:FileTest.test_get_image_by_grid_id.TestImage
+image_path	mongoengine/docs/code/tumblelog.py	/^    image_path = StringField()$/;"	v	class:ImagePost
+in_bulk	mongoengine/mongoengine/queryset/base.py	/^    def in_bulk(self, object_ids):$/;"	m	class:BaseQuerySet
+in_embedded	mongoengine/tests/fields/fields.py	/^            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
+in_embedded	mongoengine/tests/fields/fields.py	/^            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
+in_embedded	tests/fields/fields.py	/^            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
+in_embedded	tests/fields/fields.py	/^            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
+in_list	mongoengine/tests/fields/fields.py	/^            in_list = ListField(GenericLazyReferenceField())$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.EmbeddedOcurrence
+in_list	mongoengine/tests/fields/fields.py	/^            in_list = ListField(GenericLazyReferenceField())$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
+in_list	mongoengine/tests/fields/fields.py	/^            in_list = ListField(LazyReferenceField(Animal))$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.EmbeddedOcurrence
+in_list	mongoengine/tests/fields/fields.py	/^            in_list = ListField(LazyReferenceField(Animal))$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
+in_list	tests/fields/fields.py	/^            in_list = ListField(GenericLazyReferenceField())$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.EmbeddedOcurrence
+in_list	tests/fields/fields.py	/^            in_list = ListField(GenericLazyReferenceField())$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
+in_list	tests/fields/fields.py	/^            in_list = ListField(LazyReferenceField(Animal))$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.EmbeddedOcurrence
+in_list	tests/fields/fields.py	/^            in_list = ListField(LazyReferenceField(Animal))$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
+includes_cls	mongoengine/mongoengine/document.py	/^def includes_cls(fields):$/;"	f
+info	mongoengine/tests/document/delta.py	/^            info = ReferenceField(UInfoDocument)$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedUser
+info	mongoengine/tests/fields/fields.py	/^            info = DictField()$/;"	v	class:FieldTest.test_dict_field.BlogPost
+info	mongoengine/tests/fields/fields.py	/^            info = ListField()$/;"	v	class:FieldTest.test_list_assignment.BlogPost
+info	mongoengine/tests/fields/fields.py	/^            info = ListField()$/;"	v	class:FieldTest.test_list_field.BlogPost
+info	mongoengine/tests/fields/fields.py	/^            info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_invalid_operators.BlogPost
+info	mongoengine/tests/fields/fields.py	/^            info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_manipulative_operators.BlogPost
+info	mongoengine/tests/queryset/queryset.py	/^            info = DictField()$/;"	v	class:QuerySetTest.test_find_dict_item.BlogPost
+info	tests/fields/fields.py	/^            info = DictField()$/;"	v	class:FieldTest.test_dict_field.BlogPost
+info	tests/fields/fields.py	/^            info = ListField()$/;"	v	class:FieldTest.test_list_assignment.BlogPost
+info	tests/fields/fields.py	/^            info = ListField()$/;"	v	class:FieldTest.test_list_field.BlogPost
+info	tests/fields/fields.py	/^            info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_invalid_operators.BlogPost
+info	tests/fields/fields.py	/^            info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_manipulative_operators.BlogPost
+info_dict	mongoengine/tests/fields/fields.py	/^            info_dict = MapField(field=EmbeddedDocumentField(Info))$/;"	v	class:FieldTest.test_map_field_unicode.BlogPost
+info_dict	tests/fields/fields.py	/^            info_dict = MapField(field=EmbeddedDocumentField(Info))$/;"	v	class:FieldTest.test_map_field_unicode.BlogPost
+init	mongoengine/setup.py	/^init = os.path.join(os.path.dirname(__file__), 'mongoengine', '__init__.py')$/;"	v
+insert	mongoengine/mongoengine/base/datastructures.py	/^    def insert(self, *args, **kwargs):$/;"	m	class:BaseList
+insert	mongoengine/mongoengine/queryset/base.py	/^    def insert(self, doc_or_docs, load_bulk=True,$/;"	m	class:BaseQuerySet
+int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField()$/;"	v	class:DeltaTest.delta.Doc
+int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField()$/;"	v	class:DeltaTest.delta_recursive.Doc
+int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
+int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField(db_field='db_int_field')$/;"	v	class:DeltaTest.delta_db_field.Doc
+int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField(db_field='db_int_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
+int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField(db_field='db_int_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Embedded
+int_field	mongoengine/tests/document/instance.py	/^            int_field = IntField(default=1)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+int_field	mongoengine/tests/document/json_serialisation.py	/^            int_field = IntField(default=1)$/;"	v	class:TestJson.test_json_complex.Doc
+int_field	mongoengine/tests/queryset/queryset.py	/^            int_field = IntField(default=1)$/;"	v	class:QuerySetTest.test_json_complex.Doc
+int_fld	mongoengine/tests/document/instance.py	/^            int_fld = IntField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
+int_fld	mongoengine/tests/fields/fields.py	/^            int_fld = IntField()$/;"	v	class:FieldTest.test_int_and_float_ne_operator.TestDocument
+int_fld	mongoengine/tests/fields/fields.py	/^            int_fld = IntField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+int_fld	mongoengine/tests/fields/fields.py	/^            int_fld = IntField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
+int_fld	tests/fields/fields.py	/^            int_fld = IntField()$/;"	v	class:FieldTest.test_int_and_float_ne_operator.TestDocument
+int_fld	tests/fields/fields.py	/^            int_fld = IntField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+int_fld	tests/fields/fields.py	/^            int_fld = IntField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
+invalid_index	mongoengine/tests/document/indexes.py	/^            def invalid_index():$/;"	m	class:IndexesTest.test_hint.BlogPost
+invalid_index_2	mongoengine/tests/document/indexes.py	/^        def invalid_index_2():$/;"	f	function:IndexesTest.test_hint
+ip	mongoengine/tests/queryset/queryset.py	/^                ip='104.107.108.116'$/;"	v	class:QuerySetTest.test_as_pymongo.User
+ip	mongoengine/tests/queryset/queryset.py	/^            ip = StringField()$/;"	v	class:QuerySetTest.test_as_pymongo.LastLogin
+is_active	mongoengine/tests/queryset/queryset.py	/^             is_active=False).save()$/;"	v	class:QuerySetTest.test_text_indexes.News
+is_active	mongoengine/tests/queryset/queryset.py	/^            is_active = BooleanField(default=True)$/;"	v	class:QuerySetTest.test_text_indexes.News
+is_mamal	mongoengine/tests/queryset/queryset.py	/^            is_mamal = BooleanField()$/;"	v	class:QuerySetTest.test_subclass_field_query.Animal
+is_published	mongoengine/tests/queryset/queryset.py	/^            is_published = BooleanField()$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+is_published	mongoengine/tests/queryset/queryset.py	/^            is_published = BooleanField(default=False)$/;"	v	class:QuerySetTest.test_custom_querysets_managers_directly.Post
+is_published	mongoengine/tests/queryset/queryset.py	/^            is_published=True,$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+item	mongoengine/tests/queryset/transform.py	/^            item = EmbeddedDocumentField(EmbeddedItem)$/;"	v	class:TransformTest.test_last_field_name_like_operator.Doc
+item_frequencies	mongoengine/mongoengine/queryset/base.py	/^    def item_frequencies(self, field, normalize=False, map_reduce=True):$/;"	m	class:BaseQuerySet
+items	mongoengine/mongoengine/base/datastructures.py	/^    def items(self):$/;"	m	class:StrictDict
+items	mongoengine/tests/document/instance.py	/^            items = ListField()$/;"	v	class:InstanceTest.test_reload_of_non_strict_with_special_field_name.Post
+items	mongoengine/tests/fields/fields.py	/^            items = ListField(EnumField())$/;"	v	class:FieldTest.test_tuples_as_tuples.TestDoc
+items	mongoengine/tests/test_dereference.py	/^            items = ListField(EmbeddedDocumentField("PlaylistItem"))$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.Playlist
+items	tests/fields/fields.py	/^            items = ListField(EnumField())$/;"	v	class:FieldTest.test_tuples_as_tuples.TestDoc
+iteritems	mongoengine/mongoengine/base/datastructures.py	/^    def iteritems(self):$/;"	m	class:StrictDict
+iterkeys	mongoengine/mongoengine/base/datastructures.py	/^    def iterkeys(self):$/;"	m	class:StrictDict
+job	mongoengine/tests/document/instance.py	/^            job = EmbeddedDocumentField(Job)$/;"	v	class:InstanceTest.setUp.Person
+job	mongoengine/tests/document/instance.py	/^            job = ReferenceField(Job)$/;"	v	class:InstanceTest.test_do_not_save_unchanged_references.Person
+john	mongoengine/docs/code/tumblelog.py	/^john = User(email='jdoe@example.com', first_name='John', last_name='Doe')$/;"	v
+key	mongoengine/tests/document/indexes.py	/^            key = DictField(primary_key=True)$/;"	v	class:IndexesTest.test_compound_key_dictfield.ReportDictField
+key	mongoengine/tests/document/indexes.py	/^            key = EmbeddedDocumentField(CompoundKey, primary_key=True)$/;"	v	class:IndexesTest.test_compound_key_embedded.ReportEmbedded
+key	mongoengine/tests/queryset/queryset.py	/^            key = StringField(primary_key=True)$/;"	v	class:QuerySetTest.test_scalar_primary_key.SettingValue
+key_has_dot_or_dollar	mongoengine/fields.py	/^def key_has_dot_or_dollar(d):$/;"	f
+key_has_dot_or_dollar	mongoengine/mongoengine/fields.py	/^def key_has_dot_or_dollar(d):$/;"	f
+key_not_string	mongoengine/fields.py	/^def key_not_string(d):$/;"	f
+key_not_string	mongoengine/mongoengine/fields.py	/^def key_not_string(d):$/;"	f
+keys	mongoengine/mongoengine/base/datastructures.py	/^    def keys(self):$/;"	m	class:StrictDict
+keywords	mongoengine/tests/document/indexes.py	/^            keywords = StringField()$/;"	v	class:IndexesTest.test_build_index_spec_is_not_destructive.MyDoc
+l	mongoengine/tests/document/instance.py	/^            l = ListField(EmbeddedDocumentField(B))$/;"	v	class:InstanceTest.test_list_iter.A
+last_login	mongoengine/tests/queryset/queryset.py	/^            last_login = EmbeddedDocumentField(LastLogin)$/;"	v	class:QuerySetTest.test_as_pymongo.User
+last_login	mongoengine/tests/queryset/queryset.py	/^            last_login=LastLogin($/;"	v	class:QuerySetTest.test_as_pymongo.User
+last_name	mongoengine/docs/code/tumblelog.py	/^    last_name = StringField(max_length=50)$/;"	v	class:User
+latex_documents	mongoengine/docs/conf.py	/^latex_documents = [$/;"	v
+latex_paper_size	mongoengine/docs/conf.py	/^latex_paper_size = 'a4'$/;"	v
+like	mongoengine/tests/fields/fields.py	/^            like = GenericEmbeddedDocumentField()$/;"	v	class:FieldTest.test_generic_embedded_document.Person
+like	mongoengine/tests/fields/fields.py	/^            like = GenericEmbeddedDocumentField(choices=(Dish,))$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Person
+like	tests/fields/fields.py	/^            like = GenericEmbeddedDocumentField()$/;"	v	class:FieldTest.test_generic_embedded_document.Person
+like	tests/fields/fields.py	/^            like = GenericEmbeddedDocumentField(choices=(Dish,))$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Person
+likes	mongoengine/tests/fields/fields.py	/^            likes = ListField(GenericEmbeddedDocumentField(choices=(Dish,)))$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Person
+likes	tests/fields/fields.py	/^            likes = ListField(GenericEmbeddedDocumentField(choices=(Dish,)))$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Person
+limit	mongoengine/mongoengine/queryset/base.py	/^    def limit(self, n):$/;"	m	class:BaseQuerySet
+line	mongoengine/tests/fields/geo.py	/^            line = LineStringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere.Event
+line	mongoengine/tests/fields/geo.py	/^            line = LineStringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Venue
+line	mongoengine/tests/queryset/geo.py	/^            line = LineStringField()$/;"	v	class:GeoQueriesTest.test_2dsphere_linestring_sets_correctly.Location
+line	mongoengine/tests/queryset/geo.py	/^            line = LineStringField()$/;"	v	class:GeoQueriesTest.test_linestring.Road
+line	mongoengine/tests/queryset/transform.py	/^            line = LineStringField()$/;"	v	class:TransformTest.test_geojson_LineStringField.Location
+link_url	mongoengine/docs/code/tumblelog.py	/^    link_url = StringField()$/;"	v	class:LinkPost
+list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField()$/;"	v	class:DeltaTest.delta.Doc
+list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField()$/;"	v	class:DeltaTest.delta_recursive.Doc
+list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
+list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField(db_field='db_list_field')$/;"	v	class:DeltaTest.delta_db_field.Doc
+list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField(db_field='db_list_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
+list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField(db_field='db_list_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Embedded
+list_field	mongoengine/tests/document/instance.py	/^            list_field = ListField()$/;"	v	class:InstanceTest.test_reload_referencing.Doc
+list_field	mongoengine/tests/document/instance.py	/^            list_field = ListField()$/;"	v	class:InstanceTest.test_reload_referencing.Embedded
+list_field	mongoengine/tests/document/instance.py	/^            list_field = ListField(default=lambda: [1, 2, 3])$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+list_field	mongoengine/tests/document/json_serialisation.py	/^            list_field = ListField(default=lambda: [1, 2, 3])$/;"	v	class:TestJson.test_json_complex.Doc
+list_field	mongoengine/tests/queryset/queryset.py	/^            list_field = ListField(default=lambda: [1, 2, 3])$/;"	v	class:QuerySetTest.test_json_complex.Doc
+list_indexes	mongoengine/mongoengine/document.py	/^    def list_indexes(cls):$/;"	m	class:Document
+lists	mongoengine/tests/fixtures.py	/^    lists = ListField(StringField())$/;"	v	class:NewDocumentPickleTest
+lists	mongoengine/tests/fixtures.py	/^    lists = ListField(StringField())$/;"	v	class:PickleSignalsTest
+lists	mongoengine/tests/fixtures.py	/^    lists = ListField(StringField())$/;"	v	class:PickleTest
+live_and_let_die	mongoengine/tests/test_signals.py	/^        def live_and_let_die():$/;"	f	function:SignalTests.test_signal_kwargs
+living_thing	mongoengine/tests/fields/fields.py	/^            living_thing = GenericLazyReferenceField(choices=[Animal, Vegetal])$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Ocurrence
+living_thing	tests/fields/fields.py	/^            living_thing = GenericLazyReferenceField(choices=[Animal, Vegetal])$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Ocurrence
+load_existing_author	mongoengine/tests/test_signals.py	/^        def load_existing_author():$/;"	f	function:SignalTests.test_model_signals
+loc	mongoengine/tests/fields/geo.py	/^            loc = GeoPointField()$/;"	v	class:GeoFieldTest.test_geopoint_validation.Location
+loc	mongoengine/tests/fields/geo.py	/^            loc = LineStringField()$/;"	v	class:GeoFieldTest.test_linestring_validation.Location
+loc	mongoengine/tests/fields/geo.py	/^            loc = MultiLineStringField()$/;"	v	class:GeoFieldTest.test_multilinestring_validation.Location
+loc	mongoengine/tests/fields/geo.py	/^            loc = MultiPointField()$/;"	v	class:GeoFieldTest.test_multipoint_validation.Location
+loc	mongoengine/tests/fields/geo.py	/^            loc = MultiPolygonField()$/;"	v	class:GeoFieldTest.test_multipolygon_validation.Location
+loc	mongoengine/tests/fields/geo.py	/^            loc = PointField()$/;"	v	class:GeoFieldTest.test_point_validation.Location
+loc	mongoengine/tests/fields/geo.py	/^            loc = PolygonField()$/;"	v	class:GeoFieldTest.test_polygon_validation.Location
+loc	mongoengine/tests/queryset/geo.py	/^            loc = PointField()$/;"	v	class:GeoQueriesTest.test_2dsphere_point_sets_correctly.Location
+loc	mongoengine/tests/queryset/transform.py	/^            loc = PointField()$/;"	v	class:TransformTest.test_geojson_PointField.Location
+locale	mongoengine/tests/queryset/queryset.py	/^               locale=Locale(city="Belo Horizonte", country="Brazil")).save()$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
+locale	mongoengine/tests/queryset/queryset.py	/^               locale=Locale(city="Brasilia", country="Brazil")).save()$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
+locale	mongoengine/tests/queryset/queryset.py	/^               locale=Locale(city="Corumba-GO", country="Brazil")).save()$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
+locale	mongoengine/tests/queryset/queryset.py	/^               locale=Locale(city="New York", country="USA")).save()$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
+locale	mongoengine/tests/queryset/queryset.py	/^            locale = EmbeddedDocumentField(Locale)$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
+location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_create_geohaystack_index.Place
+location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_explicit_geo2d_index.Place
+location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_explicit_geo2d_index_embedded.EmbeddedLocation
+location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_explicit_geohaystack_index.Place
+location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_explicit_geosphere_index.Place
+location	mongoengine/tests/document/instance.py	/^            location = ReferenceField('Location', dbref=True)$/;"	v	class:InstanceTest.test_document_registry_regressions.Area
+location	mongoengine/tests/fields/geo.py	/^            location = GeoPointField()$/;"	v	class:GeoFieldTest.test_geo_indexes_recursion.Location
+location	mongoengine/tests/fields/geo.py	/^            location = GeoPointField()$/;"	v	class:GeoFieldTest.test_geopoint_embedded_indexes.Venue
+location	mongoengine/tests/fields/geo.py	/^            location = GeoPointField()$/;"	v	class:GeoFieldTest.test_indexes_geopoint.Event
+location	mongoengine/tests/fields/geo.py	/^            location = PointField(auto_index=False)$/;"	v	class:GeoFieldTest.test_geo_indexes_auto_index.Log
+location	mongoengine/tests/fields/geo.py	/^            location = ReferenceField(Location)$/;"	v	class:GeoFieldTest.test_geo_indexes_recursion.Parent
+location	mongoengine/tests/queryset/geo.py	/^            location = GeoPointField()$/;"	v	class:GeoQueriesTest.test_spherical_geospatial_operators.Point
+location	mongoengine/tests/queryset/geo.py	/^            location = PointField()$/;"	v	class:GeoQueriesTest.test_aspymongo_with_only.Place
+location	mongoengine/tests/queryset/geo.py	/^            location = point_field_class()$/;"	v	class:GeoQueriesTest._create_event_data.Event
+location	mongoengine/tests/queryset/geo.py	/^            location = point_field_class()$/;"	v	class:GeoQueriesTest._test_embedded.Venue
+location	mongoengine/tests/queryset/geo.py	/^            location=[-122.4194155, 37.7749295])$/;"	v	class:GeoQueriesTest._create_event_data.Event
+location	mongoengine/tests/queryset/geo.py	/^            location=[-87.677137, 41.909889])$/;"	v	class:GeoQueriesTest._create_event_data.Event
+location	mongoengine/tests/queryset/geo.py	/^            location=[-87.686638, 41.900474])$/;"	v	class:GeoQueriesTest._create_event_data.Event
+location	mongoengine/tests/queryset/queryset.py	/^                location='White House',$/;"	v	class:QuerySetTest.test_as_pymongo.User
+location	mongoengine/tests/queryset/queryset.py	/^            location = StringField()$/;"	v	class:QuerySetTest.test_as_pymongo.LastLogin
+location	mongoengine/tests/queryset/transform.py	/^            location = GeoPointField()$/;"	v	class:TransformTest.test_understandable_error_raised.Event
+location__max_distance	mongoengine/tests/queryset/geo.py	/^                               location__max_distance=60 \/ earth_radius)$/;"	v	class:GeoQueriesTest.test_spherical_geospatial_operators.Point
+location__min_distance	mongoengine/tests/queryset/geo.py	/^                               location__min_distance=60 \/ earth_radius)$/;"	v	class:GeoQueriesTest.test_spherical_geospatial_operators.Point
+location__within_spherical_distance	mongoengine/tests/queryset/geo.py	/^            location__within_spherical_distance=[$/;"	v	class:GeoQueriesTest.test_spherical_geospatial_operators.Point
+log	mongoengine/tests/document/instance.py	/^            log = StringField()$/;"	v	class:InstanceTest.test_shard_key.LogEntry
+log	mongoengine/tests/document/instance.py	/^            log = StringField()$/;"	v	class:InstanceTest.test_shard_key_primary.LogEntry
+log	mongoengine/tests/queryset/queryset.py	/^            log = StringField()$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Family
+log1	mongoengine/tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=d1)$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+log1	mongoengine/tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=d1.isoformat('T'))$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+log1	mongoengine/tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=query)$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+log1	tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=d1)$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+log1	tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=d1.isoformat('T'))$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+log1	tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=query)$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
+log_message	mongoengine/tests/document/instance.py	/^            log_message = StringField(verbose_name="Log message",$/;"	v	class:InstanceTest.test_embedded_update.Page
+log_message	mongoengine/tests/document/instance.py	/^            log_message = StringField(verbose_name="Log message",$/;"	v	class:InstanceTest.test_embedded_update_after_save.Page
+log_message	mongoengine/tests/document/instance.py	/^            log_message = StringField(verbose_name="Log message",$/;"	v	class:InstanceTest.test_embedded_update_db_field.Page
+long_fld	mongoengine/tests/fields/fields.py	/^            long_fld = LongField()$/;"	v	class:FieldTest.test_long_ne_operator.TestDocument
+long_fld	tests/fields/fields.py	/^            long_fld = LongField()$/;"	v	class:FieldTest.test_long_ne_operator.TestDocument
+lookup	mongoengine/mongoengine/queryset/base.py	/^        def lookup(obj, name):$/;"	f	function:BaseQuerySet._get_scalar
+lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:CachedReferenceField
+lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:DictField
+lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:DynamicField
+lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:EmbeddedDocumentField
+lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:GenericEmbeddedDocumentField
+lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:LazyReferenceField
+lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:ReferenceField
+lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:StringField
+lookup_member	mongoengine/mongoengine/base/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:ComplexBaseField
+lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:CachedReferenceField
+lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:DictField
+lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:DynamicField
+lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:EmbeddedDocumentField
+lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:GenericEmbeddedDocumentField
+lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:LazyReferenceField
+lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:ReferenceField
+lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:StringField
+low_score	mongoengine/tests/queryset/queryset.py	/^            low_score = IntField()$/;"	v	class:QuerySetTest.test_update_min_max.Scores
+machine	mongoengine/tests/document/instance.py	/^            machine = StringField()$/;"	v	class:InstanceTest.test_shard_key.LogEntry
+machine	mongoengine/tests/document/instance.py	/^            machine = StringField(primary_key=True)$/;"	v	class:InstanceTest.test_shard_key_primary.LogEntry
+macros	mongoengine/tests/document/instance.py	/^            macros = MapField(EmbeddedDocumentField(Macro))$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Parameter
+main	mongoengine/benchmark.py	/^def main():$/;"	f
+map_f	mongoengine/tests/queryset/queryset.py	/^            map_f=map_family,$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+map_f	mongoengine/tests/queryset/queryset.py	/^            map_f=map_person,$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+map_field	mongoengine/tests/document/instance.py	/^            map_field = MapField(IntField(), default=lambda: {"simple": 1})$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+map_field	mongoengine/tests/document/json_serialisation.py	/^            map_field = MapField(IntField(), default=lambda: {"simple": 1})$/;"	v	class:TestJson.test_json_complex.Doc
+map_field	mongoengine/tests/queryset/queryset.py	/^            map_field = MapField(IntField(), default=lambda: {"simple": 1})$/;"	v	class:QuerySetTest.test_json_complex.Doc
+map_reduce	mongoengine/mongoengine/queryset/base.py	/^    def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,$/;"	m	class:BaseQuerySet
+mapping	mongoengine/tests/fields/fields.py	/^                mapping = MapField()$/;"	v	class:FieldTest.test_mapfield.Simple.NoDeclaredType
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField()$/;"	v	class:FieldTest.test_complex_field_same_value_not_changed.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField()$/;"	v	class:FieldTest.test_dictfield_complex.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField(field=IntField())$/;"	v	class:FieldTest.test_dictfield_strict.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField(field=ListField(IntField(required=True)))$/;"	v	class:FieldTest.test_atomic_update_dict_field.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField(required=True)$/;"	v	class:FieldTest.test_complex_field_required.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_complex_field_same_value_not_changed.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_list_field_complex.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_list_field_rejects_strings.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField(field=IntField())$/;"	v	class:FieldTest.test_list_field_strict.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField(required=True)$/;"	v	class:FieldTest.test_complex_field_required.Simple
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = MapField(EmbeddedDocumentField(SettingBase))$/;"	v	class:FieldTest.test_complex_mapfield.Extensible
+mapping	mongoengine/tests/fields/fields.py	/^            mapping = MapField(IntField())$/;"	v	class:FieldTest.test_mapfield.Simple
+mapping	tests/fields/fields.py	/^                mapping = MapField()$/;"	v	class:FieldTest.test_mapfield.Simple.NoDeclaredType
+mapping	tests/fields/fields.py	/^            mapping = DictField()$/;"	v	class:FieldTest.test_complex_field_same_value_not_changed.Simple
+mapping	tests/fields/fields.py	/^            mapping = DictField()$/;"	v	class:FieldTest.test_dictfield_complex.Simple
+mapping	tests/fields/fields.py	/^            mapping = DictField(field=IntField())$/;"	v	class:FieldTest.test_dictfield_strict.Simple
+mapping	tests/fields/fields.py	/^            mapping = DictField(field=ListField(IntField(required=True)))$/;"	v	class:FieldTest.test_atomic_update_dict_field.Simple
+mapping	tests/fields/fields.py	/^            mapping = DictField(required=True)$/;"	v	class:FieldTest.test_complex_field_required.Simple
+mapping	tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_complex_field_same_value_not_changed.Simple
+mapping	tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_list_field_complex.Simple
+mapping	tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_list_field_rejects_strings.Simple
+mapping	tests/fields/fields.py	/^            mapping = ListField(field=IntField())$/;"	v	class:FieldTest.test_list_field_strict.Simple
+mapping	tests/fields/fields.py	/^            mapping = ListField(required=True)$/;"	v	class:FieldTest.test_complex_field_required.Simple
+mapping	tests/fields/fields.py	/^            mapping = MapField(EmbeddedDocumentField(SettingBase))$/;"	v	class:FieldTest.test_complex_mapfield.Extensible
+mapping	tests/fields/fields.py	/^            mapping = MapField(IntField())$/;"	v	class:FieldTest.test_mapfield.Simple
+master_doc	mongoengine/docs/conf.py	/^master_doc = 'index'$/;"	v
+max_time_ms	mongoengine/mongoengine/queryset/base.py	/^    def max_time_ms(self, ms):$/;"	m	class:BaseQuerySet
+max_value	mongoengine/tests/fields/fields.py	/^                                  max_value=Decimal('3.5'))$/;"	v	class:FieldTest.test_decimal_validation.Person
+max_value	tests/fields/fields.py	/^                                  max_value=Decimal('3.5'))$/;"	v	class:FieldTest.test_decimal_validation.Person
+member	mongoengine/tests/queryset/queryset.py	/^            member = EmbeddedDocumentField(Member)$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
+members	mongoengine/tests/fields/fields.py	/^            members = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_item_dereference.Group
+members	mongoengine/tests/queryset/queryset.py	/^            members = DictField()$/;"	v	class:QuerySetTest.test_dictfield_update.Club
+members	mongoengine/tests/queryset/queryset.py	/^            members = ListField(EmbeddedDocumentField(Member))$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
+members	mongoengine/tests/queryset/queryset.py	/^            members = ListField(ReferenceField(self.Person))$/;"	v	class:QuerySetTest.test_update_value_conversion.Group
+members	mongoengine/tests/queryset/queryset.py	/^            members = MapField(EmbeddedDocumentField(Member))$/;"	v	class:QuerySetTest.test_mapfield_update.Club
+members	mongoengine/tests/test_context_managers.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.Group
+members	mongoengine/tests/test_context_managers.py	/^            members = ListField(ReferenceField(User, dbref=True))$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.Group
+members	mongoengine/tests/test_dereference.py	/^            members = DictField()$/;"	v	class:FieldTest.test_dict_field.Group
+members	mongoengine/tests/test_dereference.py	/^            members = DictField()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField()$/;"	v	class:FieldTest.test_list_field_complex.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_item_dereference.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_handle_old_style_references.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_stores_as_type.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_migrate_references.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=True))$/;"	v	class:FieldTest.test_handle_old_style_references.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=True))$/;"	v	class:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries.Group
+members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=True))$/;"	v	class:FieldTest.test_migrate_references.Group
+members	mongoengine/tests/test_dereference.py	/^            members = MapField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
+members	mongoengine/tests/test_dereference.py	/^            members = MapField(ReferenceField(User))$/;"	v	class:FieldTest.test_map_field_reference.Group
+members	tests/fields/fields.py	/^            members = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_item_dereference.Group
+merge	mongoengine/mongoengine/base/metaclasses.py	/^    def merge(self, new_options):$/;"	m	class:MetaDict
+merge_index_specs	mongoengine/mongoengine/base/document.py	/^        def merge_index_specs(index_specs, indices):$/;"	f	function:BaseDocument._build_index_specs
+message	mongoengine/mongoengine/errors.py	/^    message = property(_get_message, _set_message)$/;"	v	class:ValidationError
+message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.Comments
+message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents.UserComments
+message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
+message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.ModeratorComments
+message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.UserComments
+message	mongoengine/tests/queryset/queryset.py	/^            message = StringField()$/;"	v	class:QuerySetTest.test_ensure_index.Comment
+message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.Comments
+message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents.UserComments
+message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
+message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.ModeratorComments
+message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.UserComments
+meta	mongoengine/docs/code/tumblelog.py	/^    meta = {'allow_inheritance': True}$/;"	v	class:Post
+meta	mongoengine/tests/all_warnings/__init__.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:AllWarnings.test_document_collection_syntax_warning.NonAbstractBase
+meta	mongoengine/tests/all_warnings/__init__.py	/^            meta = {'collection': 'fail'}$/;"	v	class:AllWarnings.test_document_collection_syntax_warning.InheritedDocumentFailTest
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {"allow_inheritance": True, "indexes": ["family"]}$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Animal
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:ClassMethodsTest.setUp.Person
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {"indexes": ["name"]}$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Vaccine
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_collection_naming.BaseDocument
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_collection_naming.BaseMixin
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPost
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPostWithTags
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPost
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithCustomField
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithTags
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPost
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPostWithTags
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPostWithTagsAndExtraText
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:ClassMethodsTest.test_collection_naming.BaseDocument
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': 'app'}$/;"	v	class:ClassMethodsTest.test_collection_name_and_primary.Person
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': 'pimp_my_collection'}$/;"	v	class:ClassMethodsTest.test_collection_naming.CustomNamingTest
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': 'wibble'}$/;"	v	class:ClassMethodsTest.test_collection_naming.InheritedAbstractNamingTest
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': collection_name}$/;"	v	class:ClassMethodsTest.test_custom_collection_name_operations.Person
+meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': lambda c: "DYNAMO"}$/;"	v	class:ClassMethodsTest.test_collection_naming.DynamicNamingTest
+meta	mongoengine/tests/document/delta.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:DeltaTest.setUp.Person
+meta	mongoengine/tests/document/delta.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:DeltaTest.test_delta_for_dynamic_documents.Person
+meta	mongoengine/tests/document/dynamic.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:DynamicTest.setUp.Person
+meta	mongoengine/tests/document/indexes.py	/^                meta = {'indexes': [$/;"	v	class:IndexesTest.test_index_with_pk.Comment.BlogPost
+meta	mongoengine/tests/document/indexes.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:IndexesTest.setUp.Person
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest._index_test.BlogPost
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest._index_test_inheritance.BlogPost
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_abstract_index_inheritance.Person
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_abstract_index_inheritance.UserBase
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_build_index_spec_is_not_destructive.MyDoc
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_compound_index_underscore_cls_not_overwritten.TestDoc
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_covered_index.Test
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_dictionary_indexes.BlogPost
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_disable_index_creation.User
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_embedded_document_index.BlogPost
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_embedded_document_index_meta.Person
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_explicit_geo2d_index.Place
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_explicit_geo2d_index_embedded.Place
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_explicit_geohaystack_index.Place
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_explicit_geosphere_index.Place
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_hashed_indexes.Book
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_hint.BlogPost
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_dont_send_cls_option.TestChildDoc
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_dont_send_cls_option.TestDoc
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_no_cls.A
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_no_cls.B
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_on_id.BlogPost
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_inherited_index.A
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_list_embedded_document_index.BlogPost
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_sparse_compound_indexes.MyDoc
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_string_indexes.MyDoc
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_text_indexes.Book
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_ttl_indexes.Log
+meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_unique_and_indexes.Customer
+meta	mongoengine/tests/document/indexes.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:IndexesTest.test_recursive_embedded_objects_dont_break_indexes.RecursiveDocument
+meta	mongoengine/tests/document/indexes.py	/^            meta = {'db_alias': 'test_indexes_after_database_drop'}$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
+meta	mongoengine/tests/document/indexes.py	/^            meta = {'indexes': ['title']}$/;"	v	class:IndexesTest._index_test_inheritance.ExtendedBlogPost
+meta	mongoengine/tests/document/inheritance.py	/^                meta = {'abstract': True}$/;"	v	class:InheritanceTest.test_abstract_documents.Human.EvilHuman
+meta	mongoengine/tests/document/inheritance.py	/^                meta = {'allow_inheritance': False}$/;"	v	class:InheritanceTest.test_cant_turn_off_inheritance_on_subclass.Animal.Mammal
+meta	mongoengine/tests/document/inheritance.py	/^                meta = {'collection': 'booze'}$/;"	v	class:InheritanceTest.test_inherited_collections.Drinker.AcloholicDrink
+meta	mongoengine/tests/document/inheritance.py	/^                meta = {'collection': 'booze'}$/;"	v	class:InheritanceTest.test_inherited_collections.Drinker.AlcoholicDrink
+meta	mongoengine/tests/document/inheritance.py	/^            meta = meta_settings$/;"	v	class:InheritanceTest.test_abstract_documents.Animal
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {"abstract": True}$/;"	v	class:InheritanceTest.test_abstract_embedded_documents.A
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {$/;"	v	class:InheritanceTest.test_document_inheritance.DateCreatedDocument
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {$/;"	v	class:InheritanceTest.test_document_inheritance.DateUpdatedDocument
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {$/;"	v	class:InheritanceTest.test_indexes_and_multiple_inheritance.A
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {$/;"	v	class:InheritanceTest.test_indexes_and_multiple_inheritance.B
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_abstract_document_creation_does_not_fail.City
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly.City
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_allow_inheritance_abstract_document.FinalDocument
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class.City
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_auto_id_vs_non_pk_id_field.City
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True}$/;"	v	class:InheritanceTest.test_abstract_documents.Mammal
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_allow_inheritance_embedded_document.Comment
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_cant_turn_off_inheritance_on_subclass.Animal
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_dynamic_declarations.Animal
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_inheritance_meta_data.Person
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_inheritance_to_mongo_keys.Person
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_inherited_collections.Drink
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_polymorphic_queries.Animal
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_subclasses.Animal
+meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_superclasses.Animal
+meta	mongoengine/tests/document/instance.py	/^            meta = dict(shard_key=["id"])$/;"	v	class:InstanceTest.test_from_son.MyPerson
+meta	mongoengine/tests/document/instance.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:InstanceTest.setUp.Person
+meta	mongoengine/tests/document/instance.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:InstanceTest.test_db_alias_overrides.A
+meta	mongoengine/tests/document/instance.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:InstanceTest.test_embedded_document_to_mongo.Person
+meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-1", "allow_inheritance": True}$/;"	v	class:InstanceTest.test_db_alias_propagates.A
+meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-1"}$/;"	v	class:InstanceTest.test_db_alias_tests.User
+meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-2"}$/;"	v	class:InstanceTest.test_db_alias_overrides.B
+meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-2"}$/;"	v	class:InstanceTest.test_db_alias_tests.Book
+meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-3"}$/;"	v	class:InstanceTest.test_db_alias_tests.AuthorBooks
+meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_capped_collection.Log
+meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_capped_collection_default.Log
+meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_capped_collection_no_max_size_problems.Log
+meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_db_ref_usage.Book
+meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_reload_of_non_strict_with_special_field_name.Post
+meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_shard_key.LogEntry
+meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_shard_key_in_embedded_document.Bar
+meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_shard_key_primary.LogEntry
+meta	mongoengine/tests/document/instance.py	/^            meta = {'abstract': True}$/;"	v	class:InstanceTest.test_save_abstract_document.Doc
+meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False,$/;"	v	class:InstanceTest.test_list_search_by_embedded.Page
+meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
+meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:InstanceTest.test_list_search_by_embedded.Comment
+meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:InstanceTest.test_list_search_by_embedded.User
+meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:InstanceTest.test_reference_inheritance.Stats
+meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InstanceTest.test_custom_id_field.User
+meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InstanceTest.test_document_not_registered.Place
+meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InstanceTest.test_document_registry_regressions.Location
+meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InstanceTest.test_polymorphic_references.Animal
+meta	mongoengine/tests/document/instance.py	/^            meta = {'cascade': False}$/;"	v	class:InstanceTest.test_save_cascade_meta_false.Person
+meta	mongoengine/tests/document/instance.py	/^            meta = {'cascade': False}$/;"	v	class:InstanceTest.test_save_cascade_meta_true.Person
+meta	mongoengine/tests/document/instance.py	/^            meta = {'collection': 'blogpost_1'}$/;"	v	class:InstanceTest.test_save_reference.BlogPost
+meta	mongoengine/tests/document/instance.py	/^            meta = {'shard_key': ('superphylum',)}$/;"	v	class:InstanceTest.test_reload_sharded.Animal
+meta	mongoengine/tests/document/instance.py	/^            meta = {'shard_key': ('superphylum.name',)}$/;"	v	class:InstanceTest.test_reload_sharded_nested.Animal
+meta	mongoengine/tests/document/instance.py	/^            meta = {'strict': False}$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false.Thing
+meta	mongoengine/tests/document/instance.py	/^            meta = {'strict': False}$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc.User
+meta	mongoengine/tests/document/instance.py	/^            meta = {'strict': False}$/;"	v	class:InstanceTest.test_load_undefined_fields_with_strict_false.User
+meta	mongoengine/tests/document/validation.py	/^            meta = {'abstract': True}$/;"	v	class:ValidatorErrorTest.test_fields_rewrite.BasePerson
+meta	mongoengine/tests/document/validation.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:ValidatorErrorTest.test_parent_reference_in_child_document.Parent
+meta	mongoengine/tests/document/validation.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:ValidatorErrorTest.test_parent_reference_set_as_attribute_in_child_document.Parent
+meta	mongoengine/tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_abstract_reference_base_type.Sibling
+meta	mongoengine/tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_drop_abstract_document.AbstractDoc
+meta	mongoengine/tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_reference_abstract_class.Sibling
+meta	mongoengine/tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Sibling
+meta	mongoengine/tests/fields/fields.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:FieldTest.test_complex_mapfield.SettingBase
+meta	mongoengine/tests/fields/fields.py	/^            meta = {$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Basedoc
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Base
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_generic_reference.Link
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_cls_field.Animal
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dictfield_complex.SettingBase
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_embedded_document_inheritance.User
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_list_field_complex.SettingBase
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
+meta	mongoengine/tests/fields/fields.py	/^            meta = {'strict': False}$/;"	v	class:FieldTest.test_undefined_field_exception_with_strict.Doc
+meta	mongoengine/tests/fields/geo.py	/^            meta = {$/;"	v	class:GeoFieldTest.test_geo_indexes_auto_index.Log
+meta	mongoengine/tests/fixtures.py	/^    meta = {'allow_inheritance': True}$/;"	v	class:Base
+meta	mongoengine/tests/queryset/field_list.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:OnlyExcludeAllTest.setUp.Person
+meta	mongoengine/tests/queryset/field_list.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.Base
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_bool_with_ordering_from_meta_dict.Person
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_clear_ordering.BlogPost
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_cls_query_in_subclassed_docs.Animal
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_no_ordering_for_get.BlogPost
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_ordering.BlogPost
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_read_preference.Bar
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True, 'queryset_class': CustomQuerySet}$/;"	v	class:QuerySetTest.test_custom_querysets_inherited.Base
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_custom_querysets_inherited_direct.Base
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document.AbstractBlogPost
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document.AbstractBlogPost
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document.AbstractBlogPost
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents.AbstractBlogPost
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:QuerySetTest.test_elem_match.Bar
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:QuerySetTest.test_elem_match.Foo
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.setUp.Person
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_ensure_index.Comment
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_inherit_objects.Foo
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_inherit_objects_override.Foo
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_no_sub_classes.A
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_subclass_field_query.Animal
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_upsert_includes_cls.Test
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'collection': 'b'}$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.B
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'db_alias': 'testdb'}$/;"	v	class:QuerySetTest.test_distinct_handles_references_to_alias.Bar
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'db_alias': 'testdb'}$/;"	v	class:QuerySetTest.test_distinct_handles_references_to_alias.Foo
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'indexes': [$/;"	v	class:QuerySetTest.test_text_indexes.News
+meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'queryset_class': CustomQuerySet}$/;"	v	class:QuerySetTest.test_custom_querysets.Post
+meta	mongoengine/tests/queryset/transform.py	/^            meta = {$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
+meta	mongoengine/tests/queryset/transform.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:TransformTest.test_raw_and_merging.Doc
+meta	mongoengine/tests/queryset/visitor.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QTest.setUp.Person
+meta	mongoengine/tests/test_context_managers.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:ContextManagersTest.test_no_sub_classes.A
+meta	mongoengine/tests/test_dereference.py	/^            meta = {"db_alias": "testdb-1"}$/;"	v	class:FieldTest.test_objectid_reference_across_databases.User
+meta	mongoengine/tests/test_dereference.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.UserA
+meta	mongoengine/tests/test_dereference.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Bar
+meta	mongoengine/tests/test_dereference.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Baz
+meta	mongoengine/tests/test_dereference.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Foo
+meta	mongoengine/tests/test_dereference.py	/^            meta = {'collection': 'pages'}$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Page
+meta	mongoengine/tests/test_dereference.py	/^            meta = {'collection': 'tags'}$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Tag
+meta	tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_abstract_reference_base_type.Sibling
+meta	tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_drop_abstract_document.AbstractDoc
+meta	tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_reference_abstract_class.Sibling
+meta	tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Sibling
+meta	tests/fields/fields.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:FieldTest.test_complex_mapfield.SettingBase
+meta	tests/fields/fields.py	/^            meta = {$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
+meta	tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Basedoc
+meta	tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
+meta	tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Base
+meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_generic_reference.Link
+meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_cls_field.Animal
+meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dictfield_complex.SettingBase
+meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
+meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
+meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_embedded_document_inheritance.User
+meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_list_field_complex.SettingBase
+meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
+meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
+meta	tests/fields/fields.py	/^            meta = {'strict': False}$/;"	v	class:FieldTest.test_undefined_field_exception_with_strict.Doc
+modify	mongoengine/mongoengine/document.py	/^    def modify(self, query=None, **update):$/;"	m	class:Document
+modify	mongoengine/mongoengine/queryset/base.py	/^    def modify(self, upsert=False, full_response=False, remove=False, new=False, **update):$/;"	m	class:BaseQuerySet
+money	mongoengine/tests/fields/fields.py	/^            money = DecimalField()$/;"	v	class:FieldTest.test_decimal_comparison.Person
+money	tests/fields/fields.py	/^            money = DecimalField()$/;"	v	class:FieldTest.test_decimal_comparison.Person
+mother	mongoengine/tests/document/instance.py	/^                mother = ReferenceField('Person', reverse_delete_rule=DENY)$/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Parents
+msg	mongoengine/tests/test_dereference.py	/^            msg = StringField(required=True, default='Blammo!')$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Bar
+msg	mongoengine/tests/test_dereference.py	/^            msg = StringField(required=True, default='Kaboom!')$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Baz
+music_posts	mongoengine/tests/queryset/queryset.py	/^            def music_posts(doc_cls, queryset, deleted=False):$/;"	m	class:QuerySetTest.test_custom_manager.BlogPost
+my_id	mongoengine/tests/fields/fields.py	/^            my_id = IntField(required=True, unique=True, primary_key=True)$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
+my_id	mongoengine/tests/fields/fields.py	/^            my_id = IntField(required=True, unique=True, primary_key=True)$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
+my_id	mongoengine/tests/test_dereference.py	/^            my_id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_stores_as_type.User
+my_id	tests/fields/fields.py	/^            my_id = IntField(required=True, unique=True, primary_key=True)$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
+my_id	tests/fields/fields.py	/^            my_id = IntField(required=True, unique=True, primary_key=True)$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
+my_list	mongoengine/tests/fields/fields.py	/^            my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique))$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.B
+my_list	mongoengine/tests/fields/fields.py	/^            my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.A
+my_list	tests/fields/fields.py	/^            my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique))$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.B
+my_list	tests/fields/fields.py	/^            my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.A
+my_map	mongoengine/tests/fields/fields.py	/^            my_map = MapField(EmbeddedDocumentField(Embedded))$/;"	v	class:FieldTest.test_mapfield_numerical_index.Test
+my_map	mongoengine/tests/fields/fields.py	/^            my_map = MapField(field=EmbeddedDocumentField(Embedded),$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Test
+my_map	tests/fields/fields.py	/^            my_map = MapField(EmbeddedDocumentField(Embedded))$/;"	v	class:FieldTest.test_mapfield_numerical_index.Test
+my_map	tests/fields/fields.py	/^            my_map = MapField(field=EmbeddedDocumentField(Embedded),$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Test
+my_metaclass	mongoengine/mongoengine/document.py	/^    my_metaclass = DocumentMetaclass$/;"	v	class:DynamicEmbeddedDocument
+my_metaclass	mongoengine/mongoengine/document.py	/^    my_metaclass = DocumentMetaclass$/;"	v	class:EmbeddedDocument
+my_metaclass	mongoengine/mongoengine/document.py	/^    my_metaclass = TopLevelDocumentMetaclass$/;"	v	class:Document
+my_metaclass	mongoengine/mongoengine/document.py	/^    my_metaclass = TopLevelDocumentMetaclass$/;"	v	class:DynamicDocument
+n	mongoengine/tests/queryset/field_list.py	/^            n = ListField(IntField())$/;"	v	class:OnlyExcludeAllTest.test_slicing_fields.Numbers
+n	mongoengine/tests/queryset/field_list.py	/^            n = ListField(IntField())$/;"	v	class:OnlyExcludeAllTest.test_slicing_nested_fields.EmbeddedNumber
+n	mongoengine/tests/queryset/queryset.py	/^            n = IntField()$/;"	v	class:QuerySetTest.test_clone.Number
+n	mongoengine/tests/queryset/queryset.py	/^            n = IntField()$/;"	v	class:QuerySetTest.test_order_then_filter.Number
+n	mongoengine/tests/queryset/queryset.py	/^            n = IntField()$/;"	v	class:QuerySetTest.test_using.Number2
+n	mongoengine/tests/queryset/queryset.py	/^            n = IntField(db_field='number')$/;"	v	class:QuerySetTest.test_order_works_with_custom_db_field_names.Number
+n	mongoengine/tests/queryset/queryset.py	/^            n = IntField(primary_key=True)$/;"	v	class:QuerySetTest.test_order_works_with_primary.Number
+name	mongoengine/docs/code/tumblelog.py	/^    name = StringField(max_length=120)$/;"	v	class:Comment
+name	mongoengine/mongoengine/base/fields.py	/^    name = None$/;"	v	class:BaseField
+name	mongoengine/tests/document/class_methods.py	/^            name = StringField()$/;"	v	class:ClassMethodsTest.setUp.Person
+name	mongoengine/tests/document/class_methods.py	/^            name = StringField()$/;"	v	class:ClassMethodsTest.test_custom_collection_name_operations.Person
+name	mongoengine/tests/document/class_methods.py	/^            name = StringField(primary_key=True)$/;"	v	class:ClassMethodsTest.test_collection_name_and_primary.Person
+name	mongoengine/tests/document/class_methods.py	/^            name = StringField(required=True)$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Cat
+name	mongoengine/tests/document/class_methods.py	/^            name = StringField(required=True)$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Vaccine
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.circular_reference_deltas.Organization
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.circular_reference_deltas.Person
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.circular_reference_deltas_2.Organization
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.circular_reference_deltas_2.Person
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.setUp.Person
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_delta_for_dynamic_documents.Person
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedUser
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_lower_level_mark_as_changed.EmbeddedDoc
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_nested_nested_fields_mark_as_changed.EmbeddedDoc
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_nested_nested_fields_mark_as_changed.MyDoc
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_referenced_object_changed_attributes.Organization
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_referenced_object_changed_attributes.User
+name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_upper_level_mark_as_changed.EmbeddedDoc
+name	mongoengine/tests/document/dynamic.py	/^            name = StringField()$/;"	v	class:DynamicTest.setUp.Person
+name	mongoengine/tests/document/dynamic.py	/^            name = StringField()$/;"	v	class:DynamicTest.test_complex_dynamic_document_queries.Person
+name	mongoengine/tests/document/dynamic.py	/^            name = StringField()$/;"	v	class:DynamicTest.test_dynamic_and_embedded.Person
+name	mongoengine/tests/document/dynamic.py	/^            name = StringField()$/;"	v	class:DynamicTest.test_dynamic_and_embedded_dict_access.Person
+name	mongoengine/tests/document/indexes.py	/^            name = StringField()$/;"	v	class:IndexesTest.setUp.Person
+name	mongoengine/tests/document/indexes.py	/^            name = StringField()$/;"	v	class:IndexesTest.test_abstract_index_inheritance.Person
+name	mongoengine/tests/document/indexes.py	/^            name = StringField()$/;"	v	class:IndexesTest.test_create_geohaystack_index.Place
+name	mongoengine/tests/document/indexes.py	/^            name = StringField()$/;"	v	class:IndexesTest.test_explicit_geohaystack_index.Place
+name	mongoengine/tests/document/indexes.py	/^            name = StringField(db_field='tag')$/;"	v	class:IndexesTest.test_list_embedded_document_index.Tag
+name	mongoengine/tests/document/indexes.py	/^            name = StringField(primary_key=True)$/;"	v	class:IndexesTest.test_unique_and_primary_create.User
+name	mongoengine/tests/document/indexes.py	/^            name = StringField(primary_key=True, unique=True)$/;"	v	class:IndexesTest.test_unique_and_primary.User
+name	mongoengine/tests/document/indexes.py	/^            name = StringField(required=True)$/;"	v	class:IndexesTest.test_compound_key_embedded.CompoundKey
+name	mongoengine/tests/document/indexes.py	/^            name = StringField(required=True)$/;"	v	class:IndexesTest.test_embedded_document_index_meta.Person
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_abstract_documents.Animal
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly.EuropeanCity
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_allow_inheritance.Animal
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_allow_inheritance_abstract_document.Animal
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class.EuropeanCity
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_auto_id_vs_non_pk_id_field.EuropeanCity
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_cant_turn_off_inheritance_on_subclass.Animal
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_inheritance_meta_data.Person
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_inheritance_to_mongo_keys.Person
+name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_inherited_collections.Drink
+name	mongoengine/tests/document/instance.py	/^                name = StringField()$/;"	v	class:InstanceTest.test_duplicate_db_fields_raise_invalid_document_error.Foo
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.setUp.Job
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.setUp.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_custom_id_field.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_data_contains_id_field.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_alias_overrides.A
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_alias_propagates.A
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_alias_tests.Book
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_alias_tests.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_ref_usage.Book
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_ref_usage.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_dbref_equality.Test
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_dbref_equality.Test2
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_dbref_equality.Test3
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_default_values.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_do_not_save_unchanged_references.Job
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_do_not_save_unchanged_references.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_document_not_registered.Place
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_document_registry_regressions.Location
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_embedded_document_to_mongo.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_kwargs_complex.Embedded
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_kwargs_simple.Embedded
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document.Thing
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false.Thing
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc.Thing
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_with_strict_false.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_mixed_creation_dynamic.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_null_field.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_object_mixins.NameMixin
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_query_count_when_saving.Feed
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_query_count_when_saving.Organization
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_query_count_when_saving.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_reload_sharded_nested.SuperPhylum
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_pull.Record
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_abstract_document.Doc
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascade_kwargs.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascade_meta_false.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascade_meta_true.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascades.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascades_generically.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit_with_file_field.Foo
+name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_switch_db_instance.Group
+name	mongoengine/tests/document/instance.py	/^            name = StringField(primary_key=True)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_custom_id_field.User
+name	mongoengine/tests/document/instance.py	/^            name = StringField(required=True)$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.NodesSystem
+name	mongoengine/tests/document/instance.py	/^            name = StringField(required=True)$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField(required=True)$/;"	v	class:InstanceTest.test_db_field_load.Person
+name	mongoengine/tests/document/instance.py	/^            name = StringField(unique=True)$/;"	v	class:InstanceTest.test_update_unique_field.Doc
+name	mongoengine/tests/document/validation.py	/^            name = StringField()$/;"	v	class:ValidatorErrorTest.test_fields_rewrite.BasePerson
+name	mongoengine/tests/document/validation.py	/^            name = StringField(required=True)$/;"	v	class:ValidatorErrorTest.test_fields_rewrite.Person
+name	mongoengine/tests/document/validation.py	/^            name = StringField(required=True)$/;"	v	class:ValidatorErrorTest.test_model_validation.User
+name	mongoengine/tests/fields/fields.py	/^                               name="Wilson Júnior")$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+name	mongoengine/tests/fields/fields.py	/^                name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields_on_embedded_documents.Test
+name	mongoengine/tests/fields/fields.py	/^                name = StringField(db_field='$name')$/;"	v	class:FieldTest.test_db_field_validation.User
+name	mongoengine/tests/fields/fields.py	/^                name = StringField(db_field='name\\0')$/;"	v	class:FieldTest.test_db_field_validation.User
+name	mongoengine/tests/fields/fields.py	/^                name = StringField(db_field='user.name')$/;"	v	class:FieldTest.test_db_field_validation.User
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Owner
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.PersonAuto
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields.Product
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Group
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_abstract_reference_base_type.Mother
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_abstract_reference_base_type.Sibling
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dbref_reference_fields.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_drop_abstract_document.AbstractDoc
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.User
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Group
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_validation.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document.Car
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Car
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Car
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_is_none.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference.User
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Log
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_mapfield_numerical_index.Embedded
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Base
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_object_id_validation.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_embedding.Tree
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_embedding.TreeNode
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_reference.Employee
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_abstract_class.Sibling
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Sibling
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_validation.User
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reverse_list_sorting.Category
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reverse_list_sorting.CategoryList
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_sequence_name.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_fields_reload.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_undefined_reference.Company
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_undefined_reference.Product
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Mineral
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Vegetal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_equality.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Animal
+name	mongoengine/tests/fields/fields.py	/^            name = StringField(max_length=20)$/;"	v	class:FieldTest.test_string_validation.Person
+name	mongoengine/tests/fields/fields.py	/^            name = StringField(required=False, unique=True, sparse=True)$/;"	v	class:FieldTest.test_sparse_field.Doc
+name	mongoengine/tests/fields/fields.py	/^            name = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Author
+name	mongoengine/tests/fields/fields.py	/^            name = StringField(required=True)$/;"	v	class:FieldTest.test_required_values.Person
+name	mongoengine/tests/fields/fields.py	/^            name='Steve',$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
+name	mongoengine/tests/fields/file_tests.py	/^                          name="hello.txt")$/;"	v	class:FileTest.test_file_multidb.TestFile
+name	mongoengine/tests/fields/file_tests.py	/^            name = StringField()$/;"	v	class:FileTest.test_copyable.TestFile
+name	mongoengine/tests/fields/file_tests.py	/^            name = StringField()$/;"	v	class:FileTest.test_file_multidb.TestFile
+name	mongoengine/tests/fields/file_tests.py	/^            name = StringField()$/;"	v	class:FileTest.test_file_uniqueness.TestFile
+name	mongoengine/tests/fields/geo.py	/^            name = StringField()$/;"	v	class:GeoFieldTest.test_geo_indexes_recursion.Location
+name	mongoengine/tests/fields/geo.py	/^            name = StringField()$/;"	v	class:GeoFieldTest.test_geo_indexes_recursion.Parent
+name	mongoengine/tests/fields/geo.py	/^            name = StringField()$/;"	v	class:GeoFieldTest.test_geopoint_embedded_indexes.Venue
+name	mongoengine/tests/fields/geo.py	/^            name = StringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Venue
+name	mongoengine/tests/fixtures.py	/^    name = StringField()$/;"	v	class:Mixin
+name	mongoengine/tests/queryset/field_list.py	/^            name = StringField()$/;"	v	class:OnlyExcludeAllTest.setUp.Person
+name	mongoengine/tests/queryset/field_list.py	/^            name = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.User
+name	mongoengine/tests/queryset/field_list.py	/^            name = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Attachment
+name	mongoengine/tests/queryset/field_list.py	/^            name = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.User
+name	mongoengine/tests/queryset/geo.py	/^            name = StringField()$/;"	v	class:GeoQueriesTest._test_embedded.Venue
+name	mongoengine/tests/queryset/geo.py	/^            name = StringField()$/;"	v	class:GeoQueriesTest.test_linestring.Road
+name	mongoengine/tests/queryset/geo.py	/^            name = StringField()$/;"	v	class:GeoQueriesTest.test_polygon.Road
+name	mongoengine/tests/queryset/pickable.py	/^    name = StringField()$/;"	v	class:Person
+name	mongoengine/tests/queryset/queryset.py	/^                name = StringField()$/;"	v	class:QuerySetTest.test_update_related_models.TestOrganization
+name	mongoengine/tests/queryset/queryset.py	/^                name = StringField()$/;"	v	class:QuerySetTest.test_update_related_models.TestPerson
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.setUp.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_as_pymongo.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_bool_performance.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_bool_with_ordering.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_bool_with_ordering_from_meta_dict.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_bulk_insert.Comment
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_cache_not_cloned.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_cached_queryset.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_can_have_field_same_name_as_query_operator.Size
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_cls_query_in_subclassed_docs.Animal
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField.Author
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Author
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_embedded_array_average.Doc
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_embedded_array_sum.Doc
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_embedded_average.Doc
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_embedded_sum.Doc
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_find_array_position.Comment
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_find_embedded.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_find_empty_embedded.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo.TestActivity
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo.TestPerson
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Organization
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Project
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_in_operator_on_non_iterable.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_null_values.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_on_embedded.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_with_null_embedded.Data
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_loop_over_invalid_id_does_not_crash.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_nested_queryset_iterator.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_cached_queryset.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference.Organization
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Member
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_pull_in_genericembedded_field.Foo
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_queryset_aggregation_framework.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle.Category
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify.Category
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar.Organization
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar.User
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_decimal.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_embedded.Profile
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_generic_reference_field.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_generic_reference_field.State
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_reference_field.Person
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_reference_field.State
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_simple.UserDoc
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_set_generic_embedded_documents.Bar
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Author
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_update.BlogPost
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_update_array_position.Comment
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(db_field='doc-name')$/;"	v	class:QuerySetTest.test_exec_js_field_sub.BlogPost
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(max_length=120)$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Comment
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(max_length=75, unique=True, required=True)$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Site
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(max_length=75, unique=True, required=True)$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(max_length=75, unique=True, required=True)$/;"	v	class:QuerySetTest.test_pull_nested.Site
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(required=True)$/;"	v	class:QuerySetTest.test_add_to_set_each.Item
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(required=True)$/;"	v	class:QuerySetTest.test_editting_embedded_objects.BlogTag
+name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(required=True)$/;"	v	class:QuerySetTest.test_update_one_pop_generic_reference.BlogTag
+name	mongoengine/tests/queryset/queryset.py	/^            name="Barack Obama",$/;"	v	class:QuerySetTest.test_as_pymongo.User
+name	mongoengine/tests/queryset/transform.py	/^            name = StringField()$/;"	v	class:TransformTest.test_last_field_name_like_operator.EmbeddedItem
+name	mongoengine/tests/queryset/transform.py	/^            name = StringField()$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
+name	mongoengine/tests/queryset/visitor.py	/^            name = StringField()$/;"	v	class:QTest.setUp.Person
+name	mongoengine/tests/queryset/visitor.py	/^            name = StringField()$/;"	v	class:QTest.test_empty_q.Person
+name	mongoengine/tests/queryset/visitor.py	/^            name = StringField()$/;"	v	class:QTest.test_q_merge_queries_edge_case.User
+name	mongoengine/tests/queryset/visitor.py	/^            name = StringField(max_length=40)$/;"	v	class:QTest.test_multiple_occurence_in_field.Test
+name	mongoengine/tests/queryset/visitor.py	/^            name = StringField(required=True)$/;"	v	class:QTest.test_chained_q_or_filtering.Post
+name	mongoengine/tests/test_context_managers.py	/^            name = StringField()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.User
+name	mongoengine/tests/test_context_managers.py	/^            name = StringField()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.User
+name	mongoengine/tests/test_context_managers.py	/^            name = StringField()$/;"	v	class:ContextManagersTest.test_switch_collection_context_manager.Group
+name	mongoengine/tests/test_context_managers.py	/^            name = StringField()$/;"	v	class:ContextManagersTest.test_switch_db_context_manager.Group
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_reference.Person
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_reference.Relation
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_reference_on_self.Person
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_tree_reference.Other
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_tree_reference.Person
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Tag
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dict_field.UserA
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dict_field.UserB
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dict_field.UserC
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.UserA
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_document_reload_reference_integrity.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference.UserA
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference.UserB
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference.UserC
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_map_field.UserA
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_map_field.UserB
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_map_field.UserC
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.UserA
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.UserB
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.UserC
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_handle_old_style_references.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_field_complex.UserA
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_field_complex.UserB
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_field_complex.UserC
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries.Group
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_stores_as_type.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries.Group
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_of_lists_of_references.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_map_field_reference.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_migrate_references.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_objectid_reference_across_databases.Book
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_objectid_reference_across_databases.User
+name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_reference.Employee
+name	mongoengine/tests/test_dereference.py	/^            name = StringField(max_length=250, required=True)$/;"	v	class:FieldTest.test_dict_in_dbref_instance.Person
+name	mongoengine/tests/test_dereference.py	/^            name = StringField(max_length=250, required=True)$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
+name	mongoengine/tests/test_signals.py	/^            name = StringField()$/;"	v	class:SignalTests.setUp.Another
+name	mongoengine/tests/test_signals.py	/^            name = StringField()$/;"	v	class:SignalTests.setUp.Author
+name	tests/fields/fields.py	/^                               name="Wilson Júnior")$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+name	tests/fields/fields.py	/^                name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields_on_embedded_documents.Test
+name	tests/fields/fields.py	/^                name = StringField(db_field='$name')$/;"	v	class:FieldTest.test_db_field_validation.User
+name	tests/fields/fields.py	/^                name = StringField(db_field='name\\0')$/;"	v	class:FieldTest.test_db_field_validation.User
+name	tests/fields/fields.py	/^                name = StringField(db_field='user.name')$/;"	v	class:FieldTest.test_db_field_validation.User
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Owner
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.PersonAuto
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields.Product
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Group
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_abstract_reference_base_type.Mother
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_abstract_reference_base_type.Sibling
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dbref_reference_fields.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_drop_abstract_document.AbstractDoc
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.User
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Group
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_validation.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document.Car
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Car
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Car
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_is_none.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference.User
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Log
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_mapfield_numerical_index.Embedded
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Base
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_object_id_validation.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_embedding.Tree
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_embedding.TreeNode
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_reference.Employee
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_abstract_class.Sibling
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Sibling
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_validation.User
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reverse_list_sorting.Category
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reverse_list_sorting.CategoryList
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_sequence_name.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_fields_reload.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_undefined_reference.Company
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_undefined_reference.Product
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Mineral
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Vegetal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_equality.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
+name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Animal
+name	tests/fields/fields.py	/^            name = StringField(max_length=20)$/;"	v	class:FieldTest.test_string_validation.Person
+name	tests/fields/fields.py	/^            name = StringField(required=False, unique=True, sparse=True)$/;"	v	class:FieldTest.test_sparse_field.Doc
+name	tests/fields/fields.py	/^            name = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Author
+name	tests/fields/fields.py	/^            name = StringField(required=True)$/;"	v	class:FieldTest.test_required_values.Person
+name	tests/fields/fields.py	/^            name='Steve',$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
+name2	mongoengine/tests/document/instance.py	/^                name2 = StringField(db_field='name')$/;"	v	class:InstanceTest.test_duplicate_db_fields_raise_invalid_document_error.Foo
+needs_mongodb_v26	mongoengine/tests/utils.py	/^def needs_mongodb_v26(func):$/;"	f
+needs_mongodb_v3	mongoengine/tests/utils.py	/^def needs_mongodb_v3(func):$/;"	f
+new	mongoengine/tests/queryset/modify.py	/^            new=True)$/;"	v	class:FindAndModifyTest.test_modify_with_push.BlogPost
+new_field	mongoengine/tests/fixtures.py	/^    new_field = StringField()$/;"	v	class:NewDocumentPickleTest
+new_file	mongoengine/fields.py	/^    def new_file(self, **kwargs):$/;"	m	class:GridFSProxy
+new_file	mongoengine/mongoengine/fields.py	/^    def new_file(self, **kwargs):$/;"	m	class:GridFSProxy
+next	mongoengine/mongoengine/queryset/base.py	/^    def next(self):$/;"	m	class:BaseQuerySet
+next_log	mongoengine/tests/fields/fields.py	/^            next_log = logs[next_idx]$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+next_log	tests/fields/fields.py	/^            next_log = logs[next_idx]$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
+nick	mongoengine/tests/fields/fields.py	/^            nick = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.SubAnimal
+nick	mongoengine/tests/fields/fields.py	/^            nick = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.SubAnimal
+nick	tests/fields/fields.py	/^            nick = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.SubAnimal
+nick	tests/fields/fields.py	/^            nick = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.SubAnimal
+no_cache	mongoengine/mongoengine/queryset/queryset.py	/^    def no_cache(self):$/;"	m	class:QuerySet
+no_dereference	mongoengine/mongoengine/context_managers.py	/^class no_dereference(object):$/;"	c
+no_dereference	mongoengine/mongoengine/queryset/base.py	/^    def no_dereference(self):$/;"	m	class:BaseQuerySet
+no_sub_classes	mongoengine/mongoengine/context_managers.py	/^class no_sub_classes(object):$/;"	c
+no_sub_classes	mongoengine/mongoengine/queryset/base.py	/^    def no_sub_classes(self):$/;"	m	class:BaseQuerySet
+noddy	mongoengine/tests/queryset/queryset.py	/^            noddy = Noddy()$/;"	v	class:QuerySetTest.test_no_cache.Noddy
+nodes	mongoengine/tests/document/instance.py	/^            nodes = MapField(ReferenceField(Node, dbref=False))$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.NodesSystem
+non_field	mongoengine/tests/document/class_methods.py	/^            non_field = True$/;"	v	class:ClassMethodsTest.setUp.Person
+non_field	mongoengine/tests/document/delta.py	/^            non_field = True$/;"	v	class:DeltaTest.setUp.Person
+non_field	mongoengine/tests/document/indexes.py	/^            non_field = True$/;"	v	class:IndexesTest.setUp.Person
+non_field	mongoengine/tests/document/instance.py	/^            non_field = True$/;"	v	class:InstanceTest.setUp.Person
+none	mongoengine/mongoengine/queryset/base.py	/^    def none(self):$/;"	m	class:BaseQuerySet
+not_empty	mongoengine/tests/queryset/queryset.py	/^            def not_empty(self):$/;"	m	class:QuerySetTest.test_custom_querysets.CustomQuerySet
+not_empty	mongoengine/tests/queryset/queryset.py	/^            def not_empty(self):$/;"	m	class:QuerySetTest.test_custom_querysets_inherited.CustomQuerySet
+not_empty	mongoengine/tests/queryset/queryset.py	/^            def not_empty(self):$/;"	m	class:QuerySetTest.test_custom_querysets_inherited_direct.CustomQuerySet
+not_empty	mongoengine/tests/queryset/queryset.py	/^            def not_empty(self):$/;"	m	class:QuerySetTest.test_custom_querysets_set_manager_directly.CustomQuerySet
+num	mongoengine/tests/document/delta.py	/^            num = IntField(default=-1)$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.Doc
+num_posts	mongoengine/docs/code/tumblelog.py	/^num_posts = Post.objects(tags='mongodb').count()$/;"	v
+num_visits	mongoengine/tests/queryset/queryset.py	/^            num_visits = IntField(db_field='visits')$/;"	v	class:QuerySetTest.test_average_over_db_field.UserVisit
+num_visits	mongoengine/tests/queryset/queryset.py	/^            num_visits = IntField(db_field='visits')$/;"	v	class:QuerySetTest.test_sum_over_db_field.UserVisit
+number	mongoengine/tests/document/instance.py	/^            number = IntField()$/;"	v	class:InstanceTest.test_invalid_son.Occurrence
+number	mongoengine/tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_embedded_document_validation.PersonPreferences
+number	mongoengine/tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_embedded_document.Dish
+number	mongoengine/tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Dish
+number	mongoengine/tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Dish
+number	mongoengine/tests/fields/fields.py	/^            number = IntField(default=0, db_field='i')$/;"	v	class:FieldTest.test_embedded_db_field.Embedded
+number	mongoengine/tests/fields/fields.py	/^            number = IntField(default=0, db_field='i')$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Embedded
+number	mongoengine/tests/fields/fields.py	/^            number = IntField(unique=True)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.EmbeddedWithUnique
+number	mongoengine/tests/fields/fields.py	/^            number = IntField(unique=True, sparse=True)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.EmbeddedWithSparseUnique
+number	mongoengine/tests/fixtures.py	/^    number = IntField()$/;"	v	class:NewDocumentPickleTest
+number	mongoengine/tests/fixtures.py	/^    number = IntField()$/;"	v	class:PickleDynamicTest
+number	mongoengine/tests/fixtures.py	/^    number = IntField()$/;"	v	class:PickleSignalsTest
+number	mongoengine/tests/fixtures.py	/^    number = IntField()$/;"	v	class:PickleTest
+number	mongoengine/tests/queryset/queryset.py	/^            number = IntField()$/;"	v	class:QuerySetTest.test_repr.Doc
+number	mongoengine/tests/queryset/queryset.py	/^            number = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_on_embedded.Phone
+number	mongoengine/tests/test_dereference.py	/^            number = StringField(max_length=250, required=True)$/;"	v	class:FieldTest.test_dict_in_dbref_instance.Room
+number	tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_embedded_document_validation.PersonPreferences
+number	tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_embedded_document.Dish
+number	tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Dish
+number	tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Dish
+number	tests/fields/fields.py	/^            number = IntField(default=0, db_field='i')$/;"	v	class:FieldTest.test_embedded_db_field.Embedded
+number	tests/fields/fields.py	/^            number = IntField(default=0, db_field='i')$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Embedded
+number	tests/fields/fields.py	/^            number = IntField(unique=True)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.EmbeddedWithUnique
+number	tests/fields/fields.py	/^            number = IntField(unique=True, sparse=True)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.EmbeddedWithSparseUnique
+obj	mongoengine/tests/document/indexes.py	/^            obj = EmbeddedDocumentField('self')$/;"	v	class:IndexesTest.test_recursive_embedded_objects_dont_break_indexes.RecursiveObject
+object	mongoengine/mongoengine/document.py	/^    def object(self):$/;"	m	class:MapReduceDocument
+object	mongoengine/tests/fields/fields.py	/^            object = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Action
+object	tests/fields/fields.py	/^            object = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Action
+objectid_field	mongoengine/tests/document/instance.py	/^            objectid_field = ObjectIdField(default=bson.ObjectId)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+objectid_field	mongoengine/tests/document/json_serialisation.py	/^            objectid_field = ObjectIdField(default=ObjectId)$/;"	v	class:TestJson.test_json_complex.Doc
+objectid_field	mongoengine/tests/queryset/queryset.py	/^            objectid_field = ObjectIdField(default=ObjectId)$/;"	v	class:QuerySetTest.test_json_complex.Doc
+objects	mongoengine/tests/queryset/queryset.py	/^            def objects(cls, qryset):$/;"	m	class:QuerySetTest.test_custom_manager.BlogPost
+objects	mongoengine/tests/queryset/queryset.py	/^            def objects(doc_cls, queryset):$/;"	m	class:QuerySetTest.test_custom_manager_overriding_objects_works.Foo
+objects	mongoengine/tests/queryset/queryset.py	/^            def objects(klass, queryset):$/;"	m	class:QuerySetTest.test_inherit_objects.Foo
+objects	mongoengine/tests/queryset/queryset.py	/^            def objects(klass, queryset):$/;"	m	class:QuerySetTest.test_inherit_objects_override.Bar
+objects	mongoengine/tests/queryset/queryset.py	/^            def objects(klass, queryset):$/;"	m	class:QuerySetTest.test_inherit_objects_override.Foo
+objects	mongoengine/tests/queryset/queryset.py	/^            objects = CustomQuerySetManager()$/;"	v	class:QuerySetTest.test_custom_querysets_inherited_direct.Base
+objects	mongoengine/tests/queryset/queryset.py	/^            objects = CustomQuerySetManager()$/;"	v	class:QuerySetTest.test_custom_querysets_set_manager_directly.Post
+obs	mongoengine/tests/fields/fields.py	/^            obs = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
+obs	tests/fields/fields.py	/^            obs = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
+occurs	mongoengine/tests/document/instance.py	/^            occurs = ListField(EmbeddedDocumentField(Occurrence), default=list)$/;"	v	class:InstanceTest.test_invalid_son.Word
+oid_info	mongoengine/tests/fields/fields.py	/^            oid_info = ListField(ObjectIdField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
+oid_info	tests/fields/fields.py	/^            oid_info = ListField(ObjectIdField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
+on_document_pre_save	mongoengine/fields.py	/^    def on_document_pre_save(self, sender, document, created, **kwargs):$/;"	m	class:CachedReferenceField
+on_document_pre_save	mongoengine/mongoengine/fields.py	/^    def on_document_pre_save(self, sender, document, created, **kwargs):$/;"	m	class:CachedReferenceField
+only	mongoengine/mongoengine/queryset/base.py	/^    def only(self, *fields):$/;"	m	class:BaseQuerySet
+op	mongoengine/tests/queryset/queryset.py	/^            op = ops[0]$/;"	v	class:QuerySetTest.test_comment.User
+op	mongoengine/tests/queryset/queryset.py	/^            op = p.db.system.profile.find({"ns":$/;"	v	class:QuerySetTest.test_bool_with_ordering.Person
+op	mongoengine/tests/queryset/queryset.py	/^            op = q.db.system.profile.find({"ns":$/;"	v	class:QuerySetTest.test_bool_performance.Person
+op	mongoengine/tests/queryset/queryset.py	/^            op = q.db.system.profile.find({"ns":$/;"	v	class:QuerySetTest.test_bool_with_ordering.Person
+op	mongoengine/tests/queryset/queryset.py	/^            op = q.db.system.profile.find({"ns":$/;"	v	class:QuerySetTest.test_bool_with_ordering_from_meta_dict.Person
+operation	mongoengine/tests/fields/fields.py	/^            operation = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Action
+operation	tests/fields/fields.py	/^            operation = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Action
+ops	mongoengine/tests/queryset/queryset.py	/^            ops = q.get_ops()$/;"	v	class:QuerySetTest.test_comment.User
+order	mongoengine/tests/fields/fields.py	/^            order = IntField()$/;"	v	class:FieldTest.test_sorted_list_sorting.Comment
+order	tests/fields/fields.py	/^            order = IntField()$/;"	v	class:FieldTest.test_sorted_list_sorting.Comment
+order_by	mongoengine/mongoengine/queryset/base.py	/^    def order_by(self, *keys):$/;"	m	class:BaseQuerySet
+ordering	mongoengine/tests/fields/fields.py	/^                                       ordering='order')$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
+ordering	tests/fields/fields.py	/^                                       ordering='order')$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
+org	mongoengine/tests/document/delta.py	/^            org = ReferenceField('Organization', required=True)$/;"	v	class:DeltaTest.test_referenced_object_changed_attributes.User
+org	mongoengine/tests/queryset/queryset.py	/^            org = Organization.objects.get(id=o1.id)$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Project
+organization	mongoengine/tests/queryset/queryset.py	/^            organization = ObjectIdField()$/;"	v	class:QuerySetTest.test_scalar.User
+organization	mongoengine/tests/queryset/queryset.py	/^            organization = ReferenceField(Organization)$/;"	v	class:QuerySetTest.test_no_dereference.User
+orgs	mongoengine/tests/document/instance.py	/^            orgs = ListField(ReferenceField('Organization'))$/;"	v	class:InstanceTest.test_query_count_when_saving.User
+other	mongoengine/tests/test_dereference.py	/^            other = EmbeddedDocumentField(Other, default=lambda: Other())$/;"	v	class:FieldTest.test_circular_tree_reference.Person
+other_field	mongoengine/tests/fields/fields.py	/^            other_field = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Bookmark
+other_field	tests/fields/fields.py	/^            other_field = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Bookmark
+output	mongoengine/tests/queryset/queryset.py	/^            output={'reduce': 'family_map', 'db_alias': 'test2'})$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+output	mongoengine/tests/queryset/queryset.py	/^            output={'replace': 'family_map', 'db_alias': 'test2'})$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+owner	mongoengine/tests/document/delta.py	/^            owner = ReferenceField('Person')$/;"	v	class:DeltaTest.circular_reference_deltas.Organization
+owner	mongoengine/tests/document/delta.py	/^            owner = ReferenceField('Person', dbref=dbref)$/;"	v	class:DeltaTest.circular_reference_deltas_2.Organization
+owner	mongoengine/tests/fields/fields.py	/^                   owner=Owner(tags=['cool', 'funny'],$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+owner	mongoengine/tests/fields/fields.py	/^                   owner=Owner(tp='u', name="Wilson Júnior")$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+owner	mongoengine/tests/fields/fields.py	/^            owner = EmbeddedDocumentField(Owner)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
+owner	mongoengine/tests/fields/fields.py	/^            owner = EmbeddedDocumentField(Owner)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
+owner	mongoengine/tests/queryset/queryset.py	/^                owner = ReferenceField(TestPerson)$/;"	v	class:QuerySetTest.test_update_related_models.TestOrganization
+owner	mongoengine/tests/queryset/queryset.py	/^            owner = GenericReferenceField()$/;"	v	class:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo.TestActivity
+owner	mongoengine/tests/queryset/queryset.py	/^            owner = ReferenceField(Person)$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Organization
+owner	tests/fields/fields.py	/^                   owner=Owner(tags=['cool', 'funny'],$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+owner	tests/fields/fields.py	/^                   owner=Owner(tp='u', name="Wilson Júnior")$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+owner	tests/fields/fields.py	/^            owner = EmbeddedDocumentField(Owner)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
+owner	tests/fields/fields.py	/^            owner = EmbeddedDocumentField(Owner)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
+owner_document	mongoengine/mongoengine/base/fields.py	/^    def owner_document(self):$/;"	m	class:BaseField
+owner_document	mongoengine/mongoengine/base/fields.py	/^    def owner_document(self, owner_document):$/;"	m	class:BaseField
+owns	mongoengine/tests/document/delta.py	/^            owns = ListField(ReferenceField('Organization'))$/;"	v	class:DeltaTest.circular_reference_deltas.Person
+owns	mongoengine/tests/document/delta.py	/^            owns = ListField(ReferenceField('Organization', dbref=dbref))$/;"	v	class:DeltaTest.circular_reference_deltas_2.Person
+owns	mongoengine/tests/queryset/queryset.py	/^            owns = ListField(ReferenceField('Organization'))$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Person
+p	mongoengine/tests/fields/fields.py	/^                p = Ocurrence(person="test", animal=bad).save()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.BadDoc
+p	mongoengine/tests/fields/fields.py	/^                p = Ocurrence(person="test", animal=bad).save()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.BadDoc
+p	mongoengine/tests/fields/fields.py	/^            p = Ocurrence(person="test", animal=ref).save()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.SubAnimal
+p	mongoengine/tests/fields/fields.py	/^            p = Ocurrence(person="test", animal=ref).save()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.SubAnimal
+p	mongoengine/tests/fields/fields.py	/^            p = Person(name="Person %s" % x)$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
+p	tests/fields/fields.py	/^                p = Ocurrence(person="test", animal=bad).save()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.BadDoc
+p	tests/fields/fields.py	/^                p = Ocurrence(person="test", animal=bad).save()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.BadDoc
+p	tests/fields/fields.py	/^            p = Ocurrence(person="test", animal=ref).save()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.SubAnimal
+p	tests/fields/fields.py	/^            p = Ocurrence(person="test", animal=ref).save()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.SubAnimal
+p	tests/fields/fields.py	/^            p = Person(name="Person %s" % x)$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
+page	mongoengine/tests/document/instance.py	/^            page = EmbeddedDocumentField(Page)$/;"	v	class:InstanceTest.test_embedded_update.Site
+page	mongoengine/tests/document/instance.py	/^            page = EmbeddedDocumentField(Page)$/;"	v	class:InstanceTest.test_embedded_update_after_save.Site
+page	mongoengine/tests/document/instance.py	/^            page = EmbeddedDocumentField(Page)$/;"	v	class:InstanceTest.test_embedded_update_db_field.Site
+parameters	mongoengine/tests/document/instance.py	/^            parameters = MapField(EmbeddedDocumentField(Parameter))$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Node
+parent	mongoengine/tests/document/instance.py	/^            parent = GenericReferenceField()$/;"	v	class:InstanceTest.test_save_cascades_generically.Person
+parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_cascade_kwargs.Person
+parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_cascade_meta_false.Person
+parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_cascade_meta_true.Person
+parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_cascades.Person
+parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit.Person
+parent	mongoengine/tests/fields/fields.py	/^            parent = ReferenceField('self')$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
+parent	mongoengine/tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=False)$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
+parent	mongoengine/tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=False)$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
+parent	mongoengine/tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=True)$/;"	v	class:FieldTest.test_dbref_reference_fields.Person
+parent	mongoengine/tests/fields/fields.py	/^            parent=DBRef('person', 'abcdefghijklmnop')$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
+parent	mongoengine/tests/queryset/queryset.py	/^            parent = ReferenceField('self', reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
+parent	mongoengine/tests/test_dereference.py	/^            parent = GenericReferenceField(default=None)$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
+parent	tests/fields/fields.py	/^            parent = ReferenceField('self')$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
+parent	tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=False)$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
+parent	tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=False)$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
+parent	tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=True)$/;"	v	class:FieldTest.test_dbref_reference_fields.Person
+parent	tests/fields/fields.py	/^            parent=DBRef('person', 'abcdefghijklmnop')$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
+parents	mongoengine/tests/queryset/queryset.py	/^            parents = ListField(ReferenceField('self'))$/;"	v	class:QuerySetTest.test_add_to_set_each.Item
+parents	mongoengine/tests/test_dereference.py	/^            parents = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
+password	mongoengine/tests/document/indexes.py	/^            password = StringField()$/;"	v	class:IndexesTest.test_unique_and_primary.User
+password	mongoengine/tests/document/indexes.py	/^            password = StringField()$/;"	v	class:IndexesTest.test_unique_and_primary_create.User
+password	mongoengine/tests/queryset/field_list.py	/^            password = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.User
+password_hash	mongoengine/tests/queryset/queryset.py	/^             password_hash="SomeHash").save()$/;"	v	class:QuerySetTest.test_as_pymongo_json_limit_fields.User
+password_hash	mongoengine/tests/queryset/queryset.py	/^            password_hash = StringField($/;"	v	class:QuerySetTest.test_as_pymongo_json_limit_fields.User
+password_salt	mongoengine/tests/queryset/queryset.py	/^            password_salt = StringField($/;"	v	class:QuerySetTest.test_as_pymongo_json_limit_fields.User
+path	mongoengine/tests/test_dereference.py	/^            path = StringField()$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
+pay	mongoengine/tests/queryset/queryset.py	/^            pay = EmbeddedDocumentField($/;"	v	class:QuerySetTest.test_embedded_average.Doc
+pay	mongoengine/tests/queryset/queryset.py	/^            pay = EmbeddedDocumentField(Pay)$/;"	v	class:QuerySetTest.test_embedded_array_average.Doc
+pay	mongoengine/tests/queryset/queryset.py	/^            pay = EmbeddedDocumentField(Pay)$/;"	v	class:QuerySetTest.test_embedded_array_sum.Doc
+pay	mongoengine/tests/queryset/queryset.py	/^            pay = EmbeddedDocumentField(Pay)$/;"	v	class:QuerySetTest.test_embedded_sum.Doc
+people	mongoengine/tests/queryset/queryset.py	/^            people = Person.objects$/;"	v	class:QuerySetTest.test_cached_queryset.Person
+people	mongoengine/tests/queryset/queryset.py	/^            people = Person.objects.no_cache()$/;"	v	class:QuerySetTest.test_no_cached_queryset.Person
+person	mongoengine/tests/fields/fields.py	/^                    person = Person.objects.create()$/;"	v	class:FieldTest.test_decimal_storage.Person
+person	mongoengine/tests/fields/fields.py	/^            person = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
+person	mongoengine/tests/fields/fields.py	/^            person = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Ocorrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Ocurrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Ocurrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Ocurrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Ocurrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Ocurrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Ocurrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Ocurrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Ocurrence
+person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Ocurrence
+person	mongoengine/tests/test_dereference.py	/^            person = ReferenceField('Person')$/;"	v	class:FieldTest.test_circular_reference.Relation
+person	tests/fields/fields.py	/^                    person = Person.objects.create()$/;"	v	class:FieldTest.test_decimal_storage.Person
+person	tests/fields/fields.py	/^            person = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
+person	tests/fields/fields.py	/^            person = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Ocorrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Ocurrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Ocurrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Ocurrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Ocurrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Ocurrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Ocurrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Ocurrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Ocurrence
+person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Ocurrence
+person_meta	mongoengine/tests/queryset/queryset.py	/^            person_meta = EmbeddedDocumentField(PersonMeta)$/;"	v	class:QuerySetTest.setUp.Person
+peter	mongoengine/tests/test_dereference.py	/^            peter = Employee.objects.with_id(peter.id)$/;"	v	class:FieldTest.test_recursive_reference.Employee
+peter	mongoengine/tests/test_dereference.py	/^            peter = Employee.objects.with_id(peter.id).select_related()$/;"	v	class:FieldTest.test_recursive_reference.Employee
+phone	mongoengine/tests/document/delta.py	/^            phone = StringField()$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.UInfoDocument
+phone	mongoengine/tests/queryset/queryset.py	/^            phone = EmbeddedDocumentField(Phone)$/;"	v	class:QuerySetTest.test_item_frequencies_on_embedded.Person
+photo	mongoengine/tests/fields/file_tests.py	/^            photo = FileField()$/;"	v	class:FileTest.test_file_saving.Animal
+photo	mongoengine/tests/fixtures.py	/^    photo = FileField()$/;"	v	class:NewDocumentPickleTest
+photo	mongoengine/tests/fixtures.py	/^    photo = FileField()$/;"	v	class:PickleTest
+photos	mongoengine/tests/fields/file_tests.py	/^            photos = ListField(FileField())$/;"	v	class:FileTest.test_complex_field_filefield.Animal
+picture	mongoengine/tests/document/instance.py	/^            picture = FileField()$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit_with_file_field.Foo
+pk	mongoengine/mongoengine/base/datastructures.py	/^    def pk(self):$/;"	m	class:LazyReference
+pk	mongoengine/mongoengine/document.py	/^    def pk(self):$/;"	m	class:Document
+pk	mongoengine/mongoengine/document.py	/^    def pk(self, value):$/;"	m	class:Document
+playlist	mongoengine/tests/test_dereference.py	/^            playlist = Playlist.objects.first().select_related()$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.Playlist
+point	mongoengine/tests/fields/geo.py	/^            point = PointField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere.Event
+point	mongoengine/tests/fields/geo.py	/^            point = PointField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Venue
+poly	mongoengine/tests/queryset/geo.py	/^            poly = PolygonField()$/;"	v	class:GeoQueriesTest.test_geojson_PolygonField.Location
+poly	mongoengine/tests/queryset/geo.py	/^            poly = PolygonField()$/;"	v	class:GeoQueriesTest.test_polygon.Road
+poly	mongoengine/tests/queryset/transform.py	/^            poly = PolygonField()$/;"	v	class:TransformTest.test_geojson_PolygonField.Location
+polygon	mongoengine/tests/fields/geo.py	/^            polygon = PolygonField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere.Event
+polygon	mongoengine/tests/fields/geo.py	/^            polygon = PolygonField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Venue
+pop	mongoengine/mongoengine/base/datastructures.py	/^    def pop(self, *args, **kwargs):$/;"	m	class:BaseDict
+pop	mongoengine/mongoengine/base/datastructures.py	/^    def pop(self, *args, **kwargs):$/;"	m	class:BaseList
+pop	mongoengine/mongoengine/base/datastructures.py	/^    def pop(self, key, default=None):$/;"	m	class:StrictDict
+popitem	mongoengine/mongoengine/base/datastructures.py	/^    def popitem(self, *args, **kwargs):$/;"	m	class:BaseDict
+position	mongoengine/tests/document/instance.py	/^            position = StringField()$/;"	v	class:InstanceTest.test_save_embedded_document.EmployeeDetails
+position	mongoengine/tests/document/instance.py	/^            position = StringField()$/;"	v	class:InstanceTest.test_updating_an_embedded_document.EmployeeDetails
+post	mongoengine/tests/document/instance.py	/^            post = ReferenceField(BlogPost, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_recurs.Comment
+post1	mongoengine/docs/code/tumblelog.py	/^post1 = TextPost(title='Fun with MongoEngine', author=john)$/;"	v
+post1	mongoengine/tests/document/indexes.py	/^            post1 = BlogPost(title='test1', slug='test')$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
+post1	mongoengine/tests/queryset/queryset.py	/^            post1 = Post(comments=[comment1, comment2])$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+post2	mongoengine/docs/code/tumblelog.py	/^post2 = LinkPost(title='MongoEngine Documentation', author=john)$/;"	v
+post2	mongoengine/tests/document/indexes.py	/^            post2 = BlogPost(title='test2', slug='test')$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
+post2	mongoengine/tests/queryset/queryset.py	/^            post2 = Post(comments=[comment2, comment2])$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+post_bulk_insert	mongoengine/mongoengine/signals.py	/^post_bulk_insert = _signals.signal('post_bulk_insert')$/;"	v
+post_bulk_insert	mongoengine/tests/test_signals.py	/^            def post_bulk_insert(cls, sender, documents, **kwargs):$/;"	m	class:SignalTests.setUp.Author
+post_bulk_insert	mongoengine/tests/test_signals.py	/^            def post_bulk_insert(cls, sender, documents, **kwargs):$/;"	m	class:SignalTests.setUp.Post
+post_delete	mongoengine/mongoengine/signals.py	/^post_delete = _signals.signal('post_delete')$/;"	v
+post_delete	mongoengine/tests/fixtures.py	/^    def post_delete(self, sender, document, **kwargs):$/;"	m	class:PickleSignalsTest
+post_delete	mongoengine/tests/test_signals.py	/^            def post_delete(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Another
+post_delete	mongoengine/tests/test_signals.py	/^            def post_delete(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
+post_init	mongoengine/mongoengine/signals.py	/^post_init = _signals.signal('post_init')$/;"	v
+post_init	mongoengine/tests/test_signals.py	/^            def post_init(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
+post_save	mongoengine/mongoengine/signals.py	/^post_save = _signals.signal('post_save')$/;"	v
+post_save	mongoengine/tests/fixtures.py	/^    def post_save(self, sender, document, created, **kwargs):$/;"	m	class:PickleSignalsTest
+post_save	mongoengine/tests/test_signals.py	/^            def post_save(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
+post_save	mongoengine/tests/test_signals.py	/^            def post_save(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.ExplicitId
+postables	mongoengine/tests/queryset/visitor.py	/^            postables = ListField(EmbeddedDocumentField(Post))$/;"	v	class:QTest.test_chained_q_or_filtering.Item
+posts	mongoengine/tests/queryset/queryset.py	/^            posts = ListField(EmbeddedDocumentField(Post))$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+posts	mongoengine/tests/queryset/queryset.py	/^            posts = ListField(EmbeddedDocumentField(Post))$/;"	v	class:QuerySetTest.test_find_array_position.Blog
+posts	mongoengine/tests/queryset/queryset.py	/^            posts = ListField(EmbeddedDocumentField(Post))$/;"	v	class:QuerySetTest.test_update_array_position.Blog
+posts	mongoengine/tests/test_dereference.py	/^            posts = ListField(EmbeddedDocumentField(Post))$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Page
+power	mongoengine/tests/fields/fields.py	/^            power = IntField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.PowerUser
+power	tests/fields/fields.py	/^            power = IntField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.PowerUser
+pre_bulk_insert	mongoengine/mongoengine/signals.py	/^pre_bulk_insert = _signals.signal('pre_bulk_insert')$/;"	v
+pre_bulk_insert	mongoengine/tests/test_signals.py	/^            def pre_bulk_insert(cls, sender, documents, **kwargs):$/;"	m	class:SignalTests.setUp.Author
+pre_bulk_insert	mongoengine/tests/test_signals.py	/^            def pre_bulk_insert(cls, sender, documents, **kwargs):$/;"	m	class:SignalTests.setUp.Post
+pre_delete	mongoengine/mongoengine/signals.py	/^pre_delete = _signals.signal('pre_delete')$/;"	v
+pre_delete	mongoengine/tests/document/instance.py	/^            def pre_delete(cls, sender, document, **kwargs):$/;"	m	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.BlogPost
+pre_delete	mongoengine/tests/test_signals.py	/^            def pre_delete(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Another
+pre_delete	mongoengine/tests/test_signals.py	/^            def pre_delete(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
+pre_init	mongoengine/mongoengine/signals.py	/^pre_init = _signals.signal('pre_init')$/;"	v
+pre_init	mongoengine/tests/test_signals.py	/^            def pre_init(cls, sender, document, *args, **kwargs):$/;"	m	class:SignalTests.setUp.Author
+pre_save	mongoengine/mongoengine/signals.py	/^pre_save = _signals.signal('pre_save')$/;"	v
+pre_save	mongoengine/tests/test_signals.py	/^            def pre_save(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
+pre_save_post_validation	mongoengine/mongoengine/signals.py	/^pre_save_post_validation = _signals.signal('pre_save_post_validation')$/;"	v
+pre_save_post_validation	mongoengine/tests/test_signals.py	/^            def pre_save_post_validation(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
+preferences	mongoengine/tests/fields/fields.py	/^            preferences = EmbeddedDocumentField(PersonPreferences)$/;"	v	class:FieldTest.test_embedded_document_validation.Person
+preferences	tests/fields/fields.py	/^            preferences = EmbeddedDocumentField(PersonPreferences)$/;"	v	class:FieldTest.test_embedded_document_validation.Person
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:CachedReferenceField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ComplexDateTimeField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DateTimeField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DecimalField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DictField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DynamicField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:EmbeddedDocumentField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:FloatField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:GenericEmbeddedDocumentField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:GenericReferenceField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:IntField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:LazyReferenceField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ListField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:LongField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ReferenceField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:SequenceField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:StringField
+prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:UUIDField
+prepare_query_value	mongoengine/mongoengine/base/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:BaseField
+prepare_query_value	mongoengine/mongoengine/base/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ComplexBaseField
+prepare_query_value	mongoengine/mongoengine/base/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ObjectIdField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:CachedReferenceField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ComplexDateTimeField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DateTimeField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DecimalField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DictField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DynamicField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:EmbeddedDocumentField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:FloatField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:GenericEmbeddedDocumentField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:GenericReferenceField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:IntField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:LazyReferenceField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ListField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:LongField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ReferenceField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:SequenceField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:StringField
+prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:UUIDField
+price	mongoengine/tests/queryset/queryset.py	/^            price = DecimalField()$/;"	v	class:QuerySetTest.test_as_pymongo.User
+price	mongoengine/tests/queryset/queryset.py	/^            price=Decimal('2.22'),$/;"	v	class:QuerySetTest.test_as_pymongo.User
+primary_key	mongoengine/tests/queryset/queryset.py	/^                primary_key=True)$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Family
+primary_key	mongoengine/tests/queryset/queryset.py	/^                primary_key=True)$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+product_id	mongoengine/tests/queryset/queryset.py	/^            product_id = IntField(db_field='pid')$/;"	v	class:QuerySetTest.test_distinct_handles_db_field.Product
+products	mongoengine/tests/fields/fields.py	/^            products = ListField(CachedReferenceField(Product, fields=['name']))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields.Basket
+products	tests/fields/fields.py	/^            products = ListField(CachedReferenceField(Product, fields=['name']))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields.Basket
+profile	mongoengine/tests/queryset/queryset.py	/^            profile = EmbeddedDocumentField(Profile)$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
+project	mongoengine/docs/conf.py	/^project = u'MongoEngine'$/;"	v
+projects	mongoengine/tests/queryset/queryset.py	/^            projects = ListField(ReferenceField('Project'))$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Person
+provider_ids	mongoengine/tests/document/indexes.py	/^            provider_ids = DictField()$/;"	v	class:IndexesTest.test_sparse_compound_indexes.MyDoc
+provider_ids	mongoengine/tests/document/indexes.py	/^            provider_ids = DictField()$/;"	v	class:IndexesTest.test_string_indexes.MyDoc
+proxy_class	mongoengine/fields.py	/^    proxy_class = GridFSProxy$/;"	v	class:FileField
+proxy_class	mongoengine/fields.py	/^    proxy_class = ImageGridFsProxy$/;"	v	class:ImageField
+proxy_class	mongoengine/mongoengine/fields.py	/^    proxy_class = GridFSProxy$/;"	v	class:FileField
+proxy_class	mongoengine/mongoengine/fields.py	/^    proxy_class = ImageGridFsProxy$/;"	v	class:ImageField
+pub_date	mongoengine/tests/document/instance.py	/^            pub_date = DateTimeField()$/;"	v	class:InstanceTest.test_document_clean.TestDocument
+publish_date	mongoengine/tests/queryset/visitor.py	/^            publish_date = DateTimeField()$/;"	v	class:QTest.test_q.BlogPost
+published	mongoengine/tests/document/instance.py	/^            published = BooleanField(default=True)$/;"	v	class:InstanceTest.test_save_only_changed_fields_recursive.Comment
+published	mongoengine/tests/queryset/queryset.py	/^            def published(doc_cls, queryset):$/;"	m	class:QuerySetTest.test_filter_chaining.BlogPost
+published	mongoengine/tests/queryset/queryset.py	/^            published = BooleanField()$/;"	v	class:QuerySetTest.test_exec_js_query.BlogPost
+published	mongoengine/tests/queryset/queryset.py	/^            published = CustomQuerySetManager()$/;"	v	class:QuerySetTest.test_custom_querysets_managers_directly.Post
+published	mongoengine/tests/queryset/visitor.py	/^            published = BooleanField()$/;"	v	class:QTest.test_q.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField()$/;"	v	class:QuerySetTest.test_clear_ordering.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField()$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField()$/;"	v	class:QuerySetTest.test_no_ordering_for_get.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField()$/;"	v	class:QuerySetTest.test_ordering.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField(required=False)$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField(required=False)$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=None$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)$/;"	v	class:QuerySetTest.test_ordering.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)$/;"	v	class:QuerySetTest.test_ordering.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)$/;"	v	class:QuerySetTest.test_ordering.BlogPost
+published_date__lt	mongoengine/tests/queryset/queryset.py	/^            published_date__lt=datetime.datetime(2010, 1, 7, 0, 0, 0))$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+pull__collaborators__helpful__user	mongoengine/tests/queryset/queryset.py	/^            pull__collaborators__helpful__user='Esteban')$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
+pull__collaborators__unhelpful	mongoengine/tests/queryset/queryset.py	/^            pull__collaborators__unhelpful={'name': 'Frank'})$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Site
+pull__collaborators__unhelpful	mongoengine/tests/queryset/queryset.py	/^            pull__collaborators__unhelpful={'user': 'Frank'})$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
+pull_all__collaborators__helpful__name	mongoengine/tests/queryset/queryset.py	/^                pull_all__collaborators__helpful__name=['Ross'])$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Site
+pull_all__collaborators__helpful__user	mongoengine/tests/queryset/queryset.py	/^                pull_all__collaborators__helpful__user=['Ross'])$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
+pull_all__collaborators__user	mongoengine/tests/queryset/queryset.py	/^                pull_all__collaborators__user=['Ross'])$/;"	v	class:QuerySetTest.test_pull_nested.Site
+pull_all__tags	mongoengine/tests/queryset/queryset.py	/^            pull_all__tags=["mongodb", "code"])$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
+push__tags__0	mongoengine/tests/queryset/modify.py	/^            push__tags__0='python',$/;"	v	class:FindAndModifyTest.test_modify_with_push.BlogPost
+push__tags__1	mongoengine/tests/queryset/modify.py	/^            push__tags__1=['go', 'rust'],$/;"	v	class:FindAndModifyTest.test_modify_with_push.BlogPost
+push_all__tags	mongoengine/tests/queryset/queryset.py	/^            push_all__tags=["mongodb", "code"])$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
+put	mongoengine/fields.py	/^    def put(self, file_obj, **kwargs):$/;"	m	class:GridFSProxy
+put	mongoengine/fields.py	/^    def put(self, file_obj, **kwargs):$/;"	m	class:ImageGridFsProxy
+put	mongoengine/mongoengine/fields.py	/^    def put(self, file_obj, **kwargs):$/;"	m	class:GridFSProxy
+put	mongoengine/mongoengine/fields.py	/^    def put(self, file_obj, **kwargs):$/;"	m	class:ImageGridFsProxy
+pygments_style	mongoengine/docs/conf.py	/^pygments_style = 'sphinx'$/;"	v
+qs	mongoengine/tests/queryset/queryset.py	/^            qs = BlogPost.objects.filter(title='whatever').order_by('published_date')$/;"	v	class:QuerySetTest.test_clear_ordering.BlogPost
+quantity	mongoengine/tests/document/instance.py	/^            quantity = IntField()$/;"	v	class:InstanceTest.test_object_mixins.Foo
+query	mongoengine/mongoengine/queryset/transform.py	/^def query(_doc_cls=None, **kwargs):$/;"	f
+query_counter	mongoengine/mongoengine/context_managers.py	/^class query_counter(object):$/;"	c
+queryset_class	mongoengine/tests/queryset/queryset.py	/^            queryset_class = CustomQuerySet$/;"	v	class:QuerySetTest.test_custom_querysets_inherited_direct.CustomQuerySetManager
+queryset_class	mongoengine/tests/queryset/queryset.py	/^            queryset_class = CustomQuerySet$/;"	v	class:QuerySetTest.test_custom_querysets_set_manager_directly.CustomQuerySetManager
+queryset_manager	mongoengine/mongoengine/queryset/manager.py	/^def queryset_manager(func):$/;"	f
+rank	mongoengine/tests/document/indexes.py	/^            rank = EmbeddedDocumentField(Rank, required=False)$/;"	v	class:IndexesTest.test_embedded_document_index_meta.Person
+rank	mongoengine/tests/document/instance.py	/^            def rank(self):$/;"	m	class:InstanceTest.test_db_embedded_doc_field_load.Person
+rank	mongoengine/tests/document/instance.py	/^            def rank(self):$/;"	m	class:InstanceTest.test_db_field_load.Person
+rank_	mongoengine/tests/document/instance.py	/^            rank_ = EmbeddedDocumentField(Rank,$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Person
+rating	mongoengine/tests/queryset/queryset.py	/^            rating = DecimalField()$/;"	v	class:QuerySetTest.test_scalar_decimal.Person
+read	mongoengine/fields.py	/^    def read(self, size=-1):$/;"	m	class:GridFSProxy
+read	mongoengine/mongoengine/fields.py	/^    def read(self, size=-1):$/;"	m	class:GridFSProxy
+read_preference	mongoengine/mongoengine/queryset/base.py	/^    def read_preference(self, read_preference):$/;"	m	class:BaseQuerySet
+recursive	mongoengine/tests/fields/fields.py	/^            recursive = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbed
+recursive	mongoengine/tests/fields/fields.py	/^            recursive = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
+recursive	mongoengine/tests/fields/fields.py	/^            recursive = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbed
+recursive	mongoengine/tests/fields/fields.py	/^            recursive = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
+recursive	tests/fields/fields.py	/^            recursive = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbed
+recursive	tests/fields/fields.py	/^            recursive = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
+recursive	tests/fields/fields.py	/^            recursive = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbed
+recursive	tests/fields/fields.py	/^            recursive = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
+recursive_obj	mongoengine/tests/document/indexes.py	/^            recursive_obj = EmbeddedDocumentField(RecursiveObject)$/;"	v	class:IndexesTest.test_recursive_embedded_objects_dont_break_indexes.RecursiveDocument
+reduce_f	mongoengine/tests/queryset/queryset.py	/^            reduce_f=reduce_f,$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
+ref	mongoengine/tests/document/instance.py	/^            ref = ReferenceField(Test)$/;"	v	class:InstanceTest.test_embedded_document_equality.Embedded
+ref	mongoengine/tests/fields/fields.py	/^            ref = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_filter_by_dbref.Doc
+ref	mongoengine/tests/fields/fields.py	/^            ref = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_filter_by_objectid.Doc
+ref	mongoengine/tests/fields/fields.py	/^            ref = ReferenceField(Foo)$/;"	v	class:FieldTest.test_reference_miss.Bar
+ref	mongoengine/tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_invalid_operators.BlogPost
+ref	mongoengine/tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
+ref	mongoengine/tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_manipulative_operators.BlogPost
+ref	mongoengine/tests/queryset/queryset.py	/^            ref = ReferenceField(A)$/;"	v	class:QuerySetTest.test_chaining.B
+ref	mongoengine/tests/test_context_managers.py	/^            ref = ReferenceField(User, dbref=False)$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.Group
+ref	mongoengine/tests/test_context_managers.py	/^            ref = ReferenceField(User, dbref=True)$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.Group
+ref	tests/fields/fields.py	/^            ref = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_filter_by_dbref.Doc
+ref	tests/fields/fields.py	/^            ref = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_filter_by_objectid.Doc
+ref	tests/fields/fields.py	/^            ref = ReferenceField(Foo)$/;"	v	class:FieldTest.test_reference_miss.Bar
+ref	tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_invalid_operators.BlogPost
+ref	tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
+ref	tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_manipulative_operators.BlogPost
+ref_id	mongoengine/tests/document/indexes.py	/^            ref_id = StringField()$/;"	v	class:IndexesTest.test_hashed_indexes.Book
+reference	mongoengine/tests/document/validation.py	/^            reference = ReferenceField('self')$/;"	v	class:ValidatorErrorTest.test_parent_reference_in_child_document.Parent
+reference	mongoengine/tests/document/validation.py	/^            reference = ReferenceField('self')$/;"	v	class:ValidatorErrorTest.test_parent_reference_set_as_attribute_in_child_document.Parent
+reference	mongoengine/tests/queryset/queryset.py	/^            reference = ReferenceField('self', reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle.Dummy
+reference	mongoengine/tests/queryset/queryset.py	/^            reference = ReferenceField('self', reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_cycle.Dummy
+reference_field	mongoengine/tests/document/instance.py	/^            reference_field = ReferenceField(Simple, default=lambda:$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+reference_field	mongoengine/tests/document/json_serialisation.py	/^            reference_field = ReferenceField(Simple, default=lambda:$/;"	v	class:TestJson.test_json_complex.Doc
+reference_field	mongoengine/tests/queryset/queryset.py	/^            reference_field = ReferenceField($/;"	v	class:QuerySetTest.test_json_complex.Doc
+register_connection	mongoengine/mongoengine/connection.py	/^def register_connection(alias, db=None, name=None, host=None, port=None,$/;"	f
+register_delete_rule	mongoengine/mongoengine/document.py	/^    def register_delete_rule(cls, document_cls, field_name, rule):$/;"	m	class:Document
+relations	mongoengine/tests/test_dereference.py	/^            relations = ListField(EmbeddedDocumentField('Relation'))$/;"	v	class:FieldTest.test_circular_reference.Person
+relations	mongoengine/tests/test_dereference.py	/^            relations = ListField(ReferenceField('self'))$/;"	v	class:FieldTest.test_circular_reference_on_self.Person
+release	mongoengine/docs/conf.py	/^release = mongoengine.get_version()$/;"	v
+reload	mongoengine/mongoengine/document.py	/^    def reload(self, *args, **kwargs):$/;"	m	class:EmbeddedDocument
+reload	mongoengine/mongoengine/document.py	/^    def reload(self, *fields, **kwargs):$/;"	m	class:Document
+remove	mongoengine/mongoengine/base/datastructures.py	/^    def remove(self, *args, **kwargs):$/;"	m	class:BaseList
+replace	mongoengine/fields.py	/^    def replace(self, file_obj, **kwargs):$/;"	m	class:GridFSProxy
+replace	mongoengine/mongoengine/fields.py	/^    def replace(self, file_obj, **kwargs):$/;"	m	class:GridFSProxy
+required	mongoengine/tests/document/instance.py	/^                                          required=False,$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Person
+required	mongoengine/tests/document/instance.py	/^                                      required=True)$/;"	v	class:InstanceTest.test_embedded_update.Page
+required	mongoengine/tests/document/instance.py	/^                                      required=True)$/;"	v	class:InstanceTest.test_embedded_update_after_save.Page
+required	mongoengine/tests/document/instance.py	/^                                      required=True)$/;"	v	class:InstanceTest.test_embedded_update_db_field.Page
+required	mongoengine/tests/document/instance.py	/^                                  required=True)$/;"	v	class:InstanceTest.test_list_search_by_embedded.Comment
+reset	mongoengine/mongoengine/queryset/field_list.py	/^    def reset(self):$/;"	m	class:QueryFieldList
+reset_post	mongoengine/tests/fields/fields.py	/^        def reset_post():$/;"	f	function:FieldTest.test_list_field_manipulative_operators
+reset_post	tests/fields/fields.py	/^        def reset_post():$/;"	f	function:FieldTest.test_list_field_manipulative_operators
+reverse	mongoengine/mongoengine/base/datastructures.py	/^    def reverse(self, *args, **kwargs):$/;"	m	class:BaseList
+reverse_delete_rule	mongoengine/tests/document/instance.py	/^                        reverse_delete_rule=NULLIFY))$/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
+reverse_delete_rule	mongoengine/tests/queryset/queryset.py	/^                                               reverse_delete_rule=PULL))$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull.BlogPost
+reverse_delete_rule	mongoengine/tests/queryset/queryset.py	/^                                               reverse_delete_rule=PULL))$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents.AbstractBlogPost
+review_queue	mongoengine/tests/document/instance.py	/^            review_queue = IntField(default=0)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.Editor
+reviewer	mongoengine/tests/document/instance.py	/^            reviewer = ReferenceField(User, reverse_delete_rule=NULLIFY)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_custom_id_field.Book
+reviewer	mongoengine/tests/document/instance.py	/^            reviewer = ReferenceField(self.Person, reverse_delete_rule=NULLIFY)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify.BlogPost
+reviewer	mongoengine/tests/document/instance.py	/^            reviewer = ReferenceField(self.Person, reverse_delete_rule=NULLIFY)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_document_inheritance.BlogPost
+reviewers	mongoengine/tests/document/instance.py	/^                reviewers = DictField($/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
+reviewers	mongoengine/tests/document/instance.py	/^            reviewers = ListField(ReferenceField($/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify_complex_field.BlogPost
+rewind	mongoengine/mongoengine/queryset/base.py	/^    def rewind(self):$/;"	m	class:BaseQuerySet
+roles	mongoengine/tests/document/delta.py	/^            roles = MapField(field=EmbeddedDocumentField(EmbeddedRole))$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedUser
+rolist	mongoengine/tests/document/delta.py	/^            rolist = ListField(field=EmbeddedDocumentField(EmbeddedRole))$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedUser
+s	mongoengine/tests/document/instance.py	/^            s = Stats()$/;"	v	class:InstanceTest.test_reference_inheritance.CompareStats
+s	mongoengine/tests/queryset/queryset.py	/^            s = StringField()$/;"	v	class:QuerySetTest.test_batch_size.A
+s	mongoengine/tests/queryset/queryset.py	/^            s = StringField()$/;"	v	class:QuerySetTest.test_chaining.A
+s	mongoengine/tests/queryset/queryset.py	/^            s = StringField()$/;"	v	class:QuerySetTest.test_none.A
+salary	mongoengine/tests/document/dynamic.py	/^            salary = IntField()$/;"	v	class:DynamicTest.test_inheritance.Employee
+salary	mongoengine/tests/document/inheritance.py	/^            salary = IntField()$/;"	v	class:InheritanceTest.test_inheritance_meta_data.Employee
+salary	mongoengine/tests/document/inheritance.py	/^            salary = IntField()$/;"	v	class:InheritanceTest.test_inheritance_to_mongo_keys.Employee
+salary	mongoengine/tests/document/instance.py	/^            salary = IntField()$/;"	v	class:InstanceTest.test_embedded_document_to_mongo.Employee
+salary	mongoengine/tests/document/instance.py	/^            salary = IntField()$/;"	v	class:InstanceTest.test_save_embedded_document.Employee
+salary	mongoengine/tests/document/instance.py	/^            salary = IntField()$/;"	v	class:InstanceTest.test_updating_an_embedded_document.Employee
+salary	mongoengine/tests/fields/fields.py	/^            salary = DecimalField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.PersonAuto
+salary	mongoengine/tests/queryset/field_list.py	/^            salary = IntField(db_field='wage')$/;"	v	class:OnlyExcludeAllTest.test_only.Employee
+salary	tests/fields/fields.py	/^            salary = DecimalField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.PersonAuto
+save	mongoengine/mongoengine/base/datastructures.py	/^    def save(self, *args, **kwargs):$/;"	m	class:EmbeddedDocumentList
+save	mongoengine/mongoengine/document.py	/^    def save(self, *args, **kwargs):$/;"	m	class:EmbeddedDocument
+save	mongoengine/mongoengine/document.py	/^    def save(self, force_insert=False, validate=True, clean=True,$/;"	m	class:Document
+save	mongoengine/tests/document/instance.py	/^            def save(self, *args, **kwargs):$/;"	m	class:InstanceTest.test_complex_nesting_document_and_embedded_document.NodesSystem
+save_id	mongoengine/tests/document/instance.py	/^            save_id = UUIDField()$/;"	v	class:InstanceTest.test_save_atomicity_condition.Widget
+scalar	mongoengine/mongoengine/queryset/base.py	/^    def scalar(self, *fields):$/;"	m	class:BaseQuerySet
+scope	mongoengine/tests/queryset/queryset.py	/^                                     scope=scope)$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+score	mongoengine/tests/queryset/queryset.py	/^            score = IntField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.Vote
+search_text	mongoengine/mongoengine/queryset/base.py	/^    def search_text(self, text, language=None):$/;"	m	class:BaseQuerySet
+select_related	mongoengine/mongoengine/document.py	/^    def select_related(self, max_depth=1):$/;"	m	class:Document
+select_related	mongoengine/mongoengine/queryset/base.py	/^    def select_related(self, max_depth=1):$/;"	m	class:BaseQuerySet
+send	mongoengine/mongoengine/signals.py	/^        send = lambda *a, **kw: None  # noqa$/;"	v	class:_FakeSignal
+sender	mongoengine/tests/queryset/field_list.py	/^            sender = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
+sender	mongoengine/tests/queryset/field_list.py	/^            sender = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
+sequence_field	mongoengine/tests/document/instance.py	/^            sequence_field = SequenceField()$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+sequence_field	mongoengine/tests/document/json_serialisation.py	/^            sequence_field = SequenceField()$/;"	v	class:TestJson.test_json_complex.Doc
+sequence_field	mongoengine/tests/queryset/queryset.py	/^            sequence_field = SequenceField()$/;"	v	class:QuerySetTest.test_json_complex.Doc
+setUp	mongoengine/tests/all_warnings/__init__.py	/^    def setUp(self):$/;"	m	class:AllWarnings
+setUp	mongoengine/tests/document/class_methods.py	/^    def setUp(self):$/;"	m	class:ClassMethodsTest
+setUp	mongoengine/tests/document/delta.py	/^    def setUp(self):$/;"	m	class:DeltaTest
+setUp	mongoengine/tests/document/dynamic.py	/^    def setUp(self):$/;"	m	class:DynamicTest
+setUp	mongoengine/tests/document/indexes.py	/^    def setUp(self):$/;"	m	class:IndexesTest
+setUp	mongoengine/tests/document/inheritance.py	/^    def setUp(self):$/;"	m	class:InheritanceTest
+setUp	mongoengine/tests/document/instance.py	/^    def setUp(self):$/;"	m	class:InstanceTest
+setUp	mongoengine/tests/document/json_serialisation.py	/^    def setUp(self):$/;"	m	class:TestJson
+setUp	mongoengine/tests/document/validation.py	/^    def setUp(self):$/;"	m	class:ValidatorErrorTest
+setUp	mongoengine/tests/fields/fields.py	/^    def setUp(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+setUp	mongoengine/tests/fields/geo.py	/^    def setUp(self):$/;"	m	class:GeoFieldTest
+setUp	mongoengine/tests/queryset/field_list.py	/^    def setUp(self):$/;"	m	class:OnlyExcludeAllTest
+setUp	mongoengine/tests/queryset/modify.py	/^    def setUp(self):$/;"	m	class:FindAndModifyTest
+setUp	mongoengine/tests/queryset/pickable.py	/^    def setUp(self):$/;"	m	class:TestQuerysetPickable
+setUp	mongoengine/tests/queryset/queryset.py	/^    def setUp(self):$/;"	m	class:QuerySetTest
+setUp	mongoengine/tests/queryset/transform.py	/^    def setUp(self):$/;"	m	class:TransformTest
+setUp	mongoengine/tests/queryset/visitor.py	/^    def setUp(self):$/;"	m	class:QTest
+setUp	mongoengine/tests/test_datastructures.py	/^    def setUp(self):$/;"	m	class:TestStrictDict
+setUp	mongoengine/tests/test_replicaset_connection.py	/^    def setUp(self):$/;"	m	class:ConnectionTest
+setUp	mongoengine/tests/test_signals.py	/^    def setUp(self):$/;"	m	class:SignalTests
+setUp	tests/fields/fields.py	/^    def setUp(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+setUpClass	mongoengine/tests/test_dereference.py	/^    def setUpClass(cls):$/;"	m	class:FieldTest
+setUpClass	mongoengine/tests/utils.py	/^    def setUpClass(cls):$/;"	m	class:MongoDBTestCase
+set__authors	mongoengine/tests/queryset/queryset.py	/^            set__authors=[Author(name="Harry"),$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Message
+set__authors__S	mongoengine/tests/queryset/queryset.py	/^            set__authors__S=Author(name="Ross"))$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Message
+set__bar	mongoengine/tests/queryset/queryset.py	/^            set__bar=Bar(name='test'), upsert=True)$/;"	v	class:QuerySetTest.test_set_generic_embedded_documents.User
+set__comments__S__votes	mongoengine/tests/queryset/queryset.py	/^            set__comments__S__votes=Vote(score=4))$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.BlogPost
+set__comp_dt_fld	mongoengine/tests/fields/fields.py	/^            set__comp_dt_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+set__comp_dt_fld	tests/fields/fields.py	/^            set__comp_dt_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+set__flt_fld	mongoengine/tests/fields/fields.py	/^            set__flt_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+set__flt_fld	tests/fields/fields.py	/^            set__flt_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+set__int_fld	mongoengine/tests/fields/fields.py	/^            set__int_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+set__int_fld	tests/fields/fields.py	/^            set__int_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+set__mapping	mongoengine/tests/fields/fields.py	/^            set__mapping={"someint": IntegerSetting(value=10)})$/;"	v	class:FieldTest.test_dictfield_complex.Simple
+set__mapping	tests/fields/fields.py	/^            set__mapping={"someint": IntegerSetting(value=10)})$/;"	v	class:FieldTest.test_dictfield_complex.Simple
+set__mapping__2__list__1	mongoengine/tests/fields/fields.py	/^            set__mapping__2__list__1=StringSetting(value='Boo'))$/;"	v	class:FieldTest.test_list_field_complex.Simple
+set__mapping__2__list__1	tests/fields/fields.py	/^            set__mapping__2__list__1=StringSetting(value='Boo'))$/;"	v	class:FieldTest.test_list_field_complex.Simple
+set__mapping__nested_dict__list__1	mongoengine/tests/fields/fields.py	/^            set__mapping__nested_dict__list__1=StringSetting(value='Boo'))$/;"	v	class:FieldTest.test_dictfield_complex.Simple
+set__mapping__nested_dict__list__1	tests/fields/fields.py	/^            set__mapping__nested_dict__list__1=StringSetting(value='Boo'))$/;"	v	class:FieldTest.test_dictfield_complex.Simple
+set__members	mongoengine/tests/queryset/queryset.py	/^            set__members={"John": Member(gender="F", age=14)})$/;"	v	class:QuerySetTest.test_mapfield_update.Club
+set__members	mongoengine/tests/queryset/queryset.py	/^            set__members={"John": {'gender': 'F', 'age': 14}})$/;"	v	class:QuerySetTest.test_dictfield_update.Club
+set__posts__1__comments__1__name	mongoengine/tests/queryset/queryset.py	/^            set__posts__1__comments__1__name='testc')$/;"	v	class:QuerySetTest.test_update_array_position.Blog
+set__str_fld	mongoengine/tests/fields/fields.py	/^            set__str_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+set__str_fld	tests/fields/fields.py	/^            set__str_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+set_next_value	mongoengine/fields.py	/^    def set_next_value(self, value):$/;"	m	class:SequenceField
+set_next_value	mongoengine/mongoengine/fields.py	/^    def set_next_value(self, value):$/;"	m	class:SequenceField
+setdefault	mongoengine/mongoengine/base/datastructures.py	/^    def setdefault(self, *args, **kwargs):$/;"	m	class:BaseDict
+shape	mongoengine/tests/queryset/queryset.py	/^            shape = StringField()$/;"	v	class:QuerySetTest.test_elem_match.Foo
+shard_1	mongoengine/tests/document/indexes.py	/^            shard_1 = StringField()$/;"	v	class:IndexesTest.test_compound_index_underscore_cls_not_overwritten.TestDoc
+sibling	mongoengine/tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_abstract_reference_base_type.Brother
+sibling	mongoengine/tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_reference_abstract_class.Brother
+sibling	mongoengine/tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Brother
+sibling	tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_abstract_reference_base_type.Brother
+sibling	tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_reference_abstract_class.Brother
+sibling	tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Brother
+signal	mongoengine/mongoengine/signals.py	/^        def signal(self, name, doc=None):$/;"	m	class:Namespace
+signal_output	mongoengine/tests/test_signals.py	/^signal_output = []$/;"	v
+signals_available	mongoengine/mongoengine/signals.py	/^    signals_available = True$/;"	v
+signals_available	mongoengine/mongoengine/signals.py	/^signals_available = False$/;"	v
+size	mongoengine/fields.py	/^    def size(self):$/;"	m	class:ImageGridFsProxy
+size	mongoengine/mongoengine/fields.py	/^    def size(self):$/;"	m	class:ImageGridFsProxy
+size	mongoengine/tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_accept_possible_value.Shirt
+size	mongoengine/tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_allow_no_value.Shirt
+size	mongoengine/tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_reject_unknown_value.Shirt
+size	mongoengine/tests/fields/fields.py	/^            size = StringField(choices={'M', 'L'})$/;"	v	class:FieldTest.test_choices_allow_using_sets_as_choices.Shirt
+size	mongoengine/tests/fields/fields.py	/^            size = StringField(max_length=3, choices=($/;"	v	class:FieldTest.test_choices_get_field_display.Shirt
+size	mongoengine/tests/fields/fields.py	/^            size = StringField(max_length=3, choices=SIZES)$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
+size	mongoengine/tests/fields/fields.py	/^            size = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+size	mongoengine/tests/fields/fields.py	/^            size = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_validation.Shirt
+size	mongoengine/tests/queryset/queryset.py	/^            size = ReferenceField(Size)$/;"	v	class:QuerySetTest.test_can_have_field_same_name_as_query_operator.Example
+size	tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_accept_possible_value.Shirt
+size	tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_allow_no_value.Shirt
+size	tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_reject_unknown_value.Shirt
+size	tests/fields/fields.py	/^            size = StringField(choices={'M', 'L'})$/;"	v	class:FieldTest.test_choices_allow_using_sets_as_choices.Shirt
+size	tests/fields/fields.py	/^            size = StringField(max_length=3, choices=($/;"	v	class:FieldTest.test_choices_get_field_display.Shirt
+size	tests/fields/fields.py	/^            size = StringField(max_length=3, choices=SIZES)$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
+size	tests/fields/fields.py	/^            size = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+size	tests/fields/fields.py	/^            size = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_validation.Shirt
+skip	mongoengine/mongoengine/queryset/base.py	/^    def skip(self, n):$/;"	m	class:BaseQuerySet
+skip_pymongo3	mongoengine/tests/utils.py	/^def skip_pymongo3(f):$/;"	f
+slave_okay	mongoengine/mongoengine/queryset/base.py	/^    def slave_okay(self, enabled):$/;"	m	class:BaseQuerySet
+slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
+slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_unique.BlogPost
+slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_unique_embedded_document.SubDocument
+slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_unique_embedded_document_in_list.SubDocument
+slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.SubDocument
+slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique_with='date.year')$/;"	v	class:IndexesTest.test_unique_with.BlogPost
+slug	mongoengine/tests/document/instance.py	/^            slug = StringField()$/;"	v	class:InstanceTest.test_push_nested_list.BlogPost
+slug	mongoengine/tests/document/instance.py	/^            slug = StringField()$/;"	v	class:InstanceTest.test_push_with_position.BlogPost
+slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_editting_embedded_objects.BlogPost
+slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_update_one_pop_generic_reference.BlogPost
+slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
+slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_update_push_list_of_list.BlogPost
+slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_update_push_with_position.BlogPost
+snapshot	mongoengine/mongoengine/queryset/base.py	/^    def snapshot(self, enabled):$/;"	m	class:BaseQuerySet
+some	mongoengine/tests/queryset/field_list.py	/^            some = BooleanField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.VariousData
+some_long	mongoengine/tests/fields/fields.py	/^            some_long = LongField()$/;"	v	class:FieldTest.test_long_field_is_considered_as_int64.TestLongFieldConsideredAsInt64
+some_long	tests/fields/fields.py	/^            some_long = LongField()$/;"	v	class:FieldTest.test_long_field_is_considered_as_int64.TestLongFieldConsideredAsInt64
+song	mongoengine/tests/test_dereference.py	/^            song = ReferenceField("Song")$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.PlaylistItem
+songs	mongoengine/tests/test_dereference.py	/^            songs = [item.song for item in playlist.items]$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.Playlist
+sort	mongoengine/mongoengine/base/datastructures.py	/^    def sort(self, *args, **kwargs):$/;"	m	class:BaseList
+sorted_list_field	mongoengine/tests/document/instance.py	/^            sorted_list_field = SortedListField(IntField(),$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+sorted_list_field	mongoengine/tests/document/json_serialisation.py	/^            sorted_list_field = SortedListField(IntField(),$/;"	v	class:TestJson.test_json_complex.Doc
+sorted_list_field	mongoengine/tests/queryset/queryset.py	/^            sorted_list_field = SortedListField(IntField(),$/;"	v	class:QuerySetTest.test_json_complex.Doc
+source_suffix	mongoengine/docs/conf.py	/^source_suffix = '.rst'$/;"	v
+staffs_with_position	mongoengine/tests/test_dereference.py	/^            staffs_with_position = ListField(DictField())$/;"	v	class:FieldTest.test_dict_in_dbref_instance.Room
+start_listener	mongoengine/fields.py	/^    def start_listener(self):$/;"	m	class:CachedReferenceField
+start_listener	mongoengine/mongoengine/fields.py	/^    def start_listener(self):$/;"	m	class:CachedReferenceField
+state	mongoengine/tests/queryset/queryset.py	/^            state = GenericReferenceField()$/;"	v	class:QuerySetTest.test_scalar_generic_reference_field.Person
+state	mongoengine/tests/queryset/queryset.py	/^            state = ReferenceField(State)$/;"	v	class:QuerySetTest.test_scalar_reference_field.Person
+stats	mongoengine/tests/document/instance.py	/^            stats = ListField(ReferenceField(Stats))$/;"	v	class:InstanceTest.test_reference_inheritance.CompareStats
+status	mongoengine/tests/document/instance.py	/^            status = StringField()$/;"	v	class:InstanceTest.test_document_clean.TestDocument
+status	mongoengine/tests/document/instance.py	/^            status = StringField()$/;"	v	class:InstanceTest.test_document_embedded_clean.TestDocument
+stem	mongoengine/tests/document/instance.py	/^            stem = StringField()$/;"	v	class:InstanceTest.test_invalid_son.Word
+stored	mongoengine/tests/fields/fields.py	/^            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+stored	tests/fields/fields.py	/^            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
+str_f	mongoengine/tests/queryset/queryset.py	/^            str_f = StringField()$/;"	v	class:QuerySetTest.test_update_validate.Doc
+str_f	mongoengine/tests/queryset/queryset.py	/^            str_f = StringField()$/;"	v	class:QuerySetTest.test_update_validate.EmDoc
+str_fld	mongoengine/tests/document/instance.py	/^            str_fld = StringField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
+str_fld	mongoengine/tests/fields/fields.py	/^            str_fld = StringField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+str_fld	mongoengine/tests/fields/fields.py	/^            str_fld = StringField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
+str_fld	tests/fields/fields.py	/^            str_fld = StringField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
+str_fld	tests/fields/fields.py	/^            str_fld = StringField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
+strict_dict_class	mongoengine/tests/test_datastructures.py	/^    def strict_dict_class(self, *args, **kwargs):$/;"	m	class:TestStrictDict
+string	mongoengine/tests/document/instance.py	/^            string = StringField()$/;"	v	class:InstanceTest.test_embedded_document_complex_instance.Embedded
+string	mongoengine/tests/document/instance.py	/^            string = StringField()$/;"	v	class:InstanceTest.test_embedded_document_instance.Embedded
+string	mongoengine/tests/document/instance.py	/^            string = StringField(db_field='s')$/;"	v	class:InstanceTest.test_embedded_document_complex_instance_no_use_db_field.Embedded
+string	mongoengine/tests/document/json_serialisation.py	/^            string = StringField()$/;"	v	class:TestJson.test_json_simple.Doc
+string	mongoengine/tests/document/json_serialisation.py	/^            string = StringField()$/;"	v	class:TestJson.test_json_simple.Embedded
+string	mongoengine/tests/document/json_serialisation.py	/^            string = StringField(db_field='s')$/;"	v	class:TestJson.test_json_names.Doc
+string	mongoengine/tests/document/json_serialisation.py	/^            string = StringField(db_field='s')$/;"	v	class:TestJson.test_json_names.Embedded
+string	mongoengine/tests/fixtures.py	/^    string = StringField(choices=(('One', '1'), ('Two', '2')))$/;"	v	class:NewDocumentPickleTest
+string	mongoengine/tests/fixtures.py	/^    string = StringField(choices=(('One', '1'), ('Two', '2')))$/;"	v	class:PickleSignalsTest
+string	mongoengine/tests/fixtures.py	/^    string = StringField(choices=(('One', '1'), ('Two', '2')))$/;"	v	class:PickleTest
+string	mongoengine/tests/queryset/queryset.py	/^            string = StringField()$/;"	v	class:QuerySetTest.test_json_simple.Doc
+string	mongoengine/tests/queryset/queryset.py	/^            string = StringField()$/;"	v	class:QuerySetTest.test_json_simple.Embedded
+string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField()$/;"	v	class:DeltaTest.delta.Doc
+string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField()$/;"	v	class:DeltaTest.delta_recursive.Doc
+string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
+string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField(db_field='db_string_field')$/;"	v	class:DeltaTest.delta_db_field.Doc
+string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField(db_field='db_string_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
+string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField(db_field='db_string_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Embedded
+string_field	mongoengine/tests/document/instance.py	/^            string_field = StringField(default='1')$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+string_field	mongoengine/tests/document/json_serialisation.py	/^            string_field = StringField(default='1')$/;"	v	class:TestJson.test_json_complex.Doc
+string_field	mongoengine/tests/queryset/queryset.py	/^            string_field = StringField(default='1')$/;"	v	class:QuerySetTest.test_json_complex.Doc
+string_value	mongoengine/tests/fields/fields.py	/^            string_value = DecimalField(precision=4, force_string=True)$/;"	v	class:FieldTest.test_decimal_storage.Person
+string_value	tests/fields/fields.py	/^            string_value = DecimalField(precision=4, force_string=True)$/;"	v	class:FieldTest.test_decimal_storage.Person
+style	mongoengine/tests/fields/fields.py	/^            style = StringField(max_length=3, choices=($/;"	v	class:FieldTest.test_choices_get_field_display.Shirt
+style	mongoengine/tests/fields/fields.py	/^            style = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+style	tests/fields/fields.py	/^            style = StringField(max_length=3, choices=($/;"	v	class:FieldTest.test_choices_get_field_display.Shirt
+style	tests/fields/fields.py	/^            style = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
+sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2009, slug="test"))$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
+sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2009, slug="test"))$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
+sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2009, slug='test-1'))$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
+sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2010, slug='another-slug'))$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
+sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2010, slug='another-slug'))$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
+sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2010, slug='test'))$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
+sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2010, slug='test'))$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
+sub	mongoengine/tests/document/indexes.py	/^            sub = EmbeddedDocumentField(SubDocument)$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
+sub	mongoengine/tests/document/indexes.py	/^            sub = EmbeddedDocumentField(SubDocument)$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
+sub	mongoengine/tests/document/instance.py	/^            sub = UserSubscription(user=u1.pk, feed=f1.pk)$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
+sub	mongoengine/tests/document/instance.py	/^            sub = UserSubscription(user=user, feed=feed)$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
+sub	mongoengine/tests/document/instance.py	/^            sub = UserSubscription.objects.first()$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
+subclasses_and_unique_keys_works	mongoengine/tests/document/instance.py	/^    def subclasses_and_unique_keys_works(self):$/;"	m	class:InstanceTest
+subject	mongoengine/tests/queryset/field_list.py	/^            subject = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
+subject	mongoengine/tests/queryset/field_list.py	/^            subject = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
+submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=10)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=13)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=2)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=4)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=5)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=6)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+submitted	mongoengine/tests/queryset/queryset.py	/^            submitted = DateTimeField(db_field='sTime')$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+subs	mongoengine/tests/document/delta.py	/^            subs = MapField(EmbeddedDocumentField(EmbeddedDoc))$/;"	v	class:DeltaTest.test_lower_level_mark_as_changed.MyDoc
+subs	mongoengine/tests/document/delta.py	/^            subs = MapField(EmbeddedDocumentField(EmbeddedDoc))$/;"	v	class:DeltaTest.test_upper_level_mark_as_changed.MyDoc
+subs	mongoengine/tests/document/delta.py	/^            subs = MapField(MapField(EmbeddedDocumentField(EmbeddedDoc)))$/;"	v	class:DeltaTest.test_nested_nested_fields_mark_as_changed.MyDoc
+subs	mongoengine/tests/document/indexes.py	/^            subs = ListField(EmbeddedDocumentField(SubDocument))$/;"	v	class:IndexesTest.test_unique_embedded_document_in_list.BlogPost
+sum	mongoengine/mongoengine/queryset/base.py	/^    def sum(self, field):$/;"	m	class:BaseQuerySet
+superphylum	mongoengine/tests/document/instance.py	/^            superphylum = EmbeddedDocumentField(SuperPhylum)$/;"	v	class:InstanceTest.test_reload_sharded_nested.Animal
+superphylum	mongoengine/tests/document/instance.py	/^            superphylum = StringField()$/;"	v	class:InstanceTest.test_reload_sharded.Animal
+switch_collection	mongoengine/mongoengine/context_managers.py	/^class switch_collection(object):$/;"	c
+switch_collection	mongoengine/mongoengine/document.py	/^    def switch_collection(self, collection_name, keep_created=True):$/;"	m	class:Document
+switch_db	mongoengine/mongoengine/context_managers.py	/^class switch_db(object):$/;"	c
+switch_db	mongoengine/mongoengine/document.py	/^    def switch_db(self, db_alias, keep_created=True):$/;"	m	class:Document
+sync_all	mongoengine/fields.py	/^    def sync_all(self):$/;"	m	class:CachedReferenceField
+sync_all	mongoengine/mongoengine/fields.py	/^    def sync_all(self):$/;"	m	class:CachedReferenceField
+t	mongoengine/benchmark.py	/^    t = timeit.Timer(stmt=stmt, setup=setup)$/;"	v
+t	mongoengine/tests/fields/file_tests.py	/^            t = TestImage()$/;"	v	class:FileTest.test_image_field.TestImage
+t	mongoengine/tests/queryset/queryset.py	/^            t = Number(n=i)$/;"	v	class:QuerySetTest.test_clone.Number
+t	mongoengine/tests/queryset/queryset.py	/^            t = Number2(n=i)$/;"	v	class:QuerySetTest.test_using.Number2
+t	mongoengine/tests/queryset/visitor.py	/^            t = TestDoc(x=i)$/;"	v	class:QTest.test_q_clone.TestDoc
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_equality.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
+tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Animal
+tag	mongoengine/tests/queryset/queryset.py	/^            tag = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_with_null_embedded.Extra
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_equality.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
+tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Animal
+tag_list	mongoengine/tests/document/class_methods.py	/^            tag_list = ListField(StringField())$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPostWithTags
+tag_list	mongoengine/tests/document/class_methods.py	/^            tag_list = ListField(StringField())$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithTags
+tags	mongoengine/docs/code/tumblelog.py	/^    tags = ListField(StringField(max_length=30))$/;"	v	class:Post
+tags	mongoengine/tests/document/class_methods.py	/^            tags = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
+tags	mongoengine/tests/document/class_methods.py	/^            tags = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPostWithTags
+tags	mongoengine/tests/document/class_methods.py	/^            tags = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithTags
+tags	mongoengine/tests/document/class_methods.py	/^            tags = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPostWithTags
+tags	mongoengine/tests/document/indexes.py	/^                         tags=[Tag(name="about"), Tag(name="time")])$/;"	v	class:IndexesTest.test_list_embedded_document_index.BlogPost
+tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(EmbeddedDocumentField(Tag))$/;"	v	class:IndexesTest.test_list_embedded_document_index.BlogPost
+tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(StringField())$/;"	v	class:IndexesTest._index_test.BlogPost
+tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(StringField())$/;"	v	class:IndexesTest._index_test_inheritance.BlogPost
+tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(StringField())$/;"	v	class:IndexesTest.test_dictionary_indexes.BlogPost
+tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(StringField())$/;"	v	class:IndexesTest.test_hint.BlogPost
+tags	mongoengine/tests/document/indexes.py	/^            tags = [("tag %i" % n) for n in range(0, i % 2)]$/;"	v	class:IndexesTest.test_hint.BlogPost
+tags	mongoengine/tests/document/instance.py	/^            tags = ListField()$/;"	v	class:InstanceTest.test_push_nested_list.BlogPost
+tags	mongoengine/tests/document/instance.py	/^            tags = ListField(StringField())$/;"	v	class:InstanceTest.test_modify_with_positional_push.BlogPost
+tags	mongoengine/tests/document/instance.py	/^            tags = ListField(StringField())$/;"	v	class:InstanceTest.test_push_with_position.BlogPost
+tags	mongoengine/tests/document/instance.py	/^            tags = ListField(StringField())$/;"	v	class:InstanceTest.test_save_list.BlogPost
+tags	mongoengine/tests/fields/fields.py	/^            tags = ListField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
+tags	mongoengine/tests/fields/fields.py	/^            tags = ListField(StringField())$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Owner
+tags	mongoengine/tests/fields/fields.py	/^            tags = ListField(StringField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
+tags	mongoengine/tests/fields/fields.py	/^            tags = SortedListField(StringField())$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
+tags	mongoengine/tests/queryset/modify.py	/^            tags = ListField(StringField())$/;"	v	class:FindAndModifyTest.test_modify_with_push.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField()$/;"	v	class:QuerySetTest.test_update_push_list_of_list.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(EmbeddedDocumentField(BlogTag), required=True)$/;"	v	class:QuerySetTest.test_editting_embedded_objects.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(ReferenceField(BlogTag), required=True)$/;"	v	class:QuerySetTest.test_update_one_pop_generic_reference.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_custom_manager.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_find_array_position.Blog
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_map_reduce_with_custom_object_ids.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_update.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_update_array_position.Blog
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_update_push_with_position.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Post
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField(), db_field='blogTags')$/;"	v	class:QuerySetTest.test_item_frequencies.BlogPost
+tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField(), db_field='post-tag-list')$/;"	v	class:QuerySetTest.test_map_reduce.BlogPost
+tags	mongoengine/tests/queryset/visitor.py	/^            tags = ListField(StringField())$/;"	v	class:QTest.test_q_lists.BlogPost
+tags	mongoengine/tests/test_dereference.py	/^            tags = ListField(ReferenceField("Tag", dbref=True))$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Page
+tags	mongoengine/tests/test_dereference.py	/^            tags = ListField(ReferenceField("Tag", dbref=True))$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Post
+tags	tests/fields/fields.py	/^            tags = ListField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
+tags	tests/fields/fields.py	/^            tags = ListField(StringField())$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Owner
+tags	tests/fields/fields.py	/^            tags = ListField(StringField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
+tags	tests/fields/fields.py	/^            tags = SortedListField(StringField())$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
+tearDown	mongoengine/tests/all_warnings/__init__.py	/^    def tearDown(self):$/;"	m	class:AllWarnings
+tearDown	mongoengine/tests/document/class_methods.py	/^    def tearDown(self):$/;"	m	class:ClassMethodsTest
+tearDown	mongoengine/tests/document/delta.py	/^    def tearDown(self):$/;"	m	class:DeltaTest
+tearDown	mongoengine/tests/document/indexes.py	/^    def tearDown(self):$/;"	m	class:IndexesTest
+tearDown	mongoengine/tests/document/inheritance.py	/^    def tearDown(self):$/;"	m	class:InheritanceTest
+tearDown	mongoengine/tests/document/instance.py	/^    def tearDown(self):$/;"	m	class:InstanceTest
+tearDown	mongoengine/tests/fields/file_tests.py	/^    def tearDown(self):$/;"	m	class:FileTest
+tearDown	mongoengine/tests/queryset/queryset.py	/^    def tearDown(self):$/;"	m	class:QuerySetTest
+tearDown	mongoengine/tests/test_connection.py	/^    def tearDown(self):$/;"	m	class:ConnectionTest
+tearDown	mongoengine/tests/test_replicaset_connection.py	/^    def tearDown(self):$/;"	m	class:ConnectionTest
+tearDown	mongoengine/tests/test_signals.py	/^    def tearDown(self):$/;"	m	class:SignalTests
+tearDownClass	mongoengine/tests/test_dereference.py	/^    def tearDownClass(cls):$/;"	m	class:FieldTest
+tearDownClass	mongoengine/tests/utils.py	/^    def tearDownClass(cls):$/;"	m	class:MongoDBTestCase
+templates_path	mongoengine/docs/conf.py	/^templates_path = ['_templates']$/;"	v
+term	mongoengine/tests/document/indexes.py	/^            term = StringField(required=True)$/;"	v	class:IndexesTest.test_compound_key_embedded.CompoundKey
+test	mongoengine/tests/queryset/queryset.py	/^            test = DictField()$/;"	v	class:QuerySetTest.test_dictfield_key_looks_like_a_digit.MyDoc
+test	mongoengine/tests/queryset/queryset.py	/^            test = StringField()$/;"	v	class:QuerySetTest.test_upsert_includes_cls.Test
+test2	mongoengine/tests/document/instance.py	/^            test2 = ReferenceField('Test2')$/;"	v	class:InstanceTest.test_dbref_equality.Test
+test3	mongoengine/tests/document/instance.py	/^            test3 = ReferenceField('Test3')$/;"	v	class:InstanceTest.test_dbref_equality.Test
+test_2dsphere_geo_within_box	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_geo_within_box(self):$/;"	m	class:GeoQueriesTest
+test_2dsphere_geo_within_center	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_geo_within_center(self):$/;"	m	class:GeoQueriesTest
+test_2dsphere_geo_within_polygon	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_geo_within_polygon(self):$/;"	m	class:GeoQueriesTest
+test_2dsphere_linestring_sets_correctly	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_linestring_sets_correctly(self):$/;"	m	class:GeoQueriesTest
+test_2dsphere_near	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_near(self):$/;"	m	class:GeoQueriesTest
+test_2dsphere_near_and_max_distance	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_near_and_max_distance(self):$/;"	m	class:GeoQueriesTest
+test_2dsphere_near_and_min_max_distance	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_near_and_min_max_distance(self):$/;"	m	class:GeoQueriesTest
+test_2dsphere_point_embedded	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_point_embedded(self):$/;"	m	class:GeoQueriesTest
+test_2dsphere_point_sets_correctly	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_point_sets_correctly(self):$/;"	m	class:GeoQueriesTest
+test_abstract_document_creation_does_not_fail	mongoengine/tests/document/inheritance.py	/^    def test_abstract_document_creation_does_not_fail(self):$/;"	m	class:InheritanceTest
+test_abstract_documents	mongoengine/tests/document/inheritance.py	/^    def test_abstract_documents(self):$/;"	m	class:InheritanceTest
+test_abstract_embedded_documents	mongoengine/tests/document/inheritance.py	/^    def test_abstract_embedded_documents(self):$/;"	m	class:InheritanceTest
+test_abstract_handle_ids_in_metaclass_properly	mongoengine/tests/document/inheritance.py	/^    def test_abstract_handle_ids_in_metaclass_properly(self):$/;"	m	class:InheritanceTest
+test_abstract_index_inheritance	mongoengine/tests/document/indexes.py	/^    def test_abstract_index_inheritance(self):$/;"	m	class:IndexesTest
+test_abstract_reference_base_type	mongoengine/tests/fields/fields.py	/^    def test_abstract_reference_base_type(self):$/;"	m	class:FieldTest
+test_abstract_reference_base_type	tests/fields/fields.py	/^    def test_abstract_reference_base_type(self):$/;"	m	class:FieldTest
+test_add_to_set_each	mongoengine/tests/queryset/queryset.py	/^    def test_add_to_set_each(self):$/;"	m	class:QuerySetTest
+test_all_fields	mongoengine/tests/queryset/field_list.py	/^    def test_all_fields(self):$/;"	m	class:OnlyExcludeAllTest
+test_allow_inheritance	mongoengine/tests/document/inheritance.py	/^    def test_allow_inheritance(self):$/;"	m	class:InheritanceTest
+test_allow_inheritance_abstract_document	mongoengine/tests/document/inheritance.py	/^    def test_allow_inheritance_abstract_document(self):$/;"	m	class:InheritanceTest
+test_allow_inheritance_embedded_document	mongoengine/tests/document/inheritance.py	/^    def test_allow_inheritance_embedded_document(self):$/;"	m	class:InheritanceTest
+test_always_include	mongoengine/tests/queryset/field_list.py	/^    def test_always_include(self):$/;"	m	class:QueryFieldListTest
+test_and_combination	mongoengine/tests/queryset/visitor.py	/^    def test_and_combination(self):$/;"	m	class:QTest
+test_and_or_combination	mongoengine/tests/queryset/visitor.py	/^    def test_and_or_combination(self):$/;"	m	class:QTest
+test_array_average	mongoengine/tests/queryset/queryset.py	/^    def test_array_average(self):$/;"	m	class:QuerySetTest
+test_array_sum	mongoengine/tests/queryset/queryset.py	/^    def test_array_sum(self):$/;"	m	class:QuerySetTest
+test_as_pymongo	mongoengine/tests/queryset/queryset.py	/^    def test_as_pymongo(self):$/;"	m	class:QuerySetTest
+test_as_pymongo_json_limit_fields	mongoengine/tests/queryset/queryset.py	/^    def test_as_pymongo_json_limit_fields(self):$/;"	m	class:QuerySetTest
+test_aspymongo_with_only	mongoengine/tests/queryset/geo.py	/^    def test_aspymongo_with_only(self):$/;"	m	class:GeoQueriesTest
+test_assertions	mongoengine/tests/queryset/queryset.py	/^        def test_assertions(f):$/;"	f	function:QuerySetTest.test_item_frequencies
+test_assertions	mongoengine/tests/queryset/queryset.py	/^        def test_assertions(f):$/;"	f	function:QuerySetTest.test_item_frequencies_on_embedded
+test_atomic_update_dict_field	mongoengine/tests/fields/fields.py	/^    def test_atomic_update_dict_field(self):$/;"	m	class:FieldTest
+test_atomic_update_dict_field	tests/fields/fields.py	/^    def test_atomic_update_dict_field(self):$/;"	m	class:FieldTest
+test_auto_id_not_set_if_specific_in_parent_class	mongoengine/tests/document/inheritance.py	/^    def test_auto_id_not_set_if_specific_in_parent_class(self):$/;"	m	class:InheritanceTest
+test_auto_id_vs_non_pk_id_field	mongoengine/tests/document/inheritance.py	/^    def test_auto_id_vs_non_pk_id_field(self):$/;"	m	class:InheritanceTest
+test_average	mongoengine/tests/queryset/queryset.py	/^    def test_average(self):$/;"	m	class:QuerySetTest
+test_average_over_db_field	mongoengine/tests/queryset/queryset.py	/^    def test_average_over_db_field(self):$/;"	m	class:QuerySetTest
+test_bad_mixed_creation	mongoengine/tests/document/instance.py	/^    def test_bad_mixed_creation(self):$/;"	m	class:InstanceTest
+test_batch_size	mongoengine/tests/queryset/queryset.py	/^    def test_batch_size(self):$/;"	m	class:QuerySetTest
+test_binary_field_primary	mongoengine/tests/fields/fields.py	/^    def test_binary_field_primary(self):$/;"	m	class:FieldTest
+test_binary_field_primary	tests/fields/fields.py	/^    def test_binary_field_primary(self):$/;"	m	class:FieldTest
+test_binary_field_primary_filter_by_binary_pk_as_str	mongoengine/tests/fields/fields.py	/^    def test_binary_field_primary_filter_by_binary_pk_as_str(self):$/;"	m	class:FieldTest
+test_binary_field_primary_filter_by_binary_pk_as_str	tests/fields/fields.py	/^    def test_binary_field_primary_filter_by_binary_pk_as_str(self):$/;"	m	class:FieldTest
+test_binary_fields	mongoengine/tests/fields/fields.py	/^    def test_binary_fields(self):$/;"	m	class:FieldTest
+test_binary_fields	tests/fields/fields.py	/^    def test_binary_fields(self):$/;"	m	class:FieldTest
+test_binary_validation	mongoengine/tests/fields/fields.py	/^    def test_binary_validation(self):$/;"	m	class:FieldTest
+test_binary_validation	tests/fields/fields.py	/^    def test_binary_validation(self):$/;"	m	class:FieldTest
+test_bool_performance	mongoengine/tests/queryset/queryset.py	/^    def test_bool_performance(self):$/;"	m	class:QuerySetTest
+test_bool_with_ordering	mongoengine/tests/queryset/queryset.py	/^    def test_bool_with_ordering(self):$/;"	m	class:QuerySetTest
+test_bool_with_ordering_from_meta_dict	mongoengine/tests/queryset/queryset.py	/^    def test_bool_with_ordering_from_meta_dict(self):$/;"	m	class:QuerySetTest
+test_boolean_validation	mongoengine/tests/fields/fields.py	/^    def test_boolean_validation(self):$/;"	m	class:FieldTest
+test_boolean_validation	tests/fields/fields.py	/^    def test_boolean_validation(self):$/;"	m	class:FieldTest
+test_build_index_spec_is_not_destructive	mongoengine/tests/document/indexes.py	/^    def test_build_index_spec_is_not_destructive(self):$/;"	m	class:IndexesTest
+test_bulk	mongoengine/tests/queryset/queryset.py	/^    def test_bulk(self):$/;"	m	class:QuerySetTest
+test_bulk_insert	mongoengine/tests/queryset/queryset.py	/^    def test_bulk_insert(self):$/;"	m	class:QuerySetTest
+test_cache_not_cloned	mongoengine/tests/queryset/queryset.py	/^    def test_cache_not_cloned(self):$/;"	m	class:QuerySetTest
+test_cached_queryset	mongoengine/tests/queryset/queryset.py	/^    def test_cached_queryset(self):$/;"	m	class:QuerySetTest
+test_cached_reference_auto_sync	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_auto_sync(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_auto_sync	tests/fields/fields.py	/^    def test_cached_reference_auto_sync(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_auto_sync_disabled	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_auto_sync_disabled(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_auto_sync_disabled	tests/fields/fields.py	/^    def test_cached_reference_auto_sync_disabled(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_embedded_fields	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_embedded_fields(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_embedded_fields	tests/fields/fields.py	/^    def test_cached_reference_embedded_fields(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_embedded_list_fields	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_embedded_list_fields(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_embedded_list_fields	tests/fields/fields.py	/^    def test_cached_reference_embedded_list_fields(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_decimal	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_decimal(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_decimal	tests/fields/fields.py	/^    def test_cached_reference_field_decimal(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_get_and_save	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_get_and_save(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_get_and_save	tests/fields/fields.py	/^    def test_cached_reference_field_get_and_save(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_push_with_fields	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_push_with_fields(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_push_with_fields	tests/fields/fields.py	/^    def test_cached_reference_field_push_with_fields(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_reference	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_reference(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_reference	tests/fields/fields.py	/^    def test_cached_reference_field_reference(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_update_all	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_update_all(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_field_update_all	tests/fields/fields.py	/^    def test_cached_reference_field_update_all(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_fields	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_fields(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_fields	tests/fields/fields.py	/^    def test_cached_reference_fields(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_fields_on_embedded_documents	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_fields_on_embedded_documents(self):$/;"	m	class:CachedReferenceFieldTest
+test_cached_reference_fields_on_embedded_documents	tests/fields/fields.py	/^    def test_cached_reference_fields_on_embedded_documents(self):$/;"	m	class:CachedReferenceFieldTest
+test_call_after_limits_set	mongoengine/tests/queryset/queryset.py	/^    def test_call_after_limits_set(self):$/;"	m	class:QuerySetTest
+test_can_have_field_same_name_as_query_operator	mongoengine/tests/queryset/queryset.py	/^    def test_can_have_field_same_name_as_query_operator(self):$/;"	m	class:QuerySetTest
+test_can_save_false_values	mongoengine/tests/document/instance.py	/^    def test_can_save_false_values(self):$/;"	m	class:InstanceTest
+test_can_save_false_values_dynamic	mongoengine/tests/document/instance.py	/^    def test_can_save_false_values_dynamic(self):$/;"	m	class:InstanceTest
+test_can_save_if_not_included	mongoengine/tests/document/instance.py	/^    def test_can_save_if_not_included(self):$/;"	m	class:InstanceTest
+test_cannot_perform_joins_references	mongoengine/tests/queryset/queryset.py	/^    def test_cannot_perform_joins_references(self):$/;"	m	class:QuerySetTest
+test_cant_turn_off_inheritance_on_subclass	mongoengine/tests/document/inheritance.py	/^    def test_cant_turn_off_inheritance_on_subclass(self):$/;"	m	class:InheritanceTest
+test_capped_collection	mongoengine/tests/document/instance.py	/^    def test_capped_collection(self):$/;"	m	class:InstanceTest
+test_capped_collection_default	mongoengine/tests/document/instance.py	/^    def test_capped_collection_default(self):$/;"	m	class:InstanceTest
+test_capped_collection_no_max_size_problems	mongoengine/tests/document/instance.py	/^    def test_capped_collection_no_max_size_problems(self):$/;"	m	class:InstanceTest
+test_chained_filter	mongoengine/tests/fields/fields.py	/^    def test_chained_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_chained_filter	tests/fields/fields.py	/^    def test_chained_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_chained_filter_exclude	mongoengine/tests/fields/fields.py	/^    def test_chained_filter_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_chained_filter_exclude	tests/fields/fields.py	/^    def test_chained_filter_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_chained_q_or_filtering	mongoengine/tests/queryset/visitor.py	/^    def test_chained_q_or_filtering(self):$/;"	m	class:QTest
+test_chaining	mongoengine/tests/queryset/queryset.py	/^    def test_chaining(self):$/;"	m	class:QuerySetTest
+test_chaining	mongoengine/tests/queryset/transform.py	/^    def test_chaining(self):$/;"	m	class:TransformTest
+test_change_scope_of_variable	mongoengine/tests/document/dynamic.py	/^    def test_change_scope_of_variable(self):$/;"	m	class:DynamicTest
+test_choices_allow_using_sets_as_choices	mongoengine/tests/fields/fields.py	/^    def test_choices_allow_using_sets_as_choices(self):$/;"	m	class:FieldTest
+test_choices_allow_using_sets_as_choices	tests/fields/fields.py	/^    def test_choices_allow_using_sets_as_choices(self):$/;"	m	class:FieldTest
+test_choices_get_field_display	mongoengine/tests/fields/fields.py	/^    def test_choices_get_field_display(self):$/;"	m	class:FieldTest
+test_choices_get_field_display	tests/fields/fields.py	/^    def test_choices_get_field_display(self):$/;"	m	class:FieldTest
+test_choices_validation_accept_possible_value	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_accept_possible_value(self):$/;"	m	class:FieldTest
+test_choices_validation_accept_possible_value	tests/fields/fields.py	/^    def test_choices_validation_accept_possible_value(self):$/;"	m	class:FieldTest
+test_choices_validation_allow_no_value	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_allow_no_value(self):$/;"	m	class:FieldTest
+test_choices_validation_allow_no_value	tests/fields/fields.py	/^    def test_choices_validation_allow_no_value(self):$/;"	m	class:FieldTest
+test_choices_validation_documents	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_documents(self):$/;"	m	class:FieldTest
+test_choices_validation_documents	tests/fields/fields.py	/^    def test_choices_validation_documents(self):$/;"	m	class:FieldTest
+test_choices_validation_documents_inheritance	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_documents_inheritance(self):$/;"	m	class:FieldTest
+test_choices_validation_documents_inheritance	tests/fields/fields.py	/^    def test_choices_validation_documents_inheritance(self):$/;"	m	class:FieldTest
+test_choices_validation_documents_invalid	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_documents_invalid(self):$/;"	m	class:FieldTest
+test_choices_validation_documents_invalid	tests/fields/fields.py	/^    def test_choices_validation_documents_invalid(self):$/;"	m	class:FieldTest
+test_choices_validation_reject_unknown_value	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_reject_unknown_value(self):$/;"	m	class:FieldTest
+test_choices_validation_reject_unknown_value	tests/fields/fields.py	/^    def test_choices_validation_reject_unknown_value(self):$/;"	m	class:FieldTest
+test_circular_reference	mongoengine/tests/test_dereference.py	/^    def test_circular_reference(self):$/;"	m	class:FieldTest
+test_circular_reference_deltas	mongoengine/tests/document/delta.py	/^    def test_circular_reference_deltas(self):$/;"	m	class:DeltaTest
+test_circular_reference_deltas_2	mongoengine/tests/document/delta.py	/^    def test_circular_reference_deltas_2(self):$/;"	m	class:DeltaTest
+test_circular_reference_on_self	mongoengine/tests/test_dereference.py	/^    def test_circular_reference_on_self(self):$/;"	m	class:FieldTest
+test_circular_tree_reference	mongoengine/tests/test_dereference.py	/^    def test_circular_tree_reference(self):$/;"	m	class:FieldTest
+test_clear_ordering	mongoengine/tests/queryset/queryset.py	/^    def test_clear_ordering(self):$/;"	m	class:QuerySetTest
+test_clone	mongoengine/tests/queryset/queryset.py	/^    def test_clone(self):$/;"	m	class:QuerySetTest
+test_cls_field	mongoengine/tests/fields/fields.py	/^    def test_cls_field(self):$/;"	m	class:FieldTest
+test_cls_field	tests/fields/fields.py	/^    def test_cls_field(self):$/;"	m	class:FieldTest
+test_cls_query_in_subclassed_docs	mongoengine/tests/queryset/queryset.py	/^    def test_cls_query_in_subclassed_docs(self):$/;"	m	class:QuerySetTest
+test_collection_name_and_primary	mongoengine/tests/document/class_methods.py	/^    def test_collection_name_and_primary(self):$/;"	m	class:ClassMethodsTest
+test_collection_naming	mongoengine/tests/document/class_methods.py	/^    def test_collection_naming(self):$/;"	m	class:ClassMethodsTest
+test_comment	mongoengine/tests/queryset/queryset.py	/^    def test_comment(self):$/;"	m	class:QuerySetTest
+test_compare_indexes	mongoengine/tests/document/class_methods.py	/^    def test_compare_indexes(self):$/;"	m	class:ClassMethodsTest
+test_compare_indexes_inheritance	mongoengine/tests/document/class_methods.py	/^    def test_compare_indexes_inheritance(self):$/;"	m	class:ClassMethodsTest
+test_compare_indexes_multiple_subclasses	mongoengine/tests/document/class_methods.py	/^    def test_compare_indexes_multiple_subclasses(self):$/;"	m	class:ClassMethodsTest
+test_complex_data_lookups	mongoengine/tests/document/dynamic.py	/^    def test_complex_data_lookups(self):$/;"	m	class:DynamicTest
+test_complex_dynamic_document_queries	mongoengine/tests/document/dynamic.py	/^    def test_complex_dynamic_document_queries(self):$/;"	m	class:DynamicTest
+test_complex_embedded_document_validation	mongoengine/tests/document/dynamic.py	/^    def test_complex_embedded_document_validation(self):$/;"	m	class:DynamicTest
+test_complex_embedded_documents	mongoengine/tests/document/dynamic.py	/^    def test_complex_embedded_documents(self):$/;"	m	class:DynamicTest
+test_complex_field_filefield	mongoengine/tests/fields/file_tests.py	/^    def test_complex_field_filefield(self):$/;"	m	class:FileTest
+test_complex_field_required	mongoengine/tests/fields/fields.py	/^    def test_complex_field_required(self):$/;"	m	class:FieldTest
+test_complex_field_required	tests/fields/fields.py	/^    def test_complex_field_required(self):$/;"	m	class:FieldTest
+test_complex_field_same_value_not_changed	mongoengine/tests/fields/fields.py	/^    def test_complex_field_same_value_not_changed(self):$/;"	m	class:FieldTest
+test_complex_field_same_value_not_changed	tests/fields/fields.py	/^    def test_complex_field_same_value_not_changed(self):$/;"	m	class:FieldTest
+test_complex_mapfield	mongoengine/tests/fields/fields.py	/^    def test_complex_mapfield(self):$/;"	m	class:FieldTest
+test_complex_mapfield	tests/fields/fields.py	/^    def test_complex_mapfield(self):$/;"	m	class:FieldTest
+test_complex_nesting_document_and_embedded_document	mongoengine/tests/document/instance.py	/^    def test_complex_nesting_document_and_embedded_document(self):$/;"	m	class:InstanceTest
+test_complexdatetime_storage	mongoengine/tests/fields/fields.py	/^    def test_complexdatetime_storage(self):$/;"	m	class:FieldTest
+test_complexdatetime_storage	tests/fields/fields.py	/^    def test_complexdatetime_storage(self):$/;"	m	class:FieldTest
+test_complexdatetime_usage	mongoengine/tests/fields/fields.py	/^    def test_complexdatetime_usage(self):$/;"	m	class:FieldTest
+test_complexdatetime_usage	tests/fields/fields.py	/^    def test_complexdatetime_usage(self):$/;"	m	class:FieldTest
+test_compound_index_underscore_cls_not_overwritten	mongoengine/tests/document/indexes.py	/^    def test_compound_index_underscore_cls_not_overwritten(self):$/;"	m	class:IndexesTest
+test_compound_key_dictfield	mongoengine/tests/document/indexes.py	/^    def test_compound_key_dictfield(self):$/;"	m	class:IndexesTest
+test_compound_key_embedded	mongoengine/tests/document/indexes.py	/^    def test_compound_key_embedded(self):$/;"	m	class:IndexesTest
+test_confirm_order_by_reference_wont_work	mongoengine/tests/queryset/queryset.py	/^    def test_confirm_order_by_reference_wont_work(self):$/;"	m	class:QuerySetTest
+test_connect	mongoengine/tests/test_connection.py	/^    def test_connect(self):$/;"	m	class:ConnectionTest
+test_connect_in_mocking	mongoengine/tests/test_connection.py	/^    def test_connect_in_mocking(self):$/;"	m	class:ConnectionTest
+test_connect_uri	mongoengine/tests/test_connection.py	/^    def test_connect_uri(self):$/;"	m	class:ConnectionTest
+test_connect_uri_default_db	mongoengine/tests/test_connection.py	/^    def test_connect_uri_default_db(self):$/;"	m	class:ConnectionTest
+test_connect_uri_with_authsource	mongoengine/tests/test_connection.py	/^    def test_connect_uri_with_authsource(self):$/;"	m	class:ConnectionTest
+test_connect_uri_without_db	mongoengine/tests/test_connection.py	/^    def test_connect_uri_without_db(self):$/;"	m	class:ConnectionTest
+test_connect_with_host_list	mongoengine/tests/test_connection.py	/^    def test_connect_with_host_list(self):$/;"	m	class:ConnectionTest
+test_connect_with_replicaset_via_kwargs	mongoengine/tests/test_connection.py	/^    def test_connect_with_replicaset_via_kwargs(self):$/;"	m	class:ConnectionTest
+test_connect_with_replicaset_via_uri	mongoengine/tests/test_connection.py	/^    def test_connect_with_replicaset_via_uri(self):$/;"	m	class:ConnectionTest
+test_connection_kwargs	mongoengine/tests/test_connection.py	/^    def test_connection_kwargs(self):$/;"	m	class:ConnectionTest
+test_connection_pool_via_kwarg	mongoengine/tests/test_connection.py	/^    def test_connection_pool_via_kwarg(self):$/;"	m	class:ConnectionTest
+test_connection_pool_via_uri	mongoengine/tests/test_connection.py	/^    def test_connection_pool_via_uri(self):$/;"	m	class:ConnectionTest
+test_copyable	mongoengine/tests/fields/file_tests.py	/^    def test_copyable(self):$/;"	m	class:FileTest
+test_count	mongoengine/tests/fields/fields.py	/^    def test_count(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_count	tests/fields/fields.py	/^    def test_count(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_count_and_none	mongoengine/tests/queryset/queryset.py	/^    def test_count_and_none(self):$/;"	m	class:QuerySetTest
+test_count_limit_and_skip	mongoengine/tests/queryset/queryset.py	/^    def test_count_limit_and_skip(self):$/;"	m	class:QuerySetTest
+test_count_list_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_count_list_embedded(self):$/;"	m	class:QuerySetTest
+test_covered_index	mongoengine/tests/document/indexes.py	/^    def test_covered_index(self):$/;"	m	class:IndexesTest
+test_create	mongoengine/tests/fields/fields.py	/^    def test_create(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_create	tests/fields/fields.py	/^    def test_create(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_create_geohaystack_index	mongoengine/tests/document/indexes.py	/^    def test_create_geohaystack_index(self):$/;"	m	class:IndexesTest
+test_creation	mongoengine/tests/document/instance.py	/^    def test_creation(self):$/;"	m	class:InstanceTest
+test_cursor_args	mongoengine/tests/queryset/queryset.py	/^    def test_cursor_args(self):$/;"	m	class:QuerySetTest
+test_cursor_in_an_if_stmt	mongoengine/tests/queryset/queryset.py	/^    def test_cursor_in_an_if_stmt(self):$/;"	m	class:QuerySetTest
+test_custom_collection_name_operations	mongoengine/tests/document/class_methods.py	/^    def test_custom_collection_name_operations(self):$/;"	m	class:ClassMethodsTest
+test_custom_data	mongoengine/tests/fields/fields.py	/^    def test_custom_data(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_custom_data	tests/fields/fields.py	/^    def test_custom_data(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_custom_id_field	mongoengine/tests/document/instance.py	/^    def test_custom_id_field(self):$/;"	m	class:InstanceTest
+test_custom_manager	mongoengine/tests/queryset/queryset.py	/^    def test_custom_manager(self):$/;"	m	class:QuerySetTest
+test_custom_manager_overriding_objects_works	mongoengine/tests/queryset/queryset.py	/^    def test_custom_manager_overriding_objects_works(self):$/;"	m	class:QuerySetTest
+test_custom_querysets	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets(self):$/;"	m	class:QuerySetTest
+test_custom_querysets_inherited	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets_inherited(self):$/;"	m	class:QuerySetTest
+test_custom_querysets_inherited_direct	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets_inherited_direct(self):$/;"	m	class:QuerySetTest
+test_custom_querysets_managers_directly	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets_managers_directly(self):$/;"	m	class:QuerySetTest
+test_custom_querysets_set_manager_directly	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets_set_manager_directly(self):$/;"	m	class:QuerySetTest
+test_data_contains_id_field	mongoengine/tests/document/instance.py	/^    def test_data_contains_id_field(self):$/;"	m	class:InstanceTest
+test_datetime	mongoengine/tests/fields/fields.py	/^    def test_datetime(self):$/;"	m	class:FieldTest
+test_datetime	mongoengine/tests/test_connection.py	/^    def test_datetime(self):$/;"	m	class:ConnectionTest
+test_datetime	tests/fields/fields.py	/^    def test_datetime(self):$/;"	m	class:FieldTest
+test_datetime_from_empty_string	mongoengine/tests/fields/fields.py	/^    def test_datetime_from_empty_string(self):$/;"	m	class:FieldTest
+test_datetime_from_empty_string	tests/fields/fields.py	/^    def test_datetime_from_empty_string(self):$/;"	m	class:FieldTest
+test_datetime_from_whitespace_string	mongoengine/tests/fields/fields.py	/^    def test_datetime_from_whitespace_string(self):$/;"	m	class:FieldTest
+test_datetime_from_whitespace_string	tests/fields/fields.py	/^    def test_datetime_from_whitespace_string(self):$/;"	m	class:FieldTest
+test_datetime_tz_aware_mark_as_changed	mongoengine/tests/fields/fields.py	/^    def test_datetime_tz_aware_mark_as_changed(self):$/;"	m	class:FieldTest
+test_datetime_tz_aware_mark_as_changed	tests/fields/fields.py	/^    def test_datetime_tz_aware_mark_as_changed(self):$/;"	m	class:FieldTest
+test_datetime_usage	mongoengine/tests/fields/fields.py	/^    def test_datetime_usage(self):$/;"	m	class:FieldTest
+test_datetime_usage	tests/fields/fields.py	/^    def test_datetime_usage(self):$/;"	m	class:FieldTest
+test_datetime_validation	mongoengine/tests/fields/fields.py	/^    def test_datetime_validation(self):$/;"	m	class:FieldTest
+test_datetime_validation	tests/fields/fields.py	/^    def test_datetime_validation(self):$/;"	m	class:FieldTest
+test_db_alias_overrides	mongoengine/tests/document/instance.py	/^    def test_db_alias_overrides(self):$/;"	m	class:InstanceTest
+test_db_alias_propagates	mongoengine/tests/document/instance.py	/^    def test_db_alias_propagates(self):$/;"	m	class:InstanceTest
+test_db_alias_tests	mongoengine/tests/document/instance.py	/^    def test_db_alias_tests(self):$/;"	m	class:InstanceTest
+test_db_embedded_doc_field_load	mongoengine/tests/document/instance.py	/^    def test_db_embedded_doc_field_load(self):$/;"	m	class:InstanceTest
+test_db_field_load	mongoengine/tests/document/instance.py	/^    def test_db_field_load(self):$/;"	m	class:InstanceTest
+test_db_field_validation	mongoengine/tests/fields/fields.py	/^    def test_db_field_validation(self):$/;"	m	class:FieldTest
+test_db_field_validation	tests/fields/fields.py	/^    def test_db_field_validation(self):$/;"	m	class:FieldTest
+test_db_ref_usage	mongoengine/tests/document/instance.py	/^    def test_db_ref_usage(self):$/;"	m	class:InstanceTest
+test_dbref_equality	mongoengine/tests/document/instance.py	/^    def test_dbref_equality(self):$/;"	m	class:InstanceTest
+test_dbref_reference_fields	mongoengine/tests/fields/fields.py	/^    def test_dbref_reference_fields(self):$/;"	m	class:FieldTest
+test_dbref_reference_fields	tests/fields/fields.py	/^    def test_dbref_reference_fields(self):$/;"	m	class:FieldTest
+test_dbref_to_mongo	mongoengine/tests/fields/fields.py	/^    def test_dbref_to_mongo(self):$/;"	m	class:FieldTest
+test_dbref_to_mongo	tests/fields/fields.py	/^    def test_dbref_to_mongo(self):$/;"	m	class:FieldTest
+test_decimal_comparison	mongoengine/tests/fields/fields.py	/^    def test_decimal_comparison(self):$/;"	m	class:FieldTest
+test_decimal_comparison	tests/fields/fields.py	/^    def test_decimal_comparison(self):$/;"	m	class:FieldTest
+test_decimal_storage	mongoengine/tests/fields/fields.py	/^    def test_decimal_storage(self):$/;"	m	class:FieldTest
+test_decimal_storage	tests/fields/fields.py	/^    def test_decimal_storage(self):$/;"	m	class:FieldTest
+test_decimal_validation	mongoengine/tests/fields/fields.py	/^    def test_decimal_validation(self):$/;"	m	class:FieldTest
+test_decimal_validation	tests/fields/fields.py	/^    def test_decimal_validation(self):$/;"	m	class:FieldTest
+test_default_values	mongoengine/tests/document/instance.py	/^    def test_default_values(self):$/;"	m	class:InstanceTest
+test_default_values_nothing_set	mongoengine/tests/fields/fields.py	/^    def test_default_values_nothing_set(self):$/;"	m	class:FieldTest
+test_default_values_nothing_set	tests/fields/fields.py	/^    def test_default_values_nothing_set(self):$/;"	m	class:FieldTest
+test_default_values_set_to_None	mongoengine/tests/fields/fields.py	/^    def test_default_values_set_to_None(self):$/;"	m	class:FieldTest
+test_default_values_set_to_None	tests/fields/fields.py	/^    def test_default_values_set_to_None(self):$/;"	m	class:FieldTest
+test_default_values_when_deleting_value	mongoengine/tests/fields/fields.py	/^    def test_default_values_when_deleting_value(self):$/;"	m	class:FieldTest
+test_default_values_when_deleting_value	tests/fields/fields.py	/^    def test_default_values_when_deleting_value(self):$/;"	m	class:FieldTest
+test_default_values_when_setting_to_None	mongoengine/tests/fields/fields.py	/^    def test_default_values_when_setting_to_None(self):$/;"	m	class:FieldTest
+test_default_values_when_setting_to_None	tests/fields/fields.py	/^    def test_default_values_when_setting_to_None(self):$/;"	m	class:FieldTest
+test_definition	mongoengine/tests/document/class_methods.py	/^    def test_definition(self):$/;"	m	class:ClassMethodsTest
+test_del_slice_marks_field_as_changed	mongoengine/tests/fields/fields.py	/^    def test_del_slice_marks_field_as_changed(self):$/;"	m	class:FieldTest
+test_del_slice_marks_field_as_changed	tests/fields/fields.py	/^    def test_del_slice_marks_field_as_changed(self):$/;"	m	class:FieldTest
+test_delete	mongoengine/tests/document/instance.py	/^    def test_delete(self):$/;"	m	class:InstanceTest
+test_delete	mongoengine/tests/fields/fields.py	/^    def test_delete(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_delete	mongoengine/tests/queryset/queryset.py	/^    def test_delete(self):$/;"	m	class:QuerySetTest
+test_delete	tests/fields/fields.py	/^    def test_delete(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_delete_count	mongoengine/tests/queryset/queryset.py	/^    def test_delete_count(self):$/;"	m	class:QuerySetTest
+test_delete_dynamic_field	mongoengine/tests/document/dynamic.py	/^    def test_delete_dynamic_field(self):$/;"	m	class:DynamicTest
+test_delete_with_limit_handles_delete_rules	mongoengine/tests/queryset/queryset.py	/^    def test_delete_with_limit_handles_delete_rules(self):$/;"	m	class:QuerySetTest
+test_delete_with_limits	mongoengine/tests/queryset/queryset.py	/^    def test_delete_with_limits(self):$/;"	m	class:QuerySetTest
+test_delta	mongoengine/tests/document/delta.py	/^    def test_delta(self):$/;"	m	class:DeltaTest
+test_delta_db_field	mongoengine/tests/document/delta.py	/^    def test_delta_db_field(self):$/;"	m	class:DeltaTest
+test_delta_for_dynamic_documents	mongoengine/tests/document/delta.py	/^    def test_delta_for_dynamic_documents(self):$/;"	m	class:DeltaTest
+test_delta_for_nested_map_fields	mongoengine/tests/document/delta.py	/^    def test_delta_for_nested_map_fields(self):$/;"	m	class:DeltaTest
+test_delta_recursive	mongoengine/tests/document/delta.py	/^    def test_delta_recursive(self):$/;"	m	class:DeltaTest
+test_delta_recursive_db_field	mongoengine/tests/document/delta.py	/^    def test_delta_recursive_db_field(self):$/;"	m	class:DeltaTest
+test_delta_with_dbref_false	mongoengine/tests/document/delta.py	/^    def test_delta_with_dbref_false(self):$/;"	m	class:DeltaTest
+test_delta_with_dbref_true	mongoengine/tests/document/delta.py	/^    def test_delta_with_dbref_true(self):$/;"	m	class:DeltaTest
+test_dereferencing_embedded_listfield_referencefield	mongoengine/tests/test_dereference.py	/^    def test_dereferencing_embedded_listfield_referencefield(self):$/;"	m	class:FieldTest
+test_dict_field	mongoengine/tests/fields/fields.py	/^    def test_dict_field(self):$/;"	m	class:FieldTest
+test_dict_field	mongoengine/tests/test_dereference.py	/^    def test_dict_field(self):$/;"	m	class:FieldTest
+test_dict_field	tests/fields/fields.py	/^    def test_dict_field(self):$/;"	m	class:FieldTest
+test_dict_field_no_field_inheritance	mongoengine/tests/test_dereference.py	/^    def test_dict_field_no_field_inheritance(self):$/;"	m	class:FieldTest
+test_dict_in_dbref_instance	mongoengine/tests/test_dereference.py	/^    def test_dict_in_dbref_instance(self):$/;"	m	class:FieldTest
+test_dict_with_custom_baseclass	mongoengine/tests/queryset/queryset.py	/^    def test_dict_with_custom_baseclass(self):$/;"	m	class:QuerySetTest
+test_dictfield_complex	mongoengine/tests/fields/fields.py	/^    def test_dictfield_complex(self):$/;"	m	class:FieldTest
+test_dictfield_complex	tests/fields/fields.py	/^    def test_dictfield_complex(self):$/;"	m	class:FieldTest
+test_dictfield_dump_document	mongoengine/tests/fields/fields.py	/^    def test_dictfield_dump_document(self):$/;"	m	class:FieldTest
+test_dictfield_dump_document	tests/fields/fields.py	/^    def test_dictfield_dump_document(self):$/;"	m	class:FieldTest
+test_dictfield_key_looks_like_a_digit	mongoengine/tests/queryset/queryset.py	/^    def test_dictfield_key_looks_like_a_digit(self):$/;"	m	class:QuerySetTest
+test_dictfield_strict	mongoengine/tests/fields/fields.py	/^    def test_dictfield_strict(self):$/;"	m	class:FieldTest
+test_dictfield_strict	tests/fields/fields.py	/^    def test_dictfield_strict(self):$/;"	m	class:FieldTest
+test_dictfield_update	mongoengine/tests/queryset/queryset.py	/^    def test_dictfield_update(self):$/;"	m	class:QuerySetTest
+test_dictionary_access	mongoengine/tests/document/instance.py	/^    def test_dictionary_access(self):$/;"	m	class:InstanceTest
+test_dictionary_indexes	mongoengine/tests/document/indexes.py	/^    def test_dictionary_indexes(self):$/;"	m	class:IndexesTest
+test_disable_index_creation	mongoengine/tests/document/indexes.py	/^    def test_disable_index_creation(self):$/;"	m	class:IndexesTest
+test_disconnect	mongoengine/tests/test_connection.py	/^    def test_disconnect(self):$/;"	m	class:ConnectionTest
+test_distinct	mongoengine/tests/queryset/queryset.py	/^    def test_distinct(self):$/;"	m	class:QuerySetTest
+test_distinct_ListField_EmbeddedDocumentField	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_ListField_EmbeddedDocumentField(self):$/;"	m	class:QuerySetTest
+test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField(self):$/;"	m	class:QuerySetTest
+test_distinct_ListField_ReferenceField	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_ListField_ReferenceField(self):$/;"	m	class:QuerySetTest
+test_distinct_handles_db_field	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_handles_db_field(self):$/;"	m	class:QuerySetTest
+test_distinct_handles_references	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_handles_references(self):$/;"	m	class:QuerySetTest
+test_distinct_handles_references_to_alias	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_handles_references_to_alias(self):$/;"	m	class:QuerySetTest
+test_do_not_save_unchanged_references	mongoengine/tests/document/instance.py	/^    def test_do_not_save_unchanged_references(self):$/;"	m	class:InstanceTest
+test_document_clean	mongoengine/tests/document/instance.py	/^    def test_document_clean(self):$/;"	m	class:InstanceTest
+test_document_collection_syntax_warning	mongoengine/tests/all_warnings/__init__.py	/^    def test_document_collection_syntax_warning(self):$/;"	m	class:AllWarnings
+test_document_embedded_clean	mongoengine/tests/document/instance.py	/^    def test_document_embedded_clean(self):$/;"	m	class:InstanceTest
+test_document_hash	mongoengine/tests/document/instance.py	/^    def test_document_hash(self):$/;"	m	class:InstanceTest
+test_document_inheritance	mongoengine/tests/document/inheritance.py	/^    def test_document_inheritance(self):$/;"	m	class:InheritanceTest
+test_document_not_registered	mongoengine/tests/document/instance.py	/^    def test_document_not_registered(self):$/;"	m	class:InstanceTest
+test_document_registry_regressions	mongoengine/tests/document/instance.py	/^    def test_document_registry_regressions(self):$/;"	m	class:InstanceTest
+test_document_reload_no_inheritance	mongoengine/tests/test_dereference.py	/^    def test_document_reload_no_inheritance(self):$/;"	m	class:FieldTest
+test_document_reload_reference_integrity	mongoengine/tests/test_dereference.py	/^    def test_document_reload_reference_integrity(self):$/;"	m	class:FieldTest
+test_document_update	mongoengine/tests/document/instance.py	/^    def test_document_update(self):$/;"	m	class:InstanceTest
+test_double_embedded_db_field	mongoengine/tests/fields/fields.py	/^    def test_double_embedded_db_field(self):$/;"	m	class:FieldTest
+test_double_embedded_db_field	tests/fields/fields.py	/^    def test_double_embedded_db_field(self):$/;"	m	class:FieldTest
+test_double_embedded_db_field_from_son	mongoengine/tests/fields/fields.py	/^    def test_double_embedded_db_field_from_son(self):$/;"	m	class:FieldTest
+test_double_embedded_db_field_from_son	tests/fields/fields.py	/^    def test_double_embedded_db_field_from_son(self):$/;"	m	class:FieldTest
+test_drop_abstract_document	mongoengine/tests/fields/fields.py	/^    def test_drop_abstract_document(self):$/;"	m	class:FieldTest
+test_drop_abstract_document	tests/fields/fields.py	/^    def test_drop_abstract_document(self):$/;"	m	class:FieldTest
+test_drop_collection	mongoengine/tests/document/class_methods.py	/^    def test_drop_collection(self):$/;"	m	class:ClassMethodsTest
+test_duplicate_db_fields_raise_invalid_document_error	mongoengine/tests/document/instance.py	/^    def test_duplicate_db_fields_raise_invalid_document_error(self):$/;"	m	class:InstanceTest
+test_dynamic_and_embedded	mongoengine/tests/document/dynamic.py	/^    def test_dynamic_and_embedded(self):$/;"	m	class:DynamicTest
+test_dynamic_and_embedded_dict_access	mongoengine/tests/document/dynamic.py	/^    def test_dynamic_and_embedded_dict_access(self):$/;"	m	class:DynamicTest
+test_dynamic_declarations	mongoengine/tests/document/inheritance.py	/^    def test_dynamic_declarations(self):$/;"	m	class:InheritanceTest
+test_dynamic_delta	mongoengine/tests/document/delta.py	/^    def test_dynamic_delta(self):$/;"	m	class:DeltaTest
+test_dynamic_document_pickle	mongoengine/tests/document/instance.py	/^    def test_dynamic_document_pickle(self):$/;"	m	class:InstanceTest
+test_dynamic_document_queries	mongoengine/tests/document/dynamic.py	/^    def test_dynamic_document_queries(self):$/;"	m	class:DynamicTest
+test_dynamic_embedded_works_with_only	mongoengine/tests/document/dynamic.py	/^    def test_dynamic_embedded_works_with_only(self):$/;"	m	class:DynamicTest
+test_dynamic_fields_class	mongoengine/tests/fields/fields.py	/^    def test_dynamic_fields_class(self):$/;"	m	class:FieldTest
+test_dynamic_fields_class	tests/fields/fields.py	/^    def test_dynamic_fields_class(self):$/;"	m	class:FieldTest
+test_dynamic_fields_embedded_class	mongoengine/tests/fields/fields.py	/^    def test_dynamic_fields_embedded_class(self):$/;"	m	class:FieldTest
+test_dynamic_fields_embedded_class	tests/fields/fields.py	/^    def test_dynamic_fields_embedded_class(self):$/;"	m	class:FieldTest
+test_dynamicfield_dump_document	mongoengine/tests/fields/fields.py	/^    def test_dynamicfield_dump_document(self):$/;"	m	class:FieldTest
+test_dynamicfield_dump_document	tests/fields/fields.py	/^    def test_dynamicfield_dump_document(self):$/;"	m	class:FieldTest
+test_editting_embedded_objects	mongoengine/tests/queryset/queryset.py	/^    def test_editting_embedded_objects(self):$/;"	m	class:QuerySetTest
+test_elem_match	mongoengine/tests/queryset/queryset.py	/^    def test_elem_match(self):$/;"	m	class:QuerySetTest
+test_email_field	mongoengine/tests/fields/fields.py	/^    def test_email_field(self):$/;"	m	class:FieldTest
+test_email_field	tests/fields/fields.py	/^    def test_email_field(self):$/;"	m	class:FieldTest
+test_email_field_domain_whitelist	mongoengine/tests/fields/fields.py	/^    def test_email_field_domain_whitelist(self):$/;"	m	class:FieldTest
+test_email_field_domain_whitelist	tests/fields/fields.py	/^    def test_email_field_domain_whitelist(self):$/;"	m	class:FieldTest
+test_email_field_honors_regex	mongoengine/tests/fields/fields.py	/^    def test_email_field_honors_regex(self):$/;"	m	class:FieldTest
+test_email_field_honors_regex	tests/fields/fields.py	/^    def test_email_field_honors_regex(self):$/;"	m	class:FieldTest
+test_email_field_ip_domain	mongoengine/tests/fields/fields.py	/^    def test_email_field_ip_domain(self):$/;"	m	class:FieldTest
+test_email_field_ip_domain	tests/fields/fields.py	/^    def test_email_field_ip_domain(self):$/;"	m	class:FieldTest
+test_email_field_unicode_user	mongoengine/tests/fields/fields.py	/^    def test_email_field_unicode_user(self):$/;"	m	class:FieldTest
+test_email_field_unicode_user	tests/fields/fields.py	/^    def test_email_field_unicode_user(self):$/;"	m	class:FieldTest
+test_embedded_array_average	mongoengine/tests/queryset/queryset.py	/^    def test_embedded_array_average(self):$/;"	m	class:QuerySetTest
+test_embedded_array_sum	mongoengine/tests/queryset/queryset.py	/^    def test_embedded_array_sum(self):$/;"	m	class:QuerySetTest
+test_embedded_average	mongoengine/tests/queryset/queryset.py	/^    def test_embedded_average(self):$/;"	m	class:QuerySetTest
+test_embedded_db_field	mongoengine/tests/fields/fields.py	/^    def test_embedded_db_field(self):$/;"	m	class:FieldTest
+test_embedded_db_field	tests/fields/fields.py	/^    def test_embedded_db_field(self):$/;"	m	class:FieldTest
+test_embedded_db_field_validate	mongoengine/tests/document/validation.py	/^    def test_embedded_db_field_validate(self):$/;"	m	class:ValidatorErrorTest
+test_embedded_document	mongoengine/tests/document/instance.py	/^    def test_embedded_document(self):$/;"	m	class:InstanceTest
+test_embedded_document_complex_instance	mongoengine/tests/document/instance.py	/^    def test_embedded_document_complex_instance(self):$/;"	m	class:InstanceTest
+test_embedded_document_complex_instance_no_use_db_field	mongoengine/tests/document/instance.py	/^    def test_embedded_document_complex_instance_no_use_db_field(self):$/;"	m	class:InstanceTest
+test_embedded_document_equality	mongoengine/tests/document/instance.py	/^    def test_embedded_document_equality(self):$/;"	m	class:InstanceTest
+test_embedded_document_index	mongoengine/tests/document/indexes.py	/^    def test_embedded_document_index(self):$/;"	m	class:IndexesTest
+test_embedded_document_index_meta	mongoengine/tests/document/indexes.py	/^    def test_embedded_document_index_meta(self):$/;"	m	class:IndexesTest
+test_embedded_document_inheritance	mongoengine/tests/fields/fields.py	/^    def test_embedded_document_inheritance(self):$/;"	m	class:FieldTest
+test_embedded_document_inheritance	tests/fields/fields.py	/^    def test_embedded_document_inheritance(self):$/;"	m	class:FieldTest
+test_embedded_document_inheritance_with_list	mongoengine/tests/fields/fields.py	/^    def test_embedded_document_inheritance_with_list(self):$/;"	m	class:FieldTest
+test_embedded_document_inheritance_with_list	tests/fields/fields.py	/^    def test_embedded_document_inheritance_with_list(self):$/;"	m	class:FieldTest
+test_embedded_document_instance	mongoengine/tests/document/instance.py	/^    def test_embedded_document_instance(self):$/;"	m	class:InstanceTest
+test_embedded_document_to_mongo	mongoengine/tests/document/instance.py	/^    def test_embedded_document_to_mongo(self):$/;"	m	class:InstanceTest
+test_embedded_document_to_mongo_id	mongoengine/tests/document/instance.py	/^    def test_embedded_document_to_mongo_id(self):$/;"	m	class:InstanceTest
+test_embedded_document_validation	mongoengine/tests/document/validation.py	/^    def test_embedded_document_validation(self):$/;"	m	class:ValidatorErrorTest
+test_embedded_document_validation	mongoengine/tests/fields/fields.py	/^    def test_embedded_document_validation(self):$/;"	m	class:FieldTest
+test_embedded_document_validation	tests/fields/fields.py	/^    def test_embedded_document_validation(self):$/;"	m	class:FieldTest
+test_embedded_dynamic_document	mongoengine/tests/document/dynamic.py	/^    def test_embedded_dynamic_document(self):$/;"	m	class:DynamicTest
+test_embedded_mapfield_db_field	mongoengine/tests/fields/fields.py	/^    def test_embedded_mapfield_db_field(self):$/;"	m	class:FieldTest
+test_embedded_mapfield_db_field	tests/fields/fields.py	/^    def test_embedded_mapfield_db_field(self):$/;"	m	class:FieldTest
+test_embedded_sequence_field	mongoengine/tests/fields/fields.py	/^    def test_embedded_sequence_field(self):$/;"	m	class:FieldTest
+test_embedded_sequence_field	tests/fields/fields.py	/^    def test_embedded_sequence_field(self):$/;"	m	class:FieldTest
+test_embedded_sum	mongoengine/tests/queryset/queryset.py	/^    def test_embedded_sum(self):$/;"	m	class:QuerySetTest
+test_embedded_update	mongoengine/tests/document/instance.py	/^    def test_embedded_update(self):$/;"	m	class:InstanceTest
+test_embedded_update_after_save	mongoengine/tests/document/instance.py	/^    def test_embedded_update_after_save(self):$/;"	m	class:InstanceTest
+test_embedded_update_db_field	mongoengine/tests/document/instance.py	/^    def test_embedded_update_db_field(self):$/;"	m	class:InstanceTest
+test_embedded_weakref	mongoengine/tests/document/validation.py	/^    def test_embedded_weakref(self):$/;"	m	class:ValidatorErrorTest
+test_empty	mongoengine/tests/queryset/field_list.py	/^    def test_empty(self):$/;"	m	class:QueryFieldListTest
+test_empty_list_embedded_documents_with_unique_field	mongoengine/tests/fields/fields.py	/^    def test_empty_list_embedded_documents_with_unique_field(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_empty_list_embedded_documents_with_unique_field	tests/fields/fields.py	/^    def test_empty_list_embedded_documents_with_unique_field(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_empty_q	mongoengine/tests/queryset/visitor.py	/^    def test_empty_q(self):$/;"	m	class:QTest
+test_ensure_index	mongoengine/tests/queryset/queryset.py	/^    def test_ensure_index(self):$/;"	m	class:QuerySetTest
+test_ensure_unique_default_instances	mongoengine/tests/fields/fields.py	/^    def test_ensure_unique_default_instances(self):$/;"	m	class:FieldTest
+test_ensure_unique_default_instances	tests/fields/fields.py	/^    def test_ensure_unique_default_instances(self):$/;"	m	class:FieldTest
+test_eq	mongoengine/tests/test_datastructures.py	/^    def test_eq(self):$/;"	m	class:TestStrictDict
+test_exclude	mongoengine/tests/queryset/field_list.py	/^    def test_exclude(self):$/;"	m	class:OnlyExcludeAllTest
+test_exclude_exclude	mongoengine/tests/queryset/field_list.py	/^    def test_exclude_exclude(self):$/;"	m	class:QueryFieldListTest
+test_exclude_from_subclasses_docs	mongoengine/tests/queryset/field_list.py	/^    def test_exclude_from_subclasses_docs(self):$/;"	m	class:OnlyExcludeAllTest
+test_exclude_include	mongoengine/tests/queryset/field_list.py	/^    def test_exclude_include(self):$/;"	m	class:QueryFieldListTest
+test_exclude_only_combining	mongoengine/tests/queryset/field_list.py	/^    def test_exclude_only_combining(self):$/;"	m	class:OnlyExcludeAllTest
+test_exec_js_field_sub	mongoengine/tests/queryset/queryset.py	/^    def test_exec_js_field_sub(self):$/;"	m	class:QuerySetTest
+test_exec_js_query	mongoengine/tests/queryset/queryset.py	/^    def test_exec_js_query(self):$/;"	m	class:QuerySetTest
+test_explicit_geo2d_index	mongoengine/tests/document/indexes.py	/^    def test_explicit_geo2d_index(self):$/;"	m	class:IndexesTest
+test_explicit_geo2d_index_embedded	mongoengine/tests/document/indexes.py	/^    def test_explicit_geo2d_index_embedded(self):$/;"	m	class:IndexesTest
+test_explicit_geohaystack_index	mongoengine/tests/document/indexes.py	/^    def test_explicit_geohaystack_index(self):$/;"	m	class:IndexesTest
+test_explicit_geosphere_index	mongoengine/tests/document/indexes.py	/^    def test_explicit_geosphere_index(self):$/;"	m	class:IndexesTest
+test_external_subclasses	mongoengine/tests/document/inheritance.py	/^    def test_external_subclasses(self):$/;"	m	class:InheritanceTest
+test_external_superclasses	mongoengine/tests/document/inheritance.py	/^    def test_external_superclasses(self):$/;"	m	class:InheritanceTest
+test_falsey_pk	mongoengine/tests/document/instance.py	/^    def test_falsey_pk(self):$/;"	m	class:InstanceTest
+test_field	mongoengine/tests/queryset/queryset.py	/^            test_field = StringField()$/;"	v	class:QuerySetTest.test_cursor_in_an_if_stmt.Test
+test_fields_rewrite	mongoengine/tests/document/validation.py	/^    def test_fields_rewrite(self):$/;"	m	class:ValidatorErrorTest
+test_file_boolean	mongoengine/tests/fields/file_tests.py	/^    def test_file_boolean(self):$/;"	m	class:FileTest
+test_file_cmp	mongoengine/tests/fields/file_tests.py	/^    def test_file_cmp(self):$/;"	m	class:FileTest
+test_file_disk_space	mongoengine/tests/fields/file_tests.py	/^    def test_file_disk_space(self):$/;"	m	class:FileTest
+test_file_field_no_default	mongoengine/tests/fields/file_tests.py	/^    def test_file_field_no_default(self):$/;"	m	class:FileTest
+test_file_field_optional	mongoengine/tests/fields/file_tests.py	/^    def test_file_field_optional(self):$/;"	m	class:FileTest
+test_file_fields	mongoengine/tests/fields/file_tests.py	/^    def test_file_fields(self):$/;"	m	class:FileTest
+test_file_fields_set	mongoengine/tests/fields/file_tests.py	/^    def test_file_fields_set(self):$/;"	m	class:FileTest
+test_file_fields_stream	mongoengine/tests/fields/file_tests.py	/^    def test_file_fields_stream(self):$/;"	m	class:FileTest
+test_file_fields_stream_after_none	mongoengine/tests/fields/file_tests.py	/^    def test_file_fields_stream_after_none(self):$/;"	m	class:FileTest
+test_file_multidb	mongoengine/tests/fields/file_tests.py	/^    def test_file_multidb(self):$/;"	m	class:FileTest
+test_file_reassigning	mongoengine/tests/fields/file_tests.py	/^    def test_file_reassigning(self):$/;"	m	class:FileTest
+test_file_saving	mongoengine/tests/fields/file_tests.py	/^    def test_file_saving(self):$/;"	m	class:FileTest
+test_file_uniqueness	mongoengine/tests/fields/file_tests.py	/^    def test_file_uniqueness(self):$/;"	m	class:FileTest
+test_filter_chaining	mongoengine/tests/queryset/queryset.py	/^    def test_filter_chaining(self):$/;"	m	class:QuerySetTest
+test_filtered_count	mongoengine/tests/fields/fields.py	/^    def test_filtered_count(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_filtered_count	tests/fields/fields.py	/^    def test_filtered_count(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_filtered_create	mongoengine/tests/fields/fields.py	/^    def test_filtered_create(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_filtered_create	tests/fields/fields.py	/^    def test_filtered_create(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_filtered_delete	mongoengine/tests/fields/fields.py	/^    def test_filtered_delete(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_filtered_delete	tests/fields/fields.py	/^    def test_filtered_delete(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_find	mongoengine/tests/queryset/queryset.py	/^    def test_find(self):$/;"	m	class:QuerySetTest
+test_find_and_modify_with_remove_not_existing	mongoengine/tests/queryset/modify.py	/^    def test_find_and_modify_with_remove_not_existing(self):$/;"	m	class:FindAndModifyTest
+test_find_array_position	mongoengine/tests/queryset/queryset.py	/^    def test_find_array_position(self):$/;"	m	class:QuerySetTest
+test_find_dict_item	mongoengine/tests/queryset/queryset.py	/^    def test_find_dict_item(self):$/;"	m	class:QuerySetTest
+test_find_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_find_embedded(self):$/;"	m	class:QuerySetTest
+test_find_empty_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_find_empty_embedded(self):$/;"	m	class:QuerySetTest
+test_find_one	mongoengine/tests/queryset/queryset.py	/^    def test_find_one(self):$/;"	m	class:QuerySetTest
+test_find_only_one	mongoengine/tests/queryset/queryset.py	/^    def test_find_only_one(self):$/;"	m	class:QuerySetTest
+test_first	mongoengine/tests/fields/fields.py	/^    def test_first(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_first	tests/fields/fields.py	/^    def test_first(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_float_validation	mongoengine/tests/fields/fields.py	/^    def test_float_validation(self):$/;"	m	class:FieldTest
+test_float_validation	tests/fields/fields.py	/^    def test_float_validation(self):$/;"	m	class:FieldTest
+test_from_son	mongoengine/tests/document/instance.py	/^    def test_from_son(self):$/;"	m	class:InstanceTest
+test_generic_embedded_document	mongoengine/tests/fields/fields.py	/^    def test_generic_embedded_document(self):$/;"	m	class:FieldTest
+test_generic_embedded_document	tests/fields/fields.py	/^    def test_generic_embedded_document(self):$/;"	m	class:FieldTest
+test_generic_embedded_document_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_embedded_document_choices(self):$/;"	m	class:FieldTest
+test_generic_embedded_document_choices	tests/fields/fields.py	/^    def test_generic_embedded_document_choices(self):$/;"	m	class:FieldTest
+test_generic_lazy_reference_bad_set	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_bad_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_bad_set	tests/fields/fields.py	/^    def test_generic_lazy_reference_bad_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_choices(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_choices	tests/fields/fields.py	/^    def test_generic_lazy_reference_choices(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_embedded	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_embedded(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_embedded	tests/fields/fields.py	/^    def test_generic_lazy_reference_embedded(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_not_set	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_not_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_not_set	tests/fields/fields.py	/^    def test_generic_lazy_reference_not_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_query_conversion	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_query_conversion(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_query_conversion	tests/fields/fields.py	/^    def test_generic_lazy_reference_query_conversion(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_set	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_set	tests/fields/fields.py	/^    def test_generic_lazy_reference_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_simple	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_simple(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_lazy_reference_simple	tests/fields/fields.py	/^    def test_generic_lazy_reference_simple(self):$/;"	m	class:GenericLazyReferenceFieldTest
+test_generic_list_embedded_document_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_list_embedded_document_choices(self):$/;"	m	class:FieldTest
+test_generic_list_embedded_document_choices	tests/fields/fields.py	/^    def test_generic_list_embedded_document_choices(self):$/;"	m	class:FieldTest
+test_generic_reference	mongoengine/tests/fields/fields.py	/^    def test_generic_reference(self):$/;"	m	class:FieldTest
+test_generic_reference	mongoengine/tests/test_dereference.py	/^    def test_generic_reference(self):$/;"	m	class:FieldTest
+test_generic_reference	tests/fields/fields.py	/^    def test_generic_reference(self):$/;"	m	class:FieldTest
+test_generic_reference_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_choices(self):$/;"	m	class:FieldTest
+test_generic_reference_choices	tests/fields/fields.py	/^    def test_generic_reference_choices(self):$/;"	m	class:FieldTest
+test_generic_reference_choices_no_dereference	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_choices_no_dereference(self):$/;"	m	class:FieldTest
+test_generic_reference_choices_no_dereference	tests/fields/fields.py	/^    def test_generic_reference_choices_no_dereference(self):$/;"	m	class:FieldTest
+test_generic_reference_document_not_registered	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_document_not_registered(self):$/;"	m	class:FieldTest
+test_generic_reference_document_not_registered	tests/fields/fields.py	/^    def test_generic_reference_document_not_registered(self):$/;"	m	class:FieldTest
+test_generic_reference_field_with_only_and_as_pymongo	mongoengine/tests/queryset/queryset.py	/^    def test_generic_reference_field_with_only_and_as_pymongo(self):$/;"	m	class:QuerySetTest
+test_generic_reference_filter_by_dbref	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_filter_by_dbref(self):$/;"	m	class:FieldTest
+test_generic_reference_filter_by_dbref	tests/fields/fields.py	/^    def test_generic_reference_filter_by_dbref(self):$/;"	m	class:FieldTest
+test_generic_reference_filter_by_objectid	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_filter_by_objectid(self):$/;"	m	class:FieldTest
+test_generic_reference_filter_by_objectid	tests/fields/fields.py	/^    def test_generic_reference_filter_by_objectid(self):$/;"	m	class:FieldTest
+test_generic_reference_is_none	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_is_none(self):$/;"	m	class:FieldTest
+test_generic_reference_is_none	tests/fields/fields.py	/^    def test_generic_reference_is_none(self):$/;"	m	class:FieldTest
+test_generic_reference_list	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_list(self):$/;"	m	class:FieldTest
+test_generic_reference_list	tests/fields/fields.py	/^    def test_generic_reference_list(self):$/;"	m	class:FieldTest
+test_generic_reference_list_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_list_choices(self):$/;"	m	class:FieldTest
+test_generic_reference_list_choices	tests/fields/fields.py	/^    def test_generic_reference_list_choices(self):$/;"	m	class:FieldTest
+test_generic_reference_list_item_modification	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_list_item_modification(self):$/;"	m	class:FieldTest
+test_generic_reference_list_item_modification	tests/fields/fields.py	/^    def test_generic_reference_list_item_modification(self):$/;"	m	class:FieldTest
+test_generic_reference_map_field	mongoengine/tests/test_dereference.py	/^    def test_generic_reference_map_field(self):$/;"	m	class:FieldTest
+test_generic_reference_save_doesnt_cause_extra_queries	mongoengine/tests/test_dereference.py	/^    def test_generic_reference_save_doesnt_cause_extra_queries(self):$/;"	m	class:FieldTest
+test_generic_reference_string_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_string_choices(self):$/;"	m	class:FieldTest
+test_generic_reference_string_choices	tests/fields/fields.py	/^    def test_generic_reference_string_choices(self):$/;"	m	class:FieldTest
+test_geo_indexes_auto_index	mongoengine/tests/fields/geo.py	/^    def test_geo_indexes_auto_index(self):$/;"	m	class:GeoFieldTest
+test_geo_indexes_recursion	mongoengine/tests/fields/geo.py	/^    def test_geo_indexes_recursion(self):$/;"	m	class:GeoFieldTest
+test_geo_spatial_embedded	mongoengine/tests/queryset/geo.py	/^    def test_geo_spatial_embedded(self):$/;"	m	class:GeoQueriesTest
+test_geojson_LineStringField	mongoengine/tests/queryset/transform.py	/^    def test_geojson_LineStringField(self):$/;"	m	class:TransformTest
+test_geojson_PointField	mongoengine/tests/queryset/transform.py	/^    def test_geojson_PointField(self):$/;"	m	class:TransformTest
+test_geojson_PolygonField	mongoengine/tests/queryset/geo.py	/^    def test_geojson_PolygonField(self):$/;"	m	class:GeoQueriesTest
+test_geojson_PolygonField	mongoengine/tests/queryset/transform.py	/^    def test_geojson_PolygonField(self):$/;"	m	class:TransformTest
+test_geopoint_embedded_indexes	mongoengine/tests/fields/geo.py	/^    def test_geopoint_embedded_indexes(self):$/;"	m	class:GeoFieldTest
+test_geopoint_validation	mongoengine/tests/fields/geo.py	/^    def test_geopoint_validation(self):$/;"	m	class:GeoFieldTest
+test_get	mongoengine/tests/test_datastructures.py	/^    def test_get(self):$/;"	m	class:TestStrictDict
+test_get_changed_fields_query_count	mongoengine/tests/queryset/queryset.py	/^    def test_get_changed_fields_query_count(self):$/;"	m	class:QuerySetTest
+test_get_collection	mongoengine/tests/document/class_methods.py	/^    def test_get_collection(self):$/;"	m	class:ClassMethodsTest
+test_get_collection_name	mongoengine/tests/document/class_methods.py	/^    def test_get_collection_name(self):$/;"	m	class:ClassMethodsTest
+test_get_db	mongoengine/tests/document/class_methods.py	/^    def test_get_db(self):$/;"	m	class:ClassMethodsTest
+test_get_image_by_grid_id	mongoengine/tests/fields/file_tests.py	/^    def test_get_image_by_grid_id(self):$/;"	m	class:FileTest
+test_handle_old_style_references	mongoengine/tests/test_dereference.py	/^    def test_handle_old_style_references(self):$/;"	m	class:FieldTest
+test_hashed_indexes	mongoengine/tests/document/indexes.py	/^    def test_hashed_indexes(self):$/;"	m	class:IndexesTest
+test_hint	mongoengine/tests/document/indexes.py	/^    def test_hint(self):$/;"	m	class:IndexesTest
+test_image_field	mongoengine/tests/fields/file_tests.py	/^    def test_image_field(self):$/;"	m	class:FileTest
+test_image_field_reassigning	mongoengine/tests/fields/file_tests.py	/^    def test_image_field_reassigning(self):$/;"	m	class:FileTest
+test_image_field_resize	mongoengine/tests/fields/file_tests.py	/^    def test_image_field_resize(self):$/;"	m	class:FileTest
+test_image_field_resize_force	mongoengine/tests/fields/file_tests.py	/^    def test_image_field_resize_force(self):$/;"	m	class:FileTest
+test_image_field_thumbnail	mongoengine/tests/fields/file_tests.py	/^    def test_image_field_thumbnail(self):$/;"	m	class:FileTest
+test_in_operator_on_non_iterable	mongoengine/tests/queryset/queryset.py	/^    def test_in_operator_on_non_iterable(self):$/;"	m	class:QuerySetTest
+test_include_exclude	mongoengine/tests/queryset/field_list.py	/^    def test_include_exclude(self):$/;"	m	class:QueryFieldListTest
+test_include_include	mongoengine/tests/queryset/field_list.py	/^    def test_include_include(self):$/;"	m	class:QueryFieldListTest
+test_index_dont_send_cls_option	mongoengine/tests/document/indexes.py	/^    def test_index_dont_send_cls_option(self):$/;"	m	class:IndexesTest
+test_index_no_cls	mongoengine/tests/document/indexes.py	/^    def test_index_no_cls(self):$/;"	m	class:IndexesTest
+test_index_on_id	mongoengine/tests/document/indexes.py	/^    def test_index_on_id(self):$/;"	m	class:IndexesTest
+test_index_with_pk	mongoengine/tests/document/indexes.py	/^    def test_index_with_pk(self):$/;"	m	class:IndexesTest
+test_indexes_2dsphere	mongoengine/tests/fields/geo.py	/^    def test_indexes_2dsphere(self):$/;"	m	class:GeoFieldTest
+test_indexes_2dsphere_embedded	mongoengine/tests/fields/geo.py	/^    def test_indexes_2dsphere_embedded(self):$/;"	m	class:GeoFieldTest
+test_indexes_after_database_drop	mongoengine/tests/document/indexes.py	/^    def test_indexes_after_database_drop(self):$/;"	m	class:IndexesTest
+test_indexes_and_multiple_inheritance	mongoengine/tests/document/inheritance.py	/^    def test_indexes_and_multiple_inheritance(self):$/;"	m	class:InheritanceTest
+test_indexes_document	mongoengine/tests/document/indexes.py	/^    def test_indexes_document(self):$/;"	m	class:IndexesTest
+test_indexes_document_inheritance	mongoengine/tests/document/indexes.py	/^    def test_indexes_document_inheritance(self):$/;"	m	class:IndexesTest
+test_indexes_dynamic_document	mongoengine/tests/document/indexes.py	/^    def test_indexes_dynamic_document(self):$/;"	m	class:IndexesTest
+test_indexes_dynamic_document_inheritance	mongoengine/tests/document/indexes.py	/^    def test_indexes_dynamic_document_inheritance(self):$/;"	m	class:IndexesTest
+test_indexes_geopoint	mongoengine/tests/fields/geo.py	/^    def test_indexes_geopoint(self):$/;"	m	class:GeoFieldTest
+test_inherit_objects	mongoengine/tests/queryset/queryset.py	/^    def test_inherit_objects(self):$/;"	m	class:QuerySetTest
+test_inherit_objects_override	mongoengine/tests/queryset/queryset.py	/^    def test_inherit_objects_override(self):$/;"	m	class:QuerySetTest
+test_inheritance	mongoengine/tests/document/dynamic.py	/^    def test_inheritance(self):$/;"	m	class:DynamicTest
+test_inheritance_meta_data	mongoengine/tests/document/inheritance.py	/^    def test_inheritance_meta_data(self):$/;"	m	class:InheritanceTest
+test_inheritance_to_mongo_keys	mongoengine/tests/document/inheritance.py	/^    def test_inheritance_to_mongo_keys(self):$/;"	m	class:InheritanceTest
+test_inherited_collections	mongoengine/tests/document/inheritance.py	/^    def test_inherited_collections(self):$/;"	m	class:InheritanceTest
+test_inherited_index	mongoengine/tests/document/indexes.py	/^    def test_inherited_index(self):$/;"	m	class:IndexesTest
+test_inherited_sequencefield	mongoengine/tests/fields/fields.py	/^    def test_inherited_sequencefield(self):$/;"	m	class:FieldTest
+test_inherited_sequencefield	tests/fields/fields.py	/^    def test_inherited_sequencefield(self):$/;"	m	class:FieldTest
+test_init	mongoengine/tests/test_datastructures.py	/^    def test_init(self):$/;"	m	class:TestStrictDict
+test_init_fails_on_nonexisting_attrs	mongoengine/tests/test_datastructures.py	/^    def test_init_fails_on_nonexisting_attrs(self):$/;"	m	class:TestStrictDict
+test_initialisation	mongoengine/tests/queryset/queryset.py	/^    def test_initialisation(self):$/;"	m	class:QuerySetTest
+test_inserts_if_you_set_the_pk	mongoengine/tests/document/instance.py	/^    def test_inserts_if_you_set_the_pk(self):$/;"	m	class:InstanceTest
+test_instance_is_set_on_setattr	mongoengine/tests/document/instance.py	/^    def test_instance_is_set_on_setattr(self):$/;"	m	class:InstanceTest
+test_instance_is_set_on_setattr_on_embedded_document_list	mongoengine/tests/document/instance.py	/^    def test_instance_is_set_on_setattr_on_embedded_document_list(self):$/;"	m	class:InstanceTest
+test_int_and_float_ne_operator	mongoengine/tests/fields/fields.py	/^    def test_int_and_float_ne_operator(self):$/;"	m	class:FieldTest
+test_int_and_float_ne_operator	tests/fields/fields.py	/^    def test_int_and_float_ne_operator(self):$/;"	m	class:FieldTest
+test_int_validation	mongoengine/tests/fields/fields.py	/^    def test_int_validation(self):$/;"	m	class:FieldTest
+test_int_validation	tests/fields/fields.py	/^    def test_int_validation(self):$/;"	m	class:FieldTest
+test_invalid_dict_value	mongoengine/tests/fields/fields.py	/^    def test_invalid_dict_value(self):$/;"	m	class:FieldTest
+test_invalid_dict_value	tests/fields/fields.py	/^    def test_invalid_dict_value(self):$/;"	m	class:FieldTest
+test_invalid_reverse_delete_rule_raise_errors	mongoengine/tests/document/instance.py	/^    def test_invalid_reverse_delete_rule_raise_errors(self):$/;"	m	class:InstanceTest
+test_invalid_son	mongoengine/tests/document/instance.py	/^    def test_invalid_son(self):$/;"	m	class:InstanceTest
+test_item_frequencies	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies(self):$/;"	m	class:QuerySetTest
+test_item_frequencies_normalize	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_normalize(self):$/;"	m	class:QuerySetTest
+test_item_frequencies_null_values	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_null_values(self):$/;"	m	class:QuerySetTest
+test_item_frequencies_on_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_on_embedded(self):$/;"	m	class:QuerySetTest
+test_item_frequencies_with_0_values	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_with_0_values(self):$/;"	m	class:QuerySetTest
+test_item_frequencies_with_False_values	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_with_False_values(self):$/;"	m	class:QuerySetTest
+test_item_frequencies_with_null_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_with_null_embedded(self):$/;"	m	class:QuerySetTest
+test_items	mongoengine/tests/test_datastructures.py	/^    def test_items(self):$/;"	m	class:TestStrictDict
+test_iteration_within_iteration	mongoengine/tests/queryset/queryset.py	/^    def test_iteration_within_iteration(self):$/;"	m	class:QuerySetTest
+test_json_complex	mongoengine/tests/document/json_serialisation.py	/^    def test_json_complex(self):$/;"	m	class:TestJson
+test_json_complex	mongoengine/tests/queryset/queryset.py	/^    def test_json_complex(self):$/;"	m	class:QuerySetTest
+test_json_names	mongoengine/tests/document/json_serialisation.py	/^    def test_json_names(self):$/;"	m	class:TestJson
+test_json_simple	mongoengine/tests/document/json_serialisation.py	/^    def test_json_simple(self):$/;"	m	class:TestJson
+test_json_simple	mongoengine/tests/queryset/queryset.py	/^    def test_json_simple(self):$/;"	m	class:QuerySetTest
+test_keyword_multiple_return_get	mongoengine/tests/fields/fields.py	/^    def test_keyword_multiple_return_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_keyword_multiple_return_get	tests/fields/fields.py	/^    def test_keyword_multiple_return_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_kwargs_complex	mongoengine/tests/document/instance.py	/^    def test_kwargs_complex(self):$/;"	m	class:InstanceTest
+test_kwargs_simple	mongoengine/tests/document/instance.py	/^    def test_kwargs_simple(self):$/;"	m	class:InstanceTest
+test_last_field_name_like_operator	mongoengine/tests/queryset/transform.py	/^    def test_last_field_name_like_operator(self):$/;"	m	class:TransformTest
+test_lazy_reference_bad_set	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_bad_set(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_bad_set	tests/fields/fields.py	/^    def test_lazy_reference_bad_set(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_config	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_config(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_config	tests/fields/fields.py	/^    def test_lazy_reference_config(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_embedded	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_embedded(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_embedded	tests/fields/fields.py	/^    def test_lazy_reference_embedded(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_equality	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_equality(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_equality	tests/fields/fields.py	/^    def test_lazy_reference_equality(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_fetch_invalid_ref	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_fetch_invalid_ref(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_fetch_invalid_ref	tests/fields/fields.py	/^    def test_lazy_reference_fetch_invalid_ref(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_not_set	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_not_set(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_not_set	tests/fields/fields.py	/^    def test_lazy_reference_not_set(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_passthrough	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_passthrough(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_passthrough	tests/fields/fields.py	/^    def test_lazy_reference_passthrough(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_query_conversion	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_query_conversion(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_query_conversion	tests/fields/fields.py	/^    def test_lazy_reference_query_conversion(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_query_conversion_dbref	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_query_conversion_dbref(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_query_conversion_dbref	tests/fields/fields.py	/^    def test_lazy_reference_query_conversion_dbref(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_set	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_set(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_set	tests/fields/fields.py	/^    def test_lazy_reference_set(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_simple	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_simple(self):$/;"	m	class:LazyReferenceFieldTest
+test_lazy_reference_simple	tests/fields/fields.py	/^    def test_lazy_reference_simple(self):$/;"	m	class:LazyReferenceFieldTest
+test_len_during_iteration	mongoengine/tests/queryset/queryset.py	/^    def test_len_during_iteration(self):$/;"	m	class:QuerySetTest
+test_limit	mongoengine/tests/queryset/queryset.py	/^    def test_limit(self):$/;"	m	class:QuerySetTest
+test_limit_with_write_concern_0	mongoengine/tests/queryset/queryset.py	/^    def test_limit_with_write_concern_0(self):$/;"	m	class:QuerySetTest
+test_linestring	mongoengine/tests/queryset/geo.py	/^    def test_linestring(self):$/;"	m	class:GeoQueriesTest
+test_linestring_validation	mongoengine/tests/fields/geo.py	/^    def test_linestring_validation(self):$/;"	m	class:GeoFieldTest
+test_list_assignment	mongoengine/tests/fields/fields.py	/^    def test_list_assignment(self):$/;"	m	class:FieldTest
+test_list_assignment	tests/fields/fields.py	/^    def test_list_assignment(self):$/;"	m	class:FieldTest
+test_list_embedded_document_index	mongoengine/tests/document/indexes.py	/^    def test_list_embedded_document_index(self):$/;"	m	class:IndexesTest
+test_list_field	mongoengine/tests/fields/fields.py	/^    def test_list_field(self):$/;"	m	class:FieldTest
+test_list_field	tests/fields/fields.py	/^    def test_list_field(self):$/;"	m	class:FieldTest
+test_list_field_complex	mongoengine/tests/fields/fields.py	/^    def test_list_field_complex(self):$/;"	m	class:FieldTest
+test_list_field_complex	mongoengine/tests/test_dereference.py	/^    def test_list_field_complex(self):$/;"	m	class:FieldTest
+test_list_field_complex	tests/fields/fields.py	/^    def test_list_field_complex(self):$/;"	m	class:FieldTest
+test_list_field_invalid_operators	mongoengine/tests/fields/fields.py	/^    def test_list_field_invalid_operators(self):$/;"	m	class:FieldTest
+test_list_field_invalid_operators	tests/fields/fields.py	/^    def test_list_field_invalid_operators(self):$/;"	m	class:FieldTest
+test_list_field_lexicographic_operators	mongoengine/tests/fields/fields.py	/^    def test_list_field_lexicographic_operators(self):$/;"	m	class:FieldTest
+test_list_field_lexicographic_operators	tests/fields/fields.py	/^    def test_list_field_lexicographic_operators(self):$/;"	m	class:FieldTest
+test_list_field_manipulative_operators	mongoengine/tests/fields/fields.py	/^    def test_list_field_manipulative_operators(self):$/;"	m	class:FieldTest
+test_list_field_manipulative_operators	tests/fields/fields.py	/^    def test_list_field_manipulative_operators(self):$/;"	m	class:FieldTest
+test_list_field_passed_in_value	mongoengine/tests/fields/fields.py	/^    def test_list_field_passed_in_value(self):$/;"	m	class:FieldTest
+test_list_field_passed_in_value	tests/fields/fields.py	/^    def test_list_field_passed_in_value(self):$/;"	m	class:FieldTest
+test_list_field_rejects_strings	mongoengine/tests/fields/fields.py	/^    def test_list_field_rejects_strings(self):$/;"	m	class:FieldTest
+test_list_field_rejects_strings	tests/fields/fields.py	/^    def test_list_field_rejects_strings(self):$/;"	m	class:FieldTest
+test_list_field_strict	mongoengine/tests/fields/fields.py	/^    def test_list_field_strict(self):$/;"	m	class:FieldTest
+test_list_field_strict	tests/fields/fields.py	/^    def test_list_field_strict(self):$/;"	m	class:FieldTest
+test_list_field_with_negative_indices	mongoengine/tests/fields/fields.py	/^    def test_list_field_with_negative_indices(self):$/;"	m	class:FieldTest
+test_list_field_with_negative_indices	tests/fields/fields.py	/^    def test_list_field_with_negative_indices(self):$/;"	m	class:FieldTest
+test_list_indexes_inheritance	mongoengine/tests/document/class_methods.py	/^    def test_list_indexes_inheritance(self):$/;"	m	class:ClassMethodsTest
+test_list_item_dereference	mongoengine/tests/fields/fields.py	/^    def test_list_item_dereference(self):$/;"	m	class:FieldTest
+test_list_item_dereference	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference(self):$/;"	m	class:FieldTest
+test_list_item_dereference	tests/fields/fields.py	/^    def test_list_item_dereference(self):$/;"	m	class:FieldTest
+test_list_item_dereference_dref_false	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference_dref_false(self):$/;"	m	class:FieldTest
+test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries(self):$/;"	m	class:FieldTest
+test_list_item_dereference_dref_false_stores_as_type	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference_dref_false_stores_as_type(self):$/;"	m	class:FieldTest
+test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries(self):$/;"	m	class:FieldTest
+test_list_iter	mongoengine/tests/document/instance.py	/^    def test_list_iter(self):$/;"	m	class:InstanceTest
+test_list_lookup_not_checked_in_map	mongoengine/tests/test_dereference.py	/^    def test_list_lookup_not_checked_in_map(self):$/;"	m	class:FieldTest
+test_list_of_lists_of_references	mongoengine/tests/test_dereference.py	/^    def test_list_of_lists_of_references(self):$/;"	m	class:FieldTest
+test_list_search_by_embedded	mongoengine/tests/document/instance.py	/^    def test_list_search_by_embedded(self):$/;"	m	class:InstanceTest
+test_list_validation	mongoengine/tests/fields/fields.py	/^    def test_list_validation(self):$/;"	m	class:FieldTest
+test_list_validation	tests/fields/fields.py	/^    def test_list_validation(self):$/;"	m	class:FieldTest
+test_load_undefined_fields	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields(self):$/;"	m	class:InstanceTest
+test_load_undefined_fields_on_embedded_document	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields_on_embedded_document(self):$/;"	m	class:InstanceTest
+test_load_undefined_fields_on_embedded_document_with_strict_false	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields_on_embedded_document_with_strict_false(self):$/;"	m	class:InstanceTest
+test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc(self):$/;"	m	class:InstanceTest
+test_load_undefined_fields_with_strict_false	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields_with_strict_false(self):$/;"	m	class:InstanceTest
+test_long_field_is_considered_as_int64	mongoengine/tests/fields/fields.py	/^    def test_long_field_is_considered_as_int64(self):$/;"	m	class:FieldTest
+test_long_field_is_considered_as_int64	tests/fields/fields.py	/^    def test_long_field_is_considered_as_int64(self):$/;"	m	class:FieldTest
+test_long_ne_operator	mongoengine/tests/fields/fields.py	/^    def test_long_ne_operator(self):$/;"	m	class:FieldTest
+test_long_ne_operator	tests/fields/fields.py	/^    def test_long_ne_operator(self):$/;"	m	class:FieldTest
+test_long_validation	mongoengine/tests/fields/fields.py	/^    def test_long_validation(self):$/;"	m	class:FieldTest
+test_long_validation	tests/fields/fields.py	/^    def test_long_validation(self):$/;"	m	class:FieldTest
+test_loop_over_invalid_id_does_not_crash	mongoengine/tests/queryset/queryset.py	/^    def test_loop_over_invalid_id_does_not_crash(self):$/;"	m	class:QuerySetTest
+test_lower_level_mark_as_changed	mongoengine/tests/document/delta.py	/^    def test_lower_level_mark_as_changed(self):$/;"	m	class:DeltaTest
+test_map_field_lookup	mongoengine/tests/fields/fields.py	/^    def test_map_field_lookup(self):$/;"	m	class:FieldTest
+test_map_field_lookup	tests/fields/fields.py	/^    def test_map_field_lookup(self):$/;"	m	class:FieldTest
+test_map_field_reference	mongoengine/tests/test_dereference.py	/^    def test_map_field_reference(self):$/;"	m	class:FieldTest
+test_map_field_unicode	mongoengine/tests/fields/fields.py	/^    def test_map_field_unicode(self):$/;"	m	class:FieldTest
+test_map_field_unicode	tests/fields/fields.py	/^    def test_map_field_unicode(self):$/;"	m	class:FieldTest
+test_map_reduce	mongoengine/tests/queryset/queryset.py	/^    def test_map_reduce(self):$/;"	m	class:QuerySetTest
+test_map_reduce_custom_output	mongoengine/tests/queryset/queryset.py	/^    def test_map_reduce_custom_output(self):$/;"	m	class:QuerySetTest
+test_map_reduce_finalize	mongoengine/tests/queryset/queryset.py	/^    def test_map_reduce_finalize(self):$/;"	m	class:QuerySetTest
+test_map_reduce_with_custom_object_ids	mongoengine/tests/queryset/queryset.py	/^    def test_map_reduce_with_custom_object_ids(self):$/;"	m	class:QuerySetTest
+test_mapfield	mongoengine/tests/fields/fields.py	/^    def test_mapfield(self):$/;"	m	class:FieldTest
+test_mapfield	tests/fields/fields.py	/^    def test_mapfield(self):$/;"	m	class:FieldTest
+test_mapfield_numerical_index	mongoengine/tests/fields/fields.py	/^    def test_mapfield_numerical_index(self):$/;"	m	class:FieldTest
+test_mapfield_numerical_index	tests/fields/fields.py	/^    def test_mapfield_numerical_index(self):$/;"	m	class:FieldTest
+test_mapfield_update	mongoengine/tests/queryset/queryset.py	/^    def test_mapfield_update(self):$/;"	m	class:QuerySetTest
+test_mappings_protocol	mongoengine/tests/test_datastructures.py	/^    def test_mappings_protocol(self):$/;"	m	class:TestStrictDict
+test_max_time_ms	mongoengine/tests/queryset/queryset.py	/^    def test_max_time_ms(self):$/;"	m	class:QuerySetTest
+test_migrate_references	mongoengine/tests/test_dereference.py	/^    def test_migrate_references(self):$/;"	m	class:FieldTest
+test_mix_slice_with_other_fields	mongoengine/tests/queryset/field_list.py	/^    def test_mix_slice_with_other_fields(self):$/;"	m	class:OnlyExcludeAllTest
+test_mixed_creation	mongoengine/tests/document/instance.py	/^    def test_mixed_creation(self):$/;"	m	class:InstanceTest
+test_mixed_creation_dynamic	mongoengine/tests/document/instance.py	/^    def test_mixed_creation_dynamic(self):$/;"	m	class:InstanceTest
+test_mixed_creation_embedded	mongoengine/tests/document/instance.py	/^    def test_mixed_creation_embedded(self):$/;"	m	class:InstanceTest
+test_mixin_inheritance	mongoengine/tests/document/instance.py	/^    def test_mixin_inheritance(self):$/;"	m	class:InstanceTest
+test_mixing_only_exclude	mongoengine/tests/queryset/field_list.py	/^    def test_mixing_only_exclude(self):$/;"	m	class:OnlyExcludeAllTest
+test_model_signals	mongoengine/tests/test_signals.py	/^    def test_model_signals(self):$/;"	m	class:SignalTests
+test_model_validation	mongoengine/tests/document/validation.py	/^    def test_model_validation(self):$/;"	m	class:ValidatorErrorTest
+test_modify	mongoengine/tests/queryset/modify.py	/^    def test_modify(self):$/;"	m	class:FindAndModifyTest
+test_modify_empty	mongoengine/tests/document/instance.py	/^    def test_modify_empty(self):$/;"	m	class:InstanceTest
+test_modify_invalid_query	mongoengine/tests/document/instance.py	/^    def test_modify_invalid_query(self):$/;"	m	class:InstanceTest
+test_modify_match_another_document	mongoengine/tests/document/instance.py	/^    def test_modify_match_another_document(self):$/;"	m	class:InstanceTest
+test_modify_not_existing	mongoengine/tests/queryset/modify.py	/^    def test_modify_not_existing(self):$/;"	m	class:FindAndModifyTest
+test_modify_not_exists	mongoengine/tests/document/instance.py	/^    def test_modify_not_exists(self):$/;"	m	class:InstanceTest
+test_modify_update	mongoengine/tests/document/instance.py	/^    def test_modify_update(self):$/;"	m	class:InstanceTest
+test_modify_with_fields	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_fields(self):$/;"	m	class:FindAndModifyTest
+test_modify_with_new	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_new(self):$/;"	m	class:FindAndModifyTest
+test_modify_with_order_by	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_order_by(self):$/;"	m	class:FindAndModifyTest
+test_modify_with_positional_push	mongoengine/tests/document/instance.py	/^    def test_modify_with_positional_push(self):$/;"	m	class:InstanceTest
+test_modify_with_push	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_push(self):$/;"	m	class:FindAndModifyTest
+test_modify_with_remove	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_remove(self):$/;"	m	class:FindAndModifyTest
+test_modify_with_upsert	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_upsert(self):$/;"	m	class:FindAndModifyTest
+test_modify_with_upsert_existing	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_upsert_existing(self):$/;"	m	class:FindAndModifyTest
+test_modify_with_upsert_with_new	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_upsert_with_new(self):$/;"	m	class:FindAndModifyTest
+test_multi_keyword_exclude	mongoengine/tests/fields/fields.py	/^    def test_multi_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_multi_keyword_exclude	tests/fields/fields.py	/^    def test_multi_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_multi_keyword_filter	mongoengine/tests/fields/fields.py	/^    def test_multi_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_multi_keyword_filter	tests/fields/fields.py	/^    def test_multi_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_multi_keyword_get	mongoengine/tests/fields/fields.py	/^    def test_multi_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_multi_keyword_get	tests/fields/fields.py	/^    def test_multi_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_multidirectional_lists	mongoengine/tests/test_dereference.py	/^    def test_multidirectional_lists(self):$/;"	m	class:FieldTest
+test_multilinestring_validation	mongoengine/tests/fields/geo.py	/^    def test_multilinestring_validation(self):$/;"	m	class:GeoFieldTest
+test_multiple_connection_settings	mongoengine/tests/test_connection.py	/^    def test_multiple_connection_settings(self):$/;"	m	class:ConnectionTest
+test_multiple_occurence_in_field	mongoengine/tests/queryset/visitor.py	/^    def test_multiple_occurence_in_field(self):$/;"	m	class:QTest
+test_multiple_sequence_fields	mongoengine/tests/fields/fields.py	/^    def test_multiple_sequence_fields(self):$/;"	m	class:FieldTest
+test_multiple_sequence_fields	tests/fields/fields.py	/^    def test_multiple_sequence_fields(self):$/;"	m	class:FieldTest
+test_multiple_sequence_fields_on_docs	mongoengine/tests/fields/fields.py	/^    def test_multiple_sequence_fields_on_docs(self):$/;"	m	class:FieldTest
+test_multiple_sequence_fields_on_docs	tests/fields/fields.py	/^    def test_multiple_sequence_fields_on_docs(self):$/;"	m	class:FieldTest
+test_multipoint_validation	mongoengine/tests/fields/geo.py	/^    def test_multipoint_validation(self):$/;"	m	class:GeoFieldTest
+test_multipolygon_validation	mongoengine/tests/fields/geo.py	/^    def test_multipolygon_validation(self):$/;"	m	class:GeoFieldTest
+test_mutating_documents	mongoengine/tests/document/instance.py	/^    def test_mutating_documents(self):$/;"	m	class:InstanceTest
+test_near	mongoengine/tests/queryset/geo.py	/^    def test_near(self):$/;"	m	class:GeoQueriesTest
+test_near_and_max_distance	mongoengine/tests/queryset/geo.py	/^    def test_near_and_max_distance(self):$/;"	m	class:GeoQueriesTest
+test_near_and_min_distance	mongoengine/tests/queryset/geo.py	/^    def test_near_and_min_distance(self):$/;"	m	class:GeoQueriesTest
+test_nested_nested_fields_mark_as_changed	mongoengine/tests/document/delta.py	/^    def test_nested_nested_fields_mark_as_changed(self):$/;"	m	class:DeltaTest
+test_nested_queryset_iterator	mongoengine/tests/queryset/queryset.py	/^    def test_nested_queryset_iterator(self):$/;"	m	class:QuerySetTest
+test_no_cache	mongoengine/tests/queryset/queryset.py	/^    def test_no_cache(self):$/;"	m	class:QuerySetTest
+test_no_cached_queryset	mongoengine/tests/queryset/queryset.py	/^    def test_no_cached_queryset(self):$/;"	m	class:QuerySetTest
+test_no_dereference	mongoengine/tests/queryset/queryset.py	/^    def test_no_dereference(self):$/;"	m	class:QuerySetTest
+test_no_dereference_context_manager_dbref	mongoengine/tests/test_context_managers.py	/^    def test_no_dereference_context_manager_dbref(self):$/;"	m	class:ContextManagersTest
+test_no_dereference_context_manager_object_id	mongoengine/tests/test_context_managers.py	/^    def test_no_dereference_context_manager_object_id(self):$/;"	m	class:ContextManagersTest
+test_no_dereference_embedded_doc	mongoengine/tests/queryset/queryset.py	/^    def test_no_dereference_embedded_doc(self):$/;"	m	class:QuerySetTest
+test_no_inherited_sequencefield	mongoengine/tests/fields/fields.py	/^    def test_no_inherited_sequencefield(self):$/;"	m	class:FieldTest
+test_no_inherited_sequencefield	tests/fields/fields.py	/^    def test_no_inherited_sequencefield(self):$/;"	m	class:FieldTest
+test_no_keyword_exclude	mongoengine/tests/fields/fields.py	/^    def test_no_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_keyword_exclude	tests/fields/fields.py	/^    def test_no_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_keyword_filter	mongoengine/tests/fields/fields.py	/^    def test_no_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_keyword_filter	tests/fields/fields.py	/^    def test_no_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_keyword_multiple_return_get	mongoengine/tests/fields/fields.py	/^    def test_no_keyword_multiple_return_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_keyword_multiple_return_get	tests/fields/fields.py	/^    def test_no_keyword_multiple_return_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_keyword_update	mongoengine/tests/fields/fields.py	/^    def test_no_keyword_update(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_keyword_update	tests/fields/fields.py	/^    def test_no_keyword_update(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_ordering_for_get	mongoengine/tests/queryset/queryset.py	/^    def test_no_ordering_for_get(self):$/;"	m	class:QuerySetTest
+test_no_result_get	mongoengine/tests/fields/fields.py	/^    def test_no_result_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_result_get	tests/fields/fields.py	/^    def test_no_result_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_no_sub_classes	mongoengine/tests/queryset/queryset.py	/^    def test_no_sub_classes(self):$/;"	m	class:QuerySetTest
+test_no_sub_classes	mongoengine/tests/test_context_managers.py	/^    def test_no_sub_classes(self):$/;"	m	class:ContextManagersTest
+test_non_ascii_pk	mongoengine/tests/test_dereference.py	/^    def test_non_ascii_pk(self):$/;"	m	class:FieldTest
+test_non_matching_exclude	mongoengine/tests/fields/fields.py	/^    def test_non_matching_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_non_matching_exclude	tests/fields/fields.py	/^    def test_non_matching_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_none	mongoengine/tests/queryset/queryset.py	/^    def test_none(self):$/;"	m	class:QuerySetTest
+test_not	mongoengine/tests/queryset/queryset.py	/^    def test_not(self):$/;"	m	class:QuerySetTest
+test_not_required_handles_none_from_database	mongoengine/tests/fields/fields.py	/^    def test_not_required_handles_none_from_database(self):$/;"	m	class:FieldTest
+test_not_required_handles_none_from_database	tests/fields/fields.py	/^    def test_not_required_handles_none_from_database(self):$/;"	m	class:FieldTest
+test_not_required_handles_none_in_update	mongoengine/tests/fields/fields.py	/^    def test_not_required_handles_none_in_update(self):$/;"	m	class:FieldTest
+test_not_required_handles_none_in_update	tests/fields/fields.py	/^    def test_not_required_handles_none_in_update(self):$/;"	m	class:FieldTest
+test_not_saved_eq	mongoengine/tests/document/instance.py	/^    def test_not_saved_eq(self):$/;"	m	class:InstanceTest
+test_null_field	mongoengine/tests/document/instance.py	/^    def test_null_field(self):$/;"	m	class:InstanceTest
+test_object_id_validation	mongoengine/tests/fields/fields.py	/^    def test_object_id_validation(self):$/;"	m	class:FieldTest
+test_object_id_validation	tests/fields/fields.py	/^    def test_object_id_validation(self):$/;"	m	class:FieldTest
+test_object_mixins	mongoengine/tests/document/instance.py	/^    def test_object_mixins(self):$/;"	m	class:InstanceTest
+test_objectid_reference_across_databases	mongoengine/tests/test_dereference.py	/^    def test_objectid_reference_across_databases(self):$/;"	m	class:FieldTest
+test_objectid_reference_fields	mongoengine/tests/fields/fields.py	/^    def test_objectid_reference_fields(self):$/;"	m	class:FieldTest
+test_objectid_reference_fields	tests/fields/fields.py	/^    def test_objectid_reference_fields(self):$/;"	m	class:FieldTest
+test_only	mongoengine/tests/queryset/field_list.py	/^    def test_only(self):$/;"	m	class:OnlyExcludeAllTest
+test_only_with_subfields	mongoengine/tests/queryset/field_list.py	/^    def test_only_with_subfields(self):$/;"	m	class:OnlyExcludeAllTest
+test_or_and_or_combination	mongoengine/tests/queryset/visitor.py	/^    def test_or_and_or_combination(self):$/;"	m	class:QTest
+test_or_combination	mongoengine/tests/queryset/visitor.py	/^    def test_or_combination(self):$/;"	m	class:QTest
+test_order_by	mongoengine/tests/queryset/queryset.py	/^    def test_order_by(self):$/;"	m	class:QuerySetTest
+test_order_by_chaining	mongoengine/tests/queryset/queryset.py	/^    def test_order_by_chaining(self):$/;"	m	class:QuerySetTest
+test_order_by_list	mongoengine/tests/queryset/queryset.py	/^    def test_order_by_list(self):$/;"	m	class:QuerySetTest
+test_order_by_optional	mongoengine/tests/queryset/queryset.py	/^    def test_order_by_optional(self):$/;"	m	class:QuerySetTest
+test_order_then_filter	mongoengine/tests/queryset/queryset.py	/^    def test_order_then_filter(self):$/;"	m	class:QuerySetTest
+test_order_works_with_custom_db_field_names	mongoengine/tests/queryset/queryset.py	/^    def test_order_works_with_custom_db_field_names(self):$/;"	m	class:QuerySetTest
+test_order_works_with_primary	mongoengine/tests/queryset/queryset.py	/^    def test_order_works_with_primary(self):$/;"	m	class:QuerySetTest
+test_ordering	mongoengine/tests/queryset/queryset.py	/^    def test_ordering(self):$/;"	m	class:QuerySetTest
+test_override_method_with_field	mongoengine/tests/document/instance.py	/^    def test_override_method_with_field(self):$/;"	m	class:InstanceTest
+test_parent_reference_in_child_document	mongoengine/tests/document/validation.py	/^    def test_parent_reference_in_child_document(self):$/;"	m	class:ValidatorErrorTest
+test_parent_reference_set_as_attribute_in_child_document	mongoengine/tests/document/validation.py	/^    def test_parent_reference_set_as_attribute_in_child_document(self):$/;"	m	class:ValidatorErrorTest
+test_picke_simple_qs	mongoengine/tests/queryset/pickable.py	/^    def test_picke_simple_qs(self):$/;"	m	class:TestQuerysetPickable
+test_picklable	mongoengine/tests/document/instance.py	/^    def test_picklable(self):$/;"	m	class:InstanceTest
+test_picklable_on_signals	mongoengine/tests/document/instance.py	/^    def test_picklable_on_signals(self):$/;"	m	class:InstanceTest
+test_pickle_support_filtration	mongoengine/tests/queryset/pickable.py	/^    def test_pickle_support_filtration(self):$/;"	m	class:TestQuerysetPickable
+test_point_validation	mongoengine/tests/fields/geo.py	/^    def test_point_validation(self):$/;"	m	class:GeoFieldTest
+test_polygon	mongoengine/tests/queryset/geo.py	/^    def test_polygon(self):$/;"	m	class:GeoQueriesTest
+test_polygon_validation	mongoengine/tests/fields/geo.py	/^    def test_polygon_validation(self):$/;"	m	class:GeoFieldTest
+test_polymorphic_queries	mongoengine/tests/document/inheritance.py	/^    def test_polymorphic_queries(self):$/;"	m	class:InheritanceTest
+test_polymorphic_references	mongoengine/tests/document/instance.py	/^    def test_polymorphic_references(self):$/;"	m	class:InstanceTest
+test_positional_creation	mongoengine/tests/document/instance.py	/^    def test_positional_creation(self):$/;"	m	class:InstanceTest
+test_positional_creation_embedded	mongoengine/tests/document/instance.py	/^    def test_positional_creation_embedded(self):$/;"	m	class:InstanceTest
+test_pull_from_nested_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_pull_from_nested_embedded(self):$/;"	m	class:QuerySetTest
+test_pull_from_nested_mapfield	mongoengine/tests/queryset/queryset.py	/^    def test_pull_from_nested_mapfield(self):$/;"	m	class:QuerySetTest
+test_pull_in_genericembedded_field	mongoengine/tests/queryset/queryset.py	/^    def test_pull_in_genericembedded_field(self):$/;"	m	class:QuerySetTest
+test_pull_nested	mongoengine/tests/queryset/queryset.py	/^    def test_pull_nested(self):$/;"	m	class:QuerySetTest
+test_push_nested_list	mongoengine/tests/document/instance.py	/^    def test_push_nested_list(self):$/;"	m	class:InstanceTest
+test_push_with_position	mongoengine/tests/document/instance.py	/^    def test_push_with_position(self):$/;"	m	class:InstanceTest
+test_q	mongoengine/tests/queryset/visitor.py	/^    def test_q(self):$/;"	m	class:QTest
+test_q_clone	mongoengine/tests/queryset/visitor.py	/^    def test_q_clone(self):$/;"	m	class:QTest
+test_q_lists	mongoengine/tests/queryset/visitor.py	/^    def test_q_lists(self):$/;"	m	class:QTest
+test_q_merge_queries_edge_case	mongoengine/tests/queryset/visitor.py	/^    def test_q_merge_queries_edge_case(self):$/;"	m	class:QTest
+test_q_regex	mongoengine/tests/queryset/visitor.py	/^    def test_q_regex(self):$/;"	m	class:QTest
+test_q_with_dbref	mongoengine/tests/queryset/visitor.py	/^    def test_q_with_dbref(self):$/;"	m	class:QTest
+test_query_count_when_saving	mongoengine/tests/document/instance.py	/^    def test_query_count_when_saving(self):$/;"	m	class:InstanceTest
+test_query_counter	mongoengine/tests/test_context_managers.py	/^    def test_query_counter(self):$/;"	m	class:ContextManagersTest
+test_query_field_name	mongoengine/tests/queryset/transform.py	/^    def test_query_field_name(self):$/;"	m	class:TransformTest
+test_query_generic_embedded_document	mongoengine/tests/queryset/queryset.py	/^    def test_query_generic_embedded_document(self):$/;"	m	class:QuerySetTest
+test_query_pk_field_name	mongoengine/tests/queryset/transform.py	/^    def test_query_pk_field_name(self):$/;"	m	class:TransformTest
+test_query_reference_to_custom_pk_doc	mongoengine/tests/queryset/queryset.py	/^    def test_query_reference_to_custom_pk_doc(self):$/;"	m	class:QuerySetTest
+test_query_value_conversion	mongoengine/tests/queryset/queryset.py	/^    def test_query_value_conversion(self):$/;"	m	class:QuerySetTest
+test_queryset_aggregation_framework	mongoengine/tests/queryset/queryset.py	/^    def test_queryset_aggregation_framework(self):$/;"	m	class:QuerySetTest
+test_queryset_delete_signals	mongoengine/tests/test_signals.py	/^    def test_queryset_delete_signals(self):$/;"	m	class:SignalTests
+test_queryset_resurrects_dropped_collection	mongoengine/tests/document/instance.py	/^    def test_queryset_resurrects_dropped_collection(self):$/;"	m	class:InstanceTest
+test_raw_and_merging	mongoengine/tests/queryset/transform.py	/^    def test_raw_and_merging(self):$/;"	m	class:TransformTest
+test_raw_query_and_Q_objects	mongoengine/tests/queryset/transform.py	/^    def test_raw_query_and_Q_objects(self):$/;"	m	class:TransformTest
+test_read_preference	mongoengine/tests/queryset/queryset.py	/^    def test_read_preference(self):$/;"	m	class:QuerySetTest
+test_recursive_embedded_objects_dont_break_indexes	mongoengine/tests/document/indexes.py	/^    def test_recursive_embedded_objects_dont_break_indexes(self):$/;"	m	class:IndexesTest
+test_recursive_embedding	mongoengine/tests/fields/fields.py	/^    def test_recursive_embedding(self):$/;"	m	class:FieldTest
+test_recursive_embedding	tests/fields/fields.py	/^    def test_recursive_embedding(self):$/;"	m	class:FieldTest
+test_recursive_reference	mongoengine/tests/fields/fields.py	/^    def test_recursive_reference(self):$/;"	m	class:FieldTest
+test_recursive_reference	mongoengine/tests/test_dereference.py	/^    def test_recursive_reference(self):$/;"	m	class:FieldTest
+test_recursive_reference	tests/fields/fields.py	/^    def test_recursive_reference(self):$/;"	m	class:FieldTest
+test_recursive_validation	mongoengine/tests/fields/fields.py	/^    def test_recursive_validation(self):$/;"	m	class:FieldTest
+test_recursive_validation	tests/fields/fields.py	/^    def test_recursive_validation(self):$/;"	m	class:FieldTest
+test_reference_abstract_class	mongoengine/tests/fields/fields.py	/^    def test_reference_abstract_class(self):$/;"	m	class:FieldTest
+test_reference_abstract_class	tests/fields/fields.py	/^    def test_reference_abstract_class(self):$/;"	m	class:FieldTest
+test_reference_class_with_abstract_parent	mongoengine/tests/fields/fields.py	/^    def test_reference_class_with_abstract_parent(self):$/;"	m	class:FieldTest
+test_reference_class_with_abstract_parent	tests/fields/fields.py	/^    def test_reference_class_with_abstract_parent(self):$/;"	m	class:FieldTest
+test_reference_field_find	mongoengine/tests/queryset/queryset.py	/^    def test_reference_field_find(self):$/;"	m	class:QuerySetTest
+test_reference_field_find_dbref	mongoengine/tests/queryset/queryset.py	/^    def test_reference_field_find_dbref(self):$/;"	m	class:QuerySetTest
+test_reference_inheritance	mongoengine/tests/document/instance.py	/^    def test_reference_inheritance(self):$/;"	m	class:InstanceTest
+test_reference_miss	mongoengine/tests/fields/fields.py	/^    def test_reference_miss(self):$/;"	m	class:FieldTest
+test_reference_miss	tests/fields/fields.py	/^    def test_reference_miss(self):$/;"	m	class:FieldTest
+test_reference_query_conversion	mongoengine/tests/fields/fields.py	/^    def test_reference_query_conversion(self):$/;"	m	class:FieldTest
+test_reference_query_conversion	tests/fields/fields.py	/^    def test_reference_query_conversion(self):$/;"	m	class:FieldTest
+test_reference_query_conversion_dbref	mongoengine/tests/fields/fields.py	/^    def test_reference_query_conversion_dbref(self):$/;"	m	class:FieldTest
+test_reference_query_conversion_dbref	tests/fields/fields.py	/^    def test_reference_query_conversion_dbref(self):$/;"	m	class:FieldTest
+test_reference_validation	mongoengine/tests/fields/fields.py	/^    def test_reference_validation(self):$/;"	m	class:FieldTest
+test_reference_validation	tests/fields/fields.py	/^    def test_reference_validation(self):$/;"	m	class:FieldTest
+test_referenced_object_changed_attributes	mongoengine/tests/document/delta.py	/^    def test_referenced_object_changed_attributes(self):$/;"	m	class:DeltaTest
+test_regex_query_shortcuts	mongoengine/tests/queryset/queryset.py	/^    def test_regex_query_shortcuts(self):$/;"	m	class:QuerySetTest
+test_register_connection	mongoengine/tests/test_connection.py	/^    def test_register_connection(self):$/;"	m	class:ConnectionTest
+test_register_connection_defaults	mongoengine/tests/test_connection.py	/^    def test_register_connection_defaults(self):$/;"	m	class:ConnectionTest
+test_register_delete_rule	mongoengine/tests/document/class_methods.py	/^    def test_register_delete_rule(self):$/;"	m	class:ClassMethodsTest
+test_register_delete_rule_inherited	mongoengine/tests/document/class_methods.py	/^    def test_register_delete_rule_inherited(self):$/;"	m	class:ClassMethodsTest
+test_regular_document_pickle	mongoengine/tests/document/instance.py	/^    def test_regular_document_pickle(self):$/;"	m	class:InstanceTest
+test_reload	mongoengine/tests/document/instance.py	/^    def test_reload(self):$/;"	m	class:InstanceTest
+test_reload_after_unsetting	mongoengine/tests/document/dynamic.py	/^    def test_reload_after_unsetting(self):$/;"	m	class:DynamicTest
+test_reload_doesnt_exist	mongoengine/tests/document/instance.py	/^    def test_reload_doesnt_exist(self):$/;"	m	class:InstanceTest
+test_reload_dynamic_field	mongoengine/tests/document/dynamic.py	/^    def test_reload_dynamic_field(self):$/;"	m	class:DynamicTest
+test_reload_embedded_docs_instance	mongoengine/tests/queryset/queryset.py	/^    def test_reload_embedded_docs_instance(self):$/;"	m	class:QuerySetTest
+test_reload_list_embedded_docs_instance	mongoengine/tests/queryset/queryset.py	/^    def test_reload_list_embedded_docs_instance(self):$/;"	m	class:QuerySetTest
+test_reload_of_non_strict_with_special_field_name	mongoengine/tests/document/instance.py	/^    def test_reload_of_non_strict_with_special_field_name(self):$/;"	m	class:InstanceTest
+test_reload_referencing	mongoengine/tests/document/instance.py	/^    def test_reload_referencing(self):$/;"	m	class:InstanceTest
+test_reload_sharded	mongoengine/tests/document/instance.py	/^    def test_reload_sharded(self):$/;"	m	class:InstanceTest
+test_reload_sharded_nested	mongoengine/tests/document/instance.py	/^    def test_reload_sharded_nested(self):$/;"	m	class:InstanceTest
+test_repeated_iteration	mongoengine/tests/queryset/queryset.py	/^    def test_repeated_iteration(self):$/;"	m	class:QuerySetTest
+test_replicaset_uri_passes_read_preference	mongoengine/tests/test_replicaset_connection.py	/^    def test_replicaset_uri_passes_read_preference(self):$/;"	m	class:ConnectionTest
+test_repr	mongoengine/tests/document/instance.py	/^    def test_repr(self):$/;"	m	class:InstanceTest
+test_repr	mongoengine/tests/queryset/queryset.py	/^    def test_repr(self):$/;"	m	class:QuerySetTest
+test_repr	mongoengine/tests/test_datastructures.py	/^    def test_repr(self):$/;"	m	class:TestStrictDict
+test_repr_none	mongoengine/tests/document/instance.py	/^    def test_repr_none(self):$/;"	m	class:InstanceTest
+test_required_values	mongoengine/tests/fields/fields.py	/^    def test_required_values(self):$/;"	m	class:FieldTest
+test_required_values	tests/fields/fields.py	/^    def test_required_values(self):$/;"	m	class:FieldTest
+test_reset	mongoengine/tests/queryset/field_list.py	/^    def test_reset(self):$/;"	m	class:QueryFieldListTest
+test_reverse_delete_rule_cascade	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_cascade_and_nullify	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_cascade_and_nullify(self):$/;"	m	class:InstanceTest
+test_reverse_delete_rule_cascade_and_nullify_complex_field	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_cascade_and_nullify_complex_field(self):$/;"	m	class:InstanceTest
+test_reverse_delete_rule_cascade_complex_cycle	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade_complex_cycle(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_cascade_cycle	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade_cycle(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_cascade_on_abstract_document	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade_on_abstract_document(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_cascade_recurs	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_cascade_recurs(self):$/;"	m	class:InstanceTest
+test_reverse_delete_rule_cascade_self_referencing	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade_self_referencing(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_cascade_triggers_pre_delete_signal	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_cascade_triggers_pre_delete_signal(self):$/;"	m	class:InstanceTest
+test_reverse_delete_rule_deny	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_deny(self):$/;"	m	class:InstanceTest
+test_reverse_delete_rule_deny	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_deny(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_deny_on_abstract_document	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_deny_on_abstract_document(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_nullify	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_nullify(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_nullify_on_abstract_document	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_nullify_on_abstract_document(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_pull	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_pull(self):$/;"	m	class:InstanceTest
+test_reverse_delete_rule_pull	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_pull(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_pull_on_abstract_documents	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_pull_on_abstract_documents(self):$/;"	m	class:QuerySetTest
+test_reverse_delete_rule_with_custom_id_field	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_with_custom_id_field(self):$/;"	m	class:InstanceTest
+test_reverse_delete_rule_with_document_inheritance	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_with_document_inheritance(self):$/;"	m	class:InstanceTest
+test_reverse_delete_rule_with_shared_id_among_collections	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_with_shared_id_among_collections(self):$/;"	m	class:InstanceTest
+test_reverse_list_sorting	mongoengine/tests/fields/fields.py	/^    def test_reverse_list_sorting(self):$/;"	m	class:FieldTest
+test_reverse_list_sorting	tests/fields/fields.py	/^    def test_reverse_list_sorting(self):$/;"	m	class:FieldTest
+test_save	mongoengine/tests/document/instance.py	/^    def test_save(self):$/;"	m	class:InstanceTest
+test_save	mongoengine/tests/fields/fields.py	/^    def test_save(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_save	tests/fields/fields.py	/^    def test_save(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_save_abstract_document	mongoengine/tests/document/instance.py	/^    def test_save_abstract_document(self):$/;"	m	class:InstanceTest
+test_save_and_only_on_fields_with_default	mongoengine/tests/queryset/queryset.py	/^    def test_save_and_only_on_fields_with_default(self):$/;"	m	class:QuerySetTest
+test_save_atomicity_condition	mongoengine/tests/document/instance.py	/^    def test_save_atomicity_condition(self):$/;"	m	class:InstanceTest
+test_save_cascade_kwargs	mongoengine/tests/document/instance.py	/^    def test_save_cascade_kwargs(self):$/;"	m	class:InstanceTest
+test_save_cascade_meta_false	mongoengine/tests/document/instance.py	/^    def test_save_cascade_meta_false(self):$/;"	m	class:InstanceTest
+test_save_cascade_meta_true	mongoengine/tests/document/instance.py	/^    def test_save_cascade_meta_true(self):$/;"	m	class:InstanceTest
+test_save_cascades	mongoengine/tests/document/instance.py	/^    def test_save_cascades(self):$/;"	m	class:InstanceTest
+test_save_cascades_generically	mongoengine/tests/document/instance.py	/^    def test_save_cascades_generically(self):$/;"	m	class:InstanceTest
+test_save_custom_id	mongoengine/tests/document/instance.py	/^    def test_save_custom_id(self):$/;"	m	class:InstanceTest
+test_save_custom_pk	mongoengine/tests/document/instance.py	/^    def test_save_custom_pk(self):$/;"	m	class:InstanceTest
+test_save_embedded_document	mongoengine/tests/document/instance.py	/^    def test_save_embedded_document(self):$/;"	m	class:InstanceTest
+test_save_list	mongoengine/tests/document/instance.py	/^    def test_save_list(self):$/;"	m	class:InstanceTest
+test_save_max_recursion_not_hit	mongoengine/tests/document/instance.py	/^    def test_save_max_recursion_not_hit(self):$/;"	m	class:InstanceTest
+test_save_max_recursion_not_hit_with_file_field	mongoengine/tests/document/instance.py	/^    def test_save_max_recursion_not_hit_with_file_field(self):$/;"	m	class:InstanceTest
+test_save_only_changed_fields	mongoengine/tests/document/instance.py	/^    def test_save_only_changed_fields(self):$/;"	m	class:InstanceTest
+test_save_only_changed_fields_recursive	mongoengine/tests/document/instance.py	/^    def test_save_only_changed_fields_recursive(self):$/;"	m	class:InstanceTest
+test_save_reference	mongoengine/tests/document/instance.py	/^    def test_save_reference(self):$/;"	m	class:InstanceTest
+test_save_to_a_value_that_equates_to_false	mongoengine/tests/document/instance.py	/^    def test_save_to_a_value_that_equates_to_false(self):$/;"	m	class:InstanceTest
+test_scalar	mongoengine/tests/queryset/queryset.py	/^    def test_scalar(self):$/;"	m	class:QuerySetTest
+test_scalar_cursor_behaviour	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_cursor_behaviour(self):$/;"	m	class:QuerySetTest
+test_scalar_db_field	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_db_field(self):$/;"	m	class:QuerySetTest
+test_scalar_decimal	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_decimal(self):$/;"	m	class:QuerySetTest
+test_scalar_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_embedded(self):$/;"	m	class:QuerySetTest
+test_scalar_generic_reference_field	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_generic_reference_field(self):$/;"	m	class:QuerySetTest
+test_scalar_primary_key	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_primary_key(self):$/;"	m	class:QuerySetTest
+test_scalar_reference_field	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_reference_field(self):$/;"	m	class:QuerySetTest
+test_scalar_simple	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_simple(self):$/;"	m	class:QuerySetTest
+test_select_related_follows_embedded_referencefields	mongoengine/tests/test_dereference.py	/^    def test_select_related_follows_embedded_referencefields(self):$/;"	m	class:FieldTest
+test_sequence_field	mongoengine/tests/fields/fields.py	/^    def test_sequence_field(self):$/;"	m	class:FieldTest
+test_sequence_field	tests/fields/fields.py	/^    def test_sequence_field(self):$/;"	m	class:FieldTest
+test_sequence_field_get_next_value	mongoengine/tests/fields/fields.py	/^    def test_sequence_field_get_next_value(self):$/;"	m	class:FieldTest
+test_sequence_field_get_next_value	tests/fields/fields.py	/^    def test_sequence_field_get_next_value(self):$/;"	m	class:FieldTest
+test_sequence_field_sequence_name	mongoengine/tests/fields/fields.py	/^    def test_sequence_field_sequence_name(self):$/;"	m	class:FieldTest
+test_sequence_field_sequence_name	tests/fields/fields.py	/^    def test_sequence_field_sequence_name(self):$/;"	m	class:FieldTest
+test_sequence_field_value_decorator	mongoengine/tests/fields/fields.py	/^    def test_sequence_field_value_decorator(self):$/;"	m	class:FieldTest
+test_sequence_field_value_decorator	tests/fields/fields.py	/^    def test_sequence_field_value_decorator(self):$/;"	m	class:FieldTest
+test_sequence_fields_reload	mongoengine/tests/fields/fields.py	/^    def test_sequence_fields_reload(self):$/;"	m	class:FieldTest
+test_sequence_fields_reload	tests/fields/fields.py	/^    def test_sequence_fields_reload(self):$/;"	m	class:FieldTest
+test_set_generic_embedded_documents	mongoengine/tests/queryset/queryset.py	/^    def test_set_generic_embedded_documents(self):$/;"	m	class:QuerySetTest
+test_set_list_embedded_documents	mongoengine/tests/queryset/queryset.py	/^    def test_set_list_embedded_documents(self):$/;"	m	class:QuerySetTest
+test_set_on_insert	mongoengine/tests/queryset/queryset.py	/^    def test_set_on_insert(self):$/;"	m	class:QuerySetTest
+test_set_unset_one_operation	mongoengine/tests/document/instance.py	/^    def test_set_unset_one_operation(self):$/;"	m	class:InstanceTest
+test_setattr_getattr	mongoengine/tests/test_datastructures.py	/^    def test_setattr_getattr(self):$/;"	m	class:TestStrictDict
+test_setattr_getattr_special	mongoengine/tests/test_datastructures.py	/^    def test_setattr_getattr_special(self):$/;"	m	class:TestStrictDict
+test_setattr_raises_on_nonexisting_attr	mongoengine/tests/test_datastructures.py	/^    def test_setattr_raises_on_nonexisting_attr(self):$/;"	m	class:TestStrictDict
+test_shard_key	mongoengine/tests/document/instance.py	/^    def test_shard_key(self):$/;"	m	class:InstanceTest
+test_shard_key_in_embedded_document	mongoengine/tests/document/instance.py	/^    def test_shard_key_in_embedded_document(self):$/;"	m	class:InstanceTest
+test_shard_key_primary	mongoengine/tests/document/instance.py	/^    def test_shard_key_primary(self):$/;"	m	class:InstanceTest
+test_sharing_connections	mongoengine/tests/test_connection.py	/^    def test_sharing_connections(self):$/;"	m	class:ConnectionTest
+test_signal_kwargs	mongoengine/tests/test_signals.py	/^    def test_signal_kwargs(self):$/;"	m	class:SignalTests
+test_signals_bulk_insert	mongoengine/tests/test_signals.py	/^    def test_signals_bulk_insert(self):$/;"	m	class:SignalTests
+test_signals_with_explicit_doc_ids	mongoengine/tests/test_signals.py	/^    def test_signals_with_explicit_doc_ids(self):$/;"	m	class:SignalTests
+test_signals_with_switch_collection	mongoengine/tests/test_signals.py	/^    def test_signals_with_switch_collection(self):$/;"	m	class:SignalTests
+test_signals_with_switch_db	mongoengine/tests/test_signals.py	/^    def test_signals_with_switch_db(self):$/;"	m	class:SignalTests
+test_simple_choices_get_field_display	mongoengine/tests/fields/fields.py	/^    def test_simple_choices_get_field_display(self):$/;"	m	class:FieldTest
+test_simple_choices_get_field_display	tests/fields/fields.py	/^    def test_simple_choices_get_field_display(self):$/;"	m	class:FieldTest
+test_simple_choices_validation	mongoengine/tests/fields/fields.py	/^    def test_simple_choices_validation(self):$/;"	m	class:FieldTest
+test_simple_choices_validation	tests/fields/fields.py	/^    def test_simple_choices_validation(self):$/;"	m	class:FieldTest
+test_simple_choices_validation_invalid_value	mongoengine/tests/fields/fields.py	/^    def test_simple_choices_validation_invalid_value(self):$/;"	m	class:FieldTest
+test_simple_choices_validation_invalid_value	tests/fields/fields.py	/^    def test_simple_choices_validation_invalid_value(self):$/;"	m	class:FieldTest
+test_simple_dynamic_document	mongoengine/tests/document/dynamic.py	/^    def test_simple_dynamic_document(self):$/;"	m	class:DynamicTest
+test_single_keyword_exclude	mongoengine/tests/fields/fields.py	/^    def test_single_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_single_keyword_exclude	tests/fields/fields.py	/^    def test_single_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_single_keyword_filter	mongoengine/tests/fields/fields.py	/^    def test_single_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_single_keyword_filter	tests/fields/fields.py	/^    def test_single_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_single_keyword_get	mongoengine/tests/fields/fields.py	/^    def test_single_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_single_keyword_get	tests/fields/fields.py	/^    def test_single_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_single_keyword_update	mongoengine/tests/fields/fields.py	/^    def test_single_keyword_update(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_single_keyword_update	tests/fields/fields.py	/^    def test_single_keyword_update(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_skip	mongoengine/tests/queryset/queryset.py	/^    def test_skip(self):$/;"	m	class:QuerySetTest
+test_slave_okay	mongoengine/tests/queryset/queryset.py	/^    def test_slave_okay(self):$/;"	m	class:QuerySetTest
+test_slice	mongoengine/tests/queryset/queryset.py	/^    def test_slice(self):$/;"	m	class:QuerySetTest
+test_slice_marks_field_as_changed	mongoengine/tests/fields/fields.py	/^    def test_slice_marks_field_as_changed(self):$/;"	m	class:FieldTest
+test_slice_marks_field_as_changed	tests/fields/fields.py	/^    def test_slice_marks_field_as_changed(self):$/;"	m	class:FieldTest
+test_slicing	mongoengine/tests/queryset/field_list.py	/^    def test_slicing(self):$/;"	m	class:OnlyExcludeAllTest
+test_slicing_fields	mongoengine/tests/queryset/field_list.py	/^    def test_slicing_fields(self):$/;"	m	class:OnlyExcludeAllTest
+test_slicing_nested_fields	mongoengine/tests/queryset/field_list.py	/^    def test_slicing_nested_fields(self):$/;"	m	class:OnlyExcludeAllTest
+test_sorted_list_sorting	mongoengine/tests/fields/fields.py	/^    def test_sorted_list_sorting(self):$/;"	m	class:FieldTest
+test_sorted_list_sorting	tests/fields/fields.py	/^    def test_sorted_list_sorting(self):$/;"	m	class:FieldTest
+test_spaces_in_keys	mongoengine/tests/document/instance.py	/^    def test_spaces_in_keys(self):$/;"	m	class:InstanceTest
+test_sparse_compound_indexes	mongoengine/tests/document/indexes.py	/^    def test_sparse_compound_indexes(self):$/;"	m	class:IndexesTest
+test_sparse_field	mongoengine/tests/fields/fields.py	/^    def test_sparse_field(self):$/;"	m	class:FieldTest
+test_sparse_field	tests/fields/fields.py	/^    def test_sparse_field(self):$/;"	m	class:FieldTest
+test_spherical_geospatial_operators	mongoengine/tests/queryset/geo.py	/^    def test_spherical_geospatial_operators(self):$/;"	m	class:GeoQueriesTest
+test_string_indexes	mongoengine/tests/document/indexes.py	/^    def test_string_indexes(self):$/;"	m	class:IndexesTest
+test_string_validation	mongoengine/tests/fields/fields.py	/^    def test_string_validation(self):$/;"	m	class:FieldTest
+test_string_validation	tests/fields/fields.py	/^    def test_string_validation(self):$/;"	m	class:FieldTest
+test_subclass_field_query	mongoengine/tests/queryset/queryset.py	/^    def test_subclass_field_query(self):$/;"	m	class:QuerySetTest
+test_subclasses	mongoengine/tests/document/inheritance.py	/^    def test_subclasses(self):$/;"	m	class:InheritanceTest
+test_sum	mongoengine/tests/queryset/queryset.py	/^    def test_sum(self):$/;"	m	class:QuerySetTest
+test_sum_over_db_field	mongoengine/tests/queryset/queryset.py	/^    def test_sum_over_db_field(self):$/;"	m	class:QuerySetTest
+test_superclasses	mongoengine/tests/document/inheritance.py	/^    def test_superclasses(self):$/;"	m	class:InheritanceTest
+test_switch_collection_context_manager	mongoengine/tests/test_context_managers.py	/^    def test_switch_collection_context_manager(self):$/;"	m	class:ContextManagersTest
+test_switch_db_context_manager	mongoengine/tests/test_context_managers.py	/^    def test_switch_db_context_manager(self):$/;"	m	class:ContextManagersTest
+test_switch_db_instance	mongoengine/tests/document/instance.py	/^    def test_switch_db_instance(self):$/;"	m	class:InstanceTest
+test_text_indexes	mongoengine/tests/document/indexes.py	/^    def test_text_indexes(self):$/;"	m	class:IndexesTest
+test_text_indexes	mongoengine/tests/queryset/queryset.py	/^    def test_text_indexes(self):$/;"	m	class:QuerySetTest
+test_three_level_complex_data_lookups	mongoengine/tests/document/dynamic.py	/^    def test_three_level_complex_data_lookups(self):$/;"	m	class:DynamicTest
+test_to_dbref	mongoengine/tests/document/instance.py	/^    def test_to_dbref(self):$/;"	m	class:InstanceTest
+test_to_dict	mongoengine/tests/document/validation.py	/^    def test_to_dict(self):$/;"	m	class:ValidatorErrorTest
+test_transform_query	mongoengine/tests/queryset/transform.py	/^    def test_transform_query(self):$/;"	m	class:TransformTest
+test_transform_update	mongoengine/tests/queryset/transform.py	/^    def test_transform_update(self):$/;"	m	class:TransformTest
+test_ttl_indexes	mongoengine/tests/document/indexes.py	/^    def test_ttl_indexes(self):$/;"	m	class:IndexesTest
+test_tuples_as_tuples	mongoengine/tests/fields/fields.py	/^    def test_tuples_as_tuples(self):$/;"	m	class:FieldTest
+test_tuples_as_tuples	tests/fields/fields.py	/^    def test_tuples_as_tuples(self):$/;"	m	class:FieldTest
+test_two_way_reverse_delete_rule	mongoengine/tests/document/instance.py	/^    def test_two_way_reverse_delete_rule(self):$/;"	m	class:InstanceTest
+test_type	mongoengine/tests/queryset/transform.py	/^    def test_type(self):$/;"	m	class:TransformTest
+test_undefined_field_exception	mongoengine/tests/fields/fields.py	/^    def test_undefined_field_exception(self):$/;"	m	class:FieldTest
+test_undefined_field_exception	tests/fields/fields.py	/^    def test_undefined_field_exception(self):$/;"	m	class:FieldTest
+test_undefined_field_exception_with_strict	mongoengine/tests/fields/fields.py	/^    def test_undefined_field_exception_with_strict(self):$/;"	m	class:FieldTest
+test_undefined_field_exception_with_strict	tests/fields/fields.py	/^    def test_undefined_field_exception_with_strict(self):$/;"	m	class:FieldTest
+test_undefined_reference	mongoengine/tests/fields/fields.py	/^    def test_undefined_reference(self):$/;"	m	class:FieldTest
+test_undefined_reference	tests/fields/fields.py	/^    def test_undefined_reference(self):$/;"	m	class:FieldTest
+test_understandable_error_raised	mongoengine/tests/queryset/transform.py	/^    def test_understandable_error_raised(self):$/;"	m	class:TransformTest
+test_unicode	mongoengine/tests/fields/fields.py	/^    def test_unicode(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_unicode	tests/fields/fields.py	/^    def test_unicode(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_unicode_url_validation	mongoengine/tests/fields/fields.py	/^    def test_unicode_url_validation(self):$/;"	m	class:FieldTest
+test_unicode_url_validation	tests/fields/fields.py	/^    def test_unicode_url_validation(self):$/;"	m	class:FieldTest
+test_unique	mongoengine/tests/document/indexes.py	/^    def test_unique(self):$/;"	m	class:IndexesTest
+test_unique_and_indexes	mongoengine/tests/document/indexes.py	/^    def test_unique_and_indexes(self):$/;"	m	class:IndexesTest
+test_unique_and_primary	mongoengine/tests/document/indexes.py	/^    def test_unique_and_primary(self):$/;"	m	class:IndexesTest
+test_unique_and_primary_create	mongoengine/tests/document/indexes.py	/^    def test_unique_and_primary_create(self):$/;"	m	class:IndexesTest
+test_unique_embedded_document	mongoengine/tests/document/indexes.py	/^    def test_unique_embedded_document(self):$/;"	m	class:IndexesTest
+test_unique_embedded_document_in_list	mongoengine/tests/document/indexes.py	/^    def test_unique_embedded_document_in_list(self):$/;"	m	class:IndexesTest
+test_unique_with	mongoengine/tests/document/indexes.py	/^    def test_unique_with(self):$/;"	m	class:IndexesTest
+test_unique_with_embedded_document_and_embedded_unique	mongoengine/tests/document/indexes.py	/^    def test_unique_with_embedded_document_and_embedded_unique(self):$/;"	m	class:IndexesTest
+test_unknown_keyword_exclude	mongoengine/tests/fields/fields.py	/^    def test_unknown_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_unknown_keyword_exclude	tests/fields/fields.py	/^    def test_unknown_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_unknown_keyword_filter	mongoengine/tests/fields/fields.py	/^    def test_unknown_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_unknown_keyword_filter	tests/fields/fields.py	/^    def test_unknown_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_unknown_keyword_get	mongoengine/tests/fields/fields.py	/^    def test_unknown_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_unknown_keyword_get	tests/fields/fields.py	/^    def test_unknown_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
+test_unpickle	mongoengine/tests/queryset/pickable.py	/^    def test_unpickle(self):$/;"	m	class:TestQuerysetPickable
+test_unset_reference	mongoengine/tests/queryset/queryset.py	/^    def test_unset_reference(self):$/;"	m	class:QuerySetTest
+test_update	mongoengine/tests/document/instance.py	/^    def test_update(self):$/;"	m	class:InstanceTest
+test_update	mongoengine/tests/queryset/queryset.py	/^    def test_update(self):$/;"	m	class:QuerySetTest
+test_update_array_position	mongoengine/tests/queryset/queryset.py	/^    def test_update_array_position(self):$/;"	m	class:QuerySetTest
+test_update_list_field	mongoengine/tests/document/instance.py	/^    def test_update_list_field(self):$/;"	m	class:InstanceTest
+test_update_min_max	mongoengine/tests/queryset/queryset.py	/^    def test_update_min_max(self):$/;"	m	class:QuerySetTest
+test_update_one_pop_generic_reference	mongoengine/tests/queryset/queryset.py	/^    def test_update_one_pop_generic_reference(self):$/;"	m	class:QuerySetTest
+test_update_push_and_pull_add_to_set	mongoengine/tests/queryset/queryset.py	/^    def test_update_push_and_pull_add_to_set(self):$/;"	m	class:QuerySetTest
+test_update_push_list_of_list	mongoengine/tests/queryset/queryset.py	/^    def test_update_push_list_of_list(self):$/;"	m	class:QuerySetTest
+test_update_push_with_position	mongoengine/tests/queryset/queryset.py	/^    def test_update_push_with_position(self):$/;"	m	class:QuerySetTest
+test_update_related_models	mongoengine/tests/queryset/queryset.py	/^    def test_update_related_models(self):$/;"	m	class:QuerySetTest
+test_update_rename_operator	mongoengine/tests/document/instance.py	/^    def test_update_rename_operator(self):$/;"	m	class:InstanceTest
+test_update_results	mongoengine/tests/queryset/queryset.py	/^    def test_update_results(self):$/;"	m	class:QuerySetTest
+test_update_unique_field	mongoengine/tests/document/instance.py	/^    def test_update_unique_field(self):$/;"	m	class:InstanceTest
+test_update_update_has_a_value	mongoengine/tests/queryset/queryset.py	/^    def test_update_update_has_a_value(self):$/;"	m	class:QuerySetTest
+test_update_upsert_looks_like_a_digit	mongoengine/tests/queryset/queryset.py	/^    def test_update_upsert_looks_like_a_digit(self):$/;"	m	class:QuerySetTest
+test_update_using_positional_operator	mongoengine/tests/queryset/queryset.py	/^    def test_update_using_positional_operator(self):$/;"	m	class:QuerySetTest
+test_update_using_positional_operator_embedded_document	mongoengine/tests/queryset/queryset.py	/^    def test_update_using_positional_operator_embedded_document(self):$/;"	m	class:QuerySetTest
+test_update_using_positional_operator_matches_first	mongoengine/tests/queryset/queryset.py	/^    def test_update_using_positional_operator_matches_first(self):$/;"	m	class:QuerySetTest
+test_update_validate	mongoengine/tests/queryset/queryset.py	/^    def test_update_validate(self):$/;"	m	class:QuerySetTest
+test_update_value_conversion	mongoengine/tests/queryset/queryset.py	/^    def test_update_value_conversion(self):$/;"	m	class:QuerySetTest
+test_update_write_concern	mongoengine/tests/queryset/queryset.py	/^    def test_update_write_concern(self):$/;"	m	class:QuerySetTest
+test_updates_can_have_match_operators	mongoengine/tests/queryset/queryset.py	/^    def test_updates_can_have_match_operators(self):$/;"	m	class:QuerySetTest
+test_updating_an_embedded_document	mongoengine/tests/document/instance.py	/^    def test_updating_an_embedded_document(self):$/;"	m	class:InstanceTest
+test_upper_level_mark_as_changed	mongoengine/tests/document/delta.py	/^    def test_upper_level_mark_as_changed(self):$/;"	m	class:DeltaTest
+test_upsert	mongoengine/tests/queryset/queryset.py	/^    def test_upsert(self):$/;"	m	class:QuerySetTest
+test_upsert_includes_cls	mongoengine/tests/queryset/queryset.py	/^    def test_upsert_includes_cls(self):$/;"	m	class:QuerySetTest
+test_upsert_one	mongoengine/tests/queryset/queryset.py	/^    def test_upsert_one(self):$/;"	m	class:QuerySetTest
+test_uri_without_credentials_doesnt_override_conn_settings	mongoengine/tests/test_connection.py	/^    def test_uri_without_credentials_doesnt_override_conn_settings(self):$/;"	m	class:ConnectionTest
+test_url_scheme_validation	mongoengine/tests/fields/fields.py	/^    def test_url_scheme_validation(self):$/;"	m	class:FieldTest
+test_url_scheme_validation	tests/fields/fields.py	/^    def test_url_scheme_validation(self):$/;"	m	class:FieldTest
+test_url_validation	mongoengine/tests/fields/fields.py	/^    def test_url_validation(self):$/;"	m	class:FieldTest
+test_url_validation	tests/fields/fields.py	/^    def test_url_validation(self):$/;"	m	class:FieldTest
+test_using	mongoengine/tests/queryset/queryset.py	/^    def test_using(self):$/;"	m	class:QuerySetTest
+test_using_a_slice	mongoengine/tests/queryset/field_list.py	/^    def test_using_a_slice(self):$/;"	m	class:QueryFieldListTest
+test_uuid_field_binary	mongoengine/tests/fields/fields.py	/^    def test_uuid_field_binary(self):$/;"	m	class:FieldTest
+test_uuid_field_binary	tests/fields/fields.py	/^    def test_uuid_field_binary(self):$/;"	m	class:FieldTest
+test_uuid_field_string	mongoengine/tests/fields/fields.py	/^    def test_uuid_field_string(self):$/;"	m	class:FieldTest
+test_uuid_field_string	tests/fields/fields.py	/^    def test_uuid_field_string(self):$/;"	m	class:FieldTest
+test_where	mongoengine/tests/queryset/queryset.py	/^    def test_where(self):$/;"	m	class:QuerySetTest
+test_within_box	mongoengine/tests/queryset/geo.py	/^    def test_within_box(self):$/;"	m	class:GeoQueriesTest
+test_within_distance	mongoengine/tests/queryset/geo.py	/^    def test_within_distance(self):$/;"	m	class:GeoQueriesTest
+test_within_polygon	mongoengine/tests/queryset/geo.py	/^    def test_within_polygon(self):$/;"	m	class:GeoQueriesTest
+test_write_concern	mongoengine/tests/test_connection.py	/^    def test_write_concern(self):$/;"	m	class:ConnectionTest
+testdict	mongoengine/tests/queryset/queryset.py	/^            testdict = DictField()$/;"	v	class:QuerySetTest.test_dict_with_custom_baseclass.Test
+testdict	mongoengine/tests/queryset/queryset.py	/^            testdict = DictField(basecls=StringField)$/;"	v	class:QuerySetTest.test_dict_with_custom_baseclass.Test
+text	mongoengine/tests/document/indexes.py	/^            text = StringField()$/;"	v	class:IndexesTest.test_compound_key_dictfield.ReportDictField
+text	mongoengine/tests/document/indexes.py	/^            text = StringField()$/;"	v	class:IndexesTest.test_compound_key_embedded.ReportEmbedded
+text	mongoengine/tests/document/instance.py	/^            text = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_recurs.Comment
+text	mongoengine/tests/fields/fields.py	/^            text = StringField()$/;"	v	class:FieldTest.test_list_field_passed_in_value.Bar
+text	mongoengine/tests/queryset/field_list.py	/^            text = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.Comment
+text	mongoengine/tests/queryset/field_list.py	/^            text = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.Comment
+text	mongoengine/tests/queryset/queryset.py	/^            text = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_ReferenceField.Bar
+text	mongoengine/tests/queryset/queryset.py	/^            text = StringField()$/;"	v	class:QuerySetTest.test_distinct_handles_references.Bar
+text	mongoengine/tests/queryset/queryset.py	/^            text = StringField()$/;"	v	class:QuerySetTest.test_distinct_handles_references_to_alias.Bar
+text	mongoengine/tests/queryset/queryset.py	/^            text = StringField()$/;"	v	class:QuerySetTest.test_unset_reference.Comment
+text	mongoengine/tests/test_dereference.py	/^            text = StringField()$/;"	v	class:FieldTest.test_list_lookup_not_checked_in_map.Comment
+text	tests/fields/fields.py	/^            text = StringField()$/;"	v	class:FieldTest.test_list_field_passed_in_value.Bar
+text_info	mongoengine/tests/fields/fields.py	/^            text_info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
+text_info	tests/fields/fields.py	/^            text_info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
+the_date	mongoengine/tests/test_connection.py	/^            the_date = DateTimeField(required=True)$/;"	v	class:ConnectionTest.test_datetime.DateDoc
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_copyable.PutFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_boolean.TestFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_cmp.TestFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_disk_space.TestFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_field_optional.DemoFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_fields.PutFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_fields_set.SetFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_fields_stream.StreamFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_fields_stream_after_none.StreamFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_reassigning.TestFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_uniqueness.TestFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField(db_alias="test_files",$/;"	v	class:FileTest.test_file_multidb.TestFile
+the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = ImageField()$/;"	v	class:FileTest.test_image_field_reassigning.TestFile
+thick	mongoengine/tests/queryset/queryset.py	/^            thick = BooleanField()$/;"	v	class:QuerySetTest.test_elem_match.Foo
+thing	mongoengine/tests/document/instance.py	/^            thing = EmbeddedDocumentField(Thing)$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document.User
+thing	mongoengine/tests/document/instance.py	/^            thing = EmbeddedDocumentField(Thing)$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false.User
+thing	mongoengine/tests/document/instance.py	/^            thing = EmbeddedDocumentField(Thing)$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc.User
+thing	mongoengine/tests/document/instance.py	/^            thing = EmbeddedDocumentField(Thing)$/;"	v	class:InstanceTest.test_save_to_a_value_that_equates_to_false.User
+thing	mongoengine/tests/fields/fields.py	/^            thing = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Ocurrence
+thing	tests/fields/fields.py	/^            thing = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Ocurrence
+thumbnail	mongoengine/fields.py	/^    def thumbnail(self):$/;"	m	class:ImageGridFsProxy
+thumbnail	mongoengine/mongoengine/fields.py	/^    def thumbnail(self):$/;"	m	class:ImageGridFsProxy
+time	mongoengine/tests/fields/fields.py	/^            time = DateTimeField()$/;"	v	class:FieldTest.test_datetime_tz_aware_mark_as_changed.LogEntry
+time	mongoengine/tests/fields/fields.py	/^            time = DateTimeField()$/;"	v	class:FieldTest.test_datetime_validation.LogEntry
+time	tests/fields/fields.py	/^            time = DateTimeField()$/;"	v	class:FieldTest.test_datetime_tz_aware_mark_as_changed.LogEntry
+time	tests/fields/fields.py	/^            time = DateTimeField()$/;"	v	class:FieldTest.test_datetime_validation.LogEntry
+timeout	mongoengine/mongoengine/queryset/base.py	/^    def timeout(self, enabled):$/;"	m	class:BaseQuerySet
+title	mongoengine/docs/code/tumblelog.py	/^    title = StringField(max_length=120, required=True)$/;"	v	class:Post
+title	mongoengine/tests/document/class_methods.py	/^            title = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
+title	mongoengine/tests/document/class_methods.py	/^            title = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPost
+title	mongoengine/tests/document/class_methods.py	/^            title = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPost
+title	mongoengine/tests/document/class_methods.py	/^            title = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = DictField()$/;"	v	class:IndexesTest.test_text_indexes.Book
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest._index_test_inheritance.ExtendedBlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_embedded_document_index.BlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_index_no_cls.A
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_inherited_index.A
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_list_embedded_document_index.BlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_unique.BlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_unique_embedded_document_in_list.BlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_unique_with.BlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = StringField(required=True)$/;"	v	class:IndexesTest.test_embedded_document_index_meta.Rank
+title	mongoengine/tests/document/indexes.py	/^            title = StringField(required=True)$/;"	v	class:IndexesTest.test_index_on_id.BlogPost
+title	mongoengine/tests/document/indexes.py	/^            title = StringField(unique_with='sub.year')$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
+title	mongoengine/tests/document/instance.py	/^            title = StringField()$/;"	v	class:InstanceTest.test_reload_of_non_strict_with_special_field_name.Post
+title	mongoengine/tests/document/instance.py	/^            title = StringField()$/;"	v	class:InstanceTest.test_repr.Article
+title	mongoengine/tests/document/instance.py	/^            title = StringField()$/;"	v	class:InstanceTest.test_repr_none.Article
+title	mongoengine/tests/document/instance.py	/^            title = StringField(required=True)$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Rank
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference.Link
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference.Post
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices.Link
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices.Post
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Post
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_document_not_registered.Link
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list.Link
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list.Post
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_choices.Link
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_choices.Post
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.Post
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_string_choices.Link
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_string_choices.Post
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_reference_query_conversion.BlogPost
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.BlogPost
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.BlogPost
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.BlogPost
+title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.BlogPost
+title	mongoengine/tests/fields/fields.py	/^            title = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
+title	mongoengine/tests/fields/fields.py	/^            title = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Post
+title	mongoengine/tests/fields/geo.py	/^            title = StringField()$/;"	v	class:GeoFieldTest.test_geopoint_embedded_indexes.Event
+title	mongoengine/tests/fields/geo.py	/^            title = StringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere.Event
+title	mongoengine/tests/fields/geo.py	/^            title = StringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Event
+title	mongoengine/tests/fields/geo.py	/^            title = StringField()$/;"	v	class:GeoFieldTest.test_indexes_geopoint.Event
+title	mongoengine/tests/queryset/field_list.py	/^            title = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.Comment
+title	mongoengine/tests/queryset/field_list.py	/^            title = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.Comment
+title	mongoengine/tests/queryset/geo.py	/^            title = StringField()$/;"	v	class:GeoQueriesTest._create_event_data.Event
+title	mongoengine/tests/queryset/geo.py	/^            title = StringField()$/;"	v	class:GeoQueriesTest._test_embedded.Event
+title	mongoengine/tests/queryset/geo.py	/^            title="Coltrane Motion @ Bottom of the Hill",$/;"	v	class:GeoQueriesTest._create_event_data.Event
+title	mongoengine/tests/queryset/geo.py	/^            title="Coltrane Motion @ Double Door",$/;"	v	class:GeoQueriesTest._create_event_data.Event
+title	mongoengine/tests/queryset/geo.py	/^            title="Coltrane Motion @ Empty Bottle",$/;"	v	class:GeoQueriesTest._create_event_data.Event
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_bulk.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_call_after_limits_set.Post
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_clear_ordering.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_count_limit_and_skip.Post
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField.Book
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Book
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_map_reduce.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_no_ordering_for_get.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_ordering.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Message
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_text_indexes.News
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_update.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField(db_field='bpTitle')$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField(primary_key=True)$/;"	v	class:QuerySetTest.test_map_reduce_with_custom_object_ids.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField(required=True)$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Post
+title	mongoengine/tests/queryset/queryset.py	/^            title = StringField(unique=True)$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
+title	mongoengine/tests/queryset/queryset.py	/^            title="A",$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="B",$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #1",$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #1",$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #1",$/;"	v	class:QuerySetTest.test_ordering.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #2",$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #2",$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #2",$/;"	v	class:QuerySetTest.test_ordering.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #3",$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #3",$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #3",$/;"	v	class:QuerySetTest.test_ordering.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #4",$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
+title	mongoengine/tests/queryset/queryset.py	/^            title="C",$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
+title	mongoengine/tests/queryset/transform.py	/^            title = StringField()$/;"	v	class:TransformTest.test_understandable_error_raised.Event
+title	mongoengine/tests/queryset/transform.py	/^            title = StringField(db_field='postTitle')$/;"	v	class:TransformTest.test_query_field_name.BlogPost
+title	mongoengine/tests/queryset/transform.py	/^            title = StringField(primary_key=True, db_field='postTitle')$/;"	v	class:TransformTest.test_query_pk_field_name.BlogPost
+title	mongoengine/tests/queryset/visitor.py	/^            title = StringField()$/;"	v	class:QTest.test_q.BlogPost
+title	mongoengine/tests/queryset/visitor.py	/^            title = StringField(max_length=40)$/;"	v	class:QTest.test_multiple_occurence_in_field.Test
+title	mongoengine/tests/test_dereference.py	/^            title = StringField()$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
+title	mongoengine/tests/test_dereference.py	/^            title = StringField()$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.Song
+title	mongoengine/tests/test_dereference.py	/^            title = StringField(max_length=255, primary_key=True)$/;"	v	class:FieldTest.test_non_ascii_pk.Brand
+title	mongoengine/tests/test_dereference.py	/^            title = StringField(max_length=255, primary_key=True)$/;"	v	class:FieldTest.test_non_ascii_pk.BrandGroup
+title	mongoengine/tests/test_signals.py	/^            title = StringField()$/;"	v	class:SignalTests.setUp.Post
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference.Link
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference.Post
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices.Link
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices.Post
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Post
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_document_not_registered.Link
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list.Link
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list.Post
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_choices.Link
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_choices.Post
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.Post
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_string_choices.Link
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_string_choices.Post
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_reference_query_conversion.BlogPost
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.BlogPost
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.BlogPost
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.BlogPost
+title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.BlogPost
+title	tests/fields/fields.py	/^            title = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
+title	tests/fields/fields.py	/^            title = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Post
+to	mongoengine/tests/queryset/field_list.py	/^            to = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
+to	mongoengine/tests/queryset/field_list.py	/^            to = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
+to_dbref	mongoengine/mongoengine/document.py	/^    def to_dbref(self):$/;"	m	class:Document
+to_dict	mongoengine/mongoengine/errors.py	/^    def to_dict(self):$/;"	m	class:ValidationError
+to_json	mongoengine/mongoengine/base/document.py	/^    def to_json(self, *args, **kwargs):$/;"	m	class:BaseDocument
+to_json	mongoengine/mongoengine/queryset/base.py	/^    def to_json(self, *args, **kwargs):$/;"	m	class:BaseQuerySet
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:GenericLazyReferenceField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:GenericReferenceField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:ReferenceField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document, use_db_field=True, fields=None):$/;"	m	class:CachedReferenceField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document, use_db_field=True, fields=None):$/;"	m	class:GenericEmbeddedDocumentField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:BinaryField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:ComplexDateTimeField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:DateTimeField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:DecimalField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:FileField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:LazyReferenceField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:LongField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:UUIDField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:DynamicField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:EmbeddedDocumentField
+to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:SortedListField
+to_mongo	mongoengine/mongoengine/base/document.py	/^    def to_mongo(self, use_db_field=True, fields=None):$/;"	m	class:BaseDocument
+to_mongo	mongoengine/mongoengine/base/fields.py	/^    def to_mongo(self, value):$/;"	m	class:BaseField
+to_mongo	mongoengine/mongoengine/base/fields.py	/^    def to_mongo(self, value):$/;"	m	class:GeoJsonBaseField
+to_mongo	mongoengine/mongoengine/base/fields.py	/^    def to_mongo(self, value):$/;"	m	class:ObjectIdField
+to_mongo	mongoengine/mongoengine/base/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:ComplexBaseField
+to_mongo	mongoengine/mongoengine/document.py	/^    def to_mongo(self, *args, **kwargs):$/;"	m	class:Document
+to_mongo	mongoengine/mongoengine/document.py	/^    def to_mongo(self, *args, **kwargs):$/;"	m	class:EmbeddedDocument
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:GenericLazyReferenceField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:GenericReferenceField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:ReferenceField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document, use_db_field=True, fields=None):$/;"	m	class:CachedReferenceField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document, use_db_field=True, fields=None):$/;"	m	class:GenericEmbeddedDocumentField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:BinaryField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:ComplexDateTimeField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:DateTimeField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:DecimalField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:FileField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:LazyReferenceField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:LongField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:UUIDField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:DynamicField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:EmbeddedDocumentField
+to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:SortedListField
+to_mongo	mongoengine/tests/fields/fields.py	/^            def to_mongo(self, value):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
+to_mongo	tests/fields/fields.py	/^            def to_mongo(self, value):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:BooleanField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:CachedReferenceField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:ComplexDateTimeField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:DecimalField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:DynamicField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:EmbeddedDocumentField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:FileField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:FloatField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:GenericEmbeddedDocumentField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:IntField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:LongField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:ReferenceField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:SequenceField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:StringField
+to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:UUIDField
+to_python	mongoengine/mongoengine/base/fields.py	/^    def to_python(self, value):$/;"	m	class:BaseField
+to_python	mongoengine/mongoengine/base/fields.py	/^    def to_python(self, value):$/;"	m	class:ComplexBaseField
+to_python	mongoengine/mongoengine/base/fields.py	/^    def to_python(self, value):$/;"	m	class:ObjectIdField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:BooleanField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:CachedReferenceField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:ComplexDateTimeField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:DecimalField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:DynamicField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:EmbeddedDocumentField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:FileField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:FloatField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:GenericEmbeddedDocumentField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:IntField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:LongField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:ReferenceField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:SequenceField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:StringField
+to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:UUIDField
+to_python	mongoengine/tests/fields/fields.py	/^            def to_python(self, value):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
+to_python	tests/fields/fields.py	/^            def to_python(self, value):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
+to_query	mongoengine/mongoengine/queryset/visitor.py	/^    def to_query(self, document):$/;"	m	class:QNode
+toggle	mongoengine/tests/document/instance.py	/^            toggle = BooleanField(default=False)$/;"	v	class:InstanceTest.test_save_atomicity_condition.Widget
+topic	mongoengine/tests/test_dereference.py	/^            topic = ReferenceField(Topic)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.Message
+tp	mongoengine/tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+tp	mongoengine/tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+tp	mongoengine/tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+tp	mongoengine/tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+tp	tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
+tp	tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
+tp	tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+tp	tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
+txt	mongoengine/tests/document/indexes.py	/^            txt = StringField()$/;"	v	class:IndexesTest.test_index_dont_send_cls_option.TestDoc
+txt	mongoengine/tests/fields/fields.py	/^            txt = StringField()$/;"	v	class:FieldTest.test_double_embedded_db_field.C
+txt	mongoengine/tests/fields/fields.py	/^            txt = StringField()$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.C
+txt	mongoengine/tests/queryset/queryset.py	/^            txt = StringField()$/;"	v	class:QuerySetTest.test_read_preference.Bar
+txt	tests/fields/fields.py	/^            txt = StringField()$/;"	v	class:FieldTest.test_double_embedded_db_field.C
+txt	tests/fields/fields.py	/^            txt = StringField()$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.C
+txt2	mongoengine/tests/document/indexes.py	/^            txt2 = StringField()$/;"	v	class:IndexesTest.test_index_dont_send_cls_option.TestChildDoc
+txt_1	mongoengine/tests/document/indexes.py	/^            txt_1 = StringField()$/;"	v	class:IndexesTest.test_compound_index_underscore_cls_not_overwritten.TestDoc
+type	mongoengine/tests/document/delta.py	/^            type = StringField()$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedRole
+type	mongoengine/tests/queryset/transform.py	/^            type = StringField()$/;"	v	class:TransformTest.test_last_field_name_like_operator.EmbeddedItem
+unhelpful	mongoengine/tests/queryset/queryset.py	/^            unhelpful = ListField(EmbeddedDocumentField(User))$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Collaborator
+up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=1079,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=1446,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=215,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=48,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=481,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=74,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+up_votes	mongoengine/tests/queryset/queryset.py	/^            up_votes = IntField()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
+update	mongoengine/mongoengine/base/datastructures.py	/^    def update(self, **update):$/;"	m	class:EmbeddedDocumentList
+update	mongoengine/mongoengine/base/datastructures.py	/^    def update(self, *args, **kwargs):$/;"	m	class:BaseDict
+update	mongoengine/mongoengine/document.py	/^    def update(self, **kwargs):$/;"	m	class:Document
+update	mongoengine/mongoengine/queryset/base.py	/^    def update(self, upsert=False, multi=True, write_concern=None,$/;"	m	class:BaseQuerySet
+update	mongoengine/mongoengine/queryset/transform.py	/^def update(_doc_cls=None, **update):$/;"	f
+update	mongoengine/tests/queryset/transform.py	/^            update = transform.update(DicDoc, **{"%s__dictField__test" % k: doc})$/;"	v	class:TransformTest.test_transform_update.Doc
+update_one	mongoengine/mongoengine/queryset/base.py	/^    def update_one(self, upsert=False, write_concern=None, **update):$/;"	m	class:BaseQuerySet
+upsert_one	mongoengine/mongoengine/queryset/base.py	/^    def upsert_one(self, write_concern=None, **update):$/;"	m	class:BaseQuerySet
+url	mongoengine/tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_unicode_url_validation.Link
+url	mongoengine/tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_url_scheme_validation.Link
+url	mongoengine/tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_url_validation.Link
+url	mongoengine/tests/fields/fields.py	/^            url = URLField(schemes=['ws', 'irc'])$/;"	v	class:FieldTest.test_url_scheme_validation.SchemeLink
+url	tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_unicode_url_validation.Link
+url	tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_url_scheme_validation.Link
+url	tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_url_validation.Link
+url	tests/fields/fields.py	/^            url = URLField(schemes=['ws', 'irc'])$/;"	v	class:FieldTest.test_url_scheme_validation.SchemeLink
+url_field	mongoengine/tests/document/instance.py	/^            url_field = URLField(default="http:\/\/mongoengine.org")$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+url_field	mongoengine/tests/document/json_serialisation.py	/^            url_field = URLField(default="http:\/\/mongoengine.org")$/;"	v	class:TestJson.test_json_complex.Doc
+url_field	mongoengine/tests/queryset/queryset.py	/^            url_field = URLField(default="http:\/\/mongoengine.org")$/;"	v	class:QuerySetTest.test_json_complex.Doc
+use_db_field	mongoengine/tests/document/instance.py	/^            use_db_field=False).to_dict()$/;"	v	class:InstanceTest.test_embedded_document_complex_instance_no_use_db_field.Doc
+user	mongoengine/tests/document/instance.py	/^            user = ReferenceField(User)$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
+user	mongoengine/tests/document/instance.py	/^            user = ReferenceField(User,$/;"	v	class:InstanceTest.test_list_search_by_embedded.Comment
+user	mongoengine/tests/document/instance.py	/^            user = User.objects.first()$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
+user	mongoengine/tests/queryset/queryset.py	/^            user = ReferenceField(User)$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Member
+user	mongoengine/tests/queryset/queryset.py	/^            user = StringField()$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Collaborator
+user	mongoengine/tests/queryset/queryset.py	/^            user = StringField()$/;"	v	class:QuerySetTest.test_pull_nested.Collaborator
+user	mongoengine/tests/test_dereference.py	/^            user = User(name='user %s' % i)$/;"	v	class:FieldTest.test_handle_old_style_references.Group
+user	mongoengine/tests/test_dereference.py	/^            user = User(name='user %s' % i)$/;"	v	class:FieldTest.test_list_item_dereference.Group
+user	mongoengine/tests/test_dereference.py	/^            user = User(name='user %s' % i)$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
+user	mongoengine/tests/test_dereference.py	/^            user = User(name='user %s' % i)$/;"	v	class:FieldTest.test_map_field_reference.Group
+user_guid	mongoengine/tests/document/indexes.py	/^            user_guid = StringField(required=True)$/;"	v	class:IndexesTest.test_abstract_index_inheritance.UserBase
+user_guid	mongoengine/tests/document/indexes.py	/^            user_guid = StringField(required=True)$/;"	v	class:IndexesTest.test_disable_index_creation.User
+user_lists	mongoengine/tests/test_dereference.py	/^            user_lists = ListField(ListField(ReferenceField(User)))$/;"	v	class:FieldTest.test_list_of_lists_of_references.Post
+user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:FieldTest.test_reference_query_conversion.Member
+user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.Member
+user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.Member
+user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.Member
+user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.Member
+user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:FieldTest.test_reference_query_conversion.Member
+user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.Member
+user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.Member
+user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.Member
+user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.Member
+userid	mongoengine/tests/fields/fields.py	/^            userid = StringField()$/;"	v	class:FieldTest.test_required_values.Person
+userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
+userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
+userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
+userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(r'[0-9a-z_]+$')$/;"	v	class:FieldTest.test_string_validation.Person
+userid	tests/fields/fields.py	/^            userid = StringField()$/;"	v	class:FieldTest.test_required_values.Person
+userid	tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
+userid	tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
+userid	tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
+userid	tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
+userid	tests/fields/fields.py	/^            userid = StringField(r'[0-9a-z_]+$')$/;"	v	class:FieldTest.test_string_validation.Person
+username	mongoengine/tests/document/instance.py	/^            username = StringField(primary_key=True)$/;"	v	class:InstanceTest.test_custom_id_field.User
+username	mongoengine/tests/document/instance.py	/^            username = StringField(required=True)$/;"	v	class:InstanceTest.test_list_search_by_embedded.User
+username	mongoengine/tests/document/validation.py	/^            username = StringField(primary_key=True)$/;"	v	class:ValidatorErrorTest.test_model_validation.User
+username	mongoengine/tests/fields/fields.py	/^            username = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.User
+username	mongoengine/tests/queryset/field_list.py	/^            username = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.Base
+username	mongoengine/tests/queryset/queryset.py	/^            username = StringField()$/;"	v	class:QuerySetTest.test_set_generic_embedded_documents.User
+username	tests/fields/fields.py	/^            username = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.User
+users	mongoengine/tests/document/delta.py	/^            users = MapField(field=EmbeddedDocumentField(EmbeddedUser))$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.Doc
+users	mongoengine/tests/test_dereference.py	/^            users = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_of_lists_of_references.SimpleList
+using	mongoengine/mongoengine/queryset/base.py	/^    def using(self, alias):$/;"	m	class:BaseQuerySet
+uuid_field	mongoengine/tests/document/instance.py	/^            uuid_field = UUIDField(default=uuid.uuid4)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
+uuid_field	mongoengine/tests/document/json_serialisation.py	/^            uuid_field = UUIDField(default=uuid.uuid4)$/;"	v	class:TestJson.test_json_complex.Doc
+uuid_field	mongoengine/tests/queryset/queryset.py	/^            uuid_field = UUIDField(default=uuid.uuid4)$/;"	v	class:QuerySetTest.test_json_complex.Doc
+v	mongoengine/tests/document/instance.py	/^            v = StringField()$/;"	v	class:InstanceTest.test_list_iter.B
+vaccine_made	mongoengine/tests/document/class_methods.py	/^            vaccine_made = ListField(ReferenceField("Vaccine", reverse_delete_rule=PULL))$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Animal
+val	mongoengine/tests/document/validation.py	/^            val = IntField(required=True)$/;"	v	class:ValidatorErrorTest.test_embedded_db_field_validate.SubDoc
+val	mongoengine/tests/document/validation.py	/^            val = IntField(required=True)$/;"	v	class:ValidatorErrorTest.test_embedded_weakref.SubDoc
+val	mongoengine/tests/queryset/queryset.py	/^            val = BooleanField()$/;"	v	class:QuerySetTest.test_item_frequencies_with_False_values.Test
+val	mongoengine/tests/queryset/queryset.py	/^            val = IntField()$/;"	v	class:QuerySetTest.test_item_frequencies_normalize.Test
+val	mongoengine/tests/queryset/queryset.py	/^            val = IntField()$/;"	v	class:QuerySetTest.test_item_frequencies_with_0_values.Test
+val	mongoengine/tests/queryset/queryset.py	/^            val = IntField()$/;"	v	class:QuerySetTest.test_reload_embedded_docs_instance.SubDoc
+val	mongoengine/tests/queryset/queryset.py	/^            val = IntField()$/;"	v	class:QuerySetTest.test_reload_list_embedded_docs_instance.SubDoc
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:BinaryField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:BooleanField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:CachedReferenceField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ComplexDateTimeField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DateTimeField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DecimalField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DictField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:EmailField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:FileField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:FloatField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GenericLazyReferenceField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GenericReferenceField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GeoPointField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:IntField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:LazyReferenceField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ListField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:LongField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ReferenceField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:StringField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:URLField
+validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:UUIDField
+validate	mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:DynamicField
+validate	mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:EmbeddedDocumentField
+validate	mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:GenericEmbeddedDocumentField
+validate	mongoengine/mongoengine/base/document.py	/^    def validate(self, clean=True):$/;"	m	class:BaseDocument
+validate	mongoengine/mongoengine/base/fields.py	/^    def validate(self, value):$/;"	m	class:ComplexBaseField
+validate	mongoengine/mongoengine/base/fields.py	/^    def validate(self, value):$/;"	m	class:GeoJsonBaseField
+validate	mongoengine/mongoengine/base/fields.py	/^    def validate(self, value):$/;"	m	class:ObjectIdField
+validate	mongoengine/mongoengine/base/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:BaseField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:BinaryField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:BooleanField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:CachedReferenceField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ComplexDateTimeField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DateTimeField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DecimalField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DictField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:EmailField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:FileField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:FloatField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GenericLazyReferenceField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GenericReferenceField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GeoPointField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:IntField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:LazyReferenceField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ListField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:LongField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ReferenceField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:StringField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:URLField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:UUIDField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:DynamicField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:EmbeddedDocumentField
+validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:GenericEmbeddedDocumentField
+validate	mongoengine/tests/document/instance.py	/^                validate = DictField()$/;"	v	class:InstanceTest.test_override_method_with_field.Blog
+validate_domain_part	mongoengine/fields.py	/^    def validate_domain_part(self, domain_part):$/;"	m	class:EmailField
+validate_domain_part	mongoengine/mongoengine/fields.py	/^    def validate_domain_part(self, domain_part):$/;"	m	class:EmailField
+validate_user_part	mongoengine/fields.py	/^    def validate_user_part(self, user_part):$/;"	m	class:EmailField
+validate_user_part	mongoengine/mongoengine/fields.py	/^    def validate_user_part(self, user_part):$/;"	m	class:EmailField
+value	mongoengine/tests/document/instance.py	/^            value = DynamicField(default="UNDEFINED")$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Macro
+value	mongoengine/tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_complex_mapfield.IntegerSetting
+value	mongoengine/tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_dictfield_complex.IntegerSetting
+value	mongoengine/tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_list_field_complex.IntegerSetting
+value	mongoengine/tests/fields/fields.py	/^            value = LongField(min_value=0, max_value=110)$/;"	v	class:FieldTest.test_long_validation.TestDocument
+value	mongoengine/tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_complex_mapfield.StringSetting
+value	mongoengine/tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_dictfield_complex.StringSetting
+value	mongoengine/tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_list_field_complex.StringSetting
+value	mongoengine/tests/queryset/modify.py	/^    value = IntField()$/;"	v	class:Doc
+value	mongoengine/tests/queryset/queryset.py	/^            value = DecimalField()$/;"	v	class:QuerySetTest.test_embedded_average.Pay
+value	mongoengine/tests/queryset/queryset.py	/^            value = DecimalField()$/;"	v	class:QuerySetTest.test_embedded_sum.Pay
+value	mongoengine/tests/queryset/queryset.py	/^            value = StringField()$/;"	v	class:QuerySetTest.test_scalar_primary_key.SettingValue
+value	tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_complex_mapfield.IntegerSetting
+value	tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_dictfield_complex.IntegerSetting
+value	tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_list_field_complex.IntegerSetting
+value	tests/fields/fields.py	/^            value = LongField(min_value=0, max_value=110)$/;"	v	class:FieldTest.test_long_validation.TestDocument
+value	tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_complex_mapfield.StringSetting
+value	tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_dictfield_complex.StringSetting
+value	tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_list_field_complex.StringSetting
+value_list	mongoengine/tests/fields/fields.py	/^            value_list = ListField(field=StringField())$/;"	v	class:FieldTest.test_map_field_unicode.Info
+value_list	tests/fields/fields.py	/^            value_list = ListField(field=StringField())$/;"	v	class:FieldTest.test_map_field_unicode.Info
+values	mongoengine/tests/queryset/queryset.py	/^            values = ListField(DecimalField())$/;"	v	class:QuerySetTest.test_array_average.Doc
+values	mongoengine/tests/queryset/queryset.py	/^            values = ListField(DecimalField())$/;"	v	class:QuerySetTest.test_array_sum.Doc
+values	mongoengine/tests/queryset/queryset.py	/^            values = ListField(DecimalField())$/;"	v	class:QuerySetTest.test_embedded_array_average.Pay
+values	mongoengine/tests/queryset/queryset.py	/^            values = ListField(DecimalField())$/;"	v	class:QuerySetTest.test_embedded_array_sum.Pay
+values_list	mongoengine/mongoengine/queryset/base.py	/^    def values_list(self, *fields):$/;"	m	class:BaseQuerySet
+various	mongoengine/tests/queryset/field_list.py	/^            various = MapField(field=EmbeddedDocumentField(VariousData))$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.BlogPost
+venue	mongoengine/tests/fields/geo.py	/^            venue = EmbeddedDocumentField(Venue)$/;"	v	class:GeoFieldTest.test_geopoint_embedded_indexes.Event
+venue	mongoengine/tests/fields/geo.py	/^            venue = EmbeddedDocumentField(Venue)$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Event
+venue	mongoengine/tests/queryset/geo.py	/^                       venue=venue1).save()$/;"	v	class:GeoQueriesTest._test_embedded.Event
+venue	mongoengine/tests/queryset/geo.py	/^                       venue=venue2).save()$/;"	v	class:GeoQueriesTest._test_embedded.Event
+venue	mongoengine/tests/queryset/geo.py	/^            venue = EmbeddedDocumentField(Venue)$/;"	v	class:GeoQueriesTest._test_embedded.Event
+verbose_name	mongoengine/tests/fields/fields.py	/^                verbose_name="Type",$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+verbose_name	tests/fields/fields.py	/^                verbose_name="Type",$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
+version	mongoengine/docs/conf.py	/^version = mongoengine.get_version()$/;"	v
+version_line	mongoengine/setup.py	/^version_line = list(filter(lambda l: l.startswith('VERSION'), open(init)))[0]$/;"	v
+visit_combination	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_combination(self, combination):$/;"	m	class:QNodeVisitor
+visit_combination	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_combination(self, combination):$/;"	m	class:QueryCompilerVisitor
+visit_combination	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_combination(self, combination):$/;"	m	class:SimplificationVisitor
+visit_query	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_query(self, query):$/;"	m	class:QNodeVisitor
+visit_query	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_query(self, query):$/;"	m	class:QueryCompilerVisitor
+visited	mongoengine/tests/fields/fields.py	/^            visited = MapField(DateTimeField())$/;"	v	class:FieldTest.test_map_field_lookup.Log
+visited	tests/fields/fields.py	/^            visited = MapField(DateTimeField())$/;"	v	class:FieldTest.test_map_field_lookup.Log
+visited__friends__exists	mongoengine/tests/fields/fields.py	/^            visited__friends__exists=True).count())$/;"	v	class:FieldTest.test_map_field_lookup.Log
+visited__friends__exists	tests/fields/fields.py	/^            visited__friends__exists=True).count())$/;"	v	class:FieldTest.test_map_field_lookup.Log
+vote	mongoengine/tests/queryset/queryset.py	/^            vote = IntField()$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Comment
+votes	mongoengine/tests/queryset/queryset.py	/^            votes = EmbeddedDocumentField(Vote)$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.Comment
+votes	mongoengine/tests/queryset/queryset.py	/^            votes = IntField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator.Comment
+weight	mongoengine/tests/queryset/queryset.py	/^            weight = IntField()$/;"	v	class:QuerySetTest.setUp.PersonMeta
+where	mongoengine/mongoengine/queryset/base.py	/^    def where(self, where_clause):$/;"	m	class:BaseQuerySet
+whiskers_length	mongoengine/tests/queryset/queryset.py	/^            whiskers_length = FloatField()$/;"	v	class:QuerySetTest.test_subclass_field_query.Cat
+wibble	mongoengine/tests/queryset/field_list.py	/^            wibble = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.User
+widgets	mongoengine/tests/document/instance.py	/^            widgets = StringField()$/;"	v	class:InstanceTest.test_object_mixins.Bar
+widgets	mongoengine/tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_del_slice_marks_field_as_changed.Simple
+widgets	mongoengine/tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_list_field_with_negative_indices.Simple
+widgets	mongoengine/tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_slice_marks_field_as_changed.Simple
+widgets	tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_del_slice_marks_field_as_changed.Simple
+widgets	tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_list_field_with_negative_indices.Simple
+widgets	tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_slice_marks_field_as_changed.Simple
+with_id	mongoengine/mongoengine/queryset/base.py	/^    def with_id(self, object_id):$/;"	m	class:BaseQuerySet
+with_inactive	mongoengine/tests/queryset/queryset.py	/^            def with_inactive(doc_cls, queryset):$/;"	m	class:QuerySetTest.test_custom_manager_overriding_objects_works.Foo
+write	mongoengine/fields.py	/^    def write(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
+write	mongoengine/fields.py	/^    def write(self, string):$/;"	m	class:GridFSProxy
+write	mongoengine/mongoengine/fields.py	/^    def write(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
+write	mongoengine/mongoengine/fields.py	/^    def write(self, string):$/;"	m	class:GridFSProxy
+write_concern	mongoengine/tests/queryset/queryset.py	/^                            write_concern={"w": 0, 'continue_on_error': True})$/;"	v	class:QuerySetTest.test_bulk_insert.Author
+writelines	mongoengine/fields.py	/^    def writelines(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
+writelines	mongoengine/fields.py	/^    def writelines(self, lines):$/;"	m	class:GridFSProxy
+writelines	mongoengine/mongoengine/fields.py	/^    def writelines(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
+writelines	mongoengine/mongoengine/fields.py	/^    def writelines(self, lines):$/;"	m	class:GridFSProxy
+x	mongoengine/tests/document/instance.py	/^            x = IntField(required=True)$/;"	v	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
+x	mongoengine/tests/queryset/queryset.py	/^            x = IntField()$/;"	v	class:QuerySetTest.test_no_sub_classes.A
+x	mongoengine/tests/queryset/queryset.py	/^            x = IntField()$/;"	v	class:QuerySetTest.test_scalar_db_field.TestDoc
+x	mongoengine/tests/queryset/queryset.py	/^            x = IntField()$/;"	v	class:QuerySetTest.test_scalar_simple.TestDoc
+x	mongoengine/tests/queryset/queryset.py	/^            x = ListField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator_matches_first.Simple
+x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_and_combination.TestDoc
+x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_and_or_combination.TestDoc
+x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_or_and_or_combination.TestDoc
+x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_or_combination.TestDoc
+x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_q_clone.TestDoc
+x	mongoengine/tests/test_context_managers.py	/^            x = IntField()$/;"	v	class:ContextManagersTest.test_no_sub_classes.A
+y	mongoengine/tests/document/instance.py	/^            y = IntField(required=True)$/;"	v	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
+y	mongoengine/tests/queryset/queryset.py	/^            y = BooleanField()$/;"	v	class:QuerySetTest.test_scalar_db_field.TestDoc
+y	mongoengine/tests/queryset/queryset.py	/^            y = BooleanField()$/;"	v	class:QuerySetTest.test_scalar_simple.TestDoc
+y	mongoengine/tests/queryset/queryset.py	/^            y = IntField()$/;"	v	class:QuerySetTest.test_no_sub_classes.A
+y	mongoengine/tests/queryset/visitor.py	/^            y = BooleanField()$/;"	v	class:QTest.test_and_or_combination.TestDoc
+y	mongoengine/tests/queryset/visitor.py	/^            y = BooleanField()$/;"	v	class:QTest.test_or_and_or_combination.TestDoc
+y	mongoengine/tests/queryset/visitor.py	/^            y = StringField()$/;"	v	class:QTest.test_and_combination.TestDoc
+y	mongoengine/tests/test_context_managers.py	/^            y = IntField()$/;"	v	class:ContextManagersTest.test_no_sub_classes.A
+year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_embedded_document_index.Date
+year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_unique_embedded_document.SubDocument
+year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_unique_embedded_document_in_list.SubDocument
+year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_unique_with.Date
+year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.SubDocument
+years	mongoengine/tests/document/instance.py	/^            years = IntField()$/;"	v	class:InstanceTest.setUp.Job
+z	mongoengine/tests/document/instance.py	/^            z = IntField(required=True)$/;"	v	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
+z	mongoengine/tests/queryset/queryset.py	/^            z = IntField()$/;"	v	class:QuerySetTest.test_no_sub_classes.B
+z	mongoengine/tests/test_context_managers.py	/^            z = IntField()$/;"	v	class:ContextManagersTest.test_no_sub_classes.B
+zz	mongoengine/tests/queryset/queryset.py	/^            zz = IntField()$/;"	v	class:QuerySetTest.test_no_sub_classes.C
+zz	mongoengine/tests/test_context_managers.py	/^            zz = IntField()$/;"	v	class:ContextManagersTest.test_no_sub_classes.C
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 0f3258497..b09c0a2de 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1698,6 +1698,10 @@ class BlogPost(Document):
         post.info = {'title': 'test'}
         post.save()
 
+        post = BlogPost()
+        post.info = {'title' : 'dollar_sign', 'details' : {'te$t' : 'test'} }
+        post.save()
+
         post = BlogPost()
         post.info = {'details': {'test': 'test'}}
         post.save()
@@ -1706,12 +1710,15 @@ class BlogPost(Document):
         post.info = {'details': {'test': 3}}
         post.save()
 
-        self.assertEqual(BlogPost.objects.count(), 3)
+        self.assertEqual(BlogPost.objects.count(), 4)
         self.assertEqual(
             BlogPost.objects.filter(info__title__exact='test').count(), 1)
         self.assertEqual(
             BlogPost.objects.filter(info__details__test__exact='test').count(), 1)
 
+        post = BlogPost.objects.filter(info__title__exact='dollar_sign').first()
+        self.assertIn('te$t', post['info']['details'])
+         
         # Confirm handles non strings or non existing keys
         self.assertEqual(
             BlogPost.objects.filter(info__details__test__exact=5).count(), 0)

From b525c91bd34861b7689958f7a2b976a00ff1ebee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 19 Dec 2018 20:33:37 +0100
Subject: [PATCH 0742/1519] remove tags file that shouldnt be added to
 situkangsayur s commit

---
 tags | 6449 ----------------------------------------------------------
 1 file changed, 6449 deletions(-)
 delete mode 100644 tags

diff --git a/tags b/tags
deleted file mode 100644
index 88c92b071..000000000
--- a/tags
+++ /dev/null
@@ -1,6449 +0,0 @@
-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/dhiebert@users.sourceforge.net/
-!_TAG_PROGRAM_NAME	Exuberant Ctags	//
-!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
-!_TAG_PROGRAM_VERSION	5.9~svn20110310	//
-A	mongoengine/tests/document/indexes.py	/^        class A(Document):$/;"	c	function:IndexesTest.test_index_no_cls
-A	mongoengine/tests/document/indexes.py	/^        class A(Document):$/;"	c	function:IndexesTest.test_inherited_index
-A	mongoengine/tests/document/inheritance.py	/^        class A(Document):$/;"	c	function:InheritanceTest.test_indexes_and_multiple_inheritance
-A	mongoengine/tests/document/inheritance.py	/^        class A(EmbeddedDocument):$/;"	c	function:InheritanceTest.test_abstract_embedded_documents
-A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.subclasses_and_unique_keys_works
-A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.test_db_alias_overrides
-A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.test_db_alias_propagates
-A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.test_list_iter
-A	mongoengine/tests/document/instance.py	/^        class A(Document):$/;"	c	function:InstanceTest.test_mutating_documents
-A	mongoengine/tests/fields/fields.py	/^        class A(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
-A	mongoengine/tests/fields/fields.py	/^        class A(Document):$/;"	c	function:FieldTest.test_double_embedded_db_field
-A	mongoengine/tests/fields/fields.py	/^        class A(Document):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
-A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_batch_size
-A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_chaining
-A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_count_list_embedded
-A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_no_sub_classes
-A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_none
-A	mongoengine/tests/queryset/queryset.py	/^        class A(Document):$/;"	c	function:QuerySetTest.test_query_reference_to_custom_pk_doc
-A	mongoengine/tests/queryset/queryset.py	/^        class A(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_query_generic_embedded_document
-A	mongoengine/tests/queryset/transform.py	/^        class A(Document):$/;"	c	function:TransformTest.test_chaining
-A	mongoengine/tests/test_context_managers.py	/^        class A(Document):$/;"	c	function:ContextManagersTest.test_no_sub_classes
-A	tests/fields/fields.py	/^        class A(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
-A	tests/fields/fields.py	/^        class A(Document):$/;"	c	function:FieldTest.test_double_embedded_db_field
-A	tests/fields/fields.py	/^        class A(Document):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
-ALLSPHINXOPTS	mongoengine/docs/Makefile	/^ALLSPHINXOPTS   = -d $(BUILDDIR)\/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .$/;"	m
-AND	mongoengine/mongoengine/queryset/visitor.py	/^    AND = 0$/;"	v	class:QNode
-AbstractBlogPost	mongoengine/tests/queryset/queryset.py	/^        class AbstractBlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document
-AbstractBlogPost	mongoengine/tests/queryset/queryset.py	/^        class AbstractBlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document
-AbstractBlogPost	mongoengine/tests/queryset/queryset.py	/^        class AbstractBlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document
-AbstractBlogPost	mongoengine/tests/queryset/queryset.py	/^        class AbstractBlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents
-AbstractDoc	mongoengine/tests/fields/fields.py	/^        class AbstractDoc(Document):$/;"	c	function:FieldTest.test_drop_abstract_document
-AbstractDoc	tests/fields/fields.py	/^        class AbstractDoc(Document):$/;"	c	function:FieldTest.test_drop_abstract_document
-Account	mongoengine/tests/document/instance.py	/^        class Account(Document):$/;"	c	function:InstanceTest.test_instance_is_set_on_setattr
-Account	mongoengine/tests/document/instance.py	/^        class Account(Document):$/;"	c	function:InstanceTest.test_instance_is_set_on_setattr_on_embedded_document_list
-AcloholicDrink	mongoengine/tests/document/inheritance.py	/^            class AcloholicDrink(Drink):$/;"	c	class:InheritanceTest.test_inherited_collections.Drinker
-Action	mongoengine/tests/fields/fields.py	/^        class Action(EmbeddedDocument):$/;"	c	function:FieldTest.test_map_field_lookup
-Action	tests/fields/fields.py	/^        class Action(EmbeddedDocument):$/;"	c	function:FieldTest.test_map_field_lookup
-Actor	mongoengine/tests/document/instance.py	/^        class Actor(self.Person):$/;"	c	function:InstanceTest.test_queryset_resurrects_dropped_collection
-Address	mongoengine/tests/document/dynamic.py	/^        class Address(DynamicEmbeddedDocument):$/;"	c	function:DynamicTest.test_dynamic_embedded_works_with_only
-Address	mongoengine/tests/document/dynamic.py	/^        class Address(EmbeddedDocument):$/;"	c	function:DynamicTest.test_dynamic_and_embedded
-Address	mongoengine/tests/document/dynamic.py	/^        class Address(EmbeddedDocument):$/;"	c	function:DynamicTest.test_dynamic_and_embedded_dict_access
-AlcoholicDrink	mongoengine/tests/document/inheritance.py	/^            class AlcoholicDrink(Drink):$/;"	c	class:InheritanceTest.test_inherited_collections.Drinker
-AllWarnings	mongoengine/tests/all_warnings/__init__.py	/^class AllWarnings(unittest.TestCase):$/;"	c
-Animal	mongoengine/tests/document/class_methods.py	/^        class Animal(Document):$/;"	c	function:ClassMethodsTest.test_register_delete_rule_inherited
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Base): pass$/;"	c	function:InheritanceTest.test_external_subclasses
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Base): pass$/;"	c	function:InheritanceTest.test_external_superclasses
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_abstract_documents
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_allow_inheritance
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_cant_turn_off_inheritance_on_subclass
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_dynamic_declarations
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_polymorphic_queries
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_subclasses
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(Document):$/;"	c	function:InheritanceTest.test_superclasses
-Animal	mongoengine/tests/document/inheritance.py	/^        class Animal(FinalDocument):$/;"	c	function:InheritanceTest.test_allow_inheritance_abstract_document
-Animal	mongoengine/tests/document/instance.py	/^        class Animal(Document):$/;"	c	function:InstanceTest.test_polymorphic_references
-Animal	mongoengine/tests/document/instance.py	/^        class Animal(Document):$/;"	c	function:InstanceTest.test_reload_sharded
-Animal	mongoengine/tests/document/instance.py	/^        class Animal(Document):$/;"	c	function:InstanceTest.test_reload_sharded_nested
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_get_and_save
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_cls_field
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields_on_docs
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_sequence_fields_reload
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_equality
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_not_set
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_passthrough
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
-Animal	mongoengine/tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_simple
-Animal	mongoengine/tests/fields/file_tests.py	/^        class Animal(Document):$/;"	c	function:FileTest.test_complex_field_filefield
-Animal	mongoengine/tests/fields/file_tests.py	/^        class Animal(Document):$/;"	c	function:FileTest.test_file_saving
-Animal	mongoengine/tests/queryset/queryset.py	/^        class Animal(Document):$/;"	c	function:QuerySetTest.test_cls_query_in_subclassed_docs
-Animal	mongoengine/tests/queryset/queryset.py	/^        class Animal(Document):$/;"	c	function:QuerySetTest.test_subclass_field_query
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_get_and_save
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_cls_field
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields_on_docs
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:FieldTest.test_sequence_fields_reload
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_equality
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_not_set
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_passthrough
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
-Animal	tests/fields/fields.py	/^        class Animal(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_simple
-Anon	mongoengine/tests/queryset/field_list.py	/^        class Anon(Base):$/;"	c	function:OnlyExcludeAllTest.test_exclude_from_subclasses_docs
-Another	mongoengine/tests/test_signals.py	/^        class Another(Document):$/;"	c	function:SignalTests.setUp
-Area	mongoengine/tests/document/instance.py	/^        class Area(Location):$/;"	c	function:InstanceTest.test_document_registry_regressions
-Article	mongoengine/tests/document/instance.py	/^        class Article(Document):$/;"	c	function:InstanceTest.test_repr
-Article	mongoengine/tests/document/instance.py	/^        class Article(Document):$/;"	c	function:InstanceTest.test_repr_none
-Asset	mongoengine/tests/test_dereference.py	/^        class Asset(Document):$/;"	c	function:FieldTest.test_multidirectional_lists
-Attachment	mongoengine/tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_field_primary
-Attachment	mongoengine/tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_field_primary_filter_by_binary_pk_as_str
-Attachment	mongoengine/tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_fields
-Attachment	mongoengine/tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_validation
-Attachment	mongoengine/tests/queryset/field_list.py	/^        class Attachment(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_exclude_only_combining
-Attachment	tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_field_primary
-Attachment	tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_field_primary_filter_by_binary_pk_as_str
-Attachment	tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_fields
-Attachment	tests/fields/fields.py	/^        class Attachment(Document):$/;"	c	function:FieldTest.test_binary_validation
-AttachmentRequired	mongoengine/tests/fields/fields.py	/^        class AttachmentRequired(Document):$/;"	c	function:FieldTest.test_binary_validation
-AttachmentRequired	tests/fields/fields.py	/^        class AttachmentRequired(Document):$/;"	c	function:FieldTest.test_binary_validation
-AttachmentSizeLimit	mongoengine/tests/fields/fields.py	/^        class AttachmentSizeLimit(Document):$/;"	c	function:FieldTest.test_binary_validation
-AttachmentSizeLimit	tests/fields/fields.py	/^        class AttachmentSizeLimit(Document):$/;"	c	function:FieldTest.test_binary_validation
-Author	mongoengine/tests/fields/fields.py	/^        class Author(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_validation
-Author	mongoengine/tests/queryset/queryset.py	/^        class Author(Document):$/;"	c	function:QuerySetTest.test_bulk_insert
-Author	mongoengine/tests/queryset/queryset.py	/^        class Author(Document):$/;"	c	function:QuerySetTest.test_confirm_order_by_reference_wont_work
-Author	mongoengine/tests/queryset/queryset.py	/^        class Author(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField
-Author	mongoengine/tests/queryset/queryset.py	/^        class Author(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField
-Author	mongoengine/tests/queryset/queryset.py	/^        class Author(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_set_list_embedded_documents
-Author	mongoengine/tests/test_signals.py	/^        class Author(Document):$/;"	c	function:SignalTests.setUp
-Author	tests/fields/fields.py	/^        class Author(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_validation
-AuthorBooks	mongoengine/tests/document/instance.py	/^        class AuthorBooks(Document):$/;"	c	function:InstanceTest.test_db_alias_tests
-B	mongoengine/tests/document/indexes.py	/^        class B(A):$/;"	c	function:IndexesTest.test_index_no_cls
-B	mongoengine/tests/document/indexes.py	/^        class B(A):$/;"	c	function:IndexesTest.test_inherited_index
-B	mongoengine/tests/document/inheritance.py	/^        class B(A):$/;"	c	function:InheritanceTest.test_abstract_embedded_documents
-B	mongoengine/tests/document/inheritance.py	/^        class B(Document):$/;"	c	function:InheritanceTest.test_indexes_and_multiple_inheritance
-B	mongoengine/tests/document/instance.py	/^        class B(A):$/;"	c	function:InstanceTest.subclasses_and_unique_keys_works
-B	mongoengine/tests/document/instance.py	/^        class B(A):$/;"	c	function:InstanceTest.test_db_alias_overrides
-B	mongoengine/tests/document/instance.py	/^        class B(A):$/;"	c	function:InstanceTest.test_db_alias_propagates
-B	mongoengine/tests/document/instance.py	/^        class B(EmbeddedDocument):$/;"	c	function:InstanceTest.test_list_iter
-B	mongoengine/tests/document/instance.py	/^        class B(EmbeddedDocument):$/;"	c	function:InstanceTest.test_mutating_documents
-B	mongoengine/tests/fields/fields.py	/^        class B(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
-B	mongoengine/tests/fields/fields.py	/^        class B(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field
-B	mongoengine/tests/fields/fields.py	/^        class B(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
-B	mongoengine/tests/queryset/queryset.py	/^        class B(A):$/;"	c	function:QuerySetTest.test_no_sub_classes
-B	mongoengine/tests/queryset/queryset.py	/^        class B(Document):$/;"	c	function:QuerySetTest.test_chaining
-B	mongoengine/tests/queryset/queryset.py	/^        class B(Document):$/;"	c	function:QuerySetTest.test_query_reference_to_custom_pk_doc
-B	mongoengine/tests/queryset/queryset.py	/^        class B(Document):$/;"	c	function:QuerySetTest.test_save_and_only_on_fields_with_default
-B	mongoengine/tests/queryset/queryset.py	/^        class B(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_count_list_embedded
-B	mongoengine/tests/queryset/queryset.py	/^        class B(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_query_generic_embedded_document
-B	mongoengine/tests/queryset/transform.py	/^        class B(Document):$/;"	c	function:TransformTest.test_chaining
-B	mongoengine/tests/test_context_managers.py	/^        class B(A):$/;"	c	function:ContextManagersTest.test_no_sub_classes
-B	tests/fields/fields.py	/^        class B(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
-B	tests/fields/fields.py	/^        class B(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field
-B	tests/fields/fields.py	/^        class B(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
-BUILDDIR	mongoengine/docs/Makefile	/^BUILDDIR      = _build$/;"	m
-BadDoc	mongoengine/tests/fields/fields.py	/^        class BadDoc(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
-BadDoc	mongoengine/tests/fields/fields.py	/^        class BadDoc(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
-BadDoc	tests/fields/fields.py	/^        class BadDoc(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
-BadDoc	tests/fields/fields.py	/^        class BadDoc(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
-Bar	mongoengine/tests/document/instance.py	/^        class Bar(Document):$/;"	c	function:InstanceTest.test_shard_key_in_embedded_document
-Bar	mongoengine/tests/document/instance.py	/^        class Bar(Document):$/;"	c	function:InstanceTest.test_two_way_reverse_delete_rule
-Bar	mongoengine/tests/document/instance.py	/^        class Bar(Document, NameMixin):$/;"	c	function:InstanceTest.test_object_mixins
-Bar	mongoengine/tests/fields/fields.py	/^        class Bar(Base):$/;"	c	function:FieldTest.test_inherited_sequencefield
-Bar	mongoengine/tests/fields/fields.py	/^        class Bar(Base):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
-Bar	mongoengine/tests/fields/fields.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_list_field_passed_in_value
-Bar	mongoengine/tests/fields/fields.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_reference_miss
-Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_distinct_ListField_ReferenceField
-Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_references
-Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_references_to_alias
-Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_elem_match
-Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_pull_in_genericembedded_field
-Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Document):$/;"	c	function:QuerySetTest.test_read_preference
-Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_set_generic_embedded_documents
-Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Foo):$/;"	c	function:QuerySetTest.test_inherit_objects
-Bar	mongoengine/tests/queryset/queryset.py	/^        class Bar(Foo):$/;"	c	function:QuerySetTest.test_inherit_objects_override
-Bar	mongoengine/tests/test_dereference.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_document_reload_no_inheritance
-Bar	tests/fields/fields.py	/^        class Bar(Base):$/;"	c	function:FieldTest.test_inherited_sequencefield
-Bar	tests/fields/fields.py	/^        class Bar(Base):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
-Bar	tests/fields/fields.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_list_field_passed_in_value
-Bar	tests/fields/fields.py	/^        class Bar(Document):$/;"	c	function:FieldTest.test_reference_miss
-Base	mongoengine/tests/fields/fields.py	/^        class Base(Document):$/;"	c	function:FieldTest.test_inherited_sequencefield
-Base	mongoengine/tests/fields/fields.py	/^        class Base(Document):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
-Base	mongoengine/tests/fixtures.py	/^class Base(Document):$/;"	c
-Base	mongoengine/tests/queryset/field_list.py	/^        class Base(Document):$/;"	c	function:OnlyExcludeAllTest.test_exclude_from_subclasses_docs
-Base	mongoengine/tests/queryset/queryset.py	/^        class Base(Document):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited
-Base	mongoengine/tests/queryset/queryset.py	/^        class Base(Document):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited_direct
-Base	tests/fields/fields.py	/^        class Base(Document):$/;"	c	function:FieldTest.test_inherited_sequencefield
-Base	tests/fields/fields.py	/^        class Base(Document):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
-BaseDict	mongoengine/mongoengine/base/datastructures.py	/^class BaseDict(dict):$/;"	c
-BaseDocument	mongoengine/mongoengine/base/document.py	/^class BaseDocument(object):$/;"	c
-BaseDocument	mongoengine/tests/document/class_methods.py	/^        class BaseDocument(Document):$/;"	c	function:ClassMethodsTest.test_collection_naming
-BaseDocument	mongoengine/tests/document/class_methods.py	/^        class BaseDocument(Document, BaseMixin):$/;"	c	function:ClassMethodsTest.test_collection_naming
-BaseField	mongoengine/mongoengine/base/fields.py	/^class BaseField(object):$/;"	c
-BaseList	mongoengine/mongoengine/base/datastructures.py	/^class BaseList(list):$/;"	c
-BaseMixIn	mongoengine/tests/document/instance.py	/^        class BaseMixIn(object):$/;"	c	function:InstanceTest.test_mixin_inheritance
-BaseMixin	mongoengine/tests/document/class_methods.py	/^        class BaseMixin(object):$/;"	c	function:ClassMethodsTest.test_collection_naming
-BasePerson	mongoengine/tests/document/validation.py	/^        class BasePerson(Document):$/;"	c	function:ValidatorErrorTest.test_fields_rewrite
-BaseQuerySet	mongoengine/mongoengine/queryset/base.py	/^class BaseQuerySet(object):$/;"	c
-Basedoc	mongoengine/tests/fields/fields.py	/^        class Basedoc(Document):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
-Basedoc	tests/fields/fields.py	/^        class Basedoc(Document):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
-BasesTuple	mongoengine/mongoengine/base/metaclasses.py	/^class BasesTuple(tuple):$/;"	c
-Basket	mongoengine/tests/fields/fields.py	/^        class Basket(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields
-Basket	tests/fields/fields.py	/^        class Basket(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields
-Baz	mongoengine/tests/test_dereference.py	/^        class Baz(Document):$/;"	c	function:FieldTest.test_document_reload_no_inheritance
-BigPerson	mongoengine/tests/fields/fields.py	/^        class BigPerson(Document):$/;"	c	function:FieldTest.test_float_validation
-BigPerson	tests/fields/fields.py	/^        class BigPerson(Document):$/;"	c	function:FieldTest.test_float_validation
-BinaryField	mongoengine/fields.py	/^class BinaryField(BaseField):$/;"	c
-BinaryField	mongoengine/mongoengine/fields.py	/^class BinaryField(BaseField):$/;"	c
-Blog	mongoengine/tests/document/instance.py	/^            class Blog(Document):$/;"	c	function:InstanceTest.test_invalid_reverse_delete_rule_raise_errors
-Blog	mongoengine/tests/document/instance.py	/^            class Blog(Document):$/;"	c	function:InstanceTest.test_override_method_with_field
-Blog	mongoengine/tests/queryset/queryset.py	/^        class Blog(Document):$/;"	c	function:QuerySetTest.test_bulk_insert
-Blog	mongoengine/tests/queryset/queryset.py	/^        class Blog(Document):$/;"	c	function:QuerySetTest.test_filter_chaining
-Blog	mongoengine/tests/queryset/queryset.py	/^        class Blog(Document):$/;"	c	function:QuerySetTest.test_find_array_position
-Blog	mongoengine/tests/queryset/queryset.py	/^        class Blog(Document):$/;"	c	function:QuerySetTest.test_update_array_position
-BlogPost	mongoengine/tests/document/class_methods.py	/^        class BlogPost(Document):$/;"	c	function:ClassMethodsTest.test_compare_indexes
-BlogPost	mongoengine/tests/document/class_methods.py	/^        class BlogPost(Document):$/;"	c	function:ClassMethodsTest.test_compare_indexes_inheritance
-BlogPost	mongoengine/tests/document/class_methods.py	/^        class BlogPost(Document):$/;"	c	function:ClassMethodsTest.test_compare_indexes_multiple_subclasses
-BlogPost	mongoengine/tests/document/class_methods.py	/^        class BlogPost(Document):$/;"	c	function:ClassMethodsTest.test_list_indexes_inheritance
-BlogPost	mongoengine/tests/document/indexes.py	/^            class BlogPost(Document):$/;"	c	class:IndexesTest.test_index_with_pk.Comment
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_dictionary_indexes
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_embedded_document_index
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_hint
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_index_on_id
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_indexes_after_database_drop
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_list_embedded_document_index
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique_embedded_document
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique_embedded_document_in_list
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique_with
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(Document):$/;"	c	function:IndexesTest.test_unique_with_embedded_document_and_embedded_unique
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(InheritFrom):$/;"	c	function:IndexesTest._index_test
-BlogPost	mongoengine/tests/document/indexes.py	/^        class BlogPost(InheritFrom):$/;"	c	function:IndexesTest._index_test_inheritance
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_document_hash
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_modify_with_positional_push
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_push_nested_list
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_push_with_position
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_and_nullify
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_and_nullify_complex_field
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_recurs
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_deny
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_document_inheritance
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_save_list
-BlogPost	mongoengine/tests/document/instance.py	/^        class BlogPost(Document):$/;"	c	function:InstanceTest.test_save_reference
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.setUp
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_dict_field
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_embedded_document_inheritance
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_assignment
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_invalid_operators
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_lexicographic_operators
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_manipulative_operators
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_validation
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_map_field_unicode
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_query_conversion
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_query_conversion_dbref
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_validation
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_sorted_list_sorting
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion
-BlogPost	mongoengine/tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref
-BlogPost	mongoengine/tests/queryset/field_list.py	/^        class BlogPost(Document):$/;"	c	function:OnlyExcludeAllTest.test_exclude
-BlogPost	mongoengine/tests/queryset/field_list.py	/^        class BlogPost(Document):$/;"	c	function:OnlyExcludeAllTest.test_only_with_subfields
-BlogPost	mongoengine/tests/queryset/modify.py	/^        class BlogPost(Document):$/;"	c	function:FindAndModifyTest.test_modify_with_push
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(AbstractBlogPost):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(AbstractBlogPost):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(AbstractBlogPost):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(AbstractBlogPost):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_bulk
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_cannot_perform_joins_references
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_clear_ordering
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_custom_manager
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_delete_with_limit_handles_delete_rules
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_editting_embedded_objects
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_exec_js_field_sub
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_exec_js_query
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_filter_chaining
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_find_dict_item
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_find_embedded
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_find_empty_embedded
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_in_operator_on_non_iterable
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_item_frequencies
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_map_reduce
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_map_reduce_with_custom_object_ids
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_no_ordering_for_get
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_order_by_list
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_order_by_optional
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_ordering
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_query_value_conversion
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reference_field_find
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reference_field_find_dbref
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_deny
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_nullify
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_pull
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_one_pop_generic_reference
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_push_and_pull_add_to_set
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_push_list_of_list
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_push_with_position
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_using_positional_operator
-BlogPost	mongoengine/tests/queryset/queryset.py	/^        class BlogPost(Document):$/;"	c	function:QuerySetTest.test_update_using_positional_operator_embedded_document
-BlogPost	mongoengine/tests/queryset/transform.py	/^        class BlogPost(Document):$/;"	c	function:TransformTest.test_query_field_name
-BlogPost	mongoengine/tests/queryset/transform.py	/^        class BlogPost(Document):$/;"	c	function:TransformTest.test_query_pk_field_name
-BlogPost	mongoengine/tests/queryset/visitor.py	/^        class BlogPost(Document):$/;"	c	function:QTest.test_q
-BlogPost	mongoengine/tests/queryset/visitor.py	/^        class BlogPost(Document):$/;"	c	function:QTest.test_q_lists
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.setUp
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_dict_field
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_embedded_document_inheritance
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_assignment
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_invalid_operators
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_lexicographic_operators
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_field_manipulative_operators
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_list_validation
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_map_field_unicode
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_query_conversion
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_query_conversion_dbref
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_reference_validation
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:FieldTest.test_sorted_list_sorting
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion
-BlogPost	tests/fields/fields.py	/^        class BlogPost(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref
-BlogPostWithCustomField	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithCustomField(BlogPost):$/;"	c	function:ClassMethodsTest.test_compare_indexes_multiple_subclasses
-BlogPostWithTags	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithTags(BlogPost):$/;"	c	function:ClassMethodsTest.test_compare_indexes_inheritance
-BlogPostWithTags	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithTags(BlogPost):$/;"	c	function:ClassMethodsTest.test_compare_indexes_multiple_subclasses
-BlogPostWithTags	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithTags(BlogPost):$/;"	c	function:ClassMethodsTest.test_list_indexes_inheritance
-BlogPostWithTagsAndExtraText	mongoengine/tests/document/class_methods.py	/^        class BlogPostWithTagsAndExtraText(BlogPostWithTags):$/;"	c	function:ClassMethodsTest.test_list_indexes_inheritance
-BlogTag	mongoengine/tests/queryset/queryset.py	/^        class BlogTag(Document):$/;"	c	function:QuerySetTest.test_update_one_pop_generic_reference
-BlogTag	mongoengine/tests/queryset/queryset.py	/^        class BlogTag(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_editting_embedded_objects
-Book	mongoengine/tests/document/indexes.py	/^        class Book(Document):$/;"	c	function:IndexesTest.test_hashed_indexes
-Book	mongoengine/tests/document/indexes.py	/^        class Book(Document):$/;"	c	function:IndexesTest.test_text_indexes
-Book	mongoengine/tests/document/instance.py	/^        class Book(Document):$/;"	c	function:InstanceTest.test_db_alias_tests
-Book	mongoengine/tests/document/instance.py	/^        class Book(Document):$/;"	c	function:InstanceTest.test_db_ref_usage
-Book	mongoengine/tests/document/instance.py	/^        class Book(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_custom_id_field
-Book	mongoengine/tests/document/instance.py	/^        class Book(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections
-Book	mongoengine/tests/queryset/queryset.py	/^        class Book(Document):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField
-Book	mongoengine/tests/queryset/queryset.py	/^        class Book(Document):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField
-Book	mongoengine/tests/test_dereference.py	/^        class Book(Document):$/;"	c	function:FieldTest.test_objectid_reference_across_databases
-Bookmark	mongoengine/tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference
-Bookmark	mongoengine/tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
-Bookmark	mongoengine/tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_choices_no_dereference
-Bookmark	mongoengine/tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
-Bookmark	tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference
-Bookmark	tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
-Bookmark	tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_choices_no_dereference
-Bookmark	tests/fields/fields.py	/^        class Bookmark(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
-BooleanField	mongoengine/fields.py	/^class BooleanField(BaseField):$/;"	c
-BooleanField	mongoengine/mongoengine/fields.py	/^class BooleanField(BaseField):$/;"	c
-Brand	mongoengine/tests/test_dereference.py	/^        class Brand(Document):$/;"	c	function:FieldTest.test_non_ascii_pk
-BrandGroup	mongoengine/tests/test_dereference.py	/^        class BrandGroup(Document):$/;"	c	function:FieldTest.test_non_ascii_pk
-Brother	mongoengine/tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_abstract_reference_base_type
-Brother	mongoengine/tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_reference_abstract_class
-Brother	mongoengine/tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
-Brother	tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_abstract_reference_base_type
-Brother	tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_reference_abstract_class
-Brother	tests/fields/fields.py	/^        class Brother(Sibling):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
-C	mongoengine/tests/document/inheritance.py	/^        class C(A, B):$/;"	c	function:InheritanceTest.test_indexes_and_multiple_inheritance
-C	mongoengine/tests/document/instance.py	/^        class C(EmbeddedDocument):$/;"	c	function:InstanceTest.test_mutating_documents
-C	mongoengine/tests/fields/fields.py	/^        class C(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field
-C	mongoengine/tests/fields/fields.py	/^        class C(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
-C	mongoengine/tests/queryset/queryset.py	/^        class C(B):$/;"	c	function:QuerySetTest.test_no_sub_classes
-C	mongoengine/tests/test_context_managers.py	/^        class C(B):$/;"	c	function:ContextManagersTest.test_no_sub_classes
-C	tests/fields/fields.py	/^        class C(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field
-C	tests/fields/fields.py	/^        class C(EmbeddedDocument):$/;"	c	function:FieldTest.test_double_embedded_db_field_from_son
-CASCADE	mongoengine/mongoengine/queryset/base.py	/^CASCADE = 2$/;"	v
-CLASSIFIERS	mongoengine/setup.py	/^CLASSIFIERS = [$/;"	v
-COLLECTION_NAME	mongoengine/fields.py	/^    COLLECTION_NAME = 'mongoengine.counters'$/;"	v	class:SequenceField
-COLLECTION_NAME	mongoengine/mongoengine/fields.py	/^    COLLECTION_NAME = 'mongoengine.counters'$/;"	v	class:SequenceField
-COMPARISON_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^COMPARISON_OPERATORS = ('ne', 'gt', 'gte', 'lt', 'lte', 'in', 'nin', 'mod',$/;"	v
-CONN_CLASS	mongoengine/tests/test_replicaset_connection.py	/^    CONN_CLASS = MongoClient$/;"	v
-CONN_CLASS	mongoengine/tests/test_replicaset_connection.py	/^    CONN_CLASS = ReplicaSetConnection$/;"	v
-CUSTOM_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^CUSTOM_OPERATORS = ('match',)$/;"	v
-CachedReferenceField	mongoengine/fields.py	/^class CachedReferenceField(BaseField):$/;"	c
-CachedReferenceField	mongoengine/mongoengine/fields.py	/^class CachedReferenceField(BaseField):$/;"	c
-CachedReferenceFieldTest	mongoengine/tests/fields/fields.py	/^class CachedReferenceFieldTest(MongoDBTestCase):$/;"	c
-CachedReferenceFieldTest	tests/fields/fields.py	/^class CachedReferenceFieldTest(MongoDBTestCase):$/;"	c
-Car	mongoengine/tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document
-Car	mongoengine/tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
-Car	mongoengine/tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
-Car	tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document
-Car	tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
-Car	tests/fields/fields.py	/^        class Car(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
-Cat	mongoengine/tests/document/class_methods.py	/^        class Cat(Animal):$/;"	c	function:ClassMethodsTest.test_register_delete_rule_inherited
-Cat	mongoengine/tests/queryset/queryset.py	/^        class Cat(Animal):$/;"	c	function:QuerySetTest.test_cls_query_in_subclassed_docs
-Cat	mongoengine/tests/queryset/queryset.py	/^        class Cat(Animal):$/;"	c	function:QuerySetTest.test_subclass_field_query
-Category	mongoengine/tests/fields/fields.py	/^        class Category(EmbeddedDocument):$/;"	c	function:FieldTest.test_reverse_list_sorting
-Category	mongoengine/tests/queryset/queryset.py	/^        class Category(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle
-Category	mongoengine/tests/queryset/queryset.py	/^        class Category(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing
-Category	mongoengine/tests/queryset/queryset.py	/^        class Category(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_nullify
-Category	tests/fields/fields.py	/^        class Category(EmbeddedDocument):$/;"	c	function:FieldTest.test_reverse_list_sorting
-CategoryList	mongoengine/tests/fields/fields.py	/^        class CategoryList(Document):$/;"	c	function:FieldTest.test_reverse_list_sorting
-CategoryList	tests/fields/fields.py	/^        class CategoryList(Document):$/;"	c	function:FieldTest.test_reverse_list_sorting
-Child	mongoengine/tests/document/validation.py	/^        class Child(Parent):$/;"	c	function:ValidatorErrorTest.test_parent_reference_in_child_document
-Child	mongoengine/tests/document/validation.py	/^        class Child(Parent):$/;"	c	function:ValidatorErrorTest.test_parent_reference_set_as_attribute_in_child_document
-City	mongoengine/tests/document/inheritance.py	/^        class City(Document):$/;"	c	function:InheritanceTest.test_abstract_document_creation_does_not_fail
-City	mongoengine/tests/document/inheritance.py	/^        class City(Document):$/;"	c	function:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly
-City	mongoengine/tests/document/inheritance.py	/^        class City(Document):$/;"	c	function:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class
-City	mongoengine/tests/document/inheritance.py	/^        class City(Document):$/;"	c	function:InheritanceTest.test_auto_id_vs_non_pk_id_field
-ClassMethodsTest	mongoengine/tests/document/class_methods.py	/^class ClassMethodsTest(unittest.TestCase):$/;"	c
-Club	mongoengine/tests/queryset/queryset.py	/^        class Club(Document):$/;"	c	function:QuerySetTest.test_dictfield_update
-Club	mongoengine/tests/queryset/queryset.py	/^        class Club(Document):$/;"	c	function:QuerySetTest.test_mapfield_update
-Collaborator	mongoengine/tests/queryset/queryset.py	/^        class Collaborator(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_from_nested_embedded
-Collaborator	mongoengine/tests/queryset/queryset.py	/^        class Collaborator(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_from_nested_mapfield
-Collaborator	mongoengine/tests/queryset/queryset.py	/^        class Collaborator(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_nested
-Comment	mongoengine/docs/code/tumblelog.py	/^class Comment(EmbeddedDocument):$/;"	c
-Comment	mongoengine/tests/document/indexes.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:IndexesTest.test_index_with_pk
-Comment	mongoengine/tests/document/inheritance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InheritanceTest.test_allow_inheritance_embedded_document
-Comment	mongoengine/tests/document/instance.py	/^        class Comment(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_recurs
-Comment	mongoengine/tests/document/instance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document
-Comment	mongoengine/tests/document/instance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InstanceTest.test_list_search_by_embedded
-Comment	mongoengine/tests/document/instance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InstanceTest.test_save_list
-Comment	mongoengine/tests/document/instance.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:InstanceTest.test_save_only_changed_fields_recursive
-Comment	mongoengine/tests/document/validation.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:ValidatorErrorTest.test_embedded_document_validation
-Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_validation
-Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_sequence_field
-Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_list_validation
-Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_validation
-Comment	mongoengine/tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_sorted_list_sorting
-Comment	mongoengine/tests/queryset/field_list.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_exclude
-Comment	mongoengine/tests/queryset/field_list.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_only_with_subfields
-Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(Document):$/;"	c	function:QuerySetTest.test_ensure_index
-Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(Document):$/;"	c	function:QuerySetTest.test_unset_reference
-Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_bulk_insert
-Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_exec_js_field_sub
-Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_find_array_position
-Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_array_position
-Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_using_positional_operator
-Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_using_positional_operator_embedded_document
-Comment	mongoengine/tests/queryset/queryset.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_updates_can_have_match_operators
-Comment	mongoengine/tests/queryset/transform.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:TransformTest.test_query_field_name
-Comment	mongoengine/tests/test_dereference.py	/^        class Comment(Document):$/;"	c	function:FieldTest.test_list_lookup_not_checked_in_map
-Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_validation
-Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_sequence_field
-Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_list_validation
-Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_validation
-Comment	tests/fields/fields.py	/^        class Comment(EmbeddedDocument):$/;"	c	function:FieldTest.test_sorted_list_sorting
-Comments	mongoengine/tests/fields/fields.py	/^        class Comments(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.setUp
-Comments	mongoengine/tests/fields/fields.py	/^        class Comments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
-Comments	tests/fields/fields.py	/^        class Comments(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.setUp
-Comments	tests/fields/fields.py	/^        class Comments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
-Company	mongoengine/tests/fields/fields.py	/^        class Company(Document):$/;"	c	function:FieldTest.test_undefined_reference
-Company	tests/fields/fields.py	/^        class Company(Document):$/;"	c	function:FieldTest.test_undefined_reference
-CompareStats	mongoengine/tests/document/instance.py	/^        class CompareStats(Document):$/;"	c	function:InstanceTest.test_reference_inheritance
-ComplexBaseField	mongoengine/mongoengine/base/fields.py	/^class ComplexBaseField(BaseField):$/;"	c
-ComplexDateTimeField	mongoengine/fields.py	/^class ComplexDateTimeField(StringField):$/;"	c
-ComplexDateTimeField	mongoengine/mongoengine/fields.py	/^class ComplexDateTimeField(StringField):$/;"	c
-CompoundKey	mongoengine/tests/document/indexes.py	/^        class CompoundKey(EmbeddedDocument):$/;"	c	function:IndexesTest.test_compound_key_embedded
-ConnectionTest	mongoengine/tests/test_connection.py	/^class ConnectionTest(unittest.TestCase):$/;"	c
-ConnectionTest	mongoengine/tests/test_replicaset_connection.py	/^class ConnectionTest(unittest.TestCase):$/;"	c
-ContextManagersTest	mongoengine/tests/test_context_managers.py	/^class ContextManagersTest(unittest.TestCase):$/;"	c
-Continent	mongoengine/tests/queryset/queryset.py	/^        class Continent(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField
-Country	mongoengine/tests/queryset/queryset.py	/^        class Country(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField
-CustomData	mongoengine/tests/fields/fields.py	/^        class CustomData(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_custom_data
-CustomData	tests/fields/fields.py	/^        class CustomData(Document):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_custom_data
-CustomNamingTest	mongoengine/tests/document/class_methods.py	/^        class CustomNamingTest(Document):$/;"	c	function:ClassMethodsTest.test_collection_naming
-CustomQuerySet	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySet(QuerySet):$/;"	c	function:QuerySetTest.test_custom_querysets
-CustomQuerySet	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySet(QuerySet):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited
-CustomQuerySet	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySet(QuerySet):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited_direct
-CustomQuerySet	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySet(QuerySet):$/;"	c	function:QuerySetTest.test_custom_querysets_set_manager_directly
-CustomQuerySetManager	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySetManager(QuerySetManager):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited_direct
-CustomQuerySetManager	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySetManager(QuerySetManager):$/;"	c	function:QuerySetTest.test_custom_querysets_managers_directly
-CustomQuerySetManager	mongoengine/tests/queryset/queryset.py	/^        class CustomQuerySetManager(QuerySetManager):$/;"	c	function:QuerySetTest.test_custom_querysets_set_manager_directly
-Customer	mongoengine/tests/document/indexes.py	/^        class Customer(Document):$/;"	c	function:IndexesTest.test_unique_and_indexes
-D	mongoengine/tests/fields/fields.py	/^        class D(Document):$/;"	c	function:FieldTest.test_ensure_unique_default_instances
-D	tests/fields/fields.py	/^        class D(Document):$/;"	c	function:FieldTest.test_ensure_unique_default_instances
-DEFAULT_CONNECTION_NAME	mongoengine/mongoengine/connection.py	/^DEFAULT_CONNECTION_NAME = 'default'$/;"	v
-DENY	mongoengine/mongoengine/queryset/base.py	/^DENY = 3$/;"	v
-DESCRIPTION	mongoengine/setup.py	/^DESCRIPTION = ($/;"	v
-DOMAIN_REGEX	mongoengine/fields.py	/^    DOMAIN_REGEX = re.compile($/;"	v	class:EmailField
-DOMAIN_REGEX	mongoengine/mongoengine/fields.py	/^    DOMAIN_REGEX = re.compile($/;"	v	class:EmailField
-DO_NOTHING	mongoengine/mongoengine/queryset/base.py	/^DO_NOTHING = 0$/;"	v
-Data	mongoengine/tests/queryset/queryset.py	/^        class Data(Document):$/;"	c	function:QuerySetTest.test_iteration_within_iteration
-Data	mongoengine/tests/queryset/queryset.py	/^        class Data(Document):$/;"	c	function:QuerySetTest.test_len_during_iteration
-Data	mongoengine/tests/queryset/queryset.py	/^        class Data(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_item_frequencies_with_null_embedded
-Date	mongoengine/tests/document/indexes.py	/^        class Date(EmbeddedDocument):$/;"	c	function:IndexesTest.test_embedded_document_index
-Date	mongoengine/tests/document/indexes.py	/^        class Date(EmbeddedDocument):$/;"	c	function:IndexesTest.test_unique_with
-DateCreatedDocument	mongoengine/tests/document/inheritance.py	/^        class DateCreatedDocument(Document):$/;"	c	function:InheritanceTest.test_document_inheritance
-DateDoc	mongoengine/tests/test_connection.py	/^        class DateDoc(Document):$/;"	c	function:ConnectionTest.test_datetime
-DateTimeField	mongoengine/fields.py	/^class DateTimeField(BaseField):$/;"	c
-DateTimeField	mongoengine/mongoengine/fields.py	/^class DateTimeField(BaseField):$/;"	c
-DateUpdatedDocument	mongoengine/tests/document/inheritance.py	/^        class DateUpdatedDocument(Document):$/;"	c	function:InheritanceTest.test_document_inheritance
-DeReference	mongoengine/mongoengine/dereference.py	/^class DeReference(object):$/;"	c
-DecimalField	mongoengine/fields.py	/^class DecimalField(BaseField):$/;"	c
-DecimalField	mongoengine/mongoengine/fields.py	/^class DecimalField(BaseField):$/;"	c
-DefaultNamingTest	mongoengine/tests/document/class_methods.py	/^        class DefaultNamingTest(Document):$/;"	c	function:ClassMethodsTest.test_collection_naming
-DeltaTest	mongoengine/tests/document/delta.py	/^class DeltaTest(unittest.TestCase):$/;"	c
-DemoFile	mongoengine/tests/fields/file_tests.py	/^        class DemoFile(Document):$/;"	c	function:FileTest.test_file_field_optional
-DicDoc	mongoengine/tests/queryset/transform.py	/^        class DicDoc(Document):$/;"	c	function:TransformTest.test_transform_update
-DictField	mongoengine/fields.py	/^class DictField(ComplexBaseField):$/;"	c
-DictField	mongoengine/mongoengine/fields.py	/^class DictField(ComplexBaseField):$/;"	c
-DictFieldTest	mongoengine/tests/fields/fields.py	/^        class DictFieldTest(Document):$/;"	c	function:FieldTest.test_invalid_dict_value
-DictFieldTest	tests/fields/fields.py	/^        class DictFieldTest(Document):$/;"	c	function:FieldTest.test_invalid_dict_value
-Dish	mongoengine/tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document
-Dish	mongoengine/tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
-Dish	mongoengine/tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
-Dish	tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document
-Dish	tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
-Dish	tests/fields/fields.py	/^        class Dish(EmbeddedDocument):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
-Doc	mongoengine/tests/document/delta.py	/^        class Doc(DocClass):$/;"	c	function:DeltaTest.delta
-Doc	mongoengine/tests/document/delta.py	/^        class Doc(DocClass):$/;"	c	function:DeltaTest.delta_db_field
-Doc	mongoengine/tests/document/delta.py	/^        class Doc(DocClass):$/;"	c	function:DeltaTest.delta_recursive
-Doc	mongoengine/tests/document/delta.py	/^        class Doc(DocClass):$/;"	c	function:DeltaTest.delta_recursive_db_field
-Doc	mongoengine/tests/document/delta.py	/^        class Doc(Document):$/;"	c	function:DeltaTest.test_delta_for_nested_map_fields
-Doc	mongoengine/tests/document/delta.py	/^        class Doc(DynamicDocument):$/;"	c	function:DeltaTest.test_dynamic_delta
-Doc	mongoengine/tests/document/dynamic.py	/^        class Doc(DynamicDocument):$/;"	c	function:DynamicTest.test_complex_embedded_document_validation
-Doc	mongoengine/tests/document/dynamic.py	/^        class Doc(DynamicDocument):$/;"	c	function:DynamicTest.test_complex_embedded_documents
-Doc	mongoengine/tests/document/dynamic.py	/^        class Doc(DynamicDocument):$/;"	c	function:DynamicTest.test_embedded_dynamic_document
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_can_save_false_values
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_can_save_if_not_included
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_embedded_document_complex_instance
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_embedded_document_complex_instance_no_use_db_field
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_embedded_document_instance
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_kwargs_complex
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_kwargs_simple
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_reload_referencing
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_save_abstract_document
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_update_list_field
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(Document):$/;"	c	function:InstanceTest.test_update_unique_field
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(DynamicDocument):$/;"	c	function:InstanceTest.test_can_save_false_values_dynamic
-Doc	mongoengine/tests/document/instance.py	/^        class Doc(DynamicDocument):$/;"	c	function:InstanceTest.test_spaces_in_keys
-Doc	mongoengine/tests/document/json_serialisation.py	/^        class Doc(Document):$/;"	c	function:TestJson.test_json_complex
-Doc	mongoengine/tests/document/json_serialisation.py	/^        class Doc(Document):$/;"	c	function:TestJson.test_json_names
-Doc	mongoengine/tests/document/json_serialisation.py	/^        class Doc(Document):$/;"	c	function:TestJson.test_json_simple
-Doc	mongoengine/tests/document/validation.py	/^        class Doc(Document):$/;"	c	function:ValidatorErrorTest.test_embedded_db_field_validate
-Doc	mongoengine/tests/document/validation.py	/^        class Doc(Document):$/;"	c	function:ValidatorErrorTest.test_embedded_weakref
-Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
-Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamic_fields_class
-Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamic_fields_embedded_class
-Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
-Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_generic_reference_filter_by_dbref
-Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_generic_reference_filter_by_objectid
-Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_sparse_field
-Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_undefined_field_exception
-Doc	mongoengine/tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_undefined_field_exception_with_strict
-Doc	mongoengine/tests/queryset/modify.py	/^class Doc(Document):$/;"	c
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_array_average
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_array_sum
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_embedded_array_average
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_embedded_array_sum
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_embedded_average
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_embedded_sum
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_json_complex
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_json_simple
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_query_generic_embedded_document
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_reload_embedded_docs_instance
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_reload_list_embedded_docs_instance
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_repr
-Doc	mongoengine/tests/queryset/queryset.py	/^        class Doc(Document):$/;"	c	function:QuerySetTest.test_update_validate
-Doc	mongoengine/tests/queryset/transform.py	/^        class Doc(Document):$/;"	c	function:TransformTest.test_last_field_name_like_operator
-Doc	mongoengine/tests/queryset/transform.py	/^        class Doc(Document):$/;"	c	function:TransformTest.test_raw_and_merging
-Doc	mongoengine/tests/queryset/transform.py	/^        class Doc(Document):$/;"	c	function:TransformTest.test_transform_update
-Doc	mongoengine/tests/queryset/transform.py	/^        class Doc(Document):$/;"	c	function:TransformTest.test_type
-Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
-Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamic_fields_class
-Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamic_fields_embedded_class
-Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
-Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_generic_reference_filter_by_dbref
-Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_generic_reference_filter_by_objectid
-Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_sparse_field
-Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_undefined_field_exception
-Doc	tests/fields/fields.py	/^        class Doc(Document):$/;"	c	function:FieldTest.test_undefined_field_exception_with_strict
-Doc2	mongoengine/tests/fields/fields.py	/^        class Doc2(Document):$/;"	c	function:FieldTest.test_dynamic_fields_class
-Doc2	tests/fields/fields.py	/^        class Doc2(Document):$/;"	c	function:FieldTest.test_dynamic_fields_class
-Document	mongoengine/mongoengine/document.py	/^class Document(BaseDocument):$/;"	c
-DocumentMetaclass	mongoengine/mongoengine/base/metaclasses.py	/^class DocumentMetaclass(type):$/;"	c
-DoesNotExist	mongoengine/mongoengine/errors.py	/^class DoesNotExist(Exception):$/;"	c
-Dog	mongoengine/tests/document/inheritance.py	/^            class Dog(Animal):$/;"	c	class:InheritanceTest.test_allow_inheritance.Animal
-Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_external_subclasses
-Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_external_superclasses
-Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_polymorphic_queries
-Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_subclasses
-Dog	mongoengine/tests/document/inheritance.py	/^        class Dog(Mammal): pass$/;"	c	function:InheritanceTest.test_superclasses
-Dog	mongoengine/tests/document/instance.py	/^        class Dog(Mammal):$/;"	c	function:InstanceTest.test_polymorphic_references
-Dog	mongoengine/tests/fields/fields.py	/^        class Dog(Mammal):$/;"	c	function:FieldTest.test_cls_field
-Dog	mongoengine/tests/queryset/queryset.py	/^        class Dog(Animal):$/;"	c	function:QuerySetTest.test_cls_query_in_subclassed_docs
-Dog	tests/fields/fields.py	/^        class Dog(Mammal):$/;"	c	function:FieldTest.test_cls_field
-DoubleMixIn	mongoengine/tests/document/instance.py	/^        class DoubleMixIn(BaseMixIn):$/;"	c	function:InstanceTest.test_mixin_inheritance
-Drink	mongoengine/tests/document/inheritance.py	/^        class Drink(Document):$/;"	c	function:InheritanceTest.test_inherited_collections
-Drinker	mongoengine/tests/document/inheritance.py	/^        class Drinker(Document):$/;"	c	function:InheritanceTest.test_inherited_collections
-Dummy	mongoengine/tests/queryset/queryset.py	/^        class Dummy(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle
-Dummy	mongoengine/tests/queryset/queryset.py	/^        class Dummy(Document):$/;"	c	function:QuerySetTest.test_reverse_delete_rule_cascade_cycle
-DuplicateQueryConditionsError	mongoengine/mongoengine/queryset/visitor.py	/^class DuplicateQueryConditionsError(InvalidQueryError):$/;"	c
-DynamicDocument	mongoengine/mongoengine/document.py	/^class DynamicDocument(Document):$/;"	c
-DynamicEmbeddedDocument	mongoengine/mongoengine/document.py	/^class DynamicEmbeddedDocument(EmbeddedDocument):$/;"	c
-DynamicField	mongoengine/fields.py	/^class DynamicField(BaseField):$/;"	c
-DynamicField	mongoengine/mongoengine/fields.py	/^class DynamicField(BaseField):$/;"	c
-DynamicNamingTest	mongoengine/tests/document/class_methods.py	/^        class DynamicNamingTest(Document):$/;"	c	function:ClassMethodsTest.test_collection_naming
-DynamicTest	mongoengine/tests/document/dynamic.py	/^class DynamicTest(unittest.TestCase):$/;"	c
-EXCLUDE	mongoengine/mongoengine/queryset/field_list.py	/^    EXCLUDE = 0$/;"	v	class:QueryFieldList
-Editor	mongoengine/tests/document/instance.py	/^        class Editor(self.Person):$/;"	c	function:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal
-EmDoc	mongoengine/tests/queryset/queryset.py	/^        class EmDoc(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_validate
-Email	mongoengine/tests/document/instance.py	/^        class Email(EmbeddedDocument):$/;"	c	function:InstanceTest.test_instance_is_set_on_setattr
-Email	mongoengine/tests/document/instance.py	/^        class Email(EmbeddedDocument):$/;"	c	function:InstanceTest.test_instance_is_set_on_setattr_on_embedded_document_list
-Email	mongoengine/tests/queryset/field_list.py	/^        class Email(Document):$/;"	c	function:OnlyExcludeAllTest.test_all_fields
-Email	mongoengine/tests/queryset/field_list.py	/^        class Email(Document):$/;"	c	function:OnlyExcludeAllTest.test_exclude_only_combining
-EmailField	mongoengine/fields.py	/^class EmailField(StringField):$/;"	c
-EmailField	mongoengine/mongoengine/fields.py	/^class EmailField(StringField):$/;"	c
-EmailUser	mongoengine/tests/document/instance.py	/^            class EmailUser(User):$/;"	c	class:InstanceTest.test_custom_id_field.User
-EmailUser	mongoengine/tests/document/instance.py	/^        class EmailUser(User):$/;"	c	function:InstanceTest.test_custom_id_field
-Embed	mongoengine/tests/fields/fields.py	/^        class Embed(EmbeddedDocument):$/;"	c	function:FieldTest.test_dynamic_fields_embedded_class
-Embed	mongoengine/tests/queryset/queryset.py	/^        class Embed(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_save_and_only_on_fields_with_default
-Embed	tests/fields/fields.py	/^        class Embed(EmbeddedDocument):$/;"	c	function:FieldTest.test_dynamic_fields_embedded_class
-Embedded	mongoengine/tests/document/delta.py	/^        class Embedded(EmbeddedClass):$/;"	c	function:DeltaTest.delta_recursive
-Embedded	mongoengine/tests/document/delta.py	/^        class Embedded(EmbeddedClass):$/;"	c	function:DeltaTest.delta_recursive_db_field
-Embedded	mongoengine/tests/document/dynamic.py	/^        class Embedded(DynamicEmbeddedDocument):$/;"	c	function:DynamicTest.test_complex_embedded_document_validation
-Embedded	mongoengine/tests/document/dynamic.py	/^        class Embedded(DynamicEmbeddedDocument):$/;"	c	function:DynamicTest.test_complex_embedded_documents
-Embedded	mongoengine/tests/document/dynamic.py	/^        class Embedded(DynamicEmbeddedDocument):$/;"	c	function:DynamicTest.test_embedded_dynamic_document
-Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(DynamicEmbeddedDocument):$/;"	c	function:InstanceTest.test_spaces_in_keys
-Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_complex_instance
-Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_complex_instance_no_use_db_field
-Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_equality
-Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_instance
-Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_kwargs_complex
-Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_kwargs_simple
-Embedded	mongoengine/tests/document/instance.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:InstanceTest.test_reload_referencing
-Embedded	mongoengine/tests/document/json_serialisation.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:TestJson.test_json_names
-Embedded	mongoengine/tests/document/json_serialisation.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:TestJson.test_json_simple
-Embedded	mongoengine/tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_db_field
-Embedded	mongoengine/tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_mapfield_db_field
-Embedded	mongoengine/tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_mapfield_numerical_index
-Embedded	mongoengine/tests/queryset/queryset.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_json_simple
-Embedded	tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_db_field
-Embedded	tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_mapfield_db_field
-Embedded	tests/fields/fields.py	/^        class Embedded(EmbeddedDocument):$/;"	c	function:FieldTest.test_mapfield_numerical_index
-EmbeddedDoc	mongoengine/tests/document/delta.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:DeltaTest.test_lower_level_mark_as_changed
-EmbeddedDoc	mongoengine/tests/document/delta.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:DeltaTest.test_nested_nested_fields_mark_as_changed
-EmbeddedDoc	mongoengine/tests/document/delta.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:DeltaTest.test_upper_level_mark_as_changed
-EmbeddedDoc	mongoengine/tests/document/instance.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:InstanceTest.test_can_save_if_not_included
-EmbeddedDoc	mongoengine/tests/document/json_serialisation.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:TestJson.test_json_complex
-EmbeddedDoc	mongoengine/tests/queryset/queryset.py	/^        class EmbeddedDoc(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_json_complex
-EmbeddedDocument	mongoengine/mongoengine/document.py	/^class EmbeddedDocument(BaseDocument):$/;"	c
-EmbeddedDocumentField	mongoengine/fields.py	/^class EmbeddedDocumentField(BaseField):$/;"	c
-EmbeddedDocumentField	mongoengine/mongoengine/fields.py	/^class EmbeddedDocumentField(BaseField):$/;"	c
-EmbeddedDocumentList	mongoengine/mongoengine/base/datastructures.py	/^class EmbeddedDocumentList(BaseList):$/;"	c
-EmbeddedDocumentListField	mongoengine/fields.py	/^class EmbeddedDocumentListField(ListField):$/;"	c
-EmbeddedDocumentListField	mongoengine/mongoengine/fields.py	/^class EmbeddedDocumentListField(ListField):$/;"	c
-EmbeddedDocumentListFieldTestCase	mongoengine/tests/fields/fields.py	/^class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):$/;"	c
-EmbeddedDocumentListFieldTestCase	tests/fields/fields.py	/^class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):$/;"	c
-EmbeddedItem	mongoengine/tests/queryset/transform.py	/^        class EmbeddedItem(EmbeddedDocument):$/;"	c	function:TransformTest.test_last_field_name_like_operator
-EmbeddedLocation	mongoengine/tests/document/indexes.py	/^        class EmbeddedLocation(EmbeddedDocument):$/;"	c	function:IndexesTest.test_explicit_geo2d_index_embedded
-EmbeddedNumber	mongoengine/tests/queryset/field_list.py	/^        class EmbeddedNumber(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_slicing_nested_fields
-EmbeddedOcurrence	mongoengine/tests/fields/fields.py	/^        class EmbeddedOcurrence(EmbeddedDocument):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
-EmbeddedOcurrence	mongoengine/tests/fields/fields.py	/^        class EmbeddedOcurrence(EmbeddedDocument):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
-EmbeddedOcurrence	tests/fields/fields.py	/^        class EmbeddedOcurrence(EmbeddedDocument):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
-EmbeddedOcurrence	tests/fields/fields.py	/^        class EmbeddedOcurrence(EmbeddedDocument):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
-EmbeddedRole	mongoengine/tests/document/delta.py	/^        class EmbeddedRole(EmbeddedDocument):$/;"	c	function:DeltaTest.test_delta_for_nested_map_fields
-EmbeddedUser	mongoengine/tests/document/delta.py	/^        class EmbeddedUser(EmbeddedDocument):$/;"	c	function:DeltaTest.test_delta_for_nested_map_fields
-EmbeddedWithSparseUnique	mongoengine/tests/fields/fields.py	/^        class EmbeddedWithSparseUnique(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
-EmbeddedWithSparseUnique	tests/fields/fields.py	/^        class EmbeddedWithSparseUnique(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
-EmbeddedWithUnique	mongoengine/tests/fields/fields.py	/^        class EmbeddedWithUnique(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
-EmbeddedWithUnique	tests/fields/fields.py	/^        class EmbeddedWithUnique(EmbeddedDocument):$/;"	c	function:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field
-Employee	mongoengine/tests/document/dynamic.py	/^        class Employee(self.Person):$/;"	c	function:DynamicTest.test_inheritance
-Employee	mongoengine/tests/document/inheritance.py	/^        class Employee(Person):$/;"	c	function:InheritanceTest.test_inheritance_meta_data
-Employee	mongoengine/tests/document/inheritance.py	/^        class Employee(Person):$/;"	c	function:InheritanceTest.test_inheritance_to_mongo_keys
-Employee	mongoengine/tests/document/instance.py	/^        class Employee(Person):$/;"	c	function:InstanceTest.test_embedded_document_to_mongo
-Employee	mongoengine/tests/document/instance.py	/^        class Employee(self.Person):$/;"	c	function:InstanceTest.test_save_embedded_document
-Employee	mongoengine/tests/document/instance.py	/^        class Employee(self.Person):$/;"	c	function:InstanceTest.test_updating_an_embedded_document
-Employee	mongoengine/tests/fields/fields.py	/^        class Employee(Document):$/;"	c	function:FieldTest.test_recursive_reference
-Employee	mongoengine/tests/queryset/field_list.py	/^        class Employee(self.Person):$/;"	c	function:OnlyExcludeAllTest.test_only
-Employee	mongoengine/tests/test_dereference.py	/^        class Employee(Document):$/;"	c	function:FieldTest.test_recursive_reference
-Employee	tests/fields/fields.py	/^        class Employee(Document):$/;"	c	function:FieldTest.test_recursive_reference
-EmployeeDetails	mongoengine/tests/document/instance.py	/^        class EmployeeDetails(EmbeddedDocument):$/;"	c	function:InstanceTest.test_save_embedded_document
-EmployeeDetails	mongoengine/tests/document/instance.py	/^        class EmployeeDetails(EmbeddedDocument):$/;"	c	function:InstanceTest.test_updating_an_embedded_document
-EnumField	mongoengine/tests/fields/fields.py	/^        class EnumField(BaseField):$/;"	c	function:FieldTest.test_tuples_as_tuples
-EnumField	tests/fields/fields.py	/^        class EnumField(BaseField):$/;"	c	function:FieldTest.test_tuples_as_tuples
-EuropeanCity	mongoengine/tests/document/inheritance.py	/^        class EuropeanCity(City):$/;"	c	function:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly
-EuropeanCity	mongoengine/tests/document/inheritance.py	/^        class EuropeanCity(City):$/;"	c	function:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class
-EuropeanCity	mongoengine/tests/document/inheritance.py	/^        class EuropeanCity(City):$/;"	c	function:InheritanceTest.test_auto_id_vs_non_pk_id_field
-Event	mongoengine/tests/fields/geo.py	/^        class Event(Document):$/;"	c	function:GeoFieldTest.test_geopoint_embedded_indexes
-Event	mongoengine/tests/fields/geo.py	/^        class Event(Document):$/;"	c	function:GeoFieldTest.test_indexes_2dsphere
-Event	mongoengine/tests/fields/geo.py	/^        class Event(Document):$/;"	c	function:GeoFieldTest.test_indexes_2dsphere_embedded
-Event	mongoengine/tests/fields/geo.py	/^        class Event(Document):$/;"	c	function:GeoFieldTest.test_indexes_geopoint
-Event	mongoengine/tests/queryset/geo.py	/^        class Event(Document):$/;"	c	function:GeoQueriesTest._create_event_data
-Event	mongoengine/tests/queryset/geo.py	/^        class Event(Document):$/;"	c	function:GeoQueriesTest._test_embedded
-Event	mongoengine/tests/queryset/transform.py	/^        class Event(Document):$/;"	c	function:TransformTest.test_understandable_error_raised
-EvilHuman	mongoengine/tests/document/inheritance.py	/^            class EvilHuman(Human):$/;"	c	class:InheritanceTest.test_abstract_documents.Human
-Example	mongoengine/tests/queryset/queryset.py	/^        class Example(Document):$/;"	c	function:QuerySetTest.test_can_have_field_same_name_as_query_operator
-ExplicitId	mongoengine/tests/test_signals.py	/^        class ExplicitId(Document):$/;"	c	function:SignalTests.setUp
-ExtendedBlogPost	mongoengine/tests/document/indexes.py	/^        class ExtendedBlogPost(BlogPost):$/;"	c	function:IndexesTest._index_test_inheritance
-Extensible	mongoengine/tests/fields/fields.py	/^        class Extensible(Document):$/;"	c	function:FieldTest.test_complex_mapfield
-Extensible	tests/fields/fields.py	/^        class Extensible(Document):$/;"	c	function:FieldTest.test_complex_mapfield
-Extra	mongoengine/tests/queryset/queryset.py	/^        class Extra(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_item_frequencies_with_null_embedded
-Family	mongoengine/tests/queryset/queryset.py	/^        class Family(Document):$/;"	c	function:QuerySetTest.test_map_reduce_custom_output
-Feed	mongoengine/tests/document/instance.py	/^        class Feed(Document):$/;"	c	function:InstanceTest.test_query_count_when_saving
-FieldDoesNotExist	mongoengine/mongoengine/errors.py	/^class FieldDoesNotExist(Exception):$/;"	c
-FieldTest	mongoengine/tests/fields/fields.py	/^class FieldTest(MongoDBTestCase):$/;"	c
-FieldTest	mongoengine/tests/test_dereference.py	/^class FieldTest(unittest.TestCase):$/;"	c
-FieldTest	tests/fields/fields.py	/^class FieldTest(MongoDBTestCase):$/;"	c
-FileField	mongoengine/fields.py	/^class FileField(BaseField):$/;"	c
-FileField	mongoengine/mongoengine/fields.py	/^class FileField(BaseField):$/;"	c
-FileTest	mongoengine/tests/fields/file_tests.py	/^class FileTest(MongoDBTestCase):$/;"	c
-FinalDocument	mongoengine/tests/document/inheritance.py	/^        class FinalDocument(Document):$/;"	c	function:InheritanceTest.test_allow_inheritance_abstract_document
-FindAndModifyTest	mongoengine/tests/queryset/modify.py	/^class FindAndModifyTest(unittest.TestCase):$/;"	c
-Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_abstract_documents
-Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_external_subclasses
-Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_external_superclasses
-Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_polymorphic_queries
-Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_subclasses
-Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal): pass$/;"	c	function:InheritanceTest.test_superclasses
-Fish	mongoengine/tests/document/inheritance.py	/^        class Fish(Animal):$/;"	c	function:InheritanceTest.test_dynamic_declarations
-Fish	mongoengine/tests/document/instance.py	/^        class Fish(Animal):$/;"	c	function:InstanceTest.test_polymorphic_references
-Fish	mongoengine/tests/fields/fields.py	/^        class Fish(Animal):$/;"	c	function:FieldTest.test_cls_field
-Fish	tests/fields/fields.py	/^        class Fish(Animal):$/;"	c	function:FieldTest.test_cls_field
-FloatField	mongoengine/fields.py	/^class FloatField(BaseField):$/;"	c
-FloatField	mongoengine/mongoengine/fields.py	/^class FloatField(BaseField):$/;"	c
-Foo	mongoengine/tests/document/instance.py	/^            class Foo(Document):$/;"	c	function:InstanceTest.test_duplicate_db_fields_raise_invalid_document_error
-Foo	mongoengine/tests/document/instance.py	/^        class Foo(Document):$/;"	c	function:InstanceTest.test_reload_doesnt_exist
-Foo	mongoengine/tests/document/instance.py	/^        class Foo(Document):$/;"	c	function:InstanceTest.test_save_max_recursion_not_hit_with_file_field
-Foo	mongoengine/tests/document/instance.py	/^        class Foo(Document):$/;"	c	function:InstanceTest.test_two_way_reverse_delete_rule
-Foo	mongoengine/tests/document/instance.py	/^        class Foo(EmbeddedDocument):$/;"	c	function:InstanceTest.test_shard_key_in_embedded_document
-Foo	mongoengine/tests/document/instance.py	/^        class Foo(EmbeddedDocument, NameMixin):$/;"	c	function:InstanceTest.test_object_mixins
-Foo	mongoengine/tests/fields/fields.py	/^        class Foo(Base):$/;"	c	function:FieldTest.test_inherited_sequencefield
-Foo	mongoengine/tests/fields/fields.py	/^        class Foo(Base):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
-Foo	mongoengine/tests/fields/fields.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_list_field_passed_in_value
-Foo	mongoengine/tests/fields/fields.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_reference_miss
-Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_custom_manager_overriding_objects_works
-Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_distinct_ListField_ReferenceField
-Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_references
-Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_references_to_alias
-Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_inherit_objects
-Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(Document):$/;"	c	function:QuerySetTest.test_inherit_objects_override
-Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_elem_match
-Foo	mongoengine/tests/queryset/queryset.py	/^        class Foo(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_in_genericembedded_field
-Foo	mongoengine/tests/queryset/transform.py	/^        class Foo(Document):$/;"	c	function:TransformTest.test_raw_query_and_Q_objects
-Foo	mongoengine/tests/test_dereference.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_document_reload_no_inheritance
-Foo	tests/fields/fields.py	/^        class Foo(Base):$/;"	c	function:FieldTest.test_inherited_sequencefield
-Foo	tests/fields/fields.py	/^        class Foo(Base):$/;"	c	function:FieldTest.test_no_inherited_sequencefield
-Foo	tests/fields/fields.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_list_field_passed_in_value
-Foo	tests/fields/fields.py	/^        class Foo(Document):$/;"	c	function:FieldTest.test_reference_miss
-FooBar	mongoengine/tests/document/instance.py	/^        class FooBar(Document):$/;"	c	function:InstanceTest.test_set_unset_one_operation
-GEO_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^GEO_OPERATORS = ('within_distance', 'within_spherical_distance',$/;"	v
-GenericEmbeddedDocumentField	mongoengine/fields.py	/^class GenericEmbeddedDocumentField(BaseField):$/;"	c
-GenericEmbeddedDocumentField	mongoengine/mongoengine/fields.py	/^class GenericEmbeddedDocumentField(BaseField):$/;"	c
-GenericLazyReferenceField	mongoengine/fields.py	/^class GenericLazyReferenceField(GenericReferenceField):$/;"	c
-GenericLazyReferenceField	mongoengine/mongoengine/fields.py	/^class GenericLazyReferenceField(GenericReferenceField):$/;"	c
-GenericLazyReferenceFieldTest	mongoengine/tests/fields/fields.py	/^class GenericLazyReferenceFieldTest(MongoDBTestCase):$/;"	c
-GenericLazyReferenceFieldTest	tests/fields/fields.py	/^class GenericLazyReferenceFieldTest(MongoDBTestCase):$/;"	c
-GenericReferenceField	mongoengine/fields.py	/^class GenericReferenceField(BaseField):$/;"	c
-GenericReferenceField	mongoengine/mongoengine/fields.py	/^class GenericReferenceField(BaseField):$/;"	c
-GeoFieldTest	mongoengine/tests/fields/geo.py	/^class GeoFieldTest(unittest.TestCase):$/;"	c
-GeoJsonBaseField	mongoengine/mongoengine/base/fields.py	/^class GeoJsonBaseField(BaseField):$/;"	c
-GeoPointField	mongoengine/fields.py	/^class GeoPointField(BaseField):$/;"	c
-GeoPointField	mongoengine/mongoengine/fields.py	/^class GeoPointField(BaseField):$/;"	c
-GeoQueriesTest	mongoengine/tests/queryset/geo.py	/^class GeoQueriesTest(MongoDBTestCase):$/;"	c
-GridDocument	mongoengine/tests/fields/file_tests.py	/^        class GridDocument(Document):$/;"	c	function:FileTest.test_file_field_no_default
-GridFSError	mongoengine/fields.py	/^class GridFSError(Exception):$/;"	c
-GridFSError	mongoengine/mongoengine/fields.py	/^class GridFSError(Exception):$/;"	c
-GridFSProxy	mongoengine/fields.py	/^class GridFSProxy(object):$/;"	c
-GridFSProxy	mongoengine/mongoengine/fields.py	/^class GridFSProxy(object):$/;"	c
-Group	mongoengine/tests/document/instance.py	/^        class Group(Document):$/;"	c	function:InstanceTest.test_switch_db_instance
-Group	mongoengine/tests/fields/fields.py	/^        class Group(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
-Group	mongoengine/tests/fields/fields.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference
-Group	mongoengine/tests/fields/fields.py	/^        class Group(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
-Group	mongoengine/tests/queryset/queryset.py	/^        class Group(Document):$/;"	c	function:QuerySetTest.test_update_value_conversion
-Group	mongoengine/tests/test_context_managers.py	/^        class Group(Document):$/;"	c	function:ContextManagersTest.test_no_dereference_context_manager_dbref
-Group	mongoengine/tests/test_context_managers.py	/^        class Group(Document):$/;"	c	function:ContextManagersTest.test_no_dereference_context_manager_object_id
-Group	mongoengine/tests/test_context_managers.py	/^        class Group(Document):$/;"	c	function:ContextManagersTest.test_switch_collection_context_manager
-Group	mongoengine/tests/test_context_managers.py	/^        class Group(Document):$/;"	c	function:ContextManagersTest.test_switch_db_context_manager
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_dict_field
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_dict_field_no_field_inheritance
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_generic_reference
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_generic_reference_map_field
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_handle_old_style_references
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_field_complex
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false_stores_as_type
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_map_field_reference
-Group	mongoengine/tests/test_dereference.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_migrate_references
-Group	tests/fields/fields.py	/^        class Group(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
-Group	tests/fields/fields.py	/^        class Group(Document):$/;"	c	function:FieldTest.test_list_item_dereference
-Group	tests/fields/fields.py	/^        class Group(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
-Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_abstract_documents
-Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_external_subclasses
-Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_external_superclasses
-Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_subclasses
-Guppy	mongoengine/tests/document/inheritance.py	/^        class Guppy(Fish): pass$/;"	c	function:InheritanceTest.test_superclasses
-HAS_PIL	mongoengine/tests/fields/file_tests.py	/^    HAS_PIL = False$/;"	v
-HAS_PIL	mongoengine/tests/fields/file_tests.py	/^    HAS_PIL = True$/;"	v
-HandleNoneFields	mongoengine/tests/fields/fields.py	/^        class HandleNoneFields(Document):$/;"	c	function:FieldTest.test_not_required_handles_none_from_database
-HandleNoneFields	mongoengine/tests/fields/fields.py	/^        class HandleNoneFields(Document):$/;"	c	function:FieldTest.test_not_required_handles_none_in_update
-HandleNoneFields	tests/fields/fields.py	/^        class HandleNoneFields(Document):$/;"	c	function:FieldTest.test_not_required_handles_none_from_database
-HandleNoneFields	tests/fields/fields.py	/^        class HandleNoneFields(Document):$/;"	c	function:FieldTest.test_not_required_handles_none_in_update
-Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_abstract_documents
-Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_external_subclasses
-Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_external_superclasses
-Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_polymorphic_queries
-Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_subclasses
-Human	mongoengine/tests/document/inheritance.py	/^        class Human(Mammal): pass$/;"	c	function:InheritanceTest.test_superclasses
-Human	mongoengine/tests/document/instance.py	/^        class Human(Mammal):$/;"	c	function:InstanceTest.test_polymorphic_references
-Human	mongoengine/tests/fields/fields.py	/^        class Human(Mammal):$/;"	c	function:FieldTest.test_cls_field
-Human	tests/fields/fields.py	/^        class Human(Mammal):$/;"	c	function:FieldTest.test_cls_field
-IS_PYMONGO_3	mongoengine/mongoengine/python_support.py	/^    IS_PYMONGO_3 = False$/;"	v
-IS_PYMONGO_3	mongoengine/mongoengine/python_support.py	/^    IS_PYMONGO_3 = True$/;"	v
-ITER_CHUNK_SIZE	mongoengine/mongoengine/queryset/queryset.py	/^ITER_CHUNK_SIZE = 100$/;"	v
-Image	mongoengine/fields.py	/^    Image = None$/;"	v
-Image	mongoengine/mongoengine/fields.py	/^    Image = None$/;"	v
-ImageField	mongoengine/fields.py	/^class ImageField(FileField):$/;"	c
-ImageField	mongoengine/mongoengine/fields.py	/^class ImageField(FileField):$/;"	c
-ImageGridFsProxy	mongoengine/fields.py	/^class ImageGridFsProxy(GridFSProxy):$/;"	c
-ImageGridFsProxy	mongoengine/mongoengine/fields.py	/^class ImageGridFsProxy(GridFSProxy):$/;"	c
-ImageOps	mongoengine/fields.py	/^    ImageOps = None$/;"	v
-ImageOps	mongoengine/mongoengine/fields.py	/^    ImageOps = None$/;"	v
-ImagePost	mongoengine/docs/code/tumblelog.py	/^class ImagePost(Post):$/;"	c
-ImproperlyConfigured	mongoengine/fields.py	/^class ImproperlyConfigured(Exception):$/;"	c
-ImproperlyConfigured	mongoengine/mongoengine/fields.py	/^class ImproperlyConfigured(Exception):$/;"	c
-IndexesTest	mongoengine/tests/document/indexes.py	/^class IndexesTest(unittest.TestCase):$/;"	c
-Info	mongoengine/tests/fields/fields.py	/^        class Info(EmbeddedDocument):$/;"	c	function:FieldTest.test_map_field_unicode
-Info	tests/fields/fields.py	/^        class Info(EmbeddedDocument):$/;"	c	function:FieldTest.test_map_field_unicode
-InheritanceTest	mongoengine/tests/document/inheritance.py	/^class InheritanceTest(unittest.TestCase):$/;"	c
-InheritedAbstractNamingTest	mongoengine/tests/document/class_methods.py	/^        class InheritedAbstractNamingTest(BaseDocument):$/;"	c	function:ClassMethodsTest.test_collection_naming
-InheritedDocumentFailTest	mongoengine/tests/all_warnings/__init__.py	/^        class InheritedDocumentFailTest(NonAbstractBase):$/;"	c	function:AllWarnings.test_document_collection_syntax_warning
-InstanceTest	mongoengine/tests/document/instance.py	/^class InstanceTest(unittest.TestCase):$/;"	c
-Int64	mongoengine/fields.py	/^    Int64 = long$/;"	v
-Int64	mongoengine/mongoengine/fields.py	/^    Int64 = long$/;"	v
-Int64	mongoengine/tests/fields/fields.py	/^    Int64 = long$/;"	v
-Int64	tests/fields/fields.py	/^    Int64 = long$/;"	v
-IntField	mongoengine/fields.py	/^class IntField(BaseField):$/;"	c
-IntField	mongoengine/mongoengine/fields.py	/^class IntField(BaseField):$/;"	c
-IntPair	mongoengine/tests/queryset/queryset.py	/^        class IntPair(Document):$/;"	c	function:QuerySetTest.test_where
-IntegerSetting	mongoengine/tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_complex_mapfield
-IntegerSetting	mongoengine/tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_dictfield_complex
-IntegerSetting	mongoengine/tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_list_field_complex
-IntegerSetting	tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_complex_mapfield
-IntegerSetting	tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_dictfield_complex
-IntegerSetting	tests/fields/fields.py	/^        class IntegerSetting(SettingBase):$/;"	c	function:FieldTest.test_list_field_complex
-InvalidCollectionError	mongoengine/mongoengine/document.py	/^class InvalidCollectionError(Exception):$/;"	c
-InvalidDocumentError	mongoengine/mongoengine/errors.py	/^class InvalidDocumentError(Exception):$/;"	c
-InvalidQueryError	mongoengine/mongoengine/errors.py	/^class InvalidQueryError(Exception):$/;"	c
-Item	mongoengine/tests/queryset/queryset.py	/^        class Item(Document):$/;"	c	function:QuerySetTest.test_add_to_set_each
-Item	mongoengine/tests/queryset/visitor.py	/^        class Item(Document):$/;"	c	function:QTest.test_chained_q_or_filtering
-Job	mongoengine/tests/document/class_methods.py	/^        class Job(Document):$/;"	c	function:ClassMethodsTest.test_register_delete_rule
-Job	mongoengine/tests/document/instance.py	/^        class Job(Document):$/;"	c	function:InstanceTest.test_do_not_save_unchanged_references
-Job	mongoengine/tests/document/instance.py	/^        class Job(EmbeddedDocument):$/;"	c	function:InstanceTest.setUp
-LONG_DESCRIPTION	mongoengine/setup.py	/^        LONG_DESCRIPTION = fin.read()$/;"	v
-LONG_DESCRIPTION	mongoengine/setup.py	/^    LONG_DESCRIPTION = None$/;"	v
-LastLogin	mongoengine/tests/queryset/queryset.py	/^        class LastLogin(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_as_pymongo
-LazyReference	mongoengine/mongoengine/base/datastructures.py	/^class LazyReference(DBRef):$/;"	c
-LazyReferenceField	mongoengine/fields.py	/^class LazyReferenceField(BaseField):$/;"	c
-LazyReferenceField	mongoengine/mongoengine/fields.py	/^class LazyReferenceField(BaseField):$/;"	c
-LazyReferenceFieldTest	mongoengine/tests/fields/fields.py	/^class LazyReferenceFieldTest(MongoDBTestCase):$/;"	c
-LazyReferenceFieldTest	tests/fields/fields.py	/^class LazyReferenceFieldTest(MongoDBTestCase):$/;"	c
-LineStringField	mongoengine/fields.py	/^class LineStringField(GeoJsonBaseField):$/;"	c
-LineStringField	mongoengine/mongoengine/fields.py	/^class LineStringField(GeoJsonBaseField):$/;"	c
-Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference
-Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
-Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_document_not_registered
-Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_list
-Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
-Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
-Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_unicode_url_validation
-Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_url_scheme_validation
-Link	mongoengine/tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_url_validation
-Link	mongoengine/tests/queryset/queryset.py	/^        class Link(Document):$/;"	c	function:QuerySetTest.test_map_reduce_finalize
-Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference
-Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
-Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_document_not_registered
-Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_list
-Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
-Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
-Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_unicode_url_validation
-Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_url_scheme_validation
-Link	tests/fields/fields.py	/^        class Link(Document):$/;"	c	function:FieldTest.test_url_validation
-LinkPost	mongoengine/docs/code/tumblelog.py	/^class LinkPost(Post):$/;"	c
-LisDoc	mongoengine/tests/queryset/transform.py	/^        class LisDoc(Document):$/;"	c	function:TransformTest.test_transform_update
-ListField	mongoengine/fields.py	/^class ListField(ComplexBaseField):$/;"	c
-ListField	mongoengine/mongoengine/fields.py	/^class ListField(ComplexBaseField):$/;"	c
-Locale	mongoengine/tests/queryset/queryset.py	/^        class Locale(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_scalar_embedded
-Location	mongoengine/tests/document/instance.py	/^        class Location(Document):$/;"	c	function:InstanceTest.test_document_registry_regressions
-Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_geo_indexes_recursion
-Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_geopoint_validation
-Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_linestring_validation
-Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_multilinestring_validation
-Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_multipoint_validation
-Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_multipolygon_validation
-Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_point_validation
-Location	mongoengine/tests/fields/geo.py	/^        class Location(Document):$/;"	c	function:GeoFieldTest.test_polygon_validation
-Location	mongoengine/tests/queryset/geo.py	/^        class Location(Document):$/;"	c	function:GeoQueriesTest.test_2dsphere_linestring_sets_correctly
-Location	mongoengine/tests/queryset/geo.py	/^        class Location(Document):$/;"	c	function:GeoQueriesTest.test_2dsphere_point_sets_correctly
-Location	mongoengine/tests/queryset/geo.py	/^        class Location(Document):$/;"	c	function:GeoQueriesTest.test_geojson_PolygonField
-Location	mongoengine/tests/queryset/transform.py	/^        class Location(Document):$/;"	c	function:TransformTest.test_geojson_LineStringField
-Location	mongoengine/tests/queryset/transform.py	/^        class Location(Document):$/;"	c	function:TransformTest.test_geojson_PointField
-Location	mongoengine/tests/queryset/transform.py	/^        class Location(Document):$/;"	c	function:TransformTest.test_geojson_PolygonField
-Log	mongoengine/tests/document/indexes.py	/^        class Log(Document):$/;"	c	function:IndexesTest.test_ttl_indexes
-Log	mongoengine/tests/document/instance.py	/^        class Log(Document):$/;"	c	function:InstanceTest.test_capped_collection
-Log	mongoengine/tests/document/instance.py	/^        class Log(Document):$/;"	c	function:InstanceTest.test_capped_collection_default
-Log	mongoengine/tests/document/instance.py	/^        class Log(Document):$/;"	c	function:InstanceTest.test_capped_collection_no_max_size_problems
-Log	mongoengine/tests/fields/fields.py	/^        class Log(Document):$/;"	c	function:FieldTest.test_map_field_lookup
-Log	mongoengine/tests/fields/geo.py	/^        class Log(Document):$/;"	c	function:GeoFieldTest.test_geo_indexes_auto_index
-Log	mongoengine/tests/queryset/queryset.py	/^        class Log(Document):$/;"	c	function:QuerySetTest.test_delete_with_limits
-Log	tests/fields/fields.py	/^        class Log(Document):$/;"	c	function:FieldTest.test_map_field_lookup
-LogEntry	mongoengine/tests/document/instance.py	/^        class LogEntry(Document):$/;"	c	function:InstanceTest.test_shard_key
-LogEntry	mongoengine/tests/document/instance.py	/^        class LogEntry(Document):$/;"	c	function:InstanceTest.test_shard_key_primary
-LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_complexdatetime_storage
-LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_complexdatetime_usage
-LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime
-LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_tz_aware_mark_as_changed
-LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_usage
-LogEntry	mongoengine/tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_validation
-LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_complexdatetime_storage
-LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_complexdatetime_usage
-LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime
-LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_tz_aware_mark_as_changed
-LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_usage
-LogEntry	tests/fields/fields.py	/^        class LogEntry(Document):$/;"	c	function:FieldTest.test_datetime_validation
-LongField	mongoengine/fields.py	/^class LongField(BaseField):$/;"	c
-LongField	mongoengine/mongoengine/fields.py	/^class LongField(BaseField):$/;"	c
-LookUpError	mongoengine/mongoengine/errors.py	/^class LookUpError(AttributeError):$/;"	c
-MATCH_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^MATCH_OPERATORS = (COMPARISON_OPERATORS + GEO_OPERATORS +$/;"	v
-MONGO_TEST_DB	mongoengine/tests/utils.py	/^MONGO_TEST_DB = 'mongoenginetest'$/;"	v
-Macro	mongoengine/tests/document/instance.py	/^        class Macro(EmbeddedDocument):$/;"	c	function:InstanceTest.test_complex_nesting_document_and_embedded_document
-Mammal	mongoengine/tests/document/inheritance.py	/^            class Mammal(Animal):$/;"	c	class:InheritanceTest.test_allow_inheritance_abstract_document.Animal
-Mammal	mongoengine/tests/document/inheritance.py	/^            class Mammal(Animal):$/;"	c	class:InheritanceTest.test_cant_turn_off_inheritance_on_subclass.Animal
-Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_external_subclasses
-Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_external_superclasses
-Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_polymorphic_queries
-Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_subclasses
-Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal): pass$/;"	c	function:InheritanceTest.test_superclasses
-Mammal	mongoengine/tests/document/inheritance.py	/^        class Mammal(Animal):$/;"	c	function:InheritanceTest.test_abstract_documents
-Mammal	mongoengine/tests/document/instance.py	/^        class Mammal(Animal):$/;"	c	function:InstanceTest.test_polymorphic_references
-Mammal	mongoengine/tests/fields/fields.py	/^        class Mammal(Animal):$/;"	c	function:FieldTest.test_cls_field
-Mammal	tests/fields/fields.py	/^        class Mammal(Animal):$/;"	c	function:FieldTest.test_cls_field
-MapField	mongoengine/fields.py	/^class MapField(DictField):$/;"	c
-MapField	mongoengine/mongoengine/fields.py	/^class MapField(DictField):$/;"	c
-MapReduceDocument	mongoengine/mongoengine/document.py	/^class MapReduceDocument(object):$/;"	c
-Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:FieldTest.test_reference_query_conversion
-Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:FieldTest.test_reference_query_conversion_dbref
-Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion
-Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion
-Member	mongoengine/tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref
-Member	mongoengine/tests/queryset/queryset.py	/^        class Member(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_mapfield_update
-Member	mongoengine/tests/queryset/queryset.py	/^        class Member(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_no_dereference_embedded_doc
-Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:FieldTest.test_reference_query_conversion
-Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:FieldTest.test_reference_query_conversion_dbref
-Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion
-Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion
-Member	tests/fields/fields.py	/^        class Member(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref
-Message	mongoengine/tests/queryset/queryset.py	/^        class Message(Document):$/;"	c	function:QuerySetTest.test_set_list_embedded_documents
-Message	mongoengine/tests/test_dereference.py	/^        class Message(Document):$/;"	c	function:FieldTest.test_document_reload_reference_integrity
-Message	mongoengine/tests/test_dereference.py	/^        class Message(Document):$/;"	c	function:FieldTest.test_list_lookup_not_checked_in_map
-MetaDict	mongoengine/mongoengine/base/metaclasses.py	/^class MetaDict(dict):$/;"	c
-Mineral	mongoengine/tests/fields/fields.py	/^        class Mineral(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
-Mineral	tests/fields/fields.py	/^        class Mineral(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
-Mixin	mongoengine/tests/fixtures.py	/^class Mixin(object):$/;"	c
-ModeratorComments	mongoengine/tests/fields/fields.py	/^        class ModeratorComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
-ModeratorComments	tests/fields/fields.py	/^        class ModeratorComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
-MongoDBTestCase	mongoengine/tests/utils.py	/^class MongoDBTestCase(unittest.TestCase):$/;"	c
-MongoEngineConnectionError	mongoengine/mongoengine/connection.py	/^class MongoEngineConnectionError(Exception):$/;"	c
-MongoUser	mongoengine/tests/document/indexes.py	/^        class MongoUser(User):$/;"	c	function:IndexesTest.test_disable_index_creation
-Mother	mongoengine/tests/fields/fields.py	/^        class Mother(Document):$/;"	c	function:FieldTest.test_abstract_reference_base_type
-Mother	tests/fields/fields.py	/^        class Mother(Document):$/;"	c	function:FieldTest.test_abstract_reference_base_type
-MultiLineStringField	mongoengine/fields.py	/^class MultiLineStringField(GeoJsonBaseField):$/;"	c
-MultiLineStringField	mongoengine/mongoengine/fields.py	/^class MultiLineStringField(GeoJsonBaseField):$/;"	c
-MultiPointField	mongoengine/fields.py	/^class MultiPointField(GeoJsonBaseField):$/;"	c
-MultiPointField	mongoengine/mongoengine/fields.py	/^class MultiPointField(GeoJsonBaseField):$/;"	c
-MultiPolygonField	mongoengine/fields.py	/^class MultiPolygonField(GeoJsonBaseField):$/;"	c
-MultiPolygonField	mongoengine/mongoengine/fields.py	/^class MultiPolygonField(GeoJsonBaseField):$/;"	c
-MultipleObjectsReturned	mongoengine/mongoengine/errors.py	/^class MultipleObjectsReturned(Exception):$/;"	c
-MyDoc	mongoengine/tests/document/delta.py	/^        class MyDoc(Document):$/;"	c	function:DeltaTest.test_lower_level_mark_as_changed
-MyDoc	mongoengine/tests/document/delta.py	/^        class MyDoc(Document):$/;"	c	function:DeltaTest.test_nested_nested_fields_mark_as_changed
-MyDoc	mongoengine/tests/document/delta.py	/^        class MyDoc(Document):$/;"	c	function:DeltaTest.test_upper_level_mark_as_changed
-MyDoc	mongoengine/tests/document/indexes.py	/^        class MyDoc(Document):$/;"	c	function:IndexesTest.test_build_index_spec_is_not_destructive
-MyDoc	mongoengine/tests/document/indexes.py	/^        class MyDoc(Document):$/;"	c	function:IndexesTest.test_sparse_compound_indexes
-MyDoc	mongoengine/tests/document/indexes.py	/^        class MyDoc(Document):$/;"	c	function:IndexesTest.test_string_indexes
-MyDoc	mongoengine/tests/fields/fields.py	/^        class MyDoc(Document):$/;"	c	function:FieldTest.test_datetime_from_empty_string
-MyDoc	mongoengine/tests/fields/fields.py	/^        class MyDoc(Document):$/;"	c	function:FieldTest.test_datetime_from_whitespace_string
-MyDoc	mongoengine/tests/queryset/field_list.py	/^        class MyDoc(Document):$/;"	c	function:OnlyExcludeAllTest.test_mix_slice_with_other_fields
-MyDoc	mongoengine/tests/queryset/field_list.py	/^        class MyDoc(Document):$/;"	c	function:OnlyExcludeAllTest.test_mixing_only_exclude
-MyDoc	mongoengine/tests/queryset/field_list.py	/^        class MyDoc(Document):$/;"	c	function:OnlyExcludeAllTest.test_slicing
-MyDoc	mongoengine/tests/queryset/queryset.py	/^        class MyDoc(Document):$/;"	c	function:QuerySetTest.test_count_and_none
-MyDoc	mongoengine/tests/queryset/queryset.py	/^        class MyDoc(Document):$/;"	c	function:QuerySetTest.test_dictfield_key_looks_like_a_digit
-MyDoc	mongoengine/tests/queryset/queryset.py	/^        class MyDoc(DynamicDocument):$/;"	c	function:QuerySetTest.test_update_upsert_looks_like_a_digit
-MyDoc	tests/fields/fields.py	/^        class MyDoc(Document):$/;"	c	function:FieldTest.test_datetime_from_empty_string
-MyDoc	tests/fields/fields.py	/^        class MyDoc(Document):$/;"	c	function:FieldTest.test_datetime_from_whitespace_string
-MyDocument	mongoengine/tests/document/class_methods.py	/^        class MyDocument(BaseDocument):$/;"	c	function:ClassMethodsTest.test_collection_naming
-MyDocument	mongoengine/tests/document/inheritance.py	/^            class MyDocument(DateCreatedDocument, DateUpdatedDocument):$/;"	c	class:InheritanceTest.test_document_inheritance.DateUpdatedDocument
-MyPerson	mongoengine/tests/document/instance.py	/^        class MyPerson(self.Person):$/;"	c	function:InstanceTest.test_from_son
-NON_FIELD_ERRORS	mongoengine/mongoengine/base/document.py	/^NON_FIELD_ERRORS = '__all__'$/;"	v
-NULLIFY	mongoengine/mongoengine/queryset/base.py	/^NULLIFY = 1$/;"	v
-NameMixin	mongoengine/tests/document/instance.py	/^        class NameMixin(object):$/;"	c	function:InstanceTest.test_object_mixins
-Namespace	mongoengine/mongoengine/signals.py	/^    class Namespace(object):$/;"	c
-NewDocumentPickleTest	mongoengine/tests/fixtures.py	/^class NewDocumentPickleTest(Document):$/;"	c
-News	mongoengine/tests/queryset/queryset.py	/^        class News(Document):$/;"	c	function:QuerySetTest.test_text_indexes
-NicePlace	mongoengine/tests/document/instance.py	/^        class NicePlace(Place):$/;"	c	function:InstanceTest.test_document_not_registered
-NoDeclaredType	mongoengine/tests/fields/fields.py	/^            class NoDeclaredType(Document):$/;"	c	class:FieldTest.test_mapfield.Simple
-NoDeclaredType	tests/fields/fields.py	/^            class NoDeclaredType(Document):$/;"	c	class:FieldTest.test_mapfield.Simple
-Noddy	mongoengine/tests/queryset/queryset.py	/^        class Noddy(Document):$/;"	c	function:QuerySetTest.test_no_cache
-Node	mongoengine/tests/document/instance.py	/^        class Node(Document):$/;"	c	function:InstanceTest.test_complex_nesting_document_and_embedded_document
-NodesSystem	mongoengine/tests/document/instance.py	/^        class NodesSystem(Document):$/;"	c	function:InstanceTest.test_complex_nesting_document_and_embedded_document
-NonAbstractBase	mongoengine/tests/all_warnings/__init__.py	/^        class NonAbstractBase(Document):$/;"	c	function:AllWarnings.test_document_collection_syntax_warning
-NotRegistered	mongoengine/mongoengine/errors.py	/^class NotRegistered(Exception):$/;"	c
-NotUniqueError	mongoengine/mongoengine/errors.py	/^class NotUniqueError(OperationError):$/;"	c
-Number	mongoengine/tests/queryset/queryset.py	/^        class Number(Document):$/;"	c	function:QuerySetTest.test_clone
-Number	mongoengine/tests/queryset/queryset.py	/^        class Number(Document):$/;"	c	function:QuerySetTest.test_order_then_filter
-Number	mongoengine/tests/queryset/queryset.py	/^        class Number(Document):$/;"	c	function:QuerySetTest.test_order_works_with_custom_db_field_names
-Number	mongoengine/tests/queryset/queryset.py	/^        class Number(Document):$/;"	c	function:QuerySetTest.test_order_works_with_primary
-Number2	mongoengine/tests/queryset/queryset.py	/^        class Number2(Document):$/;"	c	function:QuerySetTest.test_using
-Numbers	mongoengine/tests/queryset/field_list.py	/^        class Numbers(Document):$/;"	c	function:OnlyExcludeAllTest.test_slicing_fields
-Numbers	mongoengine/tests/queryset/field_list.py	/^        class Numbers(Document):$/;"	c	function:OnlyExcludeAllTest.test_slicing_nested_fields
-ONLY	mongoengine/mongoengine/queryset/field_list.py	/^    ONLY = 1$/;"	v	class:QueryFieldList
-OR	mongoengine/mongoengine/queryset/visitor.py	/^    OR = 1$/;"	v	class:QNode
-ObjectIdField	mongoengine/mongoengine/base/fields.py	/^class ObjectIdField(BaseField):$/;"	c
-Occurrence	mongoengine/tests/document/instance.py	/^        class Occurrence(EmbeddedDocument):$/;"	c	function:InstanceTest.test_invalid_son
-Ocorrence	mongoengine/tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
-Ocorrence	mongoengine/tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
-Ocorrence	mongoengine/tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_get_and_save
-Ocorrence	mongoengine/tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields
-Ocorrence	tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
-Ocorrence	tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
-Ocorrence	tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_get_and_save
-Ocorrence	tests/fields/fields.py	/^        class Ocorrence(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_not_set
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_passthrough
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
-Ocurrence	mongoengine/tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_simple
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_bad_set
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_embedded
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_not_set
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_passthrough
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
-Ocurrence	tests/fields/fields.py	/^        class Ocurrence(Document):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_simple
-OldMixinNamingConvention	mongoengine/tests/document/class_methods.py	/^        class OldMixinNamingConvention(Document, BaseMixin):$/;"	c	function:ClassMethodsTest.test_collection_naming
-OldNamingConvention	mongoengine/tests/document/class_methods.py	/^        class OldNamingConvention(BaseDocument):$/;"	c	function:ClassMethodsTest.test_collection_naming
-OnlyExcludeAllTest	mongoengine/tests/queryset/field_list.py	/^class OnlyExcludeAllTest(unittest.TestCase):$/;"	c
-OperationError	mongoengine/mongoengine/errors.py	/^class OperationError(Exception):$/;"	c
-Organization	mongoengine/tests/document/delta.py	/^        class Organization(DocClass2):$/;"	c	function:DeltaTest.circular_reference_deltas
-Organization	mongoengine/tests/document/delta.py	/^        class Organization(DocClass2):$/;"	c	function:DeltaTest.circular_reference_deltas_2
-Organization	mongoengine/tests/document/delta.py	/^        class Organization(Document):$/;"	c	function:DeltaTest.test_referenced_object_changed_attributes
-Organization	mongoengine/tests/document/instance.py	/^        class Organization(Document):$/;"	c	function:InstanceTest.test_query_count_when_saving
-Organization	mongoengine/tests/queryset/queryset.py	/^        class Organization(Document):$/;"	c	function:QuerySetTest.test_get_changed_fields_query_count
-Organization	mongoengine/tests/queryset/queryset.py	/^        class Organization(Document):$/;"	c	function:QuerySetTest.test_no_dereference
-Organization	mongoengine/tests/queryset/queryset.py	/^        class Organization(Document):$/;"	c	function:QuerySetTest.test_no_dereference_embedded_doc
-Organization	mongoengine/tests/queryset/queryset.py	/^        class Organization(Document):$/;"	c	function:QuerySetTest.test_scalar
-Other	mongoengine/tests/test_dereference.py	/^        class Other(EmbeddedDocument):$/;"	c	function:FieldTest.test_circular_tree_reference
-Owner	mongoengine/tests/fields/fields.py	/^        class Owner(EmbeddedDocument):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
-Owner	mongoengine/tests/fields/fields.py	/^        class Owner(EmbeddedDocument):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
-Owner	tests/fields/fields.py	/^        class Owner(EmbeddedDocument):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_fields
-Owner	tests/fields/fields.py	/^        class Owner(EmbeddedDocument):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields
-PAPER	mongoengine/docs/Makefile	/^PAPER         =$/;"	m
-PAPEROPT_a4	mongoengine/docs/Makefile	/^PAPEROPT_a4     = -D latex_paper_size=a4$/;"	m
-PAPEROPT_letter	mongoengine/docs/Makefile	/^PAPEROPT_letter = -D latex_paper_size=letter$/;"	m
-PULL	mongoengine/mongoengine/queryset/base.py	/^PULL = 4$/;"	v
-Page	mongoengine/tests/document/instance.py	/^        class Page(Document):$/;"	c	function:InstanceTest.test_list_search_by_embedded
-Page	mongoengine/tests/document/instance.py	/^        class Page(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_update
-Page	mongoengine/tests/document/instance.py	/^        class Page(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_update_after_save
-Page	mongoengine/tests/document/instance.py	/^        class Page(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_update_db_field
-Page	mongoengine/tests/test_dereference.py	/^        class Page(Document):$/;"	c	function:FieldTest.test_dereferencing_embedded_listfield_referencefield
-Parameter	mongoengine/tests/document/instance.py	/^        class Parameter(EmbeddedDocument):$/;"	c	function:InstanceTest.test_complex_nesting_document_and_embedded_document
-Parent	mongoengine/tests/document/validation.py	/^        class Parent(Document):$/;"	c	function:ValidatorErrorTest.test_parent_reference_in_child_document
-Parent	mongoengine/tests/document/validation.py	/^        class Parent(Document):$/;"	c	function:ValidatorErrorTest.test_parent_reference_set_as_attribute_in_child_document
-Parent	mongoengine/tests/fields/geo.py	/^        class Parent(Document):$/;"	c	function:GeoFieldTest.test_geo_indexes_recursion
-Parents	mongoengine/tests/document/instance.py	/^            class Parents(EmbeddedDocument):$/;"	c	function:InstanceTest.test_invalid_reverse_delete_rule_raise_errors
-Pay	mongoengine/tests/queryset/queryset.py	/^        class Pay(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_embedded_array_average
-Pay	mongoengine/tests/queryset/queryset.py	/^        class Pay(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_embedded_array_sum
-Pay	mongoengine/tests/queryset/queryset.py	/^        class Pay(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_embedded_average
-Pay	mongoengine/tests/queryset/queryset.py	/^        class Pay(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_embedded_sum
-Person	mongoengine/tests/document/class_methods.py	/^        class Person(Document):$/;"	c	function:ClassMethodsTest.setUp
-Person	mongoengine/tests/document/class_methods.py	/^        class Person(Document):$/;"	c	function:ClassMethodsTest.test_collection_name_and_primary
-Person	mongoengine/tests/document/class_methods.py	/^        class Person(Document):$/;"	c	function:ClassMethodsTest.test_custom_collection_name_operations
-Person	mongoengine/tests/document/delta.py	/^        class Person(DocClass1):$/;"	c	function:DeltaTest.circular_reference_deltas
-Person	mongoengine/tests/document/delta.py	/^        class Person(DocClass1):$/;"	c	function:DeltaTest.circular_reference_deltas_2
-Person	mongoengine/tests/document/delta.py	/^        class Person(Document):$/;"	c	function:DeltaTest.setUp
-Person	mongoengine/tests/document/delta.py	/^        class Person(DynamicDocument):$/;"	c	function:DeltaTest.test_delta_for_dynamic_documents
-Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.setUp
-Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.test_complex_dynamic_document_queries
-Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.test_dynamic_and_embedded
-Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.test_dynamic_and_embedded_dict_access
-Person	mongoengine/tests/document/dynamic.py	/^        class Person(DynamicDocument):$/;"	c	function:DynamicTest.test_dynamic_embedded_works_with_only
-Person	mongoengine/tests/document/indexes.py	/^        class Person(Document):$/;"	c	function:IndexesTest.setUp
-Person	mongoengine/tests/document/indexes.py	/^        class Person(Document):$/;"	c	function:IndexesTest.test_embedded_document_index_meta
-Person	mongoengine/tests/document/indexes.py	/^        class Person(UserBase):$/;"	c	function:IndexesTest.test_abstract_index_inheritance
-Person	mongoengine/tests/document/inheritance.py	/^        class Person(Document):$/;"	c	function:InheritanceTest.test_inheritance_meta_data
-Person	mongoengine/tests/document/inheritance.py	/^        class Person(Document):$/;"	c	function:InheritanceTest.test_inheritance_to_mongo_keys
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.setUp
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_data_contains_id_field
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_db_embedded_doc_field_load
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_db_field_load
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_default_values
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_do_not_save_unchanged_references
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_falsey_pk
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_not_saved_eq
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascade_kwargs
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascade_meta_false
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascade_meta_true
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascades
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_cascades_generically
-Person	mongoengine/tests/document/instance.py	/^        class Person(Document):$/;"	c	function:InstanceTest.test_save_max_recursion_not_hit
-Person	mongoengine/tests/document/instance.py	/^        class Person(DynamicDocument):$/;"	c	function:InstanceTest.test_mixed_creation_dynamic
-Person	mongoengine/tests/document/instance.py	/^        class Person(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_to_mongo
-Person	mongoengine/tests/document/validation.py	/^        class Person(BasePerson):$/;"	c	function:ValidatorErrorTest.test_fields_rewrite
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_auto_sync
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_update_all
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_boolean_validation
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dbref_reference_fields
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dbref_to_mongo
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_comparison
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_storage
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_validation
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_nothing_set
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_set_to_None
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_when_deleting_value
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_when_setting_to_None
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_embedded_document_validation
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_float_validation
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_embedded_document
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_reference_is_none
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_int_validation
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields_on_docs
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_object_id_validation
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_objectid_reference_fields
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_required_values
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_get_next_value
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_sequence_name
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_value_decorator
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_string_validation
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_uuid_field_binary
-Person	mongoengine/tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_uuid_field_string
-Person	mongoengine/tests/queryset/field_list.py	/^        class Person(Document):$/;"	c	function:OnlyExcludeAllTest.setUp
-Person	mongoengine/tests/queryset/pickable.py	/^class Person(Document):$/;"	c
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.setUp
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_bool_performance
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_bool_with_ordering
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_bool_with_ordering_from_meta_dict
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_cached_queryset
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_get_changed_fields_query_count
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_null_values
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_on_embedded
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_with_null_embedded
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_loop_over_invalid_id_does_not_crash
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_map_reduce_custom_output
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_no_cached_queryset
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_queryset_aggregation_framework
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_scalar_decimal
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_scalar_embedded
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_scalar_generic_reference_field
-Person	mongoengine/tests/queryset/queryset.py	/^        class Person(Document):$/;"	c	function:QuerySetTest.test_scalar_reference_field
-Person	mongoengine/tests/queryset/visitor.py	/^        class Person(Document):$/;"	c	function:QTest.setUp
-Person	mongoengine/tests/queryset/visitor.py	/^        class Person(Document):$/;"	c	function:QTest.test_empty_q
-Person	mongoengine/tests/test_dereference.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_circular_reference
-Person	mongoengine/tests/test_dereference.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_circular_reference_on_self
-Person	mongoengine/tests/test_dereference.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_circular_tree_reference
-Person	mongoengine/tests/test_dereference.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dict_in_dbref_instance
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_auto_sync
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_update_all
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_boolean_validation
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dbref_reference_fields
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_dbref_to_mongo
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_comparison
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_storage
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_decimal_validation
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_nothing_set
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_set_to_None
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_when_deleting_value
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_default_values_when_setting_to_None
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_embedded_document_validation
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_float_validation
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_embedded_document
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_embedded_document_choices
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_list_embedded_document_choices
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_generic_reference_is_none
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_int_validation
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_multiple_sequence_fields_on_docs
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_object_id_validation
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_objectid_reference_fields
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_required_values
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_get_next_value
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_sequence_name
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_sequence_field_value_decorator
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_string_validation
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_uuid_field_binary
-Person	tests/fields/fields.py	/^        class Person(Document):$/;"	c	function:FieldTest.test_uuid_field_string
-PersonAuto	mongoengine/tests/fields/fields.py	/^        class PersonAuto(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_decimal
-PersonAuto	tests/fields/fields.py	/^        class PersonAuto(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_decimal
-PersonMeta	mongoengine/tests/queryset/queryset.py	/^        class PersonMeta(EmbeddedDocument):$/;"	c	function:QuerySetTest.setUp
-PersonPreferences	mongoengine/tests/fields/fields.py	/^        class PersonPreferences(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_validation
-PersonPreferences	tests/fields/fields.py	/^        class PersonPreferences(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_validation
-Persone	mongoengine/tests/fields/fields.py	/^        class Persone(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled
-Persone	tests/fields/fields.py	/^        class Persone(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled
-Phone	mongoengine/tests/queryset/queryset.py	/^        class Phone(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_item_frequencies_on_embedded
-PickleDynamicEmbedded	mongoengine/tests/fixtures.py	/^class PickleDynamicEmbedded(DynamicEmbeddedDocument):$/;"	c
-PickleDynamicTest	mongoengine/tests/fixtures.py	/^class PickleDynamicTest(DynamicDocument):$/;"	c
-PickleEmbedded	mongoengine/tests/fixtures.py	/^class PickleEmbedded(EmbeddedDocument):$/;"	c
-PickleSignalsTest	mongoengine/tests/fixtures.py	/^class PickleSignalsTest(Document):$/;"	c
-PickleTest	mongoengine/tests/fixtures.py	/^class PickleTest(Document):$/;"	c
-Pike	mongoengine/tests/document/inheritance.py	/^        class Pike(Fish):$/;"	c	function:InheritanceTest.test_dynamic_declarations
-Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_create_geohaystack_index
-Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_explicit_geo2d_index
-Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_explicit_geo2d_index_embedded
-Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_explicit_geohaystack_index
-Place	mongoengine/tests/document/indexes.py	/^        class Place(Document):$/;"	c	function:IndexesTest.test_explicit_geosphere_index
-Place	mongoengine/tests/document/instance.py	/^        class Place(Document):$/;"	c	function:InstanceTest.test_document_not_registered
-Place	mongoengine/tests/queryset/geo.py	/^        class Place(Document):$/;"	c	function:GeoQueriesTest.test_aspymongo_with_only
-Playlist	mongoengine/tests/test_dereference.py	/^        class Playlist(Document):$/;"	c	function:FieldTest.test_select_related_follows_embedded_referencefields
-PlaylistItem	mongoengine/tests/test_dereference.py	/^        class PlaylistItem(EmbeddedDocument):$/;"	c	function:FieldTest.test_select_related_follows_embedded_referencefields
-Point	mongoengine/tests/queryset/geo.py	/^        class Point(Document):$/;"	c	function:GeoQueriesTest.test_spherical_geospatial_operators
-PointField	mongoengine/fields.py	/^class PointField(GeoJsonBaseField):$/;"	c
-PointField	mongoengine/mongoengine/fields.py	/^class PointField(GeoJsonBaseField):$/;"	c
-PolygonField	mongoengine/fields.py	/^class PolygonField(GeoJsonBaseField):$/;"	c
-PolygonField	mongoengine/mongoengine/fields.py	/^class PolygonField(GeoJsonBaseField):$/;"	c
-Post	mongoengine/docs/code/tumblelog.py	/^class Post(Document):$/;"	c
-Post	mongoengine/tests/document/instance.py	/^        class Post(Document):$/;"	c	function:InstanceTest.test_reload_of_non_strict_with_special_field_name
-Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_embedded_sequence_field
-Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference
-Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
-Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_choices_no_dereference
-Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list
-Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
-Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list_item_modification
-Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
-Post	mongoengine/tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_recursive_validation
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Base):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Base):$/;"	c	function:QuerySetTest.test_custom_querysets_inherited_direct
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_call_after_limits_set
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_count_limit_and_skip
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_custom_querysets
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_custom_querysets_managers_directly
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_custom_querysets_set_manager_directly
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_unset_reference
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(Document):$/;"	c	function:QuerySetTest.test_updates_can_have_match_operators
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_bulk_insert
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_find_array_position
-Post	mongoengine/tests/queryset/queryset.py	/^        class Post(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_array_position
-Post	mongoengine/tests/queryset/visitor.py	/^        class Post(Document):$/;"	c	function:QTest.test_q_with_dbref
-Post	mongoengine/tests/queryset/visitor.py	/^        class Post(EmbeddedDocument):$/;"	c	function:QTest.test_chained_q_or_filtering
-Post	mongoengine/tests/test_dereference.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_list_of_lists_of_references
-Post	mongoengine/tests/test_dereference.py	/^        class Post(EmbeddedDocument):$/;"	c	function:FieldTest.test_dereferencing_embedded_listfield_referencefield
-Post	mongoengine/tests/test_signals.py	/^        class Post(Document):$/;"	c	function:SignalTests.setUp
-Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_embedded_sequence_field
-Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference
-Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_choices
-Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_choices_no_dereference
-Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list
-Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
-Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_list_item_modification
-Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_generic_reference_string_choices
-Post	tests/fields/fields.py	/^        class Post(Document):$/;"	c	function:FieldTest.test_recursive_validation
-PowerUser	mongoengine/tests/fields/fields.py	/^        class PowerUser(User):$/;"	c	function:FieldTest.test_embedded_document_inheritance
-PowerUser	tests/fields/fields.py	/^        class PowerUser(User):$/;"	c	function:FieldTest.test_embedded_document_inheritance
-Product	mongoengine/tests/fields/fields.py	/^        class Product(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields
-Product	mongoengine/tests/fields/fields.py	/^        class Product(Document):$/;"	c	function:FieldTest.test_undefined_reference
-Product	mongoengine/tests/queryset/queryset.py	/^        class Product(Document):$/;"	c	function:QuerySetTest.test_distinct_handles_db_field
-Product	tests/fields/fields.py	/^        class Product(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields
-Product	tests/fields/fields.py	/^        class Product(Document):$/;"	c	function:FieldTest.test_undefined_reference
-Profile	mongoengine/tests/queryset/queryset.py	/^        class Profile(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_scalar_embedded
-Project	mongoengine/tests/queryset/queryset.py	/^        class Project(Document):$/;"	c	function:QuerySetTest.test_get_changed_fields_query_count
-PutFile	mongoengine/tests/fields/file_tests.py	/^        class PutFile(Document):$/;"	c	function:FileTest.test_copyable
-PutFile	mongoengine/tests/fields/file_tests.py	/^        class PutFile(Document):$/;"	c	function:FileTest.test_file_fields
-Q	mongoengine/mongoengine/queryset/visitor.py	/^class Q(QNode):$/;"	c
-QCombination	mongoengine/mongoengine/queryset/visitor.py	/^class QCombination(QNode):$/;"	c
-QNode	mongoengine/mongoengine/queryset/visitor.py	/^class QNode(object):$/;"	c
-QNodeVisitor	mongoengine/mongoengine/queryset/visitor.py	/^class QNodeVisitor(object):$/;"	c
-QTest	mongoengine/tests/queryset/visitor.py	/^class QTest(unittest.TestCase):$/;"	c
-QueryCompilerVisitor	mongoengine/mongoengine/queryset/visitor.py	/^class QueryCompilerVisitor(QNodeVisitor):$/;"	c
-QueryFieldList	mongoengine/mongoengine/queryset/field_list.py	/^class QueryFieldList(object):$/;"	c
-QueryFieldListTest	mongoengine/tests/queryset/field_list.py	/^class QueryFieldListTest(unittest.TestCase):$/;"	c
-QuerySet	mongoengine/mongoengine/queryset/queryset.py	/^class QuerySet(BaseQuerySet):$/;"	c
-QuerySetManager	mongoengine/mongoengine/queryset/manager.py	/^class QuerySetManager(object):$/;"	c
-QuerySetNoCache	mongoengine/mongoengine/queryset/queryset.py	/^class QuerySetNoCache(BaseQuerySet):$/;"	c
-QuerySetNoDeRef	mongoengine/mongoengine/queryset/queryset.py	/^class QuerySetNoDeRef(QuerySet):$/;"	c
-QuerySetTest	mongoengine/tests/queryset/queryset.py	/^class QuerySetTest(unittest.TestCase):$/;"	c
-READ_PREF	mongoengine/tests/test_replicaset_connection.py	/^    READ_PREF = ReadPreference.SECONDARY$/;"	v
-READ_PREF	mongoengine/tests/test_replicaset_connection.py	/^    READ_PREF = ReadPreference.SECONDARY_ONLY$/;"	v
-READ_PREFERENCE	mongoengine/mongoengine/connection.py	/^    READ_PREFERENCE = False$/;"	v
-READ_PREFERENCE	mongoengine/mongoengine/connection.py	/^    READ_PREFERENCE = ReadPreference.PRIMARY$/;"	v
-RECURSIVE_REFERENCE_CONSTANT	mongoengine/fields.py	/^RECURSIVE_REFERENCE_CONSTANT = 'self'$/;"	v
-RECURSIVE_REFERENCE_CONSTANT	mongoengine/mongoengine/fields.py	/^RECURSIVE_REFERENCE_CONSTANT = 'self'$/;"	v
-REPR_OUTPUT_SIZE	mongoengine/mongoengine/queryset/queryset.py	/^REPR_OUTPUT_SIZE = 20$/;"	v
-RE_TYPE	mongoengine/mongoengine/queryset/base.py	/^RE_TYPE = type(re.compile(''))$/;"	v
-Rank	mongoengine/tests/document/indexes.py	/^        class Rank(EmbeddedDocument):$/;"	c	function:IndexesTest.test_embedded_document_index_meta
-Rank	mongoengine/tests/document/instance.py	/^        class Rank(EmbeddedDocument):$/;"	c	function:InstanceTest.test_db_embedded_doc_field_load
-Recipient	mongoengine/tests/document/instance.py	/^        class Recipient(Document):$/;"	c	function:InstanceTest.test_save
-Record	mongoengine/tests/document/instance.py	/^        class Record(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_pull
-RecursiveDocument	mongoengine/tests/document/indexes.py	/^        class RecursiveDocument(Document):$/;"	c	function:IndexesTest.test_recursive_embedded_objects_dont_break_indexes
-RecursiveObject	mongoengine/tests/document/indexes.py	/^        class RecursiveObject(EmbeddedDocument):$/;"	c	function:IndexesTest.test_recursive_embedded_objects_dont_break_indexes
-ReferenceField	mongoengine/fields.py	/^class ReferenceField(BaseField):$/;"	c
-ReferenceField	mongoengine/mongoengine/fields.py	/^class ReferenceField(BaseField):$/;"	c
-Relation	mongoengine/tests/test_dereference.py	/^        class Relation(EmbeddedDocument):$/;"	c	function:FieldTest.test_circular_reference
-ReportDictField	mongoengine/tests/document/indexes.py	/^        class ReportDictField(Document):$/;"	c	function:IndexesTest.test_compound_key_dictfield
-ReportEmbedded	mongoengine/tests/document/indexes.py	/^        class ReportEmbedded(Document):$/;"	c	function:IndexesTest.test_compound_key_embedded
-Road	mongoengine/tests/queryset/geo.py	/^        class Road(Document):$/;"	c	function:GeoQueriesTest.test_linestring
-Road	mongoengine/tests/queryset/geo.py	/^        class Road(Document):$/;"	c	function:GeoQueriesTest.test_polygon
-Room	mongoengine/tests/test_dereference.py	/^        class Room(Document):$/;"	c	function:FieldTest.test_dict_in_dbref_instance
-SPHINXBUILD	mongoengine/docs/Makefile	/^SPHINXBUILD   = sphinx-build$/;"	m
-SPHINXOPTS	mongoengine/docs/Makefile	/^SPHINXOPTS    =$/;"	m
-STRICT	mongoengine/mongoengine/base/document.py	/^    STRICT = False$/;"	v	class:BaseDocument
-STRING_OPERATORS	mongoengine/mongoengine/queryset/transform.py	/^STRING_OPERATORS = ('contains', 'icontains', 'startswith',$/;"	v
-SaveConditionError	mongoengine/mongoengine/errors.py	/^class SaveConditionError(OperationError):$/;"	c
-SchemeLink	mongoengine/tests/fields/fields.py	/^        class SchemeLink(Document):$/;"	c	function:FieldTest.test_url_scheme_validation
-SchemeLink	tests/fields/fields.py	/^        class SchemeLink(Document):$/;"	c	function:FieldTest.test_url_scheme_validation
-Scores	mongoengine/tests/queryset/queryset.py	/^        class Scores(Document):$/;"	c	function:QuerySetTest.test_update_min_max
-ScottishCat	mongoengine/tests/queryset/queryset.py	/^        class ScottishCat(Cat):$/;"	c	function:QuerySetTest.test_subclass_field_query
-SequenceField	mongoengine/fields.py	/^class SequenceField(BaseField):$/;"	c
-SequenceField	mongoengine/mongoengine/fields.py	/^class SequenceField(BaseField):$/;"	c
-SetFile	mongoengine/tests/fields/file_tests.py	/^        class SetFile(Document):$/;"	c	function:FileTest.test_file_fields_set
-SettingBase	mongoengine/tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_complex_mapfield
-SettingBase	mongoengine/tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_dictfield_complex
-SettingBase	mongoengine/tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_list_field_complex
-SettingBase	tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_complex_mapfield
-SettingBase	tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_dictfield_complex
-SettingBase	tests/fields/fields.py	/^        class SettingBase(EmbeddedDocument):$/;"	c	function:FieldTest.test_list_field_complex
-SettingValue	mongoengine/tests/queryset/queryset.py	/^        class SettingValue(Document):$/;"	c	function:QuerySetTest.test_scalar_primary_key
-Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_allow_using_sets_as_choices
-Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_get_field_display
-Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_accept_possible_value
-Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_allow_no_value
-Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_reject_unknown_value
-Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_get_field_display
-Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_validation
-Shirt	mongoengine/tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_validation_invalid_value
-Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_allow_using_sets_as_choices
-Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_get_field_display
-Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_accept_possible_value
-Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_allow_no_value
-Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_choices_validation_reject_unknown_value
-Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_get_field_display
-Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_validation
-Shirt	tests/fields/fields.py	/^        class Shirt(Document):$/;"	c	function:FieldTest.test_simple_choices_validation_invalid_value
-Sibling	mongoengine/tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_abstract_reference_base_type
-Sibling	mongoengine/tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_reference_abstract_class
-Sibling	mongoengine/tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
-Sibling	tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_abstract_reference_base_type
-Sibling	tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_reference_abstract_class
-Sibling	tests/fields/fields.py	/^        class Sibling(Document):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
-SignalTests	mongoengine/tests/test_signals.py	/^class SignalTests(unittest.TestCase):$/;"	c
-Simple	mongoengine/tests/document/instance.py	/^        class Simple(Document):$/;"	c	function:InstanceTest.test_can_save_if_not_included
-Simple	mongoengine/tests/document/json_serialisation.py	/^        class Simple(Document):$/;"	c	function:TestJson.test_json_complex
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_atomic_update_dict_field
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_complex_field_required
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_complex_field_same_value_not_changed
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_del_slice_marks_field_as_changed
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_dictfield_complex
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_dictfield_strict
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_complex
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_rejects_strings
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_strict
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_with_negative_indices
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_mapfield
-Simple	mongoengine/tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_slice_marks_field_as_changed
-Simple	mongoengine/tests/queryset/queryset.py	/^        class Simple(Document):$/;"	c	function:QuerySetTest.test_json_complex
-Simple	mongoengine/tests/queryset/queryset.py	/^        class Simple(Document):$/;"	c	function:QuerySetTest.test_update_using_positional_operator_matches_first
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_atomic_update_dict_field
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_complex_field_required
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_complex_field_same_value_not_changed
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_del_slice_marks_field_as_changed
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_dictfield_complex
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_dictfield_strict
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_complex
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_rejects_strings
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_strict
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_list_field_with_negative_indices
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_mapfield
-Simple	tests/fields/fields.py	/^        class Simple(Document):$/;"	c	function:FieldTest.test_slice_marks_field_as_changed
-SimpleList	mongoengine/tests/test_dereference.py	/^        class SimpleList(Document):$/;"	c	function:FieldTest.test_list_of_lists_of_references
-SimplificationVisitor	mongoengine/mongoengine/queryset/visitor.py	/^class SimplificationVisitor(QNodeVisitor):$/;"	c
-Sister	mongoengine/tests/fields/fields.py	/^        class Sister(Sibling):$/;"	c	function:FieldTest.test_reference_abstract_class
-Sister	mongoengine/tests/fields/fields.py	/^        class Sister(Sibling):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
-Sister	tests/fields/fields.py	/^        class Sister(Sibling):$/;"	c	function:FieldTest.test_reference_abstract_class
-Sister	tests/fields/fields.py	/^        class Sister(Sibling):$/;"	c	function:FieldTest.test_reference_class_with_abstract_parent
-Site	mongoengine/tests/document/instance.py	/^        class Site(Document):$/;"	c	function:InstanceTest.test_embedded_update
-Site	mongoengine/tests/document/instance.py	/^        class Site(Document):$/;"	c	function:InstanceTest.test_embedded_update_after_save
-Site	mongoengine/tests/document/instance.py	/^        class Site(Document):$/;"	c	function:InstanceTest.test_embedded_update_db_field
-Site	mongoengine/tests/queryset/queryset.py	/^        class Site(Document):$/;"	c	function:QuerySetTest.test_pull_from_nested_embedded
-Site	mongoengine/tests/queryset/queryset.py	/^        class Site(Document):$/;"	c	function:QuerySetTest.test_pull_from_nested_mapfield
-Site	mongoengine/tests/queryset/queryset.py	/^        class Site(Document):$/;"	c	function:QuerySetTest.test_pull_nested
-Size	mongoengine/tests/queryset/queryset.py	/^        class Size(Document):$/;"	c	function:QuerySetTest.test_can_have_field_same_name_as_query_operator
-SocialData	mongoengine/tests/fields/fields.py	/^        class SocialData(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
-SocialData	tests/fields/fields.py	/^        class SocialData(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_reference
-SocialTest	mongoengine/tests/fields/fields.py	/^        class SocialTest(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_decimal
-SocialTest	tests/fields/fields.py	/^        class SocialTest(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_field_decimal
-Song	mongoengine/tests/test_dereference.py	/^        class Song(Document):$/;"	c	function:FieldTest.test_select_related_follows_embedded_referencefields
-SortedListField	mongoengine/fields.py	/^class SortedListField(ListField):$/;"	c
-SortedListField	mongoengine/mongoengine/fields.py	/^class SortedListField(ListField):$/;"	c
-SpecialComment	mongoengine/tests/document/inheritance.py	/^            class SpecialComment(Comment):$/;"	c	class:InheritanceTest.test_allow_inheritance_embedded_document.Comment
-SpecificStrictDict	mongoengine/mongoengine/base/datastructures.py	/^            class SpecificStrictDict(cls):$/;"	c	function:StrictDict.create
-State	mongoengine/tests/queryset/queryset.py	/^        class State(Document):$/;"	c	function:QuerySetTest.test_scalar_generic_reference_field
-State	mongoengine/tests/queryset/queryset.py	/^        class State(Document):$/;"	c	function:QuerySetTest.test_scalar_reference_field
-Stats	mongoengine/tests/document/instance.py	/^        class Stats(Document):$/;"	c	function:InstanceTest.test_reference_inheritance
-StreamFile	mongoengine/tests/fields/file_tests.py	/^        class StreamFile(Document):$/;"	c	function:FileTest.test_file_fields_stream
-StreamFile	mongoengine/tests/fields/file_tests.py	/^        class StreamFile(Document):$/;"	c	function:FileTest.test_file_fields_stream_after_none
-StrictDict	mongoengine/mongoengine/base/datastructures.py	/^class StrictDict(object):$/;"	c
-StringField	mongoengine/fields.py	/^class StringField(BaseField):$/;"	c
-StringField	mongoengine/mongoengine/fields.py	/^class StringField(BaseField):$/;"	c
-StringIO	mongoengine/mongoengine/python_support.py	/^        StringIO = cStringIO.StringIO$/;"	v
-StringIO	mongoengine/mongoengine/python_support.py	/^StringIO = six.BytesIO$/;"	v
-StringSetting	mongoengine/tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_complex_mapfield
-StringSetting	mongoengine/tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_dictfield_complex
-StringSetting	mongoengine/tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_list_field_complex
-StringSetting	tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_complex_mapfield
-StringSetting	tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_dictfield_complex
-StringSetting	tests/fields/fields.py	/^        class StringSetting(SettingBase):$/;"	c	function:FieldTest.test_list_field_complex
-SubAnimal	mongoengine/tests/fields/fields.py	/^        class SubAnimal(Animal):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
-SubAnimal	mongoengine/tests/fields/fields.py	/^        class SubAnimal(Animal):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
-SubAnimal	tests/fields/fields.py	/^        class SubAnimal(Animal):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set
-SubAnimal	tests/fields/fields.py	/^        class SubAnimal(Animal):$/;"	c	function:LazyReferenceFieldTest.test_lazy_reference_set
-SubDoc	mongoengine/tests/document/instance.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:InstanceTest.test_embedded_document_to_mongo_id
-SubDoc	mongoengine/tests/document/validation.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:ValidatorErrorTest.test_embedded_db_field_validate
-SubDoc	mongoengine/tests/document/validation.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:ValidatorErrorTest.test_embedded_weakref
-SubDoc	mongoengine/tests/queryset/queryset.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_reload_embedded_docs_instance
-SubDoc	mongoengine/tests/queryset/queryset.py	/^        class SubDoc(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_reload_list_embedded_docs_instance
-SubDocument	mongoengine/tests/document/indexes.py	/^        class SubDocument(EmbeddedDocument):$/;"	c	function:IndexesTest.test_unique_embedded_document
-SubDocument	mongoengine/tests/document/indexes.py	/^        class SubDocument(EmbeddedDocument):$/;"	c	function:IndexesTest.test_unique_embedded_document_in_list
-SubDocument	mongoengine/tests/document/indexes.py	/^        class SubDocument(EmbeddedDocument):$/;"	c	function:IndexesTest.test_unique_with_embedded_document_and_embedded_unique
-SuperPhylum	mongoengine/tests/document/instance.py	/^        class SuperPhylum(EmbeddedDocument):$/;"	c	function:InstanceTest.test_reload_sharded_nested
-TEST_IMAGE2_PATH	mongoengine/tests/fields/file_tests.py	/^TEST_IMAGE2_PATH = os.path.join(os.path.dirname(__file__), 'mongodb_leaf.png')$/;"	v
-TEST_IMAGE_PATH	mongoengine/tests/document/instance.py	/^TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__),$/;"	v
-TEST_IMAGE_PATH	mongoengine/tests/fields/file_tests.py	/^TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), 'mongoengine.png')$/;"	v
-TPS	mongoengine/tests/fields/fields.py	/^            TPS = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-TPS	tests/fields/fields.py	/^            TPS = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-TYPES	mongoengine/tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-TYPES	mongoengine/tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-TYPES	mongoengine/tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-TYPES	tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-TYPES	tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-TYPES	tests/fields/fields.py	/^            TYPES = ($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-Tag	mongoengine/tests/document/indexes.py	/^        class Tag(EmbeddedDocument):$/;"	c	function:IndexesTest.test_list_embedded_document_index
-Tag	mongoengine/tests/test_dereference.py	/^        class Tag(Document):$/;"	c	function:FieldTest.test_dereferencing_embedded_listfield_referencefield
-Test	mongoengine/tests/document/indexes.py	/^        class Test(Document):$/;"	c	function:IndexesTest.test_covered_index
-Test	mongoengine/tests/document/instance.py	/^        class Test(Document):$/;"	c	function:InstanceTest.test_dbref_equality
-Test	mongoengine/tests/document/instance.py	/^        class Test(Document):$/;"	c	function:InstanceTest.test_embedded_document_equality
-Test	mongoengine/tests/fields/fields.py	/^            class Test(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields_on_embedded_documents
-Test	mongoengine/tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_embedded_db_field
-Test	mongoengine/tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_embedded_mapfield_db_field
-Test	mongoengine/tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_mapfield_numerical_index
-Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_cursor_in_an_if_stmt
-Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_dict_with_custom_baseclass
-Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_normalize
-Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_with_0_values
-Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_item_frequencies_with_False_values
-Test	mongoengine/tests/queryset/queryset.py	/^        class Test(Document):$/;"	c	function:QuerySetTest.test_upsert_includes_cls
-Test	mongoengine/tests/queryset/visitor.py	/^        class Test(Document):$/;"	c	function:QTest.test_multiple_occurence_in_field
-Test	tests/fields/fields.py	/^            class Test(Document):$/;"	c	function:CachedReferenceFieldTest.test_cached_reference_fields_on_embedded_documents
-Test	tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_embedded_db_field
-Test	tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_embedded_mapfield_db_field
-Test	tests/fields/fields.py	/^        class Test(Document):$/;"	c	function:FieldTest.test_mapfield_numerical_index
-Test2	mongoengine/tests/document/instance.py	/^        class Test2(Document):$/;"	c	function:InstanceTest.test_dbref_equality
-Test3	mongoengine/tests/document/instance.py	/^        class Test3(Document):$/;"	c	function:InstanceTest.test_dbref_equality
-TestActivity	mongoengine/tests/queryset/queryset.py	/^        class TestActivity(Document):$/;"	c	function:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo
-TestChildDoc	mongoengine/tests/document/indexes.py	/^        class TestChildDoc(TestDoc):$/;"	c	function:IndexesTest.test_index_dont_send_cls_option
-TestDoc	mongoengine/tests/document/indexes.py	/^        class TestDoc(Document):$/;"	c	function:IndexesTest.test_compound_index_underscore_cls_not_overwritten
-TestDoc	mongoengine/tests/document/indexes.py	/^        class TestDoc(Document):$/;"	c	function:IndexesTest.test_index_dont_send_cls_option
-TestDoc	mongoengine/tests/document/instance.py	/^        class TestDoc(Document, DoubleMixIn):$/;"	c	function:InstanceTest.test_mixin_inheritance
-TestDoc	mongoengine/tests/fields/fields.py	/^        class TestDoc(Document):$/;"	c	function:FieldTest.test_tuples_as_tuples
-TestDoc	mongoengine/tests/queryset/queryset.py	/^        class TestDoc(Document):$/;"	c	function:QuerySetTest.test_scalar_db_field
-TestDoc	mongoengine/tests/queryset/queryset.py	/^        class TestDoc(Document):$/;"	c	function:QuerySetTest.test_scalar_simple
-TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_and_combination
-TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_and_or_combination
-TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_or_and_or_combination
-TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_or_combination
-TestDoc	mongoengine/tests/queryset/visitor.py	/^        class TestDoc(Document):$/;"	c	function:QTest.test_q_clone
-TestDoc	tests/fields/fields.py	/^        class TestDoc(Document):$/;"	c	function:FieldTest.test_tuples_as_tuples
-TestDocument	mongoengine/tests/document/instance.py	/^        class TestDocument(Document):$/;"	c	function:InstanceTest.test_document_clean
-TestDocument	mongoengine/tests/document/instance.py	/^        class TestDocument(Document):$/;"	c	function:InstanceTest.test_document_embedded_clean
-TestDocument	mongoengine/tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_int_and_float_ne_operator
-TestDocument	mongoengine/tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_long_ne_operator
-TestDocument	mongoengine/tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_long_validation
-TestDocument	tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_int_and_float_ne_operator
-TestDocument	tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_long_ne_operator
-TestDocument	tests/fields/fields.py	/^        class TestDocument(Document):$/;"	c	function:FieldTest.test_long_validation
-TestEmbeddedDocument	mongoengine/tests/document/instance.py	/^        class TestEmbeddedDocument(EmbeddedDocument):$/;"	c	function:InstanceTest.test_document_embedded_clean
-TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_copyable
-TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_boolean
-TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_cmp
-TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_disk_space
-TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_multidb
-TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_reassigning
-TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_file_uniqueness
-TestFile	mongoengine/tests/fields/file_tests.py	/^        class TestFile(Document):$/;"	c	function:FileTest.test_image_field_reassigning
-TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_get_image_by_grid_id
-TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_image_field
-TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_image_field_resize
-TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_image_field_resize_force
-TestImage	mongoengine/tests/fields/file_tests.py	/^        class TestImage(Document):$/;"	c	function:FileTest.test_image_field_thumbnail
-TestJson	mongoengine/tests/document/json_serialisation.py	/^class TestJson(unittest.TestCase):$/;"	c
-TestLongFieldConsideredAsInt64	mongoengine/tests/fields/fields.py	/^        class TestLongFieldConsideredAsInt64(Document):$/;"	c	function:FieldTest.test_long_field_is_considered_as_int64
-TestLongFieldConsideredAsInt64	tests/fields/fields.py	/^        class TestLongFieldConsideredAsInt64(Document):$/;"	c	function:FieldTest.test_long_field_is_considered_as_int64
-TestOrganization	mongoengine/tests/queryset/queryset.py	/^            class TestOrganization(Document):$/;"	c	function:QuerySetTest.test_update_related_models
-TestPerson	mongoengine/tests/queryset/queryset.py	/^            class TestPerson(Document):$/;"	c	function:QuerySetTest.test_update_related_models
-TestPerson	mongoengine/tests/queryset/queryset.py	/^        class TestPerson(Document):$/;"	c	function:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo
-TestQuerysetPickable	mongoengine/tests/queryset/pickable.py	/^class TestQuerysetPickable(unittest.TestCase):$/;"	c
-TestStrictDict	mongoengine/tests/test_datastructures.py	/^class TestStrictDict(unittest.TestCase):$/;"	c
-TextPost	mongoengine/docs/code/tumblelog.py	/^class TextPost(Post):$/;"	c
-Thing	mongoengine/tests/document/instance.py	/^        class Thing(EmbeddedDocument):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document
-Thing	mongoengine/tests/document/instance.py	/^        class Thing(EmbeddedDocument):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false
-Thing	mongoengine/tests/document/instance.py	/^        class Thing(EmbeddedDocument):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc
-Thing	mongoengine/tests/document/instance.py	/^        class Thing(EmbeddedDocument):$/;"	c	function:InstanceTest.test_save_to_a_value_that_equates_to_false
-ToEmbed	mongoengine/tests/fields/fields.py	/^        class ToEmbed(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
-ToEmbed	mongoengine/tests/fields/fields.py	/^        class ToEmbed(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
-ToEmbed	tests/fields/fields.py	/^        class ToEmbed(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
-ToEmbed	tests/fields/fields.py	/^        class ToEmbed(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
-ToEmbedChild	mongoengine/tests/fields/fields.py	/^        class ToEmbedChild(ToEmbedParent):$/;"	c	function:FieldTest.test_dictfield_dump_document
-ToEmbedChild	mongoengine/tests/fields/fields.py	/^        class ToEmbedChild(ToEmbedParent):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
-ToEmbedChild	tests/fields/fields.py	/^        class ToEmbedChild(ToEmbedParent):$/;"	c	function:FieldTest.test_dictfield_dump_document
-ToEmbedChild	tests/fields/fields.py	/^        class ToEmbedChild(ToEmbedParent):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
-ToEmbedParent	mongoengine/tests/fields/fields.py	/^        class ToEmbedParent(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
-ToEmbedParent	mongoengine/tests/fields/fields.py	/^        class ToEmbedParent(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
-ToEmbedParent	tests/fields/fields.py	/^        class ToEmbedParent(Document):$/;"	c	function:FieldTest.test_dictfield_dump_document
-ToEmbedParent	tests/fields/fields.py	/^        class ToEmbedParent(Document):$/;"	c	function:FieldTest.test_dynamicfield_dump_document
-TopLevelDocumentMetaclass	mongoengine/mongoengine/base/metaclasses.py	/^class TopLevelDocumentMetaclass(DocumentMetaclass):$/;"	c
-Topic	mongoengine/tests/test_dereference.py	/^        class Topic(Document):$/;"	c	function:FieldTest.test_document_reload_reference_integrity
-TransformTest	mongoengine/tests/queryset/transform.py	/^class TransformTest(unittest.TestCase):$/;"	c
-Tree	mongoengine/tests/fields/fields.py	/^        class Tree(Document):$/;"	c	function:FieldTest.test_recursive_embedding
-Tree	tests/fields/fields.py	/^        class Tree(Document):$/;"	c	function:FieldTest.test_recursive_embedding
-TreeNode	mongoengine/tests/fields/fields.py	/^        class TreeNode(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_embedding
-TreeNode	tests/fields/fields.py	/^        class TreeNode(EmbeddedDocument):$/;"	c	function:FieldTest.test_recursive_embedding
-UInfoDocument	mongoengine/tests/document/delta.py	/^        class UInfoDocument(Document):$/;"	c	function:DeltaTest.test_delta_for_nested_map_fields
-UPDATE_OPERATORS	mongoengine/mongoengine/base/common.py	/^UPDATE_OPERATORS = set(['set', 'unset', 'inc', 'dec', 'pop', 'push',$/;"	v
-URLField	mongoengine/fields.py	/^class URLField(StringField):$/;"	c
-URLField	mongoengine/mongoengine/fields.py	/^class URLField(StringField):$/;"	c
-USER_REGEX	mongoengine/fields.py	/^    USER_REGEX = re.compile($/;"	v	class:EmailField
-USER_REGEX	mongoengine/mongoengine/fields.py	/^    USER_REGEX = re.compile($/;"	v	class:EmailField
-UTF8_USER_REGEX	mongoengine/fields.py	/^    UTF8_USER_REGEX = re.compile($/;"	v	class:EmailField
-UTF8_USER_REGEX	mongoengine/mongoengine/fields.py	/^    UTF8_USER_REGEX = re.compile($/;"	v	class:EmailField
-UUID	mongoengine/tests/document/instance.py	/^        def UUID(i):$/;"	f	function:InstanceTest.test_save_atomicity_condition
-UUIDField	mongoengine/fields.py	/^class UUIDField(BaseField):$/;"	c
-UUIDField	mongoengine/mongoengine/fields.py	/^class UUIDField(BaseField):$/;"	c
-User	mongoengine/docs/code/tumblelog.py	/^class User(Document):$/;"	c
-User	mongoengine/tests/document/delta.py	/^        class User(Document):$/;"	c	function:DeltaTest.test_referenced_object_changed_attributes
-User	mongoengine/tests/document/indexes.py	/^        class User(Document):$/;"	c	function:IndexesTest.test_disable_index_creation
-User	mongoengine/tests/document/indexes.py	/^        class User(Document):$/;"	c	function:IndexesTest.test_unique_and_primary
-User	mongoengine/tests/document/indexes.py	/^        class User(Document):$/;"	c	function:IndexesTest.test_unique_and_primary_create
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_custom_id_field
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_db_alias_tests
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_db_ref_usage
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_document_hash
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_list_search_by_embedded
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_load_undefined_fields_with_strict_false
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_null_field
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_query_count_when_saving
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_custom_id_field
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections
-User	mongoengine/tests/document/instance.py	/^        class User(Document):$/;"	c	function:InstanceTest.test_save_to_a_value_that_equates_to_false
-User	mongoengine/tests/document/instance.py	/^        class User(self.Person):$/;"	c	function:InstanceTest.test_save_only_changed_fields
-User	mongoengine/tests/document/instance.py	/^        class User(self.Person):$/;"	c	function:InstanceTest.test_save_only_changed_fields_recursive
-User	mongoengine/tests/document/validation.py	/^        class User(Document):$/;"	c	function:ValidatorErrorTest.test_model_validation
-User	mongoengine/tests/fields/fields.py	/^            class User(Document):$/;"	c	function:FieldTest.test_db_field_validation
-User	mongoengine/tests/fields/fields.py	/^        class User(Basedoc):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_domain_whitelist
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_honors_regex
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_ip_domain
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_unicode_user
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_document_not_registered
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list_item_modification
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_validation
-User	mongoengine/tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_reference_validation
-User	mongoengine/tests/fields/fields.py	/^        class User(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_inheritance
-User	mongoengine/tests/queryset/field_list.py	/^        class User(Base):$/;"	c	function:OnlyExcludeAllTest.test_exclude_from_subclasses_docs
-User	mongoengine/tests/queryset/field_list.py	/^        class User(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_exclude
-User	mongoengine/tests/queryset/field_list.py	/^        class User(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_only_with_subfields
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_as_pymongo
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_as_pymongo_json_limit_fields
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_cache_not_cloned
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_comment
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_in_operator_on_non_iterable
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_nested_queryset_iterator
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_no_dereference
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_no_dereference_embedded_doc
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_scalar
-User	mongoengine/tests/queryset/queryset.py	/^        class User(Document):$/;"	c	function:QuerySetTest.test_set_generic_embedded_documents
-User	mongoengine/tests/queryset/queryset.py	/^        class User(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_find_embedded
-User	mongoengine/tests/queryset/queryset.py	/^        class User(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_find_empty_embedded
-User	mongoengine/tests/queryset/queryset.py	/^        class User(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_pull_from_nested_embedded
-User	mongoengine/tests/queryset/visitor.py	/^        class User(Document):$/;"	c	function:QTest.test_q_merge_queries_edge_case
-User	mongoengine/tests/queryset/visitor.py	/^        class User(Document):$/;"	c	function:QTest.test_q_with_dbref
-User	mongoengine/tests/test_context_managers.py	/^        class User(Document):$/;"	c	function:ContextManagersTest.test_no_dereference_context_manager_dbref
-User	mongoengine/tests/test_context_managers.py	/^        class User(Document):$/;"	c	function:ContextManagersTest.test_no_dereference_context_manager_object_id
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_document_reload_reference_integrity
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_handle_old_style_references
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_false_stores_as_type
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_of_lists_of_references
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_map_field_reference
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_migrate_references
-User	mongoengine/tests/test_dereference.py	/^        class User(Document):$/;"	c	function:FieldTest.test_objectid_reference_across_databases
-User	tests/fields/fields.py	/^            class User(Document):$/;"	c	function:FieldTest.test_db_field_validation
-User	tests/fields/fields.py	/^        class User(Basedoc):$/;"	c	function:FieldTest.test_embedded_document_inheritance_with_list
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_domain_whitelist
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_honors_regex
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_ip_domain
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_email_field_unicode_user
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_document_not_registered
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list_choices
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_generic_reference_list_item_modification
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_item_dereference
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_list_validation
-User	tests/fields/fields.py	/^        class User(Document):$/;"	c	function:FieldTest.test_reference_validation
-User	tests/fields/fields.py	/^        class User(EmbeddedDocument):$/;"	c	function:FieldTest.test_embedded_document_inheritance
-UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_dict_field
-UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_dict_field_no_field_inheritance
-UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_generic_reference
-UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_generic_reference_map_field
-UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries
-UserA	mongoengine/tests/test_dereference.py	/^        class UserA(Document):$/;"	c	function:FieldTest.test_list_field_complex
-UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_dict_field
-UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_generic_reference
-UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_generic_reference_map_field
-UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries
-UserB	mongoengine/tests/test_dereference.py	/^        class UserB(Document):$/;"	c	function:FieldTest.test_list_field_complex
-UserBase	mongoengine/tests/document/indexes.py	/^        class UserBase(Document):$/;"	c	function:IndexesTest.test_abstract_index_inheritance
-UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_dict_field
-UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_generic_reference
-UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_generic_reference_map_field
-UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries
-UserC	mongoengine/tests/test_dereference.py	/^        class UserC(Document):$/;"	c	function:FieldTest.test_list_field_complex
-UserComments	mongoengine/tests/fields/fields.py	/^        class UserComments(Comments):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
-UserComments	mongoengine/tests/fields/fields.py	/^        class UserComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents
-UserComments	mongoengine/tests/fields/fields.py	/^        class UserComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
-UserComments	tests/fields/fields.py	/^        class UserComments(Comments):$/;"	c	function:FieldTest.test_choices_validation_documents_inheritance
-UserComments	tests/fields/fields.py	/^        class UserComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents
-UserComments	tests/fields/fields.py	/^        class UserComments(EmbeddedDocument):$/;"	c	function:FieldTest.test_choices_validation_documents_invalid
-UserDoc	mongoengine/tests/queryset/queryset.py	/^        class UserDoc(Document):$/;"	c	function:QuerySetTest.test_scalar_simple
-UserSubscription	mongoengine/tests/document/instance.py	/^        class UserSubscription(Document):$/;"	c	function:InstanceTest.test_query_count_when_saving
-UserVisit	mongoengine/tests/queryset/queryset.py	/^        class UserVisit(Document):$/;"	c	function:QuerySetTest.test_average_over_db_field
-UserVisit	mongoengine/tests/queryset/queryset.py	/^        class UserVisit(Document):$/;"	c	function:QuerySetTest.test_sum_over_db_field
-VALUE_DECORATOR	mongoengine/fields.py	/^    VALUE_DECORATOR = int$/;"	v	class:SequenceField
-VALUE_DECORATOR	mongoengine/mongoengine/fields.py	/^    VALUE_DECORATOR = int$/;"	v	class:SequenceField
-VERSION	mongoengine/mongoengine/__init__.py	/^VERSION = (0, 15, 0)$/;"	v
-VERSION	mongoengine/setup.py	/^VERSION = get_version(eval(version_line.split('=')[-1]))$/;"	v
-Vaccine	mongoengine/tests/document/class_methods.py	/^        class Vaccine(Document):$/;"	c	function:ClassMethodsTest.test_register_delete_rule_inherited
-ValidationError	mongoengine/mongoengine/errors.py	/^class ValidationError(AssertionError):$/;"	c
-ValidatorErrorTest	mongoengine/tests/document/validation.py	/^class ValidatorErrorTest(unittest.TestCase):$/;"	c
-VariousData	mongoengine/tests/queryset/field_list.py	/^        class VariousData(EmbeddedDocument):$/;"	c	function:OnlyExcludeAllTest.test_only_with_subfields
-Vegetal	mongoengine/tests/fields/fields.py	/^        class Vegetal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
-Vegetal	tests/fields/fields.py	/^        class Vegetal(Document):$/;"	c	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices
-Venue	mongoengine/tests/fields/geo.py	/^        class Venue(EmbeddedDocument):$/;"	c	function:GeoFieldTest.test_geopoint_embedded_indexes
-Venue	mongoengine/tests/fields/geo.py	/^        class Venue(EmbeddedDocument):$/;"	c	function:GeoFieldTest.test_indexes_2dsphere_embedded
-Venue	mongoengine/tests/queryset/geo.py	/^        class Venue(EmbeddedDocument):$/;"	c	function:GeoQueriesTest._test_embedded
-Vote	mongoengine/tests/queryset/queryset.py	/^        class Vote(EmbeddedDocument):$/;"	c	function:QuerySetTest.test_update_using_positional_operator_embedded_document
-Widget	mongoengine/tests/document/instance.py	/^        class Widget(Document):$/;"	c	function:InstanceTest.test_save_atomicity_condition
-Word	mongoengine/tests/document/instance.py	/^        class Word(Document):$/;"	c	function:InstanceTest.test_invalid_son
-Writer	mongoengine/tests/document/instance.py	/^        class Writer(self.Person):$/;"	c	function:InstanceTest.test_reverse_delete_rule_with_document_inheritance
-Zoo	mongoengine/tests/document/instance.py	/^        class Zoo(Document):$/;"	c	function:InstanceTest.test_polymorphic_references
-_FakeSignal	mongoengine/mongoengine/signals.py	/^    class _FakeSignal(object):$/;"	c
-_URL_REGEX	mongoengine/fields.py	/^    _URL_REGEX = re.compile($/;"	v	class:URLField
-_URL_REGEX	mongoengine/mongoengine/fields.py	/^    _URL_REGEX = re.compile($/;"	v	class:URLField
-_URL_SCHEMES	mongoengine/fields.py	/^    _URL_SCHEMES = ['http', 'https', 'ftp', 'ftps']$/;"	v	class:URLField
-_URL_SCHEMES	mongoengine/mongoengine/fields.py	/^    _URL_SCHEMES = ['http', 'https', 'ftp', 'ftps']$/;"	v	class:URLField
-__add__	mongoengine/mongoengine/queryset/field_list.py	/^    def __add__(self, f):$/;"	m	class:QueryFieldList	file:
-__all__	mongoengine/fields.py	/^__all__ = ($/;"	v
-__all__	mongoengine/mongoengine/__init__.py	/^__all__ = (list(document.__all__) + list(fields.__all__) +$/;"	v
-__all__	mongoengine/mongoengine/base/__init__.py	/^__all__ = ($/;"	v
-__all__	mongoengine/mongoengine/base/common.py	/^__all__ = ('UPDATE_OPERATORS', 'get_document', '_document_registry')$/;"	v
-__all__	mongoengine/mongoengine/base/datastructures.py	/^__all__ = ('BaseDict', 'BaseList', 'EmbeddedDocumentList', 'LazyReference')$/;"	v
-__all__	mongoengine/mongoengine/base/document.py	/^__all__ = ('BaseDocument', 'NON_FIELD_ERRORS')$/;"	v
-__all__	mongoengine/mongoengine/base/fields.py	/^__all__ = ('BaseField', 'ComplexBaseField', 'ObjectIdField',$/;"	v
-__all__	mongoengine/mongoengine/base/metaclasses.py	/^__all__ = ('DocumentMetaclass', 'TopLevelDocumentMetaclass')$/;"	v
-__all__	mongoengine/mongoengine/connection.py	/^__all__ = ['MongoEngineConnectionError', 'connect', 'register_connection',$/;"	v
-__all__	mongoengine/mongoengine/context_managers.py	/^__all__ = ('switch_db', 'switch_collection', 'no_dereference',$/;"	v
-__all__	mongoengine/mongoengine/document.py	/^__all__ = ('Document', 'EmbeddedDocument', 'DynamicDocument',$/;"	v
-__all__	mongoengine/mongoengine/errors.py	/^__all__ = ('NotRegistered', 'InvalidDocumentError', 'LookUpError',$/;"	v
-__all__	mongoengine/mongoengine/fields.py	/^__all__ = ($/;"	v
-__all__	mongoengine/mongoengine/queryset/__init__.py	/^__all__ = ($/;"	v
-__all__	mongoengine/mongoengine/queryset/base.py	/^__all__ = ('BaseQuerySet', 'DO_NOTHING', 'NULLIFY', 'CASCADE', 'DENY', 'PULL')$/;"	v
-__all__	mongoengine/mongoengine/queryset/field_list.py	/^__all__ = ('QueryFieldList',)$/;"	v
-__all__	mongoengine/mongoengine/queryset/manager.py	/^__all__ = ('queryset_manager', 'QuerySetManager')$/;"	v
-__all__	mongoengine/mongoengine/queryset/queryset.py	/^__all__ = ('QuerySet', 'QuerySetNoCache', 'DO_NOTHING', 'NULLIFY', 'CASCADE',$/;"	v
-__all__	mongoengine/mongoengine/queryset/transform.py	/^__all__ = ('query', 'update')$/;"	v
-__all__	mongoengine/mongoengine/queryset/visitor.py	/^__all__ = ('Q',)$/;"	v
-__all__	mongoengine/mongoengine/signals.py	/^__all__ = ('pre_init', 'post_init', 'pre_save', 'pre_save_post_validation',$/;"	v
-__all__	mongoengine/tests/all_warnings/__init__.py	/^__all__ = ('AllWarnings', )$/;"	v
-__all__	mongoengine/tests/document/class_methods.py	/^__all__ = ("ClassMethodsTest", )$/;"	v
-__all__	mongoengine/tests/document/delta.py	/^__all__ = ("DeltaTest",)$/;"	v
-__all__	mongoengine/tests/document/dynamic.py	/^__all__ = ("DynamicTest", )$/;"	v
-__all__	mongoengine/tests/document/indexes.py	/^__all__ = ("IndexesTest", )$/;"	v
-__all__	mongoengine/tests/document/inheritance.py	/^__all__ = ('InheritanceTest', )$/;"	v
-__all__	mongoengine/tests/document/instance.py	/^__all__ = ("InstanceTest",)$/;"	v
-__all__	mongoengine/tests/document/json_serialisation.py	/^__all__ = ("TestJson",)$/;"	v
-__all__	mongoengine/tests/document/validation.py	/^__all__ = ("ValidatorErrorTest",)$/;"	v
-__all__	mongoengine/tests/fields/fields.py	/^__all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")$/;"	v
-__all__	mongoengine/tests/fields/geo.py	/^__all__ = ("GeoFieldTest", )$/;"	v
-__all__	mongoengine/tests/queryset/field_list.py	/^__all__ = ("QueryFieldListTest", "OnlyExcludeAllTest")$/;"	v
-__all__	mongoengine/tests/queryset/geo.py	/^__all__ = ("GeoQueriesTest",)$/;"	v
-__all__	mongoengine/tests/queryset/modify.py	/^__all__ = ("FindAndModifyTest",)$/;"	v
-__all__	mongoengine/tests/queryset/queryset.py	/^__all__ = ("QuerySetTest",)$/;"	v
-__all__	mongoengine/tests/queryset/transform.py	/^__all__ = ("TransformTest",)$/;"	v
-__all__	mongoengine/tests/queryset/visitor.py	/^__all__ = ("QTest",)$/;"	v
-__all__	tests/fields/fields.py	/^__all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")$/;"	v
-__and__	mongoengine/mongoengine/queryset/visitor.py	/^    def __and__(self, other):$/;"	m	class:QNode	file:
-__author__	mongoengine/tests/queryset/pickable.py	/^__author__ = 'stas'$/;"	v
-__bool__	mongoengine/mongoengine/queryset/base.py	/^    def __bool__(self):$/;"	m	class:BaseQuerySet	file:
-__call__	mongoengine/mongoengine/dereference.py	/^    def __call__(self, items, max_depth=1, instance=None, name=None):$/;"	m	class:DeReference	file:
-__call__	mongoengine/mongoengine/queryset/base.py	/^    def __call__(self, q_obj=None, class_check=True, read_preference=None,$/;"	m	class:BaseQuerySet	file:
-__contains__	mongoengine/mongoengine/base/datastructures.py	/^    def __contains__(self, key):$/;"	m	class:StrictDict	file:
-__contains__	mongoengine/mongoengine/base/document.py	/^    def __contains__(self, name):$/;"	m	class:BaseDocument	file:
-__copy__	mongoengine/fields.py	/^    def __copy__(self):$/;"	m	class:GridFSProxy	file:
-__copy__	mongoengine/mongoengine/fields.py	/^    def __copy__(self):$/;"	m	class:GridFSProxy	file:
-__deepcopy__	mongoengine/fields.py	/^    def __deepcopy__(self, memo):$/;"	m	class:GridFSProxy	file:
-__deepcopy__	mongoengine/mongoengine/fields.py	/^    def __deepcopy__(self, memo):$/;"	m	class:GridFSProxy	file:
-__deepcopy__	mongoengine/mongoengine/queryset/base.py	/^    def __deepcopy__(self, memo):$/;"	m	class:BaseQuerySet	file:
-__delattr__	mongoengine/mongoengine/base/datastructures.py	/^    def __delattr__(self, key, *args, **kwargs):$/;"	m	class:BaseDict	file:
-__delattr__	mongoengine/mongoengine/base/document.py	/^    def __delattr__(self, *args, **kwargs):$/;"	m	class:BaseDocument	file:
-__delattr__	mongoengine/mongoengine/document.py	/^    def __delattr__(self, *args, **kwargs):$/;"	m	class:DynamicDocument	file:
-__delattr__	mongoengine/mongoengine/document.py	/^    def __delattr__(self, *args, **kwargs):$/;"	m	class:DynamicEmbeddedDocument	file:
-__delete__	mongoengine/mongoengine/base/datastructures.py	/^    def __delete__(self, *args, **kwargs):$/;"	m	class:BaseDict	file:
-__delitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __delitem__(self, key, *args, **kwargs):$/;"	m	class:BaseDict	file:
-__delitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __delitem__(self, key, *args, **kwargs):$/;"	m	class:BaseList	file:
-__delslice__	mongoengine/mongoengine/base/datastructures.py	/^    def __delslice__(self, *args, **kwargs):$/;"	m	class:BaseList	file:
-__dereference	mongoengine/mongoengine/queryset/base.py	/^    __dereference = False$/;"	v	class:BaseQuerySet
-__dereference	mongoengine/mongoengine/queryset/queryset.py	/^    def __dereference(items, max_depth=1, instance=None, name=None):$/;"	m	class:QuerySetNoDeRef	file:
-__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:no_dereference	file:
-__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:no_sub_classes	file:
-__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:query_counter	file:
-__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:switch_collection	file:
-__enter__	mongoengine/mongoengine/context_managers.py	/^    def __enter__(self):$/;"	m	class:switch_db	file:
-__eq__	mongoengine/fields.py	/^    def __eq__(self, other):$/;"	m	class:GridFSProxy	file:
-__eq__	mongoengine/mongoengine/base/datastructures.py	/^    def __eq__(self, other):$/;"	m	class:StrictDict	file:
-__eq__	mongoengine/mongoengine/base/document.py	/^    def __eq__(self, other):$/;"	m	class:BaseDocument	file:
-__eq__	mongoengine/mongoengine/context_managers.py	/^    def __eq__(self, value):$/;"	m	class:query_counter	file:
-__eq__	mongoengine/mongoengine/document.py	/^    def __eq__(self, other):$/;"	m	class:EmbeddedDocument	file:
-__eq__	mongoengine/mongoengine/fields.py	/^    def __eq__(self, other):$/;"	m	class:GridFSProxy	file:
-__eq__	mongoengine/tests/document/instance.py	/^            def __eq__(self, other):$/;"	m	class:InstanceTest.test_kwargs_complex.Doc	file:
-__eq__	mongoengine/tests/document/instance.py	/^            def __eq__(self, other):$/;"	m	class:InstanceTest.test_kwargs_simple.Doc	file:
-__eq__	mongoengine/tests/document/json_serialisation.py	/^            def __eq__(self, other):$/;"	m	class:TestJson.test_json_complex.Doc	file:
-__eq__	mongoengine/tests/document/json_serialisation.py	/^            def __eq__(self, other):$/;"	m	class:TestJson.test_json_simple.Doc	file:
-__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:no_dereference	file:
-__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:no_sub_classes	file:
-__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:query_counter	file:
-__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:switch_collection	file:
-__exit__	mongoengine/mongoengine/context_managers.py	/^    def __exit__(self, t, value, traceback):$/;"	m	class:switch_db	file:
-__expand_dynamic_values	mongoengine/mongoengine/base/document.py	/^    def __expand_dynamic_values(self, name, value):$/;"	m	class:BaseDocument	file:
-__ge__	mongoengine/mongoengine/context_managers.py	/^    def __ge__(self, value):$/;"	m	class:query_counter	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:CachedReferenceField	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ComplexDateTimeField	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:FileField	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:GenericLazyReferenceField	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:GenericReferenceField	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:LazyReferenceField	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ListField	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ReferenceField	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:SequenceField	file:
-__get__	mongoengine/fields.py	/^    def __get__(self, instance, value):$/;"	m	class:GridFSProxy	file:
-__get__	mongoengine/mongoengine/base/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:BaseField	file:
-__get__	mongoengine/mongoengine/base/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ComplexBaseField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:CachedReferenceField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ComplexDateTimeField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:FileField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:GenericLazyReferenceField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:GenericReferenceField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:LazyReferenceField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ListField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:ReferenceField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, owner):$/;"	m	class:SequenceField	file:
-__get__	mongoengine/mongoengine/fields.py	/^    def __get__(self, instance, value):$/;"	m	class:GridFSProxy	file:
-__get__	mongoengine/mongoengine/queryset/manager.py	/^    def __get__(self, instance, owner):$/;"	m	class:QuerySetManager	file:
-__get_bases	mongoengine/mongoengine/base/metaclasses.py	/^    def __get_bases(cls, bases):$/;"	m	class:DocumentMetaclass	file:
-__get_field_display	mongoengine/mongoengine/base/document.py	/^    def __get_field_display(self, field):$/;"	m	class:BaseDocument	file:
-__getattr__	mongoengine/fields.py	/^    def __getattr__(self, name):$/;"	m	class:GridFSProxy	file:
-__getattr__	mongoengine/mongoengine/base/datastructures.py	/^    def __getattr__(self, name):$/;"	m	class:LazyReference	file:
-__getattr__	mongoengine/mongoengine/fields.py	/^    def __getattr__(self, name):$/;"	m	class:GridFSProxy	file:
-__getattribute__	mongoengine/mongoengine/errors.py	/^    def __getattribute__(self, name):$/;"	m	class:ValidationError	file:
-__getitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __getitem__(self, key):$/;"	m	class:StrictDict	file:
-__getitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __getitem__(self, key, *args, **kwargs):$/;"	m	class:BaseDict	file:
-__getitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __getitem__(self, key, *args, **kwargs):$/;"	m	class:BaseList	file:
-__getitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __getitem__(self, name):$/;"	m	class:LazyReference	file:
-__getitem__	mongoengine/mongoengine/base/document.py	/^    def __getitem__(self, name):$/;"	m	class:BaseDocument	file:
-__getitem__	mongoengine/mongoengine/queryset/base.py	/^    def __getitem__(self, key):$/;"	m	class:BaseQuerySet	file:
-__getstate__	mongoengine/fields.py	/^    def __getstate__(self):$/;"	m	class:GridFSProxy	file:
-__getstate__	mongoengine/mongoengine/base/datastructures.py	/^    def __getstate__(self):$/;"	m	class:BaseDict	file:
-__getstate__	mongoengine/mongoengine/base/datastructures.py	/^    def __getstate__(self):$/;"	m	class:BaseList	file:
-__getstate__	mongoengine/mongoengine/base/document.py	/^    def __getstate__(self):$/;"	m	class:BaseDocument	file:
-__getstate__	mongoengine/mongoengine/fields.py	/^    def __getstate__(self):$/;"	m	class:GridFSProxy	file:
-__getstate__	mongoengine/mongoengine/queryset/base.py	/^    def __getstate__(self):$/;"	m	class:BaseQuerySet	file:
-__gt__	mongoengine/mongoengine/context_managers.py	/^    def __gt__(self, value):$/;"	m	class:query_counter	file:
-__hash__	mongoengine/mongoengine/document.py	/^    __hash__ = None$/;"	v	class:EmbeddedDocument
-__hash__	mongoengine/mongoengine/document.py	/^    def __hash__(self):$/;"	m	class:Document	file:
-__iadd__	mongoengine/mongoengine/base/datastructures.py	/^    def __iadd__(self, other):$/;"	m	class:BaseList	file:
-__imul__	mongoengine/mongoengine/base/datastructures.py	/^    def __imul__(self, other):$/;"	m	class:BaseList	file:
-__init__	mongoengine/fields.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:GenericLazyReferenceField
-__init__	mongoengine/fields.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:GenericReferenceField
-__init__	mongoengine/fields.py	/^    def __init__(self, basecls=None, field=None, *args, **kwargs):$/;"	m	class:DictField
-__init__	mongoengine/fields.py	/^    def __init__(self, binary=True, **kwargs):$/;"	m	class:UUIDField
-__init__	mongoengine/fields.py	/^    def __init__(self, collection_name=None, db_alias=None, sequence_name=None,$/;"	m	class:SequenceField
-__init__	mongoengine/fields.py	/^    def __init__(self, db_alias=DEFAULT_CONNECTION_NAME, collection_name='fs',$/;"	m	class:FileField
-__init__	mongoengine/fields.py	/^    def __init__(self, document_type, **kwargs):$/;"	m	class:EmbeddedDocumentField
-__init__	mongoengine/fields.py	/^    def __init__(self, document_type, **kwargs):$/;"	m	class:EmbeddedDocumentListField
-__init__	mongoengine/fields.py	/^    def __init__(self, document_type, dbref=False,$/;"	m	class:ReferenceField
-__init__	mongoengine/fields.py	/^    def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):$/;"	m	class:CachedReferenceField
-__init__	mongoengine/fields.py	/^    def __init__(self, document_type, passthrough=False, dbref=False,$/;"	m	class:LazyReferenceField
-__init__	mongoengine/fields.py	/^    def __init__(self, domain_whitelist=None, allow_utf8_user=False,$/;"	m	class:EmailField
-__init__	mongoengine/fields.py	/^    def __init__(self, field, **kwargs):$/;"	m	class:SortedListField
-__init__	mongoengine/fields.py	/^    def __init__(self, field=None, **kwargs):$/;"	m	class:ListField
-__init__	mongoengine/fields.py	/^    def __init__(self, field=None, *args, **kwargs):$/;"	m	class:MapField
-__init__	mongoengine/fields.py	/^    def __init__(self, grid_id=None, key=None,$/;"	m	class:GridFSProxy
-__init__	mongoengine/fields.py	/^    def __init__(self, max_bytes=None, **kwargs):$/;"	m	class:BinaryField
-__init__	mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:FloatField
-__init__	mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:IntField
-__init__	mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:LongField
-__init__	mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, force_string=False,$/;"	m	class:DecimalField
-__init__	mongoengine/fields.py	/^    def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):$/;"	m	class:StringField
-__init__	mongoengine/fields.py	/^    def __init__(self, separator=',', **kwargs):$/;"	m	class:ComplexDateTimeField
-__init__	mongoengine/fields.py	/^    def __init__(self, size=None, thumbnail_size=None,$/;"	m	class:ImageField
-__init__	mongoengine/fields.py	/^    def __init__(self, verify_exists=False, url_regex=None, schemes=None, **kwargs):$/;"	m	class:URLField
-__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, **kwargs):$/;"	m	class:StrictDict
-__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, dict_items, instance, name):$/;"	m	class:BaseDict
-__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, document_type, pk, cached_doc=None, passthrough=False):$/;"	m	class:LazyReference
-__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, list_items, instance, name):$/;"	m	class:BaseList
-__init__	mongoengine/mongoengine/base/datastructures.py	/^    def __init__(self, list_items, instance, name):$/;"	m	class:EmbeddedDocumentList
-__init__	mongoengine/mongoengine/base/document.py	/^    def __init__(self, *args, **values):$/;"	m	class:BaseDocument
-__init__	mongoengine/mongoengine/base/fields.py	/^    def __init__(self, auto_index=True, *args, **kwargs):$/;"	m	class:GeoJsonBaseField
-__init__	mongoengine/mongoengine/base/fields.py	/^    def __init__(self, db_field=None, name=None, required=False, default=None,$/;"	m	class:BaseField
-__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self):$/;"	m	class:query_counter
-__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self, cls):$/;"	m	class:no_dereference
-__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self, cls):$/;"	m	class:no_sub_classes
-__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self, cls, collection_name):$/;"	m	class:switch_collection
-__init__	mongoengine/mongoengine/context_managers.py	/^    def __init__(self, cls, db_alias):$/;"	m	class:switch_db
-__init__	mongoengine/mongoengine/document.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:EmbeddedDocument
-__init__	mongoengine/mongoengine/document.py	/^    def __init__(self, document, collection, key, value):$/;"	m	class:MapReduceDocument
-__init__	mongoengine/mongoengine/errors.py	/^    def __init__(self, message='', **kwargs):$/;"	m	class:ValidationError
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:GenericLazyReferenceField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, *args, **kwargs):$/;"	m	class:GenericReferenceField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, basecls=None, field=None, *args, **kwargs):$/;"	m	class:DictField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, binary=True, **kwargs):$/;"	m	class:UUIDField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, collection_name=None, db_alias=None, sequence_name=None,$/;"	m	class:SequenceField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, db_alias=DEFAULT_CONNECTION_NAME, collection_name='fs',$/;"	m	class:FileField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, **kwargs):$/;"	m	class:EmbeddedDocumentField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, **kwargs):$/;"	m	class:EmbeddedDocumentListField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, dbref=False,$/;"	m	class:ReferenceField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):$/;"	m	class:CachedReferenceField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, document_type, passthrough=False, dbref=False,$/;"	m	class:LazyReferenceField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, domain_whitelist=None, allow_utf8_user=False,$/;"	m	class:EmailField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, field, **kwargs):$/;"	m	class:SortedListField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, field=None, **kwargs):$/;"	m	class:ListField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, field=None, *args, **kwargs):$/;"	m	class:MapField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, grid_id=None, key=None,$/;"	m	class:GridFSProxy
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, max_bytes=None, **kwargs):$/;"	m	class:BinaryField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:FloatField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:IntField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, **kwargs):$/;"	m	class:LongField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, min_value=None, max_value=None, force_string=False,$/;"	m	class:DecimalField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):$/;"	m	class:StringField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, separator=',', **kwargs):$/;"	m	class:ComplexDateTimeField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, size=None, thumbnail_size=None,$/;"	m	class:ImageField
-__init__	mongoengine/mongoengine/fields.py	/^    def __init__(self, verify_exists=False, url_regex=None, schemes=None, **kwargs):$/;"	m	class:URLField
-__init__	mongoengine/mongoengine/queryset/base.py	/^    def __init__(self, document, collection):$/;"	m	class:BaseQuerySet
-__init__	mongoengine/mongoengine/queryset/field_list.py	/^    def __init__(self, fields=None, value=ONLY, always_include=None, _only_called=False):$/;"	m	class:QueryFieldList
-__init__	mongoengine/mongoengine/queryset/manager.py	/^    def __init__(self, queryset_func=None):$/;"	m	class:QuerySetManager
-__init__	mongoengine/mongoengine/queryset/visitor.py	/^    def __init__(self, **query):$/;"	m	class:Q
-__init__	mongoengine/mongoengine/queryset/visitor.py	/^    def __init__(self, document):$/;"	m	class:QueryCompilerVisitor
-__init__	mongoengine/mongoengine/queryset/visitor.py	/^    def __init__(self, operation, children):$/;"	m	class:QCombination
-__init__	mongoengine/mongoengine/signals.py	/^        def __init__(self, name, doc=None):$/;"	m	class:_FakeSignal
-__init__	mongoengine/tests/fields/fields.py	/^            def __init__(self, **kwargs):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
-__init__	tests/fields/fields.py	/^            def __init__(self, **kwargs):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
-__int__	mongoengine/mongoengine/context_managers.py	/^    def __int__(self):$/;"	m	class:query_counter	file:
-__iter__	mongoengine/mongoengine/base/datastructures.py	/^    def __iter__(self):$/;"	m	class:BaseList	file:
-__iter__	mongoengine/mongoengine/base/datastructures.py	/^    def __iter__(self):$/;"	m	class:StrictDict	file:
-__iter__	mongoengine/mongoengine/base/document.py	/^    def __iter__(self):$/;"	m	class:BaseDocument	file:
-__iter__	mongoengine/mongoengine/queryset/base.py	/^    def __iter__(self):$/;"	m	class:BaseQuerySet	file:
-__iter__	mongoengine/mongoengine/queryset/queryset.py	/^    def __iter__(self):$/;"	m	class:QuerySet	file:
-__iter__	mongoengine/mongoengine/queryset/queryset.py	/^    def __iter__(self):$/;"	m	class:QuerySetNoCache	file:
-__le__	mongoengine/mongoengine/context_managers.py	/^    def __le__(self, value):$/;"	m	class:query_counter	file:
-__len__	mongoengine/mongoengine/base/datastructures.py	/^    def __len__(self):$/;"	m	class:StrictDict	file:
-__len__	mongoengine/mongoengine/base/document.py	/^    def __len__(self):$/;"	m	class:BaseDocument	file:
-__len__	mongoengine/mongoengine/queryset/queryset.py	/^    def __len__(self):$/;"	m	class:QuerySet	file:
-__lt__	mongoengine/mongoengine/context_managers.py	/^    def __lt__(self, value):$/;"	m	class:query_counter	file:
-__match_all	mongoengine/mongoengine/base/datastructures.py	/^    def __match_all(cls, embedded_doc, kwargs):$/;"	m	class:EmbeddedDocumentList	file:
-__metaclass__	mongoengine/mongoengine/document.py	/^    __metaclass__ = DocumentMetaclass$/;"	v	class:DynamicEmbeddedDocument
-__metaclass__	mongoengine/mongoengine/document.py	/^    __metaclass__ = DocumentMetaclass$/;"	v	class:EmbeddedDocument
-__metaclass__	mongoengine/mongoengine/document.py	/^    __metaclass__ = TopLevelDocumentMetaclass$/;"	v	class:Document
-__metaclass__	mongoengine/mongoengine/document.py	/^    __metaclass__ = TopLevelDocumentMetaclass$/;"	v	class:DynamicDocument
-__ne__	mongoengine/fields.py	/^    def __ne__(self, other):$/;"	m	class:GridFSProxy	file:
-__ne__	mongoengine/mongoengine/base/datastructures.py	/^    def __ne__(self, other):$/;"	m	class:StrictDict	file:
-__ne__	mongoengine/mongoengine/base/document.py	/^    def __ne__(self, other):$/;"	m	class:BaseDocument	file:
-__ne__	mongoengine/mongoengine/context_managers.py	/^    def __ne__(self, value):$/;"	m	class:query_counter	file:
-__ne__	mongoengine/mongoengine/document.py	/^    def __ne__(self, other):$/;"	m	class:EmbeddedDocument	file:
-__ne__	mongoengine/mongoengine/fields.py	/^    def __ne__(self, other):$/;"	m	class:GridFSProxy	file:
-__new__	mongoengine/mongoengine/base/metaclasses.py	/^    def __new__(cls, name, bases, attrs):$/;"	m	class:DocumentMetaclass	file:
-__new__	mongoengine/mongoengine/base/metaclasses.py	/^    def __new__(cls, name, bases, attrs):$/;"	m	class:TopLevelDocumentMetaclass	file:
-__nonzero__	mongoengine/fields.py	/^    def __nonzero__(self):$/;"	m	class:GridFSProxy	file:
-__nonzero__	mongoengine/mongoengine/fields.py	/^    def __nonzero__(self):$/;"	m	class:GridFSProxy	file:
-__nonzero__	mongoengine/mongoengine/queryset/base.py	/^    def __nonzero__(self):$/;"	m	class:BaseQuerySet	file:
-__nonzero__	mongoengine/mongoengine/queryset/field_list.py	/^    def __nonzero__(self):$/;"	m	class:QueryFieldList	file:
-__only_matches	mongoengine/mongoengine/base/datastructures.py	/^    def __only_matches(cls, embedded_docs, kwargs):$/;"	m	class:EmbeddedDocumentList	file:
-__or__	mongoengine/mongoengine/queryset/visitor.py	/^    def __or__(self, other):$/;"	m	class:QNode	file:
-__raw__	mongoengine/tests/queryset/queryset.py	/^            __raw__={"$addToSet": {"tags": {"$each": ["code", "mongodb", "code"]}}})$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
-__raw__	mongoengine/tests/queryset/queryset.py	/^            __raw__={'document.a_name': 'A doc'}).count(), 1)$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.Doc
-__raw__	mongoengine/tests/queryset/queryset.py	/^            __raw__={'document.b_name': 'B doc'}).count(), 1)$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.Doc
-__repr__	mongoengine/fields.py	/^    def __repr__(self):$/;"	m	class:GridFSProxy	file:
-__repr__	mongoengine/mongoengine/base/datastructures.py	/^                def __repr__(self):$/;"	m	class:StrictDict.create.SpecificStrictDict	file:
-__repr__	mongoengine/mongoengine/base/datastructures.py	/^    def __repr__(self):$/;"	m	class:LazyReference	file:
-__repr__	mongoengine/mongoengine/base/document.py	/^    def __repr__(self):$/;"	m	class:BaseDocument	file:
-__repr__	mongoengine/mongoengine/context_managers.py	/^    def __repr__(self):$/;"	m	class:query_counter	file:
-__repr__	mongoengine/mongoengine/errors.py	/^    def __repr__(self):$/;"	m	class:ValidationError	file:
-__repr__	mongoengine/mongoengine/fields.py	/^    def __repr__(self):$/;"	m	class:GridFSProxy	file:
-__repr__	mongoengine/mongoengine/queryset/queryset.py	/^    def __repr__(self):$/;"	m	class:QuerySet	file:
-__repr__	mongoengine/mongoengine/queryset/queryset.py	/^    def __repr__(self):$/;"	m	class:QuerySetNoCache	file:
-__repr__	mongoengine/tests/queryset/queryset.py	/^            def __repr__(self):$/;"	m	class:QuerySetTest.test_repr.Doc	file:
-__repr__	mongoengine/tests/test_dereference.py	/^            def __repr__(self):$/;"	m	class:FieldTest.test_circular_reference.Person	file:
-__repr__	mongoengine/tests/test_dereference.py	/^            def __repr__(self):$/;"	m	class:FieldTest.test_circular_reference_on_self.Person	file:
-__repr__	mongoengine/tests/test_dereference.py	/^            def __repr__(self):$/;"	m	class:FieldTest.test_circular_tree_reference.Person	file:
-__set__	mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:BinaryField	file:
-__set__	mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:ComplexDateTimeField	file:
-__set__	mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:FileField	file:
-__set__	mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:SequenceField	file:
-__set__	mongoengine/mongoengine/base/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:BaseField	file:
-__set__	mongoengine/mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:BinaryField	file:
-__set__	mongoengine/mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:ComplexDateTimeField	file:
-__set__	mongoengine/mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:FileField	file:
-__set__	mongoengine/mongoengine/fields.py	/^    def __set__(self, instance, value):$/;"	m	class:SequenceField	file:
-__set_field_display	mongoengine/mongoengine/base/document.py	/^    def __set_field_display(self):$/;"	m	class:BaseDocument	file:
-__setattr__	mongoengine/mongoengine/base/document.py	/^    def __setattr__(self, name, value):$/;"	m	class:BaseDocument	file:
-__setitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __setitem__(self, key, value):$/;"	m	class:StrictDict	file:
-__setitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __setitem__(self, key, value, *args, **kwargs):$/;"	m	class:BaseDict	file:
-__setitem__	mongoengine/mongoengine/base/datastructures.py	/^    def __setitem__(self, key, value, *args, **kwargs):$/;"	m	class:BaseList	file:
-__setitem__	mongoengine/mongoengine/base/document.py	/^    def __setitem__(self, name, value):$/;"	m	class:BaseDocument	file:
-__setslice__	mongoengine/mongoengine/base/datastructures.py	/^    def __setslice__(self, *args, **kwargs):$/;"	m	class:BaseList	file:
-__setstate__	mongoengine/mongoengine/base/datastructures.py	/^    def __setstate__(self, state):$/;"	m	class:BaseDict	file:
-__setstate__	mongoengine/mongoengine/base/datastructures.py	/^    def __setstate__(self, state):$/;"	m	class:BaseList	file:
-__setstate__	mongoengine/mongoengine/base/document.py	/^    def __setstate__(self, data):$/;"	m	class:BaseDocument	file:
-__setstate__	mongoengine/mongoengine/queryset/base.py	/^    def __setstate__(self, obj_dict):$/;"	m	class:BaseQuerySet	file:
-__slots__	mongoengine/mongoengine/base/datastructures.py	/^                __slots__ = allowed_keys_tuple$/;"	v	class:StrictDict.create.SpecificStrictDict
-__slots__	mongoengine/mongoengine/base/datastructures.py	/^    __slots__ = ('_cached_doc', 'passthrough', 'document_type')$/;"	v	class:LazyReference
-__slots__	mongoengine/mongoengine/base/datastructures.py	/^    __slots__ = ()$/;"	v	class:StrictDict
-__slots__	mongoengine/mongoengine/base/document.py	/^    __slots__ = ('_changed_fields', '_initialised', '_created', '_data',$/;"	v	class:BaseDocument
-__slots__	mongoengine/mongoengine/document.py	/^    __slots__ = ('__objects',)$/;"	v	class:Document
-__slots__	mongoengine/mongoengine/document.py	/^    __slots__ = ('_instance', )$/;"	v	class:EmbeddedDocument
-__str__	mongoengine/fields.py	/^    def __str__(self):$/;"	m	class:GridFSProxy	file:
-__str__	mongoengine/mongoengine/base/document.py	/^    def __str__(self):$/;"	m	class:BaseDocument	file:
-__str__	mongoengine/mongoengine/errors.py	/^    def __str__(self):$/;"	m	class:ValidationError	file:
-__str__	mongoengine/mongoengine/fields.py	/^    def __str__(self):$/;"	m	class:GridFSProxy	file:
-__str__	mongoengine/tests/document/instance.py	/^            def __str__(self):$/;"	m	class:InstanceTest.test_db_ref_usage.Book	file:
-__str__	mongoengine/tests/document/instance.py	/^            def __str__(self):$/;"	m	class:InstanceTest.test_repr_none.Article	file:
-__unicode__	mongoengine/tests/document/instance.py	/^            def __unicode__(self):$/;"	m	class:InstanceTest.test_db_ref_usage.Book	file:
-__unicode__	mongoengine/tests/document/instance.py	/^            def __unicode__(self):$/;"	m	class:InstanceTest.test_repr.Article	file:
-__unicode__	mongoengine/tests/queryset/geo.py	/^            def __unicode__(self):$/;"	m	class:GeoQueriesTest._create_event_data.Event	file:
-__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_cache_not_cloned.User	file:
-__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_nested_queryset_iterator.User	file:
-__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_pull_from_nested_embedded.User	file:
-__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_pull_from_nested_mapfield.Collaborator	file:
-__unicode__	mongoengine/tests/queryset/queryset.py	/^            def __unicode__(self):$/;"	m	class:QuerySetTest.test_pull_nested.Collaborator	file:
-__unicode__	mongoengine/tests/test_signals.py	/^            def __unicode__(self):$/;"	m	class:SignalTests.setUp.Another	file:
-__unicode__	mongoengine/tests/test_signals.py	/^            def __unicode__(self):$/;"	m	class:SignalTests.setUp.Author	file:
-__unicode__	mongoengine/tests/test_signals.py	/^            def __unicode__(self):$/;"	m	class:SignalTests.setUp.Post	file:
-__version__	mongoengine/mongoengine/__init__.py	/^__version__ = get_version()$/;"	v
-_attach_objects	mongoengine/mongoengine/dereference.py	/^    def _attach_objects(self, items, depth=0, instance=None, name=None):$/;"	m	class:DeReference
-_auto_dereference	mongoengine/mongoengine/base/fields.py	/^    _auto_dereference = True$/;"	v	class:BaseField
-_auto_dereference	mongoengine/mongoengine/queryset/base.py	/^    _auto_dereference = True$/;"	v	class:BaseQuerySet
-_auto_gen	mongoengine/fields.py	/^    _auto_gen = True$/;"	v	class:SequenceField
-_auto_gen	mongoengine/mongoengine/base/fields.py	/^    _auto_gen = False  # Call `generate` to generate a value$/;"	v	class:BaseField
-_auto_gen	mongoengine/mongoengine/fields.py	/^    _auto_gen = True$/;"	v	class:SequenceField
-_binary	mongoengine/fields.py	/^    _binary = None$/;"	v	class:UUIDField
-_binary	mongoengine/mongoengine/fields.py	/^    _binary = None$/;"	v	class:UUIDField
-_build_index_spec	mongoengine/mongoengine/base/document.py	/^    def _build_index_spec(cls, spec):$/;"	m	class:BaseDocument
-_build_index_specs	mongoengine/mongoengine/base/document.py	/^    def _build_index_specs(cls, meta_indexes):$/;"	m	class:BaseDocument
-_chainable_method	mongoengine/mongoengine/queryset/base.py	/^    def _chainable_method(self, method_name, val):$/;"	m	class:BaseQuerySet
-_class_registry_cache	mongoengine/mongoengine/common.py	/^_class_registry_cache = {}$/;"	v
-_classes	mongoengine/mongoengine/base/datastructures.py	/^    _classes = {}$/;"	v	class:StrictDict
-_clean_settings	mongoengine/mongoengine/connection.py	/^    def _clean_settings(settings_dict):$/;"	f	function:get_connection
-_clean_slice	mongoengine/mongoengine/queryset/field_list.py	/^    def _clean_slice(self):$/;"	m	class:QueryFieldList
-_clear_changed_fields	mongoengine/mongoengine/base/document.py	/^    def _clear_changed_fields(self):$/;"	m	class:BaseDocument
-_clone_into	mongoengine/mongoengine/queryset/base.py	/^    def _clone_into(self, new_qs):$/;"	m	class:BaseQuerySet
-_collection	mongoengine/mongoengine/queryset/base.py	/^    def _collection(self):$/;"	m	class:BaseQuerySet
-_combine	mongoengine/mongoengine/queryset/visitor.py	/^    def _combine(self, other, operation):$/;"	m	class:QNode
-_connection_settings	mongoengine/mongoengine/connection.py	/^_connection_settings = {}$/;"	v
-_connections	mongoengine/mongoengine/connection.py	/^_connections = {}$/;"	v
-_convert_from_datetime	mongoengine/fields.py	/^    def _convert_from_datetime(self, val):$/;"	m	class:ComplexDateTimeField
-_convert_from_datetime	mongoengine/mongoengine/fields.py	/^    def _convert_from_datetime(self, val):$/;"	m	class:ComplexDateTimeField
-_convert_from_string	mongoengine/fields.py	/^    def _convert_from_string(self, data):$/;"	m	class:ComplexDateTimeField
-_convert_from_string	mongoengine/mongoengine/fields.py	/^    def _convert_from_string(self, data):$/;"	m	class:ComplexDateTimeField
-_create_event_data	mongoengine/tests/queryset/geo.py	/^    def _create_event_data(self, point_field_class=GeoPointField):$/;"	m	class:GeoQueriesTest
-_cursor	mongoengine/mongoengine/queryset/base.py	/^    def _cursor(self):$/;"	m	class:BaseQuerySet
-_cursor_args	mongoengine/mongoengine/queryset/base.py	/^    def _cursor_args(self):$/;"	m	class:BaseQuerySet
-_dbs	mongoengine/mongoengine/connection.py	/^_dbs = {}$/;"	v
-_decorated_with_ver_requirement	mongoengine/tests/utils.py	/^def _decorated_with_ver_requirement(func, ver_tuple):$/;"	f
-_delta	mongoengine/mongoengine/base/document.py	/^    def _delta(self):$/;"	m	class:BaseDocument
-_dereference	mongoengine/mongoengine/queryset/base.py	/^    def _dereference(self):$/;"	m	class:BaseQuerySet
-_dereferenced	mongoengine/mongoengine/base/datastructures.py	/^    _dereferenced = False$/;"	v	class:BaseDict
-_dereferenced	mongoengine/mongoengine/base/datastructures.py	/^    _dereferenced = False$/;"	v	class:BaseList
-_document_registry	mongoengine/mongoengine/base/common.py	/^_document_registry = {}$/;"	v
-_dynamic	mongoengine/mongoengine/base/document.py	/^    _dynamic = False$/;"	v	class:BaseDocument
-_dynamic	mongoengine/mongoengine/document.py	/^    _dynamic = True$/;"	v	class:DynamicDocument
-_dynamic	mongoengine/mongoengine/document.py	/^    _dynamic = True$/;"	v	class:DynamicEmbeddedDocument
-_dynamic_lock	mongoengine/mongoengine/base/document.py	/^    _dynamic_lock = True$/;"	v	class:BaseDocument
-_ensure_indexes	mongoengine/mongoengine/queryset/base.py	/^    def _ensure_indexes(self):$/;"	m	class:BaseQuerySet
-_fail	mongoengine/mongoengine/signals.py	/^        def _fail(self, *args, **kwargs):$/;"	m	class:_FakeSignal
-_fetch_objects	mongoengine/mongoengine/dereference.py	/^    def _fetch_objects(self, doc_type=None):$/;"	m	class:DeReference
-_field_list_cache	mongoengine/mongoengine/common.py	/^_field_list_cache = []$/;"	v
-_fields_to_dbfields	mongoengine/mongoengine/queryset/base.py	/^    def _fields_to_dbfields(self, fields):$/;"	m	class:BaseQuerySet
-_find_references	mongoengine/mongoengine/dereference.py	/^    def _find_references(self, items, depth=0):$/;"	m	class:DeReference
-_format_errors	mongoengine/mongoengine/errors.py	/^    def _format_errors(self):$/;"	m	class:ValidationError
-_from_son	mongoengine/mongoengine/base/document.py	/^    def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False):$/;"	m	class:BaseDocument
-_fs	mongoengine/fields.py	/^    _fs = None$/;"	v	class:GridFSProxy
-_fs	mongoengine/mongoengine/fields.py	/^    _fs = None$/;"	v	class:GridFSProxy
-_geo_index	mongoengine/fields.py	/^    _geo_index = pymongo.GEO2D$/;"	v	class:GeoPointField
-_geo_index	mongoengine/mongoengine/base/fields.py	/^    _geo_index = False$/;"	v	class:BaseField
-_geo_index	mongoengine/mongoengine/base/fields.py	/^    _geo_index = pymongo.GEOSPHERE$/;"	v	class:GeoJsonBaseField
-_geo_index	mongoengine/mongoengine/fields.py	/^    _geo_index = pymongo.GEO2D$/;"	v	class:GeoPointField
-_geo_indices	mongoengine/mongoengine/base/document.py	/^    def _geo_indices(cls, inspected=None, parent_field=None):$/;"	m	class:BaseDocument
-_geo_operator	mongoengine/mongoengine/queryset/transform.py	/^def _geo_operator(field, op, value):$/;"	f
-_get_as_pymongo	mongoengine/mongoengine/queryset/base.py	/^    def _get_as_pymongo(self, doc):$/;"	m	class:BaseQuerySet
-_get_bases	mongoengine/mongoengine/base/metaclasses.py	/^    def _get_bases(cls, bases):$/;"	m	class:DocumentMetaclass
-_get_capped_collection	mongoengine/mongoengine/document.py	/^    def _get_capped_collection(cls):$/;"	m	class:Document
-_get_changed_fields	mongoengine/mongoengine/base/document.py	/^    def _get_changed_fields(self, inspected=None):$/;"	m	class:BaseDocument
-_get_collection	mongoengine/mongoengine/document.py	/^    def _get_collection(cls):$/;"	m	class:Document
-_get_collection_name	mongoengine/mongoengine/base/document.py	/^    def _get_collection_name(cls):$/;"	m	class:BaseDocument
-_get_collection_name	mongoengine/mongoengine/context_managers.py	/^        def _get_collection_name(cls):$/;"	f	function:switch_collection.__enter__
-_get_connection	mongoengine/mongoengine/connection.py	/^_get_connection = get_connection$/;"	v
-_get_count	mongoengine/mongoengine/context_managers.py	/^    def _get_count(self):$/;"	m	class:query_counter
-_get_db	mongoengine/mongoengine/connection.py	/^_get_db = get_db$/;"	v
-_get_db	mongoengine/mongoengine/document.py	/^    def _get_db(cls):$/;"	m	class:Document
-_get_items	mongoengine/mongoengine/dereference.py	/^                        def _get_items(items):$/;"	f	function:DeReference.__call__
-_get_loaded	mongoengine/tests/queryset/pickable.py	/^    def _get_loaded(self, qs):$/;"	m	class:TestQuerysetPickable
-_get_message	mongoengine/mongoengine/errors.py	/^    def _get_message(self):$/;"	m	class:ValidationError
-_get_order_by	mongoengine/mongoengine/queryset/base.py	/^    def _get_order_by(self, keys):$/;"	m	class:BaseQuerySet
-_get_scalar	mongoengine/mongoengine/queryset/base.py	/^    def _get_scalar(self, doc):$/;"	m	class:BaseQuerySet
-_get_update_doc	mongoengine/mongoengine/document.py	/^    def _get_update_doc(self):$/;"	m	class:Document
-_has_data	mongoengine/mongoengine/queryset/base.py	/^    def _has_data(self):$/;"	m	class:BaseQuerySet
-_has_more	mongoengine/mongoengine/queryset/queryset.py	/^    _has_more = True$/;"	v	class:QuerySet
-_import_class	mongoengine/mongoengine/common.py	/^def _import_class(cls_name):$/;"	f
-_import_classes	mongoengine/mongoengine/base/metaclasses.py	/^    def _import_classes(cls):$/;"	m	class:DocumentMetaclass
-_index_test	mongoengine/tests/document/indexes.py	/^    def _index_test(self, InheritFrom):$/;"	m	class:IndexesTest
-_index_test_inheritance	mongoengine/tests/document/indexes.py	/^    def _index_test_inheritance(self, InheritFrom):$/;"	m	class:IndexesTest
-_infer_geometry	mongoengine/mongoengine/queryset/transform.py	/^def _infer_geometry(value):$/;"	f
-_inner	mongoengine/tests/utils.py	/^    def _inner(*args, **kwargs):$/;"	f	function:_decorated_with_ver_requirement
-_inner	mongoengine/tests/utils.py	/^    def _inner(*args, **kwargs):$/;"	f	function:skip_pymongo3
-_instance	mongoengine/mongoengine/base/datastructures.py	/^    _instance = None$/;"	v	class:BaseDict
-_instance	mongoengine/mongoengine/base/datastructures.py	/^    _instance = None$/;"	v	class:BaseList
-_item_frequencies_exec_js	mongoengine/mongoengine/queryset/base.py	/^    def _item_frequencies_exec_js(self, field, normalize=False):$/;"	m	class:BaseQuerySet
-_item_frequencies_map_reduce	mongoengine/mongoengine/queryset/base.py	/^    def _item_frequencies_map_reduce(self, field, normalize=False):$/;"	m	class:BaseQuerySet
-_iter_results	mongoengine/mongoengine/queryset/queryset.py	/^    def _iter_results(self):$/;"	m	class:QuerySet
-_len	mongoengine/mongoengine/queryset/queryset.py	/^    _len = None$/;"	v	class:QuerySet
-_lookup_field	mongoengine/mongoengine/base/document.py	/^    def _lookup_field(cls, parts):$/;"	m	class:BaseDocument
-_mark_as_changed	mongoengine/fields.py	/^    def _mark_as_changed(self):$/;"	m	class:GridFSProxy
-_mark_as_changed	mongoengine/mongoengine/base/datastructures.py	/^    def _mark_as_changed(self, key=None):$/;"	m	class:BaseDict
-_mark_as_changed	mongoengine/mongoengine/base/datastructures.py	/^    def _mark_as_changed(self, key=None):$/;"	m	class:BaseList
-_mark_as_changed	mongoengine/mongoengine/base/document.py	/^    def _mark_as_changed(self, key):$/;"	m	class:BaseDocument
-_mark_as_changed	mongoengine/mongoengine/fields.py	/^    def _mark_as_changed(self):$/;"	m	class:GridFSProxy
-_merge_options	mongoengine/mongoengine/base/metaclasses.py	/^    _merge_options = ('indexes',)$/;"	v	class:MetaDict
-_message	mongoengine/mongoengine/errors.py	/^    _message = None$/;"	v	class:ValidationError
-_name	mongoengine/mongoengine/base/datastructures.py	/^    _name = None$/;"	v	class:BaseDict
-_name	mongoengine/mongoengine/base/datastructures.py	/^    _name = None$/;"	v	class:BaseList
-_nestable_types_changed_fields	mongoengine/mongoengine/base/document.py	/^    def _nestable_types_changed_fields(self, changed_fields, key, data, inspected):$/;"	m	class:BaseDocument
-_object_key	mongoengine/mongoengine/document.py	/^    def _object_key(self):$/;"	m	class:Document
-_order_reverse	mongoengine/fields.py	/^    _order_reverse = False$/;"	v	class:SortedListField
-_order_reverse	mongoengine/mongoengine/fields.py	/^    _order_reverse = False$/;"	v	class:SortedListField
-_ordering	mongoengine/fields.py	/^    _ordering = None$/;"	v	class:SortedListField
-_ordering	mongoengine/mongoengine/fields.py	/^    _ordering = None$/;"	v	class:SortedListField
-_populate_cache	mongoengine/mongoengine/queryset/queryset.py	/^    def _populate_cache(self):$/;"	m	class:QuerySet
-_prepare_query_for_iterable	mongoengine/mongoengine/queryset/transform.py	/^def _prepare_query_for_iterable(field, op, value):$/;"	f
-_put_thumbnail	mongoengine/fields.py	/^    def _put_thumbnail(self, thumbnail, format, progressive, **kwargs):$/;"	m	class:ImageGridFsProxy
-_put_thumbnail	mongoengine/mongoengine/fields.py	/^    def _put_thumbnail(self, thumbnail, format, progressive, **kwargs):$/;"	m	class:ImageGridFsProxy
-_qs	mongoengine/mongoengine/document.py	/^    def _qs(self):$/;"	m	class:Document
-_query	mongoengine/mongoengine/queryset/base.py	/^    def _query(self):$/;"	m	class:BaseQuerySet
-_query_conjunction	mongoengine/mongoengine/queryset/visitor.py	/^    def _query_conjunction(self, queries):$/;"	m	class:SimplificationVisitor
-_rank	mongoengine/tests/document/instance.py	/^            _rank = StringField(required=False, db_field="rank")$/;"	v	class:InstanceTest.test_db_field_load.Person
-_reload	mongoengine/mongoengine/document.py	/^    def _reload(self, key, value):$/;"	m	class:Document
-_result_cache	mongoengine/mongoengine/queryset/queryset.py	/^    _result_cache = None$/;"	v	class:QuerySet
-_save_create	mongoengine/mongoengine/document.py	/^    def _save_create(self, doc, force_insert, write_concern):$/;"	m	class:Document
-_save_update	mongoengine/mongoengine/document.py	/^    def _save_update(self, doc, save_condition, write_concern):$/;"	m	class:Document
-_set_message	mongoengine/mongoengine/errors.py	/^    def _set_message(self, message):$/;"	m	class:ValidationError
-_set_owner_document	mongoengine/mongoengine/base/fields.py	/^    def _set_owner_document(self, owner_document):$/;"	m	class:BaseField
-_set_owner_document	mongoengine/mongoengine/base/fields.py	/^    def _set_owner_document(self, owner_document):$/;"	m	class:ComplexBaseField
-_signals	mongoengine/mongoengine/signals.py	/^_signals = Namespace()$/;"	v
-_sort_key	mongoengine/mongoengine/queryset/base.py	/^        def _sort_key(field_tuple):$/;"	f	function:BaseQuerySet.fields
-_special_fields	mongoengine/mongoengine/base/datastructures.py	/^    _special_fields = set(['get', 'pop', 'iteritems', 'items', 'keys', 'create'])$/;"	v	class:StrictDict
-_sub_js_fields	mongoengine/mongoengine/queryset/base.py	/^    def _sub_js_fields(self, code):$/;"	m	class:BaseQuerySet
-_test_embedded	mongoengine/tests/queryset/geo.py	/^    def _test_embedded(self, point_field_class):$/;"	m	class:GeoQueriesTest
-_test_for_expected_error	mongoengine/tests/fields/geo.py	/^    def _test_for_expected_error(self, Cls, loc, expected):$/;"	m	class:GeoFieldTest
-_to_mongo_safe_call	mongoengine/mongoengine/base/fields.py	/^    def _to_mongo_safe_call(self, value, use_db_field=True, fields=None):$/;"	m	class:BaseField
-_translate_field_name	mongoengine/mongoengine/base/document.py	/^    def _translate_field_name(cls, field, sep='.'):$/;"	m	class:BaseDocument
-_type	mongoengine/fields.py	/^    _type = 'LineString'$/;"	v	class:LineStringField
-_type	mongoengine/fields.py	/^    _type = 'MultiLineString'$/;"	v	class:MultiLineStringField
-_type	mongoengine/fields.py	/^    _type = 'MultiPoint'$/;"	v	class:MultiPointField
-_type	mongoengine/fields.py	/^    _type = 'MultiPolygon'$/;"	v	class:MultiPolygonField
-_type	mongoengine/fields.py	/^    _type = 'Point'$/;"	v	class:PointField
-_type	mongoengine/fields.py	/^    _type = 'Polygon'$/;"	v	class:PolygonField
-_type	mongoengine/mongoengine/base/fields.py	/^    _type = 'GeoBase'$/;"	v	class:GeoJsonBaseField
-_type	mongoengine/mongoengine/fields.py	/^    _type = 'LineString'$/;"	v	class:LineStringField
-_type	mongoengine/mongoengine/fields.py	/^    _type = 'MultiLineString'$/;"	v	class:MultiLineStringField
-_type	mongoengine/mongoengine/fields.py	/^    _type = 'MultiPoint'$/;"	v	class:MultiPointField
-_type	mongoengine/mongoengine/fields.py	/^    _type = 'MultiPolygon'$/;"	v	class:MultiPolygonField
-_type	mongoengine/mongoengine/fields.py	/^    _type = 'Point'$/;"	v	class:PointField
-_type	mongoengine/mongoengine/fields.py	/^    _type = 'Polygon'$/;"	v	class:PolygonField
-_unique_with_indexes	mongoengine/mongoengine/base/document.py	/^    def _unique_with_indexes(cls, namespace=''):$/;"	m	class:BaseDocument
-_validate	mongoengine/mongoengine/base/fields.py	/^    def _validate(self, value, **kwargs):$/;"	m	class:BaseField
-_validate_choices	mongoengine/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:GenericLazyReferenceField
-_validate_choices	mongoengine/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:GenericReferenceField
-_validate_choices	mongoengine/mongoengine/base/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:BaseField
-_validate_choices	mongoengine/mongoengine/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:GenericLazyReferenceField
-_validate_choices	mongoengine/mongoengine/fields.py	/^    def _validate_choices(self, value):$/;"	m	class:GenericReferenceField
-_validate_linestring	mongoengine/mongoengine/base/fields.py	/^    def _validate_linestring(self, value, top_level=True):$/;"	m	class:GeoJsonBaseField
-_validate_multilinestring	mongoengine/mongoengine/base/fields.py	/^    def _validate_multilinestring(self, value, top_level=True):$/;"	m	class:GeoJsonBaseField
-_validate_multipoint	mongoengine/mongoengine/base/fields.py	/^    def _validate_multipoint(self, value):$/;"	m	class:GeoJsonBaseField
-_validate_multipolygon	mongoengine/mongoengine/base/fields.py	/^    def _validate_multipolygon(self, value):$/;"	m	class:GeoJsonBaseField
-_validate_point	mongoengine/mongoengine/base/fields.py	/^    def _validate_point(self, value):$/;"	m	class:GeoJsonBaseField
-_validate_polygon	mongoengine/mongoengine/base/fields.py	/^    def _validate_polygon(self, value, top_level=True):$/;"	m	class:GeoJsonBaseField
-a	mongoengine/tests/document/indexes.py	/^            a = IntField()$/;"	v	class:IndexesTest.test_covered_index.Test
-a	mongoengine/tests/document/inheritance.py	/^            a = StringField()$/;"	v	class:InheritanceTest.test_indexes_and_multiple_inheritance.A
-a	mongoengine/tests/queryset/field_list.py	/^            a = ListField()$/;"	v	class:OnlyExcludeAllTest.test_mix_slice_with_other_fields.MyDoc
-a	mongoengine/tests/queryset/field_list.py	/^            a = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
-a	mongoengine/tests/queryset/field_list.py	/^            a = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
-a	mongoengine/tests/queryset/queryset.py	/^            a = ReferenceField(A)$/;"	v	class:QuerySetTest.test_query_reference_to_custom_pk_doc.B
-a	mongoengine/tests/queryset/transform.py	/^            a = ReferenceField(A)$/;"	v	class:TransformTest.test_chaining.B
-a	mongoengine/tests/queryset/transform.py	/^            a = StringField()$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
-a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_dict_field.Group
-a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
-a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_generic_reference.Group
-a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
-a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i)$/;"	v	class:FieldTest.test_list_field_complex.Group
-a	mongoengine/tests/test_dereference.py	/^            a = UserA(name='User A %s' % i).save()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
-a_field	mongoengine/tests/fields/fields.py	/^            a_field = IntField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_custom_data.CustomData
-a_field	tests/fields/fields.py	/^            a_field = IntField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_custom_data.CustomData
-a_name	mongoengine/tests/queryset/queryset.py	/^            a_name = StringField()$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.A
-accept	mongoengine/mongoengine/queryset/visitor.py	/^    def accept(self, visitor):$/;"	m	class:Q
-accept	mongoengine/mongoengine/queryset/visitor.py	/^    def accept(self, visitor):$/;"	m	class:QCombination
-accept	mongoengine/mongoengine/queryset/visitor.py	/^    def accept(self, visitor):$/;"	m	class:QNode
-actions	mongoengine/tests/fields/fields.py	/^            actions = MapField(EmbeddedDocumentField(Action))$/;"	v	class:FieldTest.test_map_field_lookup.Log
-actions	mongoengine/tests/fields/fields.py	/^            actions={'friends': Action(operation='drink', object='beer')}).save()$/;"	v	class:FieldTest.test_map_field_lookup.Log
-actions	tests/fields/fields.py	/^            actions = MapField(EmbeddedDocumentField(Action))$/;"	v	class:FieldTest.test_map_field_lookup.Log
-actions	tests/fields/fields.py	/^            actions={'friends': Action(operation='drink', object='beer')}).save()$/;"	v	class:FieldTest.test_map_field_lookup.Log
-actions__friends__object	mongoengine/tests/fields/fields.py	/^            actions__friends__object='beer').count())$/;"	v	class:FieldTest.test_map_field_lookup.Log
-actions__friends__object	tests/fields/fields.py	/^            actions__friends__object='beer').count())$/;"	v	class:FieldTest.test_map_field_lookup.Log
-actions__friends__operation	mongoengine/tests/fields/fields.py	/^            actions__friends__operation='drink',$/;"	v	class:FieldTest.test_map_field_lookup.Log
-actions__friends__operation	tests/fields/fields.py	/^            actions__friends__operation='drink',$/;"	v	class:FieldTest.test_map_field_lookup.Log
-active	mongoengine/tests/document/instance.py	/^            active = BooleanField(default=True)$/;"	v	class:InstanceTest.test_save_only_changed_fields.User
-active	mongoengine/tests/document/instance.py	/^            active = BooleanField(default=True)$/;"	v	class:InstanceTest.test_save_only_changed_fields_recursive.User
-active	mongoengine/tests/queryset/queryset.py	/^            active = BooleanField(default=False)$/;"	v	class:QuerySetTest.test_custom_manager_overriding_objects_works.Foo
-active	mongoengine/tests/queryset/queryset.py	/^            active = BooleanField(default=True)$/;"	v	class:QuerySetTest.test_inherit_objects.Foo
-active	mongoengine/tests/queryset/queryset.py	/^            active = BooleanField(default=True)$/;"	v	class:QuerySetTest.test_inherit_objects_override.Foo
-active	mongoengine/tests/test_signals.py	/^            active = BooleanField(default=False)$/;"	v	class:SignalTests.setUp.Post
-actual	mongoengine/tests/fields/fields.py	/^            actual = list(Person.objects().scalar(field_name))$/;"	v	class:FieldTest.test_decimal_storage.Person
-actual	tests/fields/fields.py	/^            actual = list(Person.objects().scalar(field_name))$/;"	v	class:FieldTest.test_decimal_storage.Person
-add_to_class	mongoengine/mongoengine/base/metaclasses.py	/^    def add_to_class(self, name, value):$/;"	m	class:DocumentMetaclass
-address	mongoengine/tests/document/dynamic.py	/^            address = EmbeddedDocumentField(Address)$/;"	v	class:DynamicTest.test_dynamic_embedded_works_with_only.Person
-admin	mongoengine/tests/fields/fields.py	/^            admin = BooleanField()$/;"	v	class:FieldTest.test_boolean_validation.Person
-admin	mongoengine/tests/queryset/queryset.py	/^            admin = ListField(ReferenceField(User))$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
-admin	tests/fields/fields.py	/^            admin = BooleanField()$/;"	v	class:FieldTest.test_boolean_validation.Person
-adult	mongoengine/tests/queryset/queryset.py	/^            adult = (User.objects.filter(age__gte=18)$/;"	v	class:QuerySetTest.test_comment.User
-age	mongoengine/tests/document/class_methods.py	/^            age = IntField()$/;"	v	class:ClassMethodsTest.setUp.Person
-age	mongoengine/tests/document/delta.py	/^            age = IntField()$/;"	v	class:DeltaTest.setUp.Person
-age	mongoengine/tests/document/indexes.py	/^            age = IntField()$/;"	v	class:IndexesTest.setUp.Person
-age	mongoengine/tests/document/inheritance.py	/^            age = IntField()$/;"	v	class:InheritanceTest.test_inheritance_meta_data.Person
-age	mongoengine/tests/document/inheritance.py	/^            age = IntField()$/;"	v	class:InheritanceTest.test_inheritance_to_mongo_keys.Person
-age	mongoengine/tests/document/instance.py	/^            age = IntField()$/;"	v	class:InstanceTest.setUp.Person
-age	mongoengine/tests/document/instance.py	/^            age = IntField()$/;"	v	class:InstanceTest.test_do_not_save_unchanged_references.Person
-age	mongoengine/tests/document/instance.py	/^            age = IntField()$/;"	v	class:InstanceTest.test_embedded_document_to_mongo.Person
-age	mongoengine/tests/document/instance.py	/^            age = IntField()$/;"	v	class:InstanceTest.test_mixin_inheritance.TestDoc
-age	mongoengine/tests/document/instance.py	/^            age = IntField(primary_key=True)$/;"	v	class:InstanceTest.test_falsey_pk.Person
-age	mongoengine/tests/document/validation.py	/^            age = IntField()$/;"	v	class:ValidatorErrorTest.test_fields_rewrite.BasePerson
-age	mongoengine/tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
-age	mongoengine/tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
-age	mongoengine/tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-age	mongoengine/tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
-age	mongoengine/tests/fields/fields.py	/^            age = IntField(min_value=0, max_value=110)$/;"	v	class:FieldTest.test_int_validation.Person
-age	mongoengine/tests/fields/fields.py	/^            age = IntField(required=True)$/;"	v	class:FieldTest.test_required_values.Person
-age	mongoengine/tests/queryset/field_list.py	/^            age = IntField()$/;"	v	class:OnlyExcludeAllTest.setUp.Person
-age	mongoengine/tests/queryset/pickable.py	/^    age = IntField()$/;"	v	class:Person
-age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.setUp.Person
-age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_as_pymongo.User
-age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_comment.User
-age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_mapfield_update.Member
-age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_queryset_aggregation_framework.Person
-age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_scalar_embedded.Profile
-age	mongoengine/tests/queryset/queryset.py	/^            age = IntField()$/;"	v	class:QuerySetTest.test_scalar_simple.UserDoc
-age	mongoengine/tests/queryset/queryset.py	/^            age=51,$/;"	v	class:QuerySetTest.test_as_pymongo.User
-age	mongoengine/tests/queryset/visitor.py	/^            age = IntField()$/;"	v	class:QTest.setUp.Person
-age	mongoengine/tests/queryset/visitor.py	/^            age = IntField()$/;"	v	class:QTest.test_empty_q.Person
-age	tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
-age	tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
-age	tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-age	tests/fields/fields.py	/^            age = IntField(default=30, required=False)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
-age	tests/fields/fields.py	/^            age = IntField(min_value=0, max_value=110)$/;"	v	class:FieldTest.test_int_validation.Person
-age	tests/fields/fields.py	/^            age = IntField(required=True)$/;"	v	class:FieldTest.test_required_values.Person
-aggregate	mongoengine/mongoengine/queryset/base.py	/^    def aggregate(self, *pipeline, **kwargs):$/;"	m	class:BaseQuerySet
-all	mongoengine/mongoengine/queryset/base.py	/^    def all(self):$/;"	m	class:BaseQuerySet
-all_fields	mongoengine/mongoengine/queryset/base.py	/^    def all_fields(self):$/;"	m	class:BaseQuerySet
-animal	mongoengine/tests/fields/fields.py	/^                  animal=Animal(name="Leopard", tag="heavy").save()).save()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Ocorrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = CachedReferenceField(Animal)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Ocurrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Ocurrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Ocurrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = GenericLazyReferenceField(choices=['Animal'])$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Ocurrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Ocurrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Ocurrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Ocurrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Ocurrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Ocurrence
-animal	mongoengine/tests/fields/fields.py	/^            animal = LazyReferenceField(Animal, passthrough=False)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Ocurrence
-animal	tests/fields/fields.py	/^                  animal=Animal(name="Leopard", tag="heavy").save()).save()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
-animal	tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-animal	tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-animal	tests/fields/fields.py	/^            animal = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Ocorrence
-animal	tests/fields/fields.py	/^            animal = CachedReferenceField(Animal)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
-animal	tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Ocurrence
-animal	tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Ocurrence
-animal	tests/fields/fields.py	/^            animal = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Ocurrence
-animal	tests/fields/fields.py	/^            animal = GenericLazyReferenceField(choices=['Animal'])$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Ocurrence
-animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Ocurrence
-animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Ocurrence
-animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Ocurrence
-animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Ocurrence
-animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Ocurrence
-animal	tests/fields/fields.py	/^            animal = LazyReferenceField(Animal, passthrough=False)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Ocurrence
-animal__owner__tags	mongoengine/tests/fields/fields.py	/^            animal__owner__tags='cool').first()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-animal__owner__tags	tests/fields/fields.py	/^            animal__owner__tags='cool').first()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-animal__owner__tp	mongoengine/tests/fields/fields.py	/^            animal__owner__tp='u').first()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-animal__owner__tp	tests/fields/fields.py	/^            animal__owner__tp='u').first()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-animal__tag	mongoengine/tests/fields/fields.py	/^            animal__tag='heavy',$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-animal__tag	mongoengine/tests/fields/fields.py	/^            animal__tag='heavy',$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-animal__tag	tests/fields/fields.py	/^            animal__tag='heavy',$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-animal__tag	tests/fields/fields.py	/^            animal__tag='heavy',$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-animal_passthrough	mongoengine/tests/fields/fields.py	/^            animal_passthrough = LazyReferenceField(Animal, passthrough=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Ocurrence
-animal_passthrough	tests/fields/fields.py	/^            animal_passthrough = LazyReferenceField(Animal, passthrough=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Ocurrence
-animals	mongoengine/tests/document/instance.py	/^            animals = ListField(GenericReferenceField())$/;"	v	class:InstanceTest.test_polymorphic_references.Zoo
-animals	mongoengine/tests/document/instance.py	/^            animals = ListField(ReferenceField(Animal))$/;"	v	class:InstanceTest.test_polymorphic_references.Zoo
-anon	mongoengine/tests/queryset/field_list.py	/^            anon = BooleanField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.Anon
-api_key	mongoengine/tests/fields/fields.py	/^            api_key = UUIDField(binary=False)$/;"	v	class:FieldTest.test_uuid_field_string.Person
-api_key	mongoengine/tests/fields/fields.py	/^            api_key = UUIDField(binary=True)$/;"	v	class:FieldTest.test_uuid_field_binary.Person
-api_key	tests/fields/fields.py	/^            api_key = UUIDField(binary=False)$/;"	v	class:FieldTest.test_uuid_field_string.Person
-api_key	tests/fields/fields.py	/^            api_key = UUIDField(binary=True)$/;"	v	class:FieldTest.test_uuid_field_binary.Person
-append	mongoengine/mongoengine/base/datastructures.py	/^    def append(self, *args, **kwargs):$/;"	m	class:BaseList
-append_to_warning_list	mongoengine/tests/all_warnings/__init__.py	/^    def append_to_warning_list(self, message, category, *args):$/;"	m	class:AllWarnings
-archived	mongoengine/tests/document/instance.py	/^            archived = BooleanField(default=False, required=True)$/;"	v	class:InstanceTest.test_can_save_false_values.Doc
-as_dict	mongoengine/mongoengine/queryset/field_list.py	/^    def as_dict(self):$/;"	m	class:QueryFieldList
-as_pymongo	mongoengine/mongoengine/queryset/base.py	/^    def as_pymongo(self):$/;"	m	class:BaseQuerySet
-assertDbEqual	mongoengine/tests/document/instance.py	/^    def assertDbEqual(self, docs):$/;"	m	class:InstanceTest
-assertDbEqual	mongoengine/tests/queryset/modify.py	/^    def assertDbEqual(self, docs):$/;"	m	class:FindAndModifyTest
-assertHasInstance	mongoengine/tests/document/instance.py	/^    def assertHasInstance(self, field, instance):$/;"	m	class:InstanceTest
-assertSequence	mongoengine/tests/queryset/queryset.py	/^    def assertSequence(self, qs, expected):$/;"	m	class:QuerySetTest
-attachments	mongoengine/tests/queryset/field_list.py	/^            attachments = ListField(EmbeddedDocumentField(Attachment))$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
-author	mongoengine/docs/code/tumblelog.py	/^    author = ReferenceField(User)$/;"	v	class:Post
-author	mongoengine/tests/document/class_methods.py	/^            author = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
-author	mongoengine/tests/document/class_methods.py	/^            author = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPost
-author	mongoengine/tests/document/class_methods.py	/^            author = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPost
-author	mongoengine/tests/document/class_methods.py	/^            author = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPost
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(User)$/;"	v	class:InstanceTest.test_db_alias_tests.AuthorBooks
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(User)$/;"	v	class:InstanceTest.test_db_ref_usage.Book
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(User, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_custom_id_field.Book
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(User, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections.Book
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person)$/;"	v	class:InstanceTest.test_save_reference.BlogPost
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify.BlogPost
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_recurs.BlogPost
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.BlogPost
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_document_inheritance.BlogPost
-author	mongoengine/tests/document/instance.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=DENY)$/;"	v	class:InstanceTest.test_reverse_delete_rule_deny.BlogPost
-author	mongoengine/tests/fields/fields.py	/^            author = EmbeddedDocumentField(Author, required=True)$/;"	v	class:FieldTest.test_recursive_validation.Comment
-author	mongoengine/tests/fields/fields.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:FieldTest.test_embedded_document_inheritance.BlogPost
-author	mongoengine/tests/fields/fields.py	/^            author = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.BlogPost
-author	mongoengine/tests/fields/fields.py	/^            author = LazyReferenceField(Member, dbref=False)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.BlogPost
-author	mongoengine/tests/fields/fields.py	/^            author = LazyReferenceField(Member, dbref=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.BlogPost
-author	mongoengine/tests/fields/fields.py	/^            author = ReferenceField(Member, dbref=False)$/;"	v	class:FieldTest.test_reference_query_conversion.BlogPost
-author	mongoengine/tests/fields/fields.py	/^            author = ReferenceField(Member, dbref=True)$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.BlogPost
-author	mongoengine/tests/fields/fields.py	/^            author = ReferenceField(User)$/;"	v	class:FieldTest.test_reference_validation.BlogPost
-author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.Comments
-author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents.UserComments
-author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
-author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.ModeratorComments
-author	mongoengine/tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.UserComments
-author	mongoengine/tests/queryset/field_list.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:OnlyExcludeAllTest.test_exclude.BlogPost
-author	mongoengine/tests/queryset/field_list.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:QuerySetTest.test_find_embedded.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:QuerySetTest.test_find_empty_embedded.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person)$/;"	v	class:QuerySetTest.test_cannot_perform_joins_references.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person)$/;"	v	class:QuerySetTest.test_confirm_order_by_reference_wont_work.Author
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person)$/;"	v	class:QuerySetTest.test_query_value_conversion.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person)$/;"	v	class:QuerySetTest.test_reference_field_find.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, dbref=True)$/;"	v	class:QuerySetTest.test_reference_field_find_dbref.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_delete_with_limit_handles_delete_rules.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document.AbstractBlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=DENY)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny.BlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=DENY)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document.AbstractBlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author = ReferenceField(self.Person, reverse_delete_rule=NULLIFY)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document.AbstractBlogPost
-author	mongoengine/tests/queryset/queryset.py	/^            author=user,$/;"	v	class:QuerySetTest.test_find_embedded.BlogPost
-author	mongoengine/tests/test_dereference.py	/^            author = ReferenceField(User)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.Message
-author	mongoengine/tests/test_dereference.py	/^            author = ReferenceField(User)$/;"	v	class:FieldTest.test_objectid_reference_across_databases.Book
-author	mongoengine/tests/test_dereference.py	/^            author = ReferenceField(User, dbref=False)$/;"	v	class:FieldTest.test_migrate_references.Group
-author	mongoengine/tests/test_dereference.py	/^            author = ReferenceField(User, dbref=True)$/;"	v	class:FieldTest.test_migrate_references.Group
-author	tests/fields/fields.py	/^            author = EmbeddedDocumentField(Author, required=True)$/;"	v	class:FieldTest.test_recursive_validation.Comment
-author	tests/fields/fields.py	/^            author = EmbeddedDocumentField(User)$/;"	v	class:FieldTest.test_embedded_document_inheritance.BlogPost
-author	tests/fields/fields.py	/^            author = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.BlogPost
-author	tests/fields/fields.py	/^            author = LazyReferenceField(Member, dbref=False)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.BlogPost
-author	tests/fields/fields.py	/^            author = LazyReferenceField(Member, dbref=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.BlogPost
-author	tests/fields/fields.py	/^            author = ReferenceField(Member, dbref=False)$/;"	v	class:FieldTest.test_reference_query_conversion.BlogPost
-author	tests/fields/fields.py	/^            author = ReferenceField(Member, dbref=True)$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.BlogPost
-author	tests/fields/fields.py	/^            author = ReferenceField(User)$/;"	v	class:FieldTest.test_reference_validation.BlogPost
-author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.Comments
-author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents.UserComments
-author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
-author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.ModeratorComments
-author	tests/fields/fields.py	/^            author = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.UserComments
-author2	mongoengine/tests/queryset/queryset.py	/^            author2 = GenericReferenceField()$/;"	v	class:QuerySetTest.test_cannot_perform_joins_references.BlogPost
-authors	mongoengine/tests/document/instance.py	/^                authors = MapField(ReferenceField($/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
-authors	mongoengine/tests/document/instance.py	/^            authors = ListField(ReferenceField($/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify_complex_field.BlogPost
-authors	mongoengine/tests/fields/fields.py	/^            authors = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_validation.BlogPost
-authors	mongoengine/tests/queryset/queryset.py	/^                                       authors=[author])$/;"	v	class:QuerySetTest.test_in_operator_on_non_iterable.BlogPost
-authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(EmbeddedDocumentField('Author'))$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Message
-authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(EmbeddedDocumentField(Author))$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField.Book
-authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(EmbeddedDocumentField(Author))$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Book
-authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(ReferenceField(User))$/;"	v	class:QuerySetTest.test_in_operator_on_non_iterable.BlogPost
-authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(ReferenceField(self.Person,$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull.BlogPost
-authors	mongoengine/tests/queryset/queryset.py	/^            authors = ListField(ReferenceField(self.Person,$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents.AbstractBlogPost
-authors	tests/fields/fields.py	/^            authors = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_validation.BlogPost
-authors_as_lazy	mongoengine/tests/fields/fields.py	/^            authors_as_lazy = ListField(LazyReferenceField(User))$/;"	v	class:FieldTest.test_list_validation.BlogPost
-authors_as_lazy	tests/fields/fields.py	/^            authors_as_lazy = ListField(LazyReferenceField(User))$/;"	v	class:FieldTest.test_list_validation.BlogPost
-auto_creation_counter	mongoengine/mongoengine/base/fields.py	/^    auto_creation_counter = -1$/;"	v	class:BaseField
-autoclass_content	mongoengine/docs/conf.py	/^autoclass_content = 'both'$/;"	v
-average	mongoengine/mongoengine/queryset/base.py	/^    def average(self, field):$/;"	m	class:BaseQuerySet
-b	mongoengine/tests/document/indexes.py	/^            b = IntField()$/;"	v	class:IndexesTest.test_covered_index.Test
-b	mongoengine/tests/document/inheritance.py	/^            b = StringField()$/;"	v	class:InheritanceTest.test_indexes_and_multiple_inheritance.B
-b	mongoengine/tests/document/instance.py	/^            b = EmbeddedDocumentField(B, default=lambda: B())$/;"	v	class:InstanceTest.test_mutating_documents.A
-b	mongoengine/tests/document/instance.py	/^            b = Foo.objects.with_id(a.id)$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit_with_file_field.Foo
-b	mongoengine/tests/fields/fields.py	/^            b = EmbeddedDocumentField(B, db_field='fb')$/;"	v	class:FieldTest.test_double_embedded_db_field.A
-b	mongoengine/tests/fields/fields.py	/^            b = EmbeddedDocumentField(B, db_field='fb')$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.A
-b	mongoengine/tests/fields/fields.py	/^            b=B($/;"	v	class:FieldTest.test_double_embedded_db_field.A
-b	mongoengine/tests/queryset/field_list.py	/^            b = ListField()$/;"	v	class:OnlyExcludeAllTest.test_mix_slice_with_other_fields.MyDoc
-b	mongoengine/tests/queryset/field_list.py	/^            b = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
-b	mongoengine/tests/queryset/field_list.py	/^            b = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
-b	mongoengine/tests/queryset/queryset.py	/^            b = ListField(EmbeddedDocumentField(B))$/;"	v	class:QuerySetTest.test_count_list_embedded.A
-b	mongoengine/tests/queryset/transform.py	/^            b = StringField()$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
-b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i)$/;"	v	class:FieldTest.test_dict_field.Group
-b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i)$/;"	v	class:FieldTest.test_generic_reference.Group
-b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i)$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
-b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i)$/;"	v	class:FieldTest.test_list_field_complex.Group
-b	mongoengine/tests/test_dereference.py	/^            b = UserB(name='User B %s' % i).save()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
-b	tests/fields/fields.py	/^            b = EmbeddedDocumentField(B, db_field='fb')$/;"	v	class:FieldTest.test_double_embedded_db_field.A
-b	tests/fields/fields.py	/^            b = EmbeddedDocumentField(B, db_field='fb')$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.A
-b	tests/fields/fields.py	/^            b=B($/;"	v	class:FieldTest.test_double_embedded_db_field.A
-b_name	mongoengine/tests/queryset/queryset.py	/^            b_name = StringField()$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.B
-bar	mongoengine/tests/document/instance.py	/^            bar = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit_with_file_field.Foo
-bar	mongoengine/tests/document/instance.py	/^            bar = ReferenceField(Bar)$/;"	v	class:InstanceTest.test_two_way_reverse_delete_rule.Foo
-bar	mongoengine/tests/document/instance.py	/^            bar = StringField()$/;"	v	class:InstanceTest.test_shard_key_in_embedded_document.Bar
-bar	mongoengine/tests/document/instance.py	/^            bar = StringField(default=None)$/;"	v	class:InstanceTest.test_set_unset_one_operation.FooBar
-bar	mongoengine/tests/queryset/queryset.py	/^            bar = GenericEmbeddedDocumentField(choices=[Bar,])$/;"	v	class:QuerySetTest.test_set_generic_embedded_documents.User
-bar	mongoengine/tests/queryset/queryset.py	/^            bar = ReferenceField("Bar")$/;"	v	class:QuerySetTest.test_distinct_handles_references.Foo
-bar	mongoengine/tests/queryset/queryset.py	/^            bar = ReferenceField("Bar")$/;"	v	class:QuerySetTest.test_distinct_handles_references_to_alias.Foo
-bar	mongoengine/tests/queryset/queryset.py	/^            bar = ReferenceField('Bar')$/;"	v	class:QuerySetTest.test_distinct_ListField_ReferenceField.Foo
-bar	mongoengine/tests/queryset/queryset.py	/^            bar = StringField(default='bar')$/;"	v	class:QuerySetTest.test_custom_manager_overriding_objects_works.Foo
-bar	mongoengine/tests/test_dereference.py	/^            bar = ReferenceField('Bar')$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Foo
-bar_lst	mongoengine/tests/queryset/queryset.py	/^            bar_lst = ListField(ReferenceField('Bar'))$/;"	v	class:QuerySetTest.test_distinct_ListField_ReferenceField.Foo
-bars	mongoengine/tests/fields/fields.py	/^            bars = ListField(ReferenceField("Bar"))$/;"	v	class:FieldTest.test_list_field_passed_in_value.Foo
-bars	tests/fields/fields.py	/^            bars = ListField(ReferenceField("Bar"))$/;"	v	class:FieldTest.test_list_field_passed_in_value.Foo
-batch_size	mongoengine/mongoengine/queryset/base.py	/^    def batch_size(self, size):$/;"	m	class:BaseQuerySet
-baz	mongoengine/tests/test_dereference.py	/^            baz = ReferenceField('Baz')$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Foo
-blob	mongoengine/tests/fields/fields.py	/^            blob = BinaryField()$/;"	v	class:FieldTest.test_binary_fields.Attachment
-blob	mongoengine/tests/fields/fields.py	/^            blob = BinaryField()$/;"	v	class:FieldTest.test_binary_validation.Attachment
-blob	mongoengine/tests/fields/fields.py	/^            blob = BinaryField(max_bytes=4)$/;"	v	class:FieldTest.test_binary_validation.AttachmentSizeLimit
-blob	mongoengine/tests/fields/fields.py	/^            blob = BinaryField(required=True)$/;"	v	class:FieldTest.test_binary_validation.AttachmentRequired
-blob	mongoengine/tests/fields/fields.py	/^            blob=six.b('\\xe6\\x00\\xc4\\xff\\x07'))$/;"	v	class:FieldTest.test_binary_validation.AttachmentSizeLimit
-blob	tests/fields/fields.py	/^            blob = BinaryField()$/;"	v	class:FieldTest.test_binary_fields.Attachment
-blob	tests/fields/fields.py	/^            blob = BinaryField()$/;"	v	class:FieldTest.test_binary_validation.Attachment
-blob	tests/fields/fields.py	/^            blob = BinaryField(max_bytes=4)$/;"	v	class:FieldTest.test_binary_validation.AttachmentSizeLimit
-blob	tests/fields/fields.py	/^            blob = BinaryField(required=True)$/;"	v	class:FieldTest.test_binary_validation.AttachmentRequired
-blob	tests/fields/fields.py	/^            blob=six.b('\\xe6\\x00\\xc4\\xff\\x07'))$/;"	v	class:FieldTest.test_binary_validation.AttachmentSizeLimit
-blog	mongoengine/tests/queryset/queryset.py	/^            blog = Blog.objects.first()$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-blog	mongoengine/tests/queryset/queryset.py	/^            blog = ReferenceField(Blog)$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-blog	mongoengine/tests/queryset/queryset.py	/^            blog=blog_1,$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-blog	mongoengine/tests/queryset/queryset.py	/^            blog=blog_2,$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-blog	mongoengine/tests/queryset/queryset.py	/^            blog=blog_3,$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-blogs	mongoengine/tests/queryset/queryset.py	/^            blogs = Blog.objects$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-blogs	mongoengine/tests/queryset/queryset.py	/^            blogs = []$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-body	mongoengine/tests/queryset/field_list.py	/^            body = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
-body	mongoengine/tests/queryset/field_list.py	/^            body = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
-body	mongoengine/tests/test_dereference.py	/^            body = StringField()$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Post
-book	mongoengine/tests/document/instance.py	/^            book = ReferenceField(Book)$/;"	v	class:InstanceTest.test_db_alias_tests.AuthorBooks
-bookmark_object	mongoengine/tests/fields/fields.py	/^            bookmark_object = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference.Bookmark
-bookmark_object	mongoengine/tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=('Post', Link))$/;"	v	class:FieldTest.test_generic_reference_string_choices.Bookmark
-bookmark_object	mongoengine/tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=(Post, ))$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Bookmark
-bookmark_object	mongoengine/tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=(Post,))$/;"	v	class:FieldTest.test_generic_reference_choices.Bookmark
-bookmark_object	tests/fields/fields.py	/^            bookmark_object = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference.Bookmark
-bookmark_object	tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=('Post', Link))$/;"	v	class:FieldTest.test_generic_reference_string_choices.Bookmark
-bookmark_object	tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=(Post, ))$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Bookmark
-bookmark_object	tests/fields/fields.py	/^            bookmark_object = GenericReferenceField(choices=(Post,))$/;"	v	class:FieldTest.test_generic_reference_choices.Bookmark
-bookmarks	mongoengine/tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_document_not_registered.User
-bookmarks	mongoengine/tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_list.User
-bookmarks	mongoengine/tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.User
-bookmarks	mongoengine/tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField(choices=(Post,)))$/;"	v	class:FieldTest.test_generic_reference_list_choices.User
-bookmarks	tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_document_not_registered.User
-bookmarks	tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_list.User
-bookmarks	tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.User
-bookmarks	tests/fields/fields.py	/^            bookmarks = ListField(GenericReferenceField(choices=(Post,)))$/;"	v	class:FieldTest.test_generic_reference_list_choices.User
-bool_info	mongoengine/tests/fields/fields.py	/^            bool_info = ListField(BooleanField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
-bool_info	tests/fields/fields.py	/^            bool_info = ListField(BooleanField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
-boolean_field	mongoengine/tests/document/instance.py	/^            boolean_field = BooleanField(default=True)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-boolean_field	mongoengine/tests/document/json_serialisation.py	/^            boolean_field = BooleanField(default=True)$/;"	v	class:TestJson.test_json_complex.Doc
-boolean_field	mongoengine/tests/queryset/queryset.py	/^            boolean_field = BooleanField(default=True)$/;"	v	class:QuerySetTest.test_json_complex.Doc
-boolfield	mongoengine/tests/queryset/queryset.py	/^            boolfield = BooleanField(default=False)$/;"	v	class:QuerySetTest.test_chaining.B
-boss	mongoengine/tests/fields/fields.py	/^            boss = ReferenceField('self')$/;"	v	class:FieldTest.test_recursive_reference.Employee
-boss	mongoengine/tests/test_dereference.py	/^            boss = ReferenceField('self')$/;"	v	class:FieldTest.test_recursive_reference.Employee
-boss	tests/fields/fields.py	/^            boss = ReferenceField('self')$/;"	v	class:FieldTest.test_recursive_reference.Employee
-brands	mongoengine/tests/test_dereference.py	/^            brands = ListField(ReferenceField("Brand", dbref=True))$/;"	v	class:FieldTest.test_non_ascii_pk.BrandGroup
-build_dict	mongoengine/mongoengine/errors.py	/^        def build_dict(source):$/;"	f	function:ValidationError.to_dict
-build_lazyref	mongoengine/fields.py	/^    def build_lazyref(self, value):$/;"	m	class:GenericLazyReferenceField
-build_lazyref	mongoengine/fields.py	/^    def build_lazyref(self, value):$/;"	m	class:LazyReferenceField
-build_lazyref	mongoengine/mongoengine/fields.py	/^    def build_lazyref(self, value):$/;"	m	class:GenericLazyReferenceField
-build_lazyref	mongoengine/mongoengine/fields.py	/^    def build_lazyref(self, value):$/;"	m	class:LazyReferenceField
-bulk_create_author	mongoengine/tests/test_signals.py	/^        def bulk_create_author():$/;"	f	function:SignalTests.test_signal_kwargs
-bulk_create_author_with_load	mongoengine/tests/test_signals.py	/^        def bulk_create_author_with_load():$/;"	f	function:SignalTests.test_model_signals
-bulk_create_author_without_load	mongoengine/tests/test_signals.py	/^        def bulk_create_author_without_load():$/;"	f	function:SignalTests.test_model_signals
-bulk_set_active_post	mongoengine/tests/test_signals.py	/^        def bulk_set_active_post():$/;"	f	function:SignalTests.test_signals_bulk_insert
-by	mongoengine/tests/queryset/queryset.py	/^            by = StringField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator.Comment
-by	mongoengine/tests/queryset/queryset.py	/^            by = StringField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.Comment
-c	mongoengine/tests/document/indexes.py	/^            c = StringField()$/;"	v	class:IndexesTest.test_index_no_cls.B
-c	mongoengine/tests/fields/fields.py	/^                c=C(txt='hi')$/;"	v	class:FieldTest.test_double_embedded_db_field.A
-c	mongoengine/tests/fields/fields.py	/^            c = EmbeddedDocumentField(C, db_field='fc')$/;"	v	class:FieldTest.test_double_embedded_db_field.B
-c	mongoengine/tests/fields/fields.py	/^            c = EmbeddedDocumentField(C, db_field='fc')$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.B
-c	mongoengine/tests/queryset/field_list.py	/^            c = ListField()$/;"	v	class:OnlyExcludeAllTest.test_mix_slice_with_other_fields.MyDoc
-c	mongoengine/tests/queryset/field_list.py	/^            c = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
-c	mongoengine/tests/queryset/field_list.py	/^            c = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
-c	mongoengine/tests/queryset/queryset.py	/^            c = StringField()$/;"	v	class:QuerySetTest.test_count_list_embedded.B
-c	mongoengine/tests/queryset/transform.py	/^            c = StringField()$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
-c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i)$/;"	v	class:FieldTest.test_dict_field.Group
-c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i)$/;"	v	class:FieldTest.test_generic_reference.Group
-c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i)$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
-c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i)$/;"	v	class:FieldTest.test_list_field_complex.Group
-c	mongoengine/tests/test_dereference.py	/^            c = UserC(name='User C %s' % i).save()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
-c	tests/fields/fields.py	/^                c=C(txt='hi')$/;"	v	class:FieldTest.test_double_embedded_db_field.A
-c	tests/fields/fields.py	/^            c = EmbeddedDocumentField(C, db_field='fc')$/;"	v	class:FieldTest.test_double_embedded_db_field.B
-c	tests/fields/fields.py	/^            c = EmbeddedDocumentField(C, db_field='fc')$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.B
-c_field	mongoengine/tests/document/instance.py	/^            c_field = StringField(default='cfield')$/;"	v	class:InstanceTest.test_mutating_documents.C
-c_field	mongoengine/tests/fields/fields.py	/^            c_field = IntField(custom_data=custom_data)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_custom_data.CustomData
-c_field	tests/fields/fields.py	/^            c_field = IntField(custom_data=custom_data)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_custom_data.CustomData
-cache	mongoengine/mongoengine/queryset/queryset.py	/^    def cache(self):$/;"	m	class:QuerySetNoCache
-cascade_save	mongoengine/mongoengine/document.py	/^    def cascade_save(self, **kwargs):$/;"	m	class:Document
-cat	mongoengine/tests/queryset/queryset.py	/^            cat = ReferenceField(Category, reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle.Dummy
-categories	mongoengine/tests/document/indexes.py	/^            categories = ListField()$/;"	v	class:IndexesTest.test_index_on_id.BlogPost
-categories	mongoengine/tests/fields/fields.py	/^            categories = SortedListField(EmbeddedDocumentField(Category),$/;"	v	class:FieldTest.test_reverse_list_sorting.CategoryList
-categories	tests/fields/fields.py	/^            categories = SortedListField(EmbeddedDocumentField(Category),$/;"	v	class:FieldTest.test_reverse_list_sorting.CategoryList
-category	mongoengine/tests/document/indexes.py	/^            category = StringField()$/;"	v	class:IndexesTest._index_test.BlogPost
-category	mongoengine/tests/document/indexes.py	/^            category = StringField()$/;"	v	class:IndexesTest._index_test_inheritance.BlogPost
-category	mongoengine/tests/document/indexes.py	/^            category = StringField()$/;"	v	class:IndexesTest.test_dictionary_indexes.BlogPost
-category	mongoengine/tests/queryset/queryset.py	/^            category = ReferenceField(Category, reverse_delete_rule=NULLIFY)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify.BlogPost
-cdt_f	mongoengine/tests/queryset/queryset.py	/^            cdt_f = ComplexDateTimeField()$/;"	v	class:QuerySetTest.test_update_validate.Doc
-cdt_fld	mongoengine/tests/document/instance.py	/^            cdt_fld = ComplexDateTimeField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
-ceo	mongoengine/tests/queryset/queryset.py	/^            ceo = ReferenceField(User)$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
-check_fields_type	mongoengine/tests/fields/fields.py	/^        def check_fields_type(occ):$/;"	f	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
-check_fields_type	mongoengine/tests/fields/fields.py	/^        def check_fields_type(occ):$/;"	f	function:LazyReferenceFieldTest.test_lazy_reference_embedded
-check_fields_type	tests/fields/fields.py	/^        def check_fields_type(occ):$/;"	f	function:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded
-check_fields_type	tests/fields/fields.py	/^        def check_fields_type(occ):$/;"	f	function:LazyReferenceFieldTest.test_lazy_reference_embedded
-child	mongoengine/tests/queryset/queryset.py	/^            child = Category(name=child_name, parent=base)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
-child_child	mongoengine/tests/queryset/queryset.py	/^                child_child = Category(name=child_child_name, parent=child)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
-child_child_name	mongoengine/tests/queryset/queryset.py	/^                child_child_name = 'Child-Child-%i' % i$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
-child_name	mongoengine/tests/queryset/queryset.py	/^            child_name = 'Child-%i' % i$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
-children	mongoengine/tests/document/instance.py	/^            children = ListField(ReferenceField('self', reverse_delete_rule=PULL))$/;"	v	class:InstanceTest.test_reverse_delete_rule_pull.Record
-children	mongoengine/tests/fields/fields.py	/^            children = ListField(EmbeddedDocumentField('TreeNode'))$/;"	v	class:FieldTest.test_recursive_embedding.Tree
-children	mongoengine/tests/fields/fields.py	/^            children = ListField(EmbeddedDocumentField('self'))$/;"	v	class:FieldTest.test_recursive_embedding.TreeNode
-children	mongoengine/tests/test_dereference.py	/^            children = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
-children	tests/fields/fields.py	/^            children = ListField(EmbeddedDocumentField('TreeNode'))$/;"	v	class:FieldTest.test_recursive_embedding.Tree
-children	tests/fields/fields.py	/^            children = ListField(EmbeddedDocumentField('self'))$/;"	v	class:FieldTest.test_recursive_embedding.TreeNode
-choices	mongoengine/tests/fields/fields.py	/^                                choices=('Small', 'Baggy', 'wide'),$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-choices	mongoengine/tests/fields/fields.py	/^                               choices=('S', 'M', 'L', 'XL', 'XXL'))$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-choices	mongoengine/tests/fields/fields.py	/^                               choices=('S', 'M', 'L', 'XL', 'XXL'))$/;"	v	class:FieldTest.test_simple_choices_validation.Shirt
-choices	mongoengine/tests/fields/fields.py	/^                choices=TPS)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-choices	mongoengine/tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-choices	mongoengine/tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-choices	mongoengine/tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-choices	mongoengine/tests/queryset/queryset.py	/^                choices=[Foo, ]))$/;"	v	class:QuerySetTest.test_pull_in_genericembedded_field.Bar
-choices	tests/fields/fields.py	/^                                choices=('Small', 'Baggy', 'wide'),$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-choices	tests/fields/fields.py	/^                               choices=('S', 'M', 'L', 'XL', 'XXL'))$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-choices	tests/fields/fields.py	/^                               choices=('S', 'M', 'L', 'XL', 'XXL'))$/;"	v	class:FieldTest.test_simple_choices_validation.Shirt
-choices	tests/fields/fields.py	/^                choices=TPS)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-choices	tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-choices	tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-choices	tests/fields/fields.py	/^                choices=TYPES$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-circular_reference_deltas	mongoengine/tests/document/delta.py	/^    def circular_reference_deltas(self, DocClass1, DocClass2):$/;"	m	class:DeltaTest
-circular_reference_deltas_2	mongoengine/tests/document/delta.py	/^    def circular_reference_deltas_2(self, DocClass1, DocClass2, dbref=True):$/;"	m	class:DeltaTest
-city	mongoengine/tests/document/dynamic.py	/^            city = StringField()$/;"	v	class:DynamicTest.test_dynamic_and_embedded.Address
-city	mongoengine/tests/document/dynamic.py	/^            city = StringField()$/;"	v	class:DynamicTest.test_dynamic_and_embedded_dict_access.Address
-city	mongoengine/tests/document/dynamic.py	/^            city = StringField()$/;"	v	class:DynamicTest.test_dynamic_embedded_works_with_only.Address
-city	mongoengine/tests/fields/fields.py	/^            city = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_is_none.Person
-city	mongoengine/tests/queryset/queryset.py	/^            city = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_null_values.Person
-city	mongoengine/tests/queryset/queryset.py	/^            city = StringField()$/;"	v	class:QuerySetTest.test_scalar_embedded.Locale
-city	tests/fields/fields.py	/^            city = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_is_none.Person
-city_id	mongoengine/tests/document/inheritance.py	/^            city_id = IntField(primary_key=True)$/;"	v	class:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class.City
-clean	mongoengine/mongoengine/base/document.py	/^    def clean(self):$/;"	m	class:BaseDocument
-clean	mongoengine/tests/document/instance.py	/^            def clean(self):$/;"	m	class:InstanceTest.test_document_clean.TestDocument
-clean	mongoengine/tests/document/instance.py	/^            def clean(self):$/;"	m	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
-clear	mongoengine/mongoengine/base/datastructures.py	/^    def clear(self, *args, **kwargs):$/;"	m	class:BaseDict
-clone	mongoengine/mongoengine/queryset/base.py	/^    def clone(self):$/;"	m	class:BaseQuerySet
-close	mongoengine/fields.py	/^    def close(self):$/;"	m	class:GridFSProxy
-close	mongoengine/mongoengine/fields.py	/^    def close(self):$/;"	m	class:GridFSProxy
-collaborators	mongoengine/tests/queryset/queryset.py	/^            collaborators = EmbeddedDocumentField(Collaborator)$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Site
-collaborators	mongoengine/tests/queryset/queryset.py	/^            collaborators = ListField(EmbeddedDocumentField(Collaborator))$/;"	v	class:QuerySetTest.test_pull_nested.Site
-collaborators	mongoengine/tests/queryset/queryset.py	/^            collaborators = MapField($/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
-collection_name	mongoengine/tests/fields/file_tests.py	/^                                 collection_name="macumba")$/;"	v	class:FileTest.test_file_multidb.TestFile
-color	mongoengine/tests/fields/fields.py	/^            color = StringField(max_length=1, choices=COLORS)$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
-color	mongoengine/tests/queryset/queryset.py	/^            color = StringField()$/;"	v	class:QuerySetTest.test_elem_match.Foo
-color	tests/fields/fields.py	/^            color = StringField(max_length=1, choices=COLORS)$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
-comment	mongoengine/mongoengine/queryset/base.py	/^    def comment(self, text):$/;"	m	class:BaseQuerySet
-comment	mongoengine/tests/document/instance.py	/^            comment = StringField()$/;"	v	class:InstanceTest.test_list_search_by_embedded.Comment
-comment	mongoengine/tests/document/instance.py	/^            comment = StringField()$/;"	v	class:InstanceTest.test_mixin_inheritance.DoubleMixIn
-comment	mongoengine/tests/queryset/queryset.py	/^            comment = ReferenceField(Comment)$/;"	v	class:QuerySetTest.test_unset_reference.Post
-comment1	mongoengine/tests/queryset/queryset.py	/^            comment1 = Comment(name='testa')$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-comment2	mongoengine/tests/queryset/queryset.py	/^            comment2 = Comment(name='testb')$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-comment_id	mongoengine/tests/document/indexes.py	/^            comment_id = IntField(required=True)$/;"	v	class:IndexesTest.test_index_with_pk.Comment
-comments	mongoengine/docs/code/tumblelog.py	/^    comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:Post
-comments	mongoengine/tests/document/indexes.py	/^                comments = EmbeddedDocumentField(Comment)$/;"	v	class:IndexesTest.test_index_with_pk.Comment.BlogPost
-comments	mongoengine/tests/document/instance.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:InstanceTest.test_list_search_by_embedded.Page
-comments	mongoengine/tests/document/instance.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:InstanceTest.test_save_list.BlogPost
-comments	mongoengine/tests/document/instance.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:InstanceTest.test_save_only_changed_fields_recursive.User
-comments	mongoengine/tests/fields/fields.py	/^             comments=[Comment(content="NoSQL Rocks"),$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
-comments	mongoengine/tests/fields/fields.py	/^            comments = EmbeddedDocumentListField(Comments)$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.BlogPost
-comments	mongoengine/tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents.BlogPost
-comments	mongoengine/tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.BlogPost
-comments	mongoengine/tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents_invalid.BlogPost
-comments	mongoengine/tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
-comments	mongoengine/tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_list_validation.BlogPost
-comments	mongoengine/tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_recursive_validation.Post
-comments	mongoengine/tests/fields/fields.py	/^            comments = SortedListField(EmbeddedDocumentField(Comment),$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
-comments	mongoengine/tests/queryset/field_list.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:OnlyExcludeAllTest.test_exclude.BlogPost
-comments	mongoengine/tests/queryset/field_list.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.BlogPost
-comments	mongoengine/tests/queryset/queryset.py	/^             comments=[comm1, comm2]).save()$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Post
-comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField("Comment"))$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Post
-comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_bulk_insert.Post
-comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_find_array_position.Post
-comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_update_array_position.Post
-comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_update_using_positional_operator.BlogPost
-comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.BlogPost
-comments	mongoengine/tests/queryset/queryset.py	/^            comments = ListField(EmbeddedDocumentField(Comment),$/;"	v	class:QuerySetTest.test_exec_js_field_sub.BlogPost
-comments	mongoengine/tests/queryset/transform.py	/^            comments = ListField(EmbeddedDocumentField(Comment),$/;"	v	class:TransformTest.test_query_field_name.BlogPost
-comments	mongoengine/tests/test_dereference.py	/^            comments = ListField(ReferenceField(Comment))$/;"	v	class:FieldTest.test_list_lookup_not_checked_in_map.Message
-comments	tests/fields/fields.py	/^             comments=[Comment(content="NoSQL Rocks"),$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
-comments	tests/fields/fields.py	/^            comments = EmbeddedDocumentListField(Comments)$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.BlogPost
-comments	tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents.BlogPost
-comments	tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.BlogPost
-comments	tests/fields/fields.py	/^            comments = ListField($/;"	v	class:FieldTest.test_choices_validation_documents_invalid.BlogPost
-comments	tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
-comments	tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_list_validation.BlogPost
-comments	tests/fields/fields.py	/^            comments = ListField(EmbeddedDocumentField(Comment))$/;"	v	class:FieldTest.test_recursive_validation.Post
-comments	tests/fields/fields.py	/^            comments = SortedListField(EmbeddedDocumentField(Comment),$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
-comments_dict	mongoengine/tests/document/instance.py	/^            comments_dict = DictField()$/;"	v	class:InstanceTest.test_save_only_changed_fields_recursive.User
-comp_dt_fld	mongoengine/tests/fields/fields.py	/^            comp_dt_fld = ComplexDateTimeField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-comp_dt_fld	mongoengine/tests/fields/fields.py	/^            comp_dt_fld = ComplexDateTimeField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
-comp_dt_fld	tests/fields/fields.py	/^            comp_dt_fld = ComplexDateTimeField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-comp_dt_fld	tests/fields/fields.py	/^            comp_dt_fld = ComplexDateTimeField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
-company	mongoengine/tests/fields/fields.py	/^            company = ReferenceField('Company')$/;"	v	class:FieldTest.test_undefined_reference.Product
-company	tests/fields/fields.py	/^            company = ReferenceField('Company')$/;"	v	class:FieldTest.test_undefined_reference.Product
-compare_indexes	mongoengine/mongoengine/document.py	/^    def compare_indexes(cls):$/;"	m	class:Document
-complex_datetime_field	mongoengine/tests/document/instance.py	/^            complex_datetime_field = ComplexDateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-complex_datetime_field	mongoengine/tests/document/json_serialisation.py	/^            complex_datetime_field = ComplexDateTimeField(default=datetime.now)$/;"	v	class:TestJson.test_json_complex.Doc
-complex_datetime_field	mongoengine/tests/queryset/queryset.py	/^            complex_datetime_field = ComplexDateTimeField(default=datetime.datetime.now)$/;"	v	class:QuerySetTest.test_json_complex.Doc
-connect	mongoengine/mongoengine/connection.py	/^def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):$/;"	f
-content	mongoengine/docs/code/tumblelog.py	/^    content = StringField()$/;"	v	class:Comment
-content	mongoengine/docs/code/tumblelog.py	/^    content = StringField()$/;"	v	class:TextPost
-content	mongoengine/tests/document/dynamic.py	/^            content = URLField()$/;"	v	class:DynamicTest.test_complex_embedded_document_validation.Embedded
-content	mongoengine/tests/document/inheritance.py	/^            content = StringField()$/;"	v	class:InheritanceTest.test_allow_inheritance_embedded_document.Comment
-content	mongoengine/tests/document/instance.py	/^                content = StringField()$/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_embedded_document.Comment
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify.BlogPost
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify_complex_field.BlogPost
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_recurs.BlogPost
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.BlogPost
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_deny.BlogPost
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_document_inheritance.BlogPost
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_save_list.BlogPost
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_save_list.Comment
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_save_reference.BlogPost
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_two_way_reverse_delete_rule.Bar
-content	mongoengine/tests/document/instance.py	/^            content = StringField()$/;"	v	class:InstanceTest.test_two_way_reverse_delete_rule.Foo
-content	mongoengine/tests/document/validation.py	/^            content = StringField(required=True)$/;"	v	class:ValidatorErrorTest.test_embedded_document_validation.Comment
-content	mongoengine/tests/fields/fields.py	/^            content = ListField(StringField())$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Group
-content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.BlogPost
-content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_embedded_document_validation.Comment
-content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_list_validation.BlogPost
-content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_list_validation.Comment
-content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_reference_validation.BlogPost
-content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
-content	mongoengine/tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_sorted_list_sorting.Comment
-content	mongoengine/tests/fields/fields.py	/^            content = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_sequence_field.Comment
-content	mongoengine/tests/fields/fields.py	/^            content = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Comment
-content	mongoengine/tests/queryset/field_list.py	/^            content = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.BlogPost
-content	mongoengine/tests/queryset/field_list.py	/^            content = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Attachment
-content	mongoengine/tests/queryset/field_list.py	/^            content = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^             content="Com o brasil nas quartas de finais teremos um "$/;"	v	class:QuerySetTest.test_text_indexes.News
-content	mongoengine/tests/queryset/queryset.py	/^             content="O Brasil sofre com a perda de Neymar").save()$/;"	v	class:QuerySetTest.test_text_indexes.News
-content	mongoengine/tests/queryset/queryset.py	/^             content=u"A candidata dilma roussef já começa o teu planejamento",$/;"	v	class:QuerySetTest.test_text_indexes.News
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_delete_with_limit_handles_delete_rules.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_find_embedded.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_find_empty_embedded.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_in_operator_on_non_iterable.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reference_field_find.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reference_field_find_dbref.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents.BlogPost
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_text_indexes.News
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField()$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Comment
-content	mongoengine/tests/queryset/queryset.py	/^            content = StringField(db_field='body')$/;"	v	class:QuerySetTest.test_exec_js_field_sub.Comment
-content	mongoengine/tests/queryset/queryset.py	/^            content='Had a good coffee today...'$/;"	v	class:QuerySetTest.test_find_embedded.BlogPost
-content	mongoengine/tests/queryset/transform.py	/^            content = StringField(db_field='commentContent')$/;"	v	class:TransformTest.test_query_field_name.Comment
-content	mongoengine/tests/test_signals.py	/^            content = StringField()$/;"	v	class:SignalTests.setUp.Post
-content	tests/fields/fields.py	/^            content = ListField(StringField())$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Group
-content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.BlogPost
-content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_embedded_document_validation.Comment
-content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_list_validation.BlogPost
-content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_list_validation.Comment
-content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_reference_validation.BlogPost
-content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
-content	tests/fields/fields.py	/^            content = StringField()$/;"	v	class:FieldTest.test_sorted_list_sorting.Comment
-content	tests/fields/fields.py	/^            content = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_sequence_field.Comment
-content	tests/fields/fields.py	/^            content = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Comment
-content_type	mongoengine/tests/fields/fields.py	/^            content_type = StringField()$/;"	v	class:FieldTest.test_binary_fields.Attachment
-content_type	mongoengine/tests/queryset/field_list.py	/^            content_type = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
-content_type	mongoengine/tests/queryset/field_list.py	/^            content_type = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
-content_type	tests/fields/fields.py	/^            content_type = StringField()$/;"	v	class:FieldTest.test_binary_fields.Attachment
-continent	mongoengine/tests/document/inheritance.py	/^            continent = StringField()$/;"	v	class:InheritanceTest.test_abstract_document_creation_does_not_fail.City
-continent	mongoengine/tests/document/inheritance.py	/^            continent = StringField()$/;"	v	class:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly.City
-continent	mongoengine/tests/document/inheritance.py	/^            continent = StringField()$/;"	v	class:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class.City
-continent	mongoengine/tests/document/inheritance.py	/^            continent = StringField()$/;"	v	class:InheritanceTest.test_auto_id_vs_non_pk_id_field.City
-continent	mongoengine/tests/queryset/queryset.py	/^            continent = EmbeddedDocumentField(Continent)$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Country
-continent_name	mongoengine/tests/queryset/queryset.py	/^            continent_name = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Continent
-copyright	mongoengine/docs/conf.py	/^copyright = u'2009, MongoEngine Authors'$/;"	v
-count	mongoengine/mongoengine/base/datastructures.py	/^    def count(self):$/;"	m	class:EmbeddedDocumentList
-count	mongoengine/mongoengine/queryset/base.py	/^    def count(self, with_limit_and_skip=False):$/;"	m	class:BaseQuerySet
-count	mongoengine/mongoengine/queryset/queryset.py	/^    def count(self, with_limit_and_skip=False):$/;"	m	class:QuerySet
-count	mongoengine/tests/document/instance.py	/^            count = IntField()$/;"	v	class:InstanceTest.test_mixin_inheritance.BaseMixIn
-count	mongoengine/tests/document/instance.py	/^            count = IntField()$/;"	v	class:InstanceTest.test_save_to_a_value_that_equates_to_false.Thing
-count	mongoengine/tests/document/instance.py	/^            count = IntField(default=0)$/;"	v	class:InstanceTest.test_save_atomicity_condition.Widget
-count	mongoengine/tests/document/instance.py	/^            count = IntField(default=1)$/;"	v	class:InstanceTest.test_invalid_son.Word
-count	mongoengine/tests/fields/fields.py	/^            count = IntField()$/;"	v	class:FieldTest.test_reverse_list_sorting.Category
-count	tests/fields/fields.py	/^            count = IntField()$/;"	v	class:FieldTest.test_reverse_list_sorting.Category
-counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
-counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
-counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Bar
-counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Foo
-counter	mongoengine/tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_sequence_fields_reload.Animal
-counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
-counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
-counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Bar
-counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Foo
-counter	tests/fields/fields.py	/^            counter = SequenceField()$/;"	v	class:FieldTest.test_sequence_fields_reload.Animal
-country	mongoengine/tests/queryset/queryset.py	/^            country = EmbeddedDocumentField(Country)$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Author
-country	mongoengine/tests/queryset/queryset.py	/^            country = StringField()$/;"	v	class:QuerySetTest.test_scalar_embedded.Locale
-country_name	mongoengine/tests/queryset/queryset.py	/^            country_name = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Country
-create	mongoengine/mongoengine/base/datastructures.py	/^    def create(cls, allowed_keys):$/;"	m	class:StrictDict
-create	mongoengine/mongoengine/base/datastructures.py	/^    def create(self, **values):$/;"	m	class:EmbeddedDocumentList
-create	mongoengine/mongoengine/queryset/base.py	/^    def create(self, **kwargs):$/;"	m	class:BaseQuerySet
-create_author	mongoengine/tests/test_signals.py	/^        def create_author():$/;"	f	function:SignalTests.test_model_signals
-create_index	mongoengine/mongoengine/document.py	/^    def create_index(cls, keys, background=False, **kwargs):$/;"	m	class:Document
-created	mongoengine/tests/document/indexes.py	/^            created = DateTimeField(default=datetime.now)$/;"	v	class:IndexesTest.test_ttl_indexes.Log
-created	mongoengine/tests/document/instance.py	/^            created = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_reference_inheritance.Stats
-created	mongoengine/tests/fields/fields.py	/^                        created=datetime.datetime(2014, 6, 12))$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-created	mongoengine/tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
-created	mongoengine/tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
-created	mongoengine/tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-created	mongoengine/tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
-created	tests/fields/fields.py	/^                        created=datetime.datetime(2014, 6, 12))$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-created	tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
-created	tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
-created	tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-created	tests/fields/fields.py	/^            created = DateTimeField(default=datetime.datetime.utcnow)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
-created_on	mongoengine/tests/document/instance.py	/^            created_on = DateTimeField(default=lambda: datetime.utcnow())$/;"	v	class:InstanceTest.test_default_values.Person
-created_user	mongoengine/tests/queryset/visitor.py	/^            created_user = ReferenceField(User)$/;"	v	class:QTest.test_q_with_dbref.Post
-creation_counter	mongoengine/mongoengine/base/fields.py	/^    creation_counter = 0$/;"	v	class:BaseField
-current	mongoengine/tests/document/indexes.py	/^            current = DictField(field=EmbeddedDocumentField('EmbeddedLocation'))$/;"	v	class:IndexesTest.test_explicit_geo2d_index_embedded.Place
-cursor_args_fields	mongoengine/tests/queryset/queryset.py	/^            cursor_args_fields = cursor_args['fields']$/;"	v	class:QuerySetTest.test_text_indexes.News
-cursor_args_fields	mongoengine/tests/queryset/queryset.py	/^            cursor_args_fields = cursor_args['projection']$/;"	v	class:QuerySetTest.test_text_indexes.News
-cust_id	mongoengine/tests/document/indexes.py	/^            cust_id = IntField(unique=True, required=True)$/;"	v	class:IndexesTest.test_unique_and_indexes.Customer
-custom	mongoengine/tests/document/class_methods.py	/^            custom = DictField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithCustomField
-d	mongoengine/tests/document/indexes.py	/^            d = StringField()$/;"	v	class:IndexesTest.test_index_no_cls.B
-d	mongoengine/tests/fields/fields.py	/^            d = datetime.datetime(i, 1, 1, 0, 0, 1)$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-d	mongoengine/tests/fields/fields.py	/^            d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-d	mongoengine/tests/queryset/field_list.py	/^            d = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
-d	mongoengine/tests/queryset/field_list.py	/^            d = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
-d	tests/fields/fields.py	/^            d = datetime.datetime(i, 1, 1, 0, 0, 1)$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-d	tests/fields/fields.py	/^            d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-d1	mongoengine/tests/fields/fields.py	/^            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)$/;"	v	class:FieldTest.test_datetime.LogEntry
-d1	mongoengine/tests/fields/fields.py	/^            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, i)$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-d1	tests/fields/fields.py	/^            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)$/;"	v	class:FieldTest.test_datetime.LogEntry
-d1	tests/fields/fields.py	/^            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, i)$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-d2	mongoengine/tests/fields/fields.py	/^            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)$/;"	v	class:FieldTest.test_datetime.LogEntry
-d2	tests/fields/fields.py	/^            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)$/;"	v	class:FieldTest.test_datetime.LogEntry
-data	mongoengine/tests/document/instance.py	/^            data = StringField()$/;"	v	class:InstanceTest.test_mixin_inheritance.BaseMixIn
-data	mongoengine/tests/fields/fields.py	/^            data = DictField()$/;"	v	class:FieldTest.test_ensure_unique_default_instances.D
-data	mongoengine/tests/queryset/queryset.py	/^            data = EmbeddedDocumentField(Data, required=True)$/;"	v	class:QuerySetTest.test_item_frequencies_with_null_embedded.Person
-data	tests/fields/fields.py	/^            data = DictField()$/;"	v	class:FieldTest.test_ensure_unique_default_instances.D
-data2	mongoengine/tests/fields/fields.py	/^            data2 = DictField(default=lambda: {})$/;"	v	class:FieldTest.test_ensure_unique_default_instances.D
-data2	tests/fields/fields.py	/^            data2 = DictField(default=lambda: {})$/;"	v	class:FieldTest.test_ensure_unique_default_instances.D
-date	mongoengine/tests/document/indexes.py	/^            date = DateTimeField(db_field='addDate', default=datetime.now)$/;"	v	class:IndexesTest._index_test.BlogPost
-date	mongoengine/tests/document/indexes.py	/^            date = DateTimeField(db_field='addDate', default=datetime.now)$/;"	v	class:IndexesTest._index_test_inheritance.BlogPost
-date	mongoengine/tests/document/indexes.py	/^            date = DateTimeField(db_field='addDate', default=datetime.now)$/;"	v	class:IndexesTest.test_dictionary_indexes.BlogPost
-date	mongoengine/tests/document/indexes.py	/^            date = EmbeddedDocumentField(Date)$/;"	v	class:IndexesTest.test_embedded_document_index.BlogPost
-date	mongoengine/tests/document/indexes.py	/^            date = EmbeddedDocumentField(Date)$/;"	v	class:IndexesTest.test_unique_with.BlogPost
-date	mongoengine/tests/document/instance.py	/^            date = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_capped_collection.Log
-date	mongoengine/tests/document/instance.py	/^            date = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_capped_collection_default.Log
-date	mongoengine/tests/document/instance.py	/^            date = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_capped_collection_no_max_size_problems.Log
-date	mongoengine/tests/document/validation.py	/^            date = DateTimeField()$/;"	v	class:ValidatorErrorTest.test_embedded_document_validation.Comment
-date	mongoengine/tests/fields/fields.py	/^                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date	mongoengine/tests/fields/fields.py	/^            date = ComplexDateTimeField()$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-date	mongoengine/tests/fields/fields.py	/^            date = ComplexDateTimeField()$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date	mongoengine/tests/fields/fields.py	/^            date = DateTimeField()$/;"	v	class:FieldTest.test_datetime.LogEntry
-date	mongoengine/tests/fields/fields.py	/^            date = DateTimeField()$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-date	mongoengine/tests/fixtures.py	/^    date = DateTimeField(default=datetime.now)$/;"	v	class:PickleDynamicEmbedded
-date	mongoengine/tests/fixtures.py	/^    date = DateTimeField(default=datetime.now)$/;"	v	class:PickleEmbedded
-date	mongoengine/tests/queryset/geo.py	/^            date = DateTimeField()$/;"	v	class:GeoQueriesTest._create_event_data.Event
-date	mongoengine/tests/queryset/geo.py	/^            date=datetime.datetime.now() - datetime.timedelta(days=1),$/;"	v	class:GeoQueriesTest._create_event_data.Event
-date	mongoengine/tests/queryset/geo.py	/^            date=datetime.datetime.now() - datetime.timedelta(days=10),$/;"	v	class:GeoQueriesTest._create_event_data.Event
-date	mongoengine/tests/queryset/geo.py	/^            date=datetime.datetime.now(),$/;"	v	class:GeoQueriesTest._create_event_data.Event
-date	mongoengine/tests/queryset/queryset.py	/^            date = DateTimeField(default=datetime.datetime.now)$/;"	v	class:QuerySetTest.test_custom_manager.BlogPost
-date	tests/fields/fields.py	/^                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date	tests/fields/fields.py	/^            date = ComplexDateTimeField()$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-date	tests/fields/fields.py	/^            date = ComplexDateTimeField()$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date	tests/fields/fields.py	/^            date = DateTimeField()$/;"	v	class:FieldTest.test_datetime.LogEntry
-date	tests/fields/fields.py	/^            date = DateTimeField()$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-date__gte	mongoengine/tests/fields/fields.py	/^            date__gte=datetime.datetime(1975, 1, 1),$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-date__gte	mongoengine/tests/fields/fields.py	/^            date__gte=datetime.datetime(2000, 1, 1),$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date__gte	tests/fields/fields.py	/^            date__gte=datetime.datetime(1975, 1, 1),$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-date__gte	tests/fields/fields.py	/^            date__gte=datetime.datetime(2000, 1, 1),$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date__lte	mongoengine/tests/fields/fields.py	/^            date__lte=datetime.datetime(1980, 1, 1),$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-date__lte	mongoengine/tests/fields/fields.py	/^            date__lte=datetime.datetime(2011, 1, 1),$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date__lte	mongoengine/tests/fields/fields.py	/^            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date__lte	tests/fields/fields.py	/^            date__lte=datetime.datetime(1980, 1, 1),$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-date__lte	tests/fields/fields.py	/^            date__lte=datetime.datetime(2011, 1, 1),$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date__lte	tests/fields/fields.py	/^            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-date_with_dots	mongoengine/tests/fields/fields.py	/^            date_with_dots = ComplexDateTimeField(separator='.')$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-date_with_dots	tests/fields/fields.py	/^            date_with_dots = ComplexDateTimeField(separator='.')$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-datetime	mongoengine/tests/fields/geo.py	/^            datetime = DateTimeField()$/;"	v	class:GeoFieldTest.test_geo_indexes_auto_index.Log
-datetime_field	mongoengine/tests/document/instance.py	/^            datetime_field = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-datetime_field	mongoengine/tests/document/json_serialisation.py	/^            datetime_field = DateTimeField(default=datetime.now)$/;"	v	class:TestJson.test_json_complex.Doc
-datetime_field	mongoengine/tests/queryset/queryset.py	/^            datetime_field = DateTimeField(default=datetime.datetime.now)$/;"	v	class:QuerySetTest.test_json_complex.Doc
-dateutil	mongoengine/fields.py	/^    dateutil = None$/;"	v
-dateutil	mongoengine/mongoengine/fields.py	/^    dateutil = None$/;"	v
-dateutil	mongoengine/tests/fields/fields.py	/^    dateutil = None$/;"	v
-dateutil	tests/fields/fields.py	/^    dateutil = None$/;"	v
-db_field	mongoengine/tests/document/delta.py	/^                                    db_field='db_embedded_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
-db_field	mongoengine/tests/document/instance.py	/^                                          db_field='rank')$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Person
-db_field	mongoengine/tests/document/instance.py	/^                                      db_field="page_log_message",$/;"	v	class:InstanceTest.test_embedded_update_db_field.Page
-db_field	mongoengine/tests/fields/fields.py	/^                              db_field='x')$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Test
-db_field	mongoengine/tests/fields/fields.py	/^                db_field="t",$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-db_field	mongoengine/tests/queryset/queryset.py	/^                                 db_field='cmnts')$/;"	v	class:QuerySetTest.test_exec_js_field_sub.BlogPost
-db_field	mongoengine/tests/queryset/transform.py	/^                                 db_field='postComments')$/;"	v	class:TransformTest.test_query_field_name.BlogPost
-db_field	tests/fields/fields.py	/^                              db_field='x')$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Test
-db_field	tests/fields/fields.py	/^                db_field="t",$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-db_ops_tracker	mongoengine/tests/queryset/queryset.py	/^class db_ops_tracker(query_counter):$/;"	c
-decimal_field	mongoengine/tests/document/instance.py	/^            decimal_field = DecimalField(default=1.0)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-decimal_field	mongoengine/tests/document/json_serialisation.py	/^            decimal_field = DecimalField(default=1.0)$/;"	v	class:TestJson.test_json_complex.Doc
-decimal_field	mongoengine/tests/queryset/queryset.py	/^            decimal_field = DecimalField(default=1.0)$/;"	v	class:QuerySetTest.test_json_complex.Doc
-default	mongoengine/mongoengine/queryset/manager.py	/^    default = QuerySet$/;"	v	class:QuerySetManager
-default	mongoengine/tests/document/instance.py	/^                                                default=lambda: [1, 2, 3])$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-default	mongoengine/tests/document/instance.py	/^                default=lambda: EmbeddedDoc())$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-default	mongoengine/tests/document/instance.py	/^                default=lambda: Simple().save())$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-default	mongoengine/tests/document/json_serialisation.py	/^                                                default=lambda: [1, 2, 3])$/;"	v	class:TestJson.test_json_complex.Doc
-default	mongoengine/tests/document/json_serialisation.py	/^                                            default=lambda: Simple().save())$/;"	v	class:TestJson.test_json_complex.Doc
-default	mongoengine/tests/document/json_serialisation.py	/^                                        default=lambda: EmbeddedDoc())$/;"	v	class:TestJson.test_json_complex.Doc
-default	mongoengine/tests/fields/fields.py	/^                                default='Small')$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-default	mongoengine/tests/queryset/queryset.py	/^                                                default=lambda: [1, 2, 3])$/;"	v	class:QuerySetTest.test_json_complex.Doc
-default	mongoengine/tests/queryset/queryset.py	/^                default=lambda: EmbeddedDoc())$/;"	v	class:QuerySetTest.test_json_complex.Doc
-default	mongoengine/tests/queryset/queryset.py	/^                default=lambda: Simple().save())$/;"	v	class:QuerySetTest.test_json_complex.Doc
-default	tests/fields/fields.py	/^                                default='Small')$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-delete	mongoengine/fields.py	/^    def delete(self):$/;"	m	class:GridFSProxy
-delete	mongoengine/fields.py	/^    def delete(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
-delete	mongoengine/mongoengine/base/datastructures.py	/^    def delete(self):$/;"	m	class:EmbeddedDocumentList
-delete	mongoengine/mongoengine/document.py	/^    def delete(self, signal_kwargs=None, **write_concern):$/;"	m	class:Document
-delete	mongoengine/mongoengine/fields.py	/^    def delete(self):$/;"	m	class:GridFSProxy
-delete	mongoengine/mongoengine/fields.py	/^    def delete(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
-delete	mongoengine/mongoengine/queryset/base.py	/^    def delete(self, write_concern=None, _from_doc_delete=False,$/;"	m	class:BaseQuerySet
-deleted	mongoengine/tests/queryset/queryset.py	/^            deleted = BooleanField(default=False)$/;"	v	class:QuerySetTest.test_custom_manager.BlogPost
-delta	mongoengine/tests/document/delta.py	/^    def delta(self, DocClass):$/;"	m	class:DeltaTest
-delta_db_field	mongoengine/tests/document/delta.py	/^    def delta_db_field(self, DocClass):$/;"	m	class:DeltaTest
-delta_recursive	mongoengine/tests/document/delta.py	/^    def delta_recursive(self, DocClass, EmbeddedClass):$/;"	m	class:DeltaTest
-delta_recursive_db_field	mongoengine/tests/document/delta.py	/^    def delta_recursive_db_field(self, DocClass, EmbeddedClass):$/;"	m	class:DeltaTest
-dereference	mongoengine/fields.py	/^    def dereference(self, value):$/;"	m	class:GenericReferenceField
-dereference	mongoengine/mongoengine/fields.py	/^    def dereference(self, value):$/;"	m	class:GenericReferenceField
-description	mongoengine/tests/document/class_methods.py	/^            description = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
-description	mongoengine/tests/document/class_methods.py	/^            description = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPost
-description	mongoengine/tests/document/class_methods.py	/^            description = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPost
-description	mongoengine/tests/document/class_methods.py	/^            description = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPost
-description	mongoengine/tests/document/indexes.py	/^            description = StringField()$/;"	v	class:IndexesTest.test_inherited_index.B
-description	mongoengine/tests/document/indexes.py	/^            description = StringField(required=True)$/;"	v	class:IndexesTest.test_index_on_id.BlogPost
-description	mongoengine/tests/fields/fields.py	/^            description = StringField()$/;"	v	class:FieldTest.test_map_field_unicode.Info
-description	mongoengine/tests/queryset/queryset.py	/^            description = StringField(max_length=50)$/;"	v	class:QuerySetTest.test_add_to_set_each.Item
-description	tests/fields/fields.py	/^            description = StringField()$/;"	v	class:FieldTest.test_map_field_unicode.Info
-details	mongoengine/tests/document/instance.py	/^            details = EmbeddedDocumentField(EmployeeDetails)$/;"	v	class:InstanceTest.test_save_embedded_document.Employee
-details	mongoengine/tests/document/instance.py	/^            details = EmbeddedDocumentField(EmployeeDetails)$/;"	v	class:InstanceTest.test_updating_an_embedded_document.Employee
-df	mongoengine/tests/queryset/transform.py	/^            df = DynamicField()$/;"	v	class:TransformTest.test_type.Doc
-dictField	mongoengine/tests/queryset/transform.py	/^            dictField = DictField()$/;"	v	class:TransformTest.test_transform_update.DicDoc
-dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField()$/;"	v	class:DeltaTest.delta.Doc
-dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField()$/;"	v	class:DeltaTest.delta_recursive.Doc
-dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
-dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField(db_field='db_dict_field')$/;"	v	class:DeltaTest.delta_db_field.Doc
-dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField(db_field='db_dict_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
-dict_field	mongoengine/tests/document/delta.py	/^            dict_field = DictField(db_field='db_dict_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Embedded
-dict_field	mongoengine/tests/document/instance.py	/^            dict_field = DictField()$/;"	v	class:InstanceTest.test_reload_referencing.Doc
-dict_field	mongoengine/tests/document/instance.py	/^            dict_field = DictField()$/;"	v	class:InstanceTest.test_reload_referencing.Embedded
-dict_field	mongoengine/tests/document/instance.py	/^            dict_field = DictField(default=lambda: {"hello": "world"})$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-dict_field	mongoengine/tests/document/json_serialisation.py	/^            dict_field = DictField(default=lambda: {"hello": "world"})$/;"	v	class:TestJson.test_json_complex.Doc
-dict_field	mongoengine/tests/queryset/queryset.py	/^            dict_field = DictField(default=lambda: {"hello": "world"})$/;"	v	class:QuerySetTest.test_json_complex.Doc
-dictionary	mongoengine/tests/fields/fields.py	/^            dictionary = DictField(required=True)$/;"	v	class:FieldTest.test_invalid_dict_value.DictFieldTest
-dictionary	tests/fields/fields.py	/^            dictionary = DictField(required=True)$/;"	v	class:FieldTest.test_invalid_dict_value.DictFieldTest
-direct	mongoengine/tests/fields/fields.py	/^            direct = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.EmbeddedOcurrence
-direct	mongoengine/tests/fields/fields.py	/^            direct = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
-direct	mongoengine/tests/fields/fields.py	/^            direct = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.EmbeddedOcurrence
-direct	mongoengine/tests/fields/fields.py	/^            direct = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
-direct	tests/fields/fields.py	/^            direct = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.EmbeddedOcurrence
-direct	tests/fields/fields.py	/^            direct = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
-direct	tests/fields/fields.py	/^            direct = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.EmbeddedOcurrence
-direct	tests/fields/fields.py	/^            direct = LazyReferenceField(Animal)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
-disconnect	mongoengine/mongoengine/connection.py	/^def disconnect(alias=DEFAULT_CONNECTION_NAME):$/;"	f
-distinct	mongoengine/mongoengine/queryset/base.py	/^    def distinct(self, field):$/;"	m	class:BaseQuerySet
-doc	mongoengine/tests/document/instance.py	/^            doc = EmbeddedDocumentField(Embedded)$/;"	v	class:InstanceTest.test_kwargs_simple.Doc
-doc	mongoengine/tests/document/instance.py	/^            doc = EmbeddedDocumentField(TestEmbeddedDocument)$/;"	v	class:InstanceTest.test_document_embedded_clean.TestDocument
-doc_a	mongoengine/tests/fields/file_tests.py	/^            doc_a = GridDocument()$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
-doc_b	mongoengine/tests/fields/file_tests.py	/^            doc_b = GridDocument.objects.with_id(doc_a.id)$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
-doc_c	mongoengine/tests/fields/file_tests.py	/^            doc_c = GridDocument.objects.with_id(doc_b.id)$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
-doc_d	mongoengine/tests/fields/file_tests.py	/^            doc_d = GridDocument(the_file=six.b(''))$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
-doc_e	mongoengine/tests/fields/file_tests.py	/^            doc_e = GridDocument.objects.with_id(doc_d.id)$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
-doc_f	mongoengine/tests/fields/file_tests.py	/^            doc_f = GridDocument.objects.with_id(doc_e.id)$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
-doc_name	mongoengine/tests/document/instance.py	/^            doc_name = StringField()$/;"	v	class:InstanceTest.test_kwargs_complex.Doc
-doc_name	mongoengine/tests/document/instance.py	/^            doc_name = StringField()$/;"	v	class:InstanceTest.test_kwargs_simple.Doc
-docs	mongoengine/tests/document/instance.py	/^            docs = ListField(EmbeddedDocumentField(Embedded))$/;"	v	class:InstanceTest.test_kwargs_complex.Doc
-doctype	mongoengine/tests/fields/fields.py	/^            doctype = StringField(require=True, default='userdata')$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.User
-doctype	tests/fields/fields.py	/^            doctype = StringField(require=True, default='userdata')$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.User
-document	mongoengine/tests/queryset/queryset.py	/^            document = GenericEmbeddedDocumentField(choices=(A, B))$/;"	v	class:QuerySetTest.test_query_generic_embedded_document.Doc
-document_type	mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:CachedReferenceField
-document_type	mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:EmbeddedDocumentField
-document_type	mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:LazyReferenceField
-document_type	mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:ReferenceField
-document_type	mongoengine/mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:CachedReferenceField
-document_type	mongoengine/mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:EmbeddedDocumentField
-document_type	mongoengine/mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:LazyReferenceField
-document_type	mongoengine/mongoengine/fields.py	/^    def document_type(self):$/;"	m	class:ReferenceField
-down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=105,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=124,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=13,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=17,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=530,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-down_votes	mongoengine/tests/queryset/queryset.py	/^             down_votes=553,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-down_votes	mongoengine/tests/queryset/queryset.py	/^            down_votes = IntField()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-drink	mongoengine/tests/document/inheritance.py	/^            drink = GenericReferenceField()$/;"	v	class:InheritanceTest.test_inherited_collections.Drinker
-drop_collection	mongoengine/mongoengine/document.py	/^    def drop_collection(cls):$/;"	m	class:Document
-dt	mongoengine/tests/fields/fields.py	/^            dt = DateTimeField()$/;"	v	class:FieldTest.test_datetime_from_empty_string.MyDoc
-dt	mongoengine/tests/fields/fields.py	/^            dt = DateTimeField()$/;"	v	class:FieldTest.test_datetime_from_whitespace_string.MyDoc
-dt	tests/fields/fields.py	/^            dt = DateTimeField()$/;"	v	class:FieldTest.test_datetime_from_empty_string.MyDoc
-dt	tests/fields/fields.py	/^            dt = DateTimeField()$/;"	v	class:FieldTest.test_datetime_from_whitespace_string.MyDoc
-dt_f	mongoengine/tests/queryset/queryset.py	/^            dt_f = DateTimeField()$/;"	v	class:QuerySetTest.test_update_validate.Doc
-dt_fld	mongoengine/tests/document/instance.py	/^            dt_fld = DateTimeField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
-dynamic_field	mongoengine/tests/document/instance.py	/^            dynamic_field = DynamicField(default=1)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-dynamic_field	mongoengine/tests/document/json_serialisation.py	/^            dynamic_field = DynamicField(default=1)$/;"	v	class:TestJson.test_json_complex.Doc
-dynamic_field	mongoengine/tests/queryset/queryset.py	/^            dynamic_field = DynamicField(default=1)$/;"	v	class:QuerySetTest.test_json_complex.Doc
-e	mongoengine/tests/document/validation.py	/^            e = EmbeddedDocumentField(SubDoc, db_field='eb')$/;"	v	class:ValidatorErrorTest.test_embedded_db_field_validate.Doc
-e	mongoengine/tests/document/validation.py	/^            e = EmbeddedDocumentField(SubDoc, db_field='eb')$/;"	v	class:ValidatorErrorTest.test_embedded_weakref.Doc
-e	mongoengine/tests/queryset/field_list.py	/^            e = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
-e	mongoengine/tests/queryset/field_list.py	/^            e = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
-ed_f	mongoengine/tests/queryset/queryset.py	/^            ed_f = EmbeddedDocumentField(EmDoc)$/;"	v	class:QuerySetTest.test_update_validate.Doc
-editor	mongoengine/tests/document/instance.py	/^            editor = ReferenceField(Editor)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.BlogPost
-email	mongoengine/docs/code/tumblelog.py	/^    email = StringField(required=True)$/;"	v	class:User
-email	mongoengine/tests/document/instance.py	/^                email = StringField(primary_key=True)$/;"	v	class:InstanceTest.test_custom_id_field.User.EmailUser
-email	mongoengine/tests/document/instance.py	/^            email = EmailField()$/;"	v	class:InstanceTest.test_instance_is_set_on_setattr.Email
-email	mongoengine/tests/document/instance.py	/^            email = EmailField()$/;"	v	class:InstanceTest.test_instance_is_set_on_setattr_on_embedded_document_list.Email
-email	mongoengine/tests/document/instance.py	/^            email = EmailField(required=True)$/;"	v	class:InstanceTest.test_save.Recipient
-email	mongoengine/tests/document/instance.py	/^            email = EmbeddedDocumentField(Email)$/;"	v	class:InstanceTest.test_instance_is_set_on_setattr.Account
-email	mongoengine/tests/document/instance.py	/^            email = StringField()$/;"	v	class:InstanceTest.test_custom_id_field.EmailUser
-email	mongoengine/tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field.User
-email	mongoengine/tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_domain_whitelist.User
-email	mongoengine/tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_ip_domain.User
-email	mongoengine/tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_unicode_user.User
-email	mongoengine/tests/fields/fields.py	/^            email = EmailField(allow_ip_domain=True)$/;"	v	class:FieldTest.test_email_field_ip_domain.User
-email	mongoengine/tests/fields/fields.py	/^            email = EmailField(allow_utf8_user=True)$/;"	v	class:FieldTest.test_email_field_unicode_user.User
-email	mongoengine/tests/fields/fields.py	/^            email = EmailField(domain_whitelist=['localhost'])$/;"	v	class:FieldTest.test_email_field_domain_whitelist.User
-email	mongoengine/tests/fields/fields.py	/^            email = EmailField(regex=r'\\w+@example.com')$/;"	v	class:FieldTest.test_email_field_honors_regex.User
-email	mongoengine/tests/queryset/field_list.py	/^            email = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.User
-email	mongoengine/tests/queryset/field_list.py	/^            email = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.User
-email	mongoengine/tests/queryset/queryset.py	/^            email = EmailField(unique=True, required=True)$/;"	v	class:QuerySetTest.test_as_pymongo_json_limit_fields.User
-email	mongoengine/tests/queryset/visitor.py	/^            email = EmailField(required=False)$/;"	v	class:QTest.test_q_merge_queries_edge_case.User
-email	tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field.User
-email	tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_domain_whitelist.User
-email	tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_ip_domain.User
-email	tests/fields/fields.py	/^            email = EmailField()$/;"	v	class:FieldTest.test_email_field_unicode_user.User
-email	tests/fields/fields.py	/^            email = EmailField(allow_ip_domain=True)$/;"	v	class:FieldTest.test_email_field_ip_domain.User
-email	tests/fields/fields.py	/^            email = EmailField(allow_utf8_user=True)$/;"	v	class:FieldTest.test_email_field_unicode_user.User
-email	tests/fields/fields.py	/^            email = EmailField(domain_whitelist=['localhost'])$/;"	v	class:FieldTest.test_email_field_domain_whitelist.User
-email	tests/fields/fields.py	/^            email = EmailField(regex=r'\\w+@example.com')$/;"	v	class:FieldTest.test_email_field_honors_regex.User
-email_field	mongoengine/tests/document/instance.py	/^            email_field = EmailField(default="ross@example.com")$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-email_field	mongoengine/tests/document/json_serialisation.py	/^            email_field = EmailField(default="ross@example.com")$/;"	v	class:TestJson.test_json_complex.Doc
-email_field	mongoengine/tests/queryset/queryset.py	/^            email_field = EmailField(default="ross@example.com")$/;"	v	class:QuerySetTest.test_json_complex.Doc
-emails	mongoengine/tests/document/instance.py	/^            emails = EmbeddedDocumentListField(Email)$/;"	v	class:InstanceTest.test_instance_is_set_on_setattr_on_embedded_document_list.Account
-embed	mongoengine/tests/queryset/queryset.py	/^            embed = EmbeddedDocumentField(Embed, default=Embed)$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.B
-embed_me	mongoengine/tests/fields/fields.py	/^            embed_me = DynamicField(db_field='e')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
-embed_me	mongoengine/tests/fields/fields.py	/^            embed_me = DynamicField(db_field='e')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
-embed_me	tests/fields/fields.py	/^            embed_me = DynamicField(db_field='e')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
-embed_me	tests/fields/fields.py	/^            embed_me = DynamicField(db_field='e')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
-embed_no_default	mongoengine/tests/queryset/queryset.py	/^            embed_no_default = EmbeddedDocumentField(Embed)$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.B
-embedded	mongoengine/tests/document/json_serialisation.py	/^            embedded = EmbeddedDocumentField(Embedded, db_field='e')$/;"	v	class:TestJson.test_json_names.Doc
-embedded	mongoengine/tests/fields/fields.py	/^            embedded = EmbeddedDocumentField(Embedded, db_field='x')$/;"	v	class:FieldTest.test_embedded_db_field.Test
-embedded	mongoengine/tests/fixtures.py	/^    embedded = EmbeddedDocumentField(PickleEmbedded)$/;"	v	class:NewDocumentPickleTest
-embedded	mongoengine/tests/fixtures.py	/^    embedded = EmbeddedDocumentField(PickleEmbedded)$/;"	v	class:PickleSignalsTest
-embedded	mongoengine/tests/fixtures.py	/^    embedded = EmbeddedDocumentField(PickleEmbedded)$/;"	v	class:PickleTest
-embedded	mongoengine/tests/queryset/field_list.py	/^            embedded = EmbeddedDocumentField(EmbeddedNumber)$/;"	v	class:OnlyExcludeAllTest.test_slicing_nested_fields.Numbers
-embedded	mongoengine/tests/queryset/queryset.py	/^            embedded = EmbeddedDocumentField(SubDoc)$/;"	v	class:QuerySetTest.test_reload_embedded_docs_instance.Doc
-embedded	mongoengine/tests/queryset/queryset.py	/^            embedded = ListField(EmbeddedDocumentField(SubDoc))$/;"	v	class:QuerySetTest.test_reload_list_embedded_docs_instance.Doc
-embedded	tests/fields/fields.py	/^            embedded = EmbeddedDocumentField(Embedded, db_field='x')$/;"	v	class:FieldTest.test_embedded_db_field.Test
-embedded_document_field	mongoengine/tests/document/instance.py	/^            embedded_document_field = EmbeddedDocumentField($/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-embedded_document_field	mongoengine/tests/document/json_serialisation.py	/^            embedded_document_field = EmbeddedDocumentField(EmbeddedDoc,$/;"	v	class:TestJson.test_json_complex.Doc
-embedded_document_field	mongoengine/tests/queryset/queryset.py	/^            embedded_document_field = EmbeddedDocumentField($/;"	v	class:QuerySetTest.test_json_complex.Doc
-embedded_field	mongoengine/tests/document/delta.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:DeltaTest.delta_recursive.Doc
-embedded_field	mongoengine/tests/document/delta.py	/^            embedded_field = EmbeddedDocumentField(Embedded,$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
-embedded_field	mongoengine/tests/document/instance.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:InstanceTest.test_embedded_document_instance.Doc
-embedded_field	mongoengine/tests/document/instance.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:InstanceTest.test_reload_referencing.Doc
-embedded_field	mongoengine/tests/document/instance.py	/^            embedded_field = ListField(EmbeddedDocumentField(Embedded))$/;"	v	class:InstanceTest.test_embedded_document_complex_instance.Doc
-embedded_field	mongoengine/tests/document/instance.py	/^            embedded_field = ListField(EmbeddedDocumentField(Embedded))$/;"	v	class:InstanceTest.test_embedded_document_complex_instance_no_use_db_field.Doc
-embedded_field	mongoengine/tests/document/json_serialisation.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:TestJson.test_json_simple.Doc
-embedded_field	mongoengine/tests/queryset/queryset.py	/^            embedded_field = EmbeddedDocumentField(Embedded)$/;"	v	class:QuerySetTest.test_json_simple.Doc
-employee	mongoengine/tests/document/class_methods.py	/^            employee = ReferenceField(self.Person)$/;"	v	class:ClassMethodsTest.test_register_delete_rule.Job
-employees	mongoengine/tests/document/delta.py	/^            employees = ListField(ReferenceField('Person', dbref=dbref))$/;"	v	class:DeltaTest.circular_reference_deltas_2.Organization
-employees	mongoengine/tests/queryset/queryset.py	/^            employees = ListField(ReferenceField(Person))$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Organization
-employees	mongoengine/tests/test_dereference.py	/^            employees = Employee.objects(boss=bill).select_related()$/;"	v	class:FieldTest.test_recursive_reference.Employee
-employer	mongoengine/tests/document/delta.py	/^            employer = ReferenceField('Organization', dbref=dbref)$/;"	v	class:DeltaTest.circular_reference_deltas_2.Person
-empty	mongoengine/mongoengine/queryset/visitor.py	/^    def empty(self):$/;"	m	class:Q
-empty	mongoengine/mongoengine/queryset/visitor.py	/^    def empty(self):$/;"	m	class:QCombination
-empty	mongoengine/mongoengine/queryset/visitor.py	/^    def empty(self):$/;"	m	class:QNode
-ensure_index	mongoengine/mongoengine/document.py	/^    def ensure_index(cls, key_or_list, drop_dups=False, background=False,$/;"	m	class:Document
-ensure_index	mongoengine/mongoengine/queryset/base.py	/^    def ensure_index(self, **kwargs):$/;"	m	class:BaseQuerySet
-ensure_indexes	mongoengine/mongoengine/document.py	/^    def ensure_indexes(cls):$/;"	m	class:Document
-error	mongoengine/mongoengine/base/fields.py	/^    def error(self, message='', errors=None, field_name=None):$/;"	m	class:BaseField
-error_class	mongoengine/tests/queryset/queryset.py	/^            error_class = ConfigurationError$/;"	v	class:QuerySetTest.test_read_preference.Bar
-error_class	mongoengine/tests/queryset/queryset.py	/^            error_class = TypeError$/;"	v	class:QuerySetTest.test_read_preference.Bar
-error_dict	mongoengine/tests/fields/fields.py	/^            error_dict = error.to_dict()$/;"	v	class:FieldTest.test_recursive_validation.Post
-error_dict	mongoengine/tests/fields/fields.py	/^            error_dict = error.to_dict()$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
-error_dict	tests/fields/fields.py	/^            error_dict = error.to_dict()$/;"	v	class:FieldTest.test_recursive_validation.Post
-error_dict	tests/fields/fields.py	/^            error_dict = error.to_dict()$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
-error_msg	mongoengine/fields.py	/^    error_msg = u'Invalid email address: %s'$/;"	v	class:EmailField
-error_msg	mongoengine/mongoengine/fields.py	/^    error_msg = u'Invalid email address: %s'$/;"	v	class:EmailField
-errors	mongoengine/mongoengine/errors.py	/^    errors = {}$/;"	v	class:ValidationError
-evil	mongoengine/tests/document/inheritance.py	/^                evil = BooleanField(default=True)$/;"	v	class:InheritanceTest.test_abstract_documents.Human.EvilHuman
-exclude	mongoengine/mongoengine/base/datastructures.py	/^    def exclude(self, **kwargs):$/;"	m	class:EmbeddedDocumentList
-exclude	mongoengine/mongoengine/queryset/base.py	/^    def exclude(self, *fields):$/;"	m	class:BaseQuerySet
-exclude_trees	mongoengine/docs/conf.py	/^exclude_trees = ['_build']$/;"	v
-exec_js	mongoengine/mongoengine/queryset/base.py	/^    def exec_js(self, code, *fields, **options):$/;"	m	class:BaseQuerySet
-expand	mongoengine/tests/document/instance.py	/^            def expand(self):$/;"	m	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Node
-expand	mongoengine/tests/document/instance.py	/^            def expand(self):$/;"	m	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Parameter
-expect_msg	mongoengine/tests/document/instance.py	/^            expect_msg = "Draft entries may not have a publication date."$/;"	v	class:InstanceTest.test_document_clean.TestDocument
-expected	mongoengine/tests/fields/geo.py	/^            expected = "Both values (%s) in point must be float or int" % repr(coord)$/;"	v	class:GeoFieldTest.test_geopoint_validation.Location
-expected	mongoengine/tests/fields/geo.py	/^            expected = "Both values (%s) in point must be float or int" % repr(coord)$/;"	v	class:GeoFieldTest.test_point_validation.Location
-expected	mongoengine/tests/fields/geo.py	/^            expected = "Both values (%s) in point must be float or int" % repr(coord[0])$/;"	v	class:GeoFieldTest.test_multipoint_validation.Location
-expected	mongoengine/tests/fields/geo.py	/^            expected = "Invalid LineString:\\nBoth values (%s) in point must be float or int" % repr(coord[0])$/;"	v	class:GeoFieldTest.test_linestring_validation.Location
-expected	mongoengine/tests/fields/geo.py	/^            expected = "Invalid MultiLineString:\\nBoth values (%s) in point must be float or int" % repr(coord[0][0])$/;"	v	class:GeoFieldTest.test_multilinestring_validation.Location
-expected	mongoengine/tests/fields/geo.py	/^            expected = "Value (%s) must be a two-dimensional point" % repr(coord)$/;"	v	class:GeoFieldTest.test_geopoint_validation.Location
-expected	mongoengine/tests/fields/geo.py	/^            expected = "Value (%s) must be a two-dimensional point" % repr(coord)$/;"	v	class:GeoFieldTest.test_point_validation.Location
-expected	mongoengine/tests/fields/geo.py	/^            expected = "Value (%s) must be a two-dimensional point" % repr(coord[0])$/;"	v	class:GeoFieldTest.test_multipoint_validation.Location
-explain	mongoengine/mongoengine/queryset/base.py	/^    def explain(self, format=False):$/;"	m	class:BaseQuerySet
-extend	mongoengine/mongoengine/base/datastructures.py	/^    def extend(self, *args, **kwargs):$/;"	m	class:BaseList
-extensions	mongoengine/docs/conf.py	/^extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo']$/;"	v
-extra	mongoengine/tests/document/instance.py	/^            extra = DictField()$/;"	v	class:InstanceTest.test_db_ref_usage.Book
-extra	mongoengine/tests/queryset/queryset.py	/^            extra = EmbeddedDocumentField(Extra)$/;"	v	class:QuerySetTest.test_item_frequencies_with_null_embedded.Person
-extra_opts	mongoengine/setup.py	/^extra_opts = {$/;"	v
-extra_text	mongoengine/tests/document/class_methods.py	/^            extra_text = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPostWithTagsAndExtraText
-f	mongoengine/tests/queryset/field_list.py	/^            f = ListField()$/;"	v	class:OnlyExcludeAllTest.test_slicing.MyDoc
-f	mongoengine/tests/queryset/field_list.py	/^            f = StringField()$/;"	v	class:OnlyExcludeAllTest.test_mixing_only_exclude.MyDoc
-fake_update	mongoengine/tests/document/instance.py	/^            def fake_update(*args, **kwargs):$/;"	m	class:InstanceTest.test_do_not_save_unchanged_references.Person
-family	mongoengine/tests/document/class_methods.py	/^            family = StringField(required=True)$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Animal
-family	mongoengine/tests/fields/file_tests.py	/^            family = StringField()$/;"	v	class:FileTest.test_complex_field_filefield.Animal
-family	mongoengine/tests/fields/file_tests.py	/^            family = StringField()$/;"	v	class:FileTest.test_file_saving.Animal
-family	mongoengine/tests/queryset/queryset.py	/^            family = ReferenceField(Family)$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-father	mongoengine/tests/document/instance.py	/^                father = ReferenceField('Person', reverse_delete_rule=DENY)$/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Parents
-father	mongoengine/tests/fields/fields.py	/^            father = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-father	mongoengine/tests/fields/fields.py	/^            father = CachedReferenceField('self', fields=('tp',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-father	mongoengine/tests/fields/fields.py	/^            father = CachedReferenceField('self', fields=('tp',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-father	tests/fields/fields.py	/^            father = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-father	tests/fields/fields.py	/^            father = CachedReferenceField('self', fields=('tp',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-father	tests/fields/fields.py	/^            father = CachedReferenceField('self', fields=('tp',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-feed	mongoengine/tests/document/instance.py	/^            feed = Feed.objects.first()$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
-feed	mongoengine/tests/document/instance.py	/^            feed = ReferenceField(Feed)$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
-fetch	mongoengine/mongoengine/base/datastructures.py	/^    def fetch(self, force=False):$/;"	m	class:LazyReference
-field	mongoengine/mongoengine/base/fields.py	/^    field = None$/;"	v	class:ComplexBaseField
-field	mongoengine/tests/document/instance.py	/^                    field=ReferenceField($/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
-field	mongoengine/tests/document/instance.py	/^            field = StringField(required=True)$/;"	v	class:InstanceTest.test_embedded_document_equality.Test
-field	mongoengine/tests/fields/fields.py	/^            field = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.Doc
-field	mongoengine/tests/fields/fields.py	/^            field = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.Doc
-field	mongoengine/tests/queryset/queryset.py	/^            field = IntField()$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.Embed
-field	mongoengine/tests/queryset/queryset.py	/^            field = IntField(default=1)$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.B
-field	tests/fields/fields.py	/^            field = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.Doc
-field	tests/fields/fields.py	/^            field = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.Doc
-field1	mongoengine/tests/document/instance.py	/^            field1 = StringField(default='field1')$/;"	v	class:InstanceTest.test_mutating_documents.B
-field2	mongoengine/tests/document/instance.py	/^            field2 = EmbeddedDocumentField(C, default=lambda: C())$/;"	v	class:InstanceTest.test_mutating_documents.B
-field_1	mongoengine/tests/fields/fields.py	/^            field_1 = StringField(db_field='f')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc2
-field_1	mongoengine/tests/fields/fields.py	/^            field_1 = StringField(db_field='f')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Embed
-field_1	tests/fields/fields.py	/^            field_1 = StringField(db_field='f')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc2
-field_1	tests/fields/fields.py	/^            field_1 = StringField(db_field='f')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Embed
-field_name	mongoengine/mongoengine/errors.py	/^    field_name = None$/;"	v	class:ValidationError
-field_path_sub	mongoengine/mongoengine/queryset/base.py	/^        def field_path_sub(match):$/;"	f	function:BaseQuerySet._sub_js_fields
-field_sub	mongoengine/mongoengine/queryset/base.py	/^        def field_sub(match):$/;"	f	function:BaseQuerySet._sub_js_fields
-field_x	mongoengine/tests/fields/fields.py	/^            field_x = StringField(db_field='x')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
-field_x	mongoengine/tests/fields/fields.py	/^            field_x = StringField(db_field='x')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
-field_x	tests/fields/fields.py	/^            field_x = StringField(db_field='x')$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
-field_x	tests/fields/fields.py	/^            field_x = StringField(db_field='x')$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
-fielda	mongoengine/tests/queryset/queryset.py	/^            fielda = IntField()$/;"	v	class:QuerySetTest.test_where.IntPair
-fieldb	mongoengine/tests/queryset/queryset.py	/^            fieldb = IntField()$/;"	v	class:QuerySetTest.test_where.IntPair
-fields	mongoengine/mongoengine/queryset/base.py	/^    def fields(self, _only_called=False, **kwargs):$/;"	m	class:BaseQuerySet
-fields	mongoengine/tests/fields/fields.py	/^                fields=('group',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
-fields	mongoengine/tests/fields/fields.py	/^                fields=('salary',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
-fields	mongoengine/tests/queryset/queryset.py	/^            fields = DictField()$/;"	v	class:QuerySetTest.test_no_cache.Noddy
-fields	tests/fields/fields.py	/^                fields=('group',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
-fields	tests/fields/fields.py	/^                fields=('salary',))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
-filter	mongoengine/mongoengine/base/datastructures.py	/^    def filter(self, **kwargs):$/;"	m	class:EmbeddedDocumentList
-filter	mongoengine/mongoengine/queryset/base.py	/^    def filter(self, *q_objs, **query):$/;"	m	class:BaseQuerySet
-finalize_f	mongoengine/tests/queryset/queryset.py	/^                                     finalize_f=finalize_f,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-first	mongoengine/mongoengine/base/datastructures.py	/^    def first(self):$/;"	m	class:EmbeddedDocumentList
-first	mongoengine/mongoengine/queryset/base.py	/^    def first(self):$/;"	m	class:BaseQuerySet
-first_name	mongoengine/docs/code/tumblelog.py	/^    first_name = StringField(max_length=50)$/;"	v	class:User
-flip	mongoengine/tests/document/instance.py	/^        def flip(widget):$/;"	f	function:InstanceTest.test_save_atomicity_condition
-float_field	mongoengine/tests/document/instance.py	/^            float_field = FloatField(default=1.1)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-float_field	mongoengine/tests/document/json_serialisation.py	/^            float_field = FloatField(default=1.1)$/;"	v	class:TestJson.test_json_complex.Doc
-float_field	mongoengine/tests/queryset/queryset.py	/^            float_field = FloatField(default=1.1)$/;"	v	class:QuerySetTest.test_json_complex.Doc
-float_fld	mongoengine/tests/fields/fields.py	/^            float_fld = FloatField()$/;"	v	class:FieldTest.test_int_and_float_ne_operator.TestDocument
-float_fld	tests/fields/fields.py	/^            float_fld = FloatField()$/;"	v	class:FieldTest.test_int_and_float_ne_operator.TestDocument
-float_value	mongoengine/tests/fields/fields.py	/^            float_value = DecimalField(precision=4)$/;"	v	class:FieldTest.test_decimal_storage.Person
-float_value	tests/fields/fields.py	/^            float_value = DecimalField(precision=4)$/;"	v	class:FieldTest.test_decimal_storage.Person
-flt_fld	mongoengine/tests/document/instance.py	/^            flt_fld = FloatField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
-flt_fld	mongoengine/tests/fields/fields.py	/^            flt_fld = FloatField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-flt_fld	mongoengine/tests/fields/fields.py	/^            flt_fld = FloatField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
-flt_fld	tests/fields/fields.py	/^            flt_fld = FloatField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-flt_fld	tests/fields/fields.py	/^            flt_fld = FloatField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
-folded_ears	mongoengine/tests/queryset/queryset.py	/^            folded_ears = BooleanField()$/;"	v	class:QuerySetTest.test_subclass_field_query.ScottishCat
-foo	mongoengine/tests/document/instance.py	/^            foo = BooleanField(unique=True)$/;"	v	class:InstanceTest.subclasses_and_unique_keys_works.B
-foo	mongoengine/tests/document/instance.py	/^            foo = EmbeddedDocumentField(Foo)$/;"	v	class:InstanceTest.test_shard_key_in_embedded_document.Bar
-foo	mongoengine/tests/document/instance.py	/^            foo = ListField(StringField())$/;"	v	class:InstanceTest.test_update_list_field.Doc
-foo	mongoengine/tests/document/instance.py	/^            foo = ReferenceField('Foo')$/;"	v	class:InstanceTest.test_two_way_reverse_delete_rule.Bar
-foo	mongoengine/tests/document/instance.py	/^            foo = StringField()$/;"	v	class:InstanceTest.test_can_save_false_values.Doc
-foo	mongoengine/tests/document/instance.py	/^            foo = StringField()$/;"	v	class:InstanceTest.test_can_save_false_values_dynamic.Doc
-foo	mongoengine/tests/document/instance.py	/^            foo = StringField()$/;"	v	class:InstanceTest.test_shard_key_in_embedded_document.Foo
-foo	mongoengine/tests/document/instance.py	/^            foo = StringField(default=None)$/;"	v	class:InstanceTest.test_set_unset_one_operation.FooBar
-foo	mongoengine/tests/fields/fields.py	/^            foo = StringField()$/;"	v	class:FieldTest.test_undefined_field_exception.Doc
-foo	mongoengine/tests/fields/fields.py	/^            foo = StringField()$/;"	v	class:FieldTest.test_undefined_field_exception_with_strict.Doc
-foo	mongoengine/tests/queryset/queryset.py	/^            foo = ListField(EmbeddedDocumentField(Foo))$/;"	v	class:QuerySetTest.test_elem_match.Bar
-foo	mongoengine/tests/queryset/transform.py	/^            foo = ListField(StringField())$/;"	v	class:TransformTest.test_transform_update.LisDoc
-foo	tests/fields/fields.py	/^            foo = StringField()$/;"	v	class:FieldTest.test_undefined_field_exception.Doc
-foo	tests/fields/fields.py	/^            foo = StringField()$/;"	v	class:FieldTest.test_undefined_field_exception_with_strict.Doc
-food	mongoengine/tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_document_validation.PersonPreferences
-food	mongoengine/tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_embedded_document.Dish
-food	mongoengine/tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Dish
-food	mongoengine/tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Dish
-food	tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_document_validation.PersonPreferences
-food	tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_embedded_document.Dish
-food	tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Dish
-food	tests/fields/fields.py	/^            food = StringField(required=True)$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Dish
-foos	mongoengine/tests/queryset/queryset.py	/^            foos = ListField(GenericEmbeddedDocumentField($/;"	v	class:QuerySetTest.test_pull_in_genericembedded_field.Bar
-format	mongoengine/fields.py	/^    def format(self):$/;"	m	class:ImageGridFsProxy
-format	mongoengine/mongoengine/fields.py	/^    def format(self):$/;"	m	class:ImageGridFsProxy
-forms	mongoengine/tests/document/instance.py	/^            forms = ListField(StringField(), default=list)$/;"	v	class:InstanceTest.test_invalid_son.Word
-friend	mongoengine/tests/document/instance.py	/^            friend = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit.Person
-friends	mongoengine/tests/fields/fields.py	/^            friends = ListField(ReferenceField('self'))$/;"	v	class:FieldTest.test_recursive_reference.Employee
-friends	mongoengine/tests/test_dereference.py	/^            friends = ListField(ReferenceField('Person'))$/;"	v	class:FieldTest.test_circular_tree_reference.Other
-friends	mongoengine/tests/test_dereference.py	/^            friends = ListField(ReferenceField('self'))$/;"	v	class:FieldTest.test_recursive_reference.Employee
-friends	tests/fields/fields.py	/^            friends = ListField(ReferenceField('self'))$/;"	v	class:FieldTest.test_recursive_reference.Employee
-from_json	mongoengine/mongoengine/base/document.py	/^    def from_json(cls, json_data, created=False):$/;"	m	class:BaseDocument
-from_json	mongoengine/mongoengine/queryset/base.py	/^    def from_json(self, json_data):$/;"	m	class:BaseQuerySet
-fs	mongoengine/fields.py	/^    def fs(self):$/;"	m	class:GridFSProxy
-fs	mongoengine/mongoengine/fields.py	/^    def fs(self):$/;"	m	class:GridFSProxy
-gender	mongoengine/tests/queryset/queryset.py	/^            gender = StringField()$/;"	v	class:QuerySetTest.test_mapfield_update.Member
-generate	mongoengine/fields.py	/^    def generate(self):$/;"	m	class:SequenceField
-generate	mongoengine/mongoengine/fields.py	/^    def generate(self):$/;"	m	class:SequenceField
-generate_key	mongoengine/mongoengine/errors.py	/^        def generate_key(value, prefix=''):$/;"	f	function:ValidationError._format_errors
-generated	mongoengine/tests/document/instance.py	/^            generated = DateTimeField(default=datetime.now)$/;"	v	class:InstanceTest.test_reference_inheritance.CompareStats
-generic	mongoengine/tests/fields/fields.py	/^            generic = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
-generic	mongoengine/tests/test_context_managers.py	/^            generic = GenericReferenceField()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.Group
-generic	mongoengine/tests/test_context_managers.py	/^            generic = GenericReferenceField()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.Group
-generic	tests/fields/fields.py	/^            generic = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
-generic_as_lazy	mongoengine/tests/fields/fields.py	/^            generic_as_lazy = ListField(GenericLazyReferenceField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
-generic_as_lazy	tests/fields/fields.py	/^            generic_as_lazy = ListField(GenericLazyReferenceField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
-generic_embedded_document_field	mongoengine/tests/document/instance.py	/^            generic_embedded_document_field = GenericEmbeddedDocumentField($/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-generic_embedded_document_field	mongoengine/tests/document/json_serialisation.py	/^            generic_embedded_document_field = GenericEmbeddedDocumentField($/;"	v	class:TestJson.test_json_complex.Doc
-generic_embedded_document_field	mongoengine/tests/queryset/queryset.py	/^            generic_embedded_document_field = GenericEmbeddedDocumentField($/;"	v	class:QuerySetTest.test_json_complex.Doc
-generic_ref	mongoengine/tests/fields/fields.py	/^            generic_ref = GenericReferenceField()$/;"	v	class:FieldTest.test_reference_miss.Bar
-generic_ref	tests/fields/fields.py	/^            generic_ref = GenericReferenceField()$/;"	v	class:FieldTest.test_reference_miss.Bar
-generic_reference_field	mongoengine/tests/document/instance.py	/^            generic_reference_field = GenericReferenceField($/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-generic_reference_field	mongoengine/tests/document/json_serialisation.py	/^            generic_reference_field = GenericReferenceField($/;"	v	class:TestJson.test_json_complex.Doc
-generic_reference_field	mongoengine/tests/queryset/queryset.py	/^            generic_reference_field = GenericReferenceField($/;"	v	class:QuerySetTest.test_json_complex.Doc
-genus	mongoengine/tests/fields/file_tests.py	/^            genus = StringField()$/;"	v	class:FileTest.test_complex_field_filefield.Animal
-genus	mongoengine/tests/fields/file_tests.py	/^            genus = StringField()$/;"	v	class:FileTest.test_file_saving.Animal
-geo_point_field	mongoengine/tests/document/instance.py	/^            geo_point_field = GeoPointField(default=lambda: [1, 2])$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-geo_point_field	mongoengine/tests/document/json_serialisation.py	/^            geo_point_field = GeoPointField(default=lambda: [1, 2])$/;"	v	class:TestJson.test_json_complex.Doc
-geo_point_field	mongoengine/tests/queryset/queryset.py	/^            geo_point_field = GeoPointField(default=lambda: [1, 2])$/;"	v	class:QuerySetTest.test_json_complex.Doc
-get	mongoengine/fields.py	/^    def get(self, grid_id=None):$/;"	m	class:GridFSProxy
-get	mongoengine/mongoengine/base/datastructures.py	/^    def get(self, **kwargs):$/;"	m	class:EmbeddedDocumentList
-get	mongoengine/mongoengine/base/datastructures.py	/^    def get(self, key, default=None):$/;"	m	class:StrictDict
-get	mongoengine/mongoengine/fields.py	/^    def get(self, grid_id=None):$/;"	m	class:GridFSProxy
-get	mongoengine/mongoengine/queryset/base.py	/^    def get(self, *q_objs, **query):$/;"	m	class:BaseQuerySet
-get_auto_id_names	mongoengine/mongoengine/base/metaclasses.py	/^    def get_auto_id_names(cls, new_class):$/;"	m	class:TopLevelDocumentMetaclass
-get_classes	mongoengine/mongoengine/document.py	/^        def get_classes(cls):$/;"	f	function:Document.list_indexes
-get_connection	mongoengine/mongoengine/connection.py	/^def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):$/;"	f
-get_db	mongoengine/mongoengine/connection.py	/^def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):$/;"	f
-get_document	mongoengine/mongoengine/base/common.py	/^def get_document(name):$/;"	f
-get_indexes_spec	mongoengine/mongoengine/document.py	/^        def get_indexes_spec(cls):$/;"	f	function:Document.list_indexes
-get_mongodb_version	mongoengine/tests/utils.py	/^def get_mongodb_version():$/;"	f
-get_next_value	mongoengine/fields.py	/^    def get_next_value(self):$/;"	m	class:SequenceField
-get_next_value	mongoengine/mongoengine/fields.py	/^    def get_next_value(self):$/;"	m	class:SequenceField
-get_ops	mongoengine/tests/queryset/queryset.py	/^    def get_ops(self):$/;"	m	class:db_ops_tracker
-get_proxy_obj	mongoengine/fields.py	/^    def get_proxy_obj(self, key, instance, db_alias=None, collection_name=None):$/;"	m	class:FileField
-get_proxy_obj	mongoengine/mongoengine/fields.py	/^    def get_proxy_obj(self, key, instance, db_alias=None, collection_name=None):$/;"	m	class:FileField
-get_queryset	mongoengine/mongoengine/queryset/manager.py	/^    get_queryset = None$/;"	v	class:QuerySetManager
-get_queryset	mongoengine/tests/queryset/queryset.py	/^            def get_queryset(doc_cls, queryset):$/;"	m	class:QuerySetTest.test_custom_querysets_managers_directly.CustomQuerySetManager
-get_sequence_name	mongoengine/fields.py	/^    def get_sequence_name(self):$/;"	m	class:SequenceField
-get_sequence_name	mongoengine/mongoengine/fields.py	/^    def get_sequence_name(self):$/;"	m	class:SequenceField
-get_signal_output	mongoengine/tests/test_signals.py	/^    def get_signal_output(self, fn, *args, **kwargs):$/;"	m	class:SignalTests
-get_text_score	mongoengine/mongoengine/base/document.py	/^    def get_text_score(self):$/;"	m	class:BaseDocument
-get_tz_awareness	mongoengine/tests/test_connection.py	/^def get_tz_awareness(connection):$/;"	f
-get_version	mongoengine/mongoengine/__init__.py	/^def get_version():$/;"	f
-get_version	mongoengine/setup.py	/^def get_version(version_tuple):$/;"	f
-group	mongoengine/tests/document/instance.py	/^            group = Group.objects.first()$/;"	v	class:InstanceTest.test_switch_db_instance.Group
-group	mongoengine/tests/fields/fields.py	/^            group = ReferenceField(Group)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Person
-group	mongoengine/tests/fields/fields.py	/^            group = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
-group	mongoengine/tests/test_context_managers.py	/^            group = Group.objects.first()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.Group
-group	mongoengine/tests/test_context_managers.py	/^            group = Group.objects.first()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.Group
-group	tests/fields/fields.py	/^            group = ReferenceField(Group)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Person
-group	tests/fields/fields.py	/^            group = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_dict_field.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_generic_reference.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_field_complex.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_item_dereference.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first()$/;"	v	class:FieldTest.test_map_field_reference.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_dict_field.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_generic_reference.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_list_field_complex.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_list_item_dereference.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
-group_obj	mongoengine/tests/test_dereference.py	/^            group_obj = Group.objects.first().select_related()$/;"	v	class:FieldTest.test_map_field_reference.Group
-group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_dict_field.Group
-group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
-group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_generic_reference.Group
-group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
-group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_list_field_complex.Group
-group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_list_item_dereference.Group
-group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
-group_objs	mongoengine/tests/test_dereference.py	/^            group_objs = Group.objects.select_related()$/;"	v	class:FieldTest.test_map_field_reference.Group
-groups	mongoengine/tests/fields/fields.py	/^            groups = ListField(EmbeddedDocumentField(Group))$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Basedoc
-groups	tests/fields/fields.py	/^            groups = ListField(EmbeddedDocumentField(Group))$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Basedoc
-height	mongoengine/tests/document/instance.py	/^            height = FloatField()$/;"	v	class:InstanceTest.test_falsey_pk.Person
-height	mongoengine/tests/document/instance.py	/^            height = IntField(default=184, null=True)$/;"	v	class:InstanceTest.test_null_field.User
-height	mongoengine/tests/document/instance.py	/^            height = IntField(default=189)$/;"	v	class:InstanceTest.test_default_values.Person
-height	mongoengine/tests/fields/fields.py	/^            height = DecimalField(min_value=Decimal('0.1'),$/;"	v	class:FieldTest.test_decimal_validation.Person
-height	mongoengine/tests/fields/fields.py	/^            height = FloatField()$/;"	v	class:FieldTest.test_float_validation.BigPerson
-height	mongoengine/tests/fields/fields.py	/^            height = FloatField(min_value=0.1, max_value=3.5)$/;"	v	class:FieldTest.test_float_validation.Person
-height	tests/fields/fields.py	/^            height = DecimalField(min_value=Decimal('0.1'),$/;"	v	class:FieldTest.test_decimal_validation.Person
-height	tests/fields/fields.py	/^            height = FloatField()$/;"	v	class:FieldTest.test_float_validation.BigPerson
-height	tests/fields/fields.py	/^            height = FloatField(min_value=0.1, max_value=3.5)$/;"	v	class:FieldTest.test_float_validation.Person
-helpful	mongoengine/tests/queryset/queryset.py	/^            helpful = ListField(EmbeddedDocumentField(User))$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Collaborator
-high_score	mongoengine/tests/queryset/queryset.py	/^            high_score = IntField()$/;"	v	class:QuerySetTest.test_update_min_max.Scores
-hint	mongoengine/mongoengine/queryset/base.py	/^    def hint(self, index=None):$/;"	m	class:BaseQuerySet
-hits	mongoengine/tests/queryset/queryset.py	/^            hits = IntField()$/;"	v	class:QuerySetTest.test_exec_js_query.BlogPost
-hits	mongoengine/tests/queryset/queryset.py	/^            hits = IntField()$/;"	v	class:QuerySetTest.test_item_frequencies.BlogPost
-hits	mongoengine/tests/queryset/queryset.py	/^            hits = IntField()$/;"	v	class:QuerySetTest.test_update.BlogPost
-html_favicon	mongoengine/docs/conf.py	/^html_favicon = "favicon.ico"$/;"	v
-html_sidebars	mongoengine/docs/conf.py	/^html_sidebars = {$/;"	v
-html_theme	mongoengine/docs/conf.py	/^html_theme = 'sphinx_rtd_theme'$/;"	v
-html_theme_options	mongoengine/docs/conf.py	/^html_theme_options = {$/;"	v
-html_theme_path	mongoengine/docs/conf.py	/^html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]$/;"	v
-html_use_smartypants	mongoengine/docs/conf.py	/^html_use_smartypants = True$/;"	v
-htmlhelp_basename	mongoengine/docs/conf.py	/^htmlhelp_basename = 'MongoEnginedoc'$/;"	v
-id	mongoengine/tests/document/delta.py	/^            id = StringField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
-id	mongoengine/tests/document/inheritance.py	/^            id = IntField()$/;"	v	class:InheritanceTest.test_auto_id_vs_non_pk_id_field.City
-id	mongoengine/tests/document/instance.py	/^            id = IntField(primary_key=True)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections.Book
-id	mongoengine/tests/document/instance.py	/^            id = IntField(primary_key=True)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_shared_id_among_collections.User
-id	mongoengine/tests/document/instance.py	/^            id = StringField(required=True)$/;"	v	class:InstanceTest.test_embedded_document_to_mongo_id.SubDoc
-id	mongoengine/tests/document/validation.py	/^            id = StringField(primary_key=True)$/;"	v	class:ValidatorErrorTest.test_embedded_db_field_validate.Doc
-id	mongoengine/tests/fields/fields.py	/^            id = BinaryField(primary_key=True)$/;"	v	class:FieldTest.test_binary_field_primary.Attachment
-id	mongoengine/tests/fields/fields.py	/^            id = BinaryField(primary_key=True)$/;"	v	class:FieldTest.test_binary_field_primary_filter_by_binary_pk_as_str.Attachment
-id	mongoengine/tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbed
-id	mongoengine/tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
-id	mongoengine/tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbed
-id	mongoengine/tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
-id	mongoengine/tests/fields/fields.py	/^            id = SequenceField()$/;"	v	class:FieldTest.test_embedded_sequence_field.Comment
-id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
-id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Animal
-id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Person
-id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_sequence_field.Person
-id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
-id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True, sequence_name='jelly')$/;"	v	class:FieldTest.test_sequence_field_sequence_name.Person
-id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True, value_decorator=str)$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
-id	mongoengine/tests/fields/fields.py	/^            id = SequenceField(primary_key=True, value_decorator=str)$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
-id	mongoengine/tests/queryset/modify.py	/^    id = IntField(primary_key=True)$/;"	v	class:Doc
-id	mongoengine/tests/queryset/queryset.py	/^            id = IntField($/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Family
-id	mongoengine/tests/queryset/queryset.py	/^            id = IntField($/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-id	mongoengine/tests/queryset/queryset.py	/^            id = ObjectIdField('_id')$/;"	v	class:QuerySetTest.test_as_pymongo.User
-id	mongoengine/tests/queryset/queryset.py	/^            id = StringField(unique=True, primary_key=True)$/;"	v	class:QuerySetTest.test_filter_chaining.Blog
-id	mongoengine/tests/queryset/queryset.py	/^            id = StringField(unique=True, primary_key=True)$/;"	v	class:QuerySetTest.test_query_reference_to_custom_pk_doc.A
-id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.Message
-id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.Topic
-id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.User
-id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_list_lookup_not_checked_in_map.Comment
-id	mongoengine/tests/test_dereference.py	/^            id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_list_lookup_not_checked_in_map.Message
-id	mongoengine/tests/test_signals.py	/^            id = IntField(primary_key=True)$/;"	v	class:SignalTests.setUp.ExplicitId
-id	mongoengine/tests/test_signals.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:SignalTests.setUp.Author
-id	tests/fields/fields.py	/^            id = BinaryField(primary_key=True)$/;"	v	class:FieldTest.test_binary_field_primary.Attachment
-id	tests/fields/fields.py	/^            id = BinaryField(primary_key=True)$/;"	v	class:FieldTest.test_binary_field_primary_filter_by_binary_pk_as_str.Attachment
-id	tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbed
-id	tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
-id	tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbed
-id	tests/fields/fields.py	/^            id = IntField(primary_key=True, default=1)$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
-id	tests/fields/fields.py	/^            id = SequenceField()$/;"	v	class:FieldTest.test_embedded_sequence_field.Comment
-id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
-id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Animal
-id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Person
-id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_sequence_field.Person
-id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True)$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
-id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True, sequence_name='jelly')$/;"	v	class:FieldTest.test_sequence_field_sequence_name.Person
-id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True, value_decorator=str)$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
-id	tests/fields/fields.py	/^            id = SequenceField(primary_key=True, value_decorator=str)$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
-image	mongoengine/tests/fields/file_tests.py	/^            image = ImageField()$/;"	v	class:FileTest.test_image_field.TestImage
-image	mongoengine/tests/fields/file_tests.py	/^            image = ImageField(size=(185, 37))$/;"	v	class:FileTest.test_image_field_resize.TestImage
-image	mongoengine/tests/fields/file_tests.py	/^            image = ImageField(size=(185, 37, True))$/;"	v	class:FileTest.test_image_field_resize_force.TestImage
-image	mongoengine/tests/fields/file_tests.py	/^            image = ImageField(thumbnail_size=(92, 18))$/;"	v	class:FileTest.test_image_field_thumbnail.TestImage
-image1	mongoengine/tests/fields/file_tests.py	/^            image1 = ImageField()$/;"	v	class:FileTest.test_get_image_by_grid_id.TestImage
-image2	mongoengine/tests/fields/file_tests.py	/^            image2 = ImageField()$/;"	v	class:FileTest.test_get_image_by_grid_id.TestImage
-image_path	mongoengine/docs/code/tumblelog.py	/^    image_path = StringField()$/;"	v	class:ImagePost
-in_bulk	mongoengine/mongoengine/queryset/base.py	/^    def in_bulk(self, object_ids):$/;"	m	class:BaseQuerySet
-in_embedded	mongoengine/tests/fields/fields.py	/^            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
-in_embedded	mongoengine/tests/fields/fields.py	/^            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
-in_embedded	tests/fields/fields.py	/^            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
-in_embedded	tests/fields/fields.py	/^            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
-in_list	mongoengine/tests/fields/fields.py	/^            in_list = ListField(GenericLazyReferenceField())$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.EmbeddedOcurrence
-in_list	mongoengine/tests/fields/fields.py	/^            in_list = ListField(GenericLazyReferenceField())$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
-in_list	mongoengine/tests/fields/fields.py	/^            in_list = ListField(LazyReferenceField(Animal))$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.EmbeddedOcurrence
-in_list	mongoengine/tests/fields/fields.py	/^            in_list = ListField(LazyReferenceField(Animal))$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
-in_list	tests/fields/fields.py	/^            in_list = ListField(GenericLazyReferenceField())$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.EmbeddedOcurrence
-in_list	tests/fields/fields.py	/^            in_list = ListField(GenericLazyReferenceField())$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Ocurrence
-in_list	tests/fields/fields.py	/^            in_list = ListField(LazyReferenceField(Animal))$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.EmbeddedOcurrence
-in_list	tests/fields/fields.py	/^            in_list = ListField(LazyReferenceField(Animal))$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Ocurrence
-includes_cls	mongoengine/mongoengine/document.py	/^def includes_cls(fields):$/;"	f
-info	mongoengine/tests/document/delta.py	/^            info = ReferenceField(UInfoDocument)$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedUser
-info	mongoengine/tests/fields/fields.py	/^            info = DictField()$/;"	v	class:FieldTest.test_dict_field.BlogPost
-info	mongoengine/tests/fields/fields.py	/^            info = ListField()$/;"	v	class:FieldTest.test_list_assignment.BlogPost
-info	mongoengine/tests/fields/fields.py	/^            info = ListField()$/;"	v	class:FieldTest.test_list_field.BlogPost
-info	mongoengine/tests/fields/fields.py	/^            info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_invalid_operators.BlogPost
-info	mongoengine/tests/fields/fields.py	/^            info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_manipulative_operators.BlogPost
-info	mongoengine/tests/queryset/queryset.py	/^            info = DictField()$/;"	v	class:QuerySetTest.test_find_dict_item.BlogPost
-info	tests/fields/fields.py	/^            info = DictField()$/;"	v	class:FieldTest.test_dict_field.BlogPost
-info	tests/fields/fields.py	/^            info = ListField()$/;"	v	class:FieldTest.test_list_assignment.BlogPost
-info	tests/fields/fields.py	/^            info = ListField()$/;"	v	class:FieldTest.test_list_field.BlogPost
-info	tests/fields/fields.py	/^            info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_invalid_operators.BlogPost
-info	tests/fields/fields.py	/^            info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_manipulative_operators.BlogPost
-info_dict	mongoengine/tests/fields/fields.py	/^            info_dict = MapField(field=EmbeddedDocumentField(Info))$/;"	v	class:FieldTest.test_map_field_unicode.BlogPost
-info_dict	tests/fields/fields.py	/^            info_dict = MapField(field=EmbeddedDocumentField(Info))$/;"	v	class:FieldTest.test_map_field_unicode.BlogPost
-init	mongoengine/setup.py	/^init = os.path.join(os.path.dirname(__file__), 'mongoengine', '__init__.py')$/;"	v
-insert	mongoengine/mongoengine/base/datastructures.py	/^    def insert(self, *args, **kwargs):$/;"	m	class:BaseList
-insert	mongoengine/mongoengine/queryset/base.py	/^    def insert(self, doc_or_docs, load_bulk=True,$/;"	m	class:BaseQuerySet
-int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField()$/;"	v	class:DeltaTest.delta.Doc
-int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField()$/;"	v	class:DeltaTest.delta_recursive.Doc
-int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
-int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField(db_field='db_int_field')$/;"	v	class:DeltaTest.delta_db_field.Doc
-int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField(db_field='db_int_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
-int_field	mongoengine/tests/document/delta.py	/^            int_field = IntField(db_field='db_int_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Embedded
-int_field	mongoengine/tests/document/instance.py	/^            int_field = IntField(default=1)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-int_field	mongoengine/tests/document/json_serialisation.py	/^            int_field = IntField(default=1)$/;"	v	class:TestJson.test_json_complex.Doc
-int_field	mongoengine/tests/queryset/queryset.py	/^            int_field = IntField(default=1)$/;"	v	class:QuerySetTest.test_json_complex.Doc
-int_fld	mongoengine/tests/document/instance.py	/^            int_fld = IntField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
-int_fld	mongoengine/tests/fields/fields.py	/^            int_fld = IntField()$/;"	v	class:FieldTest.test_int_and_float_ne_operator.TestDocument
-int_fld	mongoengine/tests/fields/fields.py	/^            int_fld = IntField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-int_fld	mongoengine/tests/fields/fields.py	/^            int_fld = IntField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
-int_fld	tests/fields/fields.py	/^            int_fld = IntField()$/;"	v	class:FieldTest.test_int_and_float_ne_operator.TestDocument
-int_fld	tests/fields/fields.py	/^            int_fld = IntField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-int_fld	tests/fields/fields.py	/^            int_fld = IntField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
-invalid_index	mongoengine/tests/document/indexes.py	/^            def invalid_index():$/;"	m	class:IndexesTest.test_hint.BlogPost
-invalid_index_2	mongoengine/tests/document/indexes.py	/^        def invalid_index_2():$/;"	f	function:IndexesTest.test_hint
-ip	mongoengine/tests/queryset/queryset.py	/^                ip='104.107.108.116'$/;"	v	class:QuerySetTest.test_as_pymongo.User
-ip	mongoengine/tests/queryset/queryset.py	/^            ip = StringField()$/;"	v	class:QuerySetTest.test_as_pymongo.LastLogin
-is_active	mongoengine/tests/queryset/queryset.py	/^             is_active=False).save()$/;"	v	class:QuerySetTest.test_text_indexes.News
-is_active	mongoengine/tests/queryset/queryset.py	/^            is_active = BooleanField(default=True)$/;"	v	class:QuerySetTest.test_text_indexes.News
-is_mamal	mongoengine/tests/queryset/queryset.py	/^            is_mamal = BooleanField()$/;"	v	class:QuerySetTest.test_subclass_field_query.Animal
-is_published	mongoengine/tests/queryset/queryset.py	/^            is_published = BooleanField()$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-is_published	mongoengine/tests/queryset/queryset.py	/^            is_published = BooleanField(default=False)$/;"	v	class:QuerySetTest.test_custom_querysets_managers_directly.Post
-is_published	mongoengine/tests/queryset/queryset.py	/^            is_published=True,$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-item	mongoengine/tests/queryset/transform.py	/^            item = EmbeddedDocumentField(EmbeddedItem)$/;"	v	class:TransformTest.test_last_field_name_like_operator.Doc
-item_frequencies	mongoengine/mongoengine/queryset/base.py	/^    def item_frequencies(self, field, normalize=False, map_reduce=True):$/;"	m	class:BaseQuerySet
-items	mongoengine/mongoengine/base/datastructures.py	/^    def items(self):$/;"	m	class:StrictDict
-items	mongoengine/tests/document/instance.py	/^            items = ListField()$/;"	v	class:InstanceTest.test_reload_of_non_strict_with_special_field_name.Post
-items	mongoengine/tests/fields/fields.py	/^            items = ListField(EnumField())$/;"	v	class:FieldTest.test_tuples_as_tuples.TestDoc
-items	mongoengine/tests/test_dereference.py	/^            items = ListField(EmbeddedDocumentField("PlaylistItem"))$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.Playlist
-items	tests/fields/fields.py	/^            items = ListField(EnumField())$/;"	v	class:FieldTest.test_tuples_as_tuples.TestDoc
-iteritems	mongoengine/mongoengine/base/datastructures.py	/^    def iteritems(self):$/;"	m	class:StrictDict
-iterkeys	mongoengine/mongoengine/base/datastructures.py	/^    def iterkeys(self):$/;"	m	class:StrictDict
-job	mongoengine/tests/document/instance.py	/^            job = EmbeddedDocumentField(Job)$/;"	v	class:InstanceTest.setUp.Person
-job	mongoengine/tests/document/instance.py	/^            job = ReferenceField(Job)$/;"	v	class:InstanceTest.test_do_not_save_unchanged_references.Person
-john	mongoengine/docs/code/tumblelog.py	/^john = User(email='jdoe@example.com', first_name='John', last_name='Doe')$/;"	v
-key	mongoengine/tests/document/indexes.py	/^            key = DictField(primary_key=True)$/;"	v	class:IndexesTest.test_compound_key_dictfield.ReportDictField
-key	mongoengine/tests/document/indexes.py	/^            key = EmbeddedDocumentField(CompoundKey, primary_key=True)$/;"	v	class:IndexesTest.test_compound_key_embedded.ReportEmbedded
-key	mongoengine/tests/queryset/queryset.py	/^            key = StringField(primary_key=True)$/;"	v	class:QuerySetTest.test_scalar_primary_key.SettingValue
-key_has_dot_or_dollar	mongoengine/fields.py	/^def key_has_dot_or_dollar(d):$/;"	f
-key_has_dot_or_dollar	mongoengine/mongoengine/fields.py	/^def key_has_dot_or_dollar(d):$/;"	f
-key_not_string	mongoengine/fields.py	/^def key_not_string(d):$/;"	f
-key_not_string	mongoengine/mongoengine/fields.py	/^def key_not_string(d):$/;"	f
-keys	mongoengine/mongoengine/base/datastructures.py	/^    def keys(self):$/;"	m	class:StrictDict
-keywords	mongoengine/tests/document/indexes.py	/^            keywords = StringField()$/;"	v	class:IndexesTest.test_build_index_spec_is_not_destructive.MyDoc
-l	mongoengine/tests/document/instance.py	/^            l = ListField(EmbeddedDocumentField(B))$/;"	v	class:InstanceTest.test_list_iter.A
-last_login	mongoengine/tests/queryset/queryset.py	/^            last_login = EmbeddedDocumentField(LastLogin)$/;"	v	class:QuerySetTest.test_as_pymongo.User
-last_login	mongoengine/tests/queryset/queryset.py	/^            last_login=LastLogin($/;"	v	class:QuerySetTest.test_as_pymongo.User
-last_name	mongoengine/docs/code/tumblelog.py	/^    last_name = StringField(max_length=50)$/;"	v	class:User
-latex_documents	mongoengine/docs/conf.py	/^latex_documents = [$/;"	v
-latex_paper_size	mongoengine/docs/conf.py	/^latex_paper_size = 'a4'$/;"	v
-like	mongoengine/tests/fields/fields.py	/^            like = GenericEmbeddedDocumentField()$/;"	v	class:FieldTest.test_generic_embedded_document.Person
-like	mongoengine/tests/fields/fields.py	/^            like = GenericEmbeddedDocumentField(choices=(Dish,))$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Person
-like	tests/fields/fields.py	/^            like = GenericEmbeddedDocumentField()$/;"	v	class:FieldTest.test_generic_embedded_document.Person
-like	tests/fields/fields.py	/^            like = GenericEmbeddedDocumentField(choices=(Dish,))$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Person
-likes	mongoengine/tests/fields/fields.py	/^            likes = ListField(GenericEmbeddedDocumentField(choices=(Dish,)))$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Person
-likes	tests/fields/fields.py	/^            likes = ListField(GenericEmbeddedDocumentField(choices=(Dish,)))$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Person
-limit	mongoengine/mongoengine/queryset/base.py	/^    def limit(self, n):$/;"	m	class:BaseQuerySet
-line	mongoengine/tests/fields/geo.py	/^            line = LineStringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere.Event
-line	mongoengine/tests/fields/geo.py	/^            line = LineStringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Venue
-line	mongoengine/tests/queryset/geo.py	/^            line = LineStringField()$/;"	v	class:GeoQueriesTest.test_2dsphere_linestring_sets_correctly.Location
-line	mongoengine/tests/queryset/geo.py	/^            line = LineStringField()$/;"	v	class:GeoQueriesTest.test_linestring.Road
-line	mongoengine/tests/queryset/transform.py	/^            line = LineStringField()$/;"	v	class:TransformTest.test_geojson_LineStringField.Location
-link_url	mongoengine/docs/code/tumblelog.py	/^    link_url = StringField()$/;"	v	class:LinkPost
-list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField()$/;"	v	class:DeltaTest.delta.Doc
-list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField()$/;"	v	class:DeltaTest.delta_recursive.Doc
-list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
-list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField(db_field='db_list_field')$/;"	v	class:DeltaTest.delta_db_field.Doc
-list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField(db_field='db_list_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
-list_field	mongoengine/tests/document/delta.py	/^            list_field = ListField(db_field='db_list_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Embedded
-list_field	mongoengine/tests/document/instance.py	/^            list_field = ListField()$/;"	v	class:InstanceTest.test_reload_referencing.Doc
-list_field	mongoengine/tests/document/instance.py	/^            list_field = ListField()$/;"	v	class:InstanceTest.test_reload_referencing.Embedded
-list_field	mongoengine/tests/document/instance.py	/^            list_field = ListField(default=lambda: [1, 2, 3])$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-list_field	mongoengine/tests/document/json_serialisation.py	/^            list_field = ListField(default=lambda: [1, 2, 3])$/;"	v	class:TestJson.test_json_complex.Doc
-list_field	mongoengine/tests/queryset/queryset.py	/^            list_field = ListField(default=lambda: [1, 2, 3])$/;"	v	class:QuerySetTest.test_json_complex.Doc
-list_indexes	mongoengine/mongoengine/document.py	/^    def list_indexes(cls):$/;"	m	class:Document
-lists	mongoengine/tests/fixtures.py	/^    lists = ListField(StringField())$/;"	v	class:NewDocumentPickleTest
-lists	mongoengine/tests/fixtures.py	/^    lists = ListField(StringField())$/;"	v	class:PickleSignalsTest
-lists	mongoengine/tests/fixtures.py	/^    lists = ListField(StringField())$/;"	v	class:PickleTest
-live_and_let_die	mongoengine/tests/test_signals.py	/^        def live_and_let_die():$/;"	f	function:SignalTests.test_signal_kwargs
-living_thing	mongoengine/tests/fields/fields.py	/^            living_thing = GenericLazyReferenceField(choices=[Animal, Vegetal])$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Ocurrence
-living_thing	tests/fields/fields.py	/^            living_thing = GenericLazyReferenceField(choices=[Animal, Vegetal])$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Ocurrence
-load_existing_author	mongoengine/tests/test_signals.py	/^        def load_existing_author():$/;"	f	function:SignalTests.test_model_signals
-loc	mongoengine/tests/fields/geo.py	/^            loc = GeoPointField()$/;"	v	class:GeoFieldTest.test_geopoint_validation.Location
-loc	mongoengine/tests/fields/geo.py	/^            loc = LineStringField()$/;"	v	class:GeoFieldTest.test_linestring_validation.Location
-loc	mongoengine/tests/fields/geo.py	/^            loc = MultiLineStringField()$/;"	v	class:GeoFieldTest.test_multilinestring_validation.Location
-loc	mongoengine/tests/fields/geo.py	/^            loc = MultiPointField()$/;"	v	class:GeoFieldTest.test_multipoint_validation.Location
-loc	mongoengine/tests/fields/geo.py	/^            loc = MultiPolygonField()$/;"	v	class:GeoFieldTest.test_multipolygon_validation.Location
-loc	mongoengine/tests/fields/geo.py	/^            loc = PointField()$/;"	v	class:GeoFieldTest.test_point_validation.Location
-loc	mongoengine/tests/fields/geo.py	/^            loc = PolygonField()$/;"	v	class:GeoFieldTest.test_polygon_validation.Location
-loc	mongoengine/tests/queryset/geo.py	/^            loc = PointField()$/;"	v	class:GeoQueriesTest.test_2dsphere_point_sets_correctly.Location
-loc	mongoengine/tests/queryset/transform.py	/^            loc = PointField()$/;"	v	class:TransformTest.test_geojson_PointField.Location
-locale	mongoengine/tests/queryset/queryset.py	/^               locale=Locale(city="Belo Horizonte", country="Brazil")).save()$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
-locale	mongoengine/tests/queryset/queryset.py	/^               locale=Locale(city="Brasilia", country="Brazil")).save()$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
-locale	mongoengine/tests/queryset/queryset.py	/^               locale=Locale(city="Corumba-GO", country="Brazil")).save()$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
-locale	mongoengine/tests/queryset/queryset.py	/^               locale=Locale(city="New York", country="USA")).save()$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
-locale	mongoengine/tests/queryset/queryset.py	/^            locale = EmbeddedDocumentField(Locale)$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
-location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_create_geohaystack_index.Place
-location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_explicit_geo2d_index.Place
-location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_explicit_geo2d_index_embedded.EmbeddedLocation
-location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_explicit_geohaystack_index.Place
-location	mongoengine/tests/document/indexes.py	/^            location = DictField()$/;"	v	class:IndexesTest.test_explicit_geosphere_index.Place
-location	mongoengine/tests/document/instance.py	/^            location = ReferenceField('Location', dbref=True)$/;"	v	class:InstanceTest.test_document_registry_regressions.Area
-location	mongoengine/tests/fields/geo.py	/^            location = GeoPointField()$/;"	v	class:GeoFieldTest.test_geo_indexes_recursion.Location
-location	mongoengine/tests/fields/geo.py	/^            location = GeoPointField()$/;"	v	class:GeoFieldTest.test_geopoint_embedded_indexes.Venue
-location	mongoengine/tests/fields/geo.py	/^            location = GeoPointField()$/;"	v	class:GeoFieldTest.test_indexes_geopoint.Event
-location	mongoengine/tests/fields/geo.py	/^            location = PointField(auto_index=False)$/;"	v	class:GeoFieldTest.test_geo_indexes_auto_index.Log
-location	mongoengine/tests/fields/geo.py	/^            location = ReferenceField(Location)$/;"	v	class:GeoFieldTest.test_geo_indexes_recursion.Parent
-location	mongoengine/tests/queryset/geo.py	/^            location = GeoPointField()$/;"	v	class:GeoQueriesTest.test_spherical_geospatial_operators.Point
-location	mongoengine/tests/queryset/geo.py	/^            location = PointField()$/;"	v	class:GeoQueriesTest.test_aspymongo_with_only.Place
-location	mongoengine/tests/queryset/geo.py	/^            location = point_field_class()$/;"	v	class:GeoQueriesTest._create_event_data.Event
-location	mongoengine/tests/queryset/geo.py	/^            location = point_field_class()$/;"	v	class:GeoQueriesTest._test_embedded.Venue
-location	mongoengine/tests/queryset/geo.py	/^            location=[-122.4194155, 37.7749295])$/;"	v	class:GeoQueriesTest._create_event_data.Event
-location	mongoengine/tests/queryset/geo.py	/^            location=[-87.677137, 41.909889])$/;"	v	class:GeoQueriesTest._create_event_data.Event
-location	mongoengine/tests/queryset/geo.py	/^            location=[-87.686638, 41.900474])$/;"	v	class:GeoQueriesTest._create_event_data.Event
-location	mongoengine/tests/queryset/queryset.py	/^                location='White House',$/;"	v	class:QuerySetTest.test_as_pymongo.User
-location	mongoengine/tests/queryset/queryset.py	/^            location = StringField()$/;"	v	class:QuerySetTest.test_as_pymongo.LastLogin
-location	mongoengine/tests/queryset/transform.py	/^            location = GeoPointField()$/;"	v	class:TransformTest.test_understandable_error_raised.Event
-location__max_distance	mongoengine/tests/queryset/geo.py	/^                               location__max_distance=60 \/ earth_radius)$/;"	v	class:GeoQueriesTest.test_spherical_geospatial_operators.Point
-location__min_distance	mongoengine/tests/queryset/geo.py	/^                               location__min_distance=60 \/ earth_radius)$/;"	v	class:GeoQueriesTest.test_spherical_geospatial_operators.Point
-location__within_spherical_distance	mongoengine/tests/queryset/geo.py	/^            location__within_spherical_distance=[$/;"	v	class:GeoQueriesTest.test_spherical_geospatial_operators.Point
-log	mongoengine/tests/document/instance.py	/^            log = StringField()$/;"	v	class:InstanceTest.test_shard_key.LogEntry
-log	mongoengine/tests/document/instance.py	/^            log = StringField()$/;"	v	class:InstanceTest.test_shard_key_primary.LogEntry
-log	mongoengine/tests/queryset/queryset.py	/^            log = StringField()$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Family
-log1	mongoengine/tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=d1)$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-log1	mongoengine/tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=d1.isoformat('T'))$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-log1	mongoengine/tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=query)$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-log1	tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=d1)$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-log1	tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=d1.isoformat('T'))$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-log1	tests/fields/fields.py	/^            log1 = LogEntry.objects.get(date=query)$/;"	v	class:FieldTest.test_datetime_usage.LogEntry
-log_message	mongoengine/tests/document/instance.py	/^            log_message = StringField(verbose_name="Log message",$/;"	v	class:InstanceTest.test_embedded_update.Page
-log_message	mongoengine/tests/document/instance.py	/^            log_message = StringField(verbose_name="Log message",$/;"	v	class:InstanceTest.test_embedded_update_after_save.Page
-log_message	mongoengine/tests/document/instance.py	/^            log_message = StringField(verbose_name="Log message",$/;"	v	class:InstanceTest.test_embedded_update_db_field.Page
-long_fld	mongoengine/tests/fields/fields.py	/^            long_fld = LongField()$/;"	v	class:FieldTest.test_long_ne_operator.TestDocument
-long_fld	tests/fields/fields.py	/^            long_fld = LongField()$/;"	v	class:FieldTest.test_long_ne_operator.TestDocument
-lookup	mongoengine/mongoengine/queryset/base.py	/^        def lookup(obj, name):$/;"	f	function:BaseQuerySet._get_scalar
-lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:CachedReferenceField
-lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:DictField
-lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:DynamicField
-lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:EmbeddedDocumentField
-lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:GenericEmbeddedDocumentField
-lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:LazyReferenceField
-lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:ReferenceField
-lookup_member	mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:StringField
-lookup_member	mongoengine/mongoengine/base/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:ComplexBaseField
-lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:CachedReferenceField
-lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:DictField
-lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:DynamicField
-lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:EmbeddedDocumentField
-lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:GenericEmbeddedDocumentField
-lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:LazyReferenceField
-lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:ReferenceField
-lookup_member	mongoengine/mongoengine/fields.py	/^    def lookup_member(self, member_name):$/;"	m	class:StringField
-low_score	mongoengine/tests/queryset/queryset.py	/^            low_score = IntField()$/;"	v	class:QuerySetTest.test_update_min_max.Scores
-machine	mongoengine/tests/document/instance.py	/^            machine = StringField()$/;"	v	class:InstanceTest.test_shard_key.LogEntry
-machine	mongoengine/tests/document/instance.py	/^            machine = StringField(primary_key=True)$/;"	v	class:InstanceTest.test_shard_key_primary.LogEntry
-macros	mongoengine/tests/document/instance.py	/^            macros = MapField(EmbeddedDocumentField(Macro))$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Parameter
-main	mongoengine/benchmark.py	/^def main():$/;"	f
-map_f	mongoengine/tests/queryset/queryset.py	/^            map_f=map_family,$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-map_f	mongoengine/tests/queryset/queryset.py	/^            map_f=map_person,$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-map_field	mongoengine/tests/document/instance.py	/^            map_field = MapField(IntField(), default=lambda: {"simple": 1})$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-map_field	mongoengine/tests/document/json_serialisation.py	/^            map_field = MapField(IntField(), default=lambda: {"simple": 1})$/;"	v	class:TestJson.test_json_complex.Doc
-map_field	mongoengine/tests/queryset/queryset.py	/^            map_field = MapField(IntField(), default=lambda: {"simple": 1})$/;"	v	class:QuerySetTest.test_json_complex.Doc
-map_reduce	mongoengine/mongoengine/queryset/base.py	/^    def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,$/;"	m	class:BaseQuerySet
-mapping	mongoengine/tests/fields/fields.py	/^                mapping = MapField()$/;"	v	class:FieldTest.test_mapfield.Simple.NoDeclaredType
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField()$/;"	v	class:FieldTest.test_complex_field_same_value_not_changed.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField()$/;"	v	class:FieldTest.test_dictfield_complex.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField(field=IntField())$/;"	v	class:FieldTest.test_dictfield_strict.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField(field=ListField(IntField(required=True)))$/;"	v	class:FieldTest.test_atomic_update_dict_field.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = DictField(required=True)$/;"	v	class:FieldTest.test_complex_field_required.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_complex_field_same_value_not_changed.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_list_field_complex.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_list_field_rejects_strings.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField(field=IntField())$/;"	v	class:FieldTest.test_list_field_strict.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = ListField(required=True)$/;"	v	class:FieldTest.test_complex_field_required.Simple
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = MapField(EmbeddedDocumentField(SettingBase))$/;"	v	class:FieldTest.test_complex_mapfield.Extensible
-mapping	mongoengine/tests/fields/fields.py	/^            mapping = MapField(IntField())$/;"	v	class:FieldTest.test_mapfield.Simple
-mapping	tests/fields/fields.py	/^                mapping = MapField()$/;"	v	class:FieldTest.test_mapfield.Simple.NoDeclaredType
-mapping	tests/fields/fields.py	/^            mapping = DictField()$/;"	v	class:FieldTest.test_complex_field_same_value_not_changed.Simple
-mapping	tests/fields/fields.py	/^            mapping = DictField()$/;"	v	class:FieldTest.test_dictfield_complex.Simple
-mapping	tests/fields/fields.py	/^            mapping = DictField(field=IntField())$/;"	v	class:FieldTest.test_dictfield_strict.Simple
-mapping	tests/fields/fields.py	/^            mapping = DictField(field=ListField(IntField(required=True)))$/;"	v	class:FieldTest.test_atomic_update_dict_field.Simple
-mapping	tests/fields/fields.py	/^            mapping = DictField(required=True)$/;"	v	class:FieldTest.test_complex_field_required.Simple
-mapping	tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_complex_field_same_value_not_changed.Simple
-mapping	tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_list_field_complex.Simple
-mapping	tests/fields/fields.py	/^            mapping = ListField()$/;"	v	class:FieldTest.test_list_field_rejects_strings.Simple
-mapping	tests/fields/fields.py	/^            mapping = ListField(field=IntField())$/;"	v	class:FieldTest.test_list_field_strict.Simple
-mapping	tests/fields/fields.py	/^            mapping = ListField(required=True)$/;"	v	class:FieldTest.test_complex_field_required.Simple
-mapping	tests/fields/fields.py	/^            mapping = MapField(EmbeddedDocumentField(SettingBase))$/;"	v	class:FieldTest.test_complex_mapfield.Extensible
-mapping	tests/fields/fields.py	/^            mapping = MapField(IntField())$/;"	v	class:FieldTest.test_mapfield.Simple
-master_doc	mongoengine/docs/conf.py	/^master_doc = 'index'$/;"	v
-max_time_ms	mongoengine/mongoengine/queryset/base.py	/^    def max_time_ms(self, ms):$/;"	m	class:BaseQuerySet
-max_value	mongoengine/tests/fields/fields.py	/^                                  max_value=Decimal('3.5'))$/;"	v	class:FieldTest.test_decimal_validation.Person
-max_value	tests/fields/fields.py	/^                                  max_value=Decimal('3.5'))$/;"	v	class:FieldTest.test_decimal_validation.Person
-member	mongoengine/tests/queryset/queryset.py	/^            member = EmbeddedDocumentField(Member)$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
-members	mongoengine/tests/fields/fields.py	/^            members = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_item_dereference.Group
-members	mongoengine/tests/queryset/queryset.py	/^            members = DictField()$/;"	v	class:QuerySetTest.test_dictfield_update.Club
-members	mongoengine/tests/queryset/queryset.py	/^            members = ListField(EmbeddedDocumentField(Member))$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
-members	mongoengine/tests/queryset/queryset.py	/^            members = ListField(ReferenceField(self.Person))$/;"	v	class:QuerySetTest.test_update_value_conversion.Group
-members	mongoengine/tests/queryset/queryset.py	/^            members = MapField(EmbeddedDocumentField(Member))$/;"	v	class:QuerySetTest.test_mapfield_update.Club
-members	mongoengine/tests/test_context_managers.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.Group
-members	mongoengine/tests/test_context_managers.py	/^            members = ListField(ReferenceField(User, dbref=True))$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.Group
-members	mongoengine/tests/test_dereference.py	/^            members = DictField()$/;"	v	class:FieldTest.test_dict_field.Group
-members	mongoengine/tests/test_dereference.py	/^            members = DictField()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField()$/;"	v	class:FieldTest.test_list_field_complex.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_item_dereference.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_handle_old_style_references.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_stores_as_type.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=False))$/;"	v	class:FieldTest.test_migrate_references.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=True))$/;"	v	class:FieldTest.test_handle_old_style_references.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=True))$/;"	v	class:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries.Group
-members	mongoengine/tests/test_dereference.py	/^            members = ListField(ReferenceField(User, dbref=True))$/;"	v	class:FieldTest.test_migrate_references.Group
-members	mongoengine/tests/test_dereference.py	/^            members = MapField(GenericReferenceField())$/;"	v	class:FieldTest.test_generic_reference_map_field.Group
-members	mongoengine/tests/test_dereference.py	/^            members = MapField(ReferenceField(User))$/;"	v	class:FieldTest.test_map_field_reference.Group
-members	tests/fields/fields.py	/^            members = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_item_dereference.Group
-merge	mongoengine/mongoengine/base/metaclasses.py	/^    def merge(self, new_options):$/;"	m	class:MetaDict
-merge_index_specs	mongoengine/mongoengine/base/document.py	/^        def merge_index_specs(index_specs, indices):$/;"	f	function:BaseDocument._build_index_specs
-message	mongoengine/mongoengine/errors.py	/^    message = property(_get_message, _set_message)$/;"	v	class:ValidationError
-message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.Comments
-message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents.UserComments
-message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
-message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.ModeratorComments
-message	mongoengine/tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.UserComments
-message	mongoengine/tests/queryset/queryset.py	/^            message = StringField()$/;"	v	class:QuerySetTest.test_ensure_index.Comment
-message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:EmbeddedDocumentListFieldTestCase.setUp.Comments
-message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents.UserComments
-message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
-message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.ModeratorComments
-message	tests/fields/fields.py	/^            message = StringField()$/;"	v	class:FieldTest.test_choices_validation_documents_invalid.UserComments
-meta	mongoengine/docs/code/tumblelog.py	/^    meta = {'allow_inheritance': True}$/;"	v	class:Post
-meta	mongoengine/tests/all_warnings/__init__.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:AllWarnings.test_document_collection_syntax_warning.NonAbstractBase
-meta	mongoengine/tests/all_warnings/__init__.py	/^            meta = {'collection': 'fail'}$/;"	v	class:AllWarnings.test_document_collection_syntax_warning.InheritedDocumentFailTest
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {"allow_inheritance": True, "indexes": ["family"]}$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Animal
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:ClassMethodsTest.setUp.Person
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {"indexes": ["name"]}$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Vaccine
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_collection_naming.BaseDocument
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_collection_naming.BaseMixin
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPost
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPostWithTags
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPost
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithCustomField
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithTags
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPost
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPostWithTags
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPostWithTagsAndExtraText
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:ClassMethodsTest.test_collection_naming.BaseDocument
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': 'app'}$/;"	v	class:ClassMethodsTest.test_collection_name_and_primary.Person
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': 'pimp_my_collection'}$/;"	v	class:ClassMethodsTest.test_collection_naming.CustomNamingTest
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': 'wibble'}$/;"	v	class:ClassMethodsTest.test_collection_naming.InheritedAbstractNamingTest
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': collection_name}$/;"	v	class:ClassMethodsTest.test_custom_collection_name_operations.Person
-meta	mongoengine/tests/document/class_methods.py	/^            meta = {'collection': lambda c: "DYNAMO"}$/;"	v	class:ClassMethodsTest.test_collection_naming.DynamicNamingTest
-meta	mongoengine/tests/document/delta.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:DeltaTest.setUp.Person
-meta	mongoengine/tests/document/delta.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:DeltaTest.test_delta_for_dynamic_documents.Person
-meta	mongoengine/tests/document/dynamic.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:DynamicTest.setUp.Person
-meta	mongoengine/tests/document/indexes.py	/^                meta = {'indexes': [$/;"	v	class:IndexesTest.test_index_with_pk.Comment.BlogPost
-meta	mongoengine/tests/document/indexes.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:IndexesTest.setUp.Person
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest._index_test.BlogPost
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest._index_test_inheritance.BlogPost
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_abstract_index_inheritance.Person
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_abstract_index_inheritance.UserBase
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_build_index_spec_is_not_destructive.MyDoc
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_compound_index_underscore_cls_not_overwritten.TestDoc
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_covered_index.Test
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_dictionary_indexes.BlogPost
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_disable_index_creation.User
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_embedded_document_index.BlogPost
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_embedded_document_index_meta.Person
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_explicit_geo2d_index.Place
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_explicit_geo2d_index_embedded.Place
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_explicit_geohaystack_index.Place
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_explicit_geosphere_index.Place
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_hashed_indexes.Book
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_hint.BlogPost
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_dont_send_cls_option.TestChildDoc
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_dont_send_cls_option.TestDoc
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_no_cls.A
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_no_cls.B
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_index_on_id.BlogPost
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_inherited_index.A
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_list_embedded_document_index.BlogPost
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_sparse_compound_indexes.MyDoc
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_string_indexes.MyDoc
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_text_indexes.Book
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_ttl_indexes.Log
-meta	mongoengine/tests/document/indexes.py	/^            meta = {$/;"	v	class:IndexesTest.test_unique_and_indexes.Customer
-meta	mongoengine/tests/document/indexes.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:IndexesTest.test_recursive_embedded_objects_dont_break_indexes.RecursiveDocument
-meta	mongoengine/tests/document/indexes.py	/^            meta = {'db_alias': 'test_indexes_after_database_drop'}$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
-meta	mongoengine/tests/document/indexes.py	/^            meta = {'indexes': ['title']}$/;"	v	class:IndexesTest._index_test_inheritance.ExtendedBlogPost
-meta	mongoengine/tests/document/inheritance.py	/^                meta = {'abstract': True}$/;"	v	class:InheritanceTest.test_abstract_documents.Human.EvilHuman
-meta	mongoengine/tests/document/inheritance.py	/^                meta = {'allow_inheritance': False}$/;"	v	class:InheritanceTest.test_cant_turn_off_inheritance_on_subclass.Animal.Mammal
-meta	mongoengine/tests/document/inheritance.py	/^                meta = {'collection': 'booze'}$/;"	v	class:InheritanceTest.test_inherited_collections.Drinker.AcloholicDrink
-meta	mongoengine/tests/document/inheritance.py	/^                meta = {'collection': 'booze'}$/;"	v	class:InheritanceTest.test_inherited_collections.Drinker.AlcoholicDrink
-meta	mongoengine/tests/document/inheritance.py	/^            meta = meta_settings$/;"	v	class:InheritanceTest.test_abstract_documents.Animal
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {"abstract": True}$/;"	v	class:InheritanceTest.test_abstract_embedded_documents.A
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {$/;"	v	class:InheritanceTest.test_document_inheritance.DateCreatedDocument
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {$/;"	v	class:InheritanceTest.test_document_inheritance.DateUpdatedDocument
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {$/;"	v	class:InheritanceTest.test_indexes_and_multiple_inheritance.A
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {$/;"	v	class:InheritanceTest.test_indexes_and_multiple_inheritance.B
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_abstract_document_creation_does_not_fail.City
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly.City
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_allow_inheritance_abstract_document.FinalDocument
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class.City
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True,$/;"	v	class:InheritanceTest.test_auto_id_vs_non_pk_id_field.City
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'abstract': True}$/;"	v	class:InheritanceTest.test_abstract_documents.Mammal
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_allow_inheritance_embedded_document.Comment
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_cant_turn_off_inheritance_on_subclass.Animal
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_dynamic_declarations.Animal
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_inheritance_meta_data.Person
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_inheritance_to_mongo_keys.Person
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_inherited_collections.Drink
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_polymorphic_queries.Animal
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_subclasses.Animal
-meta	mongoengine/tests/document/inheritance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InheritanceTest.test_superclasses.Animal
-meta	mongoengine/tests/document/instance.py	/^            meta = dict(shard_key=["id"])$/;"	v	class:InstanceTest.test_from_son.MyPerson
-meta	mongoengine/tests/document/instance.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:InstanceTest.setUp.Person
-meta	mongoengine/tests/document/instance.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:InstanceTest.test_db_alias_overrides.A
-meta	mongoengine/tests/document/instance.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:InstanceTest.test_embedded_document_to_mongo.Person
-meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-1", "allow_inheritance": True}$/;"	v	class:InstanceTest.test_db_alias_propagates.A
-meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-1"}$/;"	v	class:InstanceTest.test_db_alias_tests.User
-meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-2"}$/;"	v	class:InstanceTest.test_db_alias_overrides.B
-meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-2"}$/;"	v	class:InstanceTest.test_db_alias_tests.Book
-meta	mongoengine/tests/document/instance.py	/^            meta = {"db_alias": "testdb-3"}$/;"	v	class:InstanceTest.test_db_alias_tests.AuthorBooks
-meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_capped_collection.Log
-meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_capped_collection_default.Log
-meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_capped_collection_no_max_size_problems.Log
-meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_db_ref_usage.Book
-meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_reload_of_non_strict_with_special_field_name.Post
-meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_shard_key.LogEntry
-meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_shard_key_in_embedded_document.Bar
-meta	mongoengine/tests/document/instance.py	/^            meta = {$/;"	v	class:InstanceTest.test_shard_key_primary.LogEntry
-meta	mongoengine/tests/document/instance.py	/^            meta = {'abstract': True}$/;"	v	class:InstanceTest.test_save_abstract_document.Doc
-meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False,$/;"	v	class:InstanceTest.test_list_search_by_embedded.Page
-meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
-meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:InstanceTest.test_list_search_by_embedded.Comment
-meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:InstanceTest.test_list_search_by_embedded.User
-meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:InstanceTest.test_reference_inheritance.Stats
-meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InstanceTest.test_custom_id_field.User
-meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InstanceTest.test_document_not_registered.Place
-meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InstanceTest.test_document_registry_regressions.Location
-meta	mongoengine/tests/document/instance.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:InstanceTest.test_polymorphic_references.Animal
-meta	mongoengine/tests/document/instance.py	/^            meta = {'cascade': False}$/;"	v	class:InstanceTest.test_save_cascade_meta_false.Person
-meta	mongoengine/tests/document/instance.py	/^            meta = {'cascade': False}$/;"	v	class:InstanceTest.test_save_cascade_meta_true.Person
-meta	mongoengine/tests/document/instance.py	/^            meta = {'collection': 'blogpost_1'}$/;"	v	class:InstanceTest.test_save_reference.BlogPost
-meta	mongoengine/tests/document/instance.py	/^            meta = {'shard_key': ('superphylum',)}$/;"	v	class:InstanceTest.test_reload_sharded.Animal
-meta	mongoengine/tests/document/instance.py	/^            meta = {'shard_key': ('superphylum.name',)}$/;"	v	class:InstanceTest.test_reload_sharded_nested.Animal
-meta	mongoengine/tests/document/instance.py	/^            meta = {'strict': False}$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false.Thing
-meta	mongoengine/tests/document/instance.py	/^            meta = {'strict': False}$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc.User
-meta	mongoengine/tests/document/instance.py	/^            meta = {'strict': False}$/;"	v	class:InstanceTest.test_load_undefined_fields_with_strict_false.User
-meta	mongoengine/tests/document/validation.py	/^            meta = {'abstract': True}$/;"	v	class:ValidatorErrorTest.test_fields_rewrite.BasePerson
-meta	mongoengine/tests/document/validation.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:ValidatorErrorTest.test_parent_reference_in_child_document.Parent
-meta	mongoengine/tests/document/validation.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:ValidatorErrorTest.test_parent_reference_set_as_attribute_in_child_document.Parent
-meta	mongoengine/tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_abstract_reference_base_type.Sibling
-meta	mongoengine/tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_drop_abstract_document.AbstractDoc
-meta	mongoengine/tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_reference_abstract_class.Sibling
-meta	mongoengine/tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Sibling
-meta	mongoengine/tests/fields/fields.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:FieldTest.test_complex_mapfield.SettingBase
-meta	mongoengine/tests/fields/fields.py	/^            meta = {$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Basedoc
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Base
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_generic_reference.Link
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_cls_field.Animal
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dictfield_complex.SettingBase
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_embedded_document_inheritance.User
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_list_field_complex.SettingBase
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
-meta	mongoengine/tests/fields/fields.py	/^            meta = {'strict': False}$/;"	v	class:FieldTest.test_undefined_field_exception_with_strict.Doc
-meta	mongoengine/tests/fields/geo.py	/^            meta = {$/;"	v	class:GeoFieldTest.test_geo_indexes_auto_index.Log
-meta	mongoengine/tests/fixtures.py	/^    meta = {'allow_inheritance': True}$/;"	v	class:Base
-meta	mongoengine/tests/queryset/field_list.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:OnlyExcludeAllTest.setUp.Person
-meta	mongoengine/tests/queryset/field_list.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.Base
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_bool_with_ordering_from_meta_dict.Person
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_clear_ordering.BlogPost
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_cls_query_in_subclassed_docs.Animal
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_no_ordering_for_get.BlogPost
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_ordering.BlogPost
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {$/;"	v	class:QuerySetTest.test_read_preference.Bar
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True, 'queryset_class': CustomQuerySet}$/;"	v	class:QuerySetTest.test_custom_querysets_inherited.Base
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_custom_querysets_inherited_direct.Base
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_on_abstract_document.AbstractBlogPost
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_reverse_delete_rule_deny_on_abstract_document.AbstractBlogPost
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify_on_abstract_document.AbstractBlogPost
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'abstract': True}$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents.AbstractBlogPost
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:QuerySetTest.test_elem_match.Bar
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:QuerySetTest.test_elem_match.Foo
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.setUp.Person
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_ensure_index.Comment
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_inherit_objects.Foo
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_inherit_objects_override.Foo
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_no_sub_classes.A
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_subclass_field_query.Animal
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QuerySetTest.test_upsert_includes_cls.Test
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'collection': 'b'}$/;"	v	class:QuerySetTest.test_save_and_only_on_fields_with_default.B
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'db_alias': 'testdb'}$/;"	v	class:QuerySetTest.test_distinct_handles_references_to_alias.Bar
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'db_alias': 'testdb'}$/;"	v	class:QuerySetTest.test_distinct_handles_references_to_alias.Foo
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'indexes': [$/;"	v	class:QuerySetTest.test_text_indexes.News
-meta	mongoengine/tests/queryset/queryset.py	/^            meta = {'queryset_class': CustomQuerySet}$/;"	v	class:QuerySetTest.test_custom_querysets.Post
-meta	mongoengine/tests/queryset/transform.py	/^            meta = {$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
-meta	mongoengine/tests/queryset/transform.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:TransformTest.test_raw_and_merging.Doc
-meta	mongoengine/tests/queryset/visitor.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:QTest.setUp.Person
-meta	mongoengine/tests/test_context_managers.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:ContextManagersTest.test_no_sub_classes.A
-meta	mongoengine/tests/test_dereference.py	/^            meta = {"db_alias": "testdb-1"}$/;"	v	class:FieldTest.test_objectid_reference_across_databases.User
-meta	mongoengine/tests/test_dereference.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.UserA
-meta	mongoengine/tests/test_dereference.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Bar
-meta	mongoengine/tests/test_dereference.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Baz
-meta	mongoengine/tests/test_dereference.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Foo
-meta	mongoengine/tests/test_dereference.py	/^            meta = {'collection': 'pages'}$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Page
-meta	mongoengine/tests/test_dereference.py	/^            meta = {'collection': 'tags'}$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Tag
-meta	tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_abstract_reference_base_type.Sibling
-meta	tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_drop_abstract_document.AbstractDoc
-meta	tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_reference_abstract_class.Sibling
-meta	tests/fields/fields.py	/^            meta = {"abstract": True}$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Sibling
-meta	tests/fields/fields.py	/^            meta = {"allow_inheritance": True}$/;"	v	class:FieldTest.test_complex_mapfield.SettingBase
-meta	tests/fields/fields.py	/^            meta = {$/;"	v	class:FieldTest.test_choices_validation_documents_inheritance.Comments
-meta	tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Basedoc
-meta	tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
-meta	tests/fields/fields.py	/^            meta = {'abstract': True}$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Base
-meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': False}$/;"	v	class:FieldTest.test_generic_reference.Link
-meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_cls_field.Animal
-meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dictfield_complex.SettingBase
-meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
-meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
-meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_embedded_document_inheritance.User
-meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:FieldTest.test_list_field_complex.SettingBase
-meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
-meta	tests/fields/fields.py	/^            meta = {'allow_inheritance': True}$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
-meta	tests/fields/fields.py	/^            meta = {'strict': False}$/;"	v	class:FieldTest.test_undefined_field_exception_with_strict.Doc
-modify	mongoengine/mongoengine/document.py	/^    def modify(self, query=None, **update):$/;"	m	class:Document
-modify	mongoengine/mongoengine/queryset/base.py	/^    def modify(self, upsert=False, full_response=False, remove=False, new=False, **update):$/;"	m	class:BaseQuerySet
-money	mongoengine/tests/fields/fields.py	/^            money = DecimalField()$/;"	v	class:FieldTest.test_decimal_comparison.Person
-money	tests/fields/fields.py	/^            money = DecimalField()$/;"	v	class:FieldTest.test_decimal_comparison.Person
-mother	mongoengine/tests/document/instance.py	/^                mother = ReferenceField('Person', reverse_delete_rule=DENY)$/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Parents
-msg	mongoengine/tests/test_dereference.py	/^            msg = StringField(required=True, default='Blammo!')$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Bar
-msg	mongoengine/tests/test_dereference.py	/^            msg = StringField(required=True, default='Kaboom!')$/;"	v	class:FieldTest.test_document_reload_no_inheritance.Baz
-music_posts	mongoengine/tests/queryset/queryset.py	/^            def music_posts(doc_cls, queryset, deleted=False):$/;"	m	class:QuerySetTest.test_custom_manager.BlogPost
-my_id	mongoengine/tests/fields/fields.py	/^            my_id = IntField(required=True, unique=True, primary_key=True)$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
-my_id	mongoengine/tests/fields/fields.py	/^            my_id = IntField(required=True, unique=True, primary_key=True)$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
-my_id	mongoengine/tests/test_dereference.py	/^            my_id = IntField(primary_key=True)$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_stores_as_type.User
-my_id	tests/fields/fields.py	/^            my_id = IntField(required=True, unique=True, primary_key=True)$/;"	v	class:FieldTest.test_dynamic_fields_class.Doc
-my_id	tests/fields/fields.py	/^            my_id = IntField(required=True, unique=True, primary_key=True)$/;"	v	class:FieldTest.test_dynamic_fields_embedded_class.Doc
-my_list	mongoengine/tests/fields/fields.py	/^            my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique))$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.B
-my_list	mongoengine/tests/fields/fields.py	/^            my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.A
-my_list	tests/fields/fields.py	/^            my_list = ListField(EmbeddedDocumentField(EmbeddedWithSparseUnique))$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.B
-my_list	tests/fields/fields.py	/^            my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.A
-my_map	mongoengine/tests/fields/fields.py	/^            my_map = MapField(EmbeddedDocumentField(Embedded))$/;"	v	class:FieldTest.test_mapfield_numerical_index.Test
-my_map	mongoengine/tests/fields/fields.py	/^            my_map = MapField(field=EmbeddedDocumentField(Embedded),$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Test
-my_map	tests/fields/fields.py	/^            my_map = MapField(EmbeddedDocumentField(Embedded))$/;"	v	class:FieldTest.test_mapfield_numerical_index.Test
-my_map	tests/fields/fields.py	/^            my_map = MapField(field=EmbeddedDocumentField(Embedded),$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Test
-my_metaclass	mongoengine/mongoengine/document.py	/^    my_metaclass = DocumentMetaclass$/;"	v	class:DynamicEmbeddedDocument
-my_metaclass	mongoengine/mongoengine/document.py	/^    my_metaclass = DocumentMetaclass$/;"	v	class:EmbeddedDocument
-my_metaclass	mongoengine/mongoengine/document.py	/^    my_metaclass = TopLevelDocumentMetaclass$/;"	v	class:Document
-my_metaclass	mongoengine/mongoengine/document.py	/^    my_metaclass = TopLevelDocumentMetaclass$/;"	v	class:DynamicDocument
-n	mongoengine/tests/queryset/field_list.py	/^            n = ListField(IntField())$/;"	v	class:OnlyExcludeAllTest.test_slicing_fields.Numbers
-n	mongoengine/tests/queryset/field_list.py	/^            n = ListField(IntField())$/;"	v	class:OnlyExcludeAllTest.test_slicing_nested_fields.EmbeddedNumber
-n	mongoengine/tests/queryset/queryset.py	/^            n = IntField()$/;"	v	class:QuerySetTest.test_clone.Number
-n	mongoengine/tests/queryset/queryset.py	/^            n = IntField()$/;"	v	class:QuerySetTest.test_order_then_filter.Number
-n	mongoengine/tests/queryset/queryset.py	/^            n = IntField()$/;"	v	class:QuerySetTest.test_using.Number2
-n	mongoengine/tests/queryset/queryset.py	/^            n = IntField(db_field='number')$/;"	v	class:QuerySetTest.test_order_works_with_custom_db_field_names.Number
-n	mongoengine/tests/queryset/queryset.py	/^            n = IntField(primary_key=True)$/;"	v	class:QuerySetTest.test_order_works_with_primary.Number
-name	mongoengine/docs/code/tumblelog.py	/^    name = StringField(max_length=120)$/;"	v	class:Comment
-name	mongoengine/mongoengine/base/fields.py	/^    name = None$/;"	v	class:BaseField
-name	mongoengine/tests/document/class_methods.py	/^            name = StringField()$/;"	v	class:ClassMethodsTest.setUp.Person
-name	mongoengine/tests/document/class_methods.py	/^            name = StringField()$/;"	v	class:ClassMethodsTest.test_custom_collection_name_operations.Person
-name	mongoengine/tests/document/class_methods.py	/^            name = StringField(primary_key=True)$/;"	v	class:ClassMethodsTest.test_collection_name_and_primary.Person
-name	mongoengine/tests/document/class_methods.py	/^            name = StringField(required=True)$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Cat
-name	mongoengine/tests/document/class_methods.py	/^            name = StringField(required=True)$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Vaccine
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.circular_reference_deltas.Organization
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.circular_reference_deltas.Person
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.circular_reference_deltas_2.Organization
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.circular_reference_deltas_2.Person
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.setUp.Person
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_delta_for_dynamic_documents.Person
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedUser
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_lower_level_mark_as_changed.EmbeddedDoc
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_nested_nested_fields_mark_as_changed.EmbeddedDoc
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_nested_nested_fields_mark_as_changed.MyDoc
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_referenced_object_changed_attributes.Organization
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_referenced_object_changed_attributes.User
-name	mongoengine/tests/document/delta.py	/^            name = StringField()$/;"	v	class:DeltaTest.test_upper_level_mark_as_changed.EmbeddedDoc
-name	mongoengine/tests/document/dynamic.py	/^            name = StringField()$/;"	v	class:DynamicTest.setUp.Person
-name	mongoengine/tests/document/dynamic.py	/^            name = StringField()$/;"	v	class:DynamicTest.test_complex_dynamic_document_queries.Person
-name	mongoengine/tests/document/dynamic.py	/^            name = StringField()$/;"	v	class:DynamicTest.test_dynamic_and_embedded.Person
-name	mongoengine/tests/document/dynamic.py	/^            name = StringField()$/;"	v	class:DynamicTest.test_dynamic_and_embedded_dict_access.Person
-name	mongoengine/tests/document/indexes.py	/^            name = StringField()$/;"	v	class:IndexesTest.setUp.Person
-name	mongoengine/tests/document/indexes.py	/^            name = StringField()$/;"	v	class:IndexesTest.test_abstract_index_inheritance.Person
-name	mongoengine/tests/document/indexes.py	/^            name = StringField()$/;"	v	class:IndexesTest.test_create_geohaystack_index.Place
-name	mongoengine/tests/document/indexes.py	/^            name = StringField()$/;"	v	class:IndexesTest.test_explicit_geohaystack_index.Place
-name	mongoengine/tests/document/indexes.py	/^            name = StringField(db_field='tag')$/;"	v	class:IndexesTest.test_list_embedded_document_index.Tag
-name	mongoengine/tests/document/indexes.py	/^            name = StringField(primary_key=True)$/;"	v	class:IndexesTest.test_unique_and_primary_create.User
-name	mongoengine/tests/document/indexes.py	/^            name = StringField(primary_key=True, unique=True)$/;"	v	class:IndexesTest.test_unique_and_primary.User
-name	mongoengine/tests/document/indexes.py	/^            name = StringField(required=True)$/;"	v	class:IndexesTest.test_compound_key_embedded.CompoundKey
-name	mongoengine/tests/document/indexes.py	/^            name = StringField(required=True)$/;"	v	class:IndexesTest.test_embedded_document_index_meta.Person
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_abstract_documents.Animal
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_abstract_handle_ids_in_metaclass_properly.EuropeanCity
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_allow_inheritance.Animal
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_allow_inheritance_abstract_document.Animal
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_auto_id_not_set_if_specific_in_parent_class.EuropeanCity
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_auto_id_vs_non_pk_id_field.EuropeanCity
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_cant_turn_off_inheritance_on_subclass.Animal
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_inheritance_meta_data.Person
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_inheritance_to_mongo_keys.Person
-name	mongoengine/tests/document/inheritance.py	/^            name = StringField()$/;"	v	class:InheritanceTest.test_inherited_collections.Drink
-name	mongoengine/tests/document/instance.py	/^                name = StringField()$/;"	v	class:InstanceTest.test_duplicate_db_fields_raise_invalid_document_error.Foo
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.setUp.Job
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.setUp.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_custom_id_field.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_data_contains_id_field.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_alias_overrides.A
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_alias_propagates.A
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_alias_tests.Book
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_alias_tests.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_ref_usage.Book
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_db_ref_usage.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_dbref_equality.Test
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_dbref_equality.Test2
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_dbref_equality.Test3
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_default_values.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_do_not_save_unchanged_references.Job
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_do_not_save_unchanged_references.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_document_not_registered.Place
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_document_registry_regressions.Location
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_embedded_document_to_mongo.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_kwargs_complex.Embedded
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_kwargs_simple.Embedded
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document.Thing
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false.Thing
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc.Thing
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_load_undefined_fields_with_strict_false.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_mixed_creation_dynamic.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_null_field.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_object_mixins.NameMixin
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_query_count_when_saving.Feed
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_query_count_when_saving.Organization
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_query_count_when_saving.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_reload_sharded_nested.SuperPhylum
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_pull.Record
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_abstract_document.Doc
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascade_kwargs.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascade_meta_false.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascade_meta_true.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascades.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_cascades_generically.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit_with_file_field.Foo
-name	mongoengine/tests/document/instance.py	/^            name = StringField()$/;"	v	class:InstanceTest.test_switch_db_instance.Group
-name	mongoengine/tests/document/instance.py	/^            name = StringField(primary_key=True)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_custom_id_field.User
-name	mongoengine/tests/document/instance.py	/^            name = StringField(required=True)$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.NodesSystem
-name	mongoengine/tests/document/instance.py	/^            name = StringField(required=True)$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField(required=True)$/;"	v	class:InstanceTest.test_db_field_load.Person
-name	mongoengine/tests/document/instance.py	/^            name = StringField(unique=True)$/;"	v	class:InstanceTest.test_update_unique_field.Doc
-name	mongoengine/tests/document/validation.py	/^            name = StringField()$/;"	v	class:ValidatorErrorTest.test_fields_rewrite.BasePerson
-name	mongoengine/tests/document/validation.py	/^            name = StringField(required=True)$/;"	v	class:ValidatorErrorTest.test_fields_rewrite.Person
-name	mongoengine/tests/document/validation.py	/^            name = StringField(required=True)$/;"	v	class:ValidatorErrorTest.test_model_validation.User
-name	mongoengine/tests/fields/fields.py	/^                               name="Wilson Júnior")$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-name	mongoengine/tests/fields/fields.py	/^                name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields_on_embedded_documents.Test
-name	mongoengine/tests/fields/fields.py	/^                name = StringField(db_field='$name')$/;"	v	class:FieldTest.test_db_field_validation.User
-name	mongoengine/tests/fields/fields.py	/^                name = StringField(db_field='name\\0')$/;"	v	class:FieldTest.test_db_field_validation.User
-name	mongoengine/tests/fields/fields.py	/^                name = StringField(db_field='user.name')$/;"	v	class:FieldTest.test_db_field_validation.User
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Owner
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.PersonAuto
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields.Product
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Group
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_abstract_reference_base_type.Mother
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_abstract_reference_base_type.Sibling
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dbref_reference_fields.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_drop_abstract_document.AbstractDoc
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.User
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Group
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_validation.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document.Car
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Car
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Car
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_is_none.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference.User
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Log
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_mapfield_numerical_index.Embedded
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Base
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_object_id_validation.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_embedding.Tree
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_embedding.TreeNode
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_reference.Employee
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_abstract_class.Sibling
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Sibling
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_validation.User
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reverse_list_sorting.Category
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reverse_list_sorting.CategoryList
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_sequence_name.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_fields_reload.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_undefined_reference.Company
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_undefined_reference.Product
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Mineral
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Vegetal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_equality.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Animal
-name	mongoengine/tests/fields/fields.py	/^            name = StringField(max_length=20)$/;"	v	class:FieldTest.test_string_validation.Person
-name	mongoengine/tests/fields/fields.py	/^            name = StringField(required=False, unique=True, sparse=True)$/;"	v	class:FieldTest.test_sparse_field.Doc
-name	mongoengine/tests/fields/fields.py	/^            name = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Author
-name	mongoengine/tests/fields/fields.py	/^            name = StringField(required=True)$/;"	v	class:FieldTest.test_required_values.Person
-name	mongoengine/tests/fields/fields.py	/^            name='Steve',$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
-name	mongoengine/tests/fields/file_tests.py	/^                          name="hello.txt")$/;"	v	class:FileTest.test_file_multidb.TestFile
-name	mongoengine/tests/fields/file_tests.py	/^            name = StringField()$/;"	v	class:FileTest.test_copyable.TestFile
-name	mongoengine/tests/fields/file_tests.py	/^            name = StringField()$/;"	v	class:FileTest.test_file_multidb.TestFile
-name	mongoengine/tests/fields/file_tests.py	/^            name = StringField()$/;"	v	class:FileTest.test_file_uniqueness.TestFile
-name	mongoengine/tests/fields/geo.py	/^            name = StringField()$/;"	v	class:GeoFieldTest.test_geo_indexes_recursion.Location
-name	mongoengine/tests/fields/geo.py	/^            name = StringField()$/;"	v	class:GeoFieldTest.test_geo_indexes_recursion.Parent
-name	mongoengine/tests/fields/geo.py	/^            name = StringField()$/;"	v	class:GeoFieldTest.test_geopoint_embedded_indexes.Venue
-name	mongoengine/tests/fields/geo.py	/^            name = StringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Venue
-name	mongoengine/tests/fixtures.py	/^    name = StringField()$/;"	v	class:Mixin
-name	mongoengine/tests/queryset/field_list.py	/^            name = StringField()$/;"	v	class:OnlyExcludeAllTest.setUp.Person
-name	mongoengine/tests/queryset/field_list.py	/^            name = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.User
-name	mongoengine/tests/queryset/field_list.py	/^            name = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Attachment
-name	mongoengine/tests/queryset/field_list.py	/^            name = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.User
-name	mongoengine/tests/queryset/geo.py	/^            name = StringField()$/;"	v	class:GeoQueriesTest._test_embedded.Venue
-name	mongoengine/tests/queryset/geo.py	/^            name = StringField()$/;"	v	class:GeoQueriesTest.test_linestring.Road
-name	mongoengine/tests/queryset/geo.py	/^            name = StringField()$/;"	v	class:GeoQueriesTest.test_polygon.Road
-name	mongoengine/tests/queryset/pickable.py	/^    name = StringField()$/;"	v	class:Person
-name	mongoengine/tests/queryset/queryset.py	/^                name = StringField()$/;"	v	class:QuerySetTest.test_update_related_models.TestOrganization
-name	mongoengine/tests/queryset/queryset.py	/^                name = StringField()$/;"	v	class:QuerySetTest.test_update_related_models.TestPerson
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.setUp.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_as_pymongo.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_bool_performance.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_bool_with_ordering.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_bool_with_ordering_from_meta_dict.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_bulk_insert.Comment
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_cache_not_cloned.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_cached_queryset.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_can_have_field_same_name_as_query_operator.Size
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_cls_query_in_subclassed_docs.Animal
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField.Author
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Author
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_embedded_array_average.Doc
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_embedded_array_sum.Doc
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_embedded_average.Doc
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_embedded_sum.Doc
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_find_array_position.Comment
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_find_embedded.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_find_empty_embedded.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo.TestActivity
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo.TestPerson
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Organization
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Project
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_in_operator_on_non_iterable.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_null_values.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_on_embedded.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_with_null_embedded.Data
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_loop_over_invalid_id_does_not_crash.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_nested_queryset_iterator.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_cached_queryset.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference.Organization
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Member
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Organization
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_pull_in_genericembedded_field.Foo
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_queryset_aggregation_framework.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle.Category
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_reverse_delete_rule_nullify.Category
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar.Organization
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar.User
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_decimal.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_embedded.Profile
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_generic_reference_field.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_generic_reference_field.State
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_reference_field.Person
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_reference_field.State
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_scalar_simple.UserDoc
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_set_generic_embedded_documents.Bar
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Author
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_update.BlogPost
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField()$/;"	v	class:QuerySetTest.test_update_array_position.Comment
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(db_field='doc-name')$/;"	v	class:QuerySetTest.test_exec_js_field_sub.BlogPost
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(max_length=120)$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Comment
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(max_length=75, unique=True, required=True)$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Site
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(max_length=75, unique=True, required=True)$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(max_length=75, unique=True, required=True)$/;"	v	class:QuerySetTest.test_pull_nested.Site
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(required=True)$/;"	v	class:QuerySetTest.test_add_to_set_each.Item
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(required=True)$/;"	v	class:QuerySetTest.test_editting_embedded_objects.BlogTag
-name	mongoengine/tests/queryset/queryset.py	/^            name = StringField(required=True)$/;"	v	class:QuerySetTest.test_update_one_pop_generic_reference.BlogTag
-name	mongoengine/tests/queryset/queryset.py	/^            name="Barack Obama",$/;"	v	class:QuerySetTest.test_as_pymongo.User
-name	mongoengine/tests/queryset/transform.py	/^            name = StringField()$/;"	v	class:TransformTest.test_last_field_name_like_operator.EmbeddedItem
-name	mongoengine/tests/queryset/transform.py	/^            name = StringField()$/;"	v	class:TransformTest.test_raw_query_and_Q_objects.Foo
-name	mongoengine/tests/queryset/visitor.py	/^            name = StringField()$/;"	v	class:QTest.setUp.Person
-name	mongoengine/tests/queryset/visitor.py	/^            name = StringField()$/;"	v	class:QTest.test_empty_q.Person
-name	mongoengine/tests/queryset/visitor.py	/^            name = StringField()$/;"	v	class:QTest.test_q_merge_queries_edge_case.User
-name	mongoengine/tests/queryset/visitor.py	/^            name = StringField(max_length=40)$/;"	v	class:QTest.test_multiple_occurence_in_field.Test
-name	mongoengine/tests/queryset/visitor.py	/^            name = StringField(required=True)$/;"	v	class:QTest.test_chained_q_or_filtering.Post
-name	mongoengine/tests/test_context_managers.py	/^            name = StringField()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.User
-name	mongoengine/tests/test_context_managers.py	/^            name = StringField()$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.User
-name	mongoengine/tests/test_context_managers.py	/^            name = StringField()$/;"	v	class:ContextManagersTest.test_switch_collection_context_manager.Group
-name	mongoengine/tests/test_context_managers.py	/^            name = StringField()$/;"	v	class:ContextManagersTest.test_switch_db_context_manager.Group
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_reference.Person
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_reference.Relation
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_reference_on_self.Person
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_tree_reference.Other
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_circular_tree_reference.Person
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Tag
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dict_field.UserA
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dict_field.UserB
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dict_field.UserC
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dict_field_no_field_inheritance.UserA
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_document_reload_reference_integrity.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference.UserA
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference.UserB
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference.UserC
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_map_field.UserA
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_map_field.UserB
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_map_field.UserC
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.Group
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.UserA
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.UserB
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_save_doesnt_cause_extra_queries.UserC
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_handle_old_style_references.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_field_complex.UserA
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_field_complex.UserB
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_field_complex.UserC
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries.Group
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_false_stores_as_type.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries.Group
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_of_lists_of_references.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_map_field_reference.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_migrate_references.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_objectid_reference_across_databases.Book
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_objectid_reference_across_databases.User
-name	mongoengine/tests/test_dereference.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_reference.Employee
-name	mongoengine/tests/test_dereference.py	/^            name = StringField(max_length=250, required=True)$/;"	v	class:FieldTest.test_dict_in_dbref_instance.Person
-name	mongoengine/tests/test_dereference.py	/^            name = StringField(max_length=250, required=True)$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
-name	mongoengine/tests/test_signals.py	/^            name = StringField()$/;"	v	class:SignalTests.setUp.Another
-name	mongoengine/tests/test_signals.py	/^            name = StringField()$/;"	v	class:SignalTests.setUp.Author
-name	tests/fields/fields.py	/^                               name="Wilson Júnior")$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-name	tests/fields/fields.py	/^                name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields_on_embedded_documents.Test
-name	tests/fields/fields.py	/^                name = StringField(db_field='$name')$/;"	v	class:FieldTest.test_db_field_validation.User
-name	tests/fields/fields.py	/^                name = StringField(db_field='name\\0')$/;"	v	class:FieldTest.test_db_field_validation.User
-name	tests/fields/fields.py	/^                name = StringField(db_field='user.name')$/;"	v	class:FieldTest.test_db_field_validation.User
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Owner
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.PersonAuto
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields.Product
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Group
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_abstract_reference_base_type.Mother
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_abstract_reference_base_type.Sibling
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dbref_reference_fields.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_drop_abstract_document.AbstractDoc
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.User
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_inheritance_with_list.Group
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_embedded_document_validation.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document.Car
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Car
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Car
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_generic_reference_is_none.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_inherited_sequencefield.Base
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_list_item_dereference.User
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Log
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_mapfield_numerical_index.Embedded
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_multiple_sequence_fields_on_docs.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_no_inherited_sequencefield.Base
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_object_id_validation.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_embedding.Tree
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_embedding.TreeNode
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_recursive_reference.Employee
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_abstract_class.Sibling
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Sibling
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reference_validation.User
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reverse_list_sorting.Category
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_reverse_list_sorting.CategoryList
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_get_next_value.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_sequence_name.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_sequence_fields_reload.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_undefined_reference.Company
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:FieldTest.test_undefined_reference.Product
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Mineral
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Vegetal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_equality.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
-name	tests/fields/fields.py	/^            name = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Animal
-name	tests/fields/fields.py	/^            name = StringField(max_length=20)$/;"	v	class:FieldTest.test_string_validation.Person
-name	tests/fields/fields.py	/^            name = StringField(required=False, unique=True, sparse=True)$/;"	v	class:FieldTest.test_sparse_field.Doc
-name	tests/fields/fields.py	/^            name = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Author
-name	tests/fields/fields.py	/^            name = StringField(required=True)$/;"	v	class:FieldTest.test_required_values.Person
-name	tests/fields/fields.py	/^            name='Steve',$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
-name2	mongoengine/tests/document/instance.py	/^                name2 = StringField(db_field='name')$/;"	v	class:InstanceTest.test_duplicate_db_fields_raise_invalid_document_error.Foo
-needs_mongodb_v26	mongoengine/tests/utils.py	/^def needs_mongodb_v26(func):$/;"	f
-needs_mongodb_v3	mongoengine/tests/utils.py	/^def needs_mongodb_v3(func):$/;"	f
-new	mongoengine/tests/queryset/modify.py	/^            new=True)$/;"	v	class:FindAndModifyTest.test_modify_with_push.BlogPost
-new_field	mongoengine/tests/fixtures.py	/^    new_field = StringField()$/;"	v	class:NewDocumentPickleTest
-new_file	mongoengine/fields.py	/^    def new_file(self, **kwargs):$/;"	m	class:GridFSProxy
-new_file	mongoengine/mongoengine/fields.py	/^    def new_file(self, **kwargs):$/;"	m	class:GridFSProxy
-next	mongoengine/mongoengine/queryset/base.py	/^    def next(self):$/;"	m	class:BaseQuerySet
-next_log	mongoengine/tests/fields/fields.py	/^            next_log = logs[next_idx]$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-next_log	tests/fields/fields.py	/^            next_log = logs[next_idx]$/;"	v	class:FieldTest.test_complexdatetime_usage.LogEntry
-nick	mongoengine/tests/fields/fields.py	/^            nick = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.SubAnimal
-nick	mongoengine/tests/fields/fields.py	/^            nick = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.SubAnimal
-nick	tests/fields/fields.py	/^            nick = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.SubAnimal
-nick	tests/fields/fields.py	/^            nick = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.SubAnimal
-no_cache	mongoengine/mongoengine/queryset/queryset.py	/^    def no_cache(self):$/;"	m	class:QuerySet
-no_dereference	mongoengine/mongoengine/context_managers.py	/^class no_dereference(object):$/;"	c
-no_dereference	mongoengine/mongoengine/queryset/base.py	/^    def no_dereference(self):$/;"	m	class:BaseQuerySet
-no_sub_classes	mongoengine/mongoengine/context_managers.py	/^class no_sub_classes(object):$/;"	c
-no_sub_classes	mongoengine/mongoengine/queryset/base.py	/^    def no_sub_classes(self):$/;"	m	class:BaseQuerySet
-noddy	mongoengine/tests/queryset/queryset.py	/^            noddy = Noddy()$/;"	v	class:QuerySetTest.test_no_cache.Noddy
-nodes	mongoengine/tests/document/instance.py	/^            nodes = MapField(ReferenceField(Node, dbref=False))$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.NodesSystem
-non_field	mongoengine/tests/document/class_methods.py	/^            non_field = True$/;"	v	class:ClassMethodsTest.setUp.Person
-non_field	mongoengine/tests/document/delta.py	/^            non_field = True$/;"	v	class:DeltaTest.setUp.Person
-non_field	mongoengine/tests/document/indexes.py	/^            non_field = True$/;"	v	class:IndexesTest.setUp.Person
-non_field	mongoengine/tests/document/instance.py	/^            non_field = True$/;"	v	class:InstanceTest.setUp.Person
-none	mongoengine/mongoengine/queryset/base.py	/^    def none(self):$/;"	m	class:BaseQuerySet
-not_empty	mongoengine/tests/queryset/queryset.py	/^            def not_empty(self):$/;"	m	class:QuerySetTest.test_custom_querysets.CustomQuerySet
-not_empty	mongoengine/tests/queryset/queryset.py	/^            def not_empty(self):$/;"	m	class:QuerySetTest.test_custom_querysets_inherited.CustomQuerySet
-not_empty	mongoengine/tests/queryset/queryset.py	/^            def not_empty(self):$/;"	m	class:QuerySetTest.test_custom_querysets_inherited_direct.CustomQuerySet
-not_empty	mongoengine/tests/queryset/queryset.py	/^            def not_empty(self):$/;"	m	class:QuerySetTest.test_custom_querysets_set_manager_directly.CustomQuerySet
-num	mongoengine/tests/document/delta.py	/^            num = IntField(default=-1)$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.Doc
-num_posts	mongoengine/docs/code/tumblelog.py	/^num_posts = Post.objects(tags='mongodb').count()$/;"	v
-num_visits	mongoengine/tests/queryset/queryset.py	/^            num_visits = IntField(db_field='visits')$/;"	v	class:QuerySetTest.test_average_over_db_field.UserVisit
-num_visits	mongoengine/tests/queryset/queryset.py	/^            num_visits = IntField(db_field='visits')$/;"	v	class:QuerySetTest.test_sum_over_db_field.UserVisit
-number	mongoengine/tests/document/instance.py	/^            number = IntField()$/;"	v	class:InstanceTest.test_invalid_son.Occurrence
-number	mongoengine/tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_embedded_document_validation.PersonPreferences
-number	mongoengine/tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_embedded_document.Dish
-number	mongoengine/tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Dish
-number	mongoengine/tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Dish
-number	mongoengine/tests/fields/fields.py	/^            number = IntField(default=0, db_field='i')$/;"	v	class:FieldTest.test_embedded_db_field.Embedded
-number	mongoengine/tests/fields/fields.py	/^            number = IntField(default=0, db_field='i')$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Embedded
-number	mongoengine/tests/fields/fields.py	/^            number = IntField(unique=True)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.EmbeddedWithUnique
-number	mongoengine/tests/fields/fields.py	/^            number = IntField(unique=True, sparse=True)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.EmbeddedWithSparseUnique
-number	mongoengine/tests/fixtures.py	/^    number = IntField()$/;"	v	class:NewDocumentPickleTest
-number	mongoengine/tests/fixtures.py	/^    number = IntField()$/;"	v	class:PickleDynamicTest
-number	mongoengine/tests/fixtures.py	/^    number = IntField()$/;"	v	class:PickleSignalsTest
-number	mongoengine/tests/fixtures.py	/^    number = IntField()$/;"	v	class:PickleTest
-number	mongoengine/tests/queryset/queryset.py	/^            number = IntField()$/;"	v	class:QuerySetTest.test_repr.Doc
-number	mongoengine/tests/queryset/queryset.py	/^            number = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_on_embedded.Phone
-number	mongoengine/tests/test_dereference.py	/^            number = StringField(max_length=250, required=True)$/;"	v	class:FieldTest.test_dict_in_dbref_instance.Room
-number	tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_embedded_document_validation.PersonPreferences
-number	tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_embedded_document.Dish
-number	tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_embedded_document_choices.Dish
-number	tests/fields/fields.py	/^            number = IntField()$/;"	v	class:FieldTest.test_generic_list_embedded_document_choices.Dish
-number	tests/fields/fields.py	/^            number = IntField(default=0, db_field='i')$/;"	v	class:FieldTest.test_embedded_db_field.Embedded
-number	tests/fields/fields.py	/^            number = IntField(default=0, db_field='i')$/;"	v	class:FieldTest.test_embedded_mapfield_db_field.Embedded
-number	tests/fields/fields.py	/^            number = IntField(unique=True)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.EmbeddedWithUnique
-number	tests/fields/fields.py	/^            number = IntField(unique=True, sparse=True)$/;"	v	class:EmbeddedDocumentListFieldTestCase.test_empty_list_embedded_documents_with_unique_field.EmbeddedWithSparseUnique
-obj	mongoengine/tests/document/indexes.py	/^            obj = EmbeddedDocumentField('self')$/;"	v	class:IndexesTest.test_recursive_embedded_objects_dont_break_indexes.RecursiveObject
-object	mongoengine/mongoengine/document.py	/^    def object(self):$/;"	m	class:MapReduceDocument
-object	mongoengine/tests/fields/fields.py	/^            object = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Action
-object	tests/fields/fields.py	/^            object = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Action
-objectid_field	mongoengine/tests/document/instance.py	/^            objectid_field = ObjectIdField(default=bson.ObjectId)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-objectid_field	mongoengine/tests/document/json_serialisation.py	/^            objectid_field = ObjectIdField(default=ObjectId)$/;"	v	class:TestJson.test_json_complex.Doc
-objectid_field	mongoengine/tests/queryset/queryset.py	/^            objectid_field = ObjectIdField(default=ObjectId)$/;"	v	class:QuerySetTest.test_json_complex.Doc
-objects	mongoengine/tests/queryset/queryset.py	/^            def objects(cls, qryset):$/;"	m	class:QuerySetTest.test_custom_manager.BlogPost
-objects	mongoengine/tests/queryset/queryset.py	/^            def objects(doc_cls, queryset):$/;"	m	class:QuerySetTest.test_custom_manager_overriding_objects_works.Foo
-objects	mongoengine/tests/queryset/queryset.py	/^            def objects(klass, queryset):$/;"	m	class:QuerySetTest.test_inherit_objects.Foo
-objects	mongoengine/tests/queryset/queryset.py	/^            def objects(klass, queryset):$/;"	m	class:QuerySetTest.test_inherit_objects_override.Bar
-objects	mongoengine/tests/queryset/queryset.py	/^            def objects(klass, queryset):$/;"	m	class:QuerySetTest.test_inherit_objects_override.Foo
-objects	mongoengine/tests/queryset/queryset.py	/^            objects = CustomQuerySetManager()$/;"	v	class:QuerySetTest.test_custom_querysets_inherited_direct.Base
-objects	mongoengine/tests/queryset/queryset.py	/^            objects = CustomQuerySetManager()$/;"	v	class:QuerySetTest.test_custom_querysets_set_manager_directly.Post
-obs	mongoengine/tests/fields/fields.py	/^            obs = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
-obs	tests/fields/fields.py	/^            obs = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
-occurs	mongoengine/tests/document/instance.py	/^            occurs = ListField(EmbeddedDocumentField(Occurrence), default=list)$/;"	v	class:InstanceTest.test_invalid_son.Word
-oid_info	mongoengine/tests/fields/fields.py	/^            oid_info = ListField(ObjectIdField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
-oid_info	tests/fields/fields.py	/^            oid_info = ListField(ObjectIdField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
-on_document_pre_save	mongoengine/fields.py	/^    def on_document_pre_save(self, sender, document, created, **kwargs):$/;"	m	class:CachedReferenceField
-on_document_pre_save	mongoengine/mongoengine/fields.py	/^    def on_document_pre_save(self, sender, document, created, **kwargs):$/;"	m	class:CachedReferenceField
-only	mongoengine/mongoengine/queryset/base.py	/^    def only(self, *fields):$/;"	m	class:BaseQuerySet
-op	mongoengine/tests/queryset/queryset.py	/^            op = ops[0]$/;"	v	class:QuerySetTest.test_comment.User
-op	mongoengine/tests/queryset/queryset.py	/^            op = p.db.system.profile.find({"ns":$/;"	v	class:QuerySetTest.test_bool_with_ordering.Person
-op	mongoengine/tests/queryset/queryset.py	/^            op = q.db.system.profile.find({"ns":$/;"	v	class:QuerySetTest.test_bool_performance.Person
-op	mongoengine/tests/queryset/queryset.py	/^            op = q.db.system.profile.find({"ns":$/;"	v	class:QuerySetTest.test_bool_with_ordering.Person
-op	mongoengine/tests/queryset/queryset.py	/^            op = q.db.system.profile.find({"ns":$/;"	v	class:QuerySetTest.test_bool_with_ordering_from_meta_dict.Person
-operation	mongoengine/tests/fields/fields.py	/^            operation = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Action
-operation	tests/fields/fields.py	/^            operation = StringField()$/;"	v	class:FieldTest.test_map_field_lookup.Action
-ops	mongoengine/tests/queryset/queryset.py	/^            ops = q.get_ops()$/;"	v	class:QuerySetTest.test_comment.User
-order	mongoengine/tests/fields/fields.py	/^            order = IntField()$/;"	v	class:FieldTest.test_sorted_list_sorting.Comment
-order	tests/fields/fields.py	/^            order = IntField()$/;"	v	class:FieldTest.test_sorted_list_sorting.Comment
-order_by	mongoengine/mongoengine/queryset/base.py	/^    def order_by(self, *keys):$/;"	m	class:BaseQuerySet
-ordering	mongoengine/tests/fields/fields.py	/^                                       ordering='order')$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
-ordering	tests/fields/fields.py	/^                                       ordering='order')$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
-org	mongoengine/tests/document/delta.py	/^            org = ReferenceField('Organization', required=True)$/;"	v	class:DeltaTest.test_referenced_object_changed_attributes.User
-org	mongoengine/tests/queryset/queryset.py	/^            org = Organization.objects.get(id=o1.id)$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Project
-organization	mongoengine/tests/queryset/queryset.py	/^            organization = ObjectIdField()$/;"	v	class:QuerySetTest.test_scalar.User
-organization	mongoengine/tests/queryset/queryset.py	/^            organization = ReferenceField(Organization)$/;"	v	class:QuerySetTest.test_no_dereference.User
-orgs	mongoengine/tests/document/instance.py	/^            orgs = ListField(ReferenceField('Organization'))$/;"	v	class:InstanceTest.test_query_count_when_saving.User
-other	mongoengine/tests/test_dereference.py	/^            other = EmbeddedDocumentField(Other, default=lambda: Other())$/;"	v	class:FieldTest.test_circular_tree_reference.Person
-other_field	mongoengine/tests/fields/fields.py	/^            other_field = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Bookmark
-other_field	tests/fields/fields.py	/^            other_field = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Bookmark
-output	mongoengine/tests/queryset/queryset.py	/^            output={'reduce': 'family_map', 'db_alias': 'test2'})$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-output	mongoengine/tests/queryset/queryset.py	/^            output={'replace': 'family_map', 'db_alias': 'test2'})$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-owner	mongoengine/tests/document/delta.py	/^            owner = ReferenceField('Person')$/;"	v	class:DeltaTest.circular_reference_deltas.Organization
-owner	mongoengine/tests/document/delta.py	/^            owner = ReferenceField('Person', dbref=dbref)$/;"	v	class:DeltaTest.circular_reference_deltas_2.Organization
-owner	mongoengine/tests/fields/fields.py	/^                   owner=Owner(tags=['cool', 'funny'],$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-owner	mongoengine/tests/fields/fields.py	/^                   owner=Owner(tp='u', name="Wilson Júnior")$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-owner	mongoengine/tests/fields/fields.py	/^            owner = EmbeddedDocumentField(Owner)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
-owner	mongoengine/tests/fields/fields.py	/^            owner = EmbeddedDocumentField(Owner)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
-owner	mongoengine/tests/queryset/queryset.py	/^                owner = ReferenceField(TestPerson)$/;"	v	class:QuerySetTest.test_update_related_models.TestOrganization
-owner	mongoengine/tests/queryset/queryset.py	/^            owner = GenericReferenceField()$/;"	v	class:QuerySetTest.test_generic_reference_field_with_only_and_as_pymongo.TestActivity
-owner	mongoengine/tests/queryset/queryset.py	/^            owner = ReferenceField(Person)$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Organization
-owner	tests/fields/fields.py	/^                   owner=Owner(tags=['cool', 'funny'],$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-owner	tests/fields/fields.py	/^                   owner=Owner(tp='u', name="Wilson Júnior")$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-owner	tests/fields/fields.py	/^            owner = EmbeddedDocumentField(Owner)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
-owner	tests/fields/fields.py	/^            owner = EmbeddedDocumentField(Owner)$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
-owner_document	mongoengine/mongoengine/base/fields.py	/^    def owner_document(self):$/;"	m	class:BaseField
-owner_document	mongoengine/mongoengine/base/fields.py	/^    def owner_document(self, owner_document):$/;"	m	class:BaseField
-owns	mongoengine/tests/document/delta.py	/^            owns = ListField(ReferenceField('Organization'))$/;"	v	class:DeltaTest.circular_reference_deltas.Person
-owns	mongoengine/tests/document/delta.py	/^            owns = ListField(ReferenceField('Organization', dbref=dbref))$/;"	v	class:DeltaTest.circular_reference_deltas_2.Person
-owns	mongoengine/tests/queryset/queryset.py	/^            owns = ListField(ReferenceField('Organization'))$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Person
-p	mongoengine/tests/fields/fields.py	/^                p = Ocurrence(person="test", animal=bad).save()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.BadDoc
-p	mongoengine/tests/fields/fields.py	/^                p = Ocurrence(person="test", animal=bad).save()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.BadDoc
-p	mongoengine/tests/fields/fields.py	/^            p = Ocurrence(person="test", animal=ref).save()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.SubAnimal
-p	mongoengine/tests/fields/fields.py	/^            p = Ocurrence(person="test", animal=ref).save()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.SubAnimal
-p	mongoengine/tests/fields/fields.py	/^            p = Person(name="Person %s" % x)$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
-p	tests/fields/fields.py	/^                p = Ocurrence(person="test", animal=bad).save()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.BadDoc
-p	tests/fields/fields.py	/^                p = Ocurrence(person="test", animal=bad).save()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.BadDoc
-p	tests/fields/fields.py	/^            p = Ocurrence(person="test", animal=ref).save()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.SubAnimal
-p	tests/fields/fields.py	/^            p = Ocurrence(person="test", animal=ref).save()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.SubAnimal
-p	tests/fields/fields.py	/^            p = Person(name="Person %s" % x)$/;"	v	class:FieldTest.test_sequence_field_value_decorator.Person
-page	mongoengine/tests/document/instance.py	/^            page = EmbeddedDocumentField(Page)$/;"	v	class:InstanceTest.test_embedded_update.Site
-page	mongoengine/tests/document/instance.py	/^            page = EmbeddedDocumentField(Page)$/;"	v	class:InstanceTest.test_embedded_update_after_save.Site
-page	mongoengine/tests/document/instance.py	/^            page = EmbeddedDocumentField(Page)$/;"	v	class:InstanceTest.test_embedded_update_db_field.Site
-parameters	mongoengine/tests/document/instance.py	/^            parameters = MapField(EmbeddedDocumentField(Parameter))$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Node
-parent	mongoengine/tests/document/instance.py	/^            parent = GenericReferenceField()$/;"	v	class:InstanceTest.test_save_cascades_generically.Person
-parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_cascade_kwargs.Person
-parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_cascade_meta_false.Person
-parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_cascade_meta_true.Person
-parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_cascades.Person
-parent	mongoengine/tests/document/instance.py	/^            parent = ReferenceField('self')$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit.Person
-parent	mongoengine/tests/fields/fields.py	/^            parent = ReferenceField('self')$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
-parent	mongoengine/tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=False)$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
-parent	mongoengine/tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=False)$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
-parent	mongoengine/tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=True)$/;"	v	class:FieldTest.test_dbref_reference_fields.Person
-parent	mongoengine/tests/fields/fields.py	/^            parent=DBRef('person', 'abcdefghijklmnop')$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
-parent	mongoengine/tests/queryset/queryset.py	/^            parent = ReferenceField('self', reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_self_referencing.Category
-parent	mongoengine/tests/test_dereference.py	/^            parent = GenericReferenceField(default=None)$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
-parent	tests/fields/fields.py	/^            parent = ReferenceField('self')$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
-parent	tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=False)$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
-parent	tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=False)$/;"	v	class:FieldTest.test_objectid_reference_fields.Person
-parent	tests/fields/fields.py	/^            parent = ReferenceField('self', dbref=True)$/;"	v	class:FieldTest.test_dbref_reference_fields.Person
-parent	tests/fields/fields.py	/^            parent=DBRef('person', 'abcdefghijklmnop')$/;"	v	class:FieldTest.test_dbref_to_mongo.Person
-parents	mongoengine/tests/queryset/queryset.py	/^            parents = ListField(ReferenceField('self'))$/;"	v	class:QuerySetTest.test_add_to_set_each.Item
-parents	mongoengine/tests/test_dereference.py	/^            parents = ListField(GenericReferenceField())$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
-password	mongoengine/tests/document/indexes.py	/^            password = StringField()$/;"	v	class:IndexesTest.test_unique_and_primary.User
-password	mongoengine/tests/document/indexes.py	/^            password = StringField()$/;"	v	class:IndexesTest.test_unique_and_primary_create.User
-password	mongoengine/tests/queryset/field_list.py	/^            password = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.User
-password_hash	mongoengine/tests/queryset/queryset.py	/^             password_hash="SomeHash").save()$/;"	v	class:QuerySetTest.test_as_pymongo_json_limit_fields.User
-password_hash	mongoengine/tests/queryset/queryset.py	/^            password_hash = StringField($/;"	v	class:QuerySetTest.test_as_pymongo_json_limit_fields.User
-password_salt	mongoengine/tests/queryset/queryset.py	/^            password_salt = StringField($/;"	v	class:QuerySetTest.test_as_pymongo_json_limit_fields.User
-path	mongoengine/tests/test_dereference.py	/^            path = StringField()$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
-pay	mongoengine/tests/queryset/queryset.py	/^            pay = EmbeddedDocumentField($/;"	v	class:QuerySetTest.test_embedded_average.Doc
-pay	mongoengine/tests/queryset/queryset.py	/^            pay = EmbeddedDocumentField(Pay)$/;"	v	class:QuerySetTest.test_embedded_array_average.Doc
-pay	mongoengine/tests/queryset/queryset.py	/^            pay = EmbeddedDocumentField(Pay)$/;"	v	class:QuerySetTest.test_embedded_array_sum.Doc
-pay	mongoengine/tests/queryset/queryset.py	/^            pay = EmbeddedDocumentField(Pay)$/;"	v	class:QuerySetTest.test_embedded_sum.Doc
-people	mongoengine/tests/queryset/queryset.py	/^            people = Person.objects$/;"	v	class:QuerySetTest.test_cached_queryset.Person
-people	mongoengine/tests/queryset/queryset.py	/^            people = Person.objects.no_cache()$/;"	v	class:QuerySetTest.test_no_cached_queryset.Person
-person	mongoengine/tests/fields/fields.py	/^                    person = Person.objects.create()$/;"	v	class:FieldTest.test_decimal_storage.Person
-person	mongoengine/tests/fields/fields.py	/^            person = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
-person	mongoengine/tests/fields/fields.py	/^            person = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Ocorrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Ocurrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Ocurrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Ocurrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Ocurrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Ocurrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Ocurrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Ocurrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Ocurrence
-person	mongoengine/tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Ocurrence
-person	mongoengine/tests/test_dereference.py	/^            person = ReferenceField('Person')$/;"	v	class:FieldTest.test_circular_reference.Relation
-person	tests/fields/fields.py	/^                    person = Person.objects.create()$/;"	v	class:FieldTest.test_decimal_storage.Person
-person	tests/fields/fields.py	/^            person = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.SocialTest
-person	tests/fields/fields.py	/^            person = CachedReferenceField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Ocorrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Ocorrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Ocorrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Ocorrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Ocurrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Ocurrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Ocurrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Ocurrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Ocurrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Ocurrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Ocurrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Ocurrence
-person	tests/fields/fields.py	/^            person = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Ocurrence
-person_meta	mongoengine/tests/queryset/queryset.py	/^            person_meta = EmbeddedDocumentField(PersonMeta)$/;"	v	class:QuerySetTest.setUp.Person
-peter	mongoengine/tests/test_dereference.py	/^            peter = Employee.objects.with_id(peter.id)$/;"	v	class:FieldTest.test_recursive_reference.Employee
-peter	mongoengine/tests/test_dereference.py	/^            peter = Employee.objects.with_id(peter.id).select_related()$/;"	v	class:FieldTest.test_recursive_reference.Employee
-phone	mongoengine/tests/document/delta.py	/^            phone = StringField()$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.UInfoDocument
-phone	mongoengine/tests/queryset/queryset.py	/^            phone = EmbeddedDocumentField(Phone)$/;"	v	class:QuerySetTest.test_item_frequencies_on_embedded.Person
-photo	mongoengine/tests/fields/file_tests.py	/^            photo = FileField()$/;"	v	class:FileTest.test_file_saving.Animal
-photo	mongoengine/tests/fixtures.py	/^    photo = FileField()$/;"	v	class:NewDocumentPickleTest
-photo	mongoengine/tests/fixtures.py	/^    photo = FileField()$/;"	v	class:PickleTest
-photos	mongoengine/tests/fields/file_tests.py	/^            photos = ListField(FileField())$/;"	v	class:FileTest.test_complex_field_filefield.Animal
-picture	mongoengine/tests/document/instance.py	/^            picture = FileField()$/;"	v	class:InstanceTest.test_save_max_recursion_not_hit_with_file_field.Foo
-pk	mongoengine/mongoengine/base/datastructures.py	/^    def pk(self):$/;"	m	class:LazyReference
-pk	mongoengine/mongoengine/document.py	/^    def pk(self):$/;"	m	class:Document
-pk	mongoengine/mongoengine/document.py	/^    def pk(self, value):$/;"	m	class:Document
-playlist	mongoengine/tests/test_dereference.py	/^            playlist = Playlist.objects.first().select_related()$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.Playlist
-point	mongoengine/tests/fields/geo.py	/^            point = PointField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere.Event
-point	mongoengine/tests/fields/geo.py	/^            point = PointField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Venue
-poly	mongoengine/tests/queryset/geo.py	/^            poly = PolygonField()$/;"	v	class:GeoQueriesTest.test_geojson_PolygonField.Location
-poly	mongoengine/tests/queryset/geo.py	/^            poly = PolygonField()$/;"	v	class:GeoQueriesTest.test_polygon.Road
-poly	mongoengine/tests/queryset/transform.py	/^            poly = PolygonField()$/;"	v	class:TransformTest.test_geojson_PolygonField.Location
-polygon	mongoengine/tests/fields/geo.py	/^            polygon = PolygonField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere.Event
-polygon	mongoengine/tests/fields/geo.py	/^            polygon = PolygonField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Venue
-pop	mongoengine/mongoengine/base/datastructures.py	/^    def pop(self, *args, **kwargs):$/;"	m	class:BaseDict
-pop	mongoengine/mongoengine/base/datastructures.py	/^    def pop(self, *args, **kwargs):$/;"	m	class:BaseList
-pop	mongoengine/mongoengine/base/datastructures.py	/^    def pop(self, key, default=None):$/;"	m	class:StrictDict
-popitem	mongoengine/mongoengine/base/datastructures.py	/^    def popitem(self, *args, **kwargs):$/;"	m	class:BaseDict
-position	mongoengine/tests/document/instance.py	/^            position = StringField()$/;"	v	class:InstanceTest.test_save_embedded_document.EmployeeDetails
-position	mongoengine/tests/document/instance.py	/^            position = StringField()$/;"	v	class:InstanceTest.test_updating_an_embedded_document.EmployeeDetails
-post	mongoengine/tests/document/instance.py	/^            post = ReferenceField(BlogPost, reverse_delete_rule=CASCADE)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_recurs.Comment
-post1	mongoengine/docs/code/tumblelog.py	/^post1 = TextPost(title='Fun with MongoEngine', author=john)$/;"	v
-post1	mongoengine/tests/document/indexes.py	/^            post1 = BlogPost(title='test1', slug='test')$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
-post1	mongoengine/tests/queryset/queryset.py	/^            post1 = Post(comments=[comment1, comment2])$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-post2	mongoengine/docs/code/tumblelog.py	/^post2 = LinkPost(title='MongoEngine Documentation', author=john)$/;"	v
-post2	mongoengine/tests/document/indexes.py	/^            post2 = BlogPost(title='test2', slug='test')$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
-post2	mongoengine/tests/queryset/queryset.py	/^            post2 = Post(comments=[comment2, comment2])$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-post_bulk_insert	mongoengine/mongoengine/signals.py	/^post_bulk_insert = _signals.signal('post_bulk_insert')$/;"	v
-post_bulk_insert	mongoengine/tests/test_signals.py	/^            def post_bulk_insert(cls, sender, documents, **kwargs):$/;"	m	class:SignalTests.setUp.Author
-post_bulk_insert	mongoengine/tests/test_signals.py	/^            def post_bulk_insert(cls, sender, documents, **kwargs):$/;"	m	class:SignalTests.setUp.Post
-post_delete	mongoengine/mongoengine/signals.py	/^post_delete = _signals.signal('post_delete')$/;"	v
-post_delete	mongoengine/tests/fixtures.py	/^    def post_delete(self, sender, document, **kwargs):$/;"	m	class:PickleSignalsTest
-post_delete	mongoengine/tests/test_signals.py	/^            def post_delete(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Another
-post_delete	mongoengine/tests/test_signals.py	/^            def post_delete(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
-post_init	mongoengine/mongoengine/signals.py	/^post_init = _signals.signal('post_init')$/;"	v
-post_init	mongoengine/tests/test_signals.py	/^            def post_init(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
-post_save	mongoengine/mongoengine/signals.py	/^post_save = _signals.signal('post_save')$/;"	v
-post_save	mongoengine/tests/fixtures.py	/^    def post_save(self, sender, document, created, **kwargs):$/;"	m	class:PickleSignalsTest
-post_save	mongoengine/tests/test_signals.py	/^            def post_save(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
-post_save	mongoengine/tests/test_signals.py	/^            def post_save(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.ExplicitId
-postables	mongoengine/tests/queryset/visitor.py	/^            postables = ListField(EmbeddedDocumentField(Post))$/;"	v	class:QTest.test_chained_q_or_filtering.Item
-posts	mongoengine/tests/queryset/queryset.py	/^            posts = ListField(EmbeddedDocumentField(Post))$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-posts	mongoengine/tests/queryset/queryset.py	/^            posts = ListField(EmbeddedDocumentField(Post))$/;"	v	class:QuerySetTest.test_find_array_position.Blog
-posts	mongoengine/tests/queryset/queryset.py	/^            posts = ListField(EmbeddedDocumentField(Post))$/;"	v	class:QuerySetTest.test_update_array_position.Blog
-posts	mongoengine/tests/test_dereference.py	/^            posts = ListField(EmbeddedDocumentField(Post))$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Page
-power	mongoengine/tests/fields/fields.py	/^            power = IntField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.PowerUser
-power	tests/fields/fields.py	/^            power = IntField()$/;"	v	class:FieldTest.test_embedded_document_inheritance.PowerUser
-pre_bulk_insert	mongoengine/mongoengine/signals.py	/^pre_bulk_insert = _signals.signal('pre_bulk_insert')$/;"	v
-pre_bulk_insert	mongoengine/tests/test_signals.py	/^            def pre_bulk_insert(cls, sender, documents, **kwargs):$/;"	m	class:SignalTests.setUp.Author
-pre_bulk_insert	mongoengine/tests/test_signals.py	/^            def pre_bulk_insert(cls, sender, documents, **kwargs):$/;"	m	class:SignalTests.setUp.Post
-pre_delete	mongoengine/mongoengine/signals.py	/^pre_delete = _signals.signal('pre_delete')$/;"	v
-pre_delete	mongoengine/tests/document/instance.py	/^            def pre_delete(cls, sender, document, **kwargs):$/;"	m	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.BlogPost
-pre_delete	mongoengine/tests/test_signals.py	/^            def pre_delete(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Another
-pre_delete	mongoengine/tests/test_signals.py	/^            def pre_delete(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
-pre_init	mongoengine/mongoengine/signals.py	/^pre_init = _signals.signal('pre_init')$/;"	v
-pre_init	mongoengine/tests/test_signals.py	/^            def pre_init(cls, sender, document, *args, **kwargs):$/;"	m	class:SignalTests.setUp.Author
-pre_save	mongoengine/mongoengine/signals.py	/^pre_save = _signals.signal('pre_save')$/;"	v
-pre_save	mongoengine/tests/test_signals.py	/^            def pre_save(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
-pre_save_post_validation	mongoengine/mongoengine/signals.py	/^pre_save_post_validation = _signals.signal('pre_save_post_validation')$/;"	v
-pre_save_post_validation	mongoengine/tests/test_signals.py	/^            def pre_save_post_validation(cls, sender, document, **kwargs):$/;"	m	class:SignalTests.setUp.Author
-preferences	mongoengine/tests/fields/fields.py	/^            preferences = EmbeddedDocumentField(PersonPreferences)$/;"	v	class:FieldTest.test_embedded_document_validation.Person
-preferences	tests/fields/fields.py	/^            preferences = EmbeddedDocumentField(PersonPreferences)$/;"	v	class:FieldTest.test_embedded_document_validation.Person
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:CachedReferenceField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ComplexDateTimeField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DateTimeField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DecimalField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DictField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DynamicField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:EmbeddedDocumentField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:FloatField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:GenericEmbeddedDocumentField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:GenericReferenceField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:IntField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:LazyReferenceField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ListField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:LongField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ReferenceField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:SequenceField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:StringField
-prepare_query_value	mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:UUIDField
-prepare_query_value	mongoengine/mongoengine/base/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:BaseField
-prepare_query_value	mongoengine/mongoengine/base/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ComplexBaseField
-prepare_query_value	mongoengine/mongoengine/base/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ObjectIdField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:CachedReferenceField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ComplexDateTimeField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DateTimeField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DecimalField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DictField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:DynamicField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:EmbeddedDocumentField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:FloatField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:GenericEmbeddedDocumentField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:GenericReferenceField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:IntField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:LazyReferenceField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ListField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:LongField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:ReferenceField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:SequenceField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:StringField
-prepare_query_value	mongoengine/mongoengine/fields.py	/^    def prepare_query_value(self, op, value):$/;"	m	class:UUIDField
-price	mongoengine/tests/queryset/queryset.py	/^            price = DecimalField()$/;"	v	class:QuerySetTest.test_as_pymongo.User
-price	mongoengine/tests/queryset/queryset.py	/^            price=Decimal('2.22'),$/;"	v	class:QuerySetTest.test_as_pymongo.User
-primary_key	mongoengine/tests/queryset/queryset.py	/^                primary_key=True)$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Family
-primary_key	mongoengine/tests/queryset/queryset.py	/^                primary_key=True)$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-product_id	mongoengine/tests/queryset/queryset.py	/^            product_id = IntField(db_field='pid')$/;"	v	class:QuerySetTest.test_distinct_handles_db_field.Product
-products	mongoengine/tests/fields/fields.py	/^            products = ListField(CachedReferenceField(Product, fields=['name']))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields.Basket
-products	tests/fields/fields.py	/^            products = ListField(CachedReferenceField(Product, fields=['name']))$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_push_with_fields.Basket
-profile	mongoengine/tests/queryset/queryset.py	/^            profile = EmbeddedDocumentField(Profile)$/;"	v	class:QuerySetTest.test_scalar_embedded.Person
-project	mongoengine/docs/conf.py	/^project = u'MongoEngine'$/;"	v
-projects	mongoengine/tests/queryset/queryset.py	/^            projects = ListField(ReferenceField('Project'))$/;"	v	class:QuerySetTest.test_get_changed_fields_query_count.Person
-provider_ids	mongoengine/tests/document/indexes.py	/^            provider_ids = DictField()$/;"	v	class:IndexesTest.test_sparse_compound_indexes.MyDoc
-provider_ids	mongoengine/tests/document/indexes.py	/^            provider_ids = DictField()$/;"	v	class:IndexesTest.test_string_indexes.MyDoc
-proxy_class	mongoengine/fields.py	/^    proxy_class = GridFSProxy$/;"	v	class:FileField
-proxy_class	mongoengine/fields.py	/^    proxy_class = ImageGridFsProxy$/;"	v	class:ImageField
-proxy_class	mongoengine/mongoengine/fields.py	/^    proxy_class = GridFSProxy$/;"	v	class:FileField
-proxy_class	mongoengine/mongoengine/fields.py	/^    proxy_class = ImageGridFsProxy$/;"	v	class:ImageField
-pub_date	mongoengine/tests/document/instance.py	/^            pub_date = DateTimeField()$/;"	v	class:InstanceTest.test_document_clean.TestDocument
-publish_date	mongoengine/tests/queryset/visitor.py	/^            publish_date = DateTimeField()$/;"	v	class:QTest.test_q.BlogPost
-published	mongoengine/tests/document/instance.py	/^            published = BooleanField(default=True)$/;"	v	class:InstanceTest.test_save_only_changed_fields_recursive.Comment
-published	mongoengine/tests/queryset/queryset.py	/^            def published(doc_cls, queryset):$/;"	m	class:QuerySetTest.test_filter_chaining.BlogPost
-published	mongoengine/tests/queryset/queryset.py	/^            published = BooleanField()$/;"	v	class:QuerySetTest.test_exec_js_query.BlogPost
-published	mongoengine/tests/queryset/queryset.py	/^            published = CustomQuerySetManager()$/;"	v	class:QuerySetTest.test_custom_querysets_managers_directly.Post
-published	mongoengine/tests/queryset/visitor.py	/^            published = BooleanField()$/;"	v	class:QTest.test_q.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField()$/;"	v	class:QuerySetTest.test_clear_ordering.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField()$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField()$/;"	v	class:QuerySetTest.test_no_ordering_for_get.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField()$/;"	v	class:QuerySetTest.test_ordering.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField(required=False)$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date = DateTimeField(required=False)$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=None$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)$/;"	v	class:QuerySetTest.test_ordering.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)$/;"	v	class:QuerySetTest.test_ordering.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-published_date	mongoengine/tests/queryset/queryset.py	/^            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)$/;"	v	class:QuerySetTest.test_ordering.BlogPost
-published_date__lt	mongoengine/tests/queryset/queryset.py	/^            published_date__lt=datetime.datetime(2010, 1, 7, 0, 0, 0))$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-pull__collaborators__helpful__user	mongoengine/tests/queryset/queryset.py	/^            pull__collaborators__helpful__user='Esteban')$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
-pull__collaborators__unhelpful	mongoengine/tests/queryset/queryset.py	/^            pull__collaborators__unhelpful={'name': 'Frank'})$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Site
-pull__collaborators__unhelpful	mongoengine/tests/queryset/queryset.py	/^            pull__collaborators__unhelpful={'user': 'Frank'})$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
-pull_all__collaborators__helpful__name	mongoengine/tests/queryset/queryset.py	/^                pull_all__collaborators__helpful__name=['Ross'])$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Site
-pull_all__collaborators__helpful__user	mongoengine/tests/queryset/queryset.py	/^                pull_all__collaborators__helpful__user=['Ross'])$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Site
-pull_all__collaborators__user	mongoengine/tests/queryset/queryset.py	/^                pull_all__collaborators__user=['Ross'])$/;"	v	class:QuerySetTest.test_pull_nested.Site
-pull_all__tags	mongoengine/tests/queryset/queryset.py	/^            pull_all__tags=["mongodb", "code"])$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
-push__tags__0	mongoengine/tests/queryset/modify.py	/^            push__tags__0='python',$/;"	v	class:FindAndModifyTest.test_modify_with_push.BlogPost
-push__tags__1	mongoengine/tests/queryset/modify.py	/^            push__tags__1=['go', 'rust'],$/;"	v	class:FindAndModifyTest.test_modify_with_push.BlogPost
-push_all__tags	mongoengine/tests/queryset/queryset.py	/^            push_all__tags=["mongodb", "code"])$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
-put	mongoengine/fields.py	/^    def put(self, file_obj, **kwargs):$/;"	m	class:GridFSProxy
-put	mongoengine/fields.py	/^    def put(self, file_obj, **kwargs):$/;"	m	class:ImageGridFsProxy
-put	mongoengine/mongoengine/fields.py	/^    def put(self, file_obj, **kwargs):$/;"	m	class:GridFSProxy
-put	mongoengine/mongoengine/fields.py	/^    def put(self, file_obj, **kwargs):$/;"	m	class:ImageGridFsProxy
-pygments_style	mongoengine/docs/conf.py	/^pygments_style = 'sphinx'$/;"	v
-qs	mongoengine/tests/queryset/queryset.py	/^            qs = BlogPost.objects.filter(title='whatever').order_by('published_date')$/;"	v	class:QuerySetTest.test_clear_ordering.BlogPost
-quantity	mongoengine/tests/document/instance.py	/^            quantity = IntField()$/;"	v	class:InstanceTest.test_object_mixins.Foo
-query	mongoengine/mongoengine/queryset/transform.py	/^def query(_doc_cls=None, **kwargs):$/;"	f
-query_counter	mongoengine/mongoengine/context_managers.py	/^class query_counter(object):$/;"	c
-queryset_class	mongoengine/tests/queryset/queryset.py	/^            queryset_class = CustomQuerySet$/;"	v	class:QuerySetTest.test_custom_querysets_inherited_direct.CustomQuerySetManager
-queryset_class	mongoengine/tests/queryset/queryset.py	/^            queryset_class = CustomQuerySet$/;"	v	class:QuerySetTest.test_custom_querysets_set_manager_directly.CustomQuerySetManager
-queryset_manager	mongoengine/mongoengine/queryset/manager.py	/^def queryset_manager(func):$/;"	f
-rank	mongoengine/tests/document/indexes.py	/^            rank = EmbeddedDocumentField(Rank, required=False)$/;"	v	class:IndexesTest.test_embedded_document_index_meta.Person
-rank	mongoengine/tests/document/instance.py	/^            def rank(self):$/;"	m	class:InstanceTest.test_db_embedded_doc_field_load.Person
-rank	mongoengine/tests/document/instance.py	/^            def rank(self):$/;"	m	class:InstanceTest.test_db_field_load.Person
-rank_	mongoengine/tests/document/instance.py	/^            rank_ = EmbeddedDocumentField(Rank,$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Person
-rating	mongoengine/tests/queryset/queryset.py	/^            rating = DecimalField()$/;"	v	class:QuerySetTest.test_scalar_decimal.Person
-read	mongoengine/fields.py	/^    def read(self, size=-1):$/;"	m	class:GridFSProxy
-read	mongoengine/mongoengine/fields.py	/^    def read(self, size=-1):$/;"	m	class:GridFSProxy
-read_preference	mongoengine/mongoengine/queryset/base.py	/^    def read_preference(self, read_preference):$/;"	m	class:BaseQuerySet
-recursive	mongoengine/tests/fields/fields.py	/^            recursive = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbed
-recursive	mongoengine/tests/fields/fields.py	/^            recursive = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
-recursive	mongoengine/tests/fields/fields.py	/^            recursive = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbed
-recursive	mongoengine/tests/fields/fields.py	/^            recursive = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
-recursive	tests/fields/fields.py	/^            recursive = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbed
-recursive	tests/fields/fields.py	/^            recursive = DictField()$/;"	v	class:FieldTest.test_dictfield_dump_document.ToEmbedParent
-recursive	tests/fields/fields.py	/^            recursive = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbed
-recursive	tests/fields/fields.py	/^            recursive = DynamicField()$/;"	v	class:FieldTest.test_dynamicfield_dump_document.ToEmbedParent
-recursive_obj	mongoengine/tests/document/indexes.py	/^            recursive_obj = EmbeddedDocumentField(RecursiveObject)$/;"	v	class:IndexesTest.test_recursive_embedded_objects_dont_break_indexes.RecursiveDocument
-reduce_f	mongoengine/tests/queryset/queryset.py	/^            reduce_f=reduce_f,$/;"	v	class:QuerySetTest.test_map_reduce_custom_output.Person
-ref	mongoengine/tests/document/instance.py	/^            ref = ReferenceField(Test)$/;"	v	class:InstanceTest.test_embedded_document_equality.Embedded
-ref	mongoengine/tests/fields/fields.py	/^            ref = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_filter_by_dbref.Doc
-ref	mongoengine/tests/fields/fields.py	/^            ref = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_filter_by_objectid.Doc
-ref	mongoengine/tests/fields/fields.py	/^            ref = ReferenceField(Foo)$/;"	v	class:FieldTest.test_reference_miss.Bar
-ref	mongoengine/tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_invalid_operators.BlogPost
-ref	mongoengine/tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
-ref	mongoengine/tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_manipulative_operators.BlogPost
-ref	mongoengine/tests/queryset/queryset.py	/^            ref = ReferenceField(A)$/;"	v	class:QuerySetTest.test_chaining.B
-ref	mongoengine/tests/test_context_managers.py	/^            ref = ReferenceField(User, dbref=False)$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_object_id.Group
-ref	mongoengine/tests/test_context_managers.py	/^            ref = ReferenceField(User, dbref=True)$/;"	v	class:ContextManagersTest.test_no_dereference_context_manager_dbref.Group
-ref	tests/fields/fields.py	/^            ref = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_filter_by_dbref.Doc
-ref	tests/fields/fields.py	/^            ref = GenericReferenceField()$/;"	v	class:FieldTest.test_generic_reference_filter_by_objectid.Doc
-ref	tests/fields/fields.py	/^            ref = ReferenceField(Foo)$/;"	v	class:FieldTest.test_reference_miss.Bar
-ref	tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_invalid_operators.BlogPost
-ref	tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
-ref	tests/fields/fields.py	/^            ref = StringField()$/;"	v	class:FieldTest.test_list_field_manipulative_operators.BlogPost
-ref_id	mongoengine/tests/document/indexes.py	/^            ref_id = StringField()$/;"	v	class:IndexesTest.test_hashed_indexes.Book
-reference	mongoengine/tests/document/validation.py	/^            reference = ReferenceField('self')$/;"	v	class:ValidatorErrorTest.test_parent_reference_in_child_document.Parent
-reference	mongoengine/tests/document/validation.py	/^            reference = ReferenceField('self')$/;"	v	class:ValidatorErrorTest.test_parent_reference_set_as_attribute_in_child_document.Parent
-reference	mongoengine/tests/queryset/queryset.py	/^            reference = ReferenceField('self', reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_complex_cycle.Dummy
-reference	mongoengine/tests/queryset/queryset.py	/^            reference = ReferenceField('self', reverse_delete_rule=CASCADE)$/;"	v	class:QuerySetTest.test_reverse_delete_rule_cascade_cycle.Dummy
-reference_field	mongoengine/tests/document/instance.py	/^            reference_field = ReferenceField(Simple, default=lambda:$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-reference_field	mongoengine/tests/document/json_serialisation.py	/^            reference_field = ReferenceField(Simple, default=lambda:$/;"	v	class:TestJson.test_json_complex.Doc
-reference_field	mongoengine/tests/queryset/queryset.py	/^            reference_field = ReferenceField($/;"	v	class:QuerySetTest.test_json_complex.Doc
-register_connection	mongoengine/mongoengine/connection.py	/^def register_connection(alias, db=None, name=None, host=None, port=None,$/;"	f
-register_delete_rule	mongoengine/mongoengine/document.py	/^    def register_delete_rule(cls, document_cls, field_name, rule):$/;"	m	class:Document
-relations	mongoengine/tests/test_dereference.py	/^            relations = ListField(EmbeddedDocumentField('Relation'))$/;"	v	class:FieldTest.test_circular_reference.Person
-relations	mongoengine/tests/test_dereference.py	/^            relations = ListField(ReferenceField('self'))$/;"	v	class:FieldTest.test_circular_reference_on_self.Person
-release	mongoengine/docs/conf.py	/^release = mongoengine.get_version()$/;"	v
-reload	mongoengine/mongoengine/document.py	/^    def reload(self, *args, **kwargs):$/;"	m	class:EmbeddedDocument
-reload	mongoengine/mongoengine/document.py	/^    def reload(self, *fields, **kwargs):$/;"	m	class:Document
-remove	mongoengine/mongoengine/base/datastructures.py	/^    def remove(self, *args, **kwargs):$/;"	m	class:BaseList
-replace	mongoengine/fields.py	/^    def replace(self, file_obj, **kwargs):$/;"	m	class:GridFSProxy
-replace	mongoengine/mongoengine/fields.py	/^    def replace(self, file_obj, **kwargs):$/;"	m	class:GridFSProxy
-required	mongoengine/tests/document/instance.py	/^                                          required=False,$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Person
-required	mongoengine/tests/document/instance.py	/^                                      required=True)$/;"	v	class:InstanceTest.test_embedded_update.Page
-required	mongoengine/tests/document/instance.py	/^                                      required=True)$/;"	v	class:InstanceTest.test_embedded_update_after_save.Page
-required	mongoengine/tests/document/instance.py	/^                                      required=True)$/;"	v	class:InstanceTest.test_embedded_update_db_field.Page
-required	mongoengine/tests/document/instance.py	/^                                  required=True)$/;"	v	class:InstanceTest.test_list_search_by_embedded.Comment
-reset	mongoengine/mongoengine/queryset/field_list.py	/^    def reset(self):$/;"	m	class:QueryFieldList
-reset_post	mongoengine/tests/fields/fields.py	/^        def reset_post():$/;"	f	function:FieldTest.test_list_field_manipulative_operators
-reset_post	tests/fields/fields.py	/^        def reset_post():$/;"	f	function:FieldTest.test_list_field_manipulative_operators
-reverse	mongoengine/mongoengine/base/datastructures.py	/^    def reverse(self, *args, **kwargs):$/;"	m	class:BaseList
-reverse_delete_rule	mongoengine/tests/document/instance.py	/^                        reverse_delete_rule=NULLIFY))$/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
-reverse_delete_rule	mongoengine/tests/queryset/queryset.py	/^                                               reverse_delete_rule=PULL))$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull.BlogPost
-reverse_delete_rule	mongoengine/tests/queryset/queryset.py	/^                                               reverse_delete_rule=PULL))$/;"	v	class:QuerySetTest.test_reverse_delete_rule_pull_on_abstract_documents.AbstractBlogPost
-review_queue	mongoengine/tests/document/instance.py	/^            review_queue = IntField(default=0)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_triggers_pre_delete_signal.Editor
-reviewer	mongoengine/tests/document/instance.py	/^            reviewer = ReferenceField(User, reverse_delete_rule=NULLIFY)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_custom_id_field.Book
-reviewer	mongoengine/tests/document/instance.py	/^            reviewer = ReferenceField(self.Person, reverse_delete_rule=NULLIFY)$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify.BlogPost
-reviewer	mongoengine/tests/document/instance.py	/^            reviewer = ReferenceField(self.Person, reverse_delete_rule=NULLIFY)$/;"	v	class:InstanceTest.test_reverse_delete_rule_with_document_inheritance.BlogPost
-reviewers	mongoengine/tests/document/instance.py	/^                reviewers = DictField($/;"	v	class:InstanceTest.test_invalid_reverse_delete_rule_raise_errors.Blog
-reviewers	mongoengine/tests/document/instance.py	/^            reviewers = ListField(ReferenceField($/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_and_nullify_complex_field.BlogPost
-rewind	mongoengine/mongoengine/queryset/base.py	/^    def rewind(self):$/;"	m	class:BaseQuerySet
-roles	mongoengine/tests/document/delta.py	/^            roles = MapField(field=EmbeddedDocumentField(EmbeddedRole))$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedUser
-rolist	mongoengine/tests/document/delta.py	/^            rolist = ListField(field=EmbeddedDocumentField(EmbeddedRole))$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedUser
-s	mongoengine/tests/document/instance.py	/^            s = Stats()$/;"	v	class:InstanceTest.test_reference_inheritance.CompareStats
-s	mongoengine/tests/queryset/queryset.py	/^            s = StringField()$/;"	v	class:QuerySetTest.test_batch_size.A
-s	mongoengine/tests/queryset/queryset.py	/^            s = StringField()$/;"	v	class:QuerySetTest.test_chaining.A
-s	mongoengine/tests/queryset/queryset.py	/^            s = StringField()$/;"	v	class:QuerySetTest.test_none.A
-salary	mongoengine/tests/document/dynamic.py	/^            salary = IntField()$/;"	v	class:DynamicTest.test_inheritance.Employee
-salary	mongoengine/tests/document/inheritance.py	/^            salary = IntField()$/;"	v	class:InheritanceTest.test_inheritance_meta_data.Employee
-salary	mongoengine/tests/document/inheritance.py	/^            salary = IntField()$/;"	v	class:InheritanceTest.test_inheritance_to_mongo_keys.Employee
-salary	mongoengine/tests/document/instance.py	/^            salary = IntField()$/;"	v	class:InstanceTest.test_embedded_document_to_mongo.Employee
-salary	mongoengine/tests/document/instance.py	/^            salary = IntField()$/;"	v	class:InstanceTest.test_save_embedded_document.Employee
-salary	mongoengine/tests/document/instance.py	/^            salary = IntField()$/;"	v	class:InstanceTest.test_updating_an_embedded_document.Employee
-salary	mongoengine/tests/fields/fields.py	/^            salary = DecimalField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.PersonAuto
-salary	mongoengine/tests/queryset/field_list.py	/^            salary = IntField(db_field='wage')$/;"	v	class:OnlyExcludeAllTest.test_only.Employee
-salary	tests/fields/fields.py	/^            salary = DecimalField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_decimal.PersonAuto
-save	mongoengine/mongoengine/base/datastructures.py	/^    def save(self, *args, **kwargs):$/;"	m	class:EmbeddedDocumentList
-save	mongoengine/mongoengine/document.py	/^    def save(self, *args, **kwargs):$/;"	m	class:EmbeddedDocument
-save	mongoengine/mongoengine/document.py	/^    def save(self, force_insert=False, validate=True, clean=True,$/;"	m	class:Document
-save	mongoengine/tests/document/instance.py	/^            def save(self, *args, **kwargs):$/;"	m	class:InstanceTest.test_complex_nesting_document_and_embedded_document.NodesSystem
-save_id	mongoengine/tests/document/instance.py	/^            save_id = UUIDField()$/;"	v	class:InstanceTest.test_save_atomicity_condition.Widget
-scalar	mongoengine/mongoengine/queryset/base.py	/^    def scalar(self, *fields):$/;"	m	class:BaseQuerySet
-scope	mongoengine/tests/queryset/queryset.py	/^                                     scope=scope)$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-score	mongoengine/tests/queryset/queryset.py	/^            score = IntField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.Vote
-search_text	mongoengine/mongoengine/queryset/base.py	/^    def search_text(self, text, language=None):$/;"	m	class:BaseQuerySet
-select_related	mongoengine/mongoengine/document.py	/^    def select_related(self, max_depth=1):$/;"	m	class:Document
-select_related	mongoengine/mongoengine/queryset/base.py	/^    def select_related(self, max_depth=1):$/;"	m	class:BaseQuerySet
-send	mongoengine/mongoengine/signals.py	/^        send = lambda *a, **kw: None  # noqa$/;"	v	class:_FakeSignal
-sender	mongoengine/tests/queryset/field_list.py	/^            sender = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
-sender	mongoengine/tests/queryset/field_list.py	/^            sender = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
-sequence_field	mongoengine/tests/document/instance.py	/^            sequence_field = SequenceField()$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-sequence_field	mongoengine/tests/document/json_serialisation.py	/^            sequence_field = SequenceField()$/;"	v	class:TestJson.test_json_complex.Doc
-sequence_field	mongoengine/tests/queryset/queryset.py	/^            sequence_field = SequenceField()$/;"	v	class:QuerySetTest.test_json_complex.Doc
-setUp	mongoengine/tests/all_warnings/__init__.py	/^    def setUp(self):$/;"	m	class:AllWarnings
-setUp	mongoengine/tests/document/class_methods.py	/^    def setUp(self):$/;"	m	class:ClassMethodsTest
-setUp	mongoengine/tests/document/delta.py	/^    def setUp(self):$/;"	m	class:DeltaTest
-setUp	mongoengine/tests/document/dynamic.py	/^    def setUp(self):$/;"	m	class:DynamicTest
-setUp	mongoengine/tests/document/indexes.py	/^    def setUp(self):$/;"	m	class:IndexesTest
-setUp	mongoengine/tests/document/inheritance.py	/^    def setUp(self):$/;"	m	class:InheritanceTest
-setUp	mongoengine/tests/document/instance.py	/^    def setUp(self):$/;"	m	class:InstanceTest
-setUp	mongoengine/tests/document/json_serialisation.py	/^    def setUp(self):$/;"	m	class:TestJson
-setUp	mongoengine/tests/document/validation.py	/^    def setUp(self):$/;"	m	class:ValidatorErrorTest
-setUp	mongoengine/tests/fields/fields.py	/^    def setUp(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-setUp	mongoengine/tests/fields/geo.py	/^    def setUp(self):$/;"	m	class:GeoFieldTest
-setUp	mongoengine/tests/queryset/field_list.py	/^    def setUp(self):$/;"	m	class:OnlyExcludeAllTest
-setUp	mongoengine/tests/queryset/modify.py	/^    def setUp(self):$/;"	m	class:FindAndModifyTest
-setUp	mongoengine/tests/queryset/pickable.py	/^    def setUp(self):$/;"	m	class:TestQuerysetPickable
-setUp	mongoengine/tests/queryset/queryset.py	/^    def setUp(self):$/;"	m	class:QuerySetTest
-setUp	mongoengine/tests/queryset/transform.py	/^    def setUp(self):$/;"	m	class:TransformTest
-setUp	mongoengine/tests/queryset/visitor.py	/^    def setUp(self):$/;"	m	class:QTest
-setUp	mongoengine/tests/test_datastructures.py	/^    def setUp(self):$/;"	m	class:TestStrictDict
-setUp	mongoengine/tests/test_replicaset_connection.py	/^    def setUp(self):$/;"	m	class:ConnectionTest
-setUp	mongoengine/tests/test_signals.py	/^    def setUp(self):$/;"	m	class:SignalTests
-setUp	tests/fields/fields.py	/^    def setUp(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-setUpClass	mongoengine/tests/test_dereference.py	/^    def setUpClass(cls):$/;"	m	class:FieldTest
-setUpClass	mongoengine/tests/utils.py	/^    def setUpClass(cls):$/;"	m	class:MongoDBTestCase
-set__authors	mongoengine/tests/queryset/queryset.py	/^            set__authors=[Author(name="Harry"),$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Message
-set__authors__S	mongoengine/tests/queryset/queryset.py	/^            set__authors__S=Author(name="Ross"))$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Message
-set__bar	mongoengine/tests/queryset/queryset.py	/^            set__bar=Bar(name='test'), upsert=True)$/;"	v	class:QuerySetTest.test_set_generic_embedded_documents.User
-set__comments__S__votes	mongoengine/tests/queryset/queryset.py	/^            set__comments__S__votes=Vote(score=4))$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.BlogPost
-set__comp_dt_fld	mongoengine/tests/fields/fields.py	/^            set__comp_dt_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-set__comp_dt_fld	tests/fields/fields.py	/^            set__comp_dt_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-set__flt_fld	mongoengine/tests/fields/fields.py	/^            set__flt_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-set__flt_fld	tests/fields/fields.py	/^            set__flt_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-set__int_fld	mongoengine/tests/fields/fields.py	/^            set__int_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-set__int_fld	tests/fields/fields.py	/^            set__int_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-set__mapping	mongoengine/tests/fields/fields.py	/^            set__mapping={"someint": IntegerSetting(value=10)})$/;"	v	class:FieldTest.test_dictfield_complex.Simple
-set__mapping	tests/fields/fields.py	/^            set__mapping={"someint": IntegerSetting(value=10)})$/;"	v	class:FieldTest.test_dictfield_complex.Simple
-set__mapping__2__list__1	mongoengine/tests/fields/fields.py	/^            set__mapping__2__list__1=StringSetting(value='Boo'))$/;"	v	class:FieldTest.test_list_field_complex.Simple
-set__mapping__2__list__1	tests/fields/fields.py	/^            set__mapping__2__list__1=StringSetting(value='Boo'))$/;"	v	class:FieldTest.test_list_field_complex.Simple
-set__mapping__nested_dict__list__1	mongoengine/tests/fields/fields.py	/^            set__mapping__nested_dict__list__1=StringSetting(value='Boo'))$/;"	v	class:FieldTest.test_dictfield_complex.Simple
-set__mapping__nested_dict__list__1	tests/fields/fields.py	/^            set__mapping__nested_dict__list__1=StringSetting(value='Boo'))$/;"	v	class:FieldTest.test_dictfield_complex.Simple
-set__members	mongoengine/tests/queryset/queryset.py	/^            set__members={"John": Member(gender="F", age=14)})$/;"	v	class:QuerySetTest.test_mapfield_update.Club
-set__members	mongoengine/tests/queryset/queryset.py	/^            set__members={"John": {'gender': 'F', 'age': 14}})$/;"	v	class:QuerySetTest.test_dictfield_update.Club
-set__posts__1__comments__1__name	mongoengine/tests/queryset/queryset.py	/^            set__posts__1__comments__1__name='testc')$/;"	v	class:QuerySetTest.test_update_array_position.Blog
-set__str_fld	mongoengine/tests/fields/fields.py	/^            set__str_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-set__str_fld	tests/fields/fields.py	/^            set__str_fld=None,$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-set_next_value	mongoengine/fields.py	/^    def set_next_value(self, value):$/;"	m	class:SequenceField
-set_next_value	mongoengine/mongoengine/fields.py	/^    def set_next_value(self, value):$/;"	m	class:SequenceField
-setdefault	mongoengine/mongoengine/base/datastructures.py	/^    def setdefault(self, *args, **kwargs):$/;"	m	class:BaseDict
-shape	mongoengine/tests/queryset/queryset.py	/^            shape = StringField()$/;"	v	class:QuerySetTest.test_elem_match.Foo
-shard_1	mongoengine/tests/document/indexes.py	/^            shard_1 = StringField()$/;"	v	class:IndexesTest.test_compound_index_underscore_cls_not_overwritten.TestDoc
-sibling	mongoengine/tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_abstract_reference_base_type.Brother
-sibling	mongoengine/tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_reference_abstract_class.Brother
-sibling	mongoengine/tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Brother
-sibling	tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_abstract_reference_base_type.Brother
-sibling	tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_reference_abstract_class.Brother
-sibling	tests/fields/fields.py	/^            sibling = ReferenceField(Sibling)$/;"	v	class:FieldTest.test_reference_class_with_abstract_parent.Brother
-signal	mongoengine/mongoengine/signals.py	/^        def signal(self, name, doc=None):$/;"	m	class:Namespace
-signal_output	mongoengine/tests/test_signals.py	/^signal_output = []$/;"	v
-signals_available	mongoengine/mongoengine/signals.py	/^    signals_available = True$/;"	v
-signals_available	mongoengine/mongoengine/signals.py	/^signals_available = False$/;"	v
-size	mongoengine/fields.py	/^    def size(self):$/;"	m	class:ImageGridFsProxy
-size	mongoengine/mongoengine/fields.py	/^    def size(self):$/;"	m	class:ImageGridFsProxy
-size	mongoengine/tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_accept_possible_value.Shirt
-size	mongoengine/tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_allow_no_value.Shirt
-size	mongoengine/tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_reject_unknown_value.Shirt
-size	mongoengine/tests/fields/fields.py	/^            size = StringField(choices={'M', 'L'})$/;"	v	class:FieldTest.test_choices_allow_using_sets_as_choices.Shirt
-size	mongoengine/tests/fields/fields.py	/^            size = StringField(max_length=3, choices=($/;"	v	class:FieldTest.test_choices_get_field_display.Shirt
-size	mongoengine/tests/fields/fields.py	/^            size = StringField(max_length=3, choices=SIZES)$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
-size	mongoengine/tests/fields/fields.py	/^            size = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-size	mongoengine/tests/fields/fields.py	/^            size = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_validation.Shirt
-size	mongoengine/tests/queryset/queryset.py	/^            size = ReferenceField(Size)$/;"	v	class:QuerySetTest.test_can_have_field_same_name_as_query_operator.Example
-size	tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_accept_possible_value.Shirt
-size	tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_allow_no_value.Shirt
-size	tests/fields/fields.py	/^            size = StringField(choices=('S', 'M'))$/;"	v	class:FieldTest.test_choices_validation_reject_unknown_value.Shirt
-size	tests/fields/fields.py	/^            size = StringField(choices={'M', 'L'})$/;"	v	class:FieldTest.test_choices_allow_using_sets_as_choices.Shirt
-size	tests/fields/fields.py	/^            size = StringField(max_length=3, choices=($/;"	v	class:FieldTest.test_choices_get_field_display.Shirt
-size	tests/fields/fields.py	/^            size = StringField(max_length=3, choices=SIZES)$/;"	v	class:FieldTest.test_simple_choices_validation_invalid_value.Shirt
-size	tests/fields/fields.py	/^            size = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-size	tests/fields/fields.py	/^            size = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_validation.Shirt
-skip	mongoengine/mongoengine/queryset/base.py	/^    def skip(self, n):$/;"	m	class:BaseQuerySet
-skip_pymongo3	mongoengine/tests/utils.py	/^def skip_pymongo3(f):$/;"	f
-slave_okay	mongoengine/mongoengine/queryset/base.py	/^    def slave_okay(self, enabled):$/;"	m	class:BaseQuerySet
-slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
-slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_unique.BlogPost
-slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_unique_embedded_document.SubDocument
-slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_unique_embedded_document_in_list.SubDocument
-slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique=True)$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.SubDocument
-slug	mongoengine/tests/document/indexes.py	/^            slug = StringField(unique_with='date.year')$/;"	v	class:IndexesTest.test_unique_with.BlogPost
-slug	mongoengine/tests/document/instance.py	/^            slug = StringField()$/;"	v	class:InstanceTest.test_push_nested_list.BlogPost
-slug	mongoengine/tests/document/instance.py	/^            slug = StringField()$/;"	v	class:InstanceTest.test_push_with_position.BlogPost
-slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_editting_embedded_objects.BlogPost
-slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_update_one_pop_generic_reference.BlogPost
-slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
-slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_update_push_list_of_list.BlogPost
-slug	mongoengine/tests/queryset/queryset.py	/^            slug = StringField()$/;"	v	class:QuerySetTest.test_update_push_with_position.BlogPost
-snapshot	mongoengine/mongoengine/queryset/base.py	/^    def snapshot(self, enabled):$/;"	m	class:BaseQuerySet
-some	mongoengine/tests/queryset/field_list.py	/^            some = BooleanField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.VariousData
-some_long	mongoengine/tests/fields/fields.py	/^            some_long = LongField()$/;"	v	class:FieldTest.test_long_field_is_considered_as_int64.TestLongFieldConsideredAsInt64
-some_long	tests/fields/fields.py	/^            some_long = LongField()$/;"	v	class:FieldTest.test_long_field_is_considered_as_int64.TestLongFieldConsideredAsInt64
-song	mongoengine/tests/test_dereference.py	/^            song = ReferenceField("Song")$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.PlaylistItem
-songs	mongoengine/tests/test_dereference.py	/^            songs = [item.song for item in playlist.items]$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.Playlist
-sort	mongoengine/mongoengine/base/datastructures.py	/^    def sort(self, *args, **kwargs):$/;"	m	class:BaseList
-sorted_list_field	mongoengine/tests/document/instance.py	/^            sorted_list_field = SortedListField(IntField(),$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-sorted_list_field	mongoengine/tests/document/json_serialisation.py	/^            sorted_list_field = SortedListField(IntField(),$/;"	v	class:TestJson.test_json_complex.Doc
-sorted_list_field	mongoengine/tests/queryset/queryset.py	/^            sorted_list_field = SortedListField(IntField(),$/;"	v	class:QuerySetTest.test_json_complex.Doc
-source_suffix	mongoengine/docs/conf.py	/^source_suffix = '.rst'$/;"	v
-staffs_with_position	mongoengine/tests/test_dereference.py	/^            staffs_with_position = ListField(DictField())$/;"	v	class:FieldTest.test_dict_in_dbref_instance.Room
-start_listener	mongoengine/fields.py	/^    def start_listener(self):$/;"	m	class:CachedReferenceField
-start_listener	mongoengine/mongoengine/fields.py	/^    def start_listener(self):$/;"	m	class:CachedReferenceField
-state	mongoengine/tests/queryset/queryset.py	/^            state = GenericReferenceField()$/;"	v	class:QuerySetTest.test_scalar_generic_reference_field.Person
-state	mongoengine/tests/queryset/queryset.py	/^            state = ReferenceField(State)$/;"	v	class:QuerySetTest.test_scalar_reference_field.Person
-stats	mongoengine/tests/document/instance.py	/^            stats = ListField(ReferenceField(Stats))$/;"	v	class:InstanceTest.test_reference_inheritance.CompareStats
-status	mongoengine/tests/document/instance.py	/^            status = StringField()$/;"	v	class:InstanceTest.test_document_clean.TestDocument
-status	mongoengine/tests/document/instance.py	/^            status = StringField()$/;"	v	class:InstanceTest.test_document_embedded_clean.TestDocument
-stem	mongoengine/tests/document/instance.py	/^            stem = StringField()$/;"	v	class:InstanceTest.test_invalid_son.Word
-stored	mongoengine/tests/fields/fields.py	/^            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-stored	tests/fields/fields.py	/^            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']$/;"	v	class:FieldTest.test_complexdatetime_storage.LogEntry
-str_f	mongoengine/tests/queryset/queryset.py	/^            str_f = StringField()$/;"	v	class:QuerySetTest.test_update_validate.Doc
-str_f	mongoengine/tests/queryset/queryset.py	/^            str_f = StringField()$/;"	v	class:QuerySetTest.test_update_validate.EmDoc
-str_fld	mongoengine/tests/document/instance.py	/^            str_fld = StringField(null=True)$/;"	v	class:InstanceTest.test_null_field.User
-str_fld	mongoengine/tests/fields/fields.py	/^            str_fld = StringField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-str_fld	mongoengine/tests/fields/fields.py	/^            str_fld = StringField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
-str_fld	tests/fields/fields.py	/^            str_fld = StringField()$/;"	v	class:FieldTest.test_not_required_handles_none_in_update.HandleNoneFields
-str_fld	tests/fields/fields.py	/^            str_fld = StringField(required=True)$/;"	v	class:FieldTest.test_not_required_handles_none_from_database.HandleNoneFields
-strict_dict_class	mongoengine/tests/test_datastructures.py	/^    def strict_dict_class(self, *args, **kwargs):$/;"	m	class:TestStrictDict
-string	mongoengine/tests/document/instance.py	/^            string = StringField()$/;"	v	class:InstanceTest.test_embedded_document_complex_instance.Embedded
-string	mongoengine/tests/document/instance.py	/^            string = StringField()$/;"	v	class:InstanceTest.test_embedded_document_instance.Embedded
-string	mongoengine/tests/document/instance.py	/^            string = StringField(db_field='s')$/;"	v	class:InstanceTest.test_embedded_document_complex_instance_no_use_db_field.Embedded
-string	mongoengine/tests/document/json_serialisation.py	/^            string = StringField()$/;"	v	class:TestJson.test_json_simple.Doc
-string	mongoengine/tests/document/json_serialisation.py	/^            string = StringField()$/;"	v	class:TestJson.test_json_simple.Embedded
-string	mongoengine/tests/document/json_serialisation.py	/^            string = StringField(db_field='s')$/;"	v	class:TestJson.test_json_names.Doc
-string	mongoengine/tests/document/json_serialisation.py	/^            string = StringField(db_field='s')$/;"	v	class:TestJson.test_json_names.Embedded
-string	mongoengine/tests/fixtures.py	/^    string = StringField(choices=(('One', '1'), ('Two', '2')))$/;"	v	class:NewDocumentPickleTest
-string	mongoengine/tests/fixtures.py	/^    string = StringField(choices=(('One', '1'), ('Two', '2')))$/;"	v	class:PickleSignalsTest
-string	mongoengine/tests/fixtures.py	/^    string = StringField(choices=(('One', '1'), ('Two', '2')))$/;"	v	class:PickleTest
-string	mongoengine/tests/queryset/queryset.py	/^            string = StringField()$/;"	v	class:QuerySetTest.test_json_simple.Doc
-string	mongoengine/tests/queryset/queryset.py	/^            string = StringField()$/;"	v	class:QuerySetTest.test_json_simple.Embedded
-string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField()$/;"	v	class:DeltaTest.delta.Doc
-string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField()$/;"	v	class:DeltaTest.delta_recursive.Doc
-string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField()$/;"	v	class:DeltaTest.delta_recursive.Embedded
-string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField(db_field='db_string_field')$/;"	v	class:DeltaTest.delta_db_field.Doc
-string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField(db_field='db_string_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Doc
-string_field	mongoengine/tests/document/delta.py	/^            string_field = StringField(db_field='db_string_field')$/;"	v	class:DeltaTest.delta_recursive_db_field.Embedded
-string_field	mongoengine/tests/document/instance.py	/^            string_field = StringField(default='1')$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-string_field	mongoengine/tests/document/json_serialisation.py	/^            string_field = StringField(default='1')$/;"	v	class:TestJson.test_json_complex.Doc
-string_field	mongoengine/tests/queryset/queryset.py	/^            string_field = StringField(default='1')$/;"	v	class:QuerySetTest.test_json_complex.Doc
-string_value	mongoengine/tests/fields/fields.py	/^            string_value = DecimalField(precision=4, force_string=True)$/;"	v	class:FieldTest.test_decimal_storage.Person
-string_value	tests/fields/fields.py	/^            string_value = DecimalField(precision=4, force_string=True)$/;"	v	class:FieldTest.test_decimal_storage.Person
-style	mongoengine/tests/fields/fields.py	/^            style = StringField(max_length=3, choices=($/;"	v	class:FieldTest.test_choices_get_field_display.Shirt
-style	mongoengine/tests/fields/fields.py	/^            style = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-style	tests/fields/fields.py	/^            style = StringField(max_length=3, choices=($/;"	v	class:FieldTest.test_choices_get_field_display.Shirt
-style	tests/fields/fields.py	/^            style = StringField(max_length=3,$/;"	v	class:FieldTest.test_simple_choices_get_field_display.Shirt
-sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2009, slug="test"))$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
-sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2009, slug="test"))$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
-sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2009, slug='test-1'))$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
-sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2010, slug='another-slug'))$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
-sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2010, slug='another-slug'))$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
-sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2010, slug='test'))$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
-sub	mongoengine/tests/document/indexes.py	/^                         sub=SubDocument(year=2010, slug='test'))$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
-sub	mongoengine/tests/document/indexes.py	/^            sub = EmbeddedDocumentField(SubDocument)$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
-sub	mongoengine/tests/document/indexes.py	/^            sub = EmbeddedDocumentField(SubDocument)$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
-sub	mongoengine/tests/document/instance.py	/^            sub = UserSubscription(user=u1.pk, feed=f1.pk)$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
-sub	mongoengine/tests/document/instance.py	/^            sub = UserSubscription(user=user, feed=feed)$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
-sub	mongoengine/tests/document/instance.py	/^            sub = UserSubscription.objects.first()$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
-subclasses_and_unique_keys_works	mongoengine/tests/document/instance.py	/^    def subclasses_and_unique_keys_works(self):$/;"	m	class:InstanceTest
-subject	mongoengine/tests/queryset/field_list.py	/^            subject = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
-subject	mongoengine/tests/queryset/field_list.py	/^            subject = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
-submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=10)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=13)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=2)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=4)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=5)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-submitted	mongoengine/tests/queryset/queryset.py	/^             submitted=now - datetime.timedelta(hours=6)).save()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-submitted	mongoengine/tests/queryset/queryset.py	/^            submitted = DateTimeField(db_field='sTime')$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-subs	mongoengine/tests/document/delta.py	/^            subs = MapField(EmbeddedDocumentField(EmbeddedDoc))$/;"	v	class:DeltaTest.test_lower_level_mark_as_changed.MyDoc
-subs	mongoengine/tests/document/delta.py	/^            subs = MapField(EmbeddedDocumentField(EmbeddedDoc))$/;"	v	class:DeltaTest.test_upper_level_mark_as_changed.MyDoc
-subs	mongoengine/tests/document/delta.py	/^            subs = MapField(MapField(EmbeddedDocumentField(EmbeddedDoc)))$/;"	v	class:DeltaTest.test_nested_nested_fields_mark_as_changed.MyDoc
-subs	mongoengine/tests/document/indexes.py	/^            subs = ListField(EmbeddedDocumentField(SubDocument))$/;"	v	class:IndexesTest.test_unique_embedded_document_in_list.BlogPost
-sum	mongoengine/mongoengine/queryset/base.py	/^    def sum(self, field):$/;"	m	class:BaseQuerySet
-superphylum	mongoengine/tests/document/instance.py	/^            superphylum = EmbeddedDocumentField(SuperPhylum)$/;"	v	class:InstanceTest.test_reload_sharded_nested.Animal
-superphylum	mongoengine/tests/document/instance.py	/^            superphylum = StringField()$/;"	v	class:InstanceTest.test_reload_sharded.Animal
-switch_collection	mongoengine/mongoengine/context_managers.py	/^class switch_collection(object):$/;"	c
-switch_collection	mongoengine/mongoengine/document.py	/^    def switch_collection(self, collection_name, keep_created=True):$/;"	m	class:Document
-switch_db	mongoengine/mongoengine/context_managers.py	/^class switch_db(object):$/;"	c
-switch_db	mongoengine/mongoengine/document.py	/^    def switch_db(self, db_alias, keep_created=True):$/;"	m	class:Document
-sync_all	mongoengine/fields.py	/^    def sync_all(self):$/;"	m	class:CachedReferenceField
-sync_all	mongoengine/mongoengine/fields.py	/^    def sync_all(self):$/;"	m	class:CachedReferenceField
-t	mongoengine/benchmark.py	/^    t = timeit.Timer(stmt=stmt, setup=setup)$/;"	v
-t	mongoengine/tests/fields/file_tests.py	/^            t = TestImage()$/;"	v	class:FileTest.test_image_field.TestImage
-t	mongoengine/tests/queryset/queryset.py	/^            t = Number(n=i)$/;"	v	class:QuerySetTest.test_clone.Number
-t	mongoengine/tests/queryset/queryset.py	/^            t = Number2(n=i)$/;"	v	class:QuerySetTest.test_using.Number2
-t	mongoengine/tests/queryset/visitor.py	/^            t = TestDoc(x=i)$/;"	v	class:QTest.test_q_clone.TestDoc
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_equality.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
-tag	mongoengine/tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Animal
-tag	mongoengine/tests/queryset/queryset.py	/^            tag = StringField()$/;"	v	class:QuerySetTest.test_item_frequencies_with_null_embedded.Extra
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_get_and_save.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_fields.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_bad_set.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_embedded.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_not_set.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_set.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_simple.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_bad_set.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_embedded.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_equality.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_fetch_invalid_ref.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_not_set.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_passthrough.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_set.Animal
-tag	tests/fields/fields.py	/^            tag = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_simple.Animal
-tag_list	mongoengine/tests/document/class_methods.py	/^            tag_list = ListField(StringField())$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPostWithTags
-tag_list	mongoengine/tests/document/class_methods.py	/^            tag_list = ListField(StringField())$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithTags
-tags	mongoengine/docs/code/tumblelog.py	/^    tags = ListField(StringField(max_length=30))$/;"	v	class:Post
-tags	mongoengine/tests/document/class_methods.py	/^            tags = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
-tags	mongoengine/tests/document/class_methods.py	/^            tags = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPostWithTags
-tags	mongoengine/tests/document/class_methods.py	/^            tags = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPostWithTags
-tags	mongoengine/tests/document/class_methods.py	/^            tags = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPostWithTags
-tags	mongoengine/tests/document/indexes.py	/^                         tags=[Tag(name="about"), Tag(name="time")])$/;"	v	class:IndexesTest.test_list_embedded_document_index.BlogPost
-tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(EmbeddedDocumentField(Tag))$/;"	v	class:IndexesTest.test_list_embedded_document_index.BlogPost
-tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(StringField())$/;"	v	class:IndexesTest._index_test.BlogPost
-tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(StringField())$/;"	v	class:IndexesTest._index_test_inheritance.BlogPost
-tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(StringField())$/;"	v	class:IndexesTest.test_dictionary_indexes.BlogPost
-tags	mongoengine/tests/document/indexes.py	/^            tags = ListField(StringField())$/;"	v	class:IndexesTest.test_hint.BlogPost
-tags	mongoengine/tests/document/indexes.py	/^            tags = [("tag %i" % n) for n in range(0, i % 2)]$/;"	v	class:IndexesTest.test_hint.BlogPost
-tags	mongoengine/tests/document/instance.py	/^            tags = ListField()$/;"	v	class:InstanceTest.test_push_nested_list.BlogPost
-tags	mongoengine/tests/document/instance.py	/^            tags = ListField(StringField())$/;"	v	class:InstanceTest.test_modify_with_positional_push.BlogPost
-tags	mongoengine/tests/document/instance.py	/^            tags = ListField(StringField())$/;"	v	class:InstanceTest.test_push_with_position.BlogPost
-tags	mongoengine/tests/document/instance.py	/^            tags = ListField(StringField())$/;"	v	class:InstanceTest.test_save_list.BlogPost
-tags	mongoengine/tests/fields/fields.py	/^            tags = ListField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
-tags	mongoengine/tests/fields/fields.py	/^            tags = ListField(StringField())$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Owner
-tags	mongoengine/tests/fields/fields.py	/^            tags = ListField(StringField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
-tags	mongoengine/tests/fields/fields.py	/^            tags = SortedListField(StringField())$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
-tags	mongoengine/tests/queryset/modify.py	/^            tags = ListField(StringField())$/;"	v	class:FindAndModifyTest.test_modify_with_push.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField()$/;"	v	class:QuerySetTest.test_update_push_list_of_list.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(EmbeddedDocumentField(BlogTag), required=True)$/;"	v	class:QuerySetTest.test_editting_embedded_objects.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(ReferenceField(BlogTag), required=True)$/;"	v	class:QuerySetTest.test_update_one_pop_generic_reference.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_custom_manager.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_find_array_position.Blog
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_map_reduce_with_custom_object_ids.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_update.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_update_array_position.Blog
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_update_push_and_pull_add_to_set.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_update_push_with_position.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField())$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Post
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField(), db_field='blogTags')$/;"	v	class:QuerySetTest.test_item_frequencies.BlogPost
-tags	mongoengine/tests/queryset/queryset.py	/^            tags = ListField(StringField(), db_field='post-tag-list')$/;"	v	class:QuerySetTest.test_map_reduce.BlogPost
-tags	mongoengine/tests/queryset/visitor.py	/^            tags = ListField(StringField())$/;"	v	class:QTest.test_q_lists.BlogPost
-tags	mongoengine/tests/test_dereference.py	/^            tags = ListField(ReferenceField("Tag", dbref=True))$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Page
-tags	mongoengine/tests/test_dereference.py	/^            tags = ListField(ReferenceField("Tag", dbref=True))$/;"	v	class:FieldTest.test_dereferencing_embedded_listfield_referencefield.Post
-tags	tests/fields/fields.py	/^            tags = ListField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_reference.SocialData
-tags	tests/fields/fields.py	/^            tags = ListField(StringField())$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_list_fields.Owner
-tags	tests/fields/fields.py	/^            tags = ListField(StringField())$/;"	v	class:FieldTest.test_list_validation.BlogPost
-tags	tests/fields/fields.py	/^            tags = SortedListField(StringField())$/;"	v	class:FieldTest.test_sorted_list_sorting.BlogPost
-tearDown	mongoengine/tests/all_warnings/__init__.py	/^    def tearDown(self):$/;"	m	class:AllWarnings
-tearDown	mongoengine/tests/document/class_methods.py	/^    def tearDown(self):$/;"	m	class:ClassMethodsTest
-tearDown	mongoengine/tests/document/delta.py	/^    def tearDown(self):$/;"	m	class:DeltaTest
-tearDown	mongoengine/tests/document/indexes.py	/^    def tearDown(self):$/;"	m	class:IndexesTest
-tearDown	mongoengine/tests/document/inheritance.py	/^    def tearDown(self):$/;"	m	class:InheritanceTest
-tearDown	mongoengine/tests/document/instance.py	/^    def tearDown(self):$/;"	m	class:InstanceTest
-tearDown	mongoengine/tests/fields/file_tests.py	/^    def tearDown(self):$/;"	m	class:FileTest
-tearDown	mongoengine/tests/queryset/queryset.py	/^    def tearDown(self):$/;"	m	class:QuerySetTest
-tearDown	mongoengine/tests/test_connection.py	/^    def tearDown(self):$/;"	m	class:ConnectionTest
-tearDown	mongoengine/tests/test_replicaset_connection.py	/^    def tearDown(self):$/;"	m	class:ConnectionTest
-tearDown	mongoengine/tests/test_signals.py	/^    def tearDown(self):$/;"	m	class:SignalTests
-tearDownClass	mongoengine/tests/test_dereference.py	/^    def tearDownClass(cls):$/;"	m	class:FieldTest
-tearDownClass	mongoengine/tests/utils.py	/^    def tearDownClass(cls):$/;"	m	class:MongoDBTestCase
-templates_path	mongoengine/docs/conf.py	/^templates_path = ['_templates']$/;"	v
-term	mongoengine/tests/document/indexes.py	/^            term = StringField(required=True)$/;"	v	class:IndexesTest.test_compound_key_embedded.CompoundKey
-test	mongoengine/tests/queryset/queryset.py	/^            test = DictField()$/;"	v	class:QuerySetTest.test_dictfield_key_looks_like_a_digit.MyDoc
-test	mongoengine/tests/queryset/queryset.py	/^            test = StringField()$/;"	v	class:QuerySetTest.test_upsert_includes_cls.Test
-test2	mongoengine/tests/document/instance.py	/^            test2 = ReferenceField('Test2')$/;"	v	class:InstanceTest.test_dbref_equality.Test
-test3	mongoengine/tests/document/instance.py	/^            test3 = ReferenceField('Test3')$/;"	v	class:InstanceTest.test_dbref_equality.Test
-test_2dsphere_geo_within_box	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_geo_within_box(self):$/;"	m	class:GeoQueriesTest
-test_2dsphere_geo_within_center	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_geo_within_center(self):$/;"	m	class:GeoQueriesTest
-test_2dsphere_geo_within_polygon	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_geo_within_polygon(self):$/;"	m	class:GeoQueriesTest
-test_2dsphere_linestring_sets_correctly	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_linestring_sets_correctly(self):$/;"	m	class:GeoQueriesTest
-test_2dsphere_near	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_near(self):$/;"	m	class:GeoQueriesTest
-test_2dsphere_near_and_max_distance	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_near_and_max_distance(self):$/;"	m	class:GeoQueriesTest
-test_2dsphere_near_and_min_max_distance	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_near_and_min_max_distance(self):$/;"	m	class:GeoQueriesTest
-test_2dsphere_point_embedded	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_point_embedded(self):$/;"	m	class:GeoQueriesTest
-test_2dsphere_point_sets_correctly	mongoengine/tests/queryset/geo.py	/^    def test_2dsphere_point_sets_correctly(self):$/;"	m	class:GeoQueriesTest
-test_abstract_document_creation_does_not_fail	mongoengine/tests/document/inheritance.py	/^    def test_abstract_document_creation_does_not_fail(self):$/;"	m	class:InheritanceTest
-test_abstract_documents	mongoengine/tests/document/inheritance.py	/^    def test_abstract_documents(self):$/;"	m	class:InheritanceTest
-test_abstract_embedded_documents	mongoengine/tests/document/inheritance.py	/^    def test_abstract_embedded_documents(self):$/;"	m	class:InheritanceTest
-test_abstract_handle_ids_in_metaclass_properly	mongoengine/tests/document/inheritance.py	/^    def test_abstract_handle_ids_in_metaclass_properly(self):$/;"	m	class:InheritanceTest
-test_abstract_index_inheritance	mongoengine/tests/document/indexes.py	/^    def test_abstract_index_inheritance(self):$/;"	m	class:IndexesTest
-test_abstract_reference_base_type	mongoengine/tests/fields/fields.py	/^    def test_abstract_reference_base_type(self):$/;"	m	class:FieldTest
-test_abstract_reference_base_type	tests/fields/fields.py	/^    def test_abstract_reference_base_type(self):$/;"	m	class:FieldTest
-test_add_to_set_each	mongoengine/tests/queryset/queryset.py	/^    def test_add_to_set_each(self):$/;"	m	class:QuerySetTest
-test_all_fields	mongoengine/tests/queryset/field_list.py	/^    def test_all_fields(self):$/;"	m	class:OnlyExcludeAllTest
-test_allow_inheritance	mongoengine/tests/document/inheritance.py	/^    def test_allow_inheritance(self):$/;"	m	class:InheritanceTest
-test_allow_inheritance_abstract_document	mongoengine/tests/document/inheritance.py	/^    def test_allow_inheritance_abstract_document(self):$/;"	m	class:InheritanceTest
-test_allow_inheritance_embedded_document	mongoengine/tests/document/inheritance.py	/^    def test_allow_inheritance_embedded_document(self):$/;"	m	class:InheritanceTest
-test_always_include	mongoengine/tests/queryset/field_list.py	/^    def test_always_include(self):$/;"	m	class:QueryFieldListTest
-test_and_combination	mongoengine/tests/queryset/visitor.py	/^    def test_and_combination(self):$/;"	m	class:QTest
-test_and_or_combination	mongoengine/tests/queryset/visitor.py	/^    def test_and_or_combination(self):$/;"	m	class:QTest
-test_array_average	mongoengine/tests/queryset/queryset.py	/^    def test_array_average(self):$/;"	m	class:QuerySetTest
-test_array_sum	mongoengine/tests/queryset/queryset.py	/^    def test_array_sum(self):$/;"	m	class:QuerySetTest
-test_as_pymongo	mongoengine/tests/queryset/queryset.py	/^    def test_as_pymongo(self):$/;"	m	class:QuerySetTest
-test_as_pymongo_json_limit_fields	mongoengine/tests/queryset/queryset.py	/^    def test_as_pymongo_json_limit_fields(self):$/;"	m	class:QuerySetTest
-test_aspymongo_with_only	mongoengine/tests/queryset/geo.py	/^    def test_aspymongo_with_only(self):$/;"	m	class:GeoQueriesTest
-test_assertions	mongoengine/tests/queryset/queryset.py	/^        def test_assertions(f):$/;"	f	function:QuerySetTest.test_item_frequencies
-test_assertions	mongoengine/tests/queryset/queryset.py	/^        def test_assertions(f):$/;"	f	function:QuerySetTest.test_item_frequencies_on_embedded
-test_atomic_update_dict_field	mongoengine/tests/fields/fields.py	/^    def test_atomic_update_dict_field(self):$/;"	m	class:FieldTest
-test_atomic_update_dict_field	tests/fields/fields.py	/^    def test_atomic_update_dict_field(self):$/;"	m	class:FieldTest
-test_auto_id_not_set_if_specific_in_parent_class	mongoengine/tests/document/inheritance.py	/^    def test_auto_id_not_set_if_specific_in_parent_class(self):$/;"	m	class:InheritanceTest
-test_auto_id_vs_non_pk_id_field	mongoengine/tests/document/inheritance.py	/^    def test_auto_id_vs_non_pk_id_field(self):$/;"	m	class:InheritanceTest
-test_average	mongoengine/tests/queryset/queryset.py	/^    def test_average(self):$/;"	m	class:QuerySetTest
-test_average_over_db_field	mongoengine/tests/queryset/queryset.py	/^    def test_average_over_db_field(self):$/;"	m	class:QuerySetTest
-test_bad_mixed_creation	mongoengine/tests/document/instance.py	/^    def test_bad_mixed_creation(self):$/;"	m	class:InstanceTest
-test_batch_size	mongoengine/tests/queryset/queryset.py	/^    def test_batch_size(self):$/;"	m	class:QuerySetTest
-test_binary_field_primary	mongoengine/tests/fields/fields.py	/^    def test_binary_field_primary(self):$/;"	m	class:FieldTest
-test_binary_field_primary	tests/fields/fields.py	/^    def test_binary_field_primary(self):$/;"	m	class:FieldTest
-test_binary_field_primary_filter_by_binary_pk_as_str	mongoengine/tests/fields/fields.py	/^    def test_binary_field_primary_filter_by_binary_pk_as_str(self):$/;"	m	class:FieldTest
-test_binary_field_primary_filter_by_binary_pk_as_str	tests/fields/fields.py	/^    def test_binary_field_primary_filter_by_binary_pk_as_str(self):$/;"	m	class:FieldTest
-test_binary_fields	mongoengine/tests/fields/fields.py	/^    def test_binary_fields(self):$/;"	m	class:FieldTest
-test_binary_fields	tests/fields/fields.py	/^    def test_binary_fields(self):$/;"	m	class:FieldTest
-test_binary_validation	mongoengine/tests/fields/fields.py	/^    def test_binary_validation(self):$/;"	m	class:FieldTest
-test_binary_validation	tests/fields/fields.py	/^    def test_binary_validation(self):$/;"	m	class:FieldTest
-test_bool_performance	mongoengine/tests/queryset/queryset.py	/^    def test_bool_performance(self):$/;"	m	class:QuerySetTest
-test_bool_with_ordering	mongoengine/tests/queryset/queryset.py	/^    def test_bool_with_ordering(self):$/;"	m	class:QuerySetTest
-test_bool_with_ordering_from_meta_dict	mongoengine/tests/queryset/queryset.py	/^    def test_bool_with_ordering_from_meta_dict(self):$/;"	m	class:QuerySetTest
-test_boolean_validation	mongoengine/tests/fields/fields.py	/^    def test_boolean_validation(self):$/;"	m	class:FieldTest
-test_boolean_validation	tests/fields/fields.py	/^    def test_boolean_validation(self):$/;"	m	class:FieldTest
-test_build_index_spec_is_not_destructive	mongoengine/tests/document/indexes.py	/^    def test_build_index_spec_is_not_destructive(self):$/;"	m	class:IndexesTest
-test_bulk	mongoengine/tests/queryset/queryset.py	/^    def test_bulk(self):$/;"	m	class:QuerySetTest
-test_bulk_insert	mongoengine/tests/queryset/queryset.py	/^    def test_bulk_insert(self):$/;"	m	class:QuerySetTest
-test_cache_not_cloned	mongoengine/tests/queryset/queryset.py	/^    def test_cache_not_cloned(self):$/;"	m	class:QuerySetTest
-test_cached_queryset	mongoengine/tests/queryset/queryset.py	/^    def test_cached_queryset(self):$/;"	m	class:QuerySetTest
-test_cached_reference_auto_sync	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_auto_sync(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_auto_sync	tests/fields/fields.py	/^    def test_cached_reference_auto_sync(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_auto_sync_disabled	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_auto_sync_disabled(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_auto_sync_disabled	tests/fields/fields.py	/^    def test_cached_reference_auto_sync_disabled(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_embedded_fields	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_embedded_fields(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_embedded_fields	tests/fields/fields.py	/^    def test_cached_reference_embedded_fields(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_embedded_list_fields	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_embedded_list_fields(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_embedded_list_fields	tests/fields/fields.py	/^    def test_cached_reference_embedded_list_fields(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_decimal	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_decimal(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_decimal	tests/fields/fields.py	/^    def test_cached_reference_field_decimal(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_get_and_save	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_get_and_save(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_get_and_save	tests/fields/fields.py	/^    def test_cached_reference_field_get_and_save(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_push_with_fields	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_push_with_fields(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_push_with_fields	tests/fields/fields.py	/^    def test_cached_reference_field_push_with_fields(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_reference	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_reference(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_reference	tests/fields/fields.py	/^    def test_cached_reference_field_reference(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_update_all	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_field_update_all(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_field_update_all	tests/fields/fields.py	/^    def test_cached_reference_field_update_all(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_fields	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_fields(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_fields	tests/fields/fields.py	/^    def test_cached_reference_fields(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_fields_on_embedded_documents	mongoengine/tests/fields/fields.py	/^    def test_cached_reference_fields_on_embedded_documents(self):$/;"	m	class:CachedReferenceFieldTest
-test_cached_reference_fields_on_embedded_documents	tests/fields/fields.py	/^    def test_cached_reference_fields_on_embedded_documents(self):$/;"	m	class:CachedReferenceFieldTest
-test_call_after_limits_set	mongoengine/tests/queryset/queryset.py	/^    def test_call_after_limits_set(self):$/;"	m	class:QuerySetTest
-test_can_have_field_same_name_as_query_operator	mongoengine/tests/queryset/queryset.py	/^    def test_can_have_field_same_name_as_query_operator(self):$/;"	m	class:QuerySetTest
-test_can_save_false_values	mongoengine/tests/document/instance.py	/^    def test_can_save_false_values(self):$/;"	m	class:InstanceTest
-test_can_save_false_values_dynamic	mongoengine/tests/document/instance.py	/^    def test_can_save_false_values_dynamic(self):$/;"	m	class:InstanceTest
-test_can_save_if_not_included	mongoengine/tests/document/instance.py	/^    def test_can_save_if_not_included(self):$/;"	m	class:InstanceTest
-test_cannot_perform_joins_references	mongoengine/tests/queryset/queryset.py	/^    def test_cannot_perform_joins_references(self):$/;"	m	class:QuerySetTest
-test_cant_turn_off_inheritance_on_subclass	mongoengine/tests/document/inheritance.py	/^    def test_cant_turn_off_inheritance_on_subclass(self):$/;"	m	class:InheritanceTest
-test_capped_collection	mongoengine/tests/document/instance.py	/^    def test_capped_collection(self):$/;"	m	class:InstanceTest
-test_capped_collection_default	mongoengine/tests/document/instance.py	/^    def test_capped_collection_default(self):$/;"	m	class:InstanceTest
-test_capped_collection_no_max_size_problems	mongoengine/tests/document/instance.py	/^    def test_capped_collection_no_max_size_problems(self):$/;"	m	class:InstanceTest
-test_chained_filter	mongoengine/tests/fields/fields.py	/^    def test_chained_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_chained_filter	tests/fields/fields.py	/^    def test_chained_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_chained_filter_exclude	mongoengine/tests/fields/fields.py	/^    def test_chained_filter_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_chained_filter_exclude	tests/fields/fields.py	/^    def test_chained_filter_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_chained_q_or_filtering	mongoengine/tests/queryset/visitor.py	/^    def test_chained_q_or_filtering(self):$/;"	m	class:QTest
-test_chaining	mongoengine/tests/queryset/queryset.py	/^    def test_chaining(self):$/;"	m	class:QuerySetTest
-test_chaining	mongoengine/tests/queryset/transform.py	/^    def test_chaining(self):$/;"	m	class:TransformTest
-test_change_scope_of_variable	mongoengine/tests/document/dynamic.py	/^    def test_change_scope_of_variable(self):$/;"	m	class:DynamicTest
-test_choices_allow_using_sets_as_choices	mongoengine/tests/fields/fields.py	/^    def test_choices_allow_using_sets_as_choices(self):$/;"	m	class:FieldTest
-test_choices_allow_using_sets_as_choices	tests/fields/fields.py	/^    def test_choices_allow_using_sets_as_choices(self):$/;"	m	class:FieldTest
-test_choices_get_field_display	mongoengine/tests/fields/fields.py	/^    def test_choices_get_field_display(self):$/;"	m	class:FieldTest
-test_choices_get_field_display	tests/fields/fields.py	/^    def test_choices_get_field_display(self):$/;"	m	class:FieldTest
-test_choices_validation_accept_possible_value	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_accept_possible_value(self):$/;"	m	class:FieldTest
-test_choices_validation_accept_possible_value	tests/fields/fields.py	/^    def test_choices_validation_accept_possible_value(self):$/;"	m	class:FieldTest
-test_choices_validation_allow_no_value	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_allow_no_value(self):$/;"	m	class:FieldTest
-test_choices_validation_allow_no_value	tests/fields/fields.py	/^    def test_choices_validation_allow_no_value(self):$/;"	m	class:FieldTest
-test_choices_validation_documents	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_documents(self):$/;"	m	class:FieldTest
-test_choices_validation_documents	tests/fields/fields.py	/^    def test_choices_validation_documents(self):$/;"	m	class:FieldTest
-test_choices_validation_documents_inheritance	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_documents_inheritance(self):$/;"	m	class:FieldTest
-test_choices_validation_documents_inheritance	tests/fields/fields.py	/^    def test_choices_validation_documents_inheritance(self):$/;"	m	class:FieldTest
-test_choices_validation_documents_invalid	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_documents_invalid(self):$/;"	m	class:FieldTest
-test_choices_validation_documents_invalid	tests/fields/fields.py	/^    def test_choices_validation_documents_invalid(self):$/;"	m	class:FieldTest
-test_choices_validation_reject_unknown_value	mongoengine/tests/fields/fields.py	/^    def test_choices_validation_reject_unknown_value(self):$/;"	m	class:FieldTest
-test_choices_validation_reject_unknown_value	tests/fields/fields.py	/^    def test_choices_validation_reject_unknown_value(self):$/;"	m	class:FieldTest
-test_circular_reference	mongoengine/tests/test_dereference.py	/^    def test_circular_reference(self):$/;"	m	class:FieldTest
-test_circular_reference_deltas	mongoengine/tests/document/delta.py	/^    def test_circular_reference_deltas(self):$/;"	m	class:DeltaTest
-test_circular_reference_deltas_2	mongoengine/tests/document/delta.py	/^    def test_circular_reference_deltas_2(self):$/;"	m	class:DeltaTest
-test_circular_reference_on_self	mongoengine/tests/test_dereference.py	/^    def test_circular_reference_on_self(self):$/;"	m	class:FieldTest
-test_circular_tree_reference	mongoengine/tests/test_dereference.py	/^    def test_circular_tree_reference(self):$/;"	m	class:FieldTest
-test_clear_ordering	mongoengine/tests/queryset/queryset.py	/^    def test_clear_ordering(self):$/;"	m	class:QuerySetTest
-test_clone	mongoengine/tests/queryset/queryset.py	/^    def test_clone(self):$/;"	m	class:QuerySetTest
-test_cls_field	mongoengine/tests/fields/fields.py	/^    def test_cls_field(self):$/;"	m	class:FieldTest
-test_cls_field	tests/fields/fields.py	/^    def test_cls_field(self):$/;"	m	class:FieldTest
-test_cls_query_in_subclassed_docs	mongoengine/tests/queryset/queryset.py	/^    def test_cls_query_in_subclassed_docs(self):$/;"	m	class:QuerySetTest
-test_collection_name_and_primary	mongoengine/tests/document/class_methods.py	/^    def test_collection_name_and_primary(self):$/;"	m	class:ClassMethodsTest
-test_collection_naming	mongoengine/tests/document/class_methods.py	/^    def test_collection_naming(self):$/;"	m	class:ClassMethodsTest
-test_comment	mongoengine/tests/queryset/queryset.py	/^    def test_comment(self):$/;"	m	class:QuerySetTest
-test_compare_indexes	mongoengine/tests/document/class_methods.py	/^    def test_compare_indexes(self):$/;"	m	class:ClassMethodsTest
-test_compare_indexes_inheritance	mongoengine/tests/document/class_methods.py	/^    def test_compare_indexes_inheritance(self):$/;"	m	class:ClassMethodsTest
-test_compare_indexes_multiple_subclasses	mongoengine/tests/document/class_methods.py	/^    def test_compare_indexes_multiple_subclasses(self):$/;"	m	class:ClassMethodsTest
-test_complex_data_lookups	mongoengine/tests/document/dynamic.py	/^    def test_complex_data_lookups(self):$/;"	m	class:DynamicTest
-test_complex_dynamic_document_queries	mongoengine/tests/document/dynamic.py	/^    def test_complex_dynamic_document_queries(self):$/;"	m	class:DynamicTest
-test_complex_embedded_document_validation	mongoengine/tests/document/dynamic.py	/^    def test_complex_embedded_document_validation(self):$/;"	m	class:DynamicTest
-test_complex_embedded_documents	mongoengine/tests/document/dynamic.py	/^    def test_complex_embedded_documents(self):$/;"	m	class:DynamicTest
-test_complex_field_filefield	mongoengine/tests/fields/file_tests.py	/^    def test_complex_field_filefield(self):$/;"	m	class:FileTest
-test_complex_field_required	mongoengine/tests/fields/fields.py	/^    def test_complex_field_required(self):$/;"	m	class:FieldTest
-test_complex_field_required	tests/fields/fields.py	/^    def test_complex_field_required(self):$/;"	m	class:FieldTest
-test_complex_field_same_value_not_changed	mongoengine/tests/fields/fields.py	/^    def test_complex_field_same_value_not_changed(self):$/;"	m	class:FieldTest
-test_complex_field_same_value_not_changed	tests/fields/fields.py	/^    def test_complex_field_same_value_not_changed(self):$/;"	m	class:FieldTest
-test_complex_mapfield	mongoengine/tests/fields/fields.py	/^    def test_complex_mapfield(self):$/;"	m	class:FieldTest
-test_complex_mapfield	tests/fields/fields.py	/^    def test_complex_mapfield(self):$/;"	m	class:FieldTest
-test_complex_nesting_document_and_embedded_document	mongoengine/tests/document/instance.py	/^    def test_complex_nesting_document_and_embedded_document(self):$/;"	m	class:InstanceTest
-test_complexdatetime_storage	mongoengine/tests/fields/fields.py	/^    def test_complexdatetime_storage(self):$/;"	m	class:FieldTest
-test_complexdatetime_storage	tests/fields/fields.py	/^    def test_complexdatetime_storage(self):$/;"	m	class:FieldTest
-test_complexdatetime_usage	mongoengine/tests/fields/fields.py	/^    def test_complexdatetime_usage(self):$/;"	m	class:FieldTest
-test_complexdatetime_usage	tests/fields/fields.py	/^    def test_complexdatetime_usage(self):$/;"	m	class:FieldTest
-test_compound_index_underscore_cls_not_overwritten	mongoengine/tests/document/indexes.py	/^    def test_compound_index_underscore_cls_not_overwritten(self):$/;"	m	class:IndexesTest
-test_compound_key_dictfield	mongoengine/tests/document/indexes.py	/^    def test_compound_key_dictfield(self):$/;"	m	class:IndexesTest
-test_compound_key_embedded	mongoengine/tests/document/indexes.py	/^    def test_compound_key_embedded(self):$/;"	m	class:IndexesTest
-test_confirm_order_by_reference_wont_work	mongoengine/tests/queryset/queryset.py	/^    def test_confirm_order_by_reference_wont_work(self):$/;"	m	class:QuerySetTest
-test_connect	mongoengine/tests/test_connection.py	/^    def test_connect(self):$/;"	m	class:ConnectionTest
-test_connect_in_mocking	mongoengine/tests/test_connection.py	/^    def test_connect_in_mocking(self):$/;"	m	class:ConnectionTest
-test_connect_uri	mongoengine/tests/test_connection.py	/^    def test_connect_uri(self):$/;"	m	class:ConnectionTest
-test_connect_uri_default_db	mongoengine/tests/test_connection.py	/^    def test_connect_uri_default_db(self):$/;"	m	class:ConnectionTest
-test_connect_uri_with_authsource	mongoengine/tests/test_connection.py	/^    def test_connect_uri_with_authsource(self):$/;"	m	class:ConnectionTest
-test_connect_uri_without_db	mongoengine/tests/test_connection.py	/^    def test_connect_uri_without_db(self):$/;"	m	class:ConnectionTest
-test_connect_with_host_list	mongoengine/tests/test_connection.py	/^    def test_connect_with_host_list(self):$/;"	m	class:ConnectionTest
-test_connect_with_replicaset_via_kwargs	mongoengine/tests/test_connection.py	/^    def test_connect_with_replicaset_via_kwargs(self):$/;"	m	class:ConnectionTest
-test_connect_with_replicaset_via_uri	mongoengine/tests/test_connection.py	/^    def test_connect_with_replicaset_via_uri(self):$/;"	m	class:ConnectionTest
-test_connection_kwargs	mongoengine/tests/test_connection.py	/^    def test_connection_kwargs(self):$/;"	m	class:ConnectionTest
-test_connection_pool_via_kwarg	mongoengine/tests/test_connection.py	/^    def test_connection_pool_via_kwarg(self):$/;"	m	class:ConnectionTest
-test_connection_pool_via_uri	mongoengine/tests/test_connection.py	/^    def test_connection_pool_via_uri(self):$/;"	m	class:ConnectionTest
-test_copyable	mongoengine/tests/fields/file_tests.py	/^    def test_copyable(self):$/;"	m	class:FileTest
-test_count	mongoengine/tests/fields/fields.py	/^    def test_count(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_count	tests/fields/fields.py	/^    def test_count(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_count_and_none	mongoengine/tests/queryset/queryset.py	/^    def test_count_and_none(self):$/;"	m	class:QuerySetTest
-test_count_limit_and_skip	mongoengine/tests/queryset/queryset.py	/^    def test_count_limit_and_skip(self):$/;"	m	class:QuerySetTest
-test_count_list_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_count_list_embedded(self):$/;"	m	class:QuerySetTest
-test_covered_index	mongoengine/tests/document/indexes.py	/^    def test_covered_index(self):$/;"	m	class:IndexesTest
-test_create	mongoengine/tests/fields/fields.py	/^    def test_create(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_create	tests/fields/fields.py	/^    def test_create(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_create_geohaystack_index	mongoengine/tests/document/indexes.py	/^    def test_create_geohaystack_index(self):$/;"	m	class:IndexesTest
-test_creation	mongoengine/tests/document/instance.py	/^    def test_creation(self):$/;"	m	class:InstanceTest
-test_cursor_args	mongoengine/tests/queryset/queryset.py	/^    def test_cursor_args(self):$/;"	m	class:QuerySetTest
-test_cursor_in_an_if_stmt	mongoengine/tests/queryset/queryset.py	/^    def test_cursor_in_an_if_stmt(self):$/;"	m	class:QuerySetTest
-test_custom_collection_name_operations	mongoengine/tests/document/class_methods.py	/^    def test_custom_collection_name_operations(self):$/;"	m	class:ClassMethodsTest
-test_custom_data	mongoengine/tests/fields/fields.py	/^    def test_custom_data(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_custom_data	tests/fields/fields.py	/^    def test_custom_data(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_custom_id_field	mongoengine/tests/document/instance.py	/^    def test_custom_id_field(self):$/;"	m	class:InstanceTest
-test_custom_manager	mongoengine/tests/queryset/queryset.py	/^    def test_custom_manager(self):$/;"	m	class:QuerySetTest
-test_custom_manager_overriding_objects_works	mongoengine/tests/queryset/queryset.py	/^    def test_custom_manager_overriding_objects_works(self):$/;"	m	class:QuerySetTest
-test_custom_querysets	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets(self):$/;"	m	class:QuerySetTest
-test_custom_querysets_inherited	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets_inherited(self):$/;"	m	class:QuerySetTest
-test_custom_querysets_inherited_direct	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets_inherited_direct(self):$/;"	m	class:QuerySetTest
-test_custom_querysets_managers_directly	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets_managers_directly(self):$/;"	m	class:QuerySetTest
-test_custom_querysets_set_manager_directly	mongoengine/tests/queryset/queryset.py	/^    def test_custom_querysets_set_manager_directly(self):$/;"	m	class:QuerySetTest
-test_data_contains_id_field	mongoengine/tests/document/instance.py	/^    def test_data_contains_id_field(self):$/;"	m	class:InstanceTest
-test_datetime	mongoengine/tests/fields/fields.py	/^    def test_datetime(self):$/;"	m	class:FieldTest
-test_datetime	mongoengine/tests/test_connection.py	/^    def test_datetime(self):$/;"	m	class:ConnectionTest
-test_datetime	tests/fields/fields.py	/^    def test_datetime(self):$/;"	m	class:FieldTest
-test_datetime_from_empty_string	mongoengine/tests/fields/fields.py	/^    def test_datetime_from_empty_string(self):$/;"	m	class:FieldTest
-test_datetime_from_empty_string	tests/fields/fields.py	/^    def test_datetime_from_empty_string(self):$/;"	m	class:FieldTest
-test_datetime_from_whitespace_string	mongoengine/tests/fields/fields.py	/^    def test_datetime_from_whitespace_string(self):$/;"	m	class:FieldTest
-test_datetime_from_whitespace_string	tests/fields/fields.py	/^    def test_datetime_from_whitespace_string(self):$/;"	m	class:FieldTest
-test_datetime_tz_aware_mark_as_changed	mongoengine/tests/fields/fields.py	/^    def test_datetime_tz_aware_mark_as_changed(self):$/;"	m	class:FieldTest
-test_datetime_tz_aware_mark_as_changed	tests/fields/fields.py	/^    def test_datetime_tz_aware_mark_as_changed(self):$/;"	m	class:FieldTest
-test_datetime_usage	mongoengine/tests/fields/fields.py	/^    def test_datetime_usage(self):$/;"	m	class:FieldTest
-test_datetime_usage	tests/fields/fields.py	/^    def test_datetime_usage(self):$/;"	m	class:FieldTest
-test_datetime_validation	mongoengine/tests/fields/fields.py	/^    def test_datetime_validation(self):$/;"	m	class:FieldTest
-test_datetime_validation	tests/fields/fields.py	/^    def test_datetime_validation(self):$/;"	m	class:FieldTest
-test_db_alias_overrides	mongoengine/tests/document/instance.py	/^    def test_db_alias_overrides(self):$/;"	m	class:InstanceTest
-test_db_alias_propagates	mongoengine/tests/document/instance.py	/^    def test_db_alias_propagates(self):$/;"	m	class:InstanceTest
-test_db_alias_tests	mongoengine/tests/document/instance.py	/^    def test_db_alias_tests(self):$/;"	m	class:InstanceTest
-test_db_embedded_doc_field_load	mongoengine/tests/document/instance.py	/^    def test_db_embedded_doc_field_load(self):$/;"	m	class:InstanceTest
-test_db_field_load	mongoengine/tests/document/instance.py	/^    def test_db_field_load(self):$/;"	m	class:InstanceTest
-test_db_field_validation	mongoengine/tests/fields/fields.py	/^    def test_db_field_validation(self):$/;"	m	class:FieldTest
-test_db_field_validation	tests/fields/fields.py	/^    def test_db_field_validation(self):$/;"	m	class:FieldTest
-test_db_ref_usage	mongoengine/tests/document/instance.py	/^    def test_db_ref_usage(self):$/;"	m	class:InstanceTest
-test_dbref_equality	mongoengine/tests/document/instance.py	/^    def test_dbref_equality(self):$/;"	m	class:InstanceTest
-test_dbref_reference_fields	mongoengine/tests/fields/fields.py	/^    def test_dbref_reference_fields(self):$/;"	m	class:FieldTest
-test_dbref_reference_fields	tests/fields/fields.py	/^    def test_dbref_reference_fields(self):$/;"	m	class:FieldTest
-test_dbref_to_mongo	mongoengine/tests/fields/fields.py	/^    def test_dbref_to_mongo(self):$/;"	m	class:FieldTest
-test_dbref_to_mongo	tests/fields/fields.py	/^    def test_dbref_to_mongo(self):$/;"	m	class:FieldTest
-test_decimal_comparison	mongoengine/tests/fields/fields.py	/^    def test_decimal_comparison(self):$/;"	m	class:FieldTest
-test_decimal_comparison	tests/fields/fields.py	/^    def test_decimal_comparison(self):$/;"	m	class:FieldTest
-test_decimal_storage	mongoengine/tests/fields/fields.py	/^    def test_decimal_storage(self):$/;"	m	class:FieldTest
-test_decimal_storage	tests/fields/fields.py	/^    def test_decimal_storage(self):$/;"	m	class:FieldTest
-test_decimal_validation	mongoengine/tests/fields/fields.py	/^    def test_decimal_validation(self):$/;"	m	class:FieldTest
-test_decimal_validation	tests/fields/fields.py	/^    def test_decimal_validation(self):$/;"	m	class:FieldTest
-test_default_values	mongoengine/tests/document/instance.py	/^    def test_default_values(self):$/;"	m	class:InstanceTest
-test_default_values_nothing_set	mongoengine/tests/fields/fields.py	/^    def test_default_values_nothing_set(self):$/;"	m	class:FieldTest
-test_default_values_nothing_set	tests/fields/fields.py	/^    def test_default_values_nothing_set(self):$/;"	m	class:FieldTest
-test_default_values_set_to_None	mongoengine/tests/fields/fields.py	/^    def test_default_values_set_to_None(self):$/;"	m	class:FieldTest
-test_default_values_set_to_None	tests/fields/fields.py	/^    def test_default_values_set_to_None(self):$/;"	m	class:FieldTest
-test_default_values_when_deleting_value	mongoengine/tests/fields/fields.py	/^    def test_default_values_when_deleting_value(self):$/;"	m	class:FieldTest
-test_default_values_when_deleting_value	tests/fields/fields.py	/^    def test_default_values_when_deleting_value(self):$/;"	m	class:FieldTest
-test_default_values_when_setting_to_None	mongoengine/tests/fields/fields.py	/^    def test_default_values_when_setting_to_None(self):$/;"	m	class:FieldTest
-test_default_values_when_setting_to_None	tests/fields/fields.py	/^    def test_default_values_when_setting_to_None(self):$/;"	m	class:FieldTest
-test_definition	mongoengine/tests/document/class_methods.py	/^    def test_definition(self):$/;"	m	class:ClassMethodsTest
-test_del_slice_marks_field_as_changed	mongoengine/tests/fields/fields.py	/^    def test_del_slice_marks_field_as_changed(self):$/;"	m	class:FieldTest
-test_del_slice_marks_field_as_changed	tests/fields/fields.py	/^    def test_del_slice_marks_field_as_changed(self):$/;"	m	class:FieldTest
-test_delete	mongoengine/tests/document/instance.py	/^    def test_delete(self):$/;"	m	class:InstanceTest
-test_delete	mongoengine/tests/fields/fields.py	/^    def test_delete(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_delete	mongoengine/tests/queryset/queryset.py	/^    def test_delete(self):$/;"	m	class:QuerySetTest
-test_delete	tests/fields/fields.py	/^    def test_delete(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_delete_count	mongoengine/tests/queryset/queryset.py	/^    def test_delete_count(self):$/;"	m	class:QuerySetTest
-test_delete_dynamic_field	mongoengine/tests/document/dynamic.py	/^    def test_delete_dynamic_field(self):$/;"	m	class:DynamicTest
-test_delete_with_limit_handles_delete_rules	mongoengine/tests/queryset/queryset.py	/^    def test_delete_with_limit_handles_delete_rules(self):$/;"	m	class:QuerySetTest
-test_delete_with_limits	mongoengine/tests/queryset/queryset.py	/^    def test_delete_with_limits(self):$/;"	m	class:QuerySetTest
-test_delta	mongoengine/tests/document/delta.py	/^    def test_delta(self):$/;"	m	class:DeltaTest
-test_delta_db_field	mongoengine/tests/document/delta.py	/^    def test_delta_db_field(self):$/;"	m	class:DeltaTest
-test_delta_for_dynamic_documents	mongoengine/tests/document/delta.py	/^    def test_delta_for_dynamic_documents(self):$/;"	m	class:DeltaTest
-test_delta_for_nested_map_fields	mongoengine/tests/document/delta.py	/^    def test_delta_for_nested_map_fields(self):$/;"	m	class:DeltaTest
-test_delta_recursive	mongoengine/tests/document/delta.py	/^    def test_delta_recursive(self):$/;"	m	class:DeltaTest
-test_delta_recursive_db_field	mongoengine/tests/document/delta.py	/^    def test_delta_recursive_db_field(self):$/;"	m	class:DeltaTest
-test_delta_with_dbref_false	mongoengine/tests/document/delta.py	/^    def test_delta_with_dbref_false(self):$/;"	m	class:DeltaTest
-test_delta_with_dbref_true	mongoengine/tests/document/delta.py	/^    def test_delta_with_dbref_true(self):$/;"	m	class:DeltaTest
-test_dereferencing_embedded_listfield_referencefield	mongoengine/tests/test_dereference.py	/^    def test_dereferencing_embedded_listfield_referencefield(self):$/;"	m	class:FieldTest
-test_dict_field	mongoengine/tests/fields/fields.py	/^    def test_dict_field(self):$/;"	m	class:FieldTest
-test_dict_field	mongoengine/tests/test_dereference.py	/^    def test_dict_field(self):$/;"	m	class:FieldTest
-test_dict_field	tests/fields/fields.py	/^    def test_dict_field(self):$/;"	m	class:FieldTest
-test_dict_field_no_field_inheritance	mongoengine/tests/test_dereference.py	/^    def test_dict_field_no_field_inheritance(self):$/;"	m	class:FieldTest
-test_dict_in_dbref_instance	mongoengine/tests/test_dereference.py	/^    def test_dict_in_dbref_instance(self):$/;"	m	class:FieldTest
-test_dict_with_custom_baseclass	mongoengine/tests/queryset/queryset.py	/^    def test_dict_with_custom_baseclass(self):$/;"	m	class:QuerySetTest
-test_dictfield_complex	mongoengine/tests/fields/fields.py	/^    def test_dictfield_complex(self):$/;"	m	class:FieldTest
-test_dictfield_complex	tests/fields/fields.py	/^    def test_dictfield_complex(self):$/;"	m	class:FieldTest
-test_dictfield_dump_document	mongoengine/tests/fields/fields.py	/^    def test_dictfield_dump_document(self):$/;"	m	class:FieldTest
-test_dictfield_dump_document	tests/fields/fields.py	/^    def test_dictfield_dump_document(self):$/;"	m	class:FieldTest
-test_dictfield_key_looks_like_a_digit	mongoengine/tests/queryset/queryset.py	/^    def test_dictfield_key_looks_like_a_digit(self):$/;"	m	class:QuerySetTest
-test_dictfield_strict	mongoengine/tests/fields/fields.py	/^    def test_dictfield_strict(self):$/;"	m	class:FieldTest
-test_dictfield_strict	tests/fields/fields.py	/^    def test_dictfield_strict(self):$/;"	m	class:FieldTest
-test_dictfield_update	mongoengine/tests/queryset/queryset.py	/^    def test_dictfield_update(self):$/;"	m	class:QuerySetTest
-test_dictionary_access	mongoengine/tests/document/instance.py	/^    def test_dictionary_access(self):$/;"	m	class:InstanceTest
-test_dictionary_indexes	mongoengine/tests/document/indexes.py	/^    def test_dictionary_indexes(self):$/;"	m	class:IndexesTest
-test_disable_index_creation	mongoengine/tests/document/indexes.py	/^    def test_disable_index_creation(self):$/;"	m	class:IndexesTest
-test_disconnect	mongoengine/tests/test_connection.py	/^    def test_disconnect(self):$/;"	m	class:ConnectionTest
-test_distinct	mongoengine/tests/queryset/queryset.py	/^    def test_distinct(self):$/;"	m	class:QuerySetTest
-test_distinct_ListField_EmbeddedDocumentField	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_ListField_EmbeddedDocumentField(self):$/;"	m	class:QuerySetTest
-test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField(self):$/;"	m	class:QuerySetTest
-test_distinct_ListField_ReferenceField	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_ListField_ReferenceField(self):$/;"	m	class:QuerySetTest
-test_distinct_handles_db_field	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_handles_db_field(self):$/;"	m	class:QuerySetTest
-test_distinct_handles_references	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_handles_references(self):$/;"	m	class:QuerySetTest
-test_distinct_handles_references_to_alias	mongoengine/tests/queryset/queryset.py	/^    def test_distinct_handles_references_to_alias(self):$/;"	m	class:QuerySetTest
-test_do_not_save_unchanged_references	mongoengine/tests/document/instance.py	/^    def test_do_not_save_unchanged_references(self):$/;"	m	class:InstanceTest
-test_document_clean	mongoengine/tests/document/instance.py	/^    def test_document_clean(self):$/;"	m	class:InstanceTest
-test_document_collection_syntax_warning	mongoengine/tests/all_warnings/__init__.py	/^    def test_document_collection_syntax_warning(self):$/;"	m	class:AllWarnings
-test_document_embedded_clean	mongoengine/tests/document/instance.py	/^    def test_document_embedded_clean(self):$/;"	m	class:InstanceTest
-test_document_hash	mongoengine/tests/document/instance.py	/^    def test_document_hash(self):$/;"	m	class:InstanceTest
-test_document_inheritance	mongoengine/tests/document/inheritance.py	/^    def test_document_inheritance(self):$/;"	m	class:InheritanceTest
-test_document_not_registered	mongoengine/tests/document/instance.py	/^    def test_document_not_registered(self):$/;"	m	class:InstanceTest
-test_document_registry_regressions	mongoengine/tests/document/instance.py	/^    def test_document_registry_regressions(self):$/;"	m	class:InstanceTest
-test_document_reload_no_inheritance	mongoengine/tests/test_dereference.py	/^    def test_document_reload_no_inheritance(self):$/;"	m	class:FieldTest
-test_document_reload_reference_integrity	mongoengine/tests/test_dereference.py	/^    def test_document_reload_reference_integrity(self):$/;"	m	class:FieldTest
-test_document_update	mongoengine/tests/document/instance.py	/^    def test_document_update(self):$/;"	m	class:InstanceTest
-test_double_embedded_db_field	mongoengine/tests/fields/fields.py	/^    def test_double_embedded_db_field(self):$/;"	m	class:FieldTest
-test_double_embedded_db_field	tests/fields/fields.py	/^    def test_double_embedded_db_field(self):$/;"	m	class:FieldTest
-test_double_embedded_db_field_from_son	mongoengine/tests/fields/fields.py	/^    def test_double_embedded_db_field_from_son(self):$/;"	m	class:FieldTest
-test_double_embedded_db_field_from_son	tests/fields/fields.py	/^    def test_double_embedded_db_field_from_son(self):$/;"	m	class:FieldTest
-test_drop_abstract_document	mongoengine/tests/fields/fields.py	/^    def test_drop_abstract_document(self):$/;"	m	class:FieldTest
-test_drop_abstract_document	tests/fields/fields.py	/^    def test_drop_abstract_document(self):$/;"	m	class:FieldTest
-test_drop_collection	mongoengine/tests/document/class_methods.py	/^    def test_drop_collection(self):$/;"	m	class:ClassMethodsTest
-test_duplicate_db_fields_raise_invalid_document_error	mongoengine/tests/document/instance.py	/^    def test_duplicate_db_fields_raise_invalid_document_error(self):$/;"	m	class:InstanceTest
-test_dynamic_and_embedded	mongoengine/tests/document/dynamic.py	/^    def test_dynamic_and_embedded(self):$/;"	m	class:DynamicTest
-test_dynamic_and_embedded_dict_access	mongoengine/tests/document/dynamic.py	/^    def test_dynamic_and_embedded_dict_access(self):$/;"	m	class:DynamicTest
-test_dynamic_declarations	mongoengine/tests/document/inheritance.py	/^    def test_dynamic_declarations(self):$/;"	m	class:InheritanceTest
-test_dynamic_delta	mongoengine/tests/document/delta.py	/^    def test_dynamic_delta(self):$/;"	m	class:DeltaTest
-test_dynamic_document_pickle	mongoengine/tests/document/instance.py	/^    def test_dynamic_document_pickle(self):$/;"	m	class:InstanceTest
-test_dynamic_document_queries	mongoengine/tests/document/dynamic.py	/^    def test_dynamic_document_queries(self):$/;"	m	class:DynamicTest
-test_dynamic_embedded_works_with_only	mongoengine/tests/document/dynamic.py	/^    def test_dynamic_embedded_works_with_only(self):$/;"	m	class:DynamicTest
-test_dynamic_fields_class	mongoengine/tests/fields/fields.py	/^    def test_dynamic_fields_class(self):$/;"	m	class:FieldTest
-test_dynamic_fields_class	tests/fields/fields.py	/^    def test_dynamic_fields_class(self):$/;"	m	class:FieldTest
-test_dynamic_fields_embedded_class	mongoengine/tests/fields/fields.py	/^    def test_dynamic_fields_embedded_class(self):$/;"	m	class:FieldTest
-test_dynamic_fields_embedded_class	tests/fields/fields.py	/^    def test_dynamic_fields_embedded_class(self):$/;"	m	class:FieldTest
-test_dynamicfield_dump_document	mongoengine/tests/fields/fields.py	/^    def test_dynamicfield_dump_document(self):$/;"	m	class:FieldTest
-test_dynamicfield_dump_document	tests/fields/fields.py	/^    def test_dynamicfield_dump_document(self):$/;"	m	class:FieldTest
-test_editting_embedded_objects	mongoengine/tests/queryset/queryset.py	/^    def test_editting_embedded_objects(self):$/;"	m	class:QuerySetTest
-test_elem_match	mongoengine/tests/queryset/queryset.py	/^    def test_elem_match(self):$/;"	m	class:QuerySetTest
-test_email_field	mongoengine/tests/fields/fields.py	/^    def test_email_field(self):$/;"	m	class:FieldTest
-test_email_field	tests/fields/fields.py	/^    def test_email_field(self):$/;"	m	class:FieldTest
-test_email_field_domain_whitelist	mongoengine/tests/fields/fields.py	/^    def test_email_field_domain_whitelist(self):$/;"	m	class:FieldTest
-test_email_field_domain_whitelist	tests/fields/fields.py	/^    def test_email_field_domain_whitelist(self):$/;"	m	class:FieldTest
-test_email_field_honors_regex	mongoengine/tests/fields/fields.py	/^    def test_email_field_honors_regex(self):$/;"	m	class:FieldTest
-test_email_field_honors_regex	tests/fields/fields.py	/^    def test_email_field_honors_regex(self):$/;"	m	class:FieldTest
-test_email_field_ip_domain	mongoengine/tests/fields/fields.py	/^    def test_email_field_ip_domain(self):$/;"	m	class:FieldTest
-test_email_field_ip_domain	tests/fields/fields.py	/^    def test_email_field_ip_domain(self):$/;"	m	class:FieldTest
-test_email_field_unicode_user	mongoengine/tests/fields/fields.py	/^    def test_email_field_unicode_user(self):$/;"	m	class:FieldTest
-test_email_field_unicode_user	tests/fields/fields.py	/^    def test_email_field_unicode_user(self):$/;"	m	class:FieldTest
-test_embedded_array_average	mongoengine/tests/queryset/queryset.py	/^    def test_embedded_array_average(self):$/;"	m	class:QuerySetTest
-test_embedded_array_sum	mongoengine/tests/queryset/queryset.py	/^    def test_embedded_array_sum(self):$/;"	m	class:QuerySetTest
-test_embedded_average	mongoengine/tests/queryset/queryset.py	/^    def test_embedded_average(self):$/;"	m	class:QuerySetTest
-test_embedded_db_field	mongoengine/tests/fields/fields.py	/^    def test_embedded_db_field(self):$/;"	m	class:FieldTest
-test_embedded_db_field	tests/fields/fields.py	/^    def test_embedded_db_field(self):$/;"	m	class:FieldTest
-test_embedded_db_field_validate	mongoengine/tests/document/validation.py	/^    def test_embedded_db_field_validate(self):$/;"	m	class:ValidatorErrorTest
-test_embedded_document	mongoengine/tests/document/instance.py	/^    def test_embedded_document(self):$/;"	m	class:InstanceTest
-test_embedded_document_complex_instance	mongoengine/tests/document/instance.py	/^    def test_embedded_document_complex_instance(self):$/;"	m	class:InstanceTest
-test_embedded_document_complex_instance_no_use_db_field	mongoengine/tests/document/instance.py	/^    def test_embedded_document_complex_instance_no_use_db_field(self):$/;"	m	class:InstanceTest
-test_embedded_document_equality	mongoengine/tests/document/instance.py	/^    def test_embedded_document_equality(self):$/;"	m	class:InstanceTest
-test_embedded_document_index	mongoengine/tests/document/indexes.py	/^    def test_embedded_document_index(self):$/;"	m	class:IndexesTest
-test_embedded_document_index_meta	mongoengine/tests/document/indexes.py	/^    def test_embedded_document_index_meta(self):$/;"	m	class:IndexesTest
-test_embedded_document_inheritance	mongoengine/tests/fields/fields.py	/^    def test_embedded_document_inheritance(self):$/;"	m	class:FieldTest
-test_embedded_document_inheritance	tests/fields/fields.py	/^    def test_embedded_document_inheritance(self):$/;"	m	class:FieldTest
-test_embedded_document_inheritance_with_list	mongoengine/tests/fields/fields.py	/^    def test_embedded_document_inheritance_with_list(self):$/;"	m	class:FieldTest
-test_embedded_document_inheritance_with_list	tests/fields/fields.py	/^    def test_embedded_document_inheritance_with_list(self):$/;"	m	class:FieldTest
-test_embedded_document_instance	mongoengine/tests/document/instance.py	/^    def test_embedded_document_instance(self):$/;"	m	class:InstanceTest
-test_embedded_document_to_mongo	mongoengine/tests/document/instance.py	/^    def test_embedded_document_to_mongo(self):$/;"	m	class:InstanceTest
-test_embedded_document_to_mongo_id	mongoengine/tests/document/instance.py	/^    def test_embedded_document_to_mongo_id(self):$/;"	m	class:InstanceTest
-test_embedded_document_validation	mongoengine/tests/document/validation.py	/^    def test_embedded_document_validation(self):$/;"	m	class:ValidatorErrorTest
-test_embedded_document_validation	mongoengine/tests/fields/fields.py	/^    def test_embedded_document_validation(self):$/;"	m	class:FieldTest
-test_embedded_document_validation	tests/fields/fields.py	/^    def test_embedded_document_validation(self):$/;"	m	class:FieldTest
-test_embedded_dynamic_document	mongoengine/tests/document/dynamic.py	/^    def test_embedded_dynamic_document(self):$/;"	m	class:DynamicTest
-test_embedded_mapfield_db_field	mongoengine/tests/fields/fields.py	/^    def test_embedded_mapfield_db_field(self):$/;"	m	class:FieldTest
-test_embedded_mapfield_db_field	tests/fields/fields.py	/^    def test_embedded_mapfield_db_field(self):$/;"	m	class:FieldTest
-test_embedded_sequence_field	mongoengine/tests/fields/fields.py	/^    def test_embedded_sequence_field(self):$/;"	m	class:FieldTest
-test_embedded_sequence_field	tests/fields/fields.py	/^    def test_embedded_sequence_field(self):$/;"	m	class:FieldTest
-test_embedded_sum	mongoengine/tests/queryset/queryset.py	/^    def test_embedded_sum(self):$/;"	m	class:QuerySetTest
-test_embedded_update	mongoengine/tests/document/instance.py	/^    def test_embedded_update(self):$/;"	m	class:InstanceTest
-test_embedded_update_after_save	mongoengine/tests/document/instance.py	/^    def test_embedded_update_after_save(self):$/;"	m	class:InstanceTest
-test_embedded_update_db_field	mongoengine/tests/document/instance.py	/^    def test_embedded_update_db_field(self):$/;"	m	class:InstanceTest
-test_embedded_weakref	mongoengine/tests/document/validation.py	/^    def test_embedded_weakref(self):$/;"	m	class:ValidatorErrorTest
-test_empty	mongoengine/tests/queryset/field_list.py	/^    def test_empty(self):$/;"	m	class:QueryFieldListTest
-test_empty_list_embedded_documents_with_unique_field	mongoengine/tests/fields/fields.py	/^    def test_empty_list_embedded_documents_with_unique_field(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_empty_list_embedded_documents_with_unique_field	tests/fields/fields.py	/^    def test_empty_list_embedded_documents_with_unique_field(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_empty_q	mongoengine/tests/queryset/visitor.py	/^    def test_empty_q(self):$/;"	m	class:QTest
-test_ensure_index	mongoengine/tests/queryset/queryset.py	/^    def test_ensure_index(self):$/;"	m	class:QuerySetTest
-test_ensure_unique_default_instances	mongoengine/tests/fields/fields.py	/^    def test_ensure_unique_default_instances(self):$/;"	m	class:FieldTest
-test_ensure_unique_default_instances	tests/fields/fields.py	/^    def test_ensure_unique_default_instances(self):$/;"	m	class:FieldTest
-test_eq	mongoengine/tests/test_datastructures.py	/^    def test_eq(self):$/;"	m	class:TestStrictDict
-test_exclude	mongoengine/tests/queryset/field_list.py	/^    def test_exclude(self):$/;"	m	class:OnlyExcludeAllTest
-test_exclude_exclude	mongoengine/tests/queryset/field_list.py	/^    def test_exclude_exclude(self):$/;"	m	class:QueryFieldListTest
-test_exclude_from_subclasses_docs	mongoengine/tests/queryset/field_list.py	/^    def test_exclude_from_subclasses_docs(self):$/;"	m	class:OnlyExcludeAllTest
-test_exclude_include	mongoengine/tests/queryset/field_list.py	/^    def test_exclude_include(self):$/;"	m	class:QueryFieldListTest
-test_exclude_only_combining	mongoengine/tests/queryset/field_list.py	/^    def test_exclude_only_combining(self):$/;"	m	class:OnlyExcludeAllTest
-test_exec_js_field_sub	mongoengine/tests/queryset/queryset.py	/^    def test_exec_js_field_sub(self):$/;"	m	class:QuerySetTest
-test_exec_js_query	mongoengine/tests/queryset/queryset.py	/^    def test_exec_js_query(self):$/;"	m	class:QuerySetTest
-test_explicit_geo2d_index	mongoengine/tests/document/indexes.py	/^    def test_explicit_geo2d_index(self):$/;"	m	class:IndexesTest
-test_explicit_geo2d_index_embedded	mongoengine/tests/document/indexes.py	/^    def test_explicit_geo2d_index_embedded(self):$/;"	m	class:IndexesTest
-test_explicit_geohaystack_index	mongoengine/tests/document/indexes.py	/^    def test_explicit_geohaystack_index(self):$/;"	m	class:IndexesTest
-test_explicit_geosphere_index	mongoengine/tests/document/indexes.py	/^    def test_explicit_geosphere_index(self):$/;"	m	class:IndexesTest
-test_external_subclasses	mongoengine/tests/document/inheritance.py	/^    def test_external_subclasses(self):$/;"	m	class:InheritanceTest
-test_external_superclasses	mongoengine/tests/document/inheritance.py	/^    def test_external_superclasses(self):$/;"	m	class:InheritanceTest
-test_falsey_pk	mongoengine/tests/document/instance.py	/^    def test_falsey_pk(self):$/;"	m	class:InstanceTest
-test_field	mongoengine/tests/queryset/queryset.py	/^            test_field = StringField()$/;"	v	class:QuerySetTest.test_cursor_in_an_if_stmt.Test
-test_fields_rewrite	mongoengine/tests/document/validation.py	/^    def test_fields_rewrite(self):$/;"	m	class:ValidatorErrorTest
-test_file_boolean	mongoengine/tests/fields/file_tests.py	/^    def test_file_boolean(self):$/;"	m	class:FileTest
-test_file_cmp	mongoengine/tests/fields/file_tests.py	/^    def test_file_cmp(self):$/;"	m	class:FileTest
-test_file_disk_space	mongoengine/tests/fields/file_tests.py	/^    def test_file_disk_space(self):$/;"	m	class:FileTest
-test_file_field_no_default	mongoengine/tests/fields/file_tests.py	/^    def test_file_field_no_default(self):$/;"	m	class:FileTest
-test_file_field_optional	mongoengine/tests/fields/file_tests.py	/^    def test_file_field_optional(self):$/;"	m	class:FileTest
-test_file_fields	mongoengine/tests/fields/file_tests.py	/^    def test_file_fields(self):$/;"	m	class:FileTest
-test_file_fields_set	mongoengine/tests/fields/file_tests.py	/^    def test_file_fields_set(self):$/;"	m	class:FileTest
-test_file_fields_stream	mongoengine/tests/fields/file_tests.py	/^    def test_file_fields_stream(self):$/;"	m	class:FileTest
-test_file_fields_stream_after_none	mongoengine/tests/fields/file_tests.py	/^    def test_file_fields_stream_after_none(self):$/;"	m	class:FileTest
-test_file_multidb	mongoengine/tests/fields/file_tests.py	/^    def test_file_multidb(self):$/;"	m	class:FileTest
-test_file_reassigning	mongoengine/tests/fields/file_tests.py	/^    def test_file_reassigning(self):$/;"	m	class:FileTest
-test_file_saving	mongoengine/tests/fields/file_tests.py	/^    def test_file_saving(self):$/;"	m	class:FileTest
-test_file_uniqueness	mongoengine/tests/fields/file_tests.py	/^    def test_file_uniqueness(self):$/;"	m	class:FileTest
-test_filter_chaining	mongoengine/tests/queryset/queryset.py	/^    def test_filter_chaining(self):$/;"	m	class:QuerySetTest
-test_filtered_count	mongoengine/tests/fields/fields.py	/^    def test_filtered_count(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_filtered_count	tests/fields/fields.py	/^    def test_filtered_count(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_filtered_create	mongoengine/tests/fields/fields.py	/^    def test_filtered_create(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_filtered_create	tests/fields/fields.py	/^    def test_filtered_create(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_filtered_delete	mongoengine/tests/fields/fields.py	/^    def test_filtered_delete(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_filtered_delete	tests/fields/fields.py	/^    def test_filtered_delete(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_find	mongoengine/tests/queryset/queryset.py	/^    def test_find(self):$/;"	m	class:QuerySetTest
-test_find_and_modify_with_remove_not_existing	mongoengine/tests/queryset/modify.py	/^    def test_find_and_modify_with_remove_not_existing(self):$/;"	m	class:FindAndModifyTest
-test_find_array_position	mongoengine/tests/queryset/queryset.py	/^    def test_find_array_position(self):$/;"	m	class:QuerySetTest
-test_find_dict_item	mongoengine/tests/queryset/queryset.py	/^    def test_find_dict_item(self):$/;"	m	class:QuerySetTest
-test_find_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_find_embedded(self):$/;"	m	class:QuerySetTest
-test_find_empty_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_find_empty_embedded(self):$/;"	m	class:QuerySetTest
-test_find_one	mongoengine/tests/queryset/queryset.py	/^    def test_find_one(self):$/;"	m	class:QuerySetTest
-test_find_only_one	mongoengine/tests/queryset/queryset.py	/^    def test_find_only_one(self):$/;"	m	class:QuerySetTest
-test_first	mongoengine/tests/fields/fields.py	/^    def test_first(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_first	tests/fields/fields.py	/^    def test_first(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_float_validation	mongoengine/tests/fields/fields.py	/^    def test_float_validation(self):$/;"	m	class:FieldTest
-test_float_validation	tests/fields/fields.py	/^    def test_float_validation(self):$/;"	m	class:FieldTest
-test_from_son	mongoengine/tests/document/instance.py	/^    def test_from_son(self):$/;"	m	class:InstanceTest
-test_generic_embedded_document	mongoengine/tests/fields/fields.py	/^    def test_generic_embedded_document(self):$/;"	m	class:FieldTest
-test_generic_embedded_document	tests/fields/fields.py	/^    def test_generic_embedded_document(self):$/;"	m	class:FieldTest
-test_generic_embedded_document_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_embedded_document_choices(self):$/;"	m	class:FieldTest
-test_generic_embedded_document_choices	tests/fields/fields.py	/^    def test_generic_embedded_document_choices(self):$/;"	m	class:FieldTest
-test_generic_lazy_reference_bad_set	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_bad_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_bad_set	tests/fields/fields.py	/^    def test_generic_lazy_reference_bad_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_choices(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_choices	tests/fields/fields.py	/^    def test_generic_lazy_reference_choices(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_embedded	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_embedded(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_embedded	tests/fields/fields.py	/^    def test_generic_lazy_reference_embedded(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_not_set	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_not_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_not_set	tests/fields/fields.py	/^    def test_generic_lazy_reference_not_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_query_conversion	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_query_conversion(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_query_conversion	tests/fields/fields.py	/^    def test_generic_lazy_reference_query_conversion(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_set	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_set	tests/fields/fields.py	/^    def test_generic_lazy_reference_set(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_simple	mongoengine/tests/fields/fields.py	/^    def test_generic_lazy_reference_simple(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_lazy_reference_simple	tests/fields/fields.py	/^    def test_generic_lazy_reference_simple(self):$/;"	m	class:GenericLazyReferenceFieldTest
-test_generic_list_embedded_document_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_list_embedded_document_choices(self):$/;"	m	class:FieldTest
-test_generic_list_embedded_document_choices	tests/fields/fields.py	/^    def test_generic_list_embedded_document_choices(self):$/;"	m	class:FieldTest
-test_generic_reference	mongoengine/tests/fields/fields.py	/^    def test_generic_reference(self):$/;"	m	class:FieldTest
-test_generic_reference	mongoengine/tests/test_dereference.py	/^    def test_generic_reference(self):$/;"	m	class:FieldTest
-test_generic_reference	tests/fields/fields.py	/^    def test_generic_reference(self):$/;"	m	class:FieldTest
-test_generic_reference_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_choices(self):$/;"	m	class:FieldTest
-test_generic_reference_choices	tests/fields/fields.py	/^    def test_generic_reference_choices(self):$/;"	m	class:FieldTest
-test_generic_reference_choices_no_dereference	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_choices_no_dereference(self):$/;"	m	class:FieldTest
-test_generic_reference_choices_no_dereference	tests/fields/fields.py	/^    def test_generic_reference_choices_no_dereference(self):$/;"	m	class:FieldTest
-test_generic_reference_document_not_registered	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_document_not_registered(self):$/;"	m	class:FieldTest
-test_generic_reference_document_not_registered	tests/fields/fields.py	/^    def test_generic_reference_document_not_registered(self):$/;"	m	class:FieldTest
-test_generic_reference_field_with_only_and_as_pymongo	mongoengine/tests/queryset/queryset.py	/^    def test_generic_reference_field_with_only_and_as_pymongo(self):$/;"	m	class:QuerySetTest
-test_generic_reference_filter_by_dbref	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_filter_by_dbref(self):$/;"	m	class:FieldTest
-test_generic_reference_filter_by_dbref	tests/fields/fields.py	/^    def test_generic_reference_filter_by_dbref(self):$/;"	m	class:FieldTest
-test_generic_reference_filter_by_objectid	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_filter_by_objectid(self):$/;"	m	class:FieldTest
-test_generic_reference_filter_by_objectid	tests/fields/fields.py	/^    def test_generic_reference_filter_by_objectid(self):$/;"	m	class:FieldTest
-test_generic_reference_is_none	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_is_none(self):$/;"	m	class:FieldTest
-test_generic_reference_is_none	tests/fields/fields.py	/^    def test_generic_reference_is_none(self):$/;"	m	class:FieldTest
-test_generic_reference_list	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_list(self):$/;"	m	class:FieldTest
-test_generic_reference_list	tests/fields/fields.py	/^    def test_generic_reference_list(self):$/;"	m	class:FieldTest
-test_generic_reference_list_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_list_choices(self):$/;"	m	class:FieldTest
-test_generic_reference_list_choices	tests/fields/fields.py	/^    def test_generic_reference_list_choices(self):$/;"	m	class:FieldTest
-test_generic_reference_list_item_modification	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_list_item_modification(self):$/;"	m	class:FieldTest
-test_generic_reference_list_item_modification	tests/fields/fields.py	/^    def test_generic_reference_list_item_modification(self):$/;"	m	class:FieldTest
-test_generic_reference_map_field	mongoengine/tests/test_dereference.py	/^    def test_generic_reference_map_field(self):$/;"	m	class:FieldTest
-test_generic_reference_save_doesnt_cause_extra_queries	mongoengine/tests/test_dereference.py	/^    def test_generic_reference_save_doesnt_cause_extra_queries(self):$/;"	m	class:FieldTest
-test_generic_reference_string_choices	mongoengine/tests/fields/fields.py	/^    def test_generic_reference_string_choices(self):$/;"	m	class:FieldTest
-test_generic_reference_string_choices	tests/fields/fields.py	/^    def test_generic_reference_string_choices(self):$/;"	m	class:FieldTest
-test_geo_indexes_auto_index	mongoengine/tests/fields/geo.py	/^    def test_geo_indexes_auto_index(self):$/;"	m	class:GeoFieldTest
-test_geo_indexes_recursion	mongoengine/tests/fields/geo.py	/^    def test_geo_indexes_recursion(self):$/;"	m	class:GeoFieldTest
-test_geo_spatial_embedded	mongoengine/tests/queryset/geo.py	/^    def test_geo_spatial_embedded(self):$/;"	m	class:GeoQueriesTest
-test_geojson_LineStringField	mongoengine/tests/queryset/transform.py	/^    def test_geojson_LineStringField(self):$/;"	m	class:TransformTest
-test_geojson_PointField	mongoengine/tests/queryset/transform.py	/^    def test_geojson_PointField(self):$/;"	m	class:TransformTest
-test_geojson_PolygonField	mongoengine/tests/queryset/geo.py	/^    def test_geojson_PolygonField(self):$/;"	m	class:GeoQueriesTest
-test_geojson_PolygonField	mongoengine/tests/queryset/transform.py	/^    def test_geojson_PolygonField(self):$/;"	m	class:TransformTest
-test_geopoint_embedded_indexes	mongoengine/tests/fields/geo.py	/^    def test_geopoint_embedded_indexes(self):$/;"	m	class:GeoFieldTest
-test_geopoint_validation	mongoengine/tests/fields/geo.py	/^    def test_geopoint_validation(self):$/;"	m	class:GeoFieldTest
-test_get	mongoengine/tests/test_datastructures.py	/^    def test_get(self):$/;"	m	class:TestStrictDict
-test_get_changed_fields_query_count	mongoengine/tests/queryset/queryset.py	/^    def test_get_changed_fields_query_count(self):$/;"	m	class:QuerySetTest
-test_get_collection	mongoengine/tests/document/class_methods.py	/^    def test_get_collection(self):$/;"	m	class:ClassMethodsTest
-test_get_collection_name	mongoengine/tests/document/class_methods.py	/^    def test_get_collection_name(self):$/;"	m	class:ClassMethodsTest
-test_get_db	mongoengine/tests/document/class_methods.py	/^    def test_get_db(self):$/;"	m	class:ClassMethodsTest
-test_get_image_by_grid_id	mongoengine/tests/fields/file_tests.py	/^    def test_get_image_by_grid_id(self):$/;"	m	class:FileTest
-test_handle_old_style_references	mongoengine/tests/test_dereference.py	/^    def test_handle_old_style_references(self):$/;"	m	class:FieldTest
-test_hashed_indexes	mongoengine/tests/document/indexes.py	/^    def test_hashed_indexes(self):$/;"	m	class:IndexesTest
-test_hint	mongoengine/tests/document/indexes.py	/^    def test_hint(self):$/;"	m	class:IndexesTest
-test_image_field	mongoengine/tests/fields/file_tests.py	/^    def test_image_field(self):$/;"	m	class:FileTest
-test_image_field_reassigning	mongoengine/tests/fields/file_tests.py	/^    def test_image_field_reassigning(self):$/;"	m	class:FileTest
-test_image_field_resize	mongoengine/tests/fields/file_tests.py	/^    def test_image_field_resize(self):$/;"	m	class:FileTest
-test_image_field_resize_force	mongoengine/tests/fields/file_tests.py	/^    def test_image_field_resize_force(self):$/;"	m	class:FileTest
-test_image_field_thumbnail	mongoengine/tests/fields/file_tests.py	/^    def test_image_field_thumbnail(self):$/;"	m	class:FileTest
-test_in_operator_on_non_iterable	mongoengine/tests/queryset/queryset.py	/^    def test_in_operator_on_non_iterable(self):$/;"	m	class:QuerySetTest
-test_include_exclude	mongoengine/tests/queryset/field_list.py	/^    def test_include_exclude(self):$/;"	m	class:QueryFieldListTest
-test_include_include	mongoengine/tests/queryset/field_list.py	/^    def test_include_include(self):$/;"	m	class:QueryFieldListTest
-test_index_dont_send_cls_option	mongoengine/tests/document/indexes.py	/^    def test_index_dont_send_cls_option(self):$/;"	m	class:IndexesTest
-test_index_no_cls	mongoengine/tests/document/indexes.py	/^    def test_index_no_cls(self):$/;"	m	class:IndexesTest
-test_index_on_id	mongoengine/tests/document/indexes.py	/^    def test_index_on_id(self):$/;"	m	class:IndexesTest
-test_index_with_pk	mongoengine/tests/document/indexes.py	/^    def test_index_with_pk(self):$/;"	m	class:IndexesTest
-test_indexes_2dsphere	mongoengine/tests/fields/geo.py	/^    def test_indexes_2dsphere(self):$/;"	m	class:GeoFieldTest
-test_indexes_2dsphere_embedded	mongoengine/tests/fields/geo.py	/^    def test_indexes_2dsphere_embedded(self):$/;"	m	class:GeoFieldTest
-test_indexes_after_database_drop	mongoengine/tests/document/indexes.py	/^    def test_indexes_after_database_drop(self):$/;"	m	class:IndexesTest
-test_indexes_and_multiple_inheritance	mongoengine/tests/document/inheritance.py	/^    def test_indexes_and_multiple_inheritance(self):$/;"	m	class:InheritanceTest
-test_indexes_document	mongoengine/tests/document/indexes.py	/^    def test_indexes_document(self):$/;"	m	class:IndexesTest
-test_indexes_document_inheritance	mongoengine/tests/document/indexes.py	/^    def test_indexes_document_inheritance(self):$/;"	m	class:IndexesTest
-test_indexes_dynamic_document	mongoengine/tests/document/indexes.py	/^    def test_indexes_dynamic_document(self):$/;"	m	class:IndexesTest
-test_indexes_dynamic_document_inheritance	mongoengine/tests/document/indexes.py	/^    def test_indexes_dynamic_document_inheritance(self):$/;"	m	class:IndexesTest
-test_indexes_geopoint	mongoengine/tests/fields/geo.py	/^    def test_indexes_geopoint(self):$/;"	m	class:GeoFieldTest
-test_inherit_objects	mongoengine/tests/queryset/queryset.py	/^    def test_inherit_objects(self):$/;"	m	class:QuerySetTest
-test_inherit_objects_override	mongoengine/tests/queryset/queryset.py	/^    def test_inherit_objects_override(self):$/;"	m	class:QuerySetTest
-test_inheritance	mongoengine/tests/document/dynamic.py	/^    def test_inheritance(self):$/;"	m	class:DynamicTest
-test_inheritance_meta_data	mongoengine/tests/document/inheritance.py	/^    def test_inheritance_meta_data(self):$/;"	m	class:InheritanceTest
-test_inheritance_to_mongo_keys	mongoengine/tests/document/inheritance.py	/^    def test_inheritance_to_mongo_keys(self):$/;"	m	class:InheritanceTest
-test_inherited_collections	mongoengine/tests/document/inheritance.py	/^    def test_inherited_collections(self):$/;"	m	class:InheritanceTest
-test_inherited_index	mongoengine/tests/document/indexes.py	/^    def test_inherited_index(self):$/;"	m	class:IndexesTest
-test_inherited_sequencefield	mongoengine/tests/fields/fields.py	/^    def test_inherited_sequencefield(self):$/;"	m	class:FieldTest
-test_inherited_sequencefield	tests/fields/fields.py	/^    def test_inherited_sequencefield(self):$/;"	m	class:FieldTest
-test_init	mongoengine/tests/test_datastructures.py	/^    def test_init(self):$/;"	m	class:TestStrictDict
-test_init_fails_on_nonexisting_attrs	mongoengine/tests/test_datastructures.py	/^    def test_init_fails_on_nonexisting_attrs(self):$/;"	m	class:TestStrictDict
-test_initialisation	mongoengine/tests/queryset/queryset.py	/^    def test_initialisation(self):$/;"	m	class:QuerySetTest
-test_inserts_if_you_set_the_pk	mongoengine/tests/document/instance.py	/^    def test_inserts_if_you_set_the_pk(self):$/;"	m	class:InstanceTest
-test_instance_is_set_on_setattr	mongoengine/tests/document/instance.py	/^    def test_instance_is_set_on_setattr(self):$/;"	m	class:InstanceTest
-test_instance_is_set_on_setattr_on_embedded_document_list	mongoengine/tests/document/instance.py	/^    def test_instance_is_set_on_setattr_on_embedded_document_list(self):$/;"	m	class:InstanceTest
-test_int_and_float_ne_operator	mongoengine/tests/fields/fields.py	/^    def test_int_and_float_ne_operator(self):$/;"	m	class:FieldTest
-test_int_and_float_ne_operator	tests/fields/fields.py	/^    def test_int_and_float_ne_operator(self):$/;"	m	class:FieldTest
-test_int_validation	mongoengine/tests/fields/fields.py	/^    def test_int_validation(self):$/;"	m	class:FieldTest
-test_int_validation	tests/fields/fields.py	/^    def test_int_validation(self):$/;"	m	class:FieldTest
-test_invalid_dict_value	mongoengine/tests/fields/fields.py	/^    def test_invalid_dict_value(self):$/;"	m	class:FieldTest
-test_invalid_dict_value	tests/fields/fields.py	/^    def test_invalid_dict_value(self):$/;"	m	class:FieldTest
-test_invalid_reverse_delete_rule_raise_errors	mongoengine/tests/document/instance.py	/^    def test_invalid_reverse_delete_rule_raise_errors(self):$/;"	m	class:InstanceTest
-test_invalid_son	mongoengine/tests/document/instance.py	/^    def test_invalid_son(self):$/;"	m	class:InstanceTest
-test_item_frequencies	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies(self):$/;"	m	class:QuerySetTest
-test_item_frequencies_normalize	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_normalize(self):$/;"	m	class:QuerySetTest
-test_item_frequencies_null_values	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_null_values(self):$/;"	m	class:QuerySetTest
-test_item_frequencies_on_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_on_embedded(self):$/;"	m	class:QuerySetTest
-test_item_frequencies_with_0_values	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_with_0_values(self):$/;"	m	class:QuerySetTest
-test_item_frequencies_with_False_values	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_with_False_values(self):$/;"	m	class:QuerySetTest
-test_item_frequencies_with_null_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_item_frequencies_with_null_embedded(self):$/;"	m	class:QuerySetTest
-test_items	mongoengine/tests/test_datastructures.py	/^    def test_items(self):$/;"	m	class:TestStrictDict
-test_iteration_within_iteration	mongoengine/tests/queryset/queryset.py	/^    def test_iteration_within_iteration(self):$/;"	m	class:QuerySetTest
-test_json_complex	mongoengine/tests/document/json_serialisation.py	/^    def test_json_complex(self):$/;"	m	class:TestJson
-test_json_complex	mongoengine/tests/queryset/queryset.py	/^    def test_json_complex(self):$/;"	m	class:QuerySetTest
-test_json_names	mongoengine/tests/document/json_serialisation.py	/^    def test_json_names(self):$/;"	m	class:TestJson
-test_json_simple	mongoengine/tests/document/json_serialisation.py	/^    def test_json_simple(self):$/;"	m	class:TestJson
-test_json_simple	mongoengine/tests/queryset/queryset.py	/^    def test_json_simple(self):$/;"	m	class:QuerySetTest
-test_keyword_multiple_return_get	mongoengine/tests/fields/fields.py	/^    def test_keyword_multiple_return_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_keyword_multiple_return_get	tests/fields/fields.py	/^    def test_keyword_multiple_return_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_kwargs_complex	mongoengine/tests/document/instance.py	/^    def test_kwargs_complex(self):$/;"	m	class:InstanceTest
-test_kwargs_simple	mongoengine/tests/document/instance.py	/^    def test_kwargs_simple(self):$/;"	m	class:InstanceTest
-test_last_field_name_like_operator	mongoengine/tests/queryset/transform.py	/^    def test_last_field_name_like_operator(self):$/;"	m	class:TransformTest
-test_lazy_reference_bad_set	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_bad_set(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_bad_set	tests/fields/fields.py	/^    def test_lazy_reference_bad_set(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_config	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_config(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_config	tests/fields/fields.py	/^    def test_lazy_reference_config(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_embedded	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_embedded(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_embedded	tests/fields/fields.py	/^    def test_lazy_reference_embedded(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_equality	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_equality(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_equality	tests/fields/fields.py	/^    def test_lazy_reference_equality(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_fetch_invalid_ref	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_fetch_invalid_ref(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_fetch_invalid_ref	tests/fields/fields.py	/^    def test_lazy_reference_fetch_invalid_ref(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_not_set	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_not_set(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_not_set	tests/fields/fields.py	/^    def test_lazy_reference_not_set(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_passthrough	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_passthrough(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_passthrough	tests/fields/fields.py	/^    def test_lazy_reference_passthrough(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_query_conversion	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_query_conversion(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_query_conversion	tests/fields/fields.py	/^    def test_lazy_reference_query_conversion(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_query_conversion_dbref	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_query_conversion_dbref(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_query_conversion_dbref	tests/fields/fields.py	/^    def test_lazy_reference_query_conversion_dbref(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_set	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_set(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_set	tests/fields/fields.py	/^    def test_lazy_reference_set(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_simple	mongoengine/tests/fields/fields.py	/^    def test_lazy_reference_simple(self):$/;"	m	class:LazyReferenceFieldTest
-test_lazy_reference_simple	tests/fields/fields.py	/^    def test_lazy_reference_simple(self):$/;"	m	class:LazyReferenceFieldTest
-test_len_during_iteration	mongoengine/tests/queryset/queryset.py	/^    def test_len_during_iteration(self):$/;"	m	class:QuerySetTest
-test_limit	mongoengine/tests/queryset/queryset.py	/^    def test_limit(self):$/;"	m	class:QuerySetTest
-test_limit_with_write_concern_0	mongoengine/tests/queryset/queryset.py	/^    def test_limit_with_write_concern_0(self):$/;"	m	class:QuerySetTest
-test_linestring	mongoengine/tests/queryset/geo.py	/^    def test_linestring(self):$/;"	m	class:GeoQueriesTest
-test_linestring_validation	mongoengine/tests/fields/geo.py	/^    def test_linestring_validation(self):$/;"	m	class:GeoFieldTest
-test_list_assignment	mongoengine/tests/fields/fields.py	/^    def test_list_assignment(self):$/;"	m	class:FieldTest
-test_list_assignment	tests/fields/fields.py	/^    def test_list_assignment(self):$/;"	m	class:FieldTest
-test_list_embedded_document_index	mongoengine/tests/document/indexes.py	/^    def test_list_embedded_document_index(self):$/;"	m	class:IndexesTest
-test_list_field	mongoengine/tests/fields/fields.py	/^    def test_list_field(self):$/;"	m	class:FieldTest
-test_list_field	tests/fields/fields.py	/^    def test_list_field(self):$/;"	m	class:FieldTest
-test_list_field_complex	mongoengine/tests/fields/fields.py	/^    def test_list_field_complex(self):$/;"	m	class:FieldTest
-test_list_field_complex	mongoengine/tests/test_dereference.py	/^    def test_list_field_complex(self):$/;"	m	class:FieldTest
-test_list_field_complex	tests/fields/fields.py	/^    def test_list_field_complex(self):$/;"	m	class:FieldTest
-test_list_field_invalid_operators	mongoengine/tests/fields/fields.py	/^    def test_list_field_invalid_operators(self):$/;"	m	class:FieldTest
-test_list_field_invalid_operators	tests/fields/fields.py	/^    def test_list_field_invalid_operators(self):$/;"	m	class:FieldTest
-test_list_field_lexicographic_operators	mongoengine/tests/fields/fields.py	/^    def test_list_field_lexicographic_operators(self):$/;"	m	class:FieldTest
-test_list_field_lexicographic_operators	tests/fields/fields.py	/^    def test_list_field_lexicographic_operators(self):$/;"	m	class:FieldTest
-test_list_field_manipulative_operators	mongoengine/tests/fields/fields.py	/^    def test_list_field_manipulative_operators(self):$/;"	m	class:FieldTest
-test_list_field_manipulative_operators	tests/fields/fields.py	/^    def test_list_field_manipulative_operators(self):$/;"	m	class:FieldTest
-test_list_field_passed_in_value	mongoengine/tests/fields/fields.py	/^    def test_list_field_passed_in_value(self):$/;"	m	class:FieldTest
-test_list_field_passed_in_value	tests/fields/fields.py	/^    def test_list_field_passed_in_value(self):$/;"	m	class:FieldTest
-test_list_field_rejects_strings	mongoengine/tests/fields/fields.py	/^    def test_list_field_rejects_strings(self):$/;"	m	class:FieldTest
-test_list_field_rejects_strings	tests/fields/fields.py	/^    def test_list_field_rejects_strings(self):$/;"	m	class:FieldTest
-test_list_field_strict	mongoengine/tests/fields/fields.py	/^    def test_list_field_strict(self):$/;"	m	class:FieldTest
-test_list_field_strict	tests/fields/fields.py	/^    def test_list_field_strict(self):$/;"	m	class:FieldTest
-test_list_field_with_negative_indices	mongoengine/tests/fields/fields.py	/^    def test_list_field_with_negative_indices(self):$/;"	m	class:FieldTest
-test_list_field_with_negative_indices	tests/fields/fields.py	/^    def test_list_field_with_negative_indices(self):$/;"	m	class:FieldTest
-test_list_indexes_inheritance	mongoengine/tests/document/class_methods.py	/^    def test_list_indexes_inheritance(self):$/;"	m	class:ClassMethodsTest
-test_list_item_dereference	mongoengine/tests/fields/fields.py	/^    def test_list_item_dereference(self):$/;"	m	class:FieldTest
-test_list_item_dereference	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference(self):$/;"	m	class:FieldTest
-test_list_item_dereference	tests/fields/fields.py	/^    def test_list_item_dereference(self):$/;"	m	class:FieldTest
-test_list_item_dereference_dref_false	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference_dref_false(self):$/;"	m	class:FieldTest
-test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries(self):$/;"	m	class:FieldTest
-test_list_item_dereference_dref_false_stores_as_type	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference_dref_false_stores_as_type(self):$/;"	m	class:FieldTest
-test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries	mongoengine/tests/test_dereference.py	/^    def test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries(self):$/;"	m	class:FieldTest
-test_list_iter	mongoengine/tests/document/instance.py	/^    def test_list_iter(self):$/;"	m	class:InstanceTest
-test_list_lookup_not_checked_in_map	mongoengine/tests/test_dereference.py	/^    def test_list_lookup_not_checked_in_map(self):$/;"	m	class:FieldTest
-test_list_of_lists_of_references	mongoengine/tests/test_dereference.py	/^    def test_list_of_lists_of_references(self):$/;"	m	class:FieldTest
-test_list_search_by_embedded	mongoengine/tests/document/instance.py	/^    def test_list_search_by_embedded(self):$/;"	m	class:InstanceTest
-test_list_validation	mongoengine/tests/fields/fields.py	/^    def test_list_validation(self):$/;"	m	class:FieldTest
-test_list_validation	tests/fields/fields.py	/^    def test_list_validation(self):$/;"	m	class:FieldTest
-test_load_undefined_fields	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields(self):$/;"	m	class:InstanceTest
-test_load_undefined_fields_on_embedded_document	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields_on_embedded_document(self):$/;"	m	class:InstanceTest
-test_load_undefined_fields_on_embedded_document_with_strict_false	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields_on_embedded_document_with_strict_false(self):$/;"	m	class:InstanceTest
-test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc(self):$/;"	m	class:InstanceTest
-test_load_undefined_fields_with_strict_false	mongoengine/tests/document/instance.py	/^    def test_load_undefined_fields_with_strict_false(self):$/;"	m	class:InstanceTest
-test_long_field_is_considered_as_int64	mongoengine/tests/fields/fields.py	/^    def test_long_field_is_considered_as_int64(self):$/;"	m	class:FieldTest
-test_long_field_is_considered_as_int64	tests/fields/fields.py	/^    def test_long_field_is_considered_as_int64(self):$/;"	m	class:FieldTest
-test_long_ne_operator	mongoengine/tests/fields/fields.py	/^    def test_long_ne_operator(self):$/;"	m	class:FieldTest
-test_long_ne_operator	tests/fields/fields.py	/^    def test_long_ne_operator(self):$/;"	m	class:FieldTest
-test_long_validation	mongoengine/tests/fields/fields.py	/^    def test_long_validation(self):$/;"	m	class:FieldTest
-test_long_validation	tests/fields/fields.py	/^    def test_long_validation(self):$/;"	m	class:FieldTest
-test_loop_over_invalid_id_does_not_crash	mongoengine/tests/queryset/queryset.py	/^    def test_loop_over_invalid_id_does_not_crash(self):$/;"	m	class:QuerySetTest
-test_lower_level_mark_as_changed	mongoengine/tests/document/delta.py	/^    def test_lower_level_mark_as_changed(self):$/;"	m	class:DeltaTest
-test_map_field_lookup	mongoengine/tests/fields/fields.py	/^    def test_map_field_lookup(self):$/;"	m	class:FieldTest
-test_map_field_lookup	tests/fields/fields.py	/^    def test_map_field_lookup(self):$/;"	m	class:FieldTest
-test_map_field_reference	mongoengine/tests/test_dereference.py	/^    def test_map_field_reference(self):$/;"	m	class:FieldTest
-test_map_field_unicode	mongoengine/tests/fields/fields.py	/^    def test_map_field_unicode(self):$/;"	m	class:FieldTest
-test_map_field_unicode	tests/fields/fields.py	/^    def test_map_field_unicode(self):$/;"	m	class:FieldTest
-test_map_reduce	mongoengine/tests/queryset/queryset.py	/^    def test_map_reduce(self):$/;"	m	class:QuerySetTest
-test_map_reduce_custom_output	mongoengine/tests/queryset/queryset.py	/^    def test_map_reduce_custom_output(self):$/;"	m	class:QuerySetTest
-test_map_reduce_finalize	mongoengine/tests/queryset/queryset.py	/^    def test_map_reduce_finalize(self):$/;"	m	class:QuerySetTest
-test_map_reduce_with_custom_object_ids	mongoengine/tests/queryset/queryset.py	/^    def test_map_reduce_with_custom_object_ids(self):$/;"	m	class:QuerySetTest
-test_mapfield	mongoengine/tests/fields/fields.py	/^    def test_mapfield(self):$/;"	m	class:FieldTest
-test_mapfield	tests/fields/fields.py	/^    def test_mapfield(self):$/;"	m	class:FieldTest
-test_mapfield_numerical_index	mongoengine/tests/fields/fields.py	/^    def test_mapfield_numerical_index(self):$/;"	m	class:FieldTest
-test_mapfield_numerical_index	tests/fields/fields.py	/^    def test_mapfield_numerical_index(self):$/;"	m	class:FieldTest
-test_mapfield_update	mongoengine/tests/queryset/queryset.py	/^    def test_mapfield_update(self):$/;"	m	class:QuerySetTest
-test_mappings_protocol	mongoengine/tests/test_datastructures.py	/^    def test_mappings_protocol(self):$/;"	m	class:TestStrictDict
-test_max_time_ms	mongoengine/tests/queryset/queryset.py	/^    def test_max_time_ms(self):$/;"	m	class:QuerySetTest
-test_migrate_references	mongoengine/tests/test_dereference.py	/^    def test_migrate_references(self):$/;"	m	class:FieldTest
-test_mix_slice_with_other_fields	mongoengine/tests/queryset/field_list.py	/^    def test_mix_slice_with_other_fields(self):$/;"	m	class:OnlyExcludeAllTest
-test_mixed_creation	mongoengine/tests/document/instance.py	/^    def test_mixed_creation(self):$/;"	m	class:InstanceTest
-test_mixed_creation_dynamic	mongoengine/tests/document/instance.py	/^    def test_mixed_creation_dynamic(self):$/;"	m	class:InstanceTest
-test_mixed_creation_embedded	mongoengine/tests/document/instance.py	/^    def test_mixed_creation_embedded(self):$/;"	m	class:InstanceTest
-test_mixin_inheritance	mongoengine/tests/document/instance.py	/^    def test_mixin_inheritance(self):$/;"	m	class:InstanceTest
-test_mixing_only_exclude	mongoengine/tests/queryset/field_list.py	/^    def test_mixing_only_exclude(self):$/;"	m	class:OnlyExcludeAllTest
-test_model_signals	mongoengine/tests/test_signals.py	/^    def test_model_signals(self):$/;"	m	class:SignalTests
-test_model_validation	mongoengine/tests/document/validation.py	/^    def test_model_validation(self):$/;"	m	class:ValidatorErrorTest
-test_modify	mongoengine/tests/queryset/modify.py	/^    def test_modify(self):$/;"	m	class:FindAndModifyTest
-test_modify_empty	mongoengine/tests/document/instance.py	/^    def test_modify_empty(self):$/;"	m	class:InstanceTest
-test_modify_invalid_query	mongoengine/tests/document/instance.py	/^    def test_modify_invalid_query(self):$/;"	m	class:InstanceTest
-test_modify_match_another_document	mongoengine/tests/document/instance.py	/^    def test_modify_match_another_document(self):$/;"	m	class:InstanceTest
-test_modify_not_existing	mongoengine/tests/queryset/modify.py	/^    def test_modify_not_existing(self):$/;"	m	class:FindAndModifyTest
-test_modify_not_exists	mongoengine/tests/document/instance.py	/^    def test_modify_not_exists(self):$/;"	m	class:InstanceTest
-test_modify_update	mongoengine/tests/document/instance.py	/^    def test_modify_update(self):$/;"	m	class:InstanceTest
-test_modify_with_fields	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_fields(self):$/;"	m	class:FindAndModifyTest
-test_modify_with_new	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_new(self):$/;"	m	class:FindAndModifyTest
-test_modify_with_order_by	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_order_by(self):$/;"	m	class:FindAndModifyTest
-test_modify_with_positional_push	mongoengine/tests/document/instance.py	/^    def test_modify_with_positional_push(self):$/;"	m	class:InstanceTest
-test_modify_with_push	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_push(self):$/;"	m	class:FindAndModifyTest
-test_modify_with_remove	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_remove(self):$/;"	m	class:FindAndModifyTest
-test_modify_with_upsert	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_upsert(self):$/;"	m	class:FindAndModifyTest
-test_modify_with_upsert_existing	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_upsert_existing(self):$/;"	m	class:FindAndModifyTest
-test_modify_with_upsert_with_new	mongoengine/tests/queryset/modify.py	/^    def test_modify_with_upsert_with_new(self):$/;"	m	class:FindAndModifyTest
-test_multi_keyword_exclude	mongoengine/tests/fields/fields.py	/^    def test_multi_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_multi_keyword_exclude	tests/fields/fields.py	/^    def test_multi_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_multi_keyword_filter	mongoengine/tests/fields/fields.py	/^    def test_multi_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_multi_keyword_filter	tests/fields/fields.py	/^    def test_multi_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_multi_keyword_get	mongoengine/tests/fields/fields.py	/^    def test_multi_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_multi_keyword_get	tests/fields/fields.py	/^    def test_multi_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_multidirectional_lists	mongoengine/tests/test_dereference.py	/^    def test_multidirectional_lists(self):$/;"	m	class:FieldTest
-test_multilinestring_validation	mongoengine/tests/fields/geo.py	/^    def test_multilinestring_validation(self):$/;"	m	class:GeoFieldTest
-test_multiple_connection_settings	mongoengine/tests/test_connection.py	/^    def test_multiple_connection_settings(self):$/;"	m	class:ConnectionTest
-test_multiple_occurence_in_field	mongoengine/tests/queryset/visitor.py	/^    def test_multiple_occurence_in_field(self):$/;"	m	class:QTest
-test_multiple_sequence_fields	mongoengine/tests/fields/fields.py	/^    def test_multiple_sequence_fields(self):$/;"	m	class:FieldTest
-test_multiple_sequence_fields	tests/fields/fields.py	/^    def test_multiple_sequence_fields(self):$/;"	m	class:FieldTest
-test_multiple_sequence_fields_on_docs	mongoengine/tests/fields/fields.py	/^    def test_multiple_sequence_fields_on_docs(self):$/;"	m	class:FieldTest
-test_multiple_sequence_fields_on_docs	tests/fields/fields.py	/^    def test_multiple_sequence_fields_on_docs(self):$/;"	m	class:FieldTest
-test_multipoint_validation	mongoengine/tests/fields/geo.py	/^    def test_multipoint_validation(self):$/;"	m	class:GeoFieldTest
-test_multipolygon_validation	mongoengine/tests/fields/geo.py	/^    def test_multipolygon_validation(self):$/;"	m	class:GeoFieldTest
-test_mutating_documents	mongoengine/tests/document/instance.py	/^    def test_mutating_documents(self):$/;"	m	class:InstanceTest
-test_near	mongoengine/tests/queryset/geo.py	/^    def test_near(self):$/;"	m	class:GeoQueriesTest
-test_near_and_max_distance	mongoengine/tests/queryset/geo.py	/^    def test_near_and_max_distance(self):$/;"	m	class:GeoQueriesTest
-test_near_and_min_distance	mongoengine/tests/queryset/geo.py	/^    def test_near_and_min_distance(self):$/;"	m	class:GeoQueriesTest
-test_nested_nested_fields_mark_as_changed	mongoengine/tests/document/delta.py	/^    def test_nested_nested_fields_mark_as_changed(self):$/;"	m	class:DeltaTest
-test_nested_queryset_iterator	mongoengine/tests/queryset/queryset.py	/^    def test_nested_queryset_iterator(self):$/;"	m	class:QuerySetTest
-test_no_cache	mongoengine/tests/queryset/queryset.py	/^    def test_no_cache(self):$/;"	m	class:QuerySetTest
-test_no_cached_queryset	mongoengine/tests/queryset/queryset.py	/^    def test_no_cached_queryset(self):$/;"	m	class:QuerySetTest
-test_no_dereference	mongoengine/tests/queryset/queryset.py	/^    def test_no_dereference(self):$/;"	m	class:QuerySetTest
-test_no_dereference_context_manager_dbref	mongoengine/tests/test_context_managers.py	/^    def test_no_dereference_context_manager_dbref(self):$/;"	m	class:ContextManagersTest
-test_no_dereference_context_manager_object_id	mongoengine/tests/test_context_managers.py	/^    def test_no_dereference_context_manager_object_id(self):$/;"	m	class:ContextManagersTest
-test_no_dereference_embedded_doc	mongoengine/tests/queryset/queryset.py	/^    def test_no_dereference_embedded_doc(self):$/;"	m	class:QuerySetTest
-test_no_inherited_sequencefield	mongoengine/tests/fields/fields.py	/^    def test_no_inherited_sequencefield(self):$/;"	m	class:FieldTest
-test_no_inherited_sequencefield	tests/fields/fields.py	/^    def test_no_inherited_sequencefield(self):$/;"	m	class:FieldTest
-test_no_keyword_exclude	mongoengine/tests/fields/fields.py	/^    def test_no_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_keyword_exclude	tests/fields/fields.py	/^    def test_no_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_keyword_filter	mongoengine/tests/fields/fields.py	/^    def test_no_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_keyword_filter	tests/fields/fields.py	/^    def test_no_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_keyword_multiple_return_get	mongoengine/tests/fields/fields.py	/^    def test_no_keyword_multiple_return_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_keyword_multiple_return_get	tests/fields/fields.py	/^    def test_no_keyword_multiple_return_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_keyword_update	mongoengine/tests/fields/fields.py	/^    def test_no_keyword_update(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_keyword_update	tests/fields/fields.py	/^    def test_no_keyword_update(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_ordering_for_get	mongoengine/tests/queryset/queryset.py	/^    def test_no_ordering_for_get(self):$/;"	m	class:QuerySetTest
-test_no_result_get	mongoengine/tests/fields/fields.py	/^    def test_no_result_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_result_get	tests/fields/fields.py	/^    def test_no_result_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_no_sub_classes	mongoengine/tests/queryset/queryset.py	/^    def test_no_sub_classes(self):$/;"	m	class:QuerySetTest
-test_no_sub_classes	mongoengine/tests/test_context_managers.py	/^    def test_no_sub_classes(self):$/;"	m	class:ContextManagersTest
-test_non_ascii_pk	mongoengine/tests/test_dereference.py	/^    def test_non_ascii_pk(self):$/;"	m	class:FieldTest
-test_non_matching_exclude	mongoengine/tests/fields/fields.py	/^    def test_non_matching_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_non_matching_exclude	tests/fields/fields.py	/^    def test_non_matching_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_none	mongoengine/tests/queryset/queryset.py	/^    def test_none(self):$/;"	m	class:QuerySetTest
-test_not	mongoengine/tests/queryset/queryset.py	/^    def test_not(self):$/;"	m	class:QuerySetTest
-test_not_required_handles_none_from_database	mongoengine/tests/fields/fields.py	/^    def test_not_required_handles_none_from_database(self):$/;"	m	class:FieldTest
-test_not_required_handles_none_from_database	tests/fields/fields.py	/^    def test_not_required_handles_none_from_database(self):$/;"	m	class:FieldTest
-test_not_required_handles_none_in_update	mongoengine/tests/fields/fields.py	/^    def test_not_required_handles_none_in_update(self):$/;"	m	class:FieldTest
-test_not_required_handles_none_in_update	tests/fields/fields.py	/^    def test_not_required_handles_none_in_update(self):$/;"	m	class:FieldTest
-test_not_saved_eq	mongoengine/tests/document/instance.py	/^    def test_not_saved_eq(self):$/;"	m	class:InstanceTest
-test_null_field	mongoengine/tests/document/instance.py	/^    def test_null_field(self):$/;"	m	class:InstanceTest
-test_object_id_validation	mongoengine/tests/fields/fields.py	/^    def test_object_id_validation(self):$/;"	m	class:FieldTest
-test_object_id_validation	tests/fields/fields.py	/^    def test_object_id_validation(self):$/;"	m	class:FieldTest
-test_object_mixins	mongoengine/tests/document/instance.py	/^    def test_object_mixins(self):$/;"	m	class:InstanceTest
-test_objectid_reference_across_databases	mongoengine/tests/test_dereference.py	/^    def test_objectid_reference_across_databases(self):$/;"	m	class:FieldTest
-test_objectid_reference_fields	mongoengine/tests/fields/fields.py	/^    def test_objectid_reference_fields(self):$/;"	m	class:FieldTest
-test_objectid_reference_fields	tests/fields/fields.py	/^    def test_objectid_reference_fields(self):$/;"	m	class:FieldTest
-test_only	mongoengine/tests/queryset/field_list.py	/^    def test_only(self):$/;"	m	class:OnlyExcludeAllTest
-test_only_with_subfields	mongoengine/tests/queryset/field_list.py	/^    def test_only_with_subfields(self):$/;"	m	class:OnlyExcludeAllTest
-test_or_and_or_combination	mongoengine/tests/queryset/visitor.py	/^    def test_or_and_or_combination(self):$/;"	m	class:QTest
-test_or_combination	mongoengine/tests/queryset/visitor.py	/^    def test_or_combination(self):$/;"	m	class:QTest
-test_order_by	mongoengine/tests/queryset/queryset.py	/^    def test_order_by(self):$/;"	m	class:QuerySetTest
-test_order_by_chaining	mongoengine/tests/queryset/queryset.py	/^    def test_order_by_chaining(self):$/;"	m	class:QuerySetTest
-test_order_by_list	mongoengine/tests/queryset/queryset.py	/^    def test_order_by_list(self):$/;"	m	class:QuerySetTest
-test_order_by_optional	mongoengine/tests/queryset/queryset.py	/^    def test_order_by_optional(self):$/;"	m	class:QuerySetTest
-test_order_then_filter	mongoengine/tests/queryset/queryset.py	/^    def test_order_then_filter(self):$/;"	m	class:QuerySetTest
-test_order_works_with_custom_db_field_names	mongoengine/tests/queryset/queryset.py	/^    def test_order_works_with_custom_db_field_names(self):$/;"	m	class:QuerySetTest
-test_order_works_with_primary	mongoengine/tests/queryset/queryset.py	/^    def test_order_works_with_primary(self):$/;"	m	class:QuerySetTest
-test_ordering	mongoengine/tests/queryset/queryset.py	/^    def test_ordering(self):$/;"	m	class:QuerySetTest
-test_override_method_with_field	mongoengine/tests/document/instance.py	/^    def test_override_method_with_field(self):$/;"	m	class:InstanceTest
-test_parent_reference_in_child_document	mongoengine/tests/document/validation.py	/^    def test_parent_reference_in_child_document(self):$/;"	m	class:ValidatorErrorTest
-test_parent_reference_set_as_attribute_in_child_document	mongoengine/tests/document/validation.py	/^    def test_parent_reference_set_as_attribute_in_child_document(self):$/;"	m	class:ValidatorErrorTest
-test_picke_simple_qs	mongoengine/tests/queryset/pickable.py	/^    def test_picke_simple_qs(self):$/;"	m	class:TestQuerysetPickable
-test_picklable	mongoengine/tests/document/instance.py	/^    def test_picklable(self):$/;"	m	class:InstanceTest
-test_picklable_on_signals	mongoengine/tests/document/instance.py	/^    def test_picklable_on_signals(self):$/;"	m	class:InstanceTest
-test_pickle_support_filtration	mongoengine/tests/queryset/pickable.py	/^    def test_pickle_support_filtration(self):$/;"	m	class:TestQuerysetPickable
-test_point_validation	mongoengine/tests/fields/geo.py	/^    def test_point_validation(self):$/;"	m	class:GeoFieldTest
-test_polygon	mongoengine/tests/queryset/geo.py	/^    def test_polygon(self):$/;"	m	class:GeoQueriesTest
-test_polygon_validation	mongoengine/tests/fields/geo.py	/^    def test_polygon_validation(self):$/;"	m	class:GeoFieldTest
-test_polymorphic_queries	mongoengine/tests/document/inheritance.py	/^    def test_polymorphic_queries(self):$/;"	m	class:InheritanceTest
-test_polymorphic_references	mongoengine/tests/document/instance.py	/^    def test_polymorphic_references(self):$/;"	m	class:InstanceTest
-test_positional_creation	mongoengine/tests/document/instance.py	/^    def test_positional_creation(self):$/;"	m	class:InstanceTest
-test_positional_creation_embedded	mongoengine/tests/document/instance.py	/^    def test_positional_creation_embedded(self):$/;"	m	class:InstanceTest
-test_pull_from_nested_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_pull_from_nested_embedded(self):$/;"	m	class:QuerySetTest
-test_pull_from_nested_mapfield	mongoengine/tests/queryset/queryset.py	/^    def test_pull_from_nested_mapfield(self):$/;"	m	class:QuerySetTest
-test_pull_in_genericembedded_field	mongoengine/tests/queryset/queryset.py	/^    def test_pull_in_genericembedded_field(self):$/;"	m	class:QuerySetTest
-test_pull_nested	mongoengine/tests/queryset/queryset.py	/^    def test_pull_nested(self):$/;"	m	class:QuerySetTest
-test_push_nested_list	mongoengine/tests/document/instance.py	/^    def test_push_nested_list(self):$/;"	m	class:InstanceTest
-test_push_with_position	mongoengine/tests/document/instance.py	/^    def test_push_with_position(self):$/;"	m	class:InstanceTest
-test_q	mongoengine/tests/queryset/visitor.py	/^    def test_q(self):$/;"	m	class:QTest
-test_q_clone	mongoengine/tests/queryset/visitor.py	/^    def test_q_clone(self):$/;"	m	class:QTest
-test_q_lists	mongoengine/tests/queryset/visitor.py	/^    def test_q_lists(self):$/;"	m	class:QTest
-test_q_merge_queries_edge_case	mongoengine/tests/queryset/visitor.py	/^    def test_q_merge_queries_edge_case(self):$/;"	m	class:QTest
-test_q_regex	mongoengine/tests/queryset/visitor.py	/^    def test_q_regex(self):$/;"	m	class:QTest
-test_q_with_dbref	mongoengine/tests/queryset/visitor.py	/^    def test_q_with_dbref(self):$/;"	m	class:QTest
-test_query_count_when_saving	mongoengine/tests/document/instance.py	/^    def test_query_count_when_saving(self):$/;"	m	class:InstanceTest
-test_query_counter	mongoengine/tests/test_context_managers.py	/^    def test_query_counter(self):$/;"	m	class:ContextManagersTest
-test_query_field_name	mongoengine/tests/queryset/transform.py	/^    def test_query_field_name(self):$/;"	m	class:TransformTest
-test_query_generic_embedded_document	mongoengine/tests/queryset/queryset.py	/^    def test_query_generic_embedded_document(self):$/;"	m	class:QuerySetTest
-test_query_pk_field_name	mongoengine/tests/queryset/transform.py	/^    def test_query_pk_field_name(self):$/;"	m	class:TransformTest
-test_query_reference_to_custom_pk_doc	mongoengine/tests/queryset/queryset.py	/^    def test_query_reference_to_custom_pk_doc(self):$/;"	m	class:QuerySetTest
-test_query_value_conversion	mongoengine/tests/queryset/queryset.py	/^    def test_query_value_conversion(self):$/;"	m	class:QuerySetTest
-test_queryset_aggregation_framework	mongoengine/tests/queryset/queryset.py	/^    def test_queryset_aggregation_framework(self):$/;"	m	class:QuerySetTest
-test_queryset_delete_signals	mongoengine/tests/test_signals.py	/^    def test_queryset_delete_signals(self):$/;"	m	class:SignalTests
-test_queryset_resurrects_dropped_collection	mongoengine/tests/document/instance.py	/^    def test_queryset_resurrects_dropped_collection(self):$/;"	m	class:InstanceTest
-test_raw_and_merging	mongoengine/tests/queryset/transform.py	/^    def test_raw_and_merging(self):$/;"	m	class:TransformTest
-test_raw_query_and_Q_objects	mongoengine/tests/queryset/transform.py	/^    def test_raw_query_and_Q_objects(self):$/;"	m	class:TransformTest
-test_read_preference	mongoengine/tests/queryset/queryset.py	/^    def test_read_preference(self):$/;"	m	class:QuerySetTest
-test_recursive_embedded_objects_dont_break_indexes	mongoengine/tests/document/indexes.py	/^    def test_recursive_embedded_objects_dont_break_indexes(self):$/;"	m	class:IndexesTest
-test_recursive_embedding	mongoengine/tests/fields/fields.py	/^    def test_recursive_embedding(self):$/;"	m	class:FieldTest
-test_recursive_embedding	tests/fields/fields.py	/^    def test_recursive_embedding(self):$/;"	m	class:FieldTest
-test_recursive_reference	mongoengine/tests/fields/fields.py	/^    def test_recursive_reference(self):$/;"	m	class:FieldTest
-test_recursive_reference	mongoengine/tests/test_dereference.py	/^    def test_recursive_reference(self):$/;"	m	class:FieldTest
-test_recursive_reference	tests/fields/fields.py	/^    def test_recursive_reference(self):$/;"	m	class:FieldTest
-test_recursive_validation	mongoengine/tests/fields/fields.py	/^    def test_recursive_validation(self):$/;"	m	class:FieldTest
-test_recursive_validation	tests/fields/fields.py	/^    def test_recursive_validation(self):$/;"	m	class:FieldTest
-test_reference_abstract_class	mongoengine/tests/fields/fields.py	/^    def test_reference_abstract_class(self):$/;"	m	class:FieldTest
-test_reference_abstract_class	tests/fields/fields.py	/^    def test_reference_abstract_class(self):$/;"	m	class:FieldTest
-test_reference_class_with_abstract_parent	mongoengine/tests/fields/fields.py	/^    def test_reference_class_with_abstract_parent(self):$/;"	m	class:FieldTest
-test_reference_class_with_abstract_parent	tests/fields/fields.py	/^    def test_reference_class_with_abstract_parent(self):$/;"	m	class:FieldTest
-test_reference_field_find	mongoengine/tests/queryset/queryset.py	/^    def test_reference_field_find(self):$/;"	m	class:QuerySetTest
-test_reference_field_find_dbref	mongoengine/tests/queryset/queryset.py	/^    def test_reference_field_find_dbref(self):$/;"	m	class:QuerySetTest
-test_reference_inheritance	mongoengine/tests/document/instance.py	/^    def test_reference_inheritance(self):$/;"	m	class:InstanceTest
-test_reference_miss	mongoengine/tests/fields/fields.py	/^    def test_reference_miss(self):$/;"	m	class:FieldTest
-test_reference_miss	tests/fields/fields.py	/^    def test_reference_miss(self):$/;"	m	class:FieldTest
-test_reference_query_conversion	mongoengine/tests/fields/fields.py	/^    def test_reference_query_conversion(self):$/;"	m	class:FieldTest
-test_reference_query_conversion	tests/fields/fields.py	/^    def test_reference_query_conversion(self):$/;"	m	class:FieldTest
-test_reference_query_conversion_dbref	mongoengine/tests/fields/fields.py	/^    def test_reference_query_conversion_dbref(self):$/;"	m	class:FieldTest
-test_reference_query_conversion_dbref	tests/fields/fields.py	/^    def test_reference_query_conversion_dbref(self):$/;"	m	class:FieldTest
-test_reference_validation	mongoengine/tests/fields/fields.py	/^    def test_reference_validation(self):$/;"	m	class:FieldTest
-test_reference_validation	tests/fields/fields.py	/^    def test_reference_validation(self):$/;"	m	class:FieldTest
-test_referenced_object_changed_attributes	mongoengine/tests/document/delta.py	/^    def test_referenced_object_changed_attributes(self):$/;"	m	class:DeltaTest
-test_regex_query_shortcuts	mongoengine/tests/queryset/queryset.py	/^    def test_regex_query_shortcuts(self):$/;"	m	class:QuerySetTest
-test_register_connection	mongoengine/tests/test_connection.py	/^    def test_register_connection(self):$/;"	m	class:ConnectionTest
-test_register_connection_defaults	mongoengine/tests/test_connection.py	/^    def test_register_connection_defaults(self):$/;"	m	class:ConnectionTest
-test_register_delete_rule	mongoengine/tests/document/class_methods.py	/^    def test_register_delete_rule(self):$/;"	m	class:ClassMethodsTest
-test_register_delete_rule_inherited	mongoengine/tests/document/class_methods.py	/^    def test_register_delete_rule_inherited(self):$/;"	m	class:ClassMethodsTest
-test_regular_document_pickle	mongoengine/tests/document/instance.py	/^    def test_regular_document_pickle(self):$/;"	m	class:InstanceTest
-test_reload	mongoengine/tests/document/instance.py	/^    def test_reload(self):$/;"	m	class:InstanceTest
-test_reload_after_unsetting	mongoengine/tests/document/dynamic.py	/^    def test_reload_after_unsetting(self):$/;"	m	class:DynamicTest
-test_reload_doesnt_exist	mongoengine/tests/document/instance.py	/^    def test_reload_doesnt_exist(self):$/;"	m	class:InstanceTest
-test_reload_dynamic_field	mongoengine/tests/document/dynamic.py	/^    def test_reload_dynamic_field(self):$/;"	m	class:DynamicTest
-test_reload_embedded_docs_instance	mongoengine/tests/queryset/queryset.py	/^    def test_reload_embedded_docs_instance(self):$/;"	m	class:QuerySetTest
-test_reload_list_embedded_docs_instance	mongoengine/tests/queryset/queryset.py	/^    def test_reload_list_embedded_docs_instance(self):$/;"	m	class:QuerySetTest
-test_reload_of_non_strict_with_special_field_name	mongoengine/tests/document/instance.py	/^    def test_reload_of_non_strict_with_special_field_name(self):$/;"	m	class:InstanceTest
-test_reload_referencing	mongoengine/tests/document/instance.py	/^    def test_reload_referencing(self):$/;"	m	class:InstanceTest
-test_reload_sharded	mongoengine/tests/document/instance.py	/^    def test_reload_sharded(self):$/;"	m	class:InstanceTest
-test_reload_sharded_nested	mongoengine/tests/document/instance.py	/^    def test_reload_sharded_nested(self):$/;"	m	class:InstanceTest
-test_repeated_iteration	mongoengine/tests/queryset/queryset.py	/^    def test_repeated_iteration(self):$/;"	m	class:QuerySetTest
-test_replicaset_uri_passes_read_preference	mongoengine/tests/test_replicaset_connection.py	/^    def test_replicaset_uri_passes_read_preference(self):$/;"	m	class:ConnectionTest
-test_repr	mongoengine/tests/document/instance.py	/^    def test_repr(self):$/;"	m	class:InstanceTest
-test_repr	mongoengine/tests/queryset/queryset.py	/^    def test_repr(self):$/;"	m	class:QuerySetTest
-test_repr	mongoengine/tests/test_datastructures.py	/^    def test_repr(self):$/;"	m	class:TestStrictDict
-test_repr_none	mongoengine/tests/document/instance.py	/^    def test_repr_none(self):$/;"	m	class:InstanceTest
-test_required_values	mongoengine/tests/fields/fields.py	/^    def test_required_values(self):$/;"	m	class:FieldTest
-test_required_values	tests/fields/fields.py	/^    def test_required_values(self):$/;"	m	class:FieldTest
-test_reset	mongoengine/tests/queryset/field_list.py	/^    def test_reset(self):$/;"	m	class:QueryFieldListTest
-test_reverse_delete_rule_cascade	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_cascade_and_nullify	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_cascade_and_nullify(self):$/;"	m	class:InstanceTest
-test_reverse_delete_rule_cascade_and_nullify_complex_field	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_cascade_and_nullify_complex_field(self):$/;"	m	class:InstanceTest
-test_reverse_delete_rule_cascade_complex_cycle	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade_complex_cycle(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_cascade_cycle	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade_cycle(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_cascade_on_abstract_document	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade_on_abstract_document(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_cascade_recurs	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_cascade_recurs(self):$/;"	m	class:InstanceTest
-test_reverse_delete_rule_cascade_self_referencing	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_cascade_self_referencing(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_cascade_triggers_pre_delete_signal	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_cascade_triggers_pre_delete_signal(self):$/;"	m	class:InstanceTest
-test_reverse_delete_rule_deny	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_deny(self):$/;"	m	class:InstanceTest
-test_reverse_delete_rule_deny	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_deny(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_deny_on_abstract_document	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_deny_on_abstract_document(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_nullify	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_nullify(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_nullify_on_abstract_document	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_nullify_on_abstract_document(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_pull	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_pull(self):$/;"	m	class:InstanceTest
-test_reverse_delete_rule_pull	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_pull(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_pull_on_abstract_documents	mongoengine/tests/queryset/queryset.py	/^    def test_reverse_delete_rule_pull_on_abstract_documents(self):$/;"	m	class:QuerySetTest
-test_reverse_delete_rule_with_custom_id_field	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_with_custom_id_field(self):$/;"	m	class:InstanceTest
-test_reverse_delete_rule_with_document_inheritance	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_with_document_inheritance(self):$/;"	m	class:InstanceTest
-test_reverse_delete_rule_with_shared_id_among_collections	mongoengine/tests/document/instance.py	/^    def test_reverse_delete_rule_with_shared_id_among_collections(self):$/;"	m	class:InstanceTest
-test_reverse_list_sorting	mongoengine/tests/fields/fields.py	/^    def test_reverse_list_sorting(self):$/;"	m	class:FieldTest
-test_reverse_list_sorting	tests/fields/fields.py	/^    def test_reverse_list_sorting(self):$/;"	m	class:FieldTest
-test_save	mongoengine/tests/document/instance.py	/^    def test_save(self):$/;"	m	class:InstanceTest
-test_save	mongoengine/tests/fields/fields.py	/^    def test_save(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_save	tests/fields/fields.py	/^    def test_save(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_save_abstract_document	mongoengine/tests/document/instance.py	/^    def test_save_abstract_document(self):$/;"	m	class:InstanceTest
-test_save_and_only_on_fields_with_default	mongoengine/tests/queryset/queryset.py	/^    def test_save_and_only_on_fields_with_default(self):$/;"	m	class:QuerySetTest
-test_save_atomicity_condition	mongoengine/tests/document/instance.py	/^    def test_save_atomicity_condition(self):$/;"	m	class:InstanceTest
-test_save_cascade_kwargs	mongoengine/tests/document/instance.py	/^    def test_save_cascade_kwargs(self):$/;"	m	class:InstanceTest
-test_save_cascade_meta_false	mongoengine/tests/document/instance.py	/^    def test_save_cascade_meta_false(self):$/;"	m	class:InstanceTest
-test_save_cascade_meta_true	mongoengine/tests/document/instance.py	/^    def test_save_cascade_meta_true(self):$/;"	m	class:InstanceTest
-test_save_cascades	mongoengine/tests/document/instance.py	/^    def test_save_cascades(self):$/;"	m	class:InstanceTest
-test_save_cascades_generically	mongoengine/tests/document/instance.py	/^    def test_save_cascades_generically(self):$/;"	m	class:InstanceTest
-test_save_custom_id	mongoengine/tests/document/instance.py	/^    def test_save_custom_id(self):$/;"	m	class:InstanceTest
-test_save_custom_pk	mongoengine/tests/document/instance.py	/^    def test_save_custom_pk(self):$/;"	m	class:InstanceTest
-test_save_embedded_document	mongoengine/tests/document/instance.py	/^    def test_save_embedded_document(self):$/;"	m	class:InstanceTest
-test_save_list	mongoengine/tests/document/instance.py	/^    def test_save_list(self):$/;"	m	class:InstanceTest
-test_save_max_recursion_not_hit	mongoengine/tests/document/instance.py	/^    def test_save_max_recursion_not_hit(self):$/;"	m	class:InstanceTest
-test_save_max_recursion_not_hit_with_file_field	mongoengine/tests/document/instance.py	/^    def test_save_max_recursion_not_hit_with_file_field(self):$/;"	m	class:InstanceTest
-test_save_only_changed_fields	mongoengine/tests/document/instance.py	/^    def test_save_only_changed_fields(self):$/;"	m	class:InstanceTest
-test_save_only_changed_fields_recursive	mongoengine/tests/document/instance.py	/^    def test_save_only_changed_fields_recursive(self):$/;"	m	class:InstanceTest
-test_save_reference	mongoengine/tests/document/instance.py	/^    def test_save_reference(self):$/;"	m	class:InstanceTest
-test_save_to_a_value_that_equates_to_false	mongoengine/tests/document/instance.py	/^    def test_save_to_a_value_that_equates_to_false(self):$/;"	m	class:InstanceTest
-test_scalar	mongoengine/tests/queryset/queryset.py	/^    def test_scalar(self):$/;"	m	class:QuerySetTest
-test_scalar_cursor_behaviour	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_cursor_behaviour(self):$/;"	m	class:QuerySetTest
-test_scalar_db_field	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_db_field(self):$/;"	m	class:QuerySetTest
-test_scalar_decimal	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_decimal(self):$/;"	m	class:QuerySetTest
-test_scalar_embedded	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_embedded(self):$/;"	m	class:QuerySetTest
-test_scalar_generic_reference_field	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_generic_reference_field(self):$/;"	m	class:QuerySetTest
-test_scalar_primary_key	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_primary_key(self):$/;"	m	class:QuerySetTest
-test_scalar_reference_field	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_reference_field(self):$/;"	m	class:QuerySetTest
-test_scalar_simple	mongoengine/tests/queryset/queryset.py	/^    def test_scalar_simple(self):$/;"	m	class:QuerySetTest
-test_select_related_follows_embedded_referencefields	mongoengine/tests/test_dereference.py	/^    def test_select_related_follows_embedded_referencefields(self):$/;"	m	class:FieldTest
-test_sequence_field	mongoengine/tests/fields/fields.py	/^    def test_sequence_field(self):$/;"	m	class:FieldTest
-test_sequence_field	tests/fields/fields.py	/^    def test_sequence_field(self):$/;"	m	class:FieldTest
-test_sequence_field_get_next_value	mongoengine/tests/fields/fields.py	/^    def test_sequence_field_get_next_value(self):$/;"	m	class:FieldTest
-test_sequence_field_get_next_value	tests/fields/fields.py	/^    def test_sequence_field_get_next_value(self):$/;"	m	class:FieldTest
-test_sequence_field_sequence_name	mongoengine/tests/fields/fields.py	/^    def test_sequence_field_sequence_name(self):$/;"	m	class:FieldTest
-test_sequence_field_sequence_name	tests/fields/fields.py	/^    def test_sequence_field_sequence_name(self):$/;"	m	class:FieldTest
-test_sequence_field_value_decorator	mongoengine/tests/fields/fields.py	/^    def test_sequence_field_value_decorator(self):$/;"	m	class:FieldTest
-test_sequence_field_value_decorator	tests/fields/fields.py	/^    def test_sequence_field_value_decorator(self):$/;"	m	class:FieldTest
-test_sequence_fields_reload	mongoengine/tests/fields/fields.py	/^    def test_sequence_fields_reload(self):$/;"	m	class:FieldTest
-test_sequence_fields_reload	tests/fields/fields.py	/^    def test_sequence_fields_reload(self):$/;"	m	class:FieldTest
-test_set_generic_embedded_documents	mongoengine/tests/queryset/queryset.py	/^    def test_set_generic_embedded_documents(self):$/;"	m	class:QuerySetTest
-test_set_list_embedded_documents	mongoengine/tests/queryset/queryset.py	/^    def test_set_list_embedded_documents(self):$/;"	m	class:QuerySetTest
-test_set_on_insert	mongoengine/tests/queryset/queryset.py	/^    def test_set_on_insert(self):$/;"	m	class:QuerySetTest
-test_set_unset_one_operation	mongoengine/tests/document/instance.py	/^    def test_set_unset_one_operation(self):$/;"	m	class:InstanceTest
-test_setattr_getattr	mongoengine/tests/test_datastructures.py	/^    def test_setattr_getattr(self):$/;"	m	class:TestStrictDict
-test_setattr_getattr_special	mongoengine/tests/test_datastructures.py	/^    def test_setattr_getattr_special(self):$/;"	m	class:TestStrictDict
-test_setattr_raises_on_nonexisting_attr	mongoengine/tests/test_datastructures.py	/^    def test_setattr_raises_on_nonexisting_attr(self):$/;"	m	class:TestStrictDict
-test_shard_key	mongoengine/tests/document/instance.py	/^    def test_shard_key(self):$/;"	m	class:InstanceTest
-test_shard_key_in_embedded_document	mongoengine/tests/document/instance.py	/^    def test_shard_key_in_embedded_document(self):$/;"	m	class:InstanceTest
-test_shard_key_primary	mongoengine/tests/document/instance.py	/^    def test_shard_key_primary(self):$/;"	m	class:InstanceTest
-test_sharing_connections	mongoengine/tests/test_connection.py	/^    def test_sharing_connections(self):$/;"	m	class:ConnectionTest
-test_signal_kwargs	mongoengine/tests/test_signals.py	/^    def test_signal_kwargs(self):$/;"	m	class:SignalTests
-test_signals_bulk_insert	mongoengine/tests/test_signals.py	/^    def test_signals_bulk_insert(self):$/;"	m	class:SignalTests
-test_signals_with_explicit_doc_ids	mongoengine/tests/test_signals.py	/^    def test_signals_with_explicit_doc_ids(self):$/;"	m	class:SignalTests
-test_signals_with_switch_collection	mongoengine/tests/test_signals.py	/^    def test_signals_with_switch_collection(self):$/;"	m	class:SignalTests
-test_signals_with_switch_db	mongoengine/tests/test_signals.py	/^    def test_signals_with_switch_db(self):$/;"	m	class:SignalTests
-test_simple_choices_get_field_display	mongoengine/tests/fields/fields.py	/^    def test_simple_choices_get_field_display(self):$/;"	m	class:FieldTest
-test_simple_choices_get_field_display	tests/fields/fields.py	/^    def test_simple_choices_get_field_display(self):$/;"	m	class:FieldTest
-test_simple_choices_validation	mongoengine/tests/fields/fields.py	/^    def test_simple_choices_validation(self):$/;"	m	class:FieldTest
-test_simple_choices_validation	tests/fields/fields.py	/^    def test_simple_choices_validation(self):$/;"	m	class:FieldTest
-test_simple_choices_validation_invalid_value	mongoengine/tests/fields/fields.py	/^    def test_simple_choices_validation_invalid_value(self):$/;"	m	class:FieldTest
-test_simple_choices_validation_invalid_value	tests/fields/fields.py	/^    def test_simple_choices_validation_invalid_value(self):$/;"	m	class:FieldTest
-test_simple_dynamic_document	mongoengine/tests/document/dynamic.py	/^    def test_simple_dynamic_document(self):$/;"	m	class:DynamicTest
-test_single_keyword_exclude	mongoengine/tests/fields/fields.py	/^    def test_single_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_single_keyword_exclude	tests/fields/fields.py	/^    def test_single_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_single_keyword_filter	mongoengine/tests/fields/fields.py	/^    def test_single_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_single_keyword_filter	tests/fields/fields.py	/^    def test_single_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_single_keyword_get	mongoengine/tests/fields/fields.py	/^    def test_single_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_single_keyword_get	tests/fields/fields.py	/^    def test_single_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_single_keyword_update	mongoengine/tests/fields/fields.py	/^    def test_single_keyword_update(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_single_keyword_update	tests/fields/fields.py	/^    def test_single_keyword_update(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_skip	mongoengine/tests/queryset/queryset.py	/^    def test_skip(self):$/;"	m	class:QuerySetTest
-test_slave_okay	mongoengine/tests/queryset/queryset.py	/^    def test_slave_okay(self):$/;"	m	class:QuerySetTest
-test_slice	mongoengine/tests/queryset/queryset.py	/^    def test_slice(self):$/;"	m	class:QuerySetTest
-test_slice_marks_field_as_changed	mongoengine/tests/fields/fields.py	/^    def test_slice_marks_field_as_changed(self):$/;"	m	class:FieldTest
-test_slice_marks_field_as_changed	tests/fields/fields.py	/^    def test_slice_marks_field_as_changed(self):$/;"	m	class:FieldTest
-test_slicing	mongoengine/tests/queryset/field_list.py	/^    def test_slicing(self):$/;"	m	class:OnlyExcludeAllTest
-test_slicing_fields	mongoengine/tests/queryset/field_list.py	/^    def test_slicing_fields(self):$/;"	m	class:OnlyExcludeAllTest
-test_slicing_nested_fields	mongoengine/tests/queryset/field_list.py	/^    def test_slicing_nested_fields(self):$/;"	m	class:OnlyExcludeAllTest
-test_sorted_list_sorting	mongoengine/tests/fields/fields.py	/^    def test_sorted_list_sorting(self):$/;"	m	class:FieldTest
-test_sorted_list_sorting	tests/fields/fields.py	/^    def test_sorted_list_sorting(self):$/;"	m	class:FieldTest
-test_spaces_in_keys	mongoengine/tests/document/instance.py	/^    def test_spaces_in_keys(self):$/;"	m	class:InstanceTest
-test_sparse_compound_indexes	mongoengine/tests/document/indexes.py	/^    def test_sparse_compound_indexes(self):$/;"	m	class:IndexesTest
-test_sparse_field	mongoengine/tests/fields/fields.py	/^    def test_sparse_field(self):$/;"	m	class:FieldTest
-test_sparse_field	tests/fields/fields.py	/^    def test_sparse_field(self):$/;"	m	class:FieldTest
-test_spherical_geospatial_operators	mongoengine/tests/queryset/geo.py	/^    def test_spherical_geospatial_operators(self):$/;"	m	class:GeoQueriesTest
-test_string_indexes	mongoengine/tests/document/indexes.py	/^    def test_string_indexes(self):$/;"	m	class:IndexesTest
-test_string_validation	mongoengine/tests/fields/fields.py	/^    def test_string_validation(self):$/;"	m	class:FieldTest
-test_string_validation	tests/fields/fields.py	/^    def test_string_validation(self):$/;"	m	class:FieldTest
-test_subclass_field_query	mongoengine/tests/queryset/queryset.py	/^    def test_subclass_field_query(self):$/;"	m	class:QuerySetTest
-test_subclasses	mongoengine/tests/document/inheritance.py	/^    def test_subclasses(self):$/;"	m	class:InheritanceTest
-test_sum	mongoengine/tests/queryset/queryset.py	/^    def test_sum(self):$/;"	m	class:QuerySetTest
-test_sum_over_db_field	mongoengine/tests/queryset/queryset.py	/^    def test_sum_over_db_field(self):$/;"	m	class:QuerySetTest
-test_superclasses	mongoengine/tests/document/inheritance.py	/^    def test_superclasses(self):$/;"	m	class:InheritanceTest
-test_switch_collection_context_manager	mongoengine/tests/test_context_managers.py	/^    def test_switch_collection_context_manager(self):$/;"	m	class:ContextManagersTest
-test_switch_db_context_manager	mongoengine/tests/test_context_managers.py	/^    def test_switch_db_context_manager(self):$/;"	m	class:ContextManagersTest
-test_switch_db_instance	mongoengine/tests/document/instance.py	/^    def test_switch_db_instance(self):$/;"	m	class:InstanceTest
-test_text_indexes	mongoengine/tests/document/indexes.py	/^    def test_text_indexes(self):$/;"	m	class:IndexesTest
-test_text_indexes	mongoengine/tests/queryset/queryset.py	/^    def test_text_indexes(self):$/;"	m	class:QuerySetTest
-test_three_level_complex_data_lookups	mongoengine/tests/document/dynamic.py	/^    def test_three_level_complex_data_lookups(self):$/;"	m	class:DynamicTest
-test_to_dbref	mongoengine/tests/document/instance.py	/^    def test_to_dbref(self):$/;"	m	class:InstanceTest
-test_to_dict	mongoengine/tests/document/validation.py	/^    def test_to_dict(self):$/;"	m	class:ValidatorErrorTest
-test_transform_query	mongoengine/tests/queryset/transform.py	/^    def test_transform_query(self):$/;"	m	class:TransformTest
-test_transform_update	mongoengine/tests/queryset/transform.py	/^    def test_transform_update(self):$/;"	m	class:TransformTest
-test_ttl_indexes	mongoengine/tests/document/indexes.py	/^    def test_ttl_indexes(self):$/;"	m	class:IndexesTest
-test_tuples_as_tuples	mongoengine/tests/fields/fields.py	/^    def test_tuples_as_tuples(self):$/;"	m	class:FieldTest
-test_tuples_as_tuples	tests/fields/fields.py	/^    def test_tuples_as_tuples(self):$/;"	m	class:FieldTest
-test_two_way_reverse_delete_rule	mongoengine/tests/document/instance.py	/^    def test_two_way_reverse_delete_rule(self):$/;"	m	class:InstanceTest
-test_type	mongoengine/tests/queryset/transform.py	/^    def test_type(self):$/;"	m	class:TransformTest
-test_undefined_field_exception	mongoengine/tests/fields/fields.py	/^    def test_undefined_field_exception(self):$/;"	m	class:FieldTest
-test_undefined_field_exception	tests/fields/fields.py	/^    def test_undefined_field_exception(self):$/;"	m	class:FieldTest
-test_undefined_field_exception_with_strict	mongoengine/tests/fields/fields.py	/^    def test_undefined_field_exception_with_strict(self):$/;"	m	class:FieldTest
-test_undefined_field_exception_with_strict	tests/fields/fields.py	/^    def test_undefined_field_exception_with_strict(self):$/;"	m	class:FieldTest
-test_undefined_reference	mongoengine/tests/fields/fields.py	/^    def test_undefined_reference(self):$/;"	m	class:FieldTest
-test_undefined_reference	tests/fields/fields.py	/^    def test_undefined_reference(self):$/;"	m	class:FieldTest
-test_understandable_error_raised	mongoengine/tests/queryset/transform.py	/^    def test_understandable_error_raised(self):$/;"	m	class:TransformTest
-test_unicode	mongoengine/tests/fields/fields.py	/^    def test_unicode(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_unicode	tests/fields/fields.py	/^    def test_unicode(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_unicode_url_validation	mongoengine/tests/fields/fields.py	/^    def test_unicode_url_validation(self):$/;"	m	class:FieldTest
-test_unicode_url_validation	tests/fields/fields.py	/^    def test_unicode_url_validation(self):$/;"	m	class:FieldTest
-test_unique	mongoengine/tests/document/indexes.py	/^    def test_unique(self):$/;"	m	class:IndexesTest
-test_unique_and_indexes	mongoengine/tests/document/indexes.py	/^    def test_unique_and_indexes(self):$/;"	m	class:IndexesTest
-test_unique_and_primary	mongoengine/tests/document/indexes.py	/^    def test_unique_and_primary(self):$/;"	m	class:IndexesTest
-test_unique_and_primary_create	mongoengine/tests/document/indexes.py	/^    def test_unique_and_primary_create(self):$/;"	m	class:IndexesTest
-test_unique_embedded_document	mongoengine/tests/document/indexes.py	/^    def test_unique_embedded_document(self):$/;"	m	class:IndexesTest
-test_unique_embedded_document_in_list	mongoengine/tests/document/indexes.py	/^    def test_unique_embedded_document_in_list(self):$/;"	m	class:IndexesTest
-test_unique_with	mongoengine/tests/document/indexes.py	/^    def test_unique_with(self):$/;"	m	class:IndexesTest
-test_unique_with_embedded_document_and_embedded_unique	mongoengine/tests/document/indexes.py	/^    def test_unique_with_embedded_document_and_embedded_unique(self):$/;"	m	class:IndexesTest
-test_unknown_keyword_exclude	mongoengine/tests/fields/fields.py	/^    def test_unknown_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_unknown_keyword_exclude	tests/fields/fields.py	/^    def test_unknown_keyword_exclude(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_unknown_keyword_filter	mongoengine/tests/fields/fields.py	/^    def test_unknown_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_unknown_keyword_filter	tests/fields/fields.py	/^    def test_unknown_keyword_filter(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_unknown_keyword_get	mongoengine/tests/fields/fields.py	/^    def test_unknown_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_unknown_keyword_get	tests/fields/fields.py	/^    def test_unknown_keyword_get(self):$/;"	m	class:EmbeddedDocumentListFieldTestCase
-test_unpickle	mongoengine/tests/queryset/pickable.py	/^    def test_unpickle(self):$/;"	m	class:TestQuerysetPickable
-test_unset_reference	mongoengine/tests/queryset/queryset.py	/^    def test_unset_reference(self):$/;"	m	class:QuerySetTest
-test_update	mongoengine/tests/document/instance.py	/^    def test_update(self):$/;"	m	class:InstanceTest
-test_update	mongoengine/tests/queryset/queryset.py	/^    def test_update(self):$/;"	m	class:QuerySetTest
-test_update_array_position	mongoengine/tests/queryset/queryset.py	/^    def test_update_array_position(self):$/;"	m	class:QuerySetTest
-test_update_list_field	mongoengine/tests/document/instance.py	/^    def test_update_list_field(self):$/;"	m	class:InstanceTest
-test_update_min_max	mongoengine/tests/queryset/queryset.py	/^    def test_update_min_max(self):$/;"	m	class:QuerySetTest
-test_update_one_pop_generic_reference	mongoengine/tests/queryset/queryset.py	/^    def test_update_one_pop_generic_reference(self):$/;"	m	class:QuerySetTest
-test_update_push_and_pull_add_to_set	mongoengine/tests/queryset/queryset.py	/^    def test_update_push_and_pull_add_to_set(self):$/;"	m	class:QuerySetTest
-test_update_push_list_of_list	mongoengine/tests/queryset/queryset.py	/^    def test_update_push_list_of_list(self):$/;"	m	class:QuerySetTest
-test_update_push_with_position	mongoengine/tests/queryset/queryset.py	/^    def test_update_push_with_position(self):$/;"	m	class:QuerySetTest
-test_update_related_models	mongoengine/tests/queryset/queryset.py	/^    def test_update_related_models(self):$/;"	m	class:QuerySetTest
-test_update_rename_operator	mongoengine/tests/document/instance.py	/^    def test_update_rename_operator(self):$/;"	m	class:InstanceTest
-test_update_results	mongoengine/tests/queryset/queryset.py	/^    def test_update_results(self):$/;"	m	class:QuerySetTest
-test_update_unique_field	mongoengine/tests/document/instance.py	/^    def test_update_unique_field(self):$/;"	m	class:InstanceTest
-test_update_update_has_a_value	mongoengine/tests/queryset/queryset.py	/^    def test_update_update_has_a_value(self):$/;"	m	class:QuerySetTest
-test_update_upsert_looks_like_a_digit	mongoengine/tests/queryset/queryset.py	/^    def test_update_upsert_looks_like_a_digit(self):$/;"	m	class:QuerySetTest
-test_update_using_positional_operator	mongoengine/tests/queryset/queryset.py	/^    def test_update_using_positional_operator(self):$/;"	m	class:QuerySetTest
-test_update_using_positional_operator_embedded_document	mongoengine/tests/queryset/queryset.py	/^    def test_update_using_positional_operator_embedded_document(self):$/;"	m	class:QuerySetTest
-test_update_using_positional_operator_matches_first	mongoengine/tests/queryset/queryset.py	/^    def test_update_using_positional_operator_matches_first(self):$/;"	m	class:QuerySetTest
-test_update_validate	mongoengine/tests/queryset/queryset.py	/^    def test_update_validate(self):$/;"	m	class:QuerySetTest
-test_update_value_conversion	mongoengine/tests/queryset/queryset.py	/^    def test_update_value_conversion(self):$/;"	m	class:QuerySetTest
-test_update_write_concern	mongoengine/tests/queryset/queryset.py	/^    def test_update_write_concern(self):$/;"	m	class:QuerySetTest
-test_updates_can_have_match_operators	mongoengine/tests/queryset/queryset.py	/^    def test_updates_can_have_match_operators(self):$/;"	m	class:QuerySetTest
-test_updating_an_embedded_document	mongoengine/tests/document/instance.py	/^    def test_updating_an_embedded_document(self):$/;"	m	class:InstanceTest
-test_upper_level_mark_as_changed	mongoengine/tests/document/delta.py	/^    def test_upper_level_mark_as_changed(self):$/;"	m	class:DeltaTest
-test_upsert	mongoengine/tests/queryset/queryset.py	/^    def test_upsert(self):$/;"	m	class:QuerySetTest
-test_upsert_includes_cls	mongoengine/tests/queryset/queryset.py	/^    def test_upsert_includes_cls(self):$/;"	m	class:QuerySetTest
-test_upsert_one	mongoengine/tests/queryset/queryset.py	/^    def test_upsert_one(self):$/;"	m	class:QuerySetTest
-test_uri_without_credentials_doesnt_override_conn_settings	mongoengine/tests/test_connection.py	/^    def test_uri_without_credentials_doesnt_override_conn_settings(self):$/;"	m	class:ConnectionTest
-test_url_scheme_validation	mongoengine/tests/fields/fields.py	/^    def test_url_scheme_validation(self):$/;"	m	class:FieldTest
-test_url_scheme_validation	tests/fields/fields.py	/^    def test_url_scheme_validation(self):$/;"	m	class:FieldTest
-test_url_validation	mongoengine/tests/fields/fields.py	/^    def test_url_validation(self):$/;"	m	class:FieldTest
-test_url_validation	tests/fields/fields.py	/^    def test_url_validation(self):$/;"	m	class:FieldTest
-test_using	mongoengine/tests/queryset/queryset.py	/^    def test_using(self):$/;"	m	class:QuerySetTest
-test_using_a_slice	mongoengine/tests/queryset/field_list.py	/^    def test_using_a_slice(self):$/;"	m	class:QueryFieldListTest
-test_uuid_field_binary	mongoengine/tests/fields/fields.py	/^    def test_uuid_field_binary(self):$/;"	m	class:FieldTest
-test_uuid_field_binary	tests/fields/fields.py	/^    def test_uuid_field_binary(self):$/;"	m	class:FieldTest
-test_uuid_field_string	mongoengine/tests/fields/fields.py	/^    def test_uuid_field_string(self):$/;"	m	class:FieldTest
-test_uuid_field_string	tests/fields/fields.py	/^    def test_uuid_field_string(self):$/;"	m	class:FieldTest
-test_where	mongoengine/tests/queryset/queryset.py	/^    def test_where(self):$/;"	m	class:QuerySetTest
-test_within_box	mongoengine/tests/queryset/geo.py	/^    def test_within_box(self):$/;"	m	class:GeoQueriesTest
-test_within_distance	mongoengine/tests/queryset/geo.py	/^    def test_within_distance(self):$/;"	m	class:GeoQueriesTest
-test_within_polygon	mongoengine/tests/queryset/geo.py	/^    def test_within_polygon(self):$/;"	m	class:GeoQueriesTest
-test_write_concern	mongoengine/tests/test_connection.py	/^    def test_write_concern(self):$/;"	m	class:ConnectionTest
-testdict	mongoengine/tests/queryset/queryset.py	/^            testdict = DictField()$/;"	v	class:QuerySetTest.test_dict_with_custom_baseclass.Test
-testdict	mongoengine/tests/queryset/queryset.py	/^            testdict = DictField(basecls=StringField)$/;"	v	class:QuerySetTest.test_dict_with_custom_baseclass.Test
-text	mongoengine/tests/document/indexes.py	/^            text = StringField()$/;"	v	class:IndexesTest.test_compound_key_dictfield.ReportDictField
-text	mongoengine/tests/document/indexes.py	/^            text = StringField()$/;"	v	class:IndexesTest.test_compound_key_embedded.ReportEmbedded
-text	mongoengine/tests/document/instance.py	/^            text = StringField()$/;"	v	class:InstanceTest.test_reverse_delete_rule_cascade_recurs.Comment
-text	mongoengine/tests/fields/fields.py	/^            text = StringField()$/;"	v	class:FieldTest.test_list_field_passed_in_value.Bar
-text	mongoengine/tests/queryset/field_list.py	/^            text = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.Comment
-text	mongoengine/tests/queryset/field_list.py	/^            text = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.Comment
-text	mongoengine/tests/queryset/queryset.py	/^            text = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_ReferenceField.Bar
-text	mongoengine/tests/queryset/queryset.py	/^            text = StringField()$/;"	v	class:QuerySetTest.test_distinct_handles_references.Bar
-text	mongoengine/tests/queryset/queryset.py	/^            text = StringField()$/;"	v	class:QuerySetTest.test_distinct_handles_references_to_alias.Bar
-text	mongoengine/tests/queryset/queryset.py	/^            text = StringField()$/;"	v	class:QuerySetTest.test_unset_reference.Comment
-text	mongoengine/tests/test_dereference.py	/^            text = StringField()$/;"	v	class:FieldTest.test_list_lookup_not_checked_in_map.Comment
-text	tests/fields/fields.py	/^            text = StringField()$/;"	v	class:FieldTest.test_list_field_passed_in_value.Bar
-text_info	mongoengine/tests/fields/fields.py	/^            text_info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
-text_info	tests/fields/fields.py	/^            text_info = ListField(StringField())$/;"	v	class:FieldTest.test_list_field_lexicographic_operators.BlogPost
-the_date	mongoengine/tests/test_connection.py	/^            the_date = DateTimeField(required=True)$/;"	v	class:ConnectionTest.test_datetime.DateDoc
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_copyable.PutFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_boolean.TestFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_cmp.TestFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_disk_space.TestFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_field_no_default.GridDocument
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_field_optional.DemoFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_fields.PutFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_fields_set.SetFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_fields_stream.StreamFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_fields_stream_after_none.StreamFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_reassigning.TestFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField()$/;"	v	class:FileTest.test_file_uniqueness.TestFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = FileField(db_alias="test_files",$/;"	v	class:FileTest.test_file_multidb.TestFile
-the_file	mongoengine/tests/fields/file_tests.py	/^            the_file = ImageField()$/;"	v	class:FileTest.test_image_field_reassigning.TestFile
-thick	mongoengine/tests/queryset/queryset.py	/^            thick = BooleanField()$/;"	v	class:QuerySetTest.test_elem_match.Foo
-thing	mongoengine/tests/document/instance.py	/^            thing = EmbeddedDocumentField(Thing)$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document.User
-thing	mongoengine/tests/document/instance.py	/^            thing = EmbeddedDocumentField(Thing)$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false.User
-thing	mongoengine/tests/document/instance.py	/^            thing = EmbeddedDocumentField(Thing)$/;"	v	class:InstanceTest.test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc.User
-thing	mongoengine/tests/document/instance.py	/^            thing = EmbeddedDocumentField(Thing)$/;"	v	class:InstanceTest.test_save_to_a_value_that_equates_to_false.User
-thing	mongoengine/tests/fields/fields.py	/^            thing = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Ocurrence
-thing	tests/fields/fields.py	/^            thing = GenericLazyReferenceField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_choices.Ocurrence
-thumbnail	mongoengine/fields.py	/^    def thumbnail(self):$/;"	m	class:ImageGridFsProxy
-thumbnail	mongoengine/mongoengine/fields.py	/^    def thumbnail(self):$/;"	m	class:ImageGridFsProxy
-time	mongoengine/tests/fields/fields.py	/^            time = DateTimeField()$/;"	v	class:FieldTest.test_datetime_tz_aware_mark_as_changed.LogEntry
-time	mongoengine/tests/fields/fields.py	/^            time = DateTimeField()$/;"	v	class:FieldTest.test_datetime_validation.LogEntry
-time	tests/fields/fields.py	/^            time = DateTimeField()$/;"	v	class:FieldTest.test_datetime_tz_aware_mark_as_changed.LogEntry
-time	tests/fields/fields.py	/^            time = DateTimeField()$/;"	v	class:FieldTest.test_datetime_validation.LogEntry
-timeout	mongoengine/mongoengine/queryset/base.py	/^    def timeout(self, enabled):$/;"	m	class:BaseQuerySet
-title	mongoengine/docs/code/tumblelog.py	/^    title = StringField(max_length=120, required=True)$/;"	v	class:Post
-title	mongoengine/tests/document/class_methods.py	/^            title = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes.BlogPost
-title	mongoengine/tests/document/class_methods.py	/^            title = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_inheritance.BlogPost
-title	mongoengine/tests/document/class_methods.py	/^            title = StringField()$/;"	v	class:ClassMethodsTest.test_compare_indexes_multiple_subclasses.BlogPost
-title	mongoengine/tests/document/class_methods.py	/^            title = StringField()$/;"	v	class:ClassMethodsTest.test_list_indexes_inheritance.BlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = DictField()$/;"	v	class:IndexesTest.test_text_indexes.Book
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest._index_test_inheritance.ExtendedBlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_embedded_document_index.BlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_index_no_cls.A
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_indexes_after_database_drop.BlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_inherited_index.A
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_list_embedded_document_index.BlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_unique.BlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_unique_embedded_document.BlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_unique_embedded_document_in_list.BlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = StringField()$/;"	v	class:IndexesTest.test_unique_with.BlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = StringField(required=True)$/;"	v	class:IndexesTest.test_embedded_document_index_meta.Rank
-title	mongoengine/tests/document/indexes.py	/^            title = StringField(required=True)$/;"	v	class:IndexesTest.test_index_on_id.BlogPost
-title	mongoengine/tests/document/indexes.py	/^            title = StringField(unique_with='sub.year')$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.BlogPost
-title	mongoengine/tests/document/instance.py	/^            title = StringField()$/;"	v	class:InstanceTest.test_reload_of_non_strict_with_special_field_name.Post
-title	mongoengine/tests/document/instance.py	/^            title = StringField()$/;"	v	class:InstanceTest.test_repr.Article
-title	mongoengine/tests/document/instance.py	/^            title = StringField()$/;"	v	class:InstanceTest.test_repr_none.Article
-title	mongoengine/tests/document/instance.py	/^            title = StringField(required=True)$/;"	v	class:InstanceTest.test_db_embedded_doc_field_load.Rank
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference.Link
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference.Post
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices.Link
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices.Post
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Post
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_document_not_registered.Link
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list.Link
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list.Post
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_choices.Link
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_choices.Post
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.Post
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_string_choices.Link
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_string_choices.Post
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_reference_query_conversion.BlogPost
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.BlogPost
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.BlogPost
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.BlogPost
-title	mongoengine/tests/fields/fields.py	/^            title = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.BlogPost
-title	mongoengine/tests/fields/fields.py	/^            title = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
-title	mongoengine/tests/fields/fields.py	/^            title = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Post
-title	mongoengine/tests/fields/geo.py	/^            title = StringField()$/;"	v	class:GeoFieldTest.test_geopoint_embedded_indexes.Event
-title	mongoengine/tests/fields/geo.py	/^            title = StringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere.Event
-title	mongoengine/tests/fields/geo.py	/^            title = StringField()$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Event
-title	mongoengine/tests/fields/geo.py	/^            title = StringField()$/;"	v	class:GeoFieldTest.test_indexes_geopoint.Event
-title	mongoengine/tests/queryset/field_list.py	/^            title = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude.Comment
-title	mongoengine/tests/queryset/field_list.py	/^            title = StringField()$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.Comment
-title	mongoengine/tests/queryset/geo.py	/^            title = StringField()$/;"	v	class:GeoQueriesTest._create_event_data.Event
-title	mongoengine/tests/queryset/geo.py	/^            title = StringField()$/;"	v	class:GeoQueriesTest._test_embedded.Event
-title	mongoengine/tests/queryset/geo.py	/^            title="Coltrane Motion @ Bottom of the Hill",$/;"	v	class:GeoQueriesTest._create_event_data.Event
-title	mongoengine/tests/queryset/geo.py	/^            title="Coltrane Motion @ Double Door",$/;"	v	class:GeoQueriesTest._create_event_data.Event
-title	mongoengine/tests/queryset/geo.py	/^            title="Coltrane Motion @ Empty Bottle",$/;"	v	class:GeoQueriesTest._create_event_data.Event
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_bulk.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_call_after_limits_set.Post
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_clear_ordering.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_count_limit_and_skip.Post
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField.Book
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField.Book
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_map_reduce.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_no_ordering_for_get.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_ordering.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_set_list_embedded_documents.Message
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_text_indexes.News
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_update.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField(db_field='bpTitle')$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField(primary_key=True)$/;"	v	class:QuerySetTest.test_map_reduce_with_custom_object_ids.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField(required=True)$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Post
-title	mongoengine/tests/queryset/queryset.py	/^            title = StringField(unique=True)$/;"	v	class:QuerySetTest.test_bulk_insert.Blog
-title	mongoengine/tests/queryset/queryset.py	/^            title="A",$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="B",$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #1",$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #1",$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #1",$/;"	v	class:QuerySetTest.test_ordering.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #2",$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #2",$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #2",$/;"	v	class:QuerySetTest.test_ordering.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #3",$/;"	v	class:QuerySetTest.test_filter_chaining.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #3",$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #3",$/;"	v	class:QuerySetTest.test_ordering.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="Blog Post #4",$/;"	v	class:QuerySetTest.test_order_by_optional.BlogPost
-title	mongoengine/tests/queryset/queryset.py	/^            title="C",$/;"	v	class:QuerySetTest.test_order_by_list.BlogPost
-title	mongoengine/tests/queryset/transform.py	/^            title = StringField()$/;"	v	class:TransformTest.test_understandable_error_raised.Event
-title	mongoengine/tests/queryset/transform.py	/^            title = StringField(db_field='postTitle')$/;"	v	class:TransformTest.test_query_field_name.BlogPost
-title	mongoengine/tests/queryset/transform.py	/^            title = StringField(primary_key=True, db_field='postTitle')$/;"	v	class:TransformTest.test_query_pk_field_name.BlogPost
-title	mongoengine/tests/queryset/visitor.py	/^            title = StringField()$/;"	v	class:QTest.test_q.BlogPost
-title	mongoengine/tests/queryset/visitor.py	/^            title = StringField(max_length=40)$/;"	v	class:QTest.test_multiple_occurence_in_field.Test
-title	mongoengine/tests/test_dereference.py	/^            title = StringField()$/;"	v	class:FieldTest.test_multidirectional_lists.Asset
-title	mongoengine/tests/test_dereference.py	/^            title = StringField()$/;"	v	class:FieldTest.test_select_related_follows_embedded_referencefields.Song
-title	mongoengine/tests/test_dereference.py	/^            title = StringField(max_length=255, primary_key=True)$/;"	v	class:FieldTest.test_non_ascii_pk.Brand
-title	mongoengine/tests/test_dereference.py	/^            title = StringField(max_length=255, primary_key=True)$/;"	v	class:FieldTest.test_non_ascii_pk.BrandGroup
-title	mongoengine/tests/test_signals.py	/^            title = StringField()$/;"	v	class:SignalTests.setUp.Post
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference.Link
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference.Post
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices.Link
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices.Post
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_choices_no_dereference.Post
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_document_not_registered.Link
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list.Link
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list.Post
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_choices.Link
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_choices.Post
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.Post
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_string_choices.Link
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_generic_reference_string_choices.Post
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_reference_query_conversion.BlogPost
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.BlogPost
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.BlogPost
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.BlogPost
-title	tests/fields/fields.py	/^            title = StringField()$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.BlogPost
-title	tests/fields/fields.py	/^            title = StringField(required=True)$/;"	v	class:FieldTest.test_embedded_sequence_field.Post
-title	tests/fields/fields.py	/^            title = StringField(required=True)$/;"	v	class:FieldTest.test_recursive_validation.Post
-to	mongoengine/tests/queryset/field_list.py	/^            to = StringField()$/;"	v	class:OnlyExcludeAllTest.test_all_fields.Email
-to	mongoengine/tests/queryset/field_list.py	/^            to = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_only_combining.Email
-to_dbref	mongoengine/mongoengine/document.py	/^    def to_dbref(self):$/;"	m	class:Document
-to_dict	mongoengine/mongoengine/errors.py	/^    def to_dict(self):$/;"	m	class:ValidationError
-to_json	mongoengine/mongoengine/base/document.py	/^    def to_json(self, *args, **kwargs):$/;"	m	class:BaseDocument
-to_json	mongoengine/mongoengine/queryset/base.py	/^    def to_json(self, *args, **kwargs):$/;"	m	class:BaseQuerySet
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:GenericLazyReferenceField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:GenericReferenceField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:ReferenceField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document, use_db_field=True, fields=None):$/;"	m	class:CachedReferenceField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, document, use_db_field=True, fields=None):$/;"	m	class:GenericEmbeddedDocumentField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:BinaryField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:ComplexDateTimeField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:DateTimeField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:DecimalField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:FileField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:LazyReferenceField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:LongField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:UUIDField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:DynamicField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:EmbeddedDocumentField
-to_mongo	mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:SortedListField
-to_mongo	mongoengine/mongoengine/base/document.py	/^    def to_mongo(self, use_db_field=True, fields=None):$/;"	m	class:BaseDocument
-to_mongo	mongoengine/mongoengine/base/fields.py	/^    def to_mongo(self, value):$/;"	m	class:BaseField
-to_mongo	mongoengine/mongoengine/base/fields.py	/^    def to_mongo(self, value):$/;"	m	class:GeoJsonBaseField
-to_mongo	mongoengine/mongoengine/base/fields.py	/^    def to_mongo(self, value):$/;"	m	class:ObjectIdField
-to_mongo	mongoengine/mongoengine/base/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:ComplexBaseField
-to_mongo	mongoengine/mongoengine/document.py	/^    def to_mongo(self, *args, **kwargs):$/;"	m	class:Document
-to_mongo	mongoengine/mongoengine/document.py	/^    def to_mongo(self, *args, **kwargs):$/;"	m	class:EmbeddedDocument
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:GenericLazyReferenceField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:GenericReferenceField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document):$/;"	m	class:ReferenceField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document, use_db_field=True, fields=None):$/;"	m	class:CachedReferenceField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, document, use_db_field=True, fields=None):$/;"	m	class:GenericEmbeddedDocumentField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:BinaryField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:ComplexDateTimeField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:DateTimeField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:DecimalField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:FileField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:LazyReferenceField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:LongField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value):$/;"	m	class:UUIDField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:DynamicField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:EmbeddedDocumentField
-to_mongo	mongoengine/mongoengine/fields.py	/^    def to_mongo(self, value, use_db_field=True, fields=None):$/;"	m	class:SortedListField
-to_mongo	mongoengine/tests/fields/fields.py	/^            def to_mongo(self, value):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
-to_mongo	tests/fields/fields.py	/^            def to_mongo(self, value):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:BooleanField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:CachedReferenceField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:ComplexDateTimeField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:DecimalField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:DynamicField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:EmbeddedDocumentField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:FileField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:FloatField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:GenericEmbeddedDocumentField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:IntField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:LongField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:ReferenceField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:SequenceField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:StringField
-to_python	mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:UUIDField
-to_python	mongoengine/mongoengine/base/fields.py	/^    def to_python(self, value):$/;"	m	class:BaseField
-to_python	mongoengine/mongoengine/base/fields.py	/^    def to_python(self, value):$/;"	m	class:ComplexBaseField
-to_python	mongoengine/mongoengine/base/fields.py	/^    def to_python(self, value):$/;"	m	class:ObjectIdField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:BooleanField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:CachedReferenceField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:ComplexDateTimeField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:DecimalField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:DynamicField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:EmbeddedDocumentField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:FileField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:FloatField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:GenericEmbeddedDocumentField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:IntField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:LongField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:ReferenceField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:SequenceField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:StringField
-to_python	mongoengine/mongoengine/fields.py	/^    def to_python(self, value):$/;"	m	class:UUIDField
-to_python	mongoengine/tests/fields/fields.py	/^            def to_python(self, value):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
-to_python	tests/fields/fields.py	/^            def to_python(self, value):$/;"	m	class:FieldTest.test_tuples_as_tuples.EnumField
-to_query	mongoengine/mongoengine/queryset/visitor.py	/^    def to_query(self, document):$/;"	m	class:QNode
-toggle	mongoengine/tests/document/instance.py	/^            toggle = BooleanField(default=False)$/;"	v	class:InstanceTest.test_save_atomicity_condition.Widget
-topic	mongoengine/tests/test_dereference.py	/^            topic = ReferenceField(Topic)$/;"	v	class:FieldTest.test_document_reload_reference_integrity.Message
-tp	mongoengine/tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-tp	mongoengine/tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-tp	mongoengine/tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-tp	mongoengine/tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-tp	tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync.Person
-tp	tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_auto_sync_disabled.Persone
-tp	tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-tp	tests/fields/fields.py	/^            tp = StringField($/;"	v	class:CachedReferenceFieldTest.test_cached_reference_field_update_all.Person
-txt	mongoengine/tests/document/indexes.py	/^            txt = StringField()$/;"	v	class:IndexesTest.test_index_dont_send_cls_option.TestDoc
-txt	mongoengine/tests/fields/fields.py	/^            txt = StringField()$/;"	v	class:FieldTest.test_double_embedded_db_field.C
-txt	mongoengine/tests/fields/fields.py	/^            txt = StringField()$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.C
-txt	mongoengine/tests/queryset/queryset.py	/^            txt = StringField()$/;"	v	class:QuerySetTest.test_read_preference.Bar
-txt	tests/fields/fields.py	/^            txt = StringField()$/;"	v	class:FieldTest.test_double_embedded_db_field.C
-txt	tests/fields/fields.py	/^            txt = StringField()$/;"	v	class:FieldTest.test_double_embedded_db_field_from_son.C
-txt2	mongoengine/tests/document/indexes.py	/^            txt2 = StringField()$/;"	v	class:IndexesTest.test_index_dont_send_cls_option.TestChildDoc
-txt_1	mongoengine/tests/document/indexes.py	/^            txt_1 = StringField()$/;"	v	class:IndexesTest.test_compound_index_underscore_cls_not_overwritten.TestDoc
-type	mongoengine/tests/document/delta.py	/^            type = StringField()$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.EmbeddedRole
-type	mongoengine/tests/queryset/transform.py	/^            type = StringField()$/;"	v	class:TransformTest.test_last_field_name_like_operator.EmbeddedItem
-unhelpful	mongoengine/tests/queryset/queryset.py	/^            unhelpful = ListField(EmbeddedDocumentField(User))$/;"	v	class:QuerySetTest.test_pull_from_nested_embedded.Collaborator
-up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=1079,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=1446,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=215,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=48,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=481,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-up_votes	mongoengine/tests/queryset/queryset.py	/^             up_votes=74,$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-up_votes	mongoengine/tests/queryset/queryset.py	/^            up_votes = IntField()$/;"	v	class:QuerySetTest.test_map_reduce_finalize.Link
-update	mongoengine/mongoengine/base/datastructures.py	/^    def update(self, **update):$/;"	m	class:EmbeddedDocumentList
-update	mongoengine/mongoengine/base/datastructures.py	/^    def update(self, *args, **kwargs):$/;"	m	class:BaseDict
-update	mongoengine/mongoengine/document.py	/^    def update(self, **kwargs):$/;"	m	class:Document
-update	mongoengine/mongoengine/queryset/base.py	/^    def update(self, upsert=False, multi=True, write_concern=None,$/;"	m	class:BaseQuerySet
-update	mongoengine/mongoengine/queryset/transform.py	/^def update(_doc_cls=None, **update):$/;"	f
-update	mongoengine/tests/queryset/transform.py	/^            update = transform.update(DicDoc, **{"%s__dictField__test" % k: doc})$/;"	v	class:TransformTest.test_transform_update.Doc
-update_one	mongoengine/mongoengine/queryset/base.py	/^    def update_one(self, upsert=False, write_concern=None, **update):$/;"	m	class:BaseQuerySet
-upsert_one	mongoengine/mongoengine/queryset/base.py	/^    def upsert_one(self, write_concern=None, **update):$/;"	m	class:BaseQuerySet
-url	mongoengine/tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_unicode_url_validation.Link
-url	mongoengine/tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_url_scheme_validation.Link
-url	mongoengine/tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_url_validation.Link
-url	mongoengine/tests/fields/fields.py	/^            url = URLField(schemes=['ws', 'irc'])$/;"	v	class:FieldTest.test_url_scheme_validation.SchemeLink
-url	tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_unicode_url_validation.Link
-url	tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_url_scheme_validation.Link
-url	tests/fields/fields.py	/^            url = URLField()$/;"	v	class:FieldTest.test_url_validation.Link
-url	tests/fields/fields.py	/^            url = URLField(schemes=['ws', 'irc'])$/;"	v	class:FieldTest.test_url_scheme_validation.SchemeLink
-url_field	mongoengine/tests/document/instance.py	/^            url_field = URLField(default="http:\/\/mongoengine.org")$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-url_field	mongoengine/tests/document/json_serialisation.py	/^            url_field = URLField(default="http:\/\/mongoengine.org")$/;"	v	class:TestJson.test_json_complex.Doc
-url_field	mongoengine/tests/queryset/queryset.py	/^            url_field = URLField(default="http:\/\/mongoengine.org")$/;"	v	class:QuerySetTest.test_json_complex.Doc
-use_db_field	mongoengine/tests/document/instance.py	/^            use_db_field=False).to_dict()$/;"	v	class:InstanceTest.test_embedded_document_complex_instance_no_use_db_field.Doc
-user	mongoengine/tests/document/instance.py	/^            user = ReferenceField(User)$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
-user	mongoengine/tests/document/instance.py	/^            user = ReferenceField(User,$/;"	v	class:InstanceTest.test_list_search_by_embedded.Comment
-user	mongoengine/tests/document/instance.py	/^            user = User.objects.first()$/;"	v	class:InstanceTest.test_query_count_when_saving.UserSubscription
-user	mongoengine/tests/queryset/queryset.py	/^            user = ReferenceField(User)$/;"	v	class:QuerySetTest.test_no_dereference_embedded_doc.Member
-user	mongoengine/tests/queryset/queryset.py	/^            user = StringField()$/;"	v	class:QuerySetTest.test_pull_from_nested_mapfield.Collaborator
-user	mongoengine/tests/queryset/queryset.py	/^            user = StringField()$/;"	v	class:QuerySetTest.test_pull_nested.Collaborator
-user	mongoengine/tests/test_dereference.py	/^            user = User(name='user %s' % i)$/;"	v	class:FieldTest.test_handle_old_style_references.Group
-user	mongoengine/tests/test_dereference.py	/^            user = User(name='user %s' % i)$/;"	v	class:FieldTest.test_list_item_dereference.Group
-user	mongoengine/tests/test_dereference.py	/^            user = User(name='user %s' % i)$/;"	v	class:FieldTest.test_list_item_dereference_dref_false.Group
-user	mongoengine/tests/test_dereference.py	/^            user = User(name='user %s' % i)$/;"	v	class:FieldTest.test_map_field_reference.Group
-user_guid	mongoengine/tests/document/indexes.py	/^            user_guid = StringField(required=True)$/;"	v	class:IndexesTest.test_abstract_index_inheritance.UserBase
-user_guid	mongoengine/tests/document/indexes.py	/^            user_guid = StringField(required=True)$/;"	v	class:IndexesTest.test_disable_index_creation.User
-user_lists	mongoengine/tests/test_dereference.py	/^            user_lists = ListField(ListField(ReferenceField(User)))$/;"	v	class:FieldTest.test_list_of_lists_of_references.Post
-user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:FieldTest.test_reference_query_conversion.Member
-user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.Member
-user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.Member
-user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.Member
-user_num	mongoengine/tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.Member
-user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:FieldTest.test_reference_query_conversion.Member
-user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:FieldTest.test_reference_query_conversion_dbref.Member
-user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:GenericLazyReferenceFieldTest.test_generic_lazy_reference_query_conversion.Member
-user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion.Member
-user_num	tests/fields/fields.py	/^            user_num = IntField(primary_key=True)$/;"	v	class:LazyReferenceFieldTest.test_lazy_reference_query_conversion_dbref.Member
-userid	mongoengine/tests/fields/fields.py	/^            userid = StringField()$/;"	v	class:FieldTest.test_required_values.Person
-userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
-userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
-userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
-userid	mongoengine/tests/fields/fields.py	/^            userid = StringField(r'[0-9a-z_]+$')$/;"	v	class:FieldTest.test_string_validation.Person
-userid	tests/fields/fields.py	/^            userid = StringField()$/;"	v	class:FieldTest.test_required_values.Person
-userid	tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_nothing_set.Person
-userid	tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_set_to_None.Person
-userid	tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_when_deleting_value.Person
-userid	tests/fields/fields.py	/^            userid = StringField(default=lambda: 'test', required=True)$/;"	v	class:FieldTest.test_default_values_when_setting_to_None.Person
-userid	tests/fields/fields.py	/^            userid = StringField(r'[0-9a-z_]+$')$/;"	v	class:FieldTest.test_string_validation.Person
-username	mongoengine/tests/document/instance.py	/^            username = StringField(primary_key=True)$/;"	v	class:InstanceTest.test_custom_id_field.User
-username	mongoengine/tests/document/instance.py	/^            username = StringField(required=True)$/;"	v	class:InstanceTest.test_list_search_by_embedded.User
-username	mongoengine/tests/document/validation.py	/^            username = StringField(primary_key=True)$/;"	v	class:ValidatorErrorTest.test_model_validation.User
-username	mongoengine/tests/fields/fields.py	/^            username = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.User
-username	mongoengine/tests/queryset/field_list.py	/^            username = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.Base
-username	mongoengine/tests/queryset/queryset.py	/^            username = StringField()$/;"	v	class:QuerySetTest.test_set_generic_embedded_documents.User
-username	tests/fields/fields.py	/^            username = StringField()$/;"	v	class:FieldTest.test_generic_reference_list_item_modification.User
-users	mongoengine/tests/document/delta.py	/^            users = MapField(field=EmbeddedDocumentField(EmbeddedUser))$/;"	v	class:DeltaTest.test_delta_for_nested_map_fields.Doc
-users	mongoengine/tests/test_dereference.py	/^            users = ListField(ReferenceField(User))$/;"	v	class:FieldTest.test_list_of_lists_of_references.SimpleList
-using	mongoengine/mongoengine/queryset/base.py	/^    def using(self, alias):$/;"	m	class:BaseQuerySet
-uuid_field	mongoengine/tests/document/instance.py	/^            uuid_field = UUIDField(default=uuid.uuid4)$/;"	v	class:InstanceTest.test_can_save_if_not_included.Doc
-uuid_field	mongoengine/tests/document/json_serialisation.py	/^            uuid_field = UUIDField(default=uuid.uuid4)$/;"	v	class:TestJson.test_json_complex.Doc
-uuid_field	mongoengine/tests/queryset/queryset.py	/^            uuid_field = UUIDField(default=uuid.uuid4)$/;"	v	class:QuerySetTest.test_json_complex.Doc
-v	mongoengine/tests/document/instance.py	/^            v = StringField()$/;"	v	class:InstanceTest.test_list_iter.B
-vaccine_made	mongoengine/tests/document/class_methods.py	/^            vaccine_made = ListField(ReferenceField("Vaccine", reverse_delete_rule=PULL))$/;"	v	class:ClassMethodsTest.test_register_delete_rule_inherited.Animal
-val	mongoengine/tests/document/validation.py	/^            val = IntField(required=True)$/;"	v	class:ValidatorErrorTest.test_embedded_db_field_validate.SubDoc
-val	mongoengine/tests/document/validation.py	/^            val = IntField(required=True)$/;"	v	class:ValidatorErrorTest.test_embedded_weakref.SubDoc
-val	mongoengine/tests/queryset/queryset.py	/^            val = BooleanField()$/;"	v	class:QuerySetTest.test_item_frequencies_with_False_values.Test
-val	mongoengine/tests/queryset/queryset.py	/^            val = IntField()$/;"	v	class:QuerySetTest.test_item_frequencies_normalize.Test
-val	mongoengine/tests/queryset/queryset.py	/^            val = IntField()$/;"	v	class:QuerySetTest.test_item_frequencies_with_0_values.Test
-val	mongoengine/tests/queryset/queryset.py	/^            val = IntField()$/;"	v	class:QuerySetTest.test_reload_embedded_docs_instance.SubDoc
-val	mongoengine/tests/queryset/queryset.py	/^            val = IntField()$/;"	v	class:QuerySetTest.test_reload_list_embedded_docs_instance.SubDoc
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:BinaryField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:BooleanField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:CachedReferenceField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ComplexDateTimeField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DateTimeField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DecimalField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DictField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:EmailField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:FileField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:FloatField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GenericLazyReferenceField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GenericReferenceField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GeoPointField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:IntField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:LazyReferenceField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ListField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:LongField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ReferenceField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:StringField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:URLField
-validate	mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:UUIDField
-validate	mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:DynamicField
-validate	mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:EmbeddedDocumentField
-validate	mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:GenericEmbeddedDocumentField
-validate	mongoengine/mongoengine/base/document.py	/^    def validate(self, clean=True):$/;"	m	class:BaseDocument
-validate	mongoengine/mongoengine/base/fields.py	/^    def validate(self, value):$/;"	m	class:ComplexBaseField
-validate	mongoengine/mongoengine/base/fields.py	/^    def validate(self, value):$/;"	m	class:GeoJsonBaseField
-validate	mongoengine/mongoengine/base/fields.py	/^    def validate(self, value):$/;"	m	class:ObjectIdField
-validate	mongoengine/mongoengine/base/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:BaseField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:BinaryField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:BooleanField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:CachedReferenceField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ComplexDateTimeField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DateTimeField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DecimalField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:DictField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:EmailField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:FileField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:FloatField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GenericLazyReferenceField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GenericReferenceField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:GeoPointField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:IntField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:LazyReferenceField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ListField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:LongField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:ReferenceField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:StringField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:URLField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value):$/;"	m	class:UUIDField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:DynamicField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:EmbeddedDocumentField
-validate	mongoengine/mongoengine/fields.py	/^    def validate(self, value, clean=True):$/;"	m	class:GenericEmbeddedDocumentField
-validate	mongoengine/tests/document/instance.py	/^                validate = DictField()$/;"	v	class:InstanceTest.test_override_method_with_field.Blog
-validate_domain_part	mongoengine/fields.py	/^    def validate_domain_part(self, domain_part):$/;"	m	class:EmailField
-validate_domain_part	mongoengine/mongoengine/fields.py	/^    def validate_domain_part(self, domain_part):$/;"	m	class:EmailField
-validate_user_part	mongoengine/fields.py	/^    def validate_user_part(self, user_part):$/;"	m	class:EmailField
-validate_user_part	mongoengine/mongoengine/fields.py	/^    def validate_user_part(self, user_part):$/;"	m	class:EmailField
-value	mongoengine/tests/document/instance.py	/^            value = DynamicField(default="UNDEFINED")$/;"	v	class:InstanceTest.test_complex_nesting_document_and_embedded_document.Macro
-value	mongoengine/tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_complex_mapfield.IntegerSetting
-value	mongoengine/tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_dictfield_complex.IntegerSetting
-value	mongoengine/tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_list_field_complex.IntegerSetting
-value	mongoengine/tests/fields/fields.py	/^            value = LongField(min_value=0, max_value=110)$/;"	v	class:FieldTest.test_long_validation.TestDocument
-value	mongoengine/tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_complex_mapfield.StringSetting
-value	mongoengine/tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_dictfield_complex.StringSetting
-value	mongoengine/tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_list_field_complex.StringSetting
-value	mongoengine/tests/queryset/modify.py	/^    value = IntField()$/;"	v	class:Doc
-value	mongoengine/tests/queryset/queryset.py	/^            value = DecimalField()$/;"	v	class:QuerySetTest.test_embedded_average.Pay
-value	mongoengine/tests/queryset/queryset.py	/^            value = DecimalField()$/;"	v	class:QuerySetTest.test_embedded_sum.Pay
-value	mongoengine/tests/queryset/queryset.py	/^            value = StringField()$/;"	v	class:QuerySetTest.test_scalar_primary_key.SettingValue
-value	tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_complex_mapfield.IntegerSetting
-value	tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_dictfield_complex.IntegerSetting
-value	tests/fields/fields.py	/^            value = IntField()$/;"	v	class:FieldTest.test_list_field_complex.IntegerSetting
-value	tests/fields/fields.py	/^            value = LongField(min_value=0, max_value=110)$/;"	v	class:FieldTest.test_long_validation.TestDocument
-value	tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_complex_mapfield.StringSetting
-value	tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_dictfield_complex.StringSetting
-value	tests/fields/fields.py	/^            value = StringField()$/;"	v	class:FieldTest.test_list_field_complex.StringSetting
-value_list	mongoengine/tests/fields/fields.py	/^            value_list = ListField(field=StringField())$/;"	v	class:FieldTest.test_map_field_unicode.Info
-value_list	tests/fields/fields.py	/^            value_list = ListField(field=StringField())$/;"	v	class:FieldTest.test_map_field_unicode.Info
-values	mongoengine/tests/queryset/queryset.py	/^            values = ListField(DecimalField())$/;"	v	class:QuerySetTest.test_array_average.Doc
-values	mongoengine/tests/queryset/queryset.py	/^            values = ListField(DecimalField())$/;"	v	class:QuerySetTest.test_array_sum.Doc
-values	mongoengine/tests/queryset/queryset.py	/^            values = ListField(DecimalField())$/;"	v	class:QuerySetTest.test_embedded_array_average.Pay
-values	mongoengine/tests/queryset/queryset.py	/^            values = ListField(DecimalField())$/;"	v	class:QuerySetTest.test_embedded_array_sum.Pay
-values_list	mongoengine/mongoengine/queryset/base.py	/^    def values_list(self, *fields):$/;"	m	class:BaseQuerySet
-various	mongoengine/tests/queryset/field_list.py	/^            various = MapField(field=EmbeddedDocumentField(VariousData))$/;"	v	class:OnlyExcludeAllTest.test_only_with_subfields.BlogPost
-venue	mongoengine/tests/fields/geo.py	/^            venue = EmbeddedDocumentField(Venue)$/;"	v	class:GeoFieldTest.test_geopoint_embedded_indexes.Event
-venue	mongoengine/tests/fields/geo.py	/^            venue = EmbeddedDocumentField(Venue)$/;"	v	class:GeoFieldTest.test_indexes_2dsphere_embedded.Event
-venue	mongoengine/tests/queryset/geo.py	/^                       venue=venue1).save()$/;"	v	class:GeoQueriesTest._test_embedded.Event
-venue	mongoengine/tests/queryset/geo.py	/^                       venue=venue2).save()$/;"	v	class:GeoQueriesTest._test_embedded.Event
-venue	mongoengine/tests/queryset/geo.py	/^            venue = EmbeddedDocumentField(Venue)$/;"	v	class:GeoQueriesTest._test_embedded.Event
-verbose_name	mongoengine/tests/fields/fields.py	/^                verbose_name="Type",$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-verbose_name	tests/fields/fields.py	/^                verbose_name="Type",$/;"	v	class:CachedReferenceFieldTest.test_cached_reference_embedded_fields.Owner
-version	mongoengine/docs/conf.py	/^version = mongoengine.get_version()$/;"	v
-version_line	mongoengine/setup.py	/^version_line = list(filter(lambda l: l.startswith('VERSION'), open(init)))[0]$/;"	v
-visit_combination	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_combination(self, combination):$/;"	m	class:QNodeVisitor
-visit_combination	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_combination(self, combination):$/;"	m	class:QueryCompilerVisitor
-visit_combination	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_combination(self, combination):$/;"	m	class:SimplificationVisitor
-visit_query	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_query(self, query):$/;"	m	class:QNodeVisitor
-visit_query	mongoengine/mongoengine/queryset/visitor.py	/^    def visit_query(self, query):$/;"	m	class:QueryCompilerVisitor
-visited	mongoengine/tests/fields/fields.py	/^            visited = MapField(DateTimeField())$/;"	v	class:FieldTest.test_map_field_lookup.Log
-visited	tests/fields/fields.py	/^            visited = MapField(DateTimeField())$/;"	v	class:FieldTest.test_map_field_lookup.Log
-visited__friends__exists	mongoengine/tests/fields/fields.py	/^            visited__friends__exists=True).count())$/;"	v	class:FieldTest.test_map_field_lookup.Log
-visited__friends__exists	tests/fields/fields.py	/^            visited__friends__exists=True).count())$/;"	v	class:FieldTest.test_map_field_lookup.Log
-vote	mongoengine/tests/queryset/queryset.py	/^            vote = IntField()$/;"	v	class:QuerySetTest.test_updates_can_have_match_operators.Comment
-votes	mongoengine/tests/queryset/queryset.py	/^            votes = EmbeddedDocumentField(Vote)$/;"	v	class:QuerySetTest.test_update_using_positional_operator_embedded_document.Comment
-votes	mongoengine/tests/queryset/queryset.py	/^            votes = IntField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator.Comment
-weight	mongoengine/tests/queryset/queryset.py	/^            weight = IntField()$/;"	v	class:QuerySetTest.setUp.PersonMeta
-where	mongoengine/mongoengine/queryset/base.py	/^    def where(self, where_clause):$/;"	m	class:BaseQuerySet
-whiskers_length	mongoengine/tests/queryset/queryset.py	/^            whiskers_length = FloatField()$/;"	v	class:QuerySetTest.test_subclass_field_query.Cat
-wibble	mongoengine/tests/queryset/field_list.py	/^            wibble = StringField()$/;"	v	class:OnlyExcludeAllTest.test_exclude_from_subclasses_docs.User
-widgets	mongoengine/tests/document/instance.py	/^            widgets = StringField()$/;"	v	class:InstanceTest.test_object_mixins.Bar
-widgets	mongoengine/tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_del_slice_marks_field_as_changed.Simple
-widgets	mongoengine/tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_list_field_with_negative_indices.Simple
-widgets	mongoengine/tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_slice_marks_field_as_changed.Simple
-widgets	tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_del_slice_marks_field_as_changed.Simple
-widgets	tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_list_field_with_negative_indices.Simple
-widgets	tests/fields/fields.py	/^            widgets = ListField()$/;"	v	class:FieldTest.test_slice_marks_field_as_changed.Simple
-with_id	mongoengine/mongoengine/queryset/base.py	/^    def with_id(self, object_id):$/;"	m	class:BaseQuerySet
-with_inactive	mongoengine/tests/queryset/queryset.py	/^            def with_inactive(doc_cls, queryset):$/;"	m	class:QuerySetTest.test_custom_manager_overriding_objects_works.Foo
-write	mongoengine/fields.py	/^    def write(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
-write	mongoengine/fields.py	/^    def write(self, string):$/;"	m	class:GridFSProxy
-write	mongoengine/mongoengine/fields.py	/^    def write(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
-write	mongoengine/mongoengine/fields.py	/^    def write(self, string):$/;"	m	class:GridFSProxy
-write_concern	mongoengine/tests/queryset/queryset.py	/^                            write_concern={"w": 0, 'continue_on_error': True})$/;"	v	class:QuerySetTest.test_bulk_insert.Author
-writelines	mongoengine/fields.py	/^    def writelines(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
-writelines	mongoengine/fields.py	/^    def writelines(self, lines):$/;"	m	class:GridFSProxy
-writelines	mongoengine/mongoengine/fields.py	/^    def writelines(self, *args, **kwargs):$/;"	m	class:ImageGridFsProxy
-writelines	mongoengine/mongoengine/fields.py	/^    def writelines(self, lines):$/;"	m	class:GridFSProxy
-x	mongoengine/tests/document/instance.py	/^            x = IntField(required=True)$/;"	v	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
-x	mongoengine/tests/queryset/queryset.py	/^            x = IntField()$/;"	v	class:QuerySetTest.test_no_sub_classes.A
-x	mongoengine/tests/queryset/queryset.py	/^            x = IntField()$/;"	v	class:QuerySetTest.test_scalar_db_field.TestDoc
-x	mongoengine/tests/queryset/queryset.py	/^            x = IntField()$/;"	v	class:QuerySetTest.test_scalar_simple.TestDoc
-x	mongoengine/tests/queryset/queryset.py	/^            x = ListField()$/;"	v	class:QuerySetTest.test_update_using_positional_operator_matches_first.Simple
-x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_and_combination.TestDoc
-x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_and_or_combination.TestDoc
-x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_or_and_or_combination.TestDoc
-x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_or_combination.TestDoc
-x	mongoengine/tests/queryset/visitor.py	/^            x = IntField()$/;"	v	class:QTest.test_q_clone.TestDoc
-x	mongoengine/tests/test_context_managers.py	/^            x = IntField()$/;"	v	class:ContextManagersTest.test_no_sub_classes.A
-y	mongoengine/tests/document/instance.py	/^            y = IntField(required=True)$/;"	v	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
-y	mongoengine/tests/queryset/queryset.py	/^            y = BooleanField()$/;"	v	class:QuerySetTest.test_scalar_db_field.TestDoc
-y	mongoengine/tests/queryset/queryset.py	/^            y = BooleanField()$/;"	v	class:QuerySetTest.test_scalar_simple.TestDoc
-y	mongoengine/tests/queryset/queryset.py	/^            y = IntField()$/;"	v	class:QuerySetTest.test_no_sub_classes.A
-y	mongoengine/tests/queryset/visitor.py	/^            y = BooleanField()$/;"	v	class:QTest.test_and_or_combination.TestDoc
-y	mongoengine/tests/queryset/visitor.py	/^            y = BooleanField()$/;"	v	class:QTest.test_or_and_or_combination.TestDoc
-y	mongoengine/tests/queryset/visitor.py	/^            y = StringField()$/;"	v	class:QTest.test_and_combination.TestDoc
-y	mongoengine/tests/test_context_managers.py	/^            y = IntField()$/;"	v	class:ContextManagersTest.test_no_sub_classes.A
-year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_embedded_document_index.Date
-year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_unique_embedded_document.SubDocument
-year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_unique_embedded_document_in_list.SubDocument
-year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_unique_with.Date
-year	mongoengine/tests/document/indexes.py	/^            year = IntField(db_field='yr')$/;"	v	class:IndexesTest.test_unique_with_embedded_document_and_embedded_unique.SubDocument
-years	mongoengine/tests/document/instance.py	/^            years = IntField()$/;"	v	class:InstanceTest.setUp.Job
-z	mongoengine/tests/document/instance.py	/^            z = IntField(required=True)$/;"	v	class:InstanceTest.test_document_embedded_clean.TestEmbeddedDocument
-z	mongoengine/tests/queryset/queryset.py	/^            z = IntField()$/;"	v	class:QuerySetTest.test_no_sub_classes.B
-z	mongoengine/tests/test_context_managers.py	/^            z = IntField()$/;"	v	class:ContextManagersTest.test_no_sub_classes.B
-zz	mongoengine/tests/queryset/queryset.py	/^            zz = IntField()$/;"	v	class:QuerySetTest.test_no_sub_classes.C
-zz	mongoengine/tests/test_context_managers.py	/^            zz = IntField()$/;"	v	class:ContextManagersTest.test_no_sub_classes.C

From b04dc90cdf4e71afb38594af7113a93302527a31 Mon Sep 17 00:00:00 2001
From: Eddie Linder <eddie@guardicore.com>
Date: Thu, 20 Dec 2018 00:39:32 +0200
Subject: [PATCH 0743/1519] Bring back _cls and _id fields just as they return
 in pymongo

---
 mongoengine/queryset/base.py |  5 +----
 tests/queryset/queryset.py   | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 862a18269..5f11c01e4 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1845,10 +1845,7 @@ def _get_as_pymongo(self, doc):
         # remove it from the doc (we always fetch it so that we can properly
         # construct documents).
         fields = self._loaded_fields
-        if fields and '_id' in doc and (
-            (fields.value == QueryFieldList.ONLY and '_id' not in fields.fields) or
-            (fields.value == QueryFieldList.EXCLUDE and '_id' in fields.fields)
-        ):
+        if fields and '_id' in doc and fields.value == QueryFieldList.EXCLUDE and '_id' in fields.fields:
             del doc['_id']
 
         return doc
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index b44c36df1..586913aab 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4635,7 +4635,7 @@ class LastLogin(EmbeddedDocument):
             ip = StringField()
 
         class User(Document):
-            id = ObjectIdField('_id')
+            id = StringField(primary_key=True)
             name = StringField()
             age = IntField()
             price = DecimalField()
@@ -4643,9 +4643,10 @@ class User(Document):
 
         User.drop_collection()
 
-        User.objects.create(name="Bob Dole", age=89, price=Decimal('1.11'))
+        User.objects.create(id='Bob', name="Bob Dole", age=89, price=Decimal('1.11'))
         User.objects.create(
-            name="Barack Obama",
+            id='Barak',
+            name="Barak Obama",
             age=51,
             price=Decimal('2.22'),
             last_login=LastLogin(
@@ -4673,7 +4674,7 @@ class User(Document):
         self.assertIsInstance(results[1], dict)
         self.assertEqual(results[0]['name'], 'Bob Dole')
         self.assertEqual(results[0]['price'], 1.11)
-        self.assertEqual(results[1]['name'], 'Barack Obama')
+        self.assertEqual(results[1]['name'], 'Barak Obama')
         self.assertEqual(results[1]['price'], 2.22)
 
         users = User.objects.only('name', 'last_login').as_pymongo()
@@ -4681,10 +4682,12 @@ class User(Document):
         self.assertIsInstance(results[0], dict)
         self.assertIsInstance(results[1], dict)
         self.assertEqual(results[0], {
+            '_id': 'Bob',
             'name': 'Bob Dole'
         })
         self.assertEqual(results[1], {
-            'name': 'Barack Obama',
+            '_id': 'Barak',
+            'name': 'Barak Obama',
             'last_login': {
                 'location': 'White House',
                 'ip': '104.107.108.116'
@@ -4701,8 +4704,8 @@ class User(Document):
                 db_field='password_salt', required=True)
 
         User.drop_collection()
-        User(email="ross@example.com", password_salt="SomeSalt",
-             password_hash="SomeHash").save()
+        user = User(email="ross@example.com", password_salt="SomeSalt",
+                    password_hash="SomeHash").save()
 
         serialized_user = User.objects.exclude(
             'password_salt', 'password_hash').as_pymongo()[0]
@@ -4714,11 +4717,16 @@ class User(Document):
 
         serialized_user = User.objects.exclude(
             'password_salt').only('email').as_pymongo()[0]
+        self.assertEqual(set(['_id', 'email']), set(serialized_user.keys()))
+
+        serialized_user = User.objects.exclude(
+            'password_salt', 'id').only('email').as_pymongo()[0]
         self.assertEqual(set(['email']), set(serialized_user.keys()))
 
         serialized_user = User.objects.exclude(
             'password_salt').only('email').to_json()
-        self.assertEqual('[{"email": "ross@example.com"}]', serialized_user)
+        self.assertEqual('[{"_id": {"$oid": "%s"}, "email": "ross@example.com"}]' % user.id,
+                         serialized_user)
 
     def test_only_after_count(self):
         """Test that only() works after count()"""

From 6fbdde63d8d39e00f9d33c8f5ed0d55caee09de6 Mon Sep 17 00:00:00 2001
From: Eddie Linder <eddie@guardicore.com>
Date: Thu, 20 Dec 2018 00:57:02 +0200
Subject: [PATCH 0744/1519] Fix id in test_only_after_count ut

---
 tests/queryset/queryset.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 586913aab..7490cad3c 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4736,19 +4736,19 @@ class User(Document):
             age = IntField()
             address = StringField()
         User.drop_collection()
-        User(name="User", age=50,
-             address="Moscow, Russia").save()
+        user = User(name="User", age=50,
+                    address="Moscow, Russia").save()
 
         user_queryset = User.objects(age=50)
 
         result = user_queryset.only("name", "age").as_pymongo().first()
-        self.assertEqual(result, {"name": "User", "age": 50})
+        self.assertEqual(result, {"_id": user.id, "name": "User", "age": 50})
 
         result = user_queryset.count()
         self.assertEqual(result, 1)
 
         result = user_queryset.only("name", "age").as_pymongo().first()
-        self.assertEqual(result, {"name": "User", "age": 50})
+        self.assertEqual(result, {"_id": user.id, "name": "User", "age": 50})
 
     def test_no_dereference(self):
 

From 7fd4f792ba30d1ac8061bdb017fe7703493ff0e0 Mon Sep 17 00:00:00 2001
From: Eddie Linder <eddie@guardicore.com>
Date: Thu, 20 Dec 2018 01:02:42 +0200
Subject: [PATCH 0745/1519] Don't hide _cls field when using as_pymongo

---
 mongoengine/queryset/base.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5f11c01e4..5493ffac6 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1837,10 +1837,6 @@ def _get_as_pymongo(self, doc):
         """Clean up a PyMongo doc, removing fields that were only fetched
         for the sake of MongoEngine's implementation, and return it.
         """
-        # Always remove _cls as a MongoEngine's implementation detail.
-        if '_cls' in doc:
-            del doc['_cls']
-
         # If the _id was not included in a .only or was excluded in a .exclude,
         # remove it from the doc (we always fetch it so that we can properly
         # construct documents).

From 363aefe399efc6acc035a846241acd136ca8277d Mon Sep 17 00:00:00 2001
From: Eddie Linder <eddie@guardicore.com>
Date: Thu, 20 Dec 2018 01:09:28 +0200
Subject: [PATCH 0746/1519] Get rid of _get_as_pymongo wrapper altogether as we
 return raw output

---
 mongoengine/queryset/base.py | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5493ffac6..8ae884222 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -188,7 +188,7 @@ def __getitem__(self, key):
                 )
 
             if queryset._as_pymongo:
-                return queryset._get_as_pymongo(queryset._cursor[key])
+                return queryset._cursor[key]
 
             return queryset._document._from_son(
                 queryset._cursor[key],
@@ -690,7 +690,7 @@ def in_bulk(self, object_ids):
                     self._document._from_son(doc, only_fields=self.only_fields))
         elif self._as_pymongo:
             for doc in docs:
-                doc_map[doc['_id']] = self._get_as_pymongo(doc)
+                doc_map[doc['_id']] = doc
         else:
             for doc in docs:
                 doc_map[doc['_id']] = self._document._from_son(
@@ -1486,7 +1486,7 @@ def __next__(self):
         raw_doc = six.next(self._cursor)
 
         if self._as_pymongo:
-            return self._get_as_pymongo(raw_doc)
+            return raw_doc
 
         doc = self._document._from_son(
             raw_doc, _auto_dereference=self._auto_dereference,
@@ -1833,19 +1833,6 @@ def lookup(obj, name):
 
         return tuple(data)
 
-    def _get_as_pymongo(self, doc):
-        """Clean up a PyMongo doc, removing fields that were only fetched
-        for the sake of MongoEngine's implementation, and return it.
-        """
-        # If the _id was not included in a .only or was excluded in a .exclude,
-        # remove it from the doc (we always fetch it so that we can properly
-        # construct documents).
-        fields = self._loaded_fields
-        if fields and '_id' in doc and fields.value == QueryFieldList.EXCLUDE and '_id' in fields.fields:
-            del doc['_id']
-
-        return doc
-
     def _sub_js_fields(self, code):
         """When fields are specified with [~fieldname] syntax, where
         *fieldname* is the Python name of a field, *fieldname* will be

From 56d9f7a8af1b628c52c69dfa23a6d4374d2a2ac3 Mon Sep 17 00:00:00 2001
From: Eddie Linder <eddie@guardicore.com>
Date: Thu, 20 Dec 2018 01:14:23 +0200
Subject: [PATCH 0747/1519] Fix ut to pass constantly

---
 tests/queryset/queryset.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 7490cad3c..faadfe0ce 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4704,8 +4704,8 @@ class User(Document):
                 db_field='password_salt', required=True)
 
         User.drop_collection()
-        user = User(email="ross@example.com", password_salt="SomeSalt",
-                    password_hash="SomeHash").save()
+        User(email="ross@example.com", password_salt="SomeSalt",
+             password_hash="SomeHash").save()
 
         serialized_user = User.objects.exclude(
             'password_salt', 'password_hash').as_pymongo()[0]
@@ -4724,8 +4724,8 @@ class User(Document):
         self.assertEqual(set(['email']), set(serialized_user.keys()))
 
         serialized_user = User.objects.exclude(
-            'password_salt').only('email').to_json()
-        self.assertEqual('[{"_id": {"$oid": "%s"}, "email": "ross@example.com"}]' % user.id,
+            'password_salt', 'id').only('email').to_json()
+        self.assertEqual('[{"email": "ross@example.com"}]',
                          serialized_user)
 
     def test_only_after_count(self):

From 69a99c70c69dda1e0116566308adfb6e93dfede9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 24 Dec 2018 23:51:30 +0100
Subject: [PATCH 0748/1519] minor update to .all() doc to make it clear that it
 does not return a list but a queryset

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 862a18269..af19bf34a 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -215,7 +215,7 @@ def __bool__(self):
     # Core functions
 
     def all(self):
-        """Returns all documents."""
+        """Returns a copy of the current QuerySet."""
         return self.__call__()
 
     def filter(self, *q_objs, **query):

From e7000db4914dcba49b2022133816ddbcbc630bbd Mon Sep 17 00:00:00 2001
From: G Roques <groques360@gmail.com>
Date: Sat, 29 Dec 2018 13:08:39 -0600
Subject: [PATCH 0749/1519] Add LongField to Fields list

---
 docs/guide/defining-documents.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 4449b00b8..911de36de 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -85,6 +85,7 @@ are as follows:
 * :class:`~mongoengine.fields.ImageField`
 * :class:`~mongoengine.fields.IntField`
 * :class:`~mongoengine.fields.ListField`
+* :class:`~mongoengine.fields.LongField`
 * :class:`~mongoengine.fields.MapField`
 * :class:`~mongoengine.fields.ObjectIdField`
 * :class:`~mongoengine.fields.ReferenceField`

From c6c68abfccff298fbe3f173aa337fe6e62d85d4d Mon Sep 17 00:00:00 2001
From: Eddie Linder <eddie@guardicore.com>
Date: Fri, 11 Jan 2019 19:23:47 +0200
Subject: [PATCH 0750/1519] Update changelog and add another ut case

---
 docs/changelog.rst         | 1 +
 tests/queryset/queryset.py | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index def5cc34b..d8bed7e6a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Fix .only() working improperly after using .count() of the same instance of QuerySet
+- POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (_cls, _id) when using `QuerySet.as_pymongo` #1976
 
 =================
 Changes in 0.16.3
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index faadfe0ce..c183aa86a 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4709,19 +4709,22 @@ class User(Document):
 
         serialized_user = User.objects.exclude(
             'password_salt', 'password_hash').as_pymongo()[0]
-        self.assertEqual(set(['_id', 'email']), set(serialized_user.keys()))
+        self.assertEqual({'_id', 'email'}, set(serialized_user.keys()))
 
         serialized_user = User.objects.exclude(
             'id', 'password_salt', 'password_hash').to_json()
         self.assertEqual('[{"email": "ross@example.com"}]', serialized_user)
 
+        serialized_user = User.objects.only('email').as_pymongo()[0]
+        self.assertEqual({'_id', 'email'}, set(serialized_user.keys()))
+
         serialized_user = User.objects.exclude(
             'password_salt').only('email').as_pymongo()[0]
-        self.assertEqual(set(['_id', 'email']), set(serialized_user.keys()))
+        self.assertEqual({'_id', 'email'}, set(serialized_user.keys()))
 
         serialized_user = User.objects.exclude(
             'password_salt', 'id').only('email').as_pymongo()[0]
-        self.assertEqual(set(['email']), set(serialized_user.keys()))
+        self.assertEqual({'email'}, set(serialized_user.keys()))
 
         serialized_user = User.objects.exclude(
             'password_salt', 'id').only('email').to_json()

From 4c054bf316c0a7ec0823c0a8d9f8289998732b3b Mon Sep 17 00:00:00 2001
From: Hamidreza <montaseri.hamidreza@gmail.com>
Date: Wed, 13 Feb 2019 21:27:54 +0330
Subject: [PATCH 0751/1519] Fix indentation in LazyReferenceField ref doc

---
 mongoengine/fields.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 9062333ee..df6be2f0f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2251,9 +2251,9 @@ def __init__(self, document_type, passthrough=False, dbref=False,
         :param reverse_delete_rule: Determines what to do when the referring
           object is deleted
         :param passthrough: When trying to access unknown fields, the
-        :class:`~mongoengine.base.datastructure.LazyReference` instance will
-        automatically call `fetch()` and try to retrive the field on the fetched
-        document. Note this only work getting field (not setting or deleting).
+          :class:`~mongoengine.base.datastructure.LazyReference` instance will
+          automatically call `fetch()` and try to retrive the field on the fetched
+          document. Note this only work getting field (not setting or deleting).
         """
         # XXX ValidationError raised outside of the "validate" method.
         if (

From cab659dce6048d391a4dd470d5bf4b8cbbaf36ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 16 Feb 2019 21:54:05 +0100
Subject: [PATCH 0752/1519] Fix documentation of Queryset.update regarding
 full_result #1995

---
 docs/changelog.rst           |  2 ++
 mongoengine/queryset/base.py | 20 ++++++++++++++------
 tests/queryset/queryset.py   | 13 +++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d8bed7e6a..b6c5b2772 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 - (Fill this out as you fix issues and develop your features).
 - Fix .only() working improperly after using .count() of the same instance of QuerySet
 - POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (_cls, _id) when using `QuerySet.as_pymongo` #1976
+- Document a BREAKING CHANGE introduced in 0.15.3 and not reported at that time (#1995)
 
 =================
 Changes in 0.16.3
@@ -64,6 +65,7 @@ Changes in 0.16.0
 
 Changes in 0.15.3
 =================
+-  BREAKING CHANGES: `Queryset.update/update_one` methods now returns an UpdateResult when `full_result=True` is provided and no longer a dict (relates to #1491)
 -  Subfield resolve error in generic_emdedded_document query #1651 #1652
 -  use each modifier only with $position #1673 #1675
 -  Improve LazyReferenceField and GenericLazyReferenceField with nested fields #1704
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 0ebeafa6b..391f4f86a 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -498,11 +498,12 @@ def update(self, upsert=False, multi=True, write_concern=None,
             ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
             wait until at least two servers have recorded the write and
             will force an fsync on the primary server.
-        :param full_result: Return the full result dictionary rather than just the number
-            updated, e.g. return
-            ``{'n': 2, 'nModified': 2, 'ok': 1.0, 'updatedExisting': True}``.
+        :param full_result: Return the associated ``pymongo.UpdateResult`` rather than just the number
+            updated items
         :param update: Django-style update keyword arguments
 
+        :returns the number of updated documents (unless ``full_result`` is True)
+
         .. versionadded:: 0.2
         """
         if not update and not upsert:
@@ -566,7 +567,7 @@ def upsert_one(self, write_concern=None, **update):
             document = self._document.objects.with_id(atomic_update.upserted_id)
         return document
 
-    def update_one(self, upsert=False, write_concern=None, **update):
+    def update_one(self, upsert=False, write_concern=None, full_result=False, **update):
         """Perform an atomic update on the fields of the first document
         matched by the query.
 
@@ -577,12 +578,19 @@ def update_one(self, upsert=False, write_concern=None, **update):
             ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
             wait until at least two servers have recorded the write and
             will force an fsync on the primary server.
+        :param full_result: Return the associated ``pymongo.UpdateResult`` rather than just the number
+            updated items
         :param update: Django-style update keyword arguments
-
+            full_result
+        :returns the number of updated documents (unless ``full_result`` is True)
         .. versionadded:: 0.2
         """
         return self.update(
-            upsert=upsert, multi=False, write_concern=write_concern, **update)
+            upsert=upsert,
+            multi=False,
+            write_concern=write_concern,
+            full_result=full_result,
+            **update)
 
     def modify(self, upsert=False, full_response=False, remove=False, new=False, **update):
         """Update and return the updated document.
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c183aa86a..4dac69222 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2233,6 +2233,19 @@ class Bar(Document):
         bar.reload()
         self.assertEqual(len(bar.foos), 0)
 
+    def test_update_one_check_return_with_full_result(self):
+        class BlogTag(Document):
+            name = StringField(required=True)
+
+        BlogTag.drop_collection()
+
+        BlogTag(name='garbage').save()
+        default_update = BlogTag.objects.update_one(name='new')
+        self.assertEqual(default_update, 1)
+
+        full_result_update = BlogTag.objects.update_one(name='new', full_result=True)
+        self.assertIsInstance(full_result_update, UpdateResult)
+
     def test_update_one_pop_generic_reference(self):
 
         class BlogTag(Document):

From 3484ceabb8a092655764ae5893d67b59644c4b88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 16 Feb 2019 22:54:00 +0100
Subject: [PATCH 0753/1519] Fix documentation  regarding limitation with fields
 with underscore in their name in DynamicDocument

---
 mongoengine/document.py   |  2 +-
 tests/document/dynamic.py | 76 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 0945a8edd..7a491b7dd 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1016,7 +1016,7 @@ class DynamicDocument(six.with_metaclass(TopLevelDocumentMetaclass, Document)):
 
     .. note::
 
-        There is one caveat on Dynamic Documents: fields cannot start with `_`
+        There is one caveat on Dynamic Documents: undeclared fields cannot start with `_`
     """
 
     # The __metaclass__ attribute is removed by 2to3 when running with Python3
diff --git a/tests/document/dynamic.py b/tests/document/dynamic.py
index 94cea134d..44548d27a 100644
--- a/tests/document/dynamic.py
+++ b/tests/document/dynamic.py
@@ -1,16 +1,15 @@
 import unittest
 
 from mongoengine import *
-from mongoengine.connection import get_db
+from tests.utils import MongoDBTestCase
 
-__all__ = ("DynamicTest", )
+__all__ = ("TestDynamicDocument", )
 
 
-class DynamicTest(unittest.TestCase):
+class TestDynamicDocument(MongoDBTestCase):
 
     def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
+        super(TestDynamicDocument, self).setUp()
 
         class Person(DynamicDocument):
             name = StringField()
@@ -98,6 +97,72 @@ def test_reload_dynamic_field(self):
         self.assertEqual(len(p._data), 4)
         self.assertEqual(sorted(p._data.keys()), ['_cls', 'age', 'id', 'name'])
 
+    def test_fields_without_underscore(self):
+        """Ensure we can query dynamic fields"""
+        Person = self.Person
+
+        p = self.Person(name='Dean')
+        p.save()
+
+        raw_p = Person.objects.as_pymongo().get(id=p.id)
+        self.assertEqual(
+            raw_p,
+            {
+                '_cls': u'Person',
+                '_id': p.id,
+                'name': u'Dean'
+             }
+        )
+
+        p.name = 'OldDean'
+        p.newattr = 'garbage'
+        p.save()
+        raw_p = Person.objects.as_pymongo().get(id=p.id)
+        self.assertEqual(
+            raw_p,
+            {
+                '_cls': u'Person',
+                '_id': p.id,
+                'name': 'OldDean',
+                'newattr': u'garbage'
+            }
+        )
+
+    def test_fields_containing_underscore(self):
+        """Ensure we can query dynamic fields"""
+        class WeirdPerson(DynamicDocument):
+            name = StringField()
+            _name = StringField()
+
+        WeirdPerson.drop_collection()
+
+        p = WeirdPerson(name='Dean', _name='Dean')
+        p.save()
+
+        raw_p = WeirdPerson.objects.as_pymongo().get(id=p.id)
+        self.assertEqual(
+            raw_p,
+            {
+                '_id': p.id,
+                '_name': u'Dean',
+                'name': u'Dean'
+            }
+        )
+
+        p.name = 'OldDean'
+        p._name = 'NewDean'
+        p._newattr1 = 'garbage'    # Unknown fields won't be added
+        p.save()
+        raw_p = WeirdPerson.objects.as_pymongo().get(id=p.id)
+        self.assertEqual(
+            raw_p,
+            {
+                '_id': p.id,
+                '_name': u'NewDean',
+                'name': u'OldDean',
+            }
+        )
+
     def test_dynamic_document_queries(self):
         """Ensure we can query dynamic fields"""
         p = self.Person()
@@ -369,5 +434,6 @@ class Person(DynamicDocument):
         person.save()
         self.assertEqual(Person.objects.first().age, 35)
 
+
 if __name__ == '__main__':
     unittest.main()

From 4a46f5f095e424fb0b91ac4ef85bed9241f33ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 17 Feb 2019 21:32:32 +0100
Subject: [PATCH 0754/1519] Separate fields tests into separate modules
 (date/datetime/complexdatetime) relates to #1983

---
 tests/fields/fields.py                      | 497 +-------------------
 tests/fields/test_complex_datetime_field.py | 189 ++++++++
 tests/fields/test_date_field.py             | 184 ++++++++
 tests/fields/test_datetime_field.py         | 208 ++++++++
 4 files changed, 583 insertions(+), 495 deletions(-)
 create mode 100644 tests/fields/test_complex_datetime_field.py
 create mode 100644 tests/fields/test_date_field.py
 create mode 100644 tests/fields/test_datetime_field.py

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index b09c0a2de..8f2567826 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -10,11 +10,6 @@
 from nose.plugins.skip import SkipTest
 import six
 
-try:
-    import dateutil
-except ImportError:
-    dateutil = None
-
 from decimal import Decimal
 
 from bson import Binary, DBRef, ObjectId, SON
@@ -30,55 +25,9 @@
 
 from tests.utils import MongoDBTestCase
 
-__all__ = ("FieldTest", "EmbeddedDocumentListFieldTestCase")
-
 
 class FieldTest(MongoDBTestCase):
 
-    def test_datetime_from_empty_string(self):
-        """
-        Ensure an exception is raised when trying to
-        cast an empty string to datetime.
-        """
-        class MyDoc(Document):
-            dt = DateTimeField()
-
-        md = MyDoc(dt='')
-        self.assertRaises(ValidationError, md.save)
-
-    def test_date_from_empty_string(self):
-        """
-        Ensure an exception is raised when trying to
-        cast an empty string to datetime.
-        """
-        class MyDoc(Document):
-            dt = DateField()
-
-        md = MyDoc(dt='')
-        self.assertRaises(ValidationError, md.save)
-
-    def test_datetime_from_whitespace_string(self):
-        """
-        Ensure an exception is raised when trying to
-        cast a whitespace-only string to datetime.
-        """
-        class MyDoc(Document):
-            dt = DateTimeField()
-
-        md = MyDoc(dt='   ')
-        self.assertRaises(ValidationError, md.save)
-
-    def test_date_from_whitespace_string(self):
-        """
-        Ensure an exception is raised when trying to
-        cast a whitespace-only string to datetime.
-        """
-        class MyDoc(Document):
-            dt = DateField()
-
-        md = MyDoc(dt='   ')
-        self.assertRaises(ValidationError, md.save)
-
     def test_default_values_nothing_set(self):
         """Ensure that default field values are used when creating
         a document.
@@ -695,273 +644,6 @@ class Person(Document):
             person.api_key = api_key
             self.assertRaises(ValidationError, person.validate)
 
-    def test_datetime_validation(self):
-        """Ensure that invalid values cannot be assigned to datetime
-        fields.
-        """
-        class LogEntry(Document):
-            time = DateTimeField()
-
-        log = LogEntry()
-        log.time = datetime.datetime.now()
-        log.validate()
-
-        log.time = datetime.date.today()
-        log.validate()
-
-        log.time = datetime.datetime.now().isoformat(' ')
-        log.validate()
-
-        if dateutil:
-            log.time = datetime.datetime.now().isoformat('T')
-            log.validate()
-
-        log.time = -1
-        self.assertRaises(ValidationError, log.validate)
-        log.time = 'ABC'
-        self.assertRaises(ValidationError, log.validate)
-
-    def test_date_validation(self):
-        """Ensure that invalid values cannot be assigned to datetime
-        fields.
-        """
-        class LogEntry(Document):
-            time = DateField()
-
-        log = LogEntry()
-        log.time = datetime.datetime.now()
-        log.validate()
-
-        log.time = datetime.date.today()
-        log.validate()
-
-        log.time = datetime.datetime.now().isoformat(' ')
-        log.validate()
-
-        if dateutil:
-            log.time = datetime.datetime.now().isoformat('T')
-            log.validate()
-
-        log.time = -1
-        self.assertRaises(ValidationError, log.validate)
-        log.time = 'ABC'
-        self.assertRaises(ValidationError, log.validate)
-
-    def test_datetime_tz_aware_mark_as_changed(self):
-        from mongoengine import connection
-
-        # Reset the connections
-        connection._connection_settings = {}
-        connection._connections = {}
-        connection._dbs = {}
-
-        connect(db='mongoenginetest', tz_aware=True)
-
-        class LogEntry(Document):
-            time = DateTimeField()
-
-        LogEntry.drop_collection()
-
-        LogEntry(time=datetime.datetime(2013, 1, 1, 0, 0, 0)).save()
-
-        log = LogEntry.objects.first()
-        log.time = datetime.datetime(2013, 1, 1, 0, 0, 0)
-        self.assertEqual(['time'], log._changed_fields)
-
-    def test_datetime(self):
-        """Tests showing pymongo datetime fields handling of microseconds.
-        Microseconds are rounded to the nearest millisecond and pre UTC
-        handling is wonky.
-
-        See: http://api.mongodb.org/python/current/api/bson/son.html#dt
-        """
-        class LogEntry(Document):
-            date = DateTimeField()
-
-        LogEntry.drop_collection()
-
-        # Test can save dates
-        log = LogEntry()
-        log.date = datetime.date.today()
-        log.save()
-        log.reload()
-        self.assertEqual(log.date.date(), datetime.date.today())
-
-        # Post UTC - microseconds are rounded (down) nearest millisecond and
-        # dropped
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
-        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1)
-        log = LogEntry()
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertNotEqual(log.date, d1)
-        self.assertEqual(log.date, d2)
-
-        # Post UTC - microseconds are rounded (down) nearest millisecond
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
-        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9000)
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertNotEqual(log.date, d1)
-        self.assertEqual(log.date, d2)
-
-        if not six.PY3:
-            # Pre UTC dates microseconds below 1000 are dropped
-            # This does not seem to be true in PY3
-            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
-            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)
-            log.date = d1
-            log.save()
-            log.reload()
-            self.assertNotEqual(log.date, d1)
-            self.assertEqual(log.date, d2)
-
-    def test_date(self):
-        """Tests showing pymongo date fields
-
-        See: http://api.mongodb.org/python/current/api/bson/son.html#dt
-        """
-        class LogEntry(Document):
-            date = DateField()
-
-        LogEntry.drop_collection()
-
-        # Test can save dates
-        log = LogEntry()
-        log.date = datetime.date.today()
-        log.save()
-        log.reload()
-        self.assertEqual(log.date, datetime.date.today())
-
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
-        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1)
-        log = LogEntry()
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertEqual(log.date, d1.date())
-        self.assertEqual(log.date, d2.date())
-
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
-        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9000)
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertEqual(log.date, d1.date())
-        self.assertEqual(log.date, d2.date())
-
-        if not six.PY3:
-            # Pre UTC dates microseconds below 1000 are dropped
-            # This does not seem to be true in PY3
-            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
-            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)
-            log.date = d1
-            log.save()
-            log.reload()
-            self.assertEqual(log.date, d1.date())
-            self.assertEqual(log.date, d2.date())
-
-    def test_datetime_usage(self):
-        """Tests for regular datetime fields"""
-        class LogEntry(Document):
-            date = DateTimeField()
-
-        LogEntry.drop_collection()
-
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1)
-        log = LogEntry()
-        log.date = d1
-        log.validate()
-        log.save()
-
-        for query in (d1, d1.isoformat(' ')):
-            log1 = LogEntry.objects.get(date=query)
-            self.assertEqual(log, log1)
-
-        if dateutil:
-            log1 = LogEntry.objects.get(date=d1.isoformat('T'))
-            self.assertEqual(log, log1)
-
-        # create additional 19 log entries for a total of 20
-        for i in range(1971, 1990):
-            d = datetime.datetime(i, 1, 1, 0, 0, 1)
-            LogEntry(date=d).save()
-
-        self.assertEqual(LogEntry.objects.count(), 20)
-
-        # Test ordering
-        logs = LogEntry.objects.order_by("date")
-        i = 0
-        while i < 19:
-            self.assertTrue(logs[i].date <= logs[i + 1].date)
-            i += 1
-
-        logs = LogEntry.objects.order_by("-date")
-        i = 0
-        while i < 19:
-            self.assertTrue(logs[i].date >= logs[i + 1].date)
-            i += 1
-
-        # Test searching
-        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 10)
-
-        logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 10)
-
-        logs = LogEntry.objects.filter(
-            date__lte=datetime.datetime(1980, 1, 1),
-            date__gte=datetime.datetime(1975, 1, 1),
-        )
-        self.assertEqual(logs.count(), 5)
-
-    def test_date_usage(self):
-        """Tests for regular datetime fields"""
-        class LogEntry(Document):
-            date = DateField()
-
-        LogEntry.drop_collection()
-
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1)
-        log = LogEntry()
-        log.date = d1
-        log.validate()
-        log.save()
-
-        for query in (d1, d1.isoformat(' ')):
-            log1 = LogEntry.objects.get(date=query)
-            self.assertEqual(log, log1)
-
-        if dateutil:
-            log1 = LogEntry.objects.get(date=d1.isoformat('T'))
-            self.assertEqual(log, log1)
-
-        # create additional 19 log entries for a total of 20
-        for i in range(1971, 1990):
-            d = datetime.datetime(i, 1, 1, 0, 0, 1)
-            LogEntry(date=d).save()
-
-        self.assertEqual(LogEntry.objects.count(), 20)
-
-        # Test ordering
-        logs = LogEntry.objects.order_by("date")
-        i = 0
-        while i < 19:
-            self.assertTrue(logs[i].date <= logs[i + 1].date)
-            i += 1
-
-        logs = LogEntry.objects.order_by("-date")
-        i = 0
-        while i < 19:
-            self.assertTrue(logs[i].date >= logs[i + 1].date)
-            i += 1
-
-        # Test searching
-        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 10)
-
     def test_list_validation(self):
         """Ensure that a list field only accepts lists with valid elements."""
         AccessLevelChoices = (
@@ -1699,7 +1381,7 @@ class BlogPost(Document):
         post.save()
 
         post = BlogPost()
-        post.info = {'title' : 'dollar_sign', 'details' : {'te$t' : 'test'} }
+        post.info = {'title': 'dollar_sign', 'details': {'te$t': 'test'}}
         post.save()
 
         post = BlogPost()
@@ -1718,7 +1400,7 @@ class BlogPost(Document):
 
         post = BlogPost.objects.filter(info__title__exact='dollar_sign').first()
         self.assertIn('te$t', post['info']['details'])
-         
+
         # Confirm handles non strings or non existing keys
         self.assertEqual(
             BlogPost.objects.filter(info__details__test__exact=5).count(), 0)
@@ -5400,180 +5082,5 @@ def check_fields_type(occ):
         check_fields_type(occ)
 
 
-class ComplexDateTimeFieldTest(MongoDBTestCase):
-    def test_complexdatetime_storage(self):
-        """Tests for complex datetime fields - which can handle
-        microseconds without rounding.
-        """
-        class LogEntry(Document):
-            date = ComplexDateTimeField()
-            date_with_dots = ComplexDateTimeField(separator='.')
-
-        LogEntry.drop_collection()
-
-        # Post UTC - microseconds are rounded (down) nearest millisecond and
-        # dropped - with default datetimefields
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
-        log = LogEntry()
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertEqual(log.date, d1)
-
-        # Post UTC - microseconds are rounded (down) nearest millisecond - with
-        # default datetimefields
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertEqual(log.date, d1)
-
-        # Pre UTC dates microseconds below 1000 are dropped - with default
-        # datetimefields
-        d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
-        log.date = d1
-        log.save()
-        log.reload()
-        self.assertEqual(log.date, d1)
-
-        # Pre UTC microseconds above 1000 is wonky - with default datetimefields
-        # log.date has an invalid microsecond value so I can't construct
-        # a date to compare.
-        for i in range(1001, 3113, 33):
-            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, i)
-            log.date = d1
-            log.save()
-            log.reload()
-            self.assertEqual(log.date, d1)
-            log1 = LogEntry.objects.get(date=d1)
-            self.assertEqual(log, log1)
-
-        # Test string padding
-        microsecond = map(int, [math.pow(10, x) for x in range(6)])
-        mm = dd = hh = ii = ss = [1, 10]
-
-        for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
-            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']
-            self.assertTrue(re.match('^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$', stored) is not None)
-
-        # Test separator
-        stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()['date_with_dots']
-        self.assertTrue(re.match('^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$', stored) is not None)
-
-    def test_complexdatetime_usage(self):
-        """Tests for complex datetime fields - which can handle
-        microseconds without rounding.
-        """
-        class LogEntry(Document):
-            date = ComplexDateTimeField()
-
-        LogEntry.drop_collection()
-
-        d1 = datetime.datetime(1950, 1, 1, 0, 0, 1, 999)
-        log = LogEntry()
-        log.date = d1
-        log.save()
-
-        log1 = LogEntry.objects.get(date=d1)
-        self.assertEqual(log, log1)
-
-        # create extra 59 log entries for a total of 60
-        for i in range(1951, 2010):
-            d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)
-            LogEntry(date=d).save()
-
-        self.assertEqual(LogEntry.objects.count(), 60)
-
-        # Test ordering
-        logs = LogEntry.objects.order_by("date")
-        i = 0
-        while i < 59:
-            self.assertTrue(logs[i].date <= logs[i + 1].date)
-            i += 1
-
-        logs = LogEntry.objects.order_by("-date")
-        i = 0
-        while i < 59:
-            self.assertTrue(logs[i].date >= logs[i + 1].date)
-            i += 1
-
-        # Test searching
-        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 30)
-
-        logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 30)
-
-        logs = LogEntry.objects.filter(
-            date__lte=datetime.datetime(2011, 1, 1),
-            date__gte=datetime.datetime(2000, 1, 1),
-        )
-        self.assertEqual(logs.count(), 10)
-
-        LogEntry.drop_collection()
-
-        # Test microsecond-level ordering/filtering
-        for microsecond in (99, 999, 9999, 10000):
-            LogEntry(
-                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)
-            ).save()
-
-        logs = list(LogEntry.objects.order_by('date'))
-        for next_idx, log in enumerate(logs[:-1], start=1):
-            next_log = logs[next_idx]
-            self.assertTrue(log.date < next_log.date)
-
-        logs = list(LogEntry.objects.order_by('-date'))
-        for next_idx, log in enumerate(logs[:-1], start=1):
-            next_log = logs[next_idx]
-            self.assertTrue(log.date > next_log.date)
-
-        logs = LogEntry.objects.filter(
-            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))
-        self.assertEqual(logs.count(), 4)
-
-    def test_no_default_value(self):
-        class Log(Document):
-            timestamp = ComplexDateTimeField()
-
-        Log.drop_collection()
-
-        log = Log()
-        self.assertIsNone(log.timestamp)
-        log.save()
-
-        fetched_log = Log.objects.with_id(log.id)
-        self.assertIsNone(fetched_log.timestamp)
-
-    def test_default_static_value(self):
-        NOW = datetime.datetime.utcnow()
-        class Log(Document):
-            timestamp = ComplexDateTimeField(default=NOW)
-
-        Log.drop_collection()
-
-        log = Log()
-        self.assertEqual(log.timestamp, NOW)
-        log.save()
-
-        fetched_log = Log.objects.with_id(log.id)
-        self.assertEqual(fetched_log.timestamp, NOW)
-
-    def test_default_callable(self):
-        NOW = datetime.datetime.utcnow()
-
-        class Log(Document):
-            timestamp = ComplexDateTimeField(default=datetime.datetime.utcnow)
-
-        Log.drop_collection()
-
-        log = Log()
-        self.assertGreaterEqual(log.timestamp, NOW)
-        log.save()
-
-        fetched_log = Log.objects.with_id(log.id)
-        self.assertGreaterEqual(fetched_log.timestamp, NOW)
-
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
new file mode 100644
index 000000000..bac534c05
--- /dev/null
+++ b/tests/fields/test_complex_datetime_field.py
@@ -0,0 +1,189 @@
+# -*- coding: utf-8 -*-
+import datetime
+import math
+import itertools
+import re
+
+try:
+    from bson.int64 import Int64
+except ImportError:
+    Int64 = long
+
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class ComplexDateTimeFieldTest(MongoDBTestCase):
+    def test_complexdatetime_storage(self):
+        """Tests for complex datetime fields - which can handle
+        microseconds without rounding.
+        """
+        class LogEntry(Document):
+            date = ComplexDateTimeField()
+            date_with_dots = ComplexDateTimeField(separator='.')
+
+        LogEntry.drop_collection()
+
+        # Post UTC - microseconds are rounded (down) nearest millisecond and
+        # dropped - with default datetimefields
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
+        log = LogEntry()
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1)
+
+        # Post UTC - microseconds are rounded (down) nearest millisecond - with
+        # default datetimefields
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1)
+
+        # Pre UTC dates microseconds below 1000 are dropped - with default
+        # datetimefields
+        d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1)
+
+        # Pre UTC microseconds above 1000 is wonky - with default datetimefields
+        # log.date has an invalid microsecond value so I can't construct
+        # a date to compare.
+        for i in range(1001, 3113, 33):
+            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, i)
+            log.date = d1
+            log.save()
+            log.reload()
+            self.assertEqual(log.date, d1)
+            log1 = LogEntry.objects.get(date=d1)
+            self.assertEqual(log, log1)
+
+        # Test string padding
+        microsecond = map(int, [math.pow(10, x) for x in range(6)])
+        mm = dd = hh = ii = ss = [1, 10]
+
+        for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
+            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']
+            self.assertTrue(re.match('^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$', stored) is not None)
+
+        # Test separator
+        stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()['date_with_dots']
+        self.assertTrue(re.match('^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$', stored) is not None)
+
+    def test_complexdatetime_usage(self):
+        """Tests for complex datetime fields - which can handle
+        microseconds without rounding.
+        """
+        class LogEntry(Document):
+            date = ComplexDateTimeField()
+
+        LogEntry.drop_collection()
+
+        d1 = datetime.datetime(1950, 1, 1, 0, 0, 1, 999)
+        log = LogEntry()
+        log.date = d1
+        log.save()
+
+        log1 = LogEntry.objects.get(date=d1)
+        self.assertEqual(log, log1)
+
+        # create extra 59 log entries for a total of 60
+        for i in range(1951, 2010):
+            d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)
+            LogEntry(date=d).save()
+
+        self.assertEqual(LogEntry.objects.count(), 60)
+
+        # Test ordering
+        logs = LogEntry.objects.order_by("date")
+        i = 0
+        while i < 59:
+            self.assertTrue(logs[i].date <= logs[i + 1].date)
+            i += 1
+
+        logs = LogEntry.objects.order_by("-date")
+        i = 0
+        while i < 59:
+            self.assertTrue(logs[i].date >= logs[i + 1].date)
+            i += 1
+
+        # Test searching
+        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
+        self.assertEqual(logs.count(), 30)
+
+        logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1))
+        self.assertEqual(logs.count(), 30)
+
+        logs = LogEntry.objects.filter(
+            date__lte=datetime.datetime(2011, 1, 1),
+            date__gte=datetime.datetime(2000, 1, 1),
+        )
+        self.assertEqual(logs.count(), 10)
+
+        LogEntry.drop_collection()
+
+        # Test microsecond-level ordering/filtering
+        for microsecond in (99, 999, 9999, 10000):
+            LogEntry(
+                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)
+            ).save()
+
+        logs = list(LogEntry.objects.order_by('date'))
+        for next_idx, log in enumerate(logs[:-1], start=1):
+            next_log = logs[next_idx]
+            self.assertTrue(log.date < next_log.date)
+
+        logs = list(LogEntry.objects.order_by('-date'))
+        for next_idx, log in enumerate(logs[:-1], start=1):
+            next_log = logs[next_idx]
+            self.assertTrue(log.date > next_log.date)
+
+        logs = LogEntry.objects.filter(
+            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))
+        self.assertEqual(logs.count(), 4)
+
+    def test_no_default_value(self):
+        class Log(Document):
+            timestamp = ComplexDateTimeField()
+
+        Log.drop_collection()
+
+        log = Log()
+        self.assertIsNone(log.timestamp)
+        log.save()
+
+        fetched_log = Log.objects.with_id(log.id)
+        self.assertIsNone(fetched_log.timestamp)
+
+    def test_default_static_value(self):
+        NOW = datetime.datetime.utcnow()
+        class Log(Document):
+            timestamp = ComplexDateTimeField(default=NOW)
+
+        Log.drop_collection()
+
+        log = Log()
+        self.assertEqual(log.timestamp, NOW)
+        log.save()
+
+        fetched_log = Log.objects.with_id(log.id)
+        self.assertEqual(fetched_log.timestamp, NOW)
+
+    def test_default_callable(self):
+        NOW = datetime.datetime.utcnow()
+
+        class Log(Document):
+            timestamp = ComplexDateTimeField(default=datetime.datetime.utcnow)
+
+        Log.drop_collection()
+
+        log = Log()
+        self.assertGreaterEqual(log.timestamp, NOW)
+        log.save()
+
+        fetched_log = Log.objects.with_id(log.id)
+        self.assertGreaterEqual(fetched_log.timestamp, NOW)
diff --git a/tests/fields/test_date_field.py b/tests/fields/test_date_field.py
new file mode 100644
index 000000000..b5aed5c15
--- /dev/null
+++ b/tests/fields/test_date_field.py
@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+import datetime
+import unittest
+import uuid
+import math
+import itertools
+import re
+import sys
+
+from nose.plugins.skip import SkipTest
+import six
+
+try:
+    import dateutil
+except ImportError:
+    dateutil = None
+
+from decimal import Decimal
+
+from bson import Binary, DBRef, ObjectId, SON
+try:
+    from bson.int64 import Int64
+except ImportError:
+    Int64 = long
+
+from mongoengine import *
+from mongoengine.connection import get_db
+from mongoengine.base import (BaseDict, BaseField, EmbeddedDocumentList,
+                              _document_registry, LazyReference)
+
+from tests.utils import MongoDBTestCase
+
+
+class TestDateField(MongoDBTestCase):
+    def test_date_from_empty_string(self):
+        """
+        Ensure an exception is raised when trying to
+        cast an empty string to datetime.
+        """
+        class MyDoc(Document):
+            dt = DateField()
+
+        md = MyDoc(dt='')
+        self.assertRaises(ValidationError, md.save)
+
+    def test_date_from_whitespace_string(self):
+        """
+        Ensure an exception is raised when trying to
+        cast a whitespace-only string to datetime.
+        """
+        class MyDoc(Document):
+            dt = DateField()
+
+        md = MyDoc(dt='   ')
+        self.assertRaises(ValidationError, md.save)
+
+    def test_default_values_today(self):
+        """Ensure that default field values are used when creating
+        a document.
+        """
+        class Person(Document):
+            day = DateField(default=datetime.date.today)
+
+        person = Person()
+        person.validate()
+        self.assertEqual(person.day, person.day)
+        self.assertEqual(person.day, datetime.date.today())
+        self.assertEqual(person._data['day'], person.day)
+
+    def test_date(self):
+        """Tests showing pymongo date fields
+
+        See: http://api.mongodb.org/python/current/api/bson/son.html#dt
+        """
+        class LogEntry(Document):
+            date = DateField()
+
+        LogEntry.drop_collection()
+
+        # Test can save dates
+        log = LogEntry()
+        log.date = datetime.date.today()
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, datetime.date.today())
+
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
+        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1)
+        log = LogEntry()
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1.date())
+        self.assertEqual(log.date, d2.date())
+
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
+        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9000)
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertEqual(log.date, d1.date())
+        self.assertEqual(log.date, d2.date())
+
+        if not six.PY3:
+            # Pre UTC dates microseconds below 1000 are dropped
+            # This does not seem to be true in PY3
+            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
+            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)
+            log.date = d1
+            log.save()
+            log.reload()
+            self.assertEqual(log.date, d1.date())
+            self.assertEqual(log.date, d2.date())
+
+    def test_regular_usage(self):
+        """Tests for regular datetime fields"""
+        class LogEntry(Document):
+            date = DateField()
+
+        LogEntry.drop_collection()
+
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1)
+        log = LogEntry()
+        log.date = d1
+        log.validate()
+        log.save()
+
+        for query in (d1, d1.isoformat(' ')):
+            log1 = LogEntry.objects.get(date=query)
+            self.assertEqual(log, log1)
+
+        if dateutil:
+            log1 = LogEntry.objects.get(date=d1.isoformat('T'))
+            self.assertEqual(log, log1)
+
+        # create additional 19 log entries for a total of 20
+        for i in range(1971, 1990):
+            d = datetime.datetime(i, 1, 1, 0, 0, 1)
+            LogEntry(date=d).save()
+
+        self.assertEqual(LogEntry.objects.count(), 20)
+
+        # Test ordering
+        logs = LogEntry.objects.order_by("date")
+        i = 0
+        while i < 19:
+            self.assertTrue(logs[i].date <= logs[i + 1].date)
+            i += 1
+
+        logs = LogEntry.objects.order_by("-date")
+        i = 0
+        while i < 19:
+            self.assertTrue(logs[i].date >= logs[i + 1].date)
+            i += 1
+
+        # Test searching
+        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
+        self.assertEqual(logs.count(), 10)
+
+    def test_validation(self):
+        """Ensure that invalid values cannot be assigned to datetime
+        fields.
+        """
+        class LogEntry(Document):
+            time = DateField()
+
+        log = LogEntry()
+        log.time = datetime.datetime.now()
+        log.validate()
+
+        log.time = datetime.date.today()
+        log.validate()
+
+        log.time = datetime.datetime.now().isoformat(' ')
+        log.validate()
+
+        if dateutil:
+            log.time = datetime.datetime.now().isoformat('T')
+            log.validate()
+
+        log.time = -1
+        self.assertRaises(ValidationError, log.validate)
+        log.time = 'ABC'
+        self.assertRaises(ValidationError, log.validate)
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
new file mode 100644
index 000000000..24d1c7777
--- /dev/null
+++ b/tests/fields/test_datetime_field.py
@@ -0,0 +1,208 @@
+# -*- coding: utf-8 -*-
+import datetime
+import six
+
+try:
+    import dateutil
+except ImportError:
+    dateutil = None
+
+try:
+    from bson.int64 import Int64
+except ImportError:
+    Int64 = long
+
+from mongoengine import *
+from mongoengine import connection
+
+from tests.utils import MongoDBTestCase
+
+
+class TestDateTimeField(MongoDBTestCase):
+    def test_datetime_from_empty_string(self):
+        """
+        Ensure an exception is raised when trying to
+        cast an empty string to datetime.
+        """
+        class MyDoc(Document):
+            dt = DateTimeField()
+
+        md = MyDoc(dt='')
+        self.assertRaises(ValidationError, md.save)
+
+    def test_datetime_from_whitespace_string(self):
+        """
+        Ensure an exception is raised when trying to
+        cast a whitespace-only string to datetime.
+        """
+        class MyDoc(Document):
+            dt = DateTimeField()
+
+        md = MyDoc(dt='   ')
+        self.assertRaises(ValidationError, md.save)
+
+    def test_default_value_utcnow(self):
+        """Ensure that default field values are used when creating
+        a document.
+        """
+        class Person(Document):
+            created = DateTimeField(default=datetime.datetime.utcnow)
+
+        utcnow = datetime.datetime.utcnow()
+        person = Person()
+        person.validate()
+        person_created_t0 = person.created
+        self.assertLess(person.created - utcnow, datetime.timedelta(seconds=1))
+        self.assertEqual(person_created_t0, person.created)  # make sure it does not change
+        self.assertEqual(person._data['created'], person.created)
+
+    def test_handling_microseconds(self):
+        """Tests showing pymongo datetime fields handling of microseconds.
+        Microseconds are rounded to the nearest millisecond and pre UTC
+        handling is wonky.
+
+        See: http://api.mongodb.org/python/current/api/bson/son.html#dt
+        """
+        class LogEntry(Document):
+            date = DateTimeField()
+
+        LogEntry.drop_collection()
+
+        # Test can save dates
+        log = LogEntry()
+        log.date = datetime.date.today()
+        log.save()
+        log.reload()
+        self.assertEqual(log.date.date(), datetime.date.today())
+
+        # Post UTC - microseconds are rounded (down) nearest millisecond and
+        # dropped
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
+        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1)
+        log = LogEntry()
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertNotEqual(log.date, d1)
+        self.assertEqual(log.date, d2)
+
+        # Post UTC - microseconds are rounded (down) nearest millisecond
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
+        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9000)
+        log.date = d1
+        log.save()
+        log.reload()
+        self.assertNotEqual(log.date, d1)
+        self.assertEqual(log.date, d2)
+
+        if not six.PY3:
+            # Pre UTC dates microseconds below 1000 are dropped
+            # This does not seem to be true in PY3
+            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
+            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)
+            log.date = d1
+            log.save()
+            log.reload()
+            self.assertNotEqual(log.date, d1)
+            self.assertEqual(log.date, d2)
+
+    def test_regular_usage(self):
+        """Tests for regular datetime fields"""
+        class LogEntry(Document):
+            date = DateTimeField()
+
+        LogEntry.drop_collection()
+
+        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1)
+        log = LogEntry()
+        log.date = d1
+        log.validate()
+        log.save()
+
+        for query in (d1, d1.isoformat(' ')):
+            log1 = LogEntry.objects.get(date=query)
+            self.assertEqual(log, log1)
+
+        if dateutil:
+            log1 = LogEntry.objects.get(date=d1.isoformat('T'))
+            self.assertEqual(log, log1)
+
+        # create additional 19 log entries for a total of 20
+        for i in range(1971, 1990):
+            d = datetime.datetime(i, 1, 1, 0, 0, 1)
+            LogEntry(date=d).save()
+
+        self.assertEqual(LogEntry.objects.count(), 20)
+
+        # Test ordering
+        logs = LogEntry.objects.order_by("date")
+        i = 0
+        while i < 19:
+            self.assertTrue(logs[i].date <= logs[i + 1].date)
+            i += 1
+
+        logs = LogEntry.objects.order_by("-date")
+        i = 0
+        while i < 19:
+            self.assertTrue(logs[i].date >= logs[i + 1].date)
+            i += 1
+
+        # Test searching
+        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
+        self.assertEqual(logs.count(), 10)
+
+        logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1))
+        self.assertEqual(logs.count(), 10)
+
+        logs = LogEntry.objects.filter(
+            date__lte=datetime.datetime(1980, 1, 1),
+            date__gte=datetime.datetime(1975, 1, 1),
+        )
+        self.assertEqual(logs.count(), 5)
+
+    def test_datetime_validation(self):
+        """Ensure that invalid values cannot be assigned to datetime
+        fields.
+        """
+        class LogEntry(Document):
+            time = DateTimeField()
+
+        log = LogEntry()
+        log.time = datetime.datetime.now()
+        log.validate()
+
+        log.time = datetime.date.today()
+        log.validate()
+
+        log.time = datetime.datetime.now().isoformat(' ')
+        log.validate()
+
+        if dateutil:
+            log.time = datetime.datetime.now().isoformat('T')
+            log.validate()
+
+        log.time = -1
+        self.assertRaises(ValidationError, log.validate)
+        log.time = 'ABC'
+        self.assertRaises(ValidationError, log.validate)
+
+
+class TestDateTimeTzAware(MongoDBTestCase):
+    def test_datetime_tz_aware_mark_as_changed(self):
+        # Reset the connections
+        connection._connection_settings = {}
+        connection._connections = {}
+        connection._dbs = {}
+
+        connect(db='mongoenginetest', tz_aware=True)
+
+        class LogEntry(Document):
+            time = DateTimeField()
+
+        LogEntry.drop_collection()
+
+        LogEntry(time=datetime.datetime(2013, 1, 1, 0, 0, 0)).save()
+
+        log = LogEntry.objects.first()
+        log.time = datetime.datetime(2013, 1, 1, 0, 0, 0)
+        self.assertEqual(['time'], log._changed_fields)

From 2919e6765c71abe6a07ed5a8fefa5f8e6a31d5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 17 Feb 2019 21:45:05 +0100
Subject: [PATCH 0755/1519] separate test on binary field (#1983)

---
 tests/fields/fields.py            |  78 +----------------------
 tests/fields/test_binary_field.py | 100 ++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 75 deletions(-)
 create mode 100644 tests/fields/test_binary_field.py

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index b09c0a2de..05810f2c4 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -17,7 +17,7 @@
 
 from decimal import Decimal
 
-from bson import Binary, DBRef, ObjectId, SON
+from bson import DBRef, ObjectId, SON
 try:
     from bson.int64 import Int64
 except ImportError:
@@ -1699,7 +1699,7 @@ class BlogPost(Document):
         post.save()
 
         post = BlogPost()
-        post.info = {'title' : 'dollar_sign', 'details' : {'te$t' : 'test'} }
+        post.info = {'title': 'dollar_sign', 'details': {'te$t': 'test'}}
         post.save()
 
         post = BlogPost()
@@ -1718,7 +1718,7 @@ class BlogPost(Document):
 
         post = BlogPost.objects.filter(info__title__exact='dollar_sign').first()
         self.assertIn('te$t', post['info']['details'])
-         
+
         # Confirm handles non strings or non existing keys
         self.assertEqual(
             BlogPost.objects.filter(info__details__test__exact=5).count(), 0)
@@ -2934,78 +2934,6 @@ class Doc(Document):
         doc = Doc.objects.get(ref=doc1.pk)
         self.assertEqual(doc, doc2)
 
-    def test_binary_fields(self):
-        """Ensure that binary fields can be stored and retrieved.
-        """
-        class Attachment(Document):
-            content_type = StringField()
-            blob = BinaryField()
-
-        BLOB = six.b('\xe6\x00\xc4\xff\x07')
-        MIME_TYPE = 'application/octet-stream'
-
-        Attachment.drop_collection()
-
-        attachment = Attachment(content_type=MIME_TYPE, blob=BLOB)
-        attachment.save()
-
-        attachment_1 = Attachment.objects().first()
-        self.assertEqual(MIME_TYPE, attachment_1.content_type)
-        self.assertEqual(BLOB, six.binary_type(attachment_1.blob))
-
-    def test_binary_validation_succeeds(self):
-        """Ensure that valid values can be assigned to binary fields.
-        """
-        class AttachmentRequired(Document):
-            blob = BinaryField(required=True)
-
-        class AttachmentSizeLimit(Document):
-            blob = BinaryField(max_bytes=4)
-
-        attachment_required = AttachmentRequired()
-        self.assertRaises(ValidationError, attachment_required.validate)
-        attachment_required.blob = Binary(six.b('\xe6\x00\xc4\xff\x07'))
-        attachment_required.validate()
-
-        _5_BYTES = six.b('\xe6\x00\xc4\xff\x07')
-        _4_BYTES = six.b('\xe6\x00\xc4\xff')
-        self.assertRaises(ValidationError, AttachmentSizeLimit(blob=_5_BYTES).validate)
-        AttachmentSizeLimit(blob=_4_BYTES).validate()
-
-    def test_binary_validation_fails(self):
-        """Ensure that invalid values cannot be assigned to binary fields."""
-
-        class Attachment(Document):
-            blob = BinaryField()
-
-        for invalid_data in (2, u'Im_a_unicode', ['some_str']):
-            self.assertRaises(ValidationError, Attachment(blob=invalid_data).validate)
-
-    def test_binary_field_primary(self):
-        class Attachment(Document):
-            id = BinaryField(primary_key=True)
-
-        Attachment.drop_collection()
-        binary_id = uuid.uuid4().bytes
-        att = Attachment(id=binary_id).save()
-        self.assertEqual(1, Attachment.objects.count())
-        self.assertEqual(1, Attachment.objects.filter(id=att.id).count())
-        att.delete()
-        self.assertEqual(0, Attachment.objects.count())
-
-    def test_binary_field_primary_filter_by_binary_pk_as_str(self):
-        raise SkipTest("Querying by id as string is not currently supported")
-
-        class Attachment(Document):
-            id = BinaryField(primary_key=True)
-
-        Attachment.drop_collection()
-        binary_id = uuid.uuid4().bytes
-        att = Attachment(id=binary_id).save()
-        self.assertEqual(1, Attachment.objects.filter(id=binary_id).count())
-        att.delete()
-        self.assertEqual(0, Attachment.objects.count())
-
     def test_choices_allow_using_sets_as_choices(self):
         """Ensure that sets can be used when setting choices
         """
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
new file mode 100644
index 000000000..d96f59e91
--- /dev/null
+++ b/tests/fields/test_binary_field.py
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+import datetime
+import unittest
+import uuid
+import math
+import itertools
+import re
+import sys
+
+from nose.plugins.skip import SkipTest
+import six
+
+try:
+    import dateutil
+except ImportError:
+    dateutil = None
+
+from bson import Binary
+
+try:
+    from bson.int64 import Int64
+except ImportError:
+    Int64 = long
+
+from mongoengine import *
+from tests.utils import MongoDBTestCase
+
+
+class TestBinaryField(MongoDBTestCase):
+    def test_binary_fields(self):
+        """Ensure that binary fields can be stored and retrieved.
+        """
+        class Attachment(Document):
+            content_type = StringField()
+            blob = BinaryField()
+
+        BLOB = six.b('\xe6\x00\xc4\xff\x07')
+        MIME_TYPE = 'application/octet-stream'
+
+        Attachment.drop_collection()
+
+        attachment = Attachment(content_type=MIME_TYPE, blob=BLOB)
+        attachment.save()
+
+        attachment_1 = Attachment.objects().first()
+        self.assertEqual(MIME_TYPE, attachment_1.content_type)
+        self.assertEqual(BLOB, six.binary_type(attachment_1.blob))
+
+    def test_binary_validation_succeeds(self):
+        """Ensure that valid values can be assigned to binary fields.
+        """
+        class AttachmentRequired(Document):
+            blob = BinaryField(required=True)
+
+        class AttachmentSizeLimit(Document):
+            blob = BinaryField(max_bytes=4)
+
+        attachment_required = AttachmentRequired()
+        self.assertRaises(ValidationError, attachment_required.validate)
+        attachment_required.blob = Binary(six.b('\xe6\x00\xc4\xff\x07'))
+        attachment_required.validate()
+
+        _5_BYTES = six.b('\xe6\x00\xc4\xff\x07')
+        _4_BYTES = six.b('\xe6\x00\xc4\xff')
+        self.assertRaises(ValidationError, AttachmentSizeLimit(blob=_5_BYTES).validate)
+        AttachmentSizeLimit(blob=_4_BYTES).validate()
+
+    def test_binary_validation_fails(self):
+        """Ensure that invalid values cannot be assigned to binary fields."""
+
+        class Attachment(Document):
+            blob = BinaryField()
+
+        for invalid_data in (2, u'Im_a_unicode', ['some_str']):
+            self.assertRaises(ValidationError, Attachment(blob=invalid_data).validate)
+
+    def test_binary_field_primary(self):
+        class Attachment(Document):
+            id = BinaryField(primary_key=True)
+
+        Attachment.drop_collection()
+        binary_id = uuid.uuid4().bytes
+        att = Attachment(id=binary_id).save()
+        self.assertEqual(1, Attachment.objects.count())
+        self.assertEqual(1, Attachment.objects.filter(id=att.id).count())
+        att.delete()
+        self.assertEqual(0, Attachment.objects.count())
+
+    def test_binary_field_primary_filter_by_binary_pk_as_str(self):
+        raise SkipTest("Querying by id as string is not currently supported")
+
+        class Attachment(Document):
+            id = BinaryField(primary_key=True)
+
+        Attachment.drop_collection()
+        binary_id = uuid.uuid4().bytes
+        att = Attachment(id=binary_id).save()
+        self.assertEqual(1, Attachment.objects.filter(id=binary_id).count())
+        att.delete()
+        self.assertEqual(0, Attachment.objects.count())

From e02261be6d86489945ad022ed73ae45c39fcc9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 17 Feb 2019 21:54:36 +0100
Subject: [PATCH 0756/1519] add test coverage for #1557

---
 docs/changelog.rst                |  1 +
 tests/fields/test_binary_field.py | 77 +++++++++++++++++++++++--------
 2 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d8bed7e6a..25e1a5851 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 - (Fill this out as you fix issues and develop your features).
 - Fix .only() working improperly after using .count() of the same instance of QuerySet
 - POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (_cls, _id) when using `QuerySet.as_pymongo` #1976
+- Fix InvalidStringData error when using modify on a BinaryField #1127
 
 =================
 Changes in 0.16.3
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index d96f59e91..b04277664 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -1,30 +1,16 @@
 # -*- coding: utf-8 -*-
-import datetime
-import unittest
 import uuid
-import math
-import itertools
-import re
-import sys
 
 from nose.plugins.skip import SkipTest
 import six
 
-try:
-    import dateutil
-except ImportError:
-    dateutil = None
-
 from bson import Binary
 
-try:
-    from bson.int64 import Int64
-except ImportError:
-    Int64 = long
-
 from mongoengine import *
 from tests.utils import MongoDBTestCase
 
+BIN_VALUE = six.b('\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5')
+
 
 class TestBinaryField(MongoDBTestCase):
     def test_binary_fields(self):
@@ -46,7 +32,7 @@ class Attachment(Document):
         self.assertEqual(MIME_TYPE, attachment_1.content_type)
         self.assertEqual(BLOB, six.binary_type(attachment_1.blob))
 
-    def test_binary_validation_succeeds(self):
+    def test_validation_succeeds(self):
         """Ensure that valid values can be assigned to binary fields.
         """
         class AttachmentRequired(Document):
@@ -65,7 +51,7 @@ class AttachmentSizeLimit(Document):
         self.assertRaises(ValidationError, AttachmentSizeLimit(blob=_5_BYTES).validate)
         AttachmentSizeLimit(blob=_4_BYTES).validate()
 
-    def test_binary_validation_fails(self):
+    def test_validation_fails(self):
         """Ensure that invalid values cannot be assigned to binary fields."""
 
         class Attachment(Document):
@@ -74,7 +60,7 @@ class Attachment(Document):
         for invalid_data in (2, u'Im_a_unicode', ['some_str']):
             self.assertRaises(ValidationError, Attachment(blob=invalid_data).validate)
 
-    def test_binary_field_primary(self):
+    def test__primary(self):
         class Attachment(Document):
             id = BinaryField(primary_key=True)
 
@@ -86,7 +72,7 @@ class Attachment(Document):
         att.delete()
         self.assertEqual(0, Attachment.objects.count())
 
-    def test_binary_field_primary_filter_by_binary_pk_as_str(self):
+    def test_primary_filter_by_binary_pk_as_str(self):
         raise SkipTest("Querying by id as string is not currently supported")
 
         class Attachment(Document):
@@ -98,3 +84,54 @@ class Attachment(Document):
         self.assertEqual(1, Attachment.objects.filter(id=binary_id).count())
         att.delete()
         self.assertEqual(0, Attachment.objects.count())
+
+    def test_match_querying_with_bytes(self):
+        class MyDocument(Document):
+            bin_field = BinaryField()
+
+        MyDocument.drop_collection()
+
+        doc = MyDocument(bin_field=BIN_VALUE).save()
+        matched_doc = MyDocument.objects(bin_field=BIN_VALUE).first()
+        self.assertEqual(matched_doc.id, doc.id)
+
+    def test_match_querying_with_binary(self):
+        class MyDocument(Document):
+            bin_field = BinaryField()
+
+        MyDocument.drop_collection()
+
+        doc = MyDocument(bin_field=BIN_VALUE).save()
+
+        matched_doc = MyDocument.objects(bin_field=Binary(BIN_VALUE)).first()
+        self.assertEqual(matched_doc.id, doc.id)
+
+    def test_modify_operation__set(self):
+        """Ensures no regression of bug #1127"""
+        class MyDocument(Document):
+            some_field = StringField()
+            bin_field = BinaryField()
+
+        MyDocument.drop_collection()
+
+        doc = MyDocument.objects(some_field='test').modify(
+            upsert=True, new=True,
+            set__bin_field=BIN_VALUE
+        )
+        self.assertEqual(doc.some_field, 'test')
+        self.assertEqual(doc.bin_field, Binary(BIN_VALUE))
+
+    def test_update_one(self):
+        """Ensures no regression of bug #1127"""
+        class MyDocument(Document):
+            bin_field = BinaryField()
+
+        MyDocument.drop_collection()
+
+        bin_data = six.b('\xe6\x00\xc4\xff\x07')
+        doc = MyDocument(bin_field=bin_data).save()
+
+        n_updated = MyDocument.objects(bin_field=bin_data).update_one(bin_field=BIN_VALUE)
+        self.assertEqual(n_updated, 1)
+        fetched = MyDocument.objects.with_id(doc.id)
+        self.assertEqual(fetched.bin_field, Binary(BIN_VALUE))

From f4873fee18793543266d10ac5d7fbd0341ba2442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 17 Feb 2019 22:50:42 +0100
Subject: [PATCH 0757/1519] add additional test for #1976

---
 tests/queryset/queryset.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c183aa86a..d3a2418a5 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4628,8 +4628,6 @@ class Doc(Document):
         self.assertEqual(doc_objects, Doc.objects.from_json(json_data))
 
     def test_as_pymongo(self):
-        from decimal import Decimal
-
         class LastLogin(EmbeddedDocument):
             location = StringField()
             ip = StringField()
@@ -4694,6 +4692,24 @@ class User(Document):
             }
         })
 
+    def test_as_pymongo_returns_cls_attribute_when_using_inheritance(self):
+        class User(Document):
+            name = StringField()
+            meta = {'allow_inheritance': True}
+
+        User.drop_collection()
+
+        user = User(name="Bob Dole").save()
+        result = User.objects.as_pymongo().first()
+        self.assertEqual(
+            result,
+            {
+                '_cls': 'User',
+                '_id': user.id,
+                'name': 'Bob Dole'
+            }
+        )
+
     def test_as_pymongo_json_limit_fields(self):
 
         class User(Document):

From 201f3008b1c451c93d112e5905fe7e64259a8d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 17 Feb 2019 22:56:56 +0100
Subject: [PATCH 0758/1519] Fix for py3 in binary field test

---
 tests/fields/test_binary_field.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index b04277664..8af75d4e9 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -119,7 +119,10 @@ class MyDocument(Document):
             set__bin_field=BIN_VALUE
         )
         self.assertEqual(doc.some_field, 'test')
-        self.assertEqual(doc.bin_field, Binary(BIN_VALUE))
+        if six.PY3:
+            self.assertEqual(doc.bin_field, BIN_VALUE)
+        else:
+            self.assertEqual(doc.bin_field, Binary(BIN_VALUE))
 
     def test_update_one(self):
         """Ensures no regression of bug #1127"""
@@ -134,4 +137,7 @@ class MyDocument(Document):
         n_updated = MyDocument.objects(bin_field=bin_data).update_one(bin_field=BIN_VALUE)
         self.assertEqual(n_updated, 1)
         fetched = MyDocument.objects.with_id(doc.id)
-        self.assertEqual(fetched.bin_field, Binary(BIN_VALUE))
+        if six.PY3:
+            self.assertEqual(fetched.bin_field, BIN_VALUE)
+        else:
+            self.assertEqual(fetched.bin_field, Binary(BIN_VALUE))

From 57a38282a9a583983c6625d3e81731f9b461786f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 18 Feb 2019 22:03:03 +0100
Subject: [PATCH 0759/1519] Add DeprecationWarning for EmbeddedDocument.save &
 .reload - those will be removed soon

---
 docs/changelog.rst         |  1 +
 mongoengine/document.py    |  6 ++++++
 tests/document/instance.py | 24 +++++++++++++++++++++---
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 25e1a5851..dbd328d85 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Development
 - Fix .only() working improperly after using .count() of the same instance of QuerySet
 - POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (_cls, _id) when using `QuerySet.as_pymongo` #1976
 - Fix InvalidStringData error when using modify on a BinaryField #1127
+- DEPRECATION: `EmbeddedDocument.save` & `.reload` are marked as deprecated and will be removed in a next version of mongoengine #1552
 
 =================
 Changes in 0.16.3
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 7a491b7dd..57364ae63 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -90,9 +90,15 @@ def to_mongo(self, *args, **kwargs):
         return data
 
     def save(self, *args, **kwargs):
+        warnings.warn("EmbeddedDocument.save is deprecated and will be removed in a next version of mongoengine."
+                      "Use the parent document's .save() or ._instance.save()",
+                      DeprecationWarning, stacklevel=2)
         self._instance.save(*args, **kwargs)
 
     def reload(self, *args, **kwargs):
+        warnings.warn("EmbeddedDocument.reload is deprecated and will be removed in a next version of mongoengine."
+                      "Use the parent document's .reload() or ._instance.reload()",
+                      DeprecationWarning, stacklevel=2)
         self._instance.reload(*args, **kwargs)
 
 
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 5319ace41..39e47524e 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -7,6 +7,8 @@
 import weakref
 
 from datetime import datetime
+
+import warnings
 from bson import DBRef, ObjectId
 from pymongo.errors import DuplicateKeyError
 
@@ -1482,7 +1484,7 @@ class Message(Document):
         Message.drop_collection()
 
         # All objects share the same id, but each in a different collection
-        user = User(id=1, name='user-name')#.save()
+        user = User(id=1, name='user-name')  # .save()
         message = Message(id=1, author=user).save()
 
         message.author.name = 'tutu'
@@ -2000,7 +2002,6 @@ class Record(Document):
         child_record.delete()
         self.assertEqual(Record.objects(name='parent').get().children, [])
 
-
     def test_reverse_delete_rule_with_custom_id_field(self):
         """Ensure that a referenced document with custom primary key
         is also deleted upon deletion.
@@ -3086,6 +3087,24 @@ def save(self, *args, **kwargs):
             "UNDEFINED",
             system.nodes["node"].parameters["param"].macros["test"].value)
 
+    def test_embedded_document_save_reload_warning(self):
+        """Relates to #1570"""
+        class Embedded(EmbeddedDocument):
+            pass
+
+        class Doc(Document):
+            emb = EmbeddedDocumentField(Embedded)
+
+        doc = Doc(emb=Embedded()).save()
+        doc.emb.save()  # Make sure its still working
+        with warnings.catch_warnings():
+            warnings.simplefilter("error", DeprecationWarning)
+            with self.assertRaises(DeprecationWarning):
+                doc.emb.save()
+
+            with self.assertRaises(DeprecationWarning):
+                doc.emb.reload()
+
     def test_embedded_document_equality(self):
         class Test(Document):
             field = StringField(required=True)
@@ -3381,7 +3400,6 @@ class Company(Document):
         class User(Document):
             company = ReferenceField(Company)
 
-
         # Ensure index creation exception aren't swallowed (#1688)
         with self.assertRaises(DuplicateKeyError):
             User.objects().select_related()

From 6d353dae1e52b54f244fb1c6459b5d314e9d522d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 18 Feb 2019 21:08:04 +0100
Subject: [PATCH 0760/1519] refactored iteritems/itervalues to improve 2/3
 compat #2003

---
 mongoengine/base/datastructures.py |  5 +++--
 mongoengine/base/document.py       | 17 +++++++++--------
 mongoengine/base/fields.py         |  7 ++++---
 mongoengine/base/metaclasses.py    | 13 +++++++------
 mongoengine/context_managers.py    |  6 ++++--
 mongoengine/dereference.py         | 15 ++++++++-------
 mongoengine/document.py            |  3 ++-
 mongoengine/errors.py              |  9 +++++----
 mongoengine/fields.py              |  5 +++--
 mongoengine/queryset/base.py       |  5 +++--
 mongoengine/queryset/transform.py  |  3 ++-
 tests/document/indexes.py          | 28 ++++++++++++++--------------
 tests/document/inheritance.py      |  4 +++-
 tests/document/instance.py         |  9 ++++-----
 tests/queryset/queryset.py         |  3 ++-
 tests/test_dereference.py          | 27 ++++++++++++++-------------
 16 files changed, 87 insertions(+), 72 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 808332b99..fafc08b73 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -2,6 +2,7 @@
 
 from bson import DBRef
 import six
+from six import iteritems
 
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
@@ -363,7 +364,7 @@ class StrictDict(object):
     _classes = {}
 
     def __init__(self, **kwargs):
-        for k, v in kwargs.iteritems():
+        for k, v in iteritems(kwargs):
             setattr(self, k, v)
 
     def __getitem__(self, key):
@@ -411,7 +412,7 @@ def __iter__(self):
         return (key for key in self.__slots__ if hasattr(self, key))
 
     def __len__(self):
-        return len(list(self.iteritems()))
+        return len(list(iteritems(self)))
 
     def __eq__(self, other):
         return self.items() == other.items()
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 6a4c6bd9e..8587f17f3 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -5,6 +5,7 @@
 from bson import DBRef, ObjectId, SON, json_util
 import pymongo
 import six
+from six import iteritems
 
 from mongoengine import signals
 from mongoengine.base.common import get_document
@@ -83,7 +84,7 @@ def __init__(self, *args, **values):
         self._dynamic_fields = SON()
 
         # Assign default values to instance
-        for key, field in self._fields.iteritems():
+        for key, field in iteritems(self._fields):
             if self._db_field_map.get(key, key) in __only_fields:
                 continue
             value = getattr(self, key, None)
@@ -95,14 +96,14 @@ def __init__(self, *args, **values):
         # Set passed values after initialisation
         if self._dynamic:
             dynamic_data = {}
-            for key, value in values.iteritems():
+            for key, value in iteritems(values):
                 if key in self._fields or key == '_id':
                     setattr(self, key, value)
                 else:
                     dynamic_data[key] = value
         else:
             FileField = _import_class('FileField')
-            for key, value in values.iteritems():
+            for key, value in iteritems(values):
                 key = self._reverse_db_field_map.get(key, key)
                 if key in self._fields or key in ('id', 'pk', '_cls'):
                     if __auto_convert and value is not None:
@@ -118,7 +119,7 @@ def __init__(self, *args, **values):
 
         if self._dynamic:
             self._dynamic_lock = False
-            for key, value in dynamic_data.iteritems():
+            for key, value in iteritems(dynamic_data):
                 setattr(self, key, value)
 
         # Flag initialised
@@ -513,7 +514,7 @@ def _nestable_types_changed_fields(self, changed_fields, base_key, data):
         if not hasattr(data, 'items'):
             iterator = enumerate(data)
         else:
-            iterator = data.iteritems()
+            iterator = iteritems(data)
 
         for index_or_key, value in iterator:
             item_key = '%s%s.' % (base_key, index_or_key)
@@ -678,7 +679,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
         # Convert SON to a data dict, making sure each key is a string and
         # corresponds to the right db field.
         data = {}
-        for key, value in son.iteritems():
+        for key, value in iteritems(son):
             key = str(key)
             key = cls._db_field_map.get(key, key)
             data[key] = value
@@ -694,7 +695,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
         if not _auto_dereference:
             fields = copy.deepcopy(fields)
 
-        for field_name, field in fields.iteritems():
+        for field_name, field in iteritems(fields):
             field._auto_dereference = _auto_dereference
             if field.db_field in data:
                 value = data[field.db_field]
@@ -715,7 +716,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
 
         # In STRICT documents, remove any keys that aren't in cls._fields
         if cls.STRICT:
-            data = {k: v for k, v in data.iteritems() if k in cls._fields}
+            data = {k: v for k, v in iteritems(data) if k in cls._fields}
 
         obj = cls(__auto_convert=False, _created=created, __only_fields=only_fields, **data)
         obj._changed_fields = changed_fields
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index a32544d86..5586c5b7c 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -5,6 +5,7 @@
 from bson import DBRef, ObjectId, SON
 import pymongo
 import six
+from six import iteritems
 
 from mongoengine.base.common import UPDATE_OPERATORS
 from mongoengine.base.datastructures import (BaseDict, BaseList,
@@ -382,11 +383,11 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         if self.field:
             value_dict = {
                 key: self.field._to_mongo_safe_call(item, use_db_field, fields)
-                for key, item in value.iteritems()
+                for key, item in iteritems(value)
             }
         else:
             value_dict = {}
-            for k, v in value.iteritems():
+            for k, v in iteritems(value):
                 if isinstance(v, Document):
                     # We need the id from the saved object to create the DBRef
                     if v.pk is None:
@@ -423,7 +424,7 @@ def validate(self, value):
         errors = {}
         if self.field:
             if hasattr(value, 'iteritems') or hasattr(value, 'items'):
-                sequence = value.iteritems()
+                sequence = iteritems(value)
             else:
                 sequence = enumerate(value)
             for k, v in sequence:
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 8eb10008c..a19708256 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -1,6 +1,7 @@
 import warnings
 
 import six
+from six import iteritems, itervalues
 
 from mongoengine.base.common import _document_registry
 from mongoengine.base.fields import BaseField, ComplexBaseField, ObjectIdField
@@ -62,7 +63,7 @@ def __new__(mcs, name, bases, attrs):
             # Standard object mixin - merge in any Fields
             if not hasattr(base, '_meta'):
                 base_fields = {}
-                for attr_name, attr_value in base.__dict__.iteritems():
+                for attr_name, attr_value in iteritems(base.__dict__):
                     if not isinstance(attr_value, BaseField):
                         continue
                     attr_value.name = attr_name
@@ -74,7 +75,7 @@ def __new__(mcs, name, bases, attrs):
 
         # Discover any document fields
         field_names = {}
-        for attr_name, attr_value in attrs.iteritems():
+        for attr_name, attr_value in iteritems(attrs):
             if not isinstance(attr_value, BaseField):
                 continue
             attr_value.name = attr_name
@@ -103,7 +104,7 @@ def __new__(mcs, name, bases, attrs):
 
         attrs['_fields_ordered'] = tuple(i[1] for i in sorted(
                                          (v.creation_counter, v.name)
-                                         for v in doc_fields.itervalues()))
+                                         for v in itervalues(doc_fields)))
 
         #
         # Set document hierarchy
@@ -173,7 +174,7 @@ def __new__(mcs, name, bases, attrs):
                         f.__dict__.update({'im_self': getattr(f, '__self__')})
 
         # Handle delete rules
-        for field in new_class._fields.itervalues():
+        for field in itervalues(new_class._fields):
             f = field
             if f.owner_document is None:
                 f.owner_document = new_class
@@ -375,7 +376,7 @@ def __new__(mcs, name, bases, attrs):
             new_class.objects = QuerySetManager()
 
         # Validate the fields and set primary key if needed
-        for field_name, field in new_class._fields.iteritems():
+        for field_name, field in iteritems(new_class._fields):
             if field.primary_key:
                 # Ensure only one primary key is set
                 current_pk = new_class._meta.get('id_field')
@@ -438,7 +439,7 @@ class MetaDict(dict):
     _merge_options = ('indexes',)
 
     def merge(self, new_options):
-        for k, v in new_options.iteritems():
+        for k, v in iteritems(new_options):
             if k in self._merge_options:
                 self[k] = self.get(k, []) + v
             else:
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index c26b0a793..d1e5d9eff 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,9 +1,11 @@
 from contextlib import contextmanager
+
 from pymongo.write_concern import WriteConcern
+from six import iteritems
+
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 
-
 __all__ = ('switch_db', 'switch_collection', 'no_dereference',
            'no_sub_classes', 'query_counter', 'set_write_concern')
 
@@ -112,7 +114,7 @@ def __init__(self, cls):
         GenericReferenceField = _import_class('GenericReferenceField')
         ComplexBaseField = _import_class('ComplexBaseField')
 
-        self.deref_fields = [k for k, v in self.cls._fields.iteritems()
+        self.deref_fields = [k for k, v in iteritems(self.cls._fields)
                              if isinstance(v, (ReferenceField,
                                                GenericReferenceField,
                                                ComplexBaseField))]
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 619b5d1f2..eaebb56f3 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -1,5 +1,6 @@
 from bson import DBRef, SON
 import six
+from six import iteritems
 
 from mongoengine.base import (BaseDict, BaseList, EmbeddedDocumentList,
                               TopLevelDocumentMetaclass, get_document)
@@ -71,7 +72,7 @@ def _get_items_from_list(items):
 
                     def _get_items_from_dict(items):
                         new_items = {}
-                        for k, v in items.iteritems():
+                        for k, v in iteritems(items):
                             value = v
                             if isinstance(v, list):
                                 value = _get_items_from_list(v)
@@ -112,7 +113,7 @@ def _find_references(self, items, depth=0):
         depth += 1
         for item in iterator:
             if isinstance(item, (Document, EmbeddedDocument)):
-                for field_name, field in item._fields.iteritems():
+                for field_name, field in iteritems(item._fields):
                     v = item._data.get(field_name, None)
                     if isinstance(v, LazyReference):
                         # LazyReference inherits DBRef but should not be dereferenced here !
@@ -124,7 +125,7 @@ def _find_references(self, items, depth=0):
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                         field_cls = getattr(getattr(field, 'field', None), 'document_type', None)
                         references = self._find_references(v, depth)
-                        for key, refs in references.iteritems():
+                        for key, refs in iteritems(references):
                             if isinstance(field_cls, (Document, TopLevelDocumentMetaclass)):
                                 key = field_cls
                             reference_map.setdefault(key, set()).update(refs)
@@ -137,7 +138,7 @@ def _find_references(self, items, depth=0):
                 reference_map.setdefault(get_document(item['_cls']), set()).add(item['_ref'].id)
             elif isinstance(item, (dict, list, tuple)) and depth - 1 <= self.max_depth:
                 references = self._find_references(item, depth - 1)
-                for key, refs in references.iteritems():
+                for key, refs in iteritems(references):
                     reference_map.setdefault(key, set()).update(refs)
 
         return reference_map
@@ -146,7 +147,7 @@ def _fetch_objects(self, doc_type=None):
         """Fetch all references and convert to their document objects
         """
         object_map = {}
-        for collection, dbrefs in self.reference_map.iteritems():
+        for collection, dbrefs in iteritems(self.reference_map):
 
             # we use getattr instead of hasattr because hasattr swallows any exception under python2
             # so it could hide nasty things without raising exceptions (cfr bug #1688))
@@ -157,7 +158,7 @@ def _fetch_objects(self, doc_type=None):
                 refs = [dbref for dbref in dbrefs
                         if (col_name, dbref) not in object_map]
                 references = collection.objects.in_bulk(refs)
-                for key, doc in references.iteritems():
+                for key, doc in iteritems(references):
                     object_map[(col_name, key)] = doc
             else:  # Generic reference: use the refs data to convert to document
                 if isinstance(doc_type, (ListField, DictField, MapField)):
@@ -229,7 +230,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
             data = []
         else:
             is_list = False
-            iterator = items.iteritems()
+            iterator = iteritems(items)
             data = {}
 
         depth += 1
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 7a491b7dd..8885825b0 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -5,6 +5,7 @@
 import pymongo
 from pymongo.read_preferences import ReadPreference
 import six
+from six import iteritems
 
 from mongoengine import signals
 from mongoengine.base import (BaseDict, BaseDocument, BaseList,
@@ -607,7 +608,7 @@ def delete(self, signal_kwargs=None, **write_concern):
 
         # Delete FileFields separately
         FileField = _import_class('FileField')
-        for name, field in self._fields.iteritems():
+        for name, field in iteritems(self._fields):
             if isinstance(field, FileField):
                 getattr(self, name).delete()
 
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 986ebf736..0e92a8c40 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -1,6 +1,7 @@
 from collections import defaultdict
 
 import six
+from six import iteritems
 
 __all__ = ('NotRegistered', 'InvalidDocumentError', 'LookUpError',
            'DoesNotExist', 'MultipleObjectsReturned', 'InvalidQueryError',
@@ -113,7 +114,7 @@ def build_dict(source):
                 return errors_dict
 
             if isinstance(source, dict):
-                for field_name, error in source.iteritems():
+                for field_name, error in iteritems(source):
                     errors_dict[field_name] = build_dict(error)
             elif isinstance(source, ValidationError) and source.errors:
                 return build_dict(source.errors)
@@ -135,12 +136,12 @@ def generate_key(value, prefix=''):
                 value = ' '.join([generate_key(k) for k in value])
             elif isinstance(value, dict):
                 value = ' '.join(
-                    [generate_key(v, k) for k, v in value.iteritems()])
+                    [generate_key(v, k) for k, v in iteritems(value)])
 
             results = '%s.%s' % (prefix, value) if prefix else value
             return results
 
         error_dict = defaultdict(list)
-        for k, v in self.to_dict().iteritems():
+        for k, v in iteritems(self.to_dict()):
             error_dict[generate_key(v)].append(k)
-        return ' '.join(['%s: %s' % (k, v) for k, v in error_dict.iteritems()])
+        return ' '.join(['%s: %s' % (k, v) for k, v in iteritems(error_dict)])
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 0055bcab5..52ed4bc9c 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -11,6 +11,7 @@
 import gridfs
 import pymongo
 import six
+from six import iteritems
 
 try:
     import dateutil
@@ -794,12 +795,12 @@ def to_mongo(self, value, use_db_field=True, fields=None):
             value = {k: v for k, v in enumerate(value)}
 
         data = {}
-        for k, v in value.iteritems():
+        for k, v in iteritems(value):
             data[k] = self.to_mongo(v, use_db_field, fields)
 
         value = data
         if is_list:  # Convert back to a list
-            value = [v for k, v in sorted(data.iteritems(), key=itemgetter(0))]
+            value = [v for k, v in sorted(iteritems(data), key=itemgetter(0))]
         return value
 
     def to_python(self, value):
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 0ebeafa6b..f39fd65f6 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -12,6 +12,7 @@
 import pymongo.errors
 from pymongo.common import validate_read_preference
 import six
+from six import iteritems
 
 from mongoengine import signals
 from mongoengine.base import get_document
@@ -1731,13 +1732,13 @@ def _item_frequencies_exec_js(self, field, normalize=False):
             }
         """
         total, data, types = self.exec_js(freq_func, field)
-        values = {types.get(k): int(v) for k, v in data.iteritems()}
+        values = {types.get(k): int(v) for k, v in iteritems(data)}
 
         if normalize:
             values = {k: float(v) / total for k, v in values.items()}
 
         frequencies = {}
-        for k, v in values.iteritems():
+        for k, v in iteritems(values):
             if isinstance(k, float):
                 if int(k) == k:
                     k = int(k)
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 2d22c3507..c00271f34 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -4,6 +4,7 @@
 from bson.dbref import DBRef
 import pymongo
 import six
+from six import iteritems
 
 from mongoengine.base import UPDATE_OPERATORS
 from mongoengine.common import _import_class
@@ -154,7 +155,7 @@ def query(_doc_cls=None, **kwargs):
                 if ('$maxDistance' in value_dict or '$minDistance' in value_dict) and \
                         ('$near' in value_dict or '$nearSphere' in value_dict):
                     value_son = SON()
-                    for k, v in value_dict.iteritems():
+                    for k, v in iteritems(value_dict):
                         if k == '$maxDistance' or k == '$minDistance':
                             continue
                         value_son[k] = v
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 757d8037c..57f485878 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -5,6 +5,7 @@
 from nose.plugins.skip import SkipTest
 from pymongo.errors import OperationFailure
 import pymongo
+from six import iteritems
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -68,7 +69,7 @@ class BlogPost(InheritFrom):
         info = BlogPost.objects._collection.index_information()
         # _id, '-date', 'tags', ('cat', 'date')
         self.assertEqual(len(info), 4)
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         for expected in expected_specs:
             self.assertIn(expected['fields'], info)
 
@@ -100,7 +101,7 @@ class BlogPost(InheritFrom):
         # the indices on -date and tags will both contain
         # _cls as first element in the key
         self.assertEqual(len(info), 4)
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         for expected in expected_specs:
             self.assertIn(expected['fields'], info)
 
@@ -115,7 +116,7 @@ class ExtendedBlogPost(BlogPost):
 
         ExtendedBlogPost.ensure_indexes()
         info = ExtendedBlogPost.objects._collection.index_information()
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         for expected in expected_specs:
             self.assertIn(expected['fields'], info)
 
@@ -225,7 +226,7 @@ class Person(Document):
         # Indexes are lazy so use list() to perform query
         list(Person.objects)
         info = Person.objects._collection.index_information()
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         self.assertIn([('rank.title', 1)], info)
 
     def test_explicit_geo2d_index(self):
@@ -245,7 +246,7 @@ class Place(Document):
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         self.assertIn([('location.point', '2d')], info)
 
     def test_explicit_geo2d_index_embedded(self):
@@ -268,7 +269,7 @@ class Place(Document):
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         self.assertIn([('current.location.point', '2d')], info)
 
     def test_explicit_geosphere_index(self):
@@ -288,7 +289,7 @@ class Place(Document):
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         self.assertIn([('location.point', '2dsphere')], info)
 
     def test_explicit_geohaystack_index(self):
@@ -310,7 +311,7 @@ class Place(Document):
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         self.assertIn([('location.point', 'geoHaystack')], info)
 
     def test_create_geohaystack_index(self):
@@ -322,7 +323,7 @@ class Place(Document):
 
         Place.create_index({'fields': (')location.point', 'name')}, bucketSize=10)
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         self.assertIn([('location.point', 'geoHaystack'), ('name', 1)], info)
 
     def test_dictionary_indexes(self):
@@ -355,7 +356,7 @@ class BlogPost(Document):
         info = [(value['key'],
                  value.get('unique', False),
                  value.get('sparse', False))
-                for key, value in info.iteritems()]
+                for key, value in iteritems(info)]
         self.assertIn(([('addDate', -1)], True, True), info)
 
         BlogPost.drop_collection()
@@ -576,7 +577,7 @@ class BlogPost(Document):
         else:
             self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10)
 
-        self.assertEqual(BlogPost.objects.hint(TAGS_INDEX_NAME ).count(), 10)
+        self.assertEqual(BlogPost.objects.hint(TAGS_INDEX_NAME).count(), 10)
 
         with self.assertRaises(Exception):
             BlogPost.objects.hint(('tags', 1)).next()
@@ -806,7 +807,7 @@ class BlogPost(Document):
             self.fail('Unbound local error at index + pk definition')
 
         info = BlogPost.objects._collection.index_information()
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         index_item = [('_id', 1), ('comments.comment_id', 1)]
         self.assertIn(index_item, info)
 
@@ -854,7 +855,7 @@ class MyDoc(Document):
             }
 
         info = MyDoc.objects._collection.index_information()
-        info = [value['key'] for key, value in info.iteritems()]
+        info = [value['key'] for key, value in iteritems(info)]
         self.assertIn([('provider_ids.foo', 1)], info)
         self.assertIn([('provider_ids.bar', 1)], info)
 
@@ -936,7 +937,6 @@ class BlogPost(Document):
             # Drop the temporary database at the end
             connection.drop_database('tempdatabase')
 
-
     def test_index_dont_send_cls_option(self):
         """
         Ensure that 'cls' option is not sent through ensureIndex. We shouldn't
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index 32e3ed297..9cc20c893 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -2,6 +2,8 @@
 import unittest
 import warnings
 
+from six import iteritems
+
 from mongoengine import (BooleanField, Document, EmbeddedDocument,
                          EmbeddedDocumentField, GenericReferenceField,
                          IntField, ReferenceField, StringField, connect)
@@ -485,7 +487,7 @@ class Mammal(Animal):
             meta = {'abstract': True}
         class Human(Mammal): pass
 
-        for k, v in defaults.iteritems():
+        for k, v in iteritems(defaults):
             for cls in [Animal, Fish, Guppy]:
                 self.assertEqual(cls._meta[k], v)
 
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 5319ace41..9bde23f38 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -9,6 +9,7 @@
 from datetime import datetime
 from bson import DBRef, ObjectId
 from pymongo.errors import DuplicateKeyError
+from six import iteritems
 
 from tests import fixtures
 from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
@@ -1482,7 +1483,7 @@ class Message(Document):
         Message.drop_collection()
 
         # All objects share the same id, but each in a different collection
-        user = User(id=1, name='user-name')#.save()
+        user = User(id=1, name='user-name')  # .save()
         message = Message(id=1, author=user).save()
 
         message.author.name = 'tutu'
@@ -2000,7 +2001,6 @@ class Record(Document):
         child_record.delete()
         self.assertEqual(Record.objects(name='parent').get().children, [])
 
-
     def test_reverse_delete_rule_with_custom_id_field(self):
         """Ensure that a referenced document with custom primary key
         is also deleted upon deletion.
@@ -3059,7 +3059,7 @@ class Node(Document):
 
             def expand(self):
                 self.flattened_parameter = {}
-                for parameter_name, parameter in self.parameters.iteritems():
+                for parameter_name, parameter in iteritems(self.parameters):
                     parameter.expand()
 
         class NodesSystem(Document):
@@ -3067,7 +3067,7 @@ class NodesSystem(Document):
             nodes = MapField(ReferenceField(Node, dbref=False))
 
             def save(self, *args, **kwargs):
-                for node_name, node in self.nodes.iteritems():
+                for node_name, node in iteritems(self.nodes):
                     node.expand()
                     node.save(*args, **kwargs)
                 super(NodesSystem, self).save(*args, **kwargs)
@@ -3381,7 +3381,6 @@ class Company(Document):
         class User(Document):
             company = ReferenceField(Company)
 
-
         # Ensure index creation exception aren't swallowed (#1688)
         with self.assertRaises(DuplicateKeyError):
             User.objects().select_related()
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index d3a2418a5..ef67ac549 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -12,6 +12,7 @@
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import UpdateResult
 import six
+from six import iteritems
 
 from mongoengine import *
 from mongoengine.connection import get_connection, get_db
@@ -4026,7 +4027,7 @@ class Comment(Document):
         info = [(value['key'],
                  value.get('unique', False),
                  value.get('sparse', False))
-                for key, value in info.iteritems()]
+                for key, value in iteritems(info)]
         self.assertIn(([('_cls', 1), ('message', 1)], False, False), info)
 
     def test_where(self):
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 5cf089f47..cf1194f49 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -2,6 +2,7 @@
 import unittest
 
 from bson import DBRef, ObjectId
+from six import iteritems
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -632,7 +633,7 @@ class Group(Document):
             [m for m in group_obj.members]
             self.assertEqual(q, 2)
 
-            for k, m in group_obj.members.iteritems():
+            for k, m in iteritems(group_obj.members):
                 self.assertIsInstance(m, User)
 
         # Document select_related
@@ -645,7 +646,7 @@ class Group(Document):
             [m for m in group_obj.members]
             self.assertEqual(q, 2)
 
-            for k, m in group_obj.members.iteritems():
+            for k, m in iteritems(group_obj.members):
                 self.assertIsInstance(m, User)
 
        # Queryset select_related
@@ -659,7 +660,7 @@ class Group(Document):
                 [m for m in group_obj.members]
                 self.assertEqual(q, 2)
 
-                for k, m in group_obj.members.iteritems():
+                for k, m in iteritems(group_obj.members):
                     self.assertIsInstance(m, User)
 
         User.drop_collection()
@@ -714,7 +715,7 @@ class Group(Document):
             [m for m in group_obj.members]
             self.assertEqual(q, 4)
 
-            for k, m in group_obj.members.iteritems():
+            for k, m in iteritems(group_obj.members):
                 self.assertIn('User', m.__class__.__name__)
 
         # Document select_related
@@ -730,7 +731,7 @@ class Group(Document):
             [m for m in group_obj.members]
             self.assertEqual(q, 4)
 
-            for k, m in group_obj.members.iteritems():
+            for k, m in iteritems(group_obj.members):
                 self.assertIn('User', m.__class__.__name__)
 
         # Queryset select_related
@@ -747,7 +748,7 @@ class Group(Document):
                 [m for m in group_obj.members]
                 self.assertEqual(q, 4)
 
-                for k, m in group_obj.members.iteritems():
+                for k, m in iteritems(group_obj.members):
                     self.assertIn('User', m.__class__.__name__)
 
         Group.objects.delete()
@@ -805,7 +806,7 @@ class Group(Document):
             [m for m in group_obj.members]
             self.assertEqual(q, 2)
 
-            for k, m in group_obj.members.iteritems():
+            for k, m in iteritems(group_obj.members):
                 self.assertIsInstance(m, UserA)
 
         # Document select_related
@@ -821,7 +822,7 @@ class Group(Document):
             [m for m in group_obj.members]
             self.assertEqual(q, 2)
 
-            for k, m in group_obj.members.iteritems():
+            for k, m in iteritems(group_obj.members):
                 self.assertIsInstance(m, UserA)
 
         # Queryset select_related
@@ -838,7 +839,7 @@ class Group(Document):
                 [m for m in group_obj.members]
                 self.assertEqual(q, 2)
 
-                for k, m in group_obj.members.iteritems():
+                for k, m in iteritems(group_obj.members):
                     self.assertIsInstance(m, UserA)
 
         UserA.drop_collection()
@@ -893,7 +894,7 @@ class Group(Document):
             [m for m in group_obj.members]
             self.assertEqual(q, 4)
 
-            for k, m in group_obj.members.iteritems():
+            for k, m in iteritems(group_obj.members):
                 self.assertIn('User', m.__class__.__name__)
 
         # Document select_related
@@ -909,7 +910,7 @@ class Group(Document):
             [m for m in group_obj.members]
             self.assertEqual(q, 4)
 
-            for k, m in group_obj.members.iteritems():
+            for k, m in iteritems(group_obj.members):
                 self.assertIn('User', m.__class__.__name__)
 
         # Queryset select_related
@@ -926,7 +927,7 @@ class Group(Document):
                 [m for m in group_obj.members]
                 self.assertEqual(q, 4)
 
-                for k, m in group_obj.members.iteritems():
+                for k, m in iteritems(group_obj.members):
                     self.assertIn('User', m.__class__.__name__)
 
         Group.objects.delete()
@@ -1064,7 +1065,6 @@ class Message(Document):
         self.assertEqual(msg.author, user)
         self.assertEqual(msg.author.name, 'new-name')
 
-
     def test_list_lookup_not_checked_in_map(self):
         """Ensure we dereference list data correctly
         """
@@ -1286,5 +1286,6 @@ class Playlist(Document):
 
             self.assertEqual(q, 2)
 
+
 if __name__ == '__main__':
     unittest.main()

From f0a344525001ab2a74ad97fe16a236f3225cb7ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 18 Feb 2019 22:15:58 +0100
Subject: [PATCH 0761/1519] minor fix for import order

---
 tests/document/instance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 9bde23f38..03fd2f2cf 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -5,8 +5,8 @@
 import unittest
 import uuid
 import weakref
-
 from datetime import datetime
+
 from bson import DBRef, ObjectId
 from pymongo.errors import DuplicateKeyError
 from six import iteritems

From 5bbe782812df249ef60f7ad9cc44482ec837bd71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 23 Feb 2019 22:37:32 +0100
Subject: [PATCH 0762/1519] fix deprecated call to pymongo save() in tests

---
 tests/document/instance.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index f9331bd01..cde18c9f2 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -2758,7 +2758,7 @@ class User(Document):
 
         User.drop_collection()
 
-        User._get_collection().save({
+        User._get_collection().insert_one({
             'name': 'John',
             'foo': 'Bar',
             'data': [1, 2, 3]
@@ -2774,7 +2774,7 @@ class User(Document):
 
         User.drop_collection()
 
-        User._get_collection().save({
+        User._get_collection().insert_one({
             'name': 'John',
             'foo': 'Bar',
             'data': [1, 2, 3]
@@ -2797,7 +2797,7 @@ class User(Document):
 
         User.drop_collection()
 
-        User._get_collection().save({
+        User._get_collection().insert_one({
             'name': 'John',
             'thing': {
                 'name': 'My thing',
@@ -2820,7 +2820,7 @@ class User(Document):
 
         User.drop_collection()
 
-        User._get_collection().save({
+        User._get_collection().insert_one({
             'name': 'John',
             'thing': {
                 'name': 'My thing',
@@ -2843,7 +2843,7 @@ class User(Document):
 
         User.drop_collection()
 
-        User._get_collection().save({
+        User._get_collection().insert_one({
             'name': 'John',
             'thing': {
                 'name': 'My thing',

From 28606e9985cb4abcf1fe32b7201f4c28a14325b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 21 Feb 2019 21:53:59 +0100
Subject: [PATCH 0763/1519] refactor fields tests (float, int, lazyref, long,
 url) #1983

---
 tests/fields/fields.py                    | 693 +---------------------
 tests/fields/test_float_field.py          |  58 ++
 tests/fields/test_int_field.py            |  42 ++
 tests/fields/test_lazy_reference_field.py | 524 ++++++++++++++++
 tests/fields/test_long_field.py           |  56 ++
 tests/fields/test_url_field.py            |  59 ++
 6 files changed, 740 insertions(+), 692 deletions(-)
 create mode 100644 tests/fields/test_float_field.py
 create mode 100644 tests/fields/test_int_field.py
 create mode 100644 tests/fields/test_lazy_reference_field.py
 create mode 100644 tests/fields/test_long_field.py
 create mode 100644 tests/fields/test_url_field.py

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index b43c92af7..194d07d70 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2,9 +2,6 @@
 import datetime
 import unittest
 import uuid
-import math
-import itertools
-import re
 import sys
 
 from nose.plugins.skip import SkipTest
@@ -13,15 +10,10 @@
 from decimal import Decimal
 
 from bson import DBRef, ObjectId, SON
-try:
-    from bson.int64 import Int64
-except ImportError:
-    Int64 = long
 
 from mongoengine import *
-from mongoengine.connection import get_db
 from mongoengine.base import (BaseDict, BaseField, EmbeddedDocumentList,
-                              _document_registry, LazyReference)
+                              _document_registry)
 
 from tests.utils import MongoDBTestCase
 
@@ -284,30 +276,6 @@ class HandleNoneFields(Document):
         # attempted.
         self.assertRaises(ValidationError, ret.validate)
 
-    def test_int_and_float_ne_operator(self):
-        class TestDocument(Document):
-            int_fld = IntField()
-            float_fld = FloatField()
-
-        TestDocument.drop_collection()
-
-        TestDocument(int_fld=None, float_fld=None).save()
-        TestDocument(int_fld=1, float_fld=1).save()
-
-        self.assertEqual(1, TestDocument.objects(int_fld__ne=None).count())
-        self.assertEqual(1, TestDocument.objects(float_fld__ne=None).count())
-
-    def test_long_ne_operator(self):
-        class TestDocument(Document):
-            long_fld = LongField()
-
-        TestDocument.drop_collection()
-
-        TestDocument(long_fld=None).save()
-        TestDocument(long_fld=1).save()
-
-        self.assertEqual(1, TestDocument.objects(long_fld__ne=None).count())
-
     def test_object_id_validation(self):
         """Ensure that invalid values cannot be assigned to an
         ObjectIdField.
@@ -351,135 +319,6 @@ class Person(Document):
         person.name = 'Shorter name'
         person.validate()
 
-    def test_url_validation(self):
-        """Ensure that URLFields validate urls properly."""
-        class Link(Document):
-            url = URLField()
-
-        link = Link()
-        link.url = 'google'
-        self.assertRaises(ValidationError, link.validate)
-
-        link.url = 'http://www.google.com:8080/'
-        link.validate()
-
-    def test_unicode_url_validation(self):
-        """Ensure unicode URLs are validated properly."""
-        class Link(Document):
-            url = URLField()
-
-        link = Link()
-        link.url = u'http://xn--b1agh1afp.com/'
-
-        # TODO fix URL validation - this *IS* a valid URL
-        # For now we just want to make sure that the error message is correct
-        try:
-            link.validate()
-            self.assertTrue(False)
-        except ValidationError as e:
-            self.assertEqual(
-                unicode(e),
-                u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])"
-            )
-
-    def test_url_scheme_validation(self):
-        """Ensure that URLFields validate urls with specific schemes properly.
-        """
-        class Link(Document):
-            url = URLField()
-
-        class SchemeLink(Document):
-            url = URLField(schemes=['ws', 'irc'])
-
-        link = Link()
-        link.url = 'ws://google.com'
-        self.assertRaises(ValidationError, link.validate)
-
-        scheme_link = SchemeLink()
-        scheme_link.url = 'ws://google.com'
-        scheme_link.validate()
-
-    def test_url_allowed_domains(self):
-        """Allow underscore in domain names.
-        """
-        class Link(Document):
-            url = URLField()
-
-        link = Link()
-        link.url = 'https://san_leandro-ca.geebo.com/'
-        link.validate()
-
-    def test_int_validation(self):
-        """Ensure that invalid values cannot be assigned to int fields.
-        """
-        class Person(Document):
-            age = IntField(min_value=0, max_value=110)
-
-        person = Person()
-        person.age = 50
-        person.validate()
-
-        person.age = -1
-        self.assertRaises(ValidationError, person.validate)
-        person.age = 120
-        self.assertRaises(ValidationError, person.validate)
-        person.age = 'ten'
-        self.assertRaises(ValidationError, person.validate)
-
-    def test_long_validation(self):
-        """Ensure that invalid values cannot be assigned to long fields.
-        """
-        class TestDocument(Document):
-            value = LongField(min_value=0, max_value=110)
-
-        doc = TestDocument()
-        doc.value = 50
-        doc.validate()
-
-        doc.value = -1
-        self.assertRaises(ValidationError, doc.validate)
-        doc.age = 120
-        self.assertRaises(ValidationError, doc.validate)
-        doc.age = 'ten'
-        self.assertRaises(ValidationError, doc.validate)
-
-    def test_float_validation(self):
-        """Ensure that invalid values cannot be assigned to float fields.
-        """
-        class Person(Document):
-            height = FloatField(min_value=0.1, max_value=3.5)
-
-        class BigPerson(Document):
-            height = FloatField()
-
-        person = Person()
-        person.height = 1.89
-        person.validate()
-
-        person.height = '2.0'
-        self.assertRaises(ValidationError, person.validate)
-
-        person.height = 0.01
-        self.assertRaises(ValidationError, person.validate)
-
-        person.height = 4.0
-        self.assertRaises(ValidationError, person.validate)
-
-        person_2 = Person(height='something invalid')
-        self.assertRaises(ValidationError, person_2.validate)
-
-        big_person = BigPerson()
-
-        for value, value_type in enumerate(six.integer_types):
-            big_person.height = value_type(value)
-            big_person.validate()
-
-        big_person.height = 2 ** 500
-        big_person.validate()
-
-        big_person.height = 2 ** 100000  # Too big for a float value
-        self.assertRaises(ValidationError, big_person.validate)
-
     def test_decimal_validation(self):
         """Ensure that invalid values cannot be assigned to decimal fields.
         """
@@ -3534,19 +3373,6 @@ class Doc(Document):
         with self.assertRaises(FieldDoesNotExist):
             Doc(bar='test')
 
-    def test_long_field_is_considered_as_int64(self):
-        """
-        Tests that long fields are stored as long in mongo, even if long
-        value is small enough to be an int.
-        """
-        class TestLongFieldConsideredAsInt64(Document):
-            some_long = LongField()
-
-        doc = TestLongFieldConsideredAsInt64(some_long=42).save()
-        db = get_db()
-        self.assertIsInstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64)
-        self.assertIsInstance(doc.some_long, six.integer_types)
-
 
 class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):
 
@@ -4493,522 +4319,5 @@ class Ocorrence(Document):
         self.assertIsInstance(ocorrence.animal, Animal)
 
 
-class LazyReferenceFieldTest(MongoDBTestCase):
-    def test_lazy_reference_config(self):
-        # Make sure ReferenceField only accepts a document class or a string
-        # with a document class name.
-        self.assertRaises(ValidationError, LazyReferenceField, EmbeddedDocument)
-
-    def test_lazy_reference_simple(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            person = StringField()
-            animal = LazyReferenceField(Animal)
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        animal = Animal(name="Leopard", tag="heavy").save()
-        Ocurrence(person="test", animal=animal).save()
-        p = Ocurrence.objects.get()
-        self.assertIsInstance(p.animal, LazyReference)
-        fetched_animal = p.animal.fetch()
-        self.assertEqual(fetched_animal, animal)
-        # `fetch` keep cache on referenced document by default...
-        animal.tag = "not so heavy"
-        animal.save()
-        double_fetch = p.animal.fetch()
-        self.assertIs(fetched_animal, double_fetch)
-        self.assertEqual(double_fetch.tag, "heavy")
-        # ...unless specified otherwise
-        fetch_force = p.animal.fetch(force=True)
-        self.assertIsNot(fetch_force, fetched_animal)
-        self.assertEqual(fetch_force.tag, "not so heavy")
-
-    def test_lazy_reference_fetch_invalid_ref(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            person = StringField()
-            animal = LazyReferenceField(Animal)
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        animal = Animal(name="Leopard", tag="heavy").save()
-        Ocurrence(person="test", animal=animal).save()
-        animal.delete()
-        p = Ocurrence.objects.get()
-        self.assertIsInstance(p.animal, LazyReference)
-        with self.assertRaises(DoesNotExist):
-            p.animal.fetch()
-
-    def test_lazy_reference_set(self):
-        class Animal(Document):
-            meta = {'allow_inheritance': True}
-
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            person = StringField()
-            animal = LazyReferenceField(Animal)
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        class SubAnimal(Animal):
-            nick = StringField()
-
-        animal = Animal(name="Leopard", tag="heavy").save()
-        sub_animal = SubAnimal(nick='doggo', name='dog').save()
-        for ref in (
-                animal,
-                animal.pk,
-                DBRef(animal._get_collection_name(), animal.pk),
-                LazyReference(Animal, animal.pk),
-
-                sub_animal,
-                sub_animal.pk,
-                DBRef(sub_animal._get_collection_name(), sub_animal.pk),
-                LazyReference(SubAnimal, sub_animal.pk),
-                ):
-            p = Ocurrence(person="test", animal=ref).save()
-            p.reload()
-            self.assertIsInstance(p.animal, LazyReference)
-            p.animal.fetch()
-
-    def test_lazy_reference_bad_set(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            person = StringField()
-            animal = LazyReferenceField(Animal)
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        class BadDoc(Document):
-            pass
-
-        animal = Animal(name="Leopard", tag="heavy").save()
-        baddoc = BadDoc().save()
-        for bad in (
-                42,
-                'foo',
-                baddoc,
-                DBRef(baddoc._get_collection_name(), animal.pk),
-                LazyReference(BadDoc, animal.pk)
-                ):
-            with self.assertRaises(ValidationError):
-                p = Ocurrence(person="test", animal=bad).save()
-
-    def test_lazy_reference_query_conversion(self):
-        """Ensure that LazyReferenceFields can be queried using objects and values
-        of the type of the primary key of the referenced object.
-        """
-        class Member(Document):
-            user_num = IntField(primary_key=True)
-
-        class BlogPost(Document):
-            title = StringField()
-            author = LazyReferenceField(Member, dbref=False)
-
-        Member.drop_collection()
-        BlogPost.drop_collection()
-
-        m1 = Member(user_num=1)
-        m1.save()
-        m2 = Member(user_num=2)
-        m2.save()
-
-        post1 = BlogPost(title='post 1', author=m1)
-        post1.save()
-
-        post2 = BlogPost(title='post 2', author=m2)
-        post2.save()
-
-        post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
-
-        post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
-
-        # Same thing by passing a LazyReference instance
-        post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
-        self.assertEqual(post.id, post2.id)
-
-    def test_lazy_reference_query_conversion_dbref(self):
-        """Ensure that LazyReferenceFields can be queried using objects and values
-        of the type of the primary key of the referenced object.
-        """
-        class Member(Document):
-            user_num = IntField(primary_key=True)
-
-        class BlogPost(Document):
-            title = StringField()
-            author = LazyReferenceField(Member, dbref=True)
-
-        Member.drop_collection()
-        BlogPost.drop_collection()
-
-        m1 = Member(user_num=1)
-        m1.save()
-        m2 = Member(user_num=2)
-        m2.save()
-
-        post1 = BlogPost(title='post 1', author=m1)
-        post1.save()
-
-        post2 = BlogPost(title='post 2', author=m2)
-        post2.save()
-
-        post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
-
-        post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
-
-        # Same thing by passing a LazyReference instance
-        post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
-        self.assertEqual(post.id, post2.id)
-
-    def test_lazy_reference_passthrough(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            animal = LazyReferenceField(Animal, passthrough=False)
-            animal_passthrough = LazyReferenceField(Animal, passthrough=True)
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        animal = Animal(name="Leopard", tag="heavy").save()
-        Ocurrence(animal=animal, animal_passthrough=animal).save()
-        p = Ocurrence.objects.get()
-        self.assertIsInstance(p.animal, LazyReference)
-        with self.assertRaises(KeyError):
-            p.animal['name']
-        with self.assertRaises(AttributeError):
-            p.animal.name
-        self.assertEqual(p.animal.pk, animal.pk)
-
-        self.assertEqual(p.animal_passthrough.name, "Leopard")
-        self.assertEqual(p.animal_passthrough['name'], "Leopard")
-
-        # Should not be able to access referenced document's methods
-        with self.assertRaises(AttributeError):
-            p.animal.save
-        with self.assertRaises(KeyError):
-            p.animal['save']
-
-    def test_lazy_reference_not_set(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            person = StringField()
-            animal = LazyReferenceField(Animal)
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        Ocurrence(person='foo').save()
-        p = Ocurrence.objects.get()
-        self.assertIs(p.animal, None)
-
-    def test_lazy_reference_equality(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        Animal.drop_collection()
-
-        animal = Animal(name="Leopard", tag="heavy").save()
-        animalref = LazyReference(Animal, animal.pk)
-        self.assertEqual(animal, animalref)
-        self.assertEqual(animalref, animal)
-
-        other_animalref = LazyReference(Animal, ObjectId("54495ad94c934721ede76f90"))
-        self.assertNotEqual(animal, other_animalref)
-        self.assertNotEqual(other_animalref, animal)
-
-    def test_lazy_reference_embedded(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class EmbeddedOcurrence(EmbeddedDocument):
-            in_list = ListField(LazyReferenceField(Animal))
-            direct = LazyReferenceField(Animal)
-
-        class Ocurrence(Document):
-            in_list = ListField(LazyReferenceField(Animal))
-            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)
-            direct = LazyReferenceField(Animal)
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        animal1 = Animal('doggo').save()
-        animal2 = Animal('cheeta').save()
-
-        def check_fields_type(occ):
-            self.assertIsInstance(occ.direct, LazyReference)
-            for elem in occ.in_list:
-                self.assertIsInstance(elem, LazyReference)
-            self.assertIsInstance(occ.in_embedded.direct, LazyReference)
-            for elem in occ.in_embedded.in_list:
-                self.assertIsInstance(elem, LazyReference)
-
-        occ = Ocurrence(
-            in_list=[animal1, animal2],
-            in_embedded={'in_list': [animal1, animal2], 'direct': animal1},
-            direct=animal1
-        ).save()
-        check_fields_type(occ)
-        occ.reload()
-        check_fields_type(occ)
-        occ.direct = animal1.id
-        occ.in_list = [animal1.id, animal2.id]
-        occ.in_embedded.direct = animal1.id
-        occ.in_embedded.in_list = [animal1.id, animal2.id]
-        check_fields_type(occ)
-
-
-class GenericLazyReferenceFieldTest(MongoDBTestCase):
-    def test_generic_lazy_reference_simple(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            person = StringField()
-            animal = GenericLazyReferenceField()
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        animal = Animal(name="Leopard", tag="heavy").save()
-        Ocurrence(person="test", animal=animal).save()
-        p = Ocurrence.objects.get()
-        self.assertIsInstance(p.animal, LazyReference)
-        fetched_animal = p.animal.fetch()
-        self.assertEqual(fetched_animal, animal)
-        # `fetch` keep cache on referenced document by default...
-        animal.tag = "not so heavy"
-        animal.save()
-        double_fetch = p.animal.fetch()
-        self.assertIs(fetched_animal, double_fetch)
-        self.assertEqual(double_fetch.tag, "heavy")
-        # ...unless specified otherwise
-        fetch_force = p.animal.fetch(force=True)
-        self.assertIsNot(fetch_force, fetched_animal)
-        self.assertEqual(fetch_force.tag, "not so heavy")
-
-    def test_generic_lazy_reference_choices(self):
-        class Animal(Document):
-            name = StringField()
-
-        class Vegetal(Document):
-            name = StringField()
-
-        class Mineral(Document):
-            name = StringField()
-
-        class Ocurrence(Document):
-            living_thing = GenericLazyReferenceField(choices=[Animal, Vegetal])
-            thing = GenericLazyReferenceField()
-
-        Animal.drop_collection()
-        Vegetal.drop_collection()
-        Mineral.drop_collection()
-        Ocurrence.drop_collection()
-
-        animal = Animal(name="Leopard").save()
-        vegetal = Vegetal(name="Oak").save()
-        mineral = Mineral(name="Granite").save()
-
-        occ_animal = Ocurrence(living_thing=animal, thing=animal).save()
-        occ_vegetal = Ocurrence(living_thing=vegetal, thing=vegetal).save()
-        with self.assertRaises(ValidationError):
-            Ocurrence(living_thing=mineral).save()
-
-        occ = Ocurrence.objects.get(living_thing=animal)
-        self.assertEqual(occ, occ_animal)
-        self.assertIsInstance(occ.thing, LazyReference)
-        self.assertIsInstance(occ.living_thing, LazyReference)
-
-        occ.thing = vegetal
-        occ.living_thing = vegetal
-        occ.save()
-
-        occ.thing = mineral
-        occ.living_thing = mineral
-        with self.assertRaises(ValidationError):
-            occ.save()
-
-    def test_generic_lazy_reference_set(self):
-        class Animal(Document):
-            meta = {'allow_inheritance': True}
-
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            person = StringField()
-            animal = GenericLazyReferenceField()
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        class SubAnimal(Animal):
-            nick = StringField()
-
-        animal = Animal(name="Leopard", tag="heavy").save()
-        sub_animal = SubAnimal(nick='doggo', name='dog').save()
-        for ref in (
-                animal,
-                LazyReference(Animal, animal.pk),
-                {'_cls': 'Animal', '_ref': DBRef(animal._get_collection_name(), animal.pk)},
-
-                sub_animal,
-                LazyReference(SubAnimal, sub_animal.pk),
-                {'_cls': 'SubAnimal', '_ref': DBRef(sub_animal._get_collection_name(), sub_animal.pk)},
-                ):
-            p = Ocurrence(person="test", animal=ref).save()
-            p.reload()
-            self.assertIsInstance(p.animal, (LazyReference, Document))
-            p.animal.fetch()
-
-    def test_generic_lazy_reference_bad_set(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            person = StringField()
-            animal = GenericLazyReferenceField(choices=['Animal'])
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        class BadDoc(Document):
-            pass
-
-        animal = Animal(name="Leopard", tag="heavy").save()
-        baddoc = BadDoc().save()
-        for bad in (
-                42,
-                'foo',
-                baddoc,
-                LazyReference(BadDoc, animal.pk)
-                ):
-            with self.assertRaises(ValidationError):
-                p = Ocurrence(person="test", animal=bad).save()
-
-    def test_generic_lazy_reference_query_conversion(self):
-        class Member(Document):
-            user_num = IntField(primary_key=True)
-
-        class BlogPost(Document):
-            title = StringField()
-            author = GenericLazyReferenceField()
-
-        Member.drop_collection()
-        BlogPost.drop_collection()
-
-        m1 = Member(user_num=1)
-        m1.save()
-        m2 = Member(user_num=2)
-        m2.save()
-
-        post1 = BlogPost(title='post 1', author=m1)
-        post1.save()
-
-        post2 = BlogPost(title='post 2', author=m2)
-        post2.save()
-
-        post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
-
-        post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
-
-        # Same thing by passing a LazyReference instance
-        post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
-        self.assertEqual(post.id, post2.id)
-
-    def test_generic_lazy_reference_not_set(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocurrence(Document):
-            person = StringField()
-            animal = GenericLazyReferenceField()
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        Ocurrence(person='foo').save()
-        p = Ocurrence.objects.get()
-        self.assertIs(p.animal, None)
-
-    def test_generic_lazy_reference_embedded(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class EmbeddedOcurrence(EmbeddedDocument):
-            in_list = ListField(GenericLazyReferenceField())
-            direct = GenericLazyReferenceField()
-
-        class Ocurrence(Document):
-            in_list = ListField(GenericLazyReferenceField())
-            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)
-            direct = GenericLazyReferenceField()
-
-        Animal.drop_collection()
-        Ocurrence.drop_collection()
-
-        animal1 = Animal('doggo').save()
-        animal2 = Animal('cheeta').save()
-
-        def check_fields_type(occ):
-            self.assertIsInstance(occ.direct, LazyReference)
-            for elem in occ.in_list:
-                self.assertIsInstance(elem, LazyReference)
-            self.assertIsInstance(occ.in_embedded.direct, LazyReference)
-            for elem in occ.in_embedded.in_list:
-                self.assertIsInstance(elem, LazyReference)
-
-        occ = Ocurrence(
-            in_list=[animal1, animal2],
-            in_embedded={'in_list': [animal1, animal2], 'direct': animal1},
-            direct=animal1
-        ).save()
-        check_fields_type(occ)
-        occ.reload()
-        check_fields_type(occ)
-        animal1_ref = {'_cls': 'Animal', '_ref': DBRef(animal1._get_collection_name(), animal1.pk)}
-        animal2_ref = {'_cls': 'Animal', '_ref': DBRef(animal2._get_collection_name(), animal2.pk)}
-        occ.direct = animal1_ref
-        occ.in_list = [animal1_ref, animal2_ref]
-        occ.in_embedded.direct = animal1_ref
-        occ.in_embedded.in_list = [animal1_ref, animal2_ref]
-        check_fields_type(occ)
-
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
new file mode 100644
index 000000000..fa92cf200
--- /dev/null
+++ b/tests/fields/test_float_field.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+import six
+
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class TestFloatField(MongoDBTestCase):
+
+    def test_float_ne_operator(self):
+        class TestDocument(Document):
+            float_fld = FloatField()
+
+        TestDocument.drop_collection()
+
+        TestDocument(float_fld=None).save()
+        TestDocument(float_fld=1).save()
+
+        self.assertEqual(1, TestDocument.objects(float_fld__ne=None).count())
+        self.assertEqual(1, TestDocument.objects(float_fld__ne=1).count())
+
+    def test_validation(self):
+        """Ensure that invalid values cannot be assigned to float fields.
+        """
+        class Person(Document):
+            height = FloatField(min_value=0.1, max_value=3.5)
+
+        class BigPerson(Document):
+            height = FloatField()
+
+        person = Person()
+        person.height = 1.89
+        person.validate()
+
+        person.height = '2.0'
+        self.assertRaises(ValidationError, person.validate)
+
+        person.height = 0.01
+        self.assertRaises(ValidationError, person.validate)
+
+        person.height = 4.0
+        self.assertRaises(ValidationError, person.validate)
+
+        person_2 = Person(height='something invalid')
+        self.assertRaises(ValidationError, person_2.validate)
+
+        big_person = BigPerson()
+
+        for value, value_type in enumerate(six.integer_types):
+            big_person.height = value_type(value)
+            big_person.validate()
+
+        big_person.height = 2 ** 500
+        big_person.validate()
+
+        big_person.height = 2 ** 100000  # Too big for a float value
+        self.assertRaises(ValidationError, big_person.validate)
diff --git a/tests/fields/test_int_field.py b/tests/fields/test_int_field.py
new file mode 100644
index 000000000..1b1f7ad97
--- /dev/null
+++ b/tests/fields/test_int_field.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class TestIntField(MongoDBTestCase):
+
+    def test_int_validation(self):
+        """Ensure that invalid values cannot be assigned to int fields.
+        """
+        class Person(Document):
+            age = IntField(min_value=0, max_value=110)
+
+        person = Person()
+        person.age = 0
+        person.validate()
+
+        person.age = 50
+        person.validate()
+
+        person.age = 110
+        person.validate()
+
+        person.age = -1
+        self.assertRaises(ValidationError, person.validate)
+        person.age = 120
+        self.assertRaises(ValidationError, person.validate)
+        person.age = 'ten'
+        self.assertRaises(ValidationError, person.validate)
+
+    def test_ne_operator(self):
+        class TestDocument(Document):
+            int_fld = IntField()
+
+        TestDocument.drop_collection()
+
+        TestDocument(int_fld=None).save()
+        TestDocument(int_fld=1).save()
+
+        self.assertEqual(1, TestDocument.objects(int_fld__ne=None).count())
+        self.assertEqual(1, TestDocument.objects(int_fld__ne=1).count())
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
new file mode 100644
index 000000000..a72e8cbe6
--- /dev/null
+++ b/tests/fields/test_lazy_reference_field.py
@@ -0,0 +1,524 @@
+# -*- coding: utf-8 -*-
+from bson import DBRef, ObjectId
+
+from mongoengine import *
+from mongoengine.base import LazyReference
+
+from tests.utils import MongoDBTestCase
+
+
+class TestLazyReferenceField(MongoDBTestCase):
+    def test_lazy_reference_config(self):
+        # Make sure ReferenceField only accepts a document class or a string
+        # with a document class name.
+        self.assertRaises(ValidationError, LazyReferenceField, EmbeddedDocument)
+
+    def test_lazy_reference_simple(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        Ocurrence(person="test", animal=animal).save()
+        p = Ocurrence.objects.get()
+        self.assertIsInstance(p.animal, LazyReference)
+        fetched_animal = p.animal.fetch()
+        self.assertEqual(fetched_animal, animal)
+        # `fetch` keep cache on referenced document by default...
+        animal.tag = "not so heavy"
+        animal.save()
+        double_fetch = p.animal.fetch()
+        self.assertIs(fetched_animal, double_fetch)
+        self.assertEqual(double_fetch.tag, "heavy")
+        # ...unless specified otherwise
+        fetch_force = p.animal.fetch(force=True)
+        self.assertIsNot(fetch_force, fetched_animal)
+        self.assertEqual(fetch_force.tag, "not so heavy")
+
+    def test_lazy_reference_fetch_invalid_ref(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        Ocurrence(person="test", animal=animal).save()
+        animal.delete()
+        p = Ocurrence.objects.get()
+        self.assertIsInstance(p.animal, LazyReference)
+        with self.assertRaises(DoesNotExist):
+            p.animal.fetch()
+
+    def test_lazy_reference_set(self):
+        class Animal(Document):
+            meta = {'allow_inheritance': True}
+
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        class SubAnimal(Animal):
+            nick = StringField()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        sub_animal = SubAnimal(nick='doggo', name='dog').save()
+        for ref in (
+                animal,
+                animal.pk,
+                DBRef(animal._get_collection_name(), animal.pk),
+                LazyReference(Animal, animal.pk),
+
+                sub_animal,
+                sub_animal.pk,
+                DBRef(sub_animal._get_collection_name(), sub_animal.pk),
+                LazyReference(SubAnimal, sub_animal.pk),
+                ):
+            p = Ocurrence(person="test", animal=ref).save()
+            p.reload()
+            self.assertIsInstance(p.animal, LazyReference)
+            p.animal.fetch()
+
+    def test_lazy_reference_bad_set(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        class BadDoc(Document):
+            pass
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        baddoc = BadDoc().save()
+        for bad in (
+                42,
+                'foo',
+                baddoc,
+                DBRef(baddoc._get_collection_name(), animal.pk),
+                LazyReference(BadDoc, animal.pk)
+                ):
+            with self.assertRaises(ValidationError):
+                p = Ocurrence(person="test", animal=bad).save()
+
+    def test_lazy_reference_query_conversion(self):
+        """Ensure that LazyReferenceFields can be queried using objects and values
+        of the type of the primary key of the referenced object.
+        """
+        class Member(Document):
+            user_num = IntField(primary_key=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            author = LazyReferenceField(Member, dbref=False)
+
+        Member.drop_collection()
+        BlogPost.drop_collection()
+
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
+
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
+
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
+
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
+
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
+
+        # Same thing by passing a LazyReference instance
+        post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
+        self.assertEqual(post.id, post2.id)
+
+    def test_lazy_reference_query_conversion_dbref(self):
+        """Ensure that LazyReferenceFields can be queried using objects and values
+        of the type of the primary key of the referenced object.
+        """
+        class Member(Document):
+            user_num = IntField(primary_key=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            author = LazyReferenceField(Member, dbref=True)
+
+        Member.drop_collection()
+        BlogPost.drop_collection()
+
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
+
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
+
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
+
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
+
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
+
+        # Same thing by passing a LazyReference instance
+        post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
+        self.assertEqual(post.id, post2.id)
+
+    def test_lazy_reference_passthrough(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            animal = LazyReferenceField(Animal, passthrough=False)
+            animal_passthrough = LazyReferenceField(Animal, passthrough=True)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        Ocurrence(animal=animal, animal_passthrough=animal).save()
+        p = Ocurrence.objects.get()
+        self.assertIsInstance(p.animal, LazyReference)
+        with self.assertRaises(KeyError):
+            p.animal['name']
+        with self.assertRaises(AttributeError):
+            p.animal.name
+        self.assertEqual(p.animal.pk, animal.pk)
+
+        self.assertEqual(p.animal_passthrough.name, "Leopard")
+        self.assertEqual(p.animal_passthrough['name'], "Leopard")
+
+        # Should not be able to access referenced document's methods
+        with self.assertRaises(AttributeError):
+            p.animal.save
+        with self.assertRaises(KeyError):
+            p.animal['save']
+
+    def test_lazy_reference_not_set(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        Ocurrence(person='foo').save()
+        p = Ocurrence.objects.get()
+        self.assertIs(p.animal, None)
+
+    def test_lazy_reference_equality(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        Animal.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        animalref = LazyReference(Animal, animal.pk)
+        self.assertEqual(animal, animalref)
+        self.assertEqual(animalref, animal)
+
+        other_animalref = LazyReference(Animal, ObjectId("54495ad94c934721ede76f90"))
+        self.assertNotEqual(animal, other_animalref)
+        self.assertNotEqual(other_animalref, animal)
+
+    def test_lazy_reference_embedded(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class EmbeddedOcurrence(EmbeddedDocument):
+            in_list = ListField(LazyReferenceField(Animal))
+            direct = LazyReferenceField(Animal)
+
+        class Ocurrence(Document):
+            in_list = ListField(LazyReferenceField(Animal))
+            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)
+            direct = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal1 = Animal('doggo').save()
+        animal2 = Animal('cheeta').save()
+
+        def check_fields_type(occ):
+            self.assertIsInstance(occ.direct, LazyReference)
+            for elem in occ.in_list:
+                self.assertIsInstance(elem, LazyReference)
+            self.assertIsInstance(occ.in_embedded.direct, LazyReference)
+            for elem in occ.in_embedded.in_list:
+                self.assertIsInstance(elem, LazyReference)
+
+        occ = Ocurrence(
+            in_list=[animal1, animal2],
+            in_embedded={'in_list': [animal1, animal2], 'direct': animal1},
+            direct=animal1
+        ).save()
+        check_fields_type(occ)
+        occ.reload()
+        check_fields_type(occ)
+        occ.direct = animal1.id
+        occ.in_list = [animal1.id, animal2.id]
+        occ.in_embedded.direct = animal1.id
+        occ.in_embedded.in_list = [animal1.id, animal2.id]
+        check_fields_type(occ)
+
+
+class TestGenericLazyReferenceField(MongoDBTestCase):
+    def test_generic_lazy_reference_simple(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        Ocurrence(person="test", animal=animal).save()
+        p = Ocurrence.objects.get()
+        self.assertIsInstance(p.animal, LazyReference)
+        fetched_animal = p.animal.fetch()
+        self.assertEqual(fetched_animal, animal)
+        # `fetch` keep cache on referenced document by default...
+        animal.tag = "not so heavy"
+        animal.save()
+        double_fetch = p.animal.fetch()
+        self.assertIs(fetched_animal, double_fetch)
+        self.assertEqual(double_fetch.tag, "heavy")
+        # ...unless specified otherwise
+        fetch_force = p.animal.fetch(force=True)
+        self.assertIsNot(fetch_force, fetched_animal)
+        self.assertEqual(fetch_force.tag, "not so heavy")
+
+    def test_generic_lazy_reference_choices(self):
+        class Animal(Document):
+            name = StringField()
+
+        class Vegetal(Document):
+            name = StringField()
+
+        class Mineral(Document):
+            name = StringField()
+
+        class Ocurrence(Document):
+            living_thing = GenericLazyReferenceField(choices=[Animal, Vegetal])
+            thing = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Vegetal.drop_collection()
+        Mineral.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal(name="Leopard").save()
+        vegetal = Vegetal(name="Oak").save()
+        mineral = Mineral(name="Granite").save()
+
+        occ_animal = Ocurrence(living_thing=animal, thing=animal).save()
+        occ_vegetal = Ocurrence(living_thing=vegetal, thing=vegetal).save()
+        with self.assertRaises(ValidationError):
+            Ocurrence(living_thing=mineral).save()
+
+        occ = Ocurrence.objects.get(living_thing=animal)
+        self.assertEqual(occ, occ_animal)
+        self.assertIsInstance(occ.thing, LazyReference)
+        self.assertIsInstance(occ.living_thing, LazyReference)
+
+        occ.thing = vegetal
+        occ.living_thing = vegetal
+        occ.save()
+
+        occ.thing = mineral
+        occ.living_thing = mineral
+        with self.assertRaises(ValidationError):
+            occ.save()
+
+    def test_generic_lazy_reference_set(self):
+        class Animal(Document):
+            meta = {'allow_inheritance': True}
+
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        class SubAnimal(Animal):
+            nick = StringField()
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        sub_animal = SubAnimal(nick='doggo', name='dog').save()
+        for ref in (
+                animal,
+                LazyReference(Animal, animal.pk),
+                {'_cls': 'Animal', '_ref': DBRef(animal._get_collection_name(), animal.pk)},
+
+                sub_animal,
+                LazyReference(SubAnimal, sub_animal.pk),
+                {'_cls': 'SubAnimal', '_ref': DBRef(sub_animal._get_collection_name(), sub_animal.pk)},
+                ):
+            p = Ocurrence(person="test", animal=ref).save()
+            p.reload()
+            self.assertIsInstance(p.animal, (LazyReference, Document))
+            p.animal.fetch()
+
+    def test_generic_lazy_reference_bad_set(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = GenericLazyReferenceField(choices=['Animal'])
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        class BadDoc(Document):
+            pass
+
+        animal = Animal(name="Leopard", tag="heavy").save()
+        baddoc = BadDoc().save()
+        for bad in (
+                42,
+                'foo',
+                baddoc,
+                LazyReference(BadDoc, animal.pk)
+                ):
+            with self.assertRaises(ValidationError):
+                p = Ocurrence(person="test", animal=bad).save()
+
+    def test_generic_lazy_reference_query_conversion(self):
+        class Member(Document):
+            user_num = IntField(primary_key=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            author = GenericLazyReferenceField()
+
+        Member.drop_collection()
+        BlogPost.drop_collection()
+
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
+
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
+
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
+
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
+
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
+
+        # Same thing by passing a LazyReference instance
+        post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
+        self.assertEqual(post.id, post2.id)
+
+    def test_generic_lazy_reference_not_set(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        Ocurrence(person='foo').save()
+        p = Ocurrence.objects.get()
+        self.assertIs(p.animal, None)
+
+    def test_generic_lazy_reference_embedded(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class EmbeddedOcurrence(EmbeddedDocument):
+            in_list = ListField(GenericLazyReferenceField())
+            direct = GenericLazyReferenceField()
+
+        class Ocurrence(Document):
+            in_list = ListField(GenericLazyReferenceField())
+            in_embedded = EmbeddedDocumentField(EmbeddedOcurrence)
+            direct = GenericLazyReferenceField()
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal1 = Animal('doggo').save()
+        animal2 = Animal('cheeta').save()
+
+        def check_fields_type(occ):
+            self.assertIsInstance(occ.direct, LazyReference)
+            for elem in occ.in_list:
+                self.assertIsInstance(elem, LazyReference)
+            self.assertIsInstance(occ.in_embedded.direct, LazyReference)
+            for elem in occ.in_embedded.in_list:
+                self.assertIsInstance(elem, LazyReference)
+
+        occ = Ocurrence(
+            in_list=[animal1, animal2],
+            in_embedded={'in_list': [animal1, animal2], 'direct': animal1},
+            direct=animal1
+        ).save()
+        check_fields_type(occ)
+        occ.reload()
+        check_fields_type(occ)
+        animal1_ref = {'_cls': 'Animal', '_ref': DBRef(animal1._get_collection_name(), animal1.pk)}
+        animal2_ref = {'_cls': 'Animal', '_ref': DBRef(animal2._get_collection_name(), animal2.pk)}
+        occ.direct = animal1_ref
+        occ.in_list = [animal1_ref, animal2_ref]
+        occ.in_embedded.direct = animal1_ref
+        occ.in_embedded.in_list = [animal1_ref, animal2_ref]
+        check_fields_type(occ)
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
new file mode 100644
index 000000000..4ab7403d8
--- /dev/null
+++ b/tests/fields/test_long_field.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+import six
+
+try:
+    from bson.int64 import Int64
+except ImportError:
+    Int64 = long
+
+from mongoengine import *
+from mongoengine.connection import get_db
+
+from tests.utils import MongoDBTestCase
+
+
+class TestLongField(MongoDBTestCase):
+
+    def test_long_field_is_considered_as_int64(self):
+        """
+        Tests that long fields are stored as long in mongo, even if long
+        value is small enough to be an int.
+        """
+        class TestLongFieldConsideredAsInt64(Document):
+            some_long = LongField()
+
+        doc = TestLongFieldConsideredAsInt64(some_long=42).save()
+        db = get_db()
+        self.assertIsInstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64)
+        self.assertIsInstance(doc.some_long, six.integer_types)
+
+    def test_long_validation(self):
+        """Ensure that invalid values cannot be assigned to long fields.
+        """
+        class TestDocument(Document):
+            value = LongField(min_value=0, max_value=110)
+
+        doc = TestDocument()
+        doc.value = 50
+        doc.validate()
+
+        doc.value = -1
+        self.assertRaises(ValidationError, doc.validate)
+        doc.age = 120
+        self.assertRaises(ValidationError, doc.validate)
+        doc.age = 'ten'
+        self.assertRaises(ValidationError, doc.validate)
+
+    def test_long_ne_operator(self):
+        class TestDocument(Document):
+            long_fld = LongField()
+
+        TestDocument.drop_collection()
+
+        TestDocument(long_fld=None).save()
+        TestDocument(long_fld=1).save()
+
+        self.assertEqual(1, TestDocument.objects(long_fld__ne=None).count())
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
new file mode 100644
index 000000000..0447799ec
--- /dev/null
+++ b/tests/fields/test_url_field.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class TestFloatField(MongoDBTestCase):
+
+    def test_validation(self):
+        """Ensure that URLFields validate urls properly."""
+        class Link(Document):
+            url = URLField()
+
+        link = Link()
+        link.url = 'google'
+        self.assertRaises(ValidationError, link.validate)
+
+        link.url = 'http://www.google.com:8080/'
+        link.validate()
+
+    def test_unicode_url_validation(self):
+        """Ensure unicode URLs are validated properly."""
+        class Link(Document):
+            url = URLField()
+
+        link = Link()
+        link.url = u'http://xn--b1agh1afp.com/'
+
+        # TODO fix URL validation - this *IS* a valid URL
+        # For now we just want to make sure that the error message is correct
+        with self.assertRaises(ValidationError) as ctx_err:
+            link.validate()
+        self.assertEqual(unicode(ctx_err.exception),
+                         u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])")
+
+    def test_url_scheme_validation(self):
+        """Ensure that URLFields validate urls with specific schemes properly.
+        """
+        class Link(Document):
+            url = URLField()
+
+        class SchemeLink(Document):
+            url = URLField(schemes=['ws', 'irc'])
+
+        link = Link()
+        link.url = 'ws://google.com'
+        self.assertRaises(ValidationError, link.validate)
+
+        scheme_link = SchemeLink()
+        scheme_link.url = 'ws://google.com'
+        scheme_link.validate()
+
+    def test_underscore_allowed_in_domains_names(self):
+        class Link(Document):
+            url = URLField()
+
+        link = Link()
+        link.url = 'https://san_leandro-ca.geebo.com/'
+        link.validate()

From b9cc8a4ca9d2874f7866efa2c3e792f757c767b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 21 Feb 2019 23:12:19 +0100
Subject: [PATCH 0764/1519] refactor more field tests into submodules #1983

---
 tests/fields/fields.py                      | 1606 +------------------
 tests/fields/test_boolean_field.py          |   49 +
 tests/fields/test_cached_reference_field.py |  443 +++++
 tests/fields/test_complex_datetime_field.py |    5 -
 tests/fields/test_date_field.py             |   19 -
 tests/fields/test_datetime_field.py         |    5 -
 tests/fields/test_decimal_field.py          |   91 ++
 tests/fields/test_dict_field.py             |  303 ++++
 tests/fields/test_email_field.py            |  120 ++
 tests/fields/test_map_field.py              |  144 ++
 tests/fields/test_reference_field.py        |  219 +++
 tests/fields/test_sequence_field.py         |  271 ++++
 tests/fields/test_url_field.py              |    2 +-
 tests/fields/test_uuid_field.py             |   65 +
 tests/utils.py                              |    7 +-
 15 files changed, 1726 insertions(+), 1623 deletions(-)
 create mode 100644 tests/fields/test_boolean_field.py
 create mode 100644 tests/fields/test_cached_reference_field.py
 create mode 100644 tests/fields/test_decimal_field.py
 create mode 100644 tests/fields/test_dict_field.py
 create mode 100644 tests/fields/test_email_field.py
 create mode 100644 tests/fields/test_map_field.py
 create mode 100644 tests/fields/test_reference_field.py
 create mode 100644 tests/fields/test_sequence_field.py
 create mode 100644 tests/fields/test_uuid_field.py

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 194d07d70..c772b4723 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 import datetime
 import unittest
-import uuid
-import sys
 
 from nose.plugins.skip import SkipTest
-import six
-
-from decimal import Decimal
 
 from bson import DBRef, ObjectId, SON
 
-from mongoengine import *
-from mongoengine.base import (BaseDict, BaseField, EmbeddedDocumentList,
+from mongoengine import Document, StringField, IntField, DateTimeField, DateField, ValidationError, \
+    ComplexDateTimeField, FloatField, ListField, ReferenceField, DictField, EmbeddedDocument, EmbeddedDocumentField, \
+    GenericReferenceField, DoesNotExist, NotRegistered, GenericEmbeddedDocumentField, OperationError, DynamicField, \
+    FieldDoesNotExist, EmbeddedDocumentListField, MultipleObjectsReturned, NotUniqueError, BooleanField, ObjectIdField, \
+    SortedListField, GenericLazyReferenceField, LazyReferenceField, DynamicDocument
+from mongoengine.base import (BaseField, EmbeddedDocumentList,
                               _document_registry)
 
 from tests.utils import MongoDBTestCase
@@ -276,7 +275,7 @@ class HandleNoneFields(Document):
         # attempted.
         self.assertRaises(ValidationError, ret.validate)
 
-    def test_object_id_validation(self):
+    def test_default_id_validation_as_objectid(self):
         """Ensure that invalid values cannot be assigned to an
         ObjectIdField.
         """
@@ -292,7 +291,7 @@ class Person(Document):
         person.id = 'abc'
         self.assertRaises(ValidationError, person.validate)
 
-        person.id = '497ce96f395f2f052a494fd4'
+        person.id = str(ObjectId())
         person.validate()
 
     def test_string_validation(self):
@@ -319,33 +318,6 @@ class Person(Document):
         person.name = 'Shorter name'
         person.validate()
 
-    def test_decimal_validation(self):
-        """Ensure that invalid values cannot be assigned to decimal fields.
-        """
-        class Person(Document):
-            height = DecimalField(min_value=Decimal('0.1'),
-                                  max_value=Decimal('3.5'))
-
-        Person.drop_collection()
-
-        Person(height=Decimal('1.89')).save()
-        person = Person.objects.first()
-        self.assertEqual(person.height, Decimal('1.89'))
-
-        person.height = '2.0'
-        person.save()
-        person.height = 0.01
-        self.assertRaises(ValidationError, person.validate)
-        person.height = Decimal('0.01')
-        self.assertRaises(ValidationError, person.validate)
-        person.height = Decimal('4.0')
-        self.assertRaises(ValidationError, person.validate)
-        person.height = 'something invalid'
-        self.assertRaises(ValidationError, person.validate)
-
-        person_2 = Person(height='something invalid')
-        self.assertRaises(ValidationError, person_2.validate)
-
     def test_db_field_validation(self):
         """Ensure that db_field doesn't accept invalid values."""
 
@@ -364,128 +336,9 @@ class User(Document):
             class User(Document):
                 name = StringField(db_field='name\0')
 
-    def test_decimal_comparison(self):
-        class Person(Document):
-            money = DecimalField()
-
-        Person.drop_collection()
-
-        Person(money=6).save()
-        Person(money=8).save()
-        Person(money=10).save()
-
-        self.assertEqual(2, Person.objects(money__gt=Decimal("7")).count())
-        self.assertEqual(2, Person.objects(money__gt=7).count())
-        self.assertEqual(2, Person.objects(money__gt="7").count())
-
-    def test_decimal_storage(self):
-        class Person(Document):
-            float_value = DecimalField(precision=4)
-            string_value = DecimalField(precision=4, force_string=True)
-
-        Person.drop_collection()
-        values_to_store = [10, 10.1, 10.11, "10.111", Decimal("10.1111"), Decimal("10.11111")]
-        for store_at_creation in [True, False]:
-            for value in values_to_store:
-                # to_python is called explicitly if values were sent in the kwargs of __init__
-                if store_at_creation:
-                    Person(float_value=value, string_value=value).save()
-                else:
-                    person = Person.objects.create()
-                    person.float_value = value
-                    person.string_value = value
-                    person.save()
-
-        # How its stored
-        expected = [
-            {'float_value': 10.0, 'string_value': '10.0000'},
-            {'float_value': 10.1, 'string_value': '10.1000'},
-            {'float_value': 10.11, 'string_value': '10.1100'},
-            {'float_value': 10.111, 'string_value': '10.1110'},
-            {'float_value': 10.1111, 'string_value': '10.1111'},
-            {'float_value': 10.1111, 'string_value': '10.1111'}]
-        expected.extend(expected)
-        actual = list(Person.objects.exclude('id').as_pymongo())
-        self.assertEqual(expected, actual)
-
-        # How it comes out locally
-        expected = [Decimal('10.0000'), Decimal('10.1000'), Decimal('10.1100'),
-                    Decimal('10.1110'), Decimal('10.1111'), Decimal('10.1111')]
-        expected.extend(expected)
-        for field_name in ['float_value', 'string_value']:
-            actual = list(Person.objects().scalar(field_name))
-            self.assertEqual(expected, actual)
-
-    def test_boolean_validation(self):
-        """Ensure that invalid values cannot be assigned to boolean
-        fields.
-        """
-        class Person(Document):
-            admin = BooleanField()
-
-        person = Person()
-        person.admin = True
-        person.validate()
-
-        person.admin = 2
-        self.assertRaises(ValidationError, person.validate)
-        person.admin = 'Yes'
-        self.assertRaises(ValidationError, person.validate)
-        person.admin = 'False'
-        self.assertRaises(ValidationError, person.validate)
-
-    def test_uuid_field_string(self):
-        """Test UUID fields storing as String
-        """
-        class Person(Document):
-            api_key = UUIDField(binary=False)
-
-        Person.drop_collection()
-
-        uu = uuid.uuid4()
-        Person(api_key=uu).save()
-        self.assertEqual(1, Person.objects(api_key=uu).count())
-        self.assertEqual(uu, Person.objects.first().api_key)
-
-        person = Person()
-        valid = (uuid.uuid4(), uuid.uuid1())
-        for api_key in valid:
-            person.api_key = api_key
-            person.validate()
-
-        invalid = ('9d159858-549b-4975-9f98-dd2f987c113g',
-                   '9d159858-549b-4975-9f98-dd2f987c113')
-        for api_key in invalid:
-            person.api_key = api_key
-            self.assertRaises(ValidationError, person.validate)
-
-    def test_uuid_field_binary(self):
-        """Test UUID fields storing as Binary object."""
-        class Person(Document):
-            api_key = UUIDField(binary=True)
-
-        Person.drop_collection()
-
-        uu = uuid.uuid4()
-        Person(api_key=uu).save()
-        self.assertEqual(1, Person.objects(api_key=uu).count())
-        self.assertEqual(uu, Person.objects.first().api_key)
-
-        person = Person()
-        valid = (uuid.uuid4(), uuid.uuid1())
-        for api_key in valid:
-            person.api_key = api_key
-            person.validate()
-
-        invalid = ('9d159858-549b-4975-9f98-dd2f987c113g',
-                   '9d159858-549b-4975-9f98-dd2f987c113')
-        for api_key in invalid:
-            person.api_key = api_key
-            self.assertRaises(ValidationError, person.validate)
-
     def test_list_validation(self):
         """Ensure that a list field only accepts lists with valid elements."""
-        AccessLevelChoices = (
+        access_level_choices = (
             ('a', u'Administration'),
             ('b', u'Manager'),
             ('c', u'Staff'),
@@ -505,7 +358,7 @@ class BlogPost(Document):
             authors_as_lazy = ListField(LazyReferenceField(User))
             generic = ListField(GenericReferenceField())
             generic_as_lazy = ListField(GenericLazyReferenceField())
-            access_list = ListField(choices=AccessLevelChoices, display_sep=', ')
+            access_list = ListField(choices=access_level_choices, display_sep=', ')
 
         User.drop_collection()
         BlogPost.drop_collection()
@@ -1187,374 +1040,6 @@ class Simple(Document):
         self.assertEqual(
             Simple.objects.filter(mapping__2__list__1__value='Boo').count(), 1)
 
-    def test_dict_field(self):
-        """Ensure that dict types work as expected."""
-        class BlogPost(Document):
-            info = DictField()
-
-        BlogPost.drop_collection()
-
-        post = BlogPost()
-        post.info = 'my post'
-        self.assertRaises(ValidationError, post.validate)
-
-        post.info = ['test', 'test']
-        self.assertRaises(ValidationError, post.validate)
-
-        post.info = {'$title': 'test'}
-        self.assertRaises(ValidationError, post.validate)
-
-        post.info = {'nested': {'$title': 'test'}}
-        self.assertRaises(ValidationError, post.validate)
-
-        post.info = {'the.title': 'test'}
-        self.assertRaises(ValidationError, post.validate)
-
-        post.info = {'nested': {'the.title': 'test'}}
-        self.assertRaises(ValidationError, post.validate)
-
-        post.info = {1: 'test'}
-        self.assertRaises(ValidationError, post.validate)
-
-        post.info = {'title': 'test'}
-        post.save()
-
-        post = BlogPost()
-        post.info = {'title': 'dollar_sign', 'details': {'te$t': 'test'}}
-        post.save()
-
-        post = BlogPost()
-        post.info = {'details': {'test': 'test'}}
-        post.save()
-
-        post = BlogPost()
-        post.info = {'details': {'test': 3}}
-        post.save()
-
-        self.assertEqual(BlogPost.objects.count(), 4)
-        self.assertEqual(
-            BlogPost.objects.filter(info__title__exact='test').count(), 1)
-        self.assertEqual(
-            BlogPost.objects.filter(info__details__test__exact='test').count(), 1)
-
-        post = BlogPost.objects.filter(info__title__exact='dollar_sign').first()
-        self.assertIn('te$t', post['info']['details'])
-
-        # Confirm handles non strings or non existing keys
-        self.assertEqual(
-            BlogPost.objects.filter(info__details__test__exact=5).count(), 0)
-        self.assertEqual(
-            BlogPost.objects.filter(info__made_up__test__exact='test').count(), 0)
-
-        post = BlogPost.objects.create(info={'title': 'original'})
-        post.info.update({'title': 'updated'})
-        post.save()
-        post.reload()
-        self.assertEqual('updated', post.info['title'])
-
-        post.info.setdefault('authors', [])
-        post.save()
-        post.reload()
-        self.assertEqual([], post.info['authors'])
-
-    def test_dictfield_dump_document(self):
-        """Ensure a DictField can handle another document's dump."""
-        class Doc(Document):
-            field = DictField()
-
-        class ToEmbed(Document):
-            id = IntField(primary_key=True, default=1)
-            recursive = DictField()
-
-        class ToEmbedParent(Document):
-            id = IntField(primary_key=True, default=1)
-            recursive = DictField()
-
-            meta = {'allow_inheritance': True}
-
-        class ToEmbedChild(ToEmbedParent):
-            pass
-
-        to_embed_recursive = ToEmbed(id=1).save()
-        to_embed = ToEmbed(
-            id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
-        doc = Doc(field=to_embed.to_mongo().to_dict())
-        doc.save()
-        assert isinstance(doc.field, dict)
-        assert doc.field == {'_id': 2, 'recursive': {'_id': 1, 'recursive': {}}}
-        # Same thing with a Document with a _cls field
-        to_embed_recursive = ToEmbedChild(id=1).save()
-        to_embed_child = ToEmbedChild(
-            id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
-        doc = Doc(field=to_embed_child.to_mongo().to_dict())
-        doc.save()
-        assert isinstance(doc.field, dict)
-        assert doc.field == {
-            '_id': 2, '_cls': 'ToEmbedParent.ToEmbedChild',
-            'recursive': {'_id': 1, '_cls': 'ToEmbedParent.ToEmbedChild', 'recursive': {}}
-        }
-
-    def test_dictfield_strict(self):
-        """Ensure that dict field handles validation if provided a strict field type."""
-        class Simple(Document):
-            mapping = DictField(field=IntField())
-
-        Simple.drop_collection()
-
-        e = Simple()
-        e.mapping['someint'] = 1
-        e.save()
-
-        # try creating an invalid mapping
-        with self.assertRaises(ValidationError):
-            e.mapping['somestring'] = "abc"
-            e.save()
-
-    def test_dictfield_complex(self):
-        """Ensure that the dict field can handle the complex types."""
-        class SettingBase(EmbeddedDocument):
-            meta = {'allow_inheritance': True}
-
-        class StringSetting(SettingBase):
-            value = StringField()
-
-        class IntegerSetting(SettingBase):
-            value = IntField()
-
-        class Simple(Document):
-            mapping = DictField()
-
-        Simple.drop_collection()
-
-        e = Simple()
-        e.mapping['somestring'] = StringSetting(value='foo')
-        e.mapping['someint'] = IntegerSetting(value=42)
-        e.mapping['nested_dict'] = {'number': 1, 'string': 'Hi!',
-                                    'float': 1.001,
-                                    'complex': IntegerSetting(value=42),
-                                    'list': [IntegerSetting(value=42),
-                                             StringSetting(value='foo')]}
-        e.save()
-
-        e2 = Simple.objects.get(id=e.id)
-        self.assertIsInstance(e2.mapping['somestring'], StringSetting)
-        self.assertIsInstance(e2.mapping['someint'], IntegerSetting)
-
-        # Test querying
-        self.assertEqual(
-            Simple.objects.filter(mapping__someint__value=42).count(), 1)
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__number=1).count(), 1)
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__complex__value=42).count(), 1)
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__0__value=42).count(), 1)
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__1__value='foo').count(), 1)
-
-        # Confirm can update
-        Simple.objects().update(
-            set__mapping={"someint": IntegerSetting(value=10)})
-        Simple.objects().update(
-            set__mapping__nested_dict__list__1=StringSetting(value='Boo'))
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__1__value='foo').count(), 0)
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__1__value='Boo').count(), 1)
-
-    def test_atomic_update_dict_field(self):
-        """Ensure that the entire DictField can be atomically updated."""
-        class Simple(Document):
-            mapping = DictField(field=ListField(IntField(required=True)))
-
-        Simple.drop_collection()
-
-        e = Simple()
-        e.mapping['someints'] = [1, 2]
-        e.save()
-        e.update(set__mapping={"ints": [3, 4]})
-        e.reload()
-        self.assertEqual(BaseDict, type(e.mapping))
-        self.assertEqual({"ints": [3, 4]}, e.mapping)
-
-        # try creating an invalid mapping
-        with self.assertRaises(ValueError):
-            e.update(set__mapping={"somestrings": ["foo", "bar", ]})
-
-    def test_dictfield_with_referencefield_complex_nesting_cases(self):
-        """Ensure complex nesting inside DictField handles dereferencing of ReferenceField(dbref=True | False)"""
-        # Relates to Issue #1453
-        class Doc(Document):
-            s = StringField()
-
-        class Simple(Document):
-            mapping0 = DictField(ReferenceField(Doc, dbref=True))
-            mapping1 = DictField(ReferenceField(Doc, dbref=False))
-            mapping2 = DictField(ListField(ReferenceField(Doc, dbref=True)))
-            mapping3 = DictField(ListField(ReferenceField(Doc, dbref=False)))
-            mapping4 = DictField(DictField(field=ReferenceField(Doc, dbref=True)))
-            mapping5 = DictField(DictField(field=ReferenceField(Doc, dbref=False)))
-            mapping6 = DictField(ListField(DictField(ReferenceField(Doc, dbref=True))))
-            mapping7 = DictField(ListField(DictField(ReferenceField(Doc, dbref=False))))
-            mapping8 = DictField(ListField(DictField(ListField(ReferenceField(Doc, dbref=True)))))
-            mapping9 = DictField(ListField(DictField(ListField(ReferenceField(Doc, dbref=False)))))
-
-        Doc.drop_collection()
-        Simple.drop_collection()
-
-        d = Doc(s='aa').save()
-        e = Simple()
-        e.mapping0['someint'] = e.mapping1['someint'] = d
-        e.mapping2['someint'] = e.mapping3['someint'] = [d]
-        e.mapping4['someint'] = e.mapping5['someint'] = {'d': d}
-        e.mapping6['someint'] = e.mapping7['someint'] = [{'d': d}]
-        e.mapping8['someint'] = e.mapping9['someint'] = [{'d': [d]}]
-        e.save()
-
-        s = Simple.objects.first()
-        self.assertIsInstance(s.mapping0['someint'], Doc)
-        self.assertIsInstance(s.mapping1['someint'], Doc)
-        self.assertIsInstance(s.mapping2['someint'][0], Doc)
-        self.assertIsInstance(s.mapping3['someint'][0], Doc)
-        self.assertIsInstance(s.mapping4['someint']['d'], Doc)
-        self.assertIsInstance(s.mapping5['someint']['d'], Doc)
-        self.assertIsInstance(s.mapping6['someint'][0]['d'], Doc)
-        self.assertIsInstance(s.mapping7['someint'][0]['d'], Doc)
-        self.assertIsInstance(s.mapping8['someint'][0]['d'][0], Doc)
-        self.assertIsInstance(s.mapping9['someint'][0]['d'][0], Doc)
-
-    def test_mapfield(self):
-        """Ensure that the MapField handles the declared type."""
-        class Simple(Document):
-            mapping = MapField(IntField())
-
-        Simple.drop_collection()
-
-        e = Simple()
-        e.mapping['someint'] = 1
-        e.save()
-
-        with self.assertRaises(ValidationError):
-            e.mapping['somestring'] = "abc"
-            e.save()
-
-        with self.assertRaises(ValidationError):
-            class NoDeclaredType(Document):
-                mapping = MapField()
-
-    def test_complex_mapfield(self):
-        """Ensure that the MapField can handle complex declared types."""
-        class SettingBase(EmbeddedDocument):
-            meta = {"allow_inheritance": True}
-
-        class StringSetting(SettingBase):
-            value = StringField()
-
-        class IntegerSetting(SettingBase):
-            value = IntField()
-
-        class Extensible(Document):
-            mapping = MapField(EmbeddedDocumentField(SettingBase))
-
-        Extensible.drop_collection()
-
-        e = Extensible()
-        e.mapping['somestring'] = StringSetting(value='foo')
-        e.mapping['someint'] = IntegerSetting(value=42)
-        e.save()
-
-        e2 = Extensible.objects.get(id=e.id)
-        self.assertIsInstance(e2.mapping['somestring'], StringSetting)
-        self.assertIsInstance(e2.mapping['someint'], IntegerSetting)
-
-        with self.assertRaises(ValidationError):
-            e.mapping['someint'] = 123
-            e.save()
-
-    def test_embedded_mapfield_db_field(self):
-        class Embedded(EmbeddedDocument):
-            number = IntField(default=0, db_field='i')
-
-        class Test(Document):
-            my_map = MapField(field=EmbeddedDocumentField(Embedded),
-                              db_field='x')
-
-        Test.drop_collection()
-
-        test = Test()
-        test.my_map['DICTIONARY_KEY'] = Embedded(number=1)
-        test.save()
-
-        Test.objects.update_one(inc__my_map__DICTIONARY_KEY__number=1)
-
-        test = Test.objects.get()
-        self.assertEqual(test.my_map['DICTIONARY_KEY'].number, 2)
-        doc = self.db.test.find_one()
-        self.assertEqual(doc['x']['DICTIONARY_KEY']['i'], 2)
-
-    def test_mapfield_numerical_index(self):
-        """Ensure that MapField accept numeric strings as indexes."""
-        class Embedded(EmbeddedDocument):
-            name = StringField()
-
-        class Test(Document):
-            my_map = MapField(EmbeddedDocumentField(Embedded))
-
-        Test.drop_collection()
-
-        test = Test()
-        test.my_map['1'] = Embedded(name='test')
-        test.save()
-        test.my_map['1'].name = 'test updated'
-        test.save()
-
-    def test_map_field_lookup(self):
-        """Ensure MapField lookups succeed on Fields without a lookup
-        method.
-        """
-        class Action(EmbeddedDocument):
-            operation = StringField()
-            object = StringField()
-
-        class Log(Document):
-            name = StringField()
-            visited = MapField(DateTimeField())
-            actions = MapField(EmbeddedDocumentField(Action))
-
-        Log.drop_collection()
-        Log(name="wilson", visited={'friends': datetime.datetime.now()},
-            actions={'friends': Action(operation='drink', object='beer')}).save()
-
-        self.assertEqual(1, Log.objects(
-            visited__friends__exists=True).count())
-
-        self.assertEqual(1, Log.objects(
-            actions__friends__operation='drink',
-            actions__friends__object='beer').count())
-
-    def test_map_field_unicode(self):
-        class Info(EmbeddedDocument):
-            description = StringField()
-            value_list = ListField(field=StringField())
-
-        class BlogPost(Document):
-            info_dict = MapField(field=EmbeddedDocumentField(Info))
-
-        BlogPost.drop_collection()
-
-        tree = BlogPost(info_dict={
-            u"éééé": {
-                'description': u"VALUE: éééé"
-            }
-        })
-
-        tree.save()
-
-        self.assertEqual(
-            BlogPost.objects.get(id=tree.id).info_dict[u"éééé"].description,
-            u"VALUE: éééé"
-        )
-
     def test_embedded_db_field(self):
         class Embedded(EmbeddedDocument):
             number = IntField(default=0, db_field='i')
@@ -1741,129 +1226,14 @@ class Bar(Document):
         bar._fields['generic_ref']._auto_dereference = False
         self.assertEqual(bar.generic_ref, {'_ref': expected, '_cls': 'Foo'})
 
-    def test_reference_validation(self):
-        """Ensure that invalid document objects cannot be assigned to
-        reference fields.
+    def test_list_item_dereference(self):
+        """Ensure that DBRef items in ListFields are dereferenced.
         """
         class User(Document):
             name = StringField()
 
-        class BlogPost(Document):
-            content = StringField()
-            author = ReferenceField(User)
-
-        User.drop_collection()
-        BlogPost.drop_collection()
-
-        # Make sure ReferenceField only accepts a document class or a string
-        # with a document class name.
-        self.assertRaises(ValidationError, ReferenceField, EmbeddedDocument)
-
-        user = User(name='Test User')
-
-        # Ensure that the referenced object must have been saved
-        post1 = BlogPost(content='Chips and gravy taste good.')
-        post1.author = user
-        self.assertRaises(ValidationError, post1.save)
-
-        # Check that an invalid object type cannot be used
-        post2 = BlogPost(content='Chips and chilli taste good.')
-        post1.author = post2
-        self.assertRaises(ValidationError, post1.validate)
-
-        # Ensure ObjectID's are accepted as references
-        user_object_id = user.pk
-        post3 = BlogPost(content="Chips and curry sauce taste good.")
-        post3.author = user_object_id
-        post3.save()
-
-        # Make sure referencing a saved document of the right type works
-        user.save()
-        post1.author = user
-        post1.save()
-
-        # Make sure referencing a saved document of the *wrong* type fails
-        post2.save()
-        post1.author = post2
-        self.assertRaises(ValidationError, post1.validate)
-
-    def test_objectid_reference_fields(self):
-        """Make sure storing Object ID references works."""
-        class Person(Document):
-            name = StringField()
-            parent = ReferenceField('self')
-
-        Person.drop_collection()
-
-        p1 = Person(name="John").save()
-        Person(name="Ross", parent=p1.pk).save()
-
-        p = Person.objects.get(name="Ross")
-        self.assertEqual(p.parent, p1)
-
-    def test_dbref_reference_fields(self):
-        """Make sure storing references as bson.dbref.DBRef works."""
-        class Person(Document):
-            name = StringField()
-            parent = ReferenceField('self', dbref=True)
-
-        Person.drop_collection()
-
-        p1 = Person(name="John").save()
-        Person(name="Ross", parent=p1).save()
-
-        self.assertEqual(
-            Person._get_collection().find_one({'name': 'Ross'})['parent'],
-            DBRef('person', p1.pk)
-        )
-
-        p = Person.objects.get(name="Ross")
-        self.assertEqual(p.parent, p1)
-
-    def test_dbref_to_mongo(self):
-        """Make sure that calling to_mongo on a ReferenceField which
-        has dbref=False, but actually actually contains a DBRef returns
-        an ID of that DBRef.
-        """
-        class Person(Document):
-            name = StringField()
-            parent = ReferenceField('self', dbref=False)
-
-        p = Person(
-            name='Steve',
-            parent=DBRef('person', 'abcdefghijklmnop')
-        )
-        self.assertEqual(p.to_mongo(), SON([
-            ('name', u'Steve'),
-            ('parent', 'abcdefghijklmnop')
-        ]))
-
-    def test_objectid_reference_fields(self):
-
-        class Person(Document):
-            name = StringField()
-            parent = ReferenceField('self', dbref=False)
-
-        Person.drop_collection()
-
-        p1 = Person(name="John").save()
-        Person(name="Ross", parent=p1).save()
-
-        col = Person._get_collection()
-        data = col.find_one({'name': 'Ross'})
-        self.assertEqual(data['parent'], p1.pk)
-
-        p = Person.objects.get(name="Ross")
-        self.assertEqual(p.parent, p1)
-
-    def test_list_item_dereference(self):
-        """Ensure that DBRef items in ListFields are dereferenced.
-        """
-        class User(Document):
-            name = StringField()
-
-        class Group(Document):
-            members = ListField(ReferenceField(User))
+        class Group(Document):
+            members = ListField(ReferenceField(User))
 
         User.drop_collection()
         Group.drop_collection()
@@ -1972,99 +1342,6 @@ class Tree(Document):
         self.assertEqual(tree.children[0].children[0].name, second_child.name)
         self.assertEqual(tree.children[0].children[1].name, third_child.name)
 
-    def test_undefined_reference(self):
-        """Ensure that ReferenceFields may reference undefined Documents.
-        """
-        class Product(Document):
-            name = StringField()
-            company = ReferenceField('Company')
-
-        class Company(Document):
-            name = StringField()
-
-        Product.drop_collection()
-        Company.drop_collection()
-
-        ten_gen = Company(name='10gen')
-        ten_gen.save()
-        mongodb = Product(name='MongoDB', company=ten_gen)
-        mongodb.save()
-
-        me = Product(name='MongoEngine')
-        me.save()
-
-        obj = Product.objects(company=ten_gen).first()
-        self.assertEqual(obj, mongodb)
-        self.assertEqual(obj.company, ten_gen)
-
-        obj = Product.objects(company=None).first()
-        self.assertEqual(obj, me)
-
-        obj = Product.objects.get(company=None)
-        self.assertEqual(obj, me)
-
-    def test_reference_query_conversion(self):
-        """Ensure that ReferenceFields can be queried using objects and values
-        of the type of the primary key of the referenced object.
-        """
-        class Member(Document):
-            user_num = IntField(primary_key=True)
-
-        class BlogPost(Document):
-            title = StringField()
-            author = ReferenceField(Member, dbref=False)
-
-        Member.drop_collection()
-        BlogPost.drop_collection()
-
-        m1 = Member(user_num=1)
-        m1.save()
-        m2 = Member(user_num=2)
-        m2.save()
-
-        post1 = BlogPost(title='post 1', author=m1)
-        post1.save()
-
-        post2 = BlogPost(title='post 2', author=m2)
-        post2.save()
-
-        post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
-
-        post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
-
-    def test_reference_query_conversion_dbref(self):
-        """Ensure that ReferenceFields can be queried using objects and values
-        of the type of the primary key of the referenced object.
-        """
-        class Member(Document):
-            user_num = IntField(primary_key=True)
-
-        class BlogPost(Document):
-            title = StringField()
-            author = ReferenceField(Member, dbref=True)
-
-        Member.drop_collection()
-        BlogPost.drop_collection()
-
-        m1 = Member(user_num=1)
-        m1.save()
-        m2 = Member(user_num=2)
-        m2.save()
-
-        post1 = BlogPost(title='post 1', author=m1)
-        post1.save()
-
-        post2 = BlogPost(title='post 2', author=m2)
-        post2.save()
-
-        post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
-
-        post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
-
     def test_drop_abstract_document(self):
         """Ensure that an abstract document cannot be dropped given it
         has no underlying collection.
@@ -2681,283 +1958,6 @@ class Shirt(Document):
             self.assertEqual(error_dict['size'], SIZE_MESSAGE)
             self.assertEqual(error_dict['color'], COLOR_MESSAGE)
 
-    def test_ensure_unique_default_instances(self):
-        """Ensure that every field has it's own unique default instance."""
-        class D(Document):
-            data = DictField()
-            data2 = DictField(default=lambda: {})
-
-        d1 = D()
-        d1.data['foo'] = 'bar'
-        d1.data2['foo'] = 'bar'
-        d2 = D()
-        self.assertEqual(d2.data, {})
-        self.assertEqual(d2.data2, {})
-
-    def test_sequence_field(self):
-        class Person(Document):
-            id = SequenceField(primary_key=True)
-            name = StringField()
-
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
-
-        for x in range(10):
-            Person(name="Person %s" % x).save()
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
-
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
-
-        Person.id.set_next_value(1000)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 1000)
-
-    def test_sequence_field_get_next_value(self):
-        class Person(Document):
-            id = SequenceField(primary_key=True)
-            name = StringField()
-
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
-
-        for x in range(10):
-            Person(name="Person %s" % x).save()
-
-        self.assertEqual(Person.id.get_next_value(), 11)
-        self.db['mongoengine.counters'].drop()
-
-        self.assertEqual(Person.id.get_next_value(), 1)
-
-        class Person(Document):
-            id = SequenceField(primary_key=True, value_decorator=str)
-            name = StringField()
-
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
-
-        for x in range(10):
-            Person(name="Person %s" % x).save()
-
-        self.assertEqual(Person.id.get_next_value(), '11')
-        self.db['mongoengine.counters'].drop()
-
-        self.assertEqual(Person.id.get_next_value(), '1')
-
-    def test_sequence_field_sequence_name(self):
-        class Person(Document):
-            id = SequenceField(primary_key=True, sequence_name='jelly')
-            name = StringField()
-
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
-
-        for x in range(10):
-            Person(name="Person %s" % x).save()
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
-        self.assertEqual(c['next'], 10)
-
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
-        self.assertEqual(c['next'], 10)
-
-        Person.id.set_next_value(1000)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
-        self.assertEqual(c['next'], 1000)
-
-    def test_multiple_sequence_fields(self):
-        class Person(Document):
-            id = SequenceField(primary_key=True)
-            counter = SequenceField()
-            name = StringField()
-
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
-
-        for x in range(10):
-            Person(name="Person %s" % x).save()
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
-
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
-
-        counters = [i.counter for i in Person.objects]
-        self.assertEqual(counters, range(1, 11))
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
-
-        Person.id.set_next_value(1000)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 1000)
-
-        Person.counter.set_next_value(999)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.counter'})
-        self.assertEqual(c['next'], 999)
-
-    def test_sequence_fields_reload(self):
-        class Animal(Document):
-            counter = SequenceField()
-            name = StringField()
-
-        self.db['mongoengine.counters'].drop()
-        Animal.drop_collection()
-
-        a = Animal(name="Boi").save()
-
-        self.assertEqual(a.counter, 1)
-        a.reload()
-        self.assertEqual(a.counter, 1)
-
-        a.counter = None
-        self.assertEqual(a.counter, 2)
-        a.save()
-
-        self.assertEqual(a.counter, 2)
-
-        a = Animal.objects.first()
-        self.assertEqual(a.counter, 2)
-        a.reload()
-        self.assertEqual(a.counter, 2)
-
-    def test_multiple_sequence_fields_on_docs(self):
-        class Animal(Document):
-            id = SequenceField(primary_key=True)
-            name = StringField()
-
-        class Person(Document):
-            id = SequenceField(primary_key=True)
-            name = StringField()
-
-        self.db['mongoengine.counters'].drop()
-        Animal.drop_collection()
-        Person.drop_collection()
-
-        for x in range(10):
-            Animal(name="Animal %s" % x).save()
-            Person(name="Person %s" % x).save()
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
-        self.assertEqual(c['next'], 10)
-
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
-
-        id = [i.id for i in Animal.objects]
-        self.assertEqual(id, range(1, 11))
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
-        self.assertEqual(c['next'], 10)
-
-    def test_sequence_field_value_decorator(self):
-        class Person(Document):
-            id = SequenceField(primary_key=True, value_decorator=str)
-            name = StringField()
-
-        self.db['mongoengine.counters'].drop()
-        Person.drop_collection()
-
-        for x in range(10):
-            p = Person(name="Person %s" % x)
-            p.save()
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
-
-        ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, map(str, range(1, 11)))
-
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
-
-    def test_embedded_sequence_field(self):
-        class Comment(EmbeddedDocument):
-            id = SequenceField()
-            content = StringField(required=True)
-
-        class Post(Document):
-            title = StringField(required=True)
-            comments = ListField(EmbeddedDocumentField(Comment))
-
-        self.db['mongoengine.counters'].drop()
-        Post.drop_collection()
-
-        Post(title="MongoEngine",
-             comments=[Comment(content="NoSQL Rocks"),
-                       Comment(content="MongoEngine Rocks")]).save()
-        c = self.db['mongoengine.counters'].find_one({'_id': 'comment.id'})
-        self.assertEqual(c['next'], 2)
-        post = Post.objects.first()
-        self.assertEqual(1, post.comments[0].id)
-        self.assertEqual(2, post.comments[1].id)
-
-    def test_inherited_sequencefield(self):
-        class Base(Document):
-            name = StringField()
-            counter = SequenceField()
-            meta = {'abstract': True}
-
-        class Foo(Base):
-            pass
-
-        class Bar(Base):
-            pass
-
-        bar = Bar(name='Bar')
-        bar.save()
-
-        foo = Foo(name='Foo')
-        foo.save()
-
-        self.assertTrue('base.counter' in
-                        self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertFalse(('foo.counter' or 'bar.counter') in
-                         self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertNotEqual(foo.counter, bar.counter)
-        self.assertEqual(foo._fields['counter'].owner_document, Base)
-        self.assertEqual(bar._fields['counter'].owner_document, Base)
-
-    def test_no_inherited_sequencefield(self):
-        class Base(Document):
-            name = StringField()
-            meta = {'abstract': True}
-
-        class Foo(Base):
-            counter = SequenceField()
-
-        class Bar(Base):
-            counter = SequenceField()
-
-        bar = Bar(name='Bar')
-        bar.save()
-
-        foo = Foo(name='Foo')
-        foo.save()
-
-        self.assertFalse('base.counter' in
-                         self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertTrue(('foo.counter' and 'bar.counter') in
-                         self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertEqual(foo.counter, bar.counter)
-        self.assertEqual(foo._fields['counter'].owner_document, Foo)
-        self.assertEqual(bar._fields['counter'].owner_document, Bar)
-
     def test_generic_embedded_document(self):
         class Car(EmbeddedDocument):
             name = StringField()
@@ -3078,117 +2078,6 @@ class Post(Document):
         post.comments[1].content = 'here we go'
         post.validate()
 
-    def test_email_field(self):
-        class User(Document):
-            email = EmailField()
-
-        user = User(email='ross@example.com')
-        user.validate()
-
-        user = User(email='ross@example.co.uk')
-        user.validate()
-
-        user = User(email=('Kofq@rhom0e4klgauOhpbpNdogawnyIKvQS0wk2mjqrgGQ5S'
-                           'aJIazqqWkm7.net'))
-        user.validate()
-
-        user = User(email='new-tld@example.technology')
-        user.validate()
-
-        user = User(email='ross@example.com.')
-        self.assertRaises(ValidationError, user.validate)
-
-        # unicode domain
-        user = User(email=u'user@пример.рф')
-        user.validate()
-
-        # invalid unicode domain
-        user = User(email=u'user@пример')
-        self.assertRaises(ValidationError, user.validate)
-
-        # invalid data type
-        user = User(email=123)
-        self.assertRaises(ValidationError, user.validate)
-
-    def test_email_field_unicode_user(self):
-        # Don't run this test on pypy3, which doesn't support unicode regex:
-        # https://bitbucket.org/pypy/pypy/issues/1821/regular-expression-doesnt-find-unicode
-        if sys.version_info[:2] == (3, 2):
-            raise SkipTest('unicode email addresses are not supported on PyPy 3')
-
-        class User(Document):
-            email = EmailField()
-
-        # unicode user shouldn't validate by default...
-        user = User(email=u'Dörte@Sörensen.example.com')
-        self.assertRaises(ValidationError, user.validate)
-
-        # ...but it should be fine with allow_utf8_user set to True
-        class User(Document):
-            email = EmailField(allow_utf8_user=True)
-
-        user = User(email=u'Dörte@Sörensen.example.com')
-        user.validate()
-
-    def test_email_field_domain_whitelist(self):
-        class User(Document):
-            email = EmailField()
-
-        # localhost domain shouldn't validate by default...
-        user = User(email='me@localhost')
-        self.assertRaises(ValidationError, user.validate)
-
-        # ...but it should be fine if it's whitelisted
-        class User(Document):
-            email = EmailField(domain_whitelist=['localhost'])
-
-        user = User(email='me@localhost')
-        user.validate()
-
-    def test_email_field_ip_domain(self):
-        class User(Document):
-            email = EmailField()
-
-        valid_ipv4 = 'email@[127.0.0.1]'
-        valid_ipv6 = 'email@[2001:dB8::1]'
-        invalid_ip = 'email@[324.0.0.1]'
-
-        # IP address as a domain shouldn't validate by default...
-        user = User(email=valid_ipv4)
-        self.assertRaises(ValidationError, user.validate)
-
-        user = User(email=valid_ipv6)
-        self.assertRaises(ValidationError, user.validate)
-
-        user = User(email=invalid_ip)
-        self.assertRaises(ValidationError, user.validate)
-
-        # ...but it should be fine with allow_ip_domain set to True
-        class User(Document):
-            email = EmailField(allow_ip_domain=True)
-
-        user = User(email=valid_ipv4)
-        user.validate()
-
-        user = User(email=valid_ipv6)
-        user.validate()
-
-        # invalid IP should still fail validation
-        user = User(email=invalid_ip)
-        self.assertRaises(ValidationError, user.validate)
-
-    def test_email_field_honors_regex(self):
-        class User(Document):
-            email = EmailField(regex=r'\w+@example.com')
-
-        # Fails regex validation
-        user = User(email='me@foo.com')
-        self.assertRaises(ValidationError, user.validate)
-
-        # Passes regex validation
-        user = User(email='me@example.com')
-        self.assertIsNone(user.validate())
-
     def test_tuples_as_tuples(self):
         """Ensure that tuples remain tuples when they are inside
         a ComplexBaseField.
@@ -3289,36 +2178,6 @@ class ToEmbedChild(ToEmbedParent):
         assert isinstance(doc.field, ToEmbedChild)
         assert doc.field == to_embed_child
 
-    def test_dict_field_invalid_dict_value(self):
-        class DictFieldTest(Document):
-            dictionary = DictField(required=True)
-
-        DictFieldTest.drop_collection()
-
-        test = DictFieldTest(dictionary=None)
-        test.dictionary  # Just access to test getter
-        self.assertRaises(ValidationError, test.validate)
-
-        test = DictFieldTest(dictionary=False)
-        test.dictionary  # Just access to test getter
-        self.assertRaises(ValidationError, test.validate)
-
-    def test_dict_field_raises_validation_error_if_wrongly_assign_embedded_doc(self):
-        class DictFieldTest(Document):
-            dictionary = DictField(required=True)
-
-        DictFieldTest.drop_collection()
-
-        class Embedded(EmbeddedDocument):
-            name = StringField()
-
-        embed = Embedded(name='garbage')
-        doc = DictFieldTest(dictionary=embed)
-        with self.assertRaises(ValidationError) as ctx_err:
-            doc.validate()
-        self.assertIn("'dictionary'", str(ctx_err.exception))
-        self.assertIn('Only dictionaries may be used in a DictField', str(ctx_err.exception))
-
     def test_cls_field(self):
         class Animal(Document):
             meta = {'allow_inheritance': True}
@@ -3882,442 +2741,5 @@ class MyFailingdoc2(Document):
                 emb = EmbeddedDocumentField('MyDoc')
 
 
-class CachedReferenceFieldTest(MongoDBTestCase):
-
-    def test_cached_reference_field_get_and_save(self):
-        """
-        Tests #1047: CachedReferenceField creates DBRefs on to_python,
-        but can't save them on to_mongo.
-        """
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocorrence(Document):
-            person = StringField()
-            animal = CachedReferenceField(Animal)
-
-        Animal.drop_collection()
-        Ocorrence.drop_collection()
-
-        Ocorrence(person="testte",
-                  animal=Animal(name="Leopard", tag="heavy").save()).save()
-        p = Ocorrence.objects.get()
-        p.person = 'new_testte'
-        p.save()
-
-    def test_cached_reference_fields(self):
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-        class Ocorrence(Document):
-            person = StringField()
-            animal = CachedReferenceField(
-                Animal, fields=['tag'])
-
-        Animal.drop_collection()
-        Ocorrence.drop_collection()
-
-        a = Animal(name="Leopard", tag="heavy")
-        a.save()
-
-        self.assertEqual(Animal._cached_reference_fields, [Ocorrence.animal])
-        o = Ocorrence(person="teste", animal=a)
-        o.save()
-
-        p = Ocorrence(person="Wilson")
-        p.save()
-
-        self.assertEqual(Ocorrence.objects(animal=None).count(), 1)
-
-        self.assertEqual(
-            a.to_mongo(fields=['tag']), {'tag': 'heavy', "_id": a.pk})
-
-        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
-
-        # counts
-        Ocorrence(person="teste 2").save()
-        Ocorrence(person="teste 3").save()
-
-        count = Ocorrence.objects(animal__tag='heavy').count()
-        self.assertEqual(count, 1)
-
-        ocorrence = Ocorrence.objects(animal__tag='heavy').first()
-        self.assertEqual(ocorrence.person, "teste")
-        self.assertIsInstance(ocorrence.animal, Animal)
-
-    def test_cached_reference_field_decimal(self):
-        class PersonAuto(Document):
-            name = StringField()
-            salary = DecimalField()
-
-        class SocialTest(Document):
-            group = StringField()
-            person = CachedReferenceField(
-                PersonAuto,
-                fields=('salary',))
-
-        PersonAuto.drop_collection()
-        SocialTest.drop_collection()
-
-        p = PersonAuto(name="Alberto", salary=Decimal('7000.00'))
-        p.save()
-
-        s = SocialTest(group="dev", person=p)
-        s.save()
-
-        self.assertEqual(
-            SocialTest.objects._collection.find_one({'person.salary': 7000.00}), {
-                '_id': s.pk,
-                'group': s.group,
-                'person': {
-                    '_id': p.pk,
-                    'salary': 7000.00
-                }
-            })
-
-    def test_cached_reference_field_reference(self):
-        class Group(Document):
-            name = StringField()
-
-        class Person(Document):
-            name = StringField()
-            group = ReferenceField(Group)
-
-        class SocialData(Document):
-            obs = StringField()
-            tags = ListField(
-                StringField())
-            person = CachedReferenceField(
-                Person,
-                fields=('group',))
-
-        Group.drop_collection()
-        Person.drop_collection()
-        SocialData.drop_collection()
-
-        g1 = Group(name='dev')
-        g1.save()
-
-        g2 = Group(name="designers")
-        g2.save()
-
-        p1 = Person(name="Alberto", group=g1)
-        p1.save()
-
-        p2 = Person(name="Andre", group=g1)
-        p2.save()
-
-        p3 = Person(name="Afro design", group=g2)
-        p3.save()
-
-        s1 = SocialData(obs="testing 123", person=p1, tags=['tag1', 'tag2'])
-        s1.save()
-
-        s2 = SocialData(obs="testing 321", person=p3, tags=['tag3', 'tag4'])
-        s2.save()
-
-        self.assertEqual(SocialData.objects._collection.find_one(
-            {'tags': 'tag2'}), {
-                '_id': s1.pk,
-                'obs': 'testing 123',
-                'tags': ['tag1', 'tag2'],
-                'person': {
-                    '_id': p1.pk,
-                    'group': g1.pk
-                }
-        })
-
-        self.assertEqual(SocialData.objects(person__group=g2).count(), 1)
-        self.assertEqual(SocialData.objects(person__group=g2).first(), s2)
-
-    def test_cached_reference_field_push_with_fields(self):
-        class Product(Document):
-            name = StringField()
-
-        Product.drop_collection()
-
-        class Basket(Document):
-            products = ListField(CachedReferenceField(Product, fields=['name']))
-
-        Basket.drop_collection()
-        product1 = Product(name='abc').save()
-        product2 = Product(name='def').save()
-        basket = Basket(products=[product1]).save()
-        self.assertEqual(
-            Basket.objects._collection.find_one(),
-            {
-                '_id': basket.pk,
-                'products': [
-                    {
-                        '_id': product1.pk,
-                        'name': product1.name
-                    }
-                ]
-            }
-        )
-        # push to list
-        basket.update(push__products=product2)
-        basket.reload()
-        self.assertEqual(
-            Basket.objects._collection.find_one(),
-            {
-                '_id': basket.pk,
-                'products': [
-                    {
-                        '_id': product1.pk,
-                        'name': product1.name
-                    },
-                    {
-                        '_id': product2.pk,
-                        'name': product2.name
-                    }
-                ]
-            }
-        )
-
-    def test_cached_reference_field_update_all(self):
-        class Person(Document):
-            TYPES = (
-                ('pf', "PF"),
-                ('pj', "PJ")
-            )
-            name = StringField()
-            tp = StringField(
-                choices=TYPES
-            )
-
-            father = CachedReferenceField('self', fields=('tp',))
-
-        Person.drop_collection()
-
-        a1 = Person(name="Wilson Father", tp="pj")
-        a1.save()
-
-        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
-        a2.save()
-
-        self.assertEqual(dict(a2.to_mongo()), {
-            "_id": a2.pk,
-            "name": u"Wilson Junior",
-            "tp": u"pf",
-            "father": {
-                "_id": a1.pk,
-                "tp": u"pj"
-            }
-        })
-
-        self.assertEqual(Person.objects(father=a1)._query, {
-            'father._id': a1.pk
-        })
-        self.assertEqual(Person.objects(father=a1).count(), 1)
-
-        Person.objects.update(set__tp="pf")
-        Person.father.sync_all()
-
-        a2.reload()
-        self.assertEqual(dict(a2.to_mongo()), {
-            "_id": a2.pk,
-            "name": u"Wilson Junior",
-            "tp": u"pf",
-            "father": {
-                "_id": a1.pk,
-                "tp": u"pf"
-            }
-        })
-
-    def test_cached_reference_fields_on_embedded_documents(self):
-        with self.assertRaises(InvalidDocumentError):
-            class Test(Document):
-                name = StringField()
-
-            type('WrongEmbeddedDocument', (
-                EmbeddedDocument,), {
-                    'test': CachedReferenceField(Test)
-            })
-
-    def test_cached_reference_auto_sync(self):
-        class Person(Document):
-            TYPES = (
-                ('pf', "PF"),
-                ('pj', "PJ")
-            )
-            name = StringField()
-            tp = StringField(
-                choices=TYPES
-            )
-
-            father = CachedReferenceField('self', fields=('tp',))
-
-        Person.drop_collection()
-
-        a1 = Person(name="Wilson Father", tp="pj")
-        a1.save()
-
-        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
-        a2.save()
-
-        a1.tp = 'pf'
-        a1.save()
-
-        a2.reload()
-        self.assertEqual(dict(a2.to_mongo()), {
-            '_id': a2.pk,
-            'name': 'Wilson Junior',
-            'tp': 'pf',
-            'father': {
-                '_id': a1.pk,
-                'tp': 'pf'
-            }
-        })
-
-    def test_cached_reference_auto_sync_disabled(self):
-        class Persone(Document):
-            TYPES = (
-                ('pf', "PF"),
-                ('pj', "PJ")
-            )
-            name = StringField()
-            tp = StringField(
-                choices=TYPES
-            )
-
-            father = CachedReferenceField(
-                'self', fields=('tp',), auto_sync=False)
-
-        Persone.drop_collection()
-
-        a1 = Persone(name="Wilson Father", tp="pj")
-        a1.save()
-
-        a2 = Persone(name='Wilson Junior', tp='pf', father=a1)
-        a2.save()
-
-        a1.tp = 'pf'
-        a1.save()
-
-        self.assertEqual(Persone.objects._collection.find_one({'_id': a2.pk}), {
-            '_id': a2.pk,
-            'name': 'Wilson Junior',
-            'tp': 'pf',
-            'father': {
-                '_id': a1.pk,
-                'tp': 'pj'
-            }
-        })
-
-    def test_cached_reference_embedded_fields(self):
-        class Owner(EmbeddedDocument):
-            TPS = (
-                ('n', "Normal"),
-                ('u', "Urgent")
-            )
-            name = StringField()
-            tp = StringField(
-                verbose_name="Type",
-                db_field="t",
-                choices=TPS)
-
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-            owner = EmbeddedDocumentField(Owner)
-
-        class Ocorrence(Document):
-            person = StringField()
-            animal = CachedReferenceField(
-                Animal, fields=['tag', 'owner.tp'])
-
-        Animal.drop_collection()
-        Ocorrence.drop_collection()
-
-        a = Animal(name="Leopard", tag="heavy",
-                   owner=Owner(tp='u', name="Wilson Júnior")
-                   )
-        a.save()
-
-        o = Ocorrence(person="teste", animal=a)
-        o.save()
-        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tp'])), {
-            '_id': a.pk,
-            'tag': 'heavy',
-            'owner': {
-                't': 'u'
-            }
-        })
-        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
-        self.assertEqual(o.to_mongo()['animal']['owner']['t'], 'u')
-
-        # counts
-        Ocorrence(person="teste 2").save()
-        Ocorrence(person="teste 3").save()
-
-        count = Ocorrence.objects(
-            animal__tag='heavy', animal__owner__tp='u').count()
-        self.assertEqual(count, 1)
-
-        ocorrence = Ocorrence.objects(
-            animal__tag='heavy',
-            animal__owner__tp='u').first()
-        self.assertEqual(ocorrence.person, "teste")
-        self.assertIsInstance(ocorrence.animal, Animal)
-
-    def test_cached_reference_embedded_list_fields(self):
-        class Owner(EmbeddedDocument):
-            name = StringField()
-            tags = ListField(StringField())
-
-        class Animal(Document):
-            name = StringField()
-            tag = StringField()
-
-            owner = EmbeddedDocumentField(Owner)
-
-        class Ocorrence(Document):
-            person = StringField()
-            animal = CachedReferenceField(
-                Animal, fields=['tag', 'owner.tags'])
-
-        Animal.drop_collection()
-        Ocorrence.drop_collection()
-
-        a = Animal(name="Leopard", tag="heavy",
-                   owner=Owner(tags=['cool', 'funny'],
-                               name="Wilson Júnior")
-                   )
-        a.save()
-
-        o = Ocorrence(person="teste 2", animal=a)
-        o.save()
-        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tags'])), {
-            '_id': a.pk,
-            'tag': 'heavy',
-            'owner': {
-                'tags': ['cool', 'funny']
-            }
-        })
-
-        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
-        self.assertEqual(o.to_mongo()['animal']['owner']['tags'],
-                         ['cool', 'funny'])
-
-        # counts
-        Ocorrence(person="teste 2").save()
-        Ocorrence(person="teste 3").save()
-
-        query = Ocorrence.objects(
-            animal__tag='heavy', animal__owner__tags='cool')._query
-        self.assertEqual(
-            query, {'animal.owner.tags': 'cool', 'animal.tag': 'heavy'})
-
-        ocorrence = Ocorrence.objects(
-            animal__tag='heavy',
-            animal__owner__tags='cool').first()
-        self.assertEqual(ocorrence.person, "teste 2")
-        self.assertIsInstance(ocorrence.animal, Animal)
-
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/fields/test_boolean_field.py b/tests/fields/test_boolean_field.py
new file mode 100644
index 000000000..7a2a3db60
--- /dev/null
+++ b/tests/fields/test_boolean_field.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase, get_as_pymongo
+
+
+class TestBooleanField(MongoDBTestCase):
+    def test_storage(self):
+        class Person(Document):
+            admin = BooleanField()
+
+        person = Person(admin=True)
+        person.save()
+        self.assertEqual(
+            get_as_pymongo(person),
+            {'_id': person.id,
+             'admin': True})
+
+    def test_validation(self):
+        """Ensure that invalid values cannot be assigned to boolean
+        fields.
+        """
+        class Person(Document):
+            admin = BooleanField()
+
+        person = Person()
+        person.admin = True
+        person.validate()
+
+        person.admin = 2
+        self.assertRaises(ValidationError, person.validate)
+        person.admin = 'Yes'
+        self.assertRaises(ValidationError, person.validate)
+        person.admin = 'False'
+        self.assertRaises(ValidationError, person.validate)
+
+    def test_weirdness_constructor(self):
+        """When attribute is set in contructor, it gets cast into a bool
+        which causes some weird behavior. We dont necessarily want to maintain this behavior
+        but its a known issue
+        """
+        class Person(Document):
+            admin = BooleanField()
+
+        new_person = Person(admin='False')
+        self.assertTrue(new_person.admin)
+
+        new_person = Person(admin='0')
+        self.assertTrue(new_person.admin)
diff --git a/tests/fields/test_cached_reference_field.py b/tests/fields/test_cached_reference_field.py
new file mode 100644
index 000000000..989cea6d4
--- /dev/null
+++ b/tests/fields/test_cached_reference_field.py
@@ -0,0 +1,443 @@
+# -*- coding: utf-8 -*-
+from decimal import Decimal
+
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class TestCachedReferenceField(MongoDBTestCase):
+
+    def test_get_and_save(self):
+        """
+        Tests #1047: CachedReferenceField creates DBRefs on to_python,
+        but can't save them on to_mongo.
+        """
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
+
+        Ocorrence(person="testte",
+                  animal=Animal(name="Leopard", tag="heavy").save()).save()
+        p = Ocorrence.objects.get()
+        p.person = 'new_testte'
+        p.save()
+
+    def test_general_things(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(
+                Animal, fields=['tag'])
+
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
+
+        a = Animal(name="Leopard", tag="heavy")
+        a.save()
+
+        self.assertEqual(Animal._cached_reference_fields, [Ocorrence.animal])
+        o = Ocorrence(person="teste", animal=a)
+        o.save()
+
+        p = Ocorrence(person="Wilson")
+        p.save()
+
+        self.assertEqual(Ocorrence.objects(animal=None).count(), 1)
+
+        self.assertEqual(
+            a.to_mongo(fields=['tag']), {'tag': 'heavy', "_id": a.pk})
+
+        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
+
+        # counts
+        Ocorrence(person="teste 2").save()
+        Ocorrence(person="teste 3").save()
+
+        count = Ocorrence.objects(animal__tag='heavy').count()
+        self.assertEqual(count, 1)
+
+        ocorrence = Ocorrence.objects(animal__tag='heavy').first()
+        self.assertEqual(ocorrence.person, "teste")
+        self.assertIsInstance(ocorrence.animal, Animal)
+
+    def test_with_decimal(self):
+        class PersonAuto(Document):
+            name = StringField()
+            salary = DecimalField()
+
+        class SocialTest(Document):
+            group = StringField()
+            person = CachedReferenceField(
+                PersonAuto,
+                fields=('salary',))
+
+        PersonAuto.drop_collection()
+        SocialTest.drop_collection()
+
+        p = PersonAuto(name="Alberto", salary=Decimal('7000.00'))
+        p.save()
+
+        s = SocialTest(group="dev", person=p)
+        s.save()
+
+        self.assertEqual(
+            SocialTest.objects._collection.find_one({'person.salary': 7000.00}), {
+                '_id': s.pk,
+                'group': s.group,
+                'person': {
+                    '_id': p.pk,
+                    'salary': 7000.00
+                }
+            })
+
+    def test_cached_reference_field_reference(self):
+        class Group(Document):
+            name = StringField()
+
+        class Person(Document):
+            name = StringField()
+            group = ReferenceField(Group)
+
+        class SocialData(Document):
+            obs = StringField()
+            tags = ListField(
+                StringField())
+            person = CachedReferenceField(
+                Person,
+                fields=('group',))
+
+        Group.drop_collection()
+        Person.drop_collection()
+        SocialData.drop_collection()
+
+        g1 = Group(name='dev')
+        g1.save()
+
+        g2 = Group(name="designers")
+        g2.save()
+
+        p1 = Person(name="Alberto", group=g1)
+        p1.save()
+
+        p2 = Person(name="Andre", group=g1)
+        p2.save()
+
+        p3 = Person(name="Afro design", group=g2)
+        p3.save()
+
+        s1 = SocialData(obs="testing 123", person=p1, tags=['tag1', 'tag2'])
+        s1.save()
+
+        s2 = SocialData(obs="testing 321", person=p3, tags=['tag3', 'tag4'])
+        s2.save()
+
+        self.assertEqual(SocialData.objects._collection.find_one(
+            {'tags': 'tag2'}), {
+                '_id': s1.pk,
+                'obs': 'testing 123',
+                'tags': ['tag1', 'tag2'],
+                'person': {
+                    '_id': p1.pk,
+                    'group': g1.pk
+                }
+        })
+
+        self.assertEqual(SocialData.objects(person__group=g2).count(), 1)
+        self.assertEqual(SocialData.objects(person__group=g2).first(), s2)
+
+    def test_cached_reference_field_push_with_fields(self):
+        class Product(Document):
+            name = StringField()
+
+        Product.drop_collection()
+
+        class Basket(Document):
+            products = ListField(CachedReferenceField(Product, fields=['name']))
+
+        Basket.drop_collection()
+        product1 = Product(name='abc').save()
+        product2 = Product(name='def').save()
+        basket = Basket(products=[product1]).save()
+        self.assertEqual(
+            Basket.objects._collection.find_one(),
+            {
+                '_id': basket.pk,
+                'products': [
+                    {
+                        '_id': product1.pk,
+                        'name': product1.name
+                    }
+                ]
+            }
+        )
+        # push to list
+        basket.update(push__products=product2)
+        basket.reload()
+        self.assertEqual(
+            Basket.objects._collection.find_one(),
+            {
+                '_id': basket.pk,
+                'products': [
+                    {
+                        '_id': product1.pk,
+                        'name': product1.name
+                    },
+                    {
+                        '_id': product2.pk,
+                        'name': product2.name
+                    }
+                ]
+            }
+        )
+
+    def test_cached_reference_field_update_all(self):
+        class Person(Document):
+            TYPES = (
+                ('pf', "PF"),
+                ('pj', "PJ")
+            )
+            name = StringField()
+            tp = StringField(
+                choices=TYPES
+            )
+
+            father = CachedReferenceField('self', fields=('tp',))
+
+        Person.drop_collection()
+
+        a1 = Person(name="Wilson Father", tp="pj")
+        a1.save()
+
+        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
+        a2.save()
+
+        self.assertEqual(dict(a2.to_mongo()), {
+            "_id": a2.pk,
+            "name": u"Wilson Junior",
+            "tp": u"pf",
+            "father": {
+                "_id": a1.pk,
+                "tp": u"pj"
+            }
+        })
+
+        self.assertEqual(Person.objects(father=a1)._query, {
+            'father._id': a1.pk
+        })
+        self.assertEqual(Person.objects(father=a1).count(), 1)
+
+        Person.objects.update(set__tp="pf")
+        Person.father.sync_all()
+
+        a2.reload()
+        self.assertEqual(dict(a2.to_mongo()), {
+            "_id": a2.pk,
+            "name": u"Wilson Junior",
+            "tp": u"pf",
+            "father": {
+                "_id": a1.pk,
+                "tp": u"pf"
+            }
+        })
+
+    def test_cached_reference_fields_on_embedded_documents(self):
+        with self.assertRaises(InvalidDocumentError):
+            class Test(Document):
+                name = StringField()
+
+            type('WrongEmbeddedDocument', (
+                EmbeddedDocument,), {
+                    'test': CachedReferenceField(Test)
+            })
+
+    def test_cached_reference_auto_sync(self):
+        class Person(Document):
+            TYPES = (
+                ('pf', "PF"),
+                ('pj', "PJ")
+            )
+            name = StringField()
+            tp = StringField(
+                choices=TYPES
+            )
+
+            father = CachedReferenceField('self', fields=('tp',))
+
+        Person.drop_collection()
+
+        a1 = Person(name="Wilson Father", tp="pj")
+        a1.save()
+
+        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
+        a2.save()
+
+        a1.tp = 'pf'
+        a1.save()
+
+        a2.reload()
+        self.assertEqual(dict(a2.to_mongo()), {
+            '_id': a2.pk,
+            'name': 'Wilson Junior',
+            'tp': 'pf',
+            'father': {
+                '_id': a1.pk,
+                'tp': 'pf'
+            }
+        })
+
+    def test_cached_reference_auto_sync_disabled(self):
+        class Persone(Document):
+            TYPES = (
+                ('pf', "PF"),
+                ('pj', "PJ")
+            )
+            name = StringField()
+            tp = StringField(
+                choices=TYPES
+            )
+
+            father = CachedReferenceField(
+                'self', fields=('tp',), auto_sync=False)
+
+        Persone.drop_collection()
+
+        a1 = Persone(name="Wilson Father", tp="pj")
+        a1.save()
+
+        a2 = Persone(name='Wilson Junior', tp='pf', father=a1)
+        a2.save()
+
+        a1.tp = 'pf'
+        a1.save()
+
+        self.assertEqual(Persone.objects._collection.find_one({'_id': a2.pk}), {
+            '_id': a2.pk,
+            'name': 'Wilson Junior',
+            'tp': 'pf',
+            'father': {
+                '_id': a1.pk,
+                'tp': 'pj'
+            }
+        })
+
+    def test_cached_reference_embedded_fields(self):
+        class Owner(EmbeddedDocument):
+            TPS = (
+                ('n', "Normal"),
+                ('u', "Urgent")
+            )
+            name = StringField()
+            tp = StringField(
+                verbose_name="Type",
+                db_field="t",
+                choices=TPS)
+
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+            owner = EmbeddedDocumentField(Owner)
+
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(
+                Animal, fields=['tag', 'owner.tp'])
+
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
+
+        a = Animal(name="Leopard", tag="heavy",
+                   owner=Owner(tp='u', name="Wilson Júnior")
+                   )
+        a.save()
+
+        o = Ocorrence(person="teste", animal=a)
+        o.save()
+        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tp'])), {
+            '_id': a.pk,
+            'tag': 'heavy',
+            'owner': {
+                't': 'u'
+            }
+        })
+        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
+        self.assertEqual(o.to_mongo()['animal']['owner']['t'], 'u')
+
+        # counts
+        Ocorrence(person="teste 2").save()
+        Ocorrence(person="teste 3").save()
+
+        count = Ocorrence.objects(
+            animal__tag='heavy', animal__owner__tp='u').count()
+        self.assertEqual(count, 1)
+
+        ocorrence = Ocorrence.objects(
+            animal__tag='heavy',
+            animal__owner__tp='u').first()
+        self.assertEqual(ocorrence.person, "teste")
+        self.assertIsInstance(ocorrence.animal, Animal)
+
+    def test_cached_reference_embedded_list_fields(self):
+        class Owner(EmbeddedDocument):
+            name = StringField()
+            tags = ListField(StringField())
+
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+            owner = EmbeddedDocumentField(Owner)
+
+        class Ocorrence(Document):
+            person = StringField()
+            animal = CachedReferenceField(
+                Animal, fields=['tag', 'owner.tags'])
+
+        Animal.drop_collection()
+        Ocorrence.drop_collection()
+
+        a = Animal(name="Leopard", tag="heavy",
+                   owner=Owner(tags=['cool', 'funny'],
+                               name="Wilson Júnior")
+                   )
+        a.save()
+
+        o = Ocorrence(person="teste 2", animal=a)
+        o.save()
+        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tags'])), {
+            '_id': a.pk,
+            'tag': 'heavy',
+            'owner': {
+                'tags': ['cool', 'funny']
+            }
+        })
+
+        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
+        self.assertEqual(o.to_mongo()['animal']['owner']['tags'],
+                         ['cool', 'funny'])
+
+        # counts
+        Ocorrence(person="teste 2").save()
+        Ocorrence(person="teste 3").save()
+
+        query = Ocorrence.objects(
+            animal__tag='heavy', animal__owner__tags='cool')._query
+        self.assertEqual(
+            query, {'animal.owner.tags': 'cool', 'animal.tag': 'heavy'})
+
+        ocorrence = Ocorrence.objects(
+            animal__tag='heavy',
+            animal__owner__tags='cool').first()
+        self.assertEqual(ocorrence.person, "teste 2")
+        self.assertIsInstance(ocorrence.animal, Animal)
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index bac534c05..58dc4b433 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -4,11 +4,6 @@
 import itertools
 import re
 
-try:
-    from bson.int64 import Int64
-except ImportError:
-    Int64 = long
-
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
diff --git a/tests/fields/test_date_field.py b/tests/fields/test_date_field.py
index b5aed5c15..82adb5143 100644
--- a/tests/fields/test_date_field.py
+++ b/tests/fields/test_date_field.py
@@ -1,13 +1,5 @@
 # -*- coding: utf-8 -*-
 import datetime
-import unittest
-import uuid
-import math
-import itertools
-import re
-import sys
-
-from nose.plugins.skip import SkipTest
 import six
 
 try:
@@ -15,18 +7,7 @@
 except ImportError:
     dateutil = None
 
-from decimal import Decimal
-
-from bson import Binary, DBRef, ObjectId, SON
-try:
-    from bson.int64 import Int64
-except ImportError:
-    Int64 = long
-
 from mongoengine import *
-from mongoengine.connection import get_db
-from mongoengine.base import (BaseDict, BaseField, EmbeddedDocumentList,
-                              _document_registry, LazyReference)
 
 from tests.utils import MongoDBTestCase
 
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 24d1c7777..c6253043f 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -7,11 +7,6 @@
 except ImportError:
     dateutil = None
 
-try:
-    from bson.int64 import Int64
-except ImportError:
-    Int64 = long
-
 from mongoengine import *
 from mongoengine import connection
 
diff --git a/tests/fields/test_decimal_field.py b/tests/fields/test_decimal_field.py
new file mode 100644
index 000000000..0213b8803
--- /dev/null
+++ b/tests/fields/test_decimal_field.py
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+from decimal import Decimal
+
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class TestDecimalField(MongoDBTestCase):
+
+    def test_validation(self):
+        """Ensure that invalid values cannot be assigned to decimal fields.
+        """
+        class Person(Document):
+            height = DecimalField(min_value=Decimal('0.1'),
+                                  max_value=Decimal('3.5'))
+
+        Person.drop_collection()
+
+        Person(height=Decimal('1.89')).save()
+        person = Person.objects.first()
+        self.assertEqual(person.height, Decimal('1.89'))
+
+        person.height = '2.0'
+        person.save()
+        person.height = 0.01
+        self.assertRaises(ValidationError, person.validate)
+        person.height = Decimal('0.01')
+        self.assertRaises(ValidationError, person.validate)
+        person.height = Decimal('4.0')
+        self.assertRaises(ValidationError, person.validate)
+        person.height = 'something invalid'
+        self.assertRaises(ValidationError, person.validate)
+
+        person_2 = Person(height='something invalid')
+        self.assertRaises(ValidationError, person_2.validate)
+
+    def test_comparison(self):
+        class Person(Document):
+            money = DecimalField()
+
+        Person.drop_collection()
+
+        Person(money=6).save()
+        Person(money=7).save()
+        Person(money=8).save()
+        Person(money=10).save()
+
+        self.assertEqual(2, Person.objects(money__gt=Decimal("7")).count())
+        self.assertEqual(2, Person.objects(money__gt=7).count())
+        self.assertEqual(2, Person.objects(money__gt="7").count())
+
+        self.assertEqual(3, Person.objects(money__gte="7").count())
+
+    def test_storage(self):
+        class Person(Document):
+            float_value = DecimalField(precision=4)
+            string_value = DecimalField(precision=4, force_string=True)
+
+        Person.drop_collection()
+        values_to_store = [10, 10.1, 10.11, "10.111", Decimal("10.1111"), Decimal("10.11111")]
+        for store_at_creation in [True, False]:
+            for value in values_to_store:
+                # to_python is called explicitly if values were sent in the kwargs of __init__
+                if store_at_creation:
+                    Person(float_value=value, string_value=value).save()
+                else:
+                    person = Person.objects.create()
+                    person.float_value = value
+                    person.string_value = value
+                    person.save()
+
+        # How its stored
+        expected = [
+            {'float_value': 10.0, 'string_value': '10.0000'},
+            {'float_value': 10.1, 'string_value': '10.1000'},
+            {'float_value': 10.11, 'string_value': '10.1100'},
+            {'float_value': 10.111, 'string_value': '10.1110'},
+            {'float_value': 10.1111, 'string_value': '10.1111'},
+            {'float_value': 10.1111, 'string_value': '10.1111'}]
+        expected.extend(expected)
+        actual = list(Person.objects.exclude('id').as_pymongo())
+        self.assertEqual(expected, actual)
+
+        # How it comes out locally
+        expected = [Decimal('10.0000'), Decimal('10.1000'), Decimal('10.1100'),
+                    Decimal('10.1110'), Decimal('10.1111'), Decimal('10.1111')]
+        expected.extend(expected)
+        for field_name in ['float_value', 'string_value']:
+            actual = list(Person.objects().scalar(field_name))
+            self.assertEqual(expected, actual)
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
new file mode 100644
index 000000000..2b9cecb74
--- /dev/null
+++ b/tests/fields/test_dict_field.py
@@ -0,0 +1,303 @@
+# -*- coding: utf-8 -*-
+from mongoengine import *
+from mongoengine.base import BaseDict
+
+from tests.utils import MongoDBTestCase, get_as_pymongo
+
+
+class TestDictField(MongoDBTestCase):
+
+    def test_storage(self):
+        class BlogPost(Document):
+            info = DictField()
+
+        BlogPost.drop_collection()
+
+        info = {'testkey': 'testvalue'}
+        post = BlogPost(info=info).save()
+        self.assertEqual(
+            get_as_pymongo(post),
+            {
+                '_id': post.id,
+                'info': info
+            }
+        )
+
+    def test_general_things(self):
+        """Ensure that dict types work as expected."""
+        class BlogPost(Document):
+            info = DictField()
+
+        BlogPost.drop_collection()
+
+        post = BlogPost()
+        post.info = 'my post'
+        self.assertRaises(ValidationError, post.validate)
+
+        post.info = ['test', 'test']
+        self.assertRaises(ValidationError, post.validate)
+
+        post.info = {'$title': 'test'}
+        self.assertRaises(ValidationError, post.validate)
+
+        post.info = {'nested': {'$title': 'test'}}
+        self.assertRaises(ValidationError, post.validate)
+
+        post.info = {'the.title': 'test'}
+        self.assertRaises(ValidationError, post.validate)
+
+        post.info = {'nested': {'the.title': 'test'}}
+        self.assertRaises(ValidationError, post.validate)
+
+        post.info = {1: 'test'}
+        self.assertRaises(ValidationError, post.validate)
+
+        post.info = {'title': 'test'}
+        post.save()
+
+        post = BlogPost()
+        post.info = {'title': 'dollar_sign', 'details': {'te$t': 'test'}}
+        post.save()
+
+        post = BlogPost()
+        post.info = {'details': {'test': 'test'}}
+        post.save()
+
+        post = BlogPost()
+        post.info = {'details': {'test': 3}}
+        post.save()
+
+        self.assertEqual(BlogPost.objects.count(), 4)
+        self.assertEqual(
+            BlogPost.objects.filter(info__title__exact='test').count(), 1)
+        self.assertEqual(
+            BlogPost.objects.filter(info__details__test__exact='test').count(), 1)
+
+        post = BlogPost.objects.filter(info__title__exact='dollar_sign').first()
+        self.assertIn('te$t', post['info']['details'])
+
+        # Confirm handles non strings or non existing keys
+        self.assertEqual(
+            BlogPost.objects.filter(info__details__test__exact=5).count(), 0)
+        self.assertEqual(
+            BlogPost.objects.filter(info__made_up__test__exact='test').count(), 0)
+
+        post = BlogPost.objects.create(info={'title': 'original'})
+        post.info.update({'title': 'updated'})
+        post.save()
+        post.reload()
+        self.assertEqual('updated', post.info['title'])
+
+        post.info.setdefault('authors', [])
+        post.save()
+        post.reload()
+        self.assertEqual([], post.info['authors'])
+
+    def test_dictfield_dump_document(self):
+        """Ensure a DictField can handle another document's dump."""
+        class Doc(Document):
+            field = DictField()
+
+        class ToEmbed(Document):
+            id = IntField(primary_key=True, default=1)
+            recursive = DictField()
+
+        class ToEmbedParent(Document):
+            id = IntField(primary_key=True, default=1)
+            recursive = DictField()
+
+            meta = {'allow_inheritance': True}
+
+        class ToEmbedChild(ToEmbedParent):
+            pass
+
+        to_embed_recursive = ToEmbed(id=1).save()
+        to_embed = ToEmbed(
+            id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
+        doc = Doc(field=to_embed.to_mongo().to_dict())
+        doc.save()
+        assert isinstance(doc.field, dict)
+        assert doc.field == {'_id': 2, 'recursive': {'_id': 1, 'recursive': {}}}
+        # Same thing with a Document with a _cls field
+        to_embed_recursive = ToEmbedChild(id=1).save()
+        to_embed_child = ToEmbedChild(
+            id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
+        doc = Doc(field=to_embed_child.to_mongo().to_dict())
+        doc.save()
+        assert isinstance(doc.field, dict)
+        assert doc.field == {
+            '_id': 2, '_cls': 'ToEmbedParent.ToEmbedChild',
+            'recursive': {'_id': 1, '_cls': 'ToEmbedParent.ToEmbedChild', 'recursive': {}}
+        }
+
+    def test_dictfield_strict(self):
+        """Ensure that dict field handles validation if provided a strict field type."""
+        class Simple(Document):
+            mapping = DictField(field=IntField())
+
+        Simple.drop_collection()
+
+        e = Simple()
+        e.mapping['someint'] = 1
+        e.save()
+
+        # try creating an invalid mapping
+        with self.assertRaises(ValidationError):
+            e.mapping['somestring'] = "abc"
+            e.save()
+
+    def test_dictfield_complex(self):
+        """Ensure that the dict field can handle the complex types."""
+        class SettingBase(EmbeddedDocument):
+            meta = {'allow_inheritance': True}
+
+        class StringSetting(SettingBase):
+            value = StringField()
+
+        class IntegerSetting(SettingBase):
+            value = IntField()
+
+        class Simple(Document):
+            mapping = DictField()
+
+        Simple.drop_collection()
+
+        e = Simple()
+        e.mapping['somestring'] = StringSetting(value='foo')
+        e.mapping['someint'] = IntegerSetting(value=42)
+        e.mapping['nested_dict'] = {'number': 1, 'string': 'Hi!',
+                                    'float': 1.001,
+                                    'complex': IntegerSetting(value=42),
+                                    'list': [IntegerSetting(value=42),
+                                             StringSetting(value='foo')]}
+        e.save()
+
+        e2 = Simple.objects.get(id=e.id)
+        self.assertIsInstance(e2.mapping['somestring'], StringSetting)
+        self.assertIsInstance(e2.mapping['someint'], IntegerSetting)
+
+        # Test querying
+        self.assertEqual(
+            Simple.objects.filter(mapping__someint__value=42).count(), 1)
+        self.assertEqual(
+            Simple.objects.filter(mapping__nested_dict__number=1).count(), 1)
+        self.assertEqual(
+            Simple.objects.filter(mapping__nested_dict__complex__value=42).count(), 1)
+        self.assertEqual(
+            Simple.objects.filter(mapping__nested_dict__list__0__value=42).count(), 1)
+        self.assertEqual(
+            Simple.objects.filter(mapping__nested_dict__list__1__value='foo').count(), 1)
+
+        # Confirm can update
+        Simple.objects().update(
+            set__mapping={"someint": IntegerSetting(value=10)})
+        Simple.objects().update(
+            set__mapping__nested_dict__list__1=StringSetting(value='Boo'))
+        self.assertEqual(
+            Simple.objects.filter(mapping__nested_dict__list__1__value='foo').count(), 0)
+        self.assertEqual(
+            Simple.objects.filter(mapping__nested_dict__list__1__value='Boo').count(), 1)
+
+    def test_ensure_unique_default_instances(self):
+        """Ensure that every field has it's own unique default instance."""
+        class D(Document):
+            data = DictField()
+            data2 = DictField(default=lambda: {})
+
+        d1 = D()
+        d1.data['foo'] = 'bar'
+        d1.data2['foo'] = 'bar'
+        d2 = D()
+        self.assertEqual(d2.data, {})
+        self.assertEqual(d2.data2, {})
+
+    def test_dict_field_invalid_dict_value(self):
+        class DictFieldTest(Document):
+            dictionary = DictField(required=True)
+
+        DictFieldTest.drop_collection()
+
+        test = DictFieldTest(dictionary=None)
+        test.dictionary  # Just access to test getter
+        self.assertRaises(ValidationError, test.validate)
+
+        test = DictFieldTest(dictionary=False)
+        test.dictionary  # Just access to test getter
+        self.assertRaises(ValidationError, test.validate)
+
+    def test_dict_field_raises_validation_error_if_wrongly_assign_embedded_doc(self):
+        class DictFieldTest(Document):
+            dictionary = DictField(required=True)
+
+        DictFieldTest.drop_collection()
+
+        class Embedded(EmbeddedDocument):
+            name = StringField()
+
+        embed = Embedded(name='garbage')
+        doc = DictFieldTest(dictionary=embed)
+        with self.assertRaises(ValidationError) as ctx_err:
+            doc.validate()
+        self.assertIn("'dictionary'", str(ctx_err.exception))
+        self.assertIn('Only dictionaries may be used in a DictField', str(ctx_err.exception))
+
+    def test_atomic_update_dict_field(self):
+        """Ensure that the entire DictField can be atomically updated."""
+        class Simple(Document):
+            mapping = DictField(field=ListField(IntField(required=True)))
+
+        Simple.drop_collection()
+
+        e = Simple()
+        e.mapping['someints'] = [1, 2]
+        e.save()
+        e.update(set__mapping={"ints": [3, 4]})
+        e.reload()
+        self.assertEqual(BaseDict, type(e.mapping))
+        self.assertEqual({"ints": [3, 4]}, e.mapping)
+
+        # try creating an invalid mapping
+        with self.assertRaises(ValueError):
+            e.update(set__mapping={"somestrings": ["foo", "bar", ]})
+
+    def test_dictfield_with_referencefield_complex_nesting_cases(self):
+        """Ensure complex nesting inside DictField handles dereferencing of ReferenceField(dbref=True | False)"""
+        # Relates to Issue #1453
+        class Doc(Document):
+            s = StringField()
+
+        class Simple(Document):
+            mapping0 = DictField(ReferenceField(Doc, dbref=True))
+            mapping1 = DictField(ReferenceField(Doc, dbref=False))
+            mapping2 = DictField(ListField(ReferenceField(Doc, dbref=True)))
+            mapping3 = DictField(ListField(ReferenceField(Doc, dbref=False)))
+            mapping4 = DictField(DictField(field=ReferenceField(Doc, dbref=True)))
+            mapping5 = DictField(DictField(field=ReferenceField(Doc, dbref=False)))
+            mapping6 = DictField(ListField(DictField(ReferenceField(Doc, dbref=True))))
+            mapping7 = DictField(ListField(DictField(ReferenceField(Doc, dbref=False))))
+            mapping8 = DictField(ListField(DictField(ListField(ReferenceField(Doc, dbref=True)))))
+            mapping9 = DictField(ListField(DictField(ListField(ReferenceField(Doc, dbref=False)))))
+
+        Doc.drop_collection()
+        Simple.drop_collection()
+
+        d = Doc(s='aa').save()
+        e = Simple()
+        e.mapping0['someint'] = e.mapping1['someint'] = d
+        e.mapping2['someint'] = e.mapping3['someint'] = [d]
+        e.mapping4['someint'] = e.mapping5['someint'] = {'d': d}
+        e.mapping6['someint'] = e.mapping7['someint'] = [{'d': d}]
+        e.mapping8['someint'] = e.mapping9['someint'] = [{'d': [d]}]
+        e.save()
+
+        s = Simple.objects.first()
+        self.assertIsInstance(s.mapping0['someint'], Doc)
+        self.assertIsInstance(s.mapping1['someint'], Doc)
+        self.assertIsInstance(s.mapping2['someint'][0], Doc)
+        self.assertIsInstance(s.mapping3['someint'][0], Doc)
+        self.assertIsInstance(s.mapping4['someint']['d'], Doc)
+        self.assertIsInstance(s.mapping5['someint']['d'], Doc)
+        self.assertIsInstance(s.mapping6['someint'][0]['d'], Doc)
+        self.assertIsInstance(s.mapping7['someint'][0]['d'], Doc)
+        self.assertIsInstance(s.mapping8['someint'][0]['d'][0], Doc)
+        self.assertIsInstance(s.mapping9['someint'][0]['d'][0], Doc)
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
new file mode 100644
index 000000000..d84103544
--- /dev/null
+++ b/tests/fields/test_email_field.py
@@ -0,0 +1,120 @@
+# -*- coding: utf-8 -*-
+import sys
+from unittest import SkipTest
+
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class TestEmailField(MongoDBTestCase):
+    def test_generic_behavior(self):
+        class User(Document):
+            email = EmailField()
+
+        user = User(email='ross@example.com')
+        user.validate()
+
+        user = User(email='ross@example.co.uk')
+        user.validate()
+
+        user = User(email=('Kofq@rhom0e4klgauOhpbpNdogawnyIKvQS0wk2mjqrgGQ5S'
+                           'aJIazqqWkm7.net'))
+        user.validate()
+
+        user = User(email='new-tld@example.technology')
+        user.validate()
+
+        user = User(email='ross@example.com.')
+        self.assertRaises(ValidationError, user.validate)
+
+        # unicode domain
+        user = User(email=u'user@пример.рф')
+        user.validate()
+
+        # invalid unicode domain
+        user = User(email=u'user@пример')
+        self.assertRaises(ValidationError, user.validate)
+
+        # invalid data type
+        user = User(email=123)
+        self.assertRaises(ValidationError, user.validate)
+
+    def test_email_field_unicode_user(self):
+        # Don't run this test on pypy3, which doesn't support unicode regex:
+        # https://bitbucket.org/pypy/pypy/issues/1821/regular-expression-doesnt-find-unicode
+        if sys.version_info[:2] == (3, 2):
+            raise SkipTest('unicode email addresses are not supported on PyPy 3')
+
+        class User(Document):
+            email = EmailField()
+
+        # unicode user shouldn't validate by default...
+        user = User(email=u'Dörte@Sörensen.example.com')
+        self.assertRaises(ValidationError, user.validate)
+
+        # ...but it should be fine with allow_utf8_user set to True
+        class User(Document):
+            email = EmailField(allow_utf8_user=True)
+
+        user = User(email=u'Dörte@Sörensen.example.com')
+        user.validate()
+
+    def test_email_field_domain_whitelist(self):
+        class User(Document):
+            email = EmailField()
+
+        # localhost domain shouldn't validate by default...
+        user = User(email='me@localhost')
+        self.assertRaises(ValidationError, user.validate)
+
+        # ...but it should be fine if it's whitelisted
+        class User(Document):
+            email = EmailField(domain_whitelist=['localhost'])
+
+        user = User(email='me@localhost')
+        user.validate()
+
+    def test_email_field_ip_domain(self):
+        class User(Document):
+            email = EmailField()
+
+        valid_ipv4 = 'email@[127.0.0.1]'
+        valid_ipv6 = 'email@[2001:dB8::1]'
+        invalid_ip = 'email@[324.0.0.1]'
+
+        # IP address as a domain shouldn't validate by default...
+        user = User(email=valid_ipv4)
+        self.assertRaises(ValidationError, user.validate)
+
+        user = User(email=valid_ipv6)
+        self.assertRaises(ValidationError, user.validate)
+
+        user = User(email=invalid_ip)
+        self.assertRaises(ValidationError, user.validate)
+
+        # ...but it should be fine with allow_ip_domain set to True
+        class User(Document):
+            email = EmailField(allow_ip_domain=True)
+
+        user = User(email=valid_ipv4)
+        user.validate()
+
+        user = User(email=valid_ipv6)
+        user.validate()
+
+        # invalid IP should still fail validation
+        user = User(email=invalid_ip)
+        self.assertRaises(ValidationError, user.validate)
+
+    def test_email_field_honors_regex(self):
+        class User(Document):
+            email = EmailField(regex=r'\w+@example.com')
+
+        # Fails regex validation
+        user = User(email='me@foo.com')
+        self.assertRaises(ValidationError, user.validate)
+
+        # Passes regex validation
+        user = User(email='me@example.com')
+        self.assertIsNone(user.validate())
diff --git a/tests/fields/test_map_field.py b/tests/fields/test_map_field.py
new file mode 100644
index 000000000..cb27cffff
--- /dev/null
+++ b/tests/fields/test_map_field.py
@@ -0,0 +1,144 @@
+# -*- coding: utf-8 -*-
+import datetime
+
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class TestMapField(MongoDBTestCase):
+
+    def test_mapfield(self):
+        """Ensure that the MapField handles the declared type."""
+        class Simple(Document):
+            mapping = MapField(IntField())
+
+        Simple.drop_collection()
+
+        e = Simple()
+        e.mapping['someint'] = 1
+        e.save()
+
+        with self.assertRaises(ValidationError):
+            e.mapping['somestring'] = "abc"
+            e.save()
+
+        with self.assertRaises(ValidationError):
+            class NoDeclaredType(Document):
+                mapping = MapField()
+
+    def test_complex_mapfield(self):
+        """Ensure that the MapField can handle complex declared types."""
+
+        class SettingBase(EmbeddedDocument):
+            meta = {"allow_inheritance": True}
+
+        class StringSetting(SettingBase):
+            value = StringField()
+
+        class IntegerSetting(SettingBase):
+            value = IntField()
+
+        class Extensible(Document):
+            mapping = MapField(EmbeddedDocumentField(SettingBase))
+
+        Extensible.drop_collection()
+
+        e = Extensible()
+        e.mapping['somestring'] = StringSetting(value='foo')
+        e.mapping['someint'] = IntegerSetting(value=42)
+        e.save()
+
+        e2 = Extensible.objects.get(id=e.id)
+        self.assertIsInstance(e2.mapping['somestring'], StringSetting)
+        self.assertIsInstance(e2.mapping['someint'], IntegerSetting)
+
+        with self.assertRaises(ValidationError):
+            e.mapping['someint'] = 123
+            e.save()
+
+    def test_embedded_mapfield_db_field(self):
+        class Embedded(EmbeddedDocument):
+            number = IntField(default=0, db_field='i')
+
+        class Test(Document):
+            my_map = MapField(field=EmbeddedDocumentField(Embedded),
+                              db_field='x')
+
+        Test.drop_collection()
+
+        test = Test()
+        test.my_map['DICTIONARY_KEY'] = Embedded(number=1)
+        test.save()
+
+        Test.objects.update_one(inc__my_map__DICTIONARY_KEY__number=1)
+
+        test = Test.objects.get()
+        self.assertEqual(test.my_map['DICTIONARY_KEY'].number, 2)
+        doc = self.db.test.find_one()
+        self.assertEqual(doc['x']['DICTIONARY_KEY']['i'], 2)
+
+    def test_mapfield_numerical_index(self):
+        """Ensure that MapField accept numeric strings as indexes."""
+
+        class Embedded(EmbeddedDocument):
+            name = StringField()
+
+        class Test(Document):
+            my_map = MapField(EmbeddedDocumentField(Embedded))
+
+        Test.drop_collection()
+
+        test = Test()
+        test.my_map['1'] = Embedded(name='test')
+        test.save()
+        test.my_map['1'].name = 'test updated'
+        test.save()
+
+    def test_map_field_lookup(self):
+        """Ensure MapField lookups succeed on Fields without a lookup
+        method.
+        """
+
+        class Action(EmbeddedDocument):
+            operation = StringField()
+            object = StringField()
+
+        class Log(Document):
+            name = StringField()
+            visited = MapField(DateTimeField())
+            actions = MapField(EmbeddedDocumentField(Action))
+
+        Log.drop_collection()
+        Log(name="wilson", visited={'friends': datetime.datetime.now()},
+            actions={'friends': Action(operation='drink', object='beer')}).save()
+
+        self.assertEqual(1, Log.objects(
+            visited__friends__exists=True).count())
+
+        self.assertEqual(1, Log.objects(
+            actions__friends__operation='drink',
+            actions__friends__object='beer').count())
+
+    def test_map_field_unicode(self):
+        class Info(EmbeddedDocument):
+            description = StringField()
+            value_list = ListField(field=StringField())
+
+        class BlogPost(Document):
+            info_dict = MapField(field=EmbeddedDocumentField(Info))
+
+        BlogPost.drop_collection()
+
+        tree = BlogPost(info_dict={
+            u"éééé": {
+                'description': u"VALUE: éééé"
+            }
+        })
+
+        tree.save()
+
+        self.assertEqual(
+            BlogPost.objects.get(id=tree.id).info_dict[u"éééé"].description,
+            u"VALUE: éééé"
+        )
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
new file mode 100644
index 000000000..5e1fc6059
--- /dev/null
+++ b/tests/fields/test_reference_field.py
@@ -0,0 +1,219 @@
+# -*- coding: utf-8 -*-
+from bson import SON, DBRef
+
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class TestReferenceField(MongoDBTestCase):
+    def test_reference_validation(self):
+        """Ensure that invalid document objects cannot be assigned to
+        reference fields.
+        """
+
+        class User(Document):
+            name = StringField()
+
+        class BlogPost(Document):
+            content = StringField()
+            author = ReferenceField(User)
+
+        User.drop_collection()
+        BlogPost.drop_collection()
+
+        # Make sure ReferenceField only accepts a document class or a string
+        # with a document class name.
+        self.assertRaises(ValidationError, ReferenceField, EmbeddedDocument)
+
+        user = User(name='Test User')
+
+        # Ensure that the referenced object must have been saved
+        post1 = BlogPost(content='Chips and gravy taste good.')
+        post1.author = user
+        self.assertRaises(ValidationError, post1.save)
+
+        # Check that an invalid object type cannot be used
+        post2 = BlogPost(content='Chips and chilli taste good.')
+        post1.author = post2
+        self.assertRaises(ValidationError, post1.validate)
+
+        # Ensure ObjectID's are accepted as references
+        user_object_id = user.pk
+        post3 = BlogPost(content="Chips and curry sauce taste good.")
+        post3.author = user_object_id
+        post3.save()
+
+        # Make sure referencing a saved document of the right type works
+        user.save()
+        post1.author = user
+        post1.save()
+
+        # Make sure referencing a saved document of the *wrong* type fails
+        post2.save()
+        post1.author = post2
+        self.assertRaises(ValidationError, post1.validate)
+
+    def test_objectid_reference_fields(self):
+        """Make sure storing Object ID references works."""
+
+        class Person(Document):
+            name = StringField()
+            parent = ReferenceField('self')
+
+        Person.drop_collection()
+
+        p1 = Person(name="John").save()
+        Person(name="Ross", parent=p1.pk).save()
+
+        p = Person.objects.get(name="Ross")
+        self.assertEqual(p.parent, p1)
+
+    def test_dbref_reference_fields(self):
+        """Make sure storing references as bson.dbref.DBRef works."""
+
+        class Person(Document):
+            name = StringField()
+            parent = ReferenceField('self', dbref=True)
+
+        Person.drop_collection()
+
+        p1 = Person(name="John").save()
+        Person(name="Ross", parent=p1).save()
+
+        self.assertEqual(
+            Person._get_collection().find_one({'name': 'Ross'})['parent'],
+            DBRef('person', p1.pk)
+        )
+
+        p = Person.objects.get(name="Ross")
+        self.assertEqual(p.parent, p1)
+
+    def test_dbref_to_mongo(self):
+        """Make sure that calling to_mongo on a ReferenceField which
+        has dbref=False, but actually actually contains a DBRef returns
+        an ID of that DBRef.
+        """
+
+        class Person(Document):
+            name = StringField()
+            parent = ReferenceField('self', dbref=False)
+
+        p = Person(
+            name='Steve',
+            parent=DBRef('person', 'abcdefghijklmnop')
+        )
+        self.assertEqual(p.to_mongo(), SON([
+            ('name', u'Steve'),
+            ('parent', 'abcdefghijklmnop')
+        ]))
+
+    def test_objectid_reference_fields(self):
+        class Person(Document):
+            name = StringField()
+            parent = ReferenceField('self', dbref=False)
+
+        Person.drop_collection()
+
+        p1 = Person(name="John").save()
+        Person(name="Ross", parent=p1).save()
+
+        col = Person._get_collection()
+        data = col.find_one({'name': 'Ross'})
+        self.assertEqual(data['parent'], p1.pk)
+
+        p = Person.objects.get(name="Ross")
+        self.assertEqual(p.parent, p1)
+
+    def test_undefined_reference(self):
+        """Ensure that ReferenceFields may reference undefined Documents.
+        """
+        class Product(Document):
+            name = StringField()
+            company = ReferenceField('Company')
+
+        class Company(Document):
+            name = StringField()
+
+        Product.drop_collection()
+        Company.drop_collection()
+
+        ten_gen = Company(name='10gen')
+        ten_gen.save()
+        mongodb = Product(name='MongoDB', company=ten_gen)
+        mongodb.save()
+
+        me = Product(name='MongoEngine')
+        me.save()
+
+        obj = Product.objects(company=ten_gen).first()
+        self.assertEqual(obj, mongodb)
+        self.assertEqual(obj.company, ten_gen)
+
+        obj = Product.objects(company=None).first()
+        self.assertEqual(obj, me)
+
+        obj = Product.objects.get(company=None)
+        self.assertEqual(obj, me)
+
+    def test_reference_query_conversion(self):
+        """Ensure that ReferenceFields can be queried using objects and values
+        of the type of the primary key of the referenced object.
+        """
+        class Member(Document):
+            user_num = IntField(primary_key=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            author = ReferenceField(Member, dbref=False)
+
+        Member.drop_collection()
+        BlogPost.drop_collection()
+
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
+
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
+
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
+
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
+
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
+
+    def test_reference_query_conversion_dbref(self):
+        """Ensure that ReferenceFields can be queried using objects and values
+        of the type of the primary key of the referenced object.
+        """
+        class Member(Document):
+            user_num = IntField(primary_key=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            author = ReferenceField(Member, dbref=True)
+
+        Member.drop_collection()
+        BlogPost.drop_collection()
+
+        m1 = Member(user_num=1)
+        m1.save()
+        m2 = Member(user_num=2)
+        m2.save()
+
+        post1 = BlogPost(title='post 1', author=m1)
+        post1.save()
+
+        post2 = BlogPost(title='post 2', author=m2)
+        post2.save()
+
+        post = BlogPost.objects(author=m1).first()
+        self.assertEqual(post.id, post1.id)
+
+        post = BlogPost.objects(author=m2).first()
+        self.assertEqual(post.id, post2.id)
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
new file mode 100644
index 000000000..6124c65ef
--- /dev/null
+++ b/tests/fields/test_sequence_field.py
@@ -0,0 +1,271 @@
+# -*- coding: utf-8 -*-
+
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase
+
+
+class TestSequenceField(MongoDBTestCase):
+    def test_sequence_field(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
+
+        for x in range(10):
+            Person(name="Person %s" % x).save()
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        Person.id.set_next_value(1000)
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 1000)
+
+    def test_sequence_field_get_next_value(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
+
+        for x in range(10):
+            Person(name="Person %s" % x).save()
+
+        self.assertEqual(Person.id.get_next_value(), 11)
+        self.db['mongoengine.counters'].drop()
+
+        self.assertEqual(Person.id.get_next_value(), 1)
+
+        class Person(Document):
+            id = SequenceField(primary_key=True, value_decorator=str)
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
+
+        for x in range(10):
+            Person(name="Person %s" % x).save()
+
+        self.assertEqual(Person.id.get_next_value(), '11')
+        self.db['mongoengine.counters'].drop()
+
+        self.assertEqual(Person.id.get_next_value(), '1')
+
+    def test_sequence_field_sequence_name(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True, sequence_name='jelly')
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
+
+        for x in range(10):
+            Person(name="Person %s" % x).save()
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
+        self.assertEqual(c['next'], 10)
+
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
+        self.assertEqual(c['next'], 10)
+
+        Person.id.set_next_value(1000)
+        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
+        self.assertEqual(c['next'], 1000)
+
+    def test_multiple_sequence_fields(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            counter = SequenceField()
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
+
+        for x in range(10):
+            Person(name="Person %s" % x).save()
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
+
+        counters = [i.counter for i in Person.objects]
+        self.assertEqual(counters, range(1, 11))
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        Person.id.set_next_value(1000)
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 1000)
+
+        Person.counter.set_next_value(999)
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.counter'})
+        self.assertEqual(c['next'], 999)
+
+    def test_sequence_fields_reload(self):
+        class Animal(Document):
+            counter = SequenceField()
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Animal.drop_collection()
+
+        a = Animal(name="Boi").save()
+
+        self.assertEqual(a.counter, 1)
+        a.reload()
+        self.assertEqual(a.counter, 1)
+
+        a.counter = None
+        self.assertEqual(a.counter, 2)
+        a.save()
+
+        self.assertEqual(a.counter, 2)
+
+        a = Animal.objects.first()
+        self.assertEqual(a.counter, 2)
+        a.reload()
+        self.assertEqual(a.counter, 2)
+
+    def test_multiple_sequence_fields_on_docs(self):
+        class Animal(Document):
+            id = SequenceField(primary_key=True)
+            name = StringField()
+
+        class Person(Document):
+            id = SequenceField(primary_key=True)
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Animal.drop_collection()
+        Person.drop_collection()
+
+        for x in range(10):
+            Animal(name="Animal %s" % x).save()
+            Person(name="Person %s" % x).save()
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
+        self.assertEqual(c['next'], 10)
+
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, range(1, 11))
+
+        id = [i.id for i in Animal.objects]
+        self.assertEqual(id, range(1, 11))
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
+        self.assertEqual(c['next'], 10)
+
+    def test_sequence_field_value_decorator(self):
+        class Person(Document):
+            id = SequenceField(primary_key=True, value_decorator=str)
+            name = StringField()
+
+        self.db['mongoengine.counters'].drop()
+        Person.drop_collection()
+
+        for x in range(10):
+            p = Person(name="Person %s" % x)
+            p.save()
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+        ids = [i.id for i in Person.objects]
+        self.assertEqual(ids, map(str, range(1, 11)))
+
+        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
+        self.assertEqual(c['next'], 10)
+
+    def test_embedded_sequence_field(self):
+        class Comment(EmbeddedDocument):
+            id = SequenceField()
+            content = StringField(required=True)
+
+        class Post(Document):
+            title = StringField(required=True)
+            comments = ListField(EmbeddedDocumentField(Comment))
+
+        self.db['mongoengine.counters'].drop()
+        Post.drop_collection()
+
+        Post(title="MongoEngine",
+             comments=[Comment(content="NoSQL Rocks"),
+                       Comment(content="MongoEngine Rocks")]).save()
+        c = self.db['mongoengine.counters'].find_one({'_id': 'comment.id'})
+        self.assertEqual(c['next'], 2)
+        post = Post.objects.first()
+        self.assertEqual(1, post.comments[0].id)
+        self.assertEqual(2, post.comments[1].id)
+
+    def test_inherited_sequencefield(self):
+        class Base(Document):
+            name = StringField()
+            counter = SequenceField()
+            meta = {'abstract': True}
+
+        class Foo(Base):
+            pass
+
+        class Bar(Base):
+            pass
+
+        bar = Bar(name='Bar')
+        bar.save()
+
+        foo = Foo(name='Foo')
+        foo.save()
+
+        self.assertTrue('base.counter' in
+                        self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertFalse(('foo.counter' or 'bar.counter') in
+                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertNotEqual(foo.counter, bar.counter)
+        self.assertEqual(foo._fields['counter'].owner_document, Base)
+        self.assertEqual(bar._fields['counter'].owner_document, Base)
+
+    def test_no_inherited_sequencefield(self):
+        class Base(Document):
+            name = StringField()
+            meta = {'abstract': True}
+
+        class Foo(Base):
+            counter = SequenceField()
+
+        class Bar(Base):
+            counter = SequenceField()
+
+        bar = Bar(name='Bar')
+        bar.save()
+
+        foo = Foo(name='Foo')
+        foo.save()
+
+        self.assertFalse('base.counter' in
+                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertTrue(('foo.counter' and 'bar.counter') in
+                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertEqual(foo.counter, bar.counter)
+        self.assertEqual(foo._fields['counter'].owner_document, Foo)
+        self.assertEqual(bar._fields['counter'].owner_document, Bar)
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index 0447799ec..ddbf707ea 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -4,7 +4,7 @@
 from tests.utils import MongoDBTestCase
 
 
-class TestFloatField(MongoDBTestCase):
+class TestURLField(MongoDBTestCase):
 
     def test_validation(self):
         """Ensure that URLFields validate urls properly."""
diff --git a/tests/fields/test_uuid_field.py b/tests/fields/test_uuid_field.py
new file mode 100644
index 000000000..7b7faaf2e
--- /dev/null
+++ b/tests/fields/test_uuid_field.py
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+import uuid
+
+from mongoengine import *
+
+from tests.utils import MongoDBTestCase, get_as_pymongo
+
+
+class Person(Document):
+    api_key = UUIDField(binary=False)
+
+
+class TestUUIDField(MongoDBTestCase):
+    def test_storage(self):
+        uid = uuid.uuid4()
+        person = Person(api_key=uid).save()
+        self.assertEqual(
+            get_as_pymongo(person),
+            {'_id': person.id,
+             'api_key': str(uid)
+             }
+            )
+
+    def test_field_string(self):
+        """Test UUID fields storing as String
+        """
+        Person.drop_collection()
+
+        uu = uuid.uuid4()
+        Person(api_key=uu).save()
+        self.assertEqual(1, Person.objects(api_key=uu).count())
+        self.assertEqual(uu, Person.objects.first().api_key)
+
+        person = Person()
+        valid = (uuid.uuid4(), uuid.uuid1())
+        for api_key in valid:
+            person.api_key = api_key
+            person.validate()
+
+        invalid = ('9d159858-549b-4975-9f98-dd2f987c113g',
+                   '9d159858-549b-4975-9f98-dd2f987c113')
+        for api_key in invalid:
+            person.api_key = api_key
+            self.assertRaises(ValidationError, person.validate)
+
+    def test_field_binary(self):
+        """Test UUID fields storing as Binary object."""
+        Person.drop_collection()
+
+        uu = uuid.uuid4()
+        Person(api_key=uu).save()
+        self.assertEqual(1, Person.objects(api_key=uu).count())
+        self.assertEqual(uu, Person.objects.first().api_key)
+
+        person = Person()
+        valid = (uuid.uuid4(), uuid.uuid1())
+        for api_key in valid:
+            person.api_key = api_key
+            person.validate()
+
+        invalid = ('9d159858-549b-4975-9f98-dd2f987c113g',
+                   '9d159858-549b-4975-9f98-dd2f987c113')
+        for api_key in invalid:
+            person.api_key = api_key
+            self.assertRaises(ValidationError, person.validate)
diff --git a/tests/utils.py b/tests/utils.py
index 5345f75e7..19936a542 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -13,7 +13,7 @@
 # Constant that can be used to compare the version retrieved with
 # get_mongodb_version()
 MONGODB_26 = (2, 6)
-MONGODB_3 = (3,0)
+MONGODB_3 = (3, 0)
 MONGODB_32 = (3, 2)
 
 
@@ -33,6 +33,11 @@ def tearDownClass(cls):
         cls._connection.drop_database(MONGO_TEST_DB)
 
 
+def get_as_pymongo(doc):
+    """Fetch the pymongo version of a certain Document"""
+    return doc.__class__.objects.as_pymongo().get(id=doc.id)
+
+
 def get_mongodb_version():
     """Return the version of the connected mongoDB (first 2 digits)
 

From 3cdb5b5db2f163c8a9b2404b020dbc83e573263f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 25 Feb 2019 22:29:44 +0100
Subject: [PATCH 0765/1519] fix poor assert's in tests

---
 tests/document/inheritance.py   |  8 ++++----
 tests/document/instance.py      | 13 ++++++++-----
 tests/fields/fields.py          |  8 ++++----
 tests/fields/test_dict_field.py |  9 +++++----
 tests/test_datastructures.py    | 12 ++++++------
 5 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index 9cc20c893..83c2a80a7 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -38,12 +38,12 @@ class DataDoc(Document):
             meta = {'allow_inheritance': True}
 
         test_doc = DataDoc(name='test', embed=EmbedData(data='data'))
-        assert test_doc._cls == 'DataDoc'
-        assert test_doc.embed._cls == 'EmbedData'
+        self.assertEqual(test_doc._cls, 'DataDoc')
+        self.assertEqual(test_doc.embed._cls, 'EmbedData')
         test_doc.save()
         saved_doc = DataDoc.objects.with_id(test_doc.id)
-        assert test_doc._cls == saved_doc._cls
-        assert test_doc.embed._cls == saved_doc.embed._cls
+        self.assertEqual(test_doc._cls, saved_doc._cls)
+        self.assertEqual(test_doc.embed._cls, saved_doc.embed._cls)
         test_doc.delete()
 
     def test_superclasses(self):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index cde18c9f2..051eda680 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -806,7 +806,8 @@ def test_modify_match_another_document(self):
         doc2 = self.Person(name="jim", age=20).save()
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
-        assert not doc1.modify({'name': doc2.name}, set__age=100)
+        n_modified = doc1.modify({'name': doc2.name}, set__age=100)
+        self.assertEqual(n_modified, 0)
 
         self.assertDbEqual(docs)
 
@@ -815,7 +816,8 @@ def test_modify_not_exists(self):
         doc2 = self.Person(id=ObjectId(), name="jim", age=20)
         docs = [dict(doc1.to_mongo())]
 
-        assert not doc2.modify({'name': doc2.name}, set__age=100)
+        n_modified = doc2.modify({'name': doc2.name}, set__age=100)
+        self.assertEqual(n_modified, 0)
 
         self.assertDbEqual(docs)
 
@@ -831,14 +833,15 @@ def test_modify_update(self):
         doc.job.name = "Google"
         doc.job.years = 3
 
-        assert doc.modify(
+        n_modified = doc.modify(
             set__age=21, set__job__name="MongoDB", unset__job__years=True)
+        self.assertEqual(n_modified, 1)
         doc_copy.age = 21
         doc_copy.job.name = "MongoDB"
         del doc_copy.job.years
 
-        assert doc.to_json() == doc_copy.to_json()
-        assert doc._get_changed_fields() == []
+        self.assertEqual(doc.to_json(), doc_copy.to_json())
+        self.assertEqual(doc._get_changed_fields(), [])
 
         self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
 
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index c772b4723..128936bf6 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2168,15 +2168,15 @@ class ToEmbedChild(ToEmbedParent):
         to_embed = ToEmbed(id=2, recursive=to_embed_recursive).save()
         doc = Doc(field=to_embed)
         doc.save()
-        assert isinstance(doc.field, ToEmbed)
-        assert doc.field == to_embed
+        self.assertIsInstance(doc.field, ToEmbed)
+        self.assertEqual(doc.field, to_embed)
         # Same thing with a Document with a _cls field
         to_embed_recursive = ToEmbedChild(id=1).save()
         to_embed_child = ToEmbedChild(id=2, recursive=to_embed_recursive).save()
         doc = Doc(field=to_embed_child)
         doc.save()
-        assert isinstance(doc.field, ToEmbedChild)
-        assert doc.field == to_embed_child
+        self.assertIsInstance(doc.field, ToEmbedChild)
+        self.assertEqual(doc.field, to_embed_child)
 
     def test_cls_field(self):
         class Animal(Document):
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 2b9cecb74..a3b8ec6cb 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -116,19 +116,20 @@ class ToEmbedChild(ToEmbedParent):
             id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
         doc = Doc(field=to_embed.to_mongo().to_dict())
         doc.save()
-        assert isinstance(doc.field, dict)
-        assert doc.field == {'_id': 2, 'recursive': {'_id': 1, 'recursive': {}}}
+        self.assertIsInstance(doc.field, dict)
+        self.assertEqual(doc.field, {'_id': 2, 'recursive': {'_id': 1, 'recursive': {}}})
         # Same thing with a Document with a _cls field
         to_embed_recursive = ToEmbedChild(id=1).save()
         to_embed_child = ToEmbedChild(
             id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
         doc = Doc(field=to_embed_child.to_mongo().to_dict())
         doc.save()
-        assert isinstance(doc.field, dict)
-        assert doc.field == {
+        self.assertIsInstance(doc.field, dict)
+        expected = {
             '_id': 2, '_cls': 'ToEmbedParent.ToEmbedChild',
             'recursive': {'_id': 1, '_cls': 'ToEmbedParent.ToEmbedChild', 'recursive': {}}
         }
+        self.assertEqual(doc.field, expected)
 
     def test_dictfield_strict(self):
         """Ensure that dict field handles validation if provided a strict field type."""
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 2f1277e68..4fb21d218 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -203,7 +203,7 @@ def test___getitem__using_simple_index(self):
 
     def test___getitem__using_slice(self):
         base_list = self._get_baselist([0, 1, 2])
-        self.assertEqual(base_list[1:3], [1,2])
+        self.assertEqual(base_list[1:3], [1, 2])
         self.assertEqual(base_list[0:3:2], [0, 2])
 
     def test___getitem___using_slice_returns_list(self):
@@ -218,7 +218,7 @@ def test___getitem___using_slice_returns_list(self):
     def test___getitem__sublist_returns_BaseList_bound_to_instance(self):
         base_list = self._get_baselist(
             [
-                [1,2],
+                [1, 2],
                 [3, 4]
             ]
         )
@@ -305,10 +305,10 @@ def test___setitem___calls_with_step_slice_mark_as_changed(self):
         self.assertEqual(base_list, [-1, 1, -2])
 
     def test___setitem___with_slice(self):
-        base_list = self._get_baselist([0,1,2,3,4,5])
+        base_list = self._get_baselist([0, 1, 2, 3, 4, 5])
         base_list[0:6:2] = [None, None, None]
         self.assertEqual(base_list._instance._changed_fields, ['my_name'])
-        self.assertEqual(base_list, [None,1,None,3,None,5])
+        self.assertEqual(base_list, [None, 1, None, 3, None, 5])
 
     def test___setitem___item_0_calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
@@ -426,8 +426,8 @@ def test_items(self):
 
     def test_mappings_protocol(self):
         d = self.dtype(a=1, b=2)
-        assert dict(d) == {'a': 1, 'b': 2}
-        assert dict(**d) == {'a': 1, 'b': 2}
+        self.assertEqual(dict(d), {'a': 1, 'b': 2})
+        self.assertEqual(dict(**d), {'a': 1, 'b': 2})
 
 
 if __name__ == '__main__':

From c60c2ee8d0c90c37cadfa2fbcfdf054eca2090af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 25 Feb 2019 22:33:36 +0100
Subject: [PATCH 0766/1519] fix minor styling issue in tests

---
 tests/document/class_methods.py      | 24 ++++++++++++------------
 tests/document/delta.py              |  1 +
 tests/document/json_serialisation.py |  6 +++---
 tests/fields/file_tests.py           |  1 +
 tests/fixtures.py                    |  1 +
 tests/queryset/field_list.py         |  4 ++--
 tests/queryset/geo.py                |  4 ++--
 tests/queryset/pickable.py           | 11 ++++++-----
 tests/queryset/visitor.py            |  1 -
 tests/test_connection.py             |  8 ++++----
 tests/test_context_managers.py       |  1 +
 tests/test_replicaset_connection.py  |  1 +
 tests/test_signals.py                |  4 ++--
 13 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index 2632d38f1..88937ec81 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -66,7 +66,7 @@ def test_drop_collection(self):
         """
         collection_name = 'person'
         self.Person(name='Test').save()
-        self.assertIn(collection_name,  self.db.collection_names())
+        self.assertIn(collection_name, self.db.collection_names())
 
         self.Person.drop_collection()
         self.assertNotIn(collection_name, self.db.collection_names())
@@ -102,16 +102,16 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         BlogPost.ensure_indexes()
-        self.assertEqual(BlogPost.compare_indexes(), { 'missing': [], 'extra': [] })
+        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
 
         BlogPost.ensure_index(['author', 'description'])
-        self.assertEqual(BlogPost.compare_indexes(), { 'missing': [], 'extra': [[('author', 1), ('description', 1)]] })
+        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': [[('author', 1), ('description', 1)]]})
 
         BlogPost._get_collection().drop_index('author_1_description_1')
-        self.assertEqual(BlogPost.compare_indexes(), { 'missing': [], 'extra': [] })
+        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
 
         BlogPost._get_collection().drop_index('author_1_title_1')
-        self.assertEqual(BlogPost.compare_indexes(), { 'missing': [[('author', 1), ('title', 1)]], 'extra': [] })
+        self.assertEqual(BlogPost.compare_indexes(), {'missing': [[('author', 1), ('title', 1)]], 'extra': []})
 
     def test_compare_indexes_inheritance(self):
         """ Ensure that the indexes are properly created and that
@@ -140,16 +140,16 @@ class BlogPostWithTags(BlogPost):
 
         BlogPost.ensure_indexes()
         BlogPostWithTags.ensure_indexes()
-        self.assertEqual(BlogPost.compare_indexes(), { 'missing': [], 'extra': [] })
+        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
 
         BlogPostWithTags.ensure_index(['author', 'tag_list'])
-        self.assertEqual(BlogPost.compare_indexes(), { 'missing': [], 'extra': [[('_cls', 1), ('author', 1), ('tag_list', 1)]] })
+        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': [[('_cls', 1), ('author', 1), ('tag_list', 1)]]})
 
         BlogPostWithTags._get_collection().drop_index('_cls_1_author_1_tag_list_1')
-        self.assertEqual(BlogPost.compare_indexes(), { 'missing': [], 'extra': [] })
+        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
 
         BlogPostWithTags._get_collection().drop_index('_cls_1_author_1_tags_1')
-        self.assertEqual(BlogPost.compare_indexes(), { 'missing': [[('_cls', 1), ('author', 1), ('tags', 1)]], 'extra': [] })
+        self.assertEqual(BlogPost.compare_indexes(), {'missing': [[('_cls', 1), ('author', 1), ('tags', 1)]], 'extra': []})
 
     def test_compare_indexes_multiple_subclasses(self):
         """ Ensure that compare_indexes behaves correctly if called from a
@@ -184,9 +184,9 @@ class BlogPostWithCustomField(BlogPost):
         BlogPostWithTags.ensure_indexes()
         BlogPostWithCustomField.ensure_indexes()
 
-        self.assertEqual(BlogPost.compare_indexes(), { 'missing': [], 'extra': [] })
-        self.assertEqual(BlogPostWithTags.compare_indexes(), { 'missing': [], 'extra': [] })
-        self.assertEqual(BlogPostWithCustomField.compare_indexes(), { 'missing': [], 'extra': [] })
+        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
+        self.assertEqual(BlogPostWithTags.compare_indexes(), {'missing': [], 'extra': []})
+        self.assertEqual(BlogPostWithCustomField.compare_indexes(), {'missing': [], 'extra': []})
 
     @requires_mongodb_gte_26
     def test_compare_indexes_for_text_indexes(self):
diff --git a/tests/document/delta.py b/tests/document/delta.py
index 302969567..942e3a0a4 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -863,5 +863,6 @@ class Doc(Document):
         self.assertEqual('oops', delta[0]["users.007.rolist"][0]["type"])
         self.assertEqual(uinfo.id, delta[0]["users.007.info"])
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/document/json_serialisation.py b/tests/document/json_serialisation.py
index 110f1e14d..7c785ab26 100644
--- a/tests/document/json_serialisation.py
+++ b/tests/document/json_serialisation.py
@@ -32,12 +32,12 @@ class Doc(Document):
             string = StringField(db_field='s')
             embedded = EmbeddedDocumentField(Embedded, db_field='e')
 
-        doc = Doc( string="Hello", embedded=Embedded(string="Inner Hello"))
-        doc_json = doc.to_json(sort_keys=True, use_db_field=False,separators=(',', ':'))
+        doc = Doc(string="Hello", embedded=Embedded(string="Inner Hello"))
+        doc_json = doc.to_json(sort_keys=True, use_db_field=False, separators=(',', ':'))
 
         expected_json = """{"embedded":{"string":"Inner Hello"},"string":"Hello"}"""
 
-        self.assertEqual( doc_json, expected_json)
+        self.assertEqual(doc_json, expected_json)
 
     def test_json_simple(self):
 
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 213e889cb..76e20bb9b 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -578,5 +578,6 @@ class Animal(Document):
         self.assertEqual(marmot.photos[0].foo, 'bar')
         self.assertEqual(marmot.photos[0].get().length, 8313)
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/fixtures.py b/tests/fixtures.py
index d8eb8487f..b8303b997 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -48,6 +48,7 @@ def post_save(self, sender, document, created, **kwargs):
     def post_delete(self, sender, document, **kwargs):
         pickled = pickle.dumps(document)
 
+
 signals.post_save.connect(PickleSignalsTest.post_save, sender=PickleSignalsTest)
 signals.post_delete.connect(PickleSignalsTest.post_delete, sender=PickleSignalsTest)
 
diff --git a/tests/queryset/field_list.py b/tests/queryset/field_list.py
index b111238a8..250e2601c 100644
--- a/tests/queryset/field_list.py
+++ b/tests/queryset/field_list.py
@@ -208,7 +208,7 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post = BlogPost(content='Had a good coffee today...', various={'test_dynamic':{'some': True}})
+        post = BlogPost(content='Had a good coffee today...', various={'test_dynamic': {'some': True}})
         post.author = User(name='Test User')
         post.comments = [Comment(title='I aggree', text='Great post!'), Comment(title='Coffee', text='I hate coffee')]
         post.save()
@@ -413,7 +413,6 @@ class Numbers(Document):
         numbers = Numbers.objects.fields(embedded__n={"$slice": [-5, 10]}).get()
         self.assertEqual(numbers.embedded.n, [-5, -4, -3, -2, -1])
 
-
     def test_exclude_from_subclasses_docs(self):
 
         class Base(Document):
@@ -436,5 +435,6 @@ class User(Base):
 
         self.assertRaises(LookUpError, Base.objects.exclude, "made_up")
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index fd8c9b0f2..240a94ab1 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -534,11 +534,11 @@ class Location(Document):
 
         Location.drop_collection()
 
-        Location(loc=[1,2]).save()
+        Location(loc=[1, 2]).save()
         loc = Location.objects.as_pymongo()[0]
         self.assertEqual(loc["loc"], {"type": "Point", "coordinates": [1, 2]})
 
-        Location.objects.update(set__loc=[2,1])
+        Location.objects.update(set__loc=[2, 1])
         loc = Location.objects.as_pymongo()[0]
         self.assertEqual(loc["loc"], {"type": "Point", "coordinates": [2, 1]})
 
diff --git a/tests/queryset/pickable.py b/tests/queryset/pickable.py
index d96e7dc6a..bf7bb31c8 100644
--- a/tests/queryset/pickable.py
+++ b/tests/queryset/pickable.py
@@ -6,10 +6,12 @@
 
 __author__ = 'stas'
 
+
 class Person(Document):
     name = StringField()
     age = IntField()
 
+
 class TestQuerysetPickable(unittest.TestCase):
     """
     Test for adding pickling support for QuerySet instances
@@ -18,7 +20,7 @@ class TestQuerysetPickable(unittest.TestCase):
     def setUp(self):
         super(TestQuerysetPickable, self).setUp()
 
-        connection = connect(db="test") #type: pymongo.mongo_client.MongoClient
+        connection = connect(db="test")  # type: pymongo.mongo_client.MongoClient
 
         connection.drop_database("test")
 
@@ -27,7 +29,6 @@ def setUp(self):
             age=21
         )
 
-
     def test_picke_simple_qs(self):
 
         qs = Person.objects.all()
@@ -46,10 +47,10 @@ def test_unpickle(self):
 
         self.assertEqual(qs.count(), loadedQs.count())
 
-        #can update loadedQs
+        # can update loadedQs
         loadedQs.update(age=23)
 
-        #check
+        # check
         self.assertEqual(Person.objects.first().age, 23)
 
     def test_pickle_support_filtration(self):
@@ -70,7 +71,7 @@ def test_pickle_support_filtration(self):
 
         self.assertEqual(loaded.count(), 2)
         self.assertEqual(loaded.filter(name="Bob").first().age, 23)
-    
+
 
 
 
diff --git a/tests/queryset/visitor.py b/tests/queryset/visitor.py
index 8261faaec..22d274a85 100644
--- a/tests/queryset/visitor.py
+++ b/tests/queryset/visitor.py
@@ -275,7 +275,6 @@ class BlogPost(Document):
         with self.assertRaises(InvalidQueryError):
             self.Person.objects.filter('user1')
 
-
     def test_q_regex(self):
         """Ensure that Q objects can be queried using regexes.
         """
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 88d63cdb5..7c4fc4cf2 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -99,11 +99,11 @@ def test_connect_with_host_list(self):
         conn = get_connection()
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host=['mongodb://localhost'], is_mock=True,  alias='testdb2')
+        connect(host=['mongodb://localhost'], is_mock=True, alias='testdb2')
         conn = get_connection('testdb2')
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host=['localhost'], is_mock=True,  alias='testdb3')
+        connect(host=['localhost'], is_mock=True, alias='testdb3')
         conn = get_connection('testdb3')
         self.assertIsInstance(conn, mongomock.MongoClient)
 
@@ -111,11 +111,11 @@ def test_connect_with_host_list(self):
         conn = get_connection('testdb4')
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host=['mongodb://localhost:27017', 'mongodb://localhost:27018'], is_mock=True,  alias='testdb5')
+        connect(host=['mongodb://localhost:27017', 'mongodb://localhost:27018'], is_mock=True, alias='testdb5')
         conn = get_connection('testdb5')
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host=['localhost:27017', 'localhost:27018'], is_mock=True,  alias='testdb6')
+        connect(host=['localhost:27017', 'localhost:27018'], is_mock=True, alias='testdb6')
         conn = get_connection('testdb6')
         self.assertIsInstance(conn, mongomock.MongoClient)
 
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 8fb7bc78a..8207cd895 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -302,5 +302,6 @@ def test_query_counter_ignores_particular_queries(self):
             _ = db.system.indexes.find_one()    # queries on db.system.indexes are ignored as well
             self.assertEqual(q, 1)
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index a53f5903e..4aa647d65 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -47,5 +47,6 @@ def test_replicaset_uri_passes_read_preference(self):
 
         self.assertEqual(conn.read_preference, READ_PREF)
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/test_signals.py b/tests/test_signals.py
index df687d0ee..f3b6e33cd 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -39,7 +39,6 @@ def pre_init(cls, sender, document, *args, **kwargs):
             def post_init(cls, sender, document, **kwargs):
                 signal_output.append('post_init signal, %s, document._created = %s' % (document, document._created))
 
-
             @classmethod
             def pre_save(cls, sender, document, **kwargs):
                 signal_output.append('pre_save signal, %s' % document)
@@ -247,7 +246,7 @@ def bulk_create_author_without_load():
         def load_existing_author():
             a  = self.Author(name='Bill Shakespeare')
             a.save()
-            self.get_signal_output(lambda: None) # eliminate signal output
+            self.get_signal_output(lambda: None)  # eliminate signal output
             a1 = self.Author.objects(name='Bill Shakespeare')[0]
 
         self.assertEqual(self.get_signal_output(create_author), [
@@ -431,5 +430,6 @@ def bulk_set_active_post():
             {}
         ])
 
+
 if __name__ == '__main__':
     unittest.main()

From dca837b843272385e7be80c7d6c1c037dc38393d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 2 Oct 2018 21:26:14 +0200
Subject: [PATCH 0767/1519] Add suport for Mongo 3.4 (travis, fix tests)

---
 .install_mongodb_on_travis.sh  |  8 +++++-
 .travis.yml                    |  9 +++----
 README.rst                     |  4 +--
 docs/changelog.rst             |  1 +
 mongoengine/mongodb_support.py | 21 ++++++++++++++++
 tests/document/indexes.py      | 26 +++++++++++++++----
 tests/fields/fields.py         |  4 +--
 tests/queryset/queryset.py     | 25 +++++++++---------
 tests/utils.py                 | 46 +++++++++++++++++-----------------
 9 files changed, 94 insertions(+), 50 deletions(-)
 create mode 100644 mongoengine/mongodb_support.py

diff --git a/.install_mongodb_on_travis.sh b/.install_mongodb_on_travis.sh
index 057ccf74b..6ac2e3641 100644
--- a/.install_mongodb_on_travis.sh
+++ b/.install_mongodb_on_travis.sh
@@ -19,8 +19,14 @@ elif [ "$MONGODB" = "3.2" ]; then
     sudo apt-get update
     sudo apt-get install mongodb-org-server=3.2.20
     # service should be started automatically
+elif [ "$MONGODB" = "3.4" ]; then
+    sudo apt-key adv --keyserver keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
+    echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
+    sudo apt-get update
+    sudo apt-get install mongodb-org-server=3.4.17
+    # service should be started automatically
 else
-    echo "Invalid MongoDB version, expected 2.6, 3.0, or 3.2"
+    echo "Invalid MongoDB version, expected 2.6, 3.0, 3.2 or 3.4."
     exit 1
 fi;
 
diff --git a/.travis.yml b/.travis.yml
index 4f77f4e03..a73391aac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,9 @@
 # combinations:
 # * MongoDB v2.6 is currently the "main" version tested against Python v2.7,
 #   v3.5, v3.6, PyPy, and PyMongo v3.x.
-# * MongoDB v3.0 & v3.2 are tested against Python v2.7, v3.5 & v3.6
+# * MongoDB v3.0, v3.2 are tested against Python v2.7, v3.5 & v3.6
 #   and Pymongo v3.5 & v3.x
+# * MongoDB v3.4 is tested against v3.6 and Pymongo v3.x
 # Reminder: Update README.rst if you change MongoDB versions we test.
 
 language: python
@@ -26,16 +27,14 @@ matrix:
   include:
   - python: 2.7
     env: MONGODB=3.0 PYMONGO=3.5
-  - python: 2.7
-    env: MONGODB=3.2 PYMONGO=3.x
-  - python: 3.5
-    env: MONGODB=3.0 PYMONGO=3.5
   - python: 3.5
     env: MONGODB=3.2 PYMONGO=3.x
   - python: 3.6
     env: MONGODB=3.0 PYMONGO=3.5
   - python: 3.6
     env: MONGODB=3.2 PYMONGO=3.x
+  - python: 3.6
+    env: MONGODB=3.4 PYMONGO=3.x
 
 before_install:
 - bash .install_mongodb_on_travis.sh
diff --git a/README.rst b/README.rst
index 4e186a856..f03091706 100644
--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,7 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v2.6, v3.0 and v3.2. Future
+MongoEngine is currently tested against MongoDB v2.6, v3.0, v3.2 and v3.4. Future
 versions should be supported as well, but aren't actively tested at the moment.
 Make sure to open an issue or submit a pull request if you experience any
 problems with MongoDB v3.4+.
@@ -36,7 +36,7 @@ Installation
 We recommend the use of `virtualenv <https://virtualenv.pypa.io/>`_ and of
 `pip <https://pip.pypa.io/>`_. You can then use ``pip install -U mongoengine``.
 You may also have `setuptools <http://peak.telecommunity.com/DevCenter/setuptools>`_
-and thus you can use ``easy_install -U mongoengine``. Another option is 
+and thus you can use ``easy_install -U mongoengine``. Another option is
 `pipenv <https://docs.pipenv.org/>`_. You can then use ``pipenv install mongoengine``
 to both create the virtual environment and install the package. Otherwise, you can
 download the source from `GitHub <http://github.com/MongoEngine/mongoengine>`_ and
diff --git a/docs/changelog.rst b/docs/changelog.rst
index ae7344485..c87fd1e95 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Development
 - Document a BREAKING CHANGE introduced in 0.15.3 and not reported at that time (#1995)
 - Fix InvalidStringData error when using modify on a BinaryField #1127
 - DEPRECATION: `EmbeddedDocument.save` & `.reload` are marked as deprecated and will be removed in a next version of mongoengine #1552
+- Fix test suite and CI to support MongoDB 3.4 #1445
 
 =================
 Changes in 0.16.3
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
new file mode 100644
index 000000000..b5f3bdc8f
--- /dev/null
+++ b/mongoengine/mongodb_support.py
@@ -0,0 +1,21 @@
+"""
+Helper functions, constants, and types to aid with MongoDB v3.x support
+"""
+from mongoengine.connection import get_connection
+
+
+# Constant that can be used to compare the version retrieved with
+# get_mongodb_version()
+MONGODB_34 = (3, 4)
+MONGODB_32 = (3, 2)
+MONGODB_3 = (3, 0)
+MONGODB_26 = (2, 6)
+
+
+def get_mongodb_version():
+    """Return the version of the connected mongoDB (first 2 digits)
+
+    :return: tuple(int, int)
+    """
+    version_list = get_connection().server_info()['versionArray'][:2]     # e.g: (3, 2)
+    return tuple(version_list)
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 57f485878..a21b45bc9 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -9,7 +9,8 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from tests.utils import get_mongodb_version, requires_mongodb_gte_26, MONGODB_32, MONGODB_3
+from mongoengine.mongodb_support import get_mongodb_version, MONGODB_32, MONGODB_3
+from tests.utils import requires_mongodb_gte_26, requires_mongodb_lte_32, requires_mongodb_gte_34
 
 __all__ = ("IndexesTest", )
 
@@ -477,6 +478,7 @@ class RecursiveDocument(Document):
     def test_covered_index(self):
         """Ensure that covered indexes can be used
         """
+        IS_MONGODB_3 = get_mongodb_version() >= MONGODB_3
 
         class Test(Document):
             a = IntField()
@@ -492,8 +494,6 @@ class Test(Document):
         obj = Test(a=1)
         obj.save()
 
-        IS_MONGODB_3 = get_mongodb_version() >= MONGODB_3
-
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
         query_plan = Test.objects(id=obj.id).exclude('a').explain()
@@ -569,7 +569,7 @@ class BlogPost(Document):
         if pymongo.version != '3.0':
             self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
 
-        if MONGO_VER == MONGODB_32:
+        if MONGO_VER >= MONGODB_32:
             # Mongo32 throws an error if an index exists (i.e `tags` in our case)
             # and you use hint on an index name that does not exist
             with self.assertRaises(OperationFailure):
@@ -601,6 +601,22 @@ class BlogPost(Document):
         # Ensure backwards compatibilty for errors
         self.assertRaises(OperationError, post2.save)
 
+    @requires_mongodb_gte_34
+    def test_primary_key_unique_not_working_under_mongo_34(self):
+        class Blog(Document):
+            id = StringField(primary_key=True, unique=True)
+
+        with self.assertRaises(OperationFailure) as ctx_err:
+            Blog(id='garbage').save()
+        self.assertIn("The field 'unique' is not valid for an _id index specification", str(ctx_err.exception))
+
+    @requires_mongodb_lte_32
+    def test_primary_key_unique_working_under_mongo_32(self):
+        class Blog(Document):
+            id = StringField(primary_key=True, unique=True)
+
+        Blog(id='garbage').save()
+
     def test_unique_with(self):
         """Ensure that unique_with constraints are applied to fields.
         """
@@ -760,7 +776,7 @@ def test_primary_save_duplicate_update_existing_object(self):
         You won't create a duplicate but you will update an existing document.
         """
         class User(Document):
-            name = StringField(primary_key=True, unique=True)
+            name = StringField(primary_key=True)
             password = StringField()
 
         User.drop_collection()
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 128936bf6..2c4ac3ac0 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2113,7 +2113,7 @@ class Doc2(Document):
             field_1 = StringField(db_field='f')
 
         class Doc(Document):
-            my_id = IntField(required=True, unique=True, primary_key=True)
+            my_id = IntField(primary_key=True)
             embed_me = DynamicField(db_field='e')
             field_x = StringField(db_field='x')
 
@@ -2135,7 +2135,7 @@ class Embed(EmbeddedDocument):
             field_1 = StringField(db_field='f')
 
         class Doc(Document):
-            my_id = IntField(required=True, unique=True, primary_key=True)
+            my_id = IntField(primary_key=True)
             embed_me = DynamicField(db_field='e')
             field_x = StringField(db_field='x')
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 3d8e8960b..05a7ca757 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -18,11 +18,12 @@
 from mongoengine.connection import get_connection, get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
+from mongoengine.mongodb_support import get_mongodb_version, MONGODB_32
 from mongoengine.python_support import IS_PYMONGO_3
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
 
-from tests.utils import requires_mongodb_gte_26, skip_pymongo3, get_mongodb_version, MONGODB_32
+from tests.utils import requires_mongodb_gte_26, skip_pymongo3
 
 __all__ = ("QuerySetTest",)
 
@@ -852,8 +853,8 @@ class Blog(Document):
             self.assertEqual(q, 0)
             Blog.objects.insert(blogs, load_bulk=False)
 
-            if MONGO_VER == MONGODB_32:
-                self.assertEqual(q, 1)              # 1 entry containing the list of inserts
+            if MONGO_VER >= MONGODB_32:
+                self.assertEqual(q, 1)      # 1 entry containing the list of inserts
             else:
                 self.assertEqual(q, len(blogs))     # 1 entry per doc inserted
 
@@ -869,8 +870,8 @@ class Blog(Document):
             self.assertEqual(q, 0)
             Blog.objects.insert(blogs)
 
-            if MONGO_VER == MONGODB_32:
-                self.assertEqual(q, 2)                  # 1 for insert 1 for fetch
+            if MONGO_VER >= MONGODB_32:
+                self.assertEqual(q, 2)              # 1 for insert 1 for fetch
             else:
                 self.assertEqual(q, len(blogs)+1)       # + 1 to fetch all docs
 
@@ -1204,7 +1205,7 @@ def test_filter_chaining(self):
         """Ensure filters can be chained together.
         """
         class Blog(Document):
-            id = StringField(unique=True, primary_key=True)
+            id = StringField(primary_key=True)
 
         class BlogPost(Document):
             blog = ReferenceField(Blog)
@@ -1316,7 +1317,7 @@ def test_clear_ordering(self):
         order_by() w/o any arguments.
         """
         MONGO_VER = self.mongodb_version
-        ORDER_BY_KEY = 'sort' if MONGO_VER == MONGODB_32 else '$orderby'
+        ORDER_BY_KEY = 'sort' if MONGO_VER >= MONGODB_32 else '$orderby'
 
         class BlogPost(Document):
             title = StringField()
@@ -2524,8 +2525,8 @@ class Author(Document):
     def test_comment(self):
         """Make sure adding a comment to the query gets added to the query"""
         MONGO_VER = self.mongodb_version
-        QUERY_KEY = 'filter' if MONGO_VER == MONGODB_32 else '$query'
-        COMMENT_KEY = 'comment' if MONGO_VER == MONGODB_32 else '$comment'
+        QUERY_KEY = 'filter' if MONGO_VER >= MONGODB_32 else '$query'
+        COMMENT_KEY = 'comment' if MONGO_VER >= MONGODB_32 else '$comment'
 
         class User(Document):
             age = IntField()
@@ -3349,7 +3350,7 @@ class News(Document):
             meta = {'indexes': [
                 {'fields': ['$title', "$content"],
                  'default_language': 'portuguese',
-                 'weight': {'title': 10, 'content': 2}
+                 'weights': {'title': 10, 'content': 2}
                  }
             ]}
 
@@ -5131,7 +5132,7 @@ class Doc(Document):
     def test_query_reference_to_custom_pk_doc(self):
 
         class A(Document):
-            id = StringField(unique=True, primary_key=True)
+            id = StringField(primary_key=True)
 
         class B(Document):
             a = ReferenceField(A)
@@ -5236,7 +5237,7 @@ class Person(Document):
 
     def test_bool_with_ordering(self):
         MONGO_VER = self.mongodb_version
-        ORDER_BY_KEY = 'sort' if MONGO_VER == MONGODB_32 else '$orderby'
+        ORDER_BY_KEY = 'sort' if MONGO_VER >= MONGODB_32 else '$orderby'
 
         class Person(Document):
             name = StringField()
diff --git a/tests/utils.py b/tests/utils.py
index 19936a542..e0380dbc5 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,22 +1,17 @@
+import operator
 import unittest
 
 from nose.plugins.skip import SkipTest
 
 from mongoengine import connect
-from mongoengine.connection import get_db, get_connection
+from mongoengine.connection import get_db
+from mongoengine.mongodb_support import get_mongodb_version, MONGODB_26, MONGODB_3, MONGODB_32, MONGODB_34
 from mongoengine.python_support import IS_PYMONGO_3
 
 
 MONGO_TEST_DB = 'mongoenginetest'   # standard name for the test database
 
 
-# Constant that can be used to compare the version retrieved with
-# get_mongodb_version()
-MONGODB_26 = (2, 6)
-MONGODB_3 = (3, 0)
-MONGODB_32 = (3, 2)
-
-
 class MongoDBTestCase(unittest.TestCase):
     """Base class for tests that need a mongodb connection
     It ensures that the db is clean at the beginning and dropped at the end automatically
@@ -38,34 +33,39 @@ def get_as_pymongo(doc):
     return doc.__class__.objects.as_pymongo().get(id=doc.id)
 
 
-def get_mongodb_version():
-    """Return the version of the connected mongoDB (first 2 digits)
-
-    :return: tuple(int, int)
-    """
-    version_list = get_connection().server_info()['versionArray'][:2]     # e.g: (3, 2)
-    return tuple(version_list)
-
-
-def _decorated_with_ver_requirement(func, version):
+def _decorated_with_ver_requirement(func, mongo_version_req, oper=operator.ge):
     """Return a given function decorated with the version requirement
     for a particular MongoDB version tuple.
 
-    :param version: The version required (tuple(int, int))
+    :param mongo_version_req: The mongodb version requirement (tuple(int, int))
+    :param oper: The operator to apply
     """
     def _inner(*args, **kwargs):
-        MONGODB_V = get_mongodb_version()
-        if MONGODB_V >= version:
+        mongodb_v = get_mongodb_version()
+        if oper(mongodb_v, mongo_version_req):
             return func(*args, **kwargs)
 
-        raise SkipTest('Needs MongoDB v{}+'.format('.'.join(str(n) for n in version)))
+        raise SkipTest('Needs MongoDB v{}+'.format('.'.join(str(n) for n in mongo_version_req)))
 
     _inner.__name__ = func.__name__
     _inner.__doc__ = func.__doc__
-
     return _inner
 
 
+def requires_mongodb_gte_34(func):
+    """Raise a SkipTest exception if we're working with MongoDB version
+    lower than v3.4
+    """
+    return _decorated_with_ver_requirement(func, MONGODB_34)
+
+
+def requires_mongodb_lte_32(func):
+    """Raise a SkipTest exception if we're working with MongoDB version
+    greater than v3.2.
+    """
+    return _decorated_with_ver_requirement(func, MONGODB_32, oper=operator.le)
+
+
 def requires_mongodb_gte_26(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v2.6.

From 7247b9b68ec546c4f0f43b01455dc1c6545492f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 24 Feb 2019 22:34:17 +0100
Subject: [PATCH 0768/1519] additional fixes to support Mongo3.4

---
 .travis.yml                    |  2 +-
 mongoengine/document.py        |  4 ++--
 mongoengine/mongodb_support.py |  2 +-
 tests/document/indexes.py      |  6 ++++++
 tests/utils.py                 | 10 +++++-----
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a73391aac..64086357a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@
 # combinations:
 # * MongoDB v2.6 is currently the "main" version tested against Python v2.7,
 #   v3.5, v3.6, PyPy, and PyMongo v3.x.
-# * MongoDB v3.0, v3.2 are tested against Python v2.7, v3.5 & v3.6
+# * MongoDB v3.0 & v3.2 are tested against Python v2.7, v3.5 & v3.6
 #   and Pymongo v3.5 & v3.x
 # * MongoDB v3.4 is tested against v3.6 and Pymongo v3.x
 # Reminder: Update README.rst if you change MongoDB versions we test.
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 84c1d6997..b671ac6b9 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -808,7 +808,7 @@ def drop_collection(cls):
         db.drop_collection(col_name)
 
     @classmethod
-    def create_index(cls, keys, background=False, **kwargs):
+    def _create_index(cls, keys, background=False, **kwargs):
         """Creates the given indexes if required.
 
         :param keys: a single index key or a list of index keys (to
@@ -851,7 +851,7 @@ def ensure_index(cls, key_or_list, drop_dups=False, background=False,
             warnings.warn(msg, DeprecationWarning)
         elif not IS_PYMONGO_3:
             kwargs.update({'drop_dups': drop_dups})
-        return cls.create_index(key_or_list, background=background, **kwargs)
+        return cls._create_index(key_or_list, background=background, **kwargs)
 
     @classmethod
     def ensure_indexes(cls):
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index b5f3bdc8f..717a3d813 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -1,5 +1,5 @@
 """
-Helper functions, constants, and types to aid with MongoDB v3.x support
+Helper functions, constants, and types to aid with MongoDB version support
 """
 from mongoengine.connection import get_connection
 
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index a21b45bc9..36fbae46d 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -603,18 +603,24 @@ class BlogPost(Document):
 
     @requires_mongodb_gte_34
     def test_primary_key_unique_not_working_under_mongo_34(self):
+        """Relates to  #1445"""
         class Blog(Document):
             id = StringField(primary_key=True, unique=True)
 
+        Blog.drop_collection()
+
         with self.assertRaises(OperationFailure) as ctx_err:
             Blog(id='garbage').save()
         self.assertIn("The field 'unique' is not valid for an _id index specification", str(ctx_err.exception))
 
     @requires_mongodb_lte_32
     def test_primary_key_unique_working_under_mongo_32(self):
+        """Relates to  #1445"""
         class Blog(Document):
             id = StringField(primary_key=True, unique=True)
 
+        Blog.drop_collection()
+
         Blog(id='garbage').save()
 
     def test_unique_with(self):
diff --git a/tests/utils.py b/tests/utils.py
index e0380dbc5..e94e4a804 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -33,12 +33,12 @@ def get_as_pymongo(doc):
     return doc.__class__.objects.as_pymongo().get(id=doc.id)
 
 
-def _decorated_with_ver_requirement(func, mongo_version_req, oper=operator.ge):
+def _decorated_with_ver_requirement(func, mongo_version_req, oper):
     """Return a given function decorated with the version requirement
     for a particular MongoDB version tuple.
 
     :param mongo_version_req: The mongodb version requirement (tuple(int, int))
-    :param oper: The operator to apply
+    :param oper: The operator to apply (e.g: operator.ge)
     """
     def _inner(*args, **kwargs):
         mongodb_v = get_mongodb_version()
@@ -56,7 +56,7 @@ def requires_mongodb_gte_34(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v3.4
     """
-    return _decorated_with_ver_requirement(func, MONGODB_34)
+    return _decorated_with_ver_requirement(func, MONGODB_34, oper=operator.ge)
 
 
 def requires_mongodb_lte_32(func):
@@ -70,14 +70,14 @@ def requires_mongodb_gte_26(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v2.6.
     """
-    return _decorated_with_ver_requirement(func, MONGODB_26)
+    return _decorated_with_ver_requirement(func, MONGODB_26, oper=operator.ge)
 
 
 def requires_mongodb_gte_3(func):
     """Raise a SkipTest exception if we're working with MongoDB version
     lower than v3.0.
     """
-    return _decorated_with_ver_requirement(func, MONGODB_3)
+    return _decorated_with_ver_requirement(func, MONGODB_3, oper=operator.ge)
 
 
 def skip_pymongo3(f):

From 7cea2a768f16eafaabcec55df8e222055a8d3ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 26 Feb 2019 22:39:49 +0100
Subject: [PATCH 0769/1519] Fix recent flaky test for python 3.6

---
 mongoengine/document.py   | 4 ++--
 tests/document/indexes.py | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index b671ac6b9..84c1d6997 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -808,7 +808,7 @@ def drop_collection(cls):
         db.drop_collection(col_name)
 
     @classmethod
-    def _create_index(cls, keys, background=False, **kwargs):
+    def create_index(cls, keys, background=False, **kwargs):
         """Creates the given indexes if required.
 
         :param keys: a single index key or a list of index keys (to
@@ -851,7 +851,7 @@ def ensure_index(cls, key_or_list, drop_dups=False, background=False,
             warnings.warn(msg, DeprecationWarning)
         elif not IS_PYMONGO_3:
             kwargs.update({'drop_dups': drop_dups})
-        return cls._create_index(key_or_list, background=background, **kwargs)
+        return cls.create_index(key_or_list, background=background, **kwargs)
 
     @classmethod
     def ensure_indexes(cls):
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 36fbae46d..abd349f35 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -611,7 +611,11 @@ class Blog(Document):
 
         with self.assertRaises(OperationFailure) as ctx_err:
             Blog(id='garbage').save()
-        self.assertIn("The field 'unique' is not valid for an _id index specification", str(ctx_err.exception))
+        try:
+            self.assertIn("The field 'unique' is not valid for an _id index specification", str(ctx_err.exception))
+        except AssertionError:
+            # error is slightly different on python 3.6
+            self.assertIn("The field 'background' is not valid for an _id index specification", str(ctx_err.exception))
 
     @requires_mongodb_lte_32
     def test_primary_key_unique_working_under_mongo_32(self):

From 35b7efe3f40c3ebea39d960fb100526d2fb968b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 24 Feb 2019 11:08:46 +0100
Subject: [PATCH 0770/1519] refactored deprecated pymongo methods in tests -
 remove/count/add_user/insert - added pymongo_support

---
 mongoengine/connection.py           |  4 +--
 mongoengine/context_managers.py     |  3 +-
 mongoengine/document.py             |  4 +--
 mongoengine/pymongo_support.py      | 33 ++++++++++++++++++++++
 mongoengine/python_support.py       |  7 +----
 mongoengine/queryset/base.py        |  2 +-
 mongoengine/queryset/transform.py   |  2 +-
 tests/document/class_methods.py     | 13 ++++-----
 tests/document/delta.py             | 14 ++++-----
 tests/document/inheritance.py       | 15 ++++------
 tests/document/instance.py          | 10 +++----
 tests/fields/file_tests.py          | 44 +++++++++++++++++------------
 tests/queryset/queryset.py          |  6 ++--
 tests/test_connection.py            | 21 +++++++-------
 tests/test_context_managers.py      |  3 +-
 tests/test_replicaset_connection.py |  2 +-
 tests/utils.py                      |  2 +-
 17 files changed, 106 insertions(+), 79 deletions(-)
 create mode 100644 mongoengine/pymongo_support.py

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 38ebb2431..c0cfde311 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,10 +1,10 @@
 from pymongo import MongoClient, ReadPreference, uri_parser
 import six
 
-from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.pymongo_support import IS_PYMONGO_3
 
 __all__ = ['MongoEngineConnectionError', 'connect', 'register_connection',
-           'DEFAULT_CONNECTION_NAME']
+           'DEFAULT_CONNECTION_NAME', 'get_db']
 
 
 DEFAULT_CONNECTION_NAME = 'default'
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index d1e5d9eff..98bd897b8 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -5,6 +5,7 @@
 
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
+from mongoengine.pymongo_support import count_documents
 
 __all__ = ('switch_db', 'switch_collection', 'no_dereference',
            'no_sub_classes', 'query_counter', 'set_write_concern')
@@ -237,7 +238,7 @@ def _get_count(self):
         and substracting the queries issued by this context. In fact everytime this is called, 1 query is
         issued so we need to balance that
         """
-        count = self.db.system.profile.find(self._ignored_query).count() - self._ctx_query_counter
+        count = count_documents(self.db.system.profile, self._ignored_query) - self._ctx_query_counter
         self._ctx_query_counter += 1    # Account for the query we just issued to gather the information
         return count
 
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 84c1d6997..5981d8d10 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -18,7 +18,7 @@
                                           switch_db)
 from mongoengine.errors import (InvalidDocumentError, InvalidQueryError,
                                 SaveConditionError)
-from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.pymongo_support import IS_PYMONGO_3, list_collection_names
 from mongoengine.queryset import (NotUniqueError, OperationError,
                                   QuerySet, transform)
 
@@ -228,7 +228,7 @@ def _get_capped_collection(cls):
 
         # If the collection already exists and has different options
         # (i.e. isn't capped or has different max/size), raise an error.
-        if collection_name in db.collection_names():
+        if collection_name in list_collection_names(db, include_system_collections=True):
             collection = db[collection_name]
             options = collection.options()
             if (
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
new file mode 100644
index 000000000..0d607162c
--- /dev/null
+++ b/mongoengine/pymongo_support.py
@@ -0,0 +1,33 @@
+"""
+Helper functions, constants, and types to aid with PyMongo v2.7 - v3.x support.
+"""
+import pymongo
+
+_PYMONGO_37 = (3, 7)
+
+PYMONGO_VERSION = tuple(pymongo.version_tuple[:2])
+
+IS_PYMONGO_3 = PYMONGO_VERSION[0] >= 3
+IS_PYMONGO_GTE_37 = PYMONGO_VERSION >= _PYMONGO_37
+
+
+def count_documents(collection, filter):
+    """Pymongo>3.7 deprecates count in favour of count_documents"""
+    if IS_PYMONGO_GTE_37:
+        return collection.count_documents(filter)
+    else:
+        count = collection.find(filter).count()
+    return count
+
+
+def list_collection_names(db, include_system_collections=False):
+    """Pymongo>3.7 deprecates collection_names in favour of list_collection_names"""
+    if IS_PYMONGO_GTE_37:
+        collections = db.list_collection_names()
+    else:
+        collections = db.collection_names()
+
+    if not include_system_collections:
+        collections = [c for c in collections if not c.startswith('system.')]
+
+    return collections
diff --git a/mongoengine/python_support.py b/mongoengine/python_support.py
index 7e8e108fb..57e467dbc 100644
--- a/mongoengine/python_support.py
+++ b/mongoengine/python_support.py
@@ -1,13 +1,8 @@
 """
-Helper functions, constants, and types to aid with Python v2.7 - v3.x and
-PyMongo v2.7 - v3.x support.
+Helper functions, constants, and types to aid with Python v2.7 - v3.x support
 """
-import pymongo
 import six
 
-
-IS_PYMONGO_3 = pymongo.version_tuple[0] >= 3
-
 # six.BytesIO resolves to StringIO.StringIO in Py2 and io.BytesIO in Py3.
 StringIO = six.BytesIO
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 8c22c5b97..9ddfeab25 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -21,7 +21,7 @@
 from mongoengine.context_managers import set_write_concern, switch_db
 from mongoengine.errors import (InvalidQueryError, LookUpError,
                                 NotUniqueError, OperationError)
-from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.pymongo_support import IS_PYMONGO_3
 from mongoengine.queryset import transform
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index c00271f34..3de10a692 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -10,7 +10,7 @@
 from mongoengine.common import _import_class
 from mongoengine.connection import get_connection
 from mongoengine.errors import InvalidQueryError
-from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.pymongo_support import IS_PYMONGO_3
 
 __all__ = ('query', 'update')
 
diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index 88937ec81..421618e40 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -2,6 +2,7 @@
 import unittest
 
 from mongoengine import *
+from mongoengine.pymongo_support import list_collection_names
 
 from mongoengine.queryset import NULLIFY, PULL
 from mongoengine.connection import get_db
@@ -27,9 +28,7 @@ class Person(Document):
         self.Person = Person
 
     def tearDown(self):
-        for collection in self.db.collection_names():
-            if 'system.' in collection:
-                continue
+        for collection in list_collection_names(self.db):
             self.db.drop_collection(collection)
 
     def test_definition(self):
@@ -66,10 +65,10 @@ def test_drop_collection(self):
         """
         collection_name = 'person'
         self.Person(name='Test').save()
-        self.assertIn(collection_name, self.db.collection_names())
+        self.assertIn(collection_name, list_collection_names(self.db))
 
         self.Person.drop_collection()
-        self.assertNotIn(collection_name, self.db.collection_names())
+        self.assertNotIn(collection_name, list_collection_names(self.db))
 
     def test_register_delete_rule(self):
         """Ensure that register delete rule adds a delete rule to the document
@@ -340,7 +339,7 @@ class Person(Document):
             meta = {'collection': collection_name}
 
         Person(name="Test User").save()
-        self.assertIn(collection_name, self.db.collection_names())
+        self.assertIn(collection_name, list_collection_names(self.db))
 
         user_obj = self.db[collection_name].find_one()
         self.assertEqual(user_obj['name'], "Test User")
@@ -349,7 +348,7 @@ class Person(Document):
         self.assertEqual(user_obj.name, "Test User")
 
         Person.drop_collection()
-        self.assertNotIn(collection_name, self.db.collection_names())
+        self.assertNotIn(collection_name, list_collection_names(self.db))
 
     def test_collection_name_and_primary(self):
         """Ensure that a collection with a specified name may be used.
diff --git a/tests/document/delta.py b/tests/document/delta.py
index 942e3a0a4..504c1707c 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -3,16 +3,14 @@
 
 from bson import SON
 from mongoengine import *
-from mongoengine.connection import get_db
+from mongoengine.pymongo_support import list_collection_names
+from tests.utils import MongoDBTestCase
 
-__all__ = ("DeltaTest",)
 
-
-class DeltaTest(unittest.TestCase):
+class DeltaTest(MongoDBTestCase):
 
     def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
+        super(DeltaTest, self).setUp()
 
         class Person(Document):
             name = StringField()
@@ -25,9 +23,7 @@ class Person(Document):
         self.Person = Person
 
     def tearDown(self):
-        for collection in self.db.collection_names():
-            if 'system.' in collection:
-                continue
+        for collection in list_collection_names(self.db):
             self.db.drop_collection(collection)
 
     def test_delta(self):
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index 83c2a80a7..d81039f42 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -6,23 +6,18 @@
 
 from mongoengine import (BooleanField, Document, EmbeddedDocument,
                          EmbeddedDocumentField, GenericReferenceField,
-                         IntField, ReferenceField, StringField, connect)
-from mongoengine.connection import get_db
+                         IntField, ReferenceField, StringField)
+from mongoengine.pymongo_support import list_collection_names
+from tests.utils import MongoDBTestCase
 from tests.fixtures import Base
 
 __all__ = ('InheritanceTest', )
 
 
-class InheritanceTest(unittest.TestCase):
-
-    def setUp(self):
-        connect(db='mongoenginetest')
-        self.db = get_db()
+class InheritanceTest(MongoDBTestCase):
 
     def tearDown(self):
-        for collection in self.db.collection_names():
-            if 'system.' in collection:
-                continue
+        for collection in list_collection_names(self.db):
             self.db.drop_collection(collection)
 
     def test_constructor_cls(self):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 051eda680..9b28f1b4e 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -12,6 +12,7 @@
 from pymongo.errors import DuplicateKeyError
 from six import iteritems
 
+from mongoengine.pymongo_support import list_collection_names
 from tests import fixtures
 from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
                             PickleDynamicEmbedded, PickleDynamicTest)
@@ -55,9 +56,7 @@ class Person(Document):
         self.Job = Job
 
     def tearDown(self):
-        for collection in self.db.collection_names():
-            if 'system.' in collection:
-                continue
+        for collection in list_collection_names(self.db):
             self.db.drop_collection(collection)
 
     def assertDbEqual(self, docs):
@@ -572,7 +571,7 @@ class Post(Document):
 
         Post.drop_collection()
 
-        Post._get_collection().insert({
+        Post._get_collection().insert_one({
             "title": "Items eclipse",
             "items": ["more lorem", "even more ipsum"]
         })
@@ -3217,8 +3216,7 @@ class Person(Document):
         coll = Person._get_collection()
         for person in Person.objects.as_pymongo():
             if 'height' not in person:
-                person['height'] = 189
-                coll.save(person)
+                coll.update_one({'_id': person['_id']}, {'$set': {'height': 189}})
 
         self.assertEquals(Person.objects(height=189).count(), 1)
 
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 76e20bb9b..4ff6865bb 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -24,6 +24,16 @@
 TEST_IMAGE2_PATH = os.path.join(os.path.dirname(__file__), 'mongodb_leaf.png')
 
 
+def get_file(path):
+    """Use a BytesIO instead of a file to allow
+    to have a one-liner and avoid that the file remains opened"""
+    bytes_io = StringIO()
+    with open(path, 'rb') as f:
+        bytes_io.write(f.read())
+    bytes_io.seek(0)
+    return bytes_io
+
+
 class FileTest(MongoDBTestCase):
 
     def tearDown(self):
@@ -247,8 +257,8 @@ class Animal(Document):
         Animal.drop_collection()
         marmot = Animal(genus='Marmota', family='Sciuridae')
 
-        marmot_photo = open(TEST_IMAGE_PATH, 'rb')  # Retrieve a photo from disk
-        marmot.photo.put(marmot_photo, content_type='image/jpeg', foo='bar')
+        marmot_photo_content = get_file(TEST_IMAGE_PATH)  # Retrieve a photo from disk
+        marmot.photo.put(marmot_photo_content, content_type='image/jpeg', foo='bar')
         marmot.photo.close()
         marmot.save()
 
@@ -261,11 +271,11 @@ class TestFile(Document):
             the_file = FileField()
         TestFile.drop_collection()
 
-        test_file = TestFile(the_file=open(TEST_IMAGE_PATH, 'rb')).save()
+        test_file = TestFile(the_file=get_file(TEST_IMAGE_PATH)).save()
         self.assertEqual(test_file.the_file.get().length, 8313)
 
         test_file = TestFile.objects.first()
-        test_file.the_file = open(TEST_IMAGE2_PATH, 'rb')
+        test_file.the_file = get_file(TEST_IMAGE2_PATH)
         test_file.save()
         self.assertEqual(test_file.the_file.get().length, 4971)
 
@@ -379,7 +389,7 @@ class TestImage(Document):
                 self.assertEqual("%s" % e, "Invalid image: cannot identify image file %s" % f)
 
         t = TestImage()
-        t.image.put(open(TEST_IMAGE_PATH, 'rb'))
+        t.image.put(get_file(TEST_IMAGE_PATH))
         t.save()
 
         t = TestImage.objects.first()
@@ -400,11 +410,11 @@ class TestFile(Document):
             the_file = ImageField()
         TestFile.drop_collection()
 
-        test_file = TestFile(the_file=open(TEST_IMAGE_PATH, 'rb')).save()
+        test_file = TestFile(the_file=get_file(TEST_IMAGE_PATH)).save()
         self.assertEqual(test_file.the_file.size, (371, 76))
 
         test_file = TestFile.objects.first()
-        test_file.the_file = open(TEST_IMAGE2_PATH, 'rb')
+        test_file.the_file = get_file(TEST_IMAGE2_PATH)
         test_file.save()
         self.assertEqual(test_file.the_file.size, (45, 101))
 
@@ -418,7 +428,7 @@ class TestImage(Document):
         TestImage.drop_collection()
 
         t = TestImage()
-        t.image.put(open(TEST_IMAGE_PATH, 'rb'))
+        t.image.put(get_file(TEST_IMAGE_PATH))
         t.save()
 
         t = TestImage.objects.first()
@@ -441,7 +451,7 @@ class TestImage(Document):
         TestImage.drop_collection()
 
         t = TestImage()
-        t.image.put(open(TEST_IMAGE_PATH, 'rb'))
+        t.image.put(get_file(TEST_IMAGE_PATH))
         t.save()
 
         t = TestImage.objects.first()
@@ -464,7 +474,7 @@ class TestImage(Document):
         TestImage.drop_collection()
 
         t = TestImage()
-        t.image.put(open(TEST_IMAGE_PATH, 'rb'))
+        t.image.put(get_file(TEST_IMAGE_PATH))
         t.save()
 
         t = TestImage.objects.first()
@@ -542,8 +552,8 @@ class TestImage(Document):
         TestImage.drop_collection()
 
         t = TestImage()
-        t.image1.put(open(TEST_IMAGE_PATH, 'rb'))
-        t.image2.put(open(TEST_IMAGE2_PATH, 'rb'))
+        t.image1.put(get_file(TEST_IMAGE_PATH))
+        t.image2.put(get_file(TEST_IMAGE2_PATH))
         t.save()
 
         test = TestImage.objects.first()
@@ -563,12 +573,10 @@ class Animal(Document):
         Animal.drop_collection()
         marmot = Animal(genus='Marmota', family='Sciuridae')
 
-        marmot_photo = open(TEST_IMAGE_PATH, 'rb')  # Retrieve a photo from disk
-
-        photos_field = marmot._fields['photos'].field
-        new_proxy = photos_field.get_proxy_obj('photos', marmot)
-        new_proxy.put(marmot_photo, content_type='image/jpeg', foo='bar')
-        marmot_photo.close()
+        with open(TEST_IMAGE_PATH, 'rb') as marmot_photo:   # Retrieve a photo from disk
+            photos_field = marmot._fields['photos'].field
+            new_proxy = photos_field.get_proxy_obj('photos', marmot)
+            new_proxy.put(marmot_photo, content_type='image/jpeg', foo='bar')
 
         marmot.photos.append(new_proxy)
         marmot.save()
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 3d8e8960b..b45edb33c 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -18,7 +18,7 @@
 from mongoengine.connection import get_connection, get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
-from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.pymongo_support import IS_PYMONGO_3
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
 
@@ -4051,7 +4051,7 @@ class IntPair(Document):
             fielda = IntField()
             fieldb = IntField()
 
-        IntPair.objects._collection.remove()
+        IntPair.drop_collection()
 
         a = IntPair(fielda=1, fieldb=1)
         b = IntPair(fielda=1, fieldb=2)
@@ -5386,7 +5386,7 @@ class Person(Document):
 
         Person.drop_collection()
 
-        Person._get_collection().insert({'name': 'a', 'id': ''})
+        Person._get_collection().insert_one({'name': 'a', 'id': ''})
         for p in Person.objects():
             self.assertEqual(p.name, 'a')
 
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 7c4fc4cf2..fafef9d40 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -14,7 +14,7 @@
     connect, register_connection,
     Document, DateTimeField
 )
-from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.pymongo_support import IS_PYMONGO_3
 import mongoengine.connection
 from mongoengine.connection import (MongoEngineConnectionError, get_db,
                                     get_connection)
@@ -147,12 +147,12 @@ def test_sharing_connections(self):
     def test_connect_uri(self):
         """Ensure that the connect() method works properly with URIs."""
         c = connect(db='mongoenginetest', alias='admin')
-        c.admin.system.users.remove({})
-        c.mongoenginetest.system.users.remove({})
+        c.admin.system.users.delete_many({})
+        c.mongoenginetest.system.users.delete_many({})
 
-        c.admin.add_user("admin", "password")
+        c.admin.command("createUser", "admin", pwd="password", roles=["root"])
         c.admin.authenticate("admin", "password")
-        c.mongoenginetest.add_user("username", "password")
+        c.admin.command("createUser", "username", pwd="password", roles=["dbOwner"])
 
         if not IS_PYMONGO_3:
             self.assertRaises(
@@ -169,8 +169,8 @@ def test_connect_uri(self):
         self.assertIsInstance(db, pymongo.database.Database)
         self.assertEqual(db.name, 'mongoenginetest')
 
-        c.admin.system.users.remove({})
-        c.mongoenginetest.system.users.remove({})
+        c.admin.system.users.delete_many({})
+        c.mongoenginetest.system.users.delete_many({})
 
     def test_connect_uri_without_db(self):
         """Ensure connect() method works properly if the URI doesn't
@@ -217,8 +217,9 @@ def test_connect_uri_with_authsource(self):
         """
         # Create users
         c = connect('mongoenginetest')
-        c.admin.system.users.remove({})
-        c.admin.add_user('username2', 'password')
+
+        c.admin.system.users.delete_many({})
+        c.admin.command("createUser", "username2", pwd="password", roles=["dbOwner"])
 
         # Authentication fails without "authSource"
         if IS_PYMONGO_3:
@@ -246,7 +247,7 @@ def test_connect_uri_with_authsource(self):
         self.assertEqual(db.name, 'mongoenginetest')
 
         # Clear all users
-        authd_conn.admin.system.users.remove({})
+        authd_conn.admin.system.users.delete_many({})
 
     def test_register_connection(self):
         """Ensure that connections with different aliases may be registered.
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 8207cd895..227031e04 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -5,6 +5,7 @@
 from mongoengine.context_managers import (switch_db, switch_collection,
                                           no_sub_classes, no_dereference,
                                           query_counter)
+from mongoengine.pymongo_support import count_documents
 
 
 class ContextManagersTest(unittest.TestCase):
@@ -240,7 +241,7 @@ def test_query_counter(self):
         collection.drop()
 
         def issue_1_count_query():
-            collection.find({}).count()
+            count_documents(collection, {})
 
         def issue_1_insert_query():
             collection.insert_one({'test': 'garbage'})
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index 4aa647d65..81fdfb641 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -2,7 +2,7 @@
 
 from pymongo import ReadPreference
 
-from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.pymongo_support import IS_PYMONGO_3
 
 if IS_PYMONGO_3:
     from pymongo import MongoClient
diff --git a/tests/utils.py b/tests/utils.py
index 19936a542..bda3a8789 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -4,7 +4,7 @@
 
 from mongoengine import connect
 from mongoengine.connection import get_db, get_connection
-from mongoengine.python_support import IS_PYMONGO_3
+from mongoengine.pymongo_support import IS_PYMONGO_3
 
 
 MONGO_TEST_DB = 'mongoenginetest'   # standard name for the test database

From 7ef688b256907748981c92291a768451288f1d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 2 Mar 2019 22:05:23 +0100
Subject: [PATCH 0771/1519] Added a test for push in DictField (relates to
 #1679)

---
 tests/fields/test_dict_field.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index a3b8ec6cb..ade02ccf6 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -199,6 +199,26 @@ class Simple(Document):
         self.assertEqual(
             Simple.objects.filter(mapping__nested_dict__list__1__value='Boo').count(), 1)
 
+    def test_push_dict(self):
+        class MyModel(Document):
+            events = ListField(DictField())
+
+        doc = MyModel(events=[{'a': 1}]).save()
+        raw_doc = get_as_pymongo(doc)
+        expected_raw_doc = {
+            '_id': doc.id,
+            'events': [{'a': 1}]
+        }
+        self.assertEqual(raw_doc, expected_raw_doc)
+
+        MyModel.objects(id=doc.id).update(push__events={})
+        raw_doc = get_as_pymongo(doc)
+        expected_raw_doc = {
+            '_id': doc.id,
+            'events': [{'a': 1}, {}]
+        }
+        self.assertEqual(raw_doc, expected_raw_doc)
+
     def test_ensure_unique_default_instances(self):
         """Ensure that every field has it's own unique default instance."""
         class D(Document):

From b640c766dbb84c7a77efae8645f2d9f480ca96d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 4 Mar 2019 23:01:12 +0100
Subject: [PATCH 0772/1519] Fix queryset batch_size that wasn't copied to
 cloned queryset

---
 mongoengine/queryset/base.py |  2 +-
 tests/queryset/queryset.py   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 9ddfeab25..24e126234 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -757,7 +757,7 @@ def _clone_into(self, new_qs):
                       '_read_preference', '_iter', '_scalar', '_as_pymongo',
                       '_limit', '_skip', '_hint', '_auto_dereference',
                       '_search_text', 'only_fields', '_max_time_ms',
-                      '_comment')
+                      '_comment', '_batch_size')
 
         for prop in copy_props:
             val = getattr(self, prop)
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 0d8d6285a..662ffe616 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -394,6 +394,16 @@ class A(Document):
         with self.assertRaises(ValueError):
             list(qs)
 
+    def test_batch_size_cloned(self):
+        class A(Document):
+            s = StringField()
+
+        # test that batch size gets cloned
+        qs = A.objects.batch_size(5)
+        self.assertEqual(qs._batch_size, 5)
+        qs_clone = qs.clone()
+        self.assertEqual(qs_clone._batch_size, 5)
+
     def test_update_write_concern(self):
         """Test that passing write_concern works"""
         self.Person.drop_collection()

From 9bd0d6b99d960d3a1b14c627c4148d6bea510df3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 4 Mar 2019 23:05:22 +0100
Subject: [PATCH 0773/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c87fd1e95..da1026d4f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Fix .only() working improperly after using .count() of the same instance of QuerySet
+- Fix batch_size that was not copied when cloning a queryset object #2011
 - POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (_cls, _id) when using `QuerySet.as_pymongo` #1976
 - Document a BREAKING CHANGE introduced in 0.15.3 and not reported at that time (#1995)
 - Fix InvalidStringData error when using modify on a BinaryField #1127

From 7b4245c91c6bd55b70e37cf58272e08c60b0b678 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Sun, 10 Mar 2019 21:16:58 +0800
Subject: [PATCH 0774/1519] Bump version 0.17.0

---
 docs/changelog.rst      | 3 +++
 mongoengine/__init__.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c87fd1e95..97da8d102 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.17.0
+=================
 - Fix .only() working improperly after using .count() of the same instance of QuerySet
 - POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (_cls, _id) when using `QuerySet.as_pymongo` #1976
 - Document a BREAKING CHANGE introduced in 0.15.3 and not reported at that time (#1995)
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 2b78d4e63..b94efab9b 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 16, 3)
+VERSION = (0, 17, 0)
 
 
 def get_version():

From 48b849c0319e5f35b81eeb926e7540d3d168aa78 Mon Sep 17 00:00:00 2001
From: lalala223 <hi@lalala.ink>
Date: Wed, 13 Mar 2019 17:50:54 +0800
Subject: [PATCH 0775/1519] Update querying.rst

Fix the 'not' operator error example.
---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 089878350..151855a63 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -64,7 +64,7 @@ Available operators are as follows:
 * ``gt`` -- greater than
 * ``gte`` -- greater than or equal to
 * ``not`` -- negate a standard check, may be used before other operators (e.g.
-  ``Q(age__not__mod=5)``)
+  ``Q(age__not__mod=(5, 0))``)
 * ``in`` -- value is in list (a list of values should be provided)
 * ``nin`` -- value is not in list (a list of values should be provided)
 * ``mod`` -- ``value % x == y``, where ``x`` and ``y`` are two provided values

From 68497542b3eaf58fe33ce6548de8f5c76fd751b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 17 Mar 2019 22:04:19 +0100
Subject: [PATCH 0776/1519] Bump the required version of pymongo to >=3.5

---
 README.rst                           |  2 +-
 mongoengine/document.py              | 10 ----------
 requirements.txt                     |  2 +-
 setup.py                             |  2 +-
 tests/document/indexes.py            |  4 ----
 tests/document/json_serialisation.py |  4 ----
 tests/queryset/queryset.py           |  3 ---
 tests/test_connection.py             | 12 +-----------
 8 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/README.rst b/README.rst
index f03091706..12d9df0ea 100644
--- a/README.rst
+++ b/README.rst
@@ -47,7 +47,7 @@ Dependencies
 All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_.
 At the very least, you'll need these two packages to use MongoEngine:
 
-- pymongo>=2.7.1
+- pymongo>=3.5
 - six>=1.10.0
 
 If you utilize a ``DateTimeField``, you might also use a more flexible date parser:
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 5981d8d10..328ac2990 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -451,16 +451,6 @@ def _save_create(self, doc, force_insert, write_concern):
 
             object_id = wc_collection.insert_one(doc).inserted_id
 
-        # In PyMongo 3.0, the save() call calls internally the _update() call
-        # but they forget to return the _id value passed back, therefore getting it back here
-        # Correct behaviour in 2.X and in 3.0.1+ versions
-        if not object_id and pymongo.version_tuple == (3, 0):
-            pk_as_mongo_obj = self._fields.get(self._meta['id_field']).to_mongo(self.pk)
-            object_id = (
-                self._qs.filter(pk=pk_as_mongo_obj).first() and
-                self._qs.filter(pk=pk_as_mongo_obj).first().pk
-            )  # TODO doesn't this make 2 queries?
-
         return object_id
 
     def _get_update_doc(self):
diff --git a/requirements.txt b/requirements.txt
index 4e3ea9402..38e0b20ff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 nose
-pymongo>=2.7.1
+pymongo>=3.5
 six==1.10.0
 flake8
 flake8-import-order
diff --git a/setup.py b/setup.py
index c7632ce31..c8e9c038d 100644
--- a/setup.py
+++ b/setup.py
@@ -80,7 +80,7 @@ def get_version(version_tuple):
     long_description=LONG_DESCRIPTION,
     platforms=['any'],
     classifiers=CLASSIFIERS,
-    install_requires=['pymongo>=2.7.1', 'six'],
+    install_requires=['pymongo>=3.5', 'six'],
     test_suite='nose.collector',
     **extra_opts
 )
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index abd349f35..dd443857e 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -565,10 +565,6 @@ class BlogPost(Document):
         self.assertEqual(BlogPost.objects.count(), 10)
         self.assertEqual(BlogPost.objects.hint().count(), 10)
 
-        # PyMongo 3.0 bug only, works correctly with 2.X and 3.0.1+ versions
-        if pymongo.version != '3.0':
-            self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
-
         if MONGO_VER >= MONGODB_32:
             # Mongo32 throws an error if an index exists (i.e `tags` in our case)
             # and you use hint on an index name that does not exist
diff --git a/tests/document/json_serialisation.py b/tests/document/json_serialisation.py
index 7c785ab26..251b65a2e 100644
--- a/tests/document/json_serialisation.py
+++ b/tests/document/json_serialisation.py
@@ -61,10 +61,6 @@ def __eq__(self, other):
         self.assertEqual(doc, Doc.from_json(doc.to_json()))
 
     def test_json_complex(self):
-
-        if pymongo.version_tuple[0] <= 2 and pymongo.version_tuple[1] <= 3:
-            raise SkipTest("Need pymongo 2.4 as has a fix for DBRefs")
-
         class EmbeddedDoc(EmbeddedDocument):
             pass
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 662ffe616..46d822037 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4602,9 +4602,6 @@ class Doc(Document):
         self.assertEqual(doc_objects, Doc.objects.from_json(json_data))
 
     def test_json_complex(self):
-        if pymongo.version_tuple[0] <= 2 and pymongo.version_tuple[1] <= 3:
-            raise SkipTest("Need pymongo 2.4 as has a fix for DBRefs")
-
         class EmbeddedDoc(EmbeddedDocument):
             pass
 
diff --git a/tests/test_connection.py b/tests/test_connection.py
index fafef9d40..0a7271df3 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -285,14 +285,7 @@ def test_connection_pool_via_kwarg(self):
         """Ensure we can specify a max connection pool size using
         a connection kwarg.
         """
-        # Use "max_pool_size" or "maxpoolsize" depending on PyMongo version
-        # (former was changed to the latter as described in
-        # https://jira.mongodb.org/browse/PYTHON-854).
-        # TODO remove once PyMongo < 3.0 support is dropped
-        if pymongo.version_tuple[0] >= 3:
-            pool_size_kwargs = {'maxpoolsize': 100}
-        else:
-            pool_size_kwargs = {'max_pool_size': 100}
+        pool_size_kwargs = {'maxpoolsize': 100}
 
         conn = connect('mongoenginetest', alias='max_pool_size_via_kwarg', **pool_size_kwargs)
         self.assertEqual(conn.max_pool_size, 100)
@@ -301,9 +294,6 @@ def test_connection_pool_via_uri(self):
         """Ensure we can specify a max connection pool size using
         an option in a connection URI.
         """
-        if pymongo.version_tuple[0] == 2 and pymongo.version_tuple[1] < 9:
-            raise SkipTest('maxpoolsize as a URI option is only supported in PyMongo v2.9+')
-
         conn = connect(host='mongodb://localhost/test?maxpoolsize=100', alias='max_pool_size_via_uri')
         self.assertEqual(conn.max_pool_size, 100)
 

From 6f8be8c8ac2023354aa1227a2eb9f1c92cf49266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 17 Mar 2019 22:11:01 +0100
Subject: [PATCH 0777/1519] document change in changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9a6068120..741d3f8d3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Development
 ===========
+- mongoengine now requires pymongo>=3.5 #2017
 - (Fill this out as you fix issues and develop your features).
 
 Changes in 0.17.0

From ba6a37f315392a48092486ade238db97d1ac67e7 Mon Sep 17 00:00:00 2001
From: Paulo Amaral <paulo.amaral@optimorlabs.com>
Date: Fri, 15 Mar 2019 13:20:40 +0000
Subject: [PATCH 0778/1519] Generate Unique Indices for SortedListField and
 EmbeddedDocumentListFields

---
 AUTHORS                      |  3 +-
 docs/changelog.rst           |  1 +
 mongoengine/base/document.py |  3 +-
 tests/document/indexes.py    | 71 ++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 880dfad1d..e8a43dac5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -248,4 +248,5 @@ that much better:
  * Andy Yankovsky (https://github.com/werat)
  * Bastien Gérard (https://github.com/bagerard)
  * Trevor Hall (https://github.com/tjhall13)
- * Gleb Voropaev (https://github.com/buggyspace)
\ No newline at end of file
+ * Gleb Voropaev (https://github.com/buggyspace)
+ * Paulo Amaral (https://github.com/pauloAmaral)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9a6068120..42a0ab14e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Development
 ===========
+- Generate Unique Indices for SortedListField and EmbeddedDocumentListFields #2020
 - (Fill this out as you fix issues and develop your features).
 
 Changes in 0.17.0
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 8587f17f3..4cf34b4fa 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -883,7 +883,8 @@ def _unique_with_indexes(cls, namespace=''):
                 index = {'fields': fields, 'unique': True, 'sparse': sparse}
                 unique_indexes.append(index)
 
-            if field.__class__.__name__ == 'ListField':
+            if field.__class__.__name__ in {'EmbeddedDocumentListField',
+                                            'ListField', 'SortedListField'}:
                 field = field.field
 
             # Grab any embedded document field unique indexes
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index abd349f35..b63faa9d2 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -708,6 +708,77 @@ class BlogPost(Document):
 
         self.assertRaises(NotUniqueError, post2.save)
 
+    def test_unique_embedded_document_in_sorted_list(self):
+        """
+        Ensure that the uniqueness constraints are applied to fields in
+        embedded documents, even when the embedded documents in a sorted list
+        field.
+        """
+        class SubDocument(EmbeddedDocument):
+            year = IntField()
+            slug = StringField(unique=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            subs = SortedListField(EmbeddedDocumentField(SubDocument),
+                                   ordering='year')
+
+        BlogPost.drop_collection()
+
+        post1 = BlogPost(
+            title='test1', subs=[
+                SubDocument(year=2009, slug='conflict'),
+                SubDocument(year=2009, slug='conflict')
+            ]
+        )
+        post1.save()
+
+        # confirm that the unique index is created
+        indexes = BlogPost._get_collection().index_information()
+        self.assertIn('subs.slug_1', indexes)
+        self.assertTrue(indexes['subs.slug_1']['unique'])
+
+        post2 = BlogPost(
+            title='test2', subs=[SubDocument(year=2014, slug='conflict')]
+        )
+
+        self.assertRaises(NotUniqueError, post2.save)
+
+    def test_unique_embedded_document_in_embedded_document_list(self):
+        """
+        Ensure that the uniqueness constraints are applied to fields in
+        embedded documents, even when the embedded documents in an embedded
+        list field.
+        """
+        class SubDocument(EmbeddedDocument):
+            year = IntField()
+            slug = StringField(unique=True)
+
+        class BlogPost(Document):
+            title = StringField()
+            subs = EmbeddedDocumentListField(SubDocument)
+
+        BlogPost.drop_collection()
+
+        post1 = BlogPost(
+            title='test1', subs=[
+                SubDocument(year=2009, slug='conflict'),
+                SubDocument(year=2009, slug='conflict')
+            ]
+        )
+        post1.save()
+
+        # confirm that the unique index is created
+        indexes = BlogPost._get_collection().index_information()
+        self.assertIn('subs.slug_1', indexes)
+        self.assertTrue(indexes['subs.slug_1']['unique'])
+
+        post2 = BlogPost(
+            title='test2', subs=[SubDocument(year=2014, slug='conflict')]
+        )
+
+        self.assertRaises(NotUniqueError, post2.save)
+
     def test_unique_with_embedded_document_and_embedded_unique(self):
         """Ensure that uniqueness constraints are applied to fields on
         embedded documents.  And work with unique_with as well.

From fdcaca42ae6145ac102ec3475bdc8c550a7a604a Mon Sep 17 00:00:00 2001
From: Gaurav Dadhania <gaurav@dadhania.in>
Date: Wed, 20 Feb 2019 12:42:07 +0530
Subject: [PATCH 0779/1519] Do not keep calling _dereference on values if it
 has already been dereferenced.

---
 AUTHORS                    |   1 +
 docs/changelog.rst         |   1 +
 mongoengine/base/fields.py |   7 ++-
 tests/test_dereference.py  | 103 +++++++++++++++++++++++++++++++++++++
 4 files changed, 111 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index e8a43dac5..21b0ec64b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -250,3 +250,4 @@ that much better:
  * Trevor Hall (https://github.com/tjhall13)
  * Gleb Voropaev (https://github.com/buggyspace)
  * Paulo Amaral (https://github.com/pauloAmaral)
+ * Gaurav Dadhania (https://github.com/GVRV)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9d87d8892..53373302c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,6 +17,7 @@ Changes in 0.17.0
 - Fix InvalidStringData error when using modify on a BinaryField #1127
 - DEPRECATION: `EmbeddedDocument.save` & `.reload` are marked as deprecated and will be removed in a next version of mongoengine #1552
 - Fix test suite and CI to support MongoDB 3.4 #1445
+- Fix reference fields querying the database on each access if value contains orphan DBRefs
 
 =================
 Changes in 0.16.3
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 5586c5b7c..598eb606b 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -276,11 +276,16 @@ def __get__(self, instance, owner):
 
         _dereference = _import_class('DeReference')()
 
-        if instance._initialised and dereference and instance._data.get(self.name):
+        if (instance._initialised and
+                dereference and
+                instance._data.get(self.name) and
+                not getattr(instance._data[self.name], '_dereferenced', False)):
             instance._data[self.name] = _dereference(
                 instance._data.get(self.name), max_depth=1, instance=instance,
                 name=self.name
             )
+            if hasattr(instance._data[self.name], '_dereferenced'):
+                instance._data[self.name]._dereferenced = True
 
         value = super(ComplexBaseField, self).__get__(instance, owner)
 
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index cf1194f49..9c5658108 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -105,6 +105,14 @@ class Group(Document):
 
             [m for m in group_obj.members]
             self.assertEqual(q, 2)
+            self.assertTrue(group_obj._data['members']._dereferenced)
+
+            # verifies that no additional queries gets executed
+            # if we re-iterate over the ListField once it is
+            # dereferenced
+            [m for m in group_obj.members]
+            self.assertEqual(q, 2)
+            self.assertTrue(group_obj._data['members']._dereferenced)
 
         # Document select_related
         with query_counter() as q:
@@ -125,6 +133,46 @@ class Group(Document):
                 [m for m in group_obj.members]
                 self.assertEqual(q, 2)
 
+    def test_list_item_dereference_orphan_dbref(self):
+        """Ensure that orphan DBRef items in ListFields are dereferenced.
+        """
+        class User(Document):
+            name = StringField()
+
+        class Group(Document):
+            members = ListField(ReferenceField(User, dbref=False))
+
+        User.drop_collection()
+        Group.drop_collection()
+
+        for i in range(1, 51):
+            user = User(name='user %s' % i)
+            user.save()
+
+        group = Group(members=User.objects)
+        group.save()
+        group.reload()  # Confirm reload works
+
+        # Delete one User so one of the references in the
+        # Group.members list is an orphan DBRef
+        User.objects[0].delete()
+        with query_counter() as q:
+            self.assertEqual(q, 0)
+
+            group_obj = Group.objects.first()
+            self.assertEqual(q, 1)
+
+            [m for m in group_obj.members]
+            self.assertEqual(q, 2)
+            self.assertTrue(group_obj._data['members']._dereferenced)
+
+            # verifies that no additional queries gets executed
+            # if we re-iterate over the ListField once it is
+            # dereferenced
+            [m for m in group_obj.members]
+            self.assertEqual(q, 2)
+            self.assertTrue(group_obj._data['members']._dereferenced)
+
         User.drop_collection()
         Group.drop_collection()
 
@@ -505,6 +553,61 @@ class Group(Document):
                 for m in group_obj.members:
                     self.assertIn('User', m.__class__.__name__)
 
+
+    def test_generic_reference_orphan_dbref(self):
+        """Ensure that generic orphan DBRef items in ListFields are dereferenced.
+        """
+
+        class UserA(Document):
+            name = StringField()
+
+        class UserB(Document):
+            name = StringField()
+
+        class UserC(Document):
+            name = StringField()
+
+        class Group(Document):
+            members = ListField(GenericReferenceField())
+
+        UserA.drop_collection()
+        UserB.drop_collection()
+        UserC.drop_collection()
+        Group.drop_collection()
+
+        members = []
+        for i in range(1, 51):
+            a = UserA(name='User A %s' % i)
+            a.save()
+
+            b = UserB(name='User B %s' % i)
+            b.save()
+
+            c = UserC(name='User C %s' % i)
+            c.save()
+
+            members += [a, b, c]
+
+        group = Group(members=members)
+        group.save()
+
+        # Delete one UserA instance so that there is
+        # an orphan DBRef in the GenericReference ListField
+        UserA.objects[0].delete()
+        with query_counter() as q:
+            self.assertEqual(q, 0)
+
+            group_obj = Group.objects.first()
+            self.assertEqual(q, 1)
+
+            [m for m in group_obj.members]
+            self.assertEqual(q, 4)
+            self.assertTrue(group_obj._data['members']._dereferenced)
+
+            [m for m in group_obj.members]
+            self.assertEqual(q, 4)
+            self.assertTrue(group_obj._data['members']._dereferenced)
+
         UserA.drop_collection()
         UserB.drop_collection()
         UserC.drop_collection()

From 9f2a9d9cda4f1bfb9ca7467e1e2769b51850f188 Mon Sep 17 00:00:00 2001
From: Neeraj <n.raj.suthar@gmail.com>
Date: Wed, 3 Apr 2019 19:09:45 +0530
Subject: [PATCH 0780/1519] Fix limit usage in aggregate

As per https://stackoverflow.com/a/24161461
---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 24e126234..c2fb34dfb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1200,7 +1200,7 @@ def aggregate(self, *pipeline, **kwargs):
             initial_pipeline.append({'$sort': dict(self._ordering)})
 
         if self._limit is not None:
-            initial_pipeline.append({'$limit': self._limit})
+            initial_pipeline.append({'$limit': self._limit + self._skip})
 
         if self._skip is not None:
             initial_pipeline.append({'$skip': self._skip})

From 4ccfdf051d6d7a94406ab7004baaea82278ceb92 Mon Sep 17 00:00:00 2001
From: Neeraj Suthar <neeraj@unibuddy.com>
Date: Sat, 6 Apr 2019 17:23:02 +0530
Subject: [PATCH 0781/1519] remove fix; add testcases

---
 mongoengine/queryset/base.py |   2 +-
 tests/queryset/queryset.py   | 179 +++++++++++++++++++++++++++++++++++
 2 files changed, 180 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c2fb34dfb..24e126234 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1200,7 +1200,7 @@ def aggregate(self, *pipeline, **kwargs):
             initial_pipeline.append({'$sort': dict(self._ordering)})
 
         if self._limit is not None:
-            initial_pipeline.append({'$limit': self._limit + self._skip})
+            initial_pipeline.append({'$limit': self._limit})
 
         if self._skip is not None:
             initial_pipeline.append({'$skip': self._skip})
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 46d822037..1a5aa1f24 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -5349,6 +5349,185 @@ class Person(Document):
             {'_id': None, 'avg': 29, 'total': 2}
         ])
 
+    @requires_mongodb_gte_26
+    def test_queryset_aggregation_with_skip(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p1.save()
+
+        p2 = Person(name="Wilson Junior", age=21)
+        p2.save()
+
+        p3 = Person(name="Sandra Mara", age=37)
+        p3.save()
+
+        data = Person.objects.skip(1).aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}}
+        )
+
+        self.assertEqual(list(data), [
+            {'_id': p2.pk, 'name': "WILSON JUNIOR"},
+            {'_id': p3.pk, 'name': "SANDRA MARA"}
+        ])
+
+    @requires_mongodb_gte_26
+    def test_queryset_aggregation_with_limit(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p1.save()
+
+        p2 = Person(name="Wilson Junior", age=21)
+        p2.save()
+
+        p3 = Person(name="Sandra Mara", age=37)
+        p3.save()
+
+        data = Person.objects.limit(1).aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}}
+        )
+
+        self.assertEqual(list(data), [
+            {'_id': p1.pk, 'name': "ISABELLA LUANNA"}
+        ])
+
+    @requires_mongodb_gte_26
+    def test_queryset_aggregation_with_sort(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p1.save()
+
+        p2 = Person(name="Wilson Junior", age=21)
+        p2.save()
+
+        p3 = Person(name="Sandra Mara", age=37)
+        p3.save()
+
+        data = Person.objects.order_by('name').aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}}
+        )
+
+        self.assertEqual(list(data), [
+            {'_id': p1.pk, 'name': "ISABELLA LUANNA"},
+            {'_id': p3.pk, 'name': "SANDRA MARA"},
+            {'_id': p2.pk, 'name': "WILSON JUNIOR"}
+        ])
+
+    @requires_mongodb_gte_26
+    def test_queryset_aggregation_with_skip_with_limit(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p1.save()
+
+        p2 = Person(name="Wilson Junior", age=21)
+        p2.save()
+
+        p3 = Person(name="Sandra Mara", age=37)
+        p3.save()
+
+        data = Person.objects.skip(1).limit(1).aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}}
+        )
+
+        self.assertEqual(list(data), [
+            {'_id': p2.pk, 'name': "WILSON JUNIOR"},
+        ])
+
+    @requires_mongodb_gte_26
+    def test_queryset_aggregation_with_sort_with_limit(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p1.save()
+
+        p2 = Person(name="Wilson Junior", age=21)
+        p2.save()
+
+        p3 = Person(name="Sandra Mara", age=37)
+        p3.save()
+
+        data = Person.objects.order_by('name').limit(2).aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}}
+        )
+
+        self.assertEqual(list(data), [
+            {'_id': p1.pk, 'name': "ISABELLA LUANNA"},
+            {'_id': p3.pk, 'name': "SANDRA MARA"}
+        ])
+
+    @requires_mongodb_gte_26
+    def test_queryset_aggregation_with_sort_with_skip(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p1.save()
+
+        p2 = Person(name="Wilson Junior", age=21)
+        p2.save()
+
+        p3 = Person(name="Sandra Mara", age=37)
+        p3.save()
+
+        data = Person.objects.order_by('name').skip(2).aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}}
+        )
+
+        self.assertEqual(list(data), [
+            {'_id': p2.pk, 'name': "WILSON JUNIOR"}
+        ])
+
+    @requires_mongodb_gte_26
+    def test_queryset_aggregation_with_sort_with_skip_with_limit(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p1.save()
+
+        p2 = Person(name="Wilson Junior", age=21)
+        p2.save()
+
+        p3 = Person(name="Sandra Mara", age=37)
+        p3.save()
+
+        data = Person.objects.order_by('name').skip(1).limit(1).aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}}
+        )
+
+        self.assertEqual(list(data), [
+            {'_id': p3.pk, 'name': "SANDRA MARA"}
+        ])
+
     def test_delete_count(self):
         [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
         self.assertEqual(self.Person.objects().delete(), 3)  # test ordinary QuerySey delete count

From 61081651e4f1662e205037b3daa4897e402b924a Mon Sep 17 00:00:00 2001
From: Neeraj Suthar <neeraj@unibuddy.com>
Date: Sat, 6 Apr 2019 17:42:14 +0530
Subject: [PATCH 0782/1519] reinsert fix; add comments, reference

---
 mongoengine/queryset/base.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 24e126234..66e435142 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1200,7 +1200,11 @@ def aggregate(self, *pipeline, **kwargs):
             initial_pipeline.append({'$sort': dict(self._ordering)})
 
         if self._limit is not None:
-            initial_pipeline.append({'$limit': self._limit})
+            # As per MongoDB Documentation (https://docs.mongodb.com/manual/reference/operator/aggregation/limit/),
+            # keeping limit stage right after sort stage is more efficient. But this leads to wrong set of documents
+            # for a skip stage that might succeed these. So we need to maintain more documents in memory in such a
+            # case (https://stackoverflow.com/a/24161461).
+            initial_pipeline.append({'$limit': self._limit + (self._skip or 0)})
 
         if self._skip is not None:
             initial_pipeline.append({'$skip': self._skip})

From b5213097e887997a247218d9229c0ad3bec074a9 Mon Sep 17 00:00:00 2001
From: Yurii Andrieiev <yurii@andrieiev.com>
Date: Sun, 7 Apr 2019 02:02:26 +0300
Subject: [PATCH 0783/1519] Fail fast when db name is invalid

Without this commit save operation on first document would fail instead of immediate failure upon connection attempt. Such later failure is much less obvious.
---
 AUTHORS                   |  1 +
 docs/changelog.rst        |  1 +
 mongoengine/connection.py | 12 ++++++++++++
 tests/test_connection.py  | 32 +++++++++++++++++++++++++++++++-
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 21b0ec64b..45a754cc3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -251,3 +251,4 @@ that much better:
  * Gleb Voropaev (https://github.com/buggyspace)
  * Paulo Amaral (https://github.com/pauloAmaral)
  * Gaurav Dadhania (https://github.com/GVRV)
+ * Yurii Andrieiev (https://github.com/yandrieiev)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 53373302c..707182f18 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Development
 ===========
 - mongoengine now requires pymongo>=3.5 #2017
 - Generate Unique Indices for SortedListField and EmbeddedDocumentListFields #2020
+- connect() fails immediately when db name contains invalid characters (e. g. when user mistakenly puts 'mongodb://127.0.0.1:27017' as db name, happened in #1718) or is if db name is of an invalid type
 - (Fill this out as you fix issues and develop your features).
 
 Changes in 0.17.0
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index c0cfde311..dda9bbb70 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,4 +1,5 @@
 from pymongo import MongoClient, ReadPreference, uri_parser
+from pymongo.database import _check_name
 import six
 
 from mongoengine.pymongo_support import IS_PYMONGO_3
@@ -28,6 +29,16 @@ class MongoEngineConnectionError(Exception):
 _dbs = {}
 
 
+def check_db_name(name):
+    """Check if a database name is valid.
+    This functionality is copied from pymongo Database class constructor.
+    """
+    if not isinstance(name, six.string_types):
+        raise TypeError('name must be an instance of %s' % six.string_types)
+    elif name != '$external':
+        _check_name(name)
+
+
 def register_connection(alias, db=None, name=None, host=None, port=None,
                         read_preference=READ_PREFERENCE,
                         username=None, password=None,
@@ -69,6 +80,7 @@ def register_connection(alias, db=None, name=None, host=None, port=None,
         'authentication_mechanism': authentication_mechanism
     }
 
+    check_db_name(conn_settings['name'])
     conn_host = conn_settings['host']
 
     # Host can be a list or a string, so if string, force to a list.
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 0a7271df3..fb2a20d7a 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,5 +1,5 @@
 import datetime
-from pymongo.errors import OperationFailure
+from pymongo.errors import OperationFailure, InvalidName
 
 try:
     import unittest2 as unittest
@@ -49,6 +49,36 @@ def test_connect(self):
         conn = get_connection('testdb')
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
+    def test_connect_with_invalid_db_name(self):
+        """Ensure that connect() method fails fast if db name is invalid
+        """
+        with self.assertRaises(InvalidName):
+            connect('mongomock://localhost')
+
+    def test_connect_with_db_name_external(self):
+        """Ensure that connect() works if db name is $external
+        """
+        """Ensure that the connect() method works properly."""
+        connect('$external')
+
+        conn = get_connection()
+        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+
+        db = get_db()
+        self.assertIsInstance(db, pymongo.database.Database)
+        self.assertEqual(db.name, '$external')
+
+        connect('$external', alias='testdb')
+        conn = get_connection('testdb')
+        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+
+    def test_connect_with_invalid_db_name_type(self):
+        """Ensure that connect() method fails fast if db name has invalid type
+        """
+        with self.assertRaises(TypeError):
+            non_string_db_name = ['e. g. list instead of a string']
+            connect(non_string_db_name)
+
     def test_connect_in_mocking(self):
         """Ensure that the connect() method works properly in mocking.
         """

From 9bb3dfd6392f554dea5716df5cc5b49df7e53cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 7 Apr 2019 23:05:55 +0200
Subject: [PATCH 0784/1519] updated changelog for recent commits + improve
 tests

---
 docs/changelog.rst         |  1 +
 tests/queryset/queryset.py | 79 ++++++++++++++++++--------------------
 2 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 53373302c..5a472eb5b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Development
 ===========
+- POTENTIAL BREAKING CHANGE: Aggregate gives wrong results when used with a queryset having limit and skip #2029
 - mongoengine now requires pymongo>=3.5 #2017
 - Generate Unique Indices for SortedListField and EmbeddedDocumentListFields #2020
 - (Fill this out as you fix issues and develop your features).
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 1a5aa1f24..31b1641ea 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -5312,13 +5312,9 @@ class Person(Document):
         Person.drop_collection()
 
         p1 = Person(name="Isabella Luanna", age=16)
-        p1.save()
-
         p2 = Person(name="Wilson Junior", age=21)
-        p2.save()
-
         p3 = Person(name="Sandra Mara", age=37)
-        p3.save()
+        Person.objects.insert([p1, p2, p3])
 
         data = Person.objects(age__lte=22).aggregate(
             {'$project': {'name': {'$toUpper': '$name'}}}
@@ -5358,13 +5354,9 @@ class Person(Document):
         Person.drop_collection()
 
         p1 = Person(name="Isabella Luanna", age=16)
-        p1.save()
-
         p2 = Person(name="Wilson Junior", age=21)
-        p2.save()
-
         p3 = Person(name="Sandra Mara", age=37)
-        p3.save()
+        Person.objects.insert([p1, p2, p3])
 
         data = Person.objects.skip(1).aggregate(
             {'$project': {'name': {'$toUpper': '$name'}}}
@@ -5384,13 +5376,9 @@ class Person(Document):
         Person.drop_collection()
 
         p1 = Person(name="Isabella Luanna", age=16)
-        p1.save()
-
         p2 = Person(name="Wilson Junior", age=21)
-        p2.save()
-
         p3 = Person(name="Sandra Mara", age=37)
-        p3.save()
+        Person.objects.insert([p1, p2, p3])
 
         data = Person.objects.limit(1).aggregate(
             {'$project': {'name': {'$toUpper': '$name'}}}
@@ -5409,13 +5397,9 @@ class Person(Document):
         Person.drop_collection()
 
         p1 = Person(name="Isabella Luanna", age=16)
-        p1.save()
-
         p2 = Person(name="Wilson Junior", age=21)
-        p2.save()
-
         p3 = Person(name="Sandra Mara", age=37)
-        p3.save()
+        Person.objects.insert([p1, p2, p3])
 
         data = Person.objects.order_by('name').aggregate(
             {'$project': {'name': {'$toUpper': '$name'}}}
@@ -5436,22 +5420,27 @@ class Person(Document):
         Person.drop_collection()
 
         p1 = Person(name="Isabella Luanna", age=16)
-        p1.save()
-
         p2 = Person(name="Wilson Junior", age=21)
-        p2.save()
-
         p3 = Person(name="Sandra Mara", age=37)
-        p3.save()
+        Person.objects.insert([p1, p2, p3])
 
-        data = Person.objects.skip(1).limit(1).aggregate(
+        data = list(
+            Person.objects.skip(1).limit(1).aggregate(
             {'$project': {'name': {'$toUpper': '$name'}}}
+            )
         )
 
         self.assertEqual(list(data), [
             {'_id': p2.pk, 'name': "WILSON JUNIOR"},
         ])
 
+        # Make sure limit/skip chaining order has no impact
+        data2 = Person.objects.limit(1).skip(1).aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}}
+        )
+
+        self.assertEqual(data, list(data2))
+
     @requires_mongodb_gte_26
     def test_queryset_aggregation_with_sort_with_limit(self):
         class Person(Document):
@@ -5461,13 +5450,9 @@ class Person(Document):
         Person.drop_collection()
 
         p1 = Person(name="Isabella Luanna", age=16)
-        p1.save()
-
         p2 = Person(name="Wilson Junior", age=21)
-        p2.save()
-
         p3 = Person(name="Sandra Mara", age=37)
-        p3.save()
+        Person.objects.insert([p1, p2, p3])
 
         data = Person.objects.order_by('name').limit(2).aggregate(
             {'$project': {'name': {'$toUpper': '$name'}}}
@@ -5478,6 +5463,26 @@ class Person(Document):
             {'_id': p3.pk, 'name': "SANDRA MARA"}
         ])
 
+        # Verify adding limit/skip steps works as expected
+        data = Person.objects.order_by('name').limit(2).aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}},
+            {'$limit': 1},
+        )
+
+        self.assertEqual(list(data), [
+            {'_id': p1.pk, 'name': "ISABELLA LUANNA"},
+        ])
+
+        data = Person.objects.order_by('name').limit(2).aggregate(
+            {'$project': {'name': {'$toUpper': '$name'}}},
+            {'$skip': 1},
+            {'$limit': 1},
+        )
+
+        self.assertEqual(list(data), [
+            {'_id': p3.pk, 'name': "SANDRA MARA"},
+        ])
+
     @requires_mongodb_gte_26
     def test_queryset_aggregation_with_sort_with_skip(self):
         class Person(Document):
@@ -5487,13 +5492,9 @@ class Person(Document):
         Person.drop_collection()
 
         p1 = Person(name="Isabella Luanna", age=16)
-        p1.save()
-
         p2 = Person(name="Wilson Junior", age=21)
-        p2.save()
-
         p3 = Person(name="Sandra Mara", age=37)
-        p3.save()
+        Person.objects.insert([p1, p2, p3])
 
         data = Person.objects.order_by('name').skip(2).aggregate(
             {'$project': {'name': {'$toUpper': '$name'}}}
@@ -5512,13 +5513,9 @@ class Person(Document):
         Person.drop_collection()
 
         p1 = Person(name="Isabella Luanna", age=16)
-        p1.save()
-
         p2 = Person(name="Wilson Junior", age=21)
-        p2.save()
-
         p3 = Person(name="Sandra Mara", age=37)
-        p3.save()
+        Person.objects.insert([p1, p2, p3])
 
         data = Person.objects.order_by('name').skip(1).limit(1).aggregate(
             {'$project': {'name': {'$toUpper': '$name'}}}

From d1467c2f73dc29a16058a06cb10185f04bd2d5cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 15 Apr 2019 21:24:07 +0200
Subject: [PATCH 0785/1519] Fix connect/disconnect functions - expose
 disconnect - disconnect cleans _connection_settings - disconnect cleans
 cached collection in Document._collection - re-connecting with the same alias
 raise an error (must call disconnect in between)

---
 docs/changelog.rst         |   5 +
 mongoengine/base/common.py |  11 +-
 mongoengine/connection.py  |  93 +++++++++++++---
 mongoengine/document.py    |  10 +-
 tests/test_connection.py   | 213 +++++++++++++++++++++++++++++++++++--
 tests/utils.py             |   4 +-
 6 files changed, 311 insertions(+), 25 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5a472eb5b..6bd19b120 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,11 @@ Changelog
 
 Development
 ===========
+- expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
+- POTENTIAL BREAKING CHANGE: Fixes in connect/disconnect methods
+    - calling `connect` 2 times with the same alias and different parameter will raise an error (should call disconnect first)
+    - disconnect now clears `mongoengine.connection._connection_settings`
+    - disconnect now clears the cached attribute `Document._collection`
 - POTENTIAL BREAKING CHANGE: Aggregate gives wrong results when used with a queryset having limit and skip #2029
 - mongoengine now requires pymongo>=3.5 #2017
 - Generate Unique Indices for SortedListField and EmbeddedDocumentListFields #2020
diff --git a/mongoengine/base/common.py b/mongoengine/base/common.py
index d747c8cc7..999fd23ab 100644
--- a/mongoengine/base/common.py
+++ b/mongoengine/base/common.py
@@ -13,7 +13,7 @@
 
 
 def get_document(name):
-    """Get a document class by name."""
+    """Get a registered Document class by name."""
     doc = _document_registry.get(name, None)
     if not doc:
         # Possible old style name
@@ -30,3 +30,12 @@ def get_document(name):
             been imported?
         """.strip() % name)
     return doc
+
+
+def _get_documents_by_db(connection_alias, default_connection_alias):
+    """Get all registered Documents class attached to a given database"""
+    def get_doc_alias(doc_cls):
+        return doc_cls._meta.get('db_alias', default_connection_alias)
+
+    return [doc_cls for doc_cls in _document_registry.values()
+            if get_doc_alias(doc_cls) == connection_alias]
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index c0cfde311..13541bd43 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -3,11 +3,13 @@
 
 from mongoengine.pymongo_support import IS_PYMONGO_3
 
-__all__ = ['MongoEngineConnectionError', 'connect', 'register_connection',
-           'DEFAULT_CONNECTION_NAME', 'get_db']
+__all__ = ['MongoEngineConnectionError', 'connect', 'disconnect', 'disconnect_all',
+           'register_connection', 'DEFAULT_CONNECTION_NAME', 'DEFAULT_DATABASE_NAME',
+           'get_db', 'get_connection']
 
 
 DEFAULT_CONNECTION_NAME = 'default'
+DEFAULT_DATABASE_NAME = 'test'
 
 if IS_PYMONGO_3:
     READ_PREFERENCE = ReadPreference.PRIMARY
@@ -28,18 +30,17 @@ class MongoEngineConnectionError(Exception):
 _dbs = {}
 
 
-def register_connection(alias, db=None, name=None, host=None, port=None,
-                        read_preference=READ_PREFERENCE,
-                        username=None, password=None,
-                        authentication_source=None,
-                        authentication_mechanism=None,
-                        **kwargs):
-    """Add a connection.
+def _get_connection_settings(
+        db=None, name=None, host=None, port=None,
+        read_preference=READ_PREFERENCE,
+        username=None, password=None,
+        authentication_source=None,
+        authentication_mechanism=None,
+        **kwargs):
+    """Get the connection settings as a dict
 
-    :param alias: the name that will be used to refer to this connection
-        throughout MongoEngine
-    :param name: the name of the specific database to use
     :param db: the name of the database to use, for compatibility with connect
+    :param name: the name of the specific database to use
     :param host: the host name of the :program:`mongod` instance to connect to
     :param port: the port that the :program:`mongod` instance is running on
     :param read_preference: The read preference for the collection
@@ -59,7 +60,7 @@ def register_connection(alias, db=None, name=None, host=None, port=None,
     .. versionchanged:: 0.10.6 - added mongomock support
     """
     conn_settings = {
-        'name': name or db or 'test',
+        'name': name or db or DEFAULT_DATABASE_NAME,
         'host': host or 'localhost',
         'port': port or 27017,
         'read_preference': read_preference,
@@ -125,17 +126,74 @@ def register_connection(alias, db=None, name=None, host=None, port=None,
     kwargs.pop('is_slave', None)
 
     conn_settings.update(kwargs)
+    return conn_settings
+
+
+def register_connection(alias, db=None, name=None, host=None, port=None,
+                        read_preference=READ_PREFERENCE,
+                        username=None, password=None,
+                        authentication_source=None,
+                        authentication_mechanism=None,
+                        **kwargs):
+    """Register the connection settings.
+
+    :param alias: the name that will be used to refer to this connection
+        throughout MongoEngine
+    :param name: the name of the specific database to use
+    :param db: the name of the database to use, for compatibility with connect
+    :param host: the host name of the :program:`mongod` instance to connect to
+    :param port: the port that the :program:`mongod` instance is running on
+    :param read_preference: The read preference for the collection
+       ** Added pymongo 2.1
+    :param username: username to authenticate with
+    :param password: password to authenticate with
+    :param authentication_source: database to authenticate against
+    :param authentication_mechanism: database authentication mechanisms.
+        By default, use SCRAM-SHA-1 with MongoDB 3.0 and later,
+        MONGODB-CR (MongoDB Challenge Response protocol) for older servers.
+    :param is_mock: explicitly use mongomock for this connection
+        (can also be done by using `mongomock://` as db host prefix)
+    :param kwargs: ad-hoc parameters to be passed into the pymongo driver,
+        for example maxpoolsize, tz_aware, etc. See the documentation
+        for pymongo's `MongoClient` for a full list.
+
+    .. versionchanged:: 0.10.6 - added mongomock support
+    """
+    conn_settings = _get_connection_settings(
+        db=db, name=name, host=host, port=port,
+        read_preference=read_preference,
+        username=username, password=password,
+        authentication_source=authentication_source,
+        authentication_mechanism=authentication_mechanism,
+        **kwargs)
     _connection_settings[alias] = conn_settings
 
 
 def disconnect(alias=DEFAULT_CONNECTION_NAME):
     """Close the connection with a given alias."""
+    from mongoengine.base.common import _get_documents_by_db
+
     if alias in _connections:
         get_connection(alias=alias).close()
         del _connections[alias]
+
     if alias in _dbs:
+        # Detach all cached collections in Documents
+        for doc_cls in _get_documents_by_db(alias, DEFAULT_CONNECTION_NAME):
+            if hasattr(doc_cls, '_disconnect'):
+                doc_cls._disconnect()
+
         del _dbs[alias]
 
+    if alias in _connection_settings:
+        del _connection_settings[alias]
+
+
+def disconnect_all():
+    """Close all registered database."""
+    for alias in list(_connections.keys()):
+        disconnect(alias)
+
 
 def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
     """Return a connection with a given alias."""
@@ -265,7 +323,14 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
 
     .. versionchanged:: 0.6 - added multiple database support.
     """
-    if alias not in _connections:
+    if alias in _connections:
+        prev_conn_setting = _connection_settings[alias]
+        new_conn_settings = _get_connection_settings(db, **kwargs)
+
+        if new_conn_settings != prev_conn_setting:
+            raise MongoEngineConnectionError(
+                'A different connection with alias `%s` was already registered. Use disconnect() first' % alias)
+    else:
         register_connection(alias, db, **kwargs)
 
     return get_connection(alias)
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 328ac2990..fd953340d 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -187,11 +187,17 @@ def _get_db(cls):
         """Some Model using other db_alias"""
         return get_db(cls._meta.get('db_alias', DEFAULT_CONNECTION_NAME))
 
+    @classmethod
+    def _disconnect(cls):
+        """Detach the Document class from the (cached) database collection"""
+        cls._collection = None
+
     @classmethod
     def _get_collection(cls):
-        """Return a PyMongo collection for the document."""
+        """Return the corresponding PyMongo collection of this document.
+        Upon the first call, it will ensure that indexes gets created. The returned collection then gets cached
+        """
         if not hasattr(cls, '_collection') or cls._collection is None:
-
             # Get the collection, either capped or regular.
             if cls._meta.get('max_size') or cls._meta.get('max_documents'):
                 cls._collection = cls._get_capped_collection()
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 0a7271df3..4bab23c69 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -12,12 +12,12 @@
 
 from mongoengine import (
     connect, register_connection,
-    Document, DateTimeField
-)
+    Document, DateTimeField,
+    disconnect_all, StringField)
 from mongoengine.pymongo_support import IS_PYMONGO_3
 import mongoengine.connection
 from mongoengine.connection import (MongoEngineConnectionError, get_db,
-                                    get_connection)
+                                    get_connection, disconnect, DEFAULT_DATABASE_NAME)
 
 
 def get_tz_awareness(connection):
@@ -29,6 +29,14 @@ def get_tz_awareness(connection):
 
 class ConnectionTest(unittest.TestCase):
 
+    @classmethod
+    def setUpClass(cls):
+        disconnect_all()
+
+    @classmethod
+    def tearDownClass(cls):
+        disconnect_all()
+
     def tearDown(self):
         mongoengine.connection._connection_settings = {}
         mongoengine.connection._connections = {}
@@ -49,6 +57,117 @@ def test_connect(self):
         conn = get_connection('testdb')
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
+    def test_connect_disconnect_works_properly(self):
+        class History1(Document):
+            name = StringField()
+            meta = {'db_alias': 'db1'}
+
+        class History2(Document):
+            name = StringField()
+            meta = {'db_alias': 'db2'}
+
+        connect('db1', alias='db1')
+        connect('db2', alias='db2')
+
+        History1.drop_collection()
+        History2.drop_collection()
+
+        h = History1(name='default').save()
+        h1 = History2(name='db1').save()
+
+        self.assertEqual(list(History1.objects().as_pymongo()),
+                         [{'_id': h.id, 'name': 'default'}])
+        self.assertEqual(list(History2.objects().as_pymongo()),
+                         [{'_id': h1.id, 'name': 'db1'}])
+
+        disconnect('db1')
+        disconnect('db2')
+
+        with self.assertRaises(MongoEngineConnectionError):
+            list(History1.objects().as_pymongo())
+
+        with self.assertRaises(MongoEngineConnectionError):
+            list(History2.objects().as_pymongo())
+
+        connect('db1', alias='db1')
+        connect('db2', alias='db2')
+
+        self.assertEqual(list(History1.objects().as_pymongo()),
+                         [{'_id': h.id, 'name': 'default'}])
+        self.assertEqual(list(History2.objects().as_pymongo()),
+                         [{'_id': h1.id, 'name': 'db1'}])
+
+    def test_connect_different_documents_to_different_database(self):
+        class History(Document):
+            name = StringField()
+
+        class History1(Document):
+            name = StringField()
+            meta = {'db_alias': 'db1'}
+
+        class History2(Document):
+            name = StringField()
+            meta = {'db_alias': 'db2'}
+
+        connect()
+        connect('db1', alias='db1')
+        connect('db2', alias='db2')
+
+        History.drop_collection()
+        History1.drop_collection()
+        History2.drop_collection()
+
+        h = History(name='default').save()
+        h1 = History1(name='db1').save()
+        h2 = History2(name='db2').save()
+
+        self.assertEqual(History._collection.database.name, DEFAULT_DATABASE_NAME)
+        self.assertEqual(History1._collection.database.name, 'db1')
+        self.assertEqual(History2._collection.database.name, 'db2')
+
+        self.assertEqual(list(History.objects().as_pymongo()),
+                         [{'_id': h.id, 'name': 'default'}])
+        self.assertEqual(list(History1.objects().as_pymongo()),
+                         [{'_id': h1.id, 'name': 'db1'}])
+        self.assertEqual(list(History2.objects().as_pymongo()),
+                         [{'_id': h2.id, 'name': 'db2'}])
+
+    def test_connect_fails_if_connect_2_times_with_default_alias(self):
+        connect('mongoenginetest')
+
+        with self.assertRaises(MongoEngineConnectionError) as ctx_err:
+            connect('mongoenginetest2')
+        self.assertEqual("A different connection with alias `default` was already registered. Use disconnect() first", str(ctx_err.exception))
+
+    def test_connect_fails_if_connect_2_times_with_custom_alias(self):
+        connect('mongoenginetest', alias='alias1')
+
+        with self.assertRaises(MongoEngineConnectionError) as ctx_err:
+            connect('mongoenginetest2', alias='alias1')
+
+        self.assertEqual("A different connection with alias `alias1` was already registered. Use disconnect() first", str(ctx_err.exception))
+
+    def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way(self):
+        """Intended to keep the detecton function simple but robust"""
+        db_name = 'mongoenginetest'
+        db_alias = 'alias1'
+        connect(db=db_name, alias=db_alias, host='localhost', port=27017)
+
+        with self.assertRaises(MongoEngineConnectionError):
+            connect(host='mongodb://localhost:27017/%s' % db_name, alias=db_alias)
+
+    def test_connect_passes_silently_connect_multiple_times_with_same_config(self):
+        # test default connection to `test`
+        connect()
+        connect()
+        self.assertEqual(len(mongoengine.connection._connections), 1)
+        connect('test01', alias='test01')
+        connect('test01', alias='test01')
+        self.assertEqual(len(mongoengine.connection._connections), 2)
+        connect(host='mongodb://localhost:27017/mongoenginetest02', alias='test02')
+        connect(host='mongodb://localhost:27017/mongoenginetest02', alias='test02')
+        self.assertEqual(len(mongoengine.connection._connections), 3)
+
     def test_connect_in_mocking(self):
         """Ensure that the connect() method works properly in mocking.
         """
@@ -120,13 +239,93 @@ def test_connect_with_host_list(self):
         self.assertIsInstance(conn, mongomock.MongoClient)
 
     def test_disconnect(self):
-        """Ensure that the disconnect() method works properly
-        """
+        """Ensure that the disconnect() method works properly"""
+        connections = mongoengine.connection._connections
+        dbs = mongoengine.connection._dbs
+        connection_settings = mongoengine.connection._connection_settings
+
         conn1 = connect('mongoenginetest')
-        mongoengine.connection.disconnect()
+
+        class History(Document):
+            pass
+
+        self.assertIsNone(History._collection)
+
+        History.drop_collection()
+        History.objects.first()     # will trigger the caching of _collection attribute
+
+        self.assertIsNotNone(History._collection)
+
+        self.assertEqual(len(connections), 1)
+        self.assertEqual(len(dbs), 1)
+        self.assertEqual(len(connection_settings), 1)
+
+        disconnect()
+
+        self.assertIsNone(History._collection)
+
+        self.assertEqual(len(connections), 0)
+        self.assertEqual(len(dbs), 0)
+        self.assertEqual(len(connection_settings), 0)
+
+        with self.assertRaises(MongoEngineConnectionError) as ctx_err:
+            History.objects.first()
+        self.assertEqual("You have not defined a default connection", str(ctx_err.exception))
+
         conn2 = connect('mongoenginetest')
+        History.objects.first()     # Make sure its back on track
         self.assertTrue(conn1 is not conn2)
 
+    def test_disconnect_silently_pass_if_alias_does_not_exist(self):
+        connections = mongoengine.connection._connections
+        self.assertEqual(len(connections), 0)
+        disconnect(alias='not_exist')
+
+    def test_disconnect_all(self):
+        connections = mongoengine.connection._connections
+        dbs = mongoengine.connection._dbs
+        connection_settings = mongoengine.connection._connection_settings
+
+        connect('mongoenginetest')
+        connect('mongoenginetest2', alias='db1')
+
+        class History(Document):
+            pass
+
+        class History1(Document):
+            name = StringField()
+            meta = {'db_alias': 'db1'}
+
+        History.drop_collection()   # will trigger the caching of _collection attribute
+        History.objects.first()
+        History1.drop_collection()
+        History1.objects.first()
+
+        self.assertIsNotNone(History._collection)
+        self.assertIsNotNone(History1._collection)
+
+        self.assertEqual(len(connections), 2)
+        self.assertEqual(len(dbs), 2)
+        self.assertEqual(len(connection_settings), 2)
+
+        disconnect_all()
+
+        self.assertIsNone(History._collection)
+        self.assertIsNone(History1._collection)
+
+        self.assertEqual(len(connections), 0)
+        self.assertEqual(len(dbs), 0)
+        self.assertEqual(len(connection_settings), 0)
+
+        with self.assertRaises(MongoEngineConnectionError):
+            History.objects.first()
+
+        with self.assertRaises(MongoEngineConnectionError):
+            History1.objects.first()
+
+    def test_disconnect_all_silently_pass_if_no_connection_exist(self):
+        disconnect_all()
+
     def test_sharing_connections(self):
         """Ensure that connections are shared when the connection settings are exactly the same
         """
@@ -342,7 +541,7 @@ def test_connect_with_replicaset_via_kwargs(self):
             with self.assertRaises(MongoEngineConnectionError):
                 c = connect(replicaset='local-rs')
 
-    def test_datetime(self):
+    def test_connect_tz_aware(self):
         connect('mongoenginetest', tz_aware=True)
         d = datetime.datetime(2010, 5, 5, tzinfo=utc)
 
diff --git a/tests/utils.py b/tests/utils.py
index 3c41f07d6..910601b16 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -4,7 +4,7 @@
 from nose.plugins.skip import SkipTest
 
 from mongoengine import connect
-from mongoengine.connection import get_db
+from mongoengine.connection import get_db, disconnect_all
 from mongoengine.mongodb_support import get_mongodb_version, MONGODB_26, MONGODB_3, MONGODB_32, MONGODB_34
 from mongoengine.pymongo_support import IS_PYMONGO_3
 
@@ -19,6 +19,7 @@ class MongoDBTestCase(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
+        disconnect_all()
         cls._connection = connect(db=MONGO_TEST_DB)
         cls._connection.drop_database(MONGO_TEST_DB)
         cls.db = get_db()
@@ -26,6 +27,7 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls._connection.drop_database(MONGO_TEST_DB)
+        disconnect_all()
 
 
 def get_as_pymongo(doc):

From b1e28d02f7f16a3aa0eb4b718377ddff8e9fc6f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 24 Apr 2019 22:44:07 +0200
Subject: [PATCH 0786/1519] Improve connect/disconnect - document disconnect +
 sample of usage - add more test cases to prevent github issues regressions

---
 docs/changelog.rst        |  2 +-
 docs/guide/connecting.rst | 42 ++++++++++++++++++++++---
 mongoengine/connection.py |  3 ++
 mongoengine/document.py   |  6 ++--
 tests/test_connection.py  | 64 ++++++++++++++++++++++++++++++---------
 5 files changed, 95 insertions(+), 22 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6bd19b120..bf3bba24b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,7 @@ Changelog
 Development
 ===========
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
-- POTENTIAL BREAKING CHANGE: Fixes in connect/disconnect methods
+- POTENTIAL BREAKING CHANGE: Fixes in connect/disconnect methods #565 #566
     - calling `connect` 2 times with the same alias and different parameter will raise an error (should call disconnect first)
     - disconnect now clears `mongoengine.connection._connection_settings`
     - disconnect now clears the cached attribute `Document._collection`
diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index 5dac6ae98..1107ee3a3 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -4,9 +4,11 @@
 Connecting to MongoDB
 =====================
 
-To connect to a running instance of :program:`mongod`, use the
-:func:`~mongoengine.connect` function. The first argument is the name of the
-database to connect to::
+Connections in MongoEngine are registered globally and are identified with aliases.
+If no `alias` is provided during the connection, it will use "default" as alias.
+
+To connect to a running instance of :program:`mongod`, use the :func:`~mongoengine.connect`
+function. The first argument is the name of the database to connect to::
 
     from mongoengine import connect
     connect('project1')
@@ -42,6 +44,9 @@ the :attr:`host` to
     will establish connection to ``production`` database using
     ``admin`` username and ``qwerty`` password.
 
+.. note:: Calling :func:`~mongoengine.connect` without argument will establish
+    a connection to the "test" database by default
+
 Replica Sets
 ============
 
@@ -71,6 +76,8 @@ is used.
 In the background this uses :func:`~mongoengine.register_connection` to
 store the data and you can register all aliases up front if required.
 
+Documents defined in different database
+---------------------------------------
 Individual documents can also support multiple databases by providing a
 `db_alias` in their meta data. This allows :class:`~pymongo.dbref.DBRef`
 objects to point across databases and collections. Below is an example schema,
@@ -93,6 +100,33 @@ using 3 different databases to store data::
             meta = {'db_alias': 'users-books-db'}
 
 
+Disconnecting an existing connection
+------------------------------------
+The function :func:`~mongoengine.disconnect` can be used to
+disconnect a particular connection. This can be used to change a
+connection globally::
+
+        from mongoengine import connect, disconnect
+        connect('a_db', alias='db1')
+
+        class User(Document):
+            name = StringField()
+            meta = {'db_alias': 'db1'}
+
+        disconnect(alias='db1')
+
+        connect('another_db', alias='db1')
+
+.. note:: Calling :func:`~mongoengine.disconnect` without argument
+    will disconnect the "default" connection
+
+.. note:: Since connections gets registered globally, it is important
+    to use the `disconnect` function from MongoEngine and not the
+    `disconnect()` method of an existing connection (pymongo.MongoClient)
+
+.. note:: :class:`~mongoengine.Document` are caching the pymongo collection.
+    using `disconnect` ensures that it gets cleaned as well
+
 Context Managers
 ================
 Sometimes you may want to switch the database or collection to query against.
@@ -119,7 +153,7 @@ access to the same User document across databases::
 
 Switch Collection
 -----------------
-The :class:`~mongoengine.context_managers.switch_collection` context manager
+The :func:`~mongoengine.context_managers.switch_collection` context manager
 allows you to change the collection for a given class allowing quick and easy
 access to the same Group document across collection::
 
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 13541bd43..0597199ba 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -318,6 +318,9 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
     Multiple databases are supported by using aliases. Provide a separate
     `alias` to connect to a different instance of :program:`mongod`.
 
+    In order to replace a connection identified by a given alias, you'll
+    need to call ``disconnect`` first
+
     See the docstring for `register_connection` for more details about all
     supported kwargs.
 
diff --git a/mongoengine/document.py b/mongoengine/document.py
index fd953340d..753520c7e 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -795,13 +795,13 @@ def drop_collection(cls):
         .. versionchanged:: 0.10.7
             :class:`OperationError` exception raised if no collection available
         """
-        col_name = cls._get_collection_name()
-        if not col_name:
+        coll_name = cls._get_collection_name()
+        if not coll_name:
             raise OperationError('Document %s has no collection defined '
                                  '(is it abstract ?)' % cls)
         cls._collection = None
         db = cls._get_db()
-        db.drop_collection(col_name)
+        db.drop_collection(coll_name)
 
     @classmethod
     def create_index(cls, keys, background=False, **kwargs):
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 4bab23c69..827829b52 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,4 +1,6 @@
 import datetime
+
+from pymongo import MongoClient
 from pymongo.errors import OperationFailure
 
 try:
@@ -238,12 +240,25 @@ def test_connect_with_host_list(self):
         conn = get_connection('testdb6')
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-    def test_disconnect(self):
-        """Ensure that the disconnect() method works properly"""
+    def test_disconnect_cleans_globals(self):
+        """Ensure that the disconnect() method cleans the globals objects"""
         connections = mongoengine.connection._connections
         dbs = mongoengine.connection._dbs
         connection_settings = mongoengine.connection._connection_settings
 
+        connect('mongoenginetest')
+
+        self.assertEqual(len(connections), 1)
+        self.assertEqual(len(dbs), 1)
+        self.assertEqual(len(connection_settings), 1)
+
+        disconnect()
+        self.assertEqual(len(connections), 0)
+        self.assertEqual(len(dbs), 0)
+        self.assertEqual(len(connection_settings), 0)
+
+    def test_disconnect_cleans_cached_collection_attribute_in_document(self):
+        """Ensure that the disconnect() method works properly"""
         conn1 = connect('mongoenginetest')
 
         class History(Document):
@@ -252,29 +267,50 @@ class History(Document):
         self.assertIsNone(History._collection)
 
         History.drop_collection()
-        History.objects.first()     # will trigger the caching of _collection attribute
 
+        History.objects.first()     # will trigger the caching of _collection attribute
         self.assertIsNotNone(History._collection)
 
-        self.assertEqual(len(connections), 1)
-        self.assertEqual(len(dbs), 1)
-        self.assertEqual(len(connection_settings), 1)
-
         disconnect()
 
         self.assertIsNone(History._collection)
 
-        self.assertEqual(len(connections), 0)
-        self.assertEqual(len(dbs), 0)
-        self.assertEqual(len(connection_settings), 0)
-
         with self.assertRaises(MongoEngineConnectionError) as ctx_err:
             History.objects.first()
         self.assertEqual("You have not defined a default connection", str(ctx_err.exception))
 
-        conn2 = connect('mongoenginetest')
-        History.objects.first()     # Make sure its back on track
-        self.assertTrue(conn1 is not conn2)
+    def test_connect_disconnect_works_on_same_document(self):
+        """Ensure that the connect/disconnect works properly with a single Document"""
+        db1 = 'db1'
+        db2 = 'db2'
+
+        # Ensure freshness of the 2 databases through pymongo
+        client = MongoClient('localhost', 27017)
+        client.drop_database(db1)
+        client.drop_database(db2)
+
+        # Save in db1
+        connect(db1)
+
+        class User(Document):
+            name = StringField(required=True)
+
+        user1 = User(name='John is in db1').save()
+        disconnect()
+
+        # Make sure save doesnt work at this stage
+        with self.assertRaises(MongoEngineConnectionError):
+            User(name='Wont work').save()
+
+        # Save in db2
+        connect(db2)
+        user2 = User(name='Bob is in db2').save()
+        disconnect()
+
+        db1_users = list(client[db1].user.find())
+        self.assertEqual(db1_users, [{'_id': user1.id, 'name': 'John is in db1'}])
+        db2_users = list(client[db2].user.find())
+        self.assertEqual(db2_users, [{'_id': user2.id, 'name': 'Bob is in db2'}])
 
     def test_disconnect_silently_pass_if_alias_does_not_exist(self):
         connections = mongoengine.connection._connections

From 565e1dc0ed193b2b9e9ff55276235a8530b160a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 25 Apr 2019 22:11:43 +0200
Subject: [PATCH 0787/1519] minor improvements

---
 docs/changelog.rst             | 2 +-
 mongoengine/connection.py      | 9 ++++++---
 tests/test_connection.py       | 8 +++++++-
 tests/test_context_managers.py | 7 ++++---
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bf3bba24b..dfed5f596 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,7 @@ Changelog
 Development
 ===========
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
-- POTENTIAL BREAKING CHANGE: Fixes in connect/disconnect methods #565 #566
+- POTENTIAL BREAKING CHANGES: Fixes in connect/disconnect methods #565 #566 #605 #607 #1213 #1599
     - calling `connect` 2 times with the same alias and different parameter will raise an error (should call disconnect first)
     - disconnect now clears `mongoengine.connection._connection_settings`
     - disconnect now clears the cached attribute `Document._collection`
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 0597199ba..8902bbf61 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -10,6 +10,8 @@
 
 DEFAULT_CONNECTION_NAME = 'default'
 DEFAULT_DATABASE_NAME = 'test'
+DEFAULT_HOST = 'localhost'
+DEFAULT_PORT = 27017
 
 if IS_PYMONGO_3:
     READ_PREFERENCE = ReadPreference.PRIMARY
@@ -61,8 +63,8 @@ def _get_connection_settings(
     """
     conn_settings = {
         'name': name or db or DEFAULT_DATABASE_NAME,
-        'host': host or 'localhost',
-        'port': port or 27017,
+        'host': host or DEFAULT_HOST,
+        'port': port or DEFAULT_PORT,
         'read_preference': read_preference,
         'username': username,
         'password': password,
@@ -172,6 +174,7 @@ def register_connection(alias, db=None, name=None, host=None, port=None,
 def disconnect(alias=DEFAULT_CONNECTION_NAME):
     """Close the connection with a given alias."""
     from mongoengine.base.common import _get_documents_by_db
+    from mongoengine import Document
 
     if alias in _connections:
         get_connection(alias=alias).close()
@@ -180,7 +183,7 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
     if alias in _dbs:
         # Detach all cached collections in Documents
         for doc_cls in _get_documents_by_db(alias, DEFAULT_CONNECTION_NAME):
-            if hasattr(doc_cls, '_disconnect'):
+            if issubclass(doc_cls, Document):     # Skip EmbeddedDocument
                 doc_cls._disconnect()
 
         del _dbs[alias]
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 827829b52..5ff22e069 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -249,9 +249,15 @@ def test_disconnect_cleans_globals(self):
         connect('mongoenginetest')
 
         self.assertEqual(len(connections), 1)
-        self.assertEqual(len(dbs), 1)
+        self.assertEqual(len(dbs), 0)
         self.assertEqual(len(connection_settings), 1)
 
+        class TestDoc(Document):
+            pass
+
+        TestDoc.drop_collection()  # triggers the db
+        self.assertEqual(len(dbs), 1)
+
         disconnect()
         self.assertEqual(len(connections), 0)
         self.assertEqual(len(dbs), 0)
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 227031e04..22c33b017 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -37,14 +37,15 @@ class Group(Document):
 
     def test_switch_collection_context_manager(self):
         connect('mongoenginetest')
-        register_connection('testdb-1', 'mongoenginetest2')
+        register_connection(alias='testdb-1', db='mongoenginetest2')
 
         class Group(Document):
             name = StringField()
 
-        Group.drop_collection()
+        Group.drop_collection()         # drops in default
+
         with switch_collection(Group, 'group1') as Group:
-            Group.drop_collection()
+            Group.drop_collection()     # drops in group1
 
         Group(name="hello - group").save()
         self.assertEqual(1, Group.objects.count())

From e44f71eeb12ae95b972f7bc2bab5f896db80745e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 25 Apr 2019 22:31:05 +0200
Subject: [PATCH 0788/1519] updated changelog

---
 docs/changelog.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b88c2ce69..356e2b65b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,14 +5,16 @@ Changelog
 Development
 ===========
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
-- POTENTIAL BREAKING CHANGES: Fixes in connect/disconnect methods #565 #566 #605 #607 #1213 #1599
+- Fix disconnect function #566 #1599 #605 #607 #1213 #565
+- Improve connect/disconnect documentations
+- POTENTIAL BREAKING CHANGES: (associated with connect/disconnect fixes)
     - calling `connect` 2 times with the same alias and different parameter will raise an error (should call disconnect first)
     - disconnect now clears `mongoengine.connection._connection_settings`
     - disconnect now clears the cached attribute `Document._collection`
 - POTENTIAL BREAKING CHANGE: Aggregate gives wrong results when used with a queryset having limit and skip #2029
 - mongoengine now requires pymongo>=3.5 #2017
 - Generate Unique Indices for SortedListField and EmbeddedDocumentListFields #2020
-- connect() fails immediately when db name contains invalid characters (e. g. when user mistakenly puts 'mongodb://127.0.0.1:27017' as db name, happened in #1718) or is if db name is of an invalid type
+- connect() fails immediately when db name contains invalid characters #2031 #1718
 - (Fill this out as you fix issues and develop your features).
 
 Changes in 0.17.0

From abfabc30c96a9da1bd7d9a043cbe80d216f4ed29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 1 May 2019 23:23:19 +0200
Subject: [PATCH 0789/1519] Fix querying on (Generic)EmbeddedDocument
 subclasses fields

---
 docs/changelog.rst                           |   1 +
 mongoengine/fields.py                        |  15 +-
 tests/fields/fields.py                       | 200 +-----------
 tests/fields/test_embedded_document_field.py | 316 +++++++++++++++++++
 4 files changed, 331 insertions(+), 201 deletions(-)
 create mode 100644 tests/fields/test_embedded_document_field.py

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 356e2b65b..34e1c4953 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Development
 ===========
+- Fix querying on (Generic)EmbeddedDocument subclasses fields #475
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
 - Fix disconnect function #566 #1599 #605 #607 #1213 #565
 - Improve connect/disconnect documentations
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 52ed4bc9c..7e1197215 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -700,7 +700,11 @@ def validate(self, value, clean=True):
         self.document_type.validate(value, clean)
 
     def lookup_member(self, member_name):
-        return self.document_type._fields.get(member_name)
+        doc_and_subclasses = [self.document_type] + self.document_type.__subclasses__()
+        for doc_type in doc_and_subclasses:
+            field = doc_type._fields.get(member_name)
+            if field:
+                return field
 
     def prepare_query_value(self, op, value):
         if value is not None and not isinstance(value, self.document_type):
@@ -747,12 +751,13 @@ def validate(self, value, clean=True):
         value.validate(clean=clean)
 
     def lookup_member(self, member_name):
-        if self.choices:
-            for choice in self.choices:
-                field = choice._fields.get(member_name)
+        document_choices = self.choices or []
+        for document_choice in document_choices:
+            doc_and_subclasses = [document_choice] + document_choice.__subclasses__()
+            for doc_type in doc_and_subclasses:
+                field = doc_type._fields.get(member_name)
                 if field:
                     return field
-        return None
 
     def to_mongo(self, document, use_db_field=True, fields=None):
         if document is None:
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 2c4ac3ac0..3b66f2ded 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -8,11 +8,10 @@
 
 from mongoengine import Document, StringField, IntField, DateTimeField, DateField, ValidationError, \
     ComplexDateTimeField, FloatField, ListField, ReferenceField, DictField, EmbeddedDocument, EmbeddedDocumentField, \
-    GenericReferenceField, DoesNotExist, NotRegistered, GenericEmbeddedDocumentField, OperationError, DynamicField, \
-    FieldDoesNotExist, EmbeddedDocumentListField, MultipleObjectsReturned, NotUniqueError, BooleanField, ObjectIdField, \
-    SortedListField, GenericLazyReferenceField, LazyReferenceField, DynamicDocument
-from mongoengine.base import (BaseField, EmbeddedDocumentList,
-                              _document_registry)
+    GenericReferenceField, DoesNotExist, NotRegistered, OperationError, DynamicField, \
+    FieldDoesNotExist, EmbeddedDocumentListField, MultipleObjectsReturned, NotUniqueError, BooleanField,\
+    ObjectIdField, SortedListField, GenericLazyReferenceField, LazyReferenceField, DynamicDocument
+from mongoengine.base import (BaseField, EmbeddedDocumentList, _document_registry)
 
 from tests.utils import MongoDBTestCase
 
@@ -1769,79 +1768,6 @@ class Shirt(Document):
         with self.assertRaises(ValidationError):
             shirt.validate()
 
-    def test_choices_validation_documents(self):
-        """
-        Ensure fields with document choices validate given a valid choice.
-        """
-        class UserComments(EmbeddedDocument):
-            author = StringField()
-            message = StringField()
-
-        class BlogPost(Document):
-            comments = ListField(
-                GenericEmbeddedDocumentField(choices=(UserComments,))
-            )
-
-        # Ensure Validation Passes
-        BlogPost(comments=[
-            UserComments(author='user2', message='message2'),
-        ]).save()
-
-    def test_choices_validation_documents_invalid(self):
-        """
-        Ensure fields with document choices validate given an invalid choice.
-        This should throw a ValidationError exception.
-        """
-        class UserComments(EmbeddedDocument):
-            author = StringField()
-            message = StringField()
-
-        class ModeratorComments(EmbeddedDocument):
-            author = StringField()
-            message = StringField()
-
-        class BlogPost(Document):
-            comments = ListField(
-                GenericEmbeddedDocumentField(choices=(UserComments,))
-            )
-
-        # Single Entry Failure
-        post = BlogPost(comments=[
-            ModeratorComments(author='mod1', message='message1'),
-        ])
-        self.assertRaises(ValidationError, post.save)
-
-        # Mixed Entry Failure
-        post = BlogPost(comments=[
-            ModeratorComments(author='mod1', message='message1'),
-            UserComments(author='user2', message='message2'),
-        ])
-        self.assertRaises(ValidationError, post.save)
-
-    def test_choices_validation_documents_inheritance(self):
-        """
-        Ensure fields with document choices validate given subclass of choice.
-        """
-        class Comments(EmbeddedDocument):
-            meta = {
-                'abstract': True
-            }
-            author = StringField()
-            message = StringField()
-
-        class UserComments(Comments):
-            pass
-
-        class BlogPost(Document):
-            comments = ListField(
-                GenericEmbeddedDocumentField(choices=(Comments,))
-            )
-
-        # Save Valid EmbeddedDocument Type
-        BlogPost(comments=[
-            UserComments(author='user2', message='message2'),
-        ]).save()
-
     def test_choices_get_field_display(self):
         """Test dynamic helper for returning the display value of a choices
         field.
@@ -1958,85 +1884,6 @@ class Shirt(Document):
             self.assertEqual(error_dict['size'], SIZE_MESSAGE)
             self.assertEqual(error_dict['color'], COLOR_MESSAGE)
 
-    def test_generic_embedded_document(self):
-        class Car(EmbeddedDocument):
-            name = StringField()
-
-        class Dish(EmbeddedDocument):
-            food = StringField(required=True)
-            number = IntField()
-
-        class Person(Document):
-            name = StringField()
-            like = GenericEmbeddedDocumentField()
-
-        Person.drop_collection()
-
-        person = Person(name='Test User')
-        person.like = Car(name='Fiat')
-        person.save()
-
-        person = Person.objects.first()
-        self.assertIsInstance(person.like, Car)
-
-        person.like = Dish(food="arroz", number=15)
-        person.save()
-
-        person = Person.objects.first()
-        self.assertIsInstance(person.like, Dish)
-
-    def test_generic_embedded_document_choices(self):
-        """Ensure you can limit GenericEmbeddedDocument choices."""
-        class Car(EmbeddedDocument):
-            name = StringField()
-
-        class Dish(EmbeddedDocument):
-            food = StringField(required=True)
-            number = IntField()
-
-        class Person(Document):
-            name = StringField()
-            like = GenericEmbeddedDocumentField(choices=(Dish,))
-
-        Person.drop_collection()
-
-        person = Person(name='Test User')
-        person.like = Car(name='Fiat')
-        self.assertRaises(ValidationError, person.validate)
-
-        person.like = Dish(food="arroz", number=15)
-        person.save()
-
-        person = Person.objects.first()
-        self.assertIsInstance(person.like, Dish)
-
-    def test_generic_list_embedded_document_choices(self):
-        """Ensure you can limit GenericEmbeddedDocument choices inside
-        a list field.
-        """
-        class Car(EmbeddedDocument):
-            name = StringField()
-
-        class Dish(EmbeddedDocument):
-            food = StringField(required=True)
-            number = IntField()
-
-        class Person(Document):
-            name = StringField()
-            likes = ListField(GenericEmbeddedDocumentField(choices=(Dish,)))
-
-        Person.drop_collection()
-
-        person = Person(name='Test User')
-        person.likes = [Car(name='Fiat')]
-        self.assertRaises(ValidationError, person.validate)
-
-        person.likes = [Dish(food="arroz", number=15)]
-        person.save()
-
-        person = Person.objects.first()
-        self.assertIsInstance(person.likes[0], Dish)
-
     def test_recursive_validation(self):
         """Ensure that a validation result to_dict is available."""
         class Author(EmbeddedDocument):
@@ -2702,44 +2549,5 @@ class CustomData(Document):
         self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
 
 
-class TestEmbeddedDocumentField(MongoDBTestCase):
-    def test___init___(self):
-        class MyDoc(EmbeddedDocument):
-            name = StringField()
-
-        field = EmbeddedDocumentField(MyDoc)
-        self.assertEqual(field.document_type_obj, MyDoc)
-
-        field2 = EmbeddedDocumentField('MyDoc')
-        self.assertEqual(field2.document_type_obj, 'MyDoc')
-
-    def test___init___throw_error_if_document_type_is_not_EmbeddedDocument(self):
-        with self.assertRaises(ValidationError):
-            EmbeddedDocumentField(dict)
-
-    def test_document_type_throw_error_if_not_EmbeddedDocument_subclass(self):
-
-        class MyDoc(Document):
-            name = StringField()
-
-        emb = EmbeddedDocumentField('MyDoc')
-        with self.assertRaises(ValidationError) as ctx:
-            emb.document_type
-        self.assertIn('Invalid embedded document class provided to an EmbeddedDocumentField', str(ctx.exception))
-
-    def test_embedded_document_field_only_allow_subclasses_of_embedded_document(self):
-        # Relates to #1661
-        class MyDoc(Document):
-            name = StringField()
-
-        with self.assertRaises(ValidationError):
-            class MyFailingDoc(Document):
-                emb = EmbeddedDocumentField(MyDoc)
-
-        with self.assertRaises(ValidationError):
-            class MyFailingdoc2(Document):
-                emb = EmbeddedDocumentField('MyDoc')
-
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
new file mode 100644
index 000000000..e9fc79c80
--- /dev/null
+++ b/tests/fields/test_embedded_document_field.py
@@ -0,0 +1,316 @@
+# -*- coding: utf-8 -*-
+from mongoengine import Document, StringField, ValidationError, EmbeddedDocument, EmbeddedDocumentField, \
+    InvalidQueryError, LookUpError, IntField, GenericEmbeddedDocumentField, ListField
+
+from tests.utils import MongoDBTestCase
+
+
+class TestEmbeddedDocumentField(MongoDBTestCase):
+    def test___init___(self):
+        class MyDoc(EmbeddedDocument):
+            name = StringField()
+
+        field = EmbeddedDocumentField(MyDoc)
+        self.assertEqual(field.document_type_obj, MyDoc)
+
+        field2 = EmbeddedDocumentField('MyDoc')
+        self.assertEqual(field2.document_type_obj, 'MyDoc')
+
+    def test___init___throw_error_if_document_type_is_not_EmbeddedDocument(self):
+        with self.assertRaises(ValidationError):
+            EmbeddedDocumentField(dict)
+
+    def test_document_type_throw_error_if_not_EmbeddedDocument_subclass(self):
+
+        class MyDoc(Document):
+            name = StringField()
+
+        emb = EmbeddedDocumentField('MyDoc')
+        with self.assertRaises(ValidationError) as ctx:
+            emb.document_type
+        self.assertIn('Invalid embedded document class provided to an EmbeddedDocumentField', str(ctx.exception))
+
+    def test_embedded_document_field_only_allow_subclasses_of_embedded_document(self):
+        # Relates to #1661
+        class MyDoc(Document):
+            name = StringField()
+
+        with self.assertRaises(ValidationError):
+            class MyFailingDoc(Document):
+                emb = EmbeddedDocumentField(MyDoc)
+
+        with self.assertRaises(ValidationError):
+            class MyFailingdoc2(Document):
+                emb = EmbeddedDocumentField('MyDoc')
+
+    def test_query_embedded_document_attribute(self):
+        class AdminSettings(EmbeddedDocument):
+            foo1 = StringField()
+            foo2 = StringField()
+
+        class Person(Document):
+            settings = EmbeddedDocumentField(AdminSettings)
+            name = StringField()
+
+        Person.drop_collection()
+
+        p = Person(
+            settings=AdminSettings(foo1='bar1', foo2='bar2'),
+            name='John',
+        ).save()
+
+        # Test non exiting attribute
+        with self.assertRaises(InvalidQueryError) as ctx_err:
+            Person.objects(settings__notexist='bar').first()
+        self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
+
+        with self.assertRaises(LookUpError):
+            Person.objects.only('settings.notexist')
+
+        # Test existing attribute
+        self.assertEqual(Person.objects(settings__foo1='bar1').first().id, p.id)
+        only_p = Person.objects.only('settings.foo1').first()
+        self.assertEqual(only_p.settings.foo1, p.settings.foo1)
+        self.assertIsNone(only_p.settings.foo2)
+        self.assertIsNone(only_p.name)
+
+        exclude_p = Person.objects.exclude('settings.foo1').first()
+        self.assertIsNone(exclude_p.settings.foo1)
+        self.assertEqual(exclude_p.settings.foo2, p.settings.foo2)
+        self.assertEqual(exclude_p.name, p.name)
+
+    def test_query_embedded_document_attribute_with_inheritance(self):
+        class BaseSettings(EmbeddedDocument):
+            meta = {'allow_inheritance': True}
+            base_foo = StringField()
+
+        class AdminSettings(BaseSettings):
+            sub_foo = StringField()
+
+        class Person(Document):
+            settings = EmbeddedDocumentField(BaseSettings)
+
+        Person.drop_collection()
+
+        p = Person(settings=AdminSettings(base_foo='basefoo', sub_foo='subfoo'))
+        p.save()
+
+        # Test non exiting attribute
+        with self.assertRaises(InvalidQueryError) as ctx_err:
+            self.assertEqual(Person.objects(settings__notexist='bar').first().id, p.id)
+        self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
+
+        # Test existing attribute
+        self.assertEqual(Person.objects(settings__base_foo='basefoo').first().id, p.id)
+        self.assertEqual(Person.objects(settings__sub_foo='subfoo').first().id, p.id)
+
+        only_p = Person.objects.only('settings.base_foo', 'settings._cls').first()
+        self.assertEqual(only_p.settings.base_foo, 'basefoo')
+        self.assertIsNone(only_p.settings.sub_foo)
+
+
+class TestGenericEmbeddedDocumentField(MongoDBTestCase):
+
+    def test_generic_embedded_document(self):
+        class Car(EmbeddedDocument):
+            name = StringField()
+
+        class Dish(EmbeddedDocument):
+            food = StringField(required=True)
+            number = IntField()
+
+        class Person(Document):
+            name = StringField()
+            like = GenericEmbeddedDocumentField()
+
+        Person.drop_collection()
+
+        person = Person(name='Test User')
+        person.like = Car(name='Fiat')
+        person.save()
+
+        person = Person.objects.first()
+        self.assertIsInstance(person.like, Car)
+
+        person.like = Dish(food="arroz", number=15)
+        person.save()
+
+        person = Person.objects.first()
+        self.assertIsInstance(person.like, Dish)
+
+    def test_generic_embedded_document_choices(self):
+        """Ensure you can limit GenericEmbeddedDocument choices."""
+        class Car(EmbeddedDocument):
+            name = StringField()
+
+        class Dish(EmbeddedDocument):
+            food = StringField(required=True)
+            number = IntField()
+
+        class Person(Document):
+            name = StringField()
+            like = GenericEmbeddedDocumentField(choices=(Dish,))
+
+        Person.drop_collection()
+
+        person = Person(name='Test User')
+        person.like = Car(name='Fiat')
+        self.assertRaises(ValidationError, person.validate)
+
+        person.like = Dish(food="arroz", number=15)
+        person.save()
+
+        person = Person.objects.first()
+        self.assertIsInstance(person.like, Dish)
+
+    def test_generic_list_embedded_document_choices(self):
+        """Ensure you can limit GenericEmbeddedDocument choices inside
+        a list field.
+        """
+        class Car(EmbeddedDocument):
+            name = StringField()
+
+        class Dish(EmbeddedDocument):
+            food = StringField(required=True)
+            number = IntField()
+
+        class Person(Document):
+            name = StringField()
+            likes = ListField(GenericEmbeddedDocumentField(choices=(Dish,)))
+
+        Person.drop_collection()
+
+        person = Person(name='Test User')
+        person.likes = [Car(name='Fiat')]
+        self.assertRaises(ValidationError, person.validate)
+
+        person.likes = [Dish(food="arroz", number=15)]
+        person.save()
+
+        person = Person.objects.first()
+        self.assertIsInstance(person.likes[0], Dish)
+
+    def test_choices_validation_documents(self):
+        """
+        Ensure fields with document choices validate given a valid choice.
+        """
+        class UserComments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
+
+        class BlogPost(Document):
+            comments = ListField(
+                GenericEmbeddedDocumentField(choices=(UserComments,))
+            )
+
+        # Ensure Validation Passes
+        BlogPost(comments=[
+            UserComments(author='user2', message='message2'),
+        ]).save()
+
+    def test_choices_validation_documents_invalid(self):
+        """
+        Ensure fields with document choices validate given an invalid choice.
+        This should throw a ValidationError exception.
+        """
+        class UserComments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
+
+        class ModeratorComments(EmbeddedDocument):
+            author = StringField()
+            message = StringField()
+
+        class BlogPost(Document):
+            comments = ListField(
+                GenericEmbeddedDocumentField(choices=(UserComments,))
+            )
+
+        # Single Entry Failure
+        post = BlogPost(comments=[
+            ModeratorComments(author='mod1', message='message1'),
+        ])
+        self.assertRaises(ValidationError, post.save)
+
+        # Mixed Entry Failure
+        post = BlogPost(comments=[
+            ModeratorComments(author='mod1', message='message1'),
+            UserComments(author='user2', message='message2'),
+        ])
+        self.assertRaises(ValidationError, post.save)
+
+    def test_choices_validation_documents_inheritance(self):
+        """
+        Ensure fields with document choices validate given subclass of choice.
+        """
+        class Comments(EmbeddedDocument):
+            meta = {
+                'abstract': True
+            }
+            author = StringField()
+            message = StringField()
+
+        class UserComments(Comments):
+            pass
+
+        class BlogPost(Document):
+            comments = ListField(
+                GenericEmbeddedDocumentField(choices=(Comments,))
+            )
+
+        # Save Valid EmbeddedDocument Type
+        BlogPost(comments=[
+            UserComments(author='user2', message='message2'),
+        ]).save()
+
+    def test_query_generic_embedded_document_attribute(self):
+        class AdminSettings(EmbeddedDocument):
+            foo1 = StringField()
+
+        class NonAdminSettings(EmbeddedDocument):
+            foo2 = StringField()
+
+        class Person(Document):
+            settings = GenericEmbeddedDocumentField(choices=(AdminSettings, NonAdminSettings))
+
+        Person.drop_collection()
+
+        p1 = Person(settings=AdminSettings(foo1='bar1')).save()
+        p2 = Person(settings=NonAdminSettings(foo2='bar2')).save()
+
+        # Test non exiting attribute
+        with self.assertRaises(InvalidQueryError) as ctx_err:
+            Person.objects(settings__notexist='bar').first()
+        self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
+
+        with self.assertRaises(LookUpError):
+            Person.objects.only('settings.notexist')
+
+        # Test existing attribute
+        self.assertEqual(Person.objects(settings__foo1='bar1').first().id, p1.id)
+        self.assertEqual(Person.objects(settings__foo2='bar2').first().id, p2.id)
+
+    def test_query_generic_embedded_document_attribute_with_inheritance(self):
+        class BaseSettings(EmbeddedDocument):
+            meta = {'allow_inheritance': True}
+            base_foo = StringField()
+
+        class AdminSettings(BaseSettings):
+            sub_foo = StringField()
+
+        class Person(Document):
+            settings = GenericEmbeddedDocumentField(choices=[BaseSettings])
+
+        Person.drop_collection()
+
+        p = Person(settings=AdminSettings(base_foo='basefoo', sub_foo='subfoo'))
+        p.save()
+
+        # Test non exiting attribute
+        with self.assertRaises(InvalidQueryError) as ctx_err:
+            self.assertEqual(Person.objects(settings__notexist='bar').first().id, p.id)
+        self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
+
+        # Test existing attribute
+        self.assertEqual(Person.objects(settings__base_foo='basefoo').first().id, p.id)
+        self.assertEqual(Person.objects(settings__sub_foo='subfoo').first().id, p.id)

From d98f36ceff73dec4fc419054ceb28a4ea6315fa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 2 May 2019 00:08:16 +0200
Subject: [PATCH 0790/1519] Add test for querying on fields of
 list(EmbeddedDocument) (with inheritance on the EmbededDoc)

---
 docs/changelog.rst                           |  1 +
 tests/fields/test_embedded_document_field.py | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 34e1c4953..543cfce70 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Development
 ===========
+- Fix querying on List(EmbeddedDocument) subclasses fields #1961
 - Fix querying on (Generic)EmbeddedDocument subclasses fields #475
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
 - Fix disconnect function #566 #1599 #605 #607 #1213 #565
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index e9fc79c80..b870f9f97 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from mongoengine import Document, StringField, ValidationError, EmbeddedDocument, EmbeddedDocumentField, \
-    InvalidQueryError, LookUpError, IntField, GenericEmbeddedDocumentField, ListField
+    InvalidQueryError, LookUpError, IntField, GenericEmbeddedDocumentField, ListField, EmbeddedDocumentListField
 
 from tests.utils import MongoDBTestCase
 
@@ -108,6 +108,22 @@ class Person(Document):
         self.assertEqual(only_p.settings.base_foo, 'basefoo')
         self.assertIsNone(only_p.settings.sub_foo)
 
+    def test_query_list_embedded_document_with_inheritance(self):
+        class BaseEmbeddedDoc(EmbeddedDocument):
+            s = StringField()
+            meta = {'allow_inheritance': True}
+
+        class EmbeddedDoc(BaseEmbeddedDoc):
+            s2 = StringField()
+
+        class MyDoc(Document):
+            embeds = EmbeddedDocumentListField(BaseEmbeddedDoc)
+
+        doc = MyDoc(embeds=[EmbeddedDoc(s='foo', s2='bar')]).save()
+
+        self.assertEqual(MyDoc.objects(embeds__s='foo').first(), doc)
+        self.assertEqual(MyDoc.objects(embeds__s2='bar').first(), doc)
+
 
 class TestGenericEmbeddedDocumentField(MongoDBTestCase):
 

From f7b7d0f79e3af2594721db2a59c5d18ca8f347f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 3 May 2019 21:59:48 +0200
Subject: [PATCH 0791/1519] Improve tests for querying list(embedded) when
 using inheritance

---
 docs/changelog.rst                           |  2 +-
 tests/fields/test_embedded_document_field.py | 32 ++++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 543cfce70..961a8c946 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 
 Development
 ===========
-- Fix querying on List(EmbeddedDocument) subclasses fields #1961
+- Fix querying on List(EmbeddedDocument) subclasses fields #1961 #1492
 - Fix querying on (Generic)EmbeddedDocument subclasses fields #475
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
 - Fix disconnect function #566 #1599 #605 #607 #1213 #565
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index b870f9f97..a262d054d 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from mongoengine import Document, StringField, ValidationError, EmbeddedDocument, EmbeddedDocumentField, \
-    InvalidQueryError, LookUpError, IntField, GenericEmbeddedDocumentField, ListField, EmbeddedDocumentListField
+    InvalidQueryError, LookUpError, IntField, GenericEmbeddedDocumentField, ListField, EmbeddedDocumentListField, \
+    ReferenceField
 
 from tests.utils import MongoDBTestCase
 
@@ -109,20 +110,31 @@ class Person(Document):
         self.assertIsNone(only_p.settings.sub_foo)
 
     def test_query_list_embedded_document_with_inheritance(self):
-        class BaseEmbeddedDoc(EmbeddedDocument):
-            s = StringField()
+        class Post(EmbeddedDocument):
+            title = StringField(max_length=120, required=True)
             meta = {'allow_inheritance': True}
 
-        class EmbeddedDoc(BaseEmbeddedDoc):
-            s2 = StringField()
+        class TextPost(Post):
+            content = StringField()
 
-        class MyDoc(Document):
-            embeds = EmbeddedDocumentListField(BaseEmbeddedDoc)
+        class MoviePost(Post):
+            author = StringField()
+
+        class Record(Document):
+            posts = ListField(EmbeddedDocumentField(Post))
+
+        record_movie = Record(posts=[MoviePost(author='John', title='foo')]).save()
+        record_text = Record(posts=[TextPost(content='a', title='foo')]).save()
+
+        records = list(Record.objects(posts__author=record_movie.posts[0].author))
+        self.assertEqual(len(records), 1)
+        self.assertEqual(records[0].id, record_movie.id)
 
-        doc = MyDoc(embeds=[EmbeddedDoc(s='foo', s2='bar')]).save()
+        records = list(Record.objects(posts__content=record_text.posts[0].content))
+        self.assertEqual(len(records), 1)
+        self.assertEqual(records[0].id, record_text.id)
 
-        self.assertEqual(MyDoc.objects(embeds__s='foo').first(), doc)
-        self.assertEqual(MyDoc.objects(embeds__s2='bar').first(), doc)
+        self.assertEqual(Record.objects(posts__title='foo').count(), 2)
 
 
 class TestGenericEmbeddedDocumentField(MongoDBTestCase):

From 9cdc3ebee64f7c46be06d9264328c522889cdaf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 5 May 2019 23:37:12 +0200
Subject: [PATCH 0792/1519] Fix default write concern on save call that was
 overwriting connection wc

---
 docs/changelog.rst      | 1 +
 mongoengine/document.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 356e2b65b..80b92b814 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,7 @@ Development
     - disconnect now clears `mongoengine.connection._connection_settings`
     - disconnect now clears the cached attribute `Document._collection`
 - POTENTIAL BREAKING CHANGE: Aggregate gives wrong results when used with a queryset having limit and skip #2029
+- Fix the default write concern of .save that was overwriting the connection write concern #568
 - mongoengine now requires pymongo>=3.5 #2017
 - Generate Unique Indices for SortedListField and EmbeddedDocumentListFields #2020
 - connect() fails immediately when db name contains invalid characters #2031 #1718
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 753520c7e..5ccedbfab 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -375,7 +375,7 @@ def save(self, force_insert=False, validate=True, clean=True,
             self.validate(clean=clean)
 
         if write_concern is None:
-            write_concern = {'w': 1}
+            write_concern = {}
 
         doc = self.to_mongo()
 

From 9d53ad53e5b8ed526edadd109ea68b9dfc106798 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Fri, 10 May 2019 17:33:59 +0200
Subject: [PATCH 0793/1519] Remove save and reload from embeddeddocument

---
 mongoengine/document.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 57364ae63..4f91401ca 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -89,18 +89,6 @@ def to_mongo(self, *args, **kwargs):
 
         return data
 
-    def save(self, *args, **kwargs):
-        warnings.warn("EmbeddedDocument.save is deprecated and will be removed in a next version of mongoengine."
-                      "Use the parent document's .save() or ._instance.save()",
-                      DeprecationWarning, stacklevel=2)
-        self._instance.save(*args, **kwargs)
-
-    def reload(self, *args, **kwargs):
-        warnings.warn("EmbeddedDocument.reload is deprecated and will be removed in a next version of mongoengine."
-                      "Use the parent document's .reload() or ._instance.reload()",
-                      DeprecationWarning, stacklevel=2)
-        self._instance.reload(*args, **kwargs)
-
 
 class Document(six.with_metaclass(TopLevelDocumentMetaclass, BaseDocument)):
     """The base class used for defining the structure and properties of

From ac64ade10f27b1cf102965ec1950caaf5e190c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 15 May 2019 21:54:26 +0200
Subject: [PATCH 0794/1519] remove dead code (related to pymongo2) + minor
 cleaning

---
 mongoengine/document.py      |  8 ++------
 mongoengine/queryset/base.py | 34 ++++++++++++----------------------
 tests/queryset/queryset.py   | 11 ++---------
 tests/test_connection.py     | 30 +++++++++---------------------
 4 files changed, 25 insertions(+), 58 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 5ccedbfab..a11397891 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -816,11 +816,9 @@ def create_index(cls, keys, background=False, **kwargs):
         index_spec = index_spec.copy()
         fields = index_spec.pop('fields')
         drop_dups = kwargs.get('drop_dups', False)
-        if IS_PYMONGO_3 and drop_dups:
+        if drop_dups:
             msg = 'drop_dups is deprecated and is removed when using PyMongo 3+.'
             warnings.warn(msg, DeprecationWarning)
-        elif not IS_PYMONGO_3:
-            index_spec['drop_dups'] = drop_dups
         index_spec['background'] = background
         index_spec.update(kwargs)
 
@@ -842,11 +840,9 @@ def ensure_index(cls, key_or_list, drop_dups=False, background=False,
         :param drop_dups: Was removed/ignored with MongoDB >2.7.5. The value
             will be removed if PyMongo3+ is used
         """
-        if IS_PYMONGO_3 and drop_dups:
+        if drop_dups:
             msg = 'drop_dups is deprecated and is removed when using PyMongo 3+.'
             warnings.warn(msg, DeprecationWarning)
-        elif not IS_PYMONGO_3:
-            kwargs.update({'drop_dups': drop_dups})
         return cls.create_index(key_or_list, background=background, **kwargs)
 
     @classmethod
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 66e435142..16a2512db 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -626,7 +626,7 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
 
         queryset = self.clone()
         query = queryset._query
-        if not IS_PYMONGO_3 or not remove:
+        if not remove:
             update = transform.update(queryset._document, **update)
         sort = queryset._ordering
 
@@ -1090,7 +1090,7 @@ def snapshot(self, enabled):
         return queryset
 
     def timeout(self, enabled):
-        """Enable or disable the default mongod timeout when querying.
+        """Enable or disable the default mongod timeout when querying. (no_cursor_timeout option)
 
         :param enabled: whether or not the timeout is used
 
@@ -1531,26 +1531,16 @@ def _collection(self):
 
     @property
     def _cursor_args(self):
-        if not IS_PYMONGO_3:
-            fields_name = 'fields'
-            cursor_args = {
-                'timeout': self._timeout,
-                'snapshot': self._snapshot
-            }
-            if self._read_preference is not None:
-                cursor_args['read_preference'] = self._read_preference
-            else:
-                cursor_args['slave_okay'] = self._slave_okay
-        else:
-            fields_name = 'projection'
-            # snapshot is not handled at all by PyMongo 3+
-            # TODO: evaluate similar possibilities using modifiers
-            if self._snapshot:
-                msg = 'The snapshot option is not anymore available with PyMongo 3+'
-                warnings.warn(msg, DeprecationWarning)
-            cursor_args = {
-                'no_cursor_timeout': not self._timeout
-            }
+        fields_name = 'projection'
+        # snapshot is not handled at all by PyMongo 3+
+        # TODO: evaluate similar possibilities using modifiers
+        if self._snapshot:
+            msg = 'The snapshot option is not anymore available with PyMongo 3+'
+            warnings.warn(msg, DeprecationWarning)
+        cursor_args = {
+            'no_cursor_timeout': not self._timeout
+        }
+
         if self._loaded_fields:
             cursor_args[fields_name] = self._loaded_fields.as_dict()
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 31b1641ea..c403e68f4 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -3415,10 +3415,7 @@ class News(Document):
         self.assertEqual(query.count(), 3)
         self.assertEqual(query._query, {'$text': {'$search': 'brasil'}})
         cursor_args = query._cursor_args
-        if not IS_PYMONGO_3:
-            cursor_args_fields = cursor_args['fields']
-        else:
-            cursor_args_fields = cursor_args['projection']
+        cursor_args_fields = cursor_args['projection']
         self.assertEqual(
             cursor_args_fields, {'_text_score': {'$meta': 'textScore'}})
 
@@ -4511,11 +4508,7 @@ class Bar(Document):
         bars = list(Bar.objects(read_preference=ReadPreference.PRIMARY))
         self.assertEqual([], bars)
 
-        if not IS_PYMONGO_3:
-            error_class = ConfigurationError
-        else:
-            error_class = TypeError
-        self.assertRaises(error_class, Bar.objects, read_preference='Primary')
+        self.assertRaises(TypeError, Bar.objects, read_preference='Primary')
 
         # read_preference as a kwarg
         bars = Bar.objects(read_preference=ReadPreference.SECONDARY_PREFERRED)
diff --git a/tests/test_connection.py b/tests/test_connection.py
index e5e104791..65f017171 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -23,10 +23,7 @@
 
 
 def get_tz_awareness(connection):
-    if not IS_PYMONGO_3:
-        return connection.tz_aware
-    else:
-        return connection.codec_options.tz_aware
+    return connection.codec_options.tz_aware
 
 
 class ConnectionTest(unittest.TestCase):
@@ -425,12 +422,6 @@ def test_connect_uri(self):
         c.admin.authenticate("admin", "password")
         c.admin.command("createUser", "username", pwd="password", roles=["dbOwner"])
 
-        if not IS_PYMONGO_3:
-            self.assertRaises(
-                MongoEngineConnectionError, connect, 'testdb_uri_bad',
-                host='mongodb://test:password@localhost'
-            )
-
         connect("testdb_uri", host='mongodb://username:password@localhost/mongoenginetest')
 
         conn = get_connection()
@@ -641,17 +632,14 @@ def test_multiple_connection_settings(self):
         self.assertEqual(len(mongo_connections.items()), 2)
         self.assertIn('t1', mongo_connections.keys())
         self.assertIn('t2', mongo_connections.keys())
-        if not IS_PYMONGO_3:
-            self.assertEqual(mongo_connections['t1'].host, 'localhost')
-            self.assertEqual(mongo_connections['t2'].host, '127.0.0.1')
-        else:
-            # Handle PyMongo 3+ Async Connection
-            # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
-            # Purposely not catching exception to fail test if thrown.
-            mongo_connections['t1'].server_info()
-            mongo_connections['t2'].server_info()
-            self.assertEqual(mongo_connections['t1'].address[0], 'localhost')
-            self.assertEqual(mongo_connections['t2'].address[0], '127.0.0.1')
+
+        # Handle PyMongo 3+ Async Connection
+        # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
+        # Purposely not catching exception to fail test if thrown.
+        mongo_connections['t1'].server_info()
+        mongo_connections['t2'].server_info()
+        self.assertEqual(mongo_connections['t1'].address[0], 'localhost')
+        self.assertEqual(mongo_connections['t2'].address[0], '127.0.0.1')
 
 
 if __name__ == '__main__':

From cf38ef70cb506d20e5a506a8f07311c0d3821fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 15 May 2019 22:23:35 +0200
Subject: [PATCH 0795/1519] Remove more code related to supporting pymongo2

---
 mongoengine/connection.py           | 41 ++++------------
 mongoengine/document.py             | 23 +++------
 mongoengine/pymongo_support.py      |  1 -
 mongoengine/queryset/base.py        | 63 +++++++++----------------
 mongoengine/queryset/transform.py   | 12 ++---
 tests/queryset/queryset.py          | 53 ++-------------------
 tests/test_connection.py            | 72 +++++++++--------------------
 tests/test_replicaset_connection.py | 19 +++-----
 tests/utils.py                      | 17 -------
 9 files changed, 70 insertions(+), 231 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 67374d01b..e12980e68 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -2,8 +2,6 @@
 from pymongo.database import _check_name
 import six
 
-from mongoengine.pymongo_support import IS_PYMONGO_3
-
 __all__ = ['MongoEngineConnectionError', 'connect', 'disconnect', 'disconnect_all',
            'register_connection', 'DEFAULT_CONNECTION_NAME', 'DEFAULT_DATABASE_NAME',
            'get_db', 'get_connection']
@@ -14,11 +12,11 @@
 DEFAULT_HOST = 'localhost'
 DEFAULT_PORT = 27017
 
-if IS_PYMONGO_3:
-    READ_PREFERENCE = ReadPreference.PRIMARY
-else:
-    from pymongo import MongoReplicaSetClient
-    READ_PREFERENCE = False
+_connection_settings = {}
+_connections = {}
+_dbs = {}
+
+READ_PREFERENCE = ReadPreference.PRIMARY
 
 
 class MongoEngineConnectionError(Exception):
@@ -28,12 +26,7 @@ class MongoEngineConnectionError(Exception):
     pass
 
 
-_connection_settings = {}
-_connections = {}
-_dbs = {}
-
-
-def check_db_name(name):
+def _check_db_name(name):
     """Check if a database name is valid.
     This functionality is copied from pymongo Database class constructor.
     """
@@ -57,7 +50,6 @@ def _get_connection_settings(
     : param host: the host name of the: program: `mongod` instance to connect to
     : param port: the port that the: program: `mongod` instance is running on
     : param read_preference: The read preference for the collection
-       ** Added pymongo 2.1
     : param username: username to authenticate with
     : param password: password to authenticate with
     : param authentication_source: database to authenticate against
@@ -83,7 +75,7 @@ def _get_connection_settings(
         'authentication_mechanism': authentication_mechanism
     }
 
-    check_db_name(conn_settings['name'])
+    _check_db_name(conn_settings['name'])
     conn_host = conn_settings['host']
 
     # Host can be a list or a string, so if string, force to a list.
@@ -119,7 +111,7 @@ def _get_connection_settings(
                 conn_settings['authentication_source'] = uri_options['authsource']
             if 'authmechanism' in uri_options:
                 conn_settings['authentication_mechanism'] = uri_options['authmechanism']
-            if IS_PYMONGO_3 and 'readpreference' in uri_options:
+            if 'readpreference' in uri_options:
                 read_preferences = (
                     ReadPreference.NEAREST,
                     ReadPreference.PRIMARY,
@@ -158,7 +150,6 @@ def register_connection(alias, db=None, name=None, host=None, port=None,
     : param host: the host name of the: program: `mongod` instance to connect to
     : param port: the port that the: program: `mongod` instance is running on
     : param read_preference: The read preference for the collection
-       ** Added pymongo 2.1
     : param username: username to authenticate with
     : param password: password to authenticate with
     : param authentication_source: database to authenticate against
@@ -259,22 +250,6 @@ def _clean_settings(settings_dict):
     else:
         connection_class = MongoClient
 
-        # For replica set connections with PyMongo 2.x, use
-        # MongoReplicaSetClient.
-        # TODO remove this once we stop supporting PyMongo 2.x.
-        if 'replicaSet' in conn_settings and not IS_PYMONGO_3:
-            connection_class = MongoReplicaSetClient
-            conn_settings['hosts_or_uri'] = conn_settings.pop('host', None)
-
-            # hosts_or_uri has to be a string, so if 'host' was provided
-            # as a list, join its parts and separate them by ','
-            if isinstance(conn_settings['hosts_or_uri'], list):
-                conn_settings['hosts_or_uri'] = ','.join(
-                    conn_settings['hosts_or_uri'])
-
-            # Discard port since it can't be used on MongoReplicaSetClient
-            conn_settings.pop('port', None)
-
     # Iterate over all of the connection settings and if a connection with
     # the same parameters is already established, use it instead of creating
     # a new one.
diff --git a/mongoengine/document.py b/mongoengine/document.py
index a11397891..2ebd31fd9 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -18,7 +18,7 @@
                                           switch_db)
 from mongoengine.errors import (InvalidDocumentError, InvalidQueryError,
                                 SaveConditionError)
-from mongoengine.pymongo_support import IS_PYMONGO_3, list_collection_names
+from mongoengine.pymongo_support import list_collection_names
 from mongoengine.queryset import (NotUniqueError, OperationError,
                                   QuerySet, transform)
 
@@ -822,10 +822,7 @@ def create_index(cls, keys, background=False, **kwargs):
         index_spec['background'] = background
         index_spec.update(kwargs)
 
-        if IS_PYMONGO_3:
-            return cls._get_collection().create_index(fields, **index_spec)
-        else:
-            return cls._get_collection().ensure_index(fields, **index_spec)
+        return cls._get_collection().create_index(fields, **index_spec)
 
     @classmethod
     def ensure_index(cls, key_or_list, drop_dups=False, background=False,
@@ -858,7 +855,7 @@ def ensure_indexes(cls):
         drop_dups = cls._meta.get('index_drop_dups', False)
         index_opts = cls._meta.get('index_opts') or {}
         index_cls = cls._meta.get('index_cls', True)
-        if IS_PYMONGO_3 and drop_dups:
+        if drop_dups:
             msg = 'drop_dups is deprecated and is removed when using PyMongo 3+.'
             warnings.warn(msg, DeprecationWarning)
 
@@ -889,11 +886,7 @@ def ensure_indexes(cls):
                 if 'cls' in opts:
                     del opts['cls']
 
-                if IS_PYMONGO_3:
-                    collection.create_index(fields, background=background, **opts)
-                else:
-                    collection.ensure_index(fields, background=background,
-                                            drop_dups=drop_dups, **opts)
+                collection.create_index(fields, background=background, **opts)
 
         # If _cls is being used (for polymorphism), it needs an index,
         # only if another index doesn't begin with _cls
@@ -904,12 +897,8 @@ def ensure_indexes(cls):
             if 'cls' in index_opts:
                 del index_opts['cls']
 
-            if IS_PYMONGO_3:
-                collection.create_index('_cls', background=background,
-                                        **index_opts)
-            else:
-                collection.ensure_index('_cls', background=background,
-                                        **index_opts)
+            collection.create_index('_cls', background=background,
+                                    **index_opts)
 
     @classmethod
     def list_indexes(cls):
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 0d607162c..f66c038e4 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -7,7 +7,6 @@
 
 PYMONGO_VERSION = tuple(pymongo.version_tuple[:2])
 
-IS_PYMONGO_3 = PYMONGO_VERSION[0] >= 3
 IS_PYMONGO_GTE_37 = PYMONGO_VERSION >= _PYMONGO_37
 
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 16a2512db..bfbfbbe0b 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -10,6 +10,7 @@
 from bson.code import Code
 import pymongo
 import pymongo.errors
+from pymongo.collection import ReturnDocument
 from pymongo.common import validate_read_preference
 import six
 from six import iteritems
@@ -21,14 +22,10 @@
 from mongoengine.context_managers import set_write_concern, switch_db
 from mongoengine.errors import (InvalidQueryError, LookUpError,
                                 NotUniqueError, OperationError)
-from mongoengine.pymongo_support import IS_PYMONGO_3
 from mongoengine.queryset import transform
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
 
-if IS_PYMONGO_3:
-    from pymongo.collection import ReturnDocument
-
 
 __all__ = ('BaseQuerySet', 'DO_NOTHING', 'NULLIFY', 'CASCADE', 'DENY', 'PULL')
 
@@ -631,26 +628,20 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
         sort = queryset._ordering
 
         try:
-            if IS_PYMONGO_3:
-                if full_response:
-                    msg = 'With PyMongo 3+, it is not possible anymore to get the full response.'
-                    warnings.warn(msg, DeprecationWarning)
-                if remove:
-                    result = queryset._collection.find_one_and_delete(
-                        query, sort=sort, **self._cursor_args)
-                else:
-                    if new:
-                        return_doc = ReturnDocument.AFTER
-                    else:
-                        return_doc = ReturnDocument.BEFORE
-                    result = queryset._collection.find_one_and_update(
-                        query, update, upsert=upsert, sort=sort, return_document=return_doc,
-                        **self._cursor_args)
-
+            if full_response:
+                msg = 'With PyMongo 3+, it is not possible anymore to get the full response.'
+                warnings.warn(msg, DeprecationWarning)
+            if remove:
+                result = queryset._collection.find_one_and_delete(
+                    query, sort=sort, **self._cursor_args)
             else:
-                result = queryset._collection.find_and_modify(
-                    query, update, upsert=upsert, sort=sort, remove=remove, new=new,
-                    full_response=full_response, **self._cursor_args)
+                if new:
+                    return_doc = ReturnDocument.AFTER
+                else:
+                    return_doc = ReturnDocument.BEFORE
+                result = queryset._collection.find_one_and_update(
+                    query, update, upsert=upsert, sort=sort, return_document=return_doc,
+                    **self._cursor_args)
         except pymongo.errors.DuplicateKeyError as err:
             raise NotUniqueError(u'Update failed (%s)' % err)
         except pymongo.errors.OperationFailure as err:
@@ -1082,9 +1073,8 @@ def snapshot(self, enabled):
         ..versionchanged:: 0.5 - made chainable
         .. deprecated:: Ignored with PyMongo 3+
         """
-        if IS_PYMONGO_3:
-            msg = 'snapshot is deprecated as it has no impact when using PyMongo 3+.'
-            warnings.warn(msg, DeprecationWarning)
+        msg = 'snapshot is deprecated as it has no impact when using PyMongo 3+.'
+        warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._snapshot = enabled
         return queryset
@@ -1108,9 +1098,8 @@ def slave_okay(self, enabled):
 
         .. deprecated:: Ignored with PyMongo 3+
         """
-        if IS_PYMONGO_3:
-            msg = 'slave_okay is deprecated as it has no impact when using PyMongo 3+.'
-            warnings.warn(msg, DeprecationWarning)
+        msg = 'slave_okay is deprecated as it has no impact when using PyMongo 3+.'
+        warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._slave_okay = enabled
         return queryset
@@ -1211,7 +1200,7 @@ def aggregate(self, *pipeline, **kwargs):
 
         pipeline = initial_pipeline + list(pipeline)
 
-        if IS_PYMONGO_3 and self._read_preference is not None:
+        if self._read_preference is not None:
             return self._collection.with_options(read_preference=self._read_preference) \
                        .aggregate(pipeline, cursor={}, **kwargs)
 
@@ -1421,11 +1410,7 @@ def sum(self, field):
         if isinstance(field_instances[-1], ListField):
             pipeline.insert(1, {'$unwind': '$' + field})
 
-        result = self._document._get_collection().aggregate(pipeline)
-        if IS_PYMONGO_3:
-            result = tuple(result)
-        else:
-            result = result.get('result')
+        result = tuple(self._document._get_collection().aggregate(pipeline))
 
         if result:
             return result[0]['total']
@@ -1452,11 +1437,7 @@ def average(self, field):
         if isinstance(field_instances[-1], ListField):
             pipeline.insert(1, {'$unwind': '$' + field})
 
-        result = self._document._get_collection().aggregate(pipeline)
-        if IS_PYMONGO_3:
-            result = tuple(result)
-        else:
-            result = result.get('result')
+        result = tuple(self._document._get_collection().aggregate(pipeline))
         if result:
             return result[0]['total']
         return 0
@@ -1564,7 +1545,7 @@ def _cursor(self):
         # XXX In PyMongo 3+, we define the read preference on a collection
         # level, not a cursor level. Thus, we need to get a cloned collection
         # object using `with_options` first.
-        if IS_PYMONGO_3 and self._read_preference is not None:
+        if self._read_preference is not None:
             self._cursor_obj = self._collection\
                 .with_options(read_preference=self._read_preference)\
                 .find(self._query, **self._cursor_args)
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 3de10a692..48c5f682f 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -8,9 +8,7 @@
 
 from mongoengine.base import UPDATE_OPERATORS
 from mongoengine.common import _import_class
-from mongoengine.connection import get_connection
 from mongoengine.errors import InvalidQueryError
-from mongoengine.pymongo_support import IS_PYMONGO_3
 
 __all__ = ('query', 'update')
 
@@ -163,16 +161,14 @@ def query(_doc_cls=None, **kwargs):
                     # PyMongo 3+ and MongoDB < 2.6
                     near_embedded = False
                     for near_op in ('$near', '$nearSphere'):
-                        if isinstance(value_dict.get(near_op), dict) and (
-                                IS_PYMONGO_3 or get_connection().max_wire_version > 1):
+                        if isinstance(value_dict.get(near_op), dict):
                             value_son[near_op] = SON(value_son[near_op])
                             if '$maxDistance' in value_dict:
-                                value_son[near_op][
-                                    '$maxDistance'] = value_dict['$maxDistance']
+                                value_son[near_op]['$maxDistance'] = value_dict['$maxDistance']
                             if '$minDistance' in value_dict:
-                                value_son[near_op][
-                                    '$minDistance'] = value_dict['$minDistance']
+                                value_son[near_op]['$minDistance'] = value_dict['$minDistance']
                             near_embedded = True
+
                     if not near_embedded:
                         if '$maxDistance' in value_dict:
                             value_son['$maxDistance'] = value_dict['$maxDistance']
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c403e68f4..039834f74 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -19,10 +19,9 @@
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
 from mongoengine.mongodb_support import get_mongodb_version, MONGODB_32
-from mongoengine.pymongo_support import IS_PYMONGO_3
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
-from tests.utils import requires_mongodb_gte_26, skip_pymongo3
+from tests.utils import requires_mongodb_gte_26
 
 
 class db_ops_tracker(query_counter):
@@ -1047,48 +1046,6 @@ class Project(Document):
             org.save()  # saves the org
             self.assertEqual(q, 2)
 
-    @skip_pymongo3
-    def test_slave_okay(self):
-        """Ensures that a query can take slave_okay syntax.
-        Useless with PyMongo 3+ as well as with MongoDB 3+.
-        """
-        person1 = self.Person(name="User A", age=20)
-        person1.save()
-        person2 = self.Person(name="User B", age=30)
-        person2.save()
-
-        # Retrieve the first person from the database
-        person = self.Person.objects.slave_okay(True).first()
-        self.assertIsInstance(person, self.Person)
-        self.assertEqual(person.name, "User A")
-        self.assertEqual(person.age, 20)
-
-    @requires_mongodb_gte_26
-    @skip_pymongo3
-    def test_cursor_args(self):
-        """Ensures the cursor args can be set as expected
-        """
-        p = self.Person.objects
-        # Check default
-        self.assertEqual(p._cursor_args,
-                         {'snapshot': False, 'slave_okay': False, 'timeout': True})
-
-        p = p.snapshot(False).slave_okay(False).timeout(False)
-        self.assertEqual(p._cursor_args,
-                         {'snapshot': False, 'slave_okay': False, 'timeout': False})
-
-        p = p.snapshot(True).slave_okay(False).timeout(False)
-        self.assertEqual(p._cursor_args,
-                         {'snapshot': True, 'slave_okay': False, 'timeout': False})
-
-        p = p.snapshot(True).slave_okay(True).timeout(False)
-        self.assertEqual(p._cursor_args,
-                         {'snapshot': True, 'slave_okay': True, 'timeout': False})
-
-        p = p.snapshot(True).slave_okay(True).timeout(True)
-        self.assertEqual(p._cursor_args,
-                         {'snapshot': True, 'slave_okay': True, 'timeout': True})
-
     def test_repeated_iteration(self):
         """Ensure that QuerySet rewinds itself one iteration finishes.
         """
@@ -4568,12 +4525,8 @@ class Bar(Document):
         bars = Bar.objects \
                     .read_preference(ReadPreference.SECONDARY_PREFERRED) \
                     .aggregate()
-        if IS_PYMONGO_3:
-            self.assertEqual(bars._CommandCursor__collection.read_preference,
-                             ReadPreference.SECONDARY_PREFERRED)
-        else:
-            self.assertNotEqual(bars._CommandCursor__collection.read_preference,
-                             ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._CommandCursor__collection.read_preference,
+                         ReadPreference.SECONDARY_PREFERRED)
 
     def test_json_simple(self):
 
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 65f017171..5473b8a0a 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -2,6 +2,7 @@
 
 from pymongo import MongoClient
 from pymongo.errors import OperationFailure, InvalidName
+from pymongo import ReadPreference
 
 try:
     import unittest2 as unittest
@@ -16,7 +17,6 @@
     connect, register_connection,
     Document, DateTimeField,
     disconnect_all, StringField)
-from mongoengine.pymongo_support import IS_PYMONGO_3
 import mongoengine.connection
 from mongoengine.connection import (MongoEngineConnectionError, get_db,
                                     get_connection, disconnect, DEFAULT_DATABASE_NAME)
@@ -404,11 +404,7 @@ def test_sharing_connections(self):
         connect('mongoenginetests', alias='testdb2')
         actual_connection = get_connection('testdb2')
 
-        # Handle PyMongo 3+ Async Connection
-        if IS_PYMONGO_3:
-            # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
-            # Purposely not catching exception to fail test if thrown.
-            expected_connection.server_info()
+        expected_connection.server_info()
 
         self.assertEqual(expected_connection, actual_connection)
 
@@ -484,19 +480,11 @@ def test_connect_uri_with_authsource(self):
         c.admin.command("createUser", "username2", pwd="password", roles=["dbOwner"])
 
         # Authentication fails without "authSource"
-        if IS_PYMONGO_3:
-            test_conn = connect(
-                'mongoenginetest', alias='test1',
-                host='mongodb://username2:password@localhost/mongoenginetest'
-            )
-            self.assertRaises(OperationFailure, test_conn.server_info)
-        else:
-            self.assertRaises(
-                MongoEngineConnectionError,
-                connect, 'mongoenginetest', alias='test1',
-                host='mongodb://username2:password@localhost/mongoenginetest'
-            )
-            self.assertRaises(MongoEngineConnectionError, get_db, 'test1')
+        test_conn = connect(
+            'mongoenginetest', alias='test1',
+            host='mongodb://username2:password@localhost/mongoenginetest'
+        )
+        self.assertRaises(OperationFailure, test_conn.server_info)
 
         # Authentication succeeds with "authSource"
         authd_conn = connect(
@@ -565,44 +553,28 @@ def test_write_concern(self):
         """
         conn1 = connect(alias='conn1', host='mongodb://localhost/testing?w=1&j=true')
         conn2 = connect('testing', alias='conn2', w=1, j=True)
-        if IS_PYMONGO_3:
-            self.assertEqual(conn1.write_concern.document, {'w': 1, 'j': True})
-            self.assertEqual(conn2.write_concern.document, {'w': 1, 'j': True})
-        else:
-            self.assertEqual(dict(conn1.write_concern), {'w': 1, 'j': True})
-            self.assertEqual(dict(conn2.write_concern), {'w': 1, 'j': True})
+        self.assertEqual(conn1.write_concern.document, {'w': 1, 'j': True})
+        self.assertEqual(conn2.write_concern.document, {'w': 1, 'j': True})
 
     def test_connect_with_replicaset_via_uri(self):
         """Ensure connect() works when specifying a replicaSet via the
         MongoDB URI.
         """
-        if IS_PYMONGO_3:
-            c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
-            db = get_db()
-            self.assertIsInstance(db, pymongo.database.Database)
-            self.assertEqual(db.name, 'test')
-        else:
-            # PyMongo < v3.x raises an exception:
-            # "localhost:27017 is not a member of replica set local-rs"
-            with self.assertRaises(MongoEngineConnectionError):
-                c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
+        c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
+        db = get_db()
+        self.assertIsInstance(db, pymongo.database.Database)
+        self.assertEqual(db.name, 'test')
 
     def test_connect_with_replicaset_via_kwargs(self):
         """Ensure connect() works when specifying a replicaSet via the
         connection kwargs
         """
-        if IS_PYMONGO_3:
-            c = connect(replicaset='local-rs')
-            self.assertEqual(c._MongoClient__options.replica_set_name,
-                             'local-rs')
-            db = get_db()
-            self.assertIsInstance(db, pymongo.database.Database)
-            self.assertEqual(db.name, 'test')
-        else:
-            # PyMongo < v3.x raises an exception:
-            # "localhost:27017 is not a member of replica set local-rs"
-            with self.assertRaises(MongoEngineConnectionError):
-                c = connect(replicaset='local-rs')
+        c = connect(replicaset='local-rs')
+        self.assertEqual(c._MongoClient__options.replica_set_name,
+                         'local-rs')
+        db = get_db()
+        self.assertIsInstance(db, pymongo.database.Database)
+        self.assertEqual(db.name, 'test')
 
     def test_connect_tz_aware(self):
         connect('mongoenginetest', tz_aware=True)
@@ -618,10 +590,8 @@ class DateDoc(Document):
         self.assertEqual(d, date_doc.the_date)
 
     def test_read_preference_from_parse(self):
-        if IS_PYMONGO_3:
-            from pymongo import ReadPreference
-            conn = connect(host="mongodb://a1.vpc,a2.vpc,a3.vpc/prod?readPreference=secondaryPreferred")
-            self.assertEqual(conn.read_preference, ReadPreference.SECONDARY_PREFERRED)
+        conn = connect(host="mongodb://a1.vpc,a2.vpc,a3.vpc/prod?readPreference=secondaryPreferred")
+        self.assertEqual(conn.read_preference, ReadPreference.SECONDARY_PREFERRED)
 
     def test_multiple_connection_settings(self):
         connect('mongoenginetest', alias='t1', host="localhost")
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index 81fdfb641..cacdce8b9 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -1,23 +1,16 @@
 import unittest
 
 from pymongo import ReadPreference
-
-from mongoengine.pymongo_support import IS_PYMONGO_3
-
-if IS_PYMONGO_3:
-    from pymongo import MongoClient
-    CONN_CLASS = MongoClient
-    READ_PREF = ReadPreference.SECONDARY
-else:
-    from pymongo import ReplicaSetConnection
-    CONN_CLASS = ReplicaSetConnection
-    READ_PREF = ReadPreference.SECONDARY_ONLY
+from pymongo import MongoClient
 
 import mongoengine
-from mongoengine import *
 from mongoengine.connection import MongoEngineConnectionError
 
 
+CONN_CLASS = MongoClient
+READ_PREF = ReadPreference.SECONDARY
+
+
 class ConnectionTest(unittest.TestCase):
 
     def setUp(self):
@@ -35,7 +28,7 @@ def test_replicaset_uri_passes_read_preference(self):
         """
 
         try:
-            conn = connect(db='mongoenginetest',
+            conn = mongoengine.connect(db='mongoenginetest',
                            host="mongodb://localhost/mongoenginetest?replicaSet=rs",
                            read_preference=READ_PREF)
         except MongoEngineConnectionError as e:
diff --git a/tests/utils.py b/tests/utils.py
index 910601b16..0ebb44a48 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -6,7 +6,6 @@
 from mongoengine import connect
 from mongoengine.connection import get_db, disconnect_all
 from mongoengine.mongodb_support import get_mongodb_version, MONGODB_26, MONGODB_3, MONGODB_32, MONGODB_34
-from mongoengine.pymongo_support import IS_PYMONGO_3
 
 
 MONGO_TEST_DB = 'mongoenginetest'   # standard name for the test database
@@ -80,19 +79,3 @@ def requires_mongodb_gte_3(func):
     lower than v3.0.
     """
     return _decorated_with_ver_requirement(func, MONGODB_3, oper=operator.ge)
-
-
-def skip_pymongo3(f):
-    """Raise a SkipTest exception if we're running a test against
-    PyMongo v3.x.
-    """
-    def _inner(*args, **kwargs):
-        if IS_PYMONGO_3:
-            raise SkipTest("Useless with PyMongo 3+")
-        return f(*args, **kwargs)
-
-    _inner.__name__ = f.__name__
-    _inner.__doc__ = f.__doc__
-
-    return _inner
-

From 6a9ef319d0138ee9dce3d5ae73d667e9e14e0c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 16 May 2019 22:46:42 +0200
Subject: [PATCH 0796/1519] Fix Incompatibility btw recent tox version and
 virtualenv version

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64086357a..b943024ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,8 +48,8 @@ install:
 - travis_retry pip install --upgrade pip
 - travis_retry pip install coveralls
 - travis_retry pip install flake8 flake8-import-order
-- travis_retry pip install tox>=1.9
-- travis_retry pip install "virtualenv<14.0.0"  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
+- travis_retry pip install "tox"   # tox 3.11.0 has requirement virtualenv>=14.0.0
+- travis_retry pip install "virtualenv"  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
 - travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
 
 # Cache dependencies installed via pip

From b392e3102e94657fd663ba4e2b188ec648fe1c1b Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Fri, 17 May 2019 13:41:02 -0300
Subject: [PATCH 0797/1519] Add  support to  transform. Add pull tests for  and
 .

---
 mongoengine/queryset/transform.py |  2 +-
 tests/queryset/transform.py       | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 3de10a692..7241efbdc 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -281,7 +281,7 @@ def update(_doc_cls=None, **update):
 
             if op == 'pull':
                 if field.required or value is not None:
-                    if match == 'in' and not isinstance(value, dict):
+                    if match in ('in', 'nin') and not isinstance(value, dict):
                         value = _prepare_query_for_iterable(field, op, value)
                     else:
                         value = field.prepare_query_value(op, value)
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 8064f09c6..3c7c945f6 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -276,13 +276,18 @@ class MainDoc(Document):
             title = StringField()
             content = EmbeddedDocumentField(SubDoc)
 
-        word = Word(word='abc', index=1)
-        update = transform.update(MainDoc, pull__content__text=word)
-        self.assertEqual(update, {'$pull': {'content.text': SON([('word', u'abc'), ('index', 1)])}})
+        # word = Word(word='abc', index=1)
+        # update = transform.update(MainDoc, pull__content__text=word)
+        # self.assertEqual(update, {'$pull': {'content.text': SON([('word', u'abc'), ('index', 1)])}})
 
-        update = transform.update(MainDoc, pull__content__heading='xyz')
-        self.assertEqual(update, {'$pull': {'content.heading': 'xyz'}})
+        # update = transform.update(MainDoc, pull__content__heading='xyz')
+        # self.assertEqual(update, {'$pull': {'content.heading': 'xyz'}})
 
+        # update = transform.update(MainDoc, pull__content__text__word__in=['foo', 'bar'])
+        # self.assertEqual(update, {'$pull': {'content.text': {'word': {'$in': ['foo', 'bar']}}}})
+
+        update = transform.update(MainDoc, pull__content__text__word__nin=['foo', 'bar'])
+        self.assertEqual(update, {'$pull': {'content.text': {'word': {'$nin': ['foo', 'bar']}}}})
 
 if __name__ == '__main__':
     unittest.main()

From 2b17985a11b5ff9baa206d513f2d05e502122039 Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Fri, 17 May 2019 13:55:00 -0300
Subject: [PATCH 0798/1519] Uncomment tests.

---
 tests/queryset/transform.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 3c7c945f6..b2bc1d6c7 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -276,15 +276,15 @@ class MainDoc(Document):
             title = StringField()
             content = EmbeddedDocumentField(SubDoc)
 
-        # word = Word(word='abc', index=1)
-        # update = transform.update(MainDoc, pull__content__text=word)
-        # self.assertEqual(update, {'$pull': {'content.text': SON([('word', u'abc'), ('index', 1)])}})
+        word = Word(word='abc', index=1)
+        update = transform.update(MainDoc, pull__content__text=word)
+        self.assertEqual(update, {'$pull': {'content.text': SON([('word', u'abc'), ('index', 1)])}})
 
-        # update = transform.update(MainDoc, pull__content__heading='xyz')
-        # self.assertEqual(update, {'$pull': {'content.heading': 'xyz'}})
+        update = transform.update(MainDoc, pull__content__heading='xyz')
+        self.assertEqual(update, {'$pull': {'content.heading': 'xyz'}})
 
-        # update = transform.update(MainDoc, pull__content__text__word__in=['foo', 'bar'])
-        # self.assertEqual(update, {'$pull': {'content.text': {'word': {'$in': ['foo', 'bar']}}}})
+        update = transform.update(MainDoc, pull__content__text__word__in=['foo', 'bar'])
+        self.assertEqual(update, {'$pull': {'content.text': {'word': {'$in': ['foo', 'bar']}}}})
 
         update = transform.update(MainDoc, pull__content__text__word__nin=['foo', 'bar'])
         self.assertEqual(update, {'$pull': {'content.text': {'word': {'$nin': ['foo', 'bar']}}}})

From f28e1b8c90eeb977a1ee8be625bdc3ae5143ad51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 11 May 2019 22:31:32 +0200
Subject: [PATCH 0799/1519] improve coverage of lazy ref field

---
 tests/fields/test_lazy_reference_field.py | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index a72e8cbe6..d80314094 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -13,6 +13,35 @@ def test_lazy_reference_config(self):
         # with a document class name.
         self.assertRaises(ValidationError, LazyReferenceField, EmbeddedDocument)
 
+    def test___repr__(self):
+        class Animal(Document):
+            pass
+
+        class Ocurrence(Document):
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal()
+        oc = Ocurrence(animal=animal)
+        self.assertIn('LazyReference', repr(oc.animal))
+
+    def test___getattr___unknown_attr_raises_attribute_error(self):
+        class Animal(Document):
+            pass
+
+        class Ocurrence(Document):
+            animal = LazyReferenceField(Animal)
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal().save()
+        oc = Ocurrence(animal=animal)
+        with self.assertRaises(AttributeError):
+            oc.animal.not_exist
+
     def test_lazy_reference_simple(self):
         class Animal(Document):
             name = StringField()

From 00d2fd685af10f3cebb2c61a3d04c2ac341c7092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 12 May 2019 22:58:17 +0200
Subject: [PATCH 0800/1519] more test cov

---
 mongoengine/base/metaclasses.py   |  3 ---
 mongoengine/common.py             |  6 +-----
 mongoengine/fields.py             |  6 ++----
 mongoengine/queryset/base.py      |  2 +-
 mongoengine/queryset/transform.py | 18 +++---------------
 tests/document/indexes.py         | 29 ++++++++++++++++++++++++-----
 tests/document/instance.py        |  6 ++++++
 tests/fields/geo.py               |  5 +++++
 tests/test_common.py              |  0
 9 files changed, 42 insertions(+), 33 deletions(-)
 create mode 100644 tests/test_common.py

diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index a19708256..6f507eaab 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -184,9 +184,6 @@ def __new__(mcs, name, bases, attrs):
                 if issubclass(new_class, EmbeddedDocument):
                     raise InvalidDocumentError('CachedReferenceFields is not '
                                                'allowed in EmbeddedDocuments')
-                if not f.document_type:
-                    raise InvalidDocumentError(
-                        'Document is not available to sync')
 
                 if f.auto_sync:
                     f.start_listener()
diff --git a/mongoengine/common.py b/mongoengine/common.py
index bde7e78c4..bcdea1941 100644
--- a/mongoengine/common.py
+++ b/mongoengine/common.py
@@ -31,7 +31,6 @@ class from the :data:`mongoengine.common._class_registry_cache`.
 
     field_classes = _field_list_cache
 
-    queryset_classes = ('OperationError',)
     deref_classes = ('DeReference',)
 
     if cls_name == 'BaseDocument':
@@ -43,14 +42,11 @@ class from the :data:`mongoengine.common._class_registry_cache`.
     elif cls_name in field_classes:
         from mongoengine import fields as module
         import_classes = field_classes
-    elif cls_name in queryset_classes:
-        from mongoengine import queryset as module
-        import_classes = queryset_classes
     elif cls_name in deref_classes:
         from mongoengine import dereference as module
         import_classes = deref_classes
     else:
-        raise ValueError('No import set for: ' % cls_name)
+        raise ValueError('No import set for: %s' % cls_name)
 
     for cls in import_classes:
         _class_registry_cache[cls] = getattr(module, cls)
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 7e1197215..1cd6be11e 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -152,12 +152,10 @@ def validate(self, value):
         scheme = value.split('://')[0].lower()
         if scheme not in self.schemes:
             self.error(u'Invalid scheme {} in URL: {}'.format(scheme, value))
-            return
 
         # Then check full URL
         if not self.url_regex.match(value):
             self.error(u'Invalid URL: {}'.format(value))
-            return
 
 
 class EmailField(StringField):
@@ -259,10 +257,10 @@ def validate(self, value):
             try:
                 domain_part = domain_part.encode('idna').decode('ascii')
             except UnicodeError:
-                self.error(self.error_msg % value)
+                self.error("%s %s" % (self.error_msg % value, "(domain failed IDN encoding)"))
             else:
                 if not self.validate_domain_part(domain_part):
-                    self.error(self.error_msg % value)
+                    self.error("%s %s" % (self.error_msg % value, "(domain validation failed)"))
 
 
 class IntField(BaseField):
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 66e435142..eec73f914 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -197,7 +197,7 @@ def __getitem__(self, key):
                 only_fields=self.only_fields
             )
 
-        raise AttributeError('Provide a slice or an integer index')
+        raise TypeError('Provide a slice or an integer index')
 
     def __iter__(self):
         raise NotImplementedError
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 3de10a692..ef5b1ea39 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -88,18 +88,10 @@ def query(_doc_cls=None, **kwargs):
             singular_ops = [None, 'ne', 'gt', 'gte', 'lt', 'lte', 'not']
             singular_ops += STRING_OPERATORS
             if op in singular_ops:
-                if isinstance(field, six.string_types):
-                    if (op in STRING_OPERATORS and
-                            isinstance(value, six.string_types)):
-                        StringField = _import_class('StringField')
-                        value = StringField.prepare_query_value(op, value)
-                    else:
-                        value = field
-                else:
-                    value = field.prepare_query_value(op, value)
+                value = field.prepare_query_value(op, value)
 
-                    if isinstance(field, CachedReferenceField) and value:
-                        value = value['_id']
+                if isinstance(field, CachedReferenceField) and value:
+                    value = value['_id']
 
             elif op in ('in', 'nin', 'all', 'near') and not isinstance(value, dict):
                 # Raise an error if the in/nin/all/near param is not iterable.
@@ -308,10 +300,6 @@ def update(_doc_cls=None, **update):
 
         key = '.'.join(parts)
 
-        if not op:
-            raise InvalidQueryError('Updates must supply an operation '
-                                    'eg: set__FIELD=value')
-
         if 'pull' in op and '.' in key:
             # Dot operators don't work on pull operations
             # unless they point to a list field
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index be344d325..bbe3dc5ae 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -593,8 +593,9 @@ class BlogPost(Document):
         # Two posts with the same slug is not allowed
         post2 = BlogPost(title='test2', slug='test')
         self.assertRaises(NotUniqueError, post2.save)
+        self.assertRaises(NotUniqueError, BlogPost.objects.insert, post2)
 
-        # Ensure backwards compatibilty for errors
+        # Ensure backwards compatibility for errors
         self.assertRaises(OperationError, post2.save)
 
     @requires_mongodb_gte_34
@@ -826,6 +827,19 @@ class Log(Document):
         self.assertEqual(3600,
                          info['created_1']['expireAfterSeconds'])
 
+    def test_index_drop_dups_silently_ignored(self):
+        class Customer(Document):
+            cust_id = IntField(unique=True, required=True)
+            meta = {
+                'indexes': ['cust_id'],
+                'index_drop_dups': True,
+                'allow_inheritance': False,
+            }
+
+        Customer.drop_collection()
+        Customer.objects.first()
+
+
     def test_unique_and_indexes(self):
         """Ensure that 'unique' constraints aren't overridden by
         meta.indexes.
@@ -842,11 +856,16 @@ class Customer(Document):
         cust.save()
 
         cust_dupe = Customer(cust_id=1)
-        try:
+        with self.assertRaises(NotUniqueError):
             cust_dupe.save()
-            raise AssertionError("We saved a dupe!")
-        except NotUniqueError:
-            pass
+
+        cust = Customer(cust_id=2)
+        cust.save()
+
+        # duplicate key on update
+        with self.assertRaises(NotUniqueError):
+            cust.cust_id = 1
+            cust.save()
 
     def test_primary_save_duplicate_update_existing_object(self):
         """If you set a field as primary, then unexpected behaviour can occur.
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 9b28f1b4e..e1379a5dd 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -420,6 +420,12 @@ def test_to_dbref(self):
         person.save()
         person.to_dbref()
 
+    def test_key_like_attribute_access(self):
+        person = self.Person(age=30)
+        self.assertEqual(person['age'], 30)
+        with self.assertRaises(KeyError):
+            person['unknown_attr']
+
     def test_save_abstract_document(self):
         """Saving an abstract document should fail."""
         class Doc(Document):
diff --git a/tests/fields/geo.py b/tests/fields/geo.py
index 754f42036..37ed97f58 100644
--- a/tests/fields/geo.py
+++ b/tests/fields/geo.py
@@ -40,6 +40,11 @@ class Location(Document):
             expected = "Both values (%s) in point must be float or int" % repr(coord)
             self._test_for_expected_error(Location, coord, expected)
 
+        invalid_coords = [21, 4, 'a']
+        for coord in invalid_coords:
+            expected = "GeoPointField can only accept tuples or lists of (x, y)"
+            self._test_for_expected_error(Location, coord, expected)
+
     def test_point_validation(self):
         class Location(Document):
             loc = PointField()
diff --git a/tests/test_common.py b/tests/test_common.py
new file mode 100644
index 000000000..e69de29bb

From c82f0c937d50b2f4c27af7d59ba0069f93686baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 14 May 2019 21:46:57 +0200
Subject: [PATCH 0801/1519] more work on coverage

---
 mongoengine/errors.py            |  3 --
 tests/document/indexes.py        |  1 -
 tests/fields/test_email_field.py | 10 +++++
 tests/queryset/queryset.py       | 67 ++++++++++++++++++++++++++++++++
 tests/queryset/transform.py      |  8 ++++
 tests/test_common.py             | 15 +++++++
 tests/test_context_managers.py   |  8 ++++
 tests/test_datastructures.py     | 15 +++++++
 8 files changed, 123 insertions(+), 4 deletions(-)

diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 0e92a8c40..b0009cbcb 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -110,9 +110,6 @@ def to_dict(self):
 
         def build_dict(source):
             errors_dict = {}
-            if not source:
-                return errors_dict
-
             if isinstance(source, dict):
                 for field_name, error in iteritems(source):
                     errors_dict[field_name] = build_dict(error)
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index bbe3dc5ae..b0b789238 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -839,7 +839,6 @@ class Customer(Document):
         Customer.drop_collection()
         Customer.objects.first()
 
-
     def test_unique_and_indexes(self):
         """Ensure that 'unique' constraints aren't overridden by
         meta.indexes.
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
index d84103544..3ce49d623 100644
--- a/tests/fields/test_email_field.py
+++ b/tests/fields/test_email_field.py
@@ -75,6 +75,16 @@ class User(Document):
         user = User(email='me@localhost')
         user.validate()
 
+    def test_email_domain_validation_fails_if_invalid_idn(self):
+        class User(Document):
+            email = EmailField()
+
+        invalid_idn = '.google.com'
+        user = User(email='me@%s' % invalid_idn)
+        with self.assertRaises(ValidationError) as ctx_err:
+            user.validate()
+        self.assertIn("domain failed IDN encoding", str(ctx_err.exception))
+
     def test_email_field_ip_domain(self):
         class User(Document):
             email = EmailField()
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 31b1641ea..83b19ef85 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -158,6 +158,11 @@ def test_skip(self):
         self.assertEqual(person.name, 'User B')
         self.assertEqual(person.age, None)
 
+    def test___getitem___invalid_index(self):
+        """Ensure slicing a queryset works as expected."""
+        with self.assertRaises(TypeError):
+            self.Person.objects()['a']
+
     def test_slice(self):
         """Ensure slicing a queryset works as expected."""
         user_a = self.Person.objects.create(name='User A', age=20)
@@ -986,6 +991,29 @@ class Comment(Document):
         inserted_comment_id = Comment.objects.insert(comment, load_bulk=False)
         self.assertEqual(comment.id, inserted_comment_id)
 
+    def test_bulk_insert_accepts_doc_with_ids(self):
+        class Comment(Document):
+            id = IntField(primary_key=True)
+
+        Comment.drop_collection()
+
+        com1 = Comment(id=0)
+        com2 = Comment(id=1)
+        Comment.objects.insert([com1, com2])
+
+    def test_insert_raise_if_duplicate_in_constraint(self):
+        class Comment(Document):
+            id = IntField(primary_key=True)
+
+        Comment.drop_collection()
+
+        com1 = Comment(id=0)
+
+        Comment.objects.insert(com1)
+
+        with self.assertRaises(NotUniqueError):
+            Comment.objects.insert(com1)
+
     def test_get_changed_fields_query_count(self):
         """Make sure we don't perform unnecessary db operations when
         none of document's fields were updated.
@@ -3570,6 +3598,11 @@ def objects(cls, qryset):
                 opts = {"deleted": False}
                 return qryset(**opts)
 
+            @queryset_manager
+            def objects_1_arg(qryset):
+                opts = {"deleted": False}
+                return qryset(**opts)
+
             @queryset_manager
             def music_posts(doc_cls, queryset, deleted=False):
                 return queryset(tags='music',
@@ -3584,6 +3617,8 @@ def music_posts(doc_cls, queryset, deleted=False):
 
         self.assertEqual([p.id for p in BlogPost.objects()],
                          [post1.id, post2.id, post3.id])
+        self.assertEqual([p.id for p in BlogPost.objects_1_arg()],
+                         [post1.id, post2.id, post3.id])
         self.assertEqual([p.id for p in BlogPost.music_posts()],
                          [post1.id, post2.id])
 
@@ -4968,6 +5003,38 @@ class Person(Document):
             people.count()
             self.assertEqual(q, 3)
 
+    def test_no_cached_queryset__repr__(self):
+        class Person(Document):
+            name = StringField()
+
+        Person.drop_collection()
+        qs = Person.objects.no_cache()
+        self.assertEqual(repr(qs), '[]')
+
+    def test_no_cached_on_a_cached_queryset_raise_error(self):
+        class Person(Document):
+            name = StringField()
+
+        Person.drop_collection()
+        Person(name='a').save()
+        qs = Person.objects()
+        _ = list(qs)
+        with self.assertRaises(OperationError) as ctx_err:
+            qs.no_cache()
+        self.assertEqual("QuerySet already cached", str(ctx_err.exception))
+
+    def test_no_cached_queryset_no_cache_back_to_cache(self):
+        class Person(Document):
+            name = StringField()
+
+        Person.drop_collection()
+        qs = Person.objects()
+        self.assertIsInstance(qs, QuerySet)
+        qs = qs.no_cache()
+        self.assertIsInstance(qs, QuerySetNoCache)
+        qs = qs.cache()
+        self.assertIsInstance(qs, QuerySet)
+
     def test_cache_not_cloned(self):
 
         class User(Document):
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 8064f09c6..c0da1a52a 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -71,6 +71,14 @@ class BlogPost(Document):
         update = transform.update(BlogPost, push_all__tags=['mongo', 'db'])
         self.assertEqual(update, {'$push': {'tags': {'$each': ['mongo', 'db']}}})
 
+    def test_transform_update_no_operator_default_to_set(self):
+        """Ensure the differences in behvaior between 'push' and 'push_all'"""
+        class BlogPost(Document):
+            tags = ListField(StringField())
+
+        update = transform.update(BlogPost, tags=['mongo', 'db'])
+        self.assertEqual(update, {'$set': {'tags': ['mongo', 'db']}})
+
     def test_query_field_name(self):
         """Ensure that the correct field name is used when querying.
         """
diff --git a/tests/test_common.py b/tests/test_common.py
index e69de29bb..04ad5b346 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -0,0 +1,15 @@
+import unittest
+
+from mongoengine.common import _import_class
+from mongoengine import Document
+
+
+class TestCommon(unittest.TestCase):
+
+    def test__import_class(self):
+        doc_cls = _import_class("Document")
+        self.assertIs(doc_cls, Document)
+
+    def test__import_class_raise_if_not_known(self):
+        with self.assertRaises(ValueError):
+            _import_class("UnknownClass")
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 22c33b017..529032fe6 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -270,6 +270,14 @@ def issue_1_find_query():
                 counter += 1
             self.assertEqual(q, counter)
 
+            self.assertEqual(int(q), counter)       # test __int__
+            self.assertEqual(repr(q), str(int(q)))  # test __repr__
+            self.assertGreater(q, -1)               # test __gt__
+            self.assertGreaterEqual(q, int(q))      # test __gte__
+            self.assertNotEqual(q, -1)
+            self.assertLess(q, 1000)
+            self.assertLessEqual(q, int(q))
+
     def test_query_counter_counts_getmore_queries(self):
         connect('mongoenginetest')
         db = get_db()
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 4fb21d218..a9ef98e7f 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,4 +1,5 @@
 import unittest
+from six import iterkeys
 
 from mongoengine import Document
 from mongoengine.base.datastructures import StrictDict, BaseList, BaseDict
@@ -368,6 +369,20 @@ def test_init(self):
         d = self.dtype(a=1, b=1, c=1)
         self.assertEqual((d.a, d.b, d.c), (1, 1, 1))
 
+    def test_iterkeys(self):
+        d = self.dtype(a=1)
+        self.assertEqual(list(iterkeys(d)), ['a'])
+
+    def test_len(self):
+        d = self.dtype(a=1)
+        self.assertEqual(len(d), 1)
+
+    def test_pop(self):
+        d = self.dtype(a=1)
+        self.assertIn('a', d)
+        d.pop('a')
+        self.assertNotIn('a', d)
+
     def test_repr(self):
         d = self.dtype(a=1, b=2, c=3)
         self.assertEqual(repr(d), '{"a": 1, "b": 2, "c": 3}')

From bb1089e03d3d2a4e4e7929a377e917d056f28517 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 16 May 2019 22:31:24 +0200
Subject: [PATCH 0802/1519] Improve coverage in fields test

---
 tests/fields/test_cached_reference_field.py | 11 +++++++----
 tests/fields/test_datetime_field.py         |  9 +++++++++
 tests/fields/test_lazy_reference_field.py   | 17 +++++++++++++++++
 tests/fields/test_long_field.py             |  4 ++--
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/tests/fields/test_cached_reference_field.py b/tests/fields/test_cached_reference_field.py
index 989cea6d4..470ecc5d7 100644
--- a/tests/fields/test_cached_reference_field.py
+++ b/tests/fields/test_cached_reference_field.py
@@ -208,10 +208,7 @@ class Person(Document):
                 ('pj', "PJ")
             )
             name = StringField()
-            tp = StringField(
-                choices=TYPES
-            )
-
+            tp = StringField(choices=TYPES)
             father = CachedReferenceField('self', fields=('tp',))
 
         Person.drop_collection()
@@ -222,6 +219,9 @@ class Person(Document):
         a2 = Person(name='Wilson Junior', tp='pf', father=a1)
         a2.save()
 
+        a2 = Person.objects.with_id(a2.id)
+        self.assertEqual(a2.father.tp, a1.tp)
+
         self.assertEqual(dict(a2.to_mongo()), {
             "_id": a2.pk,
             "name": u"Wilson Junior",
@@ -374,6 +374,9 @@ class Ocorrence(Document):
         self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
         self.assertEqual(o.to_mongo()['animal']['owner']['t'], 'u')
 
+        # Check to_mongo with fields
+        self.assertNotIn('animal', o.to_mongo(fields=['person']))
+
         # counts
         Ocorrence(person="teste 2").save()
         Ocorrence(person="teste 3").save()
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index c6253043f..5af6a0113 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -172,6 +172,9 @@ class LogEntry(Document):
         log.time = datetime.datetime.now().isoformat(' ')
         log.validate()
 
+        log.time = '2019-05-16 21:42:57.897847'
+        log.validate()
+
         if dateutil:
             log.time = datetime.datetime.now().isoformat('T')
             log.validate()
@@ -180,6 +183,12 @@ class LogEntry(Document):
         self.assertRaises(ValidationError, log.validate)
         log.time = 'ABC'
         self.assertRaises(ValidationError, log.validate)
+        log.time = '2019-05-16 21:GARBAGE:12'
+        self.assertRaises(ValidationError, log.validate)
+        log.time = '2019-05-16 21:42:57.GARBAGE'
+        self.assertRaises(ValidationError, log.validate)
+        log.time = '2019-05-16 21:42:57.123.456'
+        self.assertRaises(ValidationError, log.validate)
 
 
 class TestDateTimeTzAware(MongoDBTestCase):
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index d80314094..b10506e7d 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -508,6 +508,23 @@ class Ocurrence(Document):
         p = Ocurrence.objects.get()
         self.assertIs(p.animal, None)
 
+    def test_generic_lazy_reference_accepts_string_instead_of_class(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            person = StringField()
+            animal = GenericLazyReferenceField('Animal')
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal = Animal().save()
+        Ocurrence(animal=animal).save()
+        p = Ocurrence.objects.get()
+        self.assertEqual(p.animal, animal)
+
     def test_generic_lazy_reference_embedded(self):
         class Animal(Document):
             name = StringField()
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index 4ab7403d8..3f307809a 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -39,9 +39,9 @@ class TestDocument(Document):
 
         doc.value = -1
         self.assertRaises(ValidationError, doc.validate)
-        doc.age = 120
+        doc.value = 120
         self.assertRaises(ValidationError, doc.validate)
-        doc.age = 'ten'
+        doc.value = 'ten'
         self.assertRaises(ValidationError, doc.validate)
 
     def test_long_ne_operator(self):

From 6b9d71554e397645071eacfe0b4f1fce7f834e46 Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Fri, 17 May 2019 17:23:52 -0300
Subject: [PATCH 0803/1519] Add integration tests

---
 tests/queryset/queryset.py | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 31b1641ea..0b88193e5 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2193,6 +2193,40 @@ class Site(Document):
             Site.objects(id=s.id).update_one(
                 pull_all__collaborators__helpful__name=['Ross'])
 
+    def test_pull_from_nested_embedded_using_in_nin(self):
+        """Ensure that the 'pull' update operation works on embedded documents using 'in' and 'nin' operators.
+        """
+        
+        class User(EmbeddedDocument):
+            name = StringField()
+
+            def __unicode__(self):
+                return '%s' % self.name
+
+        class Collaborator(EmbeddedDocument):
+            helpful = ListField(EmbeddedDocumentField(User))
+            unhelpful = ListField(EmbeddedDocumentField(User))
+
+        class Site(Document):
+            name = StringField(max_length=75, unique=True, required=True)
+            collaborators = EmbeddedDocumentField(Collaborator)
+
+        Site.drop_collection()
+
+        a = User(name='Esteban')
+        b = User(name='Frank')
+        x = User(name='Harry')
+        y = User(name='John')
+        
+        s = Site(name="test", collaborators=Collaborator(
+            helpful=[a, b], unhelpful=[x, y])).save()
+
+        Site.objects(id=s.id).update_one(pull__collaborators__helpful__name__in=['Esteban'])  # Pull a
+        self.assertEqual(Site.objects.first().collaborators['helpful'], [b])
+
+        Site.objects(id=s.id).update_one(pull__collaborators__unhelpful__name__nin=['John'])  # Pull x
+        self.assertEqual(Site.objects.first().collaborators['unhelpful'], [y])
+
     def test_pull_from_nested_mapfield(self):
 
         class Collaborator(EmbeddedDocument):

From 2e01eb87db14e0d6b291f91b3aec7a8c477a4754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 17 May 2019 23:07:30 +0200
Subject: [PATCH 0804/1519] Add support for MongoDB 3.6 and Python3.7 in travis

---
 .install_mongodb_on_travis.sh  |  8 +++++-
 .travis.yml                    |  2 ++
 README.rst                     |  4 +--
 docs/changelog.rst             |  1 +
 mongoengine/mongodb_support.py |  1 +
 tests/queryset/queryset.py     | 46 ++++++++++++++++++----------------
 6 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/.install_mongodb_on_travis.sh b/.install_mongodb_on_travis.sh
index 6ac2e3641..f1073333d 100644
--- a/.install_mongodb_on_travis.sh
+++ b/.install_mongodb_on_travis.sh
@@ -25,8 +25,14 @@ elif [ "$MONGODB" = "3.4" ]; then
     sudo apt-get update
     sudo apt-get install mongodb-org-server=3.4.17
     # service should be started automatically
+elif [ "$MONGODB" = "3.6" ]; then
+    sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
+    echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.6 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.6.list
+    sudo apt-get update
+    sudo apt-get install mongodb-org-server=3.6.12
+    # service should be started automatically
 else
-    echo "Invalid MongoDB version, expected 2.6, 3.0, 3.2 or 3.4."
+    echo "Invalid MongoDB version, expected 2.6, 3.0, 3.2, 3.4 or 3.6."
     exit 1
 fi;
 
diff --git a/.travis.yml b/.travis.yml
index b943024ae..909183c1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,8 @@ matrix:
     env: MONGODB=3.2 PYMONGO=3.x
   - python: 3.6
     env: MONGODB=3.4 PYMONGO=3.x
+  - python: 3.6
+    env: MONGODB=3.6 PYMONGO=3.x
 
 before_install:
 - bash .install_mongodb_on_travis.sh
diff --git a/README.rst b/README.rst
index 12d9df0ea..cb279d2c0 100644
--- a/README.rst
+++ b/README.rst
@@ -26,10 +26,10 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v2.6, v3.0, v3.2 and v3.4. Future
+MongoEngine is currently tested against MongoDB v2.6, v3.0, v3.2, v3.4 and v3.6. Future
 versions should be supported as well, but aren't actively tested at the moment.
 Make sure to open an issue or submit a pull request if you experience any
-problems with MongoDB v3.4+.
+problems with MongoDB v3.6+.
 
 Installation
 ============
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b875ffcdd..6ac8da939 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,7 @@ Changelog
 
 Development
 ===========
+- Add support for MongoDB 3.6 and Python3.7 in travis
 - Fix querying on List(EmbeddedDocument) subclasses fields #1961 #1492
 - Fix querying on (Generic)EmbeddedDocument subclasses fields #475
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index 717a3d813..8e4140755 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -6,6 +6,7 @@
 
 # Constant that can be used to compare the version retrieved with
 # get_mongodb_version()
+MONGODB_36 = (3, 6)
 MONGODB_34 = (3, 4)
 MONGODB_32 = (3, 2)
 MONGODB_3 = (3, 0)
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 31b1641ea..5005f260e 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -6,7 +6,6 @@
 from decimal import Decimal
 
 from bson import DBRef, ObjectId
-from nose.plugins.skip import SkipTest
 import pymongo
 from pymongo.errors import ConfigurationError
 from pymongo.read_preferences import ReadPreference
@@ -18,7 +17,7 @@
 from mongoengine.connection import get_connection, get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
-from mongoengine.mongodb_support import get_mongodb_version, MONGODB_32
+from mongoengine.mongodb_support import get_mongodb_version, MONGODB_32, MONGODB_36
 from mongoengine.pymongo_support import IS_PYMONGO_3
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
@@ -33,6 +32,12 @@ def get_ops(self):
         return list(self.db.system.profile.find(ignore_query))
 
 
+def get_key_compat(mongo_ver):
+    ORDER_BY_KEY = 'sort' if mongo_ver >= MONGODB_32 else '$orderby'
+    CMD_QUERY_KEY = 'command' if mongo_ver >= MONGODB_36 else 'query'
+    return ORDER_BY_KEY, CMD_QUERY_KEY
+
+
 class QuerySetTest(unittest.TestCase):
 
     def setUp(self):
@@ -1323,8 +1328,7 @@ def test_clear_ordering(self):
         """Ensure that the default ordering can be cleared by calling
         order_by() w/o any arguments.
         """
-        MONGO_VER = self.mongodb_version
-        ORDER_BY_KEY = 'sort' if MONGO_VER >= MONGODB_32 else '$orderby'
+        ORDER_BY_KEY, CMD_QUERY_KEY = get_key_compat(self.mongodb_version)
 
         class BlogPost(Document):
             title = StringField()
@@ -1341,7 +1345,7 @@ class BlogPost(Document):
             BlogPost.objects.filter(title='whatever').first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertEqual(
-                q.get_ops()[0]['query'][ORDER_BY_KEY],
+                q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY],
                 {'published_date': -1}
             )
 
@@ -1349,14 +1353,14 @@ class BlogPost(Document):
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title='whatever').order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0]['query'])
+            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
 
         # calling an explicit order_by should use a specified sort
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title='whatever').order_by('published_date').first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertEqual(
-                q.get_ops()[0]['query'][ORDER_BY_KEY],
+                q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY],
                 {'published_date': 1}
             )
 
@@ -1365,13 +1369,12 @@ class BlogPost(Document):
             qs = BlogPost.objects.filter(title='whatever').order_by('published_date')
             qs.order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0]['query'])
+            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
 
     def test_no_ordering_for_get(self):
         """ Ensure that Doc.objects.get doesn't use any ordering.
         """
-        MONGO_VER = self.mongodb_version
-        ORDER_BY_KEY = 'sort' if MONGO_VER == MONGODB_32 else '$orderby'
+        ORDER_BY_KEY, CMD_QUERY_KEY = get_key_compat(self.mongodb_version)
 
         class BlogPost(Document):
             title = StringField()
@@ -1387,13 +1390,13 @@ class BlogPost(Document):
         with db_ops_tracker() as q:
             BlogPost.objects.get(title='whatever')
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0]['query'])
+            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
 
         # Ordering should be ignored for .get even if we set it explicitly
         with db_ops_tracker() as q:
             BlogPost.objects.order_by('-title').get(title='whatever')
             self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0]['query'])
+            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
 
     def test_find_embedded(self):
         """Ensure that an embedded document is properly returned from
@@ -2532,6 +2535,7 @@ class Author(Document):
     def test_comment(self):
         """Make sure adding a comment to the query gets added to the query"""
         MONGO_VER = self.mongodb_version
+        _, CMD_QUERY_KEY = get_key_compat(MONGO_VER)
         QUERY_KEY = 'filter' if MONGO_VER >= MONGODB_32 else '$query'
         COMMENT_KEY = 'comment' if MONGO_VER >= MONGODB_32 else '$comment'
 
@@ -2550,8 +2554,8 @@ class User(Document):
             ops = q.get_ops()
             self.assertEqual(len(ops), 2)
             for op in ops:
-                self.assertEqual(op['query'][QUERY_KEY], {'age': {'$gte': 18}})
-                self.assertEqual(op['query'][COMMENT_KEY], 'looking for an adult')
+                self.assertEqual(op[CMD_QUERY_KEY][QUERY_KEY], {'age': {'$gte': 18}})
+                self.assertEqual(op[CMD_QUERY_KEY][COMMENT_KEY], 'looking for an adult')
 
     def test_map_reduce(self):
         """Ensure map/reduce is both mapping and reducing.
@@ -5240,8 +5244,7 @@ class Person(Document):
             self.assertEqual(op['nreturned'], 1)
 
     def test_bool_with_ordering(self):
-        MONGO_VER = self.mongodb_version
-        ORDER_BY_KEY = 'sort' if MONGO_VER >= MONGODB_32 else '$orderby'
+        ORDER_BY_KEY, CMD_QUERY_KEY = get_key_compat(self.mongodb_version)
 
         class Person(Document):
             name = StringField()
@@ -5260,21 +5263,22 @@ class Person(Document):
             op = q.db.system.profile.find({"ns":
                                            {"$ne": "%s.system.indexes" % q.db.name}})[0]
 
-            self.assertNotIn(ORDER_BY_KEY, op['query'])
+            self.assertNotIn(ORDER_BY_KEY, op[CMD_QUERY_KEY])
 
         # Check that normal query uses orderby
         qs2 = Person.objects.order_by('name')
-        with query_counter() as p:
+        with query_counter() as q:
 
             for x in qs2:
                 pass
 
-            op = p.db.system.profile.find({"ns":
+            op = q.db.system.profile.find({"ns":
                                            {"$ne": "%s.system.indexes" % q.db.name}})[0]
 
-            self.assertIn(ORDER_BY_KEY, op['query'])
+            self.assertIn(ORDER_BY_KEY, op[CMD_QUERY_KEY])
 
     def test_bool_with_ordering_from_meta_dict(self):
+        ORDER_BY_KEY, CMD_QUERY_KEY = get_key_compat(self.mongodb_version)
 
         class Person(Document):
             name = StringField()
@@ -5296,7 +5300,7 @@ class Person(Document):
             op = q.db.system.profile.find({"ns":
                                            {"$ne": "%s.system.indexes" % q.db.name}})[0]
 
-            self.assertNotIn('$orderby', op['query'],
+            self.assertNotIn('$orderby', op[CMD_QUERY_KEY],
                              'BaseQuerySet must remove orderby from meta in boolen test')
 
             self.assertEqual(Person.objects.first().name, 'A')

From 64b63e9d52924f60af2a938b769fb12631494d3f Mon Sep 17 00:00:00 2001
From: George Pearson <george.pearson@iglu.com>
Date: Fri, 24 May 2019 12:49:04 +0100
Subject: [PATCH 0805/1519] Use update_one instead of deprecated update #1899

---
 mongoengine/document.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 5ccedbfab..03b659e32 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -502,8 +502,12 @@ def _save_update(self, doc, save_condition, write_concern):
         update_doc = self._get_update_doc()
         if update_doc:
             upsert = save_condition is None
-            last_error = collection.update(select_dict, update_doc,
-                                           upsert=upsert, **write_concern)
+            with set_write_concern(collection, write_concern) as wc_collection:
+                last_error = wc_collection.update_one(
+                    select_dict,
+                    update_doc,
+                    upsert=upsert
+                ).raw_result
             if not upsert and last_error['n'] == 0:
                 raise SaveConditionError('Race condition preventing'
                                          ' document update detected')

From 6e1c132ee82bb2e134d18ca0e34f4b104624570e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 26 May 2019 22:17:58 +0200
Subject: [PATCH 0806/1519] Improve minor things in the tests

---
 tests/document/indexes.py  |  2 +-
 tests/document/instance.py | 16 ++++++++--------
 tests/fields/fields.py     |  6 +++---
 tests/fields/file_tests.py | 24 ++++++++++++------------
 tests/queryset/queryset.py |  6 +++---
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index b0b789238..34771e8a1 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -409,7 +409,7 @@ class MongoUser(User):
 
         self.assertEqual(2, User.objects.count())
         info = User.objects._collection.index_information()
-        self.assertEqual(info.keys(), ['_id_'])
+        self.assertEqual(list(info.keys()), ['_id_'])
 
         User.ensure_indexes()
         info = User.objects._collection.index_information()
diff --git a/tests/document/instance.py b/tests/document/instance.py
index e1379a5dd..5746f1fc7 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -3204,7 +3204,7 @@ class Person(Document):
         p2.name = 'alon2'
         p2.save()
         p3 = Person.objects().only('created_on')[0]
-        self.assertEquals(orig_created_on, p3.created_on)
+        self.assertEqual(orig_created_on, p3.created_on)
 
         class Person(Document):
             created_on = DateTimeField(default=lambda: datetime.utcnow())
@@ -3213,10 +3213,10 @@ class Person(Document):
 
         p4 = Person.objects()[0]
         p4.save()
-        self.assertEquals(p4.height, 189)
+        self.assertEqual(p4.height, 189)
 
         # However the default will not be fixed in DB
-        self.assertEquals(Person.objects(height=189).count(), 0)
+        self.assertEqual(Person.objects(height=189).count(), 0)
 
         # alter DB for the new default
         coll = Person._get_collection()
@@ -3224,17 +3224,17 @@ class Person(Document):
             if 'height' not in person:
                 coll.update_one({'_id': person['_id']}, {'$set': {'height': 189}})
 
-        self.assertEquals(Person.objects(height=189).count(), 1)
+        self.assertEqual(Person.objects(height=189).count(), 1)
 
     def test_from_son(self):
         # 771
         class MyPerson(self.Person):
             meta = dict(shard_key=["id"])
         p = MyPerson.from_json('{"name": "name", "age": 27}', created=True)
-        self.assertEquals(p.id, None)
+        self.assertEqual(p.id, None)
         p.id = "12345"  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
         p = MyPerson._from_son({"name": "name", "age": 27}, created=True)
-        self.assertEquals(p.id, None)
+        self.assertEqual(p.id, None)
         p.id = "12345"  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
 
     def test_from_son_created_False_without_id(self):
@@ -3312,7 +3312,7 @@ class User(Document):
         u_from_db = User.objects.get(name='user')
         u_from_db.height = None
         u_from_db.save()
-        self.assertEquals(u_from_db.height, None)
+        self.assertEqual(u_from_db.height, None)
         # 864
         self.assertEqual(u_from_db.str_fld, None)
         self.assertEqual(u_from_db.int_fld, None)
@@ -3326,7 +3326,7 @@ class User(Document):
         u.save()
         User.objects(name='user').update_one(set__height=None, upsert=True)
         u_from_db = User.objects.get(name='user')
-        self.assertEquals(u_from_db.height, None)
+        self.assertEqual(u_from_db.height, None)
 
     def test_not_saved_eq(self):
         """Ensure we can compare documents not saved.
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 3b66f2ded..5eaee4be4 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1372,7 +1372,7 @@ class Brother(Sibling):
         brother = Brother(name="Bob", sibling=sister)
         brother.save()
 
-        self.assertEquals(Brother.objects[0].sibling.name, sister.name)
+        self.assertEqual(Brother.objects[0].sibling.name, sister.name)
 
     def test_reference_abstract_class(self):
         """Ensure that an abstract class instance cannot be used in the
@@ -2045,8 +2045,8 @@ class Human(Mammal):
         Dog().save()
         Fish().save()
         Human().save()
-        self.assertEquals(Animal.objects(_cls__in=["Animal.Mammal.Dog", "Animal.Fish"]).count(), 2)
-        self.assertEquals(Animal.objects(_cls__in=["Animal.Fish.Guppy"]).count(), 0)
+        self.assertEqual(Animal.objects(_cls__in=["Animal.Mammal.Dog", "Animal.Fish"]).count(), 2)
+        self.assertEqual(Animal.objects(_cls__in=["Animal.Fish.Guppy"]).count(), 0)
 
     def test_sparse_field(self):
         class Doc(Document):
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index 4ff6865bb..a77224580 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -320,16 +320,16 @@ class TestFile(Document):
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEquals(len(list(files)), 1)
-        self.assertEquals(len(list(chunks)), 1)
+        self.assertEqual(len(list(files)), 1)
+        self.assertEqual(len(list(chunks)), 1)
 
         # Deleting the docoument should delete the files
         testfile.delete()
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEquals(len(list(files)), 0)
-        self.assertEquals(len(list(chunks)), 0)
+        self.assertEqual(len(list(files)), 0)
+        self.assertEqual(len(list(chunks)), 0)
 
         # Test case where we don't store a file in the first place
         testfile = TestFile()
@@ -337,15 +337,15 @@ class TestFile(Document):
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEquals(len(list(files)), 0)
-        self.assertEquals(len(list(chunks)), 0)
+        self.assertEqual(len(list(files)), 0)
+        self.assertEqual(len(list(chunks)), 0)
 
         testfile.delete()
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEquals(len(list(files)), 0)
-        self.assertEquals(len(list(chunks)), 0)
+        self.assertEqual(len(list(files)), 0)
+        self.assertEqual(len(list(chunks)), 0)
 
         # Test case where we overwrite the file
         testfile = TestFile()
@@ -358,15 +358,15 @@ class TestFile(Document):
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEquals(len(list(files)), 1)
-        self.assertEquals(len(list(chunks)), 1)
+        self.assertEqual(len(list(files)), 1)
+        self.assertEqual(len(list(chunks)), 1)
 
         testfile.delete()
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEquals(len(list(files)), 0)
-        self.assertEquals(len(list(chunks)), 0)
+        self.assertEqual(len(list(files)), 0)
+        self.assertEqual(len(list(chunks)), 0)
 
     def test_image_field(self):
         if not HAS_PIL:
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 04042350d..51da663a9 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -91,7 +91,7 @@ def test_find(self):
         results = list(people)
 
         self.assertIsInstance(results[0], self.Person)
-        self.assertIsInstance(results[0].id, (ObjectId, str, unicode))
+        self.assertIsInstance(results[0].id, ObjectId)
 
         self.assertEqual(results[0], user_a)
         self.assertEqual(results[0].name, 'User A')
@@ -5609,8 +5609,8 @@ class ScottishCat(Cat):
         Animal(is_mamal=False).save()
         Cat(is_mamal=True, whiskers_length=5.1).save()
         ScottishCat(is_mamal=True, folded_ears=True).save()
-        self.assertEquals(Animal.objects(folded_ears=True).count(), 1)
-        self.assertEquals(Animal.objects(whiskers_length=5.1).count(), 1)
+        self.assertEqual(Animal.objects(folded_ears=True).count(), 1)
+        self.assertEqual(Animal.objects(whiskers_length=5.1).count(), 1)
 
     def test_loop_over_invalid_id_does_not_crash(self):
         class Person(Document):

From 7d0687ec73c6d94ccdd9a77ee21ac82bca9a065b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 11 May 2019 22:34:25 +0200
Subject: [PATCH 0807/1519] custom field validator is now expected to raise a
 ValidationError (drop support for returning True/False)

---
 docs/changelog.rst         |  2 ++
 mongoengine/base/fields.py | 21 ++++++++++++-------
 mongoengine/errors.py      |  5 +++++
 tests/fields/fields.py     | 43 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6ac8da939..6864627b6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,8 @@ Changelog
 Development
 ===========
 - Add support for MongoDB 3.6 and Python3.7 in travis
+- BREAKING CHANGE: Changed the custom field validator (i.e `validation` parameter of Field) so that it now requires:
+    the callable to raise a ValidationError (i.o return True/False).
 - Fix querying on List(EmbeddedDocument) subclasses fields #1961 #1492
 - Fix querying on (Generic)EmbeddedDocument subclasses fields #475
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 598eb606b..5962df141 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -11,8 +11,7 @@
 from mongoengine.base.datastructures import (BaseDict, BaseList,
                                              EmbeddedDocumentList)
 from mongoengine.common import _import_class
-from mongoengine.errors import ValidationError
-
+from mongoengine.errors import ValidationError, DeprecatedError
 
 __all__ = ('BaseField', 'ComplexBaseField', 'ObjectIdField',
            'GeoJsonBaseField')
@@ -53,8 +52,8 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
             unique with.
         :param primary_key: Mark this field as the primary key. Defaults to False.
         :param validation: (optional) A callable to validate the value of the
-            field.  Generally this is deprecated in favour of the
-            `FIELD.validate` method
+            field.  The callable takes the value as parameter and should raise
+            a ValidationError if validation fails
         :param choices: (optional) The valid choices
         :param null: (optional) If the field value can be null. If no and there is a default value
             then the default value is set
@@ -226,10 +225,18 @@ def _validate(self, value, **kwargs):
         # check validation argument
         if self.validation is not None:
             if callable(self.validation):
-                if not self.validation(value):
-                    self.error('Value does not match custom validation method')
+                try:
+                    # breaking change of 0.18
+                    # Get rid of True/False-type return for the validation method
+                    # in favor of having validation raising a ValidationError
+                    ret = self.validation(value)
+                    if ret is not None:
+                        raise DeprecatedError('validation argument for `%s` must not return anything, '
+                                              'it should raise a ValidationError if validation fails' % self.name)
+                except ValidationError as ex:
+                    self.error(str(ex))
             else:
-                raise ValueError('validation argument for "%s" must be a '
+                raise ValueError('validation argument for `"%s"` must be a '
                                  'callable.' % self.name)
 
         self.validate(value, **kwargs)
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index b0009cbcb..4aecef5e5 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -142,3 +142,8 @@ def generate_key(value, prefix=''):
         for k, v in iteritems(self.to_dict()):
             error_dict[generate_key(v)].append(k)
         return ' '.join(['%s: %s' % (k, v) for k, v in iteritems(error_dict)])
+
+
+class DeprecatedError(Exception):
+    """Raise when a user uses a feature that has been Deprecated"""
+    pass
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 5eaee4be4..68baab462 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -12,6 +12,7 @@
     FieldDoesNotExist, EmbeddedDocumentListField, MultipleObjectsReturned, NotUniqueError, BooleanField,\
     ObjectIdField, SortedListField, GenericLazyReferenceField, LazyReferenceField, DynamicDocument
 from mongoengine.base import (BaseField, EmbeddedDocumentList, _document_registry)
+from mongoengine.errors import DeprecatedError
 
 from tests.utils import MongoDBTestCase
 
@@ -56,6 +57,48 @@ class Person(Document):
         self.assertEqual(
             data_to_be_saved, ['age', 'created', 'day', 'name', 'userid'])
 
+    def test_custom_field_validation_raise_deprecated_error_when_validation_return_something(self):
+        # Covers introduction of a breaking change in the validation parameter (0.18)
+        def _not_empty(z):
+            return bool(z)
+
+        class Person(Document):
+            name = StringField(validation=_not_empty)
+
+        Person.drop_collection()
+
+        error = ("validation argument for `name` must not return anything, "
+                 "it should raise a ValidationError if validation fails")
+
+        with self.assertRaises(DeprecatedError) as ctx_err:
+            Person(name="").validate()
+        self.assertEqual(str(ctx_err.exception), error)
+
+        with self.assertRaises(DeprecatedError) as ctx_err:
+            Person(name="").save()
+        self.assertEqual(str(ctx_err.exception), error)
+
+    def test_custom_field_validation_raise_validation_error(self):
+        def _not_empty(z):
+            if not z:
+                raise ValidationError('cantbeempty')
+
+        class Person(Document):
+            name = StringField(validation=_not_empty)
+
+        Person.drop_collection()
+
+        with self.assertRaises(ValidationError) as ctx_err:
+            Person(name="").validate()
+        self.assertEqual("ValidationError (Person:None) (cantbeempty: ['name'])", str(ctx_err.exception))
+
+        with self.assertRaises(ValidationError):
+            Person(name="").save()
+        self.assertEqual("ValidationError (Person:None) (cantbeempty: ['name'])", str(ctx_err.exception))
+
+        Person(name="garbage").validate()
+        Person(name="garbage").save()
+
     def test_default_values_set_to_None(self):
         """Ensure that default field values are used even when
         we explcitly initialize the doc with None values.

From f00c9dc4d654de0510d6df566a8bc9b1781bb471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 16 May 2019 22:53:31 +0200
Subject: [PATCH 0808/1519] Fix flake8 import error

---
 mongoengine/base/fields.py | 2 +-
 mongoengine/errors.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 5962df141..fe96f15b0 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -11,7 +11,7 @@
 from mongoengine.base.datastructures import (BaseDict, BaseList,
                                              EmbeddedDocumentList)
 from mongoengine.common import _import_class
-from mongoengine.errors import ValidationError, DeprecatedError
+from mongoengine.errors import DeprecatedError, ValidationError
 
 __all__ = ('BaseField', 'ComplexBaseField', 'ObjectIdField',
            'GeoJsonBaseField')
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 4aecef5e5..bea1d3dca 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -6,7 +6,7 @@
 __all__ = ('NotRegistered', 'InvalidDocumentError', 'LookUpError',
            'DoesNotExist', 'MultipleObjectsReturned', 'InvalidQueryError',
            'OperationError', 'NotUniqueError', 'FieldDoesNotExist',
-           'ValidationError', 'SaveConditionError')
+           'ValidationError', 'SaveConditionError', 'DeprecatedError')
 
 
 class NotRegistered(Exception):

From 4334955e39781e273c26293833478f4e400a0170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Fri, 31 May 2019 11:01:15 +0200
Subject: [PATCH 0809/1519] Update the test matrix to reflect what's supported
 in 2019 (#2066)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously, we were running the test suite for several combinations of MongoDB,
Python, and PyMongo:
- PyPy, MongoDB v2.6, PyMongo v3.x (which really means v3.6.1 at the moment)
- Python v2.7, MongoDB v2.6, PyMongo v3.x
- Python v3.5, MongoDB v2.6, PyMongo v3.x
- Python v3.6, MongoDB v2.6, PyMongo v3.x
- Python v2.7, MongoDB v3.0, PyMongo v3.5.0
- Python v3.6, MongoDB v3.0, PyMongo v3.5.0
- Python v3.5, MongoDB v3.2, PyMongo v3.x
- Python v3.6, MongoDB v3.2, PyMongo v3.x
- Python v3.6, MongoDB v3.4, PyMongo v3.x
- Python v3.6, MongoDB v3.6, PyMongo v3.x

There were a couple issues with this setup:
1. MongoDB v2.6 – v3.2 have reached their End of Life already (v2.6 almost 3
   years ago!). See the "MongoDB Server" section on
   https://www.mongodb.com/support-policy.
2. We were only testing two recent-ish PyMongo versions (v3.5.0 & v3.6.1).
   We were not testing the oldest actively supported MongoDB/PyMongo/Python
   setup.

This PR updates the test matrix so that these problems are solved. For the
sake of simplicity, it does not yet attempt to cover MongoDB v4.0:
- PyPy, MongoDB v3.4, PyMongo v3.x (aka v3.6.1 at the moment)
- Python v2.7, MongoDB v3.4, PyMongo v3.x
- Python v3.5, MongoDB v3.4, PyMongo v3.x
- Python v3.6, MongoDB v3.4, PyMongo v3.x
- Python v2.7, MongoDB v3.4, PyMongo v3.4
- Python v3.6, MongoDB v3.6, PyMongo v3.x
---
 .travis.yml                     | 41 ++++++++-------
 README.rst                      |  8 +--
 mongoengine/connection.py       | 18 +++++--
 mongoengine/mongodb_support.py  |  4 --
 requirements.txt                |  2 +-
 setup.py                        |  2 +-
 tests/document/class_methods.py |  2 -
 tests/document/indexes.py       | 89 +++++++++++++++------------------
 tests/document/instance.py      |  4 --
 tests/queryset/geo.py           | 10 +---
 tests/queryset/modify.py        |  3 --
 tests/queryset/queryset.py      | 35 +++----------
 tests/utils.py                  | 46 ++++++-----------
 tox.ini                         |  2 +-
 14 files changed, 105 insertions(+), 161 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 909183c1a..3186ea1c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,11 +2,18 @@
 # PyMongo combinations. However, that would result in an overly long build
 # with a very large number of jobs, hence we only test a subset of all the
 # combinations:
-# * MongoDB v2.6 is currently the "main" version tested against Python v2.7,
-#   v3.5, v3.6, PyPy, and PyMongo v3.x.
-# * MongoDB v3.0 & v3.2 are tested against Python v2.7, v3.5 & v3.6
-#   and Pymongo v3.5 & v3.x
-# * MongoDB v3.4 is tested against v3.6 and Pymongo v3.x
+# * MongoDB v3.4 & the latest PyMongo v3.x is currently the "main" setup,
+#   tested against Python v2.7, v3.5, v3.6, and PyPy.
+# * Besides that, we test the lowest actively supported Python/MongoDB/PyMongo
+#   combination: MongoDB v3.4, PyMongo v3.4, Python v2.7.
+# * MongoDB v3.6 is tested against Python v3.6, and PyMongo v3.6, v3.7, v3.8.
+#
+# We should periodically check MongoDB Server versions supported by MongoDB
+# Inc., add newly released versions to the test matrix, and remove versions
+# which have reached their End of Life. See:
+# 1. https://www.mongodb.com/support-policy.
+# 2. https://docs.mongodb.com/ecosystem/drivers/driver-compatibility-reference/#python-driver-compatibility
+#
 # Reminder: Update README.rst if you change MongoDB versions we test.
 
 language: python
@@ -18,7 +25,7 @@ python:
 - pypy
 
 env:
-- MONGODB=2.6 PYMONGO=3.x
+- MONGODB=3.4 PYMONGO=3.x
 
 matrix:
   # Finish the build as soon as one job fails
@@ -26,15 +33,7 @@ matrix:
 
   include:
   - python: 2.7
-    env: MONGODB=3.0 PYMONGO=3.5
-  - python: 3.5
-    env: MONGODB=3.2 PYMONGO=3.x
-  - python: 3.6
-    env: MONGODB=3.0 PYMONGO=3.5
-  - python: 3.6
-    env: MONGODB=3.2 PYMONGO=3.x
-  - python: 3.6
-    env: MONGODB=3.4 PYMONGO=3.x
+    env: MONGODB=3.4 PYMONGO=3.4.x
   - python: 3.6
     env: MONGODB=3.6 PYMONGO=3.x
 
@@ -86,15 +85,15 @@ deploy:
   password:
     secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
 
-  # create a source distribution and a pure python wheel for faster installs
+  # Create a source distribution and a pure python wheel for faster installs.
   distributions: "sdist bdist_wheel"
 
-  # only deploy on tagged commits (aka GitHub releases) and only for the
-  # parent repo's builds running Python 2.7 along with PyMongo v3.x (we run
-  # Travis against many different Python and PyMongo versions and we don't
-  # want the deploy to occur multiple times).
+  # Only deploy on tagged commits (aka GitHub releases) and only for the parent
+  # repo's builds running Python v2.7 along with PyMongo v3.x and MongoDB v3.4.
+  # We run Travis against many different Python, PyMongo, and MongoDB versions
+  # and we don't want the deploy to occur multiple times).
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: "$PYMONGO = 3.x"
+    condition: ($PYMONGO = 3.x) AND ($MONGODB = 3.4)
     python: 2.7
diff --git a/README.rst b/README.rst
index cb279d2c0..fe5f5f22d 100644
--- a/README.rst
+++ b/README.rst
@@ -26,10 +26,10 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v2.6, v3.0, v3.2, v3.4 and v3.6. Future
-versions should be supported as well, but aren't actively tested at the moment.
-Make sure to open an issue or submit a pull request if you experience any
-problems with MongoDB v3.6+.
+MongoEngine is currently tested against MongoDB v3.4 and v3.6. Future versions
+should be supported as well, but aren't actively tested at the moment. Make
+sure to open an issue or submit a pull request if you experience any problems
+with MongoDB version > 3.6.
 
 Installation
 ============
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index e12980e68..e0399fde4 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -117,10 +117,22 @@ def _get_connection_settings(
                     ReadPreference.PRIMARY,
                     ReadPreference.PRIMARY_PREFERRED,
                     ReadPreference.SECONDARY,
-                    ReadPreference.SECONDARY_PREFERRED)
-                read_pf_mode = uri_options['readpreference'].lower()
+                    ReadPreference.SECONDARY_PREFERRED,
+                )
+
+                # Starting with PyMongo v3.5, the "readpreference" option is
+                # returned as a string (e.g. "secondaryPreferred") and not an
+                # int (e.g. 3).
+                # TODO simplify the code below once we drop support for
+                # PyMongo v3.4.
+                read_pf_mode = uri_options['readpreference']
+                if isinstance(read_pf_mode, six.string_types):
+                    read_pf_mode = read_pf_mode.lower()
                 for preference in read_preferences:
-                    if preference.name.lower() == read_pf_mode:
+                    if (
+                        preference.name.lower() == read_pf_mode or
+                        preference.mode == read_pf_mode
+                    ):
                         conn_settings['read_preference'] = preference
                         break
         else:
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index 8e4140755..8234a6167 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -7,10 +7,6 @@
 # Constant that can be used to compare the version retrieved with
 # get_mongodb_version()
 MONGODB_36 = (3, 6)
-MONGODB_34 = (3, 4)
-MONGODB_32 = (3, 2)
-MONGODB_3 = (3, 0)
-MONGODB_26 = (2, 6)
 
 
 def get_mongodb_version():
diff --git a/requirements.txt b/requirements.txt
index 38e0b20ff..9bb319a5b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 nose
-pymongo>=3.5
+pymongo>=3.4
 six==1.10.0
 flake8
 flake8-import-order
diff --git a/setup.py b/setup.py
index c8e9c038d..f1f5dea71 100644
--- a/setup.py
+++ b/setup.py
@@ -80,7 +80,7 @@ def get_version(version_tuple):
     long_description=LONG_DESCRIPTION,
     platforms=['any'],
     classifiers=CLASSIFIERS,
-    install_requires=['pymongo>=3.5', 'six'],
+    install_requires=['pymongo>=3.4', 'six'],
     test_suite='nose.collector',
     **extra_opts
 )
diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index 421618e40..4fc648b77 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -6,7 +6,6 @@
 
 from mongoengine.queryset import NULLIFY, PULL
 from mongoengine.connection import get_db
-from tests.utils import requires_mongodb_gte_26
 
 __all__ = ("ClassMethodsTest", )
 
@@ -187,7 +186,6 @@ class BlogPostWithCustomField(BlogPost):
         self.assertEqual(BlogPostWithTags.compare_indexes(), {'missing': [], 'extra': []})
         self.assertEqual(BlogPostWithCustomField.compare_indexes(), {'missing': [], 'extra': []})
 
-    @requires_mongodb_gte_26
     def test_compare_indexes_for_text_indexes(self):
         """ Ensure that compare_indexes behaves correctly for text indexes """
 
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 34771e8a1..6f486e9f6 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -9,8 +9,7 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from mongoengine.mongodb_support import get_mongodb_version, MONGODB_32, MONGODB_3
-from tests.utils import requires_mongodb_gte_26, requires_mongodb_lte_32, requires_mongodb_gte_34
+from mongoengine.mongodb_support import get_mongodb_version
 
 __all__ = ("IndexesTest", )
 
@@ -478,8 +477,6 @@ class RecursiveDocument(Document):
     def test_covered_index(self):
         """Ensure that covered indexes can be used
         """
-        IS_MONGODB_3 = get_mongodb_version() >= MONGODB_3
-
         class Test(Document):
             a = IntField()
             b = IntField()
@@ -497,33 +494,38 @@ class Test(Document):
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
         query_plan = Test.objects(id=obj.id).exclude('a').explain()
-        if not IS_MONGODB_3:
-            self.assertFalse(query_plan['indexOnly'])
-        else:
-            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IDHACK')
+        self.assertEqual(
+            query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'),
+            'IDHACK'
+        )
 
         query_plan = Test.objects(id=obj.id).only('id').explain()
-        if not IS_MONGODB_3:
-            self.assertTrue(query_plan['indexOnly'])
-        else:
-            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IDHACK')
+        self.assertEqual(
+            query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'),
+            'IDHACK'
+        )
 
         query_plan = Test.objects(a=1).only('a').exclude('id').explain()
-        if not IS_MONGODB_3:
-            self.assertTrue(query_plan['indexOnly'])
-        else:
-            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IXSCAN')
-            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('stage'), 'PROJECTION')
+        self.assertEqual(
+            query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'),
+            'IXSCAN'
+        )
+        self.assertEqual(
+            query_plan.get('queryPlanner').get('winningPlan').get('stage'),
+            'PROJECTION'
+        )
 
         query_plan = Test.objects(a=1).explain()
-        if not IS_MONGODB_3:
-            self.assertFalse(query_plan['indexOnly'])
-        else:
-            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'), 'IXSCAN')
-            self.assertEqual(query_plan.get('queryPlanner').get('winningPlan').get('stage'), 'FETCH')
+        self.assertEqual(
+            query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'),
+            'IXSCAN'
+        )
+        self.assertEqual(
+            query_plan.get('queryPlanner').get('winningPlan').get('stage'),
+            'FETCH'
+        )
 
     def test_index_on_id(self):
-
         class BlogPost(Document):
             meta = {
                 'indexes': [
@@ -565,13 +567,10 @@ class BlogPost(Document):
         self.assertEqual(BlogPost.objects.count(), 10)
         self.assertEqual(BlogPost.objects.hint().count(), 10)
 
-        if MONGO_VER >= MONGODB_32:
-            # Mongo32 throws an error if an index exists (i.e `tags` in our case)
-            # and you use hint on an index name that does not exist
-            with self.assertRaises(OperationFailure):
-                BlogPost.objects.hint([('ZZ', 1)]).count()
-        else:
-            self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).count(), 10)
+        # MongoDB v3.2+ throws an error if an index exists (i.e `tags` in our
+        # case) and you use hint on an index name that does not exist.
+        with self.assertRaises(OperationFailure):
+            BlogPost.objects.hint([('ZZ', 1)]).count()
 
         self.assertEqual(BlogPost.objects.hint(TAGS_INDEX_NAME).count(), 10)
 
@@ -598,9 +597,8 @@ class BlogPost(Document):
         # Ensure backwards compatibility for errors
         self.assertRaises(OperationError, post2.save)
 
-    @requires_mongodb_gte_34
-    def test_primary_key_unique_not_working_under_mongo_34(self):
-        """Relates to  #1445"""
+    def test_primary_key_unique_not_working(self):
+        """Relates to #1445"""
         class Blog(Document):
             id = StringField(primary_key=True, unique=True)
 
@@ -608,21 +606,17 @@ class Blog(Document):
 
         with self.assertRaises(OperationFailure) as ctx_err:
             Blog(id='garbage').save()
-        try:
-            self.assertIn("The field 'unique' is not valid for an _id index specification", str(ctx_err.exception))
-        except AssertionError:
-            # error is slightly different on python 3.6
-            self.assertIn("The field 'background' is not valid for an _id index specification", str(ctx_err.exception))
-
-    @requires_mongodb_lte_32
-    def test_primary_key_unique_working_under_mongo_32(self):
-        """Relates to  #1445"""
-        class Blog(Document):
-            id = StringField(primary_key=True, unique=True)
 
-        Blog.drop_collection()
-
-        Blog(id='garbage').save()
+        # One of the errors below should happen. Which one depends on the
+        # PyMongo version and dict order.
+        err_msg = str(ctx_err.exception)
+        self.assertTrue(
+            any([
+                "The field 'unique' is not valid for an _id index specification" in err_msg,
+                "The field 'background' is not valid for an _id index specification" in err_msg,
+                "The field 'sparse' is not valid for an _id index specification" in err_msg,
+            ])
+        )
 
     def test_unique_with(self):
         """Ensure that unique_with constraints are applied to fields.
@@ -984,7 +978,6 @@ class MyDoc(Document):
                          info['provider_ids.foo_1_provider_ids.bar_1']['key'])
         self.assertTrue(info['provider_ids.foo_1_provider_ids.bar_1']['sparse'])
 
-    @requires_mongodb_gte_26
     def test_text_indexes(self):
         class Book(Document):
             title = DictField()
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 5746f1fc7..cec019a98 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -28,8 +28,6 @@
 from mongoengine.context_managers import switch_db, query_counter
 from mongoengine import signals
 
-from tests.utils import requires_mongodb_gte_26
-
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__),
                                '../fields/mongoengine.png')
 
@@ -850,7 +848,6 @@ def test_modify_update(self):
 
         self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
 
-    @requires_mongodb_gte_26
     def test_modify_with_positional_push(self):
         class Content(EmbeddedDocument):
             keywords = ListField(StringField())
@@ -3368,7 +3365,6 @@ class Person(Document):
 
         person.update(set__height=2.0)
 
-    @requires_mongodb_gte_26
     def test_push_with_position(self):
         """Ensure that push with position works properly for an instance."""
         class BlogPost(Document):
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 240a94ab1..45e6a089c 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -3,7 +3,7 @@
 
 from mongoengine import *
 
-from tests.utils import MongoDBTestCase, requires_mongodb_gte_3
+from tests.utils import MongoDBTestCase
 
 
 __all__ = ("GeoQueriesTest",)
@@ -70,9 +70,6 @@ def test_near_and_max_distance(self):
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0], event2)
 
-    # $minDistance was added in MongoDB v2.6, but continued being buggy
-    # until v3.0; skip for older versions
-    @requires_mongodb_gte_3
     def test_near_and_min_distance(self):
         """Ensure the "min_distance" operator works alongside the "near"
         operator.
@@ -243,9 +240,6 @@ def test_2dsphere_geo_within_polygon(self):
         events = self.Event.objects(location__geo_within_polygon=polygon2)
         self.assertEqual(events.count(), 0)
 
-    # $minDistance was added in MongoDB v2.6, but continued being buggy
-    # until v3.0; skip for older versions
-    @requires_mongodb_gte_3
     def test_2dsphere_near_and_min_max_distance(self):
         """Ensure "min_distace" and "max_distance" operators work well
         together with the "near" operator in a 2dsphere index.
@@ -328,8 +322,6 @@ def test_2dsphere_point_embedded(self):
         """Make sure PointField works properly in an embedded document."""
         self._test_embedded(point_field_class=PointField)
 
-    # Needs MongoDB > 2.6.4 https://jira.mongodb.org/browse/SERVER-14039
-    @requires_mongodb_gte_3
     def test_spherical_geospatial_operators(self):
         """Ensure that spherical geospatial queries are working."""
         class Point(Document):
diff --git a/tests/queryset/modify.py b/tests/queryset/modify.py
index 4b7c3da27..3c5879baf 100644
--- a/tests/queryset/modify.py
+++ b/tests/queryset/modify.py
@@ -2,8 +2,6 @@
 
 from mongoengine import connect, Document, IntField, StringField, ListField
 
-from tests.utils import requires_mongodb_gte_26
-
 __all__ = ("FindAndModifyTest",)
 
 
@@ -96,7 +94,6 @@ def test_modify_with_fields(self):
         self.assertEqual(old_doc.to_mongo(), {"_id": 1})
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
-    @requires_mongodb_gte_26
     def test_modify_with_push(self):
         class BlogPost(Document):
             tags = ListField(StringField())
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 51da663a9..04cfb0618 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -17,10 +17,9 @@
 from mongoengine.connection import get_connection, get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
-from mongoengine.mongodb_support import get_mongodb_version, MONGODB_32, MONGODB_36
+from mongoengine.mongodb_support import get_mongodb_version, MONGODB_36
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
-from tests.utils import requires_mongodb_gte_26
 
 
 class db_ops_tracker(query_counter):
@@ -32,7 +31,7 @@ def get_ops(self):
 
 
 def get_key_compat(mongo_ver):
-    ORDER_BY_KEY = 'sort' if mongo_ver >= MONGODB_32 else '$orderby'
+    ORDER_BY_KEY = 'sort'
     CMD_QUERY_KEY = 'command' if mongo_ver >= MONGODB_36 else 'query'
     return ORDER_BY_KEY, CMD_QUERY_KEY
 
@@ -598,7 +597,6 @@ class BlogPost(Document):
         self.assertEqual(post.comments[0].by, 'joe')
         self.assertEqual(post.comments[0].votes.score, 4)
 
-    @requires_mongodb_gte_26
     def test_update_min_max(self):
         class Scores(Document):
             high_score = IntField()
@@ -616,7 +614,6 @@ class Scores(Document):
         Scores.objects(id=scores.id).update(max__high_score=500)
         self.assertEqual(Scores.objects.get(id=scores.id).high_score, 1000)
 
-    @requires_mongodb_gte_26
     def test_update_multiple(self):
         class Product(Document):
             item = StringField()
@@ -868,11 +865,7 @@ class Blog(Document):
         with query_counter() as q:
             self.assertEqual(q, 0)
             Blog.objects.insert(blogs, load_bulk=False)
-
-            if MONGO_VER >= MONGODB_32:
-                self.assertEqual(q, 1)      # 1 entry containing the list of inserts
-            else:
-                self.assertEqual(q, len(blogs))     # 1 entry per doc inserted
+            self.assertEqual(q, 1)  # 1 entry containing the list of inserts
 
         self.assertEqual(Blog.objects.count(), len(blogs))
 
@@ -885,11 +878,7 @@ class Blog(Document):
         with query_counter() as q:
             self.assertEqual(q, 0)
             Blog.objects.insert(blogs)
-
-            if MONGO_VER >= MONGODB_32:
-                self.assertEqual(q, 2)              # 1 for insert 1 for fetch
-            else:
-                self.assertEqual(q, len(blogs)+1)       # + 1 to fetch all docs
+            self.assertEqual(q, 2)  # 1 for insert 1 for fetch
 
         Blog.drop_collection()
 
@@ -2030,7 +2019,6 @@ class BlogPost(Document):
         pymongo_doc = BlogPost.objects.as_pymongo().first()
         self.assertNotIn('title', pymongo_doc)
 
-    @requires_mongodb_gte_26
     def test_update_push_with_position(self):
         """Ensure that the 'push' update with position works properly.
         """
@@ -2555,8 +2543,8 @@ def test_comment(self):
         """Make sure adding a comment to the query gets added to the query"""
         MONGO_VER = self.mongodb_version
         _, CMD_QUERY_KEY = get_key_compat(MONGO_VER)
-        QUERY_KEY = 'filter' if MONGO_VER >= MONGODB_32 else '$query'
-        COMMENT_KEY = 'comment' if MONGO_VER >= MONGODB_32 else '$comment'
+        QUERY_KEY = 'filter'
+        COMMENT_KEY = 'comment'
 
         class User(Document):
             age = IntField()
@@ -3370,7 +3358,6 @@ class Bar(Document):
 
         self.assertEqual(Foo.objects.distinct("bar"), [bar])
 
-    @requires_mongodb_gte_26
     def test_text_indexes(self):
         class News(Document):
             title = StringField()
@@ -3454,7 +3441,6 @@ class News(Document):
             'brasil').order_by('$text_score').first()
         self.assertEqual(item.get_text_score(), max_text_score)
 
-    @requires_mongodb_gte_26
     def test_distinct_handles_references_to_alias(self):
         register_connection('testdb', 'mongoenginetest2')
 
@@ -4586,7 +4572,6 @@ class Bar(Document):
         self.assertEqual(bars._cursor._Cursor__read_preference,
                          ReadPreference.SECONDARY_PREFERRED)
 
-    @requires_mongodb_gte_26
     def test_read_preference_aggregation_framework(self):
         class Bar(Document):
             txt = StringField()
@@ -5354,7 +5339,6 @@ class Person(Document):
             self.assertTrue(Person.objects._has_data(),
                             'Cursor has data and returned False')
 
-    @requires_mongodb_gte_26
     def test_queryset_aggregation_framework(self):
         class Person(Document):
             name = StringField()
@@ -5396,7 +5380,6 @@ class Person(Document):
             {'_id': None, 'avg': 29, 'total': 2}
         ])
 
-    @requires_mongodb_gte_26
     def test_queryset_aggregation_with_skip(self):
         class Person(Document):
             name = StringField()
@@ -5418,7 +5401,6 @@ class Person(Document):
             {'_id': p3.pk, 'name': "SANDRA MARA"}
         ])
 
-    @requires_mongodb_gte_26
     def test_queryset_aggregation_with_limit(self):
         class Person(Document):
             name = StringField()
@@ -5439,7 +5421,6 @@ class Person(Document):
             {'_id': p1.pk, 'name': "ISABELLA LUANNA"}
         ])
 
-    @requires_mongodb_gte_26
     def test_queryset_aggregation_with_sort(self):
         class Person(Document):
             name = StringField()
@@ -5462,7 +5443,6 @@ class Person(Document):
             {'_id': p2.pk, 'name': "WILSON JUNIOR"}
         ])
 
-    @requires_mongodb_gte_26
     def test_queryset_aggregation_with_skip_with_limit(self):
         class Person(Document):
             name = StringField()
@@ -5492,7 +5472,6 @@ class Person(Document):
 
         self.assertEqual(data, list(data2))
 
-    @requires_mongodb_gte_26
     def test_queryset_aggregation_with_sort_with_limit(self):
         class Person(Document):
             name = StringField()
@@ -5534,7 +5513,6 @@ class Person(Document):
             {'_id': p3.pk, 'name': "SANDRA MARA"},
         ])
 
-    @requires_mongodb_gte_26
     def test_queryset_aggregation_with_sort_with_skip(self):
         class Person(Document):
             name = StringField()
@@ -5555,7 +5533,6 @@ class Person(Document):
             {'_id': p2.pk, 'name': "WILSON JUNIOR"}
         ])
 
-    @requires_mongodb_gte_26
     def test_queryset_aggregation_with_sort_with_skip_with_limit(self):
         class Person(Document):
             name = StringField()
diff --git a/tests/utils.py b/tests/utils.py
index 0ebb44a48..27d5ada7a 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -5,7 +5,7 @@
 
 from mongoengine import connect
 from mongoengine.connection import get_db, disconnect_all
-from mongoengine.mongodb_support import get_mongodb_version, MONGODB_26, MONGODB_3, MONGODB_32, MONGODB_34
+from mongoengine.mongodb_support import get_mongodb_version
 
 
 MONGO_TEST_DB = 'mongoenginetest'   # standard name for the test database
@@ -35,8 +35,20 @@ def get_as_pymongo(doc):
 
 
 def _decorated_with_ver_requirement(func, mongo_version_req, oper):
-    """Return a given function decorated with the version requirement
-    for a particular MongoDB version tuple.
+    """Return a MongoDB version requirement decorator.
+
+    The resulting decorator will raise a SkipTest exception if the current
+    MongoDB version doesn't match the provided version/operator.
+
+    For example, if you define a decorator like so:
+
+        def requires_mongodb_gte_36(func):
+            return _decorated_with_ver_requirement(
+                func, (3.6), oper=operator.ge
+            )
+
+    Then tests decorated with @requires_mongodb_gte_36 will be skipped if
+    ran against MongoDB < v3.6.
 
     :param mongo_version_req: The mongodb version requirement (tuple(int, int))
     :param oper: The operator to apply (e.g: operator.ge)
@@ -51,31 +63,3 @@ def _inner(*args, **kwargs):
     _inner.__name__ = func.__name__
     _inner.__doc__ = func.__doc__
     return _inner
-
-
-def requires_mongodb_gte_34(func):
-    """Raise a SkipTest exception if we're working with MongoDB version
-    lower than v3.4
-    """
-    return _decorated_with_ver_requirement(func, MONGODB_34, oper=operator.ge)
-
-
-def requires_mongodb_lte_32(func):
-    """Raise a SkipTest exception if we're working with MongoDB version
-    greater than v3.2.
-    """
-    return _decorated_with_ver_requirement(func, MONGODB_32, oper=operator.le)
-
-
-def requires_mongodb_gte_26(func):
-    """Raise a SkipTest exception if we're working with MongoDB version
-    lower than v2.6.
-    """
-    return _decorated_with_ver_requirement(func, MONGODB_26, oper=operator.ge)
-
-
-def requires_mongodb_gte_3(func):
-    """Raise a SkipTest exception if we're working with MongoDB version
-    lower than v3.0.
-    """
-    return _decorated_with_ver_requirement(func, MONGODB_3, oper=operator.ge)
diff --git a/tox.ini b/tox.ini
index 815d2acc4..40bcea8a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ commands =
     python setup.py nosetests {posargs}
 deps =
     nose
-    mg35: PyMongo==3.5
+    mg34x: PyMongo>=3.4,<3.5
     mg3x: PyMongo>=3.0,<3.7
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 9ae8fe7c2d674a8dfd0e061368520fb534b990f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 8 May 2019 23:45:35 +0200
Subject: [PATCH 0810/1519] Improve perf of Doc.save by preventing a full
 to_mongo() call just to get the `created` variable

---
 docs/changelog.rst           |   1 +
 mongoengine/base/document.py |   3 +-
 mongoengine/document.py      |  10 ++--
 tests/document/instance.py   | 109 ++++++++++++++++++++++++++---------
 4 files changed, 89 insertions(+), 34 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6864627b6..45de682c2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 - Add support for MongoDB 3.6 and Python3.7 in travis
 - BREAKING CHANGE: Changed the custom field validator (i.e `validation` parameter of Field) so that it now requires:
     the callable to raise a ValidationError (i.o return True/False).
+- Prevent an expensive call to to_mongo in Document.save() to improve performance #?
 - Fix querying on List(EmbeddedDocument) subclasses fields #1961 #1492
 - Fix querying on (Generic)EmbeddedDocument subclasses fields #475
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 4cf34b4fa..2e8dd9f1f 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -293,8 +293,7 @@ def to_mongo(self, use_db_field=True, fields=None):
         """
         Return as SON data ready for use with MongoDB.
         """
-        if not fields:
-            fields = []
+        fields = fields or []
 
         data = SON()
         data['_id'] = None
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 55ff538a6..bf194c70b 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -259,7 +259,7 @@ def to_mongo(self, *args, **kwargs):
         data = super(Document, self).to_mongo(*args, **kwargs)
 
         # If '_id' is None, try and set it from self._data. If that
-        # doesn't exist either, remote '_id' from the SON completely.
+        # doesn't exist either, remove '_id' from the SON completely.
         if data['_id'] is None:
             if self._data.get('id') is None:
                 del data['_id']
@@ -365,10 +365,11 @@ def save(self, force_insert=False, validate=True, clean=True,
         .. versionchanged:: 0.10.7
             Add signal_kwargs argument
         """
+        signal_kwargs = signal_kwargs or {}
+
         if self._meta.get('abstract'):
             raise InvalidDocumentError('Cannot save an abstract document.')
 
-        signal_kwargs = signal_kwargs or {}
         signals.pre_save.send(self.__class__, document=self, **signal_kwargs)
 
         if validate:
@@ -377,9 +378,8 @@ def save(self, force_insert=False, validate=True, clean=True,
         if write_concern is None:
             write_concern = {}
 
-        doc = self.to_mongo()
-
-        created = ('_id' not in doc or self._created or force_insert)
+        doc_id = self.to_mongo(fields=['id'])
+        created = ('_id' not in doc_id or self._created or force_insert)
 
         signals.pre_save_post_validation.send(self.__class__, document=self,
                                               created=created, **signal_kwargs)
diff --git a/tests/document/instance.py b/tests/document/instance.py
index cec019a98..5d4cd1da9 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -16,7 +16,7 @@
 from tests import fixtures
 from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
                             PickleDynamicEmbedded, PickleDynamicTest)
-from tests.utils import MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 from mongoengine import *
 from mongoengine.base import get_document, _document_registry
@@ -715,39 +715,74 @@ class Account(Document):
         acc1 = Account.objects.first()
         self.assertHasInstance(acc1._data["emails"][0], acc1)
 
+    def test_save_checks_that_clean_is_called(self):
+        class CustomError(Exception):
+            pass
+
+        class TestDocument(Document):
+            def clean(self):
+                raise CustomError()
+
+        with self.assertRaises(CustomError):
+            TestDocument().save()
+
+        TestDocument().save(clean=False)
+
+    def test_save_signal_pre_save_post_validation_makes_change_to_doc(self):
+        class BlogPost(Document):
+            content = StringField()
+
+            @classmethod
+            def pre_save_post_validation(cls, sender, document, **kwargs):
+                document.content = 'checked'
+
+        signals.pre_save_post_validation.connect(BlogPost.pre_save_post_validation, sender=BlogPost)
+
+        BlogPost.drop_collection()
+
+        post = BlogPost(content='unchecked').save()
+        self.assertEqual(post.content, 'checked')
+        # Make sure pre_save_post_validation changes makes it to the db
+        raw_doc = get_as_pymongo(post)
+        self.assertEqual(
+            raw_doc,
+            {
+                'content': 'checked',
+                '_id': post.id
+            })
+
     def test_document_clean(self):
         class TestDocument(Document):
             status = StringField()
-            pub_date = DateTimeField()
+            cleaned = BooleanField(default=False)
 
             def clean(self):
-                if self.status == 'draft' and self.pub_date is not None:
-                    msg = 'Draft entries may not have a publication date.'
-                    raise ValidationError(msg)
-                # Set the pub_date for published items if not set.
-                if self.status == 'published' and self.pub_date is None:
-                    self.pub_date = datetime.now()
+                self.cleaned = True
 
         TestDocument.drop_collection()
 
-        t = TestDocument(status="draft", pub_date=datetime.now())
-
-        with self.assertRaises(ValidationError) as cm:
-            t.save()
-
-        expected_msg = "Draft entries may not have a publication date."
-        self.assertIn(expected_msg, cm.exception.message)
-        self.assertEqual(cm.exception.to_dict(), {'__all__': expected_msg})
+        t = TestDocument(status="draft")
 
+        # Ensure clean=False prevent call to clean
         t = TestDocument(status="published")
         t.save(clean=False)
-
-        self.assertEqual(t.pub_date, None)
+        self.assertEqual(t.status, "published")
+        self.assertEqual(t.cleaned, False)
 
         t = TestDocument(status="published")
+        self.assertEqual(t.cleaned, False)
         t.save(clean=True)
-
-        self.assertEqual(type(t.pub_date), datetime)
+        self.assertEqual(t.status, "published")
+        self.assertEqual(t.cleaned, True)
+        raw_doc = get_as_pymongo(t)
+        # Make sure clean changes makes it to the db
+        self.assertEqual(
+            raw_doc,
+            {
+                'status': 'published',
+                'cleaned': True,
+                '_id': t.id
+            })
 
     def test_document_embedded_clean(self):
         class TestEmbeddedDocument(EmbeddedDocument):
@@ -887,19 +922,39 @@ def test_save(self):
         person.save()
 
         # Ensure that the object is in the database
-        collection = self.db[self.Person._get_collection_name()]
-        person_obj = collection.find_one({'name': 'Test User'})
-        self.assertEqual(person_obj['name'], 'Test User')
-        self.assertEqual(person_obj['age'], 30)
-        self.assertEqual(person_obj['_id'], person.id)
+        raw_doc = get_as_pymongo(person)
+        self.assertEqual(
+            raw_doc,
+            {
+                '_cls': 'Person',
+                'name': 'Test User',
+                'age': 30,
+                '_id': person.id
+            })
 
-        # Test skipping validation on save
+    def test_save_skip_validation(self):
         class Recipient(Document):
             email = EmailField(required=True)
 
         recipient = Recipient(email='not-an-email')
-        self.assertRaises(ValidationError, recipient.save)
+        with self.assertRaises(ValidationError):
+            recipient.save()
+
         recipient.save(validate=False)
+        raw_doc = get_as_pymongo(recipient)
+        self.assertEqual(
+            raw_doc,
+            {
+                'email': 'not-an-email',
+                '_id': recipient.id
+            })
+
+    def test_save_with_bad_id(self):
+        class Clown(Document):
+            id = IntField(primary_key=True)
+
+        with self.assertRaises(ValidationError):
+            Clown(id="not_an_int").save()
 
     def test_save_to_a_value_that_equates_to_false(self):
         class Thing(EmbeddedDocument):

From daca0ebc1498c74a45317cd887c93e3c5910f52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 17 May 2019 22:21:22 +0200
Subject: [PATCH 0811/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 45de682c2..dbc64e7da 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Development
 - BREAKING CHANGE: Changed the custom field validator (i.e `validation` parameter of Field) so that it now requires:
     the callable to raise a ValidationError (i.o return True/False).
 - Prevent an expensive call to to_mongo in Document.save() to improve performance #?
+- Improve perf of .save by avoiding a call to to_mongo in Document.save() #2049
 - Fix querying on List(EmbeddedDocument) subclasses fields #1961 #1492
 - Fix querying on (Generic)EmbeddedDocument subclasses fields #475
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`

From 962997ed160eefdb309d73add39ffb3d9431f560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 26 May 2019 22:33:04 +0200
Subject: [PATCH 0812/1519] fix flaky test due to signal receiver garbage
 collection

---
 tests/document/instance.py | 4 ++++
 tests/test_signals.py      | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 5d4cd1da9..f4527ad8d 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -751,6 +751,10 @@ def pre_save_post_validation(cls, sender, document, **kwargs):
                 '_id': post.id
             })
 
+        # Important to disconnect as it could cause some assertions in test_signals
+        # to fail (due to the garbage collection timing of this signal)
+        signals.pre_save_post_validation.disconnect(BlogPost.pre_save_post_validation)
+
     def test_document_clean(self):
         class TestDocument(Document):
             status = StringField()
diff --git a/tests/test_signals.py b/tests/test_signals.py
index f3b6e33cd..34cb43c3a 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -227,6 +227,9 @@ def tearDown(self):
 
         self.ExplicitId.objects.delete()
 
+        # Note that there is a chance that the following assert fails in case
+        # some receivers (eventually created in other tests)
+        # gets garbage collected (https://pythonhosted.org/blinker/#blinker.base.Signal.connect)
         self.assertEqual(self.pre_signals, post_signals)
 
     def test_model_signals(self):

From 5fb0f46e3f110a0725a73bae979d74d76c24e17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 1 Jun 2019 11:14:01 +0200
Subject: [PATCH 0813/1519] fix changelog (py37 not yet in travis)

---
 docs/changelog.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index dbc64e7da..87729df39 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,10 +4,9 @@ Changelog
 
 Development
 ===========
-- Add support for MongoDB 3.6 and Python3.7 in travis
+- Add support for MongoDB 3.6 in travis
 - BREAKING CHANGE: Changed the custom field validator (i.e `validation` parameter of Field) so that it now requires:
     the callable to raise a ValidationError (i.o return True/False).
-- Prevent an expensive call to to_mongo in Document.save() to improve performance #?
 - Improve perf of .save by avoiding a call to to_mongo in Document.save() #2049
 - Fix querying on List(EmbeddedDocument) subclasses fields #1961 #1492
 - Fix querying on (Generic)EmbeddedDocument subclasses fields #475

From 048a0459662c8b40eb01a32c1b93e116aaaf489b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Jun 2019 21:47:28 +0200
Subject: [PATCH 0814/1519] Update connection/multiple databases docs

I observed that many people were confused by this so I thought I'd make the multiple databases example more explicit
---
 docs/guide/connecting.rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index 1107ee3a3..aac139023 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -78,26 +78,30 @@ store the data and you can register all aliases up front if required.
 
 Documents defined in different database
 ---------------------------------------
-Individual documents can also support multiple databases by providing a
+Individual documents can be attached to different databases by providing a
 `db_alias` in their meta data. This allows :class:`~pymongo.dbref.DBRef`
 objects to point across databases and collections. Below is an example schema,
 using 3 different databases to store data::
 
+        connect(alias='user-db-alias', db='user-db')
+        connect(alias='book-db-alias', db='book-db')
+        connect(alias='users-books-db-alias', db='users-books-db')
+        
         class User(Document):
             name = StringField()
 
-            meta = {'db_alias': 'user-db'}
+            meta = {'db_alias': 'user-db-alias'}
 
         class Book(Document):
             name = StringField()
 
-            meta = {'db_alias': 'book-db'}
+            meta = {'db_alias': 'book-db-alias'}
 
         class AuthorBooks(Document):
             author = ReferenceField(User)
             book = ReferenceField(Book)
 
-            meta = {'db_alias': 'users-books-db'}
+            meta = {'db_alias': 'users-books-db-alias'}
 
 
 Disconnecting an existing connection

From 9634e44343b31e0880aeb628ac5e89dba3a4d97a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 15 May 2019 21:43:29 +0200
Subject: [PATCH 0815/1519] Fix the issue that the same MongoClient gets
 re-used in case we connect to 2 databases on the same host (problematic when
 different users authenticate)

---
 mongoengine/connection.py | 57 ++++++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 15 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index e0399fde4..5fae95077 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -235,7 +235,6 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
         raise MongoEngineConnectionError(msg)
 
     def _clean_settings(settings_dict):
-        # set literal more efficient than calling set function
         irrelevant_fields_set = {
             'name', 'username', 'password',
             'authentication_source', 'authentication_mechanism'
@@ -245,10 +244,11 @@ def _clean_settings(settings_dict):
             if k not in irrelevant_fields_set
         }
 
+    raw_conn_settings = _connection_settings[alias].copy()
     # Retrieve a copy of the connection settings associated with the requested
     # alias and remove the database name and authentication info (we don't
     # care about them at this point).
-    conn_settings = _clean_settings(_connection_settings[alias].copy())
+    conn_settings = _clean_settings(raw_conn_settings)
 
     # Determine if we should use PyMongo's or mongomock's MongoClient.
     is_mock = conn_settings.pop('is_mock', False)
@@ -262,19 +262,8 @@ def _clean_settings(settings_dict):
     else:
         connection_class = MongoClient
 
-    # Iterate over all of the connection settings and if a connection with
-    # the same parameters is already established, use it instead of creating
-    # a new one.
-    existing_connection = None
-    connection_settings_iterator = (
-        (db_alias, settings.copy())
-        for db_alias, settings in _connection_settings.items()
-    )
-    for db_alias, connection_settings in connection_settings_iterator:
-        connection_settings = _clean_settings(connection_settings)
-        if conn_settings == connection_settings and _connections.get(db_alias):
-            existing_connection = _connections[db_alias]
-            break
+    # Re-use existing connection if one is suitable
+    existing_connection = _find_existing_connection(raw_conn_settings)
 
     # If an existing connection was found, assign it to the new alias
     if existing_connection:
@@ -291,6 +280,44 @@ def _clean_settings(settings_dict):
     return _connections[alias]
 
 
+def _create_connection(connection_class, **connection_settings):
+    # Otherwise, create the new connection for this alias. Raise
+    # MongoEngineConnectionError if it can't be established.
+    try:
+        _connections[alias] = connection_class(**conn_settings)
+    except Exception as e:
+        raise MongoEngineConnectionError(
+            'Cannot connect to database %s :\n%s' % (alias, e))
+
+
+def _find_existing_connection(connection_settings):
+    """
+    Check if an existing connection could be reused
+
+    Iterate over all of the connection settings and if an existing connection
+    with the same parameters is suitable, return it
+
+    :param connection_settings: the settings of the new connection
+    :return: An existing connection or None
+    """
+    connection_settings_iterator = (
+        (db_alias, settings.copy())
+        for db_alias, settings in _connection_settings.items()
+    )
+
+    def _clean_settings(settings_dict):
+        # Only remove the name but it's important to
+        # keep the username/password/authentication_source/authentication_mechanism
+        # to identify if the connection could be shared (cfr https://github.com/MongoEngine/mongoengine/issues/2047)
+        return {k: v for k, v in settings_dict.items() if k != 'name'}
+
+    cleaned_conn_settings = _clean_settings(connection_settings)
+    for db_alias, connection_settings in connection_settings_iterator:
+        db_conn_settings = _clean_settings(connection_settings)
+        if cleaned_conn_settings == db_conn_settings and _connections.get(db_alias):
+            return _connections[db_alias]
+
+
 def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
     if reconnect:
         disconnect(alias)

From 84c42ed58c6c7d26ec6a392048653d1993acb319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Jun 2019 22:35:42 +0200
Subject: [PATCH 0816/1519] Add tests

---
 mongoengine/connection.py | 25 ++++++++++++-------------
 tests/test_connection.py  | 10 ++++++++++
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 5fae95077..6249225cc 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -245,6 +245,7 @@ def _clean_settings(settings_dict):
         }
 
     raw_conn_settings = _connection_settings[alias].copy()
+
     # Retrieve a copy of the connection settings associated with the requested
     # alias and remove the database name and authentication info (we don't
     # care about them at this point).
@@ -269,22 +270,20 @@ def _clean_settings(settings_dict):
     if existing_connection:
         _connections[alias] = existing_connection
     else:
-        # Otherwise, create the new connection for this alias. Raise
-        # MongoEngineConnectionError if it can't be established.
-        try:
-            _connections[alias] = connection_class(**conn_settings)
-        except Exception as e:
-            raise MongoEngineConnectionError(
-                'Cannot connect to database %s :\n%s' % (alias, e))
+        _create_connection(alias=alias,
+                           connection_class=connection_class,
+                           **conn_settings)
 
     return _connections[alias]
 
 
-def _create_connection(connection_class, **connection_settings):
-    # Otherwise, create the new connection for this alias. Raise
-    # MongoEngineConnectionError if it can't be established.
+def _create_connection(alias, connection_class, **connection_settings):
+    """
+    Create the new connection for this alias. Raise
+    MongoEngineConnectionError if it can't be established.
+    """
     try:
-        _connections[alias] = connection_class(**conn_settings)
+        _connections[alias] = connection_class(**connection_settings)
     except Exception as e:
         raise MongoEngineConnectionError(
             'Cannot connect to database %s :\n%s' % (alias, e))
@@ -300,7 +299,7 @@ def _find_existing_connection(connection_settings):
     :param connection_settings: the settings of the new connection
     :return: An existing connection or None
     """
-    connection_settings_iterator = (
+    connection_settings_bis = (
         (db_alias, settings.copy())
         for db_alias, settings in _connection_settings.items()
     )
@@ -312,7 +311,7 @@ def _clean_settings(settings_dict):
         return {k: v for k, v in settings_dict.items() if k != 'name'}
 
     cleaned_conn_settings = _clean_settings(connection_settings)
-    for db_alias, connection_settings in connection_settings_iterator:
+    for db_alias, connection_settings in connection_settings_bis:
         db_conn_settings = _clean_settings(connection_settings)
         if cleaned_conn_settings == db_conn_settings and _connections.get(db_alias):
             return _connections[db_alias]
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 5473b8a0a..d3fcc395d 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -611,6 +611,16 @@ def test_multiple_connection_settings(self):
         self.assertEqual(mongo_connections['t1'].address[0], 'localhost')
         self.assertEqual(mongo_connections['t2'].address[0], '127.0.0.1')
 
+    def test_connect_2_databases_uses_same_client_if_only_dbname_differs(self):
+        c1 = connect(alias='testdb1', db='testdb1')
+        c2 = connect(alias='testdb2', db='testdb2')
+        self.assertIs(c1, c2)
+
+    def test_connect_2_databases_uses_different_client_if_different_parameters(self):
+        c1 = connect(alias='testdb1', db='testdb1', username='u1')
+        c2 = connect(alias='testdb2', db='testdb2', username='u2')
+        self.assertIsNot(c1, c2)
+
 
 if __name__ == '__main__':
     unittest.main()

From 36aebffcc0f18fd6823d734cdd4001cef7474f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Jun 2019 22:39:44 +0200
Subject: [PATCH 0817/1519] update changelog

---
 docs/changelog.rst        | 1 +
 mongoengine/connection.py | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 87729df39..7e8fd3d2f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,7 @@ Development
 - expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
 - Fix disconnect function #566 #1599 #605 #607 #1213 #565
 - Improve connect/disconnect documentations
+- Fix issue when using multiple connections to the same mongo with different credentials #2047
 - POTENTIAL BREAKING CHANGES: (associated with connect/disconnect fixes)
     - calling `connect` 2 times with the same alias and different parameter will raise an error (should call disconnect first)
     - disconnect now clears `mongoengine.connection._connection_settings`
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 6249225cc..9d4f25fc3 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -270,9 +270,9 @@ def _clean_settings(settings_dict):
     if existing_connection:
         _connections[alias] = existing_connection
     else:
-        _create_connection(alias=alias,
-                           connection_class=connection_class,
-                           **conn_settings)
+        _connections[alias] = _create_connection(alias=alias,
+                                                 connection_class=connection_class,
+                                                 **conn_settings)
 
     return _connections[alias]
 
@@ -283,7 +283,7 @@ def _create_connection(alias, connection_class, **connection_settings):
     MongoEngineConnectionError if it can't be established.
     """
     try:
-        _connections[alias] = connection_class(**connection_settings)
+        return connection_class(**connection_settings)
     except Exception as e:
         raise MongoEngineConnectionError(
             'Cannot connect to database %s :\n%s' % (alias, e))

From 5bf1dd55b143f6dfb504d774bf345e1e7b7f0458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Jun 2019 22:56:52 +0200
Subject: [PATCH 0818/1519] Update mongomock example

Improved the mongomock example as reported in #2067

Fixes #2067
---
 docs/guide/mongomock.rst | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/guide/mongomock.rst b/docs/guide/mongomock.rst
index 1d5227ec1..d70ee6a62 100644
--- a/docs/guide/mongomock.rst
+++ b/docs/guide/mongomock.rst
@@ -19,3 +19,30 @@ or with an alias:
 
     connect('mongoenginetest', host='mongomock://localhost', alias='testdb')
     conn = get_connection('testdb')
+
+Example of test file:
+--------
+.. code-block:: python
+
+    import unittest
+    from mongoengine import connect, disconnect
+
+    class Person(Document):
+        name = StringField()
+
+    class TestPerson(unittest.TestCase):
+
+        @classmethod
+        def setUpClass(cls):
+            connect('mongoenginetest', host='mongomock://localhost')
+
+        @classmethod
+        def tearDownClass(cls):
+           disconnect()
+
+        def test_thing(self):
+            pers = Person(name='John')
+            pers.save()
+
+            fresh_pers = Person.objects().first()
+            self.assertEqual(fresh_pers.name, 'John')

From 7ed5829b2ce49fb4ef597b0535abc9addda74032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 2 Mar 2019 23:17:24 +0100
Subject: [PATCH 0819/1519] Add test on datetime field - parse datetime as str

---
 tests/fields/test_datetime_field.py | 68 +++++++++++++++++++----------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 5af6a0113..83be207f9 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import datetime
+import datetime as dt
 import six
 
 try:
@@ -41,13 +41,13 @@ def test_default_value_utcnow(self):
         a document.
         """
         class Person(Document):
-            created = DateTimeField(default=datetime.datetime.utcnow)
+            created = DateTimeField(default=dt.datetime.utcnow)
 
-        utcnow = datetime.datetime.utcnow()
+        utcnow = dt.datetime.utcnow()
         person = Person()
         person.validate()
         person_created_t0 = person.created
-        self.assertLess(person.created - utcnow, datetime.timedelta(seconds=1))
+        self.assertLess(person.created - utcnow, dt.timedelta(seconds=1))
         self.assertEqual(person_created_t0, person.created)  # make sure it does not change
         self.assertEqual(person._data['created'], person.created)
 
@@ -65,15 +65,15 @@ class LogEntry(Document):
 
         # Test can save dates
         log = LogEntry()
-        log.date = datetime.date.today()
+        log.date = dt.date.today()
         log.save()
         log.reload()
-        self.assertEqual(log.date.date(), datetime.date.today())
+        self.assertEqual(log.date.date(), dt.date.today())
 
         # Post UTC - microseconds are rounded (down) nearest millisecond and
         # dropped
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
-        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1)
+        d1 = dt.datetime(1970, 1, 1, 0, 0, 1, 999)
+        d2 = dt.datetime(1970, 1, 1, 0, 0, 1)
         log = LogEntry()
         log.date = d1
         log.save()
@@ -82,8 +82,8 @@ class LogEntry(Document):
         self.assertEqual(log.date, d2)
 
         # Post UTC - microseconds are rounded (down) nearest millisecond
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
-        d2 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9000)
+        d1 = dt.datetime(1970, 1, 1, 0, 0, 1, 9999)
+        d2 = dt.datetime(1970, 1, 1, 0, 0, 1, 9000)
         log.date = d1
         log.save()
         log.reload()
@@ -93,8 +93,8 @@ class LogEntry(Document):
         if not six.PY3:
             # Pre UTC dates microseconds below 1000 are dropped
             # This does not seem to be true in PY3
-            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
-            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)
+            d1 = dt.datetime(1969, 12, 31, 23, 59, 59, 999)
+            d2 = dt.datetime(1969, 12, 31, 23, 59, 59)
             log.date = d1
             log.save()
             log.reload()
@@ -108,7 +108,7 @@ class LogEntry(Document):
 
         LogEntry.drop_collection()
 
-        d1 = datetime.datetime(1970, 1, 1, 0, 0, 1)
+        d1 = dt.datetime(1970, 1, 1, 0, 0, 1)
         log = LogEntry()
         log.date = d1
         log.validate()
@@ -124,7 +124,7 @@ class LogEntry(Document):
 
         # create additional 19 log entries for a total of 20
         for i in range(1971, 1990):
-            d = datetime.datetime(i, 1, 1, 0, 0, 1)
+            d = dt.datetime(i, 1, 1, 0, 0, 1)
             LogEntry(date=d).save()
 
         self.assertEqual(LogEntry.objects.count(), 20)
@@ -143,15 +143,15 @@ class LogEntry(Document):
             i += 1
 
         # Test searching
-        logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
+        logs = LogEntry.objects.filter(date__gte=dt.datetime(1980, 1, 1))
         self.assertEqual(logs.count(), 10)
 
-        logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1))
+        logs = LogEntry.objects.filter(date__lte=dt.datetime(1980, 1, 1))
         self.assertEqual(logs.count(), 10)
 
         logs = LogEntry.objects.filter(
-            date__lte=datetime.datetime(1980, 1, 1),
-            date__gte=datetime.datetime(1975, 1, 1),
+            date__lte=dt.datetime(1980, 1, 1),
+            date__gte=dt.datetime(1975, 1, 1),
         )
         self.assertEqual(logs.count(), 5)
 
@@ -163,20 +163,20 @@ class LogEntry(Document):
             time = DateTimeField()
 
         log = LogEntry()
-        log.time = datetime.datetime.now()
+        log.time = dt.datetime.now()
         log.validate()
 
-        log.time = datetime.date.today()
+        log.time = dt.date.today()
         log.validate()
 
-        log.time = datetime.datetime.now().isoformat(' ')
+        log.time = dt.datetime.now().isoformat(' ')
         log.validate()
 
         log.time = '2019-05-16 21:42:57.897847'
         log.validate()
 
         if dateutil:
-            log.time = datetime.datetime.now().isoformat('T')
+            log.time = dt.datetime.now().isoformat('T')
             log.validate()
 
         log.time = -1
@@ -190,6 +190,26 @@ class LogEntry(Document):
         log.time = '2019-05-16 21:42:57.123.456'
         self.assertRaises(ValidationError, log.validate)
 
+    def test_parse_valid_datetime_str(self):
+        class DTDoc(Document):
+            date = DateTimeField()
+
+        # make sure that passing a parsable datetime works
+        dtd = DTDoc()
+        now = dt.datetime.utcnow()
+        dtd.date = str(now)
+        self.assertIsInstance(dtd.date, six.string_types)
+        dtd.save()
+        dtd.reload()
+
+        self.assertIsInstance(dtd.date, dt.datetime)
+
+        self.assertNotEqual(dtd.date, now)  # microseconds differ as its not stored in mongo
+        self.assertEqual(
+            dtd.date.strftime('%Y-%m-%d %H:%M:%S'),
+            now.strftime('%Y-%m-%d %H:%M:%S')
+        )
+
 
 class TestDateTimeTzAware(MongoDBTestCase):
     def test_datetime_tz_aware_mark_as_changed(self):
@@ -205,8 +225,8 @@ class LogEntry(Document):
 
         LogEntry.drop_collection()
 
-        LogEntry(time=datetime.datetime(2013, 1, 1, 0, 0, 0)).save()
+        LogEntry(time=dt.datetime(2013, 1, 1, 0, 0, 0)).save()
 
         log = LogEntry.objects.first()
-        log.time = datetime.datetime(2013, 1, 1, 0, 0, 0)
+        log.time = dt.datetime(2013, 1, 1, 0, 0, 0)
         self.assertEqual(['time'], log._changed_fields)

From 27ea01ee05de4b5da8336fe8b8983ff591502670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 2 Mar 2019 23:44:33 +0100
Subject: [PATCH 0820/1519] refactored datetime to_mongo, separating parsing
 from str + added test

---
 mongoengine/fields.py               |  7 +++++--
 tests/fields/test_datetime_field.py | 15 +++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 1cd6be11e..9650403ca 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -497,15 +497,18 @@ def to_mongo(self, value):
         if not isinstance(value, six.string_types):
             return None
 
+        return self._parse_datetime(value)
+
+    def _parse_datetime(self, value):
+        # Attempt to parse a datetime from a string
         value = value.strip()
         if not value:
             return None
 
-        # Attempt to parse a datetime:
         if dateutil:
             try:
                 return dateutil.parser.parse(value)
-            except (TypeError, ValueError):
+            except (TypeError, ValueError, OverflowError):
                 return None
 
         # split usecs, because they are not recognized by strptime.
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 83be207f9..92f0668af 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -190,25 +190,24 @@ class LogEntry(Document):
         log.time = '2019-05-16 21:42:57.123.456'
         self.assertRaises(ValidationError, log.validate)
 
-    def test_parse_valid_datetime_str(self):
+    def test_parse_datetime_as_str(self):
         class DTDoc(Document):
             date = DateTimeField()
 
+        date_str = '2019-03-02 22:26:01'
+
         # make sure that passing a parsable datetime works
         dtd = DTDoc()
-        now = dt.datetime.utcnow()
-        dtd.date = str(now)
+        dtd.date = date_str
         self.assertIsInstance(dtd.date, six.string_types)
         dtd.save()
         dtd.reload()
 
         self.assertIsInstance(dtd.date, dt.datetime)
+        self.assertEqual(str(dtd.date), date_str)
 
-        self.assertNotEqual(dtd.date, now)  # microseconds differ as its not stored in mongo
-        self.assertEqual(
-            dtd.date.strftime('%Y-%m-%d %H:%M:%S'),
-            now.strftime('%Y-%m-%d %H:%M:%S')
-        )
+        dtd.date = 'January 1st, 9999999999'
+        self.assertRaises(ValidationError, dtd.validate)
 
 
 class TestDateTimeTzAware(MongoDBTestCase):

From b407c0e6c6a812b80ba3882bea0d9dd1ecac4ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 4 Mar 2019 23:42:45 +0100
Subject: [PATCH 0821/1519] add test for shard key routing (ported from
 https://github.com/closeio/mongoengine/commit/43f35f5)

---
 tests/document/instance.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index f4527ad8d..04bddea1f 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -466,7 +466,13 @@ class Animal(Document):
         Animal.drop_collection()
         doc = Animal(superphylum='Deuterostomia')
         doc.save()
-        doc.reload()
+
+        with query_counter() as q:
+            doc.reload()
+            query_op = q.db.system.profile.find({'ns': 'mongoenginetest.animal'})[0]
+            self.assertEqual(set(query_op['query']['filter'].keys()), set(['_id', 'superphylum']))
+
+        Animal.drop_collection()
 
     def test_reload_sharded_nested(self):
         class SuperPhylum(EmbeddedDocument):
@@ -480,6 +486,29 @@ class Animal(Document):
         doc = Animal(superphylum=SuperPhylum(name='Deuterostomia'))
         doc.save()
         doc.reload()
+        Animal.drop_collection()
+
+    def test_update_shard_key_routing(self):
+        """Ensures updating a doc with a specified shard_key includes it in
+        the query.
+        """
+        class Animal(Document):
+            is_mammal = BooleanField()
+            name = StringField()
+            meta = {'shard_key': ('is_mammal', 'id')}
+
+        Animal.drop_collection()
+        doc = Animal(is_mammal=True, name='Dog')
+        doc.save()
+
+        with query_counter() as q:
+            doc.name = 'Cat'
+            doc.save()
+            query_op = q.db.system.profile.find({'ns': 'mongoenginetest.animal'})[0]
+            self.assertEqual(query_op['op'], 'update')
+            self.assertEqual(set(query_op['query'].keys()), set(['_id', 'is_mammal']))
+
+        Animal.drop_collection()
 
     def test_reload_with_changed_fields(self):
         """Ensures reloading will not affect changed fields"""

From 82e28dec43e64e6c7995a3ca4b9eb2f91da675d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 8 Mar 2019 17:09:39 +0100
Subject: [PATCH 0822/1519] improved string operation code

---
 mongoengine/fields.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 9650403ca..ba508a703 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -13,6 +13,8 @@
 import six
 from six import iteritems
 
+from mongoengine.queryset.transform import STRING_OPERATORS
+
 try:
     import dateutil
 except ImportError:
@@ -106,11 +108,11 @@ def prepare_query_value(self, op, value):
         if not isinstance(op, six.string_types):
             return value
 
-        if op.lstrip('i') in ('startswith', 'endswith', 'contains', 'exact'):
-            flags = 0
-            if op.startswith('i'):
-                flags = re.IGNORECASE
-                op = op.lstrip('i')
+        if op in STRING_OPERATORS:
+            case_insensitive = op.startswith('i')
+            op = op.lstrip('i')
+
+            flags = re.IGNORECASE if case_insensitive else 0
 
             regex = r'%s'
             if op == 'startswith':

From 15f4d4fee6c2239eabb30ad2c10d44f4975f9f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Jun 2019 23:35:38 +0200
Subject: [PATCH 0823/1519] fix tests for diff mongo vers

---
 mongoengine/fields.py          |  3 +--
 mongoengine/mongodb_support.py |  1 +
 tests/document/instance.py     | 13 +++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index ba508a703..aa5aa8052 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -13,8 +13,6 @@
 import six
 from six import iteritems
 
-from mongoengine.queryset.transform import STRING_OPERATORS
-
 try:
     import dateutil
 except ImportError:
@@ -39,6 +37,7 @@
 from mongoengine.python_support import StringIO
 from mongoengine.queryset import DO_NOTHING
 from mongoengine.queryset.base import BaseQuerySet
+from mongoengine.queryset.transform import STRING_OPERATORS
 
 try:
     from PIL import Image, ImageOps
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index 8234a6167..b20ebc1e6 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -6,6 +6,7 @@
 
 # Constant that can be used to compare the version retrieved with
 # get_mongodb_version()
+MONGODB_34 = (3, 4)
 MONGODB_36 = (3, 6)
 
 
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 04bddea1f..0f2f0c0fa 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -12,6 +12,7 @@
 from pymongo.errors import DuplicateKeyError
 from six import iteritems
 
+from mongoengine.mongodb_support import get_mongodb_version, MONGODB_36, MONGODB_34
 from mongoengine.pymongo_support import list_collection_names
 from tests import fixtures
 from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
@@ -467,10 +468,13 @@ class Animal(Document):
         doc = Animal(superphylum='Deuterostomia')
         doc.save()
 
+        mongo_db = get_mongodb_version()
+        CMD_QUERY_KEY = 'command' if mongo_db >= MONGODB_36 else 'query'
+
         with query_counter() as q:
             doc.reload()
             query_op = q.db.system.profile.find({'ns': 'mongoenginetest.animal'})[0]
-            self.assertEqual(set(query_op['query']['filter'].keys()), set(['_id', 'superphylum']))
+            self.assertEqual(set(query_op[CMD_QUERY_KEY]['filter'].keys()), set(['_id', 'superphylum']))
 
         Animal.drop_collection()
 
@@ -501,12 +505,17 @@ class Animal(Document):
         doc = Animal(is_mammal=True, name='Dog')
         doc.save()
 
+        mongo_db = get_mongodb_version()
+
         with query_counter() as q:
             doc.name = 'Cat'
             doc.save()
             query_op = q.db.system.profile.find({'ns': 'mongoenginetest.animal'})[0]
             self.assertEqual(query_op['op'], 'update')
-            self.assertEqual(set(query_op['query'].keys()), set(['_id', 'is_mammal']))
+            if mongo_db == MONGODB_34:
+                self.assertEqual(set(query_op['query'].keys()), set(['_id', 'is_mammal']))
+            else:
+                self.assertEqual(set(query_op['command']['q'].keys()), set(['_id', 'is_mammal']))
 
         Animal.drop_collection()
 

From 70d6e763b00ea2240cb9e5d4917c38af2bc78c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 5 Jun 2019 22:06:37 +0200
Subject: [PATCH 0824/1519] Document the custom field validation feature

---
 docs/guide/defining-documents.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 911de36de..ae9d3b36f 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -176,6 +176,21 @@ arguments can be set on all fields:
         class Shirt(Document):
             size = StringField(max_length=3, choices=SIZE)
 
+:attr:`validation` (Optional)
+    A callable to validate the value of the field.
+    The callable takes the value as parameter and should raise a ValidationError
+    if validation fails
+
+    e.g ::
+
+        def _not_empty(val):
+            if not val:
+                raise ValidationError('value can not be empty')
+
+        class Person(Document):
+            name = StringField(validation=_not_empty)
+
+
 :attr:`**kwargs` (Optional)
     You can supply additional metadata as arbitrary additional keyword
     arguments.  You can not override existing attributes, however.  Common

From 9499c97e1865355184f9bfb26c19c867040f1edd Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Fri, 7 Jun 2019 12:15:35 +0200
Subject: [PATCH 0825/1519] Clean up the .install_mongodb_on_travis.sh script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a leftover from #2066. Since we no longer install MongoDB versions
v2.6 – v3.2, we no longer need this code.
---
 .install_mongodb_on_travis.sh | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/.install_mongodb_on_travis.sh b/.install_mongodb_on_travis.sh
index f1073333d..0be026552 100644
--- a/.install_mongodb_on_travis.sh
+++ b/.install_mongodb_on_travis.sh
@@ -3,23 +3,7 @@
 sudo apt-get remove mongodb-org-server
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
 
-if [ "$MONGODB" = "2.6" ]; then
-    echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" | sudo tee /etc/apt/sources.list.d/mongodb.list
-    sudo apt-get update
-    sudo apt-get install mongodb-org-server=2.6.12
-    # service should be started automatically
-elif [ "$MONGODB" = "3.0" ]; then
-    echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb.list
-    sudo apt-get update
-    sudo apt-get install mongodb-org-server=3.0.14
-    # service should be started automatically
-elif [ "$MONGODB" = "3.2" ]; then
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv EA312927
-    echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.2 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.2.list
-    sudo apt-get update
-    sudo apt-get install mongodb-org-server=3.2.20
-    # service should be started automatically
-elif [ "$MONGODB" = "3.4" ]; then
+if [ "$MONGODB" = "3.4" ]; then
     sudo apt-key adv --keyserver keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
     echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
     sudo apt-get update

From f996f3df74e0f8ca0d522e725b03eef588389518 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Fri, 7 Jun 2019 12:34:32 +0200
Subject: [PATCH 0826/1519] Cleaner test_hint

---
 tests/document/indexes.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 6f486e9f6..3bdd1a66a 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -544,9 +544,8 @@ class BlogPost(Document):
                                  [('categories', 1), ('_id', 1)])
 
     def test_hint(self):
-        MONGO_VER = self.mongodb_version
-
         TAGS_INDEX_NAME = 'tags_1'
+
         class BlogPost(Document):
             tags = ListField(StringField())
             meta = {
@@ -564,18 +563,27 @@ class BlogPost(Document):
             tags = [("tag %i" % n) for n in range(i % 2)]
             BlogPost(tags=tags).save()
 
-        self.assertEqual(BlogPost.objects.count(), 10)
+        # Hinting by shape should work.
+        self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
+
+        # Hinting by index name should work.
+        self.assertEqual(BlogPost.objects.hint(TAGS_INDEX_NAME).count(), 10)
+
+        # Clearing the hint should work fine.
         self.assertEqual(BlogPost.objects.hint().count(), 10)
+        self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).hint().count(), 10)
 
-        # MongoDB v3.2+ throws an error if an index exists (i.e `tags` in our
-        # case) and you use hint on an index name that does not exist.
+        # Hinting on a non-existent index shape should fail.
         with self.assertRaises(OperationFailure):
             BlogPost.objects.hint([('ZZ', 1)]).count()
 
-        self.assertEqual(BlogPost.objects.hint(TAGS_INDEX_NAME).count(), 10)
+        # Hinting on a non-existent index name should fail.
+        with self.assertRaises(OperationFailure):
+            BlogPost.objects.hint('Bad Name').count()
 
-        with self.assertRaises(Exception):
-            BlogPost.objects.hint(('tags', 1)).next()
+        # Invalid shape argument (missing list brackets) should fail.
+        with self.assertRaises(ValueError):
+            BlogPost.objects.hint(('tags', 1)).count()
 
     def test_unique(self):
         """Ensure that uniqueness constraints are applied to fields.

From 8e8c74c621a31870b521ed0216ae91d1e737b971 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Fri, 7 Jun 2019 12:35:38 +0200
Subject: [PATCH 0827/1519] Drop the unused mongodb_version attribute in
 IndexesTest

---
 tests/document/indexes.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 3bdd1a66a..764ef0c5d 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -9,7 +9,6 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from mongoengine.mongodb_support import get_mongodb_version
 
 __all__ = ("IndexesTest", )
 
@@ -19,7 +18,6 @@ class IndexesTest(unittest.TestCase):
     def setUp(self):
         self.connection = connect(db='mongoenginetest')
         self.db = get_db()
-        self.mongodb_version = get_mongodb_version()
 
         class Person(Document):
             name = StringField()

From 31d99c0bd2db09c9db8df079e8f41a6febc8445b Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 10 Jun 2019 11:26:47 +0200
Subject: [PATCH 0828/1519] Cleaner wording in the dev changelog

---
 docs/changelog.rst | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7e8fd3d2f..9311b8c12 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,25 +4,25 @@ Changelog
 
 Development
 ===========
-- Add support for MongoDB 3.6 in travis
-- BREAKING CHANGE: Changed the custom field validator (i.e `validation` parameter of Field) so that it now requires:
-    the callable to raise a ValidationError (i.o return True/False).
-- Improve perf of .save by avoiding a call to to_mongo in Document.save() #2049
-- Fix querying on List(EmbeddedDocument) subclasses fields #1961 #1492
-- Fix querying on (Generic)EmbeddedDocument subclasses fields #475
-- expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
-- Fix disconnect function #566 #1599 #605 #607 #1213 #565
-- Improve connect/disconnect documentations
-- Fix issue when using multiple connections to the same mongo with different credentials #2047
-- POTENTIAL BREAKING CHANGES: (associated with connect/disconnect fixes)
-    - calling `connect` 2 times with the same alias and different parameter will raise an error (should call disconnect first)
-    - disconnect now clears `mongoengine.connection._connection_settings`
-    - disconnect now clears the cached attribute `Document._collection`
-- POTENTIAL BREAKING CHANGE: Aggregate gives wrong results when used with a queryset having limit and skip #2029
-- Fix the default write concern of .save that was overwriting the connection write concern #568
-- mongoengine now requires pymongo>=3.5 #2017
-- Generate Unique Indices for SortedListField and EmbeddedDocumentListFields #2020
-- connect() fails immediately when db name contains invalid characters #2031 #1718
+- Drop support for EOL'd MongoDB v2.6, v3.0, and v3.2.
+- MongoEngine now requires PyMongo >= v3.4. Travis CI now tests against MongoDB v3.4 – v3.6 and PyMongo v3.4 – v3.6 (#2017 #2066).
+- Improve performance by avoiding a call to `to_mongo` in `Document.save()` #2049
+- Connection/disconnection improvements:
+    - Expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
+    - Fix disconnecting #566 #1599 #605 #607 #1213 #565
+    - Improve documentation of `connect`/`disconnect`
+    - Fix issue when using multiple connections to the same mongo with different credentials #2047
+    - `connect` fails immediately when db name contains invalid characters #2031 #1718
+- Fix the default write concern of `Document.save` that was overwriting the connection write concern #568
+- Fix querying on `List(EmbeddedDocument)` subclasses fields #1961 #1492
+- Fix querying on `(Generic)EmbeddedDocument` subclasses fields #475
+- Generate unique indices for `SortedListField` and `EmbeddedDocumentListFields` #2020
+- BREAKING CHANGE: Changed the behavior of a custom field validator (i.e `validation` parameter of a `Field`). It is now expected to raise a `ValidationError` instead of returning True/False #2050
+- BREAKING CHANGE: `QuerySet.aggreagte` now takes limit and skip value into account #2029
+- BREAKING CHANGES (associated with connect/disconnect fixes):
+    - Calling `connect` 2 times with the same alias and different parameter will raise an error (should call `disconnect` first).
+    - `disconnect` now clears `mongoengine.connection._connection_settings`.
+    - `disconnect` now clears the cached attribute `Document._collection`.
 - (Fill this out as you fix issues and develop your features).
 
 Changes in 0.17.0

From 1fc5b954f2095ddc116be08f392deb3a6801446a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 10 Jun 2019 22:38:37 +0200
Subject: [PATCH 0829/1519] fix typo in changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9311b8c12..9ef90afe6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -18,7 +18,7 @@ Development
 - Fix querying on `(Generic)EmbeddedDocument` subclasses fields #475
 - Generate unique indices for `SortedListField` and `EmbeddedDocumentListFields` #2020
 - BREAKING CHANGE: Changed the behavior of a custom field validator (i.e `validation` parameter of a `Field`). It is now expected to raise a `ValidationError` instead of returning True/False #2050
-- BREAKING CHANGE: `QuerySet.aggreagte` now takes limit and skip value into account #2029
+- BREAKING CHANGE: `QuerySet.aggregate` now takes limit and skip value into account #2029
 - BREAKING CHANGES (associated with connect/disconnect fixes):
     - Calling `connect` 2 times with the same alias and different parameter will raise an error (should call `disconnect` first).
     - `disconnect` now clears `mongoengine.connection._connection_settings`.

From 1d29b824a83b46af9a89028fe3df1994c9e66190 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Tue, 11 Jun 2019 12:52:29 +0200
Subject: [PATCH 0830/1519] Remove save method from test

---
 tests/document/instance.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 0f2f0c0fa..e8248c3b8 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -3200,10 +3200,6 @@ class Doc(Document):
         doc = Doc(emb=Embedded()).save()
         doc.emb.save()  # Make sure its still working
         with warnings.catch_warnings():
-            warnings.simplefilter("error", DeprecationWarning)
-            with self.assertRaises(DeprecationWarning):
-                doc.emb.save()
-
             with self.assertRaises(DeprecationWarning):
                 doc.emb.reload()
 

From 7ad6f036e793d016b6dbb6bd411a1facc90743c9 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Tue, 11 Jun 2019 13:16:33 +0200
Subject: [PATCH 0831/1519] Remove test

---
 tests/document/instance.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index e8248c3b8..b60f51561 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -3189,20 +3189,6 @@ def save(self, *args, **kwargs):
             "UNDEFINED",
             system.nodes["node"].parameters["param"].macros["test"].value)
 
-    def test_embedded_document_save_reload_warning(self):
-        """Relates to #1570"""
-        class Embedded(EmbeddedDocument):
-            pass
-
-        class Doc(Document):
-            emb = EmbeddedDocumentField(Embedded)
-
-        doc = Doc(emb=Embedded()).save()
-        doc.emb.save()  # Make sure its still working
-        with warnings.catch_warnings():
-            with self.assertRaises(DeprecationWarning):
-                doc.emb.reload()
-
     def test_embedded_document_equality(self):
         class Test(Document):
             field = StringField(required=True)

From 118a99813828feed04c778bb14c42301d7154f55 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 11 Jun 2019 15:09:16 +0200
Subject: [PATCH 0832/1519] Classify the QuerySet.aggregate change as a bugfix
 [ci skip]

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9ef90afe6..63982cc7f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -16,9 +16,9 @@ Development
 - Fix the default write concern of `Document.save` that was overwriting the connection write concern #568
 - Fix querying on `List(EmbeddedDocument)` subclasses fields #1961 #1492
 - Fix querying on `(Generic)EmbeddedDocument` subclasses fields #475
+- Fix `QuerySet.aggregate` so that it takes limit and skip value into account #2029
 - Generate unique indices for `SortedListField` and `EmbeddedDocumentListFields` #2020
 - BREAKING CHANGE: Changed the behavior of a custom field validator (i.e `validation` parameter of a `Field`). It is now expected to raise a `ValidationError` instead of returning True/False #2050
-- BREAKING CHANGE: `QuerySet.aggregate` now takes limit and skip value into account #2029
 - BREAKING CHANGES (associated with connect/disconnect fixes):
     - Calling `connect` 2 times with the same alias and different parameter will raise an error (should call `disconnect` first).
     - `disconnect` now clears `mongoengine.connection._connection_settings`.

From f131b18cbec3e799291736467aea396ee6400d7f Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 11 Jun 2019 15:50:22 +0200
Subject: [PATCH 0833/1519] Make test_update_shard_key_routing more resilient

---
 tests/document/instance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 0f2f0c0fa..2fa755383 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -512,7 +512,7 @@ class Animal(Document):
             doc.save()
             query_op = q.db.system.profile.find({'ns': 'mongoenginetest.animal'})[0]
             self.assertEqual(query_op['op'], 'update')
-            if mongo_db == MONGODB_34:
+            if mongo_db <= MONGODB_34:
                 self.assertEqual(set(query_op['query'].keys()), set(['_id', 'is_mammal']))
             else:
                 self.assertEqual(set(query_op['command']['q'].keys()), set(['_id', 'is_mammal']))

From c58b9f00f0f0c1093a7a5fceae3ccdb6d0528388 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Tue, 11 Jun 2019 15:53:50 +0200
Subject: [PATCH 0834/1519] Add changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9ef90afe6..2466d19af 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,6 +23,7 @@ Development
     - Calling `connect` 2 times with the same alias and different parameter will raise an error (should call `disconnect` first).
     - `disconnect` now clears `mongoengine.connection._connection_settings`.
     - `disconnect` now clears the cached attribute `Document._collection`.
+- BREAKING CHANGE: `EmbeddedDocument.save` & `.reload` is no longier exist #1552
 - (Fill this out as you fix issues and develop your features).
 
 Changes in 0.17.0

From 996618a495ce0ccf2f0b81b0666e68c5af7fb71c Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 12 Jun 2019 08:27:22 +0200
Subject: [PATCH 0835/1519] Fix wording of an exception message in
 QuerySet.insert

---
 mongoengine/queryset/base.py |  2 +-
 tests/queryset/queryset.py   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c62448257..e17c9632e 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -335,7 +335,7 @@ def insert(self, doc_or_docs, load_bulk=True,
                        % str(self._document))
                 raise OperationError(msg)
             if doc.pk and not doc._created:
-                msg = 'Some documents have ObjectIds use doc.update() instead'
+                msg = 'Some documents have ObjectIds, use doc.update() instead'
                 raise OperationError(msg)
 
         signal_kwargs = signal_kwargs or {}
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 04cfb0618..1f09ca592 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -898,13 +898,19 @@ class Blog(Document):
         with self.assertRaises(OperationError) as cm:
             blog = Blog.objects.first()
             Blog.objects.insert(blog)
-        self.assertEqual(str(cm.exception), 'Some documents have ObjectIds use doc.update() instead')
+        self.assertEqual(
+            str(cm.exception),
+            'Some documents have ObjectIds, use doc.update() instead'
+        )
 
         # test inserting a query set
         with self.assertRaises(OperationError) as cm:
             blogs_qs = Blog.objects
             Blog.objects.insert(blogs_qs)
-        self.assertEqual(str(cm.exception), 'Some documents have ObjectIds use doc.update() instead')
+        self.assertEqual(
+            str(cm.exception),
+            'Some documents have ObjectIds, use doc.update() instead'
+        )
 
         # insert 1 new doc
         new_post = Blog(title="code123", id=ObjectId())

From 4a8985278deee81384668f01a1ee47bd539622b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 12 Jun 2019 11:33:56 +0200
Subject: [PATCH 0836/1519] Document inherited members for the Document,
 EmbeddedDocument, DynamicDocument, and DynamicEmbeddedDocument (#2040)

---
 docs/apireference.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/apireference.rst b/docs/apireference.rst
index 05ba3f733..218946115 100644
--- a/docs/apireference.rst
+++ b/docs/apireference.rst
@@ -13,6 +13,7 @@ Documents
 
 .. autoclass:: mongoengine.Document
    :members:
+   :inherited-members:
 
    .. attribute:: objects
 
@@ -21,15 +22,18 @@ Documents
 
 .. autoclass:: mongoengine.EmbeddedDocument
    :members:
+   :inherited-members:
 
 .. autoclass:: mongoengine.DynamicDocument
    :members:
+   :inherited-members:
 
 .. autoclass:: mongoengine.DynamicEmbeddedDocument
    :members:
+   :inherited-members:
 
 .. autoclass:: mongoengine.document.MapReduceDocument
-  :members:
+   :members:
 
 .. autoclass:: mongoengine.ValidationError
   :members:

From 15b6c1590fab9f97b77cdb295b68e2871b61edee Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 12 Jun 2019 11:37:08 +0200
Subject: [PATCH 0837/1519] Add extra context to the BaseDocument.validate
 docstring

---
 mongoengine/base/document.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 2e8dd9f1f..789687ac3 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -348,6 +348,9 @@ def to_mongo(self, use_db_field=True, fields=None):
     def validate(self, clean=True):
         """Ensure that all fields' values are valid and that required fields
         are present.
+
+        Raises :class:`ValidationError` if any of the fields' values are found
+        to be invalid.
         """
         # Ensure that each field is matched to a valid value
         errors = {}

From a6c04f4f9aab8436cefaa062718d239960ed8b3c Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 12 Jun 2019 11:38:58 +0200
Subject: [PATCH 0838/1519] Finalize the v0.18.0 changelog [ci skip]

---
 docs/changelog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 85cffbce9..5bc2b67ea 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,10 @@ Changelog
 
 Development
 ===========
+- (Fill this out as you fix issues and develop your features).
+
+Changes in 0.18.0
+=================
 - Drop support for EOL'd MongoDB v2.6, v3.0, and v3.2.
 - MongoEngine now requires PyMongo >= v3.4. Travis CI now tests against MongoDB v3.4 – v3.6 and PyMongo v3.4 – v3.6 (#2017 #2066).
 - Improve performance by avoiding a call to `to_mongo` in `Document.save()` #2049
@@ -24,7 +28,6 @@ Development
     - `disconnect` now clears `mongoengine.connection._connection_settings`.
     - `disconnect` now clears the cached attribute `Document._collection`.
 - BREAKING CHANGE: `EmbeddedDocument.save` & `.reload` is no longier exist #1552
-- (Fill this out as you fix issues and develop your features).
 
 Changes in 0.17.0
 =================

From f08f749cd9bf7cd774c04e361c2dfd7fc4944549 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 12 Jun 2019 11:47:31 +0200
Subject: [PATCH 0839/1519] Bump version to v0.18.0

---
 mongoengine/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index b94efab9b..4ddc2bf9e 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,12 +23,13 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 17, 0)
+VERSION = (0, 18, 0)
 
 
 def get_version():
-    """Return the VERSION as a string, e.g. for VERSION == (0, 10, 7),
-    return '0.10.7'.
+    """Return the VERSION as a string.
+
+    For example, if `VERSION == (0, 10, 7)`, return '0.10.7'.
     """
     return '.'.join(map(str, VERSION))
 

From d20430a7786e39c504a21f0fd43d565793611a69 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 12 Jun 2019 11:57:25 +0200
Subject: [PATCH 0840/1519] Bump up waiting for MongoDB from 15s to 20s

I've noticed that `mongo --eval 'db.version()'` has been failing fairly
regularly in the last few weeks. Hopefully that extra 5s is enough.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3186ea1c2..9f7608064 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ matrix:
 
 before_install:
 - bash .install_mongodb_on_travis.sh
-- sleep 15  # https://docs.travis-ci.com/user/database-setup/#MongoDB-does-not-immediately-accept-connections
+- sleep 20  # https://docs.travis-ci.com/user/database-setup/#mongodb-does-not-immediately-accept-connections
 - mongo --eval 'db.version();'
 
 install:

From 40ba51ac43591cbc8547f8d2db6c7ac6d1d97cee Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 12 Jun 2019 12:08:11 +0200
Subject: [PATCH 0841/1519] Try a different deployment condition

The previous one was a verbatim copy-paste of what TravisCI's Support suggested
to me, but sadly it didn't work. See
https://travis-ci.org/MongoEngine/mongoengine/jobs/544655132. That build
should've triggered a deployment.

This time I'm trying a different syntax, primarily influenced by
https://docs.travis-ci.com/user/conditions-v1#boolean-operators.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9f7608064..3afc99650 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,5 +95,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = 3.x) AND ($MONGODB = 3.4)
+    condition: $PYMONGO = 3.x AND $MONGODB = 3.4
     python: 2.7

From aa8a991d201bf1296d935f15f92b3d93534cdca7 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 12 Jun 2019 12:19:36 +0200
Subject: [PATCH 0842/1519] Try a different deployment condition

This time my attempt is based on the output found in another job that didn't
trigger a deployment: https://travis-ci.org/MongoEngine/mongoengine/jobs/544664203

```
/home/travis/.travis/job_stages: line 660: expected `)'
/home/travis/.travis/job_stages: line 660: syntax error near `AND'
/home/travis/.travis/job_stages: line 660: `  if [[ ($TRAVIS_REPO_SLUG = "MongoEngine/mongoengine") && ($TRAVIS_PYTHON_VERSION = 2.7) && ($PYMONGO = 3.x AND $MONGODB = 3.4) && ("$TRAVIS_TAG" != "") ]]; then'
```

See 80ca6360c1f3ea073e3fcb65070ded0558514ffa and
40ba51ac43591cbc8547f8d2db6c7ac6d1d97cee for my previous attempts.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3afc99650..b1fcba07f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,5 +95,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: $PYMONGO = 3.x AND $MONGODB = 3.4
+    condition: ($PYMONGO = 3.x) && ($MONGODB = 3.4)
     python: 2.7

From d7285d43dd2be65a0b5b0a60292ba085788e86c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 12 Jun 2019 23:54:20 +0200
Subject: [PATCH 0843/1519] added another aggregation test

---
 tests/queryset/queryset.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 1f09ca592..55f256d9a 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -7,7 +7,6 @@
 
 from bson import DBRef, ObjectId
 import pymongo
-from pymongo.errors import ConfigurationError
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import UpdateResult
 import six
@@ -17,7 +16,7 @@
 from mongoengine.connection import get_connection, get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
-from mongoengine.mongodb_support import get_mongodb_version, MONGODB_36
+from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
 
@@ -832,8 +831,6 @@ class B(Document):
 
     def test_bulk_insert(self):
         """Ensure that bulk insert works"""
-        MONGO_VER = self.mongodb_version
-
         class Comment(EmbeddedDocument):
             name = StringField()
 
@@ -847,10 +844,6 @@ class Blog(Document):
 
         Blog.drop_collection()
 
-        # get MongoDB version info
-        connection = get_connection()
-        info = connection.test.command('buildInfo')
-
         # Recreates the collection
         self.assertEqual(0, Blog.objects.count())
 
@@ -5386,6 +5379,13 @@ class Person(Document):
             {'_id': None, 'avg': 29, 'total': 2}
         ])
 
+        data = Person.objects().aggregate({'$match': {'name': 'Isabella Luanna'}})
+        self.assertEqual(list(data), [
+            {u'_id': p1.pk,
+             u'age': 16,
+             u'name': u'Isabella Luanna'}]
+                         )
+
     def test_queryset_aggregation_with_skip(self):
         class Person(Document):
             name = StringField()

From 17fc9d188609f5ce9f65ead57ca3bb10a93d878c Mon Sep 17 00:00:00 2001
From: Dmitry Voronenkov <divomen@gmail.com>
Date: Thu, 13 Jun 2019 19:58:44 +0300
Subject: [PATCH 0844/1519] Fix a big issue when determine if there is a new
 document or we need to update. With this issue all fields were update always
 (not only modified fields)

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 341a41bae..c338263df 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -366,7 +366,7 @@ def save(self, force_insert=False, validate=True, clean=True,
         if write_concern is None:
             write_concern = {}
 
-        doc_id = self.to_mongo(fields=['id'])
+        doc_id = self.to_mongo(fields=[self._meta['id_field']])
         created = ('_id' not in doc_id or self._created or force_insert)
 
         signals.pre_save_post_validation.send(self.__class__, document=self,

From 4c31193b82ca665fe27b1ddce3cbacbb2b7fcd32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 13 Jun 2019 20:53:56 +0200
Subject: [PATCH 0845/1519] Revert "added another aggregation test"

This reverts commit d7285d43dd2be65a0b5b0a60292ba085788e86c7.
---
 tests/queryset/queryset.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 55f256d9a..1f09ca592 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -7,6 +7,7 @@
 
 from bson import DBRef, ObjectId
 import pymongo
+from pymongo.errors import ConfigurationError
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import UpdateResult
 import six
@@ -16,7 +17,7 @@
 from mongoengine.connection import get_connection, get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
-from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
+from mongoengine.mongodb_support import get_mongodb_version, MONGODB_36
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
 
@@ -831,6 +832,8 @@ class B(Document):
 
     def test_bulk_insert(self):
         """Ensure that bulk insert works"""
+        MONGO_VER = self.mongodb_version
+
         class Comment(EmbeddedDocument):
             name = StringField()
 
@@ -844,6 +847,10 @@ class Blog(Document):
 
         Blog.drop_collection()
 
+        # get MongoDB version info
+        connection = get_connection()
+        info = connection.test.command('buildInfo')
+
         # Recreates the collection
         self.assertEqual(0, Blog.objects.count())
 
@@ -5379,13 +5386,6 @@ class Person(Document):
             {'_id': None, 'avg': 29, 'total': 2}
         ])
 
-        data = Person.objects().aggregate({'$match': {'name': 'Isabella Luanna'}})
-        self.assertEqual(list(data), [
-            {u'_id': p1.pk,
-             u'age': 16,
-             u'name': u'Isabella Luanna'}]
-                         )
-
     def test_queryset_aggregation_with_skip(self):
         class Person(Document):
             name = StringField()

From 5f00b4f923840e67f2ef81a0f8eeb2f023805c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 2 Jun 2019 23:40:29 +0200
Subject: [PATCH 0846/1519] refactor travis - mongo install and added python3.7

---
 .install_mongodb_on_travis.sh | 24 ---------------
 .travis.yml                   | 58 ++++++++++++++++++++---------------
 docs/changelog.rst            |  2 ++
 3 files changed, 36 insertions(+), 48 deletions(-)
 delete mode 100644 .install_mongodb_on_travis.sh

diff --git a/.install_mongodb_on_travis.sh b/.install_mongodb_on_travis.sh
deleted file mode 100644
index 0be026552..000000000
--- a/.install_mongodb_on_travis.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-sudo apt-get remove mongodb-org-server
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
-
-if [ "$MONGODB" = "3.4" ]; then
-    sudo apt-key adv --keyserver keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
-    echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
-    sudo apt-get update
-    sudo apt-get install mongodb-org-server=3.4.17
-    # service should be started automatically
-elif [ "$MONGODB" = "3.6" ]; then
-    sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-    echo "deb http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.6 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.6.list
-    sudo apt-get update
-    sudo apt-get install mongodb-org-server=3.6.12
-    # service should be started automatically
-else
-    echo "Invalid MongoDB version, expected 2.6, 3.0, 3.2, 3.4 or 3.6."
-    exit 1
-fi;
-
-mkdir db
-1>db/logs mongod --dbpath=db &
diff --git a/.travis.yml b/.travis.yml
index b1fcba07f..ec63b7f98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,8 @@
 #
 # Reminder: Update README.rst if you change MongoDB versions we test.
 
-language: python
 
+language: python
 python:
 - 2.7
 - 3.5
@@ -25,43 +25,53 @@ python:
 - pypy
 
 env:
-- MONGODB=3.4 PYMONGO=3.x
+  global:
+    - MONGODB_3_4=3.4.17
+    - MONGODB_3_6=3.6.12
+  matrix:
+    - MONGODB=${MONGODB_3_4} PYMONGO=3.x
 
 matrix:
+
   # Finish the build as soon as one job fails
   fast_finish: true
 
   include:
   - python: 2.7
-    env: MONGODB=3.4 PYMONGO=3.4.x
+    env: MONGODB=${MONGODB_3_4} PYMONGO=3.4.x
   - python: 3.6
-    env: MONGODB=3.6 PYMONGO=3.x
+    env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
+  - python: 3.7
+    dist: xenial    # python 3.7 not available on default dist (trusty)
+    env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
 
-before_install:
-- bash .install_mongodb_on_travis.sh
-- sleep 20  # https://docs.travis-ci.com/user/database-setup/#mongodb-does-not-immediately-accept-connections
-- mongo --eval 'db.version();'
 
 install:
-- sudo apt-get install python-dev python3-dev libopenjpeg-dev zlib1g-dev libjpeg-turbo8-dev
-  libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.5-dev tk8.5-dev
-  python-tk
-- travis_retry pip install --upgrade pip
-- travis_retry pip install coveralls
-- travis_retry pip install flake8 flake8-import-order
-- travis_retry pip install "tox"   # tox 3.11.0 has requirement virtualenv>=14.0.0
-- travis_retry pip install "virtualenv"  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
-- travis_retry tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
-
-# Cache dependencies installed via pip
-cache: pip
-
-# Run flake8 for py27
+  - echo "INIT-"$(date)
+  # Install Mongo
+  - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
+  - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
+  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
+  # Install python dependencies
+  - echo "INSTALL WITH PIP-"$(date)
+  - pip install --upgrade pip
+  - pip install coveralls
+  - pip install flake8 flake8-import-order
+  - pip install tox         # tox 3.11.0 has requirement virtualenv>=14.0.0
+  - pip install virtualenv  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
+  # Install the tox venv
+  - echo "TOX INSTALL-"$(date)
+  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
+
 before_script:
-- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then flake8 .; else echo "flake8 only runs on py27"; fi
+  - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
+  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then flake8 .; else echo "flake8 only runs on py27"; fi   # Run flake8 for py27
+  - mongo --eval 'db.version();'    # Make sure mongo is awake
 
 script:
-- tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
+  - echo "TOX RUN TEST-" $(date)
+  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 
 # For now only submit coveralls for Python v2.7. Python v3.x currently shows
 # 0% coverage. That's caused by 'use_2to3', which builds the py3-compatible
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5bc2b67ea..cdbb430e1 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,9 +1,11 @@
+
 =========
 Changelog
 =========
 
 Development
 ===========
+- Add Python 3.7 in travis #2058
 - (Fill this out as you fix issues and develop your features).
 
 Changes in 0.18.0

From 1181b75e16abdb02d29b29162165fc2bf4541c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 3 Jun 2019 23:18:48 +0200
Subject: [PATCH 0847/1519] clean travis.yml

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec63b7f98..a21c934b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,20 +47,17 @@ matrix:
 
 
 install:
-  - echo "INIT-"$(date)
   # Install Mongo
   - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
   - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
   - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
   # Install python dependencies
-  - echo "INSTALL WITH PIP-"$(date)
   - pip install --upgrade pip
   - pip install coveralls
   - pip install flake8 flake8-import-order
   - pip install tox         # tox 3.11.0 has requirement virtualenv>=14.0.0
   - pip install virtualenv  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
   # Install the tox venv
-  - echo "TOX INSTALL-"$(date)
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
 
 before_script:
@@ -70,7 +67,6 @@ before_script:
   - mongo --eval 'db.version();'    # Make sure mongo is awake
 
 script:
-  - echo "TOX RUN TEST-" $(date)
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
 
 # For now only submit coveralls for Python v2.7. Python v3.x currently shows

From f91b89f723749b0fca8a71136a5f412adfc04ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 13 Jun 2019 23:07:25 +0200
Subject: [PATCH 0848/1519] remove dist:xenial as it recently became the
 default in travis

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a21c934b2..38924a866 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,6 @@ matrix:
   - python: 3.6
     env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
   - python: 3.7
-    dist: xenial    # python 3.7 not available on default dist (trusty)
     env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
 
 

From 68e8584520cb57c9db649b38db64e9f92fb7e4da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 13 Jun 2019 23:29:02 +0200
Subject: [PATCH 0849/1519] add pypy3 back to travis and improve python 3.7
 integration

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 38924a866..cf66da6a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,9 @@ python:
 - 2.7
 - 3.5
 - 3.6
+- 3.7
 - pypy
+- pypy3
 
 env:
   global:
@@ -41,8 +43,6 @@ matrix:
     env: MONGODB=${MONGODB_3_4} PYMONGO=3.4.x
   - python: 3.6
     env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
-  - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
 
 
 install:

From 023acab779033af2bb5389da4596dcb225e87e52 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Thu, 13 Jun 2019 15:47:54 +0200
Subject: [PATCH 0850/1519] Clean up benchmark.py and move it to
 benchmarks/test_inserts.py

1. Removes the cascade=save tests. It's not an option I'd recommend using AND
   it primarily matters if you have any reference fields in your document,
   which is not the case in this script.
2. Uses PyMongo-v3.x-style write concern.
3. Removes an old docstring describing some random benchmark run from the past.
4. Removes unused parts of the code.

I'll add more tests to the "benchmarks/" directory in future commits.
---
 benchmark.py               | 207 -------------------------------------
 benchmarks/test_inserts.py | 154 +++++++++++++++++++++++++++
 2 files changed, 154 insertions(+), 207 deletions(-)
 delete mode 100644 benchmark.py
 create mode 100644 benchmarks/test_inserts.py

diff --git a/benchmark.py b/benchmark.py
deleted file mode 100644
index 8e93ee40c..000000000
--- a/benchmark.py
+++ /dev/null
@@ -1,207 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Simple benchmark comparing PyMongo and MongoEngine.
-
-Sample run on a mid 2015 MacBook Pro (commit b282511):
-
-Benchmarking...
-----------------------------------------------------------------------------------------------------
-Creating 10000 dictionaries - Pymongo
-2.58979988098
-----------------------------------------------------------------------------------------------------
-Creating 10000 dictionaries - Pymongo write_concern={"w": 0}
-1.26657605171
-----------------------------------------------------------------------------------------------------
-Creating 10000 dictionaries - MongoEngine
-8.4351580143
-----------------------------------------------------------------------------------------------------
-Creating 10000 dictionaries without continual assign - MongoEngine
-7.20191693306
-----------------------------------------------------------------------------------------------------
-Creating 10000 dictionaries - MongoEngine - write_concern={"w": 0}, cascade = True
-6.31104588509
-----------------------------------------------------------------------------------------------------
-Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False, cascade=True
-6.07083487511
-----------------------------------------------------------------------------------------------------
-Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False
-5.97704291344
-----------------------------------------------------------------------------------------------------
-Creating 10000 dictionaries - MongoEngine, force_insert=True, write_concern={"w": 0}, validate=False
-5.9111430645
-"""
-
-import timeit
-
-
-def main():
-    print("Benchmarking...")
-
-    setup = """
-from pymongo import MongoClient
-connection = MongoClient()
-connection.drop_database('timeit_test')
-"""
-
-    stmt = """
-from pymongo import MongoClient
-connection = MongoClient()
-
-db = connection.timeit_test
-noddy = db.noddy
-
-for i in range(10000):
-    example = {'fields': {}}
-    for j in range(20):
-        example['fields']['key' + str(j)] = 'value ' + str(j)
-
-    noddy.save(example)
-
-myNoddys = noddy.find()
-[n for n in myNoddys] # iterate
-"""
-
-    print("-" * 100)
-    print("""Creating 10000 dictionaries - Pymongo""")
-    t = timeit.Timer(stmt=stmt, setup=setup)
-    print(t.timeit(1))
-
-    stmt = """
-from pymongo import MongoClient
-from pymongo.write_concern import WriteConcern
-connection = MongoClient()
-
-db = connection.get_database('timeit_test', write_concern=WriteConcern(w=0))
-noddy = db.noddy
-
-for i in range(10000):
-    example = {'fields': {}}
-    for j in range(20):
-        example['fields']["key"+str(j)] = "value "+str(j)
-
-    noddy.save(example)
-
-myNoddys = noddy.find()
-[n for n in myNoddys] # iterate
-"""
-
-    print("-" * 100)
-    print("""Creating 10000 dictionaries - Pymongo write_concern={"w": 0}""")
-    t = timeit.Timer(stmt=stmt, setup=setup)
-    print(t.timeit(1))
-
-    setup = """
-from pymongo import MongoClient
-connection = MongoClient()
-connection.drop_database('timeit_test')
-connection.close()
-
-from mongoengine import Document, DictField, connect
-connect('timeit_test')
-
-class Noddy(Document):
-    fields = DictField()
-"""
-
-    stmt = """
-for i in range(10000):
-    noddy = Noddy()
-    for j in range(20):
-        noddy.fields["key"+str(j)] = "value "+str(j)
-    noddy.save()
-
-myNoddys = Noddy.objects()
-[n for n in myNoddys] # iterate
-"""
-
-    print("-" * 100)
-    print("""Creating 10000 dictionaries - MongoEngine""")
-    t = timeit.Timer(stmt=stmt, setup=setup)
-    print(t.timeit(1))
-
-    stmt = """
-for i in range(10000):
-    noddy = Noddy()
-    fields = {}
-    for j in range(20):
-        fields["key"+str(j)] = "value "+str(j)
-    noddy.fields = fields
-    noddy.save()
-
-myNoddys = Noddy.objects()
-[n for n in myNoddys] # iterate
-"""
-
-    print("-" * 100)
-    print("""Creating 10000 dictionaries without continual assign - MongoEngine""")
-    t = timeit.Timer(stmt=stmt, setup=setup)
-    print(t.timeit(1))
-
-    stmt = """
-for i in range(10000):
-    noddy = Noddy()
-    for j in range(20):
-        noddy.fields["key"+str(j)] = "value "+str(j)
-    noddy.save(write_concern={"w": 0}, cascade=True)
-
-myNoddys = Noddy.objects()
-[n for n in myNoddys] # iterate
-"""
-
-    print("-" * 100)
-    print("""Creating 10000 dictionaries - MongoEngine - write_concern={"w": 0}, cascade = True""")
-    t = timeit.Timer(stmt=stmt, setup=setup)
-    print(t.timeit(1))
-
-    stmt = """
-for i in range(10000):
-    noddy = Noddy()
-    for j in range(20):
-        noddy.fields["key"+str(j)] = "value "+str(j)
-    noddy.save(write_concern={"w": 0}, validate=False, cascade=True)
-
-myNoddys = Noddy.objects()
-[n for n in myNoddys] # iterate
-"""
-
-    print("-" * 100)
-    print("""Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False, cascade=True""")
-    t = timeit.Timer(stmt=stmt, setup=setup)
-    print(t.timeit(1))
-
-    stmt = """
-for i in range(10000):
-    noddy = Noddy()
-    for j in range(20):
-        noddy.fields["key"+str(j)] = "value "+str(j)
-    noddy.save(validate=False, write_concern={"w": 0})
-
-myNoddys = Noddy.objects()
-[n for n in myNoddys] # iterate
-"""
-
-    print("-" * 100)
-    print("""Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False""")
-    t = timeit.Timer(stmt=stmt, setup=setup)
-    print(t.timeit(1))
-
-    stmt = """
-for i in range(10000):
-    noddy = Noddy()
-    for j in range(20):
-        noddy.fields["key"+str(j)] = "value "+str(j)
-    noddy.save(force_insert=True, write_concern={"w": 0}, validate=False)
-
-myNoddys = Noddy.objects()
-[n for n in myNoddys] # iterate
-"""
-
-    print("-" * 100)
-    print("""Creating 10000 dictionaries - MongoEngine, force_insert=True, write_concern={"w": 0}, validate=False""")
-    t = timeit.Timer(stmt=stmt, setup=setup)
-    print(t.timeit(1))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/benchmarks/test_inserts.py b/benchmarks/test_inserts.py
new file mode 100644
index 000000000..29410ea5b
--- /dev/null
+++ b/benchmarks/test_inserts.py
@@ -0,0 +1,154 @@
+import timeit
+
+
+def main():
+    setup = """
+from pymongo import MongoClient
+connection = MongoClient()
+connection.drop_database('timeit_test')
+"""
+
+    stmt = """
+from pymongo import MongoClient
+connection = MongoClient()
+
+db = connection.timeit_test
+noddy = db.noddy
+
+for i in xrange(10000):
+    example = {'fields': {}}
+    for j in range(20):
+        example['fields']["key"+str(j)] = "value "+str(j)
+
+    noddy.insert_one(example)
+
+myNoddys = noddy.find()
+[n for n in myNoddys]  # iterate
+"""
+
+    print "-" * 100
+    print """Creating 10000 dictionaries - PyMongo"""
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print '{}s'.format(t.timeit(1))
+
+    stmt = """
+from pymongo import MongoClient, WriteConcern
+connection = MongoClient()
+
+db = connection.timeit_test
+noddy = db.noddy.with_options(write_concern=WriteConcern(w=0))
+
+for i in xrange(10000):
+    example = {'fields': {}}
+    for j in range(20):
+        example['fields']["key"+str(j)] = "value "+str(j)
+
+    noddy.insert_one(example)
+
+myNoddys = noddy.find()
+[n for n in myNoddys]  # iterate
+"""
+
+    print "-" * 100
+    print """Creating 10000 dictionaries - PyMongo write_concern={"w": 0}"""
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print '{}s'.format(t.timeit(1))
+
+    setup = """
+from pymongo import MongoClient
+connection = MongoClient()
+connection.drop_database('timeit_test')
+connection.close()
+
+from mongoengine import Document, DictField, connect
+connect("timeit_test")
+
+class Noddy(Document):
+    fields = DictField()
+"""
+
+    stmt = """
+for i in xrange(10000):
+    noddy = Noddy()
+    for j in range(20):
+        noddy.fields["key"+str(j)] = "value "+str(j)
+    noddy.save()
+
+myNoddys = Noddy.objects()
+[n for n in myNoddys]  # iterate
+"""
+
+    print "-" * 100
+    print "Creating 10000 dictionaries - MongoEngine"
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print '{}s'.format(t.timeit(1))
+
+    stmt = """
+for i in xrange(10000):
+    noddy = Noddy()
+    fields = {}
+    for j in range(20):
+        fields["key"+str(j)] = "value "+str(j)
+    noddy.fields = fields
+    noddy.save()
+
+myNoddys = Noddy.objects()
+[n for n in myNoddys]  # iterate
+"""
+
+    print "-" * 100
+    print "Creating 10000 dictionaries without continual assign - MongoEngine"
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print '{}s'.format(t.timeit(1))
+
+    stmt = """
+for i in xrange(10000):
+    noddy = Noddy()
+    for j in range(20):
+        noddy.fields["key"+str(j)] = "value "+str(j)
+    noddy.save(write_concern={"w": 0})
+
+myNoddys = Noddy.objects()
+[n for n in myNoddys] # iterate
+"""
+
+    print "-" * 100
+    print """Creating 10000 dictionaries - MongoEngine - write_concern={"w": 0}"""
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print '{}s'.format(t.timeit(1))
+
+    stmt = """
+for i in xrange(10000):
+    noddy = Noddy()
+    for j in range(20):
+        noddy.fields["key"+str(j)] = "value "+str(j)
+    noddy.save(write_concern={"w": 0}, validate=False)
+
+myNoddys = Noddy.objects()
+[n for n in myNoddys] # iterate
+"""
+
+    print "-" * 100
+    print """Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False"""
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print '{}s'.format(t.timeit(1))
+
+    stmt = """
+for i in xrange(10000):
+    noddy = Noddy()
+    for j in range(20):
+        noddy.fields["key"+str(j)] = "value "+str(j)
+    noddy.save(force_insert=True, write_concern={"w": 0}, validate=False)
+
+myNoddys = Noddy.objects()
+[n for n in myNoddys] # iterate
+"""
+
+    print "-" * 100
+    print """Creating 10000 dictionaries - MongoEngine, force_insert=True, write_concern={"w": 0}, validate=False"""
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print '{}s'.format(t.timeit(1))
+
+
+if __name__ == "__main__":
+    main()

From 008bb19b0b01cb9003429efd4646b50f05de7919 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Thu, 13 Jun 2019 17:46:45 +0200
Subject: [PATCH 0851/1519] Add a test covering basic Document operations

It covers operations such as:
1. Document initialization.
2. Accessing/setting attributes on a Document instance.
3. Serializing a Document instance (via `to_mongo`).
4. Deserializing a Document instance (via `_from_son`).
5. Serializing + saving a Document in the database (via `save`).
5. Loading a Document from the database + deserializing (via `Doc.objects[0]`).

And it does so for both basic flat documents and more complex nested docs.
---
 benchmarks/test_basic_doc_ops.py | 112 +++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 benchmarks/test_basic_doc_ops.py

diff --git a/benchmarks/test_basic_doc_ops.py b/benchmarks/test_basic_doc_ops.py
new file mode 100644
index 000000000..52dcab3ca
--- /dev/null
+++ b/benchmarks/test_basic_doc_ops.py
@@ -0,0 +1,112 @@
+import unittest
+from timeit import repeat
+
+import mongoengine
+from mongoengine import (BooleanField, Document, EmbeddedDocument,
+                         EmbeddedDocumentField, IntField, ListField,
+                         StringField)
+
+conn_settings = {
+    'db': 'mongoengine-benchmark-test',
+}
+
+mongoengine.connect(**conn_settings)
+
+
+def timeit(f, n=10000):
+    return min(repeat(f, repeat=3, number=n)) / float(n)
+
+
+def test_basic():
+    class Book(Document):
+        name = StringField()
+        pages = IntField()
+        tags = ListField(StringField())
+        is_published = BooleanField()
+
+    Book.drop_collection()
+
+    def init_book():
+        return Book(
+            name='Always be closing',
+            pages=100,
+            tags=['self-help', 'sales'],
+            is_published=True,
+        )
+
+    print 'Doc initialization: %.3fus' % (timeit(init_book, 1000) * 10**6)
+
+    b = init_book()
+    print 'Doc getattr: %.3fus' % (timeit(lambda: b.name, 10000) * 10**6)
+
+    print 'Doc setattr: %.3fus' % (
+        timeit(lambda: setattr(b, 'name', 'New name'), 10000) * 10**6
+    )
+
+    print 'Doc to mongo: %.3fus' % (timeit(b.to_mongo, 1000) * 10**6)
+
+    def save_book():
+        b._mark_as_changed('name')
+        b._mark_as_changed('tags')
+        b.save()
+
+    save_book()
+    son = b.to_mongo()
+
+    print 'Load from SON: %.3fus' % (
+        timeit(lambda: Book._from_son(son), 1000) * 10**6
+    )
+
+    print 'Save to database: %.3fus' % (timeit(save_book, 100) * 10**6)
+
+    print 'Load from database: %.3fus' % (
+        timeit(lambda: Book.objects[0], 100) * 10**6
+    )
+
+
+def test_embedded():
+    class Contact(EmbeddedDocument):
+        name = StringField()
+        title = StringField()
+        address = StringField()
+
+    class Company(Document):
+        name = StringField()
+        contacts = ListField(EmbeddedDocumentField(Contact))
+
+    Company.drop_collection()
+
+    def init_company():
+        return Company(
+            name='MongoDB, Inc.',
+            contacts=[
+                Contact(
+                    name='Contact %d' % x,
+                    title='CEO',
+                    address='Address %d' % x,
+                )
+                for x in range(1000)
+            ]
+        )
+
+    def create_company():
+        c = init_company()
+        c.save()
+        c.delete()
+
+    print 'Save/delete big object to database: %.3fms' % (
+        timeit(create_company, 10) * 10**3
+    )
+
+    c = init_company().save()
+    print 'Serialize big object: %.3fms' % (
+        timeit(c.to_mongo, 100) * 10**3
+    )
+    print 'Load big object from database: %.3fms' % (
+        timeit(lambda: Company.objects[0], 100) * 10**3
+    )
+
+
+if __name__ == '__main__':
+    test_basic()
+    test_embedded()

From 1fcd706e1134518349c28c1550820727b54901ec Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Fri, 14 Jun 2019 14:57:12 +0200
Subject: [PATCH 0852/1519] Clearer docstring of Document._get_collection [ci
 skip]

---
 mongoengine/document.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 341a41bae..35a7fde84 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -182,8 +182,13 @@ def _disconnect(cls):
 
     @classmethod
     def _get_collection(cls):
-        """Return the corresponding PyMongo collection of this document.
-        Upon the first call, it will ensure that indexes gets created. The returned collection then gets cached
+        """Return the PyMongo collection corresponding to this document.
+
+        Upon first call, this method:
+        1. Initializes a :class:`~pymongo.collection.Collection` corresponding
+           to this document.
+        2. Creates indexes defined in this document's :attr:`meta` dictionary.
+           This happens only if `auto_create_index` is True.
         """
         if not hasattr(cls, '_collection') or cls._collection is None:
             # Get the collection, either capped or regular.

From 6e8ea50c199f7821db56c1a1397c3b90cd96c8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 14 Jun 2019 21:04:02 +0200
Subject: [PATCH 0853/1519] "added another aggregation test"

This reverts commit 4c31193b82ca665fe27b1ddce3cbacbb2b7fcd32.
---
 tests/queryset/queryset.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 1f09ca592..55f256d9a 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -7,7 +7,6 @@
 
 from bson import DBRef, ObjectId
 import pymongo
-from pymongo.errors import ConfigurationError
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import UpdateResult
 import six
@@ -17,7 +16,7 @@
 from mongoengine.connection import get_connection, get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
-from mongoengine.mongodb_support import get_mongodb_version, MONGODB_36
+from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
 from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
                                   QuerySet, QuerySetManager, queryset_manager)
 
@@ -832,8 +831,6 @@ class B(Document):
 
     def test_bulk_insert(self):
         """Ensure that bulk insert works"""
-        MONGO_VER = self.mongodb_version
-
         class Comment(EmbeddedDocument):
             name = StringField()
 
@@ -847,10 +844,6 @@ class Blog(Document):
 
         Blog.drop_collection()
 
-        # get MongoDB version info
-        connection = get_connection()
-        info = connection.test.command('buildInfo')
-
         # Recreates the collection
         self.assertEqual(0, Blog.objects.count())
 
@@ -5386,6 +5379,13 @@ class Person(Document):
             {'_id': None, 'avg': 29, 'total': 2}
         ])
 
+        data = Person.objects().aggregate({'$match': {'name': 'Isabella Luanna'}})
+        self.assertEqual(list(data), [
+            {u'_id': p1.pk,
+             u'age': 16,
+             u'name': u'Isabella Luanna'}]
+                         )
+
     def test_queryset_aggregation_with_skip(self):
         class Person(Document):
             name = StringField()

From 97005aca6641034ce536cdff49aada7c6a7414d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 15 Jun 2019 12:24:13 +0200
Subject: [PATCH 0854/1519] set dist as xenial to avoid relying on flaky travis
 default dist

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 38924a866..7bbeef8b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,8 @@ python:
 - 3.6
 - pypy
 
+dist: xenial
+
 env:
   global:
     - MONGODB_3_4=3.4.17

From 6527b1386f46088910869f70005763e03f0a549b Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 17 Jun 2019 09:31:51 +0200
Subject: [PATCH 0855/1519] Benchmarks: Python 3 tweaks + more consistent
 testing of small vs big docs

---
 benchmarks/test_basic_doc_ops.py | 98 ++++++++++++++++++++++----------
 benchmarks/test_inserts.py       | 66 ++++++++++-----------
 2 files changed, 100 insertions(+), 64 deletions(-)

diff --git a/benchmarks/test_basic_doc_ops.py b/benchmarks/test_basic_doc_ops.py
index 52dcab3ca..06f0538bf 100644
--- a/benchmarks/test_basic_doc_ops.py
+++ b/benchmarks/test_basic_doc_ops.py
@@ -1,16 +1,11 @@
-import unittest
 from timeit import repeat
 
 import mongoengine
-from mongoengine import (BooleanField, Document, EmbeddedDocument,
+from mongoengine import (BooleanField, Document, EmailField, EmbeddedDocument,
                          EmbeddedDocumentField, IntField, ListField,
                          StringField)
 
-conn_settings = {
-    'db': 'mongoengine-benchmark-test',
-}
-
-mongoengine.connect(**conn_settings)
+mongoengine.connect(db='mongoengine_benchmark_test')
 
 
 def timeit(f, n=10000):
@@ -23,6 +18,7 @@ class Book(Document):
         pages = IntField()
         tags = ListField(StringField())
         is_published = BooleanField()
+        author_email = EmailField()
 
     Book.drop_collection()
 
@@ -32,39 +28,57 @@ def init_book():
             pages=100,
             tags=['self-help', 'sales'],
             is_published=True,
+            author_email='alec@example.com',
         )
 
-    print 'Doc initialization: %.3fus' % (timeit(init_book, 1000) * 10**6)
+    print('Doc initialization: %.3fus' % (timeit(init_book, 1000) * 10**6))
 
     b = init_book()
-    print 'Doc getattr: %.3fus' % (timeit(lambda: b.name, 10000) * 10**6)
+    print('Doc getattr: %.3fus' % (timeit(lambda: b.name, 10000) * 10**6))
 
-    print 'Doc setattr: %.3fus' % (
-        timeit(lambda: setattr(b, 'name', 'New name'), 10000) * 10**6
+    print(
+        'Doc setattr: %.3fus' % (
+            timeit(lambda: setattr(b, 'name', 'New name'), 10000) * 10**6
+        )
     )
 
-    print 'Doc to mongo: %.3fus' % (timeit(b.to_mongo, 1000) * 10**6)
+    print('Doc to mongo: %.3fus' % (timeit(b.to_mongo, 1000) * 10**6))
+
+    print('Doc validation: %.3fus' % (timeit(b.validate, 1000) * 10**6))
 
     def save_book():
         b._mark_as_changed('name')
         b._mark_as_changed('tags')
         b.save()
 
-    save_book()
+    print('Save to database: %.3fus' % (timeit(save_book, 100) * 10**6))
+
     son = b.to_mongo()
+    print(
+        'Load from SON: %.3fus' % (
+            timeit(lambda: Book._from_son(son), 1000) * 10**6
+        )
+    )
 
-    print 'Load from SON: %.3fus' % (
-        timeit(lambda: Book._from_son(son), 1000) * 10**6
+    print(
+        'Load from database: %.3fus' % (
+            timeit(lambda: Book.objects[0], 100) * 10**6
+        )
     )
 
-    print 'Save to database: %.3fus' % (timeit(save_book, 100) * 10**6)
+    def create_and_delete_book():
+        b = init_book()
+        b.save()
+        b.delete()
 
-    print 'Load from database: %.3fus' % (
-        timeit(lambda: Book.objects[0], 100) * 10**6
+    print(
+        'Init + save to database + delete: %.3fms' % (
+            timeit(create_and_delete_book, 10) * 10**3
+        )
     )
 
 
-def test_embedded():
+def test_big_doc():
     class Contact(EmbeddedDocument):
         name = StringField()
         title = StringField()
@@ -89,24 +103,46 @@ def init_company():
             ]
         )
 
-    def create_company():
-        c = init_company()
-        c.save()
-        c.delete()
+    company = init_company()
+    print('Big doc to mongo: %.3fms' % (timeit(company.to_mongo, 100) * 10**3))
 
-    print 'Save/delete big object to database: %.3fms' % (
-        timeit(create_company, 10) * 10**3
+    print('Big doc validation: %.3fms' % (timeit(company.validate, 1000) * 10**3))
+
+    company.save()
+
+    def save_company():
+        company._mark_as_changed('name')
+        company._mark_as_changed('contacts')
+        company.save()
+
+    print('Save to database: %.3fms' % (timeit(save_company, 100) * 10**3))
+
+    son = company.to_mongo()
+    print(
+        'Load from SON: %.3fms' % (
+            timeit(lambda: Company._from_son(son), 100) * 10**3
+        )
     )
 
-    c = init_company().save()
-    print 'Serialize big object: %.3fms' % (
-        timeit(c.to_mongo, 100) * 10**3
+    print(
+        'Load from database: %.3fms' % (
+            timeit(lambda: Company.objects[0], 100) * 10**3
+        )
     )
-    print 'Load big object from database: %.3fms' % (
-        timeit(lambda: Company.objects[0], 100) * 10**3
+
+    def create_and_delete_company():
+        c = init_company()
+        c.save()
+        c.delete()
+
+    print(
+        'Init + save to database + delete: %.3fms' % (
+            timeit(create_and_delete_company, 10) * 10**3
+        )
     )
 
 
 if __name__ == '__main__':
     test_basic()
-    test_embedded()
+    print('-' * 100)
+    test_big_doc()
diff --git a/benchmarks/test_inserts.py b/benchmarks/test_inserts.py
index 29410ea5b..8113d988d 100644
--- a/benchmarks/test_inserts.py
+++ b/benchmarks/test_inserts.py
@@ -5,17 +5,17 @@ def main():
     setup = """
 from pymongo import MongoClient
 connection = MongoClient()
-connection.drop_database('timeit_test')
+connection.drop_database('mongoengine_benchmark_test')
 """
 
     stmt = """
 from pymongo import MongoClient
 connection = MongoClient()
 
-db = connection.timeit_test
+db = connection.mongoengine_benchmark_test
 noddy = db.noddy
 
-for i in xrange(10000):
+for i in range(10000):
     example = {'fields': {}}
     for j in range(20):
         example['fields']["key"+str(j)] = "value "+str(j)
@@ -26,19 +26,19 @@ def main():
 [n for n in myNoddys]  # iterate
 """
 
-    print "-" * 100
-    print """Creating 10000 dictionaries - PyMongo"""
+    print('-' * 100)
+    print('PyMongo: Creating 10000 dictionaries.')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print '{}s'.format(t.timeit(1))
+    print('{}s'.format(t.timeit(1)))
 
     stmt = """
 from pymongo import MongoClient, WriteConcern
 connection = MongoClient()
 
-db = connection.timeit_test
+db = connection.mongoengine_benchmark_test
 noddy = db.noddy.with_options(write_concern=WriteConcern(w=0))
 
-for i in xrange(10000):
+for i in range(10000):
     example = {'fields': {}}
     for j in range(20):
         example['fields']["key"+str(j)] = "value "+str(j)
@@ -49,26 +49,26 @@ def main():
 [n for n in myNoddys]  # iterate
 """
 
-    print "-" * 100
-    print """Creating 10000 dictionaries - PyMongo write_concern={"w": 0}"""
+    print('-' * 100)
+    print('PyMongo: Creating 10000 dictionaries (write_concern={"w": 0}).')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print '{}s'.format(t.timeit(1))
+    print('{}s'.format(t.timeit(1)))
 
     setup = """
 from pymongo import MongoClient
 connection = MongoClient()
-connection.drop_database('timeit_test')
+connection.drop_database('mongoengine_benchmark_test')
 connection.close()
 
 from mongoengine import Document, DictField, connect
-connect("timeit_test")
+connect("mongoengine_benchmark_test")
 
 class Noddy(Document):
     fields = DictField()
 """
 
     stmt = """
-for i in xrange(10000):
+for i in range(10000):
     noddy = Noddy()
     for j in range(20):
         noddy.fields["key"+str(j)] = "value "+str(j)
@@ -78,13 +78,13 @@ class Noddy(Document):
 [n for n in myNoddys]  # iterate
 """
 
-    print "-" * 100
-    print "Creating 10000 dictionaries - MongoEngine"
+    print('-' * 100)
+    print('MongoEngine: Creating 10000 dictionaries.')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print '{}s'.format(t.timeit(1))
+    print('{}s'.format(t.timeit(1)))
 
     stmt = """
-for i in xrange(10000):
+for i in range(10000):
     noddy = Noddy()
     fields = {}
     for j in range(20):
@@ -96,13 +96,13 @@ class Noddy(Document):
 [n for n in myNoddys]  # iterate
 """
 
-    print "-" * 100
-    print "Creating 10000 dictionaries without continual assign - MongoEngine"
+    print('-' * 100)
+    print('MongoEngine: Creating 10000 dictionaries (using a single field assignment).')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print '{}s'.format(t.timeit(1))
+    print('{}s'.format(t.timeit(1)))
 
     stmt = """
-for i in xrange(10000):
+for i in range(10000):
     noddy = Noddy()
     for j in range(20):
         noddy.fields["key"+str(j)] = "value "+str(j)
@@ -112,13 +112,13 @@ class Noddy(Document):
 [n for n in myNoddys] # iterate
 """
 
-    print "-" * 100
-    print """Creating 10000 dictionaries - MongoEngine - write_concern={"w": 0}"""
+    print('-' * 100)
+    print('MongoEngine: Creating 10000 dictionaries (write_concern={"w": 0}).')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print '{}s'.format(t.timeit(1))
+    print('{}s'.format(t.timeit(1)))
 
     stmt = """
-for i in xrange(10000):
+for i in range(10000):
     noddy = Noddy()
     for j in range(20):
         noddy.fields["key"+str(j)] = "value "+str(j)
@@ -128,13 +128,13 @@ class Noddy(Document):
 [n for n in myNoddys] # iterate
 """
 
-    print "-" * 100
-    print """Creating 10000 dictionaries - MongoEngine, write_concern={"w": 0}, validate=False"""
+    print('-' * 100)
+    print('MongoEngine: Creating 10000 dictionaries (write_concern={"w": 0}, validate=False).')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print '{}s'.format(t.timeit(1))
+    print('{}s'.format(t.timeit(1)))
 
     stmt = """
-for i in xrange(10000):
+for i in range(10000):
     noddy = Noddy()
     for j in range(20):
         noddy.fields["key"+str(j)] = "value "+str(j)
@@ -144,10 +144,10 @@ class Noddy(Document):
 [n for n in myNoddys] # iterate
 """
 
-    print "-" * 100
-    print """Creating 10000 dictionaries - MongoEngine, force_insert=True, write_concern={"w": 0}, validate=False"""
+    print('-' * 100)
+    print('MongoEngine: Creating 10000 dictionaries (force_insert=True, write_concern={"w": 0}, validate=False).')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print '{}s'.format(t.timeit(1))
+    print('{}s'.format(t.timeit(1)))
 
 
 if __name__ == "__main__":

From 22f3c702340105e3b8fee562d0fc526dc6e8b658 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 17 Jun 2019 09:41:41 +0200
Subject: [PATCH 0856/1519] Fix PyMongo dependency in the readme [ci skip]

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index fe5f5f22d..679980f82 100644
--- a/README.rst
+++ b/README.rst
@@ -47,7 +47,7 @@ Dependencies
 All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_.
 At the very least, you'll need these two packages to use MongoEngine:
 
-- pymongo>=3.5
+- pymongo>=3.4
 - six>=1.10.0
 
 If you utilize a ``DateTimeField``, you might also use a more flexible date parser:

From 09c77973a0ce9d1d51c62fa5736e71fbbb9a9e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 17 Jun 2019 13:41:02 +0200
Subject: [PATCH 0857/1519] Clean up how _changed_fields are set in
 BaseDocument._from_son (#2090)

---
 mongoengine/base/document.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 789687ac3..e3283141f 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -25,6 +25,16 @@
 
 
 class BaseDocument(object):
+    # TODO simplify how `_changed_fields` is used.
+    # Currently, handling of `_changed_fields` seems unnecessarily convoluted:
+    # 1. `BaseDocument` defines `_changed_fields` in its `__slots__`, yet it's
+    #    not setting it to `[]` (or any other value) in `__init__`.
+    # 2. `EmbeddedDocument` sets `_changed_fields` to `[]` it its overloaded
+    #    `__init__`.
+    # 3. `Document` does NOT set `_changed_fields` upon initialization. The
+    #    field is primarily set via `_from_son` or `_clear_changed_fields`,
+    #    though there are also other methods that manipulate it.
+    # 4. The codebase is littered with `hasattr` calls for `_changed_fields`.
     __slots__ = ('_changed_fields', '_initialised', '_created', '_data',
                  '_dynamic_fields', '_auto_id_field', '_db_field_map',
                  '__weakref__')
@@ -665,9 +675,7 @@ def _get_collection_name(cls):
 
     @classmethod
     def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False):
-        """Create an instance of a Document (subclass) from a PyMongo
-        SON.
-        """
+        """Create an instance of a Document (subclass) from a PyMongo SON."""
         if not only_fields:
             only_fields = []
 
@@ -690,7 +698,6 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
         if class_name != cls._class_name:
             cls = get_document(class_name)
 
-        changed_fields = []
         errors_dict = {}
 
         fields = cls._fields
@@ -720,8 +727,13 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
         if cls.STRICT:
             data = {k: v for k, v in iteritems(data) if k in cls._fields}
 
-        obj = cls(__auto_convert=False, _created=created, __only_fields=only_fields, **data)
-        obj._changed_fields = changed_fields
+        obj = cls(
+            __auto_convert=False,
+            _created=created,
+            __only_fields=only_fields,
+            **data
+        )
+        obj._changed_fields = []
         if not _auto_dereference:
             obj._fields = fields
 

From d7ded366c77cc15acb0e54b14a270b780a5462ea Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 17 Jun 2019 14:34:13 +0200
Subject: [PATCH 0858/1519] Document params expected by BaseDocument.__init__
 [ci skip]

---
 mongoengine/base/document.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index e3283141f..cebcf3379 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -45,13 +45,20 @@ class BaseDocument(object):
 
     def __init__(self, *args, **values):
         """
-        Initialise a document or embedded document
-
-        :param __auto_convert: Try and will cast python objects to Object types
-        :param values: A dictionary of values for the document
+        Initialise a document or an embedded document.
+
+        :param values: A dictionary of keys and values for the document.
+            It may contain additional reserved keywords, e.g. "__auto_convert".
+        :param __auto_convert: If True, supplied values will be converted
+            to Python-type values via each field's `to_python` method.
+        :param __only_fields: A list of fields that have been loaded for this
+            document. Empty if all fields have been loaded.
+        :param _created: Indicates whether this is a brand new document or
+            whether it's already been persisted before. Defaults to true.
         """
         self._initialised = False
         self._created = True
+
         if args:
             # Combine positional arguments with named arguments.
             # We only want named arguments.
@@ -135,6 +142,7 @@ def __init__(self, *args, **values):
         # Flag initialised
         self._initialised = True
         self._created = _created
+
         signals.post_init.send(self.__class__, document=self)
 
     def __delattr__(self, *args, **kwargs):

From 09d7ae4f804096ab4d8f13fac5c6f1a862b9a12b Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 17 Jun 2019 14:52:26 +0200
Subject: [PATCH 0859/1519] More BaseDocument.__init__ documentation tweaks

---
 mongoengine/base/document.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index cebcf3379..057258f5e 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -47,14 +47,14 @@ def __init__(self, *args, **values):
         """
         Initialise a document or an embedded document.
 
-        :param values: A dictionary of keys and values for the document.
+        :param dict values: A dictionary of keys and values for the document.
             It may contain additional reserved keywords, e.g. "__auto_convert".
-        :param __auto_convert: If True, supplied values will be converted
+        :param bool __auto_convert: If True, supplied values will be converted
             to Python-type values via each field's `to_python` method.
-        :param __only_fields: A list of fields that have been loaded for this
-            document. Empty if all fields have been loaded.
-        :param _created: Indicates whether this is a brand new document or
-            whether it's already been persisted before. Defaults to true.
+        :param set __only_fields: A set of fields that have been loaded for
+            this document. Empty if all fields have been loaded.
+        :param bool _created: Indicates whether this is a brand new document
+            or whether it's already been persisted before. Defaults to true.
         """
         self._initialised = False
         self._created = True
@@ -75,7 +75,6 @@ def __init__(self, *args, **values):
 
         __auto_convert = values.pop('__auto_convert', True)
 
-        # 399: set default values only to fields loaded from DB
         __only_fields = set(values.pop('__only_fields', values))
 
         _created = values.pop('_created', True)
@@ -100,7 +99,9 @@ def __init__(self, *args, **values):
 
         self._dynamic_fields = SON()
 
-        # Assign default values to instance
+        # Assign default values to the instance.
+        # We set default values only for fields loaded from DB. See
+        # https://github.com/mongoengine/mongoengine/issues/399 for more info.
         for key, field in iteritems(self._fields):
             if self._db_field_map.get(key, key) in __only_fields:
                 continue

From 953866226272f094018d7f97aceb36b77ab2e9e0 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 17 Jun 2019 15:34:11 +0200
Subject: [PATCH 0860/1519] Slightly cleaner connection code

---
 mongoengine/connection.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 9d4f25fc3..feb6114c6 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -263,17 +263,17 @@ def _clean_settings(settings_dict):
     else:
         connection_class = MongoClient
 
-    # Re-use existing connection if one is suitable
+    # Re-use existing connection if one is suitable.
     existing_connection = _find_existing_connection(raw_conn_settings)
-
-    # If an existing connection was found, assign it to the new alias
     if existing_connection:
-        _connections[alias] = existing_connection
+        connection = existing_connection
     else:
-        _connections[alias] = _create_connection(alias=alias,
-                                                 connection_class=connection_class,
-                                                 **conn_settings)
-
+        connection = _create_connection(
+            alias=alias,
+            connection_class=connection_class,
+            **conn_settings
+        )
+    _connections[alias] = connection
     return _connections[alias]
 
 
@@ -359,8 +359,11 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
         new_conn_settings = _get_connection_settings(db, **kwargs)
 
         if new_conn_settings != prev_conn_setting:
-            raise MongoEngineConnectionError(
-                'A different connection with alias `%s` was already registered. Use disconnect() first' % alias)
+            err_msg = (
+                u'A different connection with alias `{}` was already '
+                u'registered. Use disconnect() first'
+            ).format(alias)
+            raise MongoEngineConnectionError(err_msg)
     else:
         register_connection(alias, db, **kwargs)
 

From b62ce947a6543c52be87f5eeb399053586a7d5dd Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 17 Jun 2019 15:42:15 +0200
Subject: [PATCH 0861/1519] Cleaner mongoengine.connection.__all__

---
 mongoengine/connection.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index feb6114c6..6a613a42a 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -2,9 +2,17 @@
 from pymongo.database import _check_name
 import six
 
-__all__ = ['MongoEngineConnectionError', 'connect', 'disconnect', 'disconnect_all',
-           'register_connection', 'DEFAULT_CONNECTION_NAME', 'DEFAULT_DATABASE_NAME',
-           'get_db', 'get_connection']
+__all__ = [
+    'DEFAULT_CONNECTION_NAME',
+    'DEFAULT_DATABASE_NAME',
+    'MongoEngineConnectionError',
+    'connect',
+    'disconnect',
+    'disconnect_all',
+    'get_connection',
+    'get_db',
+    'register_connection',
+]
 
 
 DEFAULT_CONNECTION_NAME = 'default'

From a4e4e8f4409400e63616183bc0dbd34270e4b96b Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 17 Jun 2019 17:28:41 +0200
Subject: [PATCH 0862/1519] Tweaks to the QuerySet.order_by docstring

---
 mongoengine/queryset/base.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index e17c9632e..49e154fb8 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1009,13 +1009,15 @@ def all_fields(self):
         return queryset
 
     def order_by(self, *keys):
-        """Order the :class:`~mongoengine.queryset.QuerySet` by the keys. The
-        order may be specified by prepending each of the keys by a + or a -.
-        Ascending order is assumed. If no keys are passed, existing ordering
-        is cleared instead.
+        """Order the :class:`~mongoengine.queryset.QuerySet` by the given keys.
+
+        The order may be specified by prepending each of the keys by a "+" or
+        a "-". Ascending order is assumed if there's no prefix.
+
+        If no keys are passed, existing ordering is cleared instead.
 
         :param keys: fields to order the query results by; keys may be
-            prefixed with **+** or **-** to determine the ordering direction
+            prefixed with "+" or a "-" to determine the ordering direction.
         """
         queryset = self.clone()
 

From 5a2e268160e67c78b05c5230c524e5b8cadab14f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 17 Jun 2019 22:05:54 +0200
Subject: [PATCH 0863/1519] Add test case to prevent regression

---
 tests/document/instance.py | 75 +++++++++++++++++++++++++++++---------
 1 file changed, 58 insertions(+), 17 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 3a2f7fcd5..d1fa7ecb6 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1,33 +1,30 @@
 # -*- coding: utf-8 -*-
-import bson
 import os
 import pickle
 import unittest
 import uuid
-import warnings
 import weakref
 from datetime import datetime
 
+import bson
 from bson import DBRef, ObjectId
 from pymongo.errors import DuplicateKeyError
 from six import iteritems
 
-from mongoengine.mongodb_support import get_mongodb_version, MONGODB_36, MONGODB_34
-from mongoengine.pymongo_support import list_collection_names
-from tests import fixtures
-from tests.fixtures import (PickleEmbedded, PickleTest, PickleSignalsTest,
-                            PickleDynamicEmbedded, PickleDynamicTest)
-from tests.utils import MongoDBTestCase, get_as_pymongo
-
 from mongoengine import *
-from mongoengine.base import get_document, _document_registry
+from mongoengine import signals
+from mongoengine.base import _document_registry, get_document
 from mongoengine.connection import get_db
-from mongoengine.errors import (NotRegistered, InvalidDocumentError,
-                                InvalidQueryError, NotUniqueError,
-                                FieldDoesNotExist, SaveConditionError)
+from mongoengine.context_managers import query_counter, switch_db
+from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError, \
+                                InvalidQueryError, NotRegistered, NotUniqueError, SaveConditionError)
+from mongoengine.mongodb_support import MONGODB_34, MONGODB_36, get_mongodb_version
+from mongoengine.pymongo_support import list_collection_names
 from mongoengine.queryset import NULLIFY, Q
-from mongoengine.context_managers import switch_db, query_counter
-from mongoengine import signals
+from tests import fixtures
+from tests.fixtures import (PickleDynamicEmbedded, PickleDynamicTest, \
+                            PickleEmbedded, PickleSignalsTest, PickleTest)
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__),
                                '../fields/mongoengine.png')
@@ -1260,6 +1257,50 @@ def UUID(i):
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)
 
+    def test_save_update_selectively(self):
+        class WildBoy(Document):
+            age = IntField()
+            name = StringField()
+
+        WildBoy.drop_collection()
+
+        WildBoy(age=12, name='John').save()
+
+        boy1 = WildBoy.objects().first()
+        boy2 = WildBoy.objects().first()
+
+        boy1.age = 99
+        boy1.save()
+        boy2.name = 'Bob'
+        boy2.save()
+
+        fresh_boy = WildBoy.objects().first()
+        self.assertEqual(fresh_boy.age, 99)
+        self.assertEqual(fresh_boy.name, 'Bob')
+
+    def test_save_update_selectively_with_custom_pk(self):
+        # Prevents regression of #2082
+        class WildBoy(Document):
+            pk_id = StringField(primary_key=True)
+            age = IntField()
+            name = StringField()
+
+        WildBoy.drop_collection()
+
+        WildBoy(pk_id='A', age=12, name='John').save()
+
+        boy1 = WildBoy.objects().first()
+        boy2 = WildBoy.objects().first()
+
+        boy1.age = 99
+        boy1.save()
+        boy2.name = 'Bob'
+        boy2.save()
+
+        fresh_boy = WildBoy.objects().first()
+        self.assertEqual(fresh_boy.age, 99)
+        self.assertEqual(fresh_boy.name, 'Bob')
+
     def test_update(self):
         """Ensure that an existing document is updated instead of be
         overwritten.
@@ -1552,9 +1593,9 @@ class ParentModel(Document):
                 EmbeddedChildModel)
 
         emb = EmbeddedChildModel(id={'1': [1]})
-        ParentModel(children=emb)._get_changed_fields()
+        ParentModel(child=emb)._get_changed_fields()
 
-    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop(self):
+    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_full_caseEmailUser(self):
         class User(Document):
             id = IntField(primary_key=True)
             name = StringField()

From 63c913518443ae82a32ea6d89b1297bcbb662084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 17 Jun 2019 22:36:54 +0200
Subject: [PATCH 0864/1519] Bump version number and update changelog for 0.18.1

---
 docs/changelog.rst      | 7 ++++++-
 mongoengine/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index cdbb430e1..3281b7b71 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,9 +5,14 @@ Changelog
 
 Development
 ===========
-- Add Python 3.7 in travis #2058
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.18.1
+=================
+- Fix a bug introduced in 0.18.0 which was causing `.save()` to update all the fields
+    instead of updating only the modified fields. This gug only occurs when using custom pk #2082
+- Add Python 3.7 in travis #2058
+
 Changes in 0.18.0
 =================
 - Drop support for EOL'd MongoDB v2.6, v3.0, and v3.2.
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 4ddc2bf9e..d6a50766b 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 18, 0)
+VERSION = (0, 18, 1)
 
 
 def get_version():

From bb0b1e88ef86954b90fad7f9e891b16fe6643477 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Tue, 18 Jun 2019 15:43:46 +0200
Subject: [PATCH 0865/1519] Split up custom PK field tests (#2095)

This more closely aligns with the rule that a single tests should test one
thing and one thing only. Previous code tested like 4 different things in a
single test and was hard to follow.
---
 tests/document/instance.py | 55 +++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index d1fa7ecb6..936ea2624 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -333,41 +333,36 @@ class User(Document):
         self.assertEqual(User._fields['username'].db_field, '_id')
         self.assertEqual(User._meta['id_field'], 'username')
 
-        # test no primary key field
-        self.assertRaises(ValidationError, User(name='test').save)
+        User.objects.create(username='test', name='test user')
+        user = User.objects.first()
+        self.assertEqual(user.id, 'test')
+        self.assertEqual(user.pk, 'test')
+        user_dict = User.objects._collection.find_one()
+        self.assertEqual(user_dict['_id'], 'test')
 
-        # define a subclass with a different primary key field than the
-        # parent
-        with self.assertRaises(ValueError):
+    def test_change_custom_id_field_in_subclass(self):
+        """Subclasses cannot override which field is the primary key."""
+        class User(Document):
+            username = StringField(primary_key=True)
+            name = StringField()
+            meta = {'allow_inheritance': True}
+
+        with self.assertRaises(ValueError) as e:
             class EmailUser(User):
                 email = StringField(primary_key=True)
+        exc = e.exception
+        self.assertEqual(str(exc), 'Cannot override primary key field')
 
-        class EmailUser(User):
-            email = StringField()
-
-        user = User(username='test', name='test user')
-        user.save()
-
-        user_obj = User.objects.first()
-        self.assertEqual(user_obj.id, 'test')
-        self.assertEqual(user_obj.pk, 'test')
-
-        user_son = User.objects._collection.find_one()
-        self.assertEqual(user_son['_id'], 'test')
-        self.assertNotIn('username', user_son['_id'])
-
-        User.drop_collection()
-
-        user = User(pk='mongo', name='mongo user')
-        user.save()
-
-        user_obj = User.objects.first()
-        self.assertEqual(user_obj.id, 'mongo')
-        self.assertEqual(user_obj.pk, 'mongo')
+    def test_custom_id_field_is_required(self):
+        """Ensure the custom primary key field is required."""
+        class User(Document):
+            username = StringField(primary_key=True)
+            name = StringField()
 
-        user_son = User.objects._collection.find_one()
-        self.assertEqual(user_son['_id'], 'mongo')
-        self.assertNotIn('username', user_son['_id'])
+        with self.assertRaises(ValidationError) as e:
+            User(name='test').save()
+        exc = e.exception
+        self.assertTrue("Field is required: ['username']" in str(exc))
 
     def test_document_not_registered(self):
         class Place(Document):

From 6a4c342e45fbd556dc1938923b7bed17031c79c7 Mon Sep 17 00:00:00 2001
From: Dmitry Voronenkov <divomen@gmail.com>
Date: Tue, 18 Jun 2019 16:13:29 +0300
Subject: [PATCH 0866/1519] Supported updates of an array by negative index

---
 mongoengine/base/datastructures.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index fafc08b73..9307556f0 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -108,6 +108,9 @@ def __init__(self, list_items, instance, name):
         super(BaseList, self).__init__(list_items)
 
     def __getitem__(self, key):
+        # change index to positive value because MongoDB does not support negative one
+        if isinstance(key, int) and key < 0:
+            key = len(self) + key
         value = super(BaseList, self).__getitem__(key)
 
         if isinstance(key, slice):

From 2abcf4764d610862819f4fccee3ff9565b782800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 18 Jun 2019 22:15:53 +0200
Subject: [PATCH 0867/1519] minor fixes based on review of #2082

---
 tests/document/instance.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 936ea2624..02617b679 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1578,7 +1578,7 @@ class User(self.Person):
         self.assertEqual(person.age, 21)
         self.assertEqual(person.active, False)
 
-    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop(self):
+    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_embedded_doc(self):
         # Refers to Issue #1685
         class EmbeddedChildModel(EmbeddedDocument):
             id = DictField(primary_key=True)
@@ -1588,9 +1588,11 @@ class ParentModel(Document):
                 EmbeddedChildModel)
 
         emb = EmbeddedChildModel(id={'1': [1]})
-        ParentModel(child=emb)._get_changed_fields()
+        changed_fields = ParentModel(child=emb)._get_changed_fields()
+        self.assertEqual(changed_fields, [])
 
-    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_full_caseEmailUser(self):
+    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_different_doc(self):
+        # Refers to Issue #1685
         class User(Document):
             id = IntField(primary_key=True)
             name = StringField()

From ca230d28b4f77825474d50e7421f4c5ca8dcb5b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 18 Jun 2019 22:18:10 +0200
Subject: [PATCH 0868/1519] fix typo in changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3281b7b71..e82cc1246 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,7 +10,7 @@ Development
 Changes in 0.18.1
 =================
 - Fix a bug introduced in 0.18.0 which was causing `.save()` to update all the fields
-    instead of updating only the modified fields. This gug only occurs when using custom pk #2082
+    instead of updating only the modified fields. This bug only occurs when using custom pk #2082
 - Add Python 3.7 in travis #2058
 
 Changes in 0.18.0

From 8f57279dc786da910590207bd988717e712d764a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 19 Jun 2019 23:04:23 +0200
Subject: [PATCH 0869/1519] remove pymongo deprecated methods: find_and_modify
 & remove

---
 mongoengine/fields.py        | 20 ++++++++++++--------
 mongoengine/queryset/base.py |  7 ++++---
 tests/queryset/queryset.py   |  4 ++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index aa5aa8052..2a4a2ad8d 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -10,6 +10,7 @@
 from bson import Binary, DBRef, ObjectId, SON
 import gridfs
 import pymongo
+from pymongo import ReturnDocument
 import six
 from six import iteritems
 
@@ -1964,10 +1965,12 @@ def generate(self):
         sequence_name = self.get_sequence_name()
         sequence_id = '%s.%s' % (sequence_name, self.name)
         collection = get_db(alias=self.db_alias)[self.collection_name]
-        counter = collection.find_and_modify(query={'_id': sequence_id},
-                                             update={'$inc': {'next': 1}},
-                                             new=True,
-                                             upsert=True)
+
+        counter = collection.find_one_and_update(
+            filter={'_id': sequence_id},
+            update={'$inc': {'next': 1}},
+            return_document=ReturnDocument.AFTER,
+            upsert=True)
         return self.value_decorator(counter['next'])
 
     def set_next_value(self, value):
@@ -1975,10 +1978,11 @@ def set_next_value(self, value):
         sequence_name = self.get_sequence_name()
         sequence_id = "%s.%s" % (sequence_name, self.name)
         collection = get_db(alias=self.db_alias)[self.collection_name]
-        counter = collection.find_and_modify(query={"_id": sequence_id},
-                                             update={"$set": {"next": value}},
-                                             new=True,
-                                             upsert=True)
+        counter = collection.find_one_and_update(
+            filter={"_id": sequence_id},
+            update={"$set": {"next": value}},
+            return_document=ReturnDocument.AFTER,
+            upsert=True)
         return self.value_decorator(counter['next'])
 
     def get_next_value(self):
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 49e154fb8..7acd9e58b 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -480,9 +480,10 @@ def delete(self, write_concern=None, _from_doc_delete=False,
                     write_concern=write_concern,
                     **{'pull_all__%s' % field_name: self})
 
-        result = queryset._collection.remove(queryset._query, **write_concern)
-        if result:
-            return result.get('n')
+        with set_write_concern(queryset._collection, write_concern) as collection:
+            result = collection.delete_many(queryset._query)
+            if result.acknowledged:
+                return result.deleted_count
 
     def update(self, upsert=False, multi=True, write_concern=None,
                full_result=False, **update):
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 55f256d9a..c58176b88 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1857,8 +1857,8 @@ class BlogPost(Document):
         self.Person.objects()[:1].delete()
         self.assertEqual(1, BlogPost.objects.count())
 
-    def test_limit_with_write_concern_0(self):
-
+    def test_delete_edge_case_with_write_concern_0_return_None(self):
+        """Return None when write is unacknowledged"""
         p1 = self.Person(name="User Z", age=20).save()
         del_result = p1.delete(w=0)
         self.assertEqual(None, del_result)

From ae0384df29bae05c9c86414a4edb45a533dd02d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Thu, 20 Jun 2019 11:25:51 +0200
Subject: [PATCH 0870/1519] Improve Document.meta.shard_key docs (#2099)

This closes #2096. Previous documentation of the shard_key meta attribute was
missing the crucial point that it really only matters if your collection is
sharded over a compound index.
---
 docs/guide/defining-documents.rst | 18 ++++++++++++------
 mongoengine/document.py           | 10 ++++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index ae9d3b36f..9dcca88c4 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -714,11 +714,16 @@ subsequent calls to :meth:`~mongoengine.queryset.QuerySet.order_by`. ::
 Shard keys
 ==========
 
-If your collection is sharded, then you need to specify the shard key as a tuple,
-using the :attr:`shard_key` attribute of :attr:`~mongoengine.Document.meta`.
-This ensures that the shard key is sent with the query when calling the
-:meth:`~mongoengine.document.Document.save` or
-:meth:`~mongoengine.document.Document.update` method on an existing
+If your collection is sharded by multiple keys, then you can improve shard
+routing (and thus the performance of your application) by specifying the shard
+key, using the :attr:`shard_key` attribute of
+:attr:`~mongoengine.Document.meta`. The shard key should be defined as a tuple.
+
+This ensures that the full shard key is sent with the query when calling
+methods such as :meth:`~mongoengine.document.Document.save`,
+:meth:`~mongoengine.document.Document.update`,
+:meth:`~mongoengine.document.Document.modify`, or
+:meth:`~mongoengine.document.Document.delete` on an existing
 :class:`~mongoengine.Document` instance::
 
     class LogEntry(Document):
@@ -728,7 +733,8 @@ This ensures that the shard key is sent with the query when calling the
         data = StringField()
 
         meta = {
-            'shard_key': ('machine', 'timestamp',)
+            'shard_key': ('machine', 'timestamp'),
+            'indexes': ('machine', 'timestamp'),
         }
 
 .. _document-inheritance:
diff --git a/mongoengine/document.py b/mongoengine/document.py
index cc35c440d..520de5bf5 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -544,7 +544,7 @@ def cascade_save(self, **kwargs):
 
     @property
     def _qs(self):
-        """Return the queryset to use for updating / reloading / deletions."""
+        """Return the default queryset corresponding to this document."""
         if not hasattr(self, '__objects'):
             self.__objects = QuerySet(self, self._get_collection())
         return self.__objects
@@ -552,9 +552,11 @@ def _qs(self):
     @property
     def _object_key(self):
         """Get the query dict that can be used to fetch this object from
-        the database. Most of the time it's a simple PK lookup, but in
-        case of a sharded collection with a compound shard key, it can
-        contain a more complex query.
+        the database.
+
+        Most of the time the dict is a simple PK lookup, but in case of
+        a sharded collection with a compound shard key, it can contain a more
+        complex query.
         """
         select_dict = {'pk': self.pk}
         shard_key = self.__class__._meta.get('shard_key', tuple())

From 799775b3a76611cef40d4aecbf3f4bf2f298c9c9 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Thu, 20 Jun 2019 12:18:58 +0200
Subject: [PATCH 0871/1519] Slightly cleaner docstring of
 BaseQuerySet.no_sub_classes [ci skip]

---
 mongoengine/queryset/base.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 49e154fb8..d853cf062 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -73,6 +73,7 @@ def __init__(self, document, collection):
                 self._initial_query = {
                     '_cls': {'$in': self._document._subclasses}}
             self._loaded_fields = QueryFieldList(always_include=['_cls'])
+
         self._cursor_obj = None
         self._limit = None
         self._skip = None
@@ -707,8 +708,9 @@ def none(self):
         return queryset
 
     def no_sub_classes(self):
-        """
-        Only return instances of this document and not any inherited documents
+        """Filter for only the instances of this specific document.
+
+        Do NOT return any inherited documents.
         """
         if self._document._meta.get('allow_inheritance') is True:
             self._initial_query = {'_cls': self._document._class_name}

From 216217e2c68c3b629e84f4af590af399d569f102 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Fri, 21 Jun 2019 13:48:24 +0200
Subject: [PATCH 0872/1519] Datastructures comments: fix typos and tweak
 formatting [ci skip]

---
 mongoengine/base/datastructures.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index fafc08b73..cce718468 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -11,18 +11,20 @@
 
 
 def mark_as_changed_wrapper(parent_method):
-    """Decorators that ensures _mark_as_changed method gets called"""
+    """Decorator that ensures _mark_as_changed method gets called."""
     def wrapper(self, *args, **kwargs):
-        result = parent_method(self, *args, **kwargs)   # Can't use super() in the decorator
+        # Can't use super() in the decorator.
+        result = parent_method(self, *args, **kwargs)
         self._mark_as_changed()
         return result
     return wrapper
 
 
 def mark_key_as_changed_wrapper(parent_method):
-    """Decorators that ensures _mark_as_changed method gets called with the key argument"""
+    """Decorator that ensures _mark_as_changed method gets called with the key argument"""
     def wrapper(self, key, *args, **kwargs):
-        result = parent_method(self, key, *args, **kwargs)   # Can't use super() in the decorator
+        # Can't use super() in the decorator.
+        result = parent_method(self, key, *args, **kwargs)
         self._mark_as_changed(key)
         return result
     return wrapper

From a4fe091a513a9fdc91ce2e45670b543643380b96 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Fri, 21 Jun 2019 13:51:53 +0200
Subject: [PATCH 0873/1519] Cleaner code & comments in BaseField.__set__

---
 mongoengine/base/fields.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index fe96f15b0..9ce426c96 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -128,10 +128,9 @@ def __get__(self, instance, owner):
         return instance._data.get(self.name)
 
     def __set__(self, instance, value):
-        """Descriptor for assigning a value to a field in a document.
-        """
-        # If setting to None and there is a default
-        # Then set the value to the default value
+        """Descriptor for assigning a value to a field in a document."""
+        # If setting to None and there is a default value provided for this
+        # field, then set the value to the default value.
         if value is None:
             if self.null:
                 value = None
@@ -142,12 +141,16 @@ def __set__(self, instance, value):
 
         if instance._initialised:
             try:
-                if (self.name not in instance._data or
-                        instance._data[self.name] != value):
+                value_has_changed = (
+                    self.name not in instance._data or
+                    instance._data[self.name] != value
+                )
+                if value_has_changed:
                     instance._mark_as_changed(self.name)
             except Exception:
-                # Values cant be compared eg: naive and tz datetimes
-                # So mark it as changed
+                # Some values can't be compared and throw an error when we
+                # attempt to do so (e.g. tz-naive and tz-aware datetimes).
+                # Mark the field as changed in such cases.
                 instance._mark_as_changed(self.name)
 
         EmbeddedDocument = _import_class('EmbeddedDocument')
@@ -157,6 +160,7 @@ def __set__(self, instance, value):
             for v in value:
                 if isinstance(v, EmbeddedDocument):
                     v._instance = weakref.proxy(instance)
+
         instance._data[self.name] = value
 
     def error(self, message='', errors=None, field_name=None):

From f45552f8f8ea2d4094c78cb60caee3c62f9d6c1e Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 24 Jun 2019 15:44:35 +0200
Subject: [PATCH 0874/1519] Drop support for positional arguments when
 instantiating a document

For example, if you had the following class:
```
class Person(Document):
    name = StringField()
    age = IntField()
```

You could instantiate an object of such class by doing one of the following:
1. `new_person = Person('Tom', 30)`
2. `new_person = Person('Tom', age=30)`
3. `new_person = Person(name='Tom', age=30)`

From now on, only option (3) is allowed.

Supporting positional arguments may sound like a reasonable idea in this
heavily simplified example, but in real life it's almost never what you want
(especially if you use inheritance in your document definitions) and it may
lead to ugly bugs. We should not rely on the *order* of fields to match a given
value to a given name.

This also helps us simplify the code e.g. by dropping the confusing (and
undocumented) `BaseDocument._auto_id_field` attribute.
---
 docs/changelog.rst                        |  2 +
 mongoengine/base/document.py              | 16 ++----
 mongoengine/base/metaclasses.py           | 57 +++++++++++++------
 tests/document/instance.py                | 68 +++++++++++------------
 tests/fields/test_lazy_reference_field.py |  8 +--
 5 files changed, 82 insertions(+), 69 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e82cc1246..6a56325e4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,8 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- BREAKING CHANGE: Drop support for positional arguments when instantiating a document. #?
+  - From now on keyword arguments (e.g. `Doc(field_name=value)`) are required.
 
 Changes in 0.18.1
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 057258f5e..047d50a46 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -60,18 +60,10 @@ def __init__(self, *args, **values):
         self._created = True
 
         if args:
-            # Combine positional arguments with named arguments.
-            # We only want named arguments.
-            field = iter(self._fields_ordered)
-            # If its an automatic id field then skip to the first defined field
-            if getattr(self, '_auto_id_field', False):
-                next(field)
-            for value in args:
-                name = next(field)
-                if name in values:
-                    raise TypeError(
-                        'Multiple values for keyword argument "%s"' % name)
-                values[name] = value
+            raise TypeError(
+                'Instantiating a document with positional arguments is not '
+                'supported. Please use `field_name=value` keyword arguments.'
+            )
 
         __auto_convert = values.pop('__auto_convert', True)
 
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 6f507eaab..c5363b09a 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -385,30 +385,35 @@ def __new__(mcs, name, bases, attrs):
                     new_class._meta['id_field'] = field_name
                     new_class.id = field
 
-        # Set primary key if not defined by the document
-        new_class._auto_id_field = getattr(parent_doc_cls,
-                                           '_auto_id_field', False)
+        # If the document doesn't explicitly define a primary key field, create
+        # one. Make it an ObjectIdField and give it a non-clashing name ("id"
+        # by default, but can be different if that one's taken).
         if not new_class._meta.get('id_field'):
-            # After 0.10, find not existing names, instead of overwriting
             id_name, id_db_name = mcs.get_auto_id_names(new_class)
-            new_class._auto_id_field = True
             new_class._meta['id_field'] = id_name
             new_class._fields[id_name] = ObjectIdField(db_field=id_db_name)
             new_class._fields[id_name].name = id_name
             new_class.id = new_class._fields[id_name]
             new_class._db_field_map[id_name] = id_db_name
             new_class._reverse_db_field_map[id_db_name] = id_name
-            # Prepend id field to _fields_ordered
+
+            # Prepend the ID field to _fields_ordered (so that it's *always*
+            # the first field).
             new_class._fields_ordered = (id_name, ) + new_class._fields_ordered
 
-        # Merge in exceptions with parent hierarchy
+        # Merge in exceptions with parent hierarchy.
         exceptions_to_merge = (DoesNotExist, MultipleObjectsReturned)
         module = attrs.get('__module__')
         for exc in exceptions_to_merge:
             name = exc.__name__
-            parents = tuple(getattr(base, name) for base in flattened_bases
-                            if hasattr(base, name)) or (exc,)
-            # Create new exception and set to new_class
+            parents = tuple(
+                getattr(base, name)
+                for base in flattened_bases
+                if hasattr(base, name)
+            ) or (exc,)
+
+            # Create a new exception and set it as an attribute on the new
+            # class.
             exception = type(name, parents, {'__module__': module})
             setattr(new_class, name, exception)
 
@@ -416,17 +421,35 @@ def __new__(mcs, name, bases, attrs):
 
     @classmethod
     def get_auto_id_names(mcs, new_class):
+        """Find a name for the automatic ID field for the given new class.
+
+        Return a two-element tuple where the first item is the field name (i.e.
+        the attribute name on the object) and the second element is the DB
+        field name (i.e. the name of the key stored in MongoDB).
+
+        Defaults to ('id', '_id'), or generates a non-clashing name in the form
+        of ('auto_id_X', '_auto_id_X') if the default name is already taken.
+        """
         id_name, id_db_name = ('id', '_id')
-        if id_name not in new_class._fields and \
-                id_db_name not in (v.db_field for v in new_class._fields.values()):
+        existing_fields = new_class._fields
+        existing_db_fields = (v.db_field for v in new_class._fields.values())
+        if (
+            id_name not in existing_fields and
+            id_db_name not in existing_db_fields
+        ):
             return id_name, id_db_name
-        id_basename, id_db_basename, i = 'auto_id', '_auto_id', 0
-        while id_name in new_class._fields or \
-                id_db_name in (v.db_field for v in new_class._fields.values()):
+
+        id_basename, id_db_basename, i = ('auto_id', '_auto_id', 0)
+        while True:
             id_name = '{0}_{1}'.format(id_basename, i)
             id_db_name = '{0}_{1}'.format(id_db_basename, i)
-            i += 1
-        return id_name, id_db_name
+            if (
+                id_name not in existing_fields and
+                id_db_name not in existing_db_fields
+            ):
+                return id_name, id_db_name
+            else:
+                i += 1
 
 
 class MetaDict(dict):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 02617b679..4be8aa45c 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -3130,48 +3130,44 @@ def __eq__(self, other):
         self.assertEqual(classic_doc._data, dict_doc._data)
 
     def test_positional_creation(self):
-        """Ensure that document may be created using positional arguments."""
-        person = self.Person("Test User", 42)
-        self.assertEqual(person.name, "Test User")
-        self.assertEqual(person.age, 42)
+        """Document cannot be instantiated using positional arguments."""
+        with self.assertRaises(TypeError) as e:
+            person = self.Person("Test User", 42)
+        expected_msg = (
+            'Instantiating a document with positional arguments is not '
+            'supported. Please use `field_name=value` keyword arguments.'
+        )
+        self.assertEqual(e.exception.message, expected_msg)
 
     def test_mixed_creation(self):
-        """Ensure that document may be created using mixed arguments."""
-        person = self.Person("Test User", age=42)
-        self.assertEqual(person.name, "Test User")
-        self.assertEqual(person.age, 42)
+        """Document cannot be instantiated using mixed arguments."""
+        with self.assertRaises(TypeError) as e:
+            person = self.Person("Test User", age=42)
+        expected_msg = (
+            'Instantiating a document with positional arguments is not '
+            'supported. Please use `field_name=value` keyword arguments.'
+        )
+        self.assertEqual(e.exception.message, expected_msg)
 
     def test_positional_creation_embedded(self):
-        """Ensure that embedded document may be created using positional
-        arguments.
-        """
-        job = self.Job("Test Job", 4)
-        self.assertEqual(job.name, "Test Job")
-        self.assertEqual(job.years, 4)
+        """Embedded document cannot be created using positional arguments."""
+        with self.assertRaises(TypeError) as e:
+            job = self.Job("Test Job", 4)
+        expected_msg = (
+            'Instantiating a document with positional arguments is not '
+            'supported. Please use `field_name=value` keyword arguments.'
+        )
+        self.assertEqual(e.exception.message, expected_msg)
 
     def test_mixed_creation_embedded(self):
-        """Ensure that embedded document may be created using mixed
-        arguments.
-        """
-        job = self.Job("Test Job", years=4)
-        self.assertEqual(job.name, "Test Job")
-        self.assertEqual(job.years, 4)
-
-    def test_mixed_creation_dynamic(self):
-        """Ensure that document may be created using mixed arguments."""
-        class Person(DynamicDocument):
-            name = StringField()
-
-        person = Person("Test User", age=42)
-        self.assertEqual(person.name, "Test User")
-        self.assertEqual(person.age, 42)
-
-    def test_bad_mixed_creation(self):
-        """Ensure that document gives correct error when duplicating
-        arguments.
-        """
-        with self.assertRaises(TypeError):
-            return self.Person("Test User", 42, name="Bad User")
+        """Embedded document cannot be created using mixed arguments."""
+        with self.assertRaises(TypeError) as e:
+            job = self.Job("Test Job", years=4)
+        expected_msg = (
+            'Instantiating a document with positional arguments is not '
+            'supported. Please use `field_name=value` keyword arguments.'
+        )
+        self.assertEqual(e.exception.message, expected_msg)
 
     def test_data_contains_id_field(self):
         """Ensure that asking for _data returns 'id'."""
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index b10506e7d..1d6e6e794 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -303,8 +303,8 @@ class Ocurrence(Document):
         Animal.drop_collection()
         Ocurrence.drop_collection()
 
-        animal1 = Animal('doggo').save()
-        animal2 = Animal('cheeta').save()
+        animal1 = Animal(name='doggo').save()
+        animal2 = Animal(name='cheeta').save()
 
         def check_fields_type(occ):
             self.assertIsInstance(occ.direct, LazyReference)
@@ -542,8 +542,8 @@ class Ocurrence(Document):
         Animal.drop_collection()
         Ocurrence.drop_collection()
 
-        animal1 = Animal('doggo').save()
-        animal2 = Animal('cheeta').save()
+        animal1 = Animal(name='doggo').save()
+        animal2 = Animal(name='cheeta').save()
 
         def check_fields_type(occ):
             self.assertIsInstance(occ.direct, LazyReference)

From 8e69008699d20268956b6c9f3b2406e5d110c6d8 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 24 Jun 2019 16:00:21 +0200
Subject: [PATCH 0875/1519] Fill in the PR # in the changelog [ci skip]

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6a56325e4..3754b010a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,7 +6,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- BREAKING CHANGE: Drop support for positional arguments when instantiating a document. #?
+- BREAKING CHANGE: Drop support for positional arguments when instantiating a document. #2103
   - From now on keyword arguments (e.g. `Doc(field_name=value)`) are required.
 
 Changes in 0.18.1

From b661afba0158befeaa8abc95f8c7184ede5aeeac Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 25 Jun 2019 11:34:31 +0200
Subject: [PATCH 0876/1519] Use set comprehensions for existing_fields &
 existing_db_fields

---
 mongoengine/base/metaclasses.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index c5363b09a..44b74509b 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -431,8 +431,8 @@ def get_auto_id_names(mcs, new_class):
         of ('auto_id_X', '_auto_id_X') if the default name is already taken.
         """
         id_name, id_db_name = ('id', '_id')
-        existing_fields = new_class._fields
-        existing_db_fields = (v.db_field for v in new_class._fields.values())
+        existing_fields = {field_name for field_name in new_class._fields}
+        existing_db_fields = {v.db_field for v in new_class._fields.values()}
         if (
             id_name not in existing_fields and
             id_db_name not in existing_db_fields

From 0578cdb62ef762454941e872ca026ada5a01e5f9 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 25 Jun 2019 11:41:27 +0200
Subject: [PATCH 0877/1519] Cleaner loop using itertools.count()

---
 mongoengine/base/metaclasses.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 44b74509b..c3ced5bbf 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -1,3 +1,4 @@
+import itertools
 import warnings
 
 import six
@@ -440,7 +441,7 @@ def get_auto_id_names(mcs, new_class):
             return id_name, id_db_name
 
         id_basename, id_db_basename, i = ('auto_id', '_auto_id', 0)
-        while True:
+        for i in itertools.count():
             id_name = '{0}_{1}'.format(id_basename, i)
             id_db_name = '{0}_{1}'.format(id_db_basename, i)
             if (
@@ -448,8 +449,6 @@ def get_auto_id_names(mcs, new_class):
                 id_db_name not in existing_db_fields
             ):
                 return id_name, id_db_name
-            else:
-                i += 1
 
 
 class MetaDict(dict):

From e57d834a0d9752dc92497d08b7fb3648212686b8 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 25 Jun 2019 12:41:59 +0200
Subject: [PATCH 0878/1519] Fix automated tests for py3

---
 tests/document/instance.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index 4be8aa45c..06f650767 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -3137,7 +3137,7 @@ def test_positional_creation(self):
             'Instantiating a document with positional arguments is not '
             'supported. Please use `field_name=value` keyword arguments.'
         )
-        self.assertEqual(e.exception.message, expected_msg)
+        self.assertEqual(str(e.exception), expected_msg)
 
     def test_mixed_creation(self):
         """Document cannot be instantiated using mixed arguments."""
@@ -3147,7 +3147,7 @@ def test_mixed_creation(self):
             'Instantiating a document with positional arguments is not '
             'supported. Please use `field_name=value` keyword arguments.'
         )
-        self.assertEqual(e.exception.message, expected_msg)
+        self.assertEqual(str(e.exception), expected_msg)
 
     def test_positional_creation_embedded(self):
         """Embedded document cannot be created using positional arguments."""
@@ -3157,7 +3157,7 @@ def test_positional_creation_embedded(self):
             'Instantiating a document with positional arguments is not '
             'supported. Please use `field_name=value` keyword arguments.'
         )
-        self.assertEqual(e.exception.message, expected_msg)
+        self.assertEqual(str(e.exception), expected_msg)
 
     def test_mixed_creation_embedded(self):
         """Embedded document cannot be created using mixed arguments."""
@@ -3167,7 +3167,7 @@ def test_mixed_creation_embedded(self):
             'Instantiating a document with positional arguments is not '
             'supported. Please use `field_name=value` keyword arguments.'
         )
-        self.assertEqual(e.exception.message, expected_msg)
+        self.assertEqual(str(e.exception), expected_msg)
 
     def test_data_contains_id_field(self):
         """Ensure that asking for _data returns 'id'."""

From 5c91877b696318680bff7c4866576661dc299a52 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 25 Jun 2019 16:48:51 +0200
Subject: [PATCH 0879/1519] Fix the Travis deployment condition

See https://github.com/MongoEngine/mongoengine/issues/2104 for details.

For now I'm hardcoding `$MONGODB = 3.4.17` just to get a release out there,
but we should probably use the globals going forward. Will do that in
a follow-up commit once I get the `travis-conditions` gem up and running and
hence can test `.travis.yml` changes without deploying.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7bbeef8b1..f9993e79e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -102,5 +102,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = 3.x) && ($MONGODB = 3.4)
+    condition: ($PYMONGO = 3.x) && ($MONGODB = 3.4.17)
     python: 2.7

From 1ead7f9b2b1ecfeba19eadb6509af9727d3226fe Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 25 Jun 2019 16:51:56 +0200
Subject: [PATCH 0880/1519] Add changelog entries for v0.18.2

---
 docs/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e82cc1246..487bc86a9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,11 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.18.2
+=================
+- Replace some of the deprecated PyMongo v2.x methods with their v3.x equivalents #2097
+- Various code clarity and documentation improvements
+
 Changes in 0.18.1
 =================
 - Fix a bug introduced in 0.18.0 which was causing `.save()` to update all the fields

From af292b0ec2cc65a4ce6684348d4fae301d527ef1 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 25 Jun 2019 16:52:31 +0200
Subject: [PATCH 0881/1519] Bump version to v0.18.2

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index d6a50766b..bb7a4e577 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -23,7 +23,7 @@
            list(signals.__all__) + list(errors.__all__))
 
 
-VERSION = (0, 18, 1)
+VERSION = (0, 18, 2)
 
 
 def get_version():

From c9ed9306068db2970f42a6ececbfd26dd783e848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 25 Jun 2019 22:20:47 +0200
Subject: [PATCH 0882/1519] Add a documentation page for validation

---
 docs/guide/index.rst      |   1 +
 docs/guide/querying.rst   |   3 +-
 docs/guide/validation.rst | 116 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 docs/guide/validation.rst

diff --git a/docs/guide/index.rst b/docs/guide/index.rst
index 46eb7af2c..c94a4eab7 100644
--- a/docs/guide/index.rst
+++ b/docs/guide/index.rst
@@ -10,6 +10,7 @@ User Guide
    defining-documents
    document-instances
    querying
+   validation
    gridfs
    signals
    text-indexes
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 151855a63..6937cf683 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -566,7 +566,8 @@ cannot use the `$` syntax in keyword arguments it has been mapped to `S`::
     ['database', 'mongodb']
 
 From MongoDB version 2.6, push operator supports $position value which allows
-to push values with index.
+to push values with index::
+
     >>> post = BlogPost(title="Test", tags=["mongo"])
     >>> post.save()
     >>> post.update(push__tags__0=["database", "code"])
diff --git a/docs/guide/validation.rst b/docs/guide/validation.rst
new file mode 100644
index 000000000..793a797a1
--- /dev/null
+++ b/docs/guide/validation.rst
@@ -0,0 +1,116 @@
+====================
+Document Validation
+====================
+
+By design, mongoengine strictly validates the documents right before they are inserted in MongoDB
+and make sure they are consistent with the fields defined in your models.
+
+Mongoengine will not validate a document when an object is loaded from the DB into an instance
+of your model but this operation will fail under some circumstances (e.g: if there is a field in
+the document fetched from the database that is not defined in your model)
+
+
+Builtin validation
+=================
+
+Mongoengine provides different fields that encapsulate the corresponding validation
+out of the box. Validation runs when calling `.validate()` or `.save()`
+
+.. code-block:: python
+
+    from mongoengine import Document, EmailField
+
+    class User(Document):
+        email = EmailField()
+        age = IntField(min_value=0, max_value=99)
+
+    user = User(email='invalid@', age=24)
+    user.validate()     # raises ValidationError (Invalid email address: ['email'])
+    user.save()         # raises ValidationError (Invalid email address: ['email'])
+
+    user2 = User(email='john.doe@garbage.com', age=1000)
+    user2.save()        # raises ValidationError (Integer value is too large: ['age'])
+
+Custom validation
+=================
+
+The following feature can be used to customize the validation:
+
+* Field `validation` parameter
+
+.. code-block:: python
+
+    def not_john_doe(name):
+        if name == 'John Doe':
+            raise ValidationError("John Doe is not a valid name")
+
+    class Person(Document):
+        full_name = StringField(validation=not_john_doe)
+
+    Person(full_name='Billy Doe').save()
+    Person(full_name='John Doe').save()  # raises ValidationError (John Doe is not a valid name)
+
+
+* Document `clean` method
+
+Although not its primary use case, `clean` may be use to do validation that involves multiple fields.
+Note that `clean` runs before the validation when you save a Document.
+
+.. code-block:: python
+
+    class Person(Document):
+        first_name = StringField()
+        last_name = StringField()
+
+        def clean(self):
+            if self.first_name == 'John' and self.last_name == 'Doe':
+                raise ValidationError('John Doe is not a valid name')
+
+    Person(first_name='Billy', last_name='Doe').save()
+    Person(first_name='John', last_name='Doe').save()      # raises ValidationError (John Doe is not a valid name)
+
+
+
+* Adding custom Field classes
+
+We recommend as much as possible to use the standard field but it is also possible
+to subclass a Field and encapsulate some validation by overriding the `validate` method
+
+.. code-block:: python
+
+    class AgeField(IntField):
+
+        def validate(self, value):
+            super(AgeField, self).validate(value)     # let IntField.validate run first
+            if value == 60:
+                self.error('60 is not allowed')
+
+    class Person(Document):
+        age = AgeField(min_value=0, max_value=99)
+
+    Person(age=20).save()   # passes
+    Person(age=1000).save() # raises ValidationError (Integer value is too large: ['age'])
+    Person(age=60).save()   # raises ValidationError (Person:None) (60 is not allowed: ['age'])
+
+
+.. note::
+
+   When overriding `validate`, use `self.error("your-custom-error")` instead of raising ValidationError explicitly,
+   it will provide a better context with the error message
+
+Disabling validation
+====================
+
+We do not recommend to do this but if for some reason you need to disable the validation of a document
+when you call `.save()`, you can use `.save(validate=False)`.
+
+.. code-block:: python
+
+    class Person(Document):
+        age = IntField()
+
+    Person(age='garbage').save()    # raises ValidationError (garbage could not be converted to int: ['age'])
+
+    Person(age='garbage').save(validate=False)
+    person = Person.objects.first()
+    assert person.age == 'garbage'

From 91899acfe5a7c2cd5354990153aaebb6269cf5c9 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 26 Jun 2019 15:14:43 +0200
Subject: [PATCH 0883/1519] Clarify unack'd write concern not returning the
 deleted count [ci skip]

---
 mongoengine/queryset/base.py | 4 ++++
 tests/queryset/queryset.py   | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 376e3fabb..85616c859 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -483,6 +483,10 @@ def delete(self, write_concern=None, _from_doc_delete=False,
 
         with set_write_concern(queryset._collection, write_concern) as collection:
             result = collection.delete_many(queryset._query)
+
+            # If we're using an unack'd write concern, we don't really know how
+            # many items have been deleted at this point, hence we only return
+            # the count for ack'd ops.
             if result.acknowledged:
                 return result.deleted_count
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c58176b88..c86e40953 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -1858,7 +1858,11 @@ class BlogPost(Document):
         self.assertEqual(1, BlogPost.objects.count())
 
     def test_delete_edge_case_with_write_concern_0_return_None(self):
-        """Return None when write is unacknowledged"""
+        """Return None if the delete operation is unacknowledged.
+
+        If we use an unack'd write concern, we don't really know how many
+        documents have been deleted.
+        """
         p1 = self.Person(name="User Z", age=20).save()
         del_result = p1.delete(w=0)
         self.assertEqual(None, del_result)

From b47669403b49428f00716ee983ffd269e402557f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Thu, 27 Jun 2019 13:05:54 +0200
Subject: [PATCH 0884/1519] Format the codebase using Black (#2109)

This commit:
1. Formats all of our existing code using `black`.
2. Adds a note about using `black` to `CONTRIBUTING.rst`.
3. Runs `black --check` as part of CI (failing builds that aren't properly formatted).
---
 .travis.yml                                  |    9 +-
 CONTRIBUTING.rst                             |    8 +-
 benchmarks/test_basic_doc_ops.py             |   92 +-
 benchmarks/test_inserts.py                   |   42 +-
 docs/code/tumblelog.py                       |   36 +-
 docs/conf.py                                 |   93 +-
 mongoengine/__init__.py                      |   13 +-
 mongoengine/base/__init__.py                 |   23 +-
 mongoengine/base/common.py                   |   53 +-
 mongoengine/base/datastructures.py           |   70 +-
 mongoengine/base/document.py                 |  528 ++--
 mongoengine/base/fields.py                   |  278 ++-
 mongoengine/base/metaclasses.py              |  333 +--
 mongoengine/common.py                        |   22 +-
 mongoengine/connection.py                    |  190 +-
 mongoengine/context_managers.py              |   51 +-
 mongoengine/dereference.py                   |  110 +-
 mongoengine/document.py                      |  400 +--
 mongoengine/errors.py                        |   44 +-
 mongoengine/fields.py                        |  890 ++++---
 mongoengine/mongodb_support.py               |    2 +-
 mongoengine/pymongo_support.py               |    2 +-
 mongoengine/queryset/__init__.py             |   21 +-
 mongoengine/queryset/base.py                 |  540 ++--
 mongoengine/queryset/field_list.py           |   13 +-
 mongoengine/queryset/manager.py              |    4 +-
 mongoengine/queryset/queryset.py             |   38 +-
 mongoengine/queryset/transform.py            |  346 +--
 mongoengine/queryset/visitor.py              |   14 +-
 mongoengine/signals.py                       |   43 +-
 requirements.txt                             |    1 +
 setup.cfg                                    |    2 +-
 setup.py                                     |   64 +-
 tests/all_warnings/__init__.py               |   18 +-
 tests/document/__init__.py                   |    2 +-
 tests/document/class_methods.py              |  229 +-
 tests/document/delta.py                      |  730 +++---
 tests/document/dynamic.py                    |  203 +-
 tests/document/indexes.py                    |  699 +++---
 tests/document/inheritance.py                |  483 ++--
 tests/document/instance.py                   | 1265 +++++-----
 tests/document/json_serialisation.py         |   45 +-
 tests/document/validation.py                 |  108 +-
 tests/fields/fields.py                       |  972 ++++----
 tests/fields/file_tests.py                   |  141 +-
 tests/fields/geo.py                          |  149 +-
 tests/fields/test_binary_field.py            |   33 +-
 tests/fields/test_boolean_field.py           |   15 +-
 tests/fields/test_cached_reference_field.py  |  316 +--
 tests/fields/test_complex_datetime_field.py  |   31 +-
 tests/fields/test_date_field.py              |   22 +-
 tests/fields/test_datetime_field.py          |   45 +-
 tests/fields/test_decimal_field.py           |   55 +-
 tests/fields/test_dict_field.py              |  205 +-
 tests/fields/test_email_field.py             |   45 +-
 tests/fields/test_embedded_document_field.py |  152 +-
 tests/fields/test_float_field.py             |    6 +-
 tests/fields/test_int_field.py               |    4 +-
 tests/fields/test_lazy_reference_field.py    |  120 +-
 tests/fields/test_long_field.py              |    9 +-
 tests/fields/test_map_field.py               |   59 +-
 tests/fields/test_reference_field.py         |   51 +-
 tests/fields/test_sequence_field.py          |  148 +-
 tests/fields/test_url_field.py               |   24 +-
 tests/fields/test_uuid_field.py              |   19 +-
 tests/fixtures.py                            |    8 +-
 tests/queryset/field_list.py                 |  249 +-
 tests/queryset/geo.py                        |  178 +-
 tests/queryset/modify.py                     |   34 +-
 tests/queryset/pickable.py                   |   24 +-
 tests/queryset/queryset.py                   | 2347 +++++++++---------
 tests/queryset/transform.py                  |  248 +-
 tests/queryset/visitor.py                    |  207 +-
 tests/test_common.py                         |    1 -
 tests/test_connection.py                     |  393 +--
 tests/test_context_managers.py               |  111 +-
 tests/test_datastructures.py                 |  205 +-
 tests/test_dereference.py                    |  252 +-
 tests/test_replicaset_connection.py          |   11 +-
 tests/test_signals.py                        |  408 +--
 tests/test_utils.py                          |   21 +-
 tests/utils.py                               |    7 +-
 82 files changed, 8406 insertions(+), 7076 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f9993e79e..8af73c6bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,19 +52,22 @@ install:
   - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
   - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
   - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
-  # Install python dependencies
+  # Install Python dependencies.
   - pip install --upgrade pip
   - pip install coveralls
   - pip install flake8 flake8-import-order
   - pip install tox         # tox 3.11.0 has requirement virtualenv>=14.0.0
   - pip install virtualenv  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
-  # Install the tox venv
+  # Install the tox venv.
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
+  # Install black for Python v3.7 only.
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then pip install black; fi
 
 before_script:
   - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
   - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then flake8 .; else echo "flake8 only runs on py27"; fi   # Run flake8 for py27
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then flake8 .; else echo "flake8 only runs on py27"; fi   # Run flake8 for Python 2.7 only
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then black --check .; else echo "black only runs on py37"; fi   # Run black for Python 3.7 only
   - mongo --eval 'db.version();'    # Make sure mongo is awake
 
 script:
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index f7b15c854..4711c1d3c 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -31,12 +31,8 @@ build. You should ensure that your code is properly converted by
 Style Guide
 -----------
 
-MongoEngine aims to follow `PEP8 <http://www.python.org/dev/peps/pep-0008/>`_
-including 4 space indents. When possible we try to stick to 79 character line
-limits. However, screens got bigger and an ORM has a strong focus on
-readability and if it can help, we accept 119 as maximum line length, in a
-similar way as `django does
-<https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/coding-style/#python-style>`_
+MongoEngine uses `black <https://github.com/python/black>`_ for code
+formatting.
 
 Testing
 -------
diff --git a/benchmarks/test_basic_doc_ops.py b/benchmarks/test_basic_doc_ops.py
index 06f0538bf..e840f97ad 100644
--- a/benchmarks/test_basic_doc_ops.py
+++ b/benchmarks/test_basic_doc_ops.py
@@ -1,11 +1,18 @@
 from timeit import repeat
 
 import mongoengine
-from mongoengine import (BooleanField, Document, EmailField, EmbeddedDocument,
-                         EmbeddedDocumentField, IntField, ListField,
-                         StringField)
+from mongoengine import (
+    BooleanField,
+    Document,
+    EmailField,
+    EmbeddedDocument,
+    EmbeddedDocumentField,
+    IntField,
+    ListField,
+    StringField,
+)
 
-mongoengine.connect(db='mongoengine_benchmark_test')
+mongoengine.connect(db="mongoengine_benchmark_test")
 
 
 def timeit(f, n=10000):
@@ -24,46 +31,41 @@ class Book(Document):
 
     def init_book():
         return Book(
-            name='Always be closing',
+            name="Always be closing",
             pages=100,
-            tags=['self-help', 'sales'],
+            tags=["self-help", "sales"],
             is_published=True,
-            author_email='alec@example.com',
+            author_email="alec@example.com",
         )
 
-    print('Doc initialization: %.3fus' % (timeit(init_book, 1000) * 10**6))
+    print("Doc initialization: %.3fus" % (timeit(init_book, 1000) * 10 ** 6))
 
     b = init_book()
-    print('Doc getattr: %.3fus' % (timeit(lambda: b.name, 10000) * 10**6))
+    print("Doc getattr: %.3fus" % (timeit(lambda: b.name, 10000) * 10 ** 6))
 
     print(
-        'Doc setattr: %.3fus' % (
-            timeit(lambda: setattr(b, 'name', 'New name'), 10000) * 10**6
-        )
+        "Doc setattr: %.3fus"
+        % (timeit(lambda: setattr(b, "name", "New name"), 10000) * 10 ** 6)
     )
 
-    print('Doc to mongo: %.3fus' % (timeit(b.to_mongo, 1000) * 10**6))
+    print("Doc to mongo: %.3fus" % (timeit(b.to_mongo, 1000) * 10 ** 6))
 
-    print('Doc validation: %.3fus' % (timeit(b.validate, 1000) * 10**6))
+    print("Doc validation: %.3fus" % (timeit(b.validate, 1000) * 10 ** 6))
 
     def save_book():
-        b._mark_as_changed('name')
-        b._mark_as_changed('tags')
+        b._mark_as_changed("name")
+        b._mark_as_changed("tags")
         b.save()
 
-    print('Save to database: %.3fus' % (timeit(save_book, 100) * 10**6))
+    print("Save to database: %.3fus" % (timeit(save_book, 100) * 10 ** 6))
 
     son = b.to_mongo()
     print(
-        'Load from SON: %.3fus' % (
-            timeit(lambda: Book._from_son(son), 1000) * 10**6
-        )
+        "Load from SON: %.3fus" % (timeit(lambda: Book._from_son(son), 1000) * 10 ** 6)
     )
 
     print(
-        'Load from database: %.3fus' % (
-            timeit(lambda: Book.objects[0], 100) * 10**6
-        )
+        "Load from database: %.3fus" % (timeit(lambda: Book.objects[0], 100) * 10 ** 6)
     )
 
     def create_and_delete_book():
@@ -72,9 +74,8 @@ def create_and_delete_book():
         b.delete()
 
     print(
-        'Init + save to database + delete: %.3fms' % (
-            timeit(create_and_delete_book, 10) * 10**3
-        )
+        "Init + save to database + delete: %.3fms"
+        % (timeit(create_and_delete_book, 10) * 10 ** 3)
     )
 
 
@@ -92,42 +93,36 @@ class Company(Document):
 
     def init_company():
         return Company(
-            name='MongoDB, Inc.',
+            name="MongoDB, Inc.",
             contacts=[
-                Contact(
-                    name='Contact %d' % x,
-                    title='CEO',
-                    address='Address %d' % x,
-                )
+                Contact(name="Contact %d" % x, title="CEO", address="Address %d" % x)
                 for x in range(1000)
-            ]
+            ],
         )
 
     company = init_company()
-    print('Big doc to mongo: %.3fms' % (timeit(company.to_mongo, 100) * 10**3))
+    print("Big doc to mongo: %.3fms" % (timeit(company.to_mongo, 100) * 10 ** 3))
 
-    print('Big doc validation: %.3fms' % (timeit(company.validate, 1000) * 10**3))
+    print("Big doc validation: %.3fms" % (timeit(company.validate, 1000) * 10 ** 3))
 
     company.save()
 
     def save_company():
-        company._mark_as_changed('name')
-        company._mark_as_changed('contacts')
+        company._mark_as_changed("name")
+        company._mark_as_changed("contacts")
         company.save()
 
-    print('Save to database: %.3fms' % (timeit(save_company, 100) * 10**3))
+    print("Save to database: %.3fms" % (timeit(save_company, 100) * 10 ** 3))
 
     son = company.to_mongo()
     print(
-        'Load from SON: %.3fms' % (
-            timeit(lambda: Company._from_son(son), 100) * 10**3
-        )
+        "Load from SON: %.3fms"
+        % (timeit(lambda: Company._from_son(son), 100) * 10 ** 3)
     )
 
     print(
-        'Load from database: %.3fms' % (
-            timeit(lambda: Company.objects[0], 100) * 10**3
-        )
+        "Load from database: %.3fms"
+        % (timeit(lambda: Company.objects[0], 100) * 10 ** 3)
     )
 
     def create_and_delete_company():
@@ -136,13 +131,12 @@ def create_and_delete_company():
         c.delete()
 
     print(
-        'Init + save to database + delete: %.3fms' % (
-            timeit(create_and_delete_company, 10) * 10**3
-        )
+        "Init + save to database + delete: %.3fms"
+        % (timeit(create_and_delete_company, 10) * 10 ** 3)
     )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     test_basic()
-    print('-' * 100)
+    print("-" * 100)
     test_big_doc()
diff --git a/benchmarks/test_inserts.py b/benchmarks/test_inserts.py
index 8113d988d..fd017bae3 100644
--- a/benchmarks/test_inserts.py
+++ b/benchmarks/test_inserts.py
@@ -26,10 +26,10 @@ def main():
 [n for n in myNoddys]  # iterate
 """
 
-    print('-' * 100)
-    print('PyMongo: Creating 10000 dictionaries.')
+    print("-" * 100)
+    print("PyMongo: Creating 10000 dictionaries.")
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print('{}s'.format(t.timeit(1)))
+    print("{}s".format(t.timeit(1)))
 
     stmt = """
 from pymongo import MongoClient, WriteConcern
@@ -49,10 +49,10 @@ def main():
 [n for n in myNoddys]  # iterate
 """
 
-    print('-' * 100)
+    print("-" * 100)
     print('PyMongo: Creating 10000 dictionaries (write_concern={"w": 0}).')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print('{}s'.format(t.timeit(1)))
+    print("{}s".format(t.timeit(1)))
 
     setup = """
 from pymongo import MongoClient
@@ -78,10 +78,10 @@ class Noddy(Document):
 [n for n in myNoddys]  # iterate
 """
 
-    print('-' * 100)
-    print('MongoEngine: Creating 10000 dictionaries.')
+    print("-" * 100)
+    print("MongoEngine: Creating 10000 dictionaries.")
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print('{}s'.format(t.timeit(1)))
+    print("{}s".format(t.timeit(1)))
 
     stmt = """
 for i in range(10000):
@@ -96,10 +96,10 @@ class Noddy(Document):
 [n for n in myNoddys]  # iterate
 """
 
-    print('-' * 100)
-    print('MongoEngine: Creating 10000 dictionaries (using a single field assignment).')
+    print("-" * 100)
+    print("MongoEngine: Creating 10000 dictionaries (using a single field assignment).")
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print('{}s'.format(t.timeit(1)))
+    print("{}s".format(t.timeit(1)))
 
     stmt = """
 for i in range(10000):
@@ -112,10 +112,10 @@ class Noddy(Document):
 [n for n in myNoddys] # iterate
 """
 
-    print('-' * 100)
+    print("-" * 100)
     print('MongoEngine: Creating 10000 dictionaries (write_concern={"w": 0}).')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print('{}s'.format(t.timeit(1)))
+    print("{}s".format(t.timeit(1)))
 
     stmt = """
 for i in range(10000):
@@ -128,10 +128,12 @@ class Noddy(Document):
 [n for n in myNoddys] # iterate
 """
 
-    print('-' * 100)
-    print('MongoEngine: Creating 10000 dictionaries (write_concern={"w": 0}, validate=False).')
+    print("-" * 100)
+    print(
+        'MongoEngine: Creating 10000 dictionaries (write_concern={"w": 0}, validate=False).'
+    )
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print('{}s'.format(t.timeit(1)))
+    print("{}s".format(t.timeit(1)))
 
     stmt = """
 for i in range(10000):
@@ -144,10 +146,12 @@ class Noddy(Document):
 [n for n in myNoddys] # iterate
 """
 
-    print('-' * 100)
-    print('MongoEngine: Creating 10000 dictionaries (force_insert=True, write_concern={"w": 0}, validate=False).')
+    print("-" * 100)
+    print(
+        'MongoEngine: Creating 10000 dictionaries (force_insert=True, write_concern={"w": 0}, validate=False).'
+    )
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print('{}s'.format(t.timeit(1)))
+    print("{}s".format(t.timeit(1)))
 
 
 if __name__ == "__main__":
diff --git a/docs/code/tumblelog.py b/docs/code/tumblelog.py
index 796336e61..3ca2384c7 100644
--- a/docs/code/tumblelog.py
+++ b/docs/code/tumblelog.py
@@ -1,16 +1,19 @@
 from mongoengine import *
 
-connect('tumblelog')
+connect("tumblelog")
+
 
 class Comment(EmbeddedDocument):
     content = StringField()
     name = StringField(max_length=120)
 
+
 class User(Document):
     email = StringField(required=True)
     first_name = StringField(max_length=50)
     last_name = StringField(max_length=50)
 
+
 class Post(Document):
     title = StringField(max_length=120, required=True)
     author = ReferenceField(User)
@@ -18,54 +21,57 @@ class Post(Document):
     comments = ListField(EmbeddedDocumentField(Comment))
 
     # bugfix
-    meta = {'allow_inheritance': True}
+    meta = {"allow_inheritance": True}
 
 
 class TextPost(Post):
     content = StringField()
 
+
 class ImagePost(Post):
     image_path = StringField()
 
+
 class LinkPost(Post):
     link_url = StringField()
 
+
 Post.drop_collection()
 
-john = User(email='jdoe@example.com', first_name='John', last_name='Doe')
+john = User(email="jdoe@example.com", first_name="John", last_name="Doe")
 john.save()
 
-post1 = TextPost(title='Fun with MongoEngine', author=john)
-post1.content = 'Took a look at MongoEngine today, looks pretty cool.'
-post1.tags = ['mongodb', 'mongoengine']
+post1 = TextPost(title="Fun with MongoEngine", author=john)
+post1.content = "Took a look at MongoEngine today, looks pretty cool."
+post1.tags = ["mongodb", "mongoengine"]
 post1.save()
 
-post2 = LinkPost(title='MongoEngine Documentation', author=john)
-post2.link_url = 'http://tractiondigital.com/labs/mongoengine/docs'
-post2.tags = ['mongoengine']
+post2 = LinkPost(title="MongoEngine Documentation", author=john)
+post2.link_url = "http://tractiondigital.com/labs/mongoengine/docs"
+post2.tags = ["mongoengine"]
 post2.save()
 
-print('ALL POSTS')
+print("ALL POSTS")
 print()
 for post in Post.objects:
     print(post.title)
-    #print '=' * post.title.count()
+    # print '=' * post.title.count()
     print("=" * 20)
 
     if isinstance(post, TextPost):
         print(post.content)
 
     if isinstance(post, LinkPost):
-        print('Link:', post.link_url)
+        print("Link:", post.link_url)
 
     print()
 print()
 
-print('POSTS TAGGED \'MONGODB\'')
+print("POSTS TAGGED 'MONGODB'")
 print()
-for post in Post.objects(tags='mongodb'):
+for post in Post.objects(tags="mongodb"):
     print(post.title)
 print()
 
-num_posts = Post.objects(tags='mongodb').count()
+num_posts = Post.objects(tags="mongodb").count()
 print('Found %d posts with tag "mongodb"' % num_posts)
diff --git a/docs/conf.py b/docs/conf.py
index 468e71e06..0d642e0c6 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -20,29 +20,29 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath(".."))
 
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo']
+extensions = ["sphinx.ext.autodoc", "sphinx.ext.todo"]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
-#source_encoding = 'utf-8'
+# source_encoding = 'utf-8'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'MongoEngine'
-copyright = u'2009, MongoEngine Authors'
+project = u"MongoEngine"
+copyright = u"2009, MongoEngine Authors"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -55,68 +55,66 @@
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-#language = None
+# language = None
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of documents that shouldn't be included in the build.
-#unused_docs = []
+# unused_docs = []
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
-exclude_trees = ['_build']
+exclude_trees = ["_build"]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'sphinx_rtd_theme'
+html_theme = "sphinx_rtd_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {
-    'canonical_url': 'http://docs.mongoengine.org/en/latest/'
-}
+html_theme_options = {"canonical_url": "http://docs.mongoengine.org/en/latest/"}
 
 # Add any paths that contain custom themes here, relative to this directory.
 html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+# html_title = None
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
@@ -126,11 +124,11 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
@@ -138,69 +136,68 @@
 
 # Custom sidebar templates, maps document names to template names.
 html_sidebars = {
-    'index': ['globaltoc.html', 'searchbox.html'],
-    '**': ['localtoc.html', 'relations.html', 'searchbox.html']
+    "index": ["globaltoc.html", "searchbox.html"],
+    "**": ["localtoc.html", "relations.html", "searchbox.html"],
 }
 
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_use_modindex = True
+# html_use_modindex = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
+# html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'MongoEnginedoc'
+htmlhelp_basename = "MongoEnginedoc"
 
 
 # -- Options for LaTeX output --------------------------------------------------
 
 # The paper size ('letter' or 'a4').
-latex_paper_size = 'a4'
+latex_paper_size = "a4"
 
 # The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
+# latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'MongoEngine.tex', 'MongoEngine Documentation',
-   'Ross Lawley', 'manual'),
+    ("index", "MongoEngine.tex", "MongoEngine Documentation", "Ross Lawley", "manual")
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
+# latex_preamble = ''
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_use_modindex = True
+# latex_use_modindex = True
 
-autoclass_content = 'both'
+autoclass_content = "both"
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index bb7a4e577..d7093d28e 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -18,9 +18,14 @@
 from mongoengine.signals import *
 
 
-__all__ = (list(document.__all__) + list(fields.__all__) +
-           list(connection.__all__) + list(queryset.__all__) +
-           list(signals.__all__) + list(errors.__all__))
+__all__ = (
+    list(document.__all__)
+    + list(fields.__all__)
+    + list(connection.__all__)
+    + list(queryset.__all__)
+    + list(signals.__all__)
+    + list(errors.__all__)
+)
 
 
 VERSION = (0, 18, 2)
@@ -31,7 +36,7 @@ def get_version():
 
     For example, if `VERSION == (0, 10, 7)`, return '0.10.7'.
     """
-    return '.'.join(map(str, VERSION))
+    return ".".join(map(str, VERSION))
 
 
 __version__ = get_version()
diff --git a/mongoengine/base/__init__.py b/mongoengine/base/__init__.py
index e069a147a..dca0c4bb7 100644
--- a/mongoengine/base/__init__.py
+++ b/mongoengine/base/__init__.py
@@ -12,17 +12,22 @@
 
 __all__ = (
     # common
-    'UPDATE_OPERATORS', '_document_registry', 'get_document',
-
+    "UPDATE_OPERATORS",
+    "_document_registry",
+    "get_document",
     # datastructures
-    'BaseDict', 'BaseList', 'EmbeddedDocumentList', 'LazyReference',
-
+    "BaseDict",
+    "BaseList",
+    "EmbeddedDocumentList",
+    "LazyReference",
     # document
-    'BaseDocument',
-
+    "BaseDocument",
     # fields
-    'BaseField', 'ComplexBaseField', 'ObjectIdField', 'GeoJsonBaseField',
-
+    "BaseField",
+    "ComplexBaseField",
+    "ObjectIdField",
+    "GeoJsonBaseField",
     # metaclasses
-    'DocumentMetaclass', 'TopLevelDocumentMetaclass'
+    "DocumentMetaclass",
+    "TopLevelDocumentMetaclass",
 )
diff --git a/mongoengine/base/common.py b/mongoengine/base/common.py
index 999fd23ab..85897324f 100644
--- a/mongoengine/base/common.py
+++ b/mongoengine/base/common.py
@@ -1,12 +1,25 @@
 from mongoengine.errors import NotRegistered
 
-__all__ = ('UPDATE_OPERATORS', 'get_document', '_document_registry')
-
-
-UPDATE_OPERATORS = {'set', 'unset', 'inc', 'dec', 'mul',
-                    'pop', 'push', 'push_all', 'pull',
-                    'pull_all', 'add_to_set', 'set_on_insert',
-                    'min', 'max', 'rename'}
+__all__ = ("UPDATE_OPERATORS", "get_document", "_document_registry")
+
+
+UPDATE_OPERATORS = {
+    "set",
+    "unset",
+    "inc",
+    "dec",
+    "mul",
+    "pop",
+    "push",
+    "push_all",
+    "pull",
+    "pull_all",
+    "add_to_set",
+    "set_on_insert",
+    "min",
+    "max",
+    "rename",
+}
 
 
 _document_registry = {}
@@ -17,25 +30,33 @@ def get_document(name):
     doc = _document_registry.get(name, None)
     if not doc:
         # Possible old style name
-        single_end = name.split('.')[-1]
-        compound_end = '.%s' % single_end
-        possible_match = [k for k in _document_registry
-                          if k.endswith(compound_end) or k == single_end]
+        single_end = name.split(".")[-1]
+        compound_end = ".%s" % single_end
+        possible_match = [
+            k for k in _document_registry if k.endswith(compound_end) or k == single_end
+        ]
         if len(possible_match) == 1:
             doc = _document_registry.get(possible_match.pop(), None)
     if not doc:
-        raise NotRegistered("""
+        raise NotRegistered(
+            """
             `%s` has not been registered in the document registry.
             Importing the document class automatically registers it, has it
             been imported?
-        """.strip() % name)
+        """.strip()
+            % name
+        )
     return doc
 
 
 def _get_documents_by_db(connection_alias, default_connection_alias):
     """Get all registered Documents class attached to a given database"""
+
     def get_doc_alias(doc_cls):
-        return doc_cls._meta.get('db_alias', default_connection_alias)
+        return doc_cls._meta.get("db_alias", default_connection_alias)
 
-    return [doc_cls for doc_cls in _document_registry.values()
-            if get_doc_alias(doc_cls) == connection_alias]
+    return [
+        doc_cls
+        for doc_cls in _document_registry.values()
+        if get_doc_alias(doc_cls) == connection_alias
+    ]
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index cce718468..d1b5ae761 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -7,26 +7,36 @@
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
 
-__all__ = ('BaseDict', 'StrictDict', 'BaseList', 'EmbeddedDocumentList', 'LazyReference')
+__all__ = (
+    "BaseDict",
+    "StrictDict",
+    "BaseList",
+    "EmbeddedDocumentList",
+    "LazyReference",
+)
 
 
 def mark_as_changed_wrapper(parent_method):
     """Decorator that ensures _mark_as_changed method gets called."""
+
     def wrapper(self, *args, **kwargs):
         # Can't use super() in the decorator.
         result = parent_method(self, *args, **kwargs)
         self._mark_as_changed()
         return result
+
     return wrapper
 
 
 def mark_key_as_changed_wrapper(parent_method):
     """Decorator that ensures _mark_as_changed method gets called with the key argument"""
+
     def wrapper(self, key, *args, **kwargs):
         # Can't use super() in the decorator.
         result = parent_method(self, key, *args, **kwargs)
         self._mark_as_changed(key)
         return result
+
     return wrapper
 
 
@@ -38,7 +48,7 @@ class BaseDict(dict):
     _name = None
 
     def __init__(self, dict_items, instance, name):
-        BaseDocument = _import_class('BaseDocument')
+        BaseDocument = _import_class("BaseDocument")
 
         if isinstance(instance, BaseDocument):
             self._instance = weakref.proxy(instance)
@@ -55,15 +65,15 @@ def get(self, key, default=None):
     def __getitem__(self, key):
         value = super(BaseDict, self).__getitem__(key)
 
-        EmbeddedDocument = _import_class('EmbeddedDocument')
+        EmbeddedDocument = _import_class("EmbeddedDocument")
         if isinstance(value, EmbeddedDocument) and value._instance is None:
             value._instance = self._instance
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
-            value = BaseDict(value, None, '%s.%s' % (self._name, key))
+            value = BaseDict(value, None, "%s.%s" % (self._name, key))
             super(BaseDict, self).__setitem__(key, value)
             value._instance = self._instance
         elif isinstance(value, list) and not isinstance(value, BaseList):
-            value = BaseList(value, None, '%s.%s' % (self._name, key))
+            value = BaseList(value, None, "%s.%s" % (self._name, key))
             super(BaseDict, self).__setitem__(key, value)
             value._instance = self._instance
         return value
@@ -87,9 +97,9 @@ def __setstate__(self, state):
     setdefault = mark_as_changed_wrapper(dict.setdefault)
 
     def _mark_as_changed(self, key=None):
-        if hasattr(self._instance, '_mark_as_changed'):
+        if hasattr(self._instance, "_mark_as_changed"):
             if key:
-                self._instance._mark_as_changed('%s.%s' % (self._name, key))
+                self._instance._mark_as_changed("%s.%s" % (self._name, key))
             else:
                 self._instance._mark_as_changed(self._name)
 
@@ -102,7 +112,7 @@ class BaseList(list):
     _name = None
 
     def __init__(self, list_items, instance, name):
-        BaseDocument = _import_class('BaseDocument')
+        BaseDocument = _import_class("BaseDocument")
 
         if isinstance(instance, BaseDocument):
             self._instance = weakref.proxy(instance)
@@ -117,17 +127,17 @@ def __getitem__(self, key):
             # to parent's instance. This is buggy for now but would require more work to be handled properly
             return value
 
-        EmbeddedDocument = _import_class('EmbeddedDocument')
+        EmbeddedDocument = _import_class("EmbeddedDocument")
         if isinstance(value, EmbeddedDocument) and value._instance is None:
             value._instance = self._instance
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
             # Replace dict by BaseDict
-            value = BaseDict(value, None, '%s.%s' % (self._name, key))
+            value = BaseDict(value, None, "%s.%s" % (self._name, key))
             super(BaseList, self).__setitem__(key, value)
             value._instance = self._instance
         elif isinstance(value, list) and not isinstance(value, BaseList):
             # Replace list by BaseList
-            value = BaseList(value, None, '%s.%s' % (self._name, key))
+            value = BaseList(value, None, "%s.%s" % (self._name, key))
             super(BaseList, self).__setitem__(key, value)
             value._instance = self._instance
         return value
@@ -181,17 +191,14 @@ def __getslice__(self, i, j):
             return self.__getitem__(slice(i, j))
 
     def _mark_as_changed(self, key=None):
-        if hasattr(self._instance, '_mark_as_changed'):
+        if hasattr(self._instance, "_mark_as_changed"):
             if key:
-                self._instance._mark_as_changed(
-                    '%s.%s' % (self._name, key % len(self))
-                )
+                self._instance._mark_as_changed("%s.%s" % (self._name, key % len(self)))
             else:
                 self._instance._mark_as_changed(self._name)
 
 
 class EmbeddedDocumentList(BaseList):
-
     def __init__(self, list_items, instance, name):
         super(EmbeddedDocumentList, self).__init__(list_items, instance, name)
         self._instance = instance
@@ -276,12 +283,10 @@ def get(self, **kwargs):
         """
         values = self.__only_matches(self, kwargs)
         if len(values) == 0:
-            raise DoesNotExist(
-                '%s matching query does not exist.' % self._name
-            )
+            raise DoesNotExist("%s matching query does not exist." % self._name)
         elif len(values) > 1:
             raise MultipleObjectsReturned(
-                '%d items returned, instead of 1' % len(values)
+                "%d items returned, instead of 1" % len(values)
             )
 
         return values[0]
@@ -362,7 +367,7 @@ def update(self, **update):
 
 class StrictDict(object):
     __slots__ = ()
-    _special_fields = {'get', 'pop', 'iteritems', 'items', 'keys', 'create'}
+    _special_fields = {"get", "pop", "iteritems", "items", "keys", "create"}
     _classes = {}
 
     def __init__(self, **kwargs):
@@ -370,14 +375,14 @@ def __init__(self, **kwargs):
             setattr(self, k, v)
 
     def __getitem__(self, key):
-        key = '_reserved_' + key if key in self._special_fields else key
+        key = "_reserved_" + key if key in self._special_fields else key
         try:
             return getattr(self, key)
         except AttributeError:
             raise KeyError(key)
 
     def __setitem__(self, key, value):
-        key = '_reserved_' + key if key in self._special_fields else key
+        key = "_reserved_" + key if key in self._special_fields else key
         return setattr(self, key, value)
 
     def __contains__(self, key):
@@ -424,27 +429,32 @@ def __ne__(self, other):
 
     @classmethod
     def create(cls, allowed_keys):
-        allowed_keys_tuple = tuple(('_reserved_' + k if k in cls._special_fields else k) for k in allowed_keys)
+        allowed_keys_tuple = tuple(
+            ("_reserved_" + k if k in cls._special_fields else k) for k in allowed_keys
+        )
         allowed_keys = frozenset(allowed_keys_tuple)
         if allowed_keys not in cls._classes:
+
             class SpecificStrictDict(cls):
                 __slots__ = allowed_keys_tuple
 
                 def __repr__(self):
-                    return '{%s}' % ', '.join('"{0!s}": {1!r}'.format(k, v) for k, v in self.items())
+                    return "{%s}" % ", ".join(
+                        '"{0!s}": {1!r}'.format(k, v) for k, v in self.items()
+                    )
 
             cls._classes[allowed_keys] = SpecificStrictDict
         return cls._classes[allowed_keys]
 
 
 class LazyReference(DBRef):
-    __slots__ = ('_cached_doc', 'passthrough', 'document_type')
+    __slots__ = ("_cached_doc", "passthrough", "document_type")
 
     def fetch(self, force=False):
         if not self._cached_doc or force:
             self._cached_doc = self.document_type.objects.get(pk=self.pk)
             if not self._cached_doc:
-                raise DoesNotExist('Trying to dereference unknown document %s' % (self))
+                raise DoesNotExist("Trying to dereference unknown document %s" % (self))
         return self._cached_doc
 
     @property
@@ -455,7 +465,9 @@ def __init__(self, document_type, pk, cached_doc=None, passthrough=False):
         self.document_type = document_type
         self._cached_doc = cached_doc
         self.passthrough = passthrough
-        super(LazyReference, self).__init__(self.document_type._get_collection_name(), pk)
+        super(LazyReference, self).__init__(
+            self.document_type._get_collection_name(), pk
+        )
 
     def __getitem__(self, name):
         if not self.passthrough:
@@ -464,7 +476,7 @@ def __getitem__(self, name):
         return document[name]
 
     def __getattr__(self, name):
-        if not object.__getattribute__(self, 'passthrough'):
+        if not object.__getattribute__(self, "passthrough"):
             raise AttributeError()
         document = self.fetch()
         try:
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 047d50a46..928a00c20 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -9,19 +9,27 @@
 
 from mongoengine import signals
 from mongoengine.base.common import get_document
-from mongoengine.base.datastructures import (BaseDict, BaseList,
-                                             EmbeddedDocumentList,
-                                             LazyReference,
-                                             StrictDict)
+from mongoengine.base.datastructures import (
+    BaseDict,
+    BaseList,
+    EmbeddedDocumentList,
+    LazyReference,
+    StrictDict,
+)
 from mongoengine.base.fields import ComplexBaseField
 from mongoengine.common import _import_class
-from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError,
-                                LookUpError, OperationError, ValidationError)
+from mongoengine.errors import (
+    FieldDoesNotExist,
+    InvalidDocumentError,
+    LookUpError,
+    OperationError,
+    ValidationError,
+)
 from mongoengine.python_support import Hashable
 
-__all__ = ('BaseDocument', 'NON_FIELD_ERRORS')
+__all__ = ("BaseDocument", "NON_FIELD_ERRORS")
 
-NON_FIELD_ERRORS = '__all__'
+NON_FIELD_ERRORS = "__all__"
 
 
 class BaseDocument(object):
@@ -35,9 +43,16 @@ class BaseDocument(object):
     #    field is primarily set via `_from_son` or `_clear_changed_fields`,
     #    though there are also other methods that manipulate it.
     # 4. The codebase is littered with `hasattr` calls for `_changed_fields`.
-    __slots__ = ('_changed_fields', '_initialised', '_created', '_data',
-                 '_dynamic_fields', '_auto_id_field', '_db_field_map',
-                 '__weakref__')
+    __slots__ = (
+        "_changed_fields",
+        "_initialised",
+        "_created",
+        "_data",
+        "_dynamic_fields",
+        "_auto_id_field",
+        "_db_field_map",
+        "__weakref__",
+    )
 
     _dynamic = False
     _dynamic_lock = True
@@ -61,27 +76,28 @@ def __init__(self, *args, **values):
 
         if args:
             raise TypeError(
-                'Instantiating a document with positional arguments is not '
-                'supported. Please use `field_name=value` keyword arguments.'
+                "Instantiating a document with positional arguments is not "
+                "supported. Please use `field_name=value` keyword arguments."
             )
 
-        __auto_convert = values.pop('__auto_convert', True)
+        __auto_convert = values.pop("__auto_convert", True)
 
-        __only_fields = set(values.pop('__only_fields', values))
+        __only_fields = set(values.pop("__only_fields", values))
 
-        _created = values.pop('_created', True)
+        _created = values.pop("_created", True)
 
         signals.pre_init.send(self.__class__, document=self, values=values)
 
         # Check if there are undefined fields supplied to the constructor,
         # if so raise an Exception.
-        if not self._dynamic and (self._meta.get('strict', True) or _created):
+        if not self._dynamic and (self._meta.get("strict", True) or _created):
             _undefined_fields = set(values.keys()) - set(
-                self._fields.keys() + ['id', 'pk', '_cls', '_text_score'])
+                self._fields.keys() + ["id", "pk", "_cls", "_text_score"]
+            )
             if _undefined_fields:
-                msg = (
-                    'The fields "{0}" do not exist on the document "{1}"'
-                ).format(_undefined_fields, self._class_name)
+                msg = ('The fields "{0}" do not exist on the document "{1}"').format(
+                    _undefined_fields, self._class_name
+                )
                 raise FieldDoesNotExist(msg)
 
         if self.STRICT and not self._dynamic:
@@ -100,22 +116,22 @@ def __init__(self, *args, **values):
             value = getattr(self, key, None)
             setattr(self, key, value)
 
-        if '_cls' not in values:
+        if "_cls" not in values:
             self._cls = self._class_name
 
         # Set passed values after initialisation
         if self._dynamic:
             dynamic_data = {}
             for key, value in iteritems(values):
-                if key in self._fields or key == '_id':
+                if key in self._fields or key == "_id":
                     setattr(self, key, value)
                 else:
                     dynamic_data[key] = value
         else:
-            FileField = _import_class('FileField')
+            FileField = _import_class("FileField")
             for key, value in iteritems(values):
                 key = self._reverse_db_field_map.get(key, key)
-                if key in self._fields or key in ('id', 'pk', '_cls'):
+                if key in self._fields or key in ("id", "pk", "_cls"):
                     if __auto_convert and value is not None:
                         field = self._fields.get(key)
                         if field and not isinstance(field, FileField):
@@ -153,20 +169,20 @@ def __setattr__(self, name, value):
         # Handle dynamic data only if an initialised dynamic document
         if self._dynamic and not self._dynamic_lock:
 
-            if not hasattr(self, name) and not name.startswith('_'):
-                DynamicField = _import_class('DynamicField')
+            if not hasattr(self, name) and not name.startswith("_"):
+                DynamicField = _import_class("DynamicField")
                 field = DynamicField(db_field=name, null=True)
                 field.name = name
                 self._dynamic_fields[name] = field
                 self._fields_ordered += (name,)
 
-            if not name.startswith('_'):
+            if not name.startswith("_"):
                 value = self.__expand_dynamic_values(name, value)
 
             # Handle marking data as changed
             if name in self._dynamic_fields:
                 self._data[name] = value
-                if hasattr(self, '_changed_fields'):
+                if hasattr(self, "_changed_fields"):
                     self._mark_as_changed(name)
         try:
             self__created = self._created
@@ -174,12 +190,12 @@ def __setattr__(self, name, value):
             self__created = True
 
         if (
-            self._is_document and
-            not self__created and
-            name in self._meta.get('shard_key', tuple()) and
-            self._data.get(name) != value
+            self._is_document
+            and not self__created
+            and name in self._meta.get("shard_key", tuple())
+            and self._data.get(name) != value
         ):
-            msg = 'Shard Keys are immutable. Tried to update %s' % name
+            msg = "Shard Keys are immutable. Tried to update %s" % name
             raise OperationError(msg)
 
         try:
@@ -187,38 +203,52 @@ def __setattr__(self, name, value):
         except AttributeError:
             self__initialised = False
         # Check if the user has created a new instance of a class
-        if (self._is_document and self__initialised and
-                self__created and name == self._meta.get('id_field')):
-            super(BaseDocument, self).__setattr__('_created', False)
+        if (
+            self._is_document
+            and self__initialised
+            and self__created
+            and name == self._meta.get("id_field")
+        ):
+            super(BaseDocument, self).__setattr__("_created", False)
 
         super(BaseDocument, self).__setattr__(name, value)
 
     def __getstate__(self):
         data = {}
-        for k in ('_changed_fields', '_initialised', '_created',
-                  '_dynamic_fields', '_fields_ordered'):
+        for k in (
+            "_changed_fields",
+            "_initialised",
+            "_created",
+            "_dynamic_fields",
+            "_fields_ordered",
+        ):
             if hasattr(self, k):
                 data[k] = getattr(self, k)
-        data['_data'] = self.to_mongo()
+        data["_data"] = self.to_mongo()
         return data
 
     def __setstate__(self, data):
-        if isinstance(data['_data'], SON):
-            data['_data'] = self.__class__._from_son(data['_data'])._data
-        for k in ('_changed_fields', '_initialised', '_created', '_data',
-                  '_dynamic_fields'):
+        if isinstance(data["_data"], SON):
+            data["_data"] = self.__class__._from_son(data["_data"])._data
+        for k in (
+            "_changed_fields",
+            "_initialised",
+            "_created",
+            "_data",
+            "_dynamic_fields",
+        ):
             if k in data:
                 setattr(self, k, data[k])
-        if '_fields_ordered' in data:
+        if "_fields_ordered" in data:
             if self._dynamic:
-                setattr(self, '_fields_ordered', data['_fields_ordered'])
+                setattr(self, "_fields_ordered", data["_fields_ordered"])
             else:
                 _super_fields_ordered = type(self)._fields_ordered
-                setattr(self, '_fields_ordered', _super_fields_ordered)
+                setattr(self, "_fields_ordered", _super_fields_ordered)
 
-        dynamic_fields = data.get('_dynamic_fields') or SON()
+        dynamic_fields = data.get("_dynamic_fields") or SON()
         for k in dynamic_fields.keys():
-            setattr(self, k, data['_data'].get(k))
+            setattr(self, k, data["_data"].get(k))
 
     def __iter__(self):
         return iter(self._fields_ordered)
@@ -255,24 +285,30 @@ def __repr__(self):
         try:
             u = self.__str__()
         except (UnicodeEncodeError, UnicodeDecodeError):
-            u = '[Bad Unicode data]'
+            u = "[Bad Unicode data]"
         repr_type = str if u is None else type(u)
-        return repr_type('<%s: %s>' % (self.__class__.__name__, u))
+        return repr_type("<%s: %s>" % (self.__class__.__name__, u))
 
     def __str__(self):
         # TODO this could be simpler?
-        if hasattr(self, '__unicode__'):
+        if hasattr(self, "__unicode__"):
             if six.PY3:
                 return self.__unicode__()
             else:
-                return six.text_type(self).encode('utf-8')
-        return six.text_type('%s object' % self.__class__.__name__)
+                return six.text_type(self).encode("utf-8")
+        return six.text_type("%s object" % self.__class__.__name__)
 
     def __eq__(self, other):
-        if isinstance(other, self.__class__) and hasattr(other, 'id') and other.id is not None:
+        if (
+            isinstance(other, self.__class__)
+            and hasattr(other, "id")
+            and other.id is not None
+        ):
             return self.id == other.id
         if isinstance(other, DBRef):
-            return self._get_collection_name() == other.collection and self.id == other.id
+            return (
+                self._get_collection_name() == other.collection and self.id == other.id
+            )
         if self.id is None:
             return self is other
         return False
@@ -295,10 +331,12 @@ def get_text_score(self):
         Get text score from text query
         """
 
-        if '_text_score' not in self._data:
-            raise InvalidDocumentError('This document is not originally built from a text query')
+        if "_text_score" not in self._data:
+            raise InvalidDocumentError(
+                "This document is not originally built from a text query"
+            )
 
-        return self._data['_text_score']
+        return self._data["_text_score"]
 
     def to_mongo(self, use_db_field=True, fields=None):
         """
@@ -307,11 +345,11 @@ def to_mongo(self, use_db_field=True, fields=None):
         fields = fields or []
 
         data = SON()
-        data['_id'] = None
-        data['_cls'] = self._class_name
+        data["_id"] = None
+        data["_cls"] = self._class_name
 
         # only root fields ['test1.a', 'test2'] => ['test1', 'test2']
-        root_fields = {f.split('.')[0] for f in fields}
+        root_fields = {f.split(".")[0] for f in fields}
 
         for field_name in self:
             if root_fields and field_name not in root_fields:
@@ -326,16 +364,16 @@ def to_mongo(self, use_db_field=True, fields=None):
             if value is not None:
                 f_inputs = field.to_mongo.__code__.co_varnames
                 ex_vars = {}
-                if fields and 'fields' in f_inputs:
-                    key = '%s.' % field_name
+                if fields and "fields" in f_inputs:
+                    key = "%s." % field_name
                     embedded_fields = [
-                        i.replace(key, '') for i in fields
-                        if i.startswith(key)]
+                        i.replace(key, "") for i in fields if i.startswith(key)
+                    ]
 
-                    ex_vars['fields'] = embedded_fields
+                    ex_vars["fields"] = embedded_fields
 
-                if 'use_db_field' in f_inputs:
-                    ex_vars['use_db_field'] = use_db_field
+                if "use_db_field" in f_inputs:
+                    ex_vars["use_db_field"] = use_db_field
 
                 value = field.to_mongo(value, **ex_vars)
 
@@ -351,8 +389,8 @@ def to_mongo(self, use_db_field=True, fields=None):
                     data[field.name] = value
 
         # Only add _cls if allow_inheritance is True
-        if not self._meta.get('allow_inheritance'):
-            data.pop('_cls')
+        if not self._meta.get("allow_inheritance"):
+            data.pop("_cls")
 
         return data
 
@@ -372,18 +410,23 @@ def validate(self, clean=True):
                 errors[NON_FIELD_ERRORS] = error
 
         # Get a list of tuples of field names and their current values
-        fields = [(self._fields.get(name, self._dynamic_fields.get(name)),
-                   self._data.get(name)) for name in self._fields_ordered]
+        fields = [
+            (
+                self._fields.get(name, self._dynamic_fields.get(name)),
+                self._data.get(name),
+            )
+            for name in self._fields_ordered
+        ]
 
-        EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
-        GenericEmbeddedDocumentField = _import_class(
-            'GenericEmbeddedDocumentField')
+        EmbeddedDocumentField = _import_class("EmbeddedDocumentField")
+        GenericEmbeddedDocumentField = _import_class("GenericEmbeddedDocumentField")
 
         for field, value in fields:
             if value is not None:
                 try:
-                    if isinstance(field, (EmbeddedDocumentField,
-                                          GenericEmbeddedDocumentField)):
+                    if isinstance(
+                        field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+                    ):
                         field._validate(value, clean=clean)
                     else:
                         field._validate(value)
@@ -391,17 +434,18 @@ def validate(self, clean=True):
                     errors[field.name] = error.errors or error
                 except (ValueError, AttributeError, AssertionError) as error:
                     errors[field.name] = error
-            elif field.required and not getattr(field, '_auto_gen', False):
-                errors[field.name] = ValidationError('Field is required',
-                                                     field_name=field.name)
+            elif field.required and not getattr(field, "_auto_gen", False):
+                errors[field.name] = ValidationError(
+                    "Field is required", field_name=field.name
+                )
 
         if errors:
-            pk = 'None'
-            if hasattr(self, 'pk'):
+            pk = "None"
+            if hasattr(self, "pk"):
                 pk = self.pk
-            elif self._instance and hasattr(self._instance, 'pk'):
+            elif self._instance and hasattr(self._instance, "pk"):
                 pk = self._instance.pk
-            message = 'ValidationError (%s:%s) ' % (self._class_name, pk)
+            message = "ValidationError (%s:%s) " % (self._class_name, pk)
             raise ValidationError(message, errors=errors)
 
     def to_json(self, *args, **kwargs):
@@ -411,7 +455,7 @@ def to_json(self, *args, **kwargs):
             MongoDB (as opposed to attribute names on this document).
             Defaults to True.
         """
-        use_db_field = kwargs.pop('use_db_field', True)
+        use_db_field = kwargs.pop("use_db_field", True)
         return json_util.dumps(self.to_mongo(use_db_field), *args, **kwargs)
 
     @classmethod
@@ -434,22 +478,18 @@ def __expand_dynamic_values(self, name, value):
 
         # If the value is a dict with '_cls' in it, turn it into a document
         is_dict = isinstance(value, dict)
-        if is_dict and '_cls' in value:
-            cls = get_document(value['_cls'])
+        if is_dict and "_cls" in value:
+            cls = get_document(value["_cls"])
             return cls(**value)
 
         if is_dict:
-            value = {
-                k: self.__expand_dynamic_values(k, v)
-                for k, v in value.items()
-            }
+            value = {k: self.__expand_dynamic_values(k, v) for k, v in value.items()}
         else:
             value = [self.__expand_dynamic_values(name, v) for v in value]
 
         # Convert lists / values so we can watch for any changes on them
-        EmbeddedDocumentListField = _import_class('EmbeddedDocumentListField')
-        if (isinstance(value, (list, tuple)) and
-                not isinstance(value, BaseList)):
+        EmbeddedDocumentListField = _import_class("EmbeddedDocumentListField")
+        if isinstance(value, (list, tuple)) and not isinstance(value, BaseList):
             if issubclass(type(self), EmbeddedDocumentListField):
                 value = EmbeddedDocumentList(value, self, name)
             else:
@@ -464,26 +504,26 @@ def _mark_as_changed(self, key):
         if not key:
             return
 
-        if not hasattr(self, '_changed_fields'):
+        if not hasattr(self, "_changed_fields"):
             return
 
-        if '.' in key:
-            key, rest = key.split('.', 1)
+        if "." in key:
+            key, rest = key.split(".", 1)
             key = self._db_field_map.get(key, key)
-            key = '%s.%s' % (key, rest)
+            key = "%s.%s" % (key, rest)
         else:
             key = self._db_field_map.get(key, key)
 
         if key not in self._changed_fields:
-            levels, idx = key.split('.'), 1
+            levels, idx = key.split("."), 1
             while idx <= len(levels):
-                if '.'.join(levels[:idx]) in self._changed_fields:
+                if ".".join(levels[:idx]) in self._changed_fields:
                     break
                 idx += 1
             else:
                 self._changed_fields.append(key)
                 # remove lower level changed fields
-                level = '.'.join(levels[:idx]) + '.'
+                level = ".".join(levels[:idx]) + "."
                 remove = self._changed_fields.remove
                 for field in self._changed_fields[:]:
                     if field.startswith(level):
@@ -494,7 +534,7 @@ def _clear_changed_fields(self):
         are marked as changed.
         """
         for changed in self._get_changed_fields():
-            parts = changed.split('.')
+            parts = changed.split(".")
             data = self
             for part in parts:
                 if isinstance(data, list):
@@ -507,8 +547,10 @@ def _clear_changed_fields(self):
                 else:
                     data = getattr(data, part, None)
 
-                if not isinstance(data, LazyReference) and hasattr(data, '_changed_fields'):
-                    if getattr(data, '_is_document', False):
+                if not isinstance(data, LazyReference) and hasattr(
+                    data, "_changed_fields"
+                ):
+                    if getattr(data, "_is_document", False):
                         continue
 
                     data._changed_fields = []
@@ -524,39 +566,38 @@ def _nestable_types_changed_fields(self, changed_fields, base_key, data):
         """
         # Loop list / dict fields as they contain documents
         # Determine the iterator to use
-        if not hasattr(data, 'items'):
+        if not hasattr(data, "items"):
             iterator = enumerate(data)
         else:
             iterator = iteritems(data)
 
         for index_or_key, value in iterator:
-            item_key = '%s%s.' % (base_key, index_or_key)
+            item_key = "%s%s." % (base_key, index_or_key)
             # don't check anything lower if this key is already marked
             # as changed.
             if item_key[:-1] in changed_fields:
                 continue
 
-            if hasattr(value, '_get_changed_fields'):
+            if hasattr(value, "_get_changed_fields"):
                 changed = value._get_changed_fields()
-                changed_fields += ['%s%s' % (item_key, k) for k in changed if k]
+                changed_fields += ["%s%s" % (item_key, k) for k in changed if k]
             elif isinstance(value, (list, tuple, dict)):
-                self._nestable_types_changed_fields(
-                    changed_fields, item_key, value)
+                self._nestable_types_changed_fields(changed_fields, item_key, value)
 
     def _get_changed_fields(self):
         """Return a list of all fields that have explicitly been changed.
         """
-        EmbeddedDocument = _import_class('EmbeddedDocument')
-        ReferenceField = _import_class('ReferenceField')
-        GenericReferenceField = _import_class('GenericReferenceField')
-        SortedListField = _import_class('SortedListField')
+        EmbeddedDocument = _import_class("EmbeddedDocument")
+        ReferenceField = _import_class("ReferenceField")
+        GenericReferenceField = _import_class("GenericReferenceField")
+        SortedListField = _import_class("SortedListField")
 
         changed_fields = []
-        changed_fields += getattr(self, '_changed_fields', [])
+        changed_fields += getattr(self, "_changed_fields", [])
 
         for field_name in self._fields_ordered:
             db_field_name = self._db_field_map.get(field_name, field_name)
-            key = '%s.' % db_field_name
+            key = "%s." % db_field_name
             data = self._data.get(field_name, None)
             field = self._fields.get(field_name)
 
@@ -564,16 +605,17 @@ def _get_changed_fields(self):
                 # Whole field already marked as changed, no need to go further
                 continue
 
-            if isinstance(field, ReferenceField):   # Don't follow referenced documents
+            if isinstance(field, ReferenceField):  # Don't follow referenced documents
                 continue
 
             if isinstance(data, EmbeddedDocument):
                 # Find all embedded fields that have been changed
                 changed = data._get_changed_fields()
-                changed_fields += ['%s%s' % (key, k) for k in changed if k]
+                changed_fields += ["%s%s" % (key, k) for k in changed if k]
             elif isinstance(data, (list, tuple, dict)):
-                if (hasattr(field, 'field') and
-                        isinstance(field.field, (ReferenceField, GenericReferenceField))):
+                if hasattr(field, "field") and isinstance(
+                    field.field, (ReferenceField, GenericReferenceField)
+                ):
                     continue
                 elif isinstance(field, SortedListField) and field._ordering:
                     # if ordering is affected whole list is changed
@@ -581,8 +623,7 @@ def _get_changed_fields(self):
                         changed_fields.append(db_field_name)
                         continue
 
-                self._nestable_types_changed_fields(
-                    changed_fields, key, data)
+                self._nestable_types_changed_fields(changed_fields, key, data)
         return changed_fields
 
     def _delta(self):
@@ -594,11 +635,11 @@ def _delta(self):
 
         set_fields = self._get_changed_fields()
         unset_data = {}
-        if hasattr(self, '_changed_fields'):
+        if hasattr(self, "_changed_fields"):
             set_data = {}
             # Fetch each set item from its path
             for path in set_fields:
-                parts = path.split('.')
+                parts = path.split(".")
                 d = doc
                 new_path = []
                 for p in parts:
@@ -608,26 +649,27 @@ def _delta(self):
                     elif isinstance(d, list) and p.isdigit():
                         # An item of a list (identified by its index) is updated
                         d = d[int(p)]
-                    elif hasattr(d, 'get'):
+                    elif hasattr(d, "get"):
                         # dict-like (dict, embedded document)
                         d = d.get(p)
                     new_path.append(p)
-                path = '.'.join(new_path)
+                path = ".".join(new_path)
                 set_data[path] = d
         else:
             set_data = doc
-            if '_id' in set_data:
-                del set_data['_id']
+            if "_id" in set_data:
+                del set_data["_id"]
 
         # Determine if any changed items were actually unset.
         for path, value in set_data.items():
-            if value or isinstance(value, (numbers.Number, bool)):  # Account for 0 and True that are truthy
+            if value or isinstance(
+                value, (numbers.Number, bool)
+            ):  # Account for 0 and True that are truthy
                 continue
 
-            parts = path.split('.')
+            parts = path.split(".")
 
-            if (self._dynamic and len(parts) and parts[0] in
-                    self._dynamic_fields):
+            if self._dynamic and len(parts) and parts[0] in self._dynamic_fields:
                 del set_data[path]
                 unset_data[path] = 1
                 continue
@@ -642,16 +684,16 @@ def _delta(self):
                 for p in parts:
                     if isinstance(d, list) and p.isdigit():
                         d = d[int(p)]
-                    elif (hasattr(d, '__getattribute__') and
-                          not isinstance(d, dict)):
+                    elif hasattr(d, "__getattribute__") and not isinstance(d, dict):
                         real_path = d._reverse_db_field_map.get(p, p)
                         d = getattr(d, real_path)
                     else:
                         d = d.get(p)
 
-                if hasattr(d, '_fields'):
-                    field_name = d._reverse_db_field_map.get(db_field_name,
-                                                             db_field_name)
+                if hasattr(d, "_fields"):
+                    field_name = d._reverse_db_field_map.get(
+                        db_field_name, db_field_name
+                    )
                     if field_name in d._fields:
                         default = d._fields.get(field_name).default
                     else:
@@ -672,7 +714,7 @@ def _get_collection_name(cls):
         """Return the collection name for this class. None for abstract
         class.
         """
-        return cls._meta.get('collection', None)
+        return cls._meta.get("collection", None)
 
     @classmethod
     def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False):
@@ -685,7 +727,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
 
         # Get the class name from the document, falling back to the given
         # class if unavailable
-        class_name = son.get('_cls', cls._class_name)
+        class_name = son.get("_cls", cls._class_name)
 
         # Convert SON to a data dict, making sure each key is a string and
         # corresponds to the right db field.
@@ -710,18 +752,20 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
             if field.db_field in data:
                 value = data[field.db_field]
                 try:
-                    data[field_name] = (value if value is None
-                                        else field.to_python(value))
+                    data[field_name] = (
+                        value if value is None else field.to_python(value)
+                    )
                     if field_name != field.db_field:
                         del data[field.db_field]
                 except (AttributeError, ValueError) as e:
                     errors_dict[field_name] = e
 
         if errors_dict:
-            errors = '\n'.join(['%s - %s' % (k, v)
-                                for k, v in errors_dict.items()])
-            msg = ('Invalid data to create a `%s` instance.\n%s'
-                   % (cls._class_name, errors))
+            errors = "\n".join(["%s - %s" % (k, v) for k, v in errors_dict.items()])
+            msg = "Invalid data to create a `%s` instance.\n%s" % (
+                cls._class_name,
+                errors,
+            )
             raise InvalidDocumentError(msg)
 
         # In STRICT documents, remove any keys that aren't in cls._fields
@@ -729,10 +773,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
             data = {k: v for k, v in iteritems(data) if k in cls._fields}
 
         obj = cls(
-            __auto_convert=False,
-            _created=created,
-            __only_fields=only_fields,
-            **data
+            __auto_convert=False, _created=created, __only_fields=only_fields, **data
         )
         obj._changed_fields = []
         if not _auto_dereference:
@@ -754,15 +795,13 @@ def merge_index_specs(index_specs, indices):
 
             # Create a map of index fields to index spec. We're converting
             # the fields from a list to a tuple so that it's hashable.
-            spec_fields = {
-                tuple(index['fields']): index for index in index_specs
-            }
+            spec_fields = {tuple(index["fields"]): index for index in index_specs}
 
             # For each new index, if there's an existing index with the same
             # fields list, update the existing spec with all data from the
             # new spec.
             for new_index in indices:
-                candidate = spec_fields.get(tuple(new_index['fields']))
+                candidate = spec_fields.get(tuple(new_index["fields"]))
                 if candidate is None:
                     index_specs.append(new_index)
                 else:
@@ -779,9 +818,9 @@ def merge_index_specs(index_specs, indices):
     def _build_index_spec(cls, spec):
         """Build a PyMongo index spec from a MongoEngine index spec."""
         if isinstance(spec, six.string_types):
-            spec = {'fields': [spec]}
+            spec = {"fields": [spec]}
         elif isinstance(spec, (list, tuple)):
-            spec = {'fields': list(spec)}
+            spec = {"fields": list(spec)}
         elif isinstance(spec, dict):
             spec = dict(spec)
 
@@ -789,19 +828,21 @@ def _build_index_spec(cls, spec):
         direction = None
 
         # Check to see if we need to include _cls
-        allow_inheritance = cls._meta.get('allow_inheritance')
+        allow_inheritance = cls._meta.get("allow_inheritance")
         include_cls = (
-            allow_inheritance and
-            not spec.get('sparse', False) and
-            spec.get('cls', True) and
-            '_cls' not in spec['fields']
+            allow_inheritance
+            and not spec.get("sparse", False)
+            and spec.get("cls", True)
+            and "_cls" not in spec["fields"]
         )
 
         # 733: don't include cls if index_cls is False unless there is an explicit cls with the index
-        include_cls = include_cls and (spec.get('cls', False) or cls._meta.get('index_cls', True))
-        if 'cls' in spec:
-            spec.pop('cls')
-        for key in spec['fields']:
+        include_cls = include_cls and (
+            spec.get("cls", False) or cls._meta.get("index_cls", True)
+        )
+        if "cls" in spec:
+            spec.pop("cls")
+        for key in spec["fields"]:
             # If inherited spec continue
             if isinstance(key, (list, tuple)):
                 continue
@@ -814,51 +855,54 @@ def _build_index_spec(cls, spec):
             # GEOHAYSTACK from )
             # GEO2D from *
             direction = pymongo.ASCENDING
-            if key.startswith('-'):
+            if key.startswith("-"):
                 direction = pymongo.DESCENDING
-            elif key.startswith('$'):
+            elif key.startswith("$"):
                 direction = pymongo.TEXT
-            elif key.startswith('#'):
+            elif key.startswith("#"):
                 direction = pymongo.HASHED
-            elif key.startswith('('):
+            elif key.startswith("("):
                 direction = pymongo.GEOSPHERE
-            elif key.startswith(')'):
+            elif key.startswith(")"):
                 direction = pymongo.GEOHAYSTACK
-            elif key.startswith('*'):
+            elif key.startswith("*"):
                 direction = pymongo.GEO2D
-            if key.startswith(('+', '-', '*', '$', '#', '(', ')')):
+            if key.startswith(("+", "-", "*", "$", "#", "(", ")")):
                 key = key[1:]
 
             # Use real field name, do it manually because we need field
             # objects for the next part (list field checking)
-            parts = key.split('.')
-            if parts in (['pk'], ['id'], ['_id']):
-                key = '_id'
+            parts = key.split(".")
+            if parts in (["pk"], ["id"], ["_id"]):
+                key = "_id"
             else:
                 fields = cls._lookup_field(parts)
                 parts = []
                 for field in fields:
                     try:
-                        if field != '_id':
+                        if field != "_id":
                             field = field.db_field
                     except AttributeError:
                         pass
                     parts.append(field)
-                key = '.'.join(parts)
+                key = ".".join(parts)
             index_list.append((key, direction))
 
         # Don't add cls to a geo index
         if include_cls and direction not in (
-                pymongo.GEO2D, pymongo.GEOHAYSTACK, pymongo.GEOSPHERE):
-            index_list.insert(0, ('_cls', 1))
+            pymongo.GEO2D,
+            pymongo.GEOHAYSTACK,
+            pymongo.GEOSPHERE,
+        ):
+            index_list.insert(0, ("_cls", 1))
 
         if index_list:
-            spec['fields'] = index_list
+            spec["fields"] = index_list
 
         return spec
 
     @classmethod
-    def _unique_with_indexes(cls, namespace=''):
+    def _unique_with_indexes(cls, namespace=""):
         """Find unique indexes in the document schema and return them."""
         unique_indexes = []
         for field_name, field in cls._fields.items():
@@ -876,36 +920,39 @@ def _unique_with_indexes(cls, namespace=''):
                     # Convert unique_with field names to real field names
                     unique_with = []
                     for other_name in field.unique_with:
-                        parts = other_name.split('.')
+                        parts = other_name.split(".")
 
                         # Lookup real name
                         parts = cls._lookup_field(parts)
                         name_parts = [part.db_field for part in parts]
-                        unique_with.append('.'.join(name_parts))
+                        unique_with.append(".".join(name_parts))
 
                         # Unique field should be required
                         parts[-1].required = True
-                        sparse = (not sparse and
-                                  parts[-1].name not in cls.__dict__)
+                        sparse = not sparse and parts[-1].name not in cls.__dict__
 
                     unique_fields += unique_with
 
                 # Add the new index to the list
                 fields = [
-                    ('%s%s' % (namespace, f), pymongo.ASCENDING)
-                    for f in unique_fields
+                    ("%s%s" % (namespace, f), pymongo.ASCENDING) for f in unique_fields
                 ]
-                index = {'fields': fields, 'unique': True, 'sparse': sparse}
+                index = {"fields": fields, "unique": True, "sparse": sparse}
                 unique_indexes.append(index)
 
-            if field.__class__.__name__ in {'EmbeddedDocumentListField',
-                                            'ListField', 'SortedListField'}:
+            if field.__class__.__name__ in {
+                "EmbeddedDocumentListField",
+                "ListField",
+                "SortedListField",
+            }:
                 field = field.field
 
             # Grab any embedded document field unique indexes
-            if (field.__class__.__name__ == 'EmbeddedDocumentField' and
-                    field.document_type != cls):
-                field_namespace = '%s.' % field_name
+            if (
+                field.__class__.__name__ == "EmbeddedDocumentField"
+                and field.document_type != cls
+            ):
+                field_namespace = "%s." % field_name
                 doc_cls = field.document_type
                 unique_indexes += doc_cls._unique_with_indexes(field_namespace)
 
@@ -917,32 +964,36 @@ def _geo_indices(cls, inspected=None, parent_field=None):
         geo_indices = []
         inspected.append(cls)
 
-        geo_field_type_names = ('EmbeddedDocumentField', 'GeoPointField',
-                                'PointField', 'LineStringField',
-                                'PolygonField')
+        geo_field_type_names = (
+            "EmbeddedDocumentField",
+            "GeoPointField",
+            "PointField",
+            "LineStringField",
+            "PolygonField",
+        )
 
-        geo_field_types = tuple([_import_class(field)
-                                 for field in geo_field_type_names])
+        geo_field_types = tuple(
+            [_import_class(field) for field in geo_field_type_names]
+        )
 
         for field in cls._fields.values():
             if not isinstance(field, geo_field_types):
                 continue
 
-            if hasattr(field, 'document_type'):
+            if hasattr(field, "document_type"):
                 field_cls = field.document_type
                 if field_cls in inspected:
                     continue
 
-                if hasattr(field_cls, '_geo_indices'):
+                if hasattr(field_cls, "_geo_indices"):
                     geo_indices += field_cls._geo_indices(
-                        inspected, parent_field=field.db_field)
+                        inspected, parent_field=field.db_field
+                    )
             elif field._geo_index:
                 field_name = field.db_field
                 if parent_field:
-                    field_name = '%s.%s' % (parent_field, field_name)
-                geo_indices.append({
-                    'fields': [(field_name, field._geo_index)]
-                })
+                    field_name = "%s.%s" % (parent_field, field_name)
+                geo_indices.append({"fields": [(field_name, field._geo_index)]})
 
         return geo_indices
 
@@ -983,8 +1034,8 @@ def _lookup_field(cls, parts):
         # TODO this method is WAY too complicated. Simplify it.
         # TODO don't think returning a string for embedded non-existent fields is desired
 
-        ListField = _import_class('ListField')
-        DynamicField = _import_class('DynamicField')
+        ListField = _import_class("ListField")
+        DynamicField = _import_class("DynamicField")
 
         if not isinstance(parts, (list, tuple)):
             parts = [parts]
@@ -1000,15 +1051,17 @@ def _lookup_field(cls, parts):
 
             # Look up first field from the document
             if field is None:
-                if field_name == 'pk':
+                if field_name == "pk":
                     # Deal with "primary key" alias
-                    field_name = cls._meta['id_field']
+                    field_name = cls._meta["id_field"]
 
                 if field_name in cls._fields:
                     field = cls._fields[field_name]
                 elif cls._dynamic:
                     field = DynamicField(db_field=field_name)
-                elif cls._meta.get('allow_inheritance') or cls._meta.get('abstract', False):
+                elif cls._meta.get("allow_inheritance") or cls._meta.get(
+                    "abstract", False
+                ):
                     # 744: in case the field is defined in a subclass
                     for subcls in cls.__subclasses__():
                         try:
@@ -1023,38 +1076,41 @@ def _lookup_field(cls, parts):
                 else:
                     raise LookUpError('Cannot resolve field "%s"' % field_name)
             else:
-                ReferenceField = _import_class('ReferenceField')
-                GenericReferenceField = _import_class('GenericReferenceField')
+                ReferenceField = _import_class("ReferenceField")
+                GenericReferenceField = _import_class("GenericReferenceField")
 
                 # If previous field was a reference, throw an error (we
                 # cannot look up fields that are on references).
                 if isinstance(field, (ReferenceField, GenericReferenceField)):
-                    raise LookUpError('Cannot perform join in mongoDB: %s' %
-                                      '__'.join(parts))
+                    raise LookUpError(
+                        "Cannot perform join in mongoDB: %s" % "__".join(parts)
+                    )
 
                 # If the parent field has a "field" attribute which has a
                 # lookup_member method, call it to find the field
                 # corresponding to this iteration.
-                if hasattr(getattr(field, 'field', None), 'lookup_member'):
+                if hasattr(getattr(field, "field", None), "lookup_member"):
                     new_field = field.field.lookup_member(field_name)
 
                 # If the parent field is a DynamicField or if it's part of
                 # a DynamicDocument, mark current field as a DynamicField
                 # with db_name equal to the field name.
-                elif cls._dynamic and (isinstance(field, DynamicField) or
-                                       getattr(getattr(field, 'document_type', None), '_dynamic', None)):
+                elif cls._dynamic and (
+                    isinstance(field, DynamicField)
+                    or getattr(getattr(field, "document_type", None), "_dynamic", None)
+                ):
                     new_field = DynamicField(db_field=field_name)
 
                 # Else, try to use the parent field's lookup_member method
                 # to find the subfield.
-                elif hasattr(field, 'lookup_member'):
+                elif hasattr(field, "lookup_member"):
                     new_field = field.lookup_member(field_name)
 
                 # Raise a LookUpError if all the other conditions failed.
                 else:
                     raise LookUpError(
-                        'Cannot resolve subfield or operator {} '
-                        'on the field {}'.format(field_name, field.name)
+                        "Cannot resolve subfield or operator {} "
+                        "on the field {}".format(field_name, field.name)
                     )
 
                 # If current field still wasn't found and the parent field
@@ -1073,23 +1129,24 @@ def _lookup_field(cls, parts):
         return fields
 
     @classmethod
-    def _translate_field_name(cls, field, sep='.'):
+    def _translate_field_name(cls, field, sep="."):
         """Translate a field attribute name to a database field name.
         """
         parts = field.split(sep)
         parts = [f.db_field for f in cls._lookup_field(parts)]
-        return '.'.join(parts)
+        return ".".join(parts)
 
     def __set_field_display(self):
         """For each field that specifies choices, create a
         get_<field>_display method.
         """
-        fields_with_choices = [(n, f) for n, f in self._fields.items()
-                               if f.choices]
+        fields_with_choices = [(n, f) for n, f in self._fields.items() if f.choices]
         for attr_name, field in fields_with_choices:
-            setattr(self,
-                    'get_%s_display' % attr_name,
-                    partial(self.__get_field_display, field=field))
+            setattr(
+                self,
+                "get_%s_display" % attr_name,
+                partial(self.__get_field_display, field=field),
+            )
 
     def __get_field_display(self, field):
         """Return the display value for a choice field"""
@@ -1097,9 +1154,16 @@ def __get_field_display(self, field):
         if field.choices and isinstance(field.choices[0], (list, tuple)):
             if value is None:
                 return None
-            sep = getattr(field, 'display_sep', ' ')
-            values = value if field.__class__.__name__ in ('ListField', 'SortedListField') else [value]
-            return sep.join([
-                six.text_type(dict(field.choices).get(val, val))
-                for val in values or []])
+            sep = getattr(field, "display_sep", " ")
+            values = (
+                value
+                if field.__class__.__name__ in ("ListField", "SortedListField")
+                else [value]
+            )
+            return sep.join(
+                [
+                    six.text_type(dict(field.choices).get(val, val))
+                    for val in values or []
+                ]
+            )
         return value
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 9ce426c96..cd1039cbb 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -8,13 +8,11 @@
 from six import iteritems
 
 from mongoengine.base.common import UPDATE_OPERATORS
-from mongoengine.base.datastructures import (BaseDict, BaseList,
-                                             EmbeddedDocumentList)
+from mongoengine.base.datastructures import BaseDict, BaseList, EmbeddedDocumentList
 from mongoengine.common import _import_class
 from mongoengine.errors import DeprecatedError, ValidationError
 
-__all__ = ('BaseField', 'ComplexBaseField', 'ObjectIdField',
-           'GeoJsonBaseField')
+__all__ = ("BaseField", "ComplexBaseField", "ObjectIdField", "GeoJsonBaseField")
 
 
 class BaseField(object):
@@ -23,6 +21,7 @@ class BaseField(object):
 
     .. versionchanged:: 0.5 - added verbose and help text
     """
+
     name = None
     _geo_index = False
     _auto_gen = False  # Call `generate` to generate a value
@@ -34,10 +33,21 @@ class BaseField(object):
     creation_counter = 0
     auto_creation_counter = -1
 
-    def __init__(self, db_field=None, name=None, required=False, default=None,
-                 unique=False, unique_with=None, primary_key=False,
-                 validation=None, choices=None, null=False, sparse=False,
-                 **kwargs):
+    def __init__(
+        self,
+        db_field=None,
+        name=None,
+        required=False,
+        default=None,
+        unique=False,
+        unique_with=None,
+        primary_key=False,
+        validation=None,
+        choices=None,
+        null=False,
+        sparse=False,
+        **kwargs
+    ):
         """
         :param db_field: The database field to store this field in
             (defaults to the name of the field)
@@ -65,7 +75,7 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
             existing attributes. Common metadata includes `verbose_name` and
             `help_text`.
         """
-        self.db_field = (db_field or name) if not primary_key else '_id'
+        self.db_field = (db_field or name) if not primary_key else "_id"
 
         if name:
             msg = 'Field\'s "name" attribute deprecated in favour of "db_field"'
@@ -82,17 +92,16 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         self._owner_document = None
 
         # Make sure db_field is a string (if it's explicitly defined).
-        if (
-            self.db_field is not None and
-            not isinstance(self.db_field, six.string_types)
+        if self.db_field is not None and not isinstance(
+            self.db_field, six.string_types
         ):
-            raise TypeError('db_field should be a string.')
+            raise TypeError("db_field should be a string.")
 
         # Make sure db_field doesn't contain any forbidden characters.
         if isinstance(self.db_field, six.string_types) and (
-            '.' in self.db_field or
-            '\0' in self.db_field or
-            self.db_field.startswith('$')
+            "." in self.db_field
+            or "\0" in self.db_field
+            or self.db_field.startswith("$")
         ):
             raise ValueError(
                 'field names cannot contain dots (".") or null characters '
@@ -102,15 +111,17 @@ def __init__(self, db_field=None, name=None, required=False, default=None,
         # Detect and report conflicts between metadata and base properties.
         conflicts = set(dir(self)) & set(kwargs)
         if conflicts:
-            raise TypeError('%s already has attribute(s): %s' % (
-                self.__class__.__name__, ', '.join(conflicts)))
+            raise TypeError(
+                "%s already has attribute(s): %s"
+                % (self.__class__.__name__, ", ".join(conflicts))
+            )
 
         # Assign metadata to the instance
         # This efficient method is available because no __slots__ are defined.
         self.__dict__.update(kwargs)
 
         # Adjust the appropriate creation counter, and save our local copy.
-        if self.db_field == '_id':
+        if self.db_field == "_id":
             self.creation_counter = BaseField.auto_creation_counter
             BaseField.auto_creation_counter -= 1
         else:
@@ -142,8 +153,8 @@ def __set__(self, instance, value):
         if instance._initialised:
             try:
                 value_has_changed = (
-                    self.name not in instance._data or
-                    instance._data[self.name] != value
+                    self.name not in instance._data
+                    or instance._data[self.name] != value
                 )
                 if value_has_changed:
                     instance._mark_as_changed(self.name)
@@ -153,7 +164,7 @@ def __set__(self, instance, value):
                 # Mark the field as changed in such cases.
                 instance._mark_as_changed(self.name)
 
-        EmbeddedDocument = _import_class('EmbeddedDocument')
+        EmbeddedDocument = _import_class("EmbeddedDocument")
         if isinstance(value, EmbeddedDocument):
             value._instance = weakref.proxy(instance)
         elif isinstance(value, (list, tuple)):
@@ -163,7 +174,7 @@ def __set__(self, instance, value):
 
         instance._data[self.name] = value
 
-    def error(self, message='', errors=None, field_name=None):
+    def error(self, message="", errors=None, field_name=None):
         """Raise a ValidationError."""
         field_name = field_name if field_name else self.name
         raise ValidationError(message, errors=errors, field_name=field_name)
@@ -180,11 +191,11 @@ def _to_mongo_safe_call(self, value, use_db_field=True, fields=None):
         """Helper method to call to_mongo with proper inputs."""
         f_inputs = self.to_mongo.__code__.co_varnames
         ex_vars = {}
-        if 'fields' in f_inputs:
-            ex_vars['fields'] = fields
+        if "fields" in f_inputs:
+            ex_vars["fields"] = fields
 
-        if 'use_db_field' in f_inputs:
-            ex_vars['use_db_field'] = use_db_field
+        if "use_db_field" in f_inputs:
+            ex_vars["use_db_field"] = use_db_field
 
         return self.to_mongo(value, **ex_vars)
 
@@ -199,8 +210,8 @@ def validate(self, value, clean=True):
         pass
 
     def _validate_choices(self, value):
-        Document = _import_class('Document')
-        EmbeddedDocument = _import_class('EmbeddedDocument')
+        Document = _import_class("Document")
+        EmbeddedDocument = _import_class("EmbeddedDocument")
 
         choice_list = self.choices
         if isinstance(next(iter(choice_list)), (list, tuple)):
@@ -211,15 +222,13 @@ def _validate_choices(self, value):
         if isinstance(value, (Document, EmbeddedDocument)):
             if not any(isinstance(value, c) for c in choice_list):
                 self.error(
-                    'Value must be an instance of %s' % (
-                        six.text_type(choice_list)
-                    )
+                    "Value must be an instance of %s" % (six.text_type(choice_list))
                 )
         # Choices which are types other than Documents
         else:
             values = value if isinstance(value, (list, tuple)) else [value]
             if len(set(values) - set(choice_list)):
-                self.error('Value must be one of %s' % six.text_type(choice_list))
+                self.error("Value must be one of %s" % six.text_type(choice_list))
 
     def _validate(self, value, **kwargs):
         # Check the Choices Constraint
@@ -235,13 +244,17 @@ def _validate(self, value, **kwargs):
                     # in favor of having validation raising a ValidationError
                     ret = self.validation(value)
                     if ret is not None:
-                        raise DeprecatedError('validation argument for `%s` must not return anything, '
-                                              'it should raise a ValidationError if validation fails' % self.name)
+                        raise DeprecatedError(
+                            "validation argument for `%s` must not return anything, "
+                            "it should raise a ValidationError if validation fails"
+                            % self.name
+                        )
                 except ValidationError as ex:
                     self.error(str(ex))
             else:
-                raise ValueError('validation argument for `"%s"` must be a '
-                                 'callable.' % self.name)
+                raise ValueError(
+                    'validation argument for `"%s"` must be a ' "callable." % self.name
+                )
 
         self.validate(value, **kwargs)
 
@@ -275,35 +288,41 @@ def __get__(self, instance, owner):
             # Document class being used rather than a document object
             return self
 
-        ReferenceField = _import_class('ReferenceField')
-        GenericReferenceField = _import_class('GenericReferenceField')
-        EmbeddedDocumentListField = _import_class('EmbeddedDocumentListField')
+        ReferenceField = _import_class("ReferenceField")
+        GenericReferenceField = _import_class("GenericReferenceField")
+        EmbeddedDocumentListField = _import_class("EmbeddedDocumentListField")
 
         auto_dereference = instance._fields[self.name]._auto_dereference
 
-        dereference = (auto_dereference and
-                       (self.field is None or isinstance(self.field,
-                                                         (GenericReferenceField, ReferenceField))))
+        dereference = auto_dereference and (
+            self.field is None
+            or isinstance(self.field, (GenericReferenceField, ReferenceField))
+        )
 
-        _dereference = _import_class('DeReference')()
+        _dereference = _import_class("DeReference")()
 
-        if (instance._initialised and
-                dereference and
-                instance._data.get(self.name) and
-                not getattr(instance._data[self.name], '_dereferenced', False)):
+        if (
+            instance._initialised
+            and dereference
+            and instance._data.get(self.name)
+            and not getattr(instance._data[self.name], "_dereferenced", False)
+        ):
             instance._data[self.name] = _dereference(
-                instance._data.get(self.name), max_depth=1, instance=instance,
-                name=self.name
+                instance._data.get(self.name),
+                max_depth=1,
+                instance=instance,
+                name=self.name,
             )
-            if hasattr(instance._data[self.name], '_dereferenced'):
+            if hasattr(instance._data[self.name], "_dereferenced"):
                 instance._data[self.name]._dereferenced = True
 
         value = super(ComplexBaseField, self).__get__(instance, owner)
 
         # Convert lists / values so we can watch for any changes on them
         if isinstance(value, (list, tuple)):
-            if (issubclass(type(self), EmbeddedDocumentListField) and
-                    not isinstance(value, EmbeddedDocumentList)):
+            if issubclass(type(self), EmbeddedDocumentListField) and not isinstance(
+                value, EmbeddedDocumentList
+            ):
                 value = EmbeddedDocumentList(value, instance, self.name)
             elif not isinstance(value, BaseList):
                 value = BaseList(value, instance, self.name)
@@ -312,12 +331,13 @@ def __get__(self, instance, owner):
             value = BaseDict(value, instance, self.name)
             instance._data[self.name] = value
 
-        if (auto_dereference and instance._initialised and
-                isinstance(value, (BaseList, BaseDict)) and
-                not value._dereferenced):
-            value = _dereference(
-                value, max_depth=1, instance=instance, name=self.name
-            )
+        if (
+            auto_dereference
+            and instance._initialised
+            and isinstance(value, (BaseList, BaseDict))
+            and not value._dereferenced
+        ):
+            value = _dereference(value, max_depth=1, instance=instance, name=self.name)
             value._dereferenced = True
             instance._data[self.name] = value
 
@@ -328,16 +348,16 @@ def to_python(self, value):
         if isinstance(value, six.string_types):
             return value
 
-        if hasattr(value, 'to_python'):
+        if hasattr(value, "to_python"):
             return value.to_python()
 
-        BaseDocument = _import_class('BaseDocument')
+        BaseDocument = _import_class("BaseDocument")
         if isinstance(value, BaseDocument):
             # Something is wrong, return the value as it is
             return value
 
         is_list = False
-        if not hasattr(value, 'items'):
+        if not hasattr(value, "items"):
             try:
                 is_list = True
                 value = {idx: v for idx, v in enumerate(value)}
@@ -346,50 +366,54 @@ def to_python(self, value):
 
         if self.field:
             self.field._auto_dereference = self._auto_dereference
-            value_dict = {key: self.field.to_python(item)
-                          for key, item in value.items()}
+            value_dict = {
+                key: self.field.to_python(item) for key, item in value.items()
+            }
         else:
-            Document = _import_class('Document')
+            Document = _import_class("Document")
             value_dict = {}
             for k, v in value.items():
                 if isinstance(v, Document):
                     # We need the id from the saved object to create the DBRef
                     if v.pk is None:
-                        self.error('You can only reference documents once they'
-                                   ' have been saved to the database')
+                        self.error(
+                            "You can only reference documents once they"
+                            " have been saved to the database"
+                        )
                     collection = v._get_collection_name()
                     value_dict[k] = DBRef(collection, v.pk)
-                elif hasattr(v, 'to_python'):
+                elif hasattr(v, "to_python"):
                     value_dict[k] = v.to_python()
                 else:
                     value_dict[k] = self.to_python(v)
 
         if is_list:  # Convert back to a list
-            return [v for _, v in sorted(value_dict.items(),
-                                         key=operator.itemgetter(0))]
+            return [
+                v for _, v in sorted(value_dict.items(), key=operator.itemgetter(0))
+            ]
         return value_dict
 
     def to_mongo(self, value, use_db_field=True, fields=None):
         """Convert a Python type to a MongoDB-compatible type."""
-        Document = _import_class('Document')
-        EmbeddedDocument = _import_class('EmbeddedDocument')
-        GenericReferenceField = _import_class('GenericReferenceField')
+        Document = _import_class("Document")
+        EmbeddedDocument = _import_class("EmbeddedDocument")
+        GenericReferenceField = _import_class("GenericReferenceField")
 
         if isinstance(value, six.string_types):
             return value
 
-        if hasattr(value, 'to_mongo'):
+        if hasattr(value, "to_mongo"):
             if isinstance(value, Document):
                 return GenericReferenceField().to_mongo(value)
             cls = value.__class__
             val = value.to_mongo(use_db_field, fields)
             # If it's a document that is not inherited add _cls
             if isinstance(value, EmbeddedDocument):
-                val['_cls'] = cls.__name__
+                val["_cls"] = cls.__name__
             return val
 
         is_list = False
-        if not hasattr(value, 'items'):
+        if not hasattr(value, "items"):
             try:
                 is_list = True
                 value = {k: v for k, v in enumerate(value)}
@@ -407,39 +431,42 @@ def to_mongo(self, value, use_db_field=True, fields=None):
                 if isinstance(v, Document):
                     # We need the id from the saved object to create the DBRef
                     if v.pk is None:
-                        self.error('You can only reference documents once they'
-                                   ' have been saved to the database')
+                        self.error(
+                            "You can only reference documents once they"
+                            " have been saved to the database"
+                        )
 
                     # If its a document that is not inheritable it won't have
                     # any _cls data so make it a generic reference allows
                     # us to dereference
-                    meta = getattr(v, '_meta', {})
-                    allow_inheritance = meta.get('allow_inheritance')
+                    meta = getattr(v, "_meta", {})
+                    allow_inheritance = meta.get("allow_inheritance")
                     if not allow_inheritance and not self.field:
                         value_dict[k] = GenericReferenceField().to_mongo(v)
                     else:
                         collection = v._get_collection_name()
                         value_dict[k] = DBRef(collection, v.pk)
-                elif hasattr(v, 'to_mongo'):
+                elif hasattr(v, "to_mongo"):
                     cls = v.__class__
                     val = v.to_mongo(use_db_field, fields)
                     # If it's a document that is not inherited add _cls
                     if isinstance(v, (Document, EmbeddedDocument)):
-                        val['_cls'] = cls.__name__
+                        val["_cls"] = cls.__name__
                     value_dict[k] = val
                 else:
                     value_dict[k] = self.to_mongo(v, use_db_field, fields)
 
         if is_list:  # Convert back to a list
-            return [v for _, v in sorted(value_dict.items(),
-                                         key=operator.itemgetter(0))]
+            return [
+                v for _, v in sorted(value_dict.items(), key=operator.itemgetter(0))
+            ]
         return value_dict
 
     def validate(self, value):
         """If field is provided ensure the value is valid."""
         errors = {}
         if self.field:
-            if hasattr(value, 'iteritems') or hasattr(value, 'items'):
+            if hasattr(value, "iteritems") or hasattr(value, "items"):
                 sequence = iteritems(value)
             else:
                 sequence = enumerate(value)
@@ -453,11 +480,10 @@ def validate(self, value):
 
             if errors:
                 field_class = self.field.__class__.__name__
-                self.error('Invalid %s item (%s)' % (field_class, value),
-                           errors=errors)
+                self.error("Invalid %s item (%s)" % (field_class, value), errors=errors)
         # Don't allow empty values if required
         if self.required and not value:
-            self.error('Field is required and cannot be empty')
+            self.error("Field is required and cannot be empty")
 
     def prepare_query_value(self, op, value):
         return self.to_mongo(value)
@@ -500,7 +526,7 @@ def validate(self, value):
         try:
             ObjectId(six.text_type(value))
         except Exception:
-            self.error('Invalid Object ID')
+            self.error("Invalid Object ID")
 
 
 class GeoJsonBaseField(BaseField):
@@ -510,14 +536,14 @@ class GeoJsonBaseField(BaseField):
     """
 
     _geo_index = pymongo.GEOSPHERE
-    _type = 'GeoBase'
+    _type = "GeoBase"
 
     def __init__(self, auto_index=True, *args, **kwargs):
         """
         :param bool auto_index: Automatically create a '2dsphere' index.\
             Defaults to `True`.
         """
-        self._name = '%sField' % self._type
+        self._name = "%sField" % self._type
         if not auto_index:
             self._geo_index = False
         super(GeoJsonBaseField, self).__init__(*args, **kwargs)
@@ -525,57 +551,58 @@ def __init__(self, auto_index=True, *args, **kwargs):
     def validate(self, value):
         """Validate the GeoJson object based on its type."""
         if isinstance(value, dict):
-            if set(value.keys()) == {'type', 'coordinates'}:
-                if value['type'] != self._type:
-                    self.error('%s type must be "%s"' %
-                               (self._name, self._type))
-                return self.validate(value['coordinates'])
+            if set(value.keys()) == {"type", "coordinates"}:
+                if value["type"] != self._type:
+                    self.error('%s type must be "%s"' % (self._name, self._type))
+                return self.validate(value["coordinates"])
             else:
-                self.error('%s can only accept a valid GeoJson dictionary'
-                           ' or lists of (x, y)' % self._name)
+                self.error(
+                    "%s can only accept a valid GeoJson dictionary"
+                    " or lists of (x, y)" % self._name
+                )
                 return
         elif not isinstance(value, (list, tuple)):
-            self.error('%s can only accept lists of [x, y]' % self._name)
+            self.error("%s can only accept lists of [x, y]" % self._name)
             return
 
-        validate = getattr(self, '_validate_%s' % self._type.lower())
+        validate = getattr(self, "_validate_%s" % self._type.lower())
         error = validate(value)
         if error:
             self.error(error)
 
     def _validate_polygon(self, value, top_level=True):
         if not isinstance(value, (list, tuple)):
-            return 'Polygons must contain list of linestrings'
+            return "Polygons must contain list of linestrings"
 
         # Quick and dirty validator
         try:
             value[0][0][0]
         except (TypeError, IndexError):
-            return 'Invalid Polygon must contain at least one valid linestring'
+            return "Invalid Polygon must contain at least one valid linestring"
 
         errors = []
         for val in value:
             error = self._validate_linestring(val, False)
             if not error and val[0] != val[-1]:
-                error = 'LineStrings must start and end at the same point'
+                error = "LineStrings must start and end at the same point"
             if error and error not in errors:
                 errors.append(error)
         if errors:
             if top_level:
-                return 'Invalid Polygon:\n%s' % ', '.join(errors)
+                return "Invalid Polygon:\n%s" % ", ".join(errors)
             else:
-                return '%s' % ', '.join(errors)
+                return "%s" % ", ".join(errors)
 
     def _validate_linestring(self, value, top_level=True):
         """Validate a linestring."""
         if not isinstance(value, (list, tuple)):
-            return 'LineStrings must contain list of coordinate pairs'
+            return "LineStrings must contain list of coordinate pairs"
 
         # Quick and dirty validator
         try:
             value[0][0]
         except (TypeError, IndexError):
-            return 'Invalid LineString must contain at least one valid point'
+            return "Invalid LineString must contain at least one valid point"
 
         errors = []
         for val in value:
@@ -584,29 +611,30 @@ def _validate_linestring(self, value, top_level=True):
                 errors.append(error)
         if errors:
             if top_level:
-                return 'Invalid LineString:\n%s' % ', '.join(errors)
+                return "Invalid LineString:\n%s" % ", ".join(errors)
             else:
-                return '%s' % ', '.join(errors)
+                return "%s" % ", ".join(errors)
 
     def _validate_point(self, value):
         """Validate each set of coords"""
         if not isinstance(value, (list, tuple)):
-            return 'Points must be a list of coordinate pairs'
+            return "Points must be a list of coordinate pairs"
         elif not len(value) == 2:
-            return 'Value (%s) must be a two-dimensional point' % repr(value)
-        elif (not isinstance(value[0], (float, int)) or
-              not isinstance(value[1], (float, int))):
-            return 'Both values (%s) in point must be float or int' % repr(value)
+            return "Value (%s) must be a two-dimensional point" % repr(value)
+        elif not isinstance(value[0], (float, int)) or not isinstance(
+            value[1], (float, int)
+        ):
+            return "Both values (%s) in point must be float or int" % repr(value)
 
     def _validate_multipoint(self, value):
         if not isinstance(value, (list, tuple)):
-            return 'MultiPoint must be a list of Point'
+            return "MultiPoint must be a list of Point"
 
         # Quick and dirty validator
         try:
             value[0][0]
         except (TypeError, IndexError):
-            return 'Invalid MultiPoint must contain at least one valid point'
+            return "Invalid MultiPoint must contain at least one valid point"
 
         errors = []
         for point in value:
@@ -615,17 +643,17 @@ def _validate_multipoint(self, value):
                 errors.append(error)
 
         if errors:
-            return '%s' % ', '.join(errors)
+            return "%s" % ", ".join(errors)
 
     def _validate_multilinestring(self, value, top_level=True):
         if not isinstance(value, (list, tuple)):
-            return 'MultiLineString must be a list of LineString'
+            return "MultiLineString must be a list of LineString"
 
         # Quick and dirty validator
         try:
             value[0][0][0]
         except (TypeError, IndexError):
-            return 'Invalid MultiLineString must contain at least one valid linestring'
+            return "Invalid MultiLineString must contain at least one valid linestring"
 
         errors = []
         for linestring in value:
@@ -635,19 +663,19 @@ def _validate_multilinestring(self, value, top_level=True):
 
         if errors:
             if top_level:
-                return 'Invalid MultiLineString:\n%s' % ', '.join(errors)
+                return "Invalid MultiLineString:\n%s" % ", ".join(errors)
             else:
-                return '%s' % ', '.join(errors)
+                return "%s" % ", ".join(errors)
 
     def _validate_multipolygon(self, value):
         if not isinstance(value, (list, tuple)):
-            return 'MultiPolygon must be a list of Polygon'
+            return "MultiPolygon must be a list of Polygon"
 
         # Quick and dirty validator
         try:
             value[0][0][0][0]
         except (TypeError, IndexError):
-            return 'Invalid MultiPolygon must contain at least one valid Polygon'
+            return "Invalid MultiPolygon must contain at least one valid Polygon"
 
         errors = []
         for polygon in value:
@@ -656,9 +684,9 @@ def _validate_multipolygon(self, value):
                 errors.append(error)
 
         if errors:
-            return 'Invalid MultiPolygon:\n%s' % ', '.join(errors)
+            return "Invalid MultiPolygon:\n%s" % ", ".join(errors)
 
     def to_mongo(self, value):
         if isinstance(value, dict):
             return value
-        return SON([('type', self._type), ('coordinates', value)])
+        return SON([("type", self._type), ("coordinates", value)])
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index c3ced5bbf..e4d26811a 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -8,12 +8,15 @@
 from mongoengine.base.fields import BaseField, ComplexBaseField, ObjectIdField
 from mongoengine.common import _import_class
 from mongoengine.errors import InvalidDocumentError
-from mongoengine.queryset import (DO_NOTHING, DoesNotExist,
-                                  MultipleObjectsReturned,
-                                  QuerySetManager)
+from mongoengine.queryset import (
+    DO_NOTHING,
+    DoesNotExist,
+    MultipleObjectsReturned,
+    QuerySetManager,
+)
 
 
-__all__ = ('DocumentMetaclass', 'TopLevelDocumentMetaclass')
+__all__ = ("DocumentMetaclass", "TopLevelDocumentMetaclass")
 
 
 class DocumentMetaclass(type):
@@ -25,44 +28,46 @@ def __new__(mcs, name, bases, attrs):
         super_new = super(DocumentMetaclass, mcs).__new__
 
         # If a base class just call super
-        metaclass = attrs.get('my_metaclass')
+        metaclass = attrs.get("my_metaclass")
         if metaclass and issubclass(metaclass, DocumentMetaclass):
             return super_new(mcs, name, bases, attrs)
 
-        attrs['_is_document'] = attrs.get('_is_document', False)
-        attrs['_cached_reference_fields'] = []
+        attrs["_is_document"] = attrs.get("_is_document", False)
+        attrs["_cached_reference_fields"] = []
 
         # EmbeddedDocuments could have meta data for inheritance
-        if 'meta' in attrs:
-            attrs['_meta'] = attrs.pop('meta')
+        if "meta" in attrs:
+            attrs["_meta"] = attrs.pop("meta")
 
         # EmbeddedDocuments should inherit meta data
-        if '_meta' not in attrs:
+        if "_meta" not in attrs:
             meta = MetaDict()
             for base in flattened_bases[::-1]:
                 # Add any mixin metadata from plain objects
-                if hasattr(base, 'meta'):
+                if hasattr(base, "meta"):
                     meta.merge(base.meta)
-                elif hasattr(base, '_meta'):
+                elif hasattr(base, "_meta"):
                     meta.merge(base._meta)
-            attrs['_meta'] = meta
-            attrs['_meta']['abstract'] = False  # 789: EmbeddedDocument shouldn't inherit abstract
+            attrs["_meta"] = meta
+            attrs["_meta"][
+                "abstract"
+            ] = False  # 789: EmbeddedDocument shouldn't inherit abstract
 
         # If allow_inheritance is True, add a "_cls" string field to the attrs
-        if attrs['_meta'].get('allow_inheritance'):
-            StringField = _import_class('StringField')
-            attrs['_cls'] = StringField()
+        if attrs["_meta"].get("allow_inheritance"):
+            StringField = _import_class("StringField")
+            attrs["_cls"] = StringField()
 
         # Handle document Fields
 
         # Merge all fields from subclasses
         doc_fields = {}
         for base in flattened_bases[::-1]:
-            if hasattr(base, '_fields'):
+            if hasattr(base, "_fields"):
                 doc_fields.update(base._fields)
 
             # Standard object mixin - merge in any Fields
-            if not hasattr(base, '_meta'):
+            if not hasattr(base, "_meta"):
                 base_fields = {}
                 for attr_name, attr_value in iteritems(base.__dict__):
                     if not isinstance(attr_value, BaseField):
@@ -85,27 +90,31 @@ def __new__(mcs, name, bases, attrs):
             doc_fields[attr_name] = attr_value
 
             # Count names to ensure no db_field redefinitions
-            field_names[attr_value.db_field] = field_names.get(
-                attr_value.db_field, 0) + 1
+            field_names[attr_value.db_field] = (
+                field_names.get(attr_value.db_field, 0) + 1
+            )
 
         # Ensure no duplicate db_fields
         duplicate_db_fields = [k for k, v in field_names.items() if v > 1]
         if duplicate_db_fields:
-            msg = ('Multiple db_fields defined for: %s ' %
-                   ', '.join(duplicate_db_fields))
+            msg = "Multiple db_fields defined for: %s " % ", ".join(duplicate_db_fields)
             raise InvalidDocumentError(msg)
 
         # Set _fields and db_field maps
-        attrs['_fields'] = doc_fields
-        attrs['_db_field_map'] = {k: getattr(v, 'db_field', k)
-                                  for k, v in doc_fields.items()}
-        attrs['_reverse_db_field_map'] = {
-            v: k for k, v in attrs['_db_field_map'].items()
+        attrs["_fields"] = doc_fields
+        attrs["_db_field_map"] = {
+            k: getattr(v, "db_field", k) for k, v in doc_fields.items()
+        }
+        attrs["_reverse_db_field_map"] = {
+            v: k for k, v in attrs["_db_field_map"].items()
         }
 
-        attrs['_fields_ordered'] = tuple(i[1] for i in sorted(
-                                         (v.creation_counter, v.name)
-                                         for v in itervalues(doc_fields)))
+        attrs["_fields_ordered"] = tuple(
+            i[1]
+            for i in sorted(
+                (v.creation_counter, v.name) for v in itervalues(doc_fields)
+            )
+        )
 
         #
         # Set document hierarchy
@@ -113,32 +122,34 @@ def __new__(mcs, name, bases, attrs):
         superclasses = ()
         class_name = [name]
         for base in flattened_bases:
-            if (not getattr(base, '_is_base_cls', True) and
-                    not getattr(base, '_meta', {}).get('abstract', True)):
+            if not getattr(base, "_is_base_cls", True) and not getattr(
+                base, "_meta", {}
+            ).get("abstract", True):
                 # Collate hierarchy for _cls and _subclasses
                 class_name.append(base.__name__)
 
-            if hasattr(base, '_meta'):
+            if hasattr(base, "_meta"):
                 # Warn if allow_inheritance isn't set and prevent
                 # inheritance of classes where inheritance is set to False
-                allow_inheritance = base._meta.get('allow_inheritance')
-                if not allow_inheritance and not base._meta.get('abstract'):
-                    raise ValueError('Document %s may not be subclassed. '
-                                     'To enable inheritance, use the "allow_inheritance" meta attribute.' %
-                                     base.__name__)
+                allow_inheritance = base._meta.get("allow_inheritance")
+                if not allow_inheritance and not base._meta.get("abstract"):
+                    raise ValueError(
+                        "Document %s may not be subclassed. "
+                        'To enable inheritance, use the "allow_inheritance" meta attribute.'
+                        % base.__name__
+                    )
 
         # Get superclasses from last base superclass
-        document_bases = [b for b in flattened_bases
-                          if hasattr(b, '_class_name')]
+        document_bases = [b for b in flattened_bases if hasattr(b, "_class_name")]
         if document_bases:
             superclasses = document_bases[0]._superclasses
-            superclasses += (document_bases[0]._class_name, )
+            superclasses += (document_bases[0]._class_name,)
 
-        _cls = '.'.join(reversed(class_name))
-        attrs['_class_name'] = _cls
-        attrs['_superclasses'] = superclasses
-        attrs['_subclasses'] = (_cls, )
-        attrs['_types'] = attrs['_subclasses']  # TODO depreciate _types
+        _cls = ".".join(reversed(class_name))
+        attrs["_class_name"] = _cls
+        attrs["_superclasses"] = superclasses
+        attrs["_subclasses"] = (_cls,)
+        attrs["_types"] = attrs["_subclasses"]  # TODO depreciate _types
 
         # Create the new_class
         new_class = super_new(mcs, name, bases, attrs)
@@ -149,8 +160,12 @@ def __new__(mcs, name, bases, attrs):
                 base._subclasses += (_cls,)
             base._types = base._subclasses  # TODO depreciate _types
 
-        (Document, EmbeddedDocument, DictField,
-         CachedReferenceField) = mcs._import_classes()
+        (
+            Document,
+            EmbeddedDocument,
+            DictField,
+            CachedReferenceField,
+        ) = mcs._import_classes()
 
         if issubclass(new_class, Document):
             new_class._collection = None
@@ -169,52 +184,55 @@ def __new__(mcs, name, bases, attrs):
             for val in new_class.__dict__.values():
                 if isinstance(val, classmethod):
                     f = val.__get__(new_class)
-                    if hasattr(f, '__func__') and not hasattr(f, 'im_func'):
-                        f.__dict__.update({'im_func': getattr(f, '__func__')})
-                    if hasattr(f, '__self__') and not hasattr(f, 'im_self'):
-                        f.__dict__.update({'im_self': getattr(f, '__self__')})
+                    if hasattr(f, "__func__") and not hasattr(f, "im_func"):
+                        f.__dict__.update({"im_func": getattr(f, "__func__")})
+                    if hasattr(f, "__self__") and not hasattr(f, "im_self"):
+                        f.__dict__.update({"im_self": getattr(f, "__self__")})
 
         # Handle delete rules
         for field in itervalues(new_class._fields):
             f = field
             if f.owner_document is None:
                 f.owner_document = new_class
-            delete_rule = getattr(f, 'reverse_delete_rule', DO_NOTHING)
+            delete_rule = getattr(f, "reverse_delete_rule", DO_NOTHING)
             if isinstance(f, CachedReferenceField):
 
                 if issubclass(new_class, EmbeddedDocument):
-                    raise InvalidDocumentError('CachedReferenceFields is not '
-                                               'allowed in EmbeddedDocuments')
+                    raise InvalidDocumentError(
+                        "CachedReferenceFields is not allowed in EmbeddedDocuments"
+                    )
 
                 if f.auto_sync:
                     f.start_listener()
 
                 f.document_type._cached_reference_fields.append(f)
 
-            if isinstance(f, ComplexBaseField) and hasattr(f, 'field'):
-                delete_rule = getattr(f.field,
-                                      'reverse_delete_rule',
-                                      DO_NOTHING)
+            if isinstance(f, ComplexBaseField) and hasattr(f, "field"):
+                delete_rule = getattr(f.field, "reverse_delete_rule", DO_NOTHING)
                 if isinstance(f, DictField) and delete_rule != DO_NOTHING:
-                    msg = ('Reverse delete rules are not supported '
-                           'for %s (field: %s)' %
-                           (field.__class__.__name__, field.name))
+                    msg = (
+                        "Reverse delete rules are not supported "
+                        "for %s (field: %s)" % (field.__class__.__name__, field.name)
+                    )
                     raise InvalidDocumentError(msg)
 
                 f = field.field
 
             if delete_rule != DO_NOTHING:
                 if issubclass(new_class, EmbeddedDocument):
-                    msg = ('Reverse delete rules are not supported for '
-                           'EmbeddedDocuments (field: %s)' % field.name)
+                    msg = (
+                        "Reverse delete rules are not supported for "
+                        "EmbeddedDocuments (field: %s)" % field.name
+                    )
                     raise InvalidDocumentError(msg)
-                f.document_type.register_delete_rule(new_class,
-                                                     field.name, delete_rule)
+                f.document_type.register_delete_rule(new_class, field.name, delete_rule)
 
-            if (field.name and hasattr(Document, field.name) and
-                    EmbeddedDocument not in new_class.mro()):
-                msg = ('%s is a document method and not a valid '
-                       'field name' % field.name)
+            if (
+                field.name
+                and hasattr(Document, field.name)
+                and EmbeddedDocument not in new_class.mro()
+            ):
+                msg = "%s is a document method and not a valid field name" % field.name
                 raise InvalidDocumentError(msg)
 
         return new_class
@@ -239,10 +257,10 @@ def __get_bases(mcs, bases):
 
     @classmethod
     def _import_classes(mcs):
-        Document = _import_class('Document')
-        EmbeddedDocument = _import_class('EmbeddedDocument')
-        DictField = _import_class('DictField')
-        CachedReferenceField = _import_class('CachedReferenceField')
+        Document = _import_class("Document")
+        EmbeddedDocument = _import_class("EmbeddedDocument")
+        DictField = _import_class("DictField")
+        CachedReferenceField = _import_class("CachedReferenceField")
         return Document, EmbeddedDocument, DictField, CachedReferenceField
 
 
@@ -256,65 +274,67 @@ def __new__(mcs, name, bases, attrs):
         super_new = super(TopLevelDocumentMetaclass, mcs).__new__
 
         # Set default _meta data if base class, otherwise get user defined meta
-        if attrs.get('my_metaclass') == TopLevelDocumentMetaclass:
+        if attrs.get("my_metaclass") == TopLevelDocumentMetaclass:
             # defaults
-            attrs['_meta'] = {
-                'abstract': True,
-                'max_documents': None,
-                'max_size': None,
-                'ordering': [],  # default ordering applied at runtime
-                'indexes': [],  # indexes to be ensured at runtime
-                'id_field': None,
-                'index_background': False,
-                'index_drop_dups': False,
-                'index_opts': None,
-                'delete_rules': None,
-
+            attrs["_meta"] = {
+                "abstract": True,
+                "max_documents": None,
+                "max_size": None,
+                "ordering": [],  # default ordering applied at runtime
+                "indexes": [],  # indexes to be ensured at runtime
+                "id_field": None,
+                "index_background": False,
+                "index_drop_dups": False,
+                "index_opts": None,
+                "delete_rules": None,
                 # allow_inheritance can be True, False, and None. True means
                 # "allow inheritance", False means "don't allow inheritance",
                 # None means "do whatever your parent does, or don't allow
                 # inheritance if you're a top-level class".
-                'allow_inheritance': None,
+                "allow_inheritance": None,
             }
-            attrs['_is_base_cls'] = True
-            attrs['_meta'].update(attrs.get('meta', {}))
+            attrs["_is_base_cls"] = True
+            attrs["_meta"].update(attrs.get("meta", {}))
         else:
-            attrs['_meta'] = attrs.get('meta', {})
+            attrs["_meta"] = attrs.get("meta", {})
             # Explicitly set abstract to false unless set
-            attrs['_meta']['abstract'] = attrs['_meta'].get('abstract', False)
-            attrs['_is_base_cls'] = False
+            attrs["_meta"]["abstract"] = attrs["_meta"].get("abstract", False)
+            attrs["_is_base_cls"] = False
 
         # Set flag marking as document class - as opposed to an object mixin
-        attrs['_is_document'] = True
+        attrs["_is_document"] = True
 
         # Ensure queryset_class is inherited
-        if 'objects' in attrs:
-            manager = attrs['objects']
-            if hasattr(manager, 'queryset_class'):
-                attrs['_meta']['queryset_class'] = manager.queryset_class
+        if "objects" in attrs:
+            manager = attrs["objects"]
+            if hasattr(manager, "queryset_class"):
+                attrs["_meta"]["queryset_class"] = manager.queryset_class
 
         # Clean up top level meta
-        if 'meta' in attrs:
-            del attrs['meta']
+        if "meta" in attrs:
+            del attrs["meta"]
 
         # Find the parent document class
-        parent_doc_cls = [b for b in flattened_bases
-                          if b.__class__ == TopLevelDocumentMetaclass]
+        parent_doc_cls = [
+            b for b in flattened_bases if b.__class__ == TopLevelDocumentMetaclass
+        ]
         parent_doc_cls = None if not parent_doc_cls else parent_doc_cls[0]
 
         # Prevent classes setting collection different to their parents
         # If parent wasn't an abstract class
-        if (parent_doc_cls and 'collection' in attrs.get('_meta', {}) and
-                not parent_doc_cls._meta.get('abstract', True)):
-            msg = 'Trying to set a collection on a subclass (%s)' % name
+        if (
+            parent_doc_cls
+            and "collection" in attrs.get("_meta", {})
+            and not parent_doc_cls._meta.get("abstract", True)
+        ):
+            msg = "Trying to set a collection on a subclass (%s)" % name
             warnings.warn(msg, SyntaxWarning)
-            del attrs['_meta']['collection']
+            del attrs["_meta"]["collection"]
 
         # Ensure abstract documents have abstract bases
-        if attrs.get('_is_base_cls') or attrs['_meta'].get('abstract'):
-            if (parent_doc_cls and
-                    not parent_doc_cls._meta.get('abstract', False)):
-                msg = 'Abstract document cannot have non-abstract base'
+        if attrs.get("_is_base_cls") or attrs["_meta"].get("abstract"):
+            if parent_doc_cls and not parent_doc_cls._meta.get("abstract", False):
+                msg = "Abstract document cannot have non-abstract base"
                 raise ValueError(msg)
             return super_new(mcs, name, bases, attrs)
 
@@ -323,38 +343,43 @@ def __new__(mcs, name, bases, attrs):
         meta = MetaDict()
         for base in flattened_bases[::-1]:
             # Add any mixin metadata from plain objects
-            if hasattr(base, 'meta'):
+            if hasattr(base, "meta"):
                 meta.merge(base.meta)
-            elif hasattr(base, '_meta'):
+            elif hasattr(base, "_meta"):
                 meta.merge(base._meta)
 
             # Set collection in the meta if its callable
-            if (getattr(base, '_is_document', False) and
-                    not base._meta.get('abstract')):
-                collection = meta.get('collection', None)
+            if getattr(base, "_is_document", False) and not base._meta.get("abstract"):
+                collection = meta.get("collection", None)
                 if callable(collection):
-                    meta['collection'] = collection(base)
+                    meta["collection"] = collection(base)
 
-        meta.merge(attrs.get('_meta', {}))  # Top level meta
+        meta.merge(attrs.get("_meta", {}))  # Top level meta
 
         # Only simple classes (i.e. direct subclasses of Document) may set
         # allow_inheritance to False. If the base Document allows inheritance,
         # none of its subclasses can override allow_inheritance to False.
-        simple_class = all([b._meta.get('abstract')
-                            for b in flattened_bases if hasattr(b, '_meta')])
+        simple_class = all(
+            [b._meta.get("abstract") for b in flattened_bases if hasattr(b, "_meta")]
+        )
         if (
-            not simple_class and
-            meta['allow_inheritance'] is False and
-            not meta['abstract']
+            not simple_class
+            and meta["allow_inheritance"] is False
+            and not meta["abstract"]
         ):
-            raise ValueError('Only direct subclasses of Document may set '
-                             '"allow_inheritance" to False')
+            raise ValueError(
+                "Only direct subclasses of Document may set "
+                '"allow_inheritance" to False'
+            )
 
         # Set default collection name
-        if 'collection' not in meta:
-            meta['collection'] = ''.join('_%s' % c if c.isupper() else c
-                                         for c in name).strip('_').lower()
-        attrs['_meta'] = meta
+        if "collection" not in meta:
+            meta["collection"] = (
+                "".join("_%s" % c if c.isupper() else c for c in name)
+                .strip("_")
+                .lower()
+            )
+        attrs["_meta"] = meta
 
         # Call super and get the new class
         new_class = super_new(mcs, name, bases, attrs)
@@ -362,36 +387,36 @@ def __new__(mcs, name, bases, attrs):
         meta = new_class._meta
 
         # Set index specifications
-        meta['index_specs'] = new_class._build_index_specs(meta['indexes'])
+        meta["index_specs"] = new_class._build_index_specs(meta["indexes"])
 
         # If collection is a callable - call it and set the value
-        collection = meta.get('collection')
+        collection = meta.get("collection")
         if callable(collection):
-            new_class._meta['collection'] = collection(new_class)
+            new_class._meta["collection"] = collection(new_class)
 
         # Provide a default queryset unless exists or one has been set
-        if 'objects' not in dir(new_class):
+        if "objects" not in dir(new_class):
             new_class.objects = QuerySetManager()
 
         # Validate the fields and set primary key if needed
         for field_name, field in iteritems(new_class._fields):
             if field.primary_key:
                 # Ensure only one primary key is set
-                current_pk = new_class._meta.get('id_field')
+                current_pk = new_class._meta.get("id_field")
                 if current_pk and current_pk != field_name:
-                    raise ValueError('Cannot override primary key field')
+                    raise ValueError("Cannot override primary key field")
 
                 # Set primary key
                 if not current_pk:
-                    new_class._meta['id_field'] = field_name
+                    new_class._meta["id_field"] = field_name
                     new_class.id = field
 
         # If the document doesn't explicitly define a primary key field, create
         # one. Make it an ObjectIdField and give it a non-clashing name ("id"
         # by default, but can be different if that one's taken).
-        if not new_class._meta.get('id_field'):
+        if not new_class._meta.get("id_field"):
             id_name, id_db_name = mcs.get_auto_id_names(new_class)
-            new_class._meta['id_field'] = id_name
+            new_class._meta["id_field"] = id_name
             new_class._fields[id_name] = ObjectIdField(db_field=id_db_name)
             new_class._fields[id_name].name = id_name
             new_class.id = new_class._fields[id_name]
@@ -400,22 +425,20 @@ def __new__(mcs, name, bases, attrs):
 
             # Prepend the ID field to _fields_ordered (so that it's *always*
             # the first field).
-            new_class._fields_ordered = (id_name, ) + new_class._fields_ordered
+            new_class._fields_ordered = (id_name,) + new_class._fields_ordered
 
         # Merge in exceptions with parent hierarchy.
         exceptions_to_merge = (DoesNotExist, MultipleObjectsReturned)
-        module = attrs.get('__module__')
+        module = attrs.get("__module__")
         for exc in exceptions_to_merge:
             name = exc.__name__
             parents = tuple(
-                getattr(base, name)
-                for base in flattened_bases
-                if hasattr(base, name)
+                getattr(base, name) for base in flattened_bases if hasattr(base, name)
             ) or (exc,)
 
             # Create a new exception and set it as an attribute on the new
             # class.
-            exception = type(name, parents, {'__module__': module})
+            exception = type(name, parents, {"__module__": module})
             setattr(new_class, name, exception)
 
         return new_class
@@ -431,23 +454,17 @@ def get_auto_id_names(mcs, new_class):
         Defaults to ('id', '_id'), or generates a non-clashing name in the form
         of ('auto_id_X', '_auto_id_X') if the default name is already taken.
         """
-        id_name, id_db_name = ('id', '_id')
+        id_name, id_db_name = ("id", "_id")
         existing_fields = {field_name for field_name in new_class._fields}
         existing_db_fields = {v.db_field for v in new_class._fields.values()}
-        if (
-            id_name not in existing_fields and
-            id_db_name not in existing_db_fields
-        ):
+        if id_name not in existing_fields and id_db_name not in existing_db_fields:
             return id_name, id_db_name
 
-        id_basename, id_db_basename, i = ('auto_id', '_auto_id', 0)
+        id_basename, id_db_basename, i = ("auto_id", "_auto_id", 0)
         for i in itertools.count():
-            id_name = '{0}_{1}'.format(id_basename, i)
-            id_db_name = '{0}_{1}'.format(id_db_basename, i)
-            if (
-                id_name not in existing_fields and
-                id_db_name not in existing_db_fields
-            ):
+            id_name = "{0}_{1}".format(id_basename, i)
+            id_db_name = "{0}_{1}".format(id_db_basename, i)
+            if id_name not in existing_fields and id_db_name not in existing_db_fields:
                 return id_name, id_db_name
 
 
@@ -455,7 +472,8 @@ class MetaDict(dict):
     """Custom dictionary for meta classes.
     Handles the merging of set indexes
     """
-    _merge_options = ('indexes',)
+
+    _merge_options = ("indexes",)
 
     def merge(self, new_options):
         for k, v in iteritems(new_options):
@@ -467,4 +485,5 @@ def merge(self, new_options):
 
 class BasesTuple(tuple):
     """Special class to handle introspection of bases tuple in __new__"""
+
     pass
diff --git a/mongoengine/common.py b/mongoengine/common.py
index bcdea1941..640384ec0 100644
--- a/mongoengine/common.py
+++ b/mongoengine/common.py
@@ -19,34 +19,44 @@ class from the :data:`mongoengine.common._class_registry_cache`.
     if cls_name in _class_registry_cache:
         return _class_registry_cache.get(cls_name)
 
-    doc_classes = ('Document', 'DynamicEmbeddedDocument', 'EmbeddedDocument',
-                   'MapReduceDocument')
+    doc_classes = (
+        "Document",
+        "DynamicEmbeddedDocument",
+        "EmbeddedDocument",
+        "MapReduceDocument",
+    )
 
     # Field Classes
     if not _field_list_cache:
         from mongoengine.fields import __all__ as fields
+
         _field_list_cache.extend(fields)
         from mongoengine.base.fields import __all__ as fields
+
         _field_list_cache.extend(fields)
 
     field_classes = _field_list_cache
 
-    deref_classes = ('DeReference',)
+    deref_classes = ("DeReference",)
 
-    if cls_name == 'BaseDocument':
+    if cls_name == "BaseDocument":
         from mongoengine.base import document as module
-        import_classes = ['BaseDocument']
+
+        import_classes = ["BaseDocument"]
     elif cls_name in doc_classes:
         from mongoengine import document as module
+
         import_classes = doc_classes
     elif cls_name in field_classes:
         from mongoengine import fields as module
+
         import_classes = field_classes
     elif cls_name in deref_classes:
         from mongoengine import dereference as module
+
         import_classes = deref_classes
     else:
-        raise ValueError('No import set for: %s' % cls_name)
+        raise ValueError("No import set for: %s" % cls_name)
 
     for cls in import_classes:
         _class_registry_cache[cls] = getattr(module, cls)
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 6a613a42a..ef0dd27cd 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -3,21 +3,21 @@
 import six
 
 __all__ = [
-    'DEFAULT_CONNECTION_NAME',
-    'DEFAULT_DATABASE_NAME',
-    'MongoEngineConnectionError',
-    'connect',
-    'disconnect',
-    'disconnect_all',
-    'get_connection',
-    'get_db',
-    'register_connection',
+    "DEFAULT_CONNECTION_NAME",
+    "DEFAULT_DATABASE_NAME",
+    "MongoEngineConnectionError",
+    "connect",
+    "disconnect",
+    "disconnect_all",
+    "get_connection",
+    "get_db",
+    "register_connection",
 ]
 
 
-DEFAULT_CONNECTION_NAME = 'default'
-DEFAULT_DATABASE_NAME = 'test'
-DEFAULT_HOST = 'localhost'
+DEFAULT_CONNECTION_NAME = "default"
+DEFAULT_DATABASE_NAME = "test"
+DEFAULT_HOST = "localhost"
 DEFAULT_PORT = 27017
 
 _connection_settings = {}
@@ -31,6 +31,7 @@ class MongoEngineConnectionError(Exception):
     """Error raised when the database connection can't be established or
     when a connection with a requested alias can't be retrieved.
     """
+
     pass
 
 
@@ -39,18 +40,23 @@ def _check_db_name(name):
     This functionality is copied from pymongo Database class constructor.
     """
     if not isinstance(name, six.string_types):
-        raise TypeError('name must be an instance of %s' % six.string_types)
-    elif name != '$external':
+        raise TypeError("name must be an instance of %s" % six.string_types)
+    elif name != "$external":
         _check_name(name)
 
 
 def _get_connection_settings(
-        db=None, name=None, host=None, port=None,
-        read_preference=READ_PREFERENCE,
-        username=None, password=None,
-        authentication_source=None,
-        authentication_mechanism=None,
-        **kwargs):
+    db=None,
+    name=None,
+    host=None,
+    port=None,
+    read_preference=READ_PREFERENCE,
+    username=None,
+    password=None,
+    authentication_source=None,
+    authentication_mechanism=None,
+    **kwargs
+):
     """Get the connection settings as a dict
 
     : param db: the name of the database to use, for compatibility with connect
@@ -73,18 +79,18 @@ def _get_connection_settings(
     .. versionchanged:: 0.10.6 - added mongomock support
     """
     conn_settings = {
-        'name': name or db or DEFAULT_DATABASE_NAME,
-        'host': host or DEFAULT_HOST,
-        'port': port or DEFAULT_PORT,
-        'read_preference': read_preference,
-        'username': username,
-        'password': password,
-        'authentication_source': authentication_source,
-        'authentication_mechanism': authentication_mechanism
+        "name": name or db or DEFAULT_DATABASE_NAME,
+        "host": host or DEFAULT_HOST,
+        "port": port or DEFAULT_PORT,
+        "read_preference": read_preference,
+        "username": username,
+        "password": password,
+        "authentication_source": authentication_source,
+        "authentication_mechanism": authentication_mechanism,
     }
 
-    _check_db_name(conn_settings['name'])
-    conn_host = conn_settings['host']
+    _check_db_name(conn_settings["name"])
+    conn_host = conn_settings["host"]
 
     # Host can be a list or a string, so if string, force to a list.
     if isinstance(conn_host, six.string_types):
@@ -94,32 +100,32 @@ def _get_connection_settings(
     for entity in conn_host:
 
         # Handle Mongomock
-        if entity.startswith('mongomock://'):
-            conn_settings['is_mock'] = True
+        if entity.startswith("mongomock://"):
+            conn_settings["is_mock"] = True
             # `mongomock://` is not a valid url prefix and must be replaced by `mongodb://`
-            resolved_hosts.append(entity.replace('mongomock://', 'mongodb://', 1))
+            resolved_hosts.append(entity.replace("mongomock://", "mongodb://", 1))
 
         # Handle URI style connections, only updating connection params which
         # were explicitly specified in the URI.
-        elif '://' in entity:
+        elif "://" in entity:
             uri_dict = uri_parser.parse_uri(entity)
             resolved_hosts.append(entity)
 
-            if uri_dict.get('database'):
-                conn_settings['name'] = uri_dict.get('database')
+            if uri_dict.get("database"):
+                conn_settings["name"] = uri_dict.get("database")
 
-            for param in ('read_preference', 'username', 'password'):
+            for param in ("read_preference", "username", "password"):
                 if uri_dict.get(param):
                     conn_settings[param] = uri_dict[param]
 
-            uri_options = uri_dict['options']
-            if 'replicaset' in uri_options:
-                conn_settings['replicaSet'] = uri_options['replicaset']
-            if 'authsource' in uri_options:
-                conn_settings['authentication_source'] = uri_options['authsource']
-            if 'authmechanism' in uri_options:
-                conn_settings['authentication_mechanism'] = uri_options['authmechanism']
-            if 'readpreference' in uri_options:
+            uri_options = uri_dict["options"]
+            if "replicaset" in uri_options:
+                conn_settings["replicaSet"] = uri_options["replicaset"]
+            if "authsource" in uri_options:
+                conn_settings["authentication_source"] = uri_options["authsource"]
+            if "authmechanism" in uri_options:
+                conn_settings["authentication_mechanism"] = uri_options["authmechanism"]
+            if "readpreference" in uri_options:
                 read_preferences = (
                     ReadPreference.NEAREST,
                     ReadPreference.PRIMARY,
@@ -133,34 +139,41 @@ def _get_connection_settings(
                 # int (e.g. 3).
                 # TODO simplify the code below once we drop support for
                 # PyMongo v3.4.
-                read_pf_mode = uri_options['readpreference']
+                read_pf_mode = uri_options["readpreference"]
                 if isinstance(read_pf_mode, six.string_types):
                     read_pf_mode = read_pf_mode.lower()
                 for preference in read_preferences:
                     if (
-                        preference.name.lower() == read_pf_mode or
-                        preference.mode == read_pf_mode
+                        preference.name.lower() == read_pf_mode
+                        or preference.mode == read_pf_mode
                     ):
-                        conn_settings['read_preference'] = preference
+                        conn_settings["read_preference"] = preference
                         break
         else:
             resolved_hosts.append(entity)
-    conn_settings['host'] = resolved_hosts
+    conn_settings["host"] = resolved_hosts
 
     # Deprecated parameters that should not be passed on
-    kwargs.pop('slaves', None)
-    kwargs.pop('is_slave', None)
+    kwargs.pop("slaves", None)
+    kwargs.pop("is_slave", None)
 
     conn_settings.update(kwargs)
     return conn_settings
 
 
-def register_connection(alias, db=None, name=None, host=None, port=None,
-                        read_preference=READ_PREFERENCE,
-                        username=None, password=None,
-                        authentication_source=None,
-                        authentication_mechanism=None,
-                        **kwargs):
+def register_connection(
+    alias,
+    db=None,
+    name=None,
+    host=None,
+    port=None,
+    read_preference=READ_PREFERENCE,
+    username=None,
+    password=None,
+    authentication_source=None,
+    authentication_mechanism=None,
+    **kwargs
+):
     """Register the connection settings.
 
     : param alias: the name that will be used to refer to this connection
@@ -185,12 +198,17 @@ def register_connection(alias, db=None, name=None, host=None, port=None,
     .. versionchanged:: 0.10.6 - added mongomock support
     """
     conn_settings = _get_connection_settings(
-        db=db, name=name, host=host, port=port,
+        db=db,
+        name=name,
+        host=host,
+        port=port,
         read_preference=read_preference,
-        username=username, password=password,
+        username=username,
+        password=password,
         authentication_source=authentication_source,
         authentication_mechanism=authentication_mechanism,
-        **kwargs)
+        **kwargs
+    )
     _connection_settings[alias] = conn_settings
 
 
@@ -206,7 +224,7 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
     if alias in _dbs:
         # Detach all cached collections in Documents
         for doc_cls in _get_documents_by_db(alias, DEFAULT_CONNECTION_NAME):
-            if issubclass(doc_cls, Document):     # Skip EmbeddedDocument
+            if issubclass(doc_cls, Document):  # Skip EmbeddedDocument
                 doc_cls._disconnect()
 
         del _dbs[alias]
@@ -237,19 +255,21 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
     # Raise MongoEngineConnectionError if it doesn't.
     if alias not in _connection_settings:
         if alias == DEFAULT_CONNECTION_NAME:
-            msg = 'You have not defined a default connection'
+            msg = "You have not defined a default connection"
         else:
             msg = 'Connection with alias "%s" has not been defined' % alias
         raise MongoEngineConnectionError(msg)
 
     def _clean_settings(settings_dict):
         irrelevant_fields_set = {
-            'name', 'username', 'password',
-            'authentication_source', 'authentication_mechanism'
+            "name",
+            "username",
+            "password",
+            "authentication_source",
+            "authentication_mechanism",
         }
         return {
-            k: v for k, v in settings_dict.items()
-            if k not in irrelevant_fields_set
+            k: v for k, v in settings_dict.items() if k not in irrelevant_fields_set
         }
 
     raw_conn_settings = _connection_settings[alias].copy()
@@ -260,13 +280,12 @@ def _clean_settings(settings_dict):
     conn_settings = _clean_settings(raw_conn_settings)
 
     # Determine if we should use PyMongo's or mongomock's MongoClient.
-    is_mock = conn_settings.pop('is_mock', False)
+    is_mock = conn_settings.pop("is_mock", False)
     if is_mock:
         try:
             import mongomock
         except ImportError:
-            raise RuntimeError('You need mongomock installed to mock '
-                               'MongoEngine.')
+            raise RuntimeError("You need mongomock installed to mock MongoEngine.")
         connection_class = mongomock.MongoClient
     else:
         connection_class = MongoClient
@@ -277,9 +296,7 @@ def _clean_settings(settings_dict):
         connection = existing_connection
     else:
         connection = _create_connection(
-            alias=alias,
-            connection_class=connection_class,
-            **conn_settings
+            alias=alias, connection_class=connection_class, **conn_settings
         )
     _connections[alias] = connection
     return _connections[alias]
@@ -294,7 +311,8 @@ def _create_connection(alias, connection_class, **connection_settings):
         return connection_class(**connection_settings)
     except Exception as e:
         raise MongoEngineConnectionError(
-            'Cannot connect to database %s :\n%s' % (alias, e))
+            "Cannot connect to database %s :\n%s" % (alias, e)
+        )
 
 
 def _find_existing_connection(connection_settings):
@@ -316,7 +334,7 @@ def _clean_settings(settings_dict):
         # Only remove the name but it's important to
         # keep the username/password/authentication_source/authentication_mechanism
         # to identify if the connection could be shared (cfr https://github.com/MongoEngine/mongoengine/issues/2047)
-        return {k: v for k, v in settings_dict.items() if k != 'name'}
+        return {k: v for k, v in settings_dict.items() if k != "name"}
 
     cleaned_conn_settings = _clean_settings(connection_settings)
     for db_alias, connection_settings in connection_settings_bis:
@@ -332,14 +350,18 @@ def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
     if alias not in _dbs:
         conn = get_connection(alias)
         conn_settings = _connection_settings[alias]
-        db = conn[conn_settings['name']]
-        auth_kwargs = {'source': conn_settings['authentication_source']}
-        if conn_settings['authentication_mechanism'] is not None:
-            auth_kwargs['mechanism'] = conn_settings['authentication_mechanism']
+        db = conn[conn_settings["name"]]
+        auth_kwargs = {"source": conn_settings["authentication_source"]}
+        if conn_settings["authentication_mechanism"] is not None:
+            auth_kwargs["mechanism"] = conn_settings["authentication_mechanism"]
         # Authenticate if necessary
-        if conn_settings['username'] and (conn_settings['password'] or
-                                          conn_settings['authentication_mechanism'] == 'MONGODB-X509'):
-            db.authenticate(conn_settings['username'], conn_settings['password'], **auth_kwargs)
+        if conn_settings["username"] and (
+            conn_settings["password"]
+            or conn_settings["authentication_mechanism"] == "MONGODB-X509"
+        ):
+            db.authenticate(
+                conn_settings["username"], conn_settings["password"], **auth_kwargs
+            )
         _dbs[alias] = db
     return _dbs[alias]
 
@@ -368,8 +390,8 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
 
         if new_conn_settings != prev_conn_setting:
             err_msg = (
-                u'A different connection with alias `{}` was already '
-                u'registered. Use disconnect() first'
+                u"A different connection with alias `{}` was already "
+                u"registered. Use disconnect() first"
             ).format(alias)
             raise MongoEngineConnectionError(err_msg)
     else:
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 98bd897b8..3424a5d5e 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -7,8 +7,14 @@
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.pymongo_support import count_documents
 
-__all__ = ('switch_db', 'switch_collection', 'no_dereference',
-           'no_sub_classes', 'query_counter', 'set_write_concern')
+__all__ = (
+    "switch_db",
+    "switch_collection",
+    "no_dereference",
+    "no_sub_classes",
+    "query_counter",
+    "set_write_concern",
+)
 
 
 class switch_db(object):
@@ -38,17 +44,17 @@ def __init__(self, cls, db_alias):
         self.cls = cls
         self.collection = cls._get_collection()
         self.db_alias = db_alias
-        self.ori_db_alias = cls._meta.get('db_alias', DEFAULT_CONNECTION_NAME)
+        self.ori_db_alias = cls._meta.get("db_alias", DEFAULT_CONNECTION_NAME)
 
     def __enter__(self):
         """Change the db_alias and clear the cached collection."""
-        self.cls._meta['db_alias'] = self.db_alias
+        self.cls._meta["db_alias"] = self.db_alias
         self.cls._collection = None
         return self.cls
 
     def __exit__(self, t, value, traceback):
         """Reset the db_alias and collection."""
-        self.cls._meta['db_alias'] = self.ori_db_alias
+        self.cls._meta["db_alias"] = self.ori_db_alias
         self.cls._collection = self.collection
 
 
@@ -111,14 +117,15 @@ def __init__(self, cls):
         """
         self.cls = cls
 
-        ReferenceField = _import_class('ReferenceField')
-        GenericReferenceField = _import_class('GenericReferenceField')
-        ComplexBaseField = _import_class('ComplexBaseField')
+        ReferenceField = _import_class("ReferenceField")
+        GenericReferenceField = _import_class("GenericReferenceField")
+        ComplexBaseField = _import_class("ComplexBaseField")
 
-        self.deref_fields = [k for k, v in iteritems(self.cls._fields)
-                             if isinstance(v, (ReferenceField,
-                                               GenericReferenceField,
-                                               ComplexBaseField))]
+        self.deref_fields = [
+            k
+            for k, v in iteritems(self.cls._fields)
+            if isinstance(v, (ReferenceField, GenericReferenceField, ComplexBaseField))
+        ]
 
     def __enter__(self):
         """Change the objects default and _auto_dereference values."""
@@ -180,15 +187,12 @@ def __init__(self):
         """
         self.db = get_db()
         self.initial_profiling_level = None
-        self._ctx_query_counter = 0             # number of queries issued by the context
+        self._ctx_query_counter = 0  # number of queries issued by the context
 
         self._ignored_query = {
-            'ns':
-                {'$ne': '%s.system.indexes' % self.db.name},
-            'op':                       # MONGODB < 3.2
-                {'$ne': 'killcursors'},
-            'command.killCursors':      # MONGODB >= 3.2
-                {'$exists': False}
+            "ns": {"$ne": "%s.system.indexes" % self.db.name},
+            "op": {"$ne": "killcursors"},  # MONGODB < 3.2
+            "command.killCursors": {"$exists": False},  # MONGODB >= 3.2
         }
 
     def _turn_on_profiling(self):
@@ -238,8 +242,13 @@ def _get_count(self):
         and substracting the queries issued by this context. In fact everytime this is called, 1 query is
         issued so we need to balance that
         """
-        count = count_documents(self.db.system.profile, self._ignored_query) - self._ctx_query_counter
-        self._ctx_query_counter += 1    # Account for the query we just issued to gather the information
+        count = (
+            count_documents(self.db.system.profile, self._ignored_query)
+            - self._ctx_query_counter
+        )
+        self._ctx_query_counter += (
+            1
+        )  # Account for the query we just issued to gather the information
         return count
 
 
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index eaebb56f3..9e75f3535 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -2,8 +2,13 @@
 import six
 from six import iteritems
 
-from mongoengine.base import (BaseDict, BaseList, EmbeddedDocumentList,
-                              TopLevelDocumentMetaclass, get_document)
+from mongoengine.base import (
+    BaseDict,
+    BaseList,
+    EmbeddedDocumentList,
+    TopLevelDocumentMetaclass,
+    get_document,
+)
 from mongoengine.base.datastructures import LazyReference
 from mongoengine.connection import get_db
 from mongoengine.document import Document, EmbeddedDocument
@@ -36,21 +41,23 @@ def __call__(self, items, max_depth=1, instance=None, name=None):
         self.max_depth = max_depth
         doc_type = None
 
-        if instance and isinstance(instance, (Document, EmbeddedDocument,
-                                              TopLevelDocumentMetaclass)):
+        if instance and isinstance(
+            instance, (Document, EmbeddedDocument, TopLevelDocumentMetaclass)
+        ):
             doc_type = instance._fields.get(name)
-            while hasattr(doc_type, 'field'):
+            while hasattr(doc_type, "field"):
                 doc_type = doc_type.field
 
             if isinstance(doc_type, ReferenceField):
                 field = doc_type
                 doc_type = doc_type.document_type
-                is_list = not hasattr(items, 'items')
+                is_list = not hasattr(items, "items")
 
                 if is_list and all([i.__class__ == doc_type for i in items]):
                     return items
                 elif not is_list and all(
-                        [i.__class__ == doc_type for i in items.values()]):
+                    [i.__class__ == doc_type for i in items.values()]
+                ):
                     return items
                 elif not field.dbref:
                     # We must turn the ObjectIds into DBRefs
@@ -83,7 +90,7 @@ def _get_items_from_dict(items):
                             new_items[k] = value
                         return new_items
 
-                    if not hasattr(items, 'items'):
+                    if not hasattr(items, "items"):
                         items = _get_items_from_list(items)
                     else:
                         items = _get_items_from_dict(items)
@@ -120,13 +127,19 @@ def _find_references(self, items, depth=0):
                         continue
                     elif isinstance(v, DBRef):
                         reference_map.setdefault(field.document_type, set()).add(v.id)
-                    elif isinstance(v, (dict, SON)) and '_ref' in v:
-                        reference_map.setdefault(get_document(v['_cls']), set()).add(v['_ref'].id)
+                    elif isinstance(v, (dict, SON)) and "_ref" in v:
+                        reference_map.setdefault(get_document(v["_cls"]), set()).add(
+                            v["_ref"].id
+                        )
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                        field_cls = getattr(getattr(field, 'field', None), 'document_type', None)
+                        field_cls = getattr(
+                            getattr(field, "field", None), "document_type", None
+                        )
                         references = self._find_references(v, depth)
                         for key, refs in iteritems(references):
-                            if isinstance(field_cls, (Document, TopLevelDocumentMetaclass)):
+                            if isinstance(
+                                field_cls, (Document, TopLevelDocumentMetaclass)
+                            ):
                                 key = field_cls
                             reference_map.setdefault(key, set()).update(refs)
             elif isinstance(item, LazyReference):
@@ -134,8 +147,10 @@ def _find_references(self, items, depth=0):
                 continue
             elif isinstance(item, DBRef):
                 reference_map.setdefault(item.collection, set()).add(item.id)
-            elif isinstance(item, (dict, SON)) and '_ref' in item:
-                reference_map.setdefault(get_document(item['_cls']), set()).add(item['_ref'].id)
+            elif isinstance(item, (dict, SON)) and "_ref" in item:
+                reference_map.setdefault(get_document(item["_cls"]), set()).add(
+                    item["_ref"].id
+                )
             elif isinstance(item, (dict, list, tuple)) and depth - 1 <= self.max_depth:
                 references = self._find_references(item, depth - 1)
                 for key, refs in iteritems(references):
@@ -151,12 +166,13 @@ def _fetch_objects(self, doc_type=None):
 
             # we use getattr instead of hasattr because hasattr swallows any exception under python2
             # so it could hide nasty things without raising exceptions (cfr bug #1688))
-            ref_document_cls_exists = (getattr(collection, 'objects', None) is not None)
+            ref_document_cls_exists = getattr(collection, "objects", None) is not None
 
             if ref_document_cls_exists:
                 col_name = collection._get_collection_name()
-                refs = [dbref for dbref in dbrefs
-                        if (col_name, dbref) not in object_map]
+                refs = [
+                    dbref for dbref in dbrefs if (col_name, dbref) not in object_map
+                ]
                 references = collection.objects.in_bulk(refs)
                 for key, doc in iteritems(references):
                     object_map[(col_name, key)] = doc
@@ -164,23 +180,26 @@ def _fetch_objects(self, doc_type=None):
                 if isinstance(doc_type, (ListField, DictField, MapField)):
                     continue
 
-                refs = [dbref for dbref in dbrefs
-                        if (collection, dbref) not in object_map]
+                refs = [
+                    dbref for dbref in dbrefs if (collection, dbref) not in object_map
+                ]
 
                 if doc_type:
-                    references = doc_type._get_db()[collection].find({'_id': {'$in': refs}})
+                    references = doc_type._get_db()[collection].find(
+                        {"_id": {"$in": refs}}
+                    )
                     for ref in references:
                         doc = doc_type._from_son(ref)
                         object_map[(collection, doc.id)] = doc
                 else:
-                    references = get_db()[collection].find({'_id': {'$in': refs}})
+                    references = get_db()[collection].find({"_id": {"$in": refs}})
                     for ref in references:
-                        if '_cls' in ref:
-                            doc = get_document(ref['_cls'])._from_son(ref)
+                        if "_cls" in ref:
+                            doc = get_document(ref["_cls"])._from_son(ref)
                         elif doc_type is None:
                             doc = get_document(
-                                ''.join(x.capitalize()
-                                        for x in collection.split('_')))._from_son(ref)
+                                "".join(x.capitalize() for x in collection.split("_"))
+                            )._from_son(ref)
                         else:
                             doc = doc_type._from_son(ref)
                         object_map[(collection, doc.id)] = doc
@@ -208,19 +227,20 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                     return BaseList(items, instance, name)
 
         if isinstance(items, (dict, SON)):
-            if '_ref' in items:
+            if "_ref" in items:
                 return self.object_map.get(
-                    (items['_ref'].collection, items['_ref'].id), items)
-            elif '_cls' in items:
-                doc = get_document(items['_cls'])._from_son(items)
-                _cls = doc._data.pop('_cls', None)
-                del items['_cls']
+                    (items["_ref"].collection, items["_ref"].id), items
+                )
+            elif "_cls" in items:
+                doc = get_document(items["_cls"])._from_son(items)
+                _cls = doc._data.pop("_cls", None)
+                del items["_cls"]
                 doc._data = self._attach_objects(doc._data, depth, doc, None)
                 if _cls is not None:
-                    doc._data['_cls'] = _cls
+                    doc._data["_cls"] = _cls
                 return doc
 
-        if not hasattr(items, 'items'):
+        if not hasattr(items, "items"):
             is_list = True
             list_type = BaseList
             if isinstance(items, EmbeddedDocumentList):
@@ -247,17 +267,25 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                     v = data[k]._data.get(field_name, None)
                     if isinstance(v, DBRef):
                         data[k]._data[field_name] = self.object_map.get(
-                            (v.collection, v.id), v)
-                    elif isinstance(v, (dict, SON)) and '_ref' in v:
+                            (v.collection, v.id), v
+                        )
+                    elif isinstance(v, (dict, SON)) and "_ref" in v:
                         data[k]._data[field_name] = self.object_map.get(
-                            (v['_ref'].collection, v['_ref'].id), v)
+                            (v["_ref"].collection, v["_ref"].id), v
+                        )
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                        item_name = six.text_type('{0}.{1}.{2}').format(name, k, field_name)
-                        data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
+                        item_name = six.text_type("{0}.{1}.{2}").format(
+                            name, k, field_name
+                        )
+                        data[k]._data[field_name] = self._attach_objects(
+                            v, depth, instance=instance, name=item_name
+                        )
             elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                item_name = '%s.%s' % (name, k) if name else name
-                data[k] = self._attach_objects(v, depth - 1, instance=instance, name=item_name)
-            elif isinstance(v, DBRef) and hasattr(v, 'id'):
+                item_name = "%s.%s" % (name, k) if name else name
+                data[k] = self._attach_objects(
+                    v, depth - 1, instance=instance, name=item_name
+                )
+            elif isinstance(v, DBRef) and hasattr(v, "id"):
                 data[k] = self.object_map.get((v.collection, v.id), v)
 
         if instance and name:
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 520de5bf5..41166df45 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -8,23 +8,36 @@
 from six import iteritems
 
 from mongoengine import signals
-from mongoengine.base import (BaseDict, BaseDocument, BaseList,
-                              DocumentMetaclass, EmbeddedDocumentList,
-                              TopLevelDocumentMetaclass, get_document)
+from mongoengine.base import (
+    BaseDict,
+    BaseDocument,
+    BaseList,
+    DocumentMetaclass,
+    EmbeddedDocumentList,
+    TopLevelDocumentMetaclass,
+    get_document,
+)
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
-from mongoengine.context_managers import (set_write_concern,
-                                          switch_collection,
-                                          switch_db)
-from mongoengine.errors import (InvalidDocumentError, InvalidQueryError,
-                                SaveConditionError)
+from mongoengine.context_managers import set_write_concern, switch_collection, switch_db
+from mongoengine.errors import (
+    InvalidDocumentError,
+    InvalidQueryError,
+    SaveConditionError,
+)
 from mongoengine.pymongo_support import list_collection_names
-from mongoengine.queryset import (NotUniqueError, OperationError,
-                                  QuerySet, transform)
+from mongoengine.queryset import NotUniqueError, OperationError, QuerySet, transform
 
-__all__ = ('Document', 'EmbeddedDocument', 'DynamicDocument',
-           'DynamicEmbeddedDocument', 'OperationError',
-           'InvalidCollectionError', 'NotUniqueError', 'MapReduceDocument')
+__all__ = (
+    "Document",
+    "EmbeddedDocument",
+    "DynamicDocument",
+    "DynamicEmbeddedDocument",
+    "OperationError",
+    "InvalidCollectionError",
+    "NotUniqueError",
+    "MapReduceDocument",
+)
 
 
 def includes_cls(fields):
@@ -35,7 +48,7 @@ def includes_cls(fields):
             first_field = fields[0]
         elif isinstance(fields[0], (list, tuple)) and len(fields[0]):
             first_field = fields[0][0]
-    return first_field == '_cls'
+    return first_field == "_cls"
 
 
 class InvalidCollectionError(Exception):
@@ -56,7 +69,7 @@ class EmbeddedDocument(six.with_metaclass(DocumentMetaclass, BaseDocument)):
     :attr:`meta` dictionary.
     """
 
-    __slots__ = ('_instance', )
+    __slots__ = ("_instance",)
 
     # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
@@ -85,8 +98,8 @@ def to_mongo(self, *args, **kwargs):
         data = super(EmbeddedDocument, self).to_mongo(*args, **kwargs)
 
         # remove _id from the SON if it's in it and it's None
-        if '_id' in data and data['_id'] is None:
-            del data['_id']
+        if "_id" in data and data["_id"] is None:
+            del data["_id"]
 
         return data
 
@@ -147,19 +160,19 @@ class Document(six.with_metaclass(TopLevelDocumentMetaclass, BaseDocument)):
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
     my_metaclass = TopLevelDocumentMetaclass
 
-    __slots__ = ('__objects',)
+    __slots__ = ("__objects",)
 
     @property
     def pk(self):
         """Get the primary key."""
-        if 'id_field' not in self._meta:
+        if "id_field" not in self._meta:
             return None
-        return getattr(self, self._meta['id_field'])
+        return getattr(self, self._meta["id_field"])
 
     @pk.setter
     def pk(self, value):
         """Set the primary key."""
-        return setattr(self, self._meta['id_field'], value)
+        return setattr(self, self._meta["id_field"], value)
 
     def __hash__(self):
         """Return the hash based on the PK of this document. If it's new
@@ -173,7 +186,7 @@ def __hash__(self):
     @classmethod
     def _get_db(cls):
         """Some Model using other db_alias"""
-        return get_db(cls._meta.get('db_alias', DEFAULT_CONNECTION_NAME))
+        return get_db(cls._meta.get("db_alias", DEFAULT_CONNECTION_NAME))
 
     @classmethod
     def _disconnect(cls):
@@ -190,9 +203,9 @@ def _get_collection(cls):
         2. Creates indexes defined in this document's :attr:`meta` dictionary.
            This happens only if `auto_create_index` is True.
         """
-        if not hasattr(cls, '_collection') or cls._collection is None:
+        if not hasattr(cls, "_collection") or cls._collection is None:
             # Get the collection, either capped or regular.
-            if cls._meta.get('max_size') or cls._meta.get('max_documents'):
+            if cls._meta.get("max_size") or cls._meta.get("max_documents"):
                 cls._collection = cls._get_capped_collection()
             else:
                 db = cls._get_db()
@@ -203,8 +216,7 @@ def _get_collection(cls):
             # set to False.
             # Also there is no need to ensure indexes on slave.
             db = cls._get_db()
-            if cls._meta.get('auto_create_index', True) and\
-                    db.client.is_primary:
+            if cls._meta.get("auto_create_index", True) and db.client.is_primary:
                 cls.ensure_indexes()
 
         return cls._collection
@@ -216,8 +228,8 @@ def _get_capped_collection(cls):
         collection_name = cls._get_collection_name()
 
         # Get max document limit and max byte size from meta.
-        max_size = cls._meta.get('max_size') or 10 * 2 ** 20  # 10MB default
-        max_documents = cls._meta.get('max_documents')
+        max_size = cls._meta.get("max_size") or 10 * 2 ** 20  # 10MB default
+        max_documents = cls._meta.get("max_documents")
 
         # MongoDB will automatically raise the size to make it a multiple of
         # 256 bytes. We raise it here ourselves to be able to reliably compare
@@ -227,24 +239,23 @@ def _get_capped_collection(cls):
 
         # If the collection already exists and has different options
         # (i.e. isn't capped or has different max/size), raise an error.
-        if collection_name in list_collection_names(db, include_system_collections=True):
+        if collection_name in list_collection_names(
+            db, include_system_collections=True
+        ):
             collection = db[collection_name]
             options = collection.options()
-            if (
-                options.get('max') != max_documents or
-                options.get('size') != max_size
-            ):
+            if options.get("max") != max_documents or options.get("size") != max_size:
                 raise InvalidCollectionError(
                     'Cannot create collection "{}" as a capped '
-                    'collection as it already exists'.format(cls._collection)
+                    "collection as it already exists".format(cls._collection)
                 )
 
             return collection
 
         # Create a new capped collection.
-        opts = {'capped': True, 'size': max_size}
+        opts = {"capped": True, "size": max_size}
         if max_documents:
-            opts['max'] = max_documents
+            opts["max"] = max_documents
 
         return db.create_collection(collection_name, **opts)
 
@@ -253,11 +264,11 @@ def to_mongo(self, *args, **kwargs):
 
         # If '_id' is None, try and set it from self._data. If that
         # doesn't exist either, remove '_id' from the SON completely.
-        if data['_id'] is None:
-            if self._data.get('id') is None:
-                del data['_id']
+        if data["_id"] is None:
+            if self._data.get("id") is None:
+                del data["_id"]
             else:
-                data['_id'] = self._data['id']
+                data["_id"] = self._data["id"]
 
         return data
 
@@ -279,15 +290,17 @@ def modify(self, query=None, **update):
             query = {}
 
         if self.pk is None:
-            raise InvalidDocumentError('The document does not have a primary key.')
+            raise InvalidDocumentError("The document does not have a primary key.")
 
-        id_field = self._meta['id_field']
+        id_field = self._meta["id_field"]
         query = query.copy() if isinstance(query, dict) else query.to_query(self)
 
         if id_field not in query:
             query[id_field] = self.pk
         elif query[id_field] != self.pk:
-            raise InvalidQueryError('Invalid document modify query: it must modify only this document.')
+            raise InvalidQueryError(
+                "Invalid document modify query: it must modify only this document."
+            )
 
         # Need to add shard key to query, or you get an error
         query.update(self._object_key)
@@ -304,9 +317,19 @@ def modify(self, query=None, **update):
 
         return True
 
-    def save(self, force_insert=False, validate=True, clean=True,
-             write_concern=None, cascade=None, cascade_kwargs=None,
-             _refs=None, save_condition=None, signal_kwargs=None, **kwargs):
+    def save(
+        self,
+        force_insert=False,
+        validate=True,
+        clean=True,
+        write_concern=None,
+        cascade=None,
+        cascade_kwargs=None,
+        _refs=None,
+        save_condition=None,
+        signal_kwargs=None,
+        **kwargs
+    ):
         """Save the :class:`~mongoengine.Document` to the database. If the
         document already exists, it will be updated, otherwise it will be
         created.
@@ -360,8 +383,8 @@ def save(self, force_insert=False, validate=True, clean=True,
         """
         signal_kwargs = signal_kwargs or {}
 
-        if self._meta.get('abstract'):
-            raise InvalidDocumentError('Cannot save an abstract document.')
+        if self._meta.get("abstract"):
+            raise InvalidDocumentError("Cannot save an abstract document.")
 
         signals.pre_save.send(self.__class__, document=self, **signal_kwargs)
 
@@ -371,15 +394,16 @@ def save(self, force_insert=False, validate=True, clean=True,
         if write_concern is None:
             write_concern = {}
 
-        doc_id = self.to_mongo(fields=[self._meta['id_field']])
-        created = ('_id' not in doc_id or self._created or force_insert)
+        doc_id = self.to_mongo(fields=[self._meta["id_field"]])
+        created = "_id" not in doc_id or self._created or force_insert
 
-        signals.pre_save_post_validation.send(self.__class__, document=self,
-                                              created=created, **signal_kwargs)
+        signals.pre_save_post_validation.send(
+            self.__class__, document=self, created=created, **signal_kwargs
+        )
         # it might be refreshed by the pre_save_post_validation hook, e.g., for etag generation
         doc = self.to_mongo()
 
-        if self._meta.get('auto_create_index', True):
+        if self._meta.get("auto_create_index", True):
             self.ensure_indexes()
 
         try:
@@ -387,44 +411,45 @@ def save(self, force_insert=False, validate=True, clean=True,
             if created:
                 object_id = self._save_create(doc, force_insert, write_concern)
             else:
-                object_id, created = self._save_update(doc, save_condition,
-                                                       write_concern)
+                object_id, created = self._save_update(
+                    doc, save_condition, write_concern
+                )
 
             if cascade is None:
-                cascade = (self._meta.get('cascade', False) or
-                           cascade_kwargs is not None)
+                cascade = self._meta.get("cascade", False) or cascade_kwargs is not None
 
             if cascade:
                 kwargs = {
-                    'force_insert': force_insert,
-                    'validate': validate,
-                    'write_concern': write_concern,
-                    'cascade': cascade
+                    "force_insert": force_insert,
+                    "validate": validate,
+                    "write_concern": write_concern,
+                    "cascade": cascade,
                 }
                 if cascade_kwargs:  # Allow granular control over cascades
                     kwargs.update(cascade_kwargs)
-                kwargs['_refs'] = _refs
+                kwargs["_refs"] = _refs
                 self.cascade_save(**kwargs)
 
         except pymongo.errors.DuplicateKeyError as err:
-            message = u'Tried to save duplicate unique keys (%s)'
+            message = u"Tried to save duplicate unique keys (%s)"
             raise NotUniqueError(message % six.text_type(err))
         except pymongo.errors.OperationFailure as err:
-            message = 'Could not save document (%s)'
-            if re.match('^E1100[01] duplicate key', six.text_type(err)):
+            message = "Could not save document (%s)"
+            if re.match("^E1100[01] duplicate key", six.text_type(err)):
                 # E11000 - duplicate key error index
                 # E11001 - duplicate key on update
-                message = u'Tried to save duplicate unique keys (%s)'
+                message = u"Tried to save duplicate unique keys (%s)"
                 raise NotUniqueError(message % six.text_type(err))
             raise OperationError(message % six.text_type(err))
 
         # Make sure we store the PK on this document now that it's saved
-        id_field = self._meta['id_field']
-        if created or id_field not in self._meta.get('shard_key', []):
+        id_field = self._meta["id_field"]
+        if created or id_field not in self._meta.get("shard_key", []):
             self[id_field] = self._fields[id_field].to_python(object_id)
 
-        signals.post_save.send(self.__class__, document=self,
-                               created=created, **signal_kwargs)
+        signals.post_save.send(
+            self.__class__, document=self, created=created, **signal_kwargs
+        )
 
         self._clear_changed_fields()
         self._created = False
@@ -442,11 +467,12 @@ def _save_create(self, doc, force_insert, write_concern):
                 return wc_collection.insert_one(doc).inserted_id
             # insert_one will provoke UniqueError alongside save does not
             # therefore, it need to catch and call replace_one.
-            if '_id' in doc:
+            if "_id" in doc:
                 raw_object = wc_collection.find_one_and_replace(
-                    {'_id': doc['_id']}, doc)
+                    {"_id": doc["_id"]}, doc
+                )
                 if raw_object:
-                    return doc['_id']
+                    return doc["_id"]
 
             object_id = wc_collection.insert_one(doc).inserted_id
 
@@ -461,9 +487,9 @@ def _get_update_doc(self):
 
         update_doc = {}
         if updates:
-            update_doc['$set'] = updates
+            update_doc["$set"] = updates
         if removals:
-            update_doc['$unset'] = removals
+            update_doc["$unset"] = removals
 
         return update_doc
 
@@ -473,39 +499,38 @@ def _save_update(self, doc, save_condition, write_concern):
         Helper method, should only be used inside save().
         """
         collection = self._get_collection()
-        object_id = doc['_id']
+        object_id = doc["_id"]
         created = False
 
         select_dict = {}
         if save_condition is not None:
             select_dict = transform.query(self.__class__, **save_condition)
 
-        select_dict['_id'] = object_id
+        select_dict["_id"] = object_id
 
         # Need to add shard key to query, or you get an error
-        shard_key = self._meta.get('shard_key', tuple())
+        shard_key = self._meta.get("shard_key", tuple())
         for k in shard_key:
-            path = self._lookup_field(k.split('.'))
+            path = self._lookup_field(k.split("."))
             actual_key = [p.db_field for p in path]
             val = doc
             for ak in actual_key:
                 val = val[ak]
-            select_dict['.'.join(actual_key)] = val
+            select_dict[".".join(actual_key)] = val
 
         update_doc = self._get_update_doc()
         if update_doc:
             upsert = save_condition is None
             with set_write_concern(collection, write_concern) as wc_collection:
                 last_error = wc_collection.update_one(
-                    select_dict,
-                    update_doc,
-                    upsert=upsert
+                    select_dict, update_doc, upsert=upsert
                 ).raw_result
-            if not upsert and last_error['n'] == 0:
-                raise SaveConditionError('Race condition preventing'
-                                         ' document update detected')
+            if not upsert and last_error["n"] == 0:
+                raise SaveConditionError(
+                    "Race condition preventing document update detected"
+                )
             if last_error is not None:
-                updated_existing = last_error.get('updatedExisting')
+                updated_existing = last_error.get("updatedExisting")
                 if updated_existing is False:
                     created = True
                     # !!! This is bad, means we accidentally created a new,
@@ -518,21 +543,20 @@ def cascade_save(self, **kwargs):
         """Recursively save any references and generic references on the
         document.
         """
-        _refs = kwargs.get('_refs') or []
+        _refs = kwargs.get("_refs") or []
 
-        ReferenceField = _import_class('ReferenceField')
-        GenericReferenceField = _import_class('GenericReferenceField')
+        ReferenceField = _import_class("ReferenceField")
+        GenericReferenceField = _import_class("GenericReferenceField")
 
         for name, cls in self._fields.items():
-            if not isinstance(cls, (ReferenceField,
-                                    GenericReferenceField)):
+            if not isinstance(cls, (ReferenceField, GenericReferenceField)):
                 continue
 
             ref = self._data.get(name)
             if not ref or isinstance(ref, DBRef):
                 continue
 
-            if not getattr(ref, '_changed_fields', True):
+            if not getattr(ref, "_changed_fields", True):
                 continue
 
             ref_id = "%s,%s" % (ref.__class__.__name__, str(ref._data))
@@ -545,7 +569,7 @@ def cascade_save(self, **kwargs):
     @property
     def _qs(self):
         """Return the default queryset corresponding to this document."""
-        if not hasattr(self, '__objects'):
+        if not hasattr(self, "__objects"):
             self.__objects = QuerySet(self, self._get_collection())
         return self.__objects
 
@@ -558,15 +582,15 @@ def _object_key(self):
         a sharded collection with a compound shard key, it can contain a more
         complex query.
         """
-        select_dict = {'pk': self.pk}
-        shard_key = self.__class__._meta.get('shard_key', tuple())
+        select_dict = {"pk": self.pk}
+        shard_key = self.__class__._meta.get("shard_key", tuple())
         for k in shard_key:
-            path = self._lookup_field(k.split('.'))
+            path = self._lookup_field(k.split("."))
             actual_key = [p.db_field for p in path]
             val = self
             for ak in actual_key:
                 val = getattr(val, ak)
-            select_dict['__'.join(actual_key)] = val
+            select_dict["__".join(actual_key)] = val
         return select_dict
 
     def update(self, **kwargs):
@@ -577,14 +601,13 @@ def update(self, **kwargs):
         been saved.
         """
         if self.pk is None:
-            if kwargs.get('upsert', False):
+            if kwargs.get("upsert", False):
                 query = self.to_mongo()
-                if '_cls' in query:
-                    del query['_cls']
+                if "_cls" in query:
+                    del query["_cls"]
                 return self._qs.filter(**query).update_one(**kwargs)
             else:
-                raise OperationError(
-                    'attempt to update a document not yet saved')
+                raise OperationError("attempt to update a document not yet saved")
 
         # Need to add shard key to query, or you get an error
         return self._qs.filter(**self._object_key).update_one(**kwargs)
@@ -608,16 +631,17 @@ def delete(self, signal_kwargs=None, **write_concern):
         signals.pre_delete.send(self.__class__, document=self, **signal_kwargs)
 
         # Delete FileFields separately
-        FileField = _import_class('FileField')
+        FileField = _import_class("FileField")
         for name, field in iteritems(self._fields):
             if isinstance(field, FileField):
                 getattr(self, name).delete()
 
         try:
-            self._qs.filter(
-                **self._object_key).delete(write_concern=write_concern, _from_doc_delete=True)
+            self._qs.filter(**self._object_key).delete(
+                write_concern=write_concern, _from_doc_delete=True
+            )
         except pymongo.errors.OperationFailure as err:
-            message = u'Could not delete document (%s)' % err.message
+            message = u"Could not delete document (%s)" % err.message
             raise OperationError(message)
         signals.post_delete.send(self.__class__, document=self, **signal_kwargs)
 
@@ -686,7 +710,7 @@ def select_related(self, max_depth=1):
 
         .. versionadded:: 0.5
         """
-        DeReference = _import_class('DeReference')
+        DeReference = _import_class("DeReference")
         DeReference()([self], max_depth + 1)
         return self
 
@@ -704,20 +728,24 @@ def reload(self, *fields, **kwargs):
         if fields and isinstance(fields[0], int):
             max_depth = fields[0]
             fields = fields[1:]
-        elif 'max_depth' in kwargs:
-            max_depth = kwargs['max_depth']
+        elif "max_depth" in kwargs:
+            max_depth = kwargs["max_depth"]
 
         if self.pk is None:
-            raise self.DoesNotExist('Document does not exist')
+            raise self.DoesNotExist("Document does not exist")
 
-        obj = self._qs.read_preference(ReadPreference.PRIMARY).filter(
-            **self._object_key).only(*fields).limit(
-            1).select_related(max_depth=max_depth)
+        obj = (
+            self._qs.read_preference(ReadPreference.PRIMARY)
+            .filter(**self._object_key)
+            .only(*fields)
+            .limit(1)
+            .select_related(max_depth=max_depth)
+        )
 
         if obj:
             obj = obj[0]
         else:
-            raise self.DoesNotExist('Document does not exist')
+            raise self.DoesNotExist("Document does not exist")
         for field in obj._data:
             if not fields or field in fields:
                 try:
@@ -733,9 +761,11 @@ def reload(self, *fields, **kwargs):
                         # i.e. obj.update(unset__field=1) followed by obj.reload()
                         delattr(self, field)
 
-        self._changed_fields = list(
-            set(self._changed_fields) - set(fields)
-        ) if fields else obj._changed_fields
+        self._changed_fields = (
+            list(set(self._changed_fields) - set(fields))
+            if fields
+            else obj._changed_fields
+        )
         self._created = False
         return self
 
@@ -761,7 +791,7 @@ def to_dbref(self):
         """Returns an instance of :class:`~bson.dbref.DBRef` useful in
         `__raw__` queries."""
         if self.pk is None:
-            msg = 'Only saved documents can have a valid dbref'
+            msg = "Only saved documents can have a valid dbref"
             raise OperationError(msg)
         return DBRef(self.__class__._get_collection_name(), self.pk)
 
@@ -770,18 +800,22 @@ def register_delete_rule(cls, document_cls, field_name, rule):
         """This method registers the delete rules to apply when removing this
         object.
         """
-        classes = [get_document(class_name)
-                   for class_name in cls._subclasses
-                   if class_name != cls.__name__] + [cls]
-        documents = [get_document(class_name)
-                     for class_name in document_cls._subclasses
-                     if class_name != document_cls.__name__] + [document_cls]
+        classes = [
+            get_document(class_name)
+            for class_name in cls._subclasses
+            if class_name != cls.__name__
+        ] + [cls]
+        documents = [
+            get_document(class_name)
+            for class_name in document_cls._subclasses
+            if class_name != document_cls.__name__
+        ] + [document_cls]
 
         for klass in classes:
             for document_cls in documents:
-                delete_rules = klass._meta.get('delete_rules') or {}
+                delete_rules = klass._meta.get("delete_rules") or {}
                 delete_rules[(document_cls, field_name)] = rule
-                klass._meta['delete_rules'] = delete_rules
+                klass._meta["delete_rules"] = delete_rules
 
     @classmethod
     def drop_collection(cls):
@@ -796,8 +830,9 @@ def drop_collection(cls):
         """
         coll_name = cls._get_collection_name()
         if not coll_name:
-            raise OperationError('Document %s has no collection defined '
-                                 '(is it abstract ?)' % cls)
+            raise OperationError(
+                "Document %s has no collection defined (is it abstract ?)" % cls
+            )
         cls._collection = None
         db = cls._get_db()
         db.drop_collection(coll_name)
@@ -813,19 +848,18 @@ def create_index(cls, keys, background=False, **kwargs):
         """
         index_spec = cls._build_index_spec(keys)
         index_spec = index_spec.copy()
-        fields = index_spec.pop('fields')
-        drop_dups = kwargs.get('drop_dups', False)
+        fields = index_spec.pop("fields")
+        drop_dups = kwargs.get("drop_dups", False)
         if drop_dups:
-            msg = 'drop_dups is deprecated and is removed when using PyMongo 3+.'
+            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
             warnings.warn(msg, DeprecationWarning)
-        index_spec['background'] = background
+        index_spec["background"] = background
         index_spec.update(kwargs)
 
         return cls._get_collection().create_index(fields, **index_spec)
 
     @classmethod
-    def ensure_index(cls, key_or_list, drop_dups=False, background=False,
-                     **kwargs):
+    def ensure_index(cls, key_or_list, drop_dups=False, background=False, **kwargs):
         """Ensure that the given indexes are in place. Deprecated in favour
         of create_index.
 
@@ -837,7 +871,7 @@ def ensure_index(cls, key_or_list, drop_dups=False, background=False,
             will be removed if PyMongo3+ is used
         """
         if drop_dups:
-            msg = 'drop_dups is deprecated and is removed when using PyMongo 3+.'
+            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
             warnings.warn(msg, DeprecationWarning)
         return cls.create_index(key_or_list, background=background, **kwargs)
 
@@ -850,12 +884,12 @@ def ensure_indexes(cls):
         .. note:: You can disable automatic index creation by setting
                   `auto_create_index` to False in the documents meta data
         """
-        background = cls._meta.get('index_background', False)
-        drop_dups = cls._meta.get('index_drop_dups', False)
-        index_opts = cls._meta.get('index_opts') or {}
-        index_cls = cls._meta.get('index_cls', True)
+        background = cls._meta.get("index_background", False)
+        drop_dups = cls._meta.get("index_drop_dups", False)
+        index_opts = cls._meta.get("index_opts") or {}
+        index_cls = cls._meta.get("index_cls", True)
         if drop_dups:
-            msg = 'drop_dups is deprecated and is removed when using PyMongo 3+.'
+            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
             warnings.warn(msg, DeprecationWarning)
 
         collection = cls._get_collection()
@@ -871,40 +905,39 @@ def ensure_indexes(cls):
         cls_indexed = False
 
         # Ensure document-defined indexes are created
-        if cls._meta['index_specs']:
-            index_spec = cls._meta['index_specs']
+        if cls._meta["index_specs"]:
+            index_spec = cls._meta["index_specs"]
             for spec in index_spec:
                 spec = spec.copy()
-                fields = spec.pop('fields')
+                fields = spec.pop("fields")
                 cls_indexed = cls_indexed or includes_cls(fields)
                 opts = index_opts.copy()
                 opts.update(spec)
 
                 # we shouldn't pass 'cls' to the collection.ensureIndex options
                 # because of https://jira.mongodb.org/browse/SERVER-769
-                if 'cls' in opts:
-                    del opts['cls']
+                if "cls" in opts:
+                    del opts["cls"]
 
                 collection.create_index(fields, background=background, **opts)
 
         # If _cls is being used (for polymorphism), it needs an index,
         # only if another index doesn't begin with _cls
-        if index_cls and not cls_indexed and cls._meta.get('allow_inheritance'):
+        if index_cls and not cls_indexed and cls._meta.get("allow_inheritance"):
 
             # we shouldn't pass 'cls' to the collection.ensureIndex options
             # because of https://jira.mongodb.org/browse/SERVER-769
-            if 'cls' in index_opts:
-                del index_opts['cls']
+            if "cls" in index_opts:
+                del index_opts["cls"]
 
-            collection.create_index('_cls', background=background,
-                                    **index_opts)
+            collection.create_index("_cls", background=background, **index_opts)
 
     @classmethod
     def list_indexes(cls):
         """ Lists all of the indexes that should be created for given
         collection. It includes all the indexes from super- and sub-classes.
         """
-        if cls._meta.get('abstract'):
+        if cls._meta.get("abstract"):
             return []
 
         # get all the base classes, subclasses and siblings
@@ -912,22 +945,27 @@ def list_indexes(cls):
 
         def get_classes(cls):
 
-            if (cls not in classes and
-                    isinstance(cls, TopLevelDocumentMetaclass)):
+            if cls not in classes and isinstance(cls, TopLevelDocumentMetaclass):
                 classes.append(cls)
 
             for base_cls in cls.__bases__:
-                if (isinstance(base_cls, TopLevelDocumentMetaclass) and
-                        base_cls != Document and
-                        not base_cls._meta.get('abstract') and
-                        base_cls._get_collection().full_name == cls._get_collection().full_name and
-                        base_cls not in classes):
+                if (
+                    isinstance(base_cls, TopLevelDocumentMetaclass)
+                    and base_cls != Document
+                    and not base_cls._meta.get("abstract")
+                    and base_cls._get_collection().full_name
+                    == cls._get_collection().full_name
+                    and base_cls not in classes
+                ):
                     classes.append(base_cls)
                     get_classes(base_cls)
             for subclass in cls.__subclasses__():
-                if (isinstance(base_cls, TopLevelDocumentMetaclass) and
-                        subclass._get_collection().full_name == cls._get_collection().full_name and
-                        subclass not in classes):
+                if (
+                    isinstance(base_cls, TopLevelDocumentMetaclass)
+                    and subclass._get_collection().full_name
+                    == cls._get_collection().full_name
+                    and subclass not in classes
+                ):
                     classes.append(subclass)
                     get_classes(subclass)
 
@@ -937,11 +975,11 @@ def get_classes(cls):
         def get_indexes_spec(cls):
             indexes = []
 
-            if cls._meta['index_specs']:
-                index_spec = cls._meta['index_specs']
+            if cls._meta["index_specs"]:
+                index_spec = cls._meta["index_specs"]
                 for spec in index_spec:
                     spec = spec.copy()
-                    fields = spec.pop('fields')
+                    fields = spec.pop("fields")
                     indexes.append(fields)
             return indexes
 
@@ -952,10 +990,10 @@ def get_indexes_spec(cls):
                     indexes.append(index)
 
         # finish up by appending { '_id': 1 } and { '_cls': 1 }, if needed
-        if [(u'_id', 1)] not in indexes:
-            indexes.append([(u'_id', 1)])
-        if cls._meta.get('index_cls', True) and cls._meta.get('allow_inheritance'):
-            indexes.append([(u'_cls', 1)])
+        if [(u"_id", 1)] not in indexes:
+            indexes.append([(u"_id", 1)])
+        if cls._meta.get("index_cls", True) and cls._meta.get("allow_inheritance"):
+            indexes.append([(u"_cls", 1)])
 
         return indexes
 
@@ -969,27 +1007,26 @@ def compare_indexes(cls):
 
         existing = []
         for info in cls._get_collection().index_information().values():
-            if '_fts' in info['key'][0]:
-                index_type = info['key'][0][1]
-                text_index_fields = info.get('weights').keys()
-                existing.append(
-                    [(key, index_type) for key in text_index_fields])
+            if "_fts" in info["key"][0]:
+                index_type = info["key"][0][1]
+                text_index_fields = info.get("weights").keys()
+                existing.append([(key, index_type) for key in text_index_fields])
             else:
-                existing.append(info['key'])
+                existing.append(info["key"])
         missing = [index for index in required if index not in existing]
         extra = [index for index in existing if index not in required]
 
         # if { _cls: 1 } is missing, make sure it's *really* necessary
-        if [(u'_cls', 1)] in missing:
+        if [(u"_cls", 1)] in missing:
             cls_obsolete = False
             for index in existing:
                 if includes_cls(index) and index not in extra:
                     cls_obsolete = True
                     break
             if cls_obsolete:
-                missing.remove([(u'_cls', 1)])
+                missing.remove([(u"_cls", 1)])
 
-        return {'missing': missing, 'extra': extra}
+        return {"missing": missing, "extra": extra}
 
 
 class DynamicDocument(six.with_metaclass(TopLevelDocumentMetaclass, Document)):
@@ -1074,17 +1111,16 @@ def object(self):
         """Lazy-load the object referenced by ``self.key``. ``self.key``
         should be the ``primary_key``.
         """
-        id_field = self._document()._meta['id_field']
+        id_field = self._document()._meta["id_field"]
         id_field_type = type(id_field)
 
         if not isinstance(self.key, id_field_type):
             try:
                 self.key = id_field_type(self.key)
             except Exception:
-                raise Exception('Could not cast key as %s' %
-                                id_field_type.__name__)
+                raise Exception("Could not cast key as %s" % id_field_type.__name__)
 
-        if not hasattr(self, '_key_object'):
+        if not hasattr(self, "_key_object"):
             self._key_object = self._document.objects.with_id(self.key)
             return self._key_object
         return self._key_object
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index bea1d3dca..9852f2a1d 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -3,10 +3,20 @@
 import six
 from six import iteritems
 
-__all__ = ('NotRegistered', 'InvalidDocumentError', 'LookUpError',
-           'DoesNotExist', 'MultipleObjectsReturned', 'InvalidQueryError',
-           'OperationError', 'NotUniqueError', 'FieldDoesNotExist',
-           'ValidationError', 'SaveConditionError', 'DeprecatedError')
+__all__ = (
+    "NotRegistered",
+    "InvalidDocumentError",
+    "LookUpError",
+    "DoesNotExist",
+    "MultipleObjectsReturned",
+    "InvalidQueryError",
+    "OperationError",
+    "NotUniqueError",
+    "FieldDoesNotExist",
+    "ValidationError",
+    "SaveConditionError",
+    "DeprecatedError",
+)
 
 
 class NotRegistered(Exception):
@@ -71,25 +81,25 @@ class ValidationError(AssertionError):
     field_name = None
     _message = None
 
-    def __init__(self, message='', **kwargs):
+    def __init__(self, message="", **kwargs):
         super(ValidationError, self).__init__(message)
-        self.errors = kwargs.get('errors', {})
-        self.field_name = kwargs.get('field_name')
+        self.errors = kwargs.get("errors", {})
+        self.field_name = kwargs.get("field_name")
         self.message = message
 
     def __str__(self):
         return six.text_type(self.message)
 
     def __repr__(self):
-        return '%s(%s,)' % (self.__class__.__name__, self.message)
+        return "%s(%s,)" % (self.__class__.__name__, self.message)
 
     def __getattribute__(self, name):
         message = super(ValidationError, self).__getattribute__(name)
-        if name == 'message':
+        if name == "message":
             if self.field_name:
-                message = '%s' % message
+                message = "%s" % message
             if self.errors:
-                message = '%s(%s)' % (message, self._format_errors())
+                message = "%s(%s)" % (message, self._format_errors())
         return message
 
     def _get_message(self):
@@ -128,22 +138,22 @@ def build_dict(source):
     def _format_errors(self):
         """Returns a string listing all errors within a document"""
 
-        def generate_key(value, prefix=''):
+        def generate_key(value, prefix=""):
             if isinstance(value, list):
-                value = ' '.join([generate_key(k) for k in value])
+                value = " ".join([generate_key(k) for k in value])
             elif isinstance(value, dict):
-                value = ' '.join(
-                    [generate_key(v, k) for k, v in iteritems(value)])
+                value = " ".join([generate_key(v, k) for k, v in iteritems(value)])
 
-            results = '%s.%s' % (prefix, value) if prefix else value
+            results = "%s.%s" % (prefix, value) if prefix else value
             return results
 
         error_dict = defaultdict(list)
         for k, v in iteritems(self.to_dict()):
             error_dict[generate_key(v)].append(k)
-        return ' '.join(['%s: %s' % (k, v) for k, v in iteritems(error_dict)])
+        return " ".join(["%s: %s" % (k, v) for k, v in iteritems(error_dict)])
 
 
 class DeprecatedError(Exception):
     """Raise when a user uses a feature that has been Deprecated"""
+
     pass
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 2a4a2ad8d..7ab2276d9 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -27,9 +27,15 @@
     Int64 = long
 
 
-from mongoengine.base import (BaseDocument, BaseField, ComplexBaseField,
-                              GeoJsonBaseField, LazyReference, ObjectIdField,
-                              get_document)
+from mongoengine.base import (
+    BaseDocument,
+    BaseField,
+    ComplexBaseField,
+    GeoJsonBaseField,
+    LazyReference,
+    ObjectIdField,
+    get_document,
+)
 from mongoengine.base.utils import LazyRegexCompiler
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
@@ -53,21 +59,51 @@
 
 
 __all__ = (
-    'StringField', 'URLField', 'EmailField', 'IntField', 'LongField',
-    'FloatField', 'DecimalField', 'BooleanField', 'DateTimeField', 'DateField',
-    'ComplexDateTimeField', 'EmbeddedDocumentField', 'ObjectIdField',
-    'GenericEmbeddedDocumentField', 'DynamicField', 'ListField',
-    'SortedListField', 'EmbeddedDocumentListField', 'DictField',
-    'MapField', 'ReferenceField', 'CachedReferenceField',
-    'LazyReferenceField', 'GenericLazyReferenceField',
-    'GenericReferenceField', 'BinaryField', 'GridFSError', 'GridFSProxy',
-    'FileField', 'ImageGridFsProxy', 'ImproperlyConfigured', 'ImageField',
-    'GeoPointField', 'PointField', 'LineStringField', 'PolygonField',
-    'SequenceField', 'UUIDField', 'MultiPointField', 'MultiLineStringField',
-    'MultiPolygonField', 'GeoJsonBaseField'
+    "StringField",
+    "URLField",
+    "EmailField",
+    "IntField",
+    "LongField",
+    "FloatField",
+    "DecimalField",
+    "BooleanField",
+    "DateTimeField",
+    "DateField",
+    "ComplexDateTimeField",
+    "EmbeddedDocumentField",
+    "ObjectIdField",
+    "GenericEmbeddedDocumentField",
+    "DynamicField",
+    "ListField",
+    "SortedListField",
+    "EmbeddedDocumentListField",
+    "DictField",
+    "MapField",
+    "ReferenceField",
+    "CachedReferenceField",
+    "LazyReferenceField",
+    "GenericLazyReferenceField",
+    "GenericReferenceField",
+    "BinaryField",
+    "GridFSError",
+    "GridFSProxy",
+    "FileField",
+    "ImageGridFsProxy",
+    "ImproperlyConfigured",
+    "ImageField",
+    "GeoPointField",
+    "PointField",
+    "LineStringField",
+    "PolygonField",
+    "SequenceField",
+    "UUIDField",
+    "MultiPointField",
+    "MultiLineStringField",
+    "MultiPolygonField",
+    "GeoJsonBaseField",
 )
 
-RECURSIVE_REFERENCE_CONSTANT = 'self'
+RECURSIVE_REFERENCE_CONSTANT = "self"
 
 
 class StringField(BaseField):
@@ -83,23 +119,23 @@ def to_python(self, value):
         if isinstance(value, six.text_type):
             return value
         try:
-            value = value.decode('utf-8')
+            value = value.decode("utf-8")
         except Exception:
             pass
         return value
 
     def validate(self, value):
         if not isinstance(value, six.string_types):
-            self.error('StringField only accepts string values')
+            self.error("StringField only accepts string values")
 
         if self.max_length is not None and len(value) > self.max_length:
-            self.error('String value is too long')
+            self.error("String value is too long")
 
         if self.min_length is not None and len(value) < self.min_length:
-            self.error('String value is too short')
+            self.error("String value is too short")
 
         if self.regex is not None and self.regex.match(value) is None:
-            self.error('String value did not match validation regex')
+            self.error("String value did not match validation regex")
 
     def lookup_member(self, member_name):
         return None
@@ -109,18 +145,18 @@ def prepare_query_value(self, op, value):
             return value
 
         if op in STRING_OPERATORS:
-            case_insensitive = op.startswith('i')
-            op = op.lstrip('i')
+            case_insensitive = op.startswith("i")
+            op = op.lstrip("i")
 
             flags = re.IGNORECASE if case_insensitive else 0
 
-            regex = r'%s'
-            if op == 'startswith':
-                regex = r'^%s'
-            elif op == 'endswith':
-                regex = r'%s$'
-            elif op == 'exact':
-                regex = r'^%s$'
+            regex = r"%s"
+            if op == "startswith":
+                regex = r"^%s"
+            elif op == "endswith":
+                regex = r"%s$"
+            elif op == "exact":
+                regex = r"^%s$"
 
             # escape unsafe characters which could lead to a re.error
             value = re.escape(value)
@@ -135,14 +171,16 @@ class URLField(StringField):
     """
 
     _URL_REGEX = LazyRegexCompiler(
-        r'^(?:[a-z0-9\.\-]*)://'  # scheme is validated separately
-        r'(?:(?:[A-Z0-9](?:[A-Z0-9-_]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}(?<!-)\.?)|'  # domain...
-        r'localhost|'  # localhost...
-        r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|'  # ...or ipv4
-        r'\[?[A-F0-9]*:[A-F0-9:]+\]?)'  # ...or ipv6
-        r'(?::\d+)?'  # optional port
-        r'(?:/?|[/?]\S+)$', re.IGNORECASE)
-    _URL_SCHEMES = ['http', 'https', 'ftp', 'ftps']
+        r"^(?:[a-z0-9\.\-]*)://"  # scheme is validated separately
+        r"(?:(?:[A-Z0-9](?:[A-Z0-9-_]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}(?<!-)\.?)|"  # domain...
+        r"localhost|"  # localhost...
+        r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|"  # ...or ipv4
+        r"\[?[A-F0-9]*:[A-F0-9:]+\]?)"  # ...or ipv6
+        r"(?::\d+)?"  # optional port
+        r"(?:/?|[/?]\S+)$",
+        re.IGNORECASE,
+    )
+    _URL_SCHEMES = ["http", "https", "ftp", "ftps"]
 
     def __init__(self, url_regex=None, schemes=None, **kwargs):
         self.url_regex = url_regex or self._URL_REGEX
@@ -151,13 +189,13 @@ def __init__(self, url_regex=None, schemes=None, **kwargs):
 
     def validate(self, value):
         # Check first if the scheme is valid
-        scheme = value.split('://')[0].lower()
+        scheme = value.split("://")[0].lower()
         if scheme not in self.schemes:
-            self.error(u'Invalid scheme {} in URL: {}'.format(scheme, value))
+            self.error(u"Invalid scheme {} in URL: {}".format(scheme, value))
 
         # Then check full URL
         if not self.url_regex.match(value):
-            self.error(u'Invalid URL: {}'.format(value))
+            self.error(u"Invalid URL: {}".format(value))
 
 
 class EmailField(StringField):
@@ -165,12 +203,13 @@ class EmailField(StringField):
 
     .. versionadded:: 0.4
     """
+
     USER_REGEX = LazyRegexCompiler(
         # `dot-atom` defined in RFC 5322 Section 3.2.3.
         r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*\Z"
         # `quoted-string` defined in RFC 5322 Section 3.2.4.
         r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"\Z)',
-        re.IGNORECASE
+        re.IGNORECASE,
     )
 
     UTF8_USER_REGEX = LazyRegexCompiler(
@@ -180,18 +219,25 @@ class EmailField(StringField):
             r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z\u0080-\U0010FFFF]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z\u0080-\U0010FFFF]+)*\Z"
             # `quoted-string`
             r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"\Z)'
-        ), re.IGNORECASE | re.UNICODE
+        ),
+        re.IGNORECASE | re.UNICODE,
     )
 
     DOMAIN_REGEX = LazyRegexCompiler(
-        r'((?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+)(?:[A-Z0-9-]{2,63}(?<!-))\Z',
-        re.IGNORECASE
+        r"((?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+)(?:[A-Z0-9-]{2,63}(?<!-))\Z",
+        re.IGNORECASE,
     )
 
-    error_msg = u'Invalid email address: %s'
+    error_msg = u"Invalid email address: %s"
 
-    def __init__(self, domain_whitelist=None, allow_utf8_user=False,
-                 allow_ip_domain=False, *args, **kwargs):
+    def __init__(
+        self,
+        domain_whitelist=None,
+        allow_utf8_user=False,
+        allow_ip_domain=False,
+        *args,
+        **kwargs
+    ):
         """Initialize the EmailField.
 
         Args:
@@ -228,11 +274,7 @@ def validate_domain_part(self, domain_part):
             return True
 
         # Validate IPv4/IPv6, e.g. user@[192.168.0.1]
-        if (
-            self.allow_ip_domain and
-            domain_part[0] == '[' and
-            domain_part[-1] == ']'
-        ):
+        if self.allow_ip_domain and domain_part[0] == "[" and domain_part[-1] == "]":
             for addr_family in (socket.AF_INET, socket.AF_INET6):
                 try:
                     socket.inet_pton(addr_family, domain_part[1:-1])
@@ -245,10 +287,10 @@ def validate_domain_part(self, domain_part):
     def validate(self, value):
         super(EmailField, self).validate(value)
 
-        if '@' not in value:
+        if "@" not in value:
             self.error(self.error_msg % value)
 
-        user_part, domain_part = value.rsplit('@', 1)
+        user_part, domain_part = value.rsplit("@", 1)
 
         # Validate the user part.
         if not self.validate_user_part(user_part):
@@ -257,12 +299,16 @@ def validate(self, value):
         # Validate the domain and, if invalid, see if it's IDN-encoded.
         if not self.validate_domain_part(domain_part):
             try:
-                domain_part = domain_part.encode('idna').decode('ascii')
+                domain_part = domain_part.encode("idna").decode("ascii")
             except UnicodeError:
-                self.error("%s %s" % (self.error_msg % value, "(domain failed IDN encoding)"))
+                self.error(
+                    "%s %s" % (self.error_msg % value, "(domain failed IDN encoding)")
+                )
             else:
                 if not self.validate_domain_part(domain_part):
-                    self.error("%s %s" % (self.error_msg % value, "(domain validation failed)"))
+                    self.error(
+                        "%s %s" % (self.error_msg % value, "(domain validation failed)")
+                    )
 
 
 class IntField(BaseField):
@@ -283,13 +329,13 @@ def validate(self, value):
         try:
             value = int(value)
         except (TypeError, ValueError):
-            self.error('%s could not be converted to int' % value)
+            self.error("%s could not be converted to int" % value)
 
         if self.min_value is not None and value < self.min_value:
-            self.error('Integer value is too small')
+            self.error("Integer value is too small")
 
         if self.max_value is not None and value > self.max_value:
-            self.error('Integer value is too large')
+            self.error("Integer value is too large")
 
     def prepare_query_value(self, op, value):
         if value is None:
@@ -319,13 +365,13 @@ def validate(self, value):
         try:
             value = long(value)
         except (TypeError, ValueError):
-            self.error('%s could not be converted to long' % value)
+            self.error("%s could not be converted to long" % value)
 
         if self.min_value is not None and value < self.min_value:
-            self.error('Long value is too small')
+            self.error("Long value is too small")
 
         if self.max_value is not None and value > self.max_value:
-            self.error('Long value is too large')
+            self.error("Long value is too large")
 
     def prepare_query_value(self, op, value):
         if value is None:
@@ -353,16 +399,16 @@ def validate(self, value):
             try:
                 value = float(value)
             except OverflowError:
-                self.error('The value is too large to be converted to float')
+                self.error("The value is too large to be converted to float")
 
         if not isinstance(value, float):
-            self.error('FloatField only accepts float and integer values')
+            self.error("FloatField only accepts float and integer values")
 
         if self.min_value is not None and value < self.min_value:
-            self.error('Float value is too small')
+            self.error("Float value is too small")
 
         if self.max_value is not None and value > self.max_value:
-            self.error('Float value is too large')
+            self.error("Float value is too large")
 
     def prepare_query_value(self, op, value):
         if value is None:
@@ -379,8 +425,15 @@ class DecimalField(BaseField):
     .. versionadded:: 0.3
     """
 
-    def __init__(self, min_value=None, max_value=None, force_string=False,
-                 precision=2, rounding=decimal.ROUND_HALF_UP, **kwargs):
+    def __init__(
+        self,
+        min_value=None,
+        max_value=None,
+        force_string=False,
+        precision=2,
+        rounding=decimal.ROUND_HALF_UP,
+        **kwargs
+    ):
         """
         :param min_value: Validation rule for the minimum acceptable value.
         :param max_value: Validation rule for the maximum acceptable value.
@@ -416,10 +469,12 @@ def to_python(self, value):
 
         # Convert to string for python 2.6 before casting to Decimal
         try:
-            value = decimal.Decimal('%s' % value)
+            value = decimal.Decimal("%s" % value)
         except (TypeError, ValueError, decimal.InvalidOperation):
             return value
-        return value.quantize(decimal.Decimal('.%s' % ('0' * self.precision)), rounding=self.rounding)
+        return value.quantize(
+            decimal.Decimal(".%s" % ("0" * self.precision)), rounding=self.rounding
+        )
 
     def to_mongo(self, value):
         if value is None:
@@ -435,13 +490,13 @@ def validate(self, value):
             try:
                 value = decimal.Decimal(value)
             except (TypeError, ValueError, decimal.InvalidOperation) as exc:
-                self.error('Could not convert value to decimal: %s' % exc)
+                self.error("Could not convert value to decimal: %s" % exc)
 
         if self.min_value is not None and value < self.min_value:
-            self.error('Decimal value is too small')
+            self.error("Decimal value is too small")
 
         if self.max_value is not None and value > self.max_value:
-            self.error('Decimal value is too large')
+            self.error("Decimal value is too large")
 
     def prepare_query_value(self, op, value):
         return super(DecimalField, self).prepare_query_value(op, self.to_mongo(value))
@@ -462,7 +517,7 @@ def to_python(self, value):
 
     def validate(self, value):
         if not isinstance(value, bool):
-            self.error('BooleanField only accepts boolean values')
+            self.error("BooleanField only accepts boolean values")
 
 
 class DateTimeField(BaseField):
@@ -514,26 +569,29 @@ def _parse_datetime(self, value):
                 return None
 
         # split usecs, because they are not recognized by strptime.
-        if '.' in value:
+        if "." in value:
             try:
-                value, usecs = value.split('.')
+                value, usecs = value.split(".")
                 usecs = int(usecs)
             except ValueError:
                 return None
         else:
             usecs = 0
-        kwargs = {'microsecond': usecs}
+        kwargs = {"microsecond": usecs}
         try:  # Seconds are optional, so try converting seconds first.
-            return datetime.datetime(*time.strptime(value,
-                                                    '%Y-%m-%d %H:%M:%S')[:6], **kwargs)
+            return datetime.datetime(
+                *time.strptime(value, "%Y-%m-%d %H:%M:%S")[:6], **kwargs
+            )
         except ValueError:
             try:  # Try without seconds.
-                return datetime.datetime(*time.strptime(value,
-                                                        '%Y-%m-%d %H:%M')[:5], **kwargs)
+                return datetime.datetime(
+                    *time.strptime(value, "%Y-%m-%d %H:%M")[:5], **kwargs
+                )
             except ValueError:  # Try without hour/minutes/seconds.
                 try:
-                    return datetime.datetime(*time.strptime(value,
-                                                            '%Y-%m-%d')[:3], **kwargs)
+                    return datetime.datetime(
+                        *time.strptime(value, "%Y-%m-%d")[:3], **kwargs
+                    )
                 except ValueError:
                     return None
 
@@ -578,12 +636,12 @@ class ComplexDateTimeField(StringField):
     .. versionadded:: 0.5
     """
 
-    def __init__(self, separator=',', **kwargs):
+    def __init__(self, separator=",", **kwargs):
         """
         :param separator: Allows to customize the separator used for storage (default ``,``)
         """
         self.separator = separator
-        self.format = separator.join(['%Y', '%m', '%d', '%H', '%M', '%S', '%f'])
+        self.format = separator.join(["%Y", "%m", "%d", "%H", "%M", "%S", "%f"])
         super(ComplexDateTimeField, self).__init__(**kwargs)
 
     def _convert_from_datetime(self, val):
@@ -630,8 +688,7 @@ def __set__(self, instance, value):
     def validate(self, value):
         value = self.to_python(value)
         if not isinstance(value, datetime.datetime):
-            self.error('Only datetime objects may used in a '
-                       'ComplexDateTimeField')
+            self.error("Only datetime objects may used in a ComplexDateTimeField")
 
     def to_python(self, value):
         original_value = value
@@ -645,7 +702,9 @@ def to_mongo(self, value):
         return self._convert_from_datetime(value)
 
     def prepare_query_value(self, op, value):
-        return super(ComplexDateTimeField, self).prepare_query_value(op, self._convert_from_datetime(value))
+        return super(ComplexDateTimeField, self).prepare_query_value(
+            op, self._convert_from_datetime(value)
+        )
 
 
 class EmbeddedDocumentField(BaseField):
@@ -656,11 +715,13 @@ class EmbeddedDocumentField(BaseField):
     def __init__(self, document_type, **kwargs):
         # XXX ValidationError raised outside of the "validate" method.
         if not (
-            isinstance(document_type, six.string_types) or
-            issubclass(document_type, EmbeddedDocument)
+            isinstance(document_type, six.string_types)
+            or issubclass(document_type, EmbeddedDocument)
         ):
-            self.error('Invalid embedded document class provided to an '
-                       'EmbeddedDocumentField')
+            self.error(
+                "Invalid embedded document class provided to an "
+                "EmbeddedDocumentField"
+            )
 
         self.document_type_obj = document_type
         super(EmbeddedDocumentField, self).__init__(**kwargs)
@@ -676,15 +737,19 @@ def document_type(self):
             if not issubclass(resolved_document_type, EmbeddedDocument):
                 # Due to the late resolution of the document_type
                 # There is a chance that it won't be an EmbeddedDocument (#1661)
-                self.error('Invalid embedded document class provided to an '
-                           'EmbeddedDocumentField')
+                self.error(
+                    "Invalid embedded document class provided to an "
+                    "EmbeddedDocumentField"
+                )
             self.document_type_obj = resolved_document_type
 
         return self.document_type_obj
 
     def to_python(self, value):
         if not isinstance(value, self.document_type):
-            return self.document_type._from_son(value, _auto_dereference=self._auto_dereference)
+            return self.document_type._from_son(
+                value, _auto_dereference=self._auto_dereference
+            )
         return value
 
     def to_mongo(self, value, use_db_field=True, fields=None):
@@ -698,8 +763,10 @@ def validate(self, value, clean=True):
         """
         # Using isinstance also works for subclasses of self.document
         if not isinstance(value, self.document_type):
-            self.error('Invalid embedded document instance provided to an '
-                       'EmbeddedDocumentField')
+            self.error(
+                "Invalid embedded document instance provided to an "
+                "EmbeddedDocumentField"
+            )
         self.document_type.validate(value, clean)
 
     def lookup_member(self, member_name):
@@ -714,8 +781,10 @@ def prepare_query_value(self, op, value):
             try:
                 value = self.document_type._from_son(value)
             except ValueError:
-                raise InvalidQueryError("Querying the embedded document '%s' failed, due to an invalid query value" %
-                                        (self.document_type._class_name,))
+                raise InvalidQueryError(
+                    "Querying the embedded document '%s' failed, due to an invalid query value"
+                    % (self.document_type._class_name,)
+                )
         super(EmbeddedDocumentField, self).prepare_query_value(op, value)
         return self.to_mongo(value)
 
@@ -732,11 +801,13 @@ class GenericEmbeddedDocumentField(BaseField):
     """
 
     def prepare_query_value(self, op, value):
-        return super(GenericEmbeddedDocumentField, self).prepare_query_value(op, self.to_mongo(value))
+        return super(GenericEmbeddedDocumentField, self).prepare_query_value(
+            op, self.to_mongo(value)
+        )
 
     def to_python(self, value):
         if isinstance(value, dict):
-            doc_cls = get_document(value['_cls'])
+            doc_cls = get_document(value["_cls"])
             value = doc_cls._from_son(value)
 
         return value
@@ -744,12 +815,14 @@ def to_python(self, value):
     def validate(self, value, clean=True):
         if self.choices and isinstance(value, SON):
             for choice in self.choices:
-                if value['_cls'] == choice._class_name:
+                if value["_cls"] == choice._class_name:
                     return True
 
         if not isinstance(value, EmbeddedDocument):
-            self.error('Invalid embedded document instance provided to an '
-                       'GenericEmbeddedDocumentField')
+            self.error(
+                "Invalid embedded document instance provided to an "
+                "GenericEmbeddedDocumentField"
+            )
 
         value.validate(clean=clean)
 
@@ -766,8 +839,8 @@ def to_mongo(self, document, use_db_field=True, fields=None):
         if document is None:
             return None
         data = document.to_mongo(use_db_field, fields)
-        if '_cls' not in data:
-            data['_cls'] = document._class_name
+        if "_cls" not in data:
+            data["_cls"] = document._class_name
         return data
 
 
@@ -784,21 +857,21 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         if isinstance(value, six.string_types):
             return value
 
-        if hasattr(value, 'to_mongo'):
+        if hasattr(value, "to_mongo"):
             cls = value.__class__
             val = value.to_mongo(use_db_field, fields)
             # If we its a document thats not inherited add _cls
             if isinstance(value, Document):
-                val = {'_ref': value.to_dbref(), '_cls': cls.__name__}
+                val = {"_ref": value.to_dbref(), "_cls": cls.__name__}
             if isinstance(value, EmbeddedDocument):
-                val['_cls'] = cls.__name__
+                val["_cls"] = cls.__name__
             return val
 
         if not isinstance(value, (dict, list, tuple)):
             return value
 
         is_list = False
-        if not hasattr(value, 'items'):
+        if not hasattr(value, "items"):
             is_list = True
             value = {k: v for k, v in enumerate(value)}
 
@@ -812,10 +885,10 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         return value
 
     def to_python(self, value):
-        if isinstance(value, dict) and '_cls' in value:
-            doc_cls = get_document(value['_cls'])
-            if '_ref' in value:
-                value = doc_cls._get_db().dereference(value['_ref'])
+        if isinstance(value, dict) and "_cls" in value:
+            doc_cls = get_document(value["_cls"])
+            if "_ref" in value:
+                value = doc_cls._get_db().dereference(value["_ref"])
             return doc_cls._from_son(value)
 
         return super(DynamicField, self).to_python(value)
@@ -829,7 +902,7 @@ def prepare_query_value(self, op, value):
         return super(DynamicField, self).prepare_query_value(op, self.to_mongo(value))
 
     def validate(self, value, clean=True):
-        if hasattr(value, 'validate'):
+        if hasattr(value, "validate"):
             value.validate(clean=clean)
 
 
@@ -845,7 +918,7 @@ class ListField(ComplexBaseField):
 
     def __init__(self, field=None, **kwargs):
         self.field = field
-        kwargs.setdefault('default', lambda: [])
+        kwargs.setdefault("default", lambda: [])
         super(ListField, self).__init__(**kwargs)
 
     def __get__(self, instance, owner):
@@ -853,16 +926,19 @@ def __get__(self, instance, owner):
             # Document class being used rather than a document object
             return self
         value = instance._data.get(self.name)
-        LazyReferenceField = _import_class('LazyReferenceField')
-        GenericLazyReferenceField = _import_class('GenericLazyReferenceField')
-        if isinstance(self.field, (LazyReferenceField, GenericLazyReferenceField)) and value:
+        LazyReferenceField = _import_class("LazyReferenceField")
+        GenericLazyReferenceField = _import_class("GenericLazyReferenceField")
+        if (
+            isinstance(self.field, (LazyReferenceField, GenericLazyReferenceField))
+            and value
+        ):
             instance._data[self.name] = [self.field.build_lazyref(x) for x in value]
         return super(ListField, self).__get__(instance, owner)
 
     def validate(self, value):
         """Make sure that a list of valid fields is being used."""
         if not isinstance(value, (list, tuple, BaseQuerySet)):
-            self.error('Only lists and tuples may be used in a list field')
+            self.error("Only lists and tuples may be used in a list field")
         super(ListField, self).validate(value)
 
     def prepare_query_value(self, op, value):
@@ -871,10 +947,10 @@ def prepare_query_value(self, op, value):
             # If the value is iterable and it's not a string nor a
             # BaseDocument, call prepare_query_value for each of its items.
             if (
-                op in ('set', 'unset', None) and
-                hasattr(value, '__iter__') and
-                not isinstance(value, six.string_types) and
-                not isinstance(value, BaseDocument)
+                op in ("set", "unset", None)
+                and hasattr(value, "__iter__")
+                and not isinstance(value, six.string_types)
+                and not isinstance(value, BaseDocument)
             ):
                 return [self.field.prepare_query_value(op, v) for v in value]
 
@@ -925,17 +1001,18 @@ class SortedListField(ListField):
     _order_reverse = False
 
     def __init__(self, field, **kwargs):
-        if 'ordering' in kwargs.keys():
-            self._ordering = kwargs.pop('ordering')
-        if 'reverse' in kwargs.keys():
-            self._order_reverse = kwargs.pop('reverse')
+        if "ordering" in kwargs.keys():
+            self._ordering = kwargs.pop("ordering")
+        if "reverse" in kwargs.keys():
+            self._order_reverse = kwargs.pop("reverse")
         super(SortedListField, self).__init__(field, **kwargs)
 
     def to_mongo(self, value, use_db_field=True, fields=None):
         value = super(SortedListField, self).to_mongo(value, use_db_field, fields)
         if self._ordering is not None:
-            return sorted(value, key=itemgetter(self._ordering),
-                          reverse=self._order_reverse)
+            return sorted(
+                value, key=itemgetter(self._ordering), reverse=self._order_reverse
+            )
         return sorted(value, reverse=self._order_reverse)
 
 
@@ -944,7 +1021,9 @@ def key_not_string(d):
     dictionary is not a string.
     """
     for k, v in d.items():
-        if not isinstance(k, six.string_types) or (isinstance(v, dict) and key_not_string(v)):
+        if not isinstance(k, six.string_types) or (
+            isinstance(v, dict) and key_not_string(v)
+        ):
             return True
 
 
@@ -953,7 +1032,9 @@ def key_has_dot_or_dollar(d):
     dictionary contains a dot or a dollar sign.
     """
     for k, v in d.items():
-        if ('.' in k or k.startswith('$')) or (isinstance(v, dict) and key_has_dot_or_dollar(v)):
+        if ("." in k or k.startswith("$")) or (
+            isinstance(v, dict) and key_has_dot_or_dollar(v)
+        ):
             return True
 
 
@@ -972,39 +1053,48 @@ def __init__(self, field=None, *args, **kwargs):
         self.field = field
         self._auto_dereference = False
 
-        kwargs.setdefault('default', lambda: {})
+        kwargs.setdefault("default", lambda: {})
         super(DictField, self).__init__(*args, **kwargs)
 
     def validate(self, value):
         """Make sure that a list of valid fields is being used."""
         if not isinstance(value, dict):
-            self.error('Only dictionaries may be used in a DictField')
+            self.error("Only dictionaries may be used in a DictField")
 
         if key_not_string(value):
-            msg = ('Invalid dictionary key - documents must '
-                   'have only string keys')
+            msg = "Invalid dictionary key - documents must have only string keys"
             self.error(msg)
         if key_has_dot_or_dollar(value):
-            self.error('Invalid dictionary key name - keys may not contain "."'
-                       ' or startswith "$" characters')
+            self.error(
+                'Invalid dictionary key name - keys may not contain "."'
+                ' or startswith "$" characters'
+            )
         super(DictField, self).validate(value)
 
     def lookup_member(self, member_name):
         return DictField(db_field=member_name)
 
     def prepare_query_value(self, op, value):
-        match_operators = ['contains', 'icontains', 'startswith',
-                           'istartswith', 'endswith', 'iendswith',
-                           'exact', 'iexact']
+        match_operators = [
+            "contains",
+            "icontains",
+            "startswith",
+            "istartswith",
+            "endswith",
+            "iendswith",
+            "exact",
+            "iexact",
+        ]
 
         if op in match_operators and isinstance(value, six.string_types):
             return StringField().prepare_query_value(op, value)
 
-        if hasattr(self.field, 'field'):    # Used for instance when using DictField(ListField(IntField()))
-            if op in ('set', 'unset') and isinstance(value, dict):
+        if hasattr(
+            self.field, "field"
+        ):  # Used for instance when using DictField(ListField(IntField()))
+            if op in ("set", "unset") and isinstance(value, dict):
                 return {
-                    k: self.field.prepare_query_value(op, v)
-                    for k, v in value.items()
+                    k: self.field.prepare_query_value(op, v) for k, v in value.items()
                 }
             return self.field.prepare_query_value(op, value)
 
@@ -1022,8 +1112,7 @@ class MapField(DictField):
     def __init__(self, field=None, *args, **kwargs):
         # XXX ValidationError raised outside of the "validate" method.
         if not isinstance(field, BaseField):
-            self.error('Argument to MapField constructor must be a valid '
-                       'field')
+            self.error("Argument to MapField constructor must be a valid field")
         super(MapField, self).__init__(field=field, *args, **kwargs)
 
 
@@ -1069,8 +1158,9 @@ class User(Document):
     .. versionchanged:: 0.5 added `reverse_delete_rule`
     """
 
-    def __init__(self, document_type, dbref=False,
-                 reverse_delete_rule=DO_NOTHING, **kwargs):
+    def __init__(
+        self, document_type, dbref=False, reverse_delete_rule=DO_NOTHING, **kwargs
+    ):
         """Initialises the Reference Field.
 
         :param dbref:  Store the reference as :class:`~pymongo.dbref.DBRef`
@@ -1083,12 +1173,13 @@ def __init__(self, document_type, dbref=False,
             :class:`~pymongo.dbref.DBRef`, regardless of the value of `dbref`.
         """
         # XXX ValidationError raised outside of the "validate" method.
-        if (
-            not isinstance(document_type, six.string_types) and
-            not issubclass(document_type, Document)
+        if not isinstance(document_type, six.string_types) and not issubclass(
+            document_type, Document
         ):
-            self.error('Argument to ReferenceField constructor must be a '
-                       'document class or a string')
+            self.error(
+                "Argument to ReferenceField constructor must be a "
+                "document class or a string"
+            )
 
         self.dbref = dbref
         self.document_type_obj = document_type
@@ -1115,14 +1206,14 @@ def __get__(self, instance, owner):
         auto_dereference = instance._fields[self.name]._auto_dereference
         # Dereference DBRefs
         if auto_dereference and isinstance(value, DBRef):
-            if hasattr(value, 'cls'):
+            if hasattr(value, "cls"):
                 # Dereference using the class type specified in the reference
                 cls = get_document(value.cls)
             else:
                 cls = self.document_type
             dereferenced = cls._get_db().dereference(value)
             if dereferenced is None:
-                raise DoesNotExist('Trying to dereference unknown document %s' % value)
+                raise DoesNotExist("Trying to dereference unknown document %s" % value)
             else:
                 instance._data[self.name] = cls._from_son(dereferenced)
 
@@ -1140,8 +1231,10 @@ def to_mongo(self, document):
 
             # XXX ValidationError raised outside of the "validate" method.
             if id_ is None:
-                self.error('You can only reference documents once they have'
-                           ' been saved to the database')
+                self.error(
+                    "You can only reference documents once they have"
+                    " been saved to the database"
+                )
 
             # Use the attributes from the document instance, so that they
             # override the attributes of this field's document type
@@ -1150,11 +1243,11 @@ def to_mongo(self, document):
             id_ = document
             cls = self.document_type
 
-        id_field_name = cls._meta['id_field']
+        id_field_name = cls._meta["id_field"]
         id_field = cls._fields[id_field_name]
 
         id_ = id_field.to_mongo(id_)
-        if self.document_type._meta.get('abstract'):
+        if self.document_type._meta.get("abstract"):
             collection = cls._get_collection_name()
             return DBRef(collection, id_, cls=cls._class_name)
         elif self.dbref:
@@ -1165,8 +1258,9 @@ def to_mongo(self, document):
 
     def to_python(self, value):
         """Convert a MongoDB-compatible type to a Python type."""
-        if (not self.dbref and
-                not isinstance(value, (DBRef, Document, EmbeddedDocument))):
+        if not self.dbref and not isinstance(
+            value, (DBRef, Document, EmbeddedDocument)
+        ):
             collection = self.document_type._get_collection_name()
             value = DBRef(collection, self.document_type.id.to_python(value))
         return value
@@ -1179,11 +1273,15 @@ def prepare_query_value(self, op, value):
 
     def validate(self, value):
         if not isinstance(value, (self.document_type, LazyReference, DBRef, ObjectId)):
-            self.error('A ReferenceField only accepts DBRef, LazyReference, ObjectId or documents')
+            self.error(
+                "A ReferenceField only accepts DBRef, LazyReference, ObjectId or documents"
+            )
 
         if isinstance(value, Document) and value.id is None:
-            self.error('You can only reference documents once they have been '
-                       'saved to the database')
+            self.error(
+                "You can only reference documents once they have been "
+                "saved to the database"
+            )
 
     def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
@@ -1206,12 +1304,13 @@ def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
             fields = []
 
         # XXX ValidationError raised outside of the "validate" method.
-        if (
-            not isinstance(document_type, six.string_types) and
-            not issubclass(document_type, Document)
+        if not isinstance(document_type, six.string_types) and not issubclass(
+            document_type, Document
         ):
-            self.error('Argument to CachedReferenceField constructor must be a'
-                       ' document class or a string')
+            self.error(
+                "Argument to CachedReferenceField constructor must be a"
+                " document class or a string"
+            )
 
         self.auto_sync = auto_sync
         self.document_type_obj = document_type
@@ -1221,15 +1320,14 @@ def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
     def start_listener(self):
         from mongoengine import signals
 
-        signals.post_save.connect(self.on_document_pre_save,
-                                  sender=self.document_type)
+        signals.post_save.connect(self.on_document_pre_save, sender=self.document_type)
 
     def on_document_pre_save(self, sender, document, created, **kwargs):
         if created:
             return None
 
         update_kwargs = {
-            'set__%s__%s' % (self.name, key): val
+            "set__%s__%s" % (self.name, key): val
             for key, val in document._delta()[0].items()
             if key in self.fields
         }
@@ -1237,15 +1335,15 @@ def on_document_pre_save(self, sender, document, created, **kwargs):
             filter_kwargs = {}
             filter_kwargs[self.name] = document
 
-            self.owner_document.objects(
-                **filter_kwargs).update(**update_kwargs)
+            self.owner_document.objects(**filter_kwargs).update(**update_kwargs)
 
     def to_python(self, value):
         if isinstance(value, dict):
             collection = self.document_type._get_collection_name()
-            value = DBRef(
-                collection, self.document_type.id.to_python(value['_id']))
-            return self.document_type._from_son(self.document_type._get_db().dereference(value))
+            value = DBRef(collection, self.document_type.id.to_python(value["_id"]))
+            return self.document_type._from_son(
+                self.document_type._get_db().dereference(value)
+            )
 
         return value
 
@@ -1271,14 +1369,14 @@ def __get__(self, instance, owner):
         if auto_dereference and isinstance(value, DBRef):
             dereferenced = self.document_type._get_db().dereference(value)
             if dereferenced is None:
-                raise DoesNotExist('Trying to dereference unknown document %s' % value)
+                raise DoesNotExist("Trying to dereference unknown document %s" % value)
             else:
                 instance._data[self.name] = self.document_type._from_son(dereferenced)
 
         return super(CachedReferenceField, self).__get__(instance, owner)
 
     def to_mongo(self, document, use_db_field=True, fields=None):
-        id_field_name = self.document_type._meta['id_field']
+        id_field_name = self.document_type._meta["id_field"]
         id_field = self.document_type._fields[id_field_name]
 
         # XXX ValidationError raised outside of the "validate" method.
@@ -1286,14 +1384,14 @@ def to_mongo(self, document, use_db_field=True, fields=None):
             # We need the id from the saved object to create the DBRef
             id_ = document.pk
             if id_ is None:
-                self.error('You can only reference documents once they have'
-                           ' been saved to the database')
+                self.error(
+                    "You can only reference documents once they have"
+                    " been saved to the database"
+                )
         else:
-            self.error('Only accept a document object')
+            self.error("Only accept a document object")
 
-        value = SON((
-            ('_id', id_field.to_mongo(id_)),
-        ))
+        value = SON((("_id", id_field.to_mongo(id_)),))
 
         if fields:
             new_fields = [f for f in self.fields if f in fields]
@@ -1310,9 +1408,11 @@ def prepare_query_value(self, op, value):
         # XXX ValidationError raised outside of the "validate" method.
         if isinstance(value, Document):
             if value.pk is None:
-                self.error('You can only reference documents once they have'
-                           ' been saved to the database')
-            value_dict = {'_id': value.pk}
+                self.error(
+                    "You can only reference documents once they have"
+                    " been saved to the database"
+                )
+            value_dict = {"_id": value.pk}
             for field in self.fields:
                 value_dict.update({field: value[field]})
 
@@ -1322,11 +1422,13 @@ def prepare_query_value(self, op, value):
 
     def validate(self, value):
         if not isinstance(value, self.document_type):
-            self.error('A CachedReferenceField only accepts documents')
+            self.error("A CachedReferenceField only accepts documents")
 
         if isinstance(value, Document) and value.id is None:
-            self.error('You can only reference documents once they have been '
-                       'saved to the database')
+            self.error(
+                "You can only reference documents once they have been "
+                "saved to the database"
+            )
 
     def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
@@ -1336,7 +1438,7 @@ def sync_all(self):
         Sync all cached fields on demand.
         Caution: this operation may be slower.
         """
-        update_key = 'set__%s' % self.name
+        update_key = "set__%s" % self.name
 
         for doc in self.document_type.objects:
             filter_kwargs = {}
@@ -1345,8 +1447,7 @@ def sync_all(self):
             update_kwargs = {}
             update_kwargs[update_key] = doc
 
-            self.owner_document.objects(
-                **filter_kwargs).update(**update_kwargs)
+            self.owner_document.objects(**filter_kwargs).update(**update_kwargs)
 
 
 class GenericReferenceField(BaseField):
@@ -1370,7 +1471,7 @@ class GenericReferenceField(BaseField):
     """
 
     def __init__(self, *args, **kwargs):
-        choices = kwargs.pop('choices', None)
+        choices = kwargs.pop("choices", None)
         super(GenericReferenceField, self).__init__(*args, **kwargs)
         self.choices = []
         # Keep the choices as a list of allowed Document class names
@@ -1383,14 +1484,16 @@ def __init__(self, *args, **kwargs):
                 else:
                     # XXX ValidationError raised outside of the "validate"
                     # method.
-                    self.error('Invalid choices provided: must be a list of'
-                               'Document subclasses and/or six.string_typess')
+                    self.error(
+                        "Invalid choices provided: must be a list of"
+                        "Document subclasses and/or six.string_typess"
+                    )
 
     def _validate_choices(self, value):
         if isinstance(value, dict):
             # If the field has not been dereferenced, it is still a dict
             # of class and DBRef
-            value = value.get('_cls')
+            value = value.get("_cls")
         elif isinstance(value, Document):
             value = value._class_name
         super(GenericReferenceField, self)._validate_choices(value)
@@ -1405,7 +1508,7 @@ def __get__(self, instance, owner):
         if auto_dereference and isinstance(value, (dict, SON)):
             dereferenced = self.dereference(value)
             if dereferenced is None:
-                raise DoesNotExist('Trying to dereference unknown document %s' % value)
+                raise DoesNotExist("Trying to dereference unknown document %s" % value)
             else:
                 instance._data[self.name] = dereferenced
 
@@ -1413,20 +1516,22 @@ def __get__(self, instance, owner):
 
     def validate(self, value):
         if not isinstance(value, (Document, DBRef, dict, SON)):
-            self.error('GenericReferences can only contain documents')
+            self.error("GenericReferences can only contain documents")
 
         if isinstance(value, (dict, SON)):
-            if '_ref' not in value or '_cls' not in value:
-                self.error('GenericReferences can only contain documents')
+            if "_ref" not in value or "_cls" not in value:
+                self.error("GenericReferences can only contain documents")
 
         # We need the id from the saved object to create the DBRef
         elif isinstance(value, Document) and value.id is None:
-            self.error('You can only reference documents once they have been'
-                       ' saved to the database')
+            self.error(
+                "You can only reference documents once they have been"
+                " saved to the database"
+            )
 
     def dereference(self, value):
-        doc_cls = get_document(value['_cls'])
-        reference = value['_ref']
+        doc_cls = get_document(value["_cls"])
+        reference = value["_ref"]
         doc = doc_cls._get_db().dereference(reference)
         if doc is not None:
             doc = doc_cls._from_son(doc)
@@ -1439,7 +1544,7 @@ def to_mongo(self, document):
         if isinstance(document, (dict, SON, ObjectId, DBRef)):
             return document
 
-        id_field_name = document.__class__._meta['id_field']
+        id_field_name = document.__class__._meta["id_field"]
         id_field = document.__class__._fields[id_field_name]
 
         if isinstance(document, Document):
@@ -1447,18 +1552,17 @@ def to_mongo(self, document):
             id_ = document.id
             if id_ is None:
                 # XXX ValidationError raised outside of the "validate" method.
-                self.error('You can only reference documents once they have'
-                           ' been saved to the database')
+                self.error(
+                    "You can only reference documents once they have"
+                    " been saved to the database"
+                )
         else:
             id_ = document
 
         id_ = id_field.to_mongo(id_)
         collection = document._get_collection_name()
         ref = DBRef(collection, id_)
-        return SON((
-            ('_cls', document._class_name),
-            ('_ref', ref)
-        ))
+        return SON((("_cls", document._class_name), ("_ref", ref)))
 
     def prepare_query_value(self, op, value):
         if value is None:
@@ -1485,18 +1589,18 @@ def to_mongo(self, value):
 
     def validate(self, value):
         if not isinstance(value, (six.binary_type, Binary)):
-            self.error('BinaryField only accepts instances of '
-                       '(%s, %s, Binary)' % (
-                           six.binary_type.__name__, Binary.__name__))
+            self.error(
+                "BinaryField only accepts instances of "
+                "(%s, %s, Binary)" % (six.binary_type.__name__, Binary.__name__)
+            )
 
         if self.max_bytes is not None and len(value) > self.max_bytes:
-            self.error('Binary value is too long')
+            self.error("Binary value is too long")
 
     def prepare_query_value(self, op, value):
         if value is None:
             return value
-        return super(BinaryField, self).prepare_query_value(
-            op, self.to_mongo(value))
+        return super(BinaryField, self).prepare_query_value(op, self.to_mongo(value))
 
 
 class GridFSError(Exception):
@@ -1513,10 +1617,14 @@ class GridFSProxy(object):
 
     _fs = None
 
-    def __init__(self, grid_id=None, key=None,
-                 instance=None,
-                 db_alias=DEFAULT_CONNECTION_NAME,
-                 collection_name='fs'):
+    def __init__(
+        self,
+        grid_id=None,
+        key=None,
+        instance=None,
+        db_alias=DEFAULT_CONNECTION_NAME,
+        collection_name="fs",
+    ):
         self.grid_id = grid_id  # Store GridFS id for file
         self.key = key
         self.instance = instance
@@ -1526,8 +1634,16 @@ def __init__(self, grid_id=None, key=None,
         self.gridout = None
 
     def __getattr__(self, name):
-        attrs = ('_fs', 'grid_id', 'key', 'instance', 'db_alias',
-                 'collection_name', 'newfile', 'gridout')
+        attrs = (
+            "_fs",
+            "grid_id",
+            "key",
+            "instance",
+            "db_alias",
+            "collection_name",
+            "newfile",
+            "gridout",
+        )
         if name in attrs:
             return self.__getattribute__(name)
         obj = self.get()
@@ -1545,7 +1661,7 @@ def __bool__(self):
 
     def __getstate__(self):
         self_dict = self.__dict__
-        self_dict['_fs'] = None
+        self_dict["_fs"] = None
         return self_dict
 
     def __copy__(self):
@@ -1557,18 +1673,20 @@ def __deepcopy__(self, memo):
         return self.__copy__()
 
     def __repr__(self):
-        return '<%s: %s>' % (self.__class__.__name__, self.grid_id)
+        return "<%s: %s>" % (self.__class__.__name__, self.grid_id)
 
     def __str__(self):
         gridout = self.get()
-        filename = getattr(gridout, 'filename') if gridout else '<no file>'
-        return '<%s: %s (%s)>' % (self.__class__.__name__, filename, self.grid_id)
+        filename = getattr(gridout, "filename") if gridout else "<no file>"
+        return "<%s: %s (%s)>" % (self.__class__.__name__, filename, self.grid_id)
 
     def __eq__(self, other):
         if isinstance(other, GridFSProxy):
-            return ((self.grid_id == other.grid_id) and
-                    (self.collection_name == other.collection_name) and
-                    (self.db_alias == other.db_alias))
+            return (
+                (self.grid_id == other.grid_id)
+                and (self.collection_name == other.collection_name)
+                and (self.db_alias == other.db_alias)
+            )
         else:
             return False
 
@@ -1578,8 +1696,7 @@ def __ne__(self, other):
     @property
     def fs(self):
         if not self._fs:
-            self._fs = gridfs.GridFS(
-                get_db(self.db_alias), self.collection_name)
+            self._fs = gridfs.GridFS(get_db(self.db_alias), self.collection_name)
         return self._fs
 
     def get(self, grid_id=None):
@@ -1604,16 +1721,20 @@ def new_file(self, **kwargs):
 
     def put(self, file_obj, **kwargs):
         if self.grid_id:
-            raise GridFSError('This document already has a file. Either delete '
-                              'it or call replace to overwrite it')
+            raise GridFSError(
+                "This document already has a file. Either delete "
+                "it or call replace to overwrite it"
+            )
         self.grid_id = self.fs.put(file_obj, **kwargs)
         self._mark_as_changed()
 
     def write(self, string):
         if self.grid_id:
             if not self.newfile:
-                raise GridFSError('This document already has a file. Either '
-                                  'delete it or call replace to overwrite it')
+                raise GridFSError(
+                    "This document already has a file. Either "
+                    "delete it or call replace to overwrite it"
+                )
         else:
             self.new_file()
         self.newfile.write(string)
@@ -1632,7 +1753,7 @@ def read(self, size=-1):
             try:
                 return gridout.read(size)
             except Exception:
-                return ''
+                return ""
 
     def delete(self):
         # Delete file from GridFS, FileField still remains
@@ -1662,10 +1783,12 @@ class FileField(BaseField):
     .. versionchanged:: 0.5 added optional size param for read
     .. versionchanged:: 0.6 added db_alias for multidb support
     """
+
     proxy_class = GridFSProxy
 
-    def __init__(self, db_alias=DEFAULT_CONNECTION_NAME, collection_name='fs',
-                 **kwargs):
+    def __init__(
+        self, db_alias=DEFAULT_CONNECTION_NAME, collection_name="fs", **kwargs
+    ):
         super(FileField, self).__init__(**kwargs)
         self.collection_name = collection_name
         self.db_alias = db_alias
@@ -1688,9 +1811,8 @@ def __get__(self, instance, owner):
     def __set__(self, instance, value):
         key = self.name
         if (
-            (hasattr(value, 'read') and not isinstance(value, GridFSProxy)) or
-            isinstance(value, (six.binary_type, six.string_types))
-        ):
+            hasattr(value, "read") and not isinstance(value, GridFSProxy)
+        ) or isinstance(value, (six.binary_type, six.string_types)):
             # using "FileField() = file/string" notation
             grid_file = instance._data.get(self.name)
             # If a file already exists, delete it
@@ -1701,8 +1823,7 @@ def __set__(self, instance, value):
                     pass
 
             # Create a new proxy object as we don't already have one
-            instance._data[key] = self.get_proxy_obj(
-                key=key, instance=instance)
+            instance._data[key] = self.get_proxy_obj(key=key, instance=instance)
             instance._data[key].put(value)
         else:
             instance._data[key] = value
@@ -1715,9 +1836,12 @@ def get_proxy_obj(self, key, instance, db_alias=None, collection_name=None):
         if collection_name is None:
             collection_name = self.collection_name
 
-        return self.proxy_class(key=key, instance=instance,
-                                db_alias=db_alias,
-                                collection_name=collection_name)
+        return self.proxy_class(
+            key=key,
+            instance=instance,
+            db_alias=db_alias,
+            collection_name=collection_name,
+        )
 
     def to_mongo(self, value):
         # Store the GridFS file id in MongoDB
@@ -1727,16 +1851,16 @@ def to_mongo(self, value):
 
     def to_python(self, value):
         if value is not None:
-            return self.proxy_class(value,
-                                    collection_name=self.collection_name,
-                                    db_alias=self.db_alias)
+            return self.proxy_class(
+                value, collection_name=self.collection_name, db_alias=self.db_alias
+            )
 
     def validate(self, value):
         if value.grid_id is not None:
             if not isinstance(value, self.proxy_class):
-                self.error('FileField only accepts GridFSProxy values')
+                self.error("FileField only accepts GridFSProxy values")
             if not isinstance(value.grid_id, ObjectId):
-                self.error('Invalid GridFSProxy value')
+                self.error("Invalid GridFSProxy value")
 
 
 class ImageGridFsProxy(GridFSProxy):
@@ -1753,52 +1877,51 @@ def put(self, file_obj, **kwargs):
         """
         field = self.instance._fields[self.key]
         # Handle nested fields
-        if hasattr(field, 'field') and isinstance(field.field, FileField):
+        if hasattr(field, "field") and isinstance(field.field, FileField):
             field = field.field
 
         try:
             img = Image.open(file_obj)
             img_format = img.format
         except Exception as e:
-            raise ValidationError('Invalid image: %s' % e)
+            raise ValidationError("Invalid image: %s" % e)
 
         # Progressive JPEG
         # TODO: fixme, at least unused, at worst bad implementation
-        progressive = img.info.get('progressive') or False
+        progressive = img.info.get("progressive") or False
 
-        if (kwargs.get('progressive') and
-                isinstance(kwargs.get('progressive'), bool) and
-                img_format == 'JPEG'):
+        if (
+            kwargs.get("progressive")
+            and isinstance(kwargs.get("progressive"), bool)
+            and img_format == "JPEG"
+        ):
             progressive = True
         else:
             progressive = False
 
-        if (field.size and (img.size[0] > field.size['width'] or
-                            img.size[1] > field.size['height'])):
+        if field.size and (
+            img.size[0] > field.size["width"] or img.size[1] > field.size["height"]
+        ):
             size = field.size
 
-            if size['force']:
-                img = ImageOps.fit(img,
-                                   (size['width'],
-                                    size['height']),
-                                   Image.ANTIALIAS)
+            if size["force"]:
+                img = ImageOps.fit(
+                    img, (size["width"], size["height"]), Image.ANTIALIAS
+                )
             else:
-                img.thumbnail((size['width'],
-                               size['height']),
-                              Image.ANTIALIAS)
+                img.thumbnail((size["width"], size["height"]), Image.ANTIALIAS)
 
         thumbnail = None
         if field.thumbnail_size:
             size = field.thumbnail_size
 
-            if size['force']:
+            if size["force"]:
                 thumbnail = ImageOps.fit(
-                    img, (size['width'], size['height']), Image.ANTIALIAS)
+                    img, (size["width"], size["height"]), Image.ANTIALIAS
+                )
             else:
                 thumbnail = img.copy()
-                thumbnail.thumbnail((size['width'],
-                                     size['height']),
-                                    Image.ANTIALIAS)
+                thumbnail.thumbnail((size["width"], size["height"]), Image.ANTIALIAS)
 
         if thumbnail:
             thumb_id = self._put_thumbnail(thumbnail, img_format, progressive)
@@ -1811,12 +1934,9 @@ def put(self, file_obj, **kwargs):
         img.save(io, img_format, progressive=progressive)
         io.seek(0)
 
-        return super(ImageGridFsProxy, self).put(io,
-                                                 width=w,
-                                                 height=h,
-                                                 format=img_format,
-                                                 thumbnail_id=thumb_id,
-                                                 **kwargs)
+        return super(ImageGridFsProxy, self).put(
+            io, width=w, height=h, format=img_format, thumbnail_id=thumb_id, **kwargs
+        )
 
     def delete(self, *args, **kwargs):
         # deletes thumbnail
@@ -1833,10 +1953,7 @@ def _put_thumbnail(self, thumbnail, format, progressive, **kwargs):
         thumbnail.save(io, format, progressive=progressive)
         io.seek(0)
 
-        return self.fs.put(io, width=w,
-                           height=h,
-                           format=format,
-                           **kwargs)
+        return self.fs.put(io, width=w, height=h, format=format, **kwargs)
 
     @property
     def size(self):
@@ -1888,32 +2005,30 @@ class ImageField(FileField):
 
     .. versionadded:: 0.6
     """
+
     proxy_class = ImageGridFsProxy
 
-    def __init__(self, size=None, thumbnail_size=None,
-                 collection_name='images', **kwargs):
+    def __init__(
+        self, size=None, thumbnail_size=None, collection_name="images", **kwargs
+    ):
         if not Image:
-            raise ImproperlyConfigured('PIL library was not found')
+            raise ImproperlyConfigured("PIL library was not found")
 
-        params_size = ('width', 'height', 'force')
-        extra_args = {
-            'size': size,
-            'thumbnail_size': thumbnail_size
-        }
+        params_size = ("width", "height", "force")
+        extra_args = {"size": size, "thumbnail_size": thumbnail_size}
         for att_name, att in extra_args.items():
             value = None
             if isinstance(att, (tuple, list)):
                 if six.PY3:
-                    value = dict(itertools.zip_longest(params_size, att,
-                                                       fillvalue=None))
+                    value = dict(
+                        itertools.zip_longest(params_size, att, fillvalue=None)
+                    )
                 else:
                     value = dict(map(None, params_size, att))
 
             setattr(self, att_name, value)
 
-        super(ImageField, self).__init__(
-            collection_name=collection_name,
-            **kwargs)
+        super(ImageField, self).__init__(collection_name=collection_name, **kwargs)
 
 
 class SequenceField(BaseField):
@@ -1947,15 +2062,24 @@ class SequenceField(BaseField):
     """
 
     _auto_gen = True
-    COLLECTION_NAME = 'mongoengine.counters'
+    COLLECTION_NAME = "mongoengine.counters"
     VALUE_DECORATOR = int
 
-    def __init__(self, collection_name=None, db_alias=None, sequence_name=None,
-                 value_decorator=None, *args, **kwargs):
+    def __init__(
+        self,
+        collection_name=None,
+        db_alias=None,
+        sequence_name=None,
+        value_decorator=None,
+        *args,
+        **kwargs
+    ):
         self.collection_name = collection_name or self.COLLECTION_NAME
         self.db_alias = db_alias or DEFAULT_CONNECTION_NAME
         self.sequence_name = sequence_name
-        self.value_decorator = value_decorator if callable(value_decorator) else self.VALUE_DECORATOR
+        self.value_decorator = (
+            value_decorator if callable(value_decorator) else self.VALUE_DECORATOR
+        )
         super(SequenceField, self).__init__(*args, **kwargs)
 
     def generate(self):
@@ -1963,15 +2087,16 @@ def generate(self):
         Generate and Increment the counter
         """
         sequence_name = self.get_sequence_name()
-        sequence_id = '%s.%s' % (sequence_name, self.name)
+        sequence_id = "%s.%s" % (sequence_name, self.name)
         collection = get_db(alias=self.db_alias)[self.collection_name]
 
         counter = collection.find_one_and_update(
-            filter={'_id': sequence_id},
-            update={'$inc': {'next': 1}},
+            filter={"_id": sequence_id},
+            update={"$inc": {"next": 1}},
             return_document=ReturnDocument.AFTER,
-            upsert=True)
-        return self.value_decorator(counter['next'])
+            upsert=True,
+        )
+        return self.value_decorator(counter["next"])
 
     def set_next_value(self, value):
         """Helper method to set the next sequence value"""
@@ -1982,8 +2107,9 @@ def set_next_value(self, value):
             filter={"_id": sequence_id},
             update={"$set": {"next": value}},
             return_document=ReturnDocument.AFTER,
-            upsert=True)
-        return self.value_decorator(counter['next'])
+            upsert=True,
+        )
+        return self.value_decorator(counter["next"])
 
     def get_next_value(self):
         """Helper method to get the next value for previewing.
@@ -1992,12 +2118,12 @@ def get_next_value(self):
         as it is only fixed on set.
         """
         sequence_name = self.get_sequence_name()
-        sequence_id = '%s.%s' % (sequence_name, self.name)
+        sequence_id = "%s.%s" % (sequence_name, self.name)
         collection = get_db(alias=self.db_alias)[self.collection_name]
-        data = collection.find_one({'_id': sequence_id})
+        data = collection.find_one({"_id": sequence_id})
 
         if data:
-            return self.value_decorator(data['next'] + 1)
+            return self.value_decorator(data["next"] + 1)
 
         return self.value_decorator(1)
 
@@ -2005,11 +2131,14 @@ def get_sequence_name(self):
         if self.sequence_name:
             return self.sequence_name
         owner = self.owner_document
-        if issubclass(owner, Document) and not owner._meta.get('abstract'):
+        if issubclass(owner, Document) and not owner._meta.get("abstract"):
             return owner._get_collection_name()
         else:
-            return ''.join('_%s' % c if c.isupper() else c
-                           for c in owner._class_name).strip('_').lower()
+            return (
+                "".join("_%s" % c if c.isupper() else c for c in owner._class_name)
+                .strip("_")
+                .lower()
+            )
 
     def __get__(self, instance, owner):
         value = super(SequenceField, self).__get__(instance, owner)
@@ -2046,6 +2175,7 @@ class UUIDField(BaseField):
 
     .. versionadded:: 0.6
     """
+
     _binary = None
 
     def __init__(self, binary=True, **kwargs):
@@ -2090,7 +2220,7 @@ def validate(self, value):
             try:
                 uuid.UUID(value)
             except (ValueError, TypeError, AttributeError) as exc:
-                self.error('Could not convert to UUID: %s' % exc)
+                self.error("Could not convert to UUID: %s" % exc)
 
 
 class GeoPointField(BaseField):
@@ -2109,16 +2239,14 @@ class GeoPointField(BaseField):
     def validate(self, value):
         """Make sure that a geo-value is of type (x, y)"""
         if not isinstance(value, (list, tuple)):
-            self.error('GeoPointField can only accept tuples or lists '
-                       'of (x, y)')
+            self.error("GeoPointField can only accept tuples or lists of (x, y)")
 
         if not len(value) == 2:
-            self.error('Value (%s) must be a two-dimensional point' %
-                       repr(value))
-        elif (not isinstance(value[0], (float, int)) or
-              not isinstance(value[1], (float, int))):
-            self.error(
-                'Both values (%s) in point must be float or int' % repr(value))
+            self.error("Value (%s) must be a two-dimensional point" % repr(value))
+        elif not isinstance(value[0], (float, int)) or not isinstance(
+            value[1], (float, int)
+        ):
+            self.error("Both values (%s) in point must be float or int" % repr(value))
 
 
 class PointField(GeoJsonBaseField):
@@ -2138,7 +2266,8 @@ class PointField(GeoJsonBaseField):
 
     .. versionadded:: 0.8
     """
-    _type = 'Point'
+
+    _type = "Point"
 
 
 class LineStringField(GeoJsonBaseField):
@@ -2157,7 +2286,8 @@ class LineStringField(GeoJsonBaseField):
 
     .. versionadded:: 0.8
     """
-    _type = 'LineString'
+
+    _type = "LineString"
 
 
 class PolygonField(GeoJsonBaseField):
@@ -2179,7 +2309,8 @@ class PolygonField(GeoJsonBaseField):
 
     .. versionadded:: 0.8
     """
-    _type = 'Polygon'
+
+    _type = "Polygon"
 
 
 class MultiPointField(GeoJsonBaseField):
@@ -2199,7 +2330,8 @@ class MultiPointField(GeoJsonBaseField):
 
     .. versionadded:: 0.9
     """
-    _type = 'MultiPoint'
+
+    _type = "MultiPoint"
 
 
 class MultiLineStringField(GeoJsonBaseField):
@@ -2219,7 +2351,8 @@ class MultiLineStringField(GeoJsonBaseField):
 
     .. versionadded:: 0.9
     """
-    _type = 'MultiLineString'
+
+    _type = "MultiLineString"
 
 
 class MultiPolygonField(GeoJsonBaseField):
@@ -2246,7 +2379,8 @@ class MultiPolygonField(GeoJsonBaseField):
 
     .. versionadded:: 0.9
     """
-    _type = 'MultiPolygon'
+
+    _type = "MultiPolygon"
 
 
 class LazyReferenceField(BaseField):
@@ -2260,8 +2394,14 @@ class LazyReferenceField(BaseField):
     .. versionadded:: 0.15
     """
 
-    def __init__(self, document_type, passthrough=False, dbref=False,
-                 reverse_delete_rule=DO_NOTHING, **kwargs):
+    def __init__(
+        self,
+        document_type,
+        passthrough=False,
+        dbref=False,
+        reverse_delete_rule=DO_NOTHING,
+        **kwargs
+    ):
         """Initialises the Reference Field.
 
         :param dbref:  Store the reference as :class:`~pymongo.dbref.DBRef`
@@ -2274,12 +2414,13 @@ def __init__(self, document_type, passthrough=False, dbref=False,
           document. Note this only work getting field (not setting or deleting).
         """
         # XXX ValidationError raised outside of the "validate" method.
-        if (
-            not isinstance(document_type, six.string_types) and
-            not issubclass(document_type, Document)
+        if not isinstance(document_type, six.string_types) and not issubclass(
+            document_type, Document
         ):
-            self.error('Argument to LazyReferenceField constructor must be a '
-                       'document class or a string')
+            self.error(
+                "Argument to LazyReferenceField constructor must be a "
+                "document class or a string"
+            )
 
         self.dbref = dbref
         self.passthrough = passthrough
@@ -2299,15 +2440,23 @@ def document_type(self):
     def build_lazyref(self, value):
         if isinstance(value, LazyReference):
             if value.passthrough != self.passthrough:
-                value = LazyReference(value.document_type, value.pk, passthrough=self.passthrough)
+                value = LazyReference(
+                    value.document_type, value.pk, passthrough=self.passthrough
+                )
         elif value is not None:
             if isinstance(value, self.document_type):
-                value = LazyReference(self.document_type, value.pk, passthrough=self.passthrough)
+                value = LazyReference(
+                    self.document_type, value.pk, passthrough=self.passthrough
+                )
             elif isinstance(value, DBRef):
-                value = LazyReference(self.document_type, value.id, passthrough=self.passthrough)
+                value = LazyReference(
+                    self.document_type, value.id, passthrough=self.passthrough
+                )
             else:
                 # value is the primary key of the referenced document
-                value = LazyReference(self.document_type, value, passthrough=self.passthrough)
+                value = LazyReference(
+                    self.document_type, value, passthrough=self.passthrough
+                )
         return value
 
     def __get__(self, instance, owner):
@@ -2332,7 +2481,7 @@ def to_mongo(self, value):
         else:
             # value is the primary key of the referenced document
             pk = value
-        id_field_name = self.document_type._meta['id_field']
+        id_field_name = self.document_type._meta["id_field"]
         id_field = self.document_type._fields[id_field_name]
         pk = id_field.to_mongo(pk)
         if self.dbref:
@@ -2343,7 +2492,7 @@ def to_mongo(self, value):
     def validate(self, value):
         if isinstance(value, LazyReference):
             if value.collection != self.document_type._get_collection_name():
-                self.error('Reference must be on a `%s` document.' % self.document_type)
+                self.error("Reference must be on a `%s` document." % self.document_type)
             pk = value.pk
         elif isinstance(value, self.document_type):
             pk = value.pk
@@ -2355,7 +2504,7 @@ def validate(self, value):
             pk = value.id
         else:
             # value is the primary key of the referenced document
-            id_field_name = self.document_type._meta['id_field']
+            id_field_name = self.document_type._meta["id_field"]
             id_field = getattr(self.document_type, id_field_name)
             pk = value
             try:
@@ -2364,11 +2513,15 @@ def validate(self, value):
                 self.error(
                     "value should be `{0}` document, LazyReference or DBRef on `{0}` "
                     "or `{0}`'s primary key (i.e. `{1}`)".format(
-                        self.document_type.__name__, type(id_field).__name__))
+                        self.document_type.__name__, type(id_field).__name__
+                    )
+                )
 
         if pk is None:
-            self.error('You can only reference documents once they have been '
-                       'saved to the database')
+            self.error(
+                "You can only reference documents once they have been "
+                "saved to the database"
+            )
 
     def prepare_query_value(self, op, value):
         if value is None:
@@ -2399,7 +2552,7 @@ class GenericLazyReferenceField(GenericReferenceField):
     """
 
     def __init__(self, *args, **kwargs):
-        self.passthrough = kwargs.pop('passthrough', False)
+        self.passthrough = kwargs.pop("passthrough", False)
         super(GenericLazyReferenceField, self).__init__(*args, **kwargs)
 
     def _validate_choices(self, value):
@@ -2410,12 +2563,20 @@ def _validate_choices(self, value):
     def build_lazyref(self, value):
         if isinstance(value, LazyReference):
             if value.passthrough != self.passthrough:
-                value = LazyReference(value.document_type, value.pk, passthrough=self.passthrough)
+                value = LazyReference(
+                    value.document_type, value.pk, passthrough=self.passthrough
+                )
         elif value is not None:
             if isinstance(value, (dict, SON)):
-                value = LazyReference(get_document(value['_cls']), value['_ref'].id, passthrough=self.passthrough)
+                value = LazyReference(
+                    get_document(value["_cls"]),
+                    value["_ref"].id,
+                    passthrough=self.passthrough,
+                )
             elif isinstance(value, Document):
-                value = LazyReference(type(value), value.pk, passthrough=self.passthrough)
+                value = LazyReference(
+                    type(value), value.pk, passthrough=self.passthrough
+                )
         return value
 
     def __get__(self, instance, owner):
@@ -2430,8 +2591,10 @@ def __get__(self, instance, owner):
 
     def validate(self, value):
         if isinstance(value, LazyReference) and value.pk is None:
-            self.error('You can only reference documents once they have been'
-                       ' saved to the database')
+            self.error(
+                "You can only reference documents once they have been"
+                " saved to the database"
+            )
         return super(GenericLazyReferenceField, self).validate(value)
 
     def to_mongo(self, document):
@@ -2439,9 +2602,16 @@ def to_mongo(self, document):
             return None
 
         if isinstance(document, LazyReference):
-            return SON((
-                ('_cls', document.document_type._class_name),
-                ('_ref', DBRef(document.document_type._get_collection_name(), document.pk))
-            ))
+            return SON(
+                (
+                    ("_cls", document.document_type._class_name),
+                    (
+                        "_ref",
+                        DBRef(
+                            document.document_type._get_collection_name(), document.pk
+                        ),
+                    ),
+                )
+            )
         else:
             return super(GenericLazyReferenceField, self).to_mongo(document)
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index b20ebc1e6..5d437fef8 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -15,5 +15,5 @@ def get_mongodb_version():
 
     :return: tuple(int, int)
     """
-    version_list = get_connection().server_info()['versionArray'][:2]     # e.g: (3, 2)
+    version_list = get_connection().server_info()["versionArray"][:2]  # e.g: (3, 2)
     return tuple(version_list)
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index f66c038e4..80c0661b8 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -27,6 +27,6 @@ def list_collection_names(db, include_system_collections=False):
         collections = db.collection_names()
 
     if not include_system_collections:
-        collections = [c for c in collections if not c.startswith('system.')]
+        collections = [c for c in collections if not c.startswith("system.")]
 
     return collections
diff --git a/mongoengine/queryset/__init__.py b/mongoengine/queryset/__init__.py
index 5219c39e1..f041d07b1 100644
--- a/mongoengine/queryset/__init__.py
+++ b/mongoengine/queryset/__init__.py
@@ -7,11 +7,22 @@
 
 # Expose just the public subset of all imported objects and constants.
 __all__ = (
-    'QuerySet', 'QuerySetNoCache', 'Q', 'queryset_manager', 'QuerySetManager',
-    'QueryFieldList', 'DO_NOTHING', 'NULLIFY', 'CASCADE', 'DENY', 'PULL',
-
+    "QuerySet",
+    "QuerySetNoCache",
+    "Q",
+    "queryset_manager",
+    "QuerySetManager",
+    "QueryFieldList",
+    "DO_NOTHING",
+    "NULLIFY",
+    "CASCADE",
+    "DENY",
+    "PULL",
     # Errors that might be related to a queryset, mostly here for backward
     # compatibility
-    'DoesNotExist', 'InvalidQueryError', 'MultipleObjectsReturned',
-    'NotUniqueError', 'OperationError',
+    "DoesNotExist",
+    "InvalidQueryError",
+    "MultipleObjectsReturned",
+    "NotUniqueError",
+    "OperationError",
 )
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 85616c859..78e853999 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -20,14 +20,18 @@
 from mongoengine.common import _import_class
 from mongoengine.connection import get_db
 from mongoengine.context_managers import set_write_concern, switch_db
-from mongoengine.errors import (InvalidQueryError, LookUpError,
-                                NotUniqueError, OperationError)
+from mongoengine.errors import (
+    InvalidQueryError,
+    LookUpError,
+    NotUniqueError,
+    OperationError,
+)
 from mongoengine.queryset import transform
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
 
 
-__all__ = ('BaseQuerySet', 'DO_NOTHING', 'NULLIFY', 'CASCADE', 'DENY', 'PULL')
+__all__ = ("BaseQuerySet", "DO_NOTHING", "NULLIFY", "CASCADE", "DENY", "PULL")
 
 # Delete rules
 DO_NOTHING = 0
@@ -41,6 +45,7 @@ class BaseQuerySet(object):
     """A set of results returned from a query. Wraps a MongoDB cursor,
     providing :class:`~mongoengine.Document` objects as the results.
     """
+
     __dereference = False
     _auto_dereference = True
 
@@ -66,13 +71,12 @@ def __init__(self, document, collection):
 
         # If inheritance is allowed, only return instances and instances of
         # subclasses of the class being used
-        if document._meta.get('allow_inheritance') is True:
+        if document._meta.get("allow_inheritance") is True:
             if len(self._document._subclasses) == 1:
-                self._initial_query = {'_cls': self._document._subclasses[0]}
+                self._initial_query = {"_cls": self._document._subclasses[0]}
             else:
-                self._initial_query = {
-                    '_cls': {'$in': self._document._subclasses}}
-            self._loaded_fields = QueryFieldList(always_include=['_cls'])
+                self._initial_query = {"_cls": {"$in": self._document._subclasses}}
+            self._loaded_fields = QueryFieldList(always_include=["_cls"])
 
         self._cursor_obj = None
         self._limit = None
@@ -83,8 +87,7 @@ def __init__(self, document, collection):
         self._max_time_ms = None
         self._comment = None
 
-    def __call__(self, q_obj=None, class_check=True, read_preference=None,
-                 **query):
+    def __call__(self, q_obj=None, class_check=True, read_preference=None, **query):
         """Filter the selected documents by calling the
         :class:`~mongoengine.queryset.QuerySet` with a query.
 
@@ -102,8 +105,10 @@ def __call__(self, q_obj=None, class_check=True, read_preference=None,
         if q_obj:
             # make sure proper query object is passed
             if not isinstance(q_obj, QNode):
-                msg = ('Not a query object: %s. '
-                       'Did you intend to use key=value?' % q_obj)
+                msg = (
+                    "Not a query object: %s. "
+                    "Did you intend to use key=value?" % q_obj
+                )
                 raise InvalidQueryError(msg)
             query &= q_obj
 
@@ -130,10 +135,10 @@ def __getstate__(self):
         obj_dict = self.__dict__.copy()
 
         # don't picke collection, instead pickle collection params
-        obj_dict.pop('_collection_obj')
+        obj_dict.pop("_collection_obj")
 
         # don't pickle cursor
-        obj_dict['_cursor_obj'] = None
+        obj_dict["_cursor_obj"] = None
 
         return obj_dict
 
@@ -144,7 +149,7 @@ def __setstate__(self, obj_dict):
         See https://github.com/MongoEngine/mongoengine/issues/442
         """
 
-        obj_dict['_collection_obj'] = obj_dict['_document']._get_collection()
+        obj_dict["_collection_obj"] = obj_dict["_document"]._get_collection()
 
         # update attributes
         self.__dict__.update(obj_dict)
@@ -182,7 +187,7 @@ def __getitem__(self, key):
                     queryset._document._from_son(
                         queryset._cursor[key],
                         _auto_dereference=self._auto_dereference,
-                        only_fields=self.only_fields
+                        only_fields=self.only_fields,
                     )
                 )
 
@@ -192,10 +197,10 @@ def __getitem__(self, key):
             return queryset._document._from_son(
                 queryset._cursor[key],
                 _auto_dereference=self._auto_dereference,
-                only_fields=self.only_fields
+                only_fields=self.only_fields,
             )
 
-        raise TypeError('Provide a slice or an integer index')
+        raise TypeError("Provide a slice or an integer index")
 
     def __iter__(self):
         raise NotImplementedError
@@ -235,14 +240,13 @@ def search_text(self, text, language=None):
         """
         queryset = self.clone()
         if queryset._search_text:
-            raise OperationError(
-                'It is not possible to use search_text two times.')
+            raise OperationError("It is not possible to use search_text two times.")
 
-        query_kwargs = SON({'$search': text})
+        query_kwargs = SON({"$search": text})
         if language:
-            query_kwargs['$language'] = language
+            query_kwargs["$language"] = language
 
-        queryset._query_obj &= Q(__raw__={'$text': query_kwargs})
+        queryset._query_obj &= Q(__raw__={"$text": query_kwargs})
         queryset._mongo_query = None
         queryset._cursor_obj = None
         queryset._search_text = text
@@ -265,8 +269,7 @@ def get(self, *q_objs, **query):
         try:
             result = six.next(queryset)
         except StopIteration:
-            msg = ('%s matching query does not exist.'
-                   % queryset._document._class_name)
+            msg = "%s matching query does not exist." % queryset._document._class_name
             raise queryset._document.DoesNotExist(msg)
         try:
             six.next(queryset)
@@ -276,7 +279,7 @@ def get(self, *q_objs, **query):
         # If we were able to retrieve the 2nd doc, rewind the cursor and
         # raise the MultipleObjectsReturned exception.
         queryset.rewind()
-        message = u'%d items returned, instead of 1' % queryset.count()
+        message = u"%d items returned, instead of 1" % queryset.count()
         raise queryset._document.MultipleObjectsReturned(message)
 
     def create(self, **kwargs):
@@ -295,8 +298,9 @@ def first(self):
             result = None
         return result
 
-    def insert(self, doc_or_docs, load_bulk=True,
-               write_concern=None, signal_kwargs=None):
+    def insert(
+        self, doc_or_docs, load_bulk=True, write_concern=None, signal_kwargs=None
+    ):
         """bulk insert documents
 
         :param doc_or_docs: a document or list of documents to be inserted
@@ -319,7 +323,7 @@ def insert(self, doc_or_docs, load_bulk=True,
         .. versionchanged:: 0.10.7
             Add signal_kwargs argument
         """
-        Document = _import_class('Document')
+        Document = _import_class("Document")
 
         if write_concern is None:
             write_concern = {}
@@ -332,16 +336,16 @@ def insert(self, doc_or_docs, load_bulk=True,
 
         for doc in docs:
             if not isinstance(doc, self._document):
-                msg = ("Some documents inserted aren't instances of %s"
-                       % str(self._document))
+                msg = "Some documents inserted aren't instances of %s" % str(
+                    self._document
+                )
                 raise OperationError(msg)
             if doc.pk and not doc._created:
-                msg = 'Some documents have ObjectIds, use doc.update() instead'
+                msg = "Some documents have ObjectIds, use doc.update() instead"
                 raise OperationError(msg)
 
         signal_kwargs = signal_kwargs or {}
-        signals.pre_bulk_insert.send(self._document,
-                                     documents=docs, **signal_kwargs)
+        signals.pre_bulk_insert.send(self._document, documents=docs, **signal_kwargs)
 
         raw = [doc.to_mongo() for doc in docs]
 
@@ -353,21 +357,25 @@ def insert(self, doc_or_docs, load_bulk=True,
 
         try:
             inserted_result = insert_func(raw)
-            ids = [inserted_result.inserted_id] if return_one else inserted_result.inserted_ids
+            ids = (
+                [inserted_result.inserted_id]
+                if return_one
+                else inserted_result.inserted_ids
+            )
         except pymongo.errors.DuplicateKeyError as err:
-            message = 'Could not save document (%s)'
+            message = "Could not save document (%s)"
             raise NotUniqueError(message % six.text_type(err))
         except pymongo.errors.BulkWriteError as err:
             # inserting documents that already have an _id field will
             # give huge performance debt or raise
-            message = u'Document must not have _id value before bulk write (%s)'
+            message = u"Document must not have _id value before bulk write (%s)"
             raise NotUniqueError(message % six.text_type(err))
         except pymongo.errors.OperationFailure as err:
-            message = 'Could not save document (%s)'
-            if re.match('^E1100[01] duplicate key', six.text_type(err)):
+            message = "Could not save document (%s)"
+            if re.match("^E1100[01] duplicate key", six.text_type(err)):
                 # E11000 - duplicate key error index
                 # E11001 - duplicate key on update
-                message = u'Tried to save duplicate unique keys (%s)'
+                message = u"Tried to save duplicate unique keys (%s)"
                 raise NotUniqueError(message % six.text_type(err))
             raise OperationError(message % six.text_type(err))
 
@@ -377,13 +385,15 @@ def insert(self, doc_or_docs, load_bulk=True,
 
         if not load_bulk:
             signals.post_bulk_insert.send(
-                self._document, documents=docs, loaded=False, **signal_kwargs)
+                self._document, documents=docs, loaded=False, **signal_kwargs
+            )
             return ids[0] if return_one else ids
 
         documents = self.in_bulk(ids)
         results = [documents.get(obj_id) for obj_id in ids]
         signals.post_bulk_insert.send(
-            self._document, documents=results, loaded=True, **signal_kwargs)
+            self._document, documents=results, loaded=True, **signal_kwargs
+        )
         return results[0] if return_one else results
 
     def count(self, with_limit_and_skip=False):
@@ -399,8 +409,7 @@ def count(self, with_limit_and_skip=False):
         self._cursor_obj = None
         return count
 
-    def delete(self, write_concern=None, _from_doc_delete=False,
-               cascade_refs=None):
+    def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
         """Delete the documents matched by the query.
 
         :param write_concern: Extra keyword arguments are passed down which
@@ -423,12 +432,13 @@ def delete(self, write_concern=None, _from_doc_delete=False,
         # Handle deletes where skips or limits have been applied or
         # there is an untriggered delete signal
         has_delete_signal = signals.signals_available and (
-            signals.pre_delete.has_receivers_for(doc) or
-            signals.post_delete.has_receivers_for(doc)
+            signals.pre_delete.has_receivers_for(doc)
+            or signals.post_delete.has_receivers_for(doc)
         )
 
-        call_document_delete = (queryset._skip or queryset._limit or
-                                has_delete_signal) and not _from_doc_delete
+        call_document_delete = (
+            queryset._skip or queryset._limit or has_delete_signal
+        ) and not _from_doc_delete
 
         if call_document_delete:
             cnt = 0
@@ -437,28 +447,28 @@ def delete(self, write_concern=None, _from_doc_delete=False,
                 cnt += 1
             return cnt
 
-        delete_rules = doc._meta.get('delete_rules') or {}
+        delete_rules = doc._meta.get("delete_rules") or {}
         delete_rules = list(delete_rules.items())
 
         # Check for DENY rules before actually deleting/nullifying any other
         # references
         for rule_entry, rule in delete_rules:
             document_cls, field_name = rule_entry
-            if document_cls._meta.get('abstract'):
+            if document_cls._meta.get("abstract"):
                 continue
 
             if rule == DENY:
-                refs = document_cls.objects(**{field_name + '__in': self})
+                refs = document_cls.objects(**{field_name + "__in": self})
                 if refs.limit(1).count() > 0:
                     raise OperationError(
-                        'Could not delete document (%s.%s refers to it)'
+                        "Could not delete document (%s.%s refers to it)"
                         % (document_cls.__name__, field_name)
                     )
 
         # Check all the other rules
         for rule_entry, rule in delete_rules:
             document_cls, field_name = rule_entry
-            if document_cls._meta.get('abstract'):
+            if document_cls._meta.get("abstract"):
                 continue
 
             if rule == CASCADE:
@@ -467,19 +477,19 @@ def delete(self, write_concern=None, _from_doc_delete=False,
                 if doc._collection == document_cls._collection:
                     for ref in queryset:
                         cascade_refs.add(ref.id)
-                refs = document_cls.objects(**{field_name + '__in': self,
-                                               'pk__nin': cascade_refs})
+                refs = document_cls.objects(
+                    **{field_name + "__in": self, "pk__nin": cascade_refs}
+                )
                 if refs.count() > 0:
-                    refs.delete(write_concern=write_concern,
-                                cascade_refs=cascade_refs)
+                    refs.delete(write_concern=write_concern, cascade_refs=cascade_refs)
             elif rule == NULLIFY:
-                document_cls.objects(**{field_name + '__in': self}).update(
-                    write_concern=write_concern,
-                    **{'unset__%s' % field_name: 1})
+                document_cls.objects(**{field_name + "__in": self}).update(
+                    write_concern=write_concern, **{"unset__%s" % field_name: 1}
+                )
             elif rule == PULL:
-                document_cls.objects(**{field_name + '__in': self}).update(
-                    write_concern=write_concern,
-                    **{'pull_all__%s' % field_name: self})
+                document_cls.objects(**{field_name + "__in": self}).update(
+                    write_concern=write_concern, **{"pull_all__%s" % field_name: self}
+                )
 
         with set_write_concern(queryset._collection, write_concern) as collection:
             result = collection.delete_many(queryset._query)
@@ -490,8 +500,9 @@ def delete(self, write_concern=None, _from_doc_delete=False,
             if result.acknowledged:
                 return result.deleted_count
 
-    def update(self, upsert=False, multi=True, write_concern=None,
-               full_result=False, **update):
+    def update(
+        self, upsert=False, multi=True, write_concern=None, full_result=False, **update
+    ):
         """Perform an atomic update on the fields matched by the query.
 
         :param upsert: insert if document doesn't exist (default ``False``)
@@ -511,7 +522,7 @@ def update(self, upsert=False, multi=True, write_concern=None,
         .. versionadded:: 0.2
         """
         if not update and not upsert:
-            raise OperationError('No update parameters, would remove data')
+            raise OperationError("No update parameters, would remove data")
 
         if write_concern is None:
             write_concern = {}
@@ -522,11 +533,11 @@ def update(self, upsert=False, multi=True, write_concern=None,
 
         # If doing an atomic upsert on an inheritable class
         # then ensure we add _cls to the update operation
-        if upsert and '_cls' in query:
-            if '$set' in update:
-                update['$set']['_cls'] = queryset._document._class_name
+        if upsert and "_cls" in query:
+            if "$set" in update:
+                update["$set"]["_cls"] = queryset._document._class_name
             else:
-                update['$set'] = {'_cls': queryset._document._class_name}
+                update["$set"] = {"_cls": queryset._document._class_name}
         try:
             with set_write_concern(queryset._collection, write_concern) as collection:
                 update_func = collection.update_one
@@ -536,14 +547,14 @@ def update(self, upsert=False, multi=True, write_concern=None,
             if full_result:
                 return result
             elif result.raw_result:
-                return result.raw_result['n']
+                return result.raw_result["n"]
         except pymongo.errors.DuplicateKeyError as err:
-            raise NotUniqueError(u'Update failed (%s)' % six.text_type(err))
+            raise NotUniqueError(u"Update failed (%s)" % six.text_type(err))
         except pymongo.errors.OperationFailure as err:
-            if six.text_type(err) == u'multi not coded yet':
-                message = u'update() method requires MongoDB 1.1.3+'
+            if six.text_type(err) == u"multi not coded yet":
+                message = u"update() method requires MongoDB 1.1.3+"
                 raise OperationError(message)
-            raise OperationError(u'Update failed (%s)' % six.text_type(err))
+            raise OperationError(u"Update failed (%s)" % six.text_type(err))
 
     def upsert_one(self, write_concern=None, **update):
         """Overwrite or add the first document matched by the query.
@@ -561,11 +572,15 @@ def upsert_one(self, write_concern=None, **update):
         .. versionadded:: 0.10.2
         """
 
-        atomic_update = self.update(multi=False, upsert=True,
-                                    write_concern=write_concern,
-                                    full_result=True, **update)
+        atomic_update = self.update(
+            multi=False,
+            upsert=True,
+            write_concern=write_concern,
+            full_result=True,
+            **update
+        )
 
-        if atomic_update.raw_result['updatedExisting']:
+        if atomic_update.raw_result["updatedExisting"]:
             document = self.get()
         else:
             document = self._document.objects.with_id(atomic_update.upserted_id)
@@ -594,9 +609,12 @@ def update_one(self, upsert=False, write_concern=None, full_result=False, **upda
             multi=False,
             write_concern=write_concern,
             full_result=full_result,
-            **update)
+            **update
+        )
 
-    def modify(self, upsert=False, full_response=False, remove=False, new=False, **update):
+    def modify(
+        self, upsert=False, full_response=False, remove=False, new=False, **update
+    ):
         """Update and return the updated document.
 
         Returns either the document before or after modification based on `new`
@@ -621,11 +639,10 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
         """
 
         if remove and new:
-            raise OperationError('Conflicting parameters: remove and new')
+            raise OperationError("Conflicting parameters: remove and new")
 
         if not update and not upsert and not remove:
-            raise OperationError(
-                'No update parameters, must either update or remove')
+            raise OperationError("No update parameters, must either update or remove")
 
         queryset = self.clone()
         query = queryset._query
@@ -635,27 +652,35 @@ def modify(self, upsert=False, full_response=False, remove=False, new=False, **u
 
         try:
             if full_response:
-                msg = 'With PyMongo 3+, it is not possible anymore to get the full response.'
+                msg = "With PyMongo 3+, it is not possible anymore to get the full response."
                 warnings.warn(msg, DeprecationWarning)
             if remove:
                 result = queryset._collection.find_one_and_delete(
-                    query, sort=sort, **self._cursor_args)
+                    query, sort=sort, **self._cursor_args
+                )
             else:
                 if new:
                     return_doc = ReturnDocument.AFTER
                 else:
                     return_doc = ReturnDocument.BEFORE
                 result = queryset._collection.find_one_and_update(
-                    query, update, upsert=upsert, sort=sort, return_document=return_doc,
-                    **self._cursor_args)
+                    query,
+                    update,
+                    upsert=upsert,
+                    sort=sort,
+                    return_document=return_doc,
+                    **self._cursor_args
+                )
         except pymongo.errors.DuplicateKeyError as err:
-            raise NotUniqueError(u'Update failed (%s)' % err)
+            raise NotUniqueError(u"Update failed (%s)" % err)
         except pymongo.errors.OperationFailure as err:
-            raise OperationError(u'Update failed (%s)' % err)
+            raise OperationError(u"Update failed (%s)" % err)
 
         if full_response:
-            if result['value'] is not None:
-                result['value'] = self._document._from_son(result['value'], only_fields=self.only_fields)
+            if result["value"] is not None:
+                result["value"] = self._document._from_son(
+                    result["value"], only_fields=self.only_fields
+                )
         else:
             if result is not None:
                 result = self._document._from_son(result, only_fields=self.only_fields)
@@ -673,7 +698,7 @@ def with_id(self, object_id):
         """
         queryset = self.clone()
         if not queryset._query_obj.empty:
-            msg = 'Cannot use a filter whilst using `with_id`'
+            msg = "Cannot use a filter whilst using `with_id`"
             raise InvalidQueryError(msg)
         return queryset.filter(pk=object_id).first()
 
@@ -688,21 +713,22 @@ def in_bulk(self, object_ids):
         """
         doc_map = {}
 
-        docs = self._collection.find({'_id': {'$in': object_ids}},
-                                     **self._cursor_args)
+        docs = self._collection.find({"_id": {"$in": object_ids}}, **self._cursor_args)
         if self._scalar:
             for doc in docs:
-                doc_map[doc['_id']] = self._get_scalar(
-                    self._document._from_son(doc, only_fields=self.only_fields))
+                doc_map[doc["_id"]] = self._get_scalar(
+                    self._document._from_son(doc, only_fields=self.only_fields)
+                )
         elif self._as_pymongo:
             for doc in docs:
-                doc_map[doc['_id']] = doc
+                doc_map[doc["_id"]] = doc
         else:
             for doc in docs:
-                doc_map[doc['_id']] = self._document._from_son(
+                doc_map[doc["_id"]] = self._document._from_son(
                     doc,
                     only_fields=self.only_fields,
-                    _auto_dereference=self._auto_dereference)
+                    _auto_dereference=self._auto_dereference,
+                )
 
         return doc_map
 
@@ -717,8 +743,8 @@ def no_sub_classes(self):
 
         Do NOT return any inherited documents.
         """
-        if self._document._meta.get('allow_inheritance') is True:
-            self._initial_query = {'_cls': self._document._class_name}
+        if self._document._meta.get("allow_inheritance") is True:
+            self._initial_query = {"_cls": self._document._class_name}
 
         return self
 
@@ -747,15 +773,35 @@ def _clone_into(self, new_qs):
         """
         if not isinstance(new_qs, BaseQuerySet):
             raise OperationError(
-                '%s is not a subclass of BaseQuerySet' % new_qs.__name__)
+                "%s is not a subclass of BaseQuerySet" % new_qs.__name__
+            )
 
-        copy_props = ('_mongo_query', '_initial_query', '_none', '_query_obj',
-                      '_where_clause', '_loaded_fields', '_ordering',
-                      '_snapshot', '_timeout', '_class_check', '_slave_okay',
-                      '_read_preference', '_iter', '_scalar', '_as_pymongo',
-                      '_limit', '_skip', '_hint', '_auto_dereference',
-                      '_search_text', 'only_fields', '_max_time_ms',
-                      '_comment', '_batch_size')
+        copy_props = (
+            "_mongo_query",
+            "_initial_query",
+            "_none",
+            "_query_obj",
+            "_where_clause",
+            "_loaded_fields",
+            "_ordering",
+            "_snapshot",
+            "_timeout",
+            "_class_check",
+            "_slave_okay",
+            "_read_preference",
+            "_iter",
+            "_scalar",
+            "_as_pymongo",
+            "_limit",
+            "_skip",
+            "_hint",
+            "_auto_dereference",
+            "_search_text",
+            "only_fields",
+            "_max_time_ms",
+            "_comment",
+            "_batch_size",
+        )
 
         for prop in copy_props:
             val = getattr(self, prop)
@@ -868,37 +914,43 @@ def distinct(self, field):
         except LookUpError:
             pass
 
-        distinct = self._dereference(queryset._cursor.distinct(field), 1,
-                                     name=field, instance=self._document)
+        distinct = self._dereference(
+            queryset._cursor.distinct(field), 1, name=field, instance=self._document
+        )
 
-        doc_field = self._document._fields.get(field.split('.', 1)[0])
+        doc_field = self._document._fields.get(field.split(".", 1)[0])
         instance = None
 
         # We may need to cast to the correct type eg. ListField(EmbeddedDocumentField)
-        EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
-        ListField = _import_class('ListField')
-        GenericEmbeddedDocumentField = _import_class('GenericEmbeddedDocumentField')
+        EmbeddedDocumentField = _import_class("EmbeddedDocumentField")
+        ListField = _import_class("ListField")
+        GenericEmbeddedDocumentField = _import_class("GenericEmbeddedDocumentField")
         if isinstance(doc_field, ListField):
-            doc_field = getattr(doc_field, 'field', doc_field)
+            doc_field = getattr(doc_field, "field", doc_field)
         if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
-            instance = getattr(doc_field, 'document_type', None)
+            instance = getattr(doc_field, "document_type", None)
 
         # handle distinct on subdocuments
-        if '.' in field:
-            for field_part in field.split('.')[1:]:
+        if "." in field:
+            for field_part in field.split(".")[1:]:
                 # if looping on embedded document, get the document type instance
-                if instance and isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
+                if instance and isinstance(
+                    doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+                ):
                     doc_field = instance
                 # now get the subdocument
                 doc_field = getattr(doc_field, field_part, doc_field)
                 # We may need to cast to the correct type eg. ListField(EmbeddedDocumentField)
                 if isinstance(doc_field, ListField):
-                    doc_field = getattr(doc_field, 'field', doc_field)
-                if isinstance(doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)):
-                    instance = getattr(doc_field, 'document_type', None)
-
-        if instance and isinstance(doc_field, (EmbeddedDocumentField,
-                                               GenericEmbeddedDocumentField)):
+                    doc_field = getattr(doc_field, "field", doc_field)
+                if isinstance(
+                    doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+                ):
+                    instance = getattr(doc_field, "document_type", None)
+
+        if instance and isinstance(
+            doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+        ):
             distinct = [instance(**doc) for doc in distinct]
 
         return distinct
@@ -970,14 +1022,14 @@ def fields(self, _only_called=False, **kwargs):
         """
 
         # Check for an operator and transform to mongo-style if there is
-        operators = ['slice']
+        operators = ["slice"]
         cleaned_fields = []
         for key, value in kwargs.items():
-            parts = key.split('__')
+            parts = key.split("__")
             if parts[0] in operators:
                 op = parts.pop(0)
-                value = {'$' + op: value}
-            key = '.'.join(parts)
+                value = {"$" + op: value}
+            key = ".".join(parts)
             cleaned_fields.append((key, value))
 
         # Sort fields by their values, explicitly excluded fields first, then
@@ -998,7 +1050,8 @@ def _sort_key(field_tuple):
             fields = [field for field, value in group]
             fields = queryset._fields_to_dbfields(fields)
             queryset._loaded_fields += QueryFieldList(
-                fields, value=value, _only_called=_only_called)
+                fields, value=value, _only_called=_only_called
+            )
 
         return queryset
 
@@ -1012,7 +1065,8 @@ def all_fields(self):
         """
         queryset = self.clone()
         queryset._loaded_fields = QueryFieldList(
-            always_include=queryset._loaded_fields.always_include)
+            always_include=queryset._loaded_fields.always_include
+        )
         return queryset
 
     def order_by(self, *keys):
@@ -1053,7 +1107,7 @@ def comment(self, text):
         See https://docs.mongodb.com/manual/reference/method/cursor.comment/#cursor.comment
         for details.
         """
-        return self._chainable_method('comment', text)
+        return self._chainable_method("comment", text)
 
     def explain(self, format=False):
         """Return an explain plan record for the
@@ -1066,8 +1120,10 @@ def explain(self, format=False):
         # TODO remove this option completely - it's useless. If somebody
         # wants to pretty-print the output, they easily can.
         if format:
-            msg = ('"format" param of BaseQuerySet.explain has been '
-                   'deprecated and will be removed in future versions.')
+            msg = (
+                '"format" param of BaseQuerySet.explain has been '
+                "deprecated and will be removed in future versions."
+            )
             warnings.warn(msg, DeprecationWarning)
             plan = pprint.pformat(plan)
 
@@ -1082,7 +1138,7 @@ def snapshot(self, enabled):
         ..versionchanged:: 0.5 - made chainable
         .. deprecated:: Ignored with PyMongo 3+
         """
-        msg = 'snapshot is deprecated as it has no impact when using PyMongo 3+.'
+        msg = "snapshot is deprecated as it has no impact when using PyMongo 3+."
         warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._snapshot = enabled
@@ -1107,7 +1163,7 @@ def slave_okay(self, enabled):
 
         .. deprecated:: Ignored with PyMongo 3+
         """
-        msg = 'slave_okay is deprecated as it has no impact when using PyMongo 3+.'
+        msg = "slave_okay is deprecated as it has no impact when using PyMongo 3+."
         warnings.warn(msg, DeprecationWarning)
         queryset = self.clone()
         queryset._slave_okay = enabled
@@ -1119,10 +1175,12 @@ def read_preference(self, read_preference):
         :param read_preference: override ReplicaSetConnection-level
             preference.
         """
-        validate_read_preference('read_preference', read_preference)
+        validate_read_preference("read_preference", read_preference)
         queryset = self.clone()
         queryset._read_preference = read_preference
-        queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_preference
+        queryset._cursor_obj = (
+            None
+        )  # we need to re-create the cursor object whenever we apply read_preference
         return queryset
 
     def scalar(self, *fields):
@@ -1168,7 +1226,7 @@ def max_time_ms(self, ms):
 
         :param ms: the number of milliseconds before killing the query on the server
         """
-        return self._chainable_method('max_time_ms', ms)
+        return self._chainable_method("max_time_ms", ms)
 
     # JSON Helpers
 
@@ -1179,7 +1237,10 @@ def to_json(self, *args, **kwargs):
     def from_json(self, json_data):
         """Converts json data to unsaved objects"""
         son_data = json_util.loads(json_data)
-        return [self._document._from_son(data, only_fields=self.only_fields) for data in son_data]
+        return [
+            self._document._from_son(data, only_fields=self.only_fields)
+            for data in son_data
+        ]
 
     def aggregate(self, *pipeline, **kwargs):
         """
@@ -1192,32 +1253,34 @@ def aggregate(self, *pipeline, **kwargs):
         initial_pipeline = []
 
         if self._query:
-            initial_pipeline.append({'$match': self._query})
+            initial_pipeline.append({"$match": self._query})
 
         if self._ordering:
-            initial_pipeline.append({'$sort': dict(self._ordering)})
+            initial_pipeline.append({"$sort": dict(self._ordering)})
 
         if self._limit is not None:
             # As per MongoDB Documentation (https://docs.mongodb.com/manual/reference/operator/aggregation/limit/),
             # keeping limit stage right after sort stage is more efficient. But this leads to wrong set of documents
             # for a skip stage that might succeed these. So we need to maintain more documents in memory in such a
             # case (https://stackoverflow.com/a/24161461).
-            initial_pipeline.append({'$limit': self._limit + (self._skip or 0)})
+            initial_pipeline.append({"$limit": self._limit + (self._skip or 0)})
 
         if self._skip is not None:
-            initial_pipeline.append({'$skip': self._skip})
+            initial_pipeline.append({"$skip": self._skip})
 
         pipeline = initial_pipeline + list(pipeline)
 
         if self._read_preference is not None:
-            return self._collection.with_options(read_preference=self._read_preference) \
-                       .aggregate(pipeline, cursor={}, **kwargs)
+            return self._collection.with_options(
+                read_preference=self._read_preference
+            ).aggregate(pipeline, cursor={}, **kwargs)
 
         return self._collection.aggregate(pipeline, cursor={}, **kwargs)
 
     # JS functionality
-    def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
-                   scope=None):
+    def map_reduce(
+        self, map_f, reduce_f, output, finalize_f=None, limit=None, scope=None
+    ):
         """Perform a map/reduce query using the current query spec
         and ordering. While ``map_reduce`` respects ``QuerySet`` chaining,
         it must be the last call made, as it does not return a maleable
@@ -1257,10 +1320,10 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
         """
         queryset = self.clone()
 
-        MapReduceDocument = _import_class('MapReduceDocument')
+        MapReduceDocument = _import_class("MapReduceDocument")
 
-        if not hasattr(self._collection, 'map_reduce'):
-            raise NotImplementedError('Requires MongoDB >= 1.7.1')
+        if not hasattr(self._collection, "map_reduce"):
+            raise NotImplementedError("Requires MongoDB >= 1.7.1")
 
         map_f_scope = {}
         if isinstance(map_f, Code):
@@ -1275,7 +1338,7 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
         reduce_f_code = queryset._sub_js_fields(reduce_f)
         reduce_f = Code(reduce_f_code, reduce_f_scope)
 
-        mr_args = {'query': queryset._query}
+        mr_args = {"query": queryset._query}
 
         if finalize_f:
             finalize_f_scope = {}
@@ -1284,39 +1347,39 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
                 finalize_f = six.text_type(finalize_f)
             finalize_f_code = queryset._sub_js_fields(finalize_f)
             finalize_f = Code(finalize_f_code, finalize_f_scope)
-            mr_args['finalize'] = finalize_f
+            mr_args["finalize"] = finalize_f
 
         if scope:
-            mr_args['scope'] = scope
+            mr_args["scope"] = scope
 
         if limit:
-            mr_args['limit'] = limit
+            mr_args["limit"] = limit
 
-        if output == 'inline' and not queryset._ordering:
-            map_reduce_function = 'inline_map_reduce'
+        if output == "inline" and not queryset._ordering:
+            map_reduce_function = "inline_map_reduce"
         else:
-            map_reduce_function = 'map_reduce'
+            map_reduce_function = "map_reduce"
 
             if isinstance(output, six.string_types):
-                mr_args['out'] = output
+                mr_args["out"] = output
 
             elif isinstance(output, dict):
                 ordered_output = []
 
-                for part in ('replace', 'merge', 'reduce'):
+                for part in ("replace", "merge", "reduce"):
                     value = output.get(part)
                     if value:
                         ordered_output.append((part, value))
                         break
 
                 else:
-                    raise OperationError('actionData not specified for output')
+                    raise OperationError("actionData not specified for output")
 
-                db_alias = output.get('db_alias')
-                remaing_args = ['db', 'sharded', 'nonAtomic']
+                db_alias = output.get("db_alias")
+                remaing_args = ["db", "sharded", "nonAtomic"]
 
                 if db_alias:
-                    ordered_output.append(('db', get_db(db_alias).name))
+                    ordered_output.append(("db", get_db(db_alias).name))
                     del remaing_args[0]
 
                 for part in remaing_args:
@@ -1324,20 +1387,22 @@ def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
                     if value:
                         ordered_output.append((part, value))
 
-                mr_args['out'] = SON(ordered_output)
+                mr_args["out"] = SON(ordered_output)
 
         results = getattr(queryset._collection, map_reduce_function)(
-            map_f, reduce_f, **mr_args)
+            map_f, reduce_f, **mr_args
+        )
 
-        if map_reduce_function == 'map_reduce':
+        if map_reduce_function == "map_reduce":
             results = results.find()
 
         if queryset._ordering:
             results = results.sort(queryset._ordering)
 
         for doc in results:
-            yield MapReduceDocument(queryset._document, queryset._collection,
-                                    doc['_id'], doc['value'])
+            yield MapReduceDocument(
+                queryset._document, queryset._collection, doc["_id"], doc["value"]
+            )
 
     def exec_js(self, code, *fields, **options):
         """Execute a Javascript function on the server. A list of fields may be
@@ -1368,16 +1433,13 @@ def exec_js(self, code, *fields, **options):
         fields = [queryset._document._translate_field_name(f) for f in fields]
         collection = queryset._document._get_collection_name()
 
-        scope = {
-            'collection': collection,
-            'options': options or {},
-        }
+        scope = {"collection": collection, "options": options or {}}
 
         query = queryset._query
         if queryset._where_clause:
-            query['$where'] = queryset._where_clause
+            query["$where"] = queryset._where_clause
 
-        scope['query'] = query
+        scope["query"] = query
         code = Code(code, scope=scope)
 
         db = queryset._document._get_db()
@@ -1407,22 +1469,22 @@ def sum(self, field):
         """
         db_field = self._fields_to_dbfields([field]).pop()
         pipeline = [
-            {'$match': self._query},
-            {'$group': {'_id': 'sum', 'total': {'$sum': '$' + db_field}}}
+            {"$match": self._query},
+            {"$group": {"_id": "sum", "total": {"$sum": "$" + db_field}}},
         ]
 
         # if we're performing a sum over a list field, we sum up all the
         # elements in the list, hence we need to $unwind the arrays first
-        ListField = _import_class('ListField')
-        field_parts = field.split('.')
+        ListField = _import_class("ListField")
+        field_parts = field.split(".")
         field_instances = self._document._lookup_field(field_parts)
         if isinstance(field_instances[-1], ListField):
-            pipeline.insert(1, {'$unwind': '$' + field})
+            pipeline.insert(1, {"$unwind": "$" + field})
 
         result = tuple(self._document._get_collection().aggregate(pipeline))
 
         if result:
-            return result[0]['total']
+            return result[0]["total"]
         return 0
 
     def average(self, field):
@@ -1433,22 +1495,22 @@ def average(self, field):
         """
         db_field = self._fields_to_dbfields([field]).pop()
         pipeline = [
-            {'$match': self._query},
-            {'$group': {'_id': 'avg', 'total': {'$avg': '$' + db_field}}}
+            {"$match": self._query},
+            {"$group": {"_id": "avg", "total": {"$avg": "$" + db_field}}},
         ]
 
         # if we're performing an average over a list field, we average out
         # all the elements in the list, hence we need to $unwind the arrays
         # first
-        ListField = _import_class('ListField')
-        field_parts = field.split('.')
+        ListField = _import_class("ListField")
+        field_parts = field.split(".")
         field_instances = self._document._lookup_field(field_parts)
         if isinstance(field_instances[-1], ListField):
-            pipeline.insert(1, {'$unwind': '$' + field})
+            pipeline.insert(1, {"$unwind": "$" + field})
 
         result = tuple(self._document._get_collection().aggregate(pipeline))
         if result:
-            return result[0]['total']
+            return result[0]["total"]
         return 0
 
     def item_frequencies(self, field, normalize=False, map_reduce=True):
@@ -1474,8 +1536,7 @@ def item_frequencies(self, field, normalize=False, map_reduce=True):
                             document lookups
         """
         if map_reduce:
-            return self._item_frequencies_map_reduce(field,
-                                                     normalize=normalize)
+            return self._item_frequencies_map_reduce(field, normalize=normalize)
         return self._item_frequencies_exec_js(field, normalize=normalize)
 
     # Iterator helpers
@@ -1492,15 +1553,17 @@ def __next__(self):
             return raw_doc
 
         doc = self._document._from_son(
-            raw_doc, _auto_dereference=self._auto_dereference,
-            only_fields=self.only_fields)
+            raw_doc,
+            _auto_dereference=self._auto_dereference,
+            only_fields=self.only_fields,
+        )
 
         if self._scalar:
             return self._get_scalar(doc)
 
         return doc
 
-    next = __next__     # For Python2 support
+    next = __next__  # For Python2 support
 
     def rewind(self):
         """Rewind the cursor to its unevaluated state.
@@ -1521,15 +1584,13 @@ def _collection(self):
 
     @property
     def _cursor_args(self):
-        fields_name = 'projection'
+        fields_name = "projection"
         # snapshot is not handled at all by PyMongo 3+
         # TODO: evaluate similar possibilities using modifiers
         if self._snapshot:
-            msg = 'The snapshot option is not anymore available with PyMongo 3+'
+            msg = "The snapshot option is not anymore available with PyMongo 3+"
             warnings.warn(msg, DeprecationWarning)
-        cursor_args = {
-            'no_cursor_timeout': not self._timeout
-        }
+        cursor_args = {"no_cursor_timeout": not self._timeout}
 
         if self._loaded_fields:
             cursor_args[fields_name] = self._loaded_fields.as_dict()
@@ -1538,7 +1599,7 @@ def _cursor_args(self):
             if fields_name not in cursor_args:
                 cursor_args[fields_name] = {}
 
-            cursor_args[fields_name]['_text_score'] = {'$meta': 'textScore'}
+            cursor_args[fields_name]["_text_score"] = {"$meta": "textScore"}
 
         return cursor_args
 
@@ -1555,12 +1616,11 @@ def _cursor(self):
         # level, not a cursor level. Thus, we need to get a cloned collection
         # object using `with_options` first.
         if self._read_preference is not None:
-            self._cursor_obj = self._collection\
-                .with_options(read_preference=self._read_preference)\
-                .find(self._query, **self._cursor_args)
+            self._cursor_obj = self._collection.with_options(
+                read_preference=self._read_preference
+            ).find(self._query, **self._cursor_args)
         else:
-            self._cursor_obj = self._collection.find(self._query,
-                                                     **self._cursor_args)
+            self._cursor_obj = self._collection.find(self._query, **self._cursor_args)
         # Apply "where" clauses to cursor
         if self._where_clause:
             where_clause = self._sub_js_fields(self._where_clause)
@@ -1576,9 +1636,9 @@ def _cursor(self):
         if self._ordering:
             # explicit ordering
             self._cursor_obj.sort(self._ordering)
-        elif self._ordering is None and self._document._meta['ordering']:
+        elif self._ordering is None and self._document._meta["ordering"]:
             # default ordering
-            order = self._get_order_by(self._document._meta['ordering'])
+            order = self._get_order_by(self._document._meta["ordering"])
             self._cursor_obj.sort(order)
 
         if self._limit is not None:
@@ -1607,8 +1667,10 @@ def _query(self):
         if self._mongo_query is None:
             self._mongo_query = self._query_obj.to_query(self._document)
             if self._class_check and self._initial_query:
-                if '_cls' in self._mongo_query:
-                    self._mongo_query = {'$and': [self._initial_query, self._mongo_query]}
+                if "_cls" in self._mongo_query:
+                    self._mongo_query = {
+                        "$and": [self._initial_query, self._mongo_query]
+                    }
                 else:
                     self._mongo_query.update(self._initial_query)
         return self._mongo_query
@@ -1616,7 +1678,7 @@ def _query(self):
     @property
     def _dereference(self):
         if not self.__dereference:
-            self.__dereference = _import_class('DeReference')()
+            self.__dereference = _import_class("DeReference")()
         return self.__dereference
 
     def no_dereference(self):
@@ -1649,7 +1711,9 @@ def _item_frequencies_map_reduce(self, field, normalize=False):
                     emit(null, 1);
                 }
             }
-        """ % {'field': field}
+        """ % {
+            "field": field
+        }
         reduce_func = """
             function(key, values) {
                 var total = 0;
@@ -1660,7 +1724,7 @@ def _item_frequencies_map_reduce(self, field, normalize=False):
                 return total;
             }
         """
-        values = self.map_reduce(map_func, reduce_func, 'inline')
+        values = self.map_reduce(map_func, reduce_func, "inline")
         frequencies = {}
         for f in values:
             key = f.key
@@ -1671,8 +1735,7 @@ def _item_frequencies_map_reduce(self, field, normalize=False):
 
         if normalize:
             count = sum(frequencies.values())
-            frequencies = {k: float(v) / count
-                           for k, v in frequencies.items()}
+            frequencies = {k: float(v) / count for k, v in frequencies.items()}
 
         return frequencies
 
@@ -1742,15 +1805,14 @@ def _item_frequencies_exec_js(self, field, normalize=False):
     def _fields_to_dbfields(self, fields):
         """Translate fields' paths to their db equivalents."""
         subclasses = []
-        if self._document._meta['allow_inheritance']:
-            subclasses = [get_document(x)
-                          for x in self._document._subclasses][1:]
+        if self._document._meta["allow_inheritance"]:
+            subclasses = [get_document(x) for x in self._document._subclasses][1:]
 
         db_field_paths = []
         for field in fields:
-            field_parts = field.split('.')
+            field_parts = field.split(".")
             try:
-                field = '.'.join(
+                field = ".".join(
                     f if isinstance(f, six.string_types) else f.db_field
                     for f in self._document._lookup_field(field_parts)
                 )
@@ -1762,7 +1824,7 @@ def _fields_to_dbfields(self, fields):
                 # through its subclasses and see if it exists on any of them.
                 for subdoc in subclasses:
                     try:
-                        subfield = '.'.join(
+                        subfield = ".".join(
                             f if isinstance(f, six.string_types) else f.db_field
                             for f in subdoc._lookup_field(field_parts)
                         )
@@ -1790,18 +1852,18 @@ def _get_order_by(self, keys):
             if not key:
                 continue
 
-            if key == '$text_score':
-                key_list.append(('_text_score', {'$meta': 'textScore'}))
+            if key == "$text_score":
+                key_list.append(("_text_score", {"$meta": "textScore"}))
                 continue
 
             direction = pymongo.ASCENDING
-            if key[0] == '-':
+            if key[0] == "-":
                 direction = pymongo.DESCENDING
 
-            if key[0] in ('-', '+'):
+            if key[0] in ("-", "+"):
                 key = key[1:]
 
-            key = key.replace('__', '.')
+            key = key.replace("__", ".")
             try:
                 key = self._document._translate_field_name(key)
             except Exception:
@@ -1813,9 +1875,8 @@ def _get_order_by(self, keys):
         return key_list
 
     def _get_scalar(self, doc):
-
         def lookup(obj, name):
-            chunks = name.split('__')
+            chunks = name.split("__")
             for chunk in chunks:
                 obj = getattr(obj, chunk)
             return obj
@@ -1835,21 +1896,20 @@ def _sub_js_fields(self, code):
 
         def field_sub(match):
             # Extract just the field name, and look up the field objects
-            field_name = match.group(1).split('.')
+            field_name = match.group(1).split(".")
             fields = self._document._lookup_field(field_name)
             # Substitute the correct name for the field into the javascript
             return u'["%s"]' % fields[-1].db_field
 
         def field_path_sub(match):
             # Extract just the field name, and look up the field objects
-            field_name = match.group(1).split('.')
+            field_name = match.group(1).split(".")
             fields = self._document._lookup_field(field_name)
             # Substitute the correct name for the field into the javascript
-            return '.'.join([f.db_field for f in fields])
+            return ".".join([f.db_field for f in fields])
 
-        code = re.sub(r'\[\s*~([A-z_][A-z_0-9.]+?)\s*\]', field_sub, code)
-        code = re.sub(r'\{\{\s*~([A-z_][A-z_0-9.]+?)\s*\}\}', field_path_sub,
-                      code)
+        code = re.sub(r"\[\s*~([A-z_][A-z_0-9.]+?)\s*\]", field_sub, code)
+        code = re.sub(r"\{\{\s*~([A-z_][A-z_0-9.]+?)\s*\}\}", field_path_sub, code)
         return code
 
     def _chainable_method(self, method_name, val):
@@ -1866,22 +1926,26 @@ def _chainable_method(self, method_name, val):
         getattr(cursor, method_name)(val)
 
         # Cache the value on the queryset._{method_name}
-        setattr(queryset, '_' + method_name, val)
+        setattr(queryset, "_" + method_name, val)
 
         return queryset
 
     # Deprecated
     def ensure_index(self, **kwargs):
         """Deprecated use :func:`Document.ensure_index`"""
-        msg = ('Doc.objects()._ensure_index() is deprecated. '
-               'Use Doc.ensure_index() instead.')
+        msg = (
+            "Doc.objects()._ensure_index() is deprecated. "
+            "Use Doc.ensure_index() instead."
+        )
         warnings.warn(msg, DeprecationWarning)
         self._document.__class__.ensure_index(**kwargs)
         return self
 
     def _ensure_indexes(self):
         """Deprecated use :func:`~Document.ensure_indexes`"""
-        msg = ('Doc.objects()._ensure_indexes() is deprecated. '
-               'Use Doc.ensure_indexes() instead.')
+        msg = (
+            "Doc.objects()._ensure_indexes() is deprecated. "
+            "Use Doc.ensure_indexes() instead."
+        )
         warnings.warn(msg, DeprecationWarning)
         self._document.__class__.ensure_indexes()
diff --git a/mongoengine/queryset/field_list.py b/mongoengine/queryset/field_list.py
index dba724af9..5c3ff2227 100644
--- a/mongoengine/queryset/field_list.py
+++ b/mongoengine/queryset/field_list.py
@@ -1,12 +1,15 @@
-__all__ = ('QueryFieldList',)
+__all__ = ("QueryFieldList",)
 
 
 class QueryFieldList(object):
     """Object that handles combinations of .only() and .exclude() calls"""
+
     ONLY = 1
     EXCLUDE = 0
 
-    def __init__(self, fields=None, value=ONLY, always_include=None, _only_called=False):
+    def __init__(
+        self, fields=None, value=ONLY, always_include=None, _only_called=False
+    ):
         """The QueryFieldList builder
 
         :param fields: A list of fields used in `.only()` or `.exclude()`
@@ -49,7 +52,7 @@ def __add__(self, f):
             self.fields = f.fields - self.fields
             self._clean_slice()
 
-        if '_id' in f.fields:
+        if "_id" in f.fields:
             self._id = f.value
 
         if self.always_include:
@@ -59,7 +62,7 @@ def __add__(self, f):
             else:
                 self.fields -= self.always_include
 
-        if getattr(f, '_only_called', False):
+        if getattr(f, "_only_called", False):
             self._only_called = True
         return self
 
@@ -73,7 +76,7 @@ def as_dict(self):
         if self.slice:
             field_list.update(self.slice)
         if self._id is not None:
-            field_list['_id'] = self._id
+            field_list["_id"] = self._id
         return field_list
 
     def reset(self):
diff --git a/mongoengine/queryset/manager.py b/mongoengine/queryset/manager.py
index f93dbb436..5067ffbf2 100644
--- a/mongoengine/queryset/manager.py
+++ b/mongoengine/queryset/manager.py
@@ -1,7 +1,7 @@
 from functools import partial
 from mongoengine.queryset.queryset import QuerySet
 
-__all__ = ('queryset_manager', 'QuerySetManager')
+__all__ = ("queryset_manager", "QuerySetManager")
 
 
 class QuerySetManager(object):
@@ -33,7 +33,7 @@ def __get__(self, instance, owner):
             return self
 
         # owner is the document that contains the QuerySetManager
-        queryset_class = owner._meta.get('queryset_class', self.default)
+        queryset_class = owner._meta.get("queryset_class", self.default)
         queryset = queryset_class(owner, owner._get_collection())
         if self.get_queryset:
             arg_count = self.get_queryset.__code__.co_argcount
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index c7c593b15..4ba62d468 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -1,11 +1,24 @@
 import six
 
 from mongoengine.errors import OperationError
-from mongoengine.queryset.base import (BaseQuerySet, CASCADE, DENY, DO_NOTHING,
-                                       NULLIFY, PULL)
-
-__all__ = ('QuerySet', 'QuerySetNoCache', 'DO_NOTHING', 'NULLIFY', 'CASCADE',
-           'DENY', 'PULL')
+from mongoengine.queryset.base import (
+    BaseQuerySet,
+    CASCADE,
+    DENY,
+    DO_NOTHING,
+    NULLIFY,
+    PULL,
+)
+
+__all__ = (
+    "QuerySet",
+    "QuerySetNoCache",
+    "DO_NOTHING",
+    "NULLIFY",
+    "CASCADE",
+    "DENY",
+    "PULL",
+)
 
 # The maximum number of items to display in a QuerySet.__repr__
 REPR_OUTPUT_SIZE = 20
@@ -57,12 +70,12 @@ def __len__(self):
     def __repr__(self):
         """Provide a string representation of the QuerySet"""
         if self._iter:
-            return '.. queryset mid-iteration ..'
+            return ".. queryset mid-iteration .."
 
         self._populate_cache()
-        data = self._result_cache[:REPR_OUTPUT_SIZE + 1]
+        data = self._result_cache[: REPR_OUTPUT_SIZE + 1]
         if len(data) > REPR_OUTPUT_SIZE:
-            data[-1] = '...(remaining elements truncated)...'
+            data[-1] = "...(remaining elements truncated)..."
         return repr(data)
 
     def _iter_results(self):
@@ -143,10 +156,9 @@ def no_cache(self):
         .. versionadded:: 0.8.3 Convert to non caching queryset
         """
         if self._result_cache is not None:
-            raise OperationError('QuerySet already cached')
+            raise OperationError("QuerySet already cached")
 
-        return self._clone_into(QuerySetNoCache(self._document,
-                                                self._collection))
+        return self._clone_into(QuerySetNoCache(self._document, self._collection))
 
 
 class QuerySetNoCache(BaseQuerySet):
@@ -165,7 +177,7 @@ def __repr__(self):
         .. versionchanged:: 0.6.13 Now doesnt modify the cursor
         """
         if self._iter:
-            return '.. queryset mid-iteration ..'
+            return ".. queryset mid-iteration .."
 
         data = []
         for _ in six.moves.range(REPR_OUTPUT_SIZE + 1):
@@ -175,7 +187,7 @@ def __repr__(self):
                 break
 
         if len(data) > REPR_OUTPUT_SIZE:
-            data[-1] = '...(remaining elements truncated)...'
+            data[-1] = "...(remaining elements truncated)..."
 
         self.rewind()
         return repr(data)
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 128a4e447..0b73e99b1 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -10,21 +10,54 @@
 from mongoengine.common import _import_class
 from mongoengine.errors import InvalidQueryError
 
-__all__ = ('query', 'update')
-
-COMPARISON_OPERATORS = ('ne', 'gt', 'gte', 'lt', 'lte', 'in', 'nin', 'mod',
-                        'all', 'size', 'exists', 'not', 'elemMatch', 'type')
-GEO_OPERATORS = ('within_distance', 'within_spherical_distance',
-                 'within_box', 'within_polygon', 'near', 'near_sphere',
-                 'max_distance', 'min_distance', 'geo_within', 'geo_within_box',
-                 'geo_within_polygon', 'geo_within_center',
-                 'geo_within_sphere', 'geo_intersects')
-STRING_OPERATORS = ('contains', 'icontains', 'startswith',
-                    'istartswith', 'endswith', 'iendswith',
-                    'exact', 'iexact')
-CUSTOM_OPERATORS = ('match',)
-MATCH_OPERATORS = (COMPARISON_OPERATORS + GEO_OPERATORS +
-                   STRING_OPERATORS + CUSTOM_OPERATORS)
+__all__ = ("query", "update")
+
+COMPARISON_OPERATORS = (
+    "ne",
+    "gt",
+    "gte",
+    "lt",
+    "lte",
+    "in",
+    "nin",
+    "mod",
+    "all",
+    "size",
+    "exists",
+    "not",
+    "elemMatch",
+    "type",
+)
+GEO_OPERATORS = (
+    "within_distance",
+    "within_spherical_distance",
+    "within_box",
+    "within_polygon",
+    "near",
+    "near_sphere",
+    "max_distance",
+    "min_distance",
+    "geo_within",
+    "geo_within_box",
+    "geo_within_polygon",
+    "geo_within_center",
+    "geo_within_sphere",
+    "geo_intersects",
+)
+STRING_OPERATORS = (
+    "contains",
+    "icontains",
+    "startswith",
+    "istartswith",
+    "endswith",
+    "iendswith",
+    "exact",
+    "iexact",
+)
+CUSTOM_OPERATORS = ("match",)
+MATCH_OPERATORS = (
+    COMPARISON_OPERATORS + GEO_OPERATORS + STRING_OPERATORS + CUSTOM_OPERATORS
+)
 
 
 # TODO make this less complex
@@ -33,11 +66,11 @@ def query(_doc_cls=None, **kwargs):
     mongo_query = {}
     merge_query = defaultdict(list)
     for key, value in sorted(kwargs.items()):
-        if key == '__raw__':
+        if key == "__raw__":
             mongo_query.update(value)
             continue
 
-        parts = key.rsplit('__')
+        parts = key.rsplit("__")
         indices = [(i, p) for i, p in enumerate(parts) if p.isdigit()]
         parts = [part for part in parts if not part.isdigit()]
         # Check for an operator and transform to mongo-style if there is
@@ -46,11 +79,11 @@ def query(_doc_cls=None, **kwargs):
             op = parts.pop()
 
         # Allow to escape operator-like field name by __
-        if len(parts) > 1 and parts[-1] == '':
+        if len(parts) > 1 and parts[-1] == "":
             parts.pop()
 
         negate = False
-        if len(parts) > 1 and parts[-1] == 'not':
+        if len(parts) > 1 and parts[-1] == "not":
             parts.pop()
             negate = True
 
@@ -62,8 +95,8 @@ def query(_doc_cls=None, **kwargs):
                 raise InvalidQueryError(e)
             parts = []
 
-            CachedReferenceField = _import_class('CachedReferenceField')
-            GenericReferenceField = _import_class('GenericReferenceField')
+            CachedReferenceField = _import_class("CachedReferenceField")
+            GenericReferenceField = _import_class("GenericReferenceField")
 
             cleaned_fields = []
             for field in fields:
@@ -73,7 +106,7 @@ def query(_doc_cls=None, **kwargs):
                     append_field = False
                 # is last and CachedReferenceField
                 elif isinstance(field, CachedReferenceField) and fields[-1] == field:
-                    parts.append('%s._id' % field.db_field)
+                    parts.append("%s._id" % field.db_field)
                 else:
                     parts.append(field.db_field)
 
@@ -83,15 +116,15 @@ def query(_doc_cls=None, **kwargs):
             # Convert value to proper value
             field = cleaned_fields[-1]
 
-            singular_ops = [None, 'ne', 'gt', 'gte', 'lt', 'lte', 'not']
+            singular_ops = [None, "ne", "gt", "gte", "lt", "lte", "not"]
             singular_ops += STRING_OPERATORS
             if op in singular_ops:
                 value = field.prepare_query_value(op, value)
 
                 if isinstance(field, CachedReferenceField) and value:
-                    value = value['_id']
+                    value = value["_id"]
 
-            elif op in ('in', 'nin', 'all', 'near') and not isinstance(value, dict):
+            elif op in ("in", "nin", "all", "near") and not isinstance(value, dict):
                 # Raise an error if the in/nin/all/near param is not iterable.
                 value = _prepare_query_for_iterable(field, op, value)
 
@@ -101,39 +134,40 @@ def query(_doc_cls=None, **kwargs):
             # * If the value is an ObjectId, the key should be "field_name._ref.$id".
             if isinstance(field, GenericReferenceField):
                 if isinstance(value, DBRef):
-                    parts[-1] += '._ref'
+                    parts[-1] += "._ref"
                 elif isinstance(value, ObjectId):
-                    parts[-1] += '._ref.$id'
+                    parts[-1] += "._ref.$id"
 
         # if op and op not in COMPARISON_OPERATORS:
         if op:
             if op in GEO_OPERATORS:
                 value = _geo_operator(field, op, value)
-            elif op in ('match', 'elemMatch'):
-                ListField = _import_class('ListField')
-                EmbeddedDocumentField = _import_class('EmbeddedDocumentField')
+            elif op in ("match", "elemMatch"):
+                ListField = _import_class("ListField")
+                EmbeddedDocumentField = _import_class("EmbeddedDocumentField")
                 if (
-                    isinstance(value, dict) and
-                    isinstance(field, ListField) and
-                    isinstance(field.field, EmbeddedDocumentField)
+                    isinstance(value, dict)
+                    and isinstance(field, ListField)
+                    and isinstance(field.field, EmbeddedDocumentField)
                 ):
                     value = query(field.field.document_type, **value)
                 else:
                     value = field.prepare_query_value(op, value)
-                value = {'$elemMatch': value}
+                value = {"$elemMatch": value}
             elif op in CUSTOM_OPERATORS:
-                NotImplementedError('Custom method "%s" has not '
-                                    'been implemented' % op)
+                NotImplementedError(
+                    'Custom method "%s" has not ' "been implemented" % op
+                )
             elif op not in STRING_OPERATORS:
-                value = {'$' + op: value}
+                value = {"$" + op: value}
 
         if negate:
-            value = {'$not': value}
+            value = {"$not": value}
 
         for i, part in indices:
             parts.insert(i, part)
 
-        key = '.'.join(parts)
+        key = ".".join(parts)
 
         if op is None or key not in mongo_query:
             mongo_query[key] = value
@@ -142,30 +176,35 @@ def query(_doc_cls=None, **kwargs):
                 mongo_query[key].update(value)
                 # $max/minDistance needs to come last - convert to SON
                 value_dict = mongo_query[key]
-                if ('$maxDistance' in value_dict or '$minDistance' in value_dict) and \
-                        ('$near' in value_dict or '$nearSphere' in value_dict):
+                if ("$maxDistance" in value_dict or "$minDistance" in value_dict) and (
+                    "$near" in value_dict or "$nearSphere" in value_dict
+                ):
                     value_son = SON()
                     for k, v in iteritems(value_dict):
-                        if k == '$maxDistance' or k == '$minDistance':
+                        if k == "$maxDistance" or k == "$minDistance":
                             continue
                         value_son[k] = v
                     # Required for MongoDB >= 2.6, may fail when combining
                     # PyMongo 3+ and MongoDB < 2.6
                     near_embedded = False
-                    for near_op in ('$near', '$nearSphere'):
+                    for near_op in ("$near", "$nearSphere"):
                         if isinstance(value_dict.get(near_op), dict):
                             value_son[near_op] = SON(value_son[near_op])
-                            if '$maxDistance' in value_dict:
-                                value_son[near_op]['$maxDistance'] = value_dict['$maxDistance']
-                            if '$minDistance' in value_dict:
-                                value_son[near_op]['$minDistance'] = value_dict['$minDistance']
+                            if "$maxDistance" in value_dict:
+                                value_son[near_op]["$maxDistance"] = value_dict[
+                                    "$maxDistance"
+                                ]
+                            if "$minDistance" in value_dict:
+                                value_son[near_op]["$minDistance"] = value_dict[
+                                    "$minDistance"
+                                ]
                             near_embedded = True
 
                     if not near_embedded:
-                        if '$maxDistance' in value_dict:
-                            value_son['$maxDistance'] = value_dict['$maxDistance']
-                        if '$minDistance' in value_dict:
-                            value_son['$minDistance'] = value_dict['$minDistance']
+                        if "$maxDistance" in value_dict:
+                            value_son["$maxDistance"] = value_dict["$maxDistance"]
+                        if "$minDistance" in value_dict:
+                            value_son["$minDistance"] = value_dict["$minDistance"]
                     mongo_query[key] = value_son
             else:
                 # Store for manually merging later
@@ -177,10 +216,10 @@ def query(_doc_cls=None, **kwargs):
         del mongo_query[k]
         if isinstance(v, list):
             value = [{k: val} for val in v]
-            if '$and' in mongo_query.keys():
-                mongo_query['$and'].extend(value)
+            if "$and" in mongo_query.keys():
+                mongo_query["$and"].extend(value)
             else:
-                mongo_query['$and'] = value
+                mongo_query["$and"] = value
 
     return mongo_query
 
@@ -192,15 +231,15 @@ def update(_doc_cls=None, **update):
     mongo_update = {}
 
     for key, value in update.items():
-        if key == '__raw__':
+        if key == "__raw__":
             mongo_update.update(value)
             continue
 
-        parts = key.split('__')
+        parts = key.split("__")
 
         # if there is no operator, default to 'set'
         if len(parts) < 3 and parts[0] not in UPDATE_OPERATORS:
-            parts.insert(0, 'set')
+            parts.insert(0, "set")
 
         # Check for an operator and transform to mongo-style if there is
         op = None
@@ -208,13 +247,13 @@ def update(_doc_cls=None, **update):
             op = parts.pop(0)
             # Convert Pythonic names to Mongo equivalents
             operator_map = {
-                'push_all': 'pushAll',
-                'pull_all': 'pullAll',
-                'dec': 'inc',
-                'add_to_set': 'addToSet',
-                'set_on_insert': 'setOnInsert'
+                "push_all": "pushAll",
+                "pull_all": "pullAll",
+                "dec": "inc",
+                "add_to_set": "addToSet",
+                "set_on_insert": "setOnInsert",
             }
-            if op == 'dec':
+            if op == "dec":
                 # Support decrement by flipping a positive value's sign
                 # and using 'inc'
                 value = -value
@@ -227,7 +266,7 @@ def update(_doc_cls=None, **update):
             match = parts.pop()
 
         # Allow to escape operator-like field name by __
-        if len(parts) > 1 and parts[-1] == '':
+        if len(parts) > 1 and parts[-1] == "":
             parts.pop()
 
         if _doc_cls:
@@ -244,8 +283,8 @@ def update(_doc_cls=None, **update):
                 append_field = True
                 if isinstance(field, six.string_types):
                     # Convert the S operator to $
-                    if field == 'S':
-                        field = '$'
+                    if field == "S":
+                        field = "$"
                     parts.append(field)
                     append_field = False
                 else:
@@ -253,7 +292,7 @@ def update(_doc_cls=None, **update):
                 if append_field:
                     appended_sub_field = False
                     cleaned_fields.append(field)
-                    if hasattr(field, 'field'):
+                    if hasattr(field, "field"):
                         cleaned_fields.append(field.field)
                         appended_sub_field = True
 
@@ -263,52 +302,53 @@ def update(_doc_cls=None, **update):
             else:
                 field = cleaned_fields[-1]
 
-            GeoJsonBaseField = _import_class('GeoJsonBaseField')
+            GeoJsonBaseField = _import_class("GeoJsonBaseField")
             if isinstance(field, GeoJsonBaseField):
                 value = field.to_mongo(value)
 
-            if op == 'pull':
+            if op == "pull":
                 if field.required or value is not None:
-                    if match in ('in', 'nin') and not isinstance(value, dict):
+                    if match in ("in", "nin") and not isinstance(value, dict):
                         value = _prepare_query_for_iterable(field, op, value)
                     else:
                         value = field.prepare_query_value(op, value)
-            elif op == 'push' and isinstance(value, (list, tuple, set)):
+            elif op == "push" and isinstance(value, (list, tuple, set)):
                 value = [field.prepare_query_value(op, v) for v in value]
-            elif op in (None, 'set', 'push'):
+            elif op in (None, "set", "push"):
                 if field.required or value is not None:
                     value = field.prepare_query_value(op, value)
-            elif op in ('pushAll', 'pullAll'):
+            elif op in ("pushAll", "pullAll"):
                 value = [field.prepare_query_value(op, v) for v in value]
-            elif op in ('addToSet', 'setOnInsert'):
+            elif op in ("addToSet", "setOnInsert"):
                 if isinstance(value, (list, tuple, set)):
                     value = [field.prepare_query_value(op, v) for v in value]
                 elif field.required or value is not None:
                     value = field.prepare_query_value(op, value)
-            elif op == 'unset':
+            elif op == "unset":
                 value = 1
-            elif op == 'inc':
+            elif op == "inc":
                 value = field.prepare_query_value(op, value)
 
         if match:
-            match = '$' + match
+            match = "$" + match
             value = {match: value}
 
-        key = '.'.join(parts)
+        key = ".".join(parts)
 
-        if 'pull' in op and '.' in key:
+        if "pull" in op and "." in key:
             # Dot operators don't work on pull operations
             # unless they point to a list field
             # Otherwise it uses nested dict syntax
-            if op == 'pullAll':
-                raise InvalidQueryError('pullAll operations only support '
-                                        'a single field depth')
+            if op == "pullAll":
+                raise InvalidQueryError(
+                    "pullAll operations only support a single field depth"
+                )
 
             # Look for the last list field and use dot notation until there
             field_classes = [c.__class__ for c in cleaned_fields]
             field_classes.reverse()
-            ListField = _import_class('ListField')
-            EmbeddedDocumentListField = _import_class('EmbeddedDocumentListField')
+            ListField = _import_class("ListField")
+            EmbeddedDocumentListField = _import_class("EmbeddedDocumentListField")
             if ListField in field_classes or EmbeddedDocumentListField in field_classes:
                 # Join all fields via dot notation to the last ListField or EmbeddedDocumentListField
                 # Then process as normal
@@ -317,37 +357,36 @@ def update(_doc_cls=None, **update):
                 else:
                     _check_field = EmbeddedDocumentListField
 
-                last_listField = len(
-                    cleaned_fields) - field_classes.index(_check_field)
-                key = '.'.join(parts[:last_listField])
+                last_listField = len(cleaned_fields) - field_classes.index(_check_field)
+                key = ".".join(parts[:last_listField])
                 parts = parts[last_listField:]
                 parts.insert(0, key)
 
             parts.reverse()
             for key in parts:
                 value = {key: value}
-        elif op == 'addToSet' and isinstance(value, list):
-            value = {key: {'$each': value}}
-        elif op in ('push', 'pushAll'):
+        elif op == "addToSet" and isinstance(value, list):
+            value = {key: {"$each": value}}
+        elif op in ("push", "pushAll"):
             if parts[-1].isdigit():
-                key = '.'.join(parts[0:-1])
+                key = ".".join(parts[0:-1])
                 position = int(parts[-1])
                 # $position expects an iterable. If pushing a single value,
                 # wrap it in a list.
                 if not isinstance(value, (set, tuple, list)):
                     value = [value]
-                value = {key: {'$each': value, '$position': position}}
+                value = {key: {"$each": value, "$position": position}}
             else:
-                if op == 'pushAll':
-                    op = 'push'  # convert to non-deprecated keyword
+                if op == "pushAll":
+                    op = "push"  # convert to non-deprecated keyword
                     if not isinstance(value, (set, tuple, list)):
                         value = [value]
-                    value = {key: {'$each': value}}
+                    value = {key: {"$each": value}}
                 else:
                     value = {key: value}
         else:
             value = {key: value}
-        key = '$' + op
+        key = "$" + op
         if key not in mongo_update:
             mongo_update[key] = value
         elif key in mongo_update and isinstance(mongo_update[key], dict):
@@ -358,45 +397,45 @@ def update(_doc_cls=None, **update):
 
 def _geo_operator(field, op, value):
     """Helper to return the query for a given geo query."""
-    if op == 'max_distance':
-        value = {'$maxDistance': value}
-    elif op == 'min_distance':
-        value = {'$minDistance': value}
+    if op == "max_distance":
+        value = {"$maxDistance": value}
+    elif op == "min_distance":
+        value = {"$minDistance": value}
     elif field._geo_index == pymongo.GEO2D:
-        if op == 'within_distance':
-            value = {'$within': {'$center': value}}
-        elif op == 'within_spherical_distance':
-            value = {'$within': {'$centerSphere': value}}
-        elif op == 'within_polygon':
-            value = {'$within': {'$polygon': value}}
-        elif op == 'near':
-            value = {'$near': value}
-        elif op == 'near_sphere':
-            value = {'$nearSphere': value}
-        elif op == 'within_box':
-            value = {'$within': {'$box': value}}
+        if op == "within_distance":
+            value = {"$within": {"$center": value}}
+        elif op == "within_spherical_distance":
+            value = {"$within": {"$centerSphere": value}}
+        elif op == "within_polygon":
+            value = {"$within": {"$polygon": value}}
+        elif op == "near":
+            value = {"$near": value}
+        elif op == "near_sphere":
+            value = {"$nearSphere": value}
+        elif op == "within_box":
+            value = {"$within": {"$box": value}}
         else:
-            raise NotImplementedError('Geo method "%s" has not been '
-                                      'implemented for a GeoPointField' % op)
+            raise NotImplementedError(
+                'Geo method "%s" has not been ' "implemented for a GeoPointField" % op
+            )
     else:
-        if op == 'geo_within':
-            value = {'$geoWithin': _infer_geometry(value)}
-        elif op == 'geo_within_box':
-            value = {'$geoWithin': {'$box': value}}
-        elif op == 'geo_within_polygon':
-            value = {'$geoWithin': {'$polygon': value}}
-        elif op == 'geo_within_center':
-            value = {'$geoWithin': {'$center': value}}
-        elif op == 'geo_within_sphere':
-            value = {'$geoWithin': {'$centerSphere': value}}
-        elif op == 'geo_intersects':
-            value = {'$geoIntersects': _infer_geometry(value)}
-        elif op == 'near':
-            value = {'$near': _infer_geometry(value)}
+        if op == "geo_within":
+            value = {"$geoWithin": _infer_geometry(value)}
+        elif op == "geo_within_box":
+            value = {"$geoWithin": {"$box": value}}
+        elif op == "geo_within_polygon":
+            value = {"$geoWithin": {"$polygon": value}}
+        elif op == "geo_within_center":
+            value = {"$geoWithin": {"$center": value}}
+        elif op == "geo_within_sphere":
+            value = {"$geoWithin": {"$centerSphere": value}}
+        elif op == "geo_intersects":
+            value = {"$geoIntersects": _infer_geometry(value)}
+        elif op == "near":
+            value = {"$near": _infer_geometry(value)}
         else:
             raise NotImplementedError(
-                'Geo method "%s" has not been implemented for a %s '
-                % (op, field._name)
+                'Geo method "%s" has not been implemented for a %s ' % (op, field._name)
             )
     return value
 
@@ -406,51 +445,58 @@ def _infer_geometry(value):
     given value.
     """
     if isinstance(value, dict):
-        if '$geometry' in value:
+        if "$geometry" in value:
             return value
-        elif 'coordinates' in value and 'type' in value:
-            return {'$geometry': value}
-        raise InvalidQueryError('Invalid $geometry dictionary should have '
-                                'type and coordinates keys')
+        elif "coordinates" in value and "type" in value:
+            return {"$geometry": value}
+        raise InvalidQueryError(
+            "Invalid $geometry dictionary should have type and coordinates keys"
+        )
     elif isinstance(value, (list, set)):
         # TODO: shouldn't we test value[0][0][0][0] to see if it is MultiPolygon?
 
         try:
             value[0][0][0]
-            return {'$geometry': {'type': 'Polygon', 'coordinates': value}}
+            return {"$geometry": {"type": "Polygon", "coordinates": value}}
         except (TypeError, IndexError):
             pass
 
         try:
             value[0][0]
-            return {'$geometry': {'type': 'LineString', 'coordinates': value}}
+            return {"$geometry": {"type": "LineString", "coordinates": value}}
         except (TypeError, IndexError):
             pass
 
         try:
             value[0]
-            return {'$geometry': {'type': 'Point', 'coordinates': value}}
+            return {"$geometry": {"type": "Point", "coordinates": value}}
         except (TypeError, IndexError):
             pass
 
-    raise InvalidQueryError('Invalid $geometry data. Can be either a '
-                            'dictionary or (nested) lists of coordinate(s)')
+    raise InvalidQueryError(
+        "Invalid $geometry data. Can be either a "
+        "dictionary or (nested) lists of coordinate(s)"
+    )
 
 
 def _prepare_query_for_iterable(field, op, value):
     # We need a special check for BaseDocument, because - although it's iterable - using
     # it as such in the context of this method is most definitely a mistake.
-    BaseDocument = _import_class('BaseDocument')
+    BaseDocument = _import_class("BaseDocument")
 
     if isinstance(value, BaseDocument):
-        raise TypeError("When using the `in`, `nin`, `all`, or "
-                        "`near`-operators you can\'t use a "
-                        "`Document`, you must wrap your object "
-                        "in a list (object -> [object]).")
-
-    if not hasattr(value, '__iter__'):
-        raise TypeError("The `in`, `nin`, `all`, or "
-                        "`near`-operators must be applied to an "
-                        "iterable (e.g. a list).")
+        raise TypeError(
+            "When using the `in`, `nin`, `all`, or "
+            "`near`-operators you can't use a "
+            "`Document`, you must wrap your object "
+            "in a list (object -> [object])."
+        )
+
+    if not hasattr(value, "__iter__"):
+        raise TypeError(
+            "The `in`, `nin`, `all`, or "
+            "`near`-operators must be applied to an "
+            "iterable (e.g. a list)."
+        )
 
     return [field.prepare_query_value(op, v) for v in value]
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index 9d97094b3..0fe139fd2 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -3,7 +3,7 @@
 from mongoengine.errors import InvalidQueryError
 from mongoengine.queryset import transform
 
-__all__ = ('Q', 'QNode')
+__all__ = ("Q", "QNode")
 
 
 class QNodeVisitor(object):
@@ -69,9 +69,9 @@ def __init__(self, document):
         self.document = document
 
     def visit_combination(self, combination):
-        operator = '$and'
+        operator = "$and"
         if combination.operation == combination.OR:
-            operator = '$or'
+            operator = "$or"
         return {operator: combination.children}
 
     def visit_query(self, query):
@@ -96,7 +96,7 @@ def _combine(self, other, operation):
         """Combine this node with another node into a QCombination
         object.
         """
-        if getattr(other, 'empty', True):
+        if getattr(other, "empty", True):
             return self
 
         if self.empty:
@@ -132,8 +132,8 @@ def __init__(self, operation, children):
                 self.children.append(node)
 
     def __repr__(self):
-        op = ' & ' if self.operation is self.AND else ' | '
-        return '(%s)' % op.join([repr(node) for node in self.children])
+        op = " & " if self.operation is self.AND else " | "
+        return "(%s)" % op.join([repr(node) for node in self.children])
 
     def accept(self, visitor):
         for i in range(len(self.children)):
@@ -156,7 +156,7 @@ def __init__(self, **query):
         self.query = query
 
     def __repr__(self):
-        return 'Q(**%s)' % repr(self.query)
+        return "Q(**%s)" % repr(self.query)
 
     def accept(self, visitor):
         return visitor.visit_query(self)
diff --git a/mongoengine/signals.py b/mongoengine/signals.py
index a892dec0d..0db636045 100644
--- a/mongoengine/signals.py
+++ b/mongoengine/signals.py
@@ -1,5 +1,12 @@
-__all__ = ('pre_init', 'post_init', 'pre_save', 'pre_save_post_validation',
-           'post_save', 'pre_delete', 'post_delete')
+__all__ = (
+    "pre_init",
+    "post_init",
+    "pre_save",
+    "pre_save_post_validation",
+    "post_save",
+    "pre_delete",
+    "post_delete",
+)
 
 signals_available = False
 try:
@@ -7,6 +14,7 @@
 
     signals_available = True
 except ImportError:
+
     class Namespace(object):
         def signal(self, name, doc=None):
             return _FakeSignal(name, doc)
@@ -23,13 +31,16 @@ def __init__(self, name, doc=None):
             self.__doc__ = doc
 
         def _fail(self, *args, **kwargs):
-            raise RuntimeError('signalling support is unavailable '
-                               'because the blinker library is '
-                               'not installed.')
+            raise RuntimeError(
+                "signalling support is unavailable "
+                "because the blinker library is "
+                "not installed."
+            )
 
         send = lambda *a, **kw: None  # noqa
-        connect = disconnect = has_receivers_for = receivers_for = \
-            temporarily_connected_to = _fail
+        connect = (
+            disconnect
+        ) = has_receivers_for = receivers_for = temporarily_connected_to = _fail
         del _fail
 
 
@@ -37,12 +48,12 @@ def _fail(self, *args, **kwargs):
 # not put signals in here.  Create your own namespace instead.
 _signals = Namespace()
 
-pre_init = _signals.signal('pre_init')
-post_init = _signals.signal('post_init')
-pre_save = _signals.signal('pre_save')
-pre_save_post_validation = _signals.signal('pre_save_post_validation')
-post_save = _signals.signal('post_save')
-pre_delete = _signals.signal('pre_delete')
-post_delete = _signals.signal('post_delete')
-pre_bulk_insert = _signals.signal('pre_bulk_insert')
-post_bulk_insert = _signals.signal('post_bulk_insert')
+pre_init = _signals.signal("pre_init")
+post_init = _signals.signal("post_init")
+pre_save = _signals.signal("pre_save")
+pre_save_post_validation = _signals.signal("pre_save_post_validation")
+post_save = _signals.signal("post_save")
+pre_delete = _signals.signal("pre_delete")
+post_delete = _signals.signal("post_delete")
+pre_bulk_insert = _signals.signal("pre_bulk_insert")
+post_bulk_insert = _signals.signal("post_bulk_insert")
diff --git a/requirements.txt b/requirements.txt
index 9bb319a5b..62ad8766b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+black
 nose
 pymongo>=3.4
 six==1.10.0
diff --git a/setup.cfg b/setup.cfg
index 840866011..4bded428e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ detailed-errors=1
 cover-package=mongoengine
 
 [flake8]
-ignore=E501,F401,F403,F405,I201,I202,W504, W605
+ignore=E501,F401,F403,F405,I201,I202,W504, W605, W503
 exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
 max-complexity=47
 application-import-names=mongoengine,tests
diff --git a/setup.py b/setup.py
index f1f5dea71..c73a93ff2 100644
--- a/setup.py
+++ b/setup.py
@@ -8,13 +8,10 @@
 except ImportError:
     pass
 
-DESCRIPTION = (
-    'MongoEngine is a Python Object-Document '
-    'Mapper for working with MongoDB.'
-)
+DESCRIPTION = "MongoEngine is a Python Object-Document Mapper for working with MongoDB."
 
 try:
-    with open('README.rst') as fin:
+    with open("README.rst") as fin:
         LONG_DESCRIPTION = fin.read()
 except Exception:
     LONG_DESCRIPTION = None
@@ -24,23 +21,23 @@ def get_version(version_tuple):
     """Return the version tuple as a string, e.g. for (0, 10, 7),
     return '0.10.7'.
     """
-    return '.'.join(map(str, version_tuple))
+    return ".".join(map(str, version_tuple))
 
 
 # Dirty hack to get version number from monogengine/__init__.py - we can't
 # import it as it depends on PyMongo and PyMongo isn't installed until this
 # file is read
-init = os.path.join(os.path.dirname(__file__), 'mongoengine', '__init__.py')
-version_line = list(filter(lambda l: l.startswith('VERSION'), open(init)))[0]
+init = os.path.join(os.path.dirname(__file__), "mongoengine", "__init__.py")
+version_line = list(filter(lambda l: l.startswith("VERSION"), open(init)))[0]
 
-VERSION = get_version(eval(version_line.split('=')[-1]))
+VERSION = get_version(eval(version_line.split("=")[-1]))
 
 CLASSIFIERS = [
-    'Development Status :: 4 - Beta',
-    'Intended Audience :: Developers',
-    'License :: OSI Approved :: MIT License',
-    'Operating System :: OS Independent',
-    'Programming Language :: Python',
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
     "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
@@ -48,39 +45,40 @@ def get_version(version_tuple):
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
-    'Topic :: Database',
-    'Topic :: Software Development :: Libraries :: Python Modules',
+    "Topic :: Database",
+    "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
 extra_opts = {
-    'packages': find_packages(exclude=['tests', 'tests.*']),
-    'tests_require': ['nose', 'coverage==4.2', 'blinker', 'Pillow>=2.0.0']
+    "packages": find_packages(exclude=["tests", "tests.*"]),
+    "tests_require": ["nose", "coverage==4.2", "blinker", "Pillow>=2.0.0"],
 }
 if sys.version_info[0] == 3:
-    extra_opts['use_2to3'] = True
-    if 'test' in sys.argv or 'nosetests' in sys.argv:
-        extra_opts['packages'] = find_packages()
-        extra_opts['package_data'] = {
-            'tests': ['fields/mongoengine.png', 'fields/mongodb_leaf.png']}
+    extra_opts["use_2to3"] = True
+    if "test" in sys.argv or "nosetests" in sys.argv:
+        extra_opts["packages"] = find_packages()
+        extra_opts["package_data"] = {
+            "tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]
+        }
 else:
-    extra_opts['tests_require'] += ['python-dateutil']
+    extra_opts["tests_require"] += ["python-dateutil"]
 
 setup(
-    name='mongoengine',
+    name="mongoengine",
     version=VERSION,
-    author='Harry Marr',
-    author_email='harry.marr@gmail.com',
+    author="Harry Marr",
+    author_email="harry.marr@gmail.com",
     maintainer="Stefan Wojcik",
     maintainer_email="wojcikstefan@gmail.com",
-    url='http://mongoengine.org/',
-    download_url='https://github.com/MongoEngine/mongoengine/tarball/master',
-    license='MIT',
+    url="http://mongoengine.org/",
+    download_url="https://github.com/MongoEngine/mongoengine/tarball/master",
+    license="MIT",
     include_package_data=True,
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
-    platforms=['any'],
+    platforms=["any"],
     classifiers=CLASSIFIERS,
-    install_requires=['pymongo>=3.4', 'six'],
-    test_suite='nose.collector',
+    install_requires=["pymongo>=3.4", "six"],
+    test_suite="nose.collector",
     **extra_opts
 )
diff --git a/tests/all_warnings/__init__.py b/tests/all_warnings/__init__.py
index 3aebe4baf..a755e7a38 100644
--- a/tests/all_warnings/__init__.py
+++ b/tests/all_warnings/__init__.py
@@ -9,34 +9,32 @@
 from mongoengine import *
 
 
-__all__ = ('AllWarnings', )
+__all__ = ("AllWarnings",)
 
 
 class AllWarnings(unittest.TestCase):
-
     def setUp(self):
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
         self.warning_list = []
         self.showwarning_default = warnings.showwarning
         warnings.showwarning = self.append_to_warning_list
 
     def append_to_warning_list(self, message, category, *args):
-        self.warning_list.append({"message": message,
-                                  "category": category})
+        self.warning_list.append({"message": message, "category": category})
 
     def tearDown(self):
         # restore default handling of warnings
         warnings.showwarning = self.showwarning_default
 
     def test_document_collection_syntax_warning(self):
-
         class NonAbstractBase(Document):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class InheritedDocumentFailTest(NonAbstractBase):
-            meta = {'collection': 'fail'}
+            meta = {"collection": "fail"}
 
         warning = self.warning_list[0]
         self.assertEqual(SyntaxWarning, warning["category"])
-        self.assertEqual('non_abstract_base',
-                         InheritedDocumentFailTest._get_collection_name())
+        self.assertEqual(
+            "non_abstract_base", InheritedDocumentFailTest._get_collection_name()
+        )
diff --git a/tests/document/__init__.py b/tests/document/__init__.py
index dc35c969e..f2230c48e 100644
--- a/tests/document/__init__.py
+++ b/tests/document/__init__.py
@@ -9,5 +9,5 @@
 from .json_serialisation import *
 from .validation import *
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/document/class_methods.py b/tests/document/class_methods.py
index 4fc648b77..87f1215b8 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/class_methods.py
@@ -7,13 +7,12 @@
 from mongoengine.queryset import NULLIFY, PULL
 from mongoengine.connection import get_db
 
-__all__ = ("ClassMethodsTest", )
+__all__ = ("ClassMethodsTest",)
 
 
 class ClassMethodsTest(unittest.TestCase):
-
     def setUp(self):
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
         self.db = get_db()
 
         class Person(Document):
@@ -33,11 +32,13 @@ def tearDown(self):
     def test_definition(self):
         """Ensure that document may be defined using fields.
         """
-        self.assertEqual(['_cls', 'age', 'id', 'name'],
-                         sorted(self.Person._fields.keys()))
-        self.assertEqual(["IntField", "ObjectIdField", "StringField", "StringField"],
-                        sorted([x.__class__.__name__ for x in
-                                self.Person._fields.values()]))
+        self.assertEqual(
+            ["_cls", "age", "id", "name"], sorted(self.Person._fields.keys())
+        )
+        self.assertEqual(
+            ["IntField", "ObjectIdField", "StringField", "StringField"],
+            sorted([x.__class__.__name__ for x in self.Person._fields.values()]),
+        )
 
     def test_get_db(self):
         """Ensure that get_db returns the expected db.
@@ -49,21 +50,21 @@ def test_get_collection_name(self):
         """Ensure that get_collection_name returns the expected collection
         name.
         """
-        collection_name = 'person'
+        collection_name = "person"
         self.assertEqual(collection_name, self.Person._get_collection_name())
 
     def test_get_collection(self):
         """Ensure that get_collection returns the expected collection.
         """
-        collection_name = 'person'
+        collection_name = "person"
         collection = self.Person._get_collection()
         self.assertEqual(self.db[collection_name], collection)
 
     def test_drop_collection(self):
         """Ensure that the collection may be dropped from the database.
         """
-        collection_name = 'person'
-        self.Person(name='Test').save()
+        collection_name = "person"
+        self.Person(name="Test").save()
         self.assertIn(collection_name, list_collection_names(self.db))
 
         self.Person.drop_collection()
@@ -73,14 +74,16 @@ def test_register_delete_rule(self):
         """Ensure that register delete rule adds a delete rule to the document
         meta.
         """
+
         class Job(Document):
             employee = ReferenceField(self.Person)
 
-        self.assertEqual(self.Person._meta.get('delete_rules'), None)
+        self.assertEqual(self.Person._meta.get("delete_rules"), None)
 
-        self.Person.register_delete_rule(Job, 'employee', NULLIFY)
-        self.assertEqual(self.Person._meta['delete_rules'],
-                         {(Job, 'employee'): NULLIFY})
+        self.Person.register_delete_rule(Job, "employee", NULLIFY)
+        self.assertEqual(
+            self.Person._meta["delete_rules"], {(Job, "employee"): NULLIFY}
+        )
 
     def test_compare_indexes(self):
         """ Ensure that the indexes are properly created and that
@@ -93,23 +96,27 @@ class BlogPost(Document):
             description = StringField()
             tags = StringField()
 
-            meta = {
-                'indexes': [('author', 'title')]
-            }
+            meta = {"indexes": [("author", "title")]}
 
         BlogPost.drop_collection()
 
         BlogPost.ensure_indexes()
-        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
+        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
 
-        BlogPost.ensure_index(['author', 'description'])
-        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': [[('author', 1), ('description', 1)]]})
+        BlogPost.ensure_index(["author", "description"])
+        self.assertEqual(
+            BlogPost.compare_indexes(),
+            {"missing": [], "extra": [[("author", 1), ("description", 1)]]},
+        )
 
-        BlogPost._get_collection().drop_index('author_1_description_1')
-        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
+        BlogPost._get_collection().drop_index("author_1_description_1")
+        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
 
-        BlogPost._get_collection().drop_index('author_1_title_1')
-        self.assertEqual(BlogPost.compare_indexes(), {'missing': [[('author', 1), ('title', 1)]], 'extra': []})
+        BlogPost._get_collection().drop_index("author_1_title_1")
+        self.assertEqual(
+            BlogPost.compare_indexes(),
+            {"missing": [[("author", 1), ("title", 1)]], "extra": []},
+        )
 
     def test_compare_indexes_inheritance(self):
         """ Ensure that the indexes are properly created and that
@@ -122,32 +129,34 @@ class BlogPost(Document):
             title = StringField()
             description = StringField()
 
-            meta = {
-                'allow_inheritance': True
-            }
+            meta = {"allow_inheritance": True}
 
         class BlogPostWithTags(BlogPost):
             tags = StringField()
             tag_list = ListField(StringField())
 
-            meta = {
-                'indexes': [('author', 'tags')]
-            }
+            meta = {"indexes": [("author", "tags")]}
 
         BlogPost.drop_collection()
 
         BlogPost.ensure_indexes()
         BlogPostWithTags.ensure_indexes()
-        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
+        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
 
-        BlogPostWithTags.ensure_index(['author', 'tag_list'])
-        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': [[('_cls', 1), ('author', 1), ('tag_list', 1)]]})
+        BlogPostWithTags.ensure_index(["author", "tag_list"])
+        self.assertEqual(
+            BlogPost.compare_indexes(),
+            {"missing": [], "extra": [[("_cls", 1), ("author", 1), ("tag_list", 1)]]},
+        )
 
-        BlogPostWithTags._get_collection().drop_index('_cls_1_author_1_tag_list_1')
-        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
+        BlogPostWithTags._get_collection().drop_index("_cls_1_author_1_tag_list_1")
+        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
 
-        BlogPostWithTags._get_collection().drop_index('_cls_1_author_1_tags_1')
-        self.assertEqual(BlogPost.compare_indexes(), {'missing': [[('_cls', 1), ('author', 1), ('tags', 1)]], 'extra': []})
+        BlogPostWithTags._get_collection().drop_index("_cls_1_author_1_tags_1")
+        self.assertEqual(
+            BlogPost.compare_indexes(),
+            {"missing": [[("_cls", 1), ("author", 1), ("tags", 1)]], "extra": []},
+        )
 
     def test_compare_indexes_multiple_subclasses(self):
         """ Ensure that compare_indexes behaves correctly if called from a
@@ -159,32 +168,30 @@ class BlogPost(Document):
             title = StringField()
             description = StringField()
 
-            meta = {
-                'allow_inheritance': True
-            }
+            meta = {"allow_inheritance": True}
 
         class BlogPostWithTags(BlogPost):
             tags = StringField()
             tag_list = ListField(StringField())
 
-            meta = {
-                'indexes': [('author', 'tags')]
-            }
+            meta = {"indexes": [("author", "tags")]}
 
         class BlogPostWithCustomField(BlogPost):
             custom = DictField()
 
-            meta = {
-                'indexes': [('author', 'custom')]
-            }
+            meta = {"indexes": [("author", "custom")]}
 
         BlogPost.ensure_indexes()
         BlogPostWithTags.ensure_indexes()
         BlogPostWithCustomField.ensure_indexes()
 
-        self.assertEqual(BlogPost.compare_indexes(), {'missing': [], 'extra': []})
-        self.assertEqual(BlogPostWithTags.compare_indexes(), {'missing': [], 'extra': []})
-        self.assertEqual(BlogPostWithCustomField.compare_indexes(), {'missing': [], 'extra': []})
+        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
+        self.assertEqual(
+            BlogPostWithTags.compare_indexes(), {"missing": [], "extra": []}
+        )
+        self.assertEqual(
+            BlogPostWithCustomField.compare_indexes(), {"missing": [], "extra": []}
+        )
 
     def test_compare_indexes_for_text_indexes(self):
         """ Ensure that compare_indexes behaves correctly for text indexes """
@@ -192,17 +199,20 @@ def test_compare_indexes_for_text_indexes(self):
         class Doc(Document):
             a = StringField()
             b = StringField()
-            meta = {'indexes': [
-                {'fields': ['$a', "$b"],
-                 'default_language': 'english',
-                 'weights': {'a': 10, 'b': 2}
-                }
-            ]}
+            meta = {
+                "indexes": [
+                    {
+                        "fields": ["$a", "$b"],
+                        "default_language": "english",
+                        "weights": {"a": 10, "b": 2},
+                    }
+                ]
+            }
 
         Doc.drop_collection()
         Doc.ensure_indexes()
         actual = Doc.compare_indexes()
-        expected = {'missing': [], 'extra': []}
+        expected = {"missing": [], "extra": []}
         self.assertEqual(actual, expected)
 
     def test_list_indexes_inheritance(self):
@@ -215,23 +225,17 @@ class BlogPost(Document):
             title = StringField()
             description = StringField()
 
-            meta = {
-                'allow_inheritance': True
-            }
+            meta = {"allow_inheritance": True}
 
         class BlogPostWithTags(BlogPost):
             tags = StringField()
 
-            meta = {
-                'indexes': [('author', 'tags')]
-            }
+            meta = {"indexes": [("author", "tags")]}
 
         class BlogPostWithTagsAndExtraText(BlogPostWithTags):
             extra_text = StringField()
 
-            meta = {
-                'indexes': [('author', 'tags', 'extra_text')]
-            }
+            meta = {"indexes": [("author", "tags", "extra_text")]}
 
         BlogPost.drop_collection()
 
@@ -239,17 +243,21 @@ class BlogPostWithTagsAndExtraText(BlogPostWithTags):
         BlogPostWithTags.ensure_indexes()
         BlogPostWithTagsAndExtraText.ensure_indexes()
 
-        self.assertEqual(BlogPost.list_indexes(),
-                         BlogPostWithTags.list_indexes())
-        self.assertEqual(BlogPost.list_indexes(),
-                         BlogPostWithTagsAndExtraText.list_indexes())
-        self.assertEqual(BlogPost.list_indexes(),
-                         [[('_cls', 1), ('author', 1), ('tags', 1)],
-                         [('_cls', 1), ('author', 1), ('tags', 1), ('extra_text', 1)],
-                         [(u'_id', 1)], [('_cls', 1)]])
+        self.assertEqual(BlogPost.list_indexes(), BlogPostWithTags.list_indexes())
+        self.assertEqual(
+            BlogPost.list_indexes(), BlogPostWithTagsAndExtraText.list_indexes()
+        )
+        self.assertEqual(
+            BlogPost.list_indexes(),
+            [
+                [("_cls", 1), ("author", 1), ("tags", 1)],
+                [("_cls", 1), ("author", 1), ("tags", 1), ("extra_text", 1)],
+                [(u"_id", 1)],
+                [("_cls", 1)],
+            ],
+        )
 
     def test_register_delete_rule_inherited(self):
-
         class Vaccine(Document):
             name = StringField(required=True)
 
@@ -257,15 +265,17 @@ class Vaccine(Document):
 
         class Animal(Document):
             family = StringField(required=True)
-            vaccine_made = ListField(ReferenceField("Vaccine", reverse_delete_rule=PULL))
+            vaccine_made = ListField(
+                ReferenceField("Vaccine", reverse_delete_rule=PULL)
+            )
 
             meta = {"allow_inheritance": True, "indexes": ["family"]}
 
         class Cat(Animal):
             name = StringField(required=True)
 
-        self.assertEqual(Vaccine._meta['delete_rules'][(Animal, 'vaccine_made')], PULL)
-        self.assertEqual(Vaccine._meta['delete_rules'][(Cat, 'vaccine_made')], PULL)
+        self.assertEqual(Vaccine._meta["delete_rules"][(Animal, "vaccine_made")], PULL)
+        self.assertEqual(Vaccine._meta["delete_rules"][(Cat, "vaccine_made")], PULL)
 
     def test_collection_naming(self):
         """Ensure that a collection with a specified name may be used.
@@ -273,74 +283,73 @@ def test_collection_naming(self):
 
         class DefaultNamingTest(Document):
             pass
-        self.assertEqual('default_naming_test',
-                         DefaultNamingTest._get_collection_name())
+
+        self.assertEqual(
+            "default_naming_test", DefaultNamingTest._get_collection_name()
+        )
 
         class CustomNamingTest(Document):
-            meta = {'collection': 'pimp_my_collection'}
+            meta = {"collection": "pimp_my_collection"}
 
-        self.assertEqual('pimp_my_collection',
-                         CustomNamingTest._get_collection_name())
+        self.assertEqual("pimp_my_collection", CustomNamingTest._get_collection_name())
 
         class DynamicNamingTest(Document):
-            meta = {'collection': lambda c: "DYNAMO"}
-        self.assertEqual('DYNAMO', DynamicNamingTest._get_collection_name())
+            meta = {"collection": lambda c: "DYNAMO"}
+
+        self.assertEqual("DYNAMO", DynamicNamingTest._get_collection_name())
 
         # Use Abstract class to handle backwards compatibility
         class BaseDocument(Document):
-            meta = {
-                'abstract': True,
-                'collection': lambda c: c.__name__.lower()
-            }
+            meta = {"abstract": True, "collection": lambda c: c.__name__.lower()}
 
         class OldNamingConvention(BaseDocument):
             pass
-        self.assertEqual('oldnamingconvention',
-                         OldNamingConvention._get_collection_name())
+
+        self.assertEqual(
+            "oldnamingconvention", OldNamingConvention._get_collection_name()
+        )
 
         class InheritedAbstractNamingTest(BaseDocument):
-            meta = {'collection': 'wibble'}
-        self.assertEqual('wibble',
-                         InheritedAbstractNamingTest._get_collection_name())
+            meta = {"collection": "wibble"}
+
+        self.assertEqual("wibble", InheritedAbstractNamingTest._get_collection_name())
 
         # Mixin tests
         class BaseMixin(object):
-            meta = {
-                'collection': lambda c: c.__name__.lower()
-            }
+            meta = {"collection": lambda c: c.__name__.lower()}
 
         class OldMixinNamingConvention(Document, BaseMixin):
             pass
-        self.assertEqual('oldmixinnamingconvention',
-                          OldMixinNamingConvention._get_collection_name())
+
+        self.assertEqual(
+            "oldmixinnamingconvention", OldMixinNamingConvention._get_collection_name()
+        )
 
         class BaseMixin(object):
-            meta = {
-                'collection': lambda c: c.__name__.lower()
-            }
+            meta = {"collection": lambda c: c.__name__.lower()}
 
         class BaseDocument(Document, BaseMixin):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class MyDocument(BaseDocument):
             pass
 
-        self.assertEqual('basedocument', MyDocument._get_collection_name())
+        self.assertEqual("basedocument", MyDocument._get_collection_name())
 
     def test_custom_collection_name_operations(self):
         """Ensure that a collection with a specified name is used as expected.
         """
-        collection_name = 'personCollTest'
+        collection_name = "personCollTest"
 
         class Person(Document):
             name = StringField()
-            meta = {'collection': collection_name}
+            meta = {"collection": collection_name}
 
         Person(name="Test User").save()
         self.assertIn(collection_name, list_collection_names(self.db))
 
         user_obj = self.db[collection_name].find_one()
-        self.assertEqual(user_obj['name'], "Test User")
+        self.assertEqual(user_obj["name"], "Test User")
 
         user_obj = Person.objects[0]
         self.assertEqual(user_obj.name, "Test User")
@@ -354,7 +363,7 @@ def test_collection_name_and_primary(self):
 
         class Person(Document):
             name = StringField(primary_key=True)
-            meta = {'collection': 'app'}
+            meta = {"collection": "app"}
 
         Person(name="Test User").save()
 
@@ -364,5 +373,5 @@ class Person(Document):
         Person.drop_collection()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/document/delta.py b/tests/document/delta.py
index 504c1707c..8f1575e62 100644
--- a/tests/document/delta.py
+++ b/tests/document/delta.py
@@ -8,7 +8,6 @@
 
 
 class DeltaTest(MongoDBTestCase):
-
     def setUp(self):
         super(DeltaTest, self).setUp()
 
@@ -31,7 +30,6 @@ def test_delta(self):
         self.delta(DynamicDocument)
 
     def delta(self, DocClass):
-
         class Doc(DocClass):
             string_field = StringField()
             int_field = IntField()
@@ -46,37 +44,37 @@ class Doc(DocClass):
         self.assertEqual(doc._get_changed_fields(), [])
         self.assertEqual(doc._delta(), ({}, {}))
 
-        doc.string_field = 'hello'
-        self.assertEqual(doc._get_changed_fields(), ['string_field'])
-        self.assertEqual(doc._delta(), ({'string_field': 'hello'}, {}))
+        doc.string_field = "hello"
+        self.assertEqual(doc._get_changed_fields(), ["string_field"])
+        self.assertEqual(doc._delta(), ({"string_field": "hello"}, {}))
 
         doc._changed_fields = []
         doc.int_field = 1
-        self.assertEqual(doc._get_changed_fields(), ['int_field'])
-        self.assertEqual(doc._delta(), ({'int_field': 1}, {}))
+        self.assertEqual(doc._get_changed_fields(), ["int_field"])
+        self.assertEqual(doc._delta(), ({"int_field": 1}, {}))
 
         doc._changed_fields = []
-        dict_value = {'hello': 'world', 'ping': 'pong'}
+        dict_value = {"hello": "world", "ping": "pong"}
         doc.dict_field = dict_value
-        self.assertEqual(doc._get_changed_fields(), ['dict_field'])
-        self.assertEqual(doc._delta(), ({'dict_field': dict_value}, {}))
+        self.assertEqual(doc._get_changed_fields(), ["dict_field"])
+        self.assertEqual(doc._delta(), ({"dict_field": dict_value}, {}))
 
         doc._changed_fields = []
-        list_value = ['1', 2, {'hello': 'world'}]
+        list_value = ["1", 2, {"hello": "world"}]
         doc.list_field = list_value
-        self.assertEqual(doc._get_changed_fields(), ['list_field'])
-        self.assertEqual(doc._delta(), ({'list_field': list_value}, {}))
+        self.assertEqual(doc._get_changed_fields(), ["list_field"])
+        self.assertEqual(doc._delta(), ({"list_field": list_value}, {}))
 
         # Test unsetting
         doc._changed_fields = []
         doc.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(), ['dict_field'])
-        self.assertEqual(doc._delta(), ({}, {'dict_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["dict_field"])
+        self.assertEqual(doc._delta(), ({}, {"dict_field": 1}))
 
         doc._changed_fields = []
         doc.list_field = []
-        self.assertEqual(doc._get_changed_fields(), ['list_field'])
-        self.assertEqual(doc._delta(), ({}, {'list_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["list_field"])
+        self.assertEqual(doc._delta(), ({}, {"list_field": 1}))
 
     def test_delta_recursive(self):
         self.delta_recursive(Document, EmbeddedDocument)
@@ -85,7 +83,6 @@ def test_delta_recursive(self):
         self.delta_recursive(DynamicDocument, DynamicEmbeddedDocument)
 
     def delta_recursive(self, DocClass, EmbeddedClass):
-
         class Embedded(EmbeddedClass):
             id = StringField()
             string_field = StringField()
@@ -110,165 +107,207 @@ class Doc(DocClass):
 
         embedded_1 = Embedded()
         embedded_1.id = "010101"
-        embedded_1.string_field = 'hello'
+        embedded_1.string_field = "hello"
         embedded_1.int_field = 1
-        embedded_1.dict_field = {'hello': 'world'}
-        embedded_1.list_field = ['1', 2, {'hello': 'world'}]
+        embedded_1.dict_field = {"hello": "world"}
+        embedded_1.list_field = ["1", 2, {"hello": "world"}]
         doc.embedded_field = embedded_1
 
-        self.assertEqual(doc._get_changed_fields(), ['embedded_field'])
+        self.assertEqual(doc._get_changed_fields(), ["embedded_field"])
 
         embedded_delta = {
-            'id': "010101",
-            'string_field': 'hello',
-            'int_field': 1,
-            'dict_field': {'hello': 'world'},
-            'list_field': ['1', 2, {'hello': 'world'}]
+            "id": "010101",
+            "string_field": "hello",
+            "int_field": 1,
+            "dict_field": {"hello": "world"},
+            "list_field": ["1", 2, {"hello": "world"}],
         }
         self.assertEqual(doc.embedded_field._delta(), (embedded_delta, {}))
-        self.assertEqual(doc._delta(),
-                         ({'embedded_field': embedded_delta}, {}))
+        self.assertEqual(doc._delta(), ({"embedded_field": embedded_delta}, {}))
 
         doc.save()
         doc = doc.reload(10)
 
         doc.embedded_field.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(),
-                         ['embedded_field.dict_field'])
-        self.assertEqual(doc.embedded_field._delta(), ({}, {'dict_field': 1}))
-        self.assertEqual(doc._delta(), ({}, {'embedded_field.dict_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["embedded_field.dict_field"])
+        self.assertEqual(doc.embedded_field._delta(), ({}, {"dict_field": 1}))
+        self.assertEqual(doc._delta(), ({}, {"embedded_field.dict_field": 1}))
         doc.save()
         doc = doc.reload(10)
         self.assertEqual(doc.embedded_field.dict_field, {})
 
         doc.embedded_field.list_field = []
-        self.assertEqual(doc._get_changed_fields(),
-                         ['embedded_field.list_field'])
-        self.assertEqual(doc.embedded_field._delta(), ({}, {'list_field': 1}))
-        self.assertEqual(doc._delta(), ({}, {'embedded_field.list_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["embedded_field.list_field"])
+        self.assertEqual(doc.embedded_field._delta(), ({}, {"list_field": 1}))
+        self.assertEqual(doc._delta(), ({}, {"embedded_field.list_field": 1}))
         doc.save()
         doc = doc.reload(10)
         self.assertEqual(doc.embedded_field.list_field, [])
 
         embedded_2 = Embedded()
-        embedded_2.string_field = 'hello'
+        embedded_2.string_field = "hello"
         embedded_2.int_field = 1
-        embedded_2.dict_field = {'hello': 'world'}
-        embedded_2.list_field = ['1', 2, {'hello': 'world'}]
-
-        doc.embedded_field.list_field = ['1', 2, embedded_2]
-        self.assertEqual(doc._get_changed_fields(),
-                         ['embedded_field.list_field'])
-
-        self.assertEqual(doc.embedded_field._delta(), ({
-            'list_field': ['1', 2, {
-                '_cls': 'Embedded',
-                'string_field': 'hello',
-                'dict_field': {'hello': 'world'},
-                'int_field': 1,
-                'list_field': ['1', 2, {'hello': 'world'}],
-            }]
-        }, {}))
-
-        self.assertEqual(doc._delta(), ({
-            'embedded_field.list_field': ['1', 2, {
-                '_cls': 'Embedded',
-                'string_field': 'hello',
-                'dict_field': {'hello': 'world'},
-                'int_field': 1,
-                'list_field': ['1', 2, {'hello': 'world'}],
-            }]
-        }, {}))
+        embedded_2.dict_field = {"hello": "world"}
+        embedded_2.list_field = ["1", 2, {"hello": "world"}]
+
+        doc.embedded_field.list_field = ["1", 2, embedded_2]
+        self.assertEqual(doc._get_changed_fields(), ["embedded_field.list_field"])
+
+        self.assertEqual(
+            doc.embedded_field._delta(),
+            (
+                {
+                    "list_field": [
+                        "1",
+                        2,
+                        {
+                            "_cls": "Embedded",
+                            "string_field": "hello",
+                            "dict_field": {"hello": "world"},
+                            "int_field": 1,
+                            "list_field": ["1", 2, {"hello": "world"}],
+                        },
+                    ]
+                },
+                {},
+            ),
+        )
+
+        self.assertEqual(
+            doc._delta(),
+            (
+                {
+                    "embedded_field.list_field": [
+                        "1",
+                        2,
+                        {
+                            "_cls": "Embedded",
+                            "string_field": "hello",
+                            "dict_field": {"hello": "world"},
+                            "int_field": 1,
+                            "list_field": ["1", 2, {"hello": "world"}],
+                        },
+                    ]
+                },
+                {},
+            ),
+        )
         doc.save()
         doc = doc.reload(10)
 
-        self.assertEqual(doc.embedded_field.list_field[0], '1')
+        self.assertEqual(doc.embedded_field.list_field[0], "1")
         self.assertEqual(doc.embedded_field.list_field[1], 2)
         for k in doc.embedded_field.list_field[2]._fields:
-            self.assertEqual(doc.embedded_field.list_field[2][k],
-                             embedded_2[k])
-
-        doc.embedded_field.list_field[2].string_field = 'world'
-        self.assertEqual(doc._get_changed_fields(),
-                         ['embedded_field.list_field.2.string_field'])
-        self.assertEqual(doc.embedded_field._delta(),
-                         ({'list_field.2.string_field': 'world'}, {}))
-        self.assertEqual(doc._delta(),
-                         ({'embedded_field.list_field.2.string_field': 'world'}, {}))
+            self.assertEqual(doc.embedded_field.list_field[2][k], embedded_2[k])
+
+        doc.embedded_field.list_field[2].string_field = "world"
+        self.assertEqual(
+            doc._get_changed_fields(), ["embedded_field.list_field.2.string_field"]
+        )
+        self.assertEqual(
+            doc.embedded_field._delta(), ({"list_field.2.string_field": "world"}, {})
+        )
+        self.assertEqual(
+            doc._delta(), ({"embedded_field.list_field.2.string_field": "world"}, {})
+        )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].string_field,
-                         'world')
+        self.assertEqual(doc.embedded_field.list_field[2].string_field, "world")
 
         # Test multiple assignments
-        doc.embedded_field.list_field[2].string_field = 'hello world'
+        doc.embedded_field.list_field[2].string_field = "hello world"
         doc.embedded_field.list_field[2] = doc.embedded_field.list_field[2]
-        self.assertEqual(doc._get_changed_fields(),
-                         ['embedded_field.list_field.2'])
-        self.assertEqual(doc.embedded_field._delta(), ({'list_field.2': {
-                '_cls': 'Embedded',
-                'string_field': 'hello world',
-                'int_field': 1,
-                'list_field': ['1', 2, {'hello': 'world'}],
-                'dict_field': {'hello': 'world'}}
-            }, {}))
-        self.assertEqual(doc._delta(), ({'embedded_field.list_field.2': {
-                '_cls': 'Embedded',
-                'string_field': 'hello world',
-                'int_field': 1,
-                'list_field': ['1', 2, {'hello': 'world'}],
-                'dict_field': {'hello': 'world'}}
-            }, {}))
+        self.assertEqual(doc._get_changed_fields(), ["embedded_field.list_field.2"])
+        self.assertEqual(
+            doc.embedded_field._delta(),
+            (
+                {
+                    "list_field.2": {
+                        "_cls": "Embedded",
+                        "string_field": "hello world",
+                        "int_field": 1,
+                        "list_field": ["1", 2, {"hello": "world"}],
+                        "dict_field": {"hello": "world"},
+                    }
+                },
+                {},
+            ),
+        )
+        self.assertEqual(
+            doc._delta(),
+            (
+                {
+                    "embedded_field.list_field.2": {
+                        "_cls": "Embedded",
+                        "string_field": "hello world",
+                        "int_field": 1,
+                        "list_field": ["1", 2, {"hello": "world"}],
+                        "dict_field": {"hello": "world"},
+                    }
+                },
+                {},
+            ),
+        )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].string_field,
-                         'hello world')
+        self.assertEqual(doc.embedded_field.list_field[2].string_field, "hello world")
 
         # Test list native methods
         doc.embedded_field.list_field[2].list_field.pop(0)
-        self.assertEqual(doc._delta(),
-                         ({'embedded_field.list_field.2.list_field':
-                          [2, {'hello': 'world'}]}, {}))
+        self.assertEqual(
+            doc._delta(),
+            ({"embedded_field.list_field.2.list_field": [2, {"hello": "world"}]}, {}),
+        )
         doc.save()
         doc = doc.reload(10)
 
         doc.embedded_field.list_field[2].list_field.append(1)
-        self.assertEqual(doc._delta(),
-                         ({'embedded_field.list_field.2.list_field':
-                          [2, {'hello': 'world'}, 1]}, {}))
+        self.assertEqual(
+            doc._delta(),
+            (
+                {"embedded_field.list_field.2.list_field": [2, {"hello": "world"}, 1]},
+                {},
+            ),
+        )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].list_field,
-                         [2, {'hello': 'world'}, 1])
+        self.assertEqual(
+            doc.embedded_field.list_field[2].list_field, [2, {"hello": "world"}, 1]
+        )
 
         doc.embedded_field.list_field[2].list_field.sort(key=str)
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].list_field,
-                         [1, 2, {'hello': 'world'}])
-
-        del doc.embedded_field.list_field[2].list_field[2]['hello']
-        self.assertEqual(doc._delta(),
-                         ({}, {'embedded_field.list_field.2.list_field.2.hello': 1}))
+        self.assertEqual(
+            doc.embedded_field.list_field[2].list_field, [1, 2, {"hello": "world"}]
+        )
+
+        del doc.embedded_field.list_field[2].list_field[2]["hello"]
+        self.assertEqual(
+            doc._delta(), ({}, {"embedded_field.list_field.2.list_field.2.hello": 1})
+        )
         doc.save()
         doc = doc.reload(10)
 
         del doc.embedded_field.list_field[2].list_field
-        self.assertEqual(doc._delta(),
-                         ({}, {'embedded_field.list_field.2.list_field': 1}))
+        self.assertEqual(
+            doc._delta(), ({}, {"embedded_field.list_field.2.list_field": 1})
+        )
 
         doc.save()
         doc = doc.reload(10)
 
-        doc.dict_field['Embedded'] = embedded_1
+        doc.dict_field["Embedded"] = embedded_1
         doc.save()
         doc = doc.reload(10)
 
-        doc.dict_field['Embedded'].string_field = 'Hello World'
-        self.assertEqual(doc._get_changed_fields(),
-                         ['dict_field.Embedded.string_field'])
-        self.assertEqual(doc._delta(),
-                         ({'dict_field.Embedded.string_field': 'Hello World'}, {}))
+        doc.dict_field["Embedded"].string_field = "Hello World"
+        self.assertEqual(
+            doc._get_changed_fields(), ["dict_field.Embedded.string_field"]
+        )
+        self.assertEqual(
+            doc._delta(), ({"dict_field.Embedded.string_field": "Hello World"}, {})
+        )
 
     def test_circular_reference_deltas(self):
         self.circular_reference_deltas(Document, Document)
@@ -277,14 +316,13 @@ def test_circular_reference_deltas(self):
         self.circular_reference_deltas(DynamicDocument, DynamicDocument)
 
     def circular_reference_deltas(self, DocClass1, DocClass2):
-
         class Person(DocClass1):
             name = StringField()
-            owns = ListField(ReferenceField('Organization'))
+            owns = ListField(ReferenceField("Organization"))
 
         class Organization(DocClass2):
             name = StringField()
-            owner = ReferenceField('Person')
+            owner = ReferenceField("Person")
 
         Person.drop_collection()
         Organization.drop_collection()
@@ -310,16 +348,15 @@ def test_circular_reference_deltas_2(self):
         self.circular_reference_deltas_2(DynamicDocument, DynamicDocument)
 
     def circular_reference_deltas_2(self, DocClass1, DocClass2, dbref=True):
-
         class Person(DocClass1):
             name = StringField()
-            owns = ListField(ReferenceField('Organization', dbref=dbref))
-            employer = ReferenceField('Organization', dbref=dbref)
+            owns = ListField(ReferenceField("Organization", dbref=dbref))
+            employer = ReferenceField("Organization", dbref=dbref)
 
         class Organization(DocClass2):
             name = StringField()
-            owner = ReferenceField('Person', dbref=dbref)
-            employees = ListField(ReferenceField('Person', dbref=dbref))
+            owner = ReferenceField("Person", dbref=dbref)
+            employees = ListField(ReferenceField("Person", dbref=dbref))
 
         Person.drop_collection()
         Organization.drop_collection()
@@ -353,12 +390,11 @@ def test_delta_db_field(self):
         self.delta_db_field(DynamicDocument)
 
     def delta_db_field(self, DocClass):
-
         class Doc(DocClass):
-            string_field = StringField(db_field='db_string_field')
-            int_field = IntField(db_field='db_int_field')
-            dict_field = DictField(db_field='db_dict_field')
-            list_field = ListField(db_field='db_list_field')
+            string_field = StringField(db_field="db_string_field")
+            int_field = IntField(db_field="db_int_field")
+            dict_field = DictField(db_field="db_dict_field")
+            list_field = ListField(db_field="db_list_field")
 
         Doc.drop_collection()
         doc = Doc()
@@ -368,53 +404,53 @@ class Doc(DocClass):
         self.assertEqual(doc._get_changed_fields(), [])
         self.assertEqual(doc._delta(), ({}, {}))
 
-        doc.string_field = 'hello'
-        self.assertEqual(doc._get_changed_fields(), ['db_string_field'])
-        self.assertEqual(doc._delta(), ({'db_string_field': 'hello'}, {}))
+        doc.string_field = "hello"
+        self.assertEqual(doc._get_changed_fields(), ["db_string_field"])
+        self.assertEqual(doc._delta(), ({"db_string_field": "hello"}, {}))
 
         doc._changed_fields = []
         doc.int_field = 1
-        self.assertEqual(doc._get_changed_fields(), ['db_int_field'])
-        self.assertEqual(doc._delta(), ({'db_int_field': 1}, {}))
+        self.assertEqual(doc._get_changed_fields(), ["db_int_field"])
+        self.assertEqual(doc._delta(), ({"db_int_field": 1}, {}))
 
         doc._changed_fields = []
-        dict_value = {'hello': 'world', 'ping': 'pong'}
+        dict_value = {"hello": "world", "ping": "pong"}
         doc.dict_field = dict_value
-        self.assertEqual(doc._get_changed_fields(), ['db_dict_field'])
-        self.assertEqual(doc._delta(), ({'db_dict_field': dict_value}, {}))
+        self.assertEqual(doc._get_changed_fields(), ["db_dict_field"])
+        self.assertEqual(doc._delta(), ({"db_dict_field": dict_value}, {}))
 
         doc._changed_fields = []
-        list_value = ['1', 2, {'hello': 'world'}]
+        list_value = ["1", 2, {"hello": "world"}]
         doc.list_field = list_value
-        self.assertEqual(doc._get_changed_fields(), ['db_list_field'])
-        self.assertEqual(doc._delta(), ({'db_list_field': list_value}, {}))
+        self.assertEqual(doc._get_changed_fields(), ["db_list_field"])
+        self.assertEqual(doc._delta(), ({"db_list_field": list_value}, {}))
 
         # Test unsetting
         doc._changed_fields = []
         doc.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(), ['db_dict_field'])
-        self.assertEqual(doc._delta(), ({}, {'db_dict_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["db_dict_field"])
+        self.assertEqual(doc._delta(), ({}, {"db_dict_field": 1}))
 
         doc._changed_fields = []
         doc.list_field = []
-        self.assertEqual(doc._get_changed_fields(), ['db_list_field'])
-        self.assertEqual(doc._delta(), ({}, {'db_list_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["db_list_field"])
+        self.assertEqual(doc._delta(), ({}, {"db_list_field": 1}))
 
         # Test it saves that data
         doc = Doc()
         doc.save()
 
-        doc.string_field = 'hello'
+        doc.string_field = "hello"
         doc.int_field = 1
-        doc.dict_field = {'hello': 'world'}
-        doc.list_field = ['1', 2, {'hello': 'world'}]
+        doc.dict_field = {"hello": "world"}
+        doc.list_field = ["1", 2, {"hello": "world"}]
         doc.save()
         doc = doc.reload(10)
 
-        self.assertEqual(doc.string_field, 'hello')
+        self.assertEqual(doc.string_field, "hello")
         self.assertEqual(doc.int_field, 1)
-        self.assertEqual(doc.dict_field, {'hello': 'world'})
-        self.assertEqual(doc.list_field, ['1', 2, {'hello': 'world'}])
+        self.assertEqual(doc.dict_field, {"hello": "world"})
+        self.assertEqual(doc.list_field, ["1", 2, {"hello": "world"}])
 
     def test_delta_recursive_db_field(self):
         self.delta_recursive_db_field(Document, EmbeddedDocument)
@@ -423,20 +459,20 @@ def test_delta_recursive_db_field(self):
         self.delta_recursive_db_field(DynamicDocument, DynamicEmbeddedDocument)
 
     def delta_recursive_db_field(self, DocClass, EmbeddedClass):
-
         class Embedded(EmbeddedClass):
-            string_field = StringField(db_field='db_string_field')
-            int_field = IntField(db_field='db_int_field')
-            dict_field = DictField(db_field='db_dict_field')
-            list_field = ListField(db_field='db_list_field')
+            string_field = StringField(db_field="db_string_field")
+            int_field = IntField(db_field="db_int_field")
+            dict_field = DictField(db_field="db_dict_field")
+            list_field = ListField(db_field="db_list_field")
 
         class Doc(DocClass):
-            string_field = StringField(db_field='db_string_field')
-            int_field = IntField(db_field='db_int_field')
-            dict_field = DictField(db_field='db_dict_field')
-            list_field = ListField(db_field='db_list_field')
-            embedded_field = EmbeddedDocumentField(Embedded,
-                                    db_field='db_embedded_field')
+            string_field = StringField(db_field="db_string_field")
+            int_field = IntField(db_field="db_int_field")
+            dict_field = DictField(db_field="db_dict_field")
+            list_field = ListField(db_field="db_list_field")
+            embedded_field = EmbeddedDocumentField(
+                Embedded, db_field="db_embedded_field"
+            )
 
         Doc.drop_collection()
         doc = Doc()
@@ -447,171 +483,228 @@ class Doc(DocClass):
         self.assertEqual(doc._delta(), ({}, {}))
 
         embedded_1 = Embedded()
-        embedded_1.string_field = 'hello'
+        embedded_1.string_field = "hello"
         embedded_1.int_field = 1
-        embedded_1.dict_field = {'hello': 'world'}
-        embedded_1.list_field = ['1', 2, {'hello': 'world'}]
+        embedded_1.dict_field = {"hello": "world"}
+        embedded_1.list_field = ["1", 2, {"hello": "world"}]
         doc.embedded_field = embedded_1
 
-        self.assertEqual(doc._get_changed_fields(), ['db_embedded_field'])
+        self.assertEqual(doc._get_changed_fields(), ["db_embedded_field"])
 
         embedded_delta = {
-            'db_string_field': 'hello',
-            'db_int_field': 1,
-            'db_dict_field': {'hello': 'world'},
-            'db_list_field': ['1', 2, {'hello': 'world'}]
+            "db_string_field": "hello",
+            "db_int_field": 1,
+            "db_dict_field": {"hello": "world"},
+            "db_list_field": ["1", 2, {"hello": "world"}],
         }
         self.assertEqual(doc.embedded_field._delta(), (embedded_delta, {}))
-        self.assertEqual(doc._delta(),
-            ({'db_embedded_field': embedded_delta}, {}))
+        self.assertEqual(doc._delta(), ({"db_embedded_field": embedded_delta}, {}))
 
         doc.save()
         doc = doc.reload(10)
 
         doc.embedded_field.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(),
-            ['db_embedded_field.db_dict_field'])
-        self.assertEqual(doc.embedded_field._delta(),
-            ({}, {'db_dict_field': 1}))
-        self.assertEqual(doc._delta(),
-            ({}, {'db_embedded_field.db_dict_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["db_embedded_field.db_dict_field"])
+        self.assertEqual(doc.embedded_field._delta(), ({}, {"db_dict_field": 1}))
+        self.assertEqual(doc._delta(), ({}, {"db_embedded_field.db_dict_field": 1}))
         doc.save()
         doc = doc.reload(10)
         self.assertEqual(doc.embedded_field.dict_field, {})
 
         doc.embedded_field.list_field = []
-        self.assertEqual(doc._get_changed_fields(),
-            ['db_embedded_field.db_list_field'])
-        self.assertEqual(doc.embedded_field._delta(),
-            ({}, {'db_list_field': 1}))
-        self.assertEqual(doc._delta(),
-            ({}, {'db_embedded_field.db_list_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["db_embedded_field.db_list_field"])
+        self.assertEqual(doc.embedded_field._delta(), ({}, {"db_list_field": 1}))
+        self.assertEqual(doc._delta(), ({}, {"db_embedded_field.db_list_field": 1}))
         doc.save()
         doc = doc.reload(10)
         self.assertEqual(doc.embedded_field.list_field, [])
 
         embedded_2 = Embedded()
-        embedded_2.string_field = 'hello'
+        embedded_2.string_field = "hello"
         embedded_2.int_field = 1
-        embedded_2.dict_field = {'hello': 'world'}
-        embedded_2.list_field = ['1', 2, {'hello': 'world'}]
-
-        doc.embedded_field.list_field = ['1', 2, embedded_2]
-        self.assertEqual(doc._get_changed_fields(),
-            ['db_embedded_field.db_list_field'])
-        self.assertEqual(doc.embedded_field._delta(), ({
-            'db_list_field': ['1', 2, {
-                '_cls': 'Embedded',
-                'db_string_field': 'hello',
-                'db_dict_field': {'hello': 'world'},
-                'db_int_field': 1,
-                'db_list_field': ['1', 2, {'hello': 'world'}],
-            }]
-        }, {}))
-
-        self.assertEqual(doc._delta(), ({
-            'db_embedded_field.db_list_field': ['1', 2, {
-                '_cls': 'Embedded',
-                'db_string_field': 'hello',
-                'db_dict_field': {'hello': 'world'},
-                'db_int_field': 1,
-                'db_list_field': ['1', 2, {'hello': 'world'}],
-            }]
-        }, {}))
+        embedded_2.dict_field = {"hello": "world"}
+        embedded_2.list_field = ["1", 2, {"hello": "world"}]
+
+        doc.embedded_field.list_field = ["1", 2, embedded_2]
+        self.assertEqual(doc._get_changed_fields(), ["db_embedded_field.db_list_field"])
+        self.assertEqual(
+            doc.embedded_field._delta(),
+            (
+                {
+                    "db_list_field": [
+                        "1",
+                        2,
+                        {
+                            "_cls": "Embedded",
+                            "db_string_field": "hello",
+                            "db_dict_field": {"hello": "world"},
+                            "db_int_field": 1,
+                            "db_list_field": ["1", 2, {"hello": "world"}],
+                        },
+                    ]
+                },
+                {},
+            ),
+        )
+
+        self.assertEqual(
+            doc._delta(),
+            (
+                {
+                    "db_embedded_field.db_list_field": [
+                        "1",
+                        2,
+                        {
+                            "_cls": "Embedded",
+                            "db_string_field": "hello",
+                            "db_dict_field": {"hello": "world"},
+                            "db_int_field": 1,
+                            "db_list_field": ["1", 2, {"hello": "world"}],
+                        },
+                    ]
+                },
+                {},
+            ),
+        )
         doc.save()
         doc = doc.reload(10)
 
-        self.assertEqual(doc.embedded_field.list_field[0], '1')
+        self.assertEqual(doc.embedded_field.list_field[0], "1")
         self.assertEqual(doc.embedded_field.list_field[1], 2)
         for k in doc.embedded_field.list_field[2]._fields:
-            self.assertEqual(doc.embedded_field.list_field[2][k],
-                             embedded_2[k])
-
-        doc.embedded_field.list_field[2].string_field = 'world'
-        self.assertEqual(doc._get_changed_fields(),
-            ['db_embedded_field.db_list_field.2.db_string_field'])
-        self.assertEqual(doc.embedded_field._delta(),
-            ({'db_list_field.2.db_string_field': 'world'}, {}))
-        self.assertEqual(doc._delta(),
-            ({'db_embedded_field.db_list_field.2.db_string_field': 'world'},
-             {}))
+            self.assertEqual(doc.embedded_field.list_field[2][k], embedded_2[k])
+
+        doc.embedded_field.list_field[2].string_field = "world"
+        self.assertEqual(
+            doc._get_changed_fields(),
+            ["db_embedded_field.db_list_field.2.db_string_field"],
+        )
+        self.assertEqual(
+            doc.embedded_field._delta(),
+            ({"db_list_field.2.db_string_field": "world"}, {}),
+        )
+        self.assertEqual(
+            doc._delta(),
+            ({"db_embedded_field.db_list_field.2.db_string_field": "world"}, {}),
+        )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].string_field,
-                        'world')
+        self.assertEqual(doc.embedded_field.list_field[2].string_field, "world")
 
         # Test multiple assignments
-        doc.embedded_field.list_field[2].string_field = 'hello world'
+        doc.embedded_field.list_field[2].string_field = "hello world"
         doc.embedded_field.list_field[2] = doc.embedded_field.list_field[2]
-        self.assertEqual(doc._get_changed_fields(),
-            ['db_embedded_field.db_list_field.2'])
-        self.assertEqual(doc.embedded_field._delta(), ({'db_list_field.2': {
-            '_cls': 'Embedded',
-            'db_string_field': 'hello world',
-            'db_int_field': 1,
-            'db_list_field': ['1', 2, {'hello': 'world'}],
-            'db_dict_field': {'hello': 'world'}}}, {}))
-        self.assertEqual(doc._delta(), ({
-            'db_embedded_field.db_list_field.2': {
-                '_cls': 'Embedded',
-                'db_string_field': 'hello world',
-                'db_int_field': 1,
-                'db_list_field': ['1', 2, {'hello': 'world'}],
-                'db_dict_field': {'hello': 'world'}}
-            }, {}))
+        self.assertEqual(
+            doc._get_changed_fields(), ["db_embedded_field.db_list_field.2"]
+        )
+        self.assertEqual(
+            doc.embedded_field._delta(),
+            (
+                {
+                    "db_list_field.2": {
+                        "_cls": "Embedded",
+                        "db_string_field": "hello world",
+                        "db_int_field": 1,
+                        "db_list_field": ["1", 2, {"hello": "world"}],
+                        "db_dict_field": {"hello": "world"},
+                    }
+                },
+                {},
+            ),
+        )
+        self.assertEqual(
+            doc._delta(),
+            (
+                {
+                    "db_embedded_field.db_list_field.2": {
+                        "_cls": "Embedded",
+                        "db_string_field": "hello world",
+                        "db_int_field": 1,
+                        "db_list_field": ["1", 2, {"hello": "world"}],
+                        "db_dict_field": {"hello": "world"},
+                    }
+                },
+                {},
+            ),
+        )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].string_field,
-                        'hello world')
+        self.assertEqual(doc.embedded_field.list_field[2].string_field, "hello world")
 
         # Test list native methods
         doc.embedded_field.list_field[2].list_field.pop(0)
-        self.assertEqual(doc._delta(),
-            ({'db_embedded_field.db_list_field.2.db_list_field':
-                [2, {'hello': 'world'}]}, {}))
+        self.assertEqual(
+            doc._delta(),
+            (
+                {
+                    "db_embedded_field.db_list_field.2.db_list_field": [
+                        2,
+                        {"hello": "world"},
+                    ]
+                },
+                {},
+            ),
+        )
         doc.save()
         doc = doc.reload(10)
 
         doc.embedded_field.list_field[2].list_field.append(1)
-        self.assertEqual(doc._delta(),
-            ({'db_embedded_field.db_list_field.2.db_list_field':
-                [2, {'hello': 'world'}, 1]}, {}))
+        self.assertEqual(
+            doc._delta(),
+            (
+                {
+                    "db_embedded_field.db_list_field.2.db_list_field": [
+                        2,
+                        {"hello": "world"},
+                        1,
+                    ]
+                },
+                {},
+            ),
+        )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].list_field,
-            [2, {'hello': 'world'}, 1])
+        self.assertEqual(
+            doc.embedded_field.list_field[2].list_field, [2, {"hello": "world"}, 1]
+        )
 
         doc.embedded_field.list_field[2].list_field.sort(key=str)
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].list_field,
-            [1, 2, {'hello': 'world'}])
-
-        del doc.embedded_field.list_field[2].list_field[2]['hello']
-        self.assertEqual(doc._delta(),
-            ({}, {'db_embedded_field.db_list_field.2.db_list_field.2.hello': 1}))
+        self.assertEqual(
+            doc.embedded_field.list_field[2].list_field, [1, 2, {"hello": "world"}]
+        )
+
+        del doc.embedded_field.list_field[2].list_field[2]["hello"]
+        self.assertEqual(
+            doc._delta(),
+            ({}, {"db_embedded_field.db_list_field.2.db_list_field.2.hello": 1}),
+        )
         doc.save()
         doc = doc.reload(10)
 
         del doc.embedded_field.list_field[2].list_field
-        self.assertEqual(doc._delta(), ({},
-            {'db_embedded_field.db_list_field.2.db_list_field': 1}))
+        self.assertEqual(
+            doc._delta(), ({}, {"db_embedded_field.db_list_field.2.db_list_field": 1})
+        )
 
     def test_delta_for_dynamic_documents(self):
         class Person(DynamicDocument):
             name = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         Person.drop_collection()
 
         p = Person(name="James", age=34)
-        self.assertEqual(p._delta(), (
-            SON([('_cls', 'Person'), ('name', 'James'), ('age', 34)]), {}))
+        self.assertEqual(
+            p._delta(), (SON([("_cls", "Person"), ("name", "James"), ("age", 34)]), {})
+        )
 
         p.doc = 123
         del p.doc
-        self.assertEqual(p._delta(), (
-            SON([('_cls', 'Person'), ('name', 'James'), ('age', 34)]), {}))
+        self.assertEqual(
+            p._delta(), (SON([("_cls", "Person"), ("name", "James"), ("age", 34)]), {})
+        )
 
         p = Person()
         p.name = "Dean"
@@ -620,20 +713,19 @@ class Person(DynamicDocument):
 
         p.age = 24
         self.assertEqual(p.age, 24)
-        self.assertEqual(p._get_changed_fields(), ['age'])
-        self.assertEqual(p._delta(), ({'age': 24}, {}))
+        self.assertEqual(p._get_changed_fields(), ["age"])
+        self.assertEqual(p._delta(), ({"age": 24}, {}))
 
         p = Person.objects(age=22).get()
         p.age = 24
         self.assertEqual(p.age, 24)
-        self.assertEqual(p._get_changed_fields(), ['age'])
-        self.assertEqual(p._delta(), ({'age': 24}, {}))
+        self.assertEqual(p._get_changed_fields(), ["age"])
+        self.assertEqual(p._delta(), ({"age": 24}, {}))
 
         p.save()
         self.assertEqual(1, Person.objects(age=24).count())
 
     def test_dynamic_delta(self):
-
         class Doc(DynamicDocument):
             pass
 
@@ -645,41 +737,43 @@ class Doc(DynamicDocument):
         self.assertEqual(doc._get_changed_fields(), [])
         self.assertEqual(doc._delta(), ({}, {}))
 
-        doc.string_field = 'hello'
-        self.assertEqual(doc._get_changed_fields(), ['string_field'])
-        self.assertEqual(doc._delta(), ({'string_field': 'hello'}, {}))
+        doc.string_field = "hello"
+        self.assertEqual(doc._get_changed_fields(), ["string_field"])
+        self.assertEqual(doc._delta(), ({"string_field": "hello"}, {}))
 
         doc._changed_fields = []
         doc.int_field = 1
-        self.assertEqual(doc._get_changed_fields(), ['int_field'])
-        self.assertEqual(doc._delta(), ({'int_field': 1}, {}))
+        self.assertEqual(doc._get_changed_fields(), ["int_field"])
+        self.assertEqual(doc._delta(), ({"int_field": 1}, {}))
 
         doc._changed_fields = []
-        dict_value = {'hello': 'world', 'ping': 'pong'}
+        dict_value = {"hello": "world", "ping": "pong"}
         doc.dict_field = dict_value
-        self.assertEqual(doc._get_changed_fields(), ['dict_field'])
-        self.assertEqual(doc._delta(), ({'dict_field': dict_value}, {}))
+        self.assertEqual(doc._get_changed_fields(), ["dict_field"])
+        self.assertEqual(doc._delta(), ({"dict_field": dict_value}, {}))
 
         doc._changed_fields = []
-        list_value = ['1', 2, {'hello': 'world'}]
+        list_value = ["1", 2, {"hello": "world"}]
         doc.list_field = list_value
-        self.assertEqual(doc._get_changed_fields(), ['list_field'])
-        self.assertEqual(doc._delta(), ({'list_field': list_value}, {}))
+        self.assertEqual(doc._get_changed_fields(), ["list_field"])
+        self.assertEqual(doc._delta(), ({"list_field": list_value}, {}))
 
         # Test unsetting
         doc._changed_fields = []
         doc.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(), ['dict_field'])
-        self.assertEqual(doc._delta(), ({}, {'dict_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["dict_field"])
+        self.assertEqual(doc._delta(), ({}, {"dict_field": 1}))
 
         doc._changed_fields = []
         doc.list_field = []
-        self.assertEqual(doc._get_changed_fields(), ['list_field'])
-        self.assertEqual(doc._delta(), ({}, {'list_field': 1}))
+        self.assertEqual(doc._get_changed_fields(), ["list_field"])
+        self.assertEqual(doc._delta(), ({}, {"list_field": 1}))
 
     def test_delta_with_dbref_true(self):
-        person, organization, employee = self.circular_reference_deltas_2(Document, Document, True)
-        employee.name = 'test'
+        person, organization, employee = self.circular_reference_deltas_2(
+            Document, Document, True
+        )
+        employee.name = "test"
 
         self.assertEqual(organization._get_changed_fields(), [])
 
@@ -690,11 +784,13 @@ def test_delta_with_dbref_true(self):
         organization.employees.append(person)
         updates, removals = organization._delta()
         self.assertEqual({}, removals)
-        self.assertIn('employees', updates)
+        self.assertIn("employees", updates)
 
     def test_delta_with_dbref_false(self):
-        person, organization, employee = self.circular_reference_deltas_2(Document, Document, False)
-        employee.name = 'test'
+        person, organization, employee = self.circular_reference_deltas_2(
+            Document, Document, False
+        )
+        employee.name = "test"
 
         self.assertEqual(organization._get_changed_fields(), [])
 
@@ -705,7 +801,7 @@ def test_delta_with_dbref_false(self):
         organization.employees.append(person)
         updates, removals = organization._delta()
         self.assertEqual({}, removals)
-        self.assertIn('employees', updates)
+        self.assertIn("employees", updates)
 
     def test_nested_nested_fields_mark_as_changed(self):
         class EmbeddedDoc(EmbeddedDocument):
@@ -717,11 +813,13 @@ class MyDoc(Document):
 
         MyDoc.drop_collection()
 
-        mydoc = MyDoc(name='testcase1', subs={'a': {'b': EmbeddedDoc(name='foo')}}).save()
+        mydoc = MyDoc(
+            name="testcase1", subs={"a": {"b": EmbeddedDoc(name="foo")}}
+        ).save()
 
         mydoc = MyDoc.objects.first()
-        subdoc = mydoc.subs['a']['b']
-        subdoc.name = 'bar'
+        subdoc = mydoc.subs["a"]["b"]
+        subdoc.name = "bar"
 
         self.assertEqual(["name"], subdoc._get_changed_fields())
         self.assertEqual(["subs.a.b.name"], mydoc._get_changed_fields())
@@ -741,11 +839,11 @@ class MyDoc(Document):
         MyDoc().save()
 
         mydoc = MyDoc.objects.first()
-        mydoc.subs['a'] = EmbeddedDoc()
+        mydoc.subs["a"] = EmbeddedDoc()
         self.assertEqual(["subs.a"], mydoc._get_changed_fields())
 
-        subdoc = mydoc.subs['a']
-        subdoc.name = 'bar'
+        subdoc = mydoc.subs["a"]
+        subdoc.name = "bar"
 
         self.assertEqual(["name"], subdoc._get_changed_fields())
         self.assertEqual(["subs.a"], mydoc._get_changed_fields())
@@ -763,16 +861,16 @@ class MyDoc(Document):
 
         MyDoc.drop_collection()
 
-        MyDoc(subs={'a': EmbeddedDoc(name='foo')}).save()
+        MyDoc(subs={"a": EmbeddedDoc(name="foo")}).save()
 
         mydoc = MyDoc.objects.first()
-        subdoc = mydoc.subs['a']
-        subdoc.name = 'bar'
+        subdoc = mydoc.subs["a"]
+        subdoc.name = "bar"
 
         self.assertEqual(["name"], subdoc._get_changed_fields())
         self.assertEqual(["subs.a.name"], mydoc._get_changed_fields())
 
-        mydoc.subs['a'] = EmbeddedDoc()
+        mydoc.subs["a"] = EmbeddedDoc()
         self.assertEqual(["subs.a"], mydoc._get_changed_fields())
         mydoc.save()
 
@@ -787,39 +885,39 @@ class Organization(Document):
 
         class User(Document):
             name = StringField()
-            org = ReferenceField('Organization', required=True)
+            org = ReferenceField("Organization", required=True)
 
         Organization.drop_collection()
         User.drop_collection()
 
-        org1 = Organization(name='Org 1')
+        org1 = Organization(name="Org 1")
         org1.save()
 
-        org2 = Organization(name='Org 2')
+        org2 = Organization(name="Org 2")
         org2.save()
 
-        user = User(name='Fred', org=org1)
+        user = User(name="Fred", org=org1)
         user.save()
 
         org1.reload()
         org2.reload()
         user.reload()
-        self.assertEqual(org1.name, 'Org 1')
-        self.assertEqual(org2.name, 'Org 2')
-        self.assertEqual(user.name, 'Fred')
+        self.assertEqual(org1.name, "Org 1")
+        self.assertEqual(org2.name, "Org 2")
+        self.assertEqual(user.name, "Fred")
 
-        user.name = 'Harold'
+        user.name = "Harold"
         user.org = org2
 
-        org2.name = 'New Org 2'
-        self.assertEqual(org2.name, 'New Org 2')
+        org2.name = "New Org 2"
+        self.assertEqual(org2.name, "New Org 2")
 
         user.save()
         org2.save()
 
-        self.assertEqual(org2.name, 'New Org 2')
+        self.assertEqual(org2.name, "New Org 2")
         org2.reload()
-        self.assertEqual(org2.name, 'New Org 2')
+        self.assertEqual(org2.name, "New Org 2")
 
     def test_delta_for_nested_map_fields(self):
         class UInfoDocument(Document):
@@ -855,10 +953,10 @@ class Doc(Document):
         self.assertEqual(True, "users.007.roles.666" in delta[0])
         self.assertEqual(True, "users.007.rolist" in delta[0])
         self.assertEqual(True, "users.007.info" in delta[0])
-        self.assertEqual('superadmin', delta[0]["users.007.roles.666"]["type"])
-        self.assertEqual('oops', delta[0]["users.007.rolist"][0]["type"])
+        self.assertEqual("superadmin", delta[0]["users.007.roles.666"]["type"])
+        self.assertEqual("oops", delta[0]["users.007.rolist"][0]["type"])
         self.assertEqual(uinfo.id, delta[0]["users.007.info"])
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/document/dynamic.py b/tests/document/dynamic.py
index 44548d27a..414d33522 100644
--- a/tests/document/dynamic.py
+++ b/tests/document/dynamic.py
@@ -3,17 +3,16 @@
 from mongoengine import *
 from tests.utils import MongoDBTestCase
 
-__all__ = ("TestDynamicDocument", )
+__all__ = ("TestDynamicDocument",)
 
 
 class TestDynamicDocument(MongoDBTestCase):
-
     def setUp(self):
         super(TestDynamicDocument, self).setUp()
 
         class Person(DynamicDocument):
             name = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         Person.drop_collection()
 
@@ -26,8 +25,7 @@ def test_simple_dynamic_document(self):
         p.name = "James"
         p.age = 34
 
-        self.assertEqual(p.to_mongo(), {"_cls": "Person", "name": "James",
-                                        "age": 34})
+        self.assertEqual(p.to_mongo(), {"_cls": "Person", "name": "James", "age": 34})
         self.assertEqual(p.to_mongo().keys(), ["_cls", "name", "age"])
         p.save()
         self.assertEqual(p.to_mongo().keys(), ["_id", "_cls", "name", "age"])
@@ -35,7 +33,7 @@ def test_simple_dynamic_document(self):
         self.assertEqual(self.Person.objects.first().age, 34)
 
         # Confirm no changes to self.Person
-        self.assertFalse(hasattr(self.Person, 'age'))
+        self.assertFalse(hasattr(self.Person, "age"))
 
     def test_change_scope_of_variable(self):
         """Test changing the scope of a dynamic field has no adverse effects"""
@@ -45,11 +43,11 @@ def test_change_scope_of_variable(self):
         p.save()
 
         p = self.Person.objects.get()
-        p.misc = {'hello': 'world'}
+        p.misc = {"hello": "world"}
         p.save()
 
         p = self.Person.objects.get()
-        self.assertEqual(p.misc, {'hello': 'world'})
+        self.assertEqual(p.misc, {"hello": "world"})
 
     def test_delete_dynamic_field(self):
         """Test deleting a dynamic field works"""
@@ -60,23 +58,23 @@ def test_delete_dynamic_field(self):
         p.save()
 
         p = self.Person.objects.get()
-        p.misc = {'hello': 'world'}
+        p.misc = {"hello": "world"}
         p.save()
 
         p = self.Person.objects.get()
-        self.assertEqual(p.misc, {'hello': 'world'})
+        self.assertEqual(p.misc, {"hello": "world"})
         collection = self.db[self.Person._get_collection_name()]
         obj = collection.find_one()
-        self.assertEqual(sorted(obj.keys()), ['_cls', '_id', 'misc', 'name'])
+        self.assertEqual(sorted(obj.keys()), ["_cls", "_id", "misc", "name"])
 
         del p.misc
         p.save()
 
         p = self.Person.objects.get()
-        self.assertFalse(hasattr(p, 'misc'))
+        self.assertFalse(hasattr(p, "misc"))
 
         obj = collection.find_one()
-        self.assertEqual(sorted(obj.keys()), ['_cls', '_id', 'name'])
+        self.assertEqual(sorted(obj.keys()), ["_cls", "_id", "name"])
 
     def test_reload_after_unsetting(self):
         p = self.Person()
@@ -91,77 +89,52 @@ def test_reload_dynamic_field(self):
         p.update(age=1)
 
         self.assertEqual(len(p._data), 3)
-        self.assertEqual(sorted(p._data.keys()), ['_cls', 'id', 'name'])
+        self.assertEqual(sorted(p._data.keys()), ["_cls", "id", "name"])
 
         p.reload()
         self.assertEqual(len(p._data), 4)
-        self.assertEqual(sorted(p._data.keys()), ['_cls', 'age', 'id', 'name'])
+        self.assertEqual(sorted(p._data.keys()), ["_cls", "age", "id", "name"])
 
     def test_fields_without_underscore(self):
         """Ensure we can query dynamic fields"""
         Person = self.Person
 
-        p = self.Person(name='Dean')
+        p = self.Person(name="Dean")
         p.save()
 
         raw_p = Person.objects.as_pymongo().get(id=p.id)
-        self.assertEqual(
-            raw_p,
-            {
-                '_cls': u'Person',
-                '_id': p.id,
-                'name': u'Dean'
-             }
-        )
+        self.assertEqual(raw_p, {"_cls": u"Person", "_id": p.id, "name": u"Dean"})
 
-        p.name = 'OldDean'
-        p.newattr = 'garbage'
+        p.name = "OldDean"
+        p.newattr = "garbage"
         p.save()
         raw_p = Person.objects.as_pymongo().get(id=p.id)
         self.assertEqual(
             raw_p,
-            {
-                '_cls': u'Person',
-                '_id': p.id,
-                'name': 'OldDean',
-                'newattr': u'garbage'
-            }
+            {"_cls": u"Person", "_id": p.id, "name": "OldDean", "newattr": u"garbage"},
         )
 
     def test_fields_containing_underscore(self):
         """Ensure we can query dynamic fields"""
+
         class WeirdPerson(DynamicDocument):
             name = StringField()
             _name = StringField()
 
         WeirdPerson.drop_collection()
 
-        p = WeirdPerson(name='Dean', _name='Dean')
+        p = WeirdPerson(name="Dean", _name="Dean")
         p.save()
 
         raw_p = WeirdPerson.objects.as_pymongo().get(id=p.id)
-        self.assertEqual(
-            raw_p,
-            {
-                '_id': p.id,
-                '_name': u'Dean',
-                'name': u'Dean'
-            }
-        )
+        self.assertEqual(raw_p, {"_id": p.id, "_name": u"Dean", "name": u"Dean"})
 
-        p.name = 'OldDean'
-        p._name = 'NewDean'
-        p._newattr1 = 'garbage'    # Unknown fields won't be added
+        p.name = "OldDean"
+        p._name = "NewDean"
+        p._newattr1 = "garbage"  # Unknown fields won't be added
         p.save()
         raw_p = WeirdPerson.objects.as_pymongo().get(id=p.id)
-        self.assertEqual(
-            raw_p,
-            {
-                '_id': p.id,
-                '_name': u'NewDean',
-                'name': u'OldDean',
-            }
-        )
+        self.assertEqual(raw_p, {"_id": p.id, "_name": u"NewDean", "name": u"OldDean"})
 
     def test_dynamic_document_queries(self):
         """Ensure we can query dynamic fields"""
@@ -193,26 +166,25 @@ class Person(DynamicDocument):
         p2.age = 10
         p2.save()
 
-        self.assertEqual(Person.objects(age__icontains='ten').count(), 2)
+        self.assertEqual(Person.objects(age__icontains="ten").count(), 2)
         self.assertEqual(Person.objects(age__gte=10).count(), 1)
 
     def test_complex_data_lookups(self):
         """Ensure you can query dynamic document dynamic fields"""
         p = self.Person()
-        p.misc = {'hello': 'world'}
+        p.misc = {"hello": "world"}
         p.save()
 
-        self.assertEqual(1, self.Person.objects(misc__hello='world').count())
+        self.assertEqual(1, self.Person.objects(misc__hello="world").count())
 
     def test_three_level_complex_data_lookups(self):
         """Ensure you can query three level document dynamic fields"""
-        p = self.Person.objects.create(
-            misc={'hello': {'hello2': 'world'}}
-        )
-        self.assertEqual(1, self.Person.objects(misc__hello__hello2='world').count())
+        p = self.Person.objects.create(misc={"hello": {"hello2": "world"}})
+        self.assertEqual(1, self.Person.objects(misc__hello__hello2="world").count())
 
     def test_complex_embedded_document_validation(self):
         """Ensure embedded dynamic documents may be validated"""
+
         class Embedded(DynamicEmbeddedDocument):
             content = URLField()
 
@@ -222,10 +194,10 @@ class Doc(DynamicDocument):
         Doc.drop_collection()
         doc = Doc()
 
-        embedded_doc_1 = Embedded(content='http://mongoengine.org/')
+        embedded_doc_1 = Embedded(content="http://mongoengine.org/")
         embedded_doc_1.validate()
 
-        embedded_doc_2 = Embedded(content='this is not a url')
+        embedded_doc_2 = Embedded(content="this is not a url")
         self.assertRaises(ValidationError, embedded_doc_2.validate)
 
         doc.embedded_field_1 = embedded_doc_1
@@ -234,15 +206,17 @@ class Doc(DynamicDocument):
 
     def test_inheritance(self):
         """Ensure that dynamic document plays nice with inheritance"""
+
         class Employee(self.Person):
             salary = IntField()
 
         Employee.drop_collection()
 
-        self.assertIn('name', Employee._fields)
-        self.assertIn('salary', Employee._fields)
-        self.assertEqual(Employee._get_collection_name(),
-                         self.Person._get_collection_name())
+        self.assertIn("name", Employee._fields)
+        self.assertIn("salary", Employee._fields)
+        self.assertEqual(
+            Employee._get_collection_name(), self.Person._get_collection_name()
+        )
 
         joe_bloggs = Employee()
         joe_bloggs.name = "Joe Bloggs"
@@ -258,6 +232,7 @@ class Employee(self.Person):
 
     def test_embedded_dynamic_document(self):
         """Test dynamic embedded documents"""
+
         class Embedded(DynamicEmbeddedDocument):
             pass
 
@@ -268,33 +243,36 @@ class Doc(DynamicDocument):
         doc = Doc()
 
         embedded_1 = Embedded()
-        embedded_1.string_field = 'hello'
+        embedded_1.string_field = "hello"
         embedded_1.int_field = 1
-        embedded_1.dict_field = {'hello': 'world'}
-        embedded_1.list_field = ['1', 2, {'hello': 'world'}]
+        embedded_1.dict_field = {"hello": "world"}
+        embedded_1.list_field = ["1", 2, {"hello": "world"}]
         doc.embedded_field = embedded_1
 
-        self.assertEqual(doc.to_mongo(), {
-            "embedded_field": {
-                "_cls": "Embedded",
-                "string_field": "hello",
-                "int_field": 1,
-                "dict_field": {"hello": "world"},
-                "list_field": ['1', 2, {'hello': 'world'}]
-            }
-        })
+        self.assertEqual(
+            doc.to_mongo(),
+            {
+                "embedded_field": {
+                    "_cls": "Embedded",
+                    "string_field": "hello",
+                    "int_field": 1,
+                    "dict_field": {"hello": "world"},
+                    "list_field": ["1", 2, {"hello": "world"}],
+                }
+            },
+        )
         doc.save()
 
         doc = Doc.objects.first()
         self.assertEqual(doc.embedded_field.__class__, Embedded)
         self.assertEqual(doc.embedded_field.string_field, "hello")
         self.assertEqual(doc.embedded_field.int_field, 1)
-        self.assertEqual(doc.embedded_field.dict_field, {'hello': 'world'})
-        self.assertEqual(doc.embedded_field.list_field,
-                            ['1', 2, {'hello': 'world'}])
+        self.assertEqual(doc.embedded_field.dict_field, {"hello": "world"})
+        self.assertEqual(doc.embedded_field.list_field, ["1", 2, {"hello": "world"}])
 
     def test_complex_embedded_documents(self):
         """Test complex dynamic embedded documents setups"""
+
         class Embedded(DynamicEmbeddedDocument):
             pass
 
@@ -305,41 +283,48 @@ class Doc(DynamicDocument):
         doc = Doc()
 
         embedded_1 = Embedded()
-        embedded_1.string_field = 'hello'
+        embedded_1.string_field = "hello"
         embedded_1.int_field = 1
-        embedded_1.dict_field = {'hello': 'world'}
+        embedded_1.dict_field = {"hello": "world"}
 
         embedded_2 = Embedded()
-        embedded_2.string_field = 'hello'
+        embedded_2.string_field = "hello"
         embedded_2.int_field = 1
-        embedded_2.dict_field = {'hello': 'world'}
-        embedded_2.list_field = ['1', 2, {'hello': 'world'}]
+        embedded_2.dict_field = {"hello": "world"}
+        embedded_2.list_field = ["1", 2, {"hello": "world"}]
 
-        embedded_1.list_field = ['1', 2, embedded_2]
+        embedded_1.list_field = ["1", 2, embedded_2]
         doc.embedded_field = embedded_1
 
-        self.assertEqual(doc.to_mongo(), {
-            "embedded_field": {
-                "_cls": "Embedded",
-                "string_field": "hello",
-                "int_field": 1,
-                "dict_field": {"hello": "world"},
-                "list_field": ['1', 2,
-                    {"_cls": "Embedded",
+        self.assertEqual(
+            doc.to_mongo(),
+            {
+                "embedded_field": {
+                    "_cls": "Embedded",
                     "string_field": "hello",
                     "int_field": 1,
                     "dict_field": {"hello": "world"},
-                    "list_field": ['1', 2, {'hello': 'world'}]}
-                ]
-            }
-        })
+                    "list_field": [
+                        "1",
+                        2,
+                        {
+                            "_cls": "Embedded",
+                            "string_field": "hello",
+                            "int_field": 1,
+                            "dict_field": {"hello": "world"},
+                            "list_field": ["1", 2, {"hello": "world"}],
+                        },
+                    ],
+                }
+            },
+        )
         doc.save()
         doc = Doc.objects.first()
         self.assertEqual(doc.embedded_field.__class__, Embedded)
         self.assertEqual(doc.embedded_field.string_field, "hello")
         self.assertEqual(doc.embedded_field.int_field, 1)
-        self.assertEqual(doc.embedded_field.dict_field, {'hello': 'world'})
-        self.assertEqual(doc.embedded_field.list_field[0], '1')
+        self.assertEqual(doc.embedded_field.dict_field, {"hello": "world"})
+        self.assertEqual(doc.embedded_field.list_field[0], "1")
         self.assertEqual(doc.embedded_field.list_field[1], 2)
 
         embedded_field = doc.embedded_field.list_field[2]
@@ -347,9 +332,8 @@ class Doc(DynamicDocument):
         self.assertEqual(embedded_field.__class__, Embedded)
         self.assertEqual(embedded_field.string_field, "hello")
         self.assertEqual(embedded_field.int_field, 1)
-        self.assertEqual(embedded_field.dict_field, {'hello': 'world'})
-        self.assertEqual(embedded_field.list_field, ['1', 2,
-                                                        {'hello': 'world'}])
+        self.assertEqual(embedded_field.dict_field, {"hello": "world"})
+        self.assertEqual(embedded_field.list_field, ["1", 2, {"hello": "world"}])
 
     def test_dynamic_and_embedded(self):
         """Ensure embedded documents play nicely"""
@@ -392,10 +376,15 @@ class Person(DynamicDocument):
 
         Person.drop_collection()
 
-        Person(name="Eric", address=Address(city="San Francisco", street_number="1337")).save()
+        Person(
+            name="Eric", address=Address(city="San Francisco", street_number="1337")
+        ).save()
 
-        self.assertEqual(Person.objects.first().address.street_number, '1337')
-        self.assertEqual(Person.objects.only('address__street_number').first().address.street_number, '1337')
+        self.assertEqual(Person.objects.first().address.street_number, "1337")
+        self.assertEqual(
+            Person.objects.only("address__street_number").first().address.street_number,
+            "1337",
+        )
 
     def test_dynamic_and_embedded_dict_access(self):
         """Ensure embedded dynamic documents work with dict[] style access"""
@@ -435,5 +424,5 @@ class Person(DynamicDocument):
         self.assertEqual(Person.objects.first().age, 35)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 764ef0c5d..570e619e1 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -10,13 +10,12 @@
 from mongoengine import *
 from mongoengine.connection import get_db
 
-__all__ = ("IndexesTest", )
+__all__ = ("IndexesTest",)
 
 
 class IndexesTest(unittest.TestCase):
-
     def setUp(self):
-        self.connection = connect(db='mongoenginetest')
+        self.connection = connect(db="mongoenginetest")
         self.db = get_db()
 
         class Person(Document):
@@ -45,52 +44,43 @@ def test_indexes_dynamic_document(self):
         self._index_test(DynamicDocument)
 
     def _index_test(self, InheritFrom):
-
         class BlogPost(InheritFrom):
-            date = DateTimeField(db_field='addDate', default=datetime.now)
+            date = DateTimeField(db_field="addDate", default=datetime.now)
             category = StringField()
             tags = ListField(StringField())
-            meta = {
-                'indexes': [
-                    '-date',
-                    'tags',
-                    ('category', '-date')
-                ]
-            }
+            meta = {"indexes": ["-date", "tags", ("category", "-date")]}
 
-        expected_specs = [{'fields': [('addDate', -1)]},
-                          {'fields': [('tags', 1)]},
-                          {'fields': [('category', 1), ('addDate', -1)]}]
-        self.assertEqual(expected_specs, BlogPost._meta['index_specs'])
+        expected_specs = [
+            {"fields": [("addDate", -1)]},
+            {"fields": [("tags", 1)]},
+            {"fields": [("category", 1), ("addDate", -1)]},
+        ]
+        self.assertEqual(expected_specs, BlogPost._meta["index_specs"])
 
         BlogPost.ensure_indexes()
         info = BlogPost.objects._collection.index_information()
         # _id, '-date', 'tags', ('cat', 'date')
         self.assertEqual(len(info), 4)
-        info = [value['key'] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in iteritems(info)]
         for expected in expected_specs:
-            self.assertIn(expected['fields'], info)
+            self.assertIn(expected["fields"], info)
 
     def _index_test_inheritance(self, InheritFrom):
-
         class BlogPost(InheritFrom):
-            date = DateTimeField(db_field='addDate', default=datetime.now)
+            date = DateTimeField(db_field="addDate", default=datetime.now)
             category = StringField()
             tags = ListField(StringField())
             meta = {
-                'indexes': [
-                    '-date',
-                    'tags',
-                    ('category', '-date')
-                ],
-                'allow_inheritance': True
+                "indexes": ["-date", "tags", ("category", "-date")],
+                "allow_inheritance": True,
             }
 
-        expected_specs = [{'fields': [('_cls', 1), ('addDate', -1)]},
-                          {'fields': [('_cls', 1), ('tags', 1)]},
-                          {'fields': [('_cls', 1), ('category', 1),
-                                      ('addDate', -1)]}]
-        self.assertEqual(expected_specs, BlogPost._meta['index_specs'])
+        expected_specs = [
+            {"fields": [("_cls", 1), ("addDate", -1)]},
+            {"fields": [("_cls", 1), ("tags", 1)]},
+            {"fields": [("_cls", 1), ("category", 1), ("addDate", -1)]},
+        ]
+        self.assertEqual(expected_specs, BlogPost._meta["index_specs"])
 
         BlogPost.ensure_indexes()
         info = BlogPost.objects._collection.index_information()
@@ -99,24 +89,24 @@ class BlogPost(InheritFrom):
         # the indices on -date and tags will both contain
         # _cls as first element in the key
         self.assertEqual(len(info), 4)
-        info = [value['key'] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in iteritems(info)]
         for expected in expected_specs:
-            self.assertIn(expected['fields'], info)
+            self.assertIn(expected["fields"], info)
 
         class ExtendedBlogPost(BlogPost):
             title = StringField()
-            meta = {'indexes': ['title']}
+            meta = {"indexes": ["title"]}
 
-        expected_specs.append({'fields': [('_cls', 1), ('title', 1)]})
-        self.assertEqual(expected_specs, ExtendedBlogPost._meta['index_specs'])
+        expected_specs.append({"fields": [("_cls", 1), ("title", 1)]})
+        self.assertEqual(expected_specs, ExtendedBlogPost._meta["index_specs"])
 
         BlogPost.drop_collection()
 
         ExtendedBlogPost.ensure_indexes()
         info = ExtendedBlogPost.objects._collection.index_information()
-        info = [value['key'] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in iteritems(info)]
         for expected in expected_specs:
-            self.assertIn(expected['fields'], info)
+            self.assertIn(expected["fields"], info)
 
     def test_indexes_document_inheritance(self):
         """Ensure that indexes are used when meta[indexes] is specified for
@@ -135,21 +125,15 @@ def test_inherited_index(self):
 
         class A(Document):
             title = StringField()
-            meta = {
-                'indexes': [
-                        {
-                            'fields': ('title',),
-                        },
-                ],
-                'allow_inheritance': True,
-                }
+            meta = {"indexes": [{"fields": ("title",)}], "allow_inheritance": True}
 
         class B(A):
             description = StringField()
 
-        self.assertEqual(A._meta['index_specs'], B._meta['index_specs'])
-        self.assertEqual([{'fields': [('_cls', 1), ('title', 1)]}],
-                         A._meta['index_specs'])
+        self.assertEqual(A._meta["index_specs"], B._meta["index_specs"])
+        self.assertEqual(
+            [{"fields": [("_cls", 1), ("title", 1)]}], A._meta["index_specs"]
+        )
 
     def test_index_no_cls(self):
         """Ensure index specs are inhertited correctly"""
@@ -157,14 +141,12 @@ def test_index_no_cls(self):
         class A(Document):
             title = StringField()
             meta = {
-                'indexes': [
-                        {'fields': ('title',), 'cls': False},
-                ],
-                'allow_inheritance': True,
-                'index_cls': False
-                }
+                "indexes": [{"fields": ("title",), "cls": False}],
+                "allow_inheritance": True,
+                "index_cls": False,
+            }
 
-        self.assertEqual([('title', 1)], A._meta['index_specs'][0]['fields'])
+        self.assertEqual([("title", 1)], A._meta["index_specs"][0]["fields"])
         A._get_collection().drop_indexes()
         A.ensure_indexes()
         info = A._get_collection().index_information()
@@ -174,34 +156,30 @@ class B(A):
             c = StringField()
             d = StringField()
             meta = {
-                'indexes': [{'fields': ['c']}, {'fields': ['d'], 'cls': True}],
-                'allow_inheritance': True
+                "indexes": [{"fields": ["c"]}, {"fields": ["d"], "cls": True}],
+                "allow_inheritance": True,
             }
-        self.assertEqual([('c', 1)], B._meta['index_specs'][1]['fields'])
-        self.assertEqual([('_cls', 1), ('d', 1)], B._meta['index_specs'][2]['fields'])
 
-    def test_build_index_spec_is_not_destructive(self):
+        self.assertEqual([("c", 1)], B._meta["index_specs"][1]["fields"])
+        self.assertEqual([("_cls", 1), ("d", 1)], B._meta["index_specs"][2]["fields"])
 
+    def test_build_index_spec_is_not_destructive(self):
         class MyDoc(Document):
             keywords = StringField()
 
-            meta = {
-                'indexes': ['keywords'],
-                'allow_inheritance': False
-            }
+            meta = {"indexes": ["keywords"], "allow_inheritance": False}
 
-        self.assertEqual(MyDoc._meta['index_specs'],
-                         [{'fields': [('keywords', 1)]}])
+        self.assertEqual(MyDoc._meta["index_specs"], [{"fields": [("keywords", 1)]}])
 
         # Force index creation
         MyDoc.ensure_indexes()
 
-        self.assertEqual(MyDoc._meta['index_specs'],
-                        [{'fields': [('keywords', 1)]}])
+        self.assertEqual(MyDoc._meta["index_specs"], [{"fields": [("keywords", 1)]}])
 
     def test_embedded_document_index_meta(self):
         """Ensure that embedded document indexes are created explicitly
         """
+
         class Rank(EmbeddedDocument):
             title = StringField(required=True)
 
@@ -209,138 +187,123 @@ class Person(Document):
             name = StringField(required=True)
             rank = EmbeddedDocumentField(Rank, required=False)
 
-            meta = {
-                'indexes': [
-                    'rank.title',
-                ],
-                'allow_inheritance': False
-            }
+            meta = {"indexes": ["rank.title"], "allow_inheritance": False}
 
-        self.assertEqual([{'fields': [('rank.title', 1)]}],
-                        Person._meta['index_specs'])
+        self.assertEqual([{"fields": [("rank.title", 1)]}], Person._meta["index_specs"])
 
         Person.drop_collection()
 
         # Indexes are lazy so use list() to perform query
         list(Person.objects)
         info = Person.objects._collection.index_information()
-        info = [value['key'] for key, value in iteritems(info)]
-        self.assertIn([('rank.title', 1)], info)
+        info = [value["key"] for key, value in iteritems(info)]
+        self.assertIn([("rank.title", 1)], info)
 
     def test_explicit_geo2d_index(self):
         """Ensure that geo2d indexes work when created via meta[indexes]
         """
+
         class Place(Document):
             location = DictField()
-            meta = {
-                'allow_inheritance': True,
-                'indexes': [
-                    '*location.point',
-                ]
-            }
+            meta = {"allow_inheritance": True, "indexes": ["*location.point"]}
 
-        self.assertEqual([{'fields': [('location.point', '2d')]}],
-                         Place._meta['index_specs'])
+        self.assertEqual(
+            [{"fields": [("location.point", "2d")]}], Place._meta["index_specs"]
+        )
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in iteritems(info)]
-        self.assertIn([('location.point', '2d')], info)
+        info = [value["key"] for key, value in iteritems(info)]
+        self.assertIn([("location.point", "2d")], info)
 
     def test_explicit_geo2d_index_embedded(self):
         """Ensure that geo2d indexes work when created via meta[indexes]
         """
+
         class EmbeddedLocation(EmbeddedDocument):
             location = DictField()
 
         class Place(Document):
-            current = DictField(field=EmbeddedDocumentField('EmbeddedLocation'))
-            meta = {
-                'allow_inheritance': True,
-                'indexes': [
-                    '*current.location.point',
-                ]
-            }
+            current = DictField(field=EmbeddedDocumentField("EmbeddedLocation"))
+            meta = {"allow_inheritance": True, "indexes": ["*current.location.point"]}
 
-        self.assertEqual([{'fields': [('current.location.point', '2d')]}],
-                         Place._meta['index_specs'])
+        self.assertEqual(
+            [{"fields": [("current.location.point", "2d")]}], Place._meta["index_specs"]
+        )
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in iteritems(info)]
-        self.assertIn([('current.location.point', '2d')], info)
+        info = [value["key"] for key, value in iteritems(info)]
+        self.assertIn([("current.location.point", "2d")], info)
 
     def test_explicit_geosphere_index(self):
         """Ensure that geosphere indexes work when created via meta[indexes]
         """
+
         class Place(Document):
             location = DictField()
-            meta = {
-                'allow_inheritance': True,
-                'indexes': [
-                    '(location.point',
-                ]
-            }
+            meta = {"allow_inheritance": True, "indexes": ["(location.point"]}
 
-        self.assertEqual([{'fields': [('location.point', '2dsphere')]}],
-                         Place._meta['index_specs'])
+        self.assertEqual(
+            [{"fields": [("location.point", "2dsphere")]}], Place._meta["index_specs"]
+        )
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in iteritems(info)]
-        self.assertIn([('location.point', '2dsphere')], info)
+        info = [value["key"] for key, value in iteritems(info)]
+        self.assertIn([("location.point", "2dsphere")], info)
 
     def test_explicit_geohaystack_index(self):
         """Ensure that geohaystack indexes work when created via meta[indexes]
         """
-        raise SkipTest('GeoHaystack index creation is not supported for now'
-                       'from meta, as it requires a bucketSize parameter.')
+        raise SkipTest(
+            "GeoHaystack index creation is not supported for now"
+            "from meta, as it requires a bucketSize parameter."
+        )
 
         class Place(Document):
             location = DictField()
             name = StringField()
-            meta = {
-                'indexes': [
-                    (')location.point', 'name')
-                ]
-            }
-        self.assertEqual([{'fields': [('location.point', 'geoHaystack'), ('name', 1)]}],
-                         Place._meta['index_specs'])
+            meta = {"indexes": [(")location.point", "name")]}
+
+        self.assertEqual(
+            [{"fields": [("location.point", "geoHaystack"), ("name", 1)]}],
+            Place._meta["index_specs"],
+        )
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in iteritems(info)]
-        self.assertIn([('location.point', 'geoHaystack')], info)
+        info = [value["key"] for key, value in iteritems(info)]
+        self.assertIn([("location.point", "geoHaystack")], info)
 
     def test_create_geohaystack_index(self):
         """Ensure that geohaystack indexes can be created
         """
+
         class Place(Document):
             location = DictField()
             name = StringField()
 
-        Place.create_index({'fields': (')location.point', 'name')}, bucketSize=10)
+        Place.create_index({"fields": (")location.point", "name")}, bucketSize=10)
         info = Place._get_collection().index_information()
-        info = [value['key'] for key, value in iteritems(info)]
-        self.assertIn([('location.point', 'geoHaystack'), ('name', 1)], info)
+        info = [value["key"] for key, value in iteritems(info)]
+        self.assertIn([("location.point", "geoHaystack"), ("name", 1)], info)
 
     def test_dictionary_indexes(self):
         """Ensure that indexes are used when meta[indexes] contains
         dictionaries instead of lists.
         """
+
         class BlogPost(Document):
-            date = DateTimeField(db_field='addDate', default=datetime.now)
+            date = DateTimeField(db_field="addDate", default=datetime.now)
             category = StringField()
             tags = ListField(StringField())
-            meta = {
-                'indexes': [
-                    {'fields': ['-date'], 'unique': True, 'sparse': True},
-                ],
-            }
+            meta = {"indexes": [{"fields": ["-date"], "unique": True, "sparse": True}]}
 
-        self.assertEqual([{'fields': [('addDate', -1)], 'unique': True,
-                          'sparse': True}],
-                         BlogPost._meta['index_specs'])
+        self.assertEqual(
+            [{"fields": [("addDate", -1)], "unique": True, "sparse": True}],
+            BlogPost._meta["index_specs"],
+        )
 
         BlogPost.drop_collection()
 
@@ -351,48 +314,48 @@ class BlogPost(Document):
         # Indexes are lazy so use list() to perform query
         list(BlogPost.objects)
         info = BlogPost.objects._collection.index_information()
-        info = [(value['key'],
-                 value.get('unique', False),
-                 value.get('sparse', False))
-                for key, value in iteritems(info)]
-        self.assertIn(([('addDate', -1)], True, True), info)
+        info = [
+            (value["key"], value.get("unique", False), value.get("sparse", False))
+            for key, value in iteritems(info)
+        ]
+        self.assertIn(([("addDate", -1)], True, True), info)
 
         BlogPost.drop_collection()
 
     def test_abstract_index_inheritance(self):
-
         class UserBase(Document):
             user_guid = StringField(required=True)
             meta = {
-                'abstract': True,
-                'indexes': ['user_guid'],
-                'allow_inheritance': True
+                "abstract": True,
+                "indexes": ["user_guid"],
+                "allow_inheritance": True,
             }
 
         class Person(UserBase):
             name = StringField()
 
-            meta = {
-                'indexes': ['name'],
-            }
+            meta = {"indexes": ["name"]}
+
         Person.drop_collection()
 
-        Person(name="test", user_guid='123').save()
+        Person(name="test", user_guid="123").save()
 
         self.assertEqual(1, Person.objects.count())
         info = Person.objects._collection.index_information()
-        self.assertEqual(sorted(info.keys()),
-                         ['_cls_1_name_1', '_cls_1_user_guid_1', '_id_'])
+        self.assertEqual(
+            sorted(info.keys()), ["_cls_1_name_1", "_cls_1_user_guid_1", "_id_"]
+        )
 
     def test_disable_index_creation(self):
         """Tests setting auto_create_index to False on the connection will
         disable any index generation.
         """
+
         class User(Document):
             meta = {
-                'allow_inheritance': True,
-                'indexes': ['user_guid'],
-                'auto_create_index': False
+                "allow_inheritance": True,
+                "indexes": ["user_guid"],
+                "auto_create_index": False,
             }
             user_guid = StringField(required=True)
 
@@ -401,88 +364,81 @@ class MongoUser(User):
 
         User.drop_collection()
 
-        User(user_guid='123').save()
-        MongoUser(user_guid='123').save()
+        User(user_guid="123").save()
+        MongoUser(user_guid="123").save()
 
         self.assertEqual(2, User.objects.count())
         info = User.objects._collection.index_information()
-        self.assertEqual(list(info.keys()), ['_id_'])
+        self.assertEqual(list(info.keys()), ["_id_"])
 
         User.ensure_indexes()
         info = User.objects._collection.index_information()
-        self.assertEqual(sorted(info.keys()), ['_cls_1_user_guid_1', '_id_'])
+        self.assertEqual(sorted(info.keys()), ["_cls_1_user_guid_1", "_id_"])
 
     def test_embedded_document_index(self):
         """Tests settings an index on an embedded document
         """
+
         class Date(EmbeddedDocument):
-            year = IntField(db_field='yr')
+            year = IntField(db_field="yr")
 
         class BlogPost(Document):
             title = StringField()
             date = EmbeddedDocumentField(Date)
 
-            meta = {
-                'indexes': [
-                    '-date.year'
-                ],
-            }
+            meta = {"indexes": ["-date.year"]}
 
         BlogPost.drop_collection()
 
         info = BlogPost.objects._collection.index_information()
-        self.assertEqual(sorted(info.keys()), ['_id_', 'date.yr_-1'])
+        self.assertEqual(sorted(info.keys()), ["_id_", "date.yr_-1"])
 
     def test_list_embedded_document_index(self):
         """Ensure list embedded documents can be indexed
         """
+
         class Tag(EmbeddedDocument):
-            name = StringField(db_field='tag')
+            name = StringField(db_field="tag")
 
         class BlogPost(Document):
             title = StringField()
             tags = ListField(EmbeddedDocumentField(Tag))
 
-            meta = {
-                'indexes': [
-                    'tags.name'
-                ]
-            }
+            meta = {"indexes": ["tags.name"]}
 
         BlogPost.drop_collection()
 
         info = BlogPost.objects._collection.index_information()
         # we don't use _cls in with list fields by default
-        self.assertEqual(sorted(info.keys()), ['_id_', 'tags.tag_1'])
+        self.assertEqual(sorted(info.keys()), ["_id_", "tags.tag_1"])
 
-        post1 = BlogPost(title="Embedded Indexes tests in place",
-                         tags=[Tag(name="about"), Tag(name="time")])
+        post1 = BlogPost(
+            title="Embedded Indexes tests in place",
+            tags=[Tag(name="about"), Tag(name="time")],
+        )
         post1.save()
 
     def test_recursive_embedded_objects_dont_break_indexes(self):
-
         class RecursiveObject(EmbeddedDocument):
-            obj = EmbeddedDocumentField('self')
+            obj = EmbeddedDocumentField("self")
 
         class RecursiveDocument(Document):
             recursive_obj = EmbeddedDocumentField(RecursiveObject)
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         RecursiveDocument.ensure_indexes()
         info = RecursiveDocument._get_collection().index_information()
-        self.assertEqual(sorted(info.keys()), ['_cls_1', '_id_'])
+        self.assertEqual(sorted(info.keys()), ["_cls_1", "_id_"])
 
     def test_covered_index(self):
         """Ensure that covered indexes can be used
         """
+
         class Test(Document):
             a = IntField()
             b = IntField()
 
-            meta = {
-                'indexes': ['a'],
-                'allow_inheritance': False
-            }
+            meta = {"indexes": ["a"], "allow_inheritance": False}
 
         Test.drop_collection()
 
@@ -491,45 +447,51 @@ class Test(Document):
 
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
-        query_plan = Test.objects(id=obj.id).exclude('a').explain()
+        query_plan = Test.objects(id=obj.id).exclude("a").explain()
         self.assertEqual(
-            query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'),
-            'IDHACK'
+            query_plan.get("queryPlanner")
+            .get("winningPlan")
+            .get("inputStage")
+            .get("stage"),
+            "IDHACK",
         )
 
-        query_plan = Test.objects(id=obj.id).only('id').explain()
+        query_plan = Test.objects(id=obj.id).only("id").explain()
         self.assertEqual(
-            query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'),
-            'IDHACK'
+            query_plan.get("queryPlanner")
+            .get("winningPlan")
+            .get("inputStage")
+            .get("stage"),
+            "IDHACK",
         )
 
-        query_plan = Test.objects(a=1).only('a').exclude('id').explain()
+        query_plan = Test.objects(a=1).only("a").exclude("id").explain()
         self.assertEqual(
-            query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'),
-            'IXSCAN'
+            query_plan.get("queryPlanner")
+            .get("winningPlan")
+            .get("inputStage")
+            .get("stage"),
+            "IXSCAN",
         )
         self.assertEqual(
-            query_plan.get('queryPlanner').get('winningPlan').get('stage'),
-            'PROJECTION'
+            query_plan.get("queryPlanner").get("winningPlan").get("stage"), "PROJECTION"
         )
 
         query_plan = Test.objects(a=1).explain()
         self.assertEqual(
-            query_plan.get('queryPlanner').get('winningPlan').get('inputStage').get('stage'),
-            'IXSCAN'
+            query_plan.get("queryPlanner")
+            .get("winningPlan")
+            .get("inputStage")
+            .get("stage"),
+            "IXSCAN",
         )
         self.assertEqual(
-            query_plan.get('queryPlanner').get('winningPlan').get('stage'),
-            'FETCH'
+            query_plan.get("queryPlanner").get("winningPlan").get("stage"), "FETCH"
         )
 
     def test_index_on_id(self):
         class BlogPost(Document):
-            meta = {
-                'indexes': [
-                    ['categories', 'id']
-                ]
-            }
+            meta = {"indexes": [["categories", "id"]]}
 
             title = StringField(required=True)
             description = StringField(required=True)
@@ -538,22 +500,16 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         indexes = BlogPost.objects._collection.index_information()
-        self.assertEqual(indexes['categories_1__id_1']['key'],
-                                 [('categories', 1), ('_id', 1)])
+        self.assertEqual(
+            indexes["categories_1__id_1"]["key"], [("categories", 1), ("_id", 1)]
+        )
 
     def test_hint(self):
-        TAGS_INDEX_NAME = 'tags_1'
+        TAGS_INDEX_NAME = "tags_1"
 
         class BlogPost(Document):
             tags = ListField(StringField())
-            meta = {
-                'indexes': [
-                    {
-                        'fields': ['tags'],
-                        'name': TAGS_INDEX_NAME
-                    }
-                ],
-            }
+            meta = {"indexes": [{"fields": ["tags"], "name": TAGS_INDEX_NAME}]}
 
         BlogPost.drop_collection()
 
@@ -562,41 +518,42 @@ class BlogPost(Document):
             BlogPost(tags=tags).save()
 
         # Hinting by shape should work.
-        self.assertEqual(BlogPost.objects.hint([('tags', 1)]).count(), 10)
+        self.assertEqual(BlogPost.objects.hint([("tags", 1)]).count(), 10)
 
         # Hinting by index name should work.
         self.assertEqual(BlogPost.objects.hint(TAGS_INDEX_NAME).count(), 10)
 
         # Clearing the hint should work fine.
         self.assertEqual(BlogPost.objects.hint().count(), 10)
-        self.assertEqual(BlogPost.objects.hint([('ZZ', 1)]).hint().count(), 10)
+        self.assertEqual(BlogPost.objects.hint([("ZZ", 1)]).hint().count(), 10)
 
         # Hinting on a non-existent index shape should fail.
         with self.assertRaises(OperationFailure):
-            BlogPost.objects.hint([('ZZ', 1)]).count()
+            BlogPost.objects.hint([("ZZ", 1)]).count()
 
         # Hinting on a non-existent index name should fail.
         with self.assertRaises(OperationFailure):
-            BlogPost.objects.hint('Bad Name').count()
+            BlogPost.objects.hint("Bad Name").count()
 
         # Invalid shape argument (missing list brackets) should fail.
         with self.assertRaises(ValueError):
-            BlogPost.objects.hint(('tags', 1)).count()
+            BlogPost.objects.hint(("tags", 1)).count()
 
     def test_unique(self):
         """Ensure that uniqueness constraints are applied to fields.
         """
+
         class BlogPost(Document):
             title = StringField()
             slug = StringField(unique=True)
 
         BlogPost.drop_collection()
 
-        post1 = BlogPost(title='test1', slug='test')
+        post1 = BlogPost(title="test1", slug="test")
         post1.save()
 
         # Two posts with the same slug is not allowed
-        post2 = BlogPost(title='test2', slug='test')
+        post2 = BlogPost(title="test2", slug="test")
         self.assertRaises(NotUniqueError, post2.save)
         self.assertRaises(NotUniqueError, BlogPost.objects.insert, post2)
 
@@ -605,54 +562,62 @@ class BlogPost(Document):
 
     def test_primary_key_unique_not_working(self):
         """Relates to #1445"""
+
         class Blog(Document):
             id = StringField(primary_key=True, unique=True)
 
         Blog.drop_collection()
 
         with self.assertRaises(OperationFailure) as ctx_err:
-            Blog(id='garbage').save()
+            Blog(id="garbage").save()
 
         # One of the errors below should happen. Which one depends on the
         # PyMongo version and dict order.
         err_msg = str(ctx_err.exception)
         self.assertTrue(
-            any([
-                "The field 'unique' is not valid for an _id index specification" in err_msg,
-                "The field 'background' is not valid for an _id index specification" in err_msg,
-                "The field 'sparse' is not valid for an _id index specification" in err_msg,
-            ])
+            any(
+                [
+                    "The field 'unique' is not valid for an _id index specification"
+                    in err_msg,
+                    "The field 'background' is not valid for an _id index specification"
+                    in err_msg,
+                    "The field 'sparse' is not valid for an _id index specification"
+                    in err_msg,
+                ]
+            )
         )
 
     def test_unique_with(self):
         """Ensure that unique_with constraints are applied to fields.
         """
+
         class Date(EmbeddedDocument):
-            year = IntField(db_field='yr')
+            year = IntField(db_field="yr")
 
         class BlogPost(Document):
             title = StringField()
             date = EmbeddedDocumentField(Date)
-            slug = StringField(unique_with='date.year')
+            slug = StringField(unique_with="date.year")
 
         BlogPost.drop_collection()
 
-        post1 = BlogPost(title='test1', date=Date(year=2009), slug='test')
+        post1 = BlogPost(title="test1", date=Date(year=2009), slug="test")
         post1.save()
 
         # day is different so won't raise exception
-        post2 = BlogPost(title='test2', date=Date(year=2010), slug='test')
+        post2 = BlogPost(title="test2", date=Date(year=2010), slug="test")
         post2.save()
 
         # Now there will be two docs with the same slug and the same day: fail
-        post3 = BlogPost(title='test3', date=Date(year=2010), slug='test')
+        post3 = BlogPost(title="test3", date=Date(year=2010), slug="test")
         self.assertRaises(OperationError, post3.save)
 
     def test_unique_embedded_document(self):
         """Ensure that uniqueness constraints are applied to fields on embedded documents.
         """
+
         class SubDocument(EmbeddedDocument):
-            year = IntField(db_field='yr')
+            year = IntField(db_field="yr")
             slug = StringField(unique=True)
 
         class BlogPost(Document):
@@ -661,18 +626,15 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post1 = BlogPost(title='test1',
-                         sub=SubDocument(year=2009, slug="test"))
+        post1 = BlogPost(title="test1", sub=SubDocument(year=2009, slug="test"))
         post1.save()
 
         # sub.slug is different so won't raise exception
-        post2 = BlogPost(title='test2',
-                         sub=SubDocument(year=2010, slug='another-slug'))
+        post2 = BlogPost(title="test2", sub=SubDocument(year=2010, slug="another-slug"))
         post2.save()
 
         # Now there will be two docs with the same sub.slug
-        post3 = BlogPost(title='test3',
-                         sub=SubDocument(year=2010, slug='test'))
+        post3 = BlogPost(title="test3", sub=SubDocument(year=2010, slug="test"))
         self.assertRaises(NotUniqueError, post3.save)
 
     def test_unique_embedded_document_in_list(self):
@@ -681,8 +643,9 @@ def test_unique_embedded_document_in_list(self):
         embedded documents, even when the embedded documents in in a
         list field.
         """
+
         class SubDocument(EmbeddedDocument):
-            year = IntField(db_field='yr')
+            year = IntField(db_field="yr")
             slug = StringField(unique=True)
 
         class BlogPost(Document):
@@ -692,16 +655,15 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         post1 = BlogPost(
-            title='test1', subs=[
-                SubDocument(year=2009, slug='conflict'),
-                SubDocument(year=2009, slug='conflict')
-            ]
+            title="test1",
+            subs=[
+                SubDocument(year=2009, slug="conflict"),
+                SubDocument(year=2009, slug="conflict"),
+            ],
         )
         post1.save()
 
-        post2 = BlogPost(
-            title='test2', subs=[SubDocument(year=2014, slug='conflict')]
-        )
+        post2 = BlogPost(title="test2", subs=[SubDocument(year=2014, slug="conflict")])
 
         self.assertRaises(NotUniqueError, post2.save)
 
@@ -711,33 +673,32 @@ def test_unique_embedded_document_in_sorted_list(self):
         embedded documents, even when the embedded documents in a sorted list
         field.
         """
+
         class SubDocument(EmbeddedDocument):
             year = IntField()
             slug = StringField(unique=True)
 
         class BlogPost(Document):
             title = StringField()
-            subs = SortedListField(EmbeddedDocumentField(SubDocument),
-                                   ordering='year')
+            subs = SortedListField(EmbeddedDocumentField(SubDocument), ordering="year")
 
         BlogPost.drop_collection()
 
         post1 = BlogPost(
-            title='test1', subs=[
-                SubDocument(year=2009, slug='conflict'),
-                SubDocument(year=2009, slug='conflict')
-            ]
+            title="test1",
+            subs=[
+                SubDocument(year=2009, slug="conflict"),
+                SubDocument(year=2009, slug="conflict"),
+            ],
         )
         post1.save()
 
         # confirm that the unique index is created
         indexes = BlogPost._get_collection().index_information()
-        self.assertIn('subs.slug_1', indexes)
-        self.assertTrue(indexes['subs.slug_1']['unique'])
+        self.assertIn("subs.slug_1", indexes)
+        self.assertTrue(indexes["subs.slug_1"]["unique"])
 
-        post2 = BlogPost(
-            title='test2', subs=[SubDocument(year=2014, slug='conflict')]
-        )
+        post2 = BlogPost(title="test2", subs=[SubDocument(year=2014, slug="conflict")])
 
         self.assertRaises(NotUniqueError, post2.save)
 
@@ -747,6 +708,7 @@ def test_unique_embedded_document_in_embedded_document_list(self):
         embedded documents, even when the embedded documents in an embedded
         list field.
         """
+
         class SubDocument(EmbeddedDocument):
             year = IntField()
             slug = StringField(unique=True)
@@ -758,21 +720,20 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         post1 = BlogPost(
-            title='test1', subs=[
-                SubDocument(year=2009, slug='conflict'),
-                SubDocument(year=2009, slug='conflict')
-            ]
+            title="test1",
+            subs=[
+                SubDocument(year=2009, slug="conflict"),
+                SubDocument(year=2009, slug="conflict"),
+            ],
         )
         post1.save()
 
         # confirm that the unique index is created
         indexes = BlogPost._get_collection().index_information()
-        self.assertIn('subs.slug_1', indexes)
-        self.assertTrue(indexes['subs.slug_1']['unique'])
+        self.assertIn("subs.slug_1", indexes)
+        self.assertTrue(indexes["subs.slug_1"]["unique"])
 
-        post2 = BlogPost(
-            title='test2', subs=[SubDocument(year=2014, slug='conflict')]
-        )
+        post2 = BlogPost(title="test2", subs=[SubDocument(year=2014, slug="conflict")])
 
         self.assertRaises(NotUniqueError, post2.save)
 
@@ -780,60 +741,51 @@ def test_unique_with_embedded_document_and_embedded_unique(self):
         """Ensure that uniqueness constraints are applied to fields on
         embedded documents.  And work with unique_with as well.
         """
+
         class SubDocument(EmbeddedDocument):
-            year = IntField(db_field='yr')
+            year = IntField(db_field="yr")
             slug = StringField(unique=True)
 
         class BlogPost(Document):
-            title = StringField(unique_with='sub.year')
+            title = StringField(unique_with="sub.year")
             sub = EmbeddedDocumentField(SubDocument)
 
         BlogPost.drop_collection()
 
-        post1 = BlogPost(title='test1',
-                         sub=SubDocument(year=2009, slug="test"))
+        post1 = BlogPost(title="test1", sub=SubDocument(year=2009, slug="test"))
         post1.save()
 
         # sub.slug is different so won't raise exception
-        post2 = BlogPost(title='test2',
-                         sub=SubDocument(year=2010, slug='another-slug'))
+        post2 = BlogPost(title="test2", sub=SubDocument(year=2010, slug="another-slug"))
         post2.save()
 
         # Now there will be two docs with the same sub.slug
-        post3 = BlogPost(title='test3',
-                         sub=SubDocument(year=2010, slug='test'))
+        post3 = BlogPost(title="test3", sub=SubDocument(year=2010, slug="test"))
         self.assertRaises(NotUniqueError, post3.save)
 
         # Now there will be two docs with the same title and year
-        post3 = BlogPost(title='test1',
-                         sub=SubDocument(year=2009, slug='test-1'))
+        post3 = BlogPost(title="test1", sub=SubDocument(year=2009, slug="test-1"))
         self.assertRaises(NotUniqueError, post3.save)
 
     def test_ttl_indexes(self):
-
         class Log(Document):
             created = DateTimeField(default=datetime.now)
-            meta = {
-                'indexes': [
-                    {'fields': ['created'], 'expireAfterSeconds': 3600}
-                ]
-            }
+            meta = {"indexes": [{"fields": ["created"], "expireAfterSeconds": 3600}]}
 
         Log.drop_collection()
 
         # Indexes are lazy so use list() to perform query
         list(Log.objects)
         info = Log.objects._collection.index_information()
-        self.assertEqual(3600,
-                         info['created_1']['expireAfterSeconds'])
+        self.assertEqual(3600, info["created_1"]["expireAfterSeconds"])
 
     def test_index_drop_dups_silently_ignored(self):
         class Customer(Document):
             cust_id = IntField(unique=True, required=True)
             meta = {
-                'indexes': ['cust_id'],
-                'index_drop_dups': True,
-                'allow_inheritance': False,
+                "indexes": ["cust_id"],
+                "index_drop_dups": True,
+                "allow_inheritance": False,
             }
 
         Customer.drop_collection()
@@ -843,12 +795,10 @@ def test_unique_and_indexes(self):
         """Ensure that 'unique' constraints aren't overridden by
         meta.indexes.
         """
+
         class Customer(Document):
             cust_id = IntField(unique=True, required=True)
-            meta = {
-                'indexes': ['cust_id'],
-                'allow_inheritance': False,
-            }
+            meta = {"indexes": ["cust_id"], "allow_inheritance": False}
 
         Customer.drop_collection()
         cust = Customer(cust_id=1)
@@ -870,37 +820,39 @@ def test_primary_save_duplicate_update_existing_object(self):
         """If you set a field as primary, then unexpected behaviour can occur.
         You won't create a duplicate but you will update an existing document.
         """
+
         class User(Document):
             name = StringField(primary_key=True)
             password = StringField()
 
         User.drop_collection()
 
-        user = User(name='huangz', password='secret')
+        user = User(name="huangz", password="secret")
         user.save()
 
-        user = User(name='huangz', password='secret2')
+        user = User(name="huangz", password="secret2")
         user.save()
 
         self.assertEqual(User.objects.count(), 1)
-        self.assertEqual(User.objects.get().password, 'secret2')
+        self.assertEqual(User.objects.get().password, "secret2")
 
     def test_unique_and_primary_create(self):
         """Create a new record with a duplicate primary key
         throws an exception
         """
+
         class User(Document):
             name = StringField(primary_key=True)
             password = StringField()
 
         User.drop_collection()
 
-        User.objects.create(name='huangz', password='secret')
+        User.objects.create(name="huangz", password="secret")
         with self.assertRaises(NotUniqueError):
-            User.objects.create(name='huangz', password='secret2')
+            User.objects.create(name="huangz", password="secret2")
 
         self.assertEqual(User.objects.count(), 1)
-        self.assertEqual(User.objects.get().password, 'secret')
+        self.assertEqual(User.objects.get().password, "secret")
 
     def test_index_with_pk(self):
         """Ensure you can use `pk` as part of a query"""
@@ -909,21 +861,24 @@ class Comment(EmbeddedDocument):
             comment_id = IntField(required=True)
 
         try:
+
             class BlogPost(Document):
                 comments = EmbeddedDocumentField(Comment)
-                meta = {'indexes': [
-                            {'fields': ['pk', 'comments.comment_id'],
-                             'unique': True}]}
+                meta = {
+                    "indexes": [
+                        {"fields": ["pk", "comments.comment_id"], "unique": True}
+                    ]
+                }
+
         except UnboundLocalError:
-            self.fail('Unbound local error at index + pk definition')
+            self.fail("Unbound local error at index + pk definition")
 
         info = BlogPost.objects._collection.index_information()
-        info = [value['key'] for key, value in iteritems(info)]
-        index_item = [('_id', 1), ('comments.comment_id', 1)]
+        info = [value["key"] for key, value in iteritems(info)]
+        index_item = [("_id", 1), ("comments.comment_id", 1)]
         self.assertIn(index_item, info)
 
     def test_compound_key_embedded(self):
-
         class CompoundKey(EmbeddedDocument):
             name = StringField(required=True)
             term = StringField(required=True)
@@ -935,12 +890,12 @@ class ReportEmbedded(Document):
         my_key = CompoundKey(name="n", term="ok")
         report = ReportEmbedded(text="OK", key=my_key).save()
 
-        self.assertEqual({'text': 'OK', '_id': {'term': 'ok', 'name': 'n'}},
-                         report.to_mongo())
+        self.assertEqual(
+            {"text": "OK", "_id": {"term": "ok", "name": "n"}}, report.to_mongo()
+        )
         self.assertEqual(report, ReportEmbedded.objects.get(pk=my_key))
 
     def test_compound_key_dictfield(self):
-
         class ReportDictField(Document):
             key = DictField(primary_key=True)
             text = StringField()
@@ -948,65 +903,60 @@ class ReportDictField(Document):
         my_key = {"name": "n", "term": "ok"}
         report = ReportDictField(text="OK", key=my_key).save()
 
-        self.assertEqual({'text': 'OK', '_id': {'term': 'ok', 'name': 'n'}},
-                         report.to_mongo())
+        self.assertEqual(
+            {"text": "OK", "_id": {"term": "ok", "name": "n"}}, report.to_mongo()
+        )
 
         # We can't directly call ReportDictField.objects.get(pk=my_key),
         # because dicts are unordered, and if the order in MongoDB is
         # different than the one in `my_key`, this test will fail.
-        self.assertEqual(report, ReportDictField.objects.get(pk__name=my_key['name']))
-        self.assertEqual(report, ReportDictField.objects.get(pk__term=my_key['term']))
+        self.assertEqual(report, ReportDictField.objects.get(pk__name=my_key["name"]))
+        self.assertEqual(report, ReportDictField.objects.get(pk__term=my_key["term"]))
 
     def test_string_indexes(self):
-
         class MyDoc(Document):
             provider_ids = DictField()
-            meta = {
-                "indexes": ["provider_ids.foo", "provider_ids.bar"],
-            }
+            meta = {"indexes": ["provider_ids.foo", "provider_ids.bar"]}
 
         info = MyDoc.objects._collection.index_information()
-        info = [value['key'] for key, value in iteritems(info)]
-        self.assertIn([('provider_ids.foo', 1)], info)
-        self.assertIn([('provider_ids.bar', 1)], info)
+        info = [value["key"] for key, value in iteritems(info)]
+        self.assertIn([("provider_ids.foo", 1)], info)
+        self.assertIn([("provider_ids.bar", 1)], info)
 
     def test_sparse_compound_indexes(self):
-
         class MyDoc(Document):
             provider_ids = DictField()
             meta = {
-                "indexes": [{'fields': ("provider_ids.foo", "provider_ids.bar"),
-                             'sparse': True}],
+                "indexes": [
+                    {"fields": ("provider_ids.foo", "provider_ids.bar"), "sparse": True}
+                ]
             }
 
         info = MyDoc.objects._collection.index_information()
-        self.assertEqual([('provider_ids.foo', 1), ('provider_ids.bar', 1)],
-                         info['provider_ids.foo_1_provider_ids.bar_1']['key'])
-        self.assertTrue(info['provider_ids.foo_1_provider_ids.bar_1']['sparse'])
+        self.assertEqual(
+            [("provider_ids.foo", 1), ("provider_ids.bar", 1)],
+            info["provider_ids.foo_1_provider_ids.bar_1"]["key"],
+        )
+        self.assertTrue(info["provider_ids.foo_1_provider_ids.bar_1"]["sparse"])
 
     def test_text_indexes(self):
         class Book(Document):
             title = DictField()
-            meta = {
-                "indexes": ["$title"],
-            }
+            meta = {"indexes": ["$title"]}
 
         indexes = Book.objects._collection.index_information()
         self.assertIn("title_text", indexes)
         key = indexes["title_text"]["key"]
-        self.assertIn(('_fts', 'text'), key)
+        self.assertIn(("_fts", "text"), key)
 
     def test_hashed_indexes(self):
-
         class Book(Document):
             ref_id = StringField()
-            meta = {
-                "indexes": ["#ref_id"],
-            }
+            meta = {"indexes": ["#ref_id"]}
 
         indexes = Book.objects._collection.index_information()
         self.assertIn("ref_id_hashed", indexes)
-        self.assertIn(('ref_id', 'hashed'), indexes["ref_id_hashed"]["key"])
+        self.assertIn(("ref_id", "hashed"), indexes["ref_id_hashed"]["key"])
 
     def test_indexes_after_database_drop(self):
         """
@@ -1017,35 +967,36 @@ def test_indexes_after_database_drop(self):
         """
         # Use a new connection and database since dropping the database could
         # cause concurrent tests to fail.
-        connection = connect(db='tempdatabase',
-                             alias='test_indexes_after_database_drop')
+        connection = connect(
+            db="tempdatabase", alias="test_indexes_after_database_drop"
+        )
 
         class BlogPost(Document):
             title = StringField()
             slug = StringField(unique=True)
 
-            meta = {'db_alias': 'test_indexes_after_database_drop'}
+            meta = {"db_alias": "test_indexes_after_database_drop"}
 
         try:
             BlogPost.drop_collection()
 
             # Create Post #1
-            post1 = BlogPost(title='test1', slug='test')
+            post1 = BlogPost(title="test1", slug="test")
             post1.save()
 
             # Drop the Database
-            connection.drop_database('tempdatabase')
+            connection.drop_database("tempdatabase")
 
             # Re-create Post #1
-            post1 = BlogPost(title='test1', slug='test')
+            post1 = BlogPost(title="test1", slug="test")
             post1.save()
 
             # Create Post #2
-            post2 = BlogPost(title='test2', slug='test')
+            post2 = BlogPost(title="test2", slug="test")
             self.assertRaises(NotUniqueError, post2.save)
         finally:
             # Drop the temporary database at the end
-            connection.drop_database('tempdatabase')
+            connection.drop_database("tempdatabase")
 
     def test_index_dont_send_cls_option(self):
         """
@@ -1057,24 +1008,19 @@ def test_index_dont_send_cls_option(self):
         options that are passed to ensureIndex. For more details, see:
         https://jira.mongodb.org/browse/SERVER-769
         """
+
         class TestDoc(Document):
             txt = StringField()
 
             meta = {
-                'allow_inheritance': True,
-                'indexes': [
-                    {'fields': ('txt',), 'cls': False}
-                ]
+                "allow_inheritance": True,
+                "indexes": [{"fields": ("txt",), "cls": False}],
             }
 
         class TestChildDoc(TestDoc):
             txt2 = StringField()
 
-            meta = {
-                'indexes': [
-                    {'fields': ('txt2',), 'cls': False}
-                ]
-            }
+            meta = {"indexes": [{"fields": ("txt2",), "cls": False}]}
 
         TestDoc.drop_collection()
         TestDoc.ensure_indexes()
@@ -1082,54 +1028,51 @@ class TestChildDoc(TestDoc):
 
         index_info = TestDoc._get_collection().index_information()
         for key in index_info:
-            del index_info[key]['v']  # drop the index version - we don't care about that here
-            if 'ns' in index_info[key]:
-                del index_info[key]['ns']  # drop the index namespace - we don't care about that here, MongoDB 3+
-            if 'dropDups' in index_info[key]:
-                del index_info[key]['dropDups']  # drop the index dropDups - it is deprecated in MongoDB 3+
-
-        self.assertEqual(index_info, {
-            'txt_1': {
-                'key': [('txt', 1)],
-                'background': False
-            },
-            '_id_': {
-                'key': [('_id', 1)],
-            },
-            'txt2_1': {
-                'key': [('txt2', 1)],
-                'background': False
+            del index_info[key][
+                "v"
+            ]  # drop the index version - we don't care about that here
+            if "ns" in index_info[key]:
+                del index_info[key][
+                    "ns"
+                ]  # drop the index namespace - we don't care about that here, MongoDB 3+
+            if "dropDups" in index_info[key]:
+                del index_info[key][
+                    "dropDups"
+                ]  # drop the index dropDups - it is deprecated in MongoDB 3+
+
+        self.assertEqual(
+            index_info,
+            {
+                "txt_1": {"key": [("txt", 1)], "background": False},
+                "_id_": {"key": [("_id", 1)]},
+                "txt2_1": {"key": [("txt2", 1)], "background": False},
+                "_cls_1": {"key": [("_cls", 1)], "background": False},
             },
-            '_cls_1': {
-                'key': [('_cls', 1)],
-                'background': False,
-            }
-        })
+        )
 
     def test_compound_index_underscore_cls_not_overwritten(self):
         """
         Test that the compound index doesn't get another _cls when it is specified
         """
+
         class TestDoc(Document):
             shard_1 = StringField()
             txt_1 = StringField()
 
             meta = {
-                'collection': 'test',
-                'allow_inheritance': True,
-                'sparse': True,
-                'shard_key': 'shard_1',
-                'indexes': [
-                    ('shard_1', '_cls', 'txt_1'),
-                ]
+                "collection": "test",
+                "allow_inheritance": True,
+                "sparse": True,
+                "shard_key": "shard_1",
+                "indexes": [("shard_1", "_cls", "txt_1")],
             }
 
         TestDoc.drop_collection()
         TestDoc.ensure_indexes()
 
         index_info = TestDoc._get_collection().index_information()
-        self.assertIn('shard_1_1__cls_1_txt_1_1', index_info)
+        self.assertIn("shard_1_1__cls_1_txt_1_1", index_info)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/document/inheritance.py b/tests/document/inheritance.py
index d81039f42..4f21d5f4c 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -4,18 +4,24 @@
 
 from six import iteritems
 
-from mongoengine import (BooleanField, Document, EmbeddedDocument,
-                         EmbeddedDocumentField, GenericReferenceField,
-                         IntField, ReferenceField, StringField)
+from mongoengine import (
+    BooleanField,
+    Document,
+    EmbeddedDocument,
+    EmbeddedDocumentField,
+    GenericReferenceField,
+    IntField,
+    ReferenceField,
+    StringField,
+)
 from mongoengine.pymongo_support import list_collection_names
 from tests.utils import MongoDBTestCase
 from tests.fixtures import Base
 
-__all__ = ('InheritanceTest', )
+__all__ = ("InheritanceTest",)
 
 
 class InheritanceTest(MongoDBTestCase):
-
     def tearDown(self):
         for collection in list_collection_names(self.db):
             self.db.drop_collection(collection)
@@ -25,16 +31,16 @@ def test_constructor_cls(self):
         # and when object gets reloaded (prevent regression of #1950)
         class EmbedData(EmbeddedDocument):
             data = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class DataDoc(Document):
             name = StringField()
             embed = EmbeddedDocumentField(EmbedData)
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
-        test_doc = DataDoc(name='test', embed=EmbedData(data='data'))
-        self.assertEqual(test_doc._cls, 'DataDoc')
-        self.assertEqual(test_doc.embed._cls, 'EmbedData')
+        test_doc = DataDoc(name="test", embed=EmbedData(data="data"))
+        self.assertEqual(test_doc._cls, "DataDoc")
+        self.assertEqual(test_doc.embed._cls, "EmbedData")
         test_doc.save()
         saved_doc = DataDoc.objects.with_id(test_doc.id)
         self.assertEqual(test_doc._cls, saved_doc._cls)
@@ -44,163 +50,234 @@ class DataDoc(Document):
     def test_superclasses(self):
         """Ensure that the correct list of superclasses is assembled.
         """
+
         class Animal(Document):
-            meta = {'allow_inheritance': True}
-        class Fish(Animal): pass
-        class Guppy(Fish): pass
-        class Mammal(Animal): pass
-        class Dog(Mammal): pass
-        class Human(Mammal): pass
+            meta = {"allow_inheritance": True}
+
+        class Fish(Animal):
+            pass
+
+        class Guppy(Fish):
+            pass
+
+        class Mammal(Animal):
+            pass
+
+        class Dog(Mammal):
+            pass
+
+        class Human(Mammal):
+            pass
 
         self.assertEqual(Animal._superclasses, ())
-        self.assertEqual(Fish._superclasses, ('Animal',))
-        self.assertEqual(Guppy._superclasses, ('Animal', 'Animal.Fish'))
-        self.assertEqual(Mammal._superclasses, ('Animal',))
-        self.assertEqual(Dog._superclasses, ('Animal', 'Animal.Mammal'))
-        self.assertEqual(Human._superclasses, ('Animal', 'Animal.Mammal'))
+        self.assertEqual(Fish._superclasses, ("Animal",))
+        self.assertEqual(Guppy._superclasses, ("Animal", "Animal.Fish"))
+        self.assertEqual(Mammal._superclasses, ("Animal",))
+        self.assertEqual(Dog._superclasses, ("Animal", "Animal.Mammal"))
+        self.assertEqual(Human._superclasses, ("Animal", "Animal.Mammal"))
 
     def test_external_superclasses(self):
         """Ensure that the correct list of super classes is assembled when
         importing part of the model.
         """
-        class Animal(Base): pass
-        class Fish(Animal): pass
-        class Guppy(Fish): pass
-        class Mammal(Animal): pass
-        class Dog(Mammal): pass
-        class Human(Mammal): pass
-
-        self.assertEqual(Animal._superclasses, ('Base', ))
-        self.assertEqual(Fish._superclasses, ('Base', 'Base.Animal',))
-        self.assertEqual(Guppy._superclasses, ('Base', 'Base.Animal',
-                                               'Base.Animal.Fish'))
-        self.assertEqual(Mammal._superclasses, ('Base', 'Base.Animal',))
-        self.assertEqual(Dog._superclasses, ('Base', 'Base.Animal',
-                                             'Base.Animal.Mammal'))
-        self.assertEqual(Human._superclasses, ('Base', 'Base.Animal',
-                                               'Base.Animal.Mammal'))
+
+        class Animal(Base):
+            pass
+
+        class Fish(Animal):
+            pass
+
+        class Guppy(Fish):
+            pass
+
+        class Mammal(Animal):
+            pass
+
+        class Dog(Mammal):
+            pass
+
+        class Human(Mammal):
+            pass
+
+        self.assertEqual(Animal._superclasses, ("Base",))
+        self.assertEqual(Fish._superclasses, ("Base", "Base.Animal"))
+        self.assertEqual(
+            Guppy._superclasses, ("Base", "Base.Animal", "Base.Animal.Fish")
+        )
+        self.assertEqual(Mammal._superclasses, ("Base", "Base.Animal"))
+        self.assertEqual(
+            Dog._superclasses, ("Base", "Base.Animal", "Base.Animal.Mammal")
+        )
+        self.assertEqual(
+            Human._superclasses, ("Base", "Base.Animal", "Base.Animal.Mammal")
+        )
 
     def test_subclasses(self):
         """Ensure that the correct list of _subclasses (subclasses) is
         assembled.
         """
+
         class Animal(Document):
-            meta = {'allow_inheritance': True}
-        class Fish(Animal): pass
-        class Guppy(Fish): pass
-        class Mammal(Animal): pass
-        class Dog(Mammal): pass
-        class Human(Mammal): pass
-
-        self.assertEqual(Animal._subclasses, ('Animal',
-                                         'Animal.Fish',
-                                         'Animal.Fish.Guppy',
-                                         'Animal.Mammal',
-                                         'Animal.Mammal.Dog',
-                                         'Animal.Mammal.Human'))
-        self.assertEqual(Fish._subclasses, ('Animal.Fish',
-                                       'Animal.Fish.Guppy',))
-        self.assertEqual(Guppy._subclasses, ('Animal.Fish.Guppy',))
-        self.assertEqual(Mammal._subclasses, ('Animal.Mammal',
-                                         'Animal.Mammal.Dog',
-                                         'Animal.Mammal.Human'))
-        self.assertEqual(Human._subclasses, ('Animal.Mammal.Human',))
+            meta = {"allow_inheritance": True}
+
+        class Fish(Animal):
+            pass
+
+        class Guppy(Fish):
+            pass
+
+        class Mammal(Animal):
+            pass
+
+        class Dog(Mammal):
+            pass
+
+        class Human(Mammal):
+            pass
+
+        self.assertEqual(
+            Animal._subclasses,
+            (
+                "Animal",
+                "Animal.Fish",
+                "Animal.Fish.Guppy",
+                "Animal.Mammal",
+                "Animal.Mammal.Dog",
+                "Animal.Mammal.Human",
+            ),
+        )
+        self.assertEqual(Fish._subclasses, ("Animal.Fish", "Animal.Fish.Guppy"))
+        self.assertEqual(Guppy._subclasses, ("Animal.Fish.Guppy",))
+        self.assertEqual(
+            Mammal._subclasses,
+            ("Animal.Mammal", "Animal.Mammal.Dog", "Animal.Mammal.Human"),
+        )
+        self.assertEqual(Human._subclasses, ("Animal.Mammal.Human",))
 
     def test_external_subclasses(self):
         """Ensure that the correct list of _subclasses (subclasses) is
         assembled when importing part of the model.
         """
-        class Animal(Base): pass
-        class Fish(Animal): pass
-        class Guppy(Fish): pass
-        class Mammal(Animal): pass
-        class Dog(Mammal): pass
-        class Human(Mammal): pass
-
-        self.assertEqual(Animal._subclasses, ('Base.Animal',
-                                              'Base.Animal.Fish',
-                                              'Base.Animal.Fish.Guppy',
-                                              'Base.Animal.Mammal',
-                                              'Base.Animal.Mammal.Dog',
-                                              'Base.Animal.Mammal.Human'))
-        self.assertEqual(Fish._subclasses, ('Base.Animal.Fish',
-                                            'Base.Animal.Fish.Guppy',))
-        self.assertEqual(Guppy._subclasses, ('Base.Animal.Fish.Guppy',))
-        self.assertEqual(Mammal._subclasses, ('Base.Animal.Mammal',
-                                              'Base.Animal.Mammal.Dog',
-                                              'Base.Animal.Mammal.Human'))
-        self.assertEqual(Human._subclasses, ('Base.Animal.Mammal.Human',))
+
+        class Animal(Base):
+            pass
+
+        class Fish(Animal):
+            pass
+
+        class Guppy(Fish):
+            pass
+
+        class Mammal(Animal):
+            pass
+
+        class Dog(Mammal):
+            pass
+
+        class Human(Mammal):
+            pass
+
+        self.assertEqual(
+            Animal._subclasses,
+            (
+                "Base.Animal",
+                "Base.Animal.Fish",
+                "Base.Animal.Fish.Guppy",
+                "Base.Animal.Mammal",
+                "Base.Animal.Mammal.Dog",
+                "Base.Animal.Mammal.Human",
+            ),
+        )
+        self.assertEqual(
+            Fish._subclasses, ("Base.Animal.Fish", "Base.Animal.Fish.Guppy")
+        )
+        self.assertEqual(Guppy._subclasses, ("Base.Animal.Fish.Guppy",))
+        self.assertEqual(
+            Mammal._subclasses,
+            (
+                "Base.Animal.Mammal",
+                "Base.Animal.Mammal.Dog",
+                "Base.Animal.Mammal.Human",
+            ),
+        )
+        self.assertEqual(Human._subclasses, ("Base.Animal.Mammal.Human",))
 
     def test_dynamic_declarations(self):
         """Test that declaring an extra class updates meta data"""
 
         class Animal(Document):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         self.assertEqual(Animal._superclasses, ())
-        self.assertEqual(Animal._subclasses, ('Animal',))
+        self.assertEqual(Animal._subclasses, ("Animal",))
 
         # Test dynamically adding a class changes the meta data
         class Fish(Animal):
             pass
 
         self.assertEqual(Animal._superclasses, ())
-        self.assertEqual(Animal._subclasses, ('Animal', 'Animal.Fish'))
+        self.assertEqual(Animal._subclasses, ("Animal", "Animal.Fish"))
 
-        self.assertEqual(Fish._superclasses, ('Animal', ))
-        self.assertEqual(Fish._subclasses, ('Animal.Fish',))
+        self.assertEqual(Fish._superclasses, ("Animal",))
+        self.assertEqual(Fish._subclasses, ("Animal.Fish",))
 
         # Test dynamically adding an inherited class changes the meta data
         class Pike(Fish):
             pass
 
         self.assertEqual(Animal._superclasses, ())
-        self.assertEqual(Animal._subclasses, ('Animal', 'Animal.Fish',
-                                              'Animal.Fish.Pike'))
+        self.assertEqual(
+            Animal._subclasses, ("Animal", "Animal.Fish", "Animal.Fish.Pike")
+        )
 
-        self.assertEqual(Fish._superclasses, ('Animal', ))
-        self.assertEqual(Fish._subclasses, ('Animal.Fish', 'Animal.Fish.Pike'))
+        self.assertEqual(Fish._superclasses, ("Animal",))
+        self.assertEqual(Fish._subclasses, ("Animal.Fish", "Animal.Fish.Pike"))
 
-        self.assertEqual(Pike._superclasses, ('Animal', 'Animal.Fish'))
-        self.assertEqual(Pike._subclasses, ('Animal.Fish.Pike',))
+        self.assertEqual(Pike._superclasses, ("Animal", "Animal.Fish"))
+        self.assertEqual(Pike._subclasses, ("Animal.Fish.Pike",))
 
     def test_inheritance_meta_data(self):
         """Ensure that document may inherit fields from a superclass document.
         """
+
         class Person(Document):
             name = StringField()
             age = IntField()
 
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class Employee(Person):
             salary = IntField()
 
-        self.assertEqual(['_cls', 'age', 'id', 'name', 'salary'],
-                         sorted(Employee._fields.keys()))
-        self.assertEqual(Employee._get_collection_name(),
-                         Person._get_collection_name())
+        self.assertEqual(
+            ["_cls", "age", "id", "name", "salary"], sorted(Employee._fields.keys())
+        )
+        self.assertEqual(Employee._get_collection_name(), Person._get_collection_name())
 
     def test_inheritance_to_mongo_keys(self):
         """Ensure that document may inherit fields from a superclass document.
         """
+
         class Person(Document):
             name = StringField()
             age = IntField()
 
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class Employee(Person):
             salary = IntField()
 
-        self.assertEqual(['_cls', 'age', 'id', 'name', 'salary'],
-                         sorted(Employee._fields.keys()))
-        self.assertEqual(Person(name="Bob", age=35).to_mongo().keys(),
-                         ['_cls', 'name', 'age'])
-        self.assertEqual(Employee(name="Bob", age=35, salary=0).to_mongo().keys(),
-                         ['_cls', 'name', 'age', 'salary'])
-        self.assertEqual(Employee._get_collection_name(),
-                         Person._get_collection_name())
+        self.assertEqual(
+            ["_cls", "age", "id", "name", "salary"], sorted(Employee._fields.keys())
+        )
+        self.assertEqual(
+            Person(name="Bob", age=35).to_mongo().keys(), ["_cls", "name", "age"]
+        )
+        self.assertEqual(
+            Employee(name="Bob", age=35, salary=0).to_mongo().keys(),
+            ["_cls", "name", "age", "salary"],
+        )
+        self.assertEqual(Employee._get_collection_name(), Person._get_collection_name())
 
     def test_indexes_and_multiple_inheritance(self):
         """ Ensure that all of the indexes are created for a document with
@@ -210,18 +287,12 @@ def test_indexes_and_multiple_inheritance(self):
         class A(Document):
             a = StringField()
 
-            meta = {
-                'allow_inheritance': True,
-                'indexes': ['a']
-            }
+            meta = {"allow_inheritance": True, "indexes": ["a"]}
 
         class B(Document):
             b = StringField()
 
-            meta = {
-                'allow_inheritance': True,
-                'indexes': ['b']
-            }
+            meta = {"allow_inheritance": True, "indexes": ["b"]}
 
         class C(A, B):
             pass
@@ -233,8 +304,12 @@ class C(A, B):
         C.ensure_indexes()
 
         self.assertEqual(
-            sorted([idx['key'] for idx in C._get_collection().index_information().values()]),
-            sorted([[(u'_cls', 1), (u'b', 1)], [(u'_id', 1)], [(u'_cls', 1), (u'a', 1)]])
+            sorted(
+                [idx["key"] for idx in C._get_collection().index_information().values()]
+            ),
+            sorted(
+                [[(u"_cls", 1), (u"b", 1)], [(u"_id", 1)], [(u"_cls", 1), (u"a", 1)]]
+            ),
         )
 
     def test_polymorphic_queries(self):
@@ -242,11 +317,19 @@ def test_polymorphic_queries(self):
         """
 
         class Animal(Document):
-            meta = {'allow_inheritance': True}
-        class Fish(Animal): pass
-        class Mammal(Animal): pass
-        class Dog(Mammal): pass
-        class Human(Mammal): pass
+            meta = {"allow_inheritance": True}
+
+        class Fish(Animal):
+            pass
+
+        class Mammal(Animal):
+            pass
+
+        class Dog(Mammal):
+            pass
+
+        class Human(Mammal):
+            pass
 
         Animal.drop_collection()
 
@@ -269,58 +352,68 @@ def test_allow_inheritance(self):
         """Ensure that inheritance is disabled by default on simple
         classes and that _cls will not be used.
         """
+
         class Animal(Document):
             name = StringField()
 
         # can't inherit because Animal didn't explicitly allow inheritance
         with self.assertRaises(ValueError) as cm:
+
             class Dog(Animal):
                 pass
+
         self.assertIn("Document Animal may not be subclassed", str(cm.exception))
 
         # Check that _cls etc aren't present on simple documents
-        dog = Animal(name='dog').save()
-        self.assertEqual(dog.to_mongo().keys(), ['_id', 'name'])
+        dog = Animal(name="dog").save()
+        self.assertEqual(dog.to_mongo().keys(), ["_id", "name"])
 
         collection = self.db[Animal._get_collection_name()]
         obj = collection.find_one()
-        self.assertNotIn('_cls', obj)
+        self.assertNotIn("_cls", obj)
 
     def test_cant_turn_off_inheritance_on_subclass(self):
         """Ensure if inheritance is on in a subclass you cant turn it off.
         """
+
         class Animal(Document):
             name = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         with self.assertRaises(ValueError) as cm:
+
             class Mammal(Animal):
-                meta = {'allow_inheritance': False}
-        self.assertEqual(str(cm.exception), 'Only direct subclasses of Document may set "allow_inheritance" to False')
+                meta = {"allow_inheritance": False}
+
+        self.assertEqual(
+            str(cm.exception),
+            'Only direct subclasses of Document may set "allow_inheritance" to False',
+        )
 
     def test_allow_inheritance_abstract_document(self):
         """Ensure that abstract documents can set inheritance rules and that
         _cls will not be used.
         """
+
         class FinalDocument(Document):
-            meta = {'abstract': True,
-                    'allow_inheritance': False}
+            meta = {"abstract": True, "allow_inheritance": False}
 
         class Animal(FinalDocument):
             name = StringField()
 
         with self.assertRaises(ValueError) as cm:
+
             class Mammal(Animal):
                 pass
 
         # Check that _cls isn't present in simple documents
-        doc = Animal(name='dog')
-        self.assertNotIn('_cls', doc.to_mongo())
+        doc = Animal(name="dog")
+        self.assertNotIn("_cls", doc.to_mongo())
 
     def test_using_abstract_class_in_reference_field(self):
         # Ensures no regression of #1920
         class AbstractHuman(Document):
-            meta = {'abstract': True}
+            meta = {"abstract": True}
 
         class Dad(AbstractHuman):
             name = StringField()
@@ -329,130 +422,122 @@ class Home(Document):
             dad = ReferenceField(AbstractHuman)  # Referencing the abstract class
             address = StringField()
 
-        dad = Dad(name='5').save()
-        Home(dad=dad, address='street').save()
+        dad = Dad(name="5").save()
+        Home(dad=dad, address="street").save()
 
         home = Home.objects.first()
-        home.address = 'garbage'
-        home.save()     # Was failing with ValidationError
+        home.address = "garbage"
+        home.save()  # Was failing with ValidationError
 
     def test_abstract_class_referencing_self(self):
         # Ensures no regression of #1920
         class Human(Document):
-            meta = {'abstract': True}
-            creator = ReferenceField('self', dbref=True)
+            meta = {"abstract": True}
+            creator = ReferenceField("self", dbref=True)
 
         class User(Human):
             name = StringField()
 
-        user = User(name='John').save()
-        user2 = User(name='Foo', creator=user).save()
+        user = User(name="John").save()
+        user2 = User(name="Foo", creator=user).save()
 
         user2 = User.objects.with_id(user2.id)
-        user2.name = 'Bar'
-        user2.save()    # Was failing with ValidationError
+        user2.name = "Bar"
+        user2.save()  # Was failing with ValidationError
 
     def test_abstract_handle_ids_in_metaclass_properly(self):
-
         class City(Document):
             continent = StringField()
-            meta = {'abstract': True,
-                    'allow_inheritance': False}
+            meta = {"abstract": True, "allow_inheritance": False}
 
         class EuropeanCity(City):
             name = StringField()
 
-        berlin = EuropeanCity(name='Berlin', continent='Europe')
+        berlin = EuropeanCity(name="Berlin", continent="Europe")
         self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
         self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
         self.assertEqual(len(berlin._fields_ordered), 3)
-        self.assertEqual(berlin._fields_ordered[0], 'id')
+        self.assertEqual(berlin._fields_ordered[0], "id")
 
     def test_auto_id_not_set_if_specific_in_parent_class(self):
-
         class City(Document):
             continent = StringField()
             city_id = IntField(primary_key=True)
-            meta = {'abstract': True,
-                    'allow_inheritance': False}
+            meta = {"abstract": True, "allow_inheritance": False}
 
         class EuropeanCity(City):
             name = StringField()
 
-        berlin = EuropeanCity(name='Berlin', continent='Europe')
+        berlin = EuropeanCity(name="Berlin", continent="Europe")
         self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
         self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
         self.assertEqual(len(berlin._fields_ordered), 3)
-        self.assertEqual(berlin._fields_ordered[0], 'city_id')
+        self.assertEqual(berlin._fields_ordered[0], "city_id")
 
     def test_auto_id_vs_non_pk_id_field(self):
-
         class City(Document):
             continent = StringField()
             id = IntField()
-            meta = {'abstract': True,
-                    'allow_inheritance': False}
+            meta = {"abstract": True, "allow_inheritance": False}
 
         class EuropeanCity(City):
             name = StringField()
 
-        berlin = EuropeanCity(name='Berlin', continent='Europe')
+        berlin = EuropeanCity(name="Berlin", continent="Europe")
         self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
         self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
         self.assertEqual(len(berlin._fields_ordered), 4)
-        self.assertEqual(berlin._fields_ordered[0], 'auto_id_0')
+        self.assertEqual(berlin._fields_ordered[0], "auto_id_0")
         berlin.save()
         self.assertEqual(berlin.pk, berlin.auto_id_0)
 
     def test_abstract_document_creation_does_not_fail(self):
         class City(Document):
             continent = StringField()
-            meta = {'abstract': True,
-                    'allow_inheritance': False}
+            meta = {"abstract": True, "allow_inheritance": False}
 
-        city = City(continent='asia')
+        city = City(continent="asia")
         self.assertEqual(None, city.pk)
         # TODO: expected error? Shouldn't we create a new error type?
         with self.assertRaises(KeyError):
-            setattr(city, 'pk', 1)
+            setattr(city, "pk", 1)
 
     def test_allow_inheritance_embedded_document(self):
         """Ensure embedded documents respect inheritance."""
+
         class Comment(EmbeddedDocument):
             content = StringField()
 
         with self.assertRaises(ValueError):
+
             class SpecialComment(Comment):
                 pass
 
-        doc = Comment(content='test')
-        self.assertNotIn('_cls', doc.to_mongo())
+        doc = Comment(content="test")
+        self.assertNotIn("_cls", doc.to_mongo())
 
         class Comment(EmbeddedDocument):
             content = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
-        doc = Comment(content='test')
-        self.assertIn('_cls', doc.to_mongo())
+        doc = Comment(content="test")
+        self.assertIn("_cls", doc.to_mongo())
 
     def test_document_inheritance(self):
         """Ensure mutliple inheritance of abstract documents
         """
+
         class DateCreatedDocument(Document):
-            meta = {
-                'allow_inheritance': True,
-                'abstract': True,
-            }
+            meta = {"allow_inheritance": True, "abstract": True}
 
         class DateUpdatedDocument(Document):
-            meta = {
-                'allow_inheritance': True,
-                'abstract': True,
-            }
+            meta = {"allow_inheritance": True, "abstract": True}
 
         try:
+
             class MyDocument(DateCreatedDocument, DateUpdatedDocument):
                 pass
+
         except Exception:
             self.assertTrue(False, "Couldn't create MyDocument class")
 
@@ -460,47 +545,55 @@ def test_abstract_documents(self):
         """Ensure that a document superclass can be marked as abstract
         thereby not using it as the name for the collection."""
 
-        defaults = {'index_background': True,
-                    'index_drop_dups': True,
-                    'index_opts': {'hello': 'world'},
-                    'allow_inheritance': True,
-                    'queryset_class': 'QuerySet',
-                    'db_alias': 'myDB',
-                    'shard_key': ('hello', 'world')}
-
-        meta_settings = {'abstract': True}
+        defaults = {
+            "index_background": True,
+            "index_drop_dups": True,
+            "index_opts": {"hello": "world"},
+            "allow_inheritance": True,
+            "queryset_class": "QuerySet",
+            "db_alias": "myDB",
+            "shard_key": ("hello", "world"),
+        }
+
+        meta_settings = {"abstract": True}
         meta_settings.update(defaults)
 
         class Animal(Document):
             name = StringField()
             meta = meta_settings
 
-        class Fish(Animal): pass
-        class Guppy(Fish): pass
+        class Fish(Animal):
+            pass
+
+        class Guppy(Fish):
+            pass
 
         class Mammal(Animal):
-            meta = {'abstract': True}
-        class Human(Mammal): pass
+            meta = {"abstract": True}
+
+        class Human(Mammal):
+            pass
 
         for k, v in iteritems(defaults):
             for cls in [Animal, Fish, Guppy]:
                 self.assertEqual(cls._meta[k], v)
 
-        self.assertNotIn('collection', Animal._meta)
-        self.assertNotIn('collection', Mammal._meta)
+        self.assertNotIn("collection", Animal._meta)
+        self.assertNotIn("collection", Mammal._meta)
 
         self.assertEqual(Animal._get_collection_name(), None)
         self.assertEqual(Mammal._get_collection_name(), None)
 
-        self.assertEqual(Fish._get_collection_name(), 'fish')
-        self.assertEqual(Guppy._get_collection_name(), 'fish')
-        self.assertEqual(Human._get_collection_name(), 'human')
+        self.assertEqual(Fish._get_collection_name(), "fish")
+        self.assertEqual(Guppy._get_collection_name(), "fish")
+        self.assertEqual(Human._get_collection_name(), "human")
 
         # ensure that a subclass of a non-abstract class can't be abstract
         with self.assertRaises(ValueError):
+
             class EvilHuman(Human):
                 evil = BooleanField(default=True)
-                meta = {'abstract': True}
+                meta = {"abstract": True}
 
     def test_abstract_embedded_documents(self):
         # 789: EmbeddedDocument shouldn't inherit abstract
@@ -519,7 +612,7 @@ def test_inherited_collections(self):
 
         class Drink(Document):
             name = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class Drinker(Document):
             drink = GenericReferenceField()
@@ -528,13 +621,13 @@ class Drinker(Document):
             warnings.simplefilter("error")
 
             class AcloholicDrink(Drink):
-                meta = {'collection': 'booze'}
+                meta = {"collection": "booze"}
 
         except SyntaxWarning:
             warnings.simplefilter("ignore")
 
             class AlcoholicDrink(Drink):
-                meta = {'collection': 'booze'}
+                meta = {"collection": "booze"}
 
         else:
             raise AssertionError("SyntaxWarning should be triggered")
@@ -545,13 +638,13 @@ class AlcoholicDrink(Drink):
         AlcoholicDrink.drop_collection()
         Drinker.drop_collection()
 
-        red_bull = Drink(name='Red Bull')
+        red_bull = Drink(name="Red Bull")
         red_bull.save()
 
         programmer = Drinker(drink=red_bull)
         programmer.save()
 
-        beer = AlcoholicDrink(name='Beer')
+        beer = AlcoholicDrink(name="Beer")
         beer.save()
         real_person = Drinker(drink=beer)
         real_person.save()
@@ -560,5 +653,5 @@ class AlcoholicDrink(Drink):
         self.assertEqual(Drinker.objects[1].drink.name, beer.name)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 06f650767..49606cffd 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -16,24 +16,33 @@
 from mongoengine.base import _document_registry, get_document
 from mongoengine.connection import get_db
 from mongoengine.context_managers import query_counter, switch_db
-from mongoengine.errors import (FieldDoesNotExist, InvalidDocumentError, \
-                                InvalidQueryError, NotRegistered, NotUniqueError, SaveConditionError)
+from mongoengine.errors import (
+    FieldDoesNotExist,
+    InvalidDocumentError,
+    InvalidQueryError,
+    NotRegistered,
+    NotUniqueError,
+    SaveConditionError,
+)
 from mongoengine.mongodb_support import MONGODB_34, MONGODB_36, get_mongodb_version
 from mongoengine.pymongo_support import list_collection_names
 from mongoengine.queryset import NULLIFY, Q
 from tests import fixtures
-from tests.fixtures import (PickleDynamicEmbedded, PickleDynamicTest, \
-                            PickleEmbedded, PickleSignalsTest, PickleTest)
+from tests.fixtures import (
+    PickleDynamicEmbedded,
+    PickleDynamicTest,
+    PickleEmbedded,
+    PickleSignalsTest,
+    PickleTest,
+)
 from tests.utils import MongoDBTestCase, get_as_pymongo
 
-TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__),
-                               '../fields/mongoengine.png')
+TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
 
 __all__ = ("InstanceTest",)
 
 
 class InstanceTest(MongoDBTestCase):
-
     def setUp(self):
         class Job(EmbeddedDocument):
             name = StringField()
@@ -58,7 +67,8 @@ def tearDown(self):
     def assertDbEqual(self, docs):
         self.assertEqual(
             list(self.Person._get_collection().find().sort("id")),
-            sorted(docs, key=lambda doc: doc["_id"]))
+            sorted(docs, key=lambda doc: doc["_id"]),
+        )
 
     def assertHasInstance(self, field, instance):
         self.assertTrue(hasattr(field, "_instance"))
@@ -70,12 +80,10 @@ def assertHasInstance(self, field, instance):
 
     def test_capped_collection(self):
         """Ensure that capped collections work properly."""
+
         class Log(Document):
             date = DateTimeField(default=datetime.now)
-            meta = {
-                'max_documents': 10,
-                'max_size': 4096,
-            }
+            meta = {"max_documents": 10, "max_size": 4096}
 
         Log.drop_collection()
 
@@ -90,16 +98,14 @@ class Log(Document):
         self.assertEqual(Log.objects.count(), 10)
 
         options = Log.objects._collection.options()
-        self.assertEqual(options['capped'], True)
-        self.assertEqual(options['max'], 10)
-        self.assertEqual(options['size'], 4096)
+        self.assertEqual(options["capped"], True)
+        self.assertEqual(options["max"], 10)
+        self.assertEqual(options["size"], 4096)
 
         # Check that the document cannot be redefined with different options
         class Log(Document):
             date = DateTimeField(default=datetime.now)
-            meta = {
-                'max_documents': 11,
-            }
+            meta = {"max_documents": 11}
 
         # Accessing Document.objects creates the collection
         with self.assertRaises(InvalidCollectionError):
@@ -107,11 +113,10 @@ class Log(Document):
 
     def test_capped_collection_default(self):
         """Ensure that capped collections defaults work properly."""
+
         class Log(Document):
             date = DateTimeField(default=datetime.now)
-            meta = {
-                'max_documents': 10,
-            }
+            meta = {"max_documents": 10}
 
         Log.drop_collection()
 
@@ -119,16 +124,14 @@ class Log(Document):
         Log().save()
 
         options = Log.objects._collection.options()
-        self.assertEqual(options['capped'], True)
-        self.assertEqual(options['max'], 10)
-        self.assertEqual(options['size'], 10 * 2**20)
+        self.assertEqual(options["capped"], True)
+        self.assertEqual(options["max"], 10)
+        self.assertEqual(options["size"], 10 * 2 ** 20)
 
         # Check that the document with default value can be recreated
         class Log(Document):
             date = DateTimeField(default=datetime.now)
-            meta = {
-                'max_documents': 10,
-            }
+            meta = {"max_documents": 10}
 
         # Create the collection by accessing Document.objects
         Log.objects
@@ -138,11 +141,10 @@ def test_capped_collection_no_max_size_problems(self):
         MongoDB rounds up max_size to next multiple of 256, recreating a doc
         with the same spec failed in mongoengine <0.10
         """
+
         class Log(Document):
             date = DateTimeField(default=datetime.now)
-            meta = {
-                'max_size': 10000,
-            }
+            meta = {"max_size": 10000}
 
         Log.drop_collection()
 
@@ -150,15 +152,13 @@ class Log(Document):
         Log().save()
 
         options = Log.objects._collection.options()
-        self.assertEqual(options['capped'], True)
-        self.assertTrue(options['size'] >= 10000)
+        self.assertEqual(options["capped"], True)
+        self.assertTrue(options["size"] >= 10000)
 
         # Check that the document with odd max_size value can be recreated
         class Log(Document):
             date = DateTimeField(default=datetime.now)
-            meta = {
-                'max_size': 10000,
-            }
+            meta = {"max_size": 10000}
 
         # Create the collection by accessing Document.objects
         Log.objects
@@ -166,26 +166,28 @@ class Log(Document):
     def test_repr(self):
         """Ensure that unicode representation works
         """
+
         class Article(Document):
             title = StringField()
 
             def __unicode__(self):
                 return self.title
 
-        doc = Article(title=u'привет мир')
+        doc = Article(title=u"привет мир")
 
-        self.assertEqual('<Article: привет мир>', repr(doc))
+        self.assertEqual("<Article: привет мир>", repr(doc))
 
     def test_repr_none(self):
         """Ensure None values are handled correctly."""
+
         class Article(Document):
             title = StringField()
 
             def __str__(self):
                 return None
 
-        doc = Article(title=u'привет мир')
-        self.assertEqual('<Article: None>', repr(doc))
+        doc = Article(title=u"привет мир")
+        self.assertEqual("<Article: None>", repr(doc))
 
     def test_queryset_resurrects_dropped_collection(self):
         self.Person.drop_collection()
@@ -203,8 +205,9 @@ def test_polymorphic_references(self):
         """Ensure that the correct subclasses are returned from a query
         when using references / generic references
         """
+
         class Animal(Document):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class Fish(Animal):
             pass
@@ -255,7 +258,7 @@ def test_reference_inheritance(self):
         class Stats(Document):
             created = DateTimeField(default=datetime.now)
 
-            meta = {'allow_inheritance': False}
+            meta = {"allow_inheritance": False}
 
         class CompareStats(Document):
             generated = DateTimeField(default=datetime.now)
@@ -278,6 +281,7 @@ class CompareStats(Document):
 
     def test_db_field_load(self):
         """Ensure we load data correctly from the right db field."""
+
         class Person(Document):
             name = StringField(required=True)
             _rank = StringField(required=False, db_field="rank")
@@ -297,14 +301,13 @@ def rank(self):
 
     def test_db_embedded_doc_field_load(self):
         """Ensure we load embedded document data correctly."""
+
         class Rank(EmbeddedDocument):
             title = StringField(required=True)
 
         class Person(Document):
             name = StringField(required=True)
-            rank_ = EmbeddedDocumentField(Rank,
-                                          required=False,
-                                          db_field='rank')
+            rank_ = EmbeddedDocumentField(Rank, required=False, db_field="rank")
 
             @property
             def rank(self):
@@ -322,45 +325,50 @@ def rank(self):
 
     def test_custom_id_field(self):
         """Ensure that documents may be created with custom primary keys."""
+
         class User(Document):
             username = StringField(primary_key=True)
             name = StringField()
 
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         User.drop_collection()
 
-        self.assertEqual(User._fields['username'].db_field, '_id')
-        self.assertEqual(User._meta['id_field'], 'username')
+        self.assertEqual(User._fields["username"].db_field, "_id")
+        self.assertEqual(User._meta["id_field"], "username")
 
-        User.objects.create(username='test', name='test user')
+        User.objects.create(username="test", name="test user")
         user = User.objects.first()
-        self.assertEqual(user.id, 'test')
-        self.assertEqual(user.pk, 'test')
+        self.assertEqual(user.id, "test")
+        self.assertEqual(user.pk, "test")
         user_dict = User.objects._collection.find_one()
-        self.assertEqual(user_dict['_id'], 'test')
+        self.assertEqual(user_dict["_id"], "test")
 
     def test_change_custom_id_field_in_subclass(self):
         """Subclasses cannot override which field is the primary key."""
+
         class User(Document):
             username = StringField(primary_key=True)
             name = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         with self.assertRaises(ValueError) as e:
+
             class EmailUser(User):
                 email = StringField(primary_key=True)
+
         exc = e.exception
-        self.assertEqual(str(exc), 'Cannot override primary key field')
+        self.assertEqual(str(exc), "Cannot override primary key field")
 
     def test_custom_id_field_is_required(self):
         """Ensure the custom primary key field is required."""
+
         class User(Document):
             username = StringField(primary_key=True)
             name = StringField()
 
         with self.assertRaises(ValidationError) as e:
-            User(name='test').save()
+            User(name="test").save()
         exc = e.exception
         self.assertTrue("Field is required: ['username']" in str(exc))
 
@@ -368,7 +376,7 @@ def test_document_not_registered(self):
         class Place(Document):
             name = StringField()
 
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class NicePlace(Place):
             pass
@@ -380,7 +388,7 @@ class NicePlace(Place):
 
         # Mimic Place and NicePlace definitions being in a different file
         # and the NicePlace model not being imported in at query time.
-        del(_document_registry['Place.NicePlace'])
+        del _document_registry["Place.NicePlace"]
 
         with self.assertRaises(NotRegistered):
             list(Place.objects.all())
@@ -388,10 +396,10 @@ class NicePlace(Place):
     def test_document_registry_regressions(self):
         class Location(Document):
             name = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class Area(Location):
-            location = ReferenceField('Location', dbref=True)
+            location = ReferenceField("Location", dbref=True)
 
         Location.drop_collection()
 
@@ -413,18 +421,19 @@ def test_to_dbref(self):
 
     def test_key_like_attribute_access(self):
         person = self.Person(age=30)
-        self.assertEqual(person['age'], 30)
+        self.assertEqual(person["age"], 30)
         with self.assertRaises(KeyError):
-            person['unknown_attr']
+            person["unknown_attr"]
 
     def test_save_abstract_document(self):
         """Saving an abstract document should fail."""
+
         class Doc(Document):
             name = StringField()
-            meta = {'abstract': True}
+            meta = {"abstract": True}
 
         with self.assertRaises(InvalidDocumentError):
-            Doc(name='aaa').save()
+            Doc(name="aaa").save()
 
     def test_reload(self):
         """Ensure that attributes may be reloaded."""
@@ -439,7 +448,7 @@ def test_reload(self):
         self.assertEqual(person.name, "Test User")
         self.assertEqual(person.age, 20)
 
-        person.reload('age')
+        person.reload("age")
         self.assertEqual(person.name, "Test User")
         self.assertEqual(person.age, 21)
 
@@ -454,19 +463,22 @@ def test_reload(self):
     def test_reload_sharded(self):
         class Animal(Document):
             superphylum = StringField()
-            meta = {'shard_key': ('superphylum',)}
+            meta = {"shard_key": ("superphylum",)}
 
         Animal.drop_collection()
-        doc = Animal(superphylum='Deuterostomia')
+        doc = Animal(superphylum="Deuterostomia")
         doc.save()
 
         mongo_db = get_mongodb_version()
-        CMD_QUERY_KEY = 'command' if mongo_db >= MONGODB_36 else 'query'
+        CMD_QUERY_KEY = "command" if mongo_db >= MONGODB_36 else "query"
 
         with query_counter() as q:
             doc.reload()
-            query_op = q.db.system.profile.find({'ns': 'mongoenginetest.animal'})[0]
-            self.assertEqual(set(query_op[CMD_QUERY_KEY]['filter'].keys()), set(['_id', 'superphylum']))
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
+            self.assertEqual(
+                set(query_op[CMD_QUERY_KEY]["filter"].keys()),
+                set(["_id", "superphylum"]),
+            )
 
         Animal.drop_collection()
 
@@ -476,10 +488,10 @@ class SuperPhylum(EmbeddedDocument):
 
         class Animal(Document):
             superphylum = EmbeddedDocumentField(SuperPhylum)
-            meta = {'shard_key': ('superphylum.name',)}
+            meta = {"shard_key": ("superphylum.name",)}
 
         Animal.drop_collection()
-        doc = Animal(superphylum=SuperPhylum(name='Deuterostomia'))
+        doc = Animal(superphylum=SuperPhylum(name="Deuterostomia"))
         doc.save()
         doc.reload()
         Animal.drop_collection()
@@ -488,49 +500,57 @@ def test_update_shard_key_routing(self):
         """Ensures updating a doc with a specified shard_key includes it in
         the query.
         """
+
         class Animal(Document):
             is_mammal = BooleanField()
             name = StringField()
-            meta = {'shard_key': ('is_mammal', 'id')}
+            meta = {"shard_key": ("is_mammal", "id")}
 
         Animal.drop_collection()
-        doc = Animal(is_mammal=True, name='Dog')
+        doc = Animal(is_mammal=True, name="Dog")
         doc.save()
 
         mongo_db = get_mongodb_version()
 
         with query_counter() as q:
-            doc.name = 'Cat'
+            doc.name = "Cat"
             doc.save()
-            query_op = q.db.system.profile.find({'ns': 'mongoenginetest.animal'})[0]
-            self.assertEqual(query_op['op'], 'update')
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
+            self.assertEqual(query_op["op"], "update")
             if mongo_db <= MONGODB_34:
-                self.assertEqual(set(query_op['query'].keys()), set(['_id', 'is_mammal']))
+                self.assertEqual(
+                    set(query_op["query"].keys()), set(["_id", "is_mammal"])
+                )
             else:
-                self.assertEqual(set(query_op['command']['q'].keys()), set(['_id', 'is_mammal']))
+                self.assertEqual(
+                    set(query_op["command"]["q"].keys()), set(["_id", "is_mammal"])
+                )
 
         Animal.drop_collection()
 
     def test_reload_with_changed_fields(self):
         """Ensures reloading will not affect changed fields"""
+
         class User(Document):
             name = StringField()
             number = IntField()
+
         User.drop_collection()
 
         user = User(name="Bob", number=1).save()
         user.name = "John"
         user.number = 2
 
-        self.assertEqual(user._get_changed_fields(), ['name', 'number'])
-        user.reload('number')
-        self.assertEqual(user._get_changed_fields(), ['name'])
+        self.assertEqual(user._get_changed_fields(), ["name", "number"])
+        user.reload("number")
+        self.assertEqual(user._get_changed_fields(), ["name"])
         user.save()
         user.reload()
         self.assertEqual(user.name, "John")
 
     def test_reload_referencing(self):
         """Ensures reloading updates weakrefs correctly."""
+
         class Embedded(EmbeddedDocument):
             dict_field = DictField()
             list_field = ListField()
@@ -542,24 +562,30 @@ class Doc(Document):
 
         Doc.drop_collection()
         doc = Doc()
-        doc.dict_field = {'hello': 'world'}
-        doc.list_field = ['1', 2, {'hello': 'world'}]
+        doc.dict_field = {"hello": "world"}
+        doc.list_field = ["1", 2, {"hello": "world"}]
 
         embedded_1 = Embedded()
-        embedded_1.dict_field = {'hello': 'world'}
-        embedded_1.list_field = ['1', 2, {'hello': 'world'}]
+        embedded_1.dict_field = {"hello": "world"}
+        embedded_1.list_field = ["1", 2, {"hello": "world"}]
         doc.embedded_field = embedded_1
         doc.save()
 
         doc = doc.reload(10)
         doc.list_field.append(1)
-        doc.dict_field['woot'] = "woot"
+        doc.dict_field["woot"] = "woot"
         doc.embedded_field.list_field.append(1)
-        doc.embedded_field.dict_field['woot'] = "woot"
+        doc.embedded_field.dict_field["woot"] = "woot"
 
-        self.assertEqual(doc._get_changed_fields(), [
-            'list_field', 'dict_field.woot', 'embedded_field.list_field',
-            'embedded_field.dict_field.woot'])
+        self.assertEqual(
+            doc._get_changed_fields(),
+            [
+                "list_field",
+                "dict_field.woot",
+                "embedded_field.list_field",
+                "embedded_field.dict_field.woot",
+            ],
+        )
         doc.save()
 
         self.assertEqual(len(doc.list_field), 4)
@@ -572,9 +598,9 @@ class Doc(Document):
 
         doc.list_field.append(1)
         doc.save()
-        doc.dict_field['extra'] = 1
-        doc = doc.reload(10, 'list_field')
-        self.assertEqual(doc._get_changed_fields(), ['dict_field.extra'])
+        doc.dict_field["extra"] = 1
+        doc = doc.reload(10, "list_field")
+        self.assertEqual(doc._get_changed_fields(), ["dict_field.extra"])
         self.assertEqual(len(doc.list_field), 5)
         self.assertEqual(len(doc.dict_field), 3)
         self.assertEqual(len(doc.embedded_field.list_field), 4)
@@ -596,19 +622,17 @@ class Foo(Document):
 
     def test_reload_of_non_strict_with_special_field_name(self):
         """Ensures reloading works for documents with meta strict == False."""
+
         class Post(Document):
-            meta = {
-                'strict': False
-            }
+            meta = {"strict": False}
             title = StringField()
             items = ListField()
 
         Post.drop_collection()
 
-        Post._get_collection().insert_one({
-            "title": "Items eclipse",
-            "items": ["more lorem", "even more ipsum"]
-        })
+        Post._get_collection().insert_one(
+            {"title": "Items eclipse", "items": ["more lorem", "even more ipsum"]}
+        )
 
         post = Post.objects.first()
         post.reload()
@@ -617,22 +641,22 @@ class Post(Document):
 
     def test_dictionary_access(self):
         """Ensure that dictionary-style field access works properly."""
-        person = self.Person(name='Test User', age=30, job=self.Job())
-        self.assertEqual(person['name'], 'Test User')
+        person = self.Person(name="Test User", age=30, job=self.Job())
+        self.assertEqual(person["name"], "Test User")
 
-        self.assertRaises(KeyError, person.__getitem__, 'salary')
-        self.assertRaises(KeyError, person.__setitem__, 'salary', 50)
+        self.assertRaises(KeyError, person.__getitem__, "salary")
+        self.assertRaises(KeyError, person.__setitem__, "salary", 50)
 
-        person['name'] = 'Another User'
-        self.assertEqual(person['name'], 'Another User')
+        person["name"] = "Another User"
+        self.assertEqual(person["name"], "Another User")
 
         # Length = length(assigned fields + id)
         self.assertEqual(len(person), 5)
 
-        self.assertIn('age', person)
+        self.assertIn("age", person)
         person.age = None
-        self.assertNotIn('age', person)
-        self.assertNotIn('nationality', person)
+        self.assertNotIn("age", person)
+        self.assertNotIn("nationality", person)
 
     def test_embedded_document_to_mongo(self):
         class Person(EmbeddedDocument):
@@ -644,29 +668,33 @@ class Person(EmbeddedDocument):
         class Employee(Person):
             salary = IntField()
 
-        self.assertEqual(Person(name="Bob", age=35).to_mongo().keys(),
-                         ['_cls', 'name', 'age'])
+        self.assertEqual(
+            Person(name="Bob", age=35).to_mongo().keys(), ["_cls", "name", "age"]
+        )
         self.assertEqual(
             Employee(name="Bob", age=35, salary=0).to_mongo().keys(),
-            ['_cls', 'name', 'age', 'salary'])
+            ["_cls", "name", "age", "salary"],
+        )
 
     def test_embedded_document_to_mongo_id(self):
         class SubDoc(EmbeddedDocument):
             id = StringField(required=True)
 
         sub_doc = SubDoc(id="abc")
-        self.assertEqual(sub_doc.to_mongo().keys(), ['id'])
+        self.assertEqual(sub_doc.to_mongo().keys(), ["id"])
 
     def test_embedded_document(self):
         """Ensure that embedded documents are set up correctly."""
+
         class Comment(EmbeddedDocument):
             content = StringField()
 
-        self.assertIn('content', Comment._fields)
-        self.assertNotIn('id', Comment._fields)
+        self.assertIn("content", Comment._fields)
+        self.assertNotIn("id", Comment._fields)
 
     def test_embedded_document_instance(self):
         """Ensure that embedded documents can reference parent instance."""
+
         class Embedded(EmbeddedDocument):
             string = StringField()
 
@@ -686,6 +714,7 @@ def test_embedded_document_complex_instance(self):
         """Ensure that embedded documents in complex fields can reference
         parent instance.
         """
+
         class Embedded(EmbeddedDocument):
             string = StringField()
 
@@ -702,15 +731,19 @@ class Doc(Document):
 
     def test_embedded_document_complex_instance_no_use_db_field(self):
         """Ensure that use_db_field is propagated to list of Emb Docs."""
+
         class Embedded(EmbeddedDocument):
-            string = StringField(db_field='s')
+            string = StringField(db_field="s")
 
         class Doc(Document):
             embedded_field = ListField(EmbeddedDocumentField(Embedded))
 
-        d = Doc(embedded_field=[Embedded(string="Hi")]).to_mongo(
-            use_db_field=False).to_dict()
-        self.assertEqual(d['embedded_field'], [{'string': 'Hi'}])
+        d = (
+            Doc(embedded_field=[Embedded(string="Hi")])
+            .to_mongo(use_db_field=False)
+            .to_dict()
+        )
+        self.assertEqual(d["embedded_field"], [{"string": "Hi"}])
 
     def test_instance_is_set_on_setattr(self):
         class Email(EmbeddedDocument):
@@ -722,7 +755,7 @@ class Account(Document):
         Account.drop_collection()
 
         acc = Account()
-        acc.email = Email(email='test@example.com')
+        acc.email = Email(email="test@example.com")
         self.assertHasInstance(acc._data["email"], acc)
         acc.save()
 
@@ -738,7 +771,7 @@ class Account(Document):
 
         Account.drop_collection()
         acc = Account()
-        acc.emails = [Email(email='test@example.com')]
+        acc.emails = [Email(email="test@example.com")]
         self.assertHasInstance(acc._data["emails"][0], acc)
         acc.save()
 
@@ -764,22 +797,19 @@ class BlogPost(Document):
 
             @classmethod
             def pre_save_post_validation(cls, sender, document, **kwargs):
-                document.content = 'checked'
+                document.content = "checked"
 
-        signals.pre_save_post_validation.connect(BlogPost.pre_save_post_validation, sender=BlogPost)
+        signals.pre_save_post_validation.connect(
+            BlogPost.pre_save_post_validation, sender=BlogPost
+        )
 
         BlogPost.drop_collection()
 
-        post = BlogPost(content='unchecked').save()
-        self.assertEqual(post.content, 'checked')
+        post = BlogPost(content="unchecked").save()
+        self.assertEqual(post.content, "checked")
         # Make sure pre_save_post_validation changes makes it to the db
         raw_doc = get_as_pymongo(post)
-        self.assertEqual(
-            raw_doc,
-            {
-                'content': 'checked',
-                '_id': post.id
-            })
+        self.assertEqual(raw_doc, {"content": "checked", "_id": post.id})
 
         # Important to disconnect as it could cause some assertions in test_signals
         # to fail (due to the garbage collection timing of this signal)
@@ -810,13 +840,7 @@ def clean(self):
         self.assertEqual(t.cleaned, True)
         raw_doc = get_as_pymongo(t)
         # Make sure clean changes makes it to the db
-        self.assertEqual(
-            raw_doc,
-            {
-                'status': 'published',
-                'cleaned': True,
-                '_id': t.id
-            })
+        self.assertEqual(raw_doc, {"status": "published", "cleaned": True, "_id": t.id})
 
     def test_document_embedded_clean(self):
         class TestEmbeddedDocument(EmbeddedDocument):
@@ -824,12 +848,12 @@ class TestEmbeddedDocument(EmbeddedDocument):
             y = IntField(required=True)
             z = IntField(required=True)
 
-            meta = {'allow_inheritance': False}
+            meta = {"allow_inheritance": False}
 
             def clean(self):
                 if self.z:
                     if self.z != self.x + self.y:
-                        raise ValidationError('Value of z != x + y')
+                        raise ValidationError("Value of z != x + y")
                 else:
                     self.z = self.x + self.y
 
@@ -846,7 +870,7 @@ class TestDocument(Document):
 
         expected_msg = "Value of z != x + y"
         self.assertIn(expected_msg, cm.exception.message)
-        self.assertEqual(cm.exception.to_dict(), {'doc': {'__all__': expected_msg}})
+        self.assertEqual(cm.exception.to_dict(), {"doc": {"__all__": expected_msg}})
 
         t = TestDocument(doc=TestEmbeddedDocument(x=10, y=25)).save()
         self.assertEqual(t.doc.z, 35)
@@ -869,7 +893,7 @@ def test_modify_invalid_query(self):
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
         with self.assertRaises(InvalidQueryError):
-            doc1.modify({'id': doc2.id}, set__value=20)
+            doc1.modify({"id": doc2.id}, set__value=20)
 
         self.assertDbEqual(docs)
 
@@ -878,7 +902,7 @@ def test_modify_match_another_document(self):
         doc2 = self.Person(name="jim", age=20).save()
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
-        n_modified = doc1.modify({'name': doc2.name}, set__age=100)
+        n_modified = doc1.modify({"name": doc2.name}, set__age=100)
         self.assertEqual(n_modified, 0)
 
         self.assertDbEqual(docs)
@@ -888,7 +912,7 @@ def test_modify_not_exists(self):
         doc2 = self.Person(id=ObjectId(), name="jim", age=20)
         docs = [dict(doc1.to_mongo())]
 
-        n_modified = doc2.modify({'name': doc2.name}, set__age=100)
+        n_modified = doc2.modify({"name": doc2.name}, set__age=100)
         self.assertEqual(n_modified, 0)
 
         self.assertDbEqual(docs)
@@ -896,7 +920,8 @@ def test_modify_not_exists(self):
     def test_modify_update(self):
         other_doc = self.Person(name="bob", age=10).save()
         doc = self.Person(
-            name="jim", age=20, job=self.Job(name="10gen", years=3)).save()
+            name="jim", age=20, job=self.Job(name="10gen", years=3)
+        ).save()
 
         doc_copy = doc._from_son(doc.to_mongo())
 
@@ -906,7 +931,8 @@ def test_modify_update(self):
         doc.job.years = 3
 
         n_modified = doc.modify(
-            set__age=21, set__job__name="MongoDB", unset__job__years=True)
+            set__age=21, set__job__name="MongoDB", unset__job__years=True
+        )
         self.assertEqual(n_modified, 1)
         doc_copy.age = 21
         doc_copy.job.name = "MongoDB"
@@ -926,62 +952,56 @@ class BlogPost(Document):
             content = EmbeddedDocumentField(Content)
 
         post = BlogPost.objects.create(
-            tags=['python'], content=Content(keywords=['ipsum']))
+            tags=["python"], content=Content(keywords=["ipsum"])
+        )
 
-        self.assertEqual(post.tags, ['python'])
-        post.modify(push__tags__0=['code', 'mongo'])
-        self.assertEqual(post.tags, ['code', 'mongo', 'python'])
+        self.assertEqual(post.tags, ["python"])
+        post.modify(push__tags__0=["code", "mongo"])
+        self.assertEqual(post.tags, ["code", "mongo", "python"])
 
         # Assert same order of the list items is maintained in the db
         self.assertEqual(
-            BlogPost._get_collection().find_one({'_id': post.pk})['tags'],
-            ['code', 'mongo', 'python']
+            BlogPost._get_collection().find_one({"_id": post.pk})["tags"],
+            ["code", "mongo", "python"],
         )
 
-        self.assertEqual(post.content.keywords, ['ipsum'])
-        post.modify(push__content__keywords__0=['lorem'])
-        self.assertEqual(post.content.keywords, ['lorem', 'ipsum'])
+        self.assertEqual(post.content.keywords, ["ipsum"])
+        post.modify(push__content__keywords__0=["lorem"])
+        self.assertEqual(post.content.keywords, ["lorem", "ipsum"])
 
         # Assert same order of the list items is maintained in the db
         self.assertEqual(
-            BlogPost._get_collection().find_one({'_id': post.pk})['content']['keywords'],
-            ['lorem', 'ipsum']
+            BlogPost._get_collection().find_one({"_id": post.pk})["content"][
+                "keywords"
+            ],
+            ["lorem", "ipsum"],
         )
 
     def test_save(self):
         """Ensure that a document may be saved in the database."""
 
         # Create person object and save it to the database
-        person = self.Person(name='Test User', age=30)
+        person = self.Person(name="Test User", age=30)
         person.save()
 
         # Ensure that the object is in the database
         raw_doc = get_as_pymongo(person)
         self.assertEqual(
             raw_doc,
-            {
-                '_cls': 'Person',
-                'name': 'Test User',
-                'age': 30,
-                '_id': person.id
-            })
+            {"_cls": "Person", "name": "Test User", "age": 30, "_id": person.id},
+        )
 
     def test_save_skip_validation(self):
         class Recipient(Document):
             email = EmailField(required=True)
 
-        recipient = Recipient(email='not-an-email')
+        recipient = Recipient(email="not-an-email")
         with self.assertRaises(ValidationError):
             recipient.save()
 
         recipient.save(validate=False)
         raw_doc = get_as_pymongo(recipient)
-        self.assertEqual(
-            raw_doc,
-            {
-                'email': 'not-an-email',
-                '_id': recipient.id
-            })
+        self.assertEqual(raw_doc, {"email": "not-an-email", "_id": recipient.id})
 
     def test_save_with_bad_id(self):
         class Clown(Document):
@@ -1012,8 +1032,8 @@ class User(Document):
     def test_save_max_recursion_not_hit(self):
         class Person(Document):
             name = StringField()
-            parent = ReferenceField('self')
-            friend = ReferenceField('self')
+            parent = ReferenceField("self")
+            friend = ReferenceField("self")
 
         Person.drop_collection()
 
@@ -1031,28 +1051,28 @@ class Person(Document):
         # Confirm can save and it resets the changed fields without hitting
         # max recursion error
         p0 = Person.objects.first()
-        p0.name = 'wpjunior'
+        p0.name = "wpjunior"
         p0.save()
 
     def test_save_max_recursion_not_hit_with_file_field(self):
         class Foo(Document):
             name = StringField()
             picture = FileField()
-            bar = ReferenceField('self')
+            bar = ReferenceField("self")
 
         Foo.drop_collection()
 
-        a = Foo(name='hello').save()
+        a = Foo(name="hello").save()
 
         a.bar = a
-        with open(TEST_IMAGE_PATH, 'rb') as test_image:
+        with open(TEST_IMAGE_PATH, "rb") as test_image:
             a.picture = test_image
             a.save()
 
             # Confirm can save and it resets the changed fields without hitting
             # max recursion error
             b = Foo.objects.with_id(a.id)
-            b.name = 'world'
+            b.name = "world"
             b.save()
 
             self.assertEqual(b.picture, b.bar.picture, b.bar.bar.picture)
@@ -1060,7 +1080,7 @@ class Foo(Document):
     def test_save_cascades(self):
         class Person(Document):
             name = StringField()
-            parent = ReferenceField('self')
+            parent = ReferenceField("self")
 
         Person.drop_collection()
 
@@ -1082,7 +1102,7 @@ class Person(Document):
     def test_save_cascade_kwargs(self):
         class Person(Document):
             name = StringField()
-            parent = ReferenceField('self')
+            parent = ReferenceField("self")
 
         Person.drop_collection()
 
@@ -1102,9 +1122,9 @@ class Person(Document):
     def test_save_cascade_meta_false(self):
         class Person(Document):
             name = StringField()
-            parent = ReferenceField('self')
+            parent = ReferenceField("self")
 
-            meta = {'cascade': False}
+            meta = {"cascade": False}
 
         Person.drop_collection()
 
@@ -1130,9 +1150,9 @@ class Person(Document):
     def test_save_cascade_meta_true(self):
         class Person(Document):
             name = StringField()
-            parent = ReferenceField('self')
+            parent = ReferenceField("self")
 
-            meta = {'cascade': False}
+            meta = {"cascade": False}
 
         Person.drop_collection()
 
@@ -1194,7 +1214,7 @@ def UUID(i):
         w1 = Widget(toggle=False, save_id=UUID(1))
 
         # ignore save_condition on new record creation
-        w1.save(save_condition={'save_id': UUID(42)})
+        w1.save(save_condition={"save_id": UUID(42)})
         w1.reload()
         self.assertFalse(w1.toggle)
         self.assertEqual(w1.save_id, UUID(1))
@@ -1204,8 +1224,9 @@ def UUID(i):
         flip(w1)
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
-        self.assertRaises(SaveConditionError,
-            w1.save, save_condition={'save_id': UUID(42)})
+        self.assertRaises(
+            SaveConditionError, w1.save, save_condition={"save_id": UUID(42)}
+        )
         w1.reload()
         self.assertFalse(w1.toggle)
         self.assertEqual(w1.count, 0)
@@ -1214,7 +1235,7 @@ def UUID(i):
         flip(w1)
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
-        w1.save(save_condition={'save_id': UUID(1)})
+        w1.save(save_condition={"save_id": UUID(1)})
         w1.reload()
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 1)
@@ -1227,27 +1248,29 @@ def UUID(i):
 
         flip(w1)
         w1.save_id = UUID(2)
-        w1.save(save_condition={'save_id': old_id})
+        w1.save(save_condition={"save_id": old_id})
         w1.reload()
         self.assertFalse(w1.toggle)
         self.assertEqual(w1.count, 2)
         flip(w2)
         flip(w2)
-        self.assertRaises(SaveConditionError,
-            w2.save, save_condition={'save_id': old_id})
+        self.assertRaises(
+            SaveConditionError, w2.save, save_condition={"save_id": old_id}
+        )
         w2.reload()
         self.assertFalse(w2.toggle)
         self.assertEqual(w2.count, 2)
 
         # save_condition uses mongoengine-style operator syntax
         flip(w1)
-        w1.save(save_condition={'count__lt': w1.count})
+        w1.save(save_condition={"count__lt": w1.count})
         w1.reload()
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)
         flip(w1)
-        self.assertRaises(SaveConditionError,
-            w1.save, save_condition={'count__gte': w1.count})
+        self.assertRaises(
+            SaveConditionError, w1.save, save_condition={"count__gte": w1.count}
+        )
         w1.reload()
         self.assertTrue(w1.toggle)
         self.assertEqual(w1.count, 3)
@@ -1259,19 +1282,19 @@ class WildBoy(Document):
 
         WildBoy.drop_collection()
 
-        WildBoy(age=12, name='John').save()
+        WildBoy(age=12, name="John").save()
 
         boy1 = WildBoy.objects().first()
         boy2 = WildBoy.objects().first()
 
         boy1.age = 99
         boy1.save()
-        boy2.name = 'Bob'
+        boy2.name = "Bob"
         boy2.save()
 
         fresh_boy = WildBoy.objects().first()
         self.assertEqual(fresh_boy.age, 99)
-        self.assertEqual(fresh_boy.name, 'Bob')
+        self.assertEqual(fresh_boy.name, "Bob")
 
     def test_save_update_selectively_with_custom_pk(self):
         # Prevents regression of #2082
@@ -1282,30 +1305,30 @@ class WildBoy(Document):
 
         WildBoy.drop_collection()
 
-        WildBoy(pk_id='A', age=12, name='John').save()
+        WildBoy(pk_id="A", age=12, name="John").save()
 
         boy1 = WildBoy.objects().first()
         boy2 = WildBoy.objects().first()
 
         boy1.age = 99
         boy1.save()
-        boy2.name = 'Bob'
+        boy2.name = "Bob"
         boy2.save()
 
         fresh_boy = WildBoy.objects().first()
         self.assertEqual(fresh_boy.age, 99)
-        self.assertEqual(fresh_boy.name, 'Bob')
+        self.assertEqual(fresh_boy.name, "Bob")
 
     def test_update(self):
         """Ensure that an existing document is updated instead of be
         overwritten.
         """
         # Create person object and save it to the database
-        person = self.Person(name='Test User', age=30)
+        person = self.Person(name="Test User", age=30)
         person.save()
 
         # Create same person object, with same id, without age
-        same_person = self.Person(name='Test')
+        same_person = self.Person(name="Test")
         same_person.id = person.id
         same_person.save()
 
@@ -1322,54 +1345,54 @@ def test_update(self):
         self.assertEqual(person.age, same_person.age)
 
         # Confirm the saved values
-        self.assertEqual(person.name, 'Test')
+        self.assertEqual(person.name, "Test")
         self.assertEqual(person.age, 30)
 
         # Test only / exclude only updates included fields
-        person = self.Person.objects.only('name').get()
-        person.name = 'User'
+        person = self.Person.objects.only("name").get()
+        person.name = "User"
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, 'User')
+        self.assertEqual(person.name, "User")
         self.assertEqual(person.age, 30)
 
         # test exclude only updates set fields
-        person = self.Person.objects.exclude('name').get()
+        person = self.Person.objects.exclude("name").get()
         person.age = 21
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, 'User')
+        self.assertEqual(person.name, "User")
         self.assertEqual(person.age, 21)
 
         # Test only / exclude can set non excluded / included fields
-        person = self.Person.objects.only('name').get()
-        person.name = 'Test'
+        person = self.Person.objects.only("name").get()
+        person.name = "Test"
         person.age = 30
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, 'Test')
+        self.assertEqual(person.name, "Test")
         self.assertEqual(person.age, 30)
 
         # test exclude only updates set fields
-        person = self.Person.objects.exclude('name').get()
-        person.name = 'User'
+        person = self.Person.objects.exclude("name").get()
+        person.name = "User"
         person.age = 21
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, 'User')
+        self.assertEqual(person.name, "User")
         self.assertEqual(person.age, 21)
 
         # Confirm does remove unrequired fields
-        person = self.Person.objects.exclude('name').get()
+        person = self.Person.objects.exclude("name").get()
         person.age = None
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, 'User')
+        self.assertEqual(person.name, "User")
         self.assertEqual(person.age, None)
 
         person = self.Person.objects.get()
@@ -1384,19 +1407,18 @@ def test_update(self):
     def test_update_rename_operator(self):
         """Test the $rename operator."""
         coll = self.Person._get_collection()
-        doc = self.Person(name='John').save()
-        raw_doc = coll.find_one({'_id': doc.pk})
-        self.assertEqual(set(raw_doc.keys()), set(['_id', '_cls', 'name']))
+        doc = self.Person(name="John").save()
+        raw_doc = coll.find_one({"_id": doc.pk})
+        self.assertEqual(set(raw_doc.keys()), set(["_id", "_cls", "name"]))
 
-        doc.update(rename__name='first_name')
-        raw_doc = coll.find_one({'_id': doc.pk})
-        self.assertEqual(set(raw_doc.keys()),
-                         set(['_id', '_cls', 'first_name']))
-        self.assertEqual(raw_doc['first_name'], 'John')
+        doc.update(rename__name="first_name")
+        raw_doc = coll.find_one({"_id": doc.pk})
+        self.assertEqual(set(raw_doc.keys()), set(["_id", "_cls", "first_name"]))
+        self.assertEqual(raw_doc["first_name"], "John")
 
     def test_inserts_if_you_set_the_pk(self):
-        p1 = self.Person(name='p1', id=bson.ObjectId()).save()
-        p2 = self.Person(name='p2')
+        p1 = self.Person(name="p1", id=bson.ObjectId()).save()
+        p2 = self.Person(name="p2")
         p2.id = bson.ObjectId()
         p2.save()
 
@@ -1410,33 +1432,34 @@ class Simple(Document):
             pass
 
         class Doc(Document):
-            string_field = StringField(default='1')
+            string_field = StringField(default="1")
             int_field = IntField(default=1)
             float_field = FloatField(default=1.1)
             boolean_field = BooleanField(default=True)
             datetime_field = DateTimeField(default=datetime.now)
             embedded_document_field = EmbeddedDocumentField(
-                EmbeddedDoc, default=lambda: EmbeddedDoc())
+                EmbeddedDoc, default=lambda: EmbeddedDoc()
+            )
             list_field = ListField(default=lambda: [1, 2, 3])
             dict_field = DictField(default=lambda: {"hello": "world"})
             objectid_field = ObjectIdField(default=bson.ObjectId)
-            reference_field = ReferenceField(Simple, default=lambda:
-                                             Simple().save())
+            reference_field = ReferenceField(Simple, default=lambda: Simple().save())
             map_field = MapField(IntField(), default=lambda: {"simple": 1})
             decimal_field = DecimalField(default=1.0)
             complex_datetime_field = ComplexDateTimeField(default=datetime.now)
             url_field = URLField(default="http://mongoengine.org/")
             dynamic_field = DynamicField(default=1)
             generic_reference_field = GenericReferenceField(
-                default=lambda: Simple().save())
-            sorted_list_field = SortedListField(IntField(),
-                                                default=lambda: [1, 2, 3])
+                default=lambda: Simple().save()
+            )
+            sorted_list_field = SortedListField(IntField(), default=lambda: [1, 2, 3])
             email_field = EmailField(default="ross@example.com")
             geo_point_field = GeoPointField(default=lambda: [1, 2])
             sequence_field = SequenceField()
             uuid_field = UUIDField(default=uuid.uuid4)
             generic_embedded_document_field = GenericEmbeddedDocumentField(
-                default=lambda: EmbeddedDoc())
+                default=lambda: EmbeddedDoc()
+            )
 
         Simple.drop_collection()
         Doc.drop_collection()
@@ -1454,13 +1477,13 @@ def test_document_update(self):
 
         # try updating a non-saved document
         with self.assertRaises(OperationError):
-            person = self.Person(name='dcrosta')
-            person.update(set__name='Dan Crosta')
+            person = self.Person(name="dcrosta")
+            person.update(set__name="Dan Crosta")
 
-        author = self.Person(name='dcrosta')
+        author = self.Person(name="dcrosta")
         author.save()
 
-        author.update(set__name='Dan Crosta')
+        author.update(set__name="Dan Crosta")
         author.reload()
 
         p1 = self.Person.objects.first()
@@ -1490,9 +1513,9 @@ class Doc(Document):
 
     def test_embedded_update(self):
         """Test update on `EmbeddedDocumentField` fields."""
+
         class Page(EmbeddedDocument):
-            log_message = StringField(verbose_name="Log message",
-                                      required=True)
+            log_message = StringField(verbose_name="Log message", required=True)
 
         class Site(Document):
             page = EmbeddedDocumentField(Page)
@@ -1512,28 +1535,30 @@ class Site(Document):
     def test_update_list_field(self):
         """Test update on `ListField` with $pull + $in.
         """
+
         class Doc(Document):
             foo = ListField(StringField())
 
         Doc.drop_collection()
-        doc = Doc(foo=['a', 'b', 'c'])
+        doc = Doc(foo=["a", "b", "c"])
         doc.save()
 
         # Update
         doc = Doc.objects.first()
-        doc.update(pull__foo__in=['a', 'c'])
+        doc.update(pull__foo__in=["a", "c"])
 
         doc = Doc.objects.first()
-        self.assertEqual(doc.foo, ['b'])
+        self.assertEqual(doc.foo, ["b"])
 
     def test_embedded_update_db_field(self):
         """Test update on `EmbeddedDocumentField` fields when db_field
         is other than default.
         """
+
         class Page(EmbeddedDocument):
-            log_message = StringField(verbose_name="Log message",
-                                      db_field="page_log_message",
-                                      required=True)
+            log_message = StringField(
+                verbose_name="Log message", db_field="page_log_message", required=True
+            )
 
         class Site(Document):
             page = EmbeddedDocumentField(Page)
@@ -1553,13 +1578,14 @@ class Site(Document):
 
     def test_save_only_changed_fields(self):
         """Ensure save only sets / unsets changed fields."""
+
         class User(self.Person):
             active = BooleanField(default=True)
 
         User.drop_collection()
 
         # Create person object and save it to the database
-        user = User(name='Test User', age=30, active=True)
+        user = User(name="Test User", age=30, active=True)
         user.save()
         user.reload()
 
@@ -1570,28 +1596,31 @@ class User(self.Person):
         user.age = 21
         user.save()
 
-        same_person.name = 'User'
+        same_person.name = "User"
         same_person.save()
 
         person = self.Person.objects.get()
-        self.assertEqual(person.name, 'User')
+        self.assertEqual(person.name, "User")
         self.assertEqual(person.age, 21)
         self.assertEqual(person.active, False)
 
-    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_embedded_doc(self):
+    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_embedded_doc(
+        self
+    ):
         # Refers to Issue #1685
         class EmbeddedChildModel(EmbeddedDocument):
             id = DictField(primary_key=True)
 
         class ParentModel(Document):
-            child = EmbeddedDocumentField(
-                EmbeddedChildModel)
+            child = EmbeddedDocumentField(EmbeddedChildModel)
 
-        emb = EmbeddedChildModel(id={'1': [1]})
+        emb = EmbeddedChildModel(id={"1": [1]})
         changed_fields = ParentModel(child=emb)._get_changed_fields()
         self.assertEqual(changed_fields, [])
 
-    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_different_doc(self):
+    def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_different_doc(
+        self
+    ):
         # Refers to Issue #1685
         class User(Document):
             id = IntField(primary_key=True)
@@ -1604,12 +1633,12 @@ class Message(Document):
         Message.drop_collection()
 
         # All objects share the same id, but each in a different collection
-        user = User(id=1, name='user-name').save()
+        user = User(id=1, name="user-name").save()
         message = Message(id=1, author=user).save()
 
-        message.author.name = 'tutu'
+        message.author.name = "tutu"
         self.assertEqual(message._get_changed_fields(), [])
-        self.assertEqual(user._get_changed_fields(), ['name'])
+        self.assertEqual(user._get_changed_fields(), ["name"])
 
     def test__get_changed_fields_same_ids_embedded(self):
         # Refers to Issue #1768
@@ -1624,24 +1653,25 @@ class Message(Document):
         Message.drop_collection()
 
         # All objects share the same id, but each in a different collection
-        user = User(id=1, name='user-name')  # .save()
+        user = User(id=1, name="user-name")  # .save()
         message = Message(id=1, author=user).save()
 
-        message.author.name = 'tutu'
-        self.assertEqual(message._get_changed_fields(), ['author.name'])
+        message.author.name = "tutu"
+        self.assertEqual(message._get_changed_fields(), ["author.name"])
         message.save()
 
         message_fetched = Message.objects.with_id(message.id)
-        self.assertEqual(message_fetched.author.name, 'tutu')
+        self.assertEqual(message_fetched.author.name, "tutu")
 
     def test_query_count_when_saving(self):
         """Ensure references don't cause extra fetches when saving"""
+
         class Organization(Document):
             name = StringField()
 
         class User(Document):
             name = StringField()
-            orgs = ListField(ReferenceField('Organization'))
+            orgs = ListField(ReferenceField("Organization"))
 
         class Feed(Document):
             name = StringField()
@@ -1667,9 +1697,9 @@ class UserSubscription(Document):
         user = User.objects.first()
         # Even if stored as ObjectId's internally mongoengine uses DBRefs
         # As ObjectId's aren't automatically derefenced
-        self.assertIsInstance(user._data['orgs'][0], DBRef)
+        self.assertIsInstance(user._data["orgs"][0], DBRef)
         self.assertIsInstance(user.orgs[0], Organization)
-        self.assertIsInstance(user._data['orgs'][0], Organization)
+        self.assertIsInstance(user._data["orgs"][0], Organization)
 
         # Changing a value
         with query_counter() as q:
@@ -1731,6 +1761,7 @@ def test_set_unset_one_operation(self):
         """Ensure that $set and $unset actions are performed in the
         same operation.
         """
+
         class FooBar(Document):
             foo = StringField(default=None)
             bar = StringField(default=None)
@@ -1738,11 +1769,11 @@ class FooBar(Document):
         FooBar.drop_collection()
 
         # write an entity with a single prop
-        foo = FooBar(foo='foo').save()
+        foo = FooBar(foo="foo").save()
 
-        self.assertEqual(foo.foo, 'foo')
+        self.assertEqual(foo.foo, "foo")
         del foo.foo
-        foo.bar = 'bar'
+        foo.bar = "bar"
 
         with query_counter() as q:
             self.assertEqual(0, q)
@@ -1751,6 +1782,7 @@ class FooBar(Document):
 
     def test_save_only_changed_fields_recursive(self):
         """Ensure save only sets / unsets changed fields."""
+
         class Comment(EmbeddedDocument):
             published = BooleanField(default=True)
 
@@ -1762,7 +1794,7 @@ class User(self.Person):
         User.drop_collection()
 
         # Create person object and save it to the database
-        person = User(name='Test User', age=30, active=True)
+        person = User(name="Test User", age=30, active=True)
         person.comments.append(Comment())
         person.save()
         person.reload()
@@ -1777,17 +1809,17 @@ class User(self.Person):
         self.assertFalse(person.comments[0].published)
 
         # Simple dict w
-        person.comments_dict['first_post'] = Comment()
+        person.comments_dict["first_post"] = Comment()
         person.save()
 
         person = self.Person.objects.get()
-        self.assertTrue(person.comments_dict['first_post'].published)
+        self.assertTrue(person.comments_dict["first_post"].published)
 
-        person.comments_dict['first_post'].published = False
+        person.comments_dict["first_post"].published = False
         person.save()
 
         person = self.Person.objects.get()
-        self.assertFalse(person.comments_dict['first_post'].published)
+        self.assertFalse(person.comments_dict["first_post"].published)
 
     def test_delete(self):
         """Ensure that document may be deleted using the delete method."""
@@ -1801,31 +1833,30 @@ def test_save_custom_id(self):
         """Ensure that a document may be saved with a custom _id."""
 
         # Create person object and save it to the database
-        person = self.Person(name='Test User', age=30,
-                             id='497ce96f395f2f052a494fd4')
+        person = self.Person(name="Test User", age=30, id="497ce96f395f2f052a494fd4")
         person.save()
 
         # Ensure that the object is in the database with the correct _id
         collection = self.db[self.Person._get_collection_name()]
-        person_obj = collection.find_one({'name': 'Test User'})
-        self.assertEqual(str(person_obj['_id']), '497ce96f395f2f052a494fd4')
+        person_obj = collection.find_one({"name": "Test User"})
+        self.assertEqual(str(person_obj["_id"]), "497ce96f395f2f052a494fd4")
 
     def test_save_custom_pk(self):
         """Ensure that a document may be saved with a custom _id using
         pk alias.
         """
         # Create person object and save it to the database
-        person = self.Person(name='Test User', age=30,
-                             pk='497ce96f395f2f052a494fd4')
+        person = self.Person(name="Test User", age=30, pk="497ce96f395f2f052a494fd4")
         person.save()
 
         # Ensure that the object is in the database with the correct _id
         collection = self.db[self.Person._get_collection_name()]
-        person_obj = collection.find_one({'name': 'Test User'})
-        self.assertEqual(str(person_obj['_id']), '497ce96f395f2f052a494fd4')
+        person_obj = collection.find_one({"name": "Test User"})
+        self.assertEqual(str(person_obj["_id"]), "497ce96f395f2f052a494fd4")
 
     def test_save_list(self):
         """Ensure that a list field may be properly saved."""
+
         class Comment(EmbeddedDocument):
             content = StringField()
 
@@ -1836,37 +1867,36 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post = BlogPost(content='Went for a walk today...')
-        post.tags = tags = ['fun', 'leisure']
-        comments = [Comment(content='Good for you'), Comment(content='Yay.')]
+        post = BlogPost(content="Went for a walk today...")
+        post.tags = tags = ["fun", "leisure"]
+        comments = [Comment(content="Good for you"), Comment(content="Yay.")]
         post.comments = comments
         post.save()
 
         collection = self.db[BlogPost._get_collection_name()]
         post_obj = collection.find_one()
-        self.assertEqual(post_obj['tags'], tags)
-        for comment_obj, comment in zip(post_obj['comments'], comments):
-            self.assertEqual(comment_obj['content'], comment['content'])
+        self.assertEqual(post_obj["tags"], tags)
+        for comment_obj, comment in zip(post_obj["comments"], comments):
+            self.assertEqual(comment_obj["content"], comment["content"])
 
     def test_list_search_by_embedded(self):
         class User(Document):
             username = StringField(required=True)
 
-            meta = {'allow_inheritance': False}
+            meta = {"allow_inheritance": False}
 
         class Comment(EmbeddedDocument):
             comment = StringField()
-            user = ReferenceField(User,
-                                  required=True)
+            user = ReferenceField(User, required=True)
 
-            meta = {'allow_inheritance': False}
+            meta = {"allow_inheritance": False}
 
         class Page(Document):
             comments = ListField(EmbeddedDocumentField(Comment))
-            meta = {'allow_inheritance': False,
-                    'indexes': [
-                        {'fields': ['comments.user']}
-                    ]}
+            meta = {
+                "allow_inheritance": False,
+                "indexes": [{"fields": ["comments.user"]}],
+            }
 
         User.drop_collection()
         Page.drop_collection()
@@ -1880,14 +1910,22 @@ class Page(Document):
         u3 = User(username="hmarr")
         u3.save()
 
-        p1 = Page(comments=[Comment(user=u1, comment="Its very good"),
-                            Comment(user=u2, comment="Hello world"),
-                            Comment(user=u3, comment="Ping Pong"),
-                            Comment(user=u1, comment="I like a beer")])
+        p1 = Page(
+            comments=[
+                Comment(user=u1, comment="Its very good"),
+                Comment(user=u2, comment="Hello world"),
+                Comment(user=u3, comment="Ping Pong"),
+                Comment(user=u1, comment="I like a beer"),
+            ]
+        )
         p1.save()
 
-        p2 = Page(comments=[Comment(user=u1, comment="Its very good"),
-                            Comment(user=u2, comment="Hello world")])
+        p2 = Page(
+            comments=[
+                Comment(user=u1, comment="Its very good"),
+                Comment(user=u2, comment="Hello world"),
+            ]
+        )
         p2.save()
 
         p3 = Page(comments=[Comment(user=u3, comment="Its very good")])
@@ -1896,20 +1934,15 @@ class Page(Document):
         p4 = Page(comments=[Comment(user=u2, comment="Heavy Metal song")])
         p4.save()
 
-        self.assertEqual(
-            [p1, p2],
-            list(Page.objects.filter(comments__user=u1)))
-        self.assertEqual(
-            [p1, p2, p4],
-            list(Page.objects.filter(comments__user=u2)))
-        self.assertEqual(
-            [p1, p3],
-            list(Page.objects.filter(comments__user=u3)))
+        self.assertEqual([p1, p2], list(Page.objects.filter(comments__user=u1)))
+        self.assertEqual([p1, p2, p4], list(Page.objects.filter(comments__user=u2)))
+        self.assertEqual([p1, p3], list(Page.objects.filter(comments__user=u3)))
 
     def test_save_embedded_document(self):
         """Ensure that a document with an embedded document field may
         be saved in the database.
         """
+
         class EmployeeDetails(EmbeddedDocument):
             position = StringField()
 
@@ -1918,26 +1951,26 @@ class Employee(self.Person):
             details = EmbeddedDocumentField(EmployeeDetails)
 
         # Create employee object and save it to the database
-        employee = Employee(name='Test Employee', age=50, salary=20000)
-        employee.details = EmployeeDetails(position='Developer')
+        employee = Employee(name="Test Employee", age=50, salary=20000)
+        employee.details = EmployeeDetails(position="Developer")
         employee.save()
 
         # Ensure that the object is in the database
         collection = self.db[self.Person._get_collection_name()]
-        employee_obj = collection.find_one({'name': 'Test Employee'})
-        self.assertEqual(employee_obj['name'], 'Test Employee')
-        self.assertEqual(employee_obj['age'], 50)
+        employee_obj = collection.find_one({"name": "Test Employee"})
+        self.assertEqual(employee_obj["name"], "Test Employee")
+        self.assertEqual(employee_obj["age"], 50)
 
         # Ensure that the 'details' embedded object saved correctly
-        self.assertEqual(employee_obj['details']['position'], 'Developer')
+        self.assertEqual(employee_obj["details"]["position"], "Developer")
 
     def test_embedded_update_after_save(self):
         """Test update of `EmbeddedDocumentField` attached to a newly
         saved document.
         """
+
         class Page(EmbeddedDocument):
-            log_message = StringField(verbose_name="Log message",
-                                      required=True)
+            log_message = StringField(verbose_name="Log message", required=True)
 
         class Site(Document):
             page = EmbeddedDocumentField(Page)
@@ -1957,6 +1990,7 @@ def test_updating_an_embedded_document(self):
         """Ensure that a document with an embedded document field may
         be saved in the database.
         """
+
         class EmployeeDetails(EmbeddedDocument):
             position = StringField()
 
@@ -1965,22 +1999,21 @@ class Employee(self.Person):
             details = EmbeddedDocumentField(EmployeeDetails)
 
         # Create employee object and save it to the database
-        employee = Employee(name='Test Employee', age=50, salary=20000)
-        employee.details = EmployeeDetails(position='Developer')
+        employee = Employee(name="Test Employee", age=50, salary=20000)
+        employee.details = EmployeeDetails(position="Developer")
         employee.save()
 
         # Test updating an embedded document
-        promoted_employee = Employee.objects.get(name='Test Employee')
-        promoted_employee.details.position = 'Senior Developer'
+        promoted_employee = Employee.objects.get(name="Test Employee")
+        promoted_employee.details.position = "Senior Developer"
         promoted_employee.save()
 
         promoted_employee.reload()
-        self.assertEqual(promoted_employee.name, 'Test Employee')
+        self.assertEqual(promoted_employee.name, "Test Employee")
         self.assertEqual(promoted_employee.age, 50)
 
         # Ensure that the 'details' embedded object saved correctly
-        self.assertEqual(
-            promoted_employee.details.position, 'Senior Developer')
+        self.assertEqual(promoted_employee.details.position, "Senior Developer")
 
         # Test removal
         promoted_employee.details = None
@@ -1996,12 +2029,12 @@ class NameMixin(object):
         class Foo(EmbeddedDocument, NameMixin):
             quantity = IntField()
 
-        self.assertEqual(['name', 'quantity'], sorted(Foo._fields.keys()))
+        self.assertEqual(["name", "quantity"], sorted(Foo._fields.keys()))
 
         class Bar(Document, NameMixin):
             widgets = StringField()
 
-        self.assertEqual(['id', 'name', 'widgets'], sorted(Bar._fields.keys()))
+        self.assertEqual(["id", "name", "widgets"], sorted(Bar._fields.keys()))
 
     def test_mixin_inheritance(self):
         class BaseMixIn(object):
@@ -2015,8 +2048,7 @@ class TestDoc(Document, DoubleMixIn):
             age = IntField()
 
         TestDoc.drop_collection()
-        t = TestDoc(count=12, data="test",
-                    comment="great!", age=19)
+        t = TestDoc(count=12, data="test", comment="great!", age=19)
 
         t.save()
 
@@ -2031,17 +2063,18 @@ def test_save_reference(self):
         """Ensure that a document reference field may be saved in the
         database.
         """
+
         class BlogPost(Document):
-            meta = {'collection': 'blogpost_1'}
+            meta = {"collection": "blogpost_1"}
             content = StringField()
             author = ReferenceField(self.Person)
 
         BlogPost.drop_collection()
 
-        author = self.Person(name='Test User')
+        author = self.Person(name="Test User")
         author.save()
 
-        post = BlogPost(content='Watched some TV today... how exciting.')
+        post = BlogPost(content="Watched some TV today... how exciting.")
         # Should only reference author when saving
         post.author = author
         post.save()
@@ -2049,15 +2082,15 @@ class BlogPost(Document):
         post_obj = BlogPost.objects.first()
 
         # Test laziness
-        self.assertIsInstance(post_obj._data['author'], bson.DBRef)
+        self.assertIsInstance(post_obj._data["author"], bson.DBRef)
         self.assertIsInstance(post_obj.author, self.Person)
-        self.assertEqual(post_obj.author.name, 'Test User')
+        self.assertEqual(post_obj.author.name, "Test User")
 
         # Ensure that the dereferenced object may be changed and saved
         post_obj.author.age = 25
         post_obj.author.save()
 
-        author = list(self.Person.objects(name='Test User'))[-1]
+        author = list(self.Person.objects(name="Test User"))[-1]
         self.assertEqual(author.age, 25)
 
     def test_duplicate_db_fields_raise_invalid_document_error(self):
@@ -2065,12 +2098,14 @@ def test_duplicate_db_fields_raise_invalid_document_error(self):
         declare the same db_field.
         """
         with self.assertRaises(InvalidDocumentError):
+
             class Foo(Document):
                 name = StringField()
-                name2 = StringField(db_field='name')
+                name2 = StringField(db_field="name")
 
     def test_invalid_son(self):
         """Raise an error if loading invalid data."""
+
         class Occurrence(EmbeddedDocument):
             number = IntField()
 
@@ -2081,21 +2116,24 @@ class Word(Document):
             occurs = ListField(EmbeddedDocumentField(Occurrence), default=list)
 
         with self.assertRaises(InvalidDocumentError):
-            Word._from_son({
-                'stem': [1, 2, 3],
-                'forms': 1,
-                'count': 'one',
-                'occurs': {"hello": None}
-            })
+            Word._from_son(
+                {
+                    "stem": [1, 2, 3],
+                    "forms": 1,
+                    "count": "one",
+                    "occurs": {"hello": None},
+                }
+            )
 
         # Tests for issue #1438: https://github.com/MongoEngine/mongoengine/issues/1438
         with self.assertRaises(ValueError):
-            Word._from_son('this is not a valid SON dict')
+            Word._from_son("this is not a valid SON dict")
 
     def test_reverse_delete_rule_cascade_and_nullify(self):
         """Ensure that a referenced document is also deleted upon
         deletion.
         """
+
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)
@@ -2104,13 +2142,13 @@ class BlogPost(Document):
         self.Person.drop_collection()
         BlogPost.drop_collection()
 
-        author = self.Person(name='Test User')
+        author = self.Person(name="Test User")
         author.save()
 
-        reviewer = self.Person(name='Re Viewer')
+        reviewer = self.Person(name="Re Viewer")
         reviewer.save()
 
-        post = BlogPost(content='Watched some TV')
+        post = BlogPost(content="Watched some TV")
         post.author = author
         post.reviewer = reviewer
         post.save()
@@ -2128,24 +2166,26 @@ def test_reverse_delete_rule_pull(self):
         """Ensure that a referenced document is also deleted with
         pull.
         """
+
         class Record(Document):
             name = StringField()
-            children = ListField(ReferenceField('self', reverse_delete_rule=PULL))
+            children = ListField(ReferenceField("self", reverse_delete_rule=PULL))
 
         Record.drop_collection()
 
-        parent_record = Record(name='parent').save()
-        child_record = Record(name='child').save()
+        parent_record = Record(name="parent").save()
+        child_record = Record(name="child").save()
         parent_record.children.append(child_record)
         parent_record.save()
 
         child_record.delete()
-        self.assertEqual(Record.objects(name='parent').get().children, [])
+        self.assertEqual(Record.objects(name="parent").get().children, [])
 
     def test_reverse_delete_rule_with_custom_id_field(self):
         """Ensure that a referenced document with custom primary key
         is also deleted upon deletion.
         """
+
         class User(Document):
             name = StringField(primary_key=True)
 
@@ -2156,8 +2196,8 @@ class Book(Document):
         User.drop_collection()
         Book.drop_collection()
 
-        user = User(name='Mike').save()
-        reviewer = User(name='John').save()
+        user = User(name="Mike").save()
+        reviewer = User(name="John").save()
         book = Book(author=user, reviewer=reviewer).save()
 
         reviewer.delete()
@@ -2171,6 +2211,7 @@ def test_reverse_delete_rule_with_shared_id_among_collections(self):
         """Ensure that cascade delete rule doesn't mix id among
         collections.
         """
+
         class User(Document):
             id = IntField(primary_key=True)
 
@@ -2203,6 +2244,7 @@ def test_reverse_delete_rule_with_document_inheritance(self):
         """Ensure that a referenced document is also deleted upon
         deletion of a child document.
         """
+
         class Writer(self.Person):
             pass
 
@@ -2214,13 +2256,13 @@ class BlogPost(Document):
         self.Person.drop_collection()
         BlogPost.drop_collection()
 
-        author = Writer(name='Test User')
+        author = Writer(name="Test User")
         author.save()
 
-        reviewer = Writer(name='Re Viewer')
+        reviewer = Writer(name="Re Viewer")
         reviewer.save()
 
-        post = BlogPost(content='Watched some TV')
+        post = BlogPost(content="Watched some TV")
         post.author = author
         post.reviewer = reviewer
         post.save()
@@ -2237,23 +2279,26 @@ def test_reverse_delete_rule_cascade_and_nullify_complex_field(self):
         """Ensure that a referenced document is also deleted upon
         deletion for complex fields.
         """
+
         class BlogPost(Document):
             content = StringField()
-            authors = ListField(ReferenceField(
-                self.Person, reverse_delete_rule=CASCADE))
-            reviewers = ListField(ReferenceField(
-                self.Person, reverse_delete_rule=NULLIFY))
+            authors = ListField(
+                ReferenceField(self.Person, reverse_delete_rule=CASCADE)
+            )
+            reviewers = ListField(
+                ReferenceField(self.Person, reverse_delete_rule=NULLIFY)
+            )
 
         self.Person.drop_collection()
         BlogPost.drop_collection()
 
-        author = self.Person(name='Test User')
+        author = self.Person(name="Test User")
         author.save()
 
-        reviewer = self.Person(name='Re Viewer')
+        reviewer = self.Person(name="Re Viewer")
         reviewer.save()
 
-        post = BlogPost(content='Watched some TV')
+        post = BlogPost(content="Watched some TV")
         post.authors = [author]
         post.reviewers = [reviewer]
         post.save()
@@ -2273,6 +2318,7 @@ def test_reverse_delete_rule_cascade_triggers_pre_delete_signal(self):
         delete the author which triggers deletion of blogpost via
         cascade blog post's pre_delete signal alters an editor attribute.
         """
+
         class Editor(self.Person):
             review_queue = IntField(default=0)
 
@@ -2292,32 +2338,32 @@ def pre_delete(cls, sender, document, **kwargs):
         BlogPost.drop_collection()
         Editor.drop_collection()
 
-        author = self.Person(name='Will S.').save()
-        editor = Editor(name='Max P.', review_queue=1).save()
-        BlogPost(content='wrote some books', author=author,
-                 editor=editor).save()
+        author = self.Person(name="Will S.").save()
+        editor = Editor(name="Max P.", review_queue=1).save()
+        BlogPost(content="wrote some books", author=author, editor=editor).save()
 
         # delete the author, the post is also deleted due to the CASCADE rule
         author.delete()
 
         # the pre-delete signal should have decremented the editor's queue
-        editor = Editor.objects(name='Max P.').get()
+        editor = Editor.objects(name="Max P.").get()
         self.assertEqual(editor.review_queue, 0)
 
     def test_two_way_reverse_delete_rule(self):
         """Ensure that Bi-Directional relationships work with
         reverse_delete_rule
         """
+
         class Bar(Document):
             content = StringField()
-            foo = ReferenceField('Foo')
+            foo = ReferenceField("Foo")
 
         class Foo(Document):
             content = StringField()
             bar = ReferenceField(Bar)
 
-        Bar.register_delete_rule(Foo, 'bar', NULLIFY)
-        Foo.register_delete_rule(Bar, 'foo', NULLIFY)
+        Bar.register_delete_rule(Foo, "bar", NULLIFY)
+        Foo.register_delete_rule(Bar, "foo", NULLIFY)
 
         Bar.drop_collection()
         Foo.drop_collection()
@@ -2338,24 +2384,27 @@ class Foo(Document):
 
     def test_invalid_reverse_delete_rule_raise_errors(self):
         with self.assertRaises(InvalidDocumentError):
+
             class Blog(Document):
                 content = StringField()
-                authors = MapField(ReferenceField(
-                    self.Person, reverse_delete_rule=CASCADE))
+                authors = MapField(
+                    ReferenceField(self.Person, reverse_delete_rule=CASCADE)
+                )
                 reviewers = DictField(
-                    field=ReferenceField(
-                        self.Person,
-                        reverse_delete_rule=NULLIFY))
+                    field=ReferenceField(self.Person, reverse_delete_rule=NULLIFY)
+                )
 
         with self.assertRaises(InvalidDocumentError):
+
             class Parents(EmbeddedDocument):
-                father = ReferenceField('Person', reverse_delete_rule=DENY)
-                mother = ReferenceField('Person', reverse_delete_rule=DENY)
+                father = ReferenceField("Person", reverse_delete_rule=DENY)
+                mother = ReferenceField("Person", reverse_delete_rule=DENY)
 
     def test_reverse_delete_rule_cascade_recurs(self):
         """Ensure that a chain of documents is also deleted upon
         cascaded deletion.
         """
+
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)
@@ -2368,14 +2417,14 @@ class Comment(Document):
         BlogPost.drop_collection()
         Comment.drop_collection()
 
-        author = self.Person(name='Test User')
+        author = self.Person(name="Test User")
         author.save()
 
-        post = BlogPost(content='Watched some TV')
+        post = BlogPost(content="Watched some TV")
         post.author = author
         post.save()
 
-        comment = Comment(text='Kudos.')
+        comment = Comment(text="Kudos.")
         comment.post = post
         comment.save()
 
@@ -2388,6 +2437,7 @@ def test_reverse_delete_rule_deny(self):
         """Ensure that a document cannot be referenced if there are
         still documents referring to it.
         """
+
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, reverse_delete_rule=DENY)
@@ -2395,20 +2445,22 @@ class BlogPost(Document):
         self.Person.drop_collection()
         BlogPost.drop_collection()
 
-        author = self.Person(name='Test User')
+        author = self.Person(name="Test User")
         author.save()
 
-        post = BlogPost(content='Watched some TV')
+        post = BlogPost(content="Watched some TV")
         post.author = author
         post.save()
 
         # Delete the Person should be denied
         self.assertRaises(OperationError, author.delete)  # Should raise denied error
-        self.assertEqual(BlogPost.objects.count(), 1)  # No objects may have been deleted
+        self.assertEqual(
+            BlogPost.objects.count(), 1
+        )  # No objects may have been deleted
         self.assertEqual(self.Person.objects.count(), 1)
 
         # Other users, that don't have BlogPosts must be removable, like normal
-        author = self.Person(name='Another User')
+        author = self.Person(name="Another User")
         author.save()
 
         self.assertEqual(self.Person.objects.count(), 2)
@@ -2434,6 +2486,7 @@ class B(A):
 
     def test_document_hash(self):
         """Test document in list, dict, set."""
+
         class User(Document):
             pass
 
@@ -2491,9 +2544,11 @@ class BlogPost(Document):
         self.assertEqual(len(all_user_set), 3)
 
     def test_picklable(self):
-        pickle_doc = PickleTest(number=1, string="One", lists=['1', '2'])
+        pickle_doc = PickleTest(number=1, string="One", lists=["1", "2"])
         pickle_doc.embedded = PickleEmbedded()
-        pickled_doc = pickle.dumps(pickle_doc)  # make sure pickling works even before the doc is saved
+        pickled_doc = pickle.dumps(
+            pickle_doc
+        )  # make sure pickling works even before the doc is saved
         pickle_doc.save()
 
         pickled_doc = pickle.dumps(pickle_doc)
@@ -2516,8 +2571,10 @@ def test_picklable(self):
         self.assertEqual(pickle_doc.lists, ["1", "2", "3"])
 
     def test_regular_document_pickle(self):
-        pickle_doc = PickleTest(number=1, string="One", lists=['1', '2'])
-        pickled_doc = pickle.dumps(pickle_doc)  # make sure pickling works even before the doc is saved
+        pickle_doc = PickleTest(number=1, string="One", lists=["1", "2"])
+        pickled_doc = pickle.dumps(
+            pickle_doc
+        )  # make sure pickling works even before the doc is saved
         pickle_doc.save()
 
         pickled_doc = pickle.dumps(pickle_doc)
@@ -2527,21 +2584,23 @@ def test_regular_document_pickle(self):
         fixtures.PickleTest = fixtures.NewDocumentPickleTest
 
         resurrected = pickle.loads(pickled_doc)
-        self.assertEqual(resurrected.__class__,
-                         fixtures.NewDocumentPickleTest)
-        self.assertEqual(resurrected._fields_ordered,
-                         fixtures.NewDocumentPickleTest._fields_ordered)
-        self.assertNotEqual(resurrected._fields_ordered,
-                            pickle_doc._fields_ordered)
+        self.assertEqual(resurrected.__class__, fixtures.NewDocumentPickleTest)
+        self.assertEqual(
+            resurrected._fields_ordered, fixtures.NewDocumentPickleTest._fields_ordered
+        )
+        self.assertNotEqual(resurrected._fields_ordered, pickle_doc._fields_ordered)
 
         # The local PickleTest is still a ref to the original
         fixtures.PickleTest = PickleTest
 
     def test_dynamic_document_pickle(self):
         pickle_doc = PickleDynamicTest(
-            name="test", number=1, string="One", lists=['1', '2'])
+            name="test", number=1, string="One", lists=["1", "2"]
+        )
         pickle_doc.embedded = PickleDynamicEmbedded(foo="Bar")
-        pickled_doc = pickle.dumps(pickle_doc)  # make sure pickling works even before the doc is saved
+        pickled_doc = pickle.dumps(
+            pickle_doc
+        )  # make sure pickling works even before the doc is saved
 
         pickle_doc.save()
 
@@ -2549,20 +2608,22 @@ def test_dynamic_document_pickle(self):
         resurrected = pickle.loads(pickled_doc)
 
         self.assertEqual(resurrected, pickle_doc)
-        self.assertEqual(resurrected._fields_ordered,
-                         pickle_doc._fields_ordered)
-        self.assertEqual(resurrected._dynamic_fields.keys(),
-                         pickle_doc._dynamic_fields.keys())
+        self.assertEqual(resurrected._fields_ordered, pickle_doc._fields_ordered)
+        self.assertEqual(
+            resurrected._dynamic_fields.keys(), pickle_doc._dynamic_fields.keys()
+        )
 
         self.assertEqual(resurrected.embedded, pickle_doc.embedded)
-        self.assertEqual(resurrected.embedded._fields_ordered,
-                         pickle_doc.embedded._fields_ordered)
-        self.assertEqual(resurrected.embedded._dynamic_fields.keys(),
-                         pickle_doc.embedded._dynamic_fields.keys())
+        self.assertEqual(
+            resurrected.embedded._fields_ordered, pickle_doc.embedded._fields_ordered
+        )
+        self.assertEqual(
+            resurrected.embedded._dynamic_fields.keys(),
+            pickle_doc.embedded._dynamic_fields.keys(),
+        )
 
     def test_picklable_on_signals(self):
-        pickle_doc = PickleSignalsTest(
-            number=1, string="One", lists=['1', '2'])
+        pickle_doc = PickleSignalsTest(number=1, string="One", lists=["1", "2"])
         pickle_doc.embedded = PickleEmbedded()
         pickle_doc.save()
         pickle_doc.delete()
@@ -2572,12 +2633,13 @@ def test_override_method_with_field(self):
         the "validate" method.
         """
         with self.assertRaises(InvalidDocumentError):
+
             class Blog(Document):
                 validate = DictField()
 
     def test_mutating_documents(self):
         class B(EmbeddedDocument):
-            field1 = StringField(default='field1')
+            field1 = StringField(default="field1")
 
         class A(Document):
             b = EmbeddedDocumentField(B, default=lambda: B())
@@ -2587,27 +2649,28 @@ class A(Document):
         a = A()
         a.save()
         a.reload()
-        self.assertEqual(a.b.field1, 'field1')
+        self.assertEqual(a.b.field1, "field1")
 
         class C(EmbeddedDocument):
-            c_field = StringField(default='cfield')
+            c_field = StringField(default="cfield")
 
         class B(EmbeddedDocument):
-            field1 = StringField(default='field1')
+            field1 = StringField(default="field1")
             field2 = EmbeddedDocumentField(C, default=lambda: C())
 
         class A(Document):
             b = EmbeddedDocumentField(B, default=lambda: B())
 
         a = A.objects()[0]
-        a.b.field2.c_field = 'new value'
+        a.b.field2.c_field = "new value"
         a.save()
 
         a.reload()
-        self.assertEqual(a.b.field2.c_field, 'new value')
+        self.assertEqual(a.b.field2.c_field, "new value")
 
     def test_can_save_false_values(self):
         """Ensures you can save False values on save."""
+
         class Doc(Document):
             foo = StringField()
             archived = BooleanField(default=False, required=True)
@@ -2623,6 +2686,7 @@ class Doc(Document):
 
     def test_can_save_false_values_dynamic(self):
         """Ensures you can save False values on dynamic docs."""
+
         class Doc(DynamicDocument):
             foo = StringField()
 
@@ -2637,6 +2701,7 @@ class Doc(DynamicDocument):
 
     def test_do_not_save_unchanged_references(self):
         """Ensures cascading saves dont auto update"""
+
         class Job(Document):
             name = StringField()
 
@@ -2655,8 +2720,10 @@ class Person(Document):
         person = Person(name="name", age=10, job=job)
 
         from pymongo.collection import Collection
+
         orig_update = Collection.update
         try:
+
             def fake_update(*args, **kwargs):
                 self.fail("Unexpected update for %s" % args[0].name)
                 return orig_update(*args, **kwargs)
@@ -2670,9 +2737,9 @@ def test_db_alias_tests(self):
         """DB Alias tests."""
         # mongoenginetest - Is default connection alias from setUp()
         # Register Aliases
-        register_connection('testdb-1', 'mongoenginetest2')
-        register_connection('testdb-2', 'mongoenginetest3')
-        register_connection('testdb-3', 'mongoenginetest4')
+        register_connection("testdb-1", "mongoenginetest2")
+        register_connection("testdb-2", "mongoenginetest3")
+        register_connection("testdb-3", "mongoenginetest4")
 
         class User(Document):
             name = StringField()
@@ -2719,42 +2786,43 @@ class AuthorBooks(Document):
 
         # Collections
         self.assertEqual(
-            User._get_collection(),
-            get_db("testdb-1")[User._get_collection_name()])
+            User._get_collection(), get_db("testdb-1")[User._get_collection_name()]
+        )
         self.assertEqual(
-            Book._get_collection(),
-            get_db("testdb-2")[Book._get_collection_name()])
+            Book._get_collection(), get_db("testdb-2")[Book._get_collection_name()]
+        )
         self.assertEqual(
             AuthorBooks._get_collection(),
-            get_db("testdb-3")[AuthorBooks._get_collection_name()])
+            get_db("testdb-3")[AuthorBooks._get_collection_name()],
+        )
 
     def test_db_alias_overrides(self):
         """Test db_alias can be overriden."""
         # Register a connection with db_alias testdb-2
-        register_connection('testdb-2', 'mongoenginetest2')
+        register_connection("testdb-2", "mongoenginetest2")
 
         class A(Document):
             """Uses default db_alias
             """
+
             name = StringField()
             meta = {"allow_inheritance": True}
 
         class B(A):
             """Uses testdb-2 db_alias
             """
+
             meta = {"db_alias": "testdb-2"}
 
         A.objects.all()
 
-        self.assertEqual('testdb-2', B._meta.get('db_alias'))
-        self.assertEqual('mongoenginetest',
-                         A._get_collection().database.name)
-        self.assertEqual('mongoenginetest2',
-                         B._get_collection().database.name)
+        self.assertEqual("testdb-2", B._meta.get("db_alias"))
+        self.assertEqual("mongoenginetest", A._get_collection().database.name)
+        self.assertEqual("mongoenginetest2", B._get_collection().database.name)
 
     def test_db_alias_propagates(self):
         """db_alias propagates?"""
-        register_connection('testdb-1', 'mongoenginetest2')
+        register_connection("testdb-1", "mongoenginetest2")
 
         class A(Document):
             name = StringField()
@@ -2763,10 +2831,11 @@ class A(Document):
         class B(A):
             pass
 
-        self.assertEqual('testdb-1', B._meta.get('db_alias'))
+        self.assertEqual("testdb-1", B._meta.get("db_alias"))
 
     def test_db_ref_usage(self):
         """DB Ref usage in dict_fields."""
+
         class User(Document):
             name = StringField()
 
@@ -2774,9 +2843,7 @@ class Book(Document):
             name = StringField()
             author = ReferenceField(User)
             extra = DictField()
-            meta = {
-                'ordering': ['+name']
-            }
+            meta = {"ordering": ["+name"]}
 
             def __unicode__(self):
                 return self.name
@@ -2798,12 +2865,19 @@ def __str__(self):
         peter = User.objects.create(name="Peter")
 
         # Bob
-        Book.objects.create(name="1", author=bob, extra={
-            "a": bob.to_dbref(), "b": [karl.to_dbref(), susan.to_dbref()]})
-        Book.objects.create(name="2", author=bob, extra={
-            "a": bob.to_dbref(), "b": karl.to_dbref()})
-        Book.objects.create(name="3", author=bob, extra={
-            "a": bob.to_dbref(), "c": [jon.to_dbref(), peter.to_dbref()]})
+        Book.objects.create(
+            name="1",
+            author=bob,
+            extra={"a": bob.to_dbref(), "b": [karl.to_dbref(), susan.to_dbref()]},
+        )
+        Book.objects.create(
+            name="2", author=bob, extra={"a": bob.to_dbref(), "b": karl.to_dbref()}
+        )
+        Book.objects.create(
+            name="3",
+            author=bob,
+            extra={"a": bob.to_dbref(), "c": [jon.to_dbref(), peter.to_dbref()]},
+        )
         Book.objects.create(name="4", author=bob)
 
         # Jon
@@ -2811,56 +2885,77 @@ def __str__(self):
         Book.objects.create(name="6", author=peter)
         Book.objects.create(name="7", author=jon)
         Book.objects.create(name="8", author=jon)
-        Book.objects.create(name="9", author=jon,
-                            extra={"a": peter.to_dbref()})
+        Book.objects.create(name="9", author=jon, extra={"a": peter.to_dbref()})
 
         # Checks
-        self.assertEqual(",".join([str(b) for b in Book.objects.all()]),
-                         "1,2,3,4,5,6,7,8,9")
+        self.assertEqual(
+            ",".join([str(b) for b in Book.objects.all()]), "1,2,3,4,5,6,7,8,9"
+        )
         # bob related books
-        self.assertEqual(",".join([str(b) for b in Book.objects.filter(
-                                  Q(extra__a=bob) |
-                                  Q(author=bob) |
-                                  Q(extra__b=bob))]),
-                         "1,2,3,4")
+        self.assertEqual(
+            ",".join(
+                [
+                    str(b)
+                    for b in Book.objects.filter(
+                        Q(extra__a=bob) | Q(author=bob) | Q(extra__b=bob)
+                    )
+                ]
+            ),
+            "1,2,3,4",
+        )
 
         # Susan & Karl related books
-        self.assertEqual(",".join([str(b) for b in Book.objects.filter(
-                                   Q(extra__a__all=[karl, susan]) |
-                                   Q(author__all=[karl, susan]) |
-                                   Q(extra__b__all=[
-                                     karl.to_dbref(), susan.to_dbref()]))
-                                   ]), "1")
+        self.assertEqual(
+            ",".join(
+                [
+                    str(b)
+                    for b in Book.objects.filter(
+                        Q(extra__a__all=[karl, susan])
+                        | Q(author__all=[karl, susan])
+                        | Q(extra__b__all=[karl.to_dbref(), susan.to_dbref()])
+                    )
+                ]
+            ),
+            "1",
+        )
 
         # $Where
-        self.assertEqual(u",".join([str(b) for b in Book.objects.filter(
-                                    __raw__={
-                                        "$where": """
+        self.assertEqual(
+            u",".join(
+                [
+                    str(b)
+                    for b in Book.objects.filter(
+                        __raw__={
+                            "$where": """
                                             function(){
                                                 return this.name == '1' ||
                                                        this.name == '2';}"""
-                                    })]),
-                         "1,2")
+                        }
+                    )
+                ]
+            ),
+            "1,2",
+        )
 
     def test_switch_db_instance(self):
-        register_connection('testdb-1', 'mongoenginetest2')
+        register_connection("testdb-1", "mongoenginetest2")
 
         class Group(Document):
             name = StringField()
 
         Group.drop_collection()
-        with switch_db(Group, 'testdb-1') as Group:
+        with switch_db(Group, "testdb-1") as Group:
             Group.drop_collection()
 
         Group(name="hello - default").save()
         self.assertEqual(1, Group.objects.count())
 
         group = Group.objects.first()
-        group.switch_db('testdb-1')
+        group.switch_db("testdb-1")
         group.name = "hello - testdb!"
         group.save()
 
-        with switch_db(Group, 'testdb-1') as Group:
+        with switch_db(Group, "testdb-1") as Group:
             group = Group.objects.first()
             self.assertEqual("hello - testdb!", group.name)
 
@@ -2869,10 +2964,10 @@ class Group(Document):
 
         # Slightly contrived now - perform an update
         # Only works as they have the same object_id
-        group.switch_db('testdb-1')
+        group.switch_db("testdb-1")
         group.update(set__name="hello - update")
 
-        with switch_db(Group, 'testdb-1') as Group:
+        with switch_db(Group, "testdb-1") as Group:
             group = Group.objects.first()
             self.assertEqual("hello - update", group.name)
             Group.drop_collection()
@@ -2883,10 +2978,10 @@ class Group(Document):
 
         # Totally contrived now - perform a delete
         # Only works as they have the same object_id
-        group.switch_db('testdb-1')
+        group.switch_db("testdb-1")
         group.delete()
 
-        with switch_db(Group, 'testdb-1') as Group:
+        with switch_db(Group, "testdb-1") as Group:
             self.assertEqual(0, Group.objects.count())
 
         group = Group.objects.first()
@@ -2898,11 +2993,9 @@ class User(Document):
 
         User.drop_collection()
 
-        User._get_collection().insert_one({
-            'name': 'John',
-            'foo': 'Bar',
-            'data': [1, 2, 3]
-        })
+        User._get_collection().insert_one(
+            {"name": "John", "foo": "Bar", "data": [1, 2, 3]}
+        )
 
         self.assertRaises(FieldDoesNotExist, User.objects.first)
 
@@ -2910,22 +3003,20 @@ def test_load_undefined_fields_with_strict_false(self):
         class User(Document):
             name = StringField()
 
-            meta = {'strict': False}
+            meta = {"strict": False}
 
         User.drop_collection()
 
-        User._get_collection().insert_one({
-            'name': 'John',
-            'foo': 'Bar',
-            'data': [1, 2, 3]
-        })
+        User._get_collection().insert_one(
+            {"name": "John", "foo": "Bar", "data": [1, 2, 3]}
+        )
 
         user = User.objects.first()
-        self.assertEqual(user.name, 'John')
-        self.assertFalse(hasattr(user, 'foo'))
-        self.assertEqual(user._data['foo'], 'Bar')
-        self.assertFalse(hasattr(user, 'data'))
-        self.assertEqual(user._data['data'], [1, 2, 3])
+        self.assertEqual(user.name, "John")
+        self.assertFalse(hasattr(user, "foo"))
+        self.assertEqual(user._data["foo"], "Bar")
+        self.assertFalse(hasattr(user, "data"))
+        self.assertEqual(user._data["data"], [1, 2, 3])
 
     def test_load_undefined_fields_on_embedded_document(self):
         class Thing(EmbeddedDocument):
@@ -2937,14 +3028,12 @@ class User(Document):
 
         User.drop_collection()
 
-        User._get_collection().insert_one({
-            'name': 'John',
-            'thing': {
-                'name': 'My thing',
-                'foo': 'Bar',
-                'data': [1, 2, 3]
+        User._get_collection().insert_one(
+            {
+                "name": "John",
+                "thing": {"name": "My thing", "foo": "Bar", "data": [1, 2, 3]},
             }
-        })
+        )
 
         self.assertRaises(FieldDoesNotExist, User.objects.first)
 
@@ -2956,18 +3045,16 @@ class User(Document):
             name = StringField()
             thing = EmbeddedDocumentField(Thing)
 
-            meta = {'strict': False}
+            meta = {"strict": False}
 
         User.drop_collection()
 
-        User._get_collection().insert_one({
-            'name': 'John',
-            'thing': {
-                'name': 'My thing',
-                'foo': 'Bar',
-                'data': [1, 2, 3]
+        User._get_collection().insert_one(
+            {
+                "name": "John",
+                "thing": {"name": "My thing", "foo": "Bar", "data": [1, 2, 3]},
             }
-        })
+        )
 
         self.assertRaises(FieldDoesNotExist, User.objects.first)
 
@@ -2975,7 +3062,7 @@ def test_load_undefined_fields_on_embedded_document_with_strict_false(self):
         class Thing(EmbeddedDocument):
             name = StringField()
 
-            meta = {'strict': False}
+            meta = {"strict": False}
 
         class User(Document):
             name = StringField()
@@ -2983,22 +3070,20 @@ class User(Document):
 
         User.drop_collection()
 
-        User._get_collection().insert_one({
-            'name': 'John',
-            'thing': {
-                'name': 'My thing',
-                'foo': 'Bar',
-                'data': [1, 2, 3]
+        User._get_collection().insert_one(
+            {
+                "name": "John",
+                "thing": {"name": "My thing", "foo": "Bar", "data": [1, 2, 3]},
             }
-        })
+        )
 
         user = User.objects.first()
-        self.assertEqual(user.name, 'John')
-        self.assertEqual(user.thing.name, 'My thing')
-        self.assertFalse(hasattr(user.thing, 'foo'))
-        self.assertEqual(user.thing._data['foo'], 'Bar')
-        self.assertFalse(hasattr(user.thing, 'data'))
-        self.assertEqual(user.thing._data['data'], [1, 2, 3])
+        self.assertEqual(user.name, "John")
+        self.assertEqual(user.thing.name, "My thing")
+        self.assertFalse(hasattr(user.thing, "foo"))
+        self.assertEqual(user.thing._data["foo"], "Bar")
+        self.assertFalse(hasattr(user.thing, "data"))
+        self.assertEqual(user.thing._data["data"], [1, 2, 3])
 
     def test_spaces_in_keys(self):
         class Embedded(DynamicEmbeddedDocument):
@@ -3009,10 +3094,10 @@ class Doc(DynamicDocument):
 
         Doc.drop_collection()
         doc = Doc()
-        setattr(doc, 'hello world', 1)
+        setattr(doc, "hello world", 1)
         doc.save()
 
-        one = Doc.objects.filter(**{'hello world': 1}).count()
+        one = Doc.objects.filter(**{"hello world": 1}).count()
         self.assertEqual(1, one)
 
     def test_shard_key(self):
@@ -3020,9 +3105,7 @@ class LogEntry(Document):
             machine = StringField()
             log = StringField()
 
-            meta = {
-                'shard_key': ('machine',)
-            }
+            meta = {"shard_key": ("machine",)}
 
         LogEntry.drop_collection()
 
@@ -3044,24 +3127,22 @@ class Foo(EmbeddedDocument):
             foo = StringField()
 
         class Bar(Document):
-            meta = {
-                'shard_key': ('foo.foo',)
-            }
+            meta = {"shard_key": ("foo.foo",)}
             foo = EmbeddedDocumentField(Foo)
             bar = StringField()
 
-        foo_doc = Foo(foo='hello')
-        bar_doc = Bar(foo=foo_doc, bar='world')
+        foo_doc = Foo(foo="hello")
+        bar_doc = Bar(foo=foo_doc, bar="world")
         bar_doc.save()
 
         self.assertTrue(bar_doc.id is not None)
 
-        bar_doc.bar = 'baz'
+        bar_doc.bar = "baz"
         bar_doc.save()
 
         # try to change the shard key
         with self.assertRaises(OperationError):
-            bar_doc.foo.foo = 'something'
+            bar_doc.foo.foo = "something"
             bar_doc.save()
 
     def test_shard_key_primary(self):
@@ -3069,9 +3150,7 @@ class LogEntry(Document):
             machine = StringField(primary_key=True)
             log = StringField()
 
-            meta = {
-                'shard_key': ('machine',)
-            }
+            meta = {"shard_key": ("machine",)}
 
         LogEntry.drop_collection()
 
@@ -3097,12 +3176,10 @@ class Doc(Document):
             doc = EmbeddedDocumentField(Embedded)
 
             def __eq__(self, other):
-                return (self.doc_name == other.doc_name and
-                        self.doc == other.doc)
+                return self.doc_name == other.doc_name and self.doc == other.doc
 
         classic_doc = Doc(doc_name="my doc", doc=Embedded(name="embedded doc"))
-        dict_doc = Doc(**{"doc_name": "my doc",
-                          "doc": {"name": "embedded doc"}})
+        dict_doc = Doc(**{"doc_name": "my doc", "doc": {"name": "embedded doc"}})
 
         self.assertEqual(classic_doc, dict_doc)
         self.assertEqual(classic_doc._data, dict_doc._data)
@@ -3116,15 +3193,18 @@ class Doc(Document):
             docs = ListField(EmbeddedDocumentField(Embedded))
 
             def __eq__(self, other):
-                return (self.doc_name == other.doc_name and
-                        self.docs == other.docs)
+                return self.doc_name == other.doc_name and self.docs == other.docs
 
-        classic_doc = Doc(doc_name="my doc", docs=[
-                          Embedded(name="embedded doc1"),
-                          Embedded(name="embedded doc2")])
-        dict_doc = Doc(**{"doc_name": "my doc",
-                          "docs": [{"name": "embedded doc1"},
-                                   {"name": "embedded doc2"}]})
+        classic_doc = Doc(
+            doc_name="my doc",
+            docs=[Embedded(name="embedded doc1"), Embedded(name="embedded doc2")],
+        )
+        dict_doc = Doc(
+            **{
+                "doc_name": "my doc",
+                "docs": [{"name": "embedded doc1"}, {"name": "embedded doc2"}],
+            }
+        )
 
         self.assertEqual(classic_doc, dict_doc)
         self.assertEqual(classic_doc._data, dict_doc._data)
@@ -3134,8 +3214,8 @@ def test_positional_creation(self):
         with self.assertRaises(TypeError) as e:
             person = self.Person("Test User", 42)
         expected_msg = (
-            'Instantiating a document with positional arguments is not '
-            'supported. Please use `field_name=value` keyword arguments.'
+            "Instantiating a document with positional arguments is not "
+            "supported. Please use `field_name=value` keyword arguments."
         )
         self.assertEqual(str(e.exception), expected_msg)
 
@@ -3144,8 +3224,8 @@ def test_mixed_creation(self):
         with self.assertRaises(TypeError) as e:
             person = self.Person("Test User", age=42)
         expected_msg = (
-            'Instantiating a document with positional arguments is not '
-            'supported. Please use `field_name=value` keyword arguments.'
+            "Instantiating a document with positional arguments is not "
+            "supported. Please use `field_name=value` keyword arguments."
         )
         self.assertEqual(str(e.exception), expected_msg)
 
@@ -3154,8 +3234,8 @@ def test_positional_creation_embedded(self):
         with self.assertRaises(TypeError) as e:
             job = self.Job("Test Job", 4)
         expected_msg = (
-            'Instantiating a document with positional arguments is not '
-            'supported. Please use `field_name=value` keyword arguments.'
+            "Instantiating a document with positional arguments is not "
+            "supported. Please use `field_name=value` keyword arguments."
         )
         self.assertEqual(str(e.exception), expected_msg)
 
@@ -3164,13 +3244,14 @@ def test_mixed_creation_embedded(self):
         with self.assertRaises(TypeError) as e:
             job = self.Job("Test Job", years=4)
         expected_msg = (
-            'Instantiating a document with positional arguments is not '
-            'supported. Please use `field_name=value` keyword arguments.'
+            "Instantiating a document with positional arguments is not "
+            "supported. Please use `field_name=value` keyword arguments."
         )
         self.assertEqual(str(e.exception), expected_msg)
 
     def test_data_contains_id_field(self):
         """Ensure that asking for _data returns 'id'."""
+
         class Person(Document):
             name = StringField()
 
@@ -3178,8 +3259,8 @@ class Person(Document):
         Person(name="Harry Potter").save()
 
         person = Person.objects.first()
-        self.assertIn('id', person._data.keys())
-        self.assertEqual(person._data.get('id'), person.id)
+        self.assertIn("id", person._data.keys())
+        self.assertEqual(person._data.get("id"), person.id)
 
     def test_complex_nesting_document_and_embedded_document(self):
         class Macro(EmbeddedDocument):
@@ -3220,8 +3301,8 @@ def save(self, *args, **kwargs):
 
         system = NodesSystem.objects.first()
         self.assertEqual(
-            "UNDEFINED",
-            system.nodes["node"].parameters["param"].macros["test"].value)
+            "UNDEFINED", system.nodes["node"].parameters["param"].macros["test"].value
+        )
 
     def test_embedded_document_equality(self):
         class Test(Document):
@@ -3231,7 +3312,7 @@ class Embedded(EmbeddedDocument):
             ref = ReferenceField(Test)
 
         Test.drop_collection()
-        test = Test(field='123').save()      # has id
+        test = Test(field="123").save()  # has id
 
         e = Embedded(ref=test)
         f1 = Embedded._from_son(e.to_mongo())
@@ -3250,25 +3331,25 @@ class Test3(Document):
 
         class Test(Document):
             name = StringField()
-            test2 = ReferenceField('Test2')
-            test3 = ReferenceField('Test3')
+            test2 = ReferenceField("Test2")
+            test3 = ReferenceField("Test3")
 
         Test.drop_collection()
         Test2.drop_collection()
         Test3.drop_collection()
 
-        t2 = Test2(name='a')
+        t2 = Test2(name="a")
         t2.save()
 
-        t3 = Test3(name='x')
+        t3 = Test3(name="x")
         t3.id = t2.id
         t3.save()
 
-        t = Test(name='b', test2=t2, test3=t3)
+        t = Test(name="b", test2=t2, test3=t3)
 
         f = Test._from_son(t.to_mongo())
 
-        dbref2 = f._data['test2']
+        dbref2 = f._data["test2"]
         obj2 = f.test2
         self.assertIsInstance(dbref2, DBRef)
         self.assertIsInstance(obj2, Test2)
@@ -3276,7 +3357,7 @@ class Test(Document):
         self.assertEqual(obj2, dbref2)
         self.assertEqual(dbref2, obj2)
 
-        dbref3 = f._data['test3']
+        dbref3 = f._data["test3"]
         obj3 = f.test3
         self.assertIsInstance(dbref3, DBRef)
         self.assertIsInstance(obj3, Test3)
@@ -3306,14 +3387,14 @@ class Person(Document):
             created_on = DateTimeField(default=lambda: datetime.utcnow())
             name = StringField()
 
-        p = Person(name='alon')
+        p = Person(name="alon")
         p.save()
-        orig_created_on = Person.objects().only('created_on')[0].created_on
+        orig_created_on = Person.objects().only("created_on")[0].created_on
 
-        p2 = Person.objects().only('name')[0]
-        p2.name = 'alon2'
+        p2 = Person.objects().only("name")[0]
+        p2.name = "alon2"
         p2.save()
-        p3 = Person.objects().only('created_on')[0]
+        p3 = Person.objects().only("created_on")[0]
         self.assertEqual(orig_created_on, p3.created_on)
 
         class Person(Document):
@@ -3331,8 +3412,8 @@ class Person(Document):
         # alter DB for the new default
         coll = Person._get_collection()
         for person in Person.objects.as_pymongo():
-            if 'height' not in person:
-                coll.update_one({'_id': person['_id']}, {'$set': {'height': 189}})
+            if "height" not in person:
+                coll.update_one({"_id": person["_id"]}, {"$set": {"height": 189}})
 
         self.assertEqual(Person.objects(height=189).count(), 1)
 
@@ -3340,12 +3421,17 @@ def test_from_son(self):
         # 771
         class MyPerson(self.Person):
             meta = dict(shard_key=["id"])
+
         p = MyPerson.from_json('{"name": "name", "age": 27}', created=True)
         self.assertEqual(p.id, None)
-        p.id = "12345"  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
+        p.id = (
+            "12345"
+        )  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
         p = MyPerson._from_son({"name": "name", "age": 27}, created=True)
         self.assertEqual(p.id, None)
-        p.id = "12345"  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
+        p.id = (
+            "12345"
+        )  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
 
     def test_from_son_created_False_without_id(self):
         class MyPerson(Document):
@@ -3359,7 +3445,7 @@ class MyPerson(Document):
         p.save()
         self.assertIsNotNone(p.id)
         saved_p = MyPerson.objects.get(id=p.id)
-        self.assertEqual(saved_p.name, 'a_fancy_name')
+        self.assertEqual(saved_p.name, "a_fancy_name")
 
     def test_from_son_created_False_with_id(self):
         # 1854
@@ -3368,11 +3454,13 @@ class MyPerson(Document):
 
         MyPerson.objects.delete()
 
-        p = MyPerson.from_json('{"_id": "5b85a8b04ec5dc2da388296e", "name": "a_fancy_name"}', created=False)
+        p = MyPerson.from_json(
+            '{"_id": "5b85a8b04ec5dc2da388296e", "name": "a_fancy_name"}', created=False
+        )
         self.assertFalse(p._created)
         self.assertEqual(p._changed_fields, [])
-        self.assertEqual(p.name, 'a_fancy_name')
-        self.assertEqual(p.id, ObjectId('5b85a8b04ec5dc2da388296e'))
+        self.assertEqual(p.name, "a_fancy_name")
+        self.assertEqual(p.id, ObjectId("5b85a8b04ec5dc2da388296e"))
         p.save()
 
         with self.assertRaises(DoesNotExist):
@@ -3382,8 +3470,8 @@ class MyPerson(Document):
             MyPerson.objects.get(id=p.id)
 
         self.assertFalse(p._created)
-        p.name = 'a new fancy name'
-        self.assertEqual(p._changed_fields, ['name'])
+        p.name = "a new fancy name"
+        self.assertEqual(p._changed_fields, ["name"])
         p.save()
         saved_p = MyPerson.objects.get(id=p.id)
         self.assertEqual(saved_p.name, p.name)
@@ -3394,16 +3482,18 @@ class MyPerson(Document):
 
         MyPerson.objects.delete()
 
-        p = MyPerson.from_json('{"_id": "5b85a8b04ec5dc2da388296e", "name": "a_fancy_name"}', created=True)
+        p = MyPerson.from_json(
+            '{"_id": "5b85a8b04ec5dc2da388296e", "name": "a_fancy_name"}', created=True
+        )
         self.assertTrue(p._created)
         self.assertEqual(p._changed_fields, [])
-        self.assertEqual(p.name, 'a_fancy_name')
-        self.assertEqual(p.id, ObjectId('5b85a8b04ec5dc2da388296e'))
+        self.assertEqual(p.name, "a_fancy_name")
+        self.assertEqual(p.id, ObjectId("5b85a8b04ec5dc2da388296e"))
         p.save()
 
         saved_p = MyPerson.objects.get(id=p.id)
         self.assertEqual(saved_p, p)
-        self.assertEqual(p.name, 'a_fancy_name')
+        self.assertEqual(p.name, "a_fancy_name")
 
     def test_null_field(self):
         # 734
@@ -3417,9 +3507,9 @@ class User(Document):
             cdt_fld = ComplexDateTimeField(null=True)
 
         User.objects.delete()
-        u = User(name='user')
+        u = User(name="user")
         u.save()
-        u_from_db = User.objects.get(name='user')
+        u_from_db = User.objects.get(name="user")
         u_from_db.height = None
         u_from_db.save()
         self.assertEqual(u_from_db.height, None)
@@ -3432,15 +3522,16 @@ class User(Document):
 
         # 735
         User.objects.delete()
-        u = User(name='user')
+        u = User(name="user")
         u.save()
-        User.objects(name='user').update_one(set__height=None, upsert=True)
-        u_from_db = User.objects.get(name='user')
+        User.objects(name="user").update_one(set__height=None, upsert=True)
+        u_from_db = User.objects.get(name="user")
         self.assertEqual(u_from_db.height, None)
 
     def test_not_saved_eq(self):
         """Ensure we can compare documents not saved.
         """
+
         class Person(Document):
             pass
 
@@ -3458,7 +3549,7 @@ class A(Document):
             l = ListField(EmbeddedDocumentField(B))
 
         A.objects.delete()
-        A(l=[B(v='1'), B(v='2'), B(v='3')]).save()
+        A(l=[B(v="1"), B(v="2"), B(v="3")]).save()
         a = A.objects.get()
         self.assertEqual(a.l._instance, a)
         for idx, b in enumerate(a.l):
@@ -3467,6 +3558,7 @@ class A(Document):
 
     def test_falsey_pk(self):
         """Ensure that we can create and update a document with Falsey PK."""
+
         class Person(Document):
             age = IntField(primary_key=True)
             height = FloatField()
@@ -3480,6 +3572,7 @@ class Person(Document):
 
     def test_push_with_position(self):
         """Ensure that push with position works properly for an instance."""
+
         class BlogPost(Document):
             slug = StringField()
             tags = ListField(StringField())
@@ -3491,10 +3584,11 @@ class BlogPost(Document):
 
         blog.update(push__tags__0=["mongodb", "code"])
         blog.reload()
-        self.assertEqual(blog.tags, ['mongodb', 'code', 'python'])
+        self.assertEqual(blog.tags, ["mongodb", "code", "python"])
 
     def test_push_nested_list(self):
         """Ensure that push update works in nested list"""
+
         class BlogPost(Document):
             slug = StringField()
             tags = ListField()
@@ -3505,10 +3599,11 @@ class BlogPost(Document):
         self.assertEqual(blog.tags, [["value1", 123]])
 
     def test_accessing_objects_with_indexes_error(self):
-        insert_result = self.db.company.insert_many([{'name': 'Foo'},
-                                                     {'name': 'Foo'}])  # Force 2 doc with same name
+        insert_result = self.db.company.insert_many(
+            [{"name": "Foo"}, {"name": "Foo"}]
+        )  # Force 2 doc with same name
         REF_OID = insert_result.inserted_ids[0]
-        self.db.user.insert_one({'company': REF_OID})   # Force 2 doc with same name
+        self.db.user.insert_one({"company": REF_OID})  # Force 2 doc with same name
 
         class Company(Document):
             name = StringField(unique=True)
@@ -3521,5 +3616,5 @@ class User(Document):
             User.objects().select_related()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/document/json_serialisation.py b/tests/document/json_serialisation.py
index 251b65a2e..33d5a6d9e 100644
--- a/tests/document/json_serialisation.py
+++ b/tests/document/json_serialisation.py
@@ -13,9 +13,8 @@
 
 
 class TestJson(unittest.TestCase):
-
     def setUp(self):
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
 
     def test_json_names(self):
         """
@@ -25,22 +24,24 @@ def test_json_names(self):
         a to_json with the original class names and not the abreviated
         mongodb document keys
         """
+
         class Embedded(EmbeddedDocument):
-            string = StringField(db_field='s')
+            string = StringField(db_field="s")
 
         class Doc(Document):
-            string = StringField(db_field='s')
-            embedded = EmbeddedDocumentField(Embedded, db_field='e')
+            string = StringField(db_field="s")
+            embedded = EmbeddedDocumentField(Embedded, db_field="e")
 
         doc = Doc(string="Hello", embedded=Embedded(string="Inner Hello"))
-        doc_json = doc.to_json(sort_keys=True, use_db_field=False, separators=(',', ':'))
+        doc_json = doc.to_json(
+            sort_keys=True, use_db_field=False, separators=(",", ":")
+        )
 
         expected_json = """{"embedded":{"string":"Inner Hello"},"string":"Hello"}"""
 
         self.assertEqual(doc_json, expected_json)
 
     def test_json_simple(self):
-
         class Embedded(EmbeddedDocument):
             string = StringField()
 
@@ -49,12 +50,14 @@ class Doc(Document):
             embedded_field = EmbeddedDocumentField(Embedded)
 
             def __eq__(self, other):
-                return (self.string == other.string and
-                        self.embedded_field == other.embedded_field)
+                return (
+                    self.string == other.string
+                    and self.embedded_field == other.embedded_field
+                )
 
         doc = Doc(string="Hi", embedded_field=Embedded(string="Hi"))
 
-        doc_json = doc.to_json(sort_keys=True, separators=(',', ':'))
+        doc_json = doc.to_json(sort_keys=True, separators=(",", ":"))
         expected_json = """{"embedded_field":{"string":"Hi"},"string":"Hi"}"""
         self.assertEqual(doc_json, expected_json)
 
@@ -68,41 +71,43 @@ class Simple(Document):
             pass
 
         class Doc(Document):
-            string_field = StringField(default='1')
+            string_field = StringField(default="1")
             int_field = IntField(default=1)
             float_field = FloatField(default=1.1)
             boolean_field = BooleanField(default=True)
             datetime_field = DateTimeField(default=datetime.now)
-            embedded_document_field = EmbeddedDocumentField(EmbeddedDoc,
-                                        default=lambda: EmbeddedDoc())
+            embedded_document_field = EmbeddedDocumentField(
+                EmbeddedDoc, default=lambda: EmbeddedDoc()
+            )
             list_field = ListField(default=lambda: [1, 2, 3])
             dict_field = DictField(default=lambda: {"hello": "world"})
             objectid_field = ObjectIdField(default=ObjectId)
-            reference_field = ReferenceField(Simple, default=lambda:
-                                                        Simple().save())
+            reference_field = ReferenceField(Simple, default=lambda: Simple().save())
             map_field = MapField(IntField(), default=lambda: {"simple": 1})
             decimal_field = DecimalField(default=1.0)
             complex_datetime_field = ComplexDateTimeField(default=datetime.now)
             url_field = URLField(default="http://mongoengine.org/")
             dynamic_field = DynamicField(default=1)
             generic_reference_field = GenericReferenceField(
-                                            default=lambda: Simple().save())
-            sorted_list_field = SortedListField(IntField(),
-                                                default=lambda: [1, 2, 3])
+                default=lambda: Simple().save()
+            )
+            sorted_list_field = SortedListField(IntField(), default=lambda: [1, 2, 3])
             email_field = EmailField(default="ross@example.com")
             geo_point_field = GeoPointField(default=lambda: [1, 2])
             sequence_field = SequenceField()
             uuid_field = UUIDField(default=uuid.uuid4)
             generic_embedded_document_field = GenericEmbeddedDocumentField(
-                                        default=lambda: EmbeddedDoc())
+                default=lambda: EmbeddedDoc()
+            )
 
             def __eq__(self, other):
                 import json
+
                 return json.loads(self.to_json()) == json.loads(other.to_json())
 
         doc = Doc()
         self.assertEqual(doc, Doc.from_json(doc.to_json()))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/document/validation.py b/tests/document/validation.py
index 30a285b2c..78199231d 100644
--- a/tests/document/validation.py
+++ b/tests/document/validation.py
@@ -8,49 +8,56 @@
 
 
 class ValidatorErrorTest(unittest.TestCase):
-
     def setUp(self):
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
 
     def test_to_dict(self):
         """Ensure a ValidationError handles error to_dict correctly.
         """
-        error = ValidationError('root')
+        error = ValidationError("root")
         self.assertEqual(error.to_dict(), {})
 
         # 1st level error schema
-        error.errors = {'1st': ValidationError('bad 1st'), }
-        self.assertIn('1st', error.to_dict())
-        self.assertEqual(error.to_dict()['1st'], 'bad 1st')
+        error.errors = {"1st": ValidationError("bad 1st")}
+        self.assertIn("1st", error.to_dict())
+        self.assertEqual(error.to_dict()["1st"], "bad 1st")
 
         # 2nd level error schema
-        error.errors = {'1st': ValidationError('bad 1st', errors={
-            '2nd': ValidationError('bad 2nd'),
-        })}
-        self.assertIn('1st', error.to_dict())
-        self.assertIsInstance(error.to_dict()['1st'], dict)
-        self.assertIn('2nd', error.to_dict()['1st'])
-        self.assertEqual(error.to_dict()['1st']['2nd'], 'bad 2nd')
+        error.errors = {
+            "1st": ValidationError(
+                "bad 1st", errors={"2nd": ValidationError("bad 2nd")}
+            )
+        }
+        self.assertIn("1st", error.to_dict())
+        self.assertIsInstance(error.to_dict()["1st"], dict)
+        self.assertIn("2nd", error.to_dict()["1st"])
+        self.assertEqual(error.to_dict()["1st"]["2nd"], "bad 2nd")
 
         # moar levels
-        error.errors = {'1st': ValidationError('bad 1st', errors={
-            '2nd': ValidationError('bad 2nd', errors={
-                '3rd': ValidationError('bad 3rd', errors={
-                    '4th': ValidationError('Inception'),
-                }),
-            }),
-        })}
-        self.assertIn('1st', error.to_dict())
-        self.assertIn('2nd', error.to_dict()['1st'])
-        self.assertIn('3rd', error.to_dict()['1st']['2nd'])
-        self.assertIn('4th', error.to_dict()['1st']['2nd']['3rd'])
-        self.assertEqual(error.to_dict()['1st']['2nd']['3rd']['4th'],
-                         'Inception')
+        error.errors = {
+            "1st": ValidationError(
+                "bad 1st",
+                errors={
+                    "2nd": ValidationError(
+                        "bad 2nd",
+                        errors={
+                            "3rd": ValidationError(
+                                "bad 3rd", errors={"4th": ValidationError("Inception")}
+                            )
+                        },
+                    )
+                },
+            )
+        }
+        self.assertIn("1st", error.to_dict())
+        self.assertIn("2nd", error.to_dict()["1st"])
+        self.assertIn("3rd", error.to_dict()["1st"]["2nd"])
+        self.assertIn("4th", error.to_dict()["1st"]["2nd"]["3rd"])
+        self.assertEqual(error.to_dict()["1st"]["2nd"]["3rd"]["4th"], "Inception")
 
         self.assertEqual(error.message, "root(2nd.3rd.4th.Inception: ['1st'])")
 
     def test_model_validation(self):
-
         class User(Document):
             username = StringField(primary_key=True)
             name = StringField(required=True)
@@ -59,9 +66,10 @@ class User(Document):
             User().validate()
         except ValidationError as e:
             self.assertIn("User:None", e.message)
-            self.assertEqual(e.to_dict(), {
-                'username': 'Field is required',
-                'name': 'Field is required'})
+            self.assertEqual(
+                e.to_dict(),
+                {"username": "Field is required", "name": "Field is required"},
+            )
 
         user = User(username="RossC0", name="Ross").save()
         user.name = None
@@ -69,14 +77,13 @@ class User(Document):
             user.save()
         except ValidationError as e:
             self.assertIn("User:RossC0", e.message)
-            self.assertEqual(e.to_dict(), {
-                'name': 'Field is required'})
+            self.assertEqual(e.to_dict(), {"name": "Field is required"})
 
     def test_fields_rewrite(self):
         class BasePerson(Document):
             name = StringField()
             age = IntField()
-            meta = {'abstract': True}
+            meta = {"abstract": True}
 
         class Person(BasePerson):
             name = StringField(required=True)
@@ -87,6 +94,7 @@ class Person(BasePerson):
     def test_embedded_document_validation(self):
         """Ensure that embedded documents may be validated.
         """
+
         class Comment(EmbeddedDocument):
             date = DateTimeField()
             content = StringField(required=True)
@@ -94,7 +102,7 @@ class Comment(EmbeddedDocument):
         comment = Comment()
         self.assertRaises(ValidationError, comment.validate)
 
-        comment.content = 'test'
+        comment.content = "test"
         comment.validate()
 
         comment.date = 4
@@ -105,20 +113,20 @@ class Comment(EmbeddedDocument):
         self.assertEqual(comment._instance, None)
 
     def test_embedded_db_field_validate(self):
-
         class SubDoc(EmbeddedDocument):
             val = IntField(required=True)
 
         class Doc(Document):
             id = StringField(primary_key=True)
-            e = EmbeddedDocumentField(SubDoc, db_field='eb')
+            e = EmbeddedDocumentField(SubDoc, db_field="eb")
 
         try:
             Doc(id="bad").validate()
         except ValidationError as e:
             self.assertIn("SubDoc:None", e.message)
-            self.assertEqual(e.to_dict(), {
-                "e": {'val': 'OK could not be converted to int'}})
+            self.assertEqual(
+                e.to_dict(), {"e": {"val": "OK could not be converted to int"}}
+            )
 
         Doc.drop_collection()
 
@@ -127,24 +135,24 @@ class Doc(Document):
         doc = Doc.objects.first()
         keys = doc._data.keys()
         self.assertEqual(2, len(keys))
-        self.assertIn('e', keys)
-        self.assertIn('id', keys)
+        self.assertIn("e", keys)
+        self.assertIn("id", keys)
 
         doc.e.val = "OK"
         try:
             doc.save()
         except ValidationError as e:
             self.assertIn("Doc:test", e.message)
-            self.assertEqual(e.to_dict(), {
-                "e": {'val': 'OK could not be converted to int'}})
+            self.assertEqual(
+                e.to_dict(), {"e": {"val": "OK could not be converted to int"}}
+            )
 
     def test_embedded_weakref(self):
-
         class SubDoc(EmbeddedDocument):
             val = IntField(required=True)
 
         class Doc(Document):
-            e = EmbeddedDocumentField(SubDoc, db_field='eb')
+            e = EmbeddedDocumentField(SubDoc, db_field="eb")
 
         Doc.drop_collection()
 
@@ -167,9 +175,10 @@ def test_parent_reference_in_child_document(self):
         Test to ensure a ReferenceField can store a reference to a parent
         class when inherited. Issue #954.
         """
+
         class Parent(Document):
-            meta = {'allow_inheritance': True}
-            reference = ReferenceField('self')
+            meta = {"allow_inheritance": True}
+            reference = ReferenceField("self")
 
         class Child(Parent):
             pass
@@ -190,9 +199,10 @@ def test_parent_reference_set_as_attribute_in_child_document(self):
         Test to ensure a ReferenceField can store a reference to a parent
         class when inherited and when set via attribute. Issue #954.
         """
+
         class Parent(Document):
-            meta = {'allow_inheritance': True}
-            reference = ReferenceField('self')
+            meta = {"allow_inheritance": True}
+            reference = ReferenceField("self")
 
         class Child(Parent):
             pass
@@ -210,5 +220,5 @@ class Child(Parent):
             self.fail("ValidationError raised: %s" % e.message)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 68baab462..87acf27f9 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -6,27 +6,52 @@
 
 from bson import DBRef, ObjectId, SON
 
-from mongoengine import Document, StringField, IntField, DateTimeField, DateField, ValidationError, \
-    ComplexDateTimeField, FloatField, ListField, ReferenceField, DictField, EmbeddedDocument, EmbeddedDocumentField, \
-    GenericReferenceField, DoesNotExist, NotRegistered, OperationError, DynamicField, \
-    FieldDoesNotExist, EmbeddedDocumentListField, MultipleObjectsReturned, NotUniqueError, BooleanField,\
-    ObjectIdField, SortedListField, GenericLazyReferenceField, LazyReferenceField, DynamicDocument
-from mongoengine.base import (BaseField, EmbeddedDocumentList, _document_registry)
+from mongoengine import (
+    Document,
+    StringField,
+    IntField,
+    DateTimeField,
+    DateField,
+    ValidationError,
+    ComplexDateTimeField,
+    FloatField,
+    ListField,
+    ReferenceField,
+    DictField,
+    EmbeddedDocument,
+    EmbeddedDocumentField,
+    GenericReferenceField,
+    DoesNotExist,
+    NotRegistered,
+    OperationError,
+    DynamicField,
+    FieldDoesNotExist,
+    EmbeddedDocumentListField,
+    MultipleObjectsReturned,
+    NotUniqueError,
+    BooleanField,
+    ObjectIdField,
+    SortedListField,
+    GenericLazyReferenceField,
+    LazyReferenceField,
+    DynamicDocument,
+)
+from mongoengine.base import BaseField, EmbeddedDocumentList, _document_registry
 from mongoengine.errors import DeprecatedError
 
 from tests.utils import MongoDBTestCase
 
 
 class FieldTest(MongoDBTestCase):
-
     def test_default_values_nothing_set(self):
         """Ensure that default field values are used when creating
         a document.
         """
+
         class Person(Document):
             name = StringField()
             age = IntField(default=30, required=False)
-            userid = StringField(default=lambda: 'test', required=True)
+            userid = StringField(default=lambda: "test", required=True)
             created = DateTimeField(default=datetime.datetime.utcnow)
             day = DateField(default=datetime.date.today)
 
@@ -34,9 +59,7 @@ class Person(Document):
 
         # Confirm saving now would store values
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved,
-            ['age', 'created', 'day', 'name', 'userid']
-        )
+        self.assertEqual(data_to_be_saved, ["age", "created", "day", "name", "userid"])
 
         self.assertTrue(person.validate() is None)
 
@@ -46,18 +69,19 @@ class Person(Document):
         self.assertEqual(person.created, person.created)
         self.assertEqual(person.day, person.day)
 
-        self.assertEqual(person._data['name'], person.name)
-        self.assertEqual(person._data['age'], person.age)
-        self.assertEqual(person._data['userid'], person.userid)
-        self.assertEqual(person._data['created'], person.created)
-        self.assertEqual(person._data['day'], person.day)
+        self.assertEqual(person._data["name"], person.name)
+        self.assertEqual(person._data["age"], person.age)
+        self.assertEqual(person._data["userid"], person.userid)
+        self.assertEqual(person._data["created"], person.created)
+        self.assertEqual(person._data["day"], person.day)
 
         # Confirm introspection changes nothing
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(
-            data_to_be_saved, ['age', 'created', 'day', 'name', 'userid'])
+        self.assertEqual(data_to_be_saved, ["age", "created", "day", "name", "userid"])
 
-    def test_custom_field_validation_raise_deprecated_error_when_validation_return_something(self):
+    def test_custom_field_validation_raise_deprecated_error_when_validation_return_something(
+        self
+    ):
         # Covers introduction of a breaking change in the validation parameter (0.18)
         def _not_empty(z):
             return bool(z)
@@ -67,8 +91,10 @@ class Person(Document):
 
         Person.drop_collection()
 
-        error = ("validation argument for `name` must not return anything, "
-                 "it should raise a ValidationError if validation fails")
+        error = (
+            "validation argument for `name` must not return anything, "
+            "it should raise a ValidationError if validation fails"
+        )
 
         with self.assertRaises(DeprecatedError) as ctx_err:
             Person(name="").validate()
@@ -81,7 +107,7 @@ class Person(Document):
     def test_custom_field_validation_raise_validation_error(self):
         def _not_empty(z):
             if not z:
-                raise ValidationError('cantbeempty')
+                raise ValidationError("cantbeempty")
 
         class Person(Document):
             name = StringField(validation=_not_empty)
@@ -90,11 +116,17 @@ class Person(Document):
 
         with self.assertRaises(ValidationError) as ctx_err:
             Person(name="").validate()
-        self.assertEqual("ValidationError (Person:None) (cantbeempty: ['name'])", str(ctx_err.exception))
+        self.assertEqual(
+            "ValidationError (Person:None) (cantbeempty: ['name'])",
+            str(ctx_err.exception),
+        )
 
         with self.assertRaises(ValidationError):
             Person(name="").save()
-        self.assertEqual("ValidationError (Person:None) (cantbeempty: ['name'])", str(ctx_err.exception))
+        self.assertEqual(
+            "ValidationError (Person:None) (cantbeempty: ['name'])",
+            str(ctx_err.exception),
+        )
 
         Person(name="garbage").validate()
         Person(name="garbage").save()
@@ -103,10 +135,11 @@ def test_default_values_set_to_None(self):
         """Ensure that default field values are used even when
         we explcitly initialize the doc with None values.
         """
+
         class Person(Document):
             name = StringField()
             age = IntField(default=30, required=False)
-            userid = StringField(default=lambda: 'test', required=True)
+            userid = StringField(default=lambda: "test", required=True)
             created = DateTimeField(default=datetime.datetime.utcnow)
 
         # Trying setting values to None
@@ -114,7 +147,7 @@ class Person(Document):
 
         # Confirm saving now would store values
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
+        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
 
         self.assertTrue(person.validate() is None)
 
@@ -123,23 +156,24 @@ class Person(Document):
         self.assertEqual(person.userid, person.userid)
         self.assertEqual(person.created, person.created)
 
-        self.assertEqual(person._data['name'], person.name)
-        self.assertEqual(person._data['age'], person.age)
-        self.assertEqual(person._data['userid'], person.userid)
-        self.assertEqual(person._data['created'], person.created)
+        self.assertEqual(person._data["name"], person.name)
+        self.assertEqual(person._data["age"], person.age)
+        self.assertEqual(person._data["userid"], person.userid)
+        self.assertEqual(person._data["created"], person.created)
 
         # Confirm introspection changes nothing
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
+        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
 
     def test_default_values_when_setting_to_None(self):
         """Ensure that default field values are used when creating
         a document.
         """
+
         class Person(Document):
             name = StringField()
             age = IntField(default=30, required=False)
-            userid = StringField(default=lambda: 'test', required=True)
+            userid = StringField(default=lambda: "test", required=True)
             created = DateTimeField(default=datetime.datetime.utcnow)
 
         person = Person()
@@ -150,25 +184,27 @@ class Person(Document):
 
         # Confirm saving now would store values
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
+        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
 
         self.assertTrue(person.validate() is None)
 
         self.assertEqual(person.name, None)
         self.assertEqual(person.age, 30)
-        self.assertEqual(person.userid, 'test')
+        self.assertEqual(person.userid, "test")
         self.assertIsInstance(person.created, datetime.datetime)
 
-        self.assertEqual(person._data['name'], person.name)
-        self.assertEqual(person._data['age'], person.age)
-        self.assertEqual(person._data['userid'], person.userid)
-        self.assertEqual(person._data['created'], person.created)
+        self.assertEqual(person._data["name"], person.name)
+        self.assertEqual(person._data["age"], person.age)
+        self.assertEqual(person._data["userid"], person.userid)
+        self.assertEqual(person._data["created"], person.created)
 
         # Confirm introspection changes nothing
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
+        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
 
-    def test_default_value_is_not_used_when_changing_value_to_empty_list_for_strict_doc(self):
+    def test_default_value_is_not_used_when_changing_value_to_empty_list_for_strict_doc(
+        self
+    ):
         """List field with default can be set to the empty list (strict)"""
         # Issue #1733
         class Doc(Document):
@@ -180,7 +216,9 @@ class Doc(Document):
         reloaded = Doc.objects.get(id=doc.id)
         self.assertEqual(reloaded.x, [])
 
-    def test_default_value_is_not_used_when_changing_value_to_empty_list_for_dyn_doc(self):
+    def test_default_value_is_not_used_when_changing_value_to_empty_list_for_dyn_doc(
+        self
+    ):
         """List field with default can be set to the empty list (dynamic)"""
         # Issue #1733
         class Doc(DynamicDocument):
@@ -188,7 +226,7 @@ class Doc(DynamicDocument):
 
         doc = Doc(x=[1]).save()
         doc.x = []
-        doc.y = 2   # Was triggering the bug
+        doc.y = 2  # Was triggering the bug
         doc.save()
         reloaded = Doc.objects.get(id=doc.id)
         self.assertEqual(reloaded.x, [])
@@ -197,41 +235,47 @@ def test_default_values_when_deleting_value(self):
         """Ensure that default field values are used after non-default
         values are explicitly deleted.
         """
+
         class Person(Document):
             name = StringField()
             age = IntField(default=30, required=False)
-            userid = StringField(default=lambda: 'test', required=True)
+            userid = StringField(default=lambda: "test", required=True)
             created = DateTimeField(default=datetime.datetime.utcnow)
 
-        person = Person(name="Ross", age=50, userid='different',
-                        created=datetime.datetime(2014, 6, 12))
+        person = Person(
+            name="Ross",
+            age=50,
+            userid="different",
+            created=datetime.datetime(2014, 6, 12),
+        )
         del person.name
         del person.age
         del person.userid
         del person.created
 
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
+        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
 
         self.assertTrue(person.validate() is None)
 
         self.assertEqual(person.name, None)
         self.assertEqual(person.age, 30)
-        self.assertEqual(person.userid, 'test')
+        self.assertEqual(person.userid, "test")
         self.assertIsInstance(person.created, datetime.datetime)
         self.assertNotEqual(person.created, datetime.datetime(2014, 6, 12))
 
-        self.assertEqual(person._data['name'], person.name)
-        self.assertEqual(person._data['age'], person.age)
-        self.assertEqual(person._data['userid'], person.userid)
-        self.assertEqual(person._data['created'], person.created)
+        self.assertEqual(person._data["name"], person.name)
+        self.assertEqual(person._data["age"], person.age)
+        self.assertEqual(person._data["userid"], person.userid)
+        self.assertEqual(person._data["created"], person.created)
 
         # Confirm introspection changes nothing
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ['age', 'created', 'userid'])
+        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
 
     def test_required_values(self):
         """Ensure that required field constraints are enforced."""
+
         class Person(Document):
             name = StringField(required=True)
             age = IntField(required=True)
@@ -246,6 +290,7 @@ def test_not_required_handles_none_in_update(self):
         """Ensure that every fields should accept None if required is
         False.
         """
+
         class HandleNoneFields(Document):
             str_fld = StringField()
             int_fld = IntField()
@@ -255,7 +300,7 @@ class HandleNoneFields(Document):
         HandleNoneFields.drop_collection()
 
         doc = HandleNoneFields()
-        doc.str_fld = u'spam ham egg'
+        doc.str_fld = u"spam ham egg"
         doc.int_fld = 42
         doc.flt_fld = 4.2
         doc.com_dt_fld = datetime.datetime.utcnow()
@@ -281,6 +326,7 @@ def test_not_required_handles_none_from_database(self):
         """Ensure that every field can handle null values from the
         database.
         """
+
         class HandleNoneFields(Document):
             str_fld = StringField(required=True)
             int_fld = IntField(required=True)
@@ -290,21 +336,17 @@ class HandleNoneFields(Document):
         HandleNoneFields.drop_collection()
 
         doc = HandleNoneFields()
-        doc.str_fld = u'spam ham egg'
+        doc.str_fld = u"spam ham egg"
         doc.int_fld = 42
         doc.flt_fld = 4.2
         doc.comp_dt_fld = datetime.datetime.utcnow()
         doc.save()
 
         # Unset all the fields
-        obj = HandleNoneFields._get_collection().update({"_id": doc.id}, {
-            "$unset": {
-                "str_fld": 1,
-                "int_fld": 1,
-                "flt_fld": 1,
-                "comp_dt_fld": 1
-            }
-        })
+        obj = HandleNoneFields._get_collection().update(
+            {"_id": doc.id},
+            {"$unset": {"str_fld": 1, "int_fld": 1, "flt_fld": 1, "comp_dt_fld": 1}},
+        )
 
         # Retrive data from db and verify it.
         ret = HandleNoneFields.objects.first()
@@ -321,16 +363,17 @@ def test_default_id_validation_as_objectid(self):
         """Ensure that invalid values cannot be assigned to an
         ObjectIdField.
         """
+
         class Person(Document):
             name = StringField()
 
-        person = Person(name='Test User')
+        person = Person(name="Test User")
         self.assertEqual(person.id, None)
 
         person.id = 47
         self.assertRaises(ValidationError, person.validate)
 
-        person.id = 'abc'
+        person.id = "abc"
         self.assertRaises(ValidationError, person.validate)
 
         person.id = str(ObjectId())
@@ -338,26 +381,27 @@ class Person(Document):
 
     def test_string_validation(self):
         """Ensure that invalid values cannot be assigned to string fields."""
+
         class Person(Document):
             name = StringField(max_length=20)
-            userid = StringField(r'[0-9a-z_]+$')
+            userid = StringField(r"[0-9a-z_]+$")
 
         person = Person(name=34)
         self.assertRaises(ValidationError, person.validate)
 
         # Test regex validation on userid
-        person = Person(userid='test.User')
+        person = Person(userid="test.User")
         self.assertRaises(ValidationError, person.validate)
 
-        person.userid = 'test_user'
-        self.assertEqual(person.userid, 'test_user')
+        person.userid = "test_user"
+        self.assertEqual(person.userid, "test_user")
         person.validate()
 
         # Test max length validation on name
-        person = Person(name='Name that is more than twenty characters')
+        person = Person(name="Name that is more than twenty characters")
         self.assertRaises(ValidationError, person.validate)
 
-        person.name = 'Shorter name'
+        person.name = "Shorter name"
         person.validate()
 
     def test_db_field_validation(self):
@@ -365,25 +409,28 @@ def test_db_field_validation(self):
 
         # dot in the name
         with self.assertRaises(ValueError):
+
             class User(Document):
-                name = StringField(db_field='user.name')
+                name = StringField(db_field="user.name")
 
         # name starting with $
         with self.assertRaises(ValueError):
+
             class User(Document):
-                name = StringField(db_field='$name')
+                name = StringField(db_field="$name")
 
         # name containing a null character
         with self.assertRaises(ValueError):
+
             class User(Document):
-                name = StringField(db_field='name\0')
+                name = StringField(db_field="name\0")
 
     def test_list_validation(self):
         """Ensure that a list field only accepts lists with valid elements."""
         access_level_choices = (
-            ('a', u'Administration'),
-            ('b', u'Manager'),
-            ('c', u'Staff'),
+            ("a", u"Administration"),
+            ("b", u"Manager"),
+            ("c", u"Staff"),
         )
 
         class User(Document):
@@ -400,41 +447,41 @@ class BlogPost(Document):
             authors_as_lazy = ListField(LazyReferenceField(User))
             generic = ListField(GenericReferenceField())
             generic_as_lazy = ListField(GenericLazyReferenceField())
-            access_list = ListField(choices=access_level_choices, display_sep=', ')
+            access_list = ListField(choices=access_level_choices, display_sep=", ")
 
         User.drop_collection()
         BlogPost.drop_collection()
 
-        post = BlogPost(content='Went for a walk today...')
+        post = BlogPost(content="Went for a walk today...")
         post.validate()
 
-        post.tags = 'fun'
+        post.tags = "fun"
         self.assertRaises(ValidationError, post.validate)
         post.tags = [1, 2]
         self.assertRaises(ValidationError, post.validate)
 
-        post.tags = ['fun', 'leisure']
+        post.tags = ["fun", "leisure"]
         post.validate()
-        post.tags = ('fun', 'leisure')
+        post.tags = ("fun", "leisure")
         post.validate()
 
-        post.access_list = 'a,b'
+        post.access_list = "a,b"
         self.assertRaises(ValidationError, post.validate)
 
-        post.access_list = ['c', 'd']
+        post.access_list = ["c", "d"]
         self.assertRaises(ValidationError, post.validate)
 
-        post.access_list = ['a', 'b']
+        post.access_list = ["a", "b"]
         post.validate()
 
-        self.assertEqual(post.get_access_list_display(), u'Administration, Manager')
+        self.assertEqual(post.get_access_list_display(), u"Administration, Manager")
 
-        post.comments = ['a']
+        post.comments = ["a"]
         self.assertRaises(ValidationError, post.validate)
-        post.comments = 'yay'
+        post.comments = "yay"
         self.assertRaises(ValidationError, post.validate)
 
-        comments = [Comment(content='Good for you'), Comment(content='Yay.')]
+        comments = [Comment(content="Good for you"), Comment(content="Yay.")]
         post.comments = comments
         post.validate()
 
@@ -485,28 +532,28 @@ class BlogPost(Document):
     def test_sorted_list_sorting(self):
         """Ensure that a sorted list field properly sorts values.
         """
+
         class Comment(EmbeddedDocument):
             order = IntField()
             content = StringField()
 
         class BlogPost(Document):
             content = StringField()
-            comments = SortedListField(EmbeddedDocumentField(Comment),
-                                       ordering='order')
+            comments = SortedListField(EmbeddedDocumentField(Comment), ordering="order")
             tags = SortedListField(StringField())
 
         BlogPost.drop_collection()
 
-        post = BlogPost(content='Went for a walk today...')
+        post = BlogPost(content="Went for a walk today...")
         post.save()
 
-        post.tags = ['leisure', 'fun']
+        post.tags = ["leisure", "fun"]
         post.save()
         post.reload()
-        self.assertEqual(post.tags, ['fun', 'leisure'])
+        self.assertEqual(post.tags, ["fun", "leisure"])
 
-        comment1 = Comment(content='Good for you', order=1)
-        comment2 = Comment(content='Yay.', order=0)
+        comment1 = Comment(content="Good for you", order=1)
+        comment2 = Comment(content="Yay.", order=0)
         comments = [comment1, comment2]
         post.comments = comments
         post.save()
@@ -529,16 +576,17 @@ class Category(EmbeddedDocument):
             name = StringField()
 
         class CategoryList(Document):
-            categories = SortedListField(EmbeddedDocumentField(Category),
-                                         ordering='count', reverse=True)
+            categories = SortedListField(
+                EmbeddedDocumentField(Category), ordering="count", reverse=True
+            )
             name = StringField()
 
         CategoryList.drop_collection()
 
         catlist = CategoryList(name="Top categories")
-        cat1 = Category(name='posts', count=10)
-        cat2 = Category(name='food', count=100)
-        cat3 = Category(name='drink', count=40)
+        cat1 = Category(name="posts", count=10)
+        cat2 = Category(name="food", count=100)
+        cat3 = Category(name="drink", count=40)
         catlist.categories = [cat1, cat2, cat3]
         catlist.save()
         catlist.reload()
@@ -549,57 +597,59 @@ class CategoryList(Document):
 
     def test_list_field(self):
         """Ensure that list types work as expected."""
+
         class BlogPost(Document):
             info = ListField()
 
         BlogPost.drop_collection()
 
         post = BlogPost()
-        post.info = 'my post'
+        post.info = "my post"
         self.assertRaises(ValidationError, post.validate)
 
-        post.info = {'title': 'test'}
+        post.info = {"title": "test"}
         self.assertRaises(ValidationError, post.validate)
 
-        post.info = ['test']
+        post.info = ["test"]
         post.save()
 
         post = BlogPost()
-        post.info = [{'test': 'test'}]
+        post.info = [{"test": "test"}]
         post.save()
 
         post = BlogPost()
-        post.info = [{'test': 3}]
+        post.info = [{"test": 3}]
         post.save()
 
         self.assertEqual(BlogPost.objects.count(), 3)
-        self.assertEqual(
-            BlogPost.objects.filter(info__exact='test').count(), 1)
-        self.assertEqual(
-            BlogPost.objects.filter(info__0__test='test').count(), 1)
+        self.assertEqual(BlogPost.objects.filter(info__exact="test").count(), 1)
+        self.assertEqual(BlogPost.objects.filter(info__0__test="test").count(), 1)
 
         # Confirm handles non strings or non existing keys
+        self.assertEqual(BlogPost.objects.filter(info__0__test__exact="5").count(), 0)
         self.assertEqual(
-            BlogPost.objects.filter(info__0__test__exact='5').count(), 0)
-        self.assertEqual(
-            BlogPost.objects.filter(info__100__test__exact='test').count(), 0)
+            BlogPost.objects.filter(info__100__test__exact="test").count(), 0
+        )
 
         # test queries by list
         post = BlogPost()
-        post.info = ['1', '2']
+        post.info = ["1", "2"]
         post.save()
-        post = BlogPost.objects(info=['1', '2']).get()
-        post.info += ['3', '4']
+        post = BlogPost.objects(info=["1", "2"]).get()
+        post.info += ["3", "4"]
         post.save()
-        self.assertEqual(BlogPost.objects(info=['1', '2', '3', '4']).count(), 1)
-        post = BlogPost.objects(info=['1', '2', '3', '4']).get()
+        self.assertEqual(BlogPost.objects(info=["1", "2", "3", "4"]).count(), 1)
+        post = BlogPost.objects(info=["1", "2", "3", "4"]).get()
         post.info *= 2
         post.save()
-        self.assertEqual(BlogPost.objects(info=['1', '2', '3', '4', '1', '2', '3', '4']).count(), 1)
+        self.assertEqual(
+            BlogPost.objects(info=["1", "2", "3", "4", "1", "2", "3", "4"]).count(), 1
+        )
 
     def test_list_field_manipulative_operators(self):
         """Ensure that ListField works with standard list operators that manipulate the list.
         """
+
         class BlogPost(Document):
             ref = StringField()
             info = ListField(StringField())
@@ -608,162 +658,178 @@ class BlogPost(Document):
 
         post = BlogPost()
         post.ref = "1234"
-        post.info = ['0', '1', '2', '3', '4', '5']
+        post.info = ["0", "1", "2", "3", "4", "5"]
         post.save()
 
         def reset_post():
-            post.info = ['0', '1', '2', '3', '4', '5']
+            post.info = ["0", "1", "2", "3", "4", "5"]
             post.save()
 
         # '__add__(listB)'
         # listA+listB
         # operator.add(listA, listB)
         reset_post()
-        temp = ['a', 'b']
+        temp = ["a", "b"]
         post.info = post.info + temp
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'a', 'b'])
+        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "a", "b"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'a', 'b'])
+        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "a", "b"])
 
         # '__delitem__(index)'
         # aka 'del list[index]'
         # aka 'operator.delitem(list, index)'
         reset_post()
         del post.info[2]  # del from middle ('2')
-        self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
+        self.assertEqual(post.info, ["0", "1", "3", "4", "5"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
+        self.assertEqual(post.info, ["0", "1", "3", "4", "5"])
 
         # '__delitem__(slice(i, j))'
         # aka 'del list[i:j]'
         # aka 'operator.delitem(list, slice(i,j))'
         reset_post()
         del post.info[1:3]  # removes '1', '2'
-        self.assertEqual(post.info, ['0', '3', '4', '5'])
+        self.assertEqual(post.info, ["0", "3", "4", "5"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '3', '4', '5'])
+        self.assertEqual(post.info, ["0", "3", "4", "5"])
 
         # '__iadd__'
         # aka 'list += list'
         reset_post()
-        temp = ['a', 'b']
+        temp = ["a", "b"]
         post.info += temp
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'a', 'b'])
+        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "a", "b"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'a', 'b'])
+        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "a", "b"])
 
         # '__imul__'
         # aka 'list *= number'
         reset_post()
         post.info *= 2
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+        self.assertEqual(
+            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
+        )
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+        self.assertEqual(
+            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
+        )
 
         # '__mul__'
         # aka 'listA*listB'
         reset_post()
         post.info = post.info * 2
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+        self.assertEqual(
+            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
+        )
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+        self.assertEqual(
+            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
+        )
 
         # '__rmul__'
         # aka 'listB*listA'
         reset_post()
         post.info = 2 * post.info
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+        self.assertEqual(
+            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
+        )
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', '0', '1', '2', '3', '4', '5'])
+        self.assertEqual(
+            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
+        )
 
         # '__setitem__(index, value)'
         # aka 'list[index]=value'
         # aka 'setitem(list, value)'
         reset_post()
-        post.info[4] = 'a'
-        self.assertEqual(post.info, ['0', '1', '2', '3', 'a', '5'])
+        post.info[4] = "a"
+        self.assertEqual(post.info, ["0", "1", "2", "3", "a", "5"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '2', '3', 'a', '5'])
+        self.assertEqual(post.info, ["0", "1", "2", "3", "a", "5"])
 
         # __setitem__(index, value) with a negative index
         reset_post()
-        post.info[-2] = 'a'
-        self.assertEqual(post.info, ['0', '1', '2', '3', 'a', '5'])
+        post.info[-2] = "a"
+        self.assertEqual(post.info, ["0", "1", "2", "3", "a", "5"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '2', '3', 'a', '5'])
+        self.assertEqual(post.info, ["0", "1", "2", "3", "a", "5"])
 
         # '__setitem__(slice(i, j), listB)'
         # aka 'listA[i:j] = listB'
         # aka 'setitem(listA, slice(i, j), listB)'
         reset_post()
-        post.info[1:3] = ['h', 'e', 'l', 'l', 'o']
-        self.assertEqual(post.info, ['0', 'h', 'e', 'l', 'l', 'o', '3', '4', '5'])
+        post.info[1:3] = ["h", "e", "l", "l", "o"]
+        self.assertEqual(post.info, ["0", "h", "e", "l", "l", "o", "3", "4", "5"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', 'h', 'e', 'l', 'l', 'o', '3', '4', '5'])
+        self.assertEqual(post.info, ["0", "h", "e", "l", "l", "o", "3", "4", "5"])
 
         # '__setitem__(slice(i, j), listB)' with negative i and j
         reset_post()
-        post.info[-5:-3] = ['h', 'e', 'l', 'l', 'o']
-        self.assertEqual(post.info, ['0', 'h', 'e', 'l', 'l', 'o', '3', '4', '5'])
+        post.info[-5:-3] = ["h", "e", "l", "l", "o"]
+        self.assertEqual(post.info, ["0", "h", "e", "l", "l", "o", "3", "4", "5"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', 'h', 'e', 'l', 'l', 'o', '3', '4', '5'])
+        self.assertEqual(post.info, ["0", "h", "e", "l", "l", "o", "3", "4", "5"])
 
         # negative
 
         # 'append'
         reset_post()
-        post.info.append('h')
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'h'])
+        post.info.append("h")
+        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "h"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'h'])
+        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "h"])
 
         # 'extend'
         reset_post()
-        post.info.extend(['h', 'e', 'l', 'l', 'o'])
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'h', 'e', 'l', 'l', 'o'])
+        post.info.extend(["h", "e", "l", "l", "o"])
+        self.assertEqual(
+            post.info, ["0", "1", "2", "3", "4", "5", "h", "e", "l", "l", "o"]
+        )
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '2', '3', '4', '5', 'h', 'e', 'l', 'l', 'o'])
+        self.assertEqual(
+            post.info, ["0", "1", "2", "3", "4", "5", "h", "e", "l", "l", "o"]
+        )
         # 'insert'
 
         # 'pop'
         reset_post()
         x = post.info.pop(2)
         y = post.info.pop()
-        self.assertEqual(post.info, ['0', '1', '3', '4'])
-        self.assertEqual(x, '2')
-        self.assertEqual(y, '5')
+        self.assertEqual(post.info, ["0", "1", "3", "4"])
+        self.assertEqual(x, "2")
+        self.assertEqual(y, "5")
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '3', '4'])
+        self.assertEqual(post.info, ["0", "1", "3", "4"])
 
         # 'remove'
         reset_post()
-        post.info.remove('2')
-        self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
+        post.info.remove("2")
+        self.assertEqual(post.info, ["0", "1", "3", "4", "5"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['0', '1', '3', '4', '5'])
+        self.assertEqual(post.info, ["0", "1", "3", "4", "5"])
 
         # 'reverse'
         reset_post()
         post.info.reverse()
-        self.assertEqual(post.info, ['5', '4', '3', '2', '1', '0'])
+        self.assertEqual(post.info, ["5", "4", "3", "2", "1", "0"])
         post.save()
         post.reload()
-        self.assertEqual(post.info, ['5', '4', '3', '2', '1', '0'])
+        self.assertEqual(post.info, ["5", "4", "3", "2", "1", "0"])
 
         # 'sort': though this operator method does manipulate the list, it is
         # tested in the 'test_list_field_lexicograpic_operators' function
@@ -775,7 +841,7 @@ class BlogPost(Document):
 
         post = BlogPost()
         post.ref = "1234"
-        post.info = ['0', '1', '2', '3', '4', '5']
+        post.info = ["0", "1", "2", "3", "4", "5"]
 
         # '__hash__'
         # aka 'hash(list)'
@@ -785,6 +851,7 @@ def test_list_field_lexicographic_operators(self):
         """Ensure that ListField works with standard list operators that
         do lexigraphic ordering.
         """
+
         class BlogPost(Document):
             ref = StringField()
             text_info = ListField(StringField())
@@ -810,7 +877,7 @@ class BlogPost(Document):
         blogLargeB.oid_info = [
             "54495ad94c934721ede76f90",
             "54495ad94c934721ede76d23",
-            "54495ad94c934721ede76d00"
+            "54495ad94c934721ede76d00",
         ]
         blogLargeB.bool_info = [False, True]
         blogLargeB.save()
@@ -852,7 +919,7 @@ class BlogPost(Document):
         sorted_target_list = [
             ObjectId("54495ad94c934721ede76d00"),
             ObjectId("54495ad94c934721ede76d23"),
-            ObjectId("54495ad94c934721ede76f90")
+            ObjectId("54495ad94c934721ede76f90"),
         ]
         self.assertEqual(blogLargeB.text_info, ["a", "j", "z"])
         self.assertEqual(blogLargeB.oid_info, sorted_target_list)
@@ -865,13 +932,14 @@ class BlogPost(Document):
 
     def test_list_assignment(self):
         """Ensure that list field element assignment and slicing work."""
+
         class BlogPost(Document):
             info = ListField()
 
         BlogPost.drop_collection()
 
         post = BlogPost()
-        post.info = ['e1', 'e2', 3, '4', 5]
+        post.info = ["e1", "e2", 3, "4", 5]
         post.save()
 
         post.info[0] = 1
@@ -879,35 +947,35 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.info[0], 1)
 
-        post.info[1:3] = ['n2', 'n3']
+        post.info[1:3] = ["n2", "n3"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, 'n2', 'n3', '4', 5])
+        self.assertEqual(post.info, [1, "n2", "n3", "4", 5])
 
-        post.info[-1] = 'n5'
+        post.info[-1] = "n5"
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, 'n2', 'n3', '4', 'n5'])
+        self.assertEqual(post.info, [1, "n2", "n3", "4", "n5"])
 
         post.info[-2] = 4
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, 'n2', 'n3', 4, 'n5'])
+        self.assertEqual(post.info, [1, "n2", "n3", 4, "n5"])
 
         post.info[1:-1] = [2]
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, 2, 'n5'])
+        self.assertEqual(post.info, [1, 2, "n5"])
 
-        post.info[:-1] = [1, 'n2', 'n3', 4]
+        post.info[:-1] = [1, "n2", "n3", 4]
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, 'n2', 'n3', 4, 'n5'])
+        self.assertEqual(post.info, [1, "n2", "n3", 4, "n5"])
 
         post.info[-4:3] = [2, 3]
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, 2, 3, 4, 'n5'])
+        self.assertEqual(post.info, [1, 2, 3, 4, "n5"])
 
     def test_list_field_passed_in_value(self):
         class Foo(Document):
@@ -921,12 +989,13 @@ class Bar(Document):
 
         foo = Foo(bars=[])
         foo.bars.append(bar)
-        self.assertEqual(repr(foo.bars), '[<Bar: Bar object>]')
+        self.assertEqual(repr(foo.bars), "[<Bar: Bar object>]")
 
     def test_list_field_strict(self):
         """Ensure that list field handles validation if provided
         a strict field type.
         """
+
         class Simple(Document):
             mapping = ListField(field=IntField())
 
@@ -943,17 +1012,19 @@ class Simple(Document):
 
     def test_list_field_rejects_strings(self):
         """Strings aren't valid list field data types."""
+
         class Simple(Document):
             mapping = ListField()
 
         Simple.drop_collection()
 
         e = Simple()
-        e.mapping = 'hello world'
+        e.mapping = "hello world"
         self.assertRaises(ValidationError, e.save)
 
     def test_complex_field_required(self):
         """Ensure required cant be None / Empty."""
+
         class Simple(Document):
             mapping = ListField(required=True)
 
@@ -975,6 +1046,7 @@ def test_complex_field_same_value_not_changed(self):
         """If a complex field is set to the same value, it should not
         be marked as changed.
         """
+
         class Simple(Document):
             mapping = ListField()
 
@@ -999,7 +1071,7 @@ class Simple(Document):
 
         simple = Simple(widgets=[1, 2, 3, 4]).save()
         simple.widgets[:3] = []
-        self.assertEqual(['widgets'], simple._changed_fields)
+        self.assertEqual(["widgets"], simple._changed_fields)
         simple.save()
 
         simple = simple.reload()
@@ -1011,7 +1083,7 @@ class Simple(Document):
 
         simple = Simple(widgets=[1, 2, 3, 4]).save()
         del simple.widgets[:3]
-        self.assertEqual(['widgets'], simple._changed_fields)
+        self.assertEqual(["widgets"], simple._changed_fields)
         simple.save()
 
         simple = simple.reload()
@@ -1023,7 +1095,7 @@ class Simple(Document):
 
         simple = Simple(widgets=[1, 2, 3, 4]).save()
         simple.widgets[-1] = 5
-        self.assertEqual(['widgets.3'], simple._changed_fields)
+        self.assertEqual(["widgets.3"], simple._changed_fields)
         simple.save()
 
         simple = simple.reload()
@@ -1031,8 +1103,9 @@ class Simple(Document):
 
     def test_list_field_complex(self):
         """Ensure that the list fields can handle the complex types."""
+
         class SettingBase(EmbeddedDocument):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class StringSetting(SettingBase):
             value = StringField()
@@ -1046,12 +1119,17 @@ class Simple(Document):
         Simple.drop_collection()
 
         e = Simple()
-        e.mapping.append(StringSetting(value='foo'))
+        e.mapping.append(StringSetting(value="foo"))
         e.mapping.append(IntegerSetting(value=42))
-        e.mapping.append({'number': 1, 'string': 'Hi!', 'float': 1.001,
-                          'complex': IntegerSetting(value=42),
-                          'list': [IntegerSetting(value=42),
-                                   StringSetting(value='foo')]})
+        e.mapping.append(
+            {
+                "number": 1,
+                "string": "Hi!",
+                "float": 1.001,
+                "complex": IntegerSetting(value=42),
+                "list": [IntegerSetting(value=42), StringSetting(value="foo")],
+            }
+        )
         e.save()
 
         e2 = Simple.objects.get(id=e.id)
@@ -1059,35 +1137,36 @@ class Simple(Document):
         self.assertIsInstance(e2.mapping[1], IntegerSetting)
 
         # Test querying
+        self.assertEqual(Simple.objects.filter(mapping__1__value=42).count(), 1)
+        self.assertEqual(Simple.objects.filter(mapping__2__number=1).count(), 1)
         self.assertEqual(
-            Simple.objects.filter(mapping__1__value=42).count(), 1)
-        self.assertEqual(
-            Simple.objects.filter(mapping__2__number=1).count(), 1)
-        self.assertEqual(
-            Simple.objects.filter(mapping__2__complex__value=42).count(), 1)
+            Simple.objects.filter(mapping__2__complex__value=42).count(), 1
+        )
         self.assertEqual(
-            Simple.objects.filter(mapping__2__list__0__value=42).count(), 1)
+            Simple.objects.filter(mapping__2__list__0__value=42).count(), 1
+        )
         self.assertEqual(
-            Simple.objects.filter(mapping__2__list__1__value='foo').count(), 1)
+            Simple.objects.filter(mapping__2__list__1__value="foo").count(), 1
+        )
 
         # Confirm can update
         Simple.objects().update(set__mapping__1=IntegerSetting(value=10))
-        self.assertEqual(
-            Simple.objects.filter(mapping__1__value=10).count(), 1)
+        self.assertEqual(Simple.objects.filter(mapping__1__value=10).count(), 1)
 
-        Simple.objects().update(
-            set__mapping__2__list__1=StringSetting(value='Boo'))
+        Simple.objects().update(set__mapping__2__list__1=StringSetting(value="Boo"))
         self.assertEqual(
-            Simple.objects.filter(mapping__2__list__1__value='foo').count(), 0)
+            Simple.objects.filter(mapping__2__list__1__value="foo").count(), 0
+        )
         self.assertEqual(
-            Simple.objects.filter(mapping__2__list__1__value='Boo').count(), 1)
+            Simple.objects.filter(mapping__2__list__1__value="Boo").count(), 1
+        )
 
     def test_embedded_db_field(self):
         class Embedded(EmbeddedDocument):
-            number = IntField(default=0, db_field='i')
+            number = IntField(default=0, db_field="i")
 
         class Test(Document):
-            embedded = EmbeddedDocumentField(Embedded, db_field='x')
+            embedded = EmbeddedDocumentField(Embedded, db_field="x")
 
         Test.drop_collection()
 
@@ -1100,58 +1179,54 @@ class Test(Document):
         test = Test.objects.get()
         self.assertEqual(test.embedded.number, 2)
         doc = self.db.test.find_one()
-        self.assertEqual(doc['x']['i'], 2)
+        self.assertEqual(doc["x"]["i"], 2)
 
     def test_double_embedded_db_field(self):
         """Make sure multiple layers of embedded docs resolve db fields
         properly and can be initialized using dicts.
         """
+
         class C(EmbeddedDocument):
             txt = StringField()
 
         class B(EmbeddedDocument):
-            c = EmbeddedDocumentField(C, db_field='fc')
+            c = EmbeddedDocumentField(C, db_field="fc")
 
         class A(Document):
-            b = EmbeddedDocumentField(B, db_field='fb')
+            b = EmbeddedDocumentField(B, db_field="fb")
 
-        a = A(
-            b=B(
-                c=C(txt='hi')
-            )
-        )
+        a = A(b=B(c=C(txt="hi")))
         a.validate()
 
-        a = A(b={'c': {'txt': 'hi'}})
+        a = A(b={"c": {"txt": "hi"}})
         a.validate()
 
     def test_double_embedded_db_field_from_son(self):
         """Make sure multiple layers of embedded docs resolve db fields
         from SON properly.
         """
+
         class C(EmbeddedDocument):
             txt = StringField()
 
         class B(EmbeddedDocument):
-            c = EmbeddedDocumentField(C, db_field='fc')
+            c = EmbeddedDocumentField(C, db_field="fc")
 
         class A(Document):
-            b = EmbeddedDocumentField(B, db_field='fb')
+            b = EmbeddedDocumentField(B, db_field="fb")
 
-        a = A._from_son(SON([
-            ('fb', SON([
-                ('fc', SON([
-                    ('txt', 'hi')
-                ]))
-            ]))
-        ]))
-        self.assertEqual(a.b.c.txt, 'hi')
+        a = A._from_son(SON([("fb", SON([("fc", SON([("txt", "hi")]))]))]))
+        self.assertEqual(a.b.c.txt, "hi")
 
-    def test_embedded_document_field_cant_reference_using_a_str_if_it_does_not_exist_yet(self):
-        raise SkipTest("Using a string reference in an EmbeddedDocumentField does not work if the class isnt registerd yet")
+    def test_embedded_document_field_cant_reference_using_a_str_if_it_does_not_exist_yet(
+        self
+    ):
+        raise SkipTest(
+            "Using a string reference in an EmbeddedDocumentField does not work if the class isnt registerd yet"
+        )
 
         class MyDoc2(Document):
-            emb = EmbeddedDocumentField('MyDoc')
+            emb = EmbeddedDocumentField("MyDoc")
 
         class MyDoc(EmbeddedDocument):
             name = StringField()
@@ -1160,6 +1235,7 @@ def test_embedded_document_validation(self):
         """Ensure that invalid embedded documents cannot be assigned to
         embedded document fields.
         """
+
         class Comment(EmbeddedDocument):
             content = StringField()
 
@@ -1173,30 +1249,31 @@ class Person(Document):
 
         Person.drop_collection()
 
-        person = Person(name='Test User')
-        person.preferences = 'My Preferences'
+        person = Person(name="Test User")
+        person.preferences = "My Preferences"
         self.assertRaises(ValidationError, person.validate)
 
         # Check that only the right embedded doc works
-        person.preferences = Comment(content='Nice blog post...')
+        person.preferences = Comment(content="Nice blog post...")
         self.assertRaises(ValidationError, person.validate)
 
         # Check that the embedded doc is valid
         person.preferences = PersonPreferences()
         self.assertRaises(ValidationError, person.validate)
 
-        person.preferences = PersonPreferences(food='Cheese', number=47)
-        self.assertEqual(person.preferences.food, 'Cheese')
+        person.preferences = PersonPreferences(food="Cheese", number=47)
+        self.assertEqual(person.preferences.food, "Cheese")
         person.validate()
 
     def test_embedded_document_inheritance(self):
         """Ensure that subclasses of embedded documents may be provided
         to EmbeddedDocumentFields of the superclass' type.
         """
+
         class User(EmbeddedDocument):
             name = StringField()
 
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class PowerUser(User):
             power = IntField()
@@ -1207,8 +1284,8 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post = BlogPost(content='What I did today...')
-        post.author = PowerUser(name='Test User', power=47)
+        post = BlogPost(content="What I did today...")
+        post.author = PowerUser(name="Test User", power=47)
         post.save()
 
         self.assertEqual(47, BlogPost.objects.first().author.power)
@@ -1217,21 +1294,22 @@ def test_embedded_document_inheritance_with_list(self):
         """Ensure that nested list of subclassed embedded documents is
         handled correctly.
         """
+
         class Group(EmbeddedDocument):
             name = StringField()
             content = ListField(StringField())
 
         class Basedoc(Document):
             groups = ListField(EmbeddedDocumentField(Group))
-            meta = {'abstract': True}
+            meta = {"abstract": True}
 
         class User(Basedoc):
-            doctype = StringField(require=True, default='userdata')
+            doctype = StringField(require=True, default="userdata")
 
         User.drop_collection()
 
-        content = ['la', 'le', 'lu']
-        group = Group(name='foo', content=content)
+        content = ["la", "le", "lu"]
+        group = Group(name="foo", content=content)
         foobar = User(groups=[group])
         foobar.save()
 
@@ -1241,6 +1319,7 @@ def test_reference_miss(self):
         """Ensure an exception is raised when dereferencing an unknown
         document.
         """
+
         class Foo(Document):
             pass
 
@@ -1257,20 +1336,21 @@ class Bar(Document):
         # Reference is no longer valid
         foo.delete()
         bar = Bar.objects.get()
-        self.assertRaises(DoesNotExist, getattr, bar, 'ref')
-        self.assertRaises(DoesNotExist, getattr, bar, 'generic_ref')
+        self.assertRaises(DoesNotExist, getattr, bar, "ref")
+        self.assertRaises(DoesNotExist, getattr, bar, "generic_ref")
 
         # When auto_dereference is disabled, there is no trouble returning DBRef
         bar = Bar.objects.get()
         expected = foo.to_dbref()
-        bar._fields['ref']._auto_dereference = False
+        bar._fields["ref"]._auto_dereference = False
         self.assertEqual(bar.ref, expected)
-        bar._fields['generic_ref']._auto_dereference = False
-        self.assertEqual(bar.generic_ref, {'_ref': expected, '_cls': 'Foo'})
+        bar._fields["generic_ref"]._auto_dereference = False
+        self.assertEqual(bar.generic_ref, {"_ref": expected, "_cls": "Foo"})
 
     def test_list_item_dereference(self):
         """Ensure that DBRef items in ListFields are dereferenced.
         """
+
         class User(Document):
             name = StringField()
 
@@ -1280,9 +1360,9 @@ class Group(Document):
         User.drop_collection()
         Group.drop_collection()
 
-        user1 = User(name='user1')
+        user1 = User(name="user1")
         user1.save()
-        user2 = User(name='user2')
+        user2 = User(name="user2")
         user2.save()
 
         group = Group(members=[user1, user2])
@@ -1296,24 +1376,25 @@ class Group(Document):
     def test_recursive_reference(self):
         """Ensure that ReferenceFields can reference their own documents.
         """
+
         class Employee(Document):
             name = StringField()
-            boss = ReferenceField('self')
-            friends = ListField(ReferenceField('self'))
+            boss = ReferenceField("self")
+            friends = ListField(ReferenceField("self"))
 
         Employee.drop_collection()
 
-        bill = Employee(name='Bill Lumbergh')
+        bill = Employee(name="Bill Lumbergh")
         bill.save()
 
-        michael = Employee(name='Michael Bolton')
+        michael = Employee(name="Michael Bolton")
         michael.save()
 
-        samir = Employee(name='Samir Nagheenanajar')
+        samir = Employee(name="Samir Nagheenanajar")
         samir.save()
 
         friends = [michael, samir]
-        peter = Employee(name='Peter Gibbons', boss=bill, friends=friends)
+        peter = Employee(name="Peter Gibbons", boss=bill, friends=friends)
         peter.save()
 
         peter = Employee.objects.with_id(peter.id)
@@ -1323,13 +1404,14 @@ class Employee(Document):
     def test_recursive_embedding(self):
         """Ensure that EmbeddedDocumentFields can contain their own documents.
         """
+
         class TreeNode(EmbeddedDocument):
             name = StringField()
-            children = ListField(EmbeddedDocumentField('self'))
+            children = ListField(EmbeddedDocumentField("self"))
 
         class Tree(Document):
             name = StringField()
-            children = ListField(EmbeddedDocumentField('TreeNode'))
+            children = ListField(EmbeddedDocumentField("TreeNode"))
 
         Tree.drop_collection()
 
@@ -1356,18 +1438,18 @@ class Tree(Document):
         self.assertEqual(tree.children[0].children[1].name, third_child.name)
 
         # Test updating
-        tree.children[0].name = 'I am Child 1'
-        tree.children[0].children[0].name = 'I am Child 2'
-        tree.children[0].children[1].name = 'I am Child 3'
+        tree.children[0].name = "I am Child 1"
+        tree.children[0].children[0].name = "I am Child 2"
+        tree.children[0].children[1].name = "I am Child 3"
         tree.save()
 
-        self.assertEqual(tree.children[0].name, 'I am Child 1')
-        self.assertEqual(tree.children[0].children[0].name, 'I am Child 2')
-        self.assertEqual(tree.children[0].children[1].name, 'I am Child 3')
+        self.assertEqual(tree.children[0].name, "I am Child 1")
+        self.assertEqual(tree.children[0].children[0].name, "I am Child 2")
+        self.assertEqual(tree.children[0].children[1].name, "I am Child 3")
 
         # Test removal
         self.assertEqual(len(tree.children[0].children), 2)
-        del(tree.children[0].children[1])
+        del tree.children[0].children[1]
 
         tree.save()
         self.assertEqual(len(tree.children[0].children), 1)
@@ -1388,6 +1470,7 @@ def test_drop_abstract_document(self):
         """Ensure that an abstract document cannot be dropped given it
         has no underlying collection.
         """
+
         class AbstractDoc(Document):
             name = StringField()
             meta = {"abstract": True}
@@ -1397,6 +1480,7 @@ class AbstractDoc(Document):
     def test_reference_class_with_abstract_parent(self):
         """Ensure that a class with an abstract parent can be referenced.
         """
+
         class Sibling(Document):
             name = StringField()
             meta = {"abstract": True}
@@ -1421,6 +1505,7 @@ def test_reference_abstract_class(self):
         """Ensure that an abstract class instance cannot be used in the
         reference of that abstract class.
         """
+
         class Sibling(Document):
             name = StringField()
             meta = {"abstract": True}
@@ -1442,6 +1527,7 @@ def test_abstract_reference_base_type(self):
         """Ensure that an an abstract reference fails validation when given a
         Document that does not inherit from the abstract type.
         """
+
         class Sibling(Document):
             name = StringField()
             meta = {"abstract": True}
@@ -1463,9 +1549,10 @@ class Mother(Document):
     def test_generic_reference(self):
         """Ensure that a GenericReferenceField properly dereferences items.
         """
+
         class Link(Document):
             title = StringField()
-            meta = {'allow_inheritance': False}
+            meta = {"allow_inheritance": False}
 
         class Post(Document):
             title = StringField()
@@ -1502,6 +1589,7 @@ class Bookmark(Document):
     def test_generic_reference_list(self):
         """Ensure that a ListField properly dereferences generic references.
         """
+
         class Link(Document):
             title = StringField()
 
@@ -1533,6 +1621,7 @@ def test_generic_reference_document_not_registered(self):
         """Ensure dereferencing out of the document registry throws a
         `NotRegistered` error.
         """
+
         class Link(Document):
             title = StringField()
 
@@ -1550,7 +1639,7 @@ class User(Document):
 
         # Mimic User and Link definitions being in a different file
         # and the Link model not being imported in the User file.
-        del(_document_registry["Link"])
+        del _document_registry["Link"]
 
         user = User.objects.first()
         try:
@@ -1560,7 +1649,6 @@ class User(Document):
             pass
 
     def test_generic_reference_is_none(self):
-
         class Person(Document):
             name = StringField()
             city = GenericReferenceField()
@@ -1568,11 +1656,11 @@ class Person(Document):
         Person.drop_collection()
 
         Person(name="Wilson Jr").save()
-        self.assertEqual(repr(Person.objects(city=None)),
-                         "[<Person: Person object>]")
+        self.assertEqual(repr(Person.objects(city=None)), "[<Person: Person object>]")
 
     def test_generic_reference_choices(self):
         """Ensure that a GenericReferenceField can handle choices."""
+
         class Link(Document):
             title = StringField()
 
@@ -1604,6 +1692,7 @@ class Bookmark(Document):
     def test_generic_reference_string_choices(self):
         """Ensure that a GenericReferenceField can handle choices as strings
         """
+
         class Link(Document):
             title = StringField()
 
@@ -1611,7 +1700,7 @@ class Post(Document):
             title = StringField()
 
         class Bookmark(Document):
-            bookmark_object = GenericReferenceField(choices=('Post', Link))
+            bookmark_object = GenericReferenceField(choices=("Post", Link))
 
         Link.drop_collection()
         Post.drop_collection()
@@ -1636,11 +1725,12 @@ def test_generic_reference_choices_no_dereference(self):
         """Ensure that a GenericReferenceField can handle choices on
         non-derefenreced (i.e. DBRef) elements
         """
+
         class Post(Document):
             title = StringField()
 
         class Bookmark(Document):
-            bookmark_object = GenericReferenceField(choices=(Post, ))
+            bookmark_object = GenericReferenceField(choices=(Post,))
             other_field = StringField()
 
         Post.drop_collection()
@@ -1654,13 +1744,14 @@ class Bookmark(Document):
 
         bm = Bookmark.objects.get(id=bm.id)
         # bookmark_object is now a DBRef
-        bm.other_field = 'dummy_change'
+        bm.other_field = "dummy_change"
         bm.save()
 
     def test_generic_reference_list_choices(self):
         """Ensure that a ListField properly dereferences generic references and
         respects choices.
         """
+
         class Link(Document):
             title = StringField()
 
@@ -1692,6 +1783,7 @@ class User(Document):
     def test_generic_reference_list_item_modification(self):
         """Ensure that modifications of related documents (through generic reference) don't influence on querying
         """
+
         class Post(Document):
             title = StringField()
 
@@ -1721,6 +1813,7 @@ def test_generic_reference_filter_by_dbref(self):
         """Ensure we can search for a specific generic reference by
         providing its ObjectId.
         """
+
         class Doc(Document):
             ref = GenericReferenceField()
 
@@ -1729,13 +1822,14 @@ class Doc(Document):
         doc1 = Doc.objects.create()
         doc2 = Doc.objects.create(ref=doc1)
 
-        doc = Doc.objects.get(ref=DBRef('doc', doc1.pk))
+        doc = Doc.objects.get(ref=DBRef("doc", doc1.pk))
         self.assertEqual(doc, doc2)
 
     def test_generic_reference_is_not_tracked_in_parent_doc(self):
         """Ensure that modifications of related documents (through generic reference) don't influence
         the owner changed fields (#1934)
         """
+
         class Doc1(Document):
             name = StringField()
 
@@ -1746,14 +1840,14 @@ class Doc2(Document):
         Doc1.drop_collection()
         Doc2.drop_collection()
 
-        doc1 = Doc1(name='garbage1').save()
-        doc11 = Doc1(name='garbage11').save()
+        doc1 = Doc1(name="garbage1").save()
+        doc11 = Doc1(name="garbage11").save()
         doc2 = Doc2(ref=doc1, refs=[doc11]).save()
 
-        doc2.ref.name = 'garbage2'
+        doc2.ref.name = "garbage2"
         self.assertEqual(doc2._get_changed_fields(), [])
 
-        doc2.refs[0].name = 'garbage3'
+        doc2.refs[0].name = "garbage3"
         self.assertEqual(doc2._get_changed_fields(), [])
         self.assertEqual(doc2._delta(), ({}, {}))
 
@@ -1761,6 +1855,7 @@ def test_generic_reference_field(self):
         """Ensure we can search for a specific generic reference by
         providing its DBRef.
         """
+
         class Doc(Document):
             ref = GenericReferenceField()
 
@@ -1777,17 +1872,19 @@ class Doc(Document):
     def test_choices_allow_using_sets_as_choices(self):
         """Ensure that sets can be used when setting choices
         """
+
         class Shirt(Document):
-            size = StringField(choices={'M', 'L'})
+            size = StringField(choices={"M", "L"})
 
-        Shirt(size='M').validate()
+        Shirt(size="M").validate()
 
     def test_choices_validation_allow_no_value(self):
         """Ensure that .validate passes and no value was provided
         for a field setup with choices
         """
+
         class Shirt(Document):
-            size = StringField(choices=('S', 'M'))
+            size = StringField(choices=("S", "M"))
 
         shirt = Shirt()
         shirt.validate()
@@ -1795,17 +1892,19 @@ class Shirt(Document):
     def test_choices_validation_accept_possible_value(self):
         """Ensure that value is in a container of allowed values.
         """
+
         class Shirt(Document):
-            size = StringField(choices=('S', 'M'))
+            size = StringField(choices=("S", "M"))
 
-        shirt = Shirt(size='S')
+        shirt = Shirt(size="S")
         shirt.validate()
 
     def test_choices_validation_reject_unknown_value(self):
         """Ensure that unallowed value are rejected upon validation
         """
+
         class Shirt(Document):
-            size = StringField(choices=('S', 'M'))
+            size = StringField(choices=("S", "M"))
 
         shirt = Shirt(size="XS")
         with self.assertRaises(ValidationError):
@@ -1815,12 +1914,23 @@ def test_choices_get_field_display(self):
         """Test dynamic helper for returning the display value of a choices
         field.
         """
+
         class Shirt(Document):
-            size = StringField(max_length=3, choices=(
-                ('S', 'Small'), ('M', 'Medium'), ('L', 'Large'),
-                ('XL', 'Extra Large'), ('XXL', 'Extra Extra Large')))
-            style = StringField(max_length=3, choices=(
-                ('S', 'Small'), ('B', 'Baggy'), ('W', 'Wide')), default='W')
+            size = StringField(
+                max_length=3,
+                choices=(
+                    ("S", "Small"),
+                    ("M", "Medium"),
+                    ("L", "Large"),
+                    ("XL", "Extra Large"),
+                    ("XXL", "Extra Extra Large"),
+                ),
+            )
+            style = StringField(
+                max_length=3,
+                choices=(("S", "Small"), ("B", "Baggy"), ("W", "Wide")),
+                default="W",
+            )
 
         Shirt.drop_collection()
 
@@ -1829,30 +1939,30 @@ class Shirt(Document):
 
         # Make sure get_<field>_display returns the default value (or None)
         self.assertEqual(shirt1.get_size_display(), None)
-        self.assertEqual(shirt1.get_style_display(), 'Wide')
+        self.assertEqual(shirt1.get_style_display(), "Wide")
 
-        shirt1.size = 'XXL'
-        shirt1.style = 'B'
-        shirt2.size = 'M'
-        shirt2.style = 'S'
-        self.assertEqual(shirt1.get_size_display(), 'Extra Extra Large')
-        self.assertEqual(shirt1.get_style_display(), 'Baggy')
-        self.assertEqual(shirt2.get_size_display(), 'Medium')
-        self.assertEqual(shirt2.get_style_display(), 'Small')
+        shirt1.size = "XXL"
+        shirt1.style = "B"
+        shirt2.size = "M"
+        shirt2.style = "S"
+        self.assertEqual(shirt1.get_size_display(), "Extra Extra Large")
+        self.assertEqual(shirt1.get_style_display(), "Baggy")
+        self.assertEqual(shirt2.get_size_display(), "Medium")
+        self.assertEqual(shirt2.get_style_display(), "Small")
 
         # Set as Z - an invalid choice
-        shirt1.size = 'Z'
-        shirt1.style = 'Z'
-        self.assertEqual(shirt1.get_size_display(), 'Z')
-        self.assertEqual(shirt1.get_style_display(), 'Z')
+        shirt1.size = "Z"
+        shirt1.style = "Z"
+        self.assertEqual(shirt1.get_size_display(), "Z")
+        self.assertEqual(shirt1.get_style_display(), "Z")
         self.assertRaises(ValidationError, shirt1.validate)
 
     def test_simple_choices_validation(self):
         """Ensure that value is in a container of allowed values.
         """
+
         class Shirt(Document):
-            size = StringField(max_length=3,
-                               choices=('S', 'M', 'L', 'XL', 'XXL'))
+            size = StringField(max_length=3, choices=("S", "M", "L", "XL", "XXL"))
 
         Shirt.drop_collection()
 
@@ -1869,37 +1979,37 @@ def test_simple_choices_get_field_display(self):
         """Test dynamic helper for returning the display value of a choices
         field.
         """
+
         class Shirt(Document):
-            size = StringField(max_length=3,
-                               choices=('S', 'M', 'L', 'XL', 'XXL'))
-            style = StringField(max_length=3,
-                                choices=('Small', 'Baggy', 'wide'),
-                                default='Small')
+            size = StringField(max_length=3, choices=("S", "M", "L", "XL", "XXL"))
+            style = StringField(
+                max_length=3, choices=("Small", "Baggy", "wide"), default="Small"
+            )
 
         Shirt.drop_collection()
 
         shirt = Shirt()
 
         self.assertEqual(shirt.get_size_display(), None)
-        self.assertEqual(shirt.get_style_display(), 'Small')
+        self.assertEqual(shirt.get_style_display(), "Small")
 
         shirt.size = "XXL"
         shirt.style = "Baggy"
-        self.assertEqual(shirt.get_size_display(), 'XXL')
-        self.assertEqual(shirt.get_style_display(), 'Baggy')
+        self.assertEqual(shirt.get_size_display(), "XXL")
+        self.assertEqual(shirt.get_style_display(), "Baggy")
 
         # Set as Z - an invalid choice
         shirt.size = "Z"
         shirt.style = "Z"
-        self.assertEqual(shirt.get_size_display(), 'Z')
-        self.assertEqual(shirt.get_style_display(), 'Z')
+        self.assertEqual(shirt.get_size_display(), "Z")
+        self.assertEqual(shirt.get_style_display(), "Z")
         self.assertRaises(ValidationError, shirt.validate)
 
     def test_simple_choices_validation_invalid_value(self):
         """Ensure that error messages are correct.
         """
-        SIZES = ('S', 'M', 'L', 'XL', 'XXL')
-        COLORS = (('R', 'Red'), ('B', 'Blue'))
+        SIZES = ("S", "M", "L", "XL", "XXL")
+        COLORS = (("R", "Red"), ("B", "Blue"))
         SIZE_MESSAGE = u"Value must be one of ('S', 'M', 'L', 'XL', 'XXL')"
         COLOR_MESSAGE = u"Value must be one of ['R', 'B']"
 
@@ -1924,11 +2034,12 @@ class Shirt(Document):
         except ValidationError as error:
             # get the validation rules
             error_dict = error.to_dict()
-            self.assertEqual(error_dict['size'], SIZE_MESSAGE)
-            self.assertEqual(error_dict['color'], COLOR_MESSAGE)
+            self.assertEqual(error_dict["size"], SIZE_MESSAGE)
+            self.assertEqual(error_dict["color"], COLOR_MESSAGE)
 
     def test_recursive_validation(self):
         """Ensure that a validation result to_dict is available."""
+
         class Author(EmbeddedDocument):
             name = StringField(required=True)
 
@@ -1940,9 +2051,9 @@ class Post(Document):
             title = StringField(required=True)
             comments = ListField(EmbeddedDocumentField(Comment))
 
-        bob = Author(name='Bob')
-        post = Post(title='hello world')
-        post.comments.append(Comment(content='hello', author=bob))
+        bob = Author(name="Bob")
+        post = Post(title="hello world")
+        post.comments.append(Comment(content="hello", author=bob))
         post.comments.append(Comment(author=bob))
 
         self.assertRaises(ValidationError, post.validate)
@@ -1950,30 +2061,31 @@ class Post(Document):
             post.validate()
         except ValidationError as error:
             # ValidationError.errors property
-            self.assertTrue(hasattr(error, 'errors'))
+            self.assertTrue(hasattr(error, "errors"))
             self.assertIsInstance(error.errors, dict)
-            self.assertIn('comments', error.errors)
-            self.assertIn(1, error.errors['comments'])
-            self.assertIsInstance(error.errors['comments'][1]['content'], ValidationError)
+            self.assertIn("comments", error.errors)
+            self.assertIn(1, error.errors["comments"])
+            self.assertIsInstance(
+                error.errors["comments"][1]["content"], ValidationError
+            )
 
             # ValidationError.schema property
             error_dict = error.to_dict()
             self.assertIsInstance(error_dict, dict)
-            self.assertIn('comments', error_dict)
-            self.assertIn(1, error_dict['comments'])
-            self.assertIn('content', error_dict['comments'][1])
-            self.assertEqual(error_dict['comments'][1]['content'],
-                             u'Field is required')
+            self.assertIn("comments", error_dict)
+            self.assertIn(1, error_dict["comments"])
+            self.assertIn("content", error_dict["comments"][1])
+            self.assertEqual(error_dict["comments"][1]["content"], u"Field is required")
 
-        post.comments[1].content = 'here we go'
+        post.comments[1].content = "here we go"
         post.validate()
 
     def test_tuples_as_tuples(self):
         """Ensure that tuples remain tuples when they are inside
         a ComplexBaseField.
         """
-        class EnumField(BaseField):
 
+        class EnumField(BaseField):
             def __init__(self, **kwargs):
                 super(EnumField, self).__init__(**kwargs)
 
@@ -1988,7 +2100,7 @@ class TestDoc(Document):
 
         TestDoc.drop_collection()
 
-        tuples = [(100, 'Testing')]
+        tuples = [(100, "Testing")]
         doc = TestDoc()
         doc.items = tuples
         doc.save()
@@ -2000,12 +2112,12 @@ class TestDoc(Document):
 
     def test_dynamic_fields_class(self):
         class Doc2(Document):
-            field_1 = StringField(db_field='f')
+            field_1 = StringField(db_field="f")
 
         class Doc(Document):
             my_id = IntField(primary_key=True)
-            embed_me = DynamicField(db_field='e')
-            field_x = StringField(db_field='x')
+            embed_me = DynamicField(db_field="e")
+            field_x = StringField(db_field="x")
 
         Doc.drop_collection()
         Doc2.drop_collection()
@@ -2022,12 +2134,12 @@ class Doc(Document):
 
     def test_dynamic_fields_embedded_class(self):
         class Embed(EmbeddedDocument):
-            field_1 = StringField(db_field='f')
+            field_1 = StringField(db_field="f")
 
         class Doc(Document):
             my_id = IntField(primary_key=True)
-            embed_me = DynamicField(db_field='e')
-            field_x = StringField(db_field='x')
+            embed_me = DynamicField(db_field="e")
+            field_x = StringField(db_field="x")
 
         Doc.drop_collection()
 
@@ -2038,6 +2150,7 @@ class Doc(Document):
 
     def test_dynamicfield_dump_document(self):
         """Ensure a DynamicField can handle another document's dump."""
+
         class Doc(Document):
             field = DynamicField()
 
@@ -2049,7 +2162,7 @@ class ToEmbedParent(Document):
             id = IntField(primary_key=True, default=1)
             recursive = DynamicField()
 
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class ToEmbedChild(ToEmbedParent):
             pass
@@ -2070,7 +2183,7 @@ class ToEmbedChild(ToEmbedParent):
 
     def test_cls_field(self):
         class Animal(Document):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class Fish(Animal):
             pass
@@ -2088,7 +2201,9 @@ class Human(Mammal):
         Dog().save()
         Fish().save()
         Human().save()
-        self.assertEqual(Animal.objects(_cls__in=["Animal.Mammal.Dog", "Animal.Fish"]).count(), 2)
+        self.assertEqual(
+            Animal.objects(_cls__in=["Animal.Mammal.Dog", "Animal.Fish"]).count(), 2
+        )
         self.assertEqual(Animal.objects(_cls__in=["Animal.Fish.Guppy"]).count(), 0)
 
     def test_sparse_field(self):
@@ -2104,32 +2219,34 @@ def test_undefined_field_exception(self):
         trying to instantiate a document with a field that's not
         defined.
         """
+
         class Doc(Document):
             foo = StringField()
 
         with self.assertRaises(FieldDoesNotExist):
-            Doc(bar='test')
+            Doc(bar="test")
 
     def test_undefined_field_exception_with_strict(self):
         """Tests if a `FieldDoesNotExist` exception is raised when
         trying to instantiate a document with a field that's not
         defined, even when strict is set to False.
         """
+
         class Doc(Document):
             foo = StringField()
-            meta = {'strict': False}
+            meta = {"strict": False}
 
         with self.assertRaises(FieldDoesNotExist):
-            Doc(bar='test')
+            Doc(bar="test")
 
 
 class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):
-
     def setUp(self):
         """
         Create two BlogPost entries in the database, each with
         several EmbeddedDocuments.
         """
+
         class Comments(EmbeddedDocument):
             author = StringField()
             message = StringField()
@@ -2142,20 +2259,24 @@ class BlogPost(Document):
         self.Comments = Comments
         self.BlogPost = BlogPost
 
-        self.post1 = self.BlogPost(comments=[
-            self.Comments(author='user1', message='message1'),
-            self.Comments(author='user2', message='message1')
-        ]).save()
-
-        self.post2 = self.BlogPost(comments=[
-            self.Comments(author='user2', message='message2'),
-            self.Comments(author='user2', message='message3'),
-            self.Comments(author='user3', message='message1')
-        ]).save()
+        self.post1 = self.BlogPost(
+            comments=[
+                self.Comments(author="user1", message="message1"),
+                self.Comments(author="user2", message="message1"),
+            ]
+        ).save()
+
+        self.post2 = self.BlogPost(
+            comments=[
+                self.Comments(author="user2", message="message2"),
+                self.Comments(author="user2", message="message3"),
+                self.Comments(author="user3", message="message1"),
+            ]
+        ).save()
 
     def test_fails_upon_validate_if_provide_a_doc_instead_of_a_list_of_doc(self):
         # Relates to Issue #1464
-        comment = self.Comments(author='John')
+        comment = self.Comments(author="John")
 
         class Title(Document):
             content = StringField()
@@ -2166,14 +2287,18 @@ class Title(Document):
         with self.assertRaises(ValidationError) as ctx_err:
             post.validate()
         self.assertIn("'comments'", str(ctx_err.exception))
-        self.assertIn('Only lists and tuples may be used in a list field', str(ctx_err.exception))
+        self.assertIn(
+            "Only lists and tuples may be used in a list field", str(ctx_err.exception)
+        )
 
         # Test with a Document
-        post = self.BlogPost(comments=Title(content='garbage'))
+        post = self.BlogPost(comments=Title(content="garbage"))
         with self.assertRaises(ValidationError) as e:
             post.validate()
         self.assertIn("'comments'", str(ctx_err.exception))
-        self.assertIn('Only lists and tuples may be used in a list field', str(ctx_err.exception))
+        self.assertIn(
+            "Only lists and tuples may be used in a list field", str(ctx_err.exception)
+        )
 
     def test_no_keyword_filter(self):
         """
@@ -2190,44 +2315,40 @@ def test_single_keyword_filter(self):
         Tests the filter method of a List of Embedded Documents
         with a single keyword.
         """
-        filtered = self.post1.comments.filter(author='user1')
+        filtered = self.post1.comments.filter(author="user1")
 
         # Ensure only 1 entry was returned.
         self.assertEqual(len(filtered), 1)
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(filtered[0].author, 'user1')
+        self.assertEqual(filtered[0].author, "user1")
 
     def test_multi_keyword_filter(self):
         """
         Tests the filter method of a List of Embedded Documents
         with multiple keywords.
         """
-        filtered = self.post2.comments.filter(
-            author='user2', message='message2'
-        )
+        filtered = self.post2.comments.filter(author="user2", message="message2")
 
         # Ensure only 1 entry was returned.
         self.assertEqual(len(filtered), 1)
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(filtered[0].author, 'user2')
-        self.assertEqual(filtered[0].message, 'message2')
+        self.assertEqual(filtered[0].author, "user2")
+        self.assertEqual(filtered[0].message, "message2")
 
     def test_chained_filter(self):
         """
         Tests chained filter methods of a List of Embedded Documents
         """
-        filtered = self.post2.comments.filter(author='user2').filter(
-            message='message2'
-        )
+        filtered = self.post2.comments.filter(author="user2").filter(message="message2")
 
         # Ensure only 1 entry was returned.
         self.assertEqual(len(filtered), 1)
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(filtered[0].author, 'user2')
-        self.assertEqual(filtered[0].message, 'message2')
+        self.assertEqual(filtered[0].author, "user2")
+        self.assertEqual(filtered[0].message, "message2")
 
     def test_unknown_keyword_filter(self):
         """
@@ -2252,36 +2373,34 @@ def test_single_keyword_exclude(self):
         Tests the exclude method of a List of Embedded Documents
         with a single keyword.
         """
-        excluded = self.post1.comments.exclude(author='user1')
+        excluded = self.post1.comments.exclude(author="user1")
 
         # Ensure only 1 entry was returned.
         self.assertEqual(len(excluded), 1)
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(excluded[0].author, 'user2')
+        self.assertEqual(excluded[0].author, "user2")
 
     def test_multi_keyword_exclude(self):
         """
         Tests the exclude method of a List of Embedded Documents
         with multiple keywords.
         """
-        excluded = self.post2.comments.exclude(
-            author='user3', message='message1'
-        )
+        excluded = self.post2.comments.exclude(author="user3", message="message1")
 
         # Ensure only 2 entries were returned.
         self.assertEqual(len(excluded), 2)
 
         # Ensure the entries returned are the correct entries.
-        self.assertEqual(excluded[0].author, 'user2')
-        self.assertEqual(excluded[1].author, 'user2')
+        self.assertEqual(excluded[0].author, "user2")
+        self.assertEqual(excluded[1].author, "user2")
 
     def test_non_matching_exclude(self):
         """
         Tests the exclude method of a List of Embedded Documents
         when the keyword does not match any entries.
         """
-        excluded = self.post2.comments.exclude(author='user4')
+        excluded = self.post2.comments.exclude(author="user4")
 
         # Ensure the 3 entries still exist.
         self.assertEqual(len(excluded), 3)
@@ -2299,16 +2418,16 @@ def test_chained_filter_exclude(self):
         Tests the exclude method after a filter method of a List of
         Embedded Documents.
         """
-        excluded = self.post2.comments.filter(author='user2').exclude(
-            message='message2'
+        excluded = self.post2.comments.filter(author="user2").exclude(
+            message="message2"
         )
 
         # Ensure only 1 entry was returned.
         self.assertEqual(len(excluded), 1)
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(excluded[0].author, 'user2')
-        self.assertEqual(excluded[0].message, 'message3')
+        self.assertEqual(excluded[0].author, "user2")
+        self.assertEqual(excluded[0].message, "message3")
 
     def test_count(self):
         """
@@ -2321,7 +2440,7 @@ def test_filtered_count(self):
         """
         Tests the filter + count method of a List of Embedded Documents.
         """
-        count = self.post1.comments.filter(author='user1').count()
+        count = self.post1.comments.filter(author="user1").count()
         self.assertEqual(count, 1)
 
     def test_single_keyword_get(self):
@@ -2329,19 +2448,19 @@ def test_single_keyword_get(self):
         Tests the get method of a List of Embedded Documents using a
         single keyword.
         """
-        comment = self.post1.comments.get(author='user1')
+        comment = self.post1.comments.get(author="user1")
         self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, 'user1')
+        self.assertEqual(comment.author, "user1")
 
     def test_multi_keyword_get(self):
         """
         Tests the get method of a List of Embedded Documents using
         multiple keywords.
         """
-        comment = self.post2.comments.get(author='user2', message='message2')
+        comment = self.post2.comments.get(author="user2", message="message2")
         self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, 'user2')
-        self.assertEqual(comment.message, 'message2')
+        self.assertEqual(comment.author, "user2")
+        self.assertEqual(comment.message, "message2")
 
     def test_no_keyword_multiple_return_get(self):
         """
@@ -2357,7 +2476,7 @@ def test_keyword_multiple_return_get(self):
         to return multiple documents.
         """
         with self.assertRaises(MultipleObjectsReturned):
-            self.post2.comments.get(author='user2')
+            self.post2.comments.get(author="user2")
 
     def test_unknown_keyword_get(self):
         """
@@ -2373,7 +2492,7 @@ def test_no_result_get(self):
         returns no results.
         """
         with self.assertRaises(DoesNotExist):
-            self.post1.comments.get(author='user3')
+            self.post1.comments.get(author="user3")
 
     def test_first(self):
         """
@@ -2390,20 +2509,17 @@ def test_create(self):
         """
         Test the create method of a List of Embedded Documents.
         """
-        comment = self.post1.comments.create(
-            author='user4', message='message1'
-        )
+        comment = self.post1.comments.create(author="user4", message="message1")
         self.post1.save()
 
         # Ensure the returned value is the comment object.
         self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, 'user4')
-        self.assertEqual(comment.message, 'message1')
+        self.assertEqual(comment.author, "user4")
+        self.assertEqual(comment.message, "message1")
 
         # Ensure the new comment was actually saved to the database.
         self.assertIn(
-            comment,
-            self.BlogPost.objects(comments__author='user4')[0].comments
+            comment, self.BlogPost.objects(comments__author="user4")[0].comments
         )
 
     def test_filtered_create(self):
@@ -2412,20 +2528,19 @@ def test_filtered_create(self):
         to a call to the filter method. Filtering should have no effect
         on creation.
         """
-        comment = self.post1.comments.filter(author='user1').create(
-            author='user4', message='message1'
+        comment = self.post1.comments.filter(author="user1").create(
+            author="user4", message="message1"
         )
         self.post1.save()
 
         # Ensure the returned value is the comment object.
         self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, 'user4')
-        self.assertEqual(comment.message, 'message1')
+        self.assertEqual(comment.author, "user4")
+        self.assertEqual(comment.message, "message1")
 
         # Ensure the new comment was actually saved to the database.
         self.assertIn(
-            comment,
-            self.BlogPost.objects(comments__author='user4')[0].comments
+            comment, self.BlogPost.objects(comments__author="user4")[0].comments
         )
 
     def test_no_keyword_update(self):
@@ -2438,15 +2553,9 @@ def test_no_keyword_update(self):
         self.post1.save()
 
         # Ensure that nothing was altered.
-        self.assertIn(
-            original[0],
-            self.BlogPost.objects(id=self.post1.id)[0].comments
-        )
+        self.assertIn(original[0], self.BlogPost.objects(id=self.post1.id)[0].comments)
 
-        self.assertIn(
-            original[1],
-            self.BlogPost.objects(id=self.post1.id)[0].comments
-        )
+        self.assertIn(original[1], self.BlogPost.objects(id=self.post1.id)[0].comments)
 
         # Ensure the method returned 0 as the number of entries
         # modified
@@ -2457,14 +2566,14 @@ def test_single_keyword_update(self):
         Tests the update method of a List of Embedded Documents with
         a single keyword.
         """
-        number = self.post1.comments.update(author='user4')
+        number = self.post1.comments.update(author="user4")
         self.post1.save()
 
         comments = self.BlogPost.objects(id=self.post1.id)[0].comments
 
         # Ensure that the database was updated properly.
-        self.assertEqual(comments[0].author, 'user4')
-        self.assertEqual(comments[1].author, 'user4')
+        self.assertEqual(comments[0].author, "user4")
+        self.assertEqual(comments[1].author, "user4")
 
         # Ensure the method returned 2 as the number of entries
         # modified
@@ -2474,27 +2583,25 @@ def test_unicode(self):
         """
         Tests that unicode strings handled correctly
         """
-        post = self.BlogPost(comments=[
-            self.Comments(author='user1', message=u'сообщение'),
-            self.Comments(author='user2', message=u'хабарлама')
-        ]).save()
-        self.assertEqual(post.comments.get(message=u'сообщение').author,
-                         'user1')
+        post = self.BlogPost(
+            comments=[
+                self.Comments(author="user1", message=u"сообщение"),
+                self.Comments(author="user2", message=u"хабарлама"),
+            ]
+        ).save()
+        self.assertEqual(post.comments.get(message=u"сообщение").author, "user1")
 
     def test_save(self):
         """
         Tests the save method of a List of Embedded Documents.
         """
         comments = self.post1.comments
-        new_comment = self.Comments(author='user4')
+        new_comment = self.Comments(author="user4")
         comments.append(new_comment)
         comments.save()
 
         # Ensure that the new comment has been added to the database.
-        self.assertIn(
-            new_comment,
-            self.BlogPost.objects(id=self.post1.id)[0].comments
-        )
+        self.assertIn(new_comment, self.BlogPost.objects(id=self.post1.id)[0].comments)
 
     def test_delete(self):
         """
@@ -2505,9 +2612,7 @@ def test_delete(self):
 
         # Ensure that all the comments under post1 were deleted in the
         # database.
-        self.assertListEqual(
-            self.BlogPost.objects(id=self.post1.id)[0].comments, []
-        )
+        self.assertListEqual(self.BlogPost.objects(id=self.post1.id)[0].comments, [])
 
         # Ensure that post1 comments were deleted from the list.
         self.assertListEqual(self.post1.comments, [])
@@ -2525,6 +2630,7 @@ def test_empty_list_embedded_documents_with_unique_field(self):
         that have a unique field can be saved, but if the unique field is
         also sparse than multiple documents with an empty list can be saved.
         """
+
         class EmbeddedWithUnique(EmbeddedDocument):
             number = IntField(unique=True)
 
@@ -2553,16 +2659,12 @@ def test_filtered_delete(self):
         after the filter method has been called.
         """
         comment = self.post1.comments[1]
-        number = self.post1.comments.filter(author='user2').delete()
+        number = self.post1.comments.filter(author="user2").delete()
         self.post1.save()
 
         # Ensure that only the user2 comment was deleted.
-        self.assertNotIn(
-            comment, self.BlogPost.objects(id=self.post1.id)[0].comments
-        )
-        self.assertEqual(
-            len(self.BlogPost.objects(id=self.post1.id)[0].comments), 1
-        )
+        self.assertNotIn(comment, self.BlogPost.objects(id=self.post1.id)[0].comments)
+        self.assertEqual(len(self.BlogPost.objects(id=self.post1.id)[0].comments), 1)
 
         # Ensure that the user2 comment no longer exists in the list.
         self.assertNotIn(comment, self.post1.comments)
@@ -2577,7 +2679,7 @@ def test_custom_data(self):
         Tests that custom data is saved in the field object
         and doesn't interfere with the rest of field functionalities.
         """
-        custom_data = {'a': 'a_value', 'b': [1, 2]}
+        custom_data = {"a": "a_value", "b": [1, 2]}
 
         class CustomData(Document):
             a_field = IntField()
@@ -2587,10 +2689,10 @@ class CustomData(Document):
 
         a1 = CustomData(a_field=1, c_field=2).save()
         self.assertEqual(2, a1.c_field)
-        self.assertFalse(hasattr(a1.c_field, 'custom_data'))
-        self.assertTrue(hasattr(CustomData.c_field, 'custom_data'))
-        self.assertEqual(custom_data['a'], CustomData.c_field.custom_data['a'])
+        self.assertFalse(hasattr(a1.c_field, "custom_data"))
+        self.assertTrue(hasattr(CustomData.c_field, "custom_data"))
+        self.assertEqual(custom_data["a"], CustomData.c_field.custom_data["a"])
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/fields/file_tests.py b/tests/fields/file_tests.py
index a77224580..dd2fe6096 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/file_tests.py
@@ -14,36 +14,37 @@
 
 try:
     from PIL import Image
+
     HAS_PIL = True
 except ImportError:
     HAS_PIL = False
 
 from tests.utils import MongoDBTestCase
 
-TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), 'mongoengine.png')
-TEST_IMAGE2_PATH = os.path.join(os.path.dirname(__file__), 'mongodb_leaf.png')
+TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "mongoengine.png")
+TEST_IMAGE2_PATH = os.path.join(os.path.dirname(__file__), "mongodb_leaf.png")
 
 
 def get_file(path):
     """Use a BytesIO instead of a file to allow
     to have a one-liner and avoid that the file remains opened"""
     bytes_io = StringIO()
-    with open(path, 'rb') as f:
+    with open(path, "rb") as f:
         bytes_io.write(f.read())
     bytes_io.seek(0)
     return bytes_io
 
 
 class FileTest(MongoDBTestCase):
-
     def tearDown(self):
-        self.db.drop_collection('fs.files')
-        self.db.drop_collection('fs.chunks')
+        self.db.drop_collection("fs.files")
+        self.db.drop_collection("fs.chunks")
 
     def test_file_field_optional(self):
         # Make sure FileField is optional and not required
         class DemoFile(Document):
             the_file = FileField()
+
         DemoFile.objects.create()
 
     def test_file_fields(self):
@@ -55,8 +56,8 @@ class PutFile(Document):
 
         PutFile.drop_collection()
 
-        text = six.b('Hello, World!')
-        content_type = 'text/plain'
+        text = six.b("Hello, World!")
+        content_type = "text/plain"
 
         putfile = PutFile()
         putfile.the_file.put(text, content_type=content_type, filename="hello")
@@ -64,7 +65,10 @@ class PutFile(Document):
 
         result = PutFile.objects.first()
         self.assertEqual(putfile, result)
-        self.assertEqual("%s" % result.the_file, "<GridFSProxy: hello (%s)>" % result.the_file.grid_id)
+        self.assertEqual(
+            "%s" % result.the_file,
+            "<GridFSProxy: hello (%s)>" % result.the_file.grid_id,
+        )
         self.assertEqual(result.the_file.read(), text)
         self.assertEqual(result.the_file.content_type, content_type)
         result.the_file.delete()  # Remove file from GridFS
@@ -89,14 +93,15 @@ class PutFile(Document):
     def test_file_fields_stream(self):
         """Ensure that file fields can be written to and their data retrieved
         """
+
         class StreamFile(Document):
             the_file = FileField()
 
         StreamFile.drop_collection()
 
-        text = six.b('Hello, World!')
-        more_text = six.b('Foo Bar')
-        content_type = 'text/plain'
+        text = six.b("Hello, World!")
+        more_text = six.b("Foo Bar")
+        content_type = "text/plain"
 
         streamfile = StreamFile()
         streamfile.the_file.new_file(content_type=content_type)
@@ -124,14 +129,15 @@ def test_file_fields_stream_after_none(self):
         """Ensure that a file field can be written to after it has been saved as
         None
         """
+
         class StreamFile(Document):
             the_file = FileField()
 
         StreamFile.drop_collection()
 
-        text = six.b('Hello, World!')
-        more_text = six.b('Foo Bar')
-        content_type = 'text/plain'
+        text = six.b("Hello, World!")
+        more_text = six.b("Foo Bar")
+        content_type = "text/plain"
 
         streamfile = StreamFile()
         streamfile.save()
@@ -157,12 +163,11 @@ class StreamFile(Document):
         self.assertTrue(result.the_file.read() is None)
 
     def test_file_fields_set(self):
-
         class SetFile(Document):
             the_file = FileField()
 
-        text = six.b('Hello, World!')
-        more_text = six.b('Foo Bar')
+        text = six.b("Hello, World!")
+        more_text = six.b("Foo Bar")
 
         SetFile.drop_collection()
 
@@ -184,7 +189,6 @@ class SetFile(Document):
         result.the_file.delete()
 
     def test_file_field_no_default(self):
-
         class GridDocument(Document):
             the_file = FileField()
 
@@ -199,7 +203,7 @@ class GridDocument(Document):
             doc_a.save()
 
             doc_b = GridDocument.objects.with_id(doc_a.id)
-            doc_b.the_file.replace(f, filename='doc_b')
+            doc_b.the_file.replace(f, filename="doc_b")
             doc_b.save()
             self.assertNotEqual(doc_b.the_file.grid_id, None)
 
@@ -208,13 +212,13 @@ class GridDocument(Document):
             self.assertEqual(doc_b.the_file.grid_id, doc_c.the_file.grid_id)
 
             # Test with default
-            doc_d = GridDocument(the_file=six.b(''))
+            doc_d = GridDocument(the_file=six.b(""))
             doc_d.save()
 
             doc_e = GridDocument.objects.with_id(doc_d.id)
             self.assertEqual(doc_d.the_file.grid_id, doc_e.the_file.grid_id)
 
-            doc_e.the_file.replace(f, filename='doc_e')
+            doc_e.the_file.replace(f, filename="doc_e")
             doc_e.save()
 
             doc_f = GridDocument.objects.with_id(doc_e.id)
@@ -222,11 +226,12 @@ class GridDocument(Document):
 
         db = GridDocument._get_db()
         grid_fs = gridfs.GridFS(db)
-        self.assertEqual(['doc_b', 'doc_e'], grid_fs.list())
+        self.assertEqual(["doc_b", "doc_e"], grid_fs.list())
 
     def test_file_uniqueness(self):
         """Ensure that each instance of a FileField is unique
         """
+
         class TestFile(Document):
             name = StringField()
             the_file = FileField()
@@ -234,7 +239,7 @@ class TestFile(Document):
         # First instance
         test_file = TestFile()
         test_file.name = "Hello, World!"
-        test_file.the_file.put(six.b('Hello, World!'))
+        test_file.the_file.put(six.b("Hello, World!"))
         test_file.save()
 
         # Second instance
@@ -255,20 +260,21 @@ class Animal(Document):
             photo = FileField()
 
         Animal.drop_collection()
-        marmot = Animal(genus='Marmota', family='Sciuridae')
+        marmot = Animal(genus="Marmota", family="Sciuridae")
 
         marmot_photo_content = get_file(TEST_IMAGE_PATH)  # Retrieve a photo from disk
-        marmot.photo.put(marmot_photo_content, content_type='image/jpeg', foo='bar')
+        marmot.photo.put(marmot_photo_content, content_type="image/jpeg", foo="bar")
         marmot.photo.close()
         marmot.save()
 
         marmot = Animal.objects.get()
-        self.assertEqual(marmot.photo.content_type, 'image/jpeg')
-        self.assertEqual(marmot.photo.foo, 'bar')
+        self.assertEqual(marmot.photo.content_type, "image/jpeg")
+        self.assertEqual(marmot.photo.foo, "bar")
 
     def test_file_reassigning(self):
         class TestFile(Document):
             the_file = FileField()
+
         TestFile.drop_collection()
 
         test_file = TestFile(the_file=get_file(TEST_IMAGE_PATH)).save()
@@ -282,13 +288,15 @@ class TestFile(Document):
     def test_file_boolean(self):
         """Ensure that a boolean test of a FileField indicates its presence
         """
+
         class TestFile(Document):
             the_file = FileField()
+
         TestFile.drop_collection()
 
         test_file = TestFile()
         self.assertFalse(bool(test_file.the_file))
-        test_file.the_file.put(six.b('Hello, World!'), content_type='text/plain')
+        test_file.the_file.put(six.b("Hello, World!"), content_type="text/plain")
         test_file.save()
         self.assertTrue(bool(test_file.the_file))
 
@@ -297,6 +305,7 @@ class TestFile(Document):
 
     def test_file_cmp(self):
         """Test comparing against other types"""
+
         class TestFile(Document):
             the_file = FileField()
 
@@ -305,11 +314,12 @@ class TestFile(Document):
 
     def test_file_disk_space(self):
         """ Test disk space usage when we delete/replace a file """
+
         class TestFile(Document):
             the_file = FileField()
 
-        text = six.b('Hello, World!')
-        content_type = 'text/plain'
+        text = six.b("Hello, World!")
+        content_type = "text/plain"
 
         testfile = TestFile()
         testfile.the_file.put(text, content_type=content_type, filename="hello")
@@ -352,7 +362,7 @@ class TestFile(Document):
         testfile.the_file.put(text, content_type=content_type, filename="hello")
         testfile.save()
 
-        text = six.b('Bonjour, World!')
+        text = six.b("Bonjour, World!")
         testfile.the_file.replace(text, content_type=content_type, filename="hello")
         testfile.save()
 
@@ -370,7 +380,7 @@ class TestFile(Document):
 
     def test_image_field(self):
         if not HAS_PIL:
-            raise SkipTest('PIL not installed')
+            raise SkipTest("PIL not installed")
 
         class TestImage(Document):
             image = ImageField()
@@ -386,7 +396,9 @@ class TestImage(Document):
                 t.image.put(f)
                 self.fail("Should have raised an invalidation error")
             except ValidationError as e:
-                self.assertEqual("%s" % e, "Invalid image: cannot identify image file %s" % f)
+                self.assertEqual(
+                    "%s" % e, "Invalid image: cannot identify image file %s" % f
+                )
 
         t = TestImage()
         t.image.put(get_file(TEST_IMAGE_PATH))
@@ -394,7 +406,7 @@ class TestImage(Document):
 
         t = TestImage.objects.first()
 
-        self.assertEqual(t.image.format, 'PNG')
+        self.assertEqual(t.image.format, "PNG")
 
         w, h = t.image.size
         self.assertEqual(w, 371)
@@ -404,10 +416,11 @@ class TestImage(Document):
 
     def test_image_field_reassigning(self):
         if not HAS_PIL:
-            raise SkipTest('PIL not installed')
+            raise SkipTest("PIL not installed")
 
         class TestFile(Document):
             the_file = ImageField()
+
         TestFile.drop_collection()
 
         test_file = TestFile(the_file=get_file(TEST_IMAGE_PATH)).save()
@@ -420,7 +433,7 @@ class TestFile(Document):
 
     def test_image_field_resize(self):
         if not HAS_PIL:
-            raise SkipTest('PIL not installed')
+            raise SkipTest("PIL not installed")
 
         class TestImage(Document):
             image = ImageField(size=(185, 37))
@@ -433,7 +446,7 @@ class TestImage(Document):
 
         t = TestImage.objects.first()
 
-        self.assertEqual(t.image.format, 'PNG')
+        self.assertEqual(t.image.format, "PNG")
         w, h = t.image.size
 
         self.assertEqual(w, 185)
@@ -443,7 +456,7 @@ class TestImage(Document):
 
     def test_image_field_resize_force(self):
         if not HAS_PIL:
-            raise SkipTest('PIL not installed')
+            raise SkipTest("PIL not installed")
 
         class TestImage(Document):
             image = ImageField(size=(185, 37, True))
@@ -456,7 +469,7 @@ class TestImage(Document):
 
         t = TestImage.objects.first()
 
-        self.assertEqual(t.image.format, 'PNG')
+        self.assertEqual(t.image.format, "PNG")
         w, h = t.image.size
 
         self.assertEqual(w, 185)
@@ -466,7 +479,7 @@ class TestImage(Document):
 
     def test_image_field_thumbnail(self):
         if not HAS_PIL:
-            raise SkipTest('PIL not installed')
+            raise SkipTest("PIL not installed")
 
         class TestImage(Document):
             image = ImageField(thumbnail_size=(92, 18))
@@ -479,19 +492,18 @@ class TestImage(Document):
 
         t = TestImage.objects.first()
 
-        self.assertEqual(t.image.thumbnail.format, 'PNG')
+        self.assertEqual(t.image.thumbnail.format, "PNG")
         self.assertEqual(t.image.thumbnail.width, 92)
         self.assertEqual(t.image.thumbnail.height, 18)
 
         t.image.delete()
 
     def test_file_multidb(self):
-        register_connection('test_files', 'test_files')
+        register_connection("test_files", "test_files")
 
         class TestFile(Document):
             name = StringField()
-            the_file = FileField(db_alias="test_files",
-                                 collection_name="macumba")
+            the_file = FileField(db_alias="test_files", collection_name="macumba")
 
         TestFile.drop_collection()
 
@@ -502,23 +514,21 @@ class TestFile(Document):
         # First instance
         test_file = TestFile()
         test_file.name = "Hello, World!"
-        test_file.the_file.put(six.b('Hello, World!'),
-                          name="hello.txt")
+        test_file.the_file.put(six.b("Hello, World!"), name="hello.txt")
         test_file.save()
 
         data = get_db("test_files").macumba.files.find_one()
-        self.assertEqual(data.get('name'), 'hello.txt')
+        self.assertEqual(data.get("name"), "hello.txt")
 
         test_file = TestFile.objects.first()
-        self.assertEqual(test_file.the_file.read(), six.b('Hello, World!'))
+        self.assertEqual(test_file.the_file.read(), six.b("Hello, World!"))
 
         test_file = TestFile.objects.first()
-        test_file.the_file = six.b('HELLO, WORLD!')
+        test_file.the_file = six.b("HELLO, WORLD!")
         test_file.save()
 
         test_file = TestFile.objects.first()
-        self.assertEqual(test_file.the_file.read(),
-                         six.b('HELLO, WORLD!'))
+        self.assertEqual(test_file.the_file.read(), six.b("HELLO, WORLD!"))
 
     def test_copyable(self):
         class PutFile(Document):
@@ -526,8 +536,8 @@ class PutFile(Document):
 
         PutFile.drop_collection()
 
-        text = six.b('Hello, World!')
-        content_type = 'text/plain'
+        text = six.b("Hello, World!")
+        content_type = "text/plain"
 
         putfile = PutFile()
         putfile.the_file.put(text, content_type=content_type)
@@ -542,7 +552,7 @@ class TestFile(Document):
     def test_get_image_by_grid_id(self):
 
         if not HAS_PIL:
-            raise SkipTest('PIL not installed')
+            raise SkipTest("PIL not installed")
 
         class TestImage(Document):
 
@@ -559,8 +569,9 @@ class TestImage(Document):
         test = TestImage.objects.first()
         grid_id = test.image1.grid_id
 
-        self.assertEqual(1, TestImage.objects(Q(image1=grid_id)
-                                              or Q(image2=grid_id)).count())
+        self.assertEqual(
+            1, TestImage.objects(Q(image1=grid_id) or Q(image2=grid_id)).count()
+        )
 
     def test_complex_field_filefield(self):
         """Ensure you can add meta data to file"""
@@ -571,21 +582,21 @@ class Animal(Document):
             photos = ListField(FileField())
 
         Animal.drop_collection()
-        marmot = Animal(genus='Marmota', family='Sciuridae')
+        marmot = Animal(genus="Marmota", family="Sciuridae")
 
-        with open(TEST_IMAGE_PATH, 'rb') as marmot_photo:   # Retrieve a photo from disk
-            photos_field = marmot._fields['photos'].field
-            new_proxy = photos_field.get_proxy_obj('photos', marmot)
-            new_proxy.put(marmot_photo, content_type='image/jpeg', foo='bar')
+        with open(TEST_IMAGE_PATH, "rb") as marmot_photo:  # Retrieve a photo from disk
+            photos_field = marmot._fields["photos"].field
+            new_proxy = photos_field.get_proxy_obj("photos", marmot)
+            new_proxy.put(marmot_photo, content_type="image/jpeg", foo="bar")
 
         marmot.photos.append(new_proxy)
         marmot.save()
 
         marmot = Animal.objects.get()
-        self.assertEqual(marmot.photos[0].content_type, 'image/jpeg')
-        self.assertEqual(marmot.photos[0].foo, 'bar')
+        self.assertEqual(marmot.photos[0].content_type, "image/jpeg")
+        self.assertEqual(marmot.photos[0].foo, "bar")
         self.assertEqual(marmot.photos[0].get().length, 8313)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/fields/geo.py b/tests/fields/geo.py
index 37ed97f58..446d71718 100644
--- a/tests/fields/geo.py
+++ b/tests/fields/geo.py
@@ -4,28 +4,27 @@
 from mongoengine import *
 from mongoengine.connection import get_db
 
-__all__ = ("GeoFieldTest", )
+__all__ = ("GeoFieldTest",)
 
 
 class GeoFieldTest(unittest.TestCase):
-
     def setUp(self):
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
         self.db = get_db()
 
     def _test_for_expected_error(self, Cls, loc, expected):
         try:
             Cls(loc=loc).validate()
-            self.fail('Should not validate the location {0}'.format(loc))
+            self.fail("Should not validate the location {0}".format(loc))
         except ValidationError as e:
-            self.assertEqual(expected, e.to_dict()['loc'])
+            self.assertEqual(expected, e.to_dict()["loc"])
 
     def test_geopoint_validation(self):
         class Location(Document):
             loc = GeoPointField()
 
         invalid_coords = [{"x": 1, "y": 2}, 5, "a"]
-        expected = 'GeoPointField can only accept tuples or lists of (x, y)'
+        expected = "GeoPointField can only accept tuples or lists of (x, y)"
 
         for coord in invalid_coords:
             self._test_for_expected_error(Location, coord, expected)
@@ -40,7 +39,7 @@ class Location(Document):
             expected = "Both values (%s) in point must be float or int" % repr(coord)
             self._test_for_expected_error(Location, coord, expected)
 
-        invalid_coords = [21, 4, 'a']
+        invalid_coords = [21, 4, "a"]
         for coord in invalid_coords:
             expected = "GeoPointField can only accept tuples or lists of (x, y)"
             self._test_for_expected_error(Location, coord, expected)
@@ -50,7 +49,9 @@ class Location(Document):
             loc = PointField()
 
         invalid_coords = {"x": 1, "y": 2}
-        expected = 'PointField can only accept a valid GeoJson dictionary or lists of (x, y)'
+        expected = (
+            "PointField can only accept a valid GeoJson dictionary or lists of (x, y)"
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = {"type": "MadeUp", "coordinates": []}
@@ -77,19 +78,16 @@ class Location(Document):
             self._test_for_expected_error(Location, coord, expected)
 
         Location(loc=[1, 2]).validate()
-        Location(loc={
-            "type": "Point",
-            "coordinates": [
-              81.4471435546875,
-              23.61432859499169
-            ]}).validate()
+        Location(
+            loc={"type": "Point", "coordinates": [81.4471435546875, 23.61432859499169]}
+        ).validate()
 
     def test_linestring_validation(self):
         class Location(Document):
             loc = LineStringField()
 
         invalid_coords = {"x": 1, "y": 2}
-        expected = 'LineStringField can only accept a valid GeoJson dictionary or lists of (x, y)'
+        expected = "LineStringField can only accept a valid GeoJson dictionary or lists of (x, y)"
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = {"type": "MadeUp", "coordinates": [[]]}
@@ -97,7 +95,9 @@ class Location(Document):
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = {"type": "LineString", "coordinates": [[1, 2, 3]]}
-        expected = "Invalid LineString:\nValue ([1, 2, 3]) must be a two-dimensional point"
+        expected = (
+            "Invalid LineString:\nValue ([1, 2, 3]) must be a two-dimensional point"
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [5, "a"]
@@ -105,16 +105,25 @@ class Location(Document):
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[1]]
-        expected = "Invalid LineString:\nValue (%s) must be a two-dimensional point" % repr(invalid_coords[0])
+        expected = (
+            "Invalid LineString:\nValue (%s) must be a two-dimensional point"
+            % repr(invalid_coords[0])
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[1, 2, 3]]
-        expected = "Invalid LineString:\nValue (%s) must be a two-dimensional point" % repr(invalid_coords[0])
+        expected = (
+            "Invalid LineString:\nValue (%s) must be a two-dimensional point"
+            % repr(invalid_coords[0])
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[{}, {}]], [("a", "b")]]
         for coord in invalid_coords:
-            expected = "Invalid LineString:\nBoth values (%s) in point must be float or int" % repr(coord[0])
+            expected = (
+                "Invalid LineString:\nBoth values (%s) in point must be float or int"
+                % repr(coord[0])
+            )
             self._test_for_expected_error(Location, coord, expected)
 
         Location(loc=[[1, 2], [3, 4], [5, 6], [1, 2]]).validate()
@@ -124,7 +133,9 @@ class Location(Document):
             loc = PolygonField()
 
         invalid_coords = {"x": 1, "y": 2}
-        expected = 'PolygonField can only accept a valid GeoJson dictionary or lists of (x, y)'
+        expected = (
+            "PolygonField can only accept a valid GeoJson dictionary or lists of (x, y)"
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = {"type": "MadeUp", "coordinates": [[]]}
@@ -136,7 +147,9 @@ class Location(Document):
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[5, "a"]]]
-        expected = "Invalid Polygon:\nBoth values ([5, 'a']) in point must be float or int"
+        expected = (
+            "Invalid Polygon:\nBoth values ([5, 'a']) in point must be float or int"
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[]]]
@@ -162,7 +175,7 @@ class Location(Document):
             loc = MultiPointField()
 
         invalid_coords = {"x": 1, "y": 2}
-        expected = 'MultiPointField can only accept a valid GeoJson dictionary or lists of (x, y)'
+        expected = "MultiPointField can only accept a valid GeoJson dictionary or lists of (x, y)"
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = {"type": "MadeUp", "coordinates": [[]]}
@@ -188,19 +201,19 @@ class Location(Document):
             self._test_for_expected_error(Location, coord, expected)
 
         Location(loc=[[1, 2]]).validate()
-        Location(loc={
-            "type": "MultiPoint",
-            "coordinates": [
-                [1, 2],
-                [81.4471435546875, 23.61432859499169]
-            ]}).validate()
+        Location(
+            loc={
+                "type": "MultiPoint",
+                "coordinates": [[1, 2], [81.4471435546875, 23.61432859499169]],
+            }
+        ).validate()
 
     def test_multilinestring_validation(self):
         class Location(Document):
             loc = MultiLineStringField()
 
         invalid_coords = {"x": 1, "y": 2}
-        expected = 'MultiLineStringField can only accept a valid GeoJson dictionary or lists of (x, y)'
+        expected = "MultiLineStringField can only accept a valid GeoJson dictionary or lists of (x, y)"
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = {"type": "MadeUp", "coordinates": [[]]}
@@ -216,16 +229,25 @@ class Location(Document):
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[1]]]
-        expected = "Invalid MultiLineString:\nValue (%s) must be a two-dimensional point" % repr(invalid_coords[0][0])
+        expected = (
+            "Invalid MultiLineString:\nValue (%s) must be a two-dimensional point"
+            % repr(invalid_coords[0][0])
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[1, 2, 3]]]
-        expected = "Invalid MultiLineString:\nValue (%s) must be a two-dimensional point" % repr(invalid_coords[0][0])
+        expected = (
+            "Invalid MultiLineString:\nValue (%s) must be a two-dimensional point"
+            % repr(invalid_coords[0][0])
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[[{}, {}]]], [[("a", "b")]]]
         for coord in invalid_coords:
-            expected = "Invalid MultiLineString:\nBoth values (%s) in point must be float or int" % repr(coord[0][0])
+            expected = (
+                "Invalid MultiLineString:\nBoth values (%s) in point must be float or int"
+                % repr(coord[0][0])
+            )
             self._test_for_expected_error(Location, coord, expected)
 
         Location(loc=[[[1, 2], [3, 4], [5, 6], [1, 2]]]).validate()
@@ -235,7 +257,7 @@ class Location(Document):
             loc = MultiPolygonField()
 
         invalid_coords = {"x": 1, "y": 2}
-        expected = 'MultiPolygonField can only accept a valid GeoJson dictionary or lists of (x, y)'
+        expected = "MultiPolygonField can only accept a valid GeoJson dictionary or lists of (x, y)"
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = {"type": "MadeUp", "coordinates": [[]]}
@@ -243,7 +265,9 @@ class Location(Document):
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = {"type": "MultiPolygon", "coordinates": [[[[1, 2, 3]]]]}
-        expected = "Invalid MultiPolygon:\nValue ([1, 2, 3]) must be a two-dimensional point"
+        expected = (
+            "Invalid MultiPolygon:\nValue ([1, 2, 3]) must be a two-dimensional point"
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[[5, "a"]]]]
@@ -255,7 +279,9 @@ class Location(Document):
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[[1, 2, 3]]]]
-        expected = "Invalid MultiPolygon:\nValue ([1, 2, 3]) must be a two-dimensional point"
+        expected = (
+            "Invalid MultiPolygon:\nValue ([1, 2, 3]) must be a two-dimensional point"
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[[{}, {}]]], [[("a", "b")]]]
@@ -263,7 +289,9 @@ class Location(Document):
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         invalid_coords = [[[[1, 2], [3, 4]]]]
-        expected = "Invalid MultiPolygon:\nLineStrings must start and end at the same point"
+        expected = (
+            "Invalid MultiPolygon:\nLineStrings must start and end at the same point"
+        )
         self._test_for_expected_error(Location, invalid_coords, expected)
 
         Location(loc=[[[[1, 2], [3, 4], [5, 6], [1, 2]]]]).validate()
@@ -271,17 +299,19 @@ class Location(Document):
     def test_indexes_geopoint(self):
         """Ensure that indexes are created automatically for GeoPointFields.
         """
+
         class Event(Document):
             title = StringField()
             location = GeoPointField()
 
         geo_indicies = Event._geo_indices()
-        self.assertEqual(geo_indicies, [{'fields': [('location', '2d')]}])
+        self.assertEqual(geo_indicies, [{"fields": [("location", "2d")]}])
 
     def test_geopoint_embedded_indexes(self):
         """Ensure that indexes are created automatically for GeoPointFields on
         embedded documents.
         """
+
         class Venue(EmbeddedDocument):
             location = GeoPointField()
             name = StringField()
@@ -291,11 +321,12 @@ class Event(Document):
             venue = EmbeddedDocumentField(Venue)
 
         geo_indicies = Event._geo_indices()
-        self.assertEqual(geo_indicies, [{'fields': [('venue.location', '2d')]}])
+        self.assertEqual(geo_indicies, [{"fields": [("venue.location", "2d")]}])
 
     def test_indexes_2dsphere(self):
         """Ensure that indexes are created automatically for GeoPointFields.
         """
+
         class Event(Document):
             title = StringField()
             point = PointField()
@@ -303,13 +334,14 @@ class Event(Document):
             polygon = PolygonField()
 
         geo_indicies = Event._geo_indices()
-        self.assertIn({'fields': [('line', '2dsphere')]}, geo_indicies)
-        self.assertIn({'fields': [('polygon', '2dsphere')]}, geo_indicies)
-        self.assertIn({'fields': [('point', '2dsphere')]}, geo_indicies)
+        self.assertIn({"fields": [("line", "2dsphere")]}, geo_indicies)
+        self.assertIn({"fields": [("polygon", "2dsphere")]}, geo_indicies)
+        self.assertIn({"fields": [("point", "2dsphere")]}, geo_indicies)
 
     def test_indexes_2dsphere_embedded(self):
         """Ensure that indexes are created automatically for GeoPointFields.
         """
+
         class Venue(EmbeddedDocument):
             name = StringField()
             point = PointField()
@@ -321,12 +353,11 @@ class Event(Document):
             venue = EmbeddedDocumentField(Venue)
 
         geo_indicies = Event._geo_indices()
-        self.assertIn({'fields': [('venue.line', '2dsphere')]}, geo_indicies)
-        self.assertIn({'fields': [('venue.polygon', '2dsphere')]}, geo_indicies)
-        self.assertIn({'fields': [('venue.point', '2dsphere')]}, geo_indicies)
+        self.assertIn({"fields": [("venue.line", "2dsphere")]}, geo_indicies)
+        self.assertIn({"fields": [("venue.polygon", "2dsphere")]}, geo_indicies)
+        self.assertIn({"fields": [("venue.point", "2dsphere")]}, geo_indicies)
 
     def test_geo_indexes_recursion(self):
-
         class Location(Document):
             name = StringField()
             location = GeoPointField()
@@ -338,11 +369,11 @@ class Parent(Document):
         Location.drop_collection()
         Parent.drop_collection()
 
-        Parent(name='Berlin').save()
+        Parent(name="Berlin").save()
         info = Parent._get_collection().index_information()
-        self.assertNotIn('location_2d', info)
+        self.assertNotIn("location_2d", info)
         info = Location._get_collection().index_information()
-        self.assertIn('location_2d', info)
+        self.assertIn("location_2d", info)
 
         self.assertEqual(len(Parent._geo_indices()), 0)
         self.assertEqual(len(Location._geo_indices()), 1)
@@ -354,9 +385,7 @@ class Log(Document):
             location = PointField(auto_index=False)
             datetime = DateTimeField()
 
-            meta = {
-                'indexes': [[("location", "2dsphere"), ("datetime", 1)]]
-            }
+            meta = {"indexes": [[("location", "2dsphere"), ("datetime", 1)]]}
 
         self.assertEqual([], Log._geo_indices())
 
@@ -364,8 +393,10 @@ class Log(Document):
         Log.ensure_indexes()
 
         info = Log._get_collection().index_information()
-        self.assertEqual(info["location_2dsphere_datetime_1"]["key"],
-                         [('location', '2dsphere'), ('datetime', 1)])
+        self.assertEqual(
+            info["location_2dsphere_datetime_1"]["key"],
+            [("location", "2dsphere"), ("datetime", 1)],
+        )
 
         # Test listing explicitly
         class Log(Document):
@@ -373,9 +404,7 @@ class Log(Document):
             datetime = DateTimeField()
 
             meta = {
-                'indexes': [
-                    {'fields': [("location", "2dsphere"), ("datetime", 1)]}
-                ]
+                "indexes": [{"fields": [("location", "2dsphere"), ("datetime", 1)]}]
             }
 
         self.assertEqual([], Log._geo_indices())
@@ -384,9 +413,11 @@ class Log(Document):
         Log.ensure_indexes()
 
         info = Log._get_collection().index_information()
-        self.assertEqual(info["location_2dsphere_datetime_1"]["key"],
-                         [('location', '2dsphere'), ('datetime', 1)])
+        self.assertEqual(
+            info["location_2dsphere_datetime_1"]["key"],
+            [("location", "2dsphere"), ("datetime", 1)],
+        )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index 8af75d4e9..df4bf2de9 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -9,19 +9,22 @@
 from mongoengine import *
 from tests.utils import MongoDBTestCase
 
-BIN_VALUE = six.b('\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5')
+BIN_VALUE = six.b(
+    "\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5"
+)
 
 
 class TestBinaryField(MongoDBTestCase):
     def test_binary_fields(self):
         """Ensure that binary fields can be stored and retrieved.
         """
+
         class Attachment(Document):
             content_type = StringField()
             blob = BinaryField()
 
-        BLOB = six.b('\xe6\x00\xc4\xff\x07')
-        MIME_TYPE = 'application/octet-stream'
+        BLOB = six.b("\xe6\x00\xc4\xff\x07")
+        MIME_TYPE = "application/octet-stream"
 
         Attachment.drop_collection()
 
@@ -35,6 +38,7 @@ class Attachment(Document):
     def test_validation_succeeds(self):
         """Ensure that valid values can be assigned to binary fields.
         """
+
         class AttachmentRequired(Document):
             blob = BinaryField(required=True)
 
@@ -43,11 +47,11 @@ class AttachmentSizeLimit(Document):
 
         attachment_required = AttachmentRequired()
         self.assertRaises(ValidationError, attachment_required.validate)
-        attachment_required.blob = Binary(six.b('\xe6\x00\xc4\xff\x07'))
+        attachment_required.blob = Binary(six.b("\xe6\x00\xc4\xff\x07"))
         attachment_required.validate()
 
-        _5_BYTES = six.b('\xe6\x00\xc4\xff\x07')
-        _4_BYTES = six.b('\xe6\x00\xc4\xff')
+        _5_BYTES = six.b("\xe6\x00\xc4\xff\x07")
+        _4_BYTES = six.b("\xe6\x00\xc4\xff")
         self.assertRaises(ValidationError, AttachmentSizeLimit(blob=_5_BYTES).validate)
         AttachmentSizeLimit(blob=_4_BYTES).validate()
 
@@ -57,7 +61,7 @@ def test_validation_fails(self):
         class Attachment(Document):
             blob = BinaryField()
 
-        for invalid_data in (2, u'Im_a_unicode', ['some_str']):
+        for invalid_data in (2, u"Im_a_unicode", ["some_str"]):
             self.assertRaises(ValidationError, Attachment(blob=invalid_data).validate)
 
     def test__primary(self):
@@ -108,17 +112,17 @@ class MyDocument(Document):
 
     def test_modify_operation__set(self):
         """Ensures no regression of bug #1127"""
+
         class MyDocument(Document):
             some_field = StringField()
             bin_field = BinaryField()
 
         MyDocument.drop_collection()
 
-        doc = MyDocument.objects(some_field='test').modify(
-            upsert=True, new=True,
-            set__bin_field=BIN_VALUE
+        doc = MyDocument.objects(some_field="test").modify(
+            upsert=True, new=True, set__bin_field=BIN_VALUE
         )
-        self.assertEqual(doc.some_field, 'test')
+        self.assertEqual(doc.some_field, "test")
         if six.PY3:
             self.assertEqual(doc.bin_field, BIN_VALUE)
         else:
@@ -126,15 +130,18 @@ class MyDocument(Document):
 
     def test_update_one(self):
         """Ensures no regression of bug #1127"""
+
         class MyDocument(Document):
             bin_field = BinaryField()
 
         MyDocument.drop_collection()
 
-        bin_data = six.b('\xe6\x00\xc4\xff\x07')
+        bin_data = six.b("\xe6\x00\xc4\xff\x07")
         doc = MyDocument(bin_field=bin_data).save()
 
-        n_updated = MyDocument.objects(bin_field=bin_data).update_one(bin_field=BIN_VALUE)
+        n_updated = MyDocument.objects(bin_field=bin_data).update_one(
+            bin_field=BIN_VALUE
+        )
         self.assertEqual(n_updated, 1)
         fetched = MyDocument.objects.with_id(doc.id)
         if six.PY3:
diff --git a/tests/fields/test_boolean_field.py b/tests/fields/test_boolean_field.py
index 7a2a3db60..22ebb6f7f 100644
--- a/tests/fields/test_boolean_field.py
+++ b/tests/fields/test_boolean_field.py
@@ -11,15 +11,13 @@ class Person(Document):
 
         person = Person(admin=True)
         person.save()
-        self.assertEqual(
-            get_as_pymongo(person),
-            {'_id': person.id,
-             'admin': True})
+        self.assertEqual(get_as_pymongo(person), {"_id": person.id, "admin": True})
 
     def test_validation(self):
         """Ensure that invalid values cannot be assigned to boolean
         fields.
         """
+
         class Person(Document):
             admin = BooleanField()
 
@@ -29,9 +27,9 @@ class Person(Document):
 
         person.admin = 2
         self.assertRaises(ValidationError, person.validate)
-        person.admin = 'Yes'
+        person.admin = "Yes"
         self.assertRaises(ValidationError, person.validate)
-        person.admin = 'False'
+        person.admin = "False"
         self.assertRaises(ValidationError, person.validate)
 
     def test_weirdness_constructor(self):
@@ -39,11 +37,12 @@ def test_weirdness_constructor(self):
         which causes some weird behavior. We dont necessarily want to maintain this behavior
         but its a known issue
         """
+
         class Person(Document):
             admin = BooleanField()
 
-        new_person = Person(admin='False')
+        new_person = Person(admin="False")
         self.assertTrue(new_person.admin)
 
-        new_person = Person(admin='0')
+        new_person = Person(admin="0")
         self.assertTrue(new_person.admin)
diff --git a/tests/fields/test_cached_reference_field.py b/tests/fields/test_cached_reference_field.py
index 470ecc5d7..4e4675870 100644
--- a/tests/fields/test_cached_reference_field.py
+++ b/tests/fields/test_cached_reference_field.py
@@ -7,12 +7,12 @@
 
 
 class TestCachedReferenceField(MongoDBTestCase):
-
     def test_get_and_save(self):
         """
         Tests #1047: CachedReferenceField creates DBRefs on to_python,
         but can't save them on to_mongo.
         """
+
         class Animal(Document):
             name = StringField()
             tag = StringField()
@@ -24,10 +24,11 @@ class Ocorrence(Document):
         Animal.drop_collection()
         Ocorrence.drop_collection()
 
-        Ocorrence(person="testte",
-                  animal=Animal(name="Leopard", tag="heavy").save()).save()
+        Ocorrence(
+            person="testte", animal=Animal(name="Leopard", tag="heavy").save()
+        ).save()
         p = Ocorrence.objects.get()
-        p.person = 'new_testte'
+        p.person = "new_testte"
         p.save()
 
     def test_general_things(self):
@@ -37,8 +38,7 @@ class Animal(Document):
 
         class Ocorrence(Document):
             person = StringField()
-            animal = CachedReferenceField(
-                Animal, fields=['tag'])
+            animal = CachedReferenceField(Animal, fields=["tag"])
 
         Animal.drop_collection()
         Ocorrence.drop_collection()
@@ -55,19 +55,18 @@ class Ocorrence(Document):
 
         self.assertEqual(Ocorrence.objects(animal=None).count(), 1)
 
-        self.assertEqual(
-            a.to_mongo(fields=['tag']), {'tag': 'heavy', "_id": a.pk})
+        self.assertEqual(a.to_mongo(fields=["tag"]), {"tag": "heavy", "_id": a.pk})
 
-        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
+        self.assertEqual(o.to_mongo()["animal"]["tag"], "heavy")
 
         # counts
         Ocorrence(person="teste 2").save()
         Ocorrence(person="teste 3").save()
 
-        count = Ocorrence.objects(animal__tag='heavy').count()
+        count = Ocorrence.objects(animal__tag="heavy").count()
         self.assertEqual(count, 1)
 
-        ocorrence = Ocorrence.objects(animal__tag='heavy').first()
+        ocorrence = Ocorrence.objects(animal__tag="heavy").first()
         self.assertEqual(ocorrence.person, "teste")
         self.assertIsInstance(ocorrence.animal, Animal)
 
@@ -78,28 +77,21 @@ class PersonAuto(Document):
 
         class SocialTest(Document):
             group = StringField()
-            person = CachedReferenceField(
-                PersonAuto,
-                fields=('salary',))
+            person = CachedReferenceField(PersonAuto, fields=("salary",))
 
         PersonAuto.drop_collection()
         SocialTest.drop_collection()
 
-        p = PersonAuto(name="Alberto", salary=Decimal('7000.00'))
+        p = PersonAuto(name="Alberto", salary=Decimal("7000.00"))
         p.save()
 
         s = SocialTest(group="dev", person=p)
         s.save()
 
         self.assertEqual(
-            SocialTest.objects._collection.find_one({'person.salary': 7000.00}), {
-                '_id': s.pk,
-                'group': s.group,
-                'person': {
-                    '_id': p.pk,
-                    'salary': 7000.00
-                }
-            })
+            SocialTest.objects._collection.find_one({"person.salary": 7000.00}),
+            {"_id": s.pk, "group": s.group, "person": {"_id": p.pk, "salary": 7000.00}},
+        )
 
     def test_cached_reference_field_reference(self):
         class Group(Document):
@@ -111,17 +103,14 @@ class Person(Document):
 
         class SocialData(Document):
             obs = StringField()
-            tags = ListField(
-                StringField())
-            person = CachedReferenceField(
-                Person,
-                fields=('group',))
+            tags = ListField(StringField())
+            person = CachedReferenceField(Person, fields=("group",))
 
         Group.drop_collection()
         Person.drop_collection()
         SocialData.drop_collection()
 
-        g1 = Group(name='dev')
+        g1 = Group(name="dev")
         g1.save()
 
         g2 = Group(name="designers")
@@ -136,22 +125,21 @@ class SocialData(Document):
         p3 = Person(name="Afro design", group=g2)
         p3.save()
 
-        s1 = SocialData(obs="testing 123", person=p1, tags=['tag1', 'tag2'])
+        s1 = SocialData(obs="testing 123", person=p1, tags=["tag1", "tag2"])
         s1.save()
 
-        s2 = SocialData(obs="testing 321", person=p3, tags=['tag3', 'tag4'])
+        s2 = SocialData(obs="testing 321", person=p3, tags=["tag3", "tag4"])
         s2.save()
 
-        self.assertEqual(SocialData.objects._collection.find_one(
-            {'tags': 'tag2'}), {
-                '_id': s1.pk,
-                'obs': 'testing 123',
-                'tags': ['tag1', 'tag2'],
-                'person': {
-                    '_id': p1.pk,
-                    'group': g1.pk
-                }
-        })
+        self.assertEqual(
+            SocialData.objects._collection.find_one({"tags": "tag2"}),
+            {
+                "_id": s1.pk,
+                "obs": "testing 123",
+                "tags": ["tag1", "tag2"],
+                "person": {"_id": p1.pk, "group": g1.pk},
+            },
+        )
 
         self.assertEqual(SocialData.objects(person__group=g2).count(), 1)
         self.assertEqual(SocialData.objects(person__group=g2).first(), s2)
@@ -163,23 +151,18 @@ class Product(Document):
         Product.drop_collection()
 
         class Basket(Document):
-            products = ListField(CachedReferenceField(Product, fields=['name']))
+            products = ListField(CachedReferenceField(Product, fields=["name"]))
 
         Basket.drop_collection()
-        product1 = Product(name='abc').save()
-        product2 = Product(name='def').save()
+        product1 = Product(name="abc").save()
+        product2 = Product(name="def").save()
         basket = Basket(products=[product1]).save()
         self.assertEqual(
             Basket.objects._collection.find_one(),
             {
-                '_id': basket.pk,
-                'products': [
-                    {
-                        '_id': product1.pk,
-                        'name': product1.name
-                    }
-                ]
-            }
+                "_id": basket.pk,
+                "products": [{"_id": product1.pk, "name": product1.name}],
+            },
         )
         # push to list
         basket.update(push__products=product2)
@@ -187,161 +170,135 @@ class Basket(Document):
         self.assertEqual(
             Basket.objects._collection.find_one(),
             {
-                '_id': basket.pk,
-                'products': [
-                    {
-                        '_id': product1.pk,
-                        'name': product1.name
-                    },
-                    {
-                        '_id': product2.pk,
-                        'name': product2.name
-                    }
-                ]
-            }
+                "_id": basket.pk,
+                "products": [
+                    {"_id": product1.pk, "name": product1.name},
+                    {"_id": product2.pk, "name": product2.name},
+                ],
+            },
         )
 
     def test_cached_reference_field_update_all(self):
         class Person(Document):
-            TYPES = (
-                ('pf', "PF"),
-                ('pj', "PJ")
-            )
+            TYPES = (("pf", "PF"), ("pj", "PJ"))
             name = StringField()
             tp = StringField(choices=TYPES)
-            father = CachedReferenceField('self', fields=('tp',))
+            father = CachedReferenceField("self", fields=("tp",))
 
         Person.drop_collection()
 
         a1 = Person(name="Wilson Father", tp="pj")
         a1.save()
 
-        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
+        a2 = Person(name="Wilson Junior", tp="pf", father=a1)
         a2.save()
 
         a2 = Person.objects.with_id(a2.id)
         self.assertEqual(a2.father.tp, a1.tp)
 
-        self.assertEqual(dict(a2.to_mongo()), {
-            "_id": a2.pk,
-            "name": u"Wilson Junior",
-            "tp": u"pf",
-            "father": {
-                "_id": a1.pk,
-                "tp": u"pj"
-            }
-        })
-
-        self.assertEqual(Person.objects(father=a1)._query, {
-            'father._id': a1.pk
-        })
+        self.assertEqual(
+            dict(a2.to_mongo()),
+            {
+                "_id": a2.pk,
+                "name": u"Wilson Junior",
+                "tp": u"pf",
+                "father": {"_id": a1.pk, "tp": u"pj"},
+            },
+        )
+
+        self.assertEqual(Person.objects(father=a1)._query, {"father._id": a1.pk})
         self.assertEqual(Person.objects(father=a1).count(), 1)
 
         Person.objects.update(set__tp="pf")
         Person.father.sync_all()
 
         a2.reload()
-        self.assertEqual(dict(a2.to_mongo()), {
-            "_id": a2.pk,
-            "name": u"Wilson Junior",
-            "tp": u"pf",
-            "father": {
-                "_id": a1.pk,
-                "tp": u"pf"
-            }
-        })
+        self.assertEqual(
+            dict(a2.to_mongo()),
+            {
+                "_id": a2.pk,
+                "name": u"Wilson Junior",
+                "tp": u"pf",
+                "father": {"_id": a1.pk, "tp": u"pf"},
+            },
+        )
 
     def test_cached_reference_fields_on_embedded_documents(self):
         with self.assertRaises(InvalidDocumentError):
+
             class Test(Document):
                 name = StringField()
 
-            type('WrongEmbeddedDocument', (
-                EmbeddedDocument,), {
-                    'test': CachedReferenceField(Test)
-            })
+            type(
+                "WrongEmbeddedDocument",
+                (EmbeddedDocument,),
+                {"test": CachedReferenceField(Test)},
+            )
 
     def test_cached_reference_auto_sync(self):
         class Person(Document):
-            TYPES = (
-                ('pf', "PF"),
-                ('pj', "PJ")
-            )
+            TYPES = (("pf", "PF"), ("pj", "PJ"))
             name = StringField()
-            tp = StringField(
-                choices=TYPES
-            )
+            tp = StringField(choices=TYPES)
 
-            father = CachedReferenceField('self', fields=('tp',))
+            father = CachedReferenceField("self", fields=("tp",))
 
         Person.drop_collection()
 
         a1 = Person(name="Wilson Father", tp="pj")
         a1.save()
 
-        a2 = Person(name='Wilson Junior', tp='pf', father=a1)
+        a2 = Person(name="Wilson Junior", tp="pf", father=a1)
         a2.save()
 
-        a1.tp = 'pf'
+        a1.tp = "pf"
         a1.save()
 
         a2.reload()
-        self.assertEqual(dict(a2.to_mongo()), {
-            '_id': a2.pk,
-            'name': 'Wilson Junior',
-            'tp': 'pf',
-            'father': {
-                '_id': a1.pk,
-                'tp': 'pf'
-            }
-        })
+        self.assertEqual(
+            dict(a2.to_mongo()),
+            {
+                "_id": a2.pk,
+                "name": "Wilson Junior",
+                "tp": "pf",
+                "father": {"_id": a1.pk, "tp": "pf"},
+            },
+        )
 
     def test_cached_reference_auto_sync_disabled(self):
         class Persone(Document):
-            TYPES = (
-                ('pf', "PF"),
-                ('pj', "PJ")
-            )
+            TYPES = (("pf", "PF"), ("pj", "PJ"))
             name = StringField()
-            tp = StringField(
-                choices=TYPES
-            )
+            tp = StringField(choices=TYPES)
 
-            father = CachedReferenceField(
-                'self', fields=('tp',), auto_sync=False)
+            father = CachedReferenceField("self", fields=("tp",), auto_sync=False)
 
         Persone.drop_collection()
 
         a1 = Persone(name="Wilson Father", tp="pj")
         a1.save()
 
-        a2 = Persone(name='Wilson Junior', tp='pf', father=a1)
+        a2 = Persone(name="Wilson Junior", tp="pf", father=a1)
         a2.save()
 
-        a1.tp = 'pf'
+        a1.tp = "pf"
         a1.save()
 
-        self.assertEqual(Persone.objects._collection.find_one({'_id': a2.pk}), {
-            '_id': a2.pk,
-            'name': 'Wilson Junior',
-            'tp': 'pf',
-            'father': {
-                '_id': a1.pk,
-                'tp': 'pj'
-            }
-        })
+        self.assertEqual(
+            Persone.objects._collection.find_one({"_id": a2.pk}),
+            {
+                "_id": a2.pk,
+                "name": "Wilson Junior",
+                "tp": "pf",
+                "father": {"_id": a1.pk, "tp": "pj"},
+            },
+        )
 
     def test_cached_reference_embedded_fields(self):
         class Owner(EmbeddedDocument):
-            TPS = (
-                ('n', "Normal"),
-                ('u', "Urgent")
-            )
+            TPS = (("n", "Normal"), ("u", "Urgent"))
             name = StringField()
-            tp = StringField(
-                verbose_name="Type",
-                db_field="t",
-                choices=TPS)
+            tp = StringField(verbose_name="Type", db_field="t", choices=TPS)
 
         class Animal(Document):
             name = StringField()
@@ -351,43 +308,38 @@ class Animal(Document):
 
         class Ocorrence(Document):
             person = StringField()
-            animal = CachedReferenceField(
-                Animal, fields=['tag', 'owner.tp'])
+            animal = CachedReferenceField(Animal, fields=["tag", "owner.tp"])
 
         Animal.drop_collection()
         Ocorrence.drop_collection()
 
-        a = Animal(name="Leopard", tag="heavy",
-                   owner=Owner(tp='u', name="Wilson Júnior")
-                   )
+        a = Animal(
+            name="Leopard", tag="heavy", owner=Owner(tp="u", name="Wilson Júnior")
+        )
         a.save()
 
         o = Ocorrence(person="teste", animal=a)
         o.save()
-        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tp'])), {
-            '_id': a.pk,
-            'tag': 'heavy',
-            'owner': {
-                't': 'u'
-            }
-        })
-        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
-        self.assertEqual(o.to_mongo()['animal']['owner']['t'], 'u')
+        self.assertEqual(
+            dict(a.to_mongo(fields=["tag", "owner.tp"])),
+            {"_id": a.pk, "tag": "heavy", "owner": {"t": "u"}},
+        )
+        self.assertEqual(o.to_mongo()["animal"]["tag"], "heavy")
+        self.assertEqual(o.to_mongo()["animal"]["owner"]["t"], "u")
 
         # Check to_mongo with fields
-        self.assertNotIn('animal', o.to_mongo(fields=['person']))
+        self.assertNotIn("animal", o.to_mongo(fields=["person"]))
 
         # counts
         Ocorrence(person="teste 2").save()
         Ocorrence(person="teste 3").save()
 
-        count = Ocorrence.objects(
-            animal__tag='heavy', animal__owner__tp='u').count()
+        count = Ocorrence.objects(animal__tag="heavy", animal__owner__tp="u").count()
         self.assertEqual(count, 1)
 
         ocorrence = Ocorrence.objects(
-            animal__tag='heavy',
-            animal__owner__tp='u').first()
+            animal__tag="heavy", animal__owner__tp="u"
+        ).first()
         self.assertEqual(ocorrence.person, "teste")
         self.assertIsInstance(ocorrence.animal, Animal)
 
@@ -404,43 +356,39 @@ class Animal(Document):
 
         class Ocorrence(Document):
             person = StringField()
-            animal = CachedReferenceField(
-                Animal, fields=['tag', 'owner.tags'])
+            animal = CachedReferenceField(Animal, fields=["tag", "owner.tags"])
 
         Animal.drop_collection()
         Ocorrence.drop_collection()
 
-        a = Animal(name="Leopard", tag="heavy",
-                   owner=Owner(tags=['cool', 'funny'],
-                               name="Wilson Júnior")
-                   )
+        a = Animal(
+            name="Leopard",
+            tag="heavy",
+            owner=Owner(tags=["cool", "funny"], name="Wilson Júnior"),
+        )
         a.save()
 
         o = Ocorrence(person="teste 2", animal=a)
         o.save()
-        self.assertEqual(dict(a.to_mongo(fields=['tag', 'owner.tags'])), {
-            '_id': a.pk,
-            'tag': 'heavy',
-            'owner': {
-                'tags': ['cool', 'funny']
-            }
-        })
-
-        self.assertEqual(o.to_mongo()['animal']['tag'], 'heavy')
-        self.assertEqual(o.to_mongo()['animal']['owner']['tags'],
-                         ['cool', 'funny'])
+        self.assertEqual(
+            dict(a.to_mongo(fields=["tag", "owner.tags"])),
+            {"_id": a.pk, "tag": "heavy", "owner": {"tags": ["cool", "funny"]}},
+        )
+
+        self.assertEqual(o.to_mongo()["animal"]["tag"], "heavy")
+        self.assertEqual(o.to_mongo()["animal"]["owner"]["tags"], ["cool", "funny"])
 
         # counts
         Ocorrence(person="teste 2").save()
         Ocorrence(person="teste 3").save()
 
         query = Ocorrence.objects(
-            animal__tag='heavy', animal__owner__tags='cool')._query
-        self.assertEqual(
-            query, {'animal.owner.tags': 'cool', 'animal.tag': 'heavy'})
+            animal__tag="heavy", animal__owner__tags="cool"
+        )._query
+        self.assertEqual(query, {"animal.owner.tags": "cool", "animal.tag": "heavy"})
 
         ocorrence = Ocorrence.objects(
-            animal__tag='heavy',
-            animal__owner__tags='cool').first()
+            animal__tag="heavy", animal__owner__tags="cool"
+        ).first()
         self.assertEqual(ocorrence.person, "teste 2")
         self.assertIsInstance(ocorrence.animal, Animal)
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index 58dc4b433..4eea5bdcc 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -14,9 +14,10 @@ def test_complexdatetime_storage(self):
         """Tests for complex datetime fields - which can handle
         microseconds without rounding.
         """
+
         class LogEntry(Document):
             date = ComplexDateTimeField()
-            date_with_dots = ComplexDateTimeField(separator='.')
+            date_with_dots = ComplexDateTimeField(separator=".")
 
         LogEntry.drop_collection()
 
@@ -62,17 +63,25 @@ class LogEntry(Document):
         mm = dd = hh = ii = ss = [1, 10]
 
         for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
-            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()['date']
-            self.assertTrue(re.match('^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$', stored) is not None)
+            stored = LogEntry(date=datetime.datetime(*values)).to_mongo()["date"]
+            self.assertTrue(
+                re.match("^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$", stored)
+                is not None
+            )
 
         # Test separator
-        stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()['date_with_dots']
-        self.assertTrue(re.match('^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$', stored) is not None)
+        stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()[
+            "date_with_dots"
+        ]
+        self.assertTrue(
+            re.match("^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$", stored) is not None
+        )
 
     def test_complexdatetime_usage(self):
         """Tests for complex datetime fields - which can handle
         microseconds without rounding.
         """
+
         class LogEntry(Document):
             date = ComplexDateTimeField()
 
@@ -123,22 +132,21 @@ class LogEntry(Document):
 
         # Test microsecond-level ordering/filtering
         for microsecond in (99, 999, 9999, 10000):
-            LogEntry(
-                date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)
-            ).save()
+            LogEntry(date=datetime.datetime(2015, 1, 1, 0, 0, 0, microsecond)).save()
 
-        logs = list(LogEntry.objects.order_by('date'))
+        logs = list(LogEntry.objects.order_by("date"))
         for next_idx, log in enumerate(logs[:-1], start=1):
             next_log = logs[next_idx]
             self.assertTrue(log.date < next_log.date)
 
-        logs = list(LogEntry.objects.order_by('-date'))
+        logs = list(LogEntry.objects.order_by("-date"))
         for next_idx, log in enumerate(logs[:-1], start=1):
             next_log = logs[next_idx]
             self.assertTrue(log.date > next_log.date)
 
         logs = LogEntry.objects.filter(
-            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000))
+            date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000)
+        )
         self.assertEqual(logs.count(), 4)
 
     def test_no_default_value(self):
@@ -156,6 +164,7 @@ class Log(Document):
 
     def test_default_static_value(self):
         NOW = datetime.datetime.utcnow()
+
         class Log(Document):
             timestamp = ComplexDateTimeField(default=NOW)
 
diff --git a/tests/fields/test_date_field.py b/tests/fields/test_date_field.py
index 82adb5143..da5721345 100644
--- a/tests/fields/test_date_field.py
+++ b/tests/fields/test_date_field.py
@@ -18,10 +18,11 @@ def test_date_from_empty_string(self):
         Ensure an exception is raised when trying to
         cast an empty string to datetime.
         """
+
         class MyDoc(Document):
             dt = DateField()
 
-        md = MyDoc(dt='')
+        md = MyDoc(dt="")
         self.assertRaises(ValidationError, md.save)
 
     def test_date_from_whitespace_string(self):
@@ -29,16 +30,18 @@ def test_date_from_whitespace_string(self):
         Ensure an exception is raised when trying to
         cast a whitespace-only string to datetime.
         """
+
         class MyDoc(Document):
             dt = DateField()
 
-        md = MyDoc(dt='   ')
+        md = MyDoc(dt="   ")
         self.assertRaises(ValidationError, md.save)
 
     def test_default_values_today(self):
         """Ensure that default field values are used when creating
         a document.
         """
+
         class Person(Document):
             day = DateField(default=datetime.date.today)
 
@@ -46,13 +49,14 @@ class Person(Document):
         person.validate()
         self.assertEqual(person.day, person.day)
         self.assertEqual(person.day, datetime.date.today())
-        self.assertEqual(person._data['day'], person.day)
+        self.assertEqual(person._data["day"], person.day)
 
     def test_date(self):
         """Tests showing pymongo date fields
 
         See: http://api.mongodb.org/python/current/api/bson/son.html#dt
         """
+
         class LogEntry(Document):
             date = DateField()
 
@@ -95,6 +99,7 @@ class LogEntry(Document):
 
     def test_regular_usage(self):
         """Tests for regular datetime fields"""
+
         class LogEntry(Document):
             date = DateField()
 
@@ -106,12 +111,12 @@ class LogEntry(Document):
         log.validate()
         log.save()
 
-        for query in (d1, d1.isoformat(' ')):
+        for query in (d1, d1.isoformat(" ")):
             log1 = LogEntry.objects.get(date=query)
             self.assertEqual(log, log1)
 
         if dateutil:
-            log1 = LogEntry.objects.get(date=d1.isoformat('T'))
+            log1 = LogEntry.objects.get(date=d1.isoformat("T"))
             self.assertEqual(log, log1)
 
         # create additional 19 log entries for a total of 20
@@ -142,6 +147,7 @@ def test_validation(self):
         """Ensure that invalid values cannot be assigned to datetime
         fields.
         """
+
         class LogEntry(Document):
             time = DateField()
 
@@ -152,14 +158,14 @@ class LogEntry(Document):
         log.time = datetime.date.today()
         log.validate()
 
-        log.time = datetime.datetime.now().isoformat(' ')
+        log.time = datetime.datetime.now().isoformat(" ")
         log.validate()
 
         if dateutil:
-            log.time = datetime.datetime.now().isoformat('T')
+            log.time = datetime.datetime.now().isoformat("T")
             log.validate()
 
         log.time = -1
         self.assertRaises(ValidationError, log.validate)
-        log.time = 'ABC'
+        log.time = "ABC"
         self.assertRaises(ValidationError, log.validate)
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 92f0668af..c911390a0 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -19,10 +19,11 @@ def test_datetime_from_empty_string(self):
         Ensure an exception is raised when trying to
         cast an empty string to datetime.
         """
+
         class MyDoc(Document):
             dt = DateTimeField()
 
-        md = MyDoc(dt='')
+        md = MyDoc(dt="")
         self.assertRaises(ValidationError, md.save)
 
     def test_datetime_from_whitespace_string(self):
@@ -30,16 +31,18 @@ def test_datetime_from_whitespace_string(self):
         Ensure an exception is raised when trying to
         cast a whitespace-only string to datetime.
         """
+
         class MyDoc(Document):
             dt = DateTimeField()
 
-        md = MyDoc(dt='   ')
+        md = MyDoc(dt="   ")
         self.assertRaises(ValidationError, md.save)
 
     def test_default_value_utcnow(self):
         """Ensure that default field values are used when creating
         a document.
         """
+
         class Person(Document):
             created = DateTimeField(default=dt.datetime.utcnow)
 
@@ -48,8 +51,10 @@ class Person(Document):
         person.validate()
         person_created_t0 = person.created
         self.assertLess(person.created - utcnow, dt.timedelta(seconds=1))
-        self.assertEqual(person_created_t0, person.created)  # make sure it does not change
-        self.assertEqual(person._data['created'], person.created)
+        self.assertEqual(
+            person_created_t0, person.created
+        )  # make sure it does not change
+        self.assertEqual(person._data["created"], person.created)
 
     def test_handling_microseconds(self):
         """Tests showing pymongo datetime fields handling of microseconds.
@@ -58,6 +63,7 @@ def test_handling_microseconds(self):
 
         See: http://api.mongodb.org/python/current/api/bson/son.html#dt
         """
+
         class LogEntry(Document):
             date = DateTimeField()
 
@@ -103,6 +109,7 @@ class LogEntry(Document):
 
     def test_regular_usage(self):
         """Tests for regular datetime fields"""
+
         class LogEntry(Document):
             date = DateTimeField()
 
@@ -114,12 +121,12 @@ class LogEntry(Document):
         log.validate()
         log.save()
 
-        for query in (d1, d1.isoformat(' ')):
+        for query in (d1, d1.isoformat(" ")):
             log1 = LogEntry.objects.get(date=query)
             self.assertEqual(log, log1)
 
         if dateutil:
-            log1 = LogEntry.objects.get(date=d1.isoformat('T'))
+            log1 = LogEntry.objects.get(date=d1.isoformat("T"))
             self.assertEqual(log, log1)
 
         # create additional 19 log entries for a total of 20
@@ -150,8 +157,7 @@ class LogEntry(Document):
         self.assertEqual(logs.count(), 10)
 
         logs = LogEntry.objects.filter(
-            date__lte=dt.datetime(1980, 1, 1),
-            date__gte=dt.datetime(1975, 1, 1),
+            date__lte=dt.datetime(1980, 1, 1), date__gte=dt.datetime(1975, 1, 1)
         )
         self.assertEqual(logs.count(), 5)
 
@@ -159,6 +165,7 @@ def test_datetime_validation(self):
         """Ensure that invalid values cannot be assigned to datetime
         fields.
         """
+
         class LogEntry(Document):
             time = DateTimeField()
 
@@ -169,32 +176,32 @@ class LogEntry(Document):
         log.time = dt.date.today()
         log.validate()
 
-        log.time = dt.datetime.now().isoformat(' ')
+        log.time = dt.datetime.now().isoformat(" ")
         log.validate()
 
-        log.time = '2019-05-16 21:42:57.897847'
+        log.time = "2019-05-16 21:42:57.897847"
         log.validate()
 
         if dateutil:
-            log.time = dt.datetime.now().isoformat('T')
+            log.time = dt.datetime.now().isoformat("T")
             log.validate()
 
         log.time = -1
         self.assertRaises(ValidationError, log.validate)
-        log.time = 'ABC'
+        log.time = "ABC"
         self.assertRaises(ValidationError, log.validate)
-        log.time = '2019-05-16 21:GARBAGE:12'
+        log.time = "2019-05-16 21:GARBAGE:12"
         self.assertRaises(ValidationError, log.validate)
-        log.time = '2019-05-16 21:42:57.GARBAGE'
+        log.time = "2019-05-16 21:42:57.GARBAGE"
         self.assertRaises(ValidationError, log.validate)
-        log.time = '2019-05-16 21:42:57.123.456'
+        log.time = "2019-05-16 21:42:57.123.456"
         self.assertRaises(ValidationError, log.validate)
 
     def test_parse_datetime_as_str(self):
         class DTDoc(Document):
             date = DateTimeField()
 
-        date_str = '2019-03-02 22:26:01'
+        date_str = "2019-03-02 22:26:01"
 
         # make sure that passing a parsable datetime works
         dtd = DTDoc()
@@ -206,7 +213,7 @@ class DTDoc(Document):
         self.assertIsInstance(dtd.date, dt.datetime)
         self.assertEqual(str(dtd.date), date_str)
 
-        dtd.date = 'January 1st, 9999999999'
+        dtd.date = "January 1st, 9999999999"
         self.assertRaises(ValidationError, dtd.validate)
 
 
@@ -217,7 +224,7 @@ def test_datetime_tz_aware_mark_as_changed(self):
         connection._connections = {}
         connection._dbs = {}
 
-        connect(db='mongoenginetest', tz_aware=True)
+        connect(db="mongoenginetest", tz_aware=True)
 
         class LogEntry(Document):
             time = DateTimeField()
@@ -228,4 +235,4 @@ class LogEntry(Document):
 
         log = LogEntry.objects.first()
         log.time = dt.datetime(2013, 1, 1, 0, 0, 0)
-        self.assertEqual(['time'], log._changed_fields)
+        self.assertEqual(["time"], log._changed_fields)
diff --git a/tests/fields/test_decimal_field.py b/tests/fields/test_decimal_field.py
index 0213b8803..30b7e5ea4 100644
--- a/tests/fields/test_decimal_field.py
+++ b/tests/fields/test_decimal_field.py
@@ -7,32 +7,31 @@
 
 
 class TestDecimalField(MongoDBTestCase):
-
     def test_validation(self):
         """Ensure that invalid values cannot be assigned to decimal fields.
         """
+
         class Person(Document):
-            height = DecimalField(min_value=Decimal('0.1'),
-                                  max_value=Decimal('3.5'))
+            height = DecimalField(min_value=Decimal("0.1"), max_value=Decimal("3.5"))
 
         Person.drop_collection()
 
-        Person(height=Decimal('1.89')).save()
+        Person(height=Decimal("1.89")).save()
         person = Person.objects.first()
-        self.assertEqual(person.height, Decimal('1.89'))
+        self.assertEqual(person.height, Decimal("1.89"))
 
-        person.height = '2.0'
+        person.height = "2.0"
         person.save()
         person.height = 0.01
         self.assertRaises(ValidationError, person.validate)
-        person.height = Decimal('0.01')
+        person.height = Decimal("0.01")
         self.assertRaises(ValidationError, person.validate)
-        person.height = Decimal('4.0')
+        person.height = Decimal("4.0")
         self.assertRaises(ValidationError, person.validate)
-        person.height = 'something invalid'
+        person.height = "something invalid"
         self.assertRaises(ValidationError, person.validate)
 
-        person_2 = Person(height='something invalid')
+        person_2 = Person(height="something invalid")
         self.assertRaises(ValidationError, person_2.validate)
 
     def test_comparison(self):
@@ -58,7 +57,14 @@ class Person(Document):
             string_value = DecimalField(precision=4, force_string=True)
 
         Person.drop_collection()
-        values_to_store = [10, 10.1, 10.11, "10.111", Decimal("10.1111"), Decimal("10.11111")]
+        values_to_store = [
+            10,
+            10.1,
+            10.11,
+            "10.111",
+            Decimal("10.1111"),
+            Decimal("10.11111"),
+        ]
         for store_at_creation in [True, False]:
             for value in values_to_store:
                 # to_python is called explicitly if values were sent in the kwargs of __init__
@@ -72,20 +78,27 @@ class Person(Document):
 
         # How its stored
         expected = [
-            {'float_value': 10.0, 'string_value': '10.0000'},
-            {'float_value': 10.1, 'string_value': '10.1000'},
-            {'float_value': 10.11, 'string_value': '10.1100'},
-            {'float_value': 10.111, 'string_value': '10.1110'},
-            {'float_value': 10.1111, 'string_value': '10.1111'},
-            {'float_value': 10.1111, 'string_value': '10.1111'}]
+            {"float_value": 10.0, "string_value": "10.0000"},
+            {"float_value": 10.1, "string_value": "10.1000"},
+            {"float_value": 10.11, "string_value": "10.1100"},
+            {"float_value": 10.111, "string_value": "10.1110"},
+            {"float_value": 10.1111, "string_value": "10.1111"},
+            {"float_value": 10.1111, "string_value": "10.1111"},
+        ]
         expected.extend(expected)
-        actual = list(Person.objects.exclude('id').as_pymongo())
+        actual = list(Person.objects.exclude("id").as_pymongo())
         self.assertEqual(expected, actual)
 
         # How it comes out locally
-        expected = [Decimal('10.0000'), Decimal('10.1000'), Decimal('10.1100'),
-                    Decimal('10.1110'), Decimal('10.1111'), Decimal('10.1111')]
+        expected = [
+            Decimal("10.0000"),
+            Decimal("10.1000"),
+            Decimal("10.1100"),
+            Decimal("10.1110"),
+            Decimal("10.1111"),
+            Decimal("10.1111"),
+        ]
         expected.extend(expected)
-        for field_name in ['float_value', 'string_value']:
+        for field_name in ["float_value", "string_value"]:
             actual = list(Person.objects().scalar(field_name))
             self.assertEqual(expected, actual)
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index ade02ccf6..07bab85b3 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -6,95 +6,92 @@
 
 
 class TestDictField(MongoDBTestCase):
-
     def test_storage(self):
         class BlogPost(Document):
             info = DictField()
 
         BlogPost.drop_collection()
 
-        info = {'testkey': 'testvalue'}
+        info = {"testkey": "testvalue"}
         post = BlogPost(info=info).save()
-        self.assertEqual(
-            get_as_pymongo(post),
-            {
-                '_id': post.id,
-                'info': info
-            }
-        )
+        self.assertEqual(get_as_pymongo(post), {"_id": post.id, "info": info})
 
     def test_general_things(self):
         """Ensure that dict types work as expected."""
+
         class BlogPost(Document):
             info = DictField()
 
         BlogPost.drop_collection()
 
         post = BlogPost()
-        post.info = 'my post'
+        post.info = "my post"
         self.assertRaises(ValidationError, post.validate)
 
-        post.info = ['test', 'test']
+        post.info = ["test", "test"]
         self.assertRaises(ValidationError, post.validate)
 
-        post.info = {'$title': 'test'}
+        post.info = {"$title": "test"}
         self.assertRaises(ValidationError, post.validate)
 
-        post.info = {'nested': {'$title': 'test'}}
+        post.info = {"nested": {"$title": "test"}}
         self.assertRaises(ValidationError, post.validate)
 
-        post.info = {'the.title': 'test'}
+        post.info = {"the.title": "test"}
         self.assertRaises(ValidationError, post.validate)
 
-        post.info = {'nested': {'the.title': 'test'}}
+        post.info = {"nested": {"the.title": "test"}}
         self.assertRaises(ValidationError, post.validate)
 
-        post.info = {1: 'test'}
+        post.info = {1: "test"}
         self.assertRaises(ValidationError, post.validate)
 
-        post.info = {'title': 'test'}
+        post.info = {"title": "test"}
         post.save()
 
         post = BlogPost()
-        post.info = {'title': 'dollar_sign', 'details': {'te$t': 'test'}}
+        post.info = {"title": "dollar_sign", "details": {"te$t": "test"}}
         post.save()
 
         post = BlogPost()
-        post.info = {'details': {'test': 'test'}}
+        post.info = {"details": {"test": "test"}}
         post.save()
 
         post = BlogPost()
-        post.info = {'details': {'test': 3}}
+        post.info = {"details": {"test": 3}}
         post.save()
 
         self.assertEqual(BlogPost.objects.count(), 4)
+        self.assertEqual(BlogPost.objects.filter(info__title__exact="test").count(), 1)
         self.assertEqual(
-            BlogPost.objects.filter(info__title__exact='test').count(), 1)
-        self.assertEqual(
-            BlogPost.objects.filter(info__details__test__exact='test').count(), 1)
+            BlogPost.objects.filter(info__details__test__exact="test").count(), 1
+        )
 
-        post = BlogPost.objects.filter(info__title__exact='dollar_sign').first()
-        self.assertIn('te$t', post['info']['details'])
+        post = BlogPost.objects.filter(info__title__exact="dollar_sign").first()
+        self.assertIn("te$t", post["info"]["details"])
 
         # Confirm handles non strings or non existing keys
         self.assertEqual(
-            BlogPost.objects.filter(info__details__test__exact=5).count(), 0)
+            BlogPost.objects.filter(info__details__test__exact=5).count(), 0
+        )
         self.assertEqual(
-            BlogPost.objects.filter(info__made_up__test__exact='test').count(), 0)
+            BlogPost.objects.filter(info__made_up__test__exact="test").count(), 0
+        )
 
-        post = BlogPost.objects.create(info={'title': 'original'})
-        post.info.update({'title': 'updated'})
+        post = BlogPost.objects.create(info={"title": "original"})
+        post.info.update({"title": "updated"})
         post.save()
         post.reload()
-        self.assertEqual('updated', post.info['title'])
+        self.assertEqual("updated", post.info["title"])
 
-        post.info.setdefault('authors', [])
+        post.info.setdefault("authors", [])
         post.save()
         post.reload()
-        self.assertEqual([], post.info['authors'])
+        self.assertEqual([], post.info["authors"])
 
     def test_dictfield_dump_document(self):
         """Ensure a DictField can handle another document's dump."""
+
         class Doc(Document):
             field = DictField()
 
@@ -106,51 +103,62 @@ class ToEmbedParent(Document):
             id = IntField(primary_key=True, default=1)
             recursive = DictField()
 
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class ToEmbedChild(ToEmbedParent):
             pass
 
         to_embed_recursive = ToEmbed(id=1).save()
         to_embed = ToEmbed(
-            id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
+            id=2, recursive=to_embed_recursive.to_mongo().to_dict()
+        ).save()
         doc = Doc(field=to_embed.to_mongo().to_dict())
         doc.save()
         self.assertIsInstance(doc.field, dict)
-        self.assertEqual(doc.field, {'_id': 2, 'recursive': {'_id': 1, 'recursive': {}}})
+        self.assertEqual(
+            doc.field, {"_id": 2, "recursive": {"_id": 1, "recursive": {}}}
+        )
         # Same thing with a Document with a _cls field
         to_embed_recursive = ToEmbedChild(id=1).save()
         to_embed_child = ToEmbedChild(
-            id=2, recursive=to_embed_recursive.to_mongo().to_dict()).save()
+            id=2, recursive=to_embed_recursive.to_mongo().to_dict()
+        ).save()
         doc = Doc(field=to_embed_child.to_mongo().to_dict())
         doc.save()
         self.assertIsInstance(doc.field, dict)
         expected = {
-            '_id': 2, '_cls': 'ToEmbedParent.ToEmbedChild',
-            'recursive': {'_id': 1, '_cls': 'ToEmbedParent.ToEmbedChild', 'recursive': {}}
+            "_id": 2,
+            "_cls": "ToEmbedParent.ToEmbedChild",
+            "recursive": {
+                "_id": 1,
+                "_cls": "ToEmbedParent.ToEmbedChild",
+                "recursive": {},
+            },
         }
         self.assertEqual(doc.field, expected)
 
     def test_dictfield_strict(self):
         """Ensure that dict field handles validation if provided a strict field type."""
+
         class Simple(Document):
             mapping = DictField(field=IntField())
 
         Simple.drop_collection()
 
         e = Simple()
-        e.mapping['someint'] = 1
+        e.mapping["someint"] = 1
         e.save()
 
         # try creating an invalid mapping
         with self.assertRaises(ValidationError):
-            e.mapping['somestring'] = "abc"
+            e.mapping["somestring"] = "abc"
             e.save()
 
     def test_dictfield_complex(self):
         """Ensure that the dict field can handle the complex types."""
+
         class SettingBase(EmbeddedDocument):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class StringSetting(SettingBase):
             value = StringField()
@@ -164,70 +172,72 @@ class Simple(Document):
         Simple.drop_collection()
 
         e = Simple()
-        e.mapping['somestring'] = StringSetting(value='foo')
-        e.mapping['someint'] = IntegerSetting(value=42)
-        e.mapping['nested_dict'] = {'number': 1, 'string': 'Hi!',
-                                    'float': 1.001,
-                                    'complex': IntegerSetting(value=42),
-                                    'list': [IntegerSetting(value=42),
-                                             StringSetting(value='foo')]}
+        e.mapping["somestring"] = StringSetting(value="foo")
+        e.mapping["someint"] = IntegerSetting(value=42)
+        e.mapping["nested_dict"] = {
+            "number": 1,
+            "string": "Hi!",
+            "float": 1.001,
+            "complex": IntegerSetting(value=42),
+            "list": [IntegerSetting(value=42), StringSetting(value="foo")],
+        }
         e.save()
 
         e2 = Simple.objects.get(id=e.id)
-        self.assertIsInstance(e2.mapping['somestring'], StringSetting)
-        self.assertIsInstance(e2.mapping['someint'], IntegerSetting)
+        self.assertIsInstance(e2.mapping["somestring"], StringSetting)
+        self.assertIsInstance(e2.mapping["someint"], IntegerSetting)
 
         # Test querying
+        self.assertEqual(Simple.objects.filter(mapping__someint__value=42).count(), 1)
         self.assertEqual(
-            Simple.objects.filter(mapping__someint__value=42).count(), 1)
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__number=1).count(), 1)
+            Simple.objects.filter(mapping__nested_dict__number=1).count(), 1
+        )
         self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__complex__value=42).count(), 1)
+            Simple.objects.filter(mapping__nested_dict__complex__value=42).count(), 1
+        )
         self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__0__value=42).count(), 1)
+            Simple.objects.filter(mapping__nested_dict__list__0__value=42).count(), 1
+        )
         self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__1__value='foo').count(), 1)
+            Simple.objects.filter(mapping__nested_dict__list__1__value="foo").count(), 1
+        )
 
         # Confirm can update
+        Simple.objects().update(set__mapping={"someint": IntegerSetting(value=10)})
         Simple.objects().update(
-            set__mapping={"someint": IntegerSetting(value=10)})
-        Simple.objects().update(
-            set__mapping__nested_dict__list__1=StringSetting(value='Boo'))
+            set__mapping__nested_dict__list__1=StringSetting(value="Boo")
+        )
         self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__1__value='foo').count(), 0)
+            Simple.objects.filter(mapping__nested_dict__list__1__value="foo").count(), 0
+        )
         self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__1__value='Boo').count(), 1)
+            Simple.objects.filter(mapping__nested_dict__list__1__value="Boo").count(), 1
+        )
 
     def test_push_dict(self):
         class MyModel(Document):
             events = ListField(DictField())
 
-        doc = MyModel(events=[{'a': 1}]).save()
+        doc = MyModel(events=[{"a": 1}]).save()
         raw_doc = get_as_pymongo(doc)
-        expected_raw_doc = {
-            '_id': doc.id,
-            'events': [{'a': 1}]
-        }
+        expected_raw_doc = {"_id": doc.id, "events": [{"a": 1}]}
         self.assertEqual(raw_doc, expected_raw_doc)
 
         MyModel.objects(id=doc.id).update(push__events={})
         raw_doc = get_as_pymongo(doc)
-        expected_raw_doc = {
-            '_id': doc.id,
-            'events': [{'a': 1}, {}]
-        }
+        expected_raw_doc = {"_id": doc.id, "events": [{"a": 1}, {}]}
         self.assertEqual(raw_doc, expected_raw_doc)
 
     def test_ensure_unique_default_instances(self):
         """Ensure that every field has it's own unique default instance."""
+
         class D(Document):
             data = DictField()
             data2 = DictField(default=lambda: {})
 
         d1 = D()
-        d1.data['foo'] = 'bar'
-        d1.data2['foo'] = 'bar'
+        d1.data["foo"] = "bar"
+        d1.data2["foo"] = "bar"
         d2 = D()
         self.assertEqual(d2.data, {})
         self.assertEqual(d2.data2, {})
@@ -255,22 +265,25 @@ class DictFieldTest(Document):
         class Embedded(EmbeddedDocument):
             name = StringField()
 
-        embed = Embedded(name='garbage')
+        embed = Embedded(name="garbage")
         doc = DictFieldTest(dictionary=embed)
         with self.assertRaises(ValidationError) as ctx_err:
             doc.validate()
         self.assertIn("'dictionary'", str(ctx_err.exception))
-        self.assertIn('Only dictionaries may be used in a DictField', str(ctx_err.exception))
+        self.assertIn(
+            "Only dictionaries may be used in a DictField", str(ctx_err.exception)
+        )
 
     def test_atomic_update_dict_field(self):
         """Ensure that the entire DictField can be atomically updated."""
+
         class Simple(Document):
             mapping = DictField(field=ListField(IntField(required=True)))
 
         Simple.drop_collection()
 
         e = Simple()
-        e.mapping['someints'] = [1, 2]
+        e.mapping["someints"] = [1, 2]
         e.save()
         e.update(set__mapping={"ints": [3, 4]})
         e.reload()
@@ -279,7 +292,7 @@ class Simple(Document):
 
         # try creating an invalid mapping
         with self.assertRaises(ValueError):
-            e.update(set__mapping={"somestrings": ["foo", "bar", ]})
+            e.update(set__mapping={"somestrings": ["foo", "bar"]})
 
     def test_dictfield_with_referencefield_complex_nesting_cases(self):
         """Ensure complex nesting inside DictField handles dereferencing of ReferenceField(dbref=True | False)"""
@@ -296,29 +309,33 @@ class Simple(Document):
             mapping5 = DictField(DictField(field=ReferenceField(Doc, dbref=False)))
             mapping6 = DictField(ListField(DictField(ReferenceField(Doc, dbref=True))))
             mapping7 = DictField(ListField(DictField(ReferenceField(Doc, dbref=False))))
-            mapping8 = DictField(ListField(DictField(ListField(ReferenceField(Doc, dbref=True)))))
-            mapping9 = DictField(ListField(DictField(ListField(ReferenceField(Doc, dbref=False)))))
+            mapping8 = DictField(
+                ListField(DictField(ListField(ReferenceField(Doc, dbref=True))))
+            )
+            mapping9 = DictField(
+                ListField(DictField(ListField(ReferenceField(Doc, dbref=False))))
+            )
 
         Doc.drop_collection()
         Simple.drop_collection()
 
-        d = Doc(s='aa').save()
+        d = Doc(s="aa").save()
         e = Simple()
-        e.mapping0['someint'] = e.mapping1['someint'] = d
-        e.mapping2['someint'] = e.mapping3['someint'] = [d]
-        e.mapping4['someint'] = e.mapping5['someint'] = {'d': d}
-        e.mapping6['someint'] = e.mapping7['someint'] = [{'d': d}]
-        e.mapping8['someint'] = e.mapping9['someint'] = [{'d': [d]}]
+        e.mapping0["someint"] = e.mapping1["someint"] = d
+        e.mapping2["someint"] = e.mapping3["someint"] = [d]
+        e.mapping4["someint"] = e.mapping5["someint"] = {"d": d}
+        e.mapping6["someint"] = e.mapping7["someint"] = [{"d": d}]
+        e.mapping8["someint"] = e.mapping9["someint"] = [{"d": [d]}]
         e.save()
 
         s = Simple.objects.first()
-        self.assertIsInstance(s.mapping0['someint'], Doc)
-        self.assertIsInstance(s.mapping1['someint'], Doc)
-        self.assertIsInstance(s.mapping2['someint'][0], Doc)
-        self.assertIsInstance(s.mapping3['someint'][0], Doc)
-        self.assertIsInstance(s.mapping4['someint']['d'], Doc)
-        self.assertIsInstance(s.mapping5['someint']['d'], Doc)
-        self.assertIsInstance(s.mapping6['someint'][0]['d'], Doc)
-        self.assertIsInstance(s.mapping7['someint'][0]['d'], Doc)
-        self.assertIsInstance(s.mapping8['someint'][0]['d'][0], Doc)
-        self.assertIsInstance(s.mapping9['someint'][0]['d'][0], Doc)
+        self.assertIsInstance(s.mapping0["someint"], Doc)
+        self.assertIsInstance(s.mapping1["someint"], Doc)
+        self.assertIsInstance(s.mapping2["someint"][0], Doc)
+        self.assertIsInstance(s.mapping3["someint"][0], Doc)
+        self.assertIsInstance(s.mapping4["someint"]["d"], Doc)
+        self.assertIsInstance(s.mapping5["someint"]["d"], Doc)
+        self.assertIsInstance(s.mapping6["someint"][0]["d"], Doc)
+        self.assertIsInstance(s.mapping7["someint"][0]["d"], Doc)
+        self.assertIsInstance(s.mapping8["someint"][0]["d"][0], Doc)
+        self.assertIsInstance(s.mapping9["someint"][0]["d"][0], Doc)
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
index 3ce49d623..06ec51513 100644
--- a/tests/fields/test_email_field.py
+++ b/tests/fields/test_email_field.py
@@ -12,28 +12,29 @@ def test_generic_behavior(self):
         class User(Document):
             email = EmailField()
 
-        user = User(email='ross@example.com')
+        user = User(email="ross@example.com")
         user.validate()
 
-        user = User(email='ross@example.co.uk')
+        user = User(email="ross@example.co.uk")
         user.validate()
 
-        user = User(email=('Kofq@rhom0e4klgauOhpbpNdogawnyIKvQS0wk2mjqrgGQ5S'
-                           'aJIazqqWkm7.net'))
+        user = User(
+            email=("Kofq@rhom0e4klgauOhpbpNdogawnyIKvQS0wk2mjqrgGQ5SaJIazqqWkm7.net")
+        )
         user.validate()
 
-        user = User(email='new-tld@example.technology')
+        user = User(email="new-tld@example.technology")
         user.validate()
 
-        user = User(email='ross@example.com.')
+        user = User(email="ross@example.com.")
         self.assertRaises(ValidationError, user.validate)
 
         # unicode domain
-        user = User(email=u'user@пример.рф')
+        user = User(email=u"user@пример.рф")
         user.validate()
 
         # invalid unicode domain
-        user = User(email=u'user@пример')
+        user = User(email=u"user@пример")
         self.assertRaises(ValidationError, user.validate)
 
         # invalid data type
@@ -44,20 +45,20 @@ def test_email_field_unicode_user(self):
         # Don't run this test on pypy3, which doesn't support unicode regex:
         # https://bitbucket.org/pypy/pypy/issues/1821/regular-expression-doesnt-find-unicode
         if sys.version_info[:2] == (3, 2):
-            raise SkipTest('unicode email addresses are not supported on PyPy 3')
+            raise SkipTest("unicode email addresses are not supported on PyPy 3")
 
         class User(Document):
             email = EmailField()
 
         # unicode user shouldn't validate by default...
-        user = User(email=u'Dörte@Sörensen.example.com')
+        user = User(email=u"Dörte@Sörensen.example.com")
         self.assertRaises(ValidationError, user.validate)
 
         # ...but it should be fine with allow_utf8_user set to True
         class User(Document):
             email = EmailField(allow_utf8_user=True)
 
-        user = User(email=u'Dörte@Sörensen.example.com')
+        user = User(email=u"Dörte@Sörensen.example.com")
         user.validate()
 
     def test_email_field_domain_whitelist(self):
@@ -65,22 +66,22 @@ class User(Document):
             email = EmailField()
 
         # localhost domain shouldn't validate by default...
-        user = User(email='me@localhost')
+        user = User(email="me@localhost")
         self.assertRaises(ValidationError, user.validate)
 
         # ...but it should be fine if it's whitelisted
         class User(Document):
-            email = EmailField(domain_whitelist=['localhost'])
+            email = EmailField(domain_whitelist=["localhost"])
 
-        user = User(email='me@localhost')
+        user = User(email="me@localhost")
         user.validate()
 
     def test_email_domain_validation_fails_if_invalid_idn(self):
         class User(Document):
             email = EmailField()
 
-        invalid_idn = '.google.com'
-        user = User(email='me@%s' % invalid_idn)
+        invalid_idn = ".google.com"
+        user = User(email="me@%s" % invalid_idn)
         with self.assertRaises(ValidationError) as ctx_err:
             user.validate()
         self.assertIn("domain failed IDN encoding", str(ctx_err.exception))
@@ -89,9 +90,9 @@ def test_email_field_ip_domain(self):
         class User(Document):
             email = EmailField()
 
-        valid_ipv4 = 'email@[127.0.0.1]'
-        valid_ipv6 = 'email@[2001:dB8::1]'
-        invalid_ip = 'email@[324.0.0.1]'
+        valid_ipv4 = "email@[127.0.0.1]"
+        valid_ipv6 = "email@[2001:dB8::1]"
+        invalid_ip = "email@[324.0.0.1]"
 
         # IP address as a domain shouldn't validate by default...
         user = User(email=valid_ipv4)
@@ -119,12 +120,12 @@ class User(Document):
 
     def test_email_field_honors_regex(self):
         class User(Document):
-            email = EmailField(regex=r'\w+@example.com')
+            email = EmailField(regex=r"\w+@example.com")
 
         # Fails regex validation
-        user = User(email='me@foo.com')
+        user = User(email="me@foo.com")
         self.assertRaises(ValidationError, user.validate)
 
         # Passes regex validation
-        user = User(email='me@example.com')
+        user = User(email="me@example.com")
         self.assertIsNone(user.validate())
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index a262d054d..6b4207818 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,7 +1,18 @@
 # -*- coding: utf-8 -*-
-from mongoengine import Document, StringField, ValidationError, EmbeddedDocument, EmbeddedDocumentField, \
-    InvalidQueryError, LookUpError, IntField, GenericEmbeddedDocumentField, ListField, EmbeddedDocumentListField, \
-    ReferenceField
+from mongoengine import (
+    Document,
+    StringField,
+    ValidationError,
+    EmbeddedDocument,
+    EmbeddedDocumentField,
+    InvalidQueryError,
+    LookUpError,
+    IntField,
+    GenericEmbeddedDocumentField,
+    ListField,
+    EmbeddedDocumentListField,
+    ReferenceField,
+)
 
 from tests.utils import MongoDBTestCase
 
@@ -14,22 +25,24 @@ class MyDoc(EmbeddedDocument):
         field = EmbeddedDocumentField(MyDoc)
         self.assertEqual(field.document_type_obj, MyDoc)
 
-        field2 = EmbeddedDocumentField('MyDoc')
-        self.assertEqual(field2.document_type_obj, 'MyDoc')
+        field2 = EmbeddedDocumentField("MyDoc")
+        self.assertEqual(field2.document_type_obj, "MyDoc")
 
     def test___init___throw_error_if_document_type_is_not_EmbeddedDocument(self):
         with self.assertRaises(ValidationError):
             EmbeddedDocumentField(dict)
 
     def test_document_type_throw_error_if_not_EmbeddedDocument_subclass(self):
-
         class MyDoc(Document):
             name = StringField()
 
-        emb = EmbeddedDocumentField('MyDoc')
+        emb = EmbeddedDocumentField("MyDoc")
         with self.assertRaises(ValidationError) as ctx:
             emb.document_type
-        self.assertIn('Invalid embedded document class provided to an EmbeddedDocumentField', str(ctx.exception))
+        self.assertIn(
+            "Invalid embedded document class provided to an EmbeddedDocumentField",
+            str(ctx.exception),
+        )
 
     def test_embedded_document_field_only_allow_subclasses_of_embedded_document(self):
         # Relates to #1661
@@ -37,12 +50,14 @@ class MyDoc(Document):
             name = StringField()
 
         with self.assertRaises(ValidationError):
+
             class MyFailingDoc(Document):
                 emb = EmbeddedDocumentField(MyDoc)
 
         with self.assertRaises(ValidationError):
+
             class MyFailingdoc2(Document):
-                emb = EmbeddedDocumentField('MyDoc')
+                emb = EmbeddedDocumentField("MyDoc")
 
     def test_query_embedded_document_attribute(self):
         class AdminSettings(EmbeddedDocument):
@@ -55,34 +70,31 @@ class Person(Document):
 
         Person.drop_collection()
 
-        p = Person(
-            settings=AdminSettings(foo1='bar1', foo2='bar2'),
-            name='John',
-        ).save()
+        p = Person(settings=AdminSettings(foo1="bar1", foo2="bar2"), name="John").save()
 
         # Test non exiting attribute
         with self.assertRaises(InvalidQueryError) as ctx_err:
-            Person.objects(settings__notexist='bar').first()
+            Person.objects(settings__notexist="bar").first()
         self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
 
         with self.assertRaises(LookUpError):
-            Person.objects.only('settings.notexist')
+            Person.objects.only("settings.notexist")
 
         # Test existing attribute
-        self.assertEqual(Person.objects(settings__foo1='bar1').first().id, p.id)
-        only_p = Person.objects.only('settings.foo1').first()
+        self.assertEqual(Person.objects(settings__foo1="bar1").first().id, p.id)
+        only_p = Person.objects.only("settings.foo1").first()
         self.assertEqual(only_p.settings.foo1, p.settings.foo1)
         self.assertIsNone(only_p.settings.foo2)
         self.assertIsNone(only_p.name)
 
-        exclude_p = Person.objects.exclude('settings.foo1').first()
+        exclude_p = Person.objects.exclude("settings.foo1").first()
         self.assertIsNone(exclude_p.settings.foo1)
         self.assertEqual(exclude_p.settings.foo2, p.settings.foo2)
         self.assertEqual(exclude_p.name, p.name)
 
     def test_query_embedded_document_attribute_with_inheritance(self):
         class BaseSettings(EmbeddedDocument):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
             base_foo = StringField()
 
         class AdminSettings(BaseSettings):
@@ -93,26 +105,26 @@ class Person(Document):
 
         Person.drop_collection()
 
-        p = Person(settings=AdminSettings(base_foo='basefoo', sub_foo='subfoo'))
+        p = Person(settings=AdminSettings(base_foo="basefoo", sub_foo="subfoo"))
         p.save()
 
         # Test non exiting attribute
         with self.assertRaises(InvalidQueryError) as ctx_err:
-            self.assertEqual(Person.objects(settings__notexist='bar').first().id, p.id)
+            self.assertEqual(Person.objects(settings__notexist="bar").first().id, p.id)
         self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
 
         # Test existing attribute
-        self.assertEqual(Person.objects(settings__base_foo='basefoo').first().id, p.id)
-        self.assertEqual(Person.objects(settings__sub_foo='subfoo').first().id, p.id)
+        self.assertEqual(Person.objects(settings__base_foo="basefoo").first().id, p.id)
+        self.assertEqual(Person.objects(settings__sub_foo="subfoo").first().id, p.id)
 
-        only_p = Person.objects.only('settings.base_foo', 'settings._cls').first()
-        self.assertEqual(only_p.settings.base_foo, 'basefoo')
+        only_p = Person.objects.only("settings.base_foo", "settings._cls").first()
+        self.assertEqual(only_p.settings.base_foo, "basefoo")
         self.assertIsNone(only_p.settings.sub_foo)
 
     def test_query_list_embedded_document_with_inheritance(self):
         class Post(EmbeddedDocument):
             title = StringField(max_length=120, required=True)
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class TextPost(Post):
             content = StringField()
@@ -123,8 +135,8 @@ class MoviePost(Post):
         class Record(Document):
             posts = ListField(EmbeddedDocumentField(Post))
 
-        record_movie = Record(posts=[MoviePost(author='John', title='foo')]).save()
-        record_text = Record(posts=[TextPost(content='a', title='foo')]).save()
+        record_movie = Record(posts=[MoviePost(author="John", title="foo")]).save()
+        record_text = Record(posts=[TextPost(content="a", title="foo")]).save()
 
         records = list(Record.objects(posts__author=record_movie.posts[0].author))
         self.assertEqual(len(records), 1)
@@ -134,11 +146,10 @@ class Record(Document):
         self.assertEqual(len(records), 1)
         self.assertEqual(records[0].id, record_text.id)
 
-        self.assertEqual(Record.objects(posts__title='foo').count(), 2)
+        self.assertEqual(Record.objects(posts__title="foo").count(), 2)
 
 
 class TestGenericEmbeddedDocumentField(MongoDBTestCase):
-
     def test_generic_embedded_document(self):
         class Car(EmbeddedDocument):
             name = StringField()
@@ -153,8 +164,8 @@ class Person(Document):
 
         Person.drop_collection()
 
-        person = Person(name='Test User')
-        person.like = Car(name='Fiat')
+        person = Person(name="Test User")
+        person.like = Car(name="Fiat")
         person.save()
 
         person = Person.objects.first()
@@ -168,6 +179,7 @@ class Person(Document):
 
     def test_generic_embedded_document_choices(self):
         """Ensure you can limit GenericEmbeddedDocument choices."""
+
         class Car(EmbeddedDocument):
             name = StringField()
 
@@ -181,8 +193,8 @@ class Person(Document):
 
         Person.drop_collection()
 
-        person = Person(name='Test User')
-        person.like = Car(name='Fiat')
+        person = Person(name="Test User")
+        person.like = Car(name="Fiat")
         self.assertRaises(ValidationError, person.validate)
 
         person.like = Dish(food="arroz", number=15)
@@ -195,6 +207,7 @@ def test_generic_list_embedded_document_choices(self):
         """Ensure you can limit GenericEmbeddedDocument choices inside
         a list field.
         """
+
         class Car(EmbeddedDocument):
             name = StringField()
 
@@ -208,8 +221,8 @@ class Person(Document):
 
         Person.drop_collection()
 
-        person = Person(name='Test User')
-        person.likes = [Car(name='Fiat')]
+        person = Person(name="Test User")
+        person.likes = [Car(name="Fiat")]
         self.assertRaises(ValidationError, person.validate)
 
         person.likes = [Dish(food="arroz", number=15)]
@@ -222,25 +235,23 @@ def test_choices_validation_documents(self):
         """
         Ensure fields with document choices validate given a valid choice.
         """
+
         class UserComments(EmbeddedDocument):
             author = StringField()
             message = StringField()
 
         class BlogPost(Document):
-            comments = ListField(
-                GenericEmbeddedDocumentField(choices=(UserComments,))
-            )
+            comments = ListField(GenericEmbeddedDocumentField(choices=(UserComments,)))
 
         # Ensure Validation Passes
-        BlogPost(comments=[
-            UserComments(author='user2', message='message2'),
-        ]).save()
+        BlogPost(comments=[UserComments(author="user2", message="message2")]).save()
 
     def test_choices_validation_documents_invalid(self):
         """
         Ensure fields with document choices validate given an invalid choice.
         This should throw a ValidationError exception.
         """
+
         class UserComments(EmbeddedDocument):
             author = StringField()
             message = StringField()
@@ -250,31 +261,28 @@ class ModeratorComments(EmbeddedDocument):
             message = StringField()
 
         class BlogPost(Document):
-            comments = ListField(
-                GenericEmbeddedDocumentField(choices=(UserComments,))
-            )
+            comments = ListField(GenericEmbeddedDocumentField(choices=(UserComments,)))
 
         # Single Entry Failure
-        post = BlogPost(comments=[
-            ModeratorComments(author='mod1', message='message1'),
-        ])
+        post = BlogPost(comments=[ModeratorComments(author="mod1", message="message1")])
         self.assertRaises(ValidationError, post.save)
 
         # Mixed Entry Failure
-        post = BlogPost(comments=[
-            ModeratorComments(author='mod1', message='message1'),
-            UserComments(author='user2', message='message2'),
-        ])
+        post = BlogPost(
+            comments=[
+                ModeratorComments(author="mod1", message="message1"),
+                UserComments(author="user2", message="message2"),
+            ]
+        )
         self.assertRaises(ValidationError, post.save)
 
     def test_choices_validation_documents_inheritance(self):
         """
         Ensure fields with document choices validate given subclass of choice.
         """
+
         class Comments(EmbeddedDocument):
-            meta = {
-                'abstract': True
-            }
+            meta = {"abstract": True}
             author = StringField()
             message = StringField()
 
@@ -282,14 +290,10 @@ class UserComments(Comments):
             pass
 
         class BlogPost(Document):
-            comments = ListField(
-                GenericEmbeddedDocumentField(choices=(Comments,))
-            )
+            comments = ListField(GenericEmbeddedDocumentField(choices=(Comments,)))
 
         # Save Valid EmbeddedDocument Type
-        BlogPost(comments=[
-            UserComments(author='user2', message='message2'),
-        ]).save()
+        BlogPost(comments=[UserComments(author="user2", message="message2")]).save()
 
     def test_query_generic_embedded_document_attribute(self):
         class AdminSettings(EmbeddedDocument):
@@ -299,28 +303,30 @@ class NonAdminSettings(EmbeddedDocument):
             foo2 = StringField()
 
         class Person(Document):
-            settings = GenericEmbeddedDocumentField(choices=(AdminSettings, NonAdminSettings))
+            settings = GenericEmbeddedDocumentField(
+                choices=(AdminSettings, NonAdminSettings)
+            )
 
         Person.drop_collection()
 
-        p1 = Person(settings=AdminSettings(foo1='bar1')).save()
-        p2 = Person(settings=NonAdminSettings(foo2='bar2')).save()
+        p1 = Person(settings=AdminSettings(foo1="bar1")).save()
+        p2 = Person(settings=NonAdminSettings(foo2="bar2")).save()
 
         # Test non exiting attribute
         with self.assertRaises(InvalidQueryError) as ctx_err:
-            Person.objects(settings__notexist='bar').first()
+            Person.objects(settings__notexist="bar").first()
         self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
 
         with self.assertRaises(LookUpError):
-            Person.objects.only('settings.notexist')
+            Person.objects.only("settings.notexist")
 
         # Test existing attribute
-        self.assertEqual(Person.objects(settings__foo1='bar1').first().id, p1.id)
-        self.assertEqual(Person.objects(settings__foo2='bar2').first().id, p2.id)
+        self.assertEqual(Person.objects(settings__foo1="bar1").first().id, p1.id)
+        self.assertEqual(Person.objects(settings__foo2="bar2").first().id, p2.id)
 
     def test_query_generic_embedded_document_attribute_with_inheritance(self):
         class BaseSettings(EmbeddedDocument):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
             base_foo = StringField()
 
         class AdminSettings(BaseSettings):
@@ -331,14 +337,14 @@ class Person(Document):
 
         Person.drop_collection()
 
-        p = Person(settings=AdminSettings(base_foo='basefoo', sub_foo='subfoo'))
+        p = Person(settings=AdminSettings(base_foo="basefoo", sub_foo="subfoo"))
         p.save()
 
         # Test non exiting attribute
         with self.assertRaises(InvalidQueryError) as ctx_err:
-            self.assertEqual(Person.objects(settings__notexist='bar').first().id, p.id)
+            self.assertEqual(Person.objects(settings__notexist="bar").first().id, p.id)
         self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
 
         # Test existing attribute
-        self.assertEqual(Person.objects(settings__base_foo='basefoo').first().id, p.id)
-        self.assertEqual(Person.objects(settings__sub_foo='subfoo').first().id, p.id)
+        self.assertEqual(Person.objects(settings__base_foo="basefoo").first().id, p.id)
+        self.assertEqual(Person.objects(settings__sub_foo="subfoo").first().id, p.id)
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
index fa92cf200..9f357ce55 100644
--- a/tests/fields/test_float_field.py
+++ b/tests/fields/test_float_field.py
@@ -7,7 +7,6 @@
 
 
 class TestFloatField(MongoDBTestCase):
-
     def test_float_ne_operator(self):
         class TestDocument(Document):
             float_fld = FloatField()
@@ -23,6 +22,7 @@ class TestDocument(Document):
     def test_validation(self):
         """Ensure that invalid values cannot be assigned to float fields.
         """
+
         class Person(Document):
             height = FloatField(min_value=0.1, max_value=3.5)
 
@@ -33,7 +33,7 @@ class BigPerson(Document):
         person.height = 1.89
         person.validate()
 
-        person.height = '2.0'
+        person.height = "2.0"
         self.assertRaises(ValidationError, person.validate)
 
         person.height = 0.01
@@ -42,7 +42,7 @@ class BigPerson(Document):
         person.height = 4.0
         self.assertRaises(ValidationError, person.validate)
 
-        person_2 = Person(height='something invalid')
+        person_2 = Person(height="something invalid")
         self.assertRaises(ValidationError, person_2.validate)
 
         big_person = BigPerson()
diff --git a/tests/fields/test_int_field.py b/tests/fields/test_int_field.py
index 1b1f7ad97..b7db0416a 100644
--- a/tests/fields/test_int_field.py
+++ b/tests/fields/test_int_field.py
@@ -5,10 +5,10 @@
 
 
 class TestIntField(MongoDBTestCase):
-
     def test_int_validation(self):
         """Ensure that invalid values cannot be assigned to int fields.
         """
+
         class Person(Document):
             age = IntField(min_value=0, max_value=110)
 
@@ -26,7 +26,7 @@ class Person(Document):
         self.assertRaises(ValidationError, person.validate)
         person.age = 120
         self.assertRaises(ValidationError, person.validate)
-        person.age = 'ten'
+        person.age = "ten"
         self.assertRaises(ValidationError, person.validate)
 
     def test_ne_operator(self):
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index 1d6e6e794..2a686d7fa 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -25,7 +25,7 @@ class Ocurrence(Document):
 
         animal = Animal()
         oc = Ocurrence(animal=animal)
-        self.assertIn('LazyReference', repr(oc.animal))
+        self.assertIn("LazyReference", repr(oc.animal))
 
     def test___getattr___unknown_attr_raises_attribute_error(self):
         class Animal(Document):
@@ -93,7 +93,7 @@ class Ocurrence(Document):
 
     def test_lazy_reference_set(self):
         class Animal(Document):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
             name = StringField()
             tag = StringField()
@@ -109,18 +109,17 @@ class SubAnimal(Animal):
             nick = StringField()
 
         animal = Animal(name="Leopard", tag="heavy").save()
-        sub_animal = SubAnimal(nick='doggo', name='dog').save()
+        sub_animal = SubAnimal(nick="doggo", name="dog").save()
         for ref in (
-                animal,
-                animal.pk,
-                DBRef(animal._get_collection_name(), animal.pk),
-                LazyReference(Animal, animal.pk),
-
-                sub_animal,
-                sub_animal.pk,
-                DBRef(sub_animal._get_collection_name(), sub_animal.pk),
-                LazyReference(SubAnimal, sub_animal.pk),
-                ):
+            animal,
+            animal.pk,
+            DBRef(animal._get_collection_name(), animal.pk),
+            LazyReference(Animal, animal.pk),
+            sub_animal,
+            sub_animal.pk,
+            DBRef(sub_animal._get_collection_name(), sub_animal.pk),
+            LazyReference(SubAnimal, sub_animal.pk),
+        ):
             p = Ocurrence(person="test", animal=ref).save()
             p.reload()
             self.assertIsInstance(p.animal, LazyReference)
@@ -144,12 +143,12 @@ class BadDoc(Document):
         animal = Animal(name="Leopard", tag="heavy").save()
         baddoc = BadDoc().save()
         for bad in (
-                42,
-                'foo',
-                baddoc,
-                DBRef(baddoc._get_collection_name(), animal.pk),
-                LazyReference(BadDoc, animal.pk)
-                ):
+            42,
+            "foo",
+            baddoc,
+            DBRef(baddoc._get_collection_name(), animal.pk),
+            LazyReference(BadDoc, animal.pk),
+        ):
             with self.assertRaises(ValidationError):
                 p = Ocurrence(person="test", animal=bad).save()
 
@@ -157,6 +156,7 @@ def test_lazy_reference_query_conversion(self):
         """Ensure that LazyReferenceFields can be queried using objects and values
         of the type of the primary key of the referenced object.
         """
+
         class Member(Document):
             user_num = IntField(primary_key=True)
 
@@ -172,10 +172,10 @@ class BlogPost(Document):
         m2 = Member(user_num=2)
         m2.save()
 
-        post1 = BlogPost(title='post 1', author=m1)
+        post1 = BlogPost(title="post 1", author=m1)
         post1.save()
 
-        post2 = BlogPost(title='post 2', author=m2)
+        post2 = BlogPost(title="post 2", author=m2)
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
@@ -192,6 +192,7 @@ def test_lazy_reference_query_conversion_dbref(self):
         """Ensure that LazyReferenceFields can be queried using objects and values
         of the type of the primary key of the referenced object.
         """
+
         class Member(Document):
             user_num = IntField(primary_key=True)
 
@@ -207,10 +208,10 @@ class BlogPost(Document):
         m2 = Member(user_num=2)
         m2.save()
 
-        post1 = BlogPost(title='post 1', author=m1)
+        post1 = BlogPost(title="post 1", author=m1)
         post1.save()
 
-        post2 = BlogPost(title='post 2', author=m2)
+        post2 = BlogPost(title="post 2", author=m2)
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
@@ -240,19 +241,19 @@ class Ocurrence(Document):
         p = Ocurrence.objects.get()
         self.assertIsInstance(p.animal, LazyReference)
         with self.assertRaises(KeyError):
-            p.animal['name']
+            p.animal["name"]
         with self.assertRaises(AttributeError):
             p.animal.name
         self.assertEqual(p.animal.pk, animal.pk)
 
         self.assertEqual(p.animal_passthrough.name, "Leopard")
-        self.assertEqual(p.animal_passthrough['name'], "Leopard")
+        self.assertEqual(p.animal_passthrough["name"], "Leopard")
 
         # Should not be able to access referenced document's methods
         with self.assertRaises(AttributeError):
             p.animal.save
         with self.assertRaises(KeyError):
-            p.animal['save']
+            p.animal["save"]
 
     def test_lazy_reference_not_set(self):
         class Animal(Document):
@@ -266,7 +267,7 @@ class Ocurrence(Document):
         Animal.drop_collection()
         Ocurrence.drop_collection()
 
-        Ocurrence(person='foo').save()
+        Ocurrence(person="foo").save()
         p = Ocurrence.objects.get()
         self.assertIs(p.animal, None)
 
@@ -303,8 +304,8 @@ class Ocurrence(Document):
         Animal.drop_collection()
         Ocurrence.drop_collection()
 
-        animal1 = Animal(name='doggo').save()
-        animal2 = Animal(name='cheeta').save()
+        animal1 = Animal(name="doggo").save()
+        animal2 = Animal(name="cheeta").save()
 
         def check_fields_type(occ):
             self.assertIsInstance(occ.direct, LazyReference)
@@ -316,8 +317,8 @@ def check_fields_type(occ):
 
         occ = Ocurrence(
             in_list=[animal1, animal2],
-            in_embedded={'in_list': [animal1, animal2], 'direct': animal1},
-            direct=animal1
+            in_embedded={"in_list": [animal1, animal2], "direct": animal1},
+            direct=animal1,
         ).save()
         check_fields_type(occ)
         occ.reload()
@@ -403,7 +404,7 @@ class Ocurrence(Document):
 
     def test_generic_lazy_reference_set(self):
         class Animal(Document):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
             name = StringField()
             tag = StringField()
@@ -419,16 +420,18 @@ class SubAnimal(Animal):
             nick = StringField()
 
         animal = Animal(name="Leopard", tag="heavy").save()
-        sub_animal = SubAnimal(nick='doggo', name='dog').save()
+        sub_animal = SubAnimal(nick="doggo", name="dog").save()
         for ref in (
-                animal,
-                LazyReference(Animal, animal.pk),
-                {'_cls': 'Animal', '_ref': DBRef(animal._get_collection_name(), animal.pk)},
-
-                sub_animal,
-                LazyReference(SubAnimal, sub_animal.pk),
-                {'_cls': 'SubAnimal', '_ref': DBRef(sub_animal._get_collection_name(), sub_animal.pk)},
-                ):
+            animal,
+            LazyReference(Animal, animal.pk),
+            {"_cls": "Animal", "_ref": DBRef(animal._get_collection_name(), animal.pk)},
+            sub_animal,
+            LazyReference(SubAnimal, sub_animal.pk),
+            {
+                "_cls": "SubAnimal",
+                "_ref": DBRef(sub_animal._get_collection_name(), sub_animal.pk),
+            },
+        ):
             p = Ocurrence(person="test", animal=ref).save()
             p.reload()
             self.assertIsInstance(p.animal, (LazyReference, Document))
@@ -441,7 +444,7 @@ class Animal(Document):
 
         class Ocurrence(Document):
             person = StringField()
-            animal = GenericLazyReferenceField(choices=['Animal'])
+            animal = GenericLazyReferenceField(choices=["Animal"])
 
         Animal.drop_collection()
         Ocurrence.drop_collection()
@@ -451,12 +454,7 @@ class BadDoc(Document):
 
         animal = Animal(name="Leopard", tag="heavy").save()
         baddoc = BadDoc().save()
-        for bad in (
-                42,
-                'foo',
-                baddoc,
-                LazyReference(BadDoc, animal.pk)
-                ):
+        for bad in (42, "foo", baddoc, LazyReference(BadDoc, animal.pk)):
             with self.assertRaises(ValidationError):
                 p = Ocurrence(person="test", animal=bad).save()
 
@@ -476,10 +474,10 @@ class BlogPost(Document):
         m2 = Member(user_num=2)
         m2.save()
 
-        post1 = BlogPost(title='post 1', author=m1)
+        post1 = BlogPost(title="post 1", author=m1)
         post1.save()
 
-        post2 = BlogPost(title='post 2', author=m2)
+        post2 = BlogPost(title="post 2", author=m2)
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
@@ -504,7 +502,7 @@ class Ocurrence(Document):
         Animal.drop_collection()
         Ocurrence.drop_collection()
 
-        Ocurrence(person='foo').save()
+        Ocurrence(person="foo").save()
         p = Ocurrence.objects.get()
         self.assertIs(p.animal, None)
 
@@ -515,7 +513,7 @@ class Animal(Document):
 
         class Ocurrence(Document):
             person = StringField()
-            animal = GenericLazyReferenceField('Animal')
+            animal = GenericLazyReferenceField("Animal")
 
         Animal.drop_collection()
         Ocurrence.drop_collection()
@@ -542,8 +540,8 @@ class Ocurrence(Document):
         Animal.drop_collection()
         Ocurrence.drop_collection()
 
-        animal1 = Animal(name='doggo').save()
-        animal2 = Animal(name='cheeta').save()
+        animal1 = Animal(name="doggo").save()
+        animal2 = Animal(name="cheeta").save()
 
         def check_fields_type(occ):
             self.assertIsInstance(occ.direct, LazyReference)
@@ -555,14 +553,20 @@ def check_fields_type(occ):
 
         occ = Ocurrence(
             in_list=[animal1, animal2],
-            in_embedded={'in_list': [animal1, animal2], 'direct': animal1},
-            direct=animal1
+            in_embedded={"in_list": [animal1, animal2], "direct": animal1},
+            direct=animal1,
         ).save()
         check_fields_type(occ)
         occ.reload()
         check_fields_type(occ)
-        animal1_ref = {'_cls': 'Animal', '_ref': DBRef(animal1._get_collection_name(), animal1.pk)}
-        animal2_ref = {'_cls': 'Animal', '_ref': DBRef(animal2._get_collection_name(), animal2.pk)}
+        animal1_ref = {
+            "_cls": "Animal",
+            "_ref": DBRef(animal1._get_collection_name(), animal1.pk),
+        }
+        animal2_ref = {
+            "_cls": "Animal",
+            "_ref": DBRef(animal2._get_collection_name(), animal2.pk),
+        }
         occ.direct = animal1_ref
         occ.in_list = [animal1_ref, animal2_ref]
         occ.in_embedded.direct = animal1_ref
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index 3f307809a..ab86eccd1 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -13,23 +13,26 @@
 
 
 class TestLongField(MongoDBTestCase):
-
     def test_long_field_is_considered_as_int64(self):
         """
         Tests that long fields are stored as long in mongo, even if long
         value is small enough to be an int.
         """
+
         class TestLongFieldConsideredAsInt64(Document):
             some_long = LongField()
 
         doc = TestLongFieldConsideredAsInt64(some_long=42).save()
         db = get_db()
-        self.assertIsInstance(db.test_long_field_considered_as_int64.find()[0]['some_long'], Int64)
+        self.assertIsInstance(
+            db.test_long_field_considered_as_int64.find()[0]["some_long"], Int64
+        )
         self.assertIsInstance(doc.some_long, six.integer_types)
 
     def test_long_validation(self):
         """Ensure that invalid values cannot be assigned to long fields.
         """
+
         class TestDocument(Document):
             value = LongField(min_value=0, max_value=110)
 
@@ -41,7 +44,7 @@ class TestDocument(Document):
         self.assertRaises(ValidationError, doc.validate)
         doc.value = 120
         self.assertRaises(ValidationError, doc.validate)
-        doc.value = 'ten'
+        doc.value = "ten"
         self.assertRaises(ValidationError, doc.validate)
 
     def test_long_ne_operator(self):
diff --git a/tests/fields/test_map_field.py b/tests/fields/test_map_field.py
index cb27cffff..54f70aa17 100644
--- a/tests/fields/test_map_field.py
+++ b/tests/fields/test_map_field.py
@@ -7,23 +7,24 @@
 
 
 class TestMapField(MongoDBTestCase):
-
     def test_mapfield(self):
         """Ensure that the MapField handles the declared type."""
+
         class Simple(Document):
             mapping = MapField(IntField())
 
         Simple.drop_collection()
 
         e = Simple()
-        e.mapping['someint'] = 1
+        e.mapping["someint"] = 1
         e.save()
 
         with self.assertRaises(ValidationError):
-            e.mapping['somestring'] = "abc"
+            e.mapping["somestring"] = "abc"
             e.save()
 
         with self.assertRaises(ValidationError):
+
             class NoDeclaredType(Document):
                 mapping = MapField()
 
@@ -45,38 +46,37 @@ class Extensible(Document):
         Extensible.drop_collection()
 
         e = Extensible()
-        e.mapping['somestring'] = StringSetting(value='foo')
-        e.mapping['someint'] = IntegerSetting(value=42)
+        e.mapping["somestring"] = StringSetting(value="foo")
+        e.mapping["someint"] = IntegerSetting(value=42)
         e.save()
 
         e2 = Extensible.objects.get(id=e.id)
-        self.assertIsInstance(e2.mapping['somestring'], StringSetting)
-        self.assertIsInstance(e2.mapping['someint'], IntegerSetting)
+        self.assertIsInstance(e2.mapping["somestring"], StringSetting)
+        self.assertIsInstance(e2.mapping["someint"], IntegerSetting)
 
         with self.assertRaises(ValidationError):
-            e.mapping['someint'] = 123
+            e.mapping["someint"] = 123
             e.save()
 
     def test_embedded_mapfield_db_field(self):
         class Embedded(EmbeddedDocument):
-            number = IntField(default=0, db_field='i')
+            number = IntField(default=0, db_field="i")
 
         class Test(Document):
-            my_map = MapField(field=EmbeddedDocumentField(Embedded),
-                              db_field='x')
+            my_map = MapField(field=EmbeddedDocumentField(Embedded), db_field="x")
 
         Test.drop_collection()
 
         test = Test()
-        test.my_map['DICTIONARY_KEY'] = Embedded(number=1)
+        test.my_map["DICTIONARY_KEY"] = Embedded(number=1)
         test.save()
 
         Test.objects.update_one(inc__my_map__DICTIONARY_KEY__number=1)
 
         test = Test.objects.get()
-        self.assertEqual(test.my_map['DICTIONARY_KEY'].number, 2)
+        self.assertEqual(test.my_map["DICTIONARY_KEY"].number, 2)
         doc = self.db.test.find_one()
-        self.assertEqual(doc['x']['DICTIONARY_KEY']['i'], 2)
+        self.assertEqual(doc["x"]["DICTIONARY_KEY"]["i"], 2)
 
     def test_mapfield_numerical_index(self):
         """Ensure that MapField accept numeric strings as indexes."""
@@ -90,9 +90,9 @@ class Test(Document):
         Test.drop_collection()
 
         test = Test()
-        test.my_map['1'] = Embedded(name='test')
+        test.my_map["1"] = Embedded(name="test")
         test.save()
-        test.my_map['1'].name = 'test updated'
+        test.my_map["1"].name = "test updated"
         test.save()
 
     def test_map_field_lookup(self):
@@ -110,15 +110,20 @@ class Log(Document):
             actions = MapField(EmbeddedDocumentField(Action))
 
         Log.drop_collection()
-        Log(name="wilson", visited={'friends': datetime.datetime.now()},
-            actions={'friends': Action(operation='drink', object='beer')}).save()
+        Log(
+            name="wilson",
+            visited={"friends": datetime.datetime.now()},
+            actions={"friends": Action(operation="drink", object="beer")},
+        ).save()
 
-        self.assertEqual(1, Log.objects(
-            visited__friends__exists=True).count())
+        self.assertEqual(1, Log.objects(visited__friends__exists=True).count())
 
-        self.assertEqual(1, Log.objects(
-            actions__friends__operation='drink',
-            actions__friends__object='beer').count())
+        self.assertEqual(
+            1,
+            Log.objects(
+                actions__friends__operation="drink", actions__friends__object="beer"
+            ).count(),
+        )
 
     def test_map_field_unicode(self):
         class Info(EmbeddedDocument):
@@ -130,15 +135,11 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        tree = BlogPost(info_dict={
-            u"éééé": {
-                'description': u"VALUE: éééé"
-            }
-        })
+        tree = BlogPost(info_dict={u"éééé": {"description": u"VALUE: éééé"}})
 
         tree.save()
 
         self.assertEqual(
             BlogPost.objects.get(id=tree.id).info_dict[u"éééé"].description,
-            u"VALUE: éééé"
+            u"VALUE: éééé",
         )
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index 5e1fc6059..5fd053fe0 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -26,15 +26,15 @@ class BlogPost(Document):
         # with a document class name.
         self.assertRaises(ValidationError, ReferenceField, EmbeddedDocument)
 
-        user = User(name='Test User')
+        user = User(name="Test User")
 
         # Ensure that the referenced object must have been saved
-        post1 = BlogPost(content='Chips and gravy taste good.')
+        post1 = BlogPost(content="Chips and gravy taste good.")
         post1.author = user
         self.assertRaises(ValidationError, post1.save)
 
         # Check that an invalid object type cannot be used
-        post2 = BlogPost(content='Chips and chilli taste good.')
+        post2 = BlogPost(content="Chips and chilli taste good.")
         post1.author = post2
         self.assertRaises(ValidationError, post1.validate)
 
@@ -59,7 +59,7 @@ def test_objectid_reference_fields(self):
 
         class Person(Document):
             name = StringField()
-            parent = ReferenceField('self')
+            parent = ReferenceField("self")
 
         Person.drop_collection()
 
@@ -74,7 +74,7 @@ def test_dbref_reference_fields(self):
 
         class Person(Document):
             name = StringField()
-            parent = ReferenceField('self', dbref=True)
+            parent = ReferenceField("self", dbref=True)
 
         Person.drop_collection()
 
@@ -82,8 +82,8 @@ class Person(Document):
         Person(name="Ross", parent=p1).save()
 
         self.assertEqual(
-            Person._get_collection().find_one({'name': 'Ross'})['parent'],
-            DBRef('person', p1.pk)
+            Person._get_collection().find_one({"name": "Ross"})["parent"],
+            DBRef("person", p1.pk),
         )
 
         p = Person.objects.get(name="Ross")
@@ -97,21 +97,17 @@ def test_dbref_to_mongo(self):
 
         class Person(Document):
             name = StringField()
-            parent = ReferenceField('self', dbref=False)
+            parent = ReferenceField("self", dbref=False)
 
-        p = Person(
-            name='Steve',
-            parent=DBRef('person', 'abcdefghijklmnop')
+        p = Person(name="Steve", parent=DBRef("person", "abcdefghijklmnop"))
+        self.assertEqual(
+            p.to_mongo(), SON([("name", u"Steve"), ("parent", "abcdefghijklmnop")])
         )
-        self.assertEqual(p.to_mongo(), SON([
-            ('name', u'Steve'),
-            ('parent', 'abcdefghijklmnop')
-        ]))
 
     def test_objectid_reference_fields(self):
         class Person(Document):
             name = StringField()
-            parent = ReferenceField('self', dbref=False)
+            parent = ReferenceField("self", dbref=False)
 
         Person.drop_collection()
 
@@ -119,8 +115,8 @@ class Person(Document):
         Person(name="Ross", parent=p1).save()
 
         col = Person._get_collection()
-        data = col.find_one({'name': 'Ross'})
-        self.assertEqual(data['parent'], p1.pk)
+        data = col.find_one({"name": "Ross"})
+        self.assertEqual(data["parent"], p1.pk)
 
         p = Person.objects.get(name="Ross")
         self.assertEqual(p.parent, p1)
@@ -128,9 +124,10 @@ class Person(Document):
     def test_undefined_reference(self):
         """Ensure that ReferenceFields may reference undefined Documents.
         """
+
         class Product(Document):
             name = StringField()
-            company = ReferenceField('Company')
+            company = ReferenceField("Company")
 
         class Company(Document):
             name = StringField()
@@ -138,12 +135,12 @@ class Company(Document):
         Product.drop_collection()
         Company.drop_collection()
 
-        ten_gen = Company(name='10gen')
+        ten_gen = Company(name="10gen")
         ten_gen.save()
-        mongodb = Product(name='MongoDB', company=ten_gen)
+        mongodb = Product(name="MongoDB", company=ten_gen)
         mongodb.save()
 
-        me = Product(name='MongoEngine')
+        me = Product(name="MongoEngine")
         me.save()
 
         obj = Product.objects(company=ten_gen).first()
@@ -160,6 +157,7 @@ def test_reference_query_conversion(self):
         """Ensure that ReferenceFields can be queried using objects and values
         of the type of the primary key of the referenced object.
         """
+
         class Member(Document):
             user_num = IntField(primary_key=True)
 
@@ -175,10 +173,10 @@ class BlogPost(Document):
         m2 = Member(user_num=2)
         m2.save()
 
-        post1 = BlogPost(title='post 1', author=m1)
+        post1 = BlogPost(title="post 1", author=m1)
         post1.save()
 
-        post2 = BlogPost(title='post 2', author=m2)
+        post2 = BlogPost(title="post 2", author=m2)
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
@@ -191,6 +189,7 @@ def test_reference_query_conversion_dbref(self):
         """Ensure that ReferenceFields can be queried using objects and values
         of the type of the primary key of the referenced object.
         """
+
         class Member(Document):
             user_num = IntField(primary_key=True)
 
@@ -206,10 +205,10 @@ class BlogPost(Document):
         m2 = Member(user_num=2)
         m2.save()
 
-        post1 = BlogPost(title='post 1', author=m1)
+        post1 = BlogPost(title="post 1", author=m1)
         post1.save()
 
-        post2 = BlogPost(title='post 2', author=m2)
+        post2 = BlogPost(title="post 2", author=m2)
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
index 6124c65ef..f2c8388b1 100644
--- a/tests/fields/test_sequence_field.py
+++ b/tests/fields/test_sequence_field.py
@@ -11,38 +11,38 @@ class Person(Document):
             id = SequenceField(primary_key=True)
             name = StringField()
 
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
         Person.drop_collection()
 
         for x in range(10):
             Person(name="Person %s" % x).save()
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 10)
 
         ids = [i.id for i in Person.objects]
         self.assertEqual(ids, range(1, 11))
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 10)
 
         Person.id.set_next_value(1000)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 1000)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 1000)
 
     def test_sequence_field_get_next_value(self):
         class Person(Document):
             id = SequenceField(primary_key=True)
             name = StringField()
 
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
         Person.drop_collection()
 
         for x in range(10):
             Person(name="Person %s" % x).save()
 
         self.assertEqual(Person.id.get_next_value(), 11)
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
 
         self.assertEqual(Person.id.get_next_value(), 1)
 
@@ -50,40 +50,40 @@ class Person(Document):
             id = SequenceField(primary_key=True, value_decorator=str)
             name = StringField()
 
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
         Person.drop_collection()
 
         for x in range(10):
             Person(name="Person %s" % x).save()
 
-        self.assertEqual(Person.id.get_next_value(), '11')
-        self.db['mongoengine.counters'].drop()
+        self.assertEqual(Person.id.get_next_value(), "11")
+        self.db["mongoengine.counters"].drop()
 
-        self.assertEqual(Person.id.get_next_value(), '1')
+        self.assertEqual(Person.id.get_next_value(), "1")
 
     def test_sequence_field_sequence_name(self):
         class Person(Document):
-            id = SequenceField(primary_key=True, sequence_name='jelly')
+            id = SequenceField(primary_key=True, sequence_name="jelly")
             name = StringField()
 
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
         Person.drop_collection()
 
         for x in range(10):
             Person(name="Person %s" % x).save()
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "jelly.id"})
+        self.assertEqual(c["next"], 10)
 
         ids = [i.id for i in Person.objects]
         self.assertEqual(ids, range(1, 11))
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "jelly.id"})
+        self.assertEqual(c["next"], 10)
 
         Person.id.set_next_value(1000)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'jelly.id'})
-        self.assertEqual(c['next'], 1000)
+        c = self.db["mongoengine.counters"].find_one({"_id": "jelly.id"})
+        self.assertEqual(c["next"], 1000)
 
     def test_multiple_sequence_fields(self):
         class Person(Document):
@@ -91,14 +91,14 @@ class Person(Document):
             counter = SequenceField()
             name = StringField()
 
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
         Person.drop_collection()
 
         for x in range(10):
             Person(name="Person %s" % x).save()
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 10)
 
         ids = [i.id for i in Person.objects]
         self.assertEqual(ids, range(1, 11))
@@ -106,23 +106,23 @@ class Person(Document):
         counters = [i.counter for i in Person.objects]
         self.assertEqual(counters, range(1, 11))
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 10)
 
         Person.id.set_next_value(1000)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 1000)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 1000)
 
         Person.counter.set_next_value(999)
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.counter'})
-        self.assertEqual(c['next'], 999)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.counter"})
+        self.assertEqual(c["next"], 999)
 
     def test_sequence_fields_reload(self):
         class Animal(Document):
             counter = SequenceField()
             name = StringField()
 
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
         Animal.drop_collection()
 
         a = Animal(name="Boi").save()
@@ -151,7 +151,7 @@ class Person(Document):
             id = SequenceField(primary_key=True)
             name = StringField()
 
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
         Animal.drop_collection()
         Person.drop_collection()
 
@@ -159,11 +159,11 @@ class Person(Document):
             Animal(name="Animal %s" % x).save()
             Person(name="Person %s" % x).save()
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 10)
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "animal.id"})
+        self.assertEqual(c["next"], 10)
 
         ids = [i.id for i in Person.objects]
         self.assertEqual(ids, range(1, 11))
@@ -171,32 +171,32 @@ class Person(Document):
         id = [i.id for i in Animal.objects]
         self.assertEqual(id, range(1, 11))
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 10)
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'animal.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "animal.id"})
+        self.assertEqual(c["next"], 10)
 
     def test_sequence_field_value_decorator(self):
         class Person(Document):
             id = SequenceField(primary_key=True, value_decorator=str)
             name = StringField()
 
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
         Person.drop_collection()
 
         for x in range(10):
             p = Person(name="Person %s" % x)
             p.save()
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 10)
 
         ids = [i.id for i in Person.objects]
         self.assertEqual(ids, map(str, range(1, 11)))
 
-        c = self.db['mongoengine.counters'].find_one({'_id': 'person.id'})
-        self.assertEqual(c['next'], 10)
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        self.assertEqual(c["next"], 10)
 
     def test_embedded_sequence_field(self):
         class Comment(EmbeddedDocument):
@@ -207,14 +207,18 @@ class Post(Document):
             title = StringField(required=True)
             comments = ListField(EmbeddedDocumentField(Comment))
 
-        self.db['mongoengine.counters'].drop()
+        self.db["mongoengine.counters"].drop()
         Post.drop_collection()
 
-        Post(title="MongoEngine",
-             comments=[Comment(content="NoSQL Rocks"),
-                       Comment(content="MongoEngine Rocks")]).save()
-        c = self.db['mongoengine.counters'].find_one({'_id': 'comment.id'})
-        self.assertEqual(c['next'], 2)
+        Post(
+            title="MongoEngine",
+            comments=[
+                Comment(content="NoSQL Rocks"),
+                Comment(content="MongoEngine Rocks"),
+            ],
+        ).save()
+        c = self.db["mongoengine.counters"].find_one({"_id": "comment.id"})
+        self.assertEqual(c["next"], 2)
         post = Post.objects.first()
         self.assertEqual(1, post.comments[0].id)
         self.assertEqual(2, post.comments[1].id)
@@ -223,7 +227,7 @@ def test_inherited_sequencefield(self):
         class Base(Document):
             name = StringField()
             counter = SequenceField()
-            meta = {'abstract': True}
+            meta = {"abstract": True}
 
         class Foo(Base):
             pass
@@ -231,24 +235,27 @@ class Foo(Base):
         class Bar(Base):
             pass
 
-        bar = Bar(name='Bar')
+        bar = Bar(name="Bar")
         bar.save()
 
-        foo = Foo(name='Foo')
+        foo = Foo(name="Foo")
         foo.save()
 
-        self.assertTrue('base.counter' in
-                        self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertFalse(('foo.counter' or 'bar.counter') in
-                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertTrue(
+            "base.counter" in self.db["mongoengine.counters"].find().distinct("_id")
+        )
+        self.assertFalse(
+            ("foo.counter" or "bar.counter")
+            in self.db["mongoengine.counters"].find().distinct("_id")
+        )
         self.assertNotEqual(foo.counter, bar.counter)
-        self.assertEqual(foo._fields['counter'].owner_document, Base)
-        self.assertEqual(bar._fields['counter'].owner_document, Base)
+        self.assertEqual(foo._fields["counter"].owner_document, Base)
+        self.assertEqual(bar._fields["counter"].owner_document, Base)
 
     def test_no_inherited_sequencefield(self):
         class Base(Document):
             name = StringField()
-            meta = {'abstract': True}
+            meta = {"abstract": True}
 
         class Foo(Base):
             counter = SequenceField()
@@ -256,16 +263,19 @@ class Foo(Base):
         class Bar(Base):
             counter = SequenceField()
 
-        bar = Bar(name='Bar')
+        bar = Bar(name="Bar")
         bar.save()
 
-        foo = Foo(name='Foo')
+        foo = Foo(name="Foo")
         foo.save()
 
-        self.assertFalse('base.counter' in
-                         self.db['mongoengine.counters'].find().distinct('_id'))
-        self.assertTrue(('foo.counter' and 'bar.counter') in
-                         self.db['mongoengine.counters'].find().distinct('_id'))
+        self.assertFalse(
+            "base.counter" in self.db["mongoengine.counters"].find().distinct("_id")
+        )
+        self.assertTrue(
+            ("foo.counter" and "bar.counter")
+            in self.db["mongoengine.counters"].find().distinct("_id")
+        )
         self.assertEqual(foo.counter, bar.counter)
-        self.assertEqual(foo._fields['counter'].owner_document, Foo)
-        self.assertEqual(bar._fields['counter'].owner_document, Bar)
+        self.assertEqual(foo._fields["counter"].owner_document, Foo)
+        self.assertEqual(bar._fields["counter"].owner_document, Bar)
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index ddbf707ea..81baf8d04 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -5,49 +5,53 @@
 
 
 class TestURLField(MongoDBTestCase):
-
     def test_validation(self):
         """Ensure that URLFields validate urls properly."""
+
         class Link(Document):
             url = URLField()
 
         link = Link()
-        link.url = 'google'
+        link.url = "google"
         self.assertRaises(ValidationError, link.validate)
 
-        link.url = 'http://www.google.com:8080/'
+        link.url = "http://www.google.com:8080/"
         link.validate()
 
     def test_unicode_url_validation(self):
         """Ensure unicode URLs are validated properly."""
+
         class Link(Document):
             url = URLField()
 
         link = Link()
-        link.url = u'http://xn--b1agh1afp.com/'
+        link.url = u"http://xn--b1agh1afp.com/"
 
         # TODO fix URL validation - this *IS* a valid URL
         # For now we just want to make sure that the error message is correct
         with self.assertRaises(ValidationError) as ctx_err:
             link.validate()
-        self.assertEqual(unicode(ctx_err.exception),
-                         u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])")
+        self.assertEqual(
+            unicode(ctx_err.exception),
+            u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])",
+        )
 
     def test_url_scheme_validation(self):
         """Ensure that URLFields validate urls with specific schemes properly.
         """
+
         class Link(Document):
             url = URLField()
 
         class SchemeLink(Document):
-            url = URLField(schemes=['ws', 'irc'])
+            url = URLField(schemes=["ws", "irc"])
 
         link = Link()
-        link.url = 'ws://google.com'
+        link.url = "ws://google.com"
         self.assertRaises(ValidationError, link.validate)
 
         scheme_link = SchemeLink()
-        scheme_link.url = 'ws://google.com'
+        scheme_link.url = "ws://google.com"
         scheme_link.validate()
 
     def test_underscore_allowed_in_domains_names(self):
@@ -55,5 +59,5 @@ class Link(Document):
             url = URLField()
 
         link = Link()
-        link.url = 'https://san_leandro-ca.geebo.com/'
+        link.url = "https://san_leandro-ca.geebo.com/"
         link.validate()
diff --git a/tests/fields/test_uuid_field.py b/tests/fields/test_uuid_field.py
index 7b7faaf2e..647dceafa 100644
--- a/tests/fields/test_uuid_field.py
+++ b/tests/fields/test_uuid_field.py
@@ -15,11 +15,8 @@ def test_storage(self):
         uid = uuid.uuid4()
         person = Person(api_key=uid).save()
         self.assertEqual(
-            get_as_pymongo(person),
-            {'_id': person.id,
-             'api_key': str(uid)
-             }
-            )
+            get_as_pymongo(person), {"_id": person.id, "api_key": str(uid)}
+        )
 
     def test_field_string(self):
         """Test UUID fields storing as String
@@ -37,8 +34,10 @@ def test_field_string(self):
             person.api_key = api_key
             person.validate()
 
-        invalid = ('9d159858-549b-4975-9f98-dd2f987c113g',
-                   '9d159858-549b-4975-9f98-dd2f987c113')
+        invalid = (
+            "9d159858-549b-4975-9f98-dd2f987c113g",
+            "9d159858-549b-4975-9f98-dd2f987c113",
+        )
         for api_key in invalid:
             person.api_key = api_key
             self.assertRaises(ValidationError, person.validate)
@@ -58,8 +57,10 @@ def test_field_binary(self):
             person.api_key = api_key
             person.validate()
 
-        invalid = ('9d159858-549b-4975-9f98-dd2f987c113g',
-                   '9d159858-549b-4975-9f98-dd2f987c113')
+        invalid = (
+            "9d159858-549b-4975-9f98-dd2f987c113g",
+            "9d159858-549b-4975-9f98-dd2f987c113",
+        )
         for api_key in invalid:
             person.api_key = api_key
             self.assertRaises(ValidationError, person.validate)
diff --git a/tests/fixtures.py b/tests/fixtures.py
index b8303b997..9f06f1abf 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -11,7 +11,7 @@ class PickleEmbedded(EmbeddedDocument):
 
 class PickleTest(Document):
     number = IntField()
-    string = StringField(choices=(('One', '1'), ('Two', '2')))
+    string = StringField(choices=(("One", "1"), ("Two", "2")))
     embedded = EmbeddedDocumentField(PickleEmbedded)
     lists = ListField(StringField())
     photo = FileField()
@@ -19,7 +19,7 @@ class PickleTest(Document):
 
 class NewDocumentPickleTest(Document):
     number = IntField()
-    string = StringField(choices=(('One', '1'), ('Two', '2')))
+    string = StringField(choices=(("One", "1"), ("Two", "2")))
     embedded = EmbeddedDocumentField(PickleEmbedded)
     lists = ListField(StringField())
     photo = FileField()
@@ -36,7 +36,7 @@ class PickleDynamicTest(DynamicDocument):
 
 class PickleSignalsTest(Document):
     number = IntField()
-    string = StringField(choices=(('One', '1'), ('Two', '2')))
+    string = StringField(choices=(("One", "1"), ("Two", "2")))
     embedded = EmbeddedDocumentField(PickleEmbedded)
     lists = ListField(StringField())
 
@@ -58,4 +58,4 @@ class Mixin(object):
 
 
 class Base(Document):
-    meta = {'allow_inheritance': True}
+    meta = {"allow_inheritance": True}
diff --git a/tests/queryset/field_list.py b/tests/queryset/field_list.py
index 250e2601c..9f0fe8277 100644
--- a/tests/queryset/field_list.py
+++ b/tests/queryset/field_list.py
@@ -7,79 +7,78 @@
 
 
 class QueryFieldListTest(unittest.TestCase):
-
     def test_empty(self):
         q = QueryFieldList()
         self.assertFalse(q)
 
-        q = QueryFieldList(always_include=['_cls'])
+        q = QueryFieldList(always_include=["_cls"])
         self.assertFalse(q)
 
     def test_include_include(self):
         q = QueryFieldList()
-        q += QueryFieldList(fields=['a', 'b'], value=QueryFieldList.ONLY, _only_called=True)
-        self.assertEqual(q.as_dict(), {'a': 1, 'b': 1})
-        q += QueryFieldList(fields=['b', 'c'], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {'a': 1, 'b': 1, 'c': 1})
+        q += QueryFieldList(
+            fields=["a", "b"], value=QueryFieldList.ONLY, _only_called=True
+        )
+        self.assertEqual(q.as_dict(), {"a": 1, "b": 1})
+        q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
+        self.assertEqual(q.as_dict(), {"a": 1, "b": 1, "c": 1})
 
     def test_include_exclude(self):
         q = QueryFieldList()
-        q += QueryFieldList(fields=['a', 'b'], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {'a': 1, 'b': 1})
-        q += QueryFieldList(fields=['b', 'c'], value=QueryFieldList.EXCLUDE)
-        self.assertEqual(q.as_dict(), {'a': 1})
+        q += QueryFieldList(fields=["a", "b"], value=QueryFieldList.ONLY)
+        self.assertEqual(q.as_dict(), {"a": 1, "b": 1})
+        q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.EXCLUDE)
+        self.assertEqual(q.as_dict(), {"a": 1})
 
     def test_exclude_exclude(self):
         q = QueryFieldList()
-        q += QueryFieldList(fields=['a', 'b'], value=QueryFieldList.EXCLUDE)
-        self.assertEqual(q.as_dict(), {'a': 0, 'b': 0})
-        q += QueryFieldList(fields=['b', 'c'], value=QueryFieldList.EXCLUDE)
-        self.assertEqual(q.as_dict(), {'a': 0, 'b': 0, 'c': 0})
+        q += QueryFieldList(fields=["a", "b"], value=QueryFieldList.EXCLUDE)
+        self.assertEqual(q.as_dict(), {"a": 0, "b": 0})
+        q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.EXCLUDE)
+        self.assertEqual(q.as_dict(), {"a": 0, "b": 0, "c": 0})
 
     def test_exclude_include(self):
         q = QueryFieldList()
-        q += QueryFieldList(fields=['a', 'b'], value=QueryFieldList.EXCLUDE)
-        self.assertEqual(q.as_dict(), {'a': 0, 'b': 0})
-        q += QueryFieldList(fields=['b', 'c'], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {'c': 1})
+        q += QueryFieldList(fields=["a", "b"], value=QueryFieldList.EXCLUDE)
+        self.assertEqual(q.as_dict(), {"a": 0, "b": 0})
+        q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
+        self.assertEqual(q.as_dict(), {"c": 1})
 
     def test_always_include(self):
-        q = QueryFieldList(always_include=['x', 'y'])
-        q += QueryFieldList(fields=['a', 'b', 'x'], value=QueryFieldList.EXCLUDE)
-        q += QueryFieldList(fields=['b', 'c'], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {'x': 1, 'y': 1, 'c': 1})
+        q = QueryFieldList(always_include=["x", "y"])
+        q += QueryFieldList(fields=["a", "b", "x"], value=QueryFieldList.EXCLUDE)
+        q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
+        self.assertEqual(q.as_dict(), {"x": 1, "y": 1, "c": 1})
 
     def test_reset(self):
-        q = QueryFieldList(always_include=['x', 'y'])
-        q += QueryFieldList(fields=['a', 'b', 'x'], value=QueryFieldList.EXCLUDE)
-        q += QueryFieldList(fields=['b', 'c'], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {'x': 1, 'y': 1, 'c': 1})
+        q = QueryFieldList(always_include=["x", "y"])
+        q += QueryFieldList(fields=["a", "b", "x"], value=QueryFieldList.EXCLUDE)
+        q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
+        self.assertEqual(q.as_dict(), {"x": 1, "y": 1, "c": 1})
         q.reset()
         self.assertFalse(q)
-        q += QueryFieldList(fields=['b', 'c'], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {'x': 1, 'y': 1, 'b': 1, 'c': 1})
+        q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
+        self.assertEqual(q.as_dict(), {"x": 1, "y": 1, "b": 1, "c": 1})
 
     def test_using_a_slice(self):
         q = QueryFieldList()
-        q += QueryFieldList(fields=['a'], value={"$slice": 5})
-        self.assertEqual(q.as_dict(), {'a': {"$slice": 5}})
+        q += QueryFieldList(fields=["a"], value={"$slice": 5})
+        self.assertEqual(q.as_dict(), {"a": {"$slice": 5}})
 
 
 class OnlyExcludeAllTest(unittest.TestCase):
-
     def setUp(self):
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
 
         class Person(Document):
             name = StringField()
             age = IntField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         Person.drop_collection()
         self.Person = Person
 
     def test_mixing_only_exclude(self):
-
         class MyDoc(Document):
             a = StringField()
             b = StringField()
@@ -88,32 +87,32 @@ class MyDoc(Document):
             e = StringField()
             f = StringField()
 
-        include = ['a', 'b', 'c', 'd', 'e']
-        exclude = ['d', 'e']
-        only = ['b', 'c']
+        include = ["a", "b", "c", "d", "e"]
+        exclude = ["d", "e"]
+        only = ["b", "c"]
 
         qs = MyDoc.objects.fields(**{i: 1 for i in include})
-        self.assertEqual(qs._loaded_fields.as_dict(),
-                         {'a': 1, 'b': 1, 'c': 1, 'd': 1, 'e': 1})
+        self.assertEqual(
+            qs._loaded_fields.as_dict(), {"a": 1, "b": 1, "c": 1, "d": 1, "e": 1}
+        )
         qs = qs.only(*only)
-        self.assertEqual(qs._loaded_fields.as_dict(), {'b': 1, 'c': 1})
+        self.assertEqual(qs._loaded_fields.as_dict(), {"b": 1, "c": 1})
         qs = qs.exclude(*exclude)
-        self.assertEqual(qs._loaded_fields.as_dict(), {'b': 1, 'c': 1})
+        self.assertEqual(qs._loaded_fields.as_dict(), {"b": 1, "c": 1})
 
         qs = MyDoc.objects.fields(**{i: 1 for i in include})
         qs = qs.exclude(*exclude)
-        self.assertEqual(qs._loaded_fields.as_dict(), {'a': 1, 'b': 1, 'c': 1})
+        self.assertEqual(qs._loaded_fields.as_dict(), {"a": 1, "b": 1, "c": 1})
         qs = qs.only(*only)
-        self.assertEqual(qs._loaded_fields.as_dict(), {'b': 1, 'c': 1})
+        self.assertEqual(qs._loaded_fields.as_dict(), {"b": 1, "c": 1})
 
         qs = MyDoc.objects.exclude(*exclude)
         qs = qs.fields(**{i: 1 for i in include})
-        self.assertEqual(qs._loaded_fields.as_dict(), {'a': 1, 'b': 1, 'c': 1})
+        self.assertEqual(qs._loaded_fields.as_dict(), {"a": 1, "b": 1, "c": 1})
         qs = qs.only(*only)
-        self.assertEqual(qs._loaded_fields.as_dict(), {'b': 1, 'c': 1})
+        self.assertEqual(qs._loaded_fields.as_dict(), {"b": 1, "c": 1})
 
     def test_slicing(self):
-
         class MyDoc(Document):
             a = ListField()
             b = ListField()
@@ -122,24 +121,23 @@ class MyDoc(Document):
             e = ListField()
             f = ListField()
 
-        include = ['a', 'b', 'c', 'd', 'e']
-        exclude = ['d', 'e']
-        only = ['b', 'c']
+        include = ["a", "b", "c", "d", "e"]
+        exclude = ["d", "e"]
+        only = ["b", "c"]
 
         qs = MyDoc.objects.fields(**{i: 1 for i in include})
         qs = qs.exclude(*exclude)
         qs = qs.only(*only)
         qs = qs.fields(slice__b=5)
-        self.assertEqual(qs._loaded_fields.as_dict(),
-                         {'b': {'$slice': 5}, 'c': 1})
+        self.assertEqual(qs._loaded_fields.as_dict(), {"b": {"$slice": 5}, "c": 1})
 
         qs = qs.fields(slice__c=[5, 1])
-        self.assertEqual(qs._loaded_fields.as_dict(),
-                         {'b': {'$slice': 5}, 'c': {'$slice': [5, 1]}})
+        self.assertEqual(
+            qs._loaded_fields.as_dict(), {"b": {"$slice": 5}, "c": {"$slice": [5, 1]}}
+        )
 
-        qs = qs.exclude('c')
-        self.assertEqual(qs._loaded_fields.as_dict(),
-                         {'b': {'$slice': 5}})
+        qs = qs.exclude("c")
+        self.assertEqual(qs._loaded_fields.as_dict(), {"b": {"$slice": 5}})
 
     def test_mix_slice_with_other_fields(self):
         class MyDoc(Document):
@@ -148,43 +146,42 @@ class MyDoc(Document):
             c = ListField()
 
         qs = MyDoc.objects.fields(a=1, b=0, slice__c=2)
-        self.assertEqual(qs._loaded_fields.as_dict(),
-                         {'c': {'$slice': 2}, 'a': 1})
+        self.assertEqual(qs._loaded_fields.as_dict(), {"c": {"$slice": 2}, "a": 1})
 
     def test_only(self):
         """Ensure that QuerySet.only only returns the requested fields.
         """
-        person = self.Person(name='test', age=25)
+        person = self.Person(name="test", age=25)
         person.save()
 
-        obj = self.Person.objects.only('name').get()
+        obj = self.Person.objects.only("name").get()
         self.assertEqual(obj.name, person.name)
         self.assertEqual(obj.age, None)
 
-        obj = self.Person.objects.only('age').get()
+        obj = self.Person.objects.only("age").get()
         self.assertEqual(obj.name, None)
         self.assertEqual(obj.age, person.age)
 
-        obj = self.Person.objects.only('name', 'age').get()
+        obj = self.Person.objects.only("name", "age").get()
         self.assertEqual(obj.name, person.name)
         self.assertEqual(obj.age, person.age)
 
-        obj = self.Person.objects.only(*('id', 'name',)).get()
+        obj = self.Person.objects.only(*("id", "name")).get()
         self.assertEqual(obj.name, person.name)
         self.assertEqual(obj.age, None)
 
         # Check polymorphism still works
         class Employee(self.Person):
-            salary = IntField(db_field='wage')
+            salary = IntField(db_field="wage")
 
-        employee = Employee(name='test employee', age=40, salary=30000)
+        employee = Employee(name="test employee", age=40, salary=30000)
         employee.save()
 
-        obj = self.Person.objects(id=employee.id).only('age').get()
+        obj = self.Person.objects(id=employee.id).only("age").get()
         self.assertIsInstance(obj, Employee)
 
         # Check field names are looked up properly
-        obj = Employee.objects(id=employee.id).only('salary').get()
+        obj = Employee.objects(id=employee.id).only("salary").get()
         self.assertEqual(obj.salary, employee.salary)
         self.assertEqual(obj.name, None)
 
@@ -208,35 +205,41 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post = BlogPost(content='Had a good coffee today...', various={'test_dynamic': {'some': True}})
-        post.author = User(name='Test User')
-        post.comments = [Comment(title='I aggree', text='Great post!'), Comment(title='Coffee', text='I hate coffee')]
+        post = BlogPost(
+            content="Had a good coffee today...",
+            various={"test_dynamic": {"some": True}},
+        )
+        post.author = User(name="Test User")
+        post.comments = [
+            Comment(title="I aggree", text="Great post!"),
+            Comment(title="Coffee", text="I hate coffee"),
+        ]
         post.save()
 
-        obj = BlogPost.objects.only('author.name',).get()
+        obj = BlogPost.objects.only("author.name").get()
         self.assertEqual(obj.content, None)
         self.assertEqual(obj.author.email, None)
-        self.assertEqual(obj.author.name, 'Test User')
+        self.assertEqual(obj.author.name, "Test User")
         self.assertEqual(obj.comments, [])
 
-        obj = BlogPost.objects.only('various.test_dynamic.some').get()
+        obj = BlogPost.objects.only("various.test_dynamic.some").get()
         self.assertEqual(obj.various["test_dynamic"].some, True)
 
-        obj = BlogPost.objects.only('content', 'comments.title',).get()
-        self.assertEqual(obj.content, 'Had a good coffee today...')
+        obj = BlogPost.objects.only("content", "comments.title").get()
+        self.assertEqual(obj.content, "Had a good coffee today...")
         self.assertEqual(obj.author, None)
-        self.assertEqual(obj.comments[0].title, 'I aggree')
-        self.assertEqual(obj.comments[1].title, 'Coffee')
+        self.assertEqual(obj.comments[0].title, "I aggree")
+        self.assertEqual(obj.comments[1].title, "Coffee")
         self.assertEqual(obj.comments[0].text, None)
         self.assertEqual(obj.comments[1].text, None)
 
-        obj = BlogPost.objects.only('comments',).get()
+        obj = BlogPost.objects.only("comments").get()
         self.assertEqual(obj.content, None)
         self.assertEqual(obj.author, None)
-        self.assertEqual(obj.comments[0].title, 'I aggree')
-        self.assertEqual(obj.comments[1].title, 'Coffee')
-        self.assertEqual(obj.comments[0].text, 'Great post!')
-        self.assertEqual(obj.comments[1].text, 'I hate coffee')
+        self.assertEqual(obj.comments[0].title, "I aggree")
+        self.assertEqual(obj.comments[1].title, "Coffee")
+        self.assertEqual(obj.comments[0].text, "Great post!")
+        self.assertEqual(obj.comments[1].text, "I hate coffee")
 
         BlogPost.drop_collection()
 
@@ -256,15 +259,18 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post = BlogPost(content='Had a good coffee today...')
-        post.author = User(name='Test User')
-        post.comments = [Comment(title='I aggree', text='Great post!'), Comment(title='Coffee', text='I hate coffee')]
+        post = BlogPost(content="Had a good coffee today...")
+        post.author = User(name="Test User")
+        post.comments = [
+            Comment(title="I aggree", text="Great post!"),
+            Comment(title="Coffee", text="I hate coffee"),
+        ]
         post.save()
 
-        obj = BlogPost.objects.exclude('author', 'comments.text').get()
+        obj = BlogPost.objects.exclude("author", "comments.text").get()
         self.assertEqual(obj.author, None)
-        self.assertEqual(obj.content, 'Had a good coffee today...')
-        self.assertEqual(obj.comments[0].title, 'I aggree')
+        self.assertEqual(obj.content, "Had a good coffee today...")
+        self.assertEqual(obj.comments[0].title, "I aggree")
         self.assertEqual(obj.comments[0].text, None)
 
         BlogPost.drop_collection()
@@ -283,32 +289,43 @@ class Email(Document):
             attachments = ListField(EmbeddedDocumentField(Attachment))
 
         Email.drop_collection()
-        email = Email(sender='me', to='you', subject='From Russia with Love', body='Hello!', content_type='text/plain')
+        email = Email(
+            sender="me",
+            to="you",
+            subject="From Russia with Love",
+            body="Hello!",
+            content_type="text/plain",
+        )
         email.attachments = [
-            Attachment(name='file1.doc', content='ABC'),
-            Attachment(name='file2.doc', content='XYZ'),
+            Attachment(name="file1.doc", content="ABC"),
+            Attachment(name="file2.doc", content="XYZ"),
         ]
         email.save()
 
-        obj = Email.objects.exclude('content_type').exclude('body').get()
-        self.assertEqual(obj.sender, 'me')
-        self.assertEqual(obj.to, 'you')
-        self.assertEqual(obj.subject, 'From Russia with Love')
+        obj = Email.objects.exclude("content_type").exclude("body").get()
+        self.assertEqual(obj.sender, "me")
+        self.assertEqual(obj.to, "you")
+        self.assertEqual(obj.subject, "From Russia with Love")
         self.assertEqual(obj.body, None)
         self.assertEqual(obj.content_type, None)
 
-        obj = Email.objects.only('sender', 'to').exclude('body', 'sender').get()
+        obj = Email.objects.only("sender", "to").exclude("body", "sender").get()
         self.assertEqual(obj.sender, None)
-        self.assertEqual(obj.to, 'you')
+        self.assertEqual(obj.to, "you")
         self.assertEqual(obj.subject, None)
         self.assertEqual(obj.body, None)
         self.assertEqual(obj.content_type, None)
 
-        obj = Email.objects.exclude('attachments.content').exclude('body').only('to', 'attachments.name').get()
-        self.assertEqual(obj.attachments[0].name, 'file1.doc')
+        obj = (
+            Email.objects.exclude("attachments.content")
+            .exclude("body")
+            .only("to", "attachments.name")
+            .get()
+        )
+        self.assertEqual(obj.attachments[0].name, "file1.doc")
         self.assertEqual(obj.attachments[0].content, None)
         self.assertEqual(obj.sender, None)
-        self.assertEqual(obj.to, 'you')
+        self.assertEqual(obj.to, "you")
         self.assertEqual(obj.subject, None)
         self.assertEqual(obj.body, None)
         self.assertEqual(obj.content_type, None)
@@ -316,7 +333,6 @@ class Email(Document):
         Email.drop_collection()
 
     def test_all_fields(self):
-
         class Email(Document):
             sender = StringField()
             to = StringField()
@@ -326,21 +342,33 @@ class Email(Document):
 
         Email.drop_collection()
 
-        email = Email(sender='me', to='you', subject='From Russia with Love', body='Hello!', content_type='text/plain')
+        email = Email(
+            sender="me",
+            to="you",
+            subject="From Russia with Love",
+            body="Hello!",
+            content_type="text/plain",
+        )
         email.save()
 
-        obj = Email.objects.exclude('content_type', 'body').only('to', 'body').all_fields().get()
-        self.assertEqual(obj.sender, 'me')
-        self.assertEqual(obj.to, 'you')
-        self.assertEqual(obj.subject, 'From Russia with Love')
-        self.assertEqual(obj.body, 'Hello!')
-        self.assertEqual(obj.content_type, 'text/plain')
+        obj = (
+            Email.objects.exclude("content_type", "body")
+            .only("to", "body")
+            .all_fields()
+            .get()
+        )
+        self.assertEqual(obj.sender, "me")
+        self.assertEqual(obj.to, "you")
+        self.assertEqual(obj.subject, "From Russia with Love")
+        self.assertEqual(obj.body, "Hello!")
+        self.assertEqual(obj.content_type, "text/plain")
 
         Email.drop_collection()
 
     def test_slicing_fields(self):
         """Ensure that query slicing an array works.
         """
+
         class Numbers(Document):
             n = ListField(IntField())
 
@@ -414,11 +442,10 @@ class Numbers(Document):
         self.assertEqual(numbers.embedded.n, [-5, -4, -3, -2, -1])
 
     def test_exclude_from_subclasses_docs(self):
-
         class Base(Document):
             username = StringField()
 
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class Anon(Base):
             anon = BooleanField()
@@ -436,5 +463,5 @@ class User(Base):
         self.assertRaises(LookUpError, Base.objects.exclude, "made_up")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/queryset/geo.py b/tests/queryset/geo.py
index 45e6a089c..95dc913da 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/geo.py
@@ -10,9 +10,9 @@
 
 
 class GeoQueriesTest(MongoDBTestCase):
-
     def _create_event_data(self, point_field_class=GeoPointField):
         """Create some sample data re-used in many of the tests below."""
+
         class Event(Document):
             title = StringField()
             date = DateTimeField()
@@ -28,15 +28,18 @@ def __unicode__(self):
         event1 = Event.objects.create(
             title="Coltrane Motion @ Double Door",
             date=datetime.datetime.now() - datetime.timedelta(days=1),
-            location=[-87.677137, 41.909889])
+            location=[-87.677137, 41.909889],
+        )
         event2 = Event.objects.create(
             title="Coltrane Motion @ Bottom of the Hill",
             date=datetime.datetime.now() - datetime.timedelta(days=10),
-            location=[-122.4194155, 37.7749295])
+            location=[-122.4194155, 37.7749295],
+        )
         event3 = Event.objects.create(
             title="Coltrane Motion @ Empty Bottle",
             date=datetime.datetime.now(),
-            location=[-87.686638, 41.900474])
+            location=[-87.686638, 41.900474],
+        )
 
         return event1, event2, event3
 
@@ -65,8 +68,7 @@ def test_near_and_max_distance(self):
 
         # find events within 10 degrees of san francisco
         point = [-122.415579, 37.7566023]
-        events = self.Event.objects(location__near=point,
-                                    location__max_distance=10)
+        events = self.Event.objects(location__near=point, location__max_distance=10)
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0], event2)
 
@@ -78,8 +80,7 @@ def test_near_and_min_distance(self):
 
         # find events at least 10 degrees away of san francisco
         point = [-122.415579, 37.7566023]
-        events = self.Event.objects(location__near=point,
-                                    location__min_distance=10)
+        events = self.Event.objects(location__near=point, location__min_distance=10)
         self.assertEqual(events.count(), 2)
 
     def test_within_distance(self):
@@ -88,8 +89,7 @@ def test_within_distance(self):
 
         # find events within 5 degrees of pitchfork office, chicago
         point_and_distance = [[-87.67892, 41.9120459], 5]
-        events = self.Event.objects(
-            location__within_distance=point_and_distance)
+        events = self.Event.objects(location__within_distance=point_and_distance)
         self.assertEqual(events.count(), 2)
         events = list(events)
         self.assertNotIn(event2, events)
@@ -98,21 +98,18 @@ def test_within_distance(self):
 
         # find events within 10 degrees of san francisco
         point_and_distance = [[-122.415579, 37.7566023], 10]
-        events = self.Event.objects(
-            location__within_distance=point_and_distance)
+        events = self.Event.objects(location__within_distance=point_and_distance)
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0], event2)
 
         # find events within 1 degree of greenpoint, broolyn, nyc, ny
         point_and_distance = [[-73.9509714, 40.7237134], 1]
-        events = self.Event.objects(
-            location__within_distance=point_and_distance)
+        events = self.Event.objects(location__within_distance=point_and_distance)
         self.assertEqual(events.count(), 0)
 
         # ensure ordering is respected by "within_distance"
         point_and_distance = [[-87.67892, 41.9120459], 10]
-        events = self.Event.objects(
-            location__within_distance=point_and_distance)
+        events = self.Event.objects(location__within_distance=point_and_distance)
         events = events.order_by("-date")
         self.assertEqual(events.count(), 2)
         self.assertEqual(events[0], event3)
@@ -145,7 +142,7 @@ def test_within_polygon(self):
         polygon2 = [
             (-1.742249, 54.033586),
             (-1.225891, 52.792797),
-            (-4.40094, 53.389881)
+            (-4.40094, 53.389881),
         ]
         events = self.Event.objects(location__within_polygon=polygon2)
         self.assertEqual(events.count(), 0)
@@ -154,9 +151,7 @@ def test_2dsphere_near(self):
         """Make sure the "near" operator works with a PointField, which
         corresponds to a 2dsphere index.
         """
-        event1, event2, event3 = self._create_event_data(
-            point_field_class=PointField
-        )
+        event1, event2, event3 = self._create_event_data(point_field_class=PointField)
 
         # find all events "near" pitchfork office, chicago.
         # note that "near" will show the san francisco event, too,
@@ -175,26 +170,23 @@ def test_2dsphere_near_and_max_distance(self):
         """Ensure the "max_distance" operator works alongside the "near"
         operator with a 2dsphere index.
         """
-        event1, event2, event3 = self._create_event_data(
-            point_field_class=PointField
-        )
+        event1, event2, event3 = self._create_event_data(point_field_class=PointField)
 
         # find events within 10km of san francisco
         point = [-122.415579, 37.7566023]
-        events = self.Event.objects(location__near=point,
-                                    location__max_distance=10000)
+        events = self.Event.objects(location__near=point, location__max_distance=10000)
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0], event2)
 
         # find events within 1km of greenpoint, broolyn, nyc, ny
-        events = self.Event.objects(location__near=[-73.9509714, 40.7237134],
-                                    location__max_distance=1000)
+        events = self.Event.objects(
+            location__near=[-73.9509714, 40.7237134], location__max_distance=1000
+        )
         self.assertEqual(events.count(), 0)
 
         # ensure ordering is respected by "near"
         events = self.Event.objects(
-            location__near=[-87.67892, 41.9120459],
-            location__max_distance=10000
+            location__near=[-87.67892, 41.9120459], location__max_distance=10000
         ).order_by("-date")
         self.assertEqual(events.count(), 2)
         self.assertEqual(events[0], event3)
@@ -203,9 +195,7 @@ def test_2dsphere_geo_within_box(self):
         """Ensure the "geo_within_box" operator works with a 2dsphere
         index.
         """
-        event1, event2, event3 = self._create_event_data(
-            point_field_class=PointField
-        )
+        event1, event2, event3 = self._create_event_data(point_field_class=PointField)
 
         # check that within_box works
         box = [(-125.0, 35.0), (-100.0, 40.0)]
@@ -217,9 +207,7 @@ def test_2dsphere_geo_within_polygon(self):
         """Ensure the "geo_within_polygon" operator works with a
         2dsphere index.
         """
-        event1, event2, event3 = self._create_event_data(
-            point_field_class=PointField
-        )
+        event1, event2, event3 = self._create_event_data(point_field_class=PointField)
 
         polygon = [
             (-87.694445, 41.912114),
@@ -235,7 +223,7 @@ def test_2dsphere_geo_within_polygon(self):
         polygon2 = [
             (-1.742249, 54.033586),
             (-1.225891, 52.792797),
-            (-4.40094, 53.389881)
+            (-4.40094, 53.389881),
         ]
         events = self.Event.objects(location__geo_within_polygon=polygon2)
         self.assertEqual(events.count(), 0)
@@ -244,23 +232,20 @@ def test_2dsphere_near_and_min_max_distance(self):
         """Ensure "min_distace" and "max_distance" operators work well
         together with the "near" operator in a 2dsphere index.
         """
-        event1, event2, event3 = self._create_event_data(
-            point_field_class=PointField
-        )
+        event1, event2, event3 = self._create_event_data(point_field_class=PointField)
 
         # ensure min_distance and max_distance combine well
         events = self.Event.objects(
             location__near=[-87.67892, 41.9120459],
             location__min_distance=1000,
-            location__max_distance=10000
+            location__max_distance=10000,
         ).order_by("-date")
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0], event3)
 
         # ensure ordering is respected by "near" with "min_distance"
         events = self.Event.objects(
-            location__near=[-87.67892, 41.9120459],
-            location__min_distance=10000
+            location__near=[-87.67892, 41.9120459], location__min_distance=10000
         ).order_by("-date")
         self.assertEqual(events.count(), 1)
         self.assertEqual(events[0], event2)
@@ -269,14 +254,11 @@ def test_2dsphere_geo_within_center(self):
         """Make sure the "geo_within_center" operator works with a
         2dsphere index.
         """
-        event1, event2, event3 = self._create_event_data(
-            point_field_class=PointField
-        )
+        event1, event2, event3 = self._create_event_data(point_field_class=PointField)
 
         # find events within 5 degrees of pitchfork office, chicago
         point_and_distance = [[-87.67892, 41.9120459], 2]
-        events = self.Event.objects(
-            location__geo_within_center=point_and_distance)
+        events = self.Event.objects(location__geo_within_center=point_and_distance)
         self.assertEqual(events.count(), 2)
         events = list(events)
         self.assertNotIn(event2, events)
@@ -287,6 +269,7 @@ def _test_embedded(self, point_field_class):
         """Helper test method ensuring given point field class works
         well in an embedded document.
         """
+
         class Venue(EmbeddedDocument):
             location = point_field_class()
             name = StringField()
@@ -300,12 +283,11 @@ class Event(Document):
         venue1 = Venue(name="The Rock", location=[-87.677137, 41.909889])
         venue2 = Venue(name="The Bridge", location=[-122.4194155, 37.7749295])
 
-        event1 = Event(title="Coltrane Motion @ Double Door",
-                       venue=venue1).save()
-        event2 = Event(title="Coltrane Motion @ Bottom of the Hill",
-                       venue=venue2).save()
-        event3 = Event(title="Coltrane Motion @ Empty Bottle",
-                       venue=venue1).save()
+        event1 = Event(title="Coltrane Motion @ Double Door", venue=venue1).save()
+        event2 = Event(
+            title="Coltrane Motion @ Bottom of the Hill", venue=venue2
+        ).save()
+        event3 = Event(title="Coltrane Motion @ Empty Bottle", venue=venue1).save()
 
         # find all events "near" pitchfork office, chicago.
         # note that "near" will show the san francisco event, too,
@@ -324,6 +306,7 @@ def test_2dsphere_point_embedded(self):
 
     def test_spherical_geospatial_operators(self):
         """Ensure that spherical geospatial queries are working."""
+
         class Point(Document):
             location = GeoPointField()
 
@@ -343,26 +326,26 @@ class Point(Document):
 
         # Same behavior for _within_spherical_distance
         points = Point.objects(
-            location__within_spherical_distance=[
-                [-122, 37.5],
-                60 / earth_radius
-            ]
+            location__within_spherical_distance=[[-122, 37.5], 60 / earth_radius]
         )
         self.assertEqual(points.count(), 2)
 
-        points = Point.objects(location__near_sphere=[-122, 37.5],
-                               location__max_distance=60 / earth_radius)
+        points = Point.objects(
+            location__near_sphere=[-122, 37.5], location__max_distance=60 / earth_radius
+        )
         self.assertEqual(points.count(), 2)
 
         # Test query works with max_distance, being farer from one point
-        points = Point.objects(location__near_sphere=[-122, 37.8],
-                               location__max_distance=60 / earth_radius)
+        points = Point.objects(
+            location__near_sphere=[-122, 37.8], location__max_distance=60 / earth_radius
+        )
         close_point = points.first()
         self.assertEqual(points.count(), 1)
 
         # Test query works with min_distance, being farer from one point
-        points = Point.objects(location__near_sphere=[-122, 37.8],
-                               location__min_distance=60 / earth_radius)
+        points = Point.objects(
+            location__near_sphere=[-122, 37.8], location__min_distance=60 / earth_radius
+        )
         self.assertEqual(points.count(), 1)
         far_point = points.first()
         self.assertNotEqual(close_point, far_point)
@@ -384,10 +367,7 @@ class Point(Document):
         # Finds only one point because only the first point is within 60km of
         # the reference point to the south.
         points = Point.objects(
-            location__within_spherical_distance=[
-                [-122, 36.5],
-                60 / earth_radius
-            ]
+            location__within_spherical_distance=[[-122, 36.5], 60 / earth_radius]
         )
         self.assertEqual(points.count(), 1)
         self.assertEqual(points[0].id, south_point.id)
@@ -413,8 +393,10 @@ class Road(Document):
         self.assertEqual(1, roads)
 
         # Within
-        polygon = {"type": "Polygon",
-                   "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]]}
+        polygon = {
+            "type": "Polygon",
+            "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
+        }
         roads = Road.objects.filter(line__geo_within=polygon["coordinates"]).count()
         self.assertEqual(1, roads)
 
@@ -425,8 +407,7 @@ class Road(Document):
         self.assertEqual(1, roads)
 
         # Intersects
-        line = {"type": "LineString",
-                "coordinates": [[40, 5], [40, 6]]}
+        line = {"type": "LineString", "coordinates": [[40, 5], [40, 6]]}
         roads = Road.objects.filter(line__geo_intersects=line["coordinates"]).count()
         self.assertEqual(1, roads)
 
@@ -436,8 +417,10 @@ class Road(Document):
         roads = Road.objects.filter(line__geo_intersects={"$geometry": line}).count()
         self.assertEqual(1, roads)
 
-        polygon = {"type": "Polygon",
-                   "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]]}
+        polygon = {
+            "type": "Polygon",
+            "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
+        }
         roads = Road.objects.filter(line__geo_intersects=polygon["coordinates"]).count()
         self.assertEqual(1, roads)
 
@@ -468,8 +451,10 @@ class Road(Document):
         self.assertEqual(1, roads)
 
         # Within
-        polygon = {"type": "Polygon",
-                   "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]]}
+        polygon = {
+            "type": "Polygon",
+            "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
+        }
         roads = Road.objects.filter(poly__geo_within=polygon["coordinates"]).count()
         self.assertEqual(1, roads)
 
@@ -480,8 +465,7 @@ class Road(Document):
         self.assertEqual(1, roads)
 
         # Intersects
-        line = {"type": "LineString",
-                "coordinates": [[40, 5], [41, 6]]}
+        line = {"type": "LineString", "coordinates": [[40, 5], [41, 6]]}
         roads = Road.objects.filter(poly__geo_intersects=line["coordinates"]).count()
         self.assertEqual(1, roads)
 
@@ -491,8 +475,10 @@ class Road(Document):
         roads = Road.objects.filter(poly__geo_intersects={"$geometry": line}).count()
         self.assertEqual(1, roads)
 
-        polygon = {"type": "Polygon",
-                   "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]]}
+        polygon = {
+            "type": "Polygon",
+            "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
+        }
         roads = Road.objects.filter(poly__geo_intersects=polygon["coordinates"]).count()
         self.assertEqual(1, roads)
 
@@ -504,20 +490,20 @@ class Road(Document):
 
     def test_aspymongo_with_only(self):
         """Ensure as_pymongo works with only"""
+
         class Place(Document):
             location = PointField()
 
         Place.drop_collection()
         p = Place(location=[24.946861267089844, 60.16311983618494])
         p.save()
-        qs = Place.objects().only('location')
+        qs = Place.objects().only("location")
         self.assertDictEqual(
-            qs.as_pymongo()[0]['location'],
-            {u'type': u'Point',
-             u'coordinates': [
-                24.946861267089844,
-                60.16311983618494]
-            }
+            qs.as_pymongo()[0]["location"],
+            {
+                u"type": u"Point",
+                u"coordinates": [24.946861267089844, 60.16311983618494],
+            },
         )
 
     def test_2dsphere_point_sets_correctly(self):
@@ -542,11 +528,15 @@ class Location(Document):
 
         Location(line=[[1, 2], [2, 2]]).save()
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(loc["line"], {"type": "LineString", "coordinates": [[1, 2], [2, 2]]})
+        self.assertEqual(
+            loc["line"], {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}
+        )
 
         Location.objects.update(set__line=[[2, 1], [1, 2]])
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(loc["line"], {"type": "LineString", "coordinates": [[2, 1], [1, 2]]})
+        self.assertEqual(
+            loc["line"], {"type": "LineString", "coordinates": [[2, 1], [1, 2]]}
+        )
 
     def test_geojson_PolygonField(self):
         class Location(Document):
@@ -556,12 +546,18 @@ class Location(Document):
 
         Location(poly=[[[40, 5], [40, 6], [41, 6], [40, 5]]]).save()
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(loc["poly"], {"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]})
+        self.assertEqual(
+            loc["poly"],
+            {"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]},
+        )
 
         Location.objects.update(set__poly=[[[40, 4], [40, 6], [41, 6], [40, 4]]])
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(loc["poly"], {"type": "Polygon", "coordinates": [[[40, 4], [40, 6], [41, 6], [40, 4]]]})
+        self.assertEqual(
+            loc["poly"],
+            {"type": "Polygon", "coordinates": [[[40, 4], [40, 6], [41, 6], [40, 4]]]},
+        )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/queryset/modify.py b/tests/queryset/modify.py
index 3c5879baf..e092d11cc 100644
--- a/tests/queryset/modify.py
+++ b/tests/queryset/modify.py
@@ -11,7 +11,6 @@ class Doc(Document):
 
 
 class FindAndModifyTest(unittest.TestCase):
-
     def setUp(self):
         connect(db="mongoenginetest")
         Doc.drop_collection()
@@ -82,9 +81,14 @@ def test_modify_with_order_by(self):
 
         old_doc = Doc.objects().order_by("-id").modify(set__value=-1)
         self.assertEqual(old_doc.to_json(), doc.to_json())
-        self.assertDbEqual([
-            {"_id": 0, "value": 3}, {"_id": 1, "value": 2},
-            {"_id": 2, "value": 1}, {"_id": 3, "value": -1}])
+        self.assertDbEqual(
+            [
+                {"_id": 0, "value": 3},
+                {"_id": 1, "value": 2},
+                {"_id": 2, "value": 1},
+                {"_id": 3, "value": -1},
+            ]
+        )
 
     def test_modify_with_fields(self):
         Doc(id=0, value=0).save()
@@ -103,27 +107,25 @@ class BlogPost(Document):
         blog = BlogPost.objects.create()
 
         # Push a new tag via modify with new=False (default).
-        BlogPost(id=blog.id).modify(push__tags='code')
+        BlogPost(id=blog.id).modify(push__tags="code")
         self.assertEqual(blog.tags, [])
         blog.reload()
-        self.assertEqual(blog.tags, ['code'])
+        self.assertEqual(blog.tags, ["code"])
 
         # Push a new tag via modify with new=True.
-        blog = BlogPost.objects(id=blog.id).modify(push__tags='java', new=True)
-        self.assertEqual(blog.tags, ['code', 'java'])
+        blog = BlogPost.objects(id=blog.id).modify(push__tags="java", new=True)
+        self.assertEqual(blog.tags, ["code", "java"])
 
         # Push a new tag with a positional argument.
-        blog = BlogPost.objects(id=blog.id).modify(
-            push__tags__0='python',
-            new=True)
-        self.assertEqual(blog.tags, ['python', 'code', 'java'])
+        blog = BlogPost.objects(id=blog.id).modify(push__tags__0="python", new=True)
+        self.assertEqual(blog.tags, ["python", "code", "java"])
 
         # Push multiple new tags with a positional argument.
         blog = BlogPost.objects(id=blog.id).modify(
-            push__tags__1=['go', 'rust'],
-            new=True)
-        self.assertEqual(blog.tags, ['python', 'go', 'rust', 'code', 'java'])
+            push__tags__1=["go", "rust"], new=True
+        )
+        self.assertEqual(blog.tags, ["python", "go", "rust", "code", "java"])
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/queryset/pickable.py b/tests/queryset/pickable.py
index bf7bb31c8..0945fcbcb 100644
--- a/tests/queryset/pickable.py
+++ b/tests/queryset/pickable.py
@@ -4,7 +4,7 @@
 from mongoengine import Document, StringField, IntField
 from mongoengine.connection import connect
 
-__author__ = 'stas'
+__author__ = "stas"
 
 
 class Person(Document):
@@ -17,6 +17,7 @@ class TestQuerysetPickable(unittest.TestCase):
     Test for adding pickling support for QuerySet instances
     See issue https://github.com/MongoEngine/mongoengine/issues/442
     """
+
     def setUp(self):
         super(TestQuerysetPickable, self).setUp()
 
@@ -24,10 +25,7 @@ def setUp(self):
 
         connection.drop_database("test")
 
-        self.john = Person.objects.create(
-            name="John",
-            age=21
-        )
+        self.john = Person.objects.create(name="John", age=21)
 
     def test_picke_simple_qs(self):
 
@@ -54,15 +52,9 @@ def test_unpickle(self):
         self.assertEqual(Person.objects.first().age, 23)
 
     def test_pickle_support_filtration(self):
-        Person.objects.create(
-            name="Alice",
-            age=22
-        )
+        Person.objects.create(name="Alice", age=22)
 
-        Person.objects.create(
-            name="Bob",
-            age=23
-        )
+        Person.objects.create(name="Bob", age=23)
 
         qs = Person.objects.filter(age__gte=22)
         self.assertEqual(qs.count(), 2)
@@ -71,9 +63,3 @@ def test_pickle_support_filtration(self):
 
         self.assertEqual(loaded.count(), 2)
         self.assertEqual(loaded.filter(name="Bob").first().age, 23)
-
-
-
-
-
-
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index c86e40953..21f350123 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -17,29 +17,34 @@
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
 from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
-from mongoengine.queryset import (DoesNotExist, MultipleObjectsReturned,
-                                  QuerySet, QuerySetManager, queryset_manager)
+from mongoengine.queryset import (
+    DoesNotExist,
+    MultipleObjectsReturned,
+    QuerySet,
+    QuerySetManager,
+    queryset_manager,
+)
 
 
 class db_ops_tracker(query_counter):
-
     def get_ops(self):
         ignore_query = dict(self._ignored_query)
-        ignore_query['command.count'] = {'$ne': 'system.profile'}   # Ignore the query issued by query_counter
+        ignore_query["command.count"] = {
+            "$ne": "system.profile"
+        }  # Ignore the query issued by query_counter
         return list(self.db.system.profile.find(ignore_query))
 
 
 def get_key_compat(mongo_ver):
-    ORDER_BY_KEY = 'sort'
-    CMD_QUERY_KEY = 'command' if mongo_ver >= MONGODB_36 else 'query'
+    ORDER_BY_KEY = "sort"
+    CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
     return ORDER_BY_KEY, CMD_QUERY_KEY
 
 
 class QuerySetTest(unittest.TestCase):
-
     def setUp(self):
-        connect(db='mongoenginetest')
-        connect(db='mongoenginetest2', alias='test2')
+        connect(db="mongoenginetest")
+        connect(db="mongoenginetest2", alias="test2")
 
         class PersonMeta(EmbeddedDocument):
             weight = IntField()
@@ -48,7 +53,7 @@ class Person(Document):
             name = StringField()
             age = IntField()
             person_meta = EmbeddedDocumentField(PersonMeta)
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         Person.drop_collection()
         self.PersonMeta = PersonMeta
@@ -60,12 +65,14 @@ def test_initialisation(self):
         """Ensure that a QuerySet is correctly initialised by QuerySetManager.
         """
         self.assertIsInstance(self.Person.objects, QuerySet)
-        self.assertEqual(self.Person.objects._collection.name,
-                         self.Person._get_collection_name())
-        self.assertIsInstance(self.Person.objects._collection, pymongo.collection.Collection)
+        self.assertEqual(
+            self.Person.objects._collection.name, self.Person._get_collection_name()
+        )
+        self.assertIsInstance(
+            self.Person.objects._collection, pymongo.collection.Collection
+        )
 
     def test_cannot_perform_joins_references(self):
-
         class BlogPost(Document):
             author = ReferenceField(self.Person)
             author2 = GenericReferenceField()
@@ -80,8 +87,8 @@ class BlogPost(Document):
 
     def test_find(self):
         """Ensure that a query returns a valid set of results."""
-        user_a = self.Person.objects.create(name='User A', age=20)
-        user_b = self.Person.objects.create(name='User B', age=30)
+        user_a = self.Person.objects.create(name="User A", age=20)
+        user_b = self.Person.objects.create(name="User B", age=30)
 
         # Find all people in the collection
         people = self.Person.objects
@@ -92,11 +99,11 @@ def test_find(self):
         self.assertIsInstance(results[0].id, ObjectId)
 
         self.assertEqual(results[0], user_a)
-        self.assertEqual(results[0].name, 'User A')
+        self.assertEqual(results[0].name, "User A")
         self.assertEqual(results[0].age, 20)
 
         self.assertEqual(results[1], user_b)
-        self.assertEqual(results[1].name, 'User B')
+        self.assertEqual(results[1].name, "User B")
         self.assertEqual(results[1].age, 30)
 
         # Filter people by age
@@ -109,8 +116,8 @@ def test_find(self):
 
     def test_limit(self):
         """Ensure that QuerySet.limit works as expected."""
-        user_a = self.Person.objects.create(name='User A', age=20)
-        user_b = self.Person.objects.create(name='User B', age=30)
+        user_a = self.Person.objects.create(name="User A", age=20)
+        user_b = self.Person.objects.create(name="User B", age=30)
 
         # Test limit on a new queryset
         people = list(self.Person.objects.limit(1))
@@ -131,15 +138,15 @@ def test_limit(self):
         self.assertEqual(len(people), 2)
 
         # Test chaining of only after limit
-        person = self.Person.objects().limit(1).only('name').first()
+        person = self.Person.objects().limit(1).only("name").first()
         self.assertEqual(person, user_a)
-        self.assertEqual(person.name, 'User A')
+        self.assertEqual(person.name, "User A")
         self.assertEqual(person.age, None)
 
     def test_skip(self):
         """Ensure that QuerySet.skip works as expected."""
-        user_a = self.Person.objects.create(name='User A', age=20)
-        user_b = self.Person.objects.create(name='User B', age=30)
+        user_a = self.Person.objects.create(name="User A", age=20)
+        user_b = self.Person.objects.create(name="User B", age=30)
 
         # Test skip on a new queryset
         people = list(self.Person.objects.skip(1))
@@ -155,20 +162,20 @@ def test_skip(self):
         self.assertEqual(people2[0], user_b)
 
         # Test chaining of only after skip
-        person = self.Person.objects().skip(1).only('name').first()
+        person = self.Person.objects().skip(1).only("name").first()
         self.assertEqual(person, user_b)
-        self.assertEqual(person.name, 'User B')
+        self.assertEqual(person.name, "User B")
         self.assertEqual(person.age, None)
 
     def test___getitem___invalid_index(self):
         """Ensure slicing a queryset works as expected."""
         with self.assertRaises(TypeError):
-            self.Person.objects()['a']
+            self.Person.objects()["a"]
 
     def test_slice(self):
         """Ensure slicing a queryset works as expected."""
-        user_a = self.Person.objects.create(name='User A', age=20)
-        user_b = self.Person.objects.create(name='User B', age=30)
+        user_a = self.Person.objects.create(name="User A", age=20)
+        user_b = self.Person.objects.create(name="User B", age=30)
         user_c = self.Person.objects.create(name="User C", age=40)
 
         # Test slice limit
@@ -202,7 +209,7 @@ def test_slice(self):
         qs._cursor_obj = None
         people = list(qs)
         self.assertEqual(len(people), 1)
-        self.assertEqual(people[0].name, 'User B')
+        self.assertEqual(people[0].name, "User B")
 
         # Test empty slice
         people = list(self.Person.objects[1:1])
@@ -215,14 +222,18 @@ def test_slice(self):
         # Test larger slice __repr__
         self.Person.objects.delete()
         for i in range(55):
-            self.Person(name='A%s' % i, age=i).save()
+            self.Person(name="A%s" % i, age=i).save()
 
         self.assertEqual(self.Person.objects.count(), 55)
         self.assertEqual("Person object", "%s" % self.Person.objects[0])
-        self.assertEqual("[<Person: Person object>, <Person: Person object>]",
-                         "%s" % self.Person.objects[1:3])
-        self.assertEqual("[<Person: Person object>, <Person: Person object>]",
-                         "%s" % self.Person.objects[51:53])
+        self.assertEqual(
+            "[<Person: Person object>, <Person: Person object>]",
+            "%s" % self.Person.objects[1:3],
+        )
+        self.assertEqual(
+            "[<Person: Person object>, <Person: Person object>]",
+            "%s" % self.Person.objects[51:53],
+        )
 
     def test_find_one(self):
         """Ensure that a query using find_one returns a valid result.
@@ -276,8 +287,7 @@ def test_find_only_one(self):
 
         # Retrieve the first person from the database
         self.assertRaises(MultipleObjectsReturned, self.Person.objects.get)
-        self.assertRaises(self.Person.MultipleObjectsReturned,
-                          self.Person.objects.get)
+        self.assertRaises(self.Person.MultipleObjectsReturned, self.Person.objects.get)
 
         # Use a query to filter the people found to just person2
         person = self.Person.objects.get(age=30)
@@ -289,6 +299,7 @@ def test_find_only_one(self):
     def test_find_array_position(self):
         """Ensure that query by array position works.
         """
+
         class Comment(EmbeddedDocument):
             name = StringField()
 
@@ -301,34 +312,34 @@ class Blog(Document):
 
         Blog.drop_collection()
 
-        Blog.objects.create(tags=['a', 'b'])
-        self.assertEqual(Blog.objects(tags__0='a').count(), 1)
-        self.assertEqual(Blog.objects(tags__0='b').count(), 0)
-        self.assertEqual(Blog.objects(tags__1='a').count(), 0)
-        self.assertEqual(Blog.objects(tags__1='b').count(), 1)
+        Blog.objects.create(tags=["a", "b"])
+        self.assertEqual(Blog.objects(tags__0="a").count(), 1)
+        self.assertEqual(Blog.objects(tags__0="b").count(), 0)
+        self.assertEqual(Blog.objects(tags__1="a").count(), 0)
+        self.assertEqual(Blog.objects(tags__1="b").count(), 1)
 
         Blog.drop_collection()
 
-        comment1 = Comment(name='testa')
-        comment2 = Comment(name='testb')
+        comment1 = Comment(name="testa")
+        comment2 = Comment(name="testb")
         post1 = Post(comments=[comment1, comment2])
         post2 = Post(comments=[comment2, comment2])
         blog1 = Blog.objects.create(posts=[post1, post2])
         blog2 = Blog.objects.create(posts=[post2, post1])
 
-        blog = Blog.objects(posts__0__comments__0__name='testa').get()
+        blog = Blog.objects(posts__0__comments__0__name="testa").get()
         self.assertEqual(blog, blog1)
 
-        blog = Blog.objects(posts__0__comments__0__name='testb').get()
+        blog = Blog.objects(posts__0__comments__0__name="testb").get()
         self.assertEqual(blog, blog2)
 
-        query = Blog.objects(posts__1__comments__1__name='testb')
+        query = Blog.objects(posts__1__comments__1__name="testb")
         self.assertEqual(query.count(), 2)
 
-        query = Blog.objects(posts__1__comments__1__name='testa')
+        query = Blog.objects(posts__1__comments__1__name="testa")
         self.assertEqual(query.count(), 0)
 
-        query = Blog.objects(posts__0__comments__1__name='testa')
+        query = Blog.objects(posts__0__comments__1__name="testa")
         self.assertEqual(query.count(), 0)
 
         Blog.drop_collection()
@@ -367,13 +378,14 @@ class B(Document):
         q2 = q2.filter(ref=a1)._query
         self.assertEqual(q1, q2)
 
-        a_objects = A.objects(s='test1')
+        a_objects = A.objects(s="test1")
         query = B.objects(ref__in=a_objects)
         query = query.filter(boolfield=True)
         self.assertEqual(query.count(), 1)
 
     def test_batch_size(self):
         """Ensure that batch_size works."""
+
         class A(Document):
             s = StringField()
 
@@ -416,33 +428,33 @@ def test_update_write_concern(self):
         self.Person.drop_collection()
 
         write_concern = {"fsync": True}
-        author = self.Person.objects.create(name='Test User')
+        author = self.Person.objects.create(name="Test User")
         author.save(write_concern=write_concern)
 
         # Ensure no regression of #1958
-        author = self.Person(name='Test User2')
+        author = self.Person(name="Test User2")
         author.save(write_concern=None)  # will default to {w: 1}
 
-        result = self.Person.objects.update(
-            set__name='Ross', write_concern={"w": 1})
+        result = self.Person.objects.update(set__name="Ross", write_concern={"w": 1})
 
         self.assertEqual(result, 2)
-        result = self.Person.objects.update(
-            set__name='Ross', write_concern={"w": 0})
+        result = self.Person.objects.update(set__name="Ross", write_concern={"w": 0})
         self.assertEqual(result, None)
 
         result = self.Person.objects.update_one(
-            set__name='Test User', write_concern={"w": 1})
+            set__name="Test User", write_concern={"w": 1}
+        )
         self.assertEqual(result, 1)
         result = self.Person.objects.update_one(
-            set__name='Test User', write_concern={"w": 0})
+            set__name="Test User", write_concern={"w": 0}
+        )
         self.assertEqual(result, None)
 
     def test_update_update_has_a_value(self):
         """Test to ensure that update is passed a value to update to"""
         self.Person.drop_collection()
 
-        author = self.Person.objects.create(name='Test User')
+        author = self.Person.objects.create(name="Test User")
 
         with self.assertRaises(OperationError):
             self.Person.objects(pk=author.pk).update({})
@@ -457,6 +469,7 @@ def test_update_array_position(self):
             set__posts__1__comments__1__name="testc"
         Check that it only works for ListFields.
         """
+
         class Comment(EmbeddedDocument):
             name = StringField()
 
@@ -469,16 +482,16 @@ class Blog(Document):
 
         Blog.drop_collection()
 
-        comment1 = Comment(name='testa')
-        comment2 = Comment(name='testb')
+        comment1 = Comment(name="testa")
+        comment2 = Comment(name="testb")
         post1 = Post(comments=[comment1, comment2])
         post2 = Post(comments=[comment2, comment2])
         Blog.objects.create(posts=[post1, post2])
         Blog.objects.create(posts=[post2, post1])
 
         # Update all of the first comments of second posts of all blogs
-        Blog.objects().update(set__posts__1__comments__0__name='testc')
-        testc_blogs = Blog.objects(posts__1__comments__0__name='testc')
+        Blog.objects().update(set__posts__1__comments__0__name="testc")
+        testc_blogs = Blog.objects(posts__1__comments__0__name="testc")
         self.assertEqual(testc_blogs.count(), 2)
 
         Blog.drop_collection()
@@ -486,14 +499,13 @@ class Blog(Document):
         Blog.objects.create(posts=[post2, post1])
 
         # Update only the first blog returned by the query
-        Blog.objects().update_one(
-            set__posts__1__comments__1__name='testc')
-        testc_blogs = Blog.objects(posts__1__comments__1__name='testc')
+        Blog.objects().update_one(set__posts__1__comments__1__name="testc")
+        testc_blogs = Blog.objects(posts__1__comments__1__name="testc")
         self.assertEqual(testc_blogs.count(), 1)
 
         # Check that using this indexing syntax on a non-list fails
         with self.assertRaises(InvalidQueryError):
-            Blog.objects().update(set__posts__1__comments__0__name__1='asdf')
+            Blog.objects().update(set__posts__1__comments__0__name__1="asdf")
 
         Blog.drop_collection()
 
@@ -519,7 +531,7 @@ class BlogPost(Document):
         BlogPost.objects(comments__by="jane").update(inc__comments__S__votes=1)
 
         post = BlogPost.objects.first()
-        self.assertEqual(post.comments[1].by, 'jane')
+        self.assertEqual(post.comments[1].by, "jane")
         self.assertEqual(post.comments[1].votes, 8)
 
     def test_update_using_positional_operator_matches_first(self):
@@ -563,7 +575,7 @@ class Simple(Document):
         # Nested updates arent supported yet..
         with self.assertRaises(OperationError):
             Simple.drop_collection()
-            Simple(x=[{'test': [1, 2, 3, 4]}]).save()
+            Simple(x=[{"test": [1, 2, 3, 4]}]).save()
             Simple.objects(x__test=2).update(set__x__S__test__S=3)
             self.assertEqual(simple.x, [1, 2, 3, 4])
 
@@ -590,10 +602,11 @@ class BlogPost(Document):
         BlogPost(title="ABC", comments=[c1, c2]).save()
 
         BlogPost.objects(comments__by="joe").update(
-            set__comments__S__votes=Vote(score=4))
+            set__comments__S__votes=Vote(score=4)
+        )
 
         post = BlogPost.objects.first()
-        self.assertEqual(post.comments[0].by, 'joe')
+        self.assertEqual(post.comments[0].by, "joe")
         self.assertEqual(post.comments[0].votes.score, 4)
 
     def test_update_min_max(self):
@@ -618,16 +631,15 @@ class Product(Document):
             item = StringField()
             price = FloatField()
 
-        product = Product.objects.create(item='ABC', price=10.99)
-        product = Product.objects.create(item='ABC', price=10.99)
+        product = Product.objects.create(item="ABC", price=10.99)
+        product = Product.objects.create(item="ABC", price=10.99)
         Product.objects(id=product.id).update(mul__price=1.25)
         self.assertEqual(Product.objects.get(id=product.id).price, 13.7375)
-        unknown_product = Product.objects.create(item='Unknown')
+        unknown_product = Product.objects.create(item="Unknown")
         Product.objects(id=unknown_product.id).update(mul__price=100)
         self.assertEqual(Product.objects.get(id=unknown_product.id).price, 0)
 
     def test_updates_can_have_match_operators(self):
-
         class Comment(EmbeddedDocument):
             content = StringField()
             name = StringField(max_length=120)
@@ -643,8 +655,11 @@ class Post(Document):
         comm1 = Comment(content="very funny indeed", name="John S", vote=1)
         comm2 = Comment(content="kind of funny", name="Mark P", vote=0)
 
-        Post(title='Fun with MongoEngine', tags=['mongodb', 'mongoengine'],
-             comments=[comm1, comm2]).save()
+        Post(
+            title="Fun with MongoEngine",
+            tags=["mongodb", "mongoengine"],
+            comments=[comm1, comm2],
+        ).save()
 
         Post.objects().update_one(pull__comments__vote__lt=1)
 
@@ -652,6 +667,7 @@ class Post(Document):
 
     def test_mapfield_update(self):
         """Ensure that the MapField can be updated."""
+
         class Member(EmbeddedDocument):
             gender = StringField()
             age = IntField()
@@ -662,37 +678,35 @@ class Club(Document):
         Club.drop_collection()
 
         club = Club()
-        club.members['John'] = Member(gender="M", age=13)
+        club.members["John"] = Member(gender="M", age=13)
         club.save()
 
-        Club.objects().update(
-            set__members={"John": Member(gender="F", age=14)})
+        Club.objects().update(set__members={"John": Member(gender="F", age=14)})
 
         club = Club.objects().first()
-        self.assertEqual(club.members['John'].gender, "F")
-        self.assertEqual(club.members['John'].age, 14)
+        self.assertEqual(club.members["John"].gender, "F")
+        self.assertEqual(club.members["John"].age, 14)
 
     def test_dictfield_update(self):
         """Ensure that the DictField can be updated."""
+
         class Club(Document):
             members = DictField()
 
         club = Club()
-        club.members['John'] = {'gender': 'M', 'age': 13}
+        club.members["John"] = {"gender": "M", "age": 13}
         club.save()
 
-        Club.objects().update(
-            set__members={"John": {'gender': 'F', 'age': 14}})
+        Club.objects().update(set__members={"John": {"gender": "F", "age": 14}})
 
         club = Club.objects().first()
-        self.assertEqual(club.members['John']['gender'], "F")
-        self.assertEqual(club.members['John']['age'], 14)
+        self.assertEqual(club.members["John"]["gender"], "F")
+        self.assertEqual(club.members["John"]["age"], 14)
 
     def test_update_results(self):
         self.Person.drop_collection()
 
-        result = self.Person(name="Bob", age=25).update(
-            upsert=True, full_result=True)
+        result = self.Person(name="Bob", age=25).update(upsert=True, full_result=True)
         self.assertIsInstance(result, UpdateResult)
         self.assertIn("upserted", result.raw_result)
         self.assertFalse(result.raw_result["updatedExisting"])
@@ -703,8 +717,7 @@ def test_update_results(self):
         self.assertTrue(result.raw_result["updatedExisting"])
 
         self.Person(name="Bob", age=20).save()
-        result = self.Person.objects(name="Bob").update(
-            set__name="bobby", multi=True)
+        result = self.Person.objects(name="Bob").update(set__name="bobby", multi=True)
         self.assertEqual(result, 2)
 
     def test_update_validate(self):
@@ -718,8 +731,12 @@ class Doc(Document):
             ed_f = EmbeddedDocumentField(EmDoc)
 
         self.assertRaises(ValidationError, Doc.objects().update, str_f=1, upsert=True)
-        self.assertRaises(ValidationError, Doc.objects().update, dt_f="datetime", upsert=True)
-        self.assertRaises(ValidationError, Doc.objects().update, ed_f__str_f=1, upsert=True)
+        self.assertRaises(
+            ValidationError, Doc.objects().update, dt_f="datetime", upsert=True
+        )
+        self.assertRaises(
+            ValidationError, Doc.objects().update, ed_f__str_f=1, upsert=True
+        )
 
     def test_update_related_models(self):
         class TestPerson(Document):
@@ -732,34 +749,33 @@ class TestOrganization(Document):
         TestPerson.drop_collection()
         TestOrganization.drop_collection()
 
-        p = TestPerson(name='p1')
+        p = TestPerson(name="p1")
         p.save()
-        o = TestOrganization(name='o1')
+        o = TestOrganization(name="o1")
         o.save()
 
         o.owner = p
-        p.name = 'p2'
+        p.name = "p2"
 
-        self.assertEqual(o._get_changed_fields(), ['owner'])
-        self.assertEqual(p._get_changed_fields(), ['name'])
+        self.assertEqual(o._get_changed_fields(), ["owner"])
+        self.assertEqual(p._get_changed_fields(), ["name"])
 
         o.save()
 
         self.assertEqual(o._get_changed_fields(), [])
-        self.assertEqual(p._get_changed_fields(), ['name'])  # Fails; it's empty
+        self.assertEqual(p._get_changed_fields(), ["name"])  # Fails; it's empty
 
         # This will do NOTHING at all, even though we changed the name
         p.save()
 
         p.reload()
 
-        self.assertEqual(p.name, 'p2')  # Fails; it's still `p1`
+        self.assertEqual(p.name, "p2")  # Fails; it's still `p1`
 
     def test_upsert(self):
         self.Person.drop_collection()
 
-        self.Person.objects(
-            pk=ObjectId(), name="Bob", age=30).update(upsert=True)
+        self.Person.objects(pk=ObjectId(), name="Bob", age=30).update(upsert=True)
 
         bob = self.Person.objects.first()
         self.assertEqual("Bob", bob.name)
@@ -786,7 +802,8 @@ def test_set_on_insert(self):
         self.Person.drop_collection()
 
         self.Person.objects(pk=ObjectId()).update(
-            set__name='Bob', set_on_insert__age=30, upsert=True)
+            set__name="Bob", set_on_insert__age=30, upsert=True
+        )
 
         bob = self.Person.objects.first()
         self.assertEqual("Bob", bob.name)
@@ -797,7 +814,7 @@ class Embed(EmbeddedDocument):
             field = IntField()
 
         class B(Document):
-            meta = {'collection': 'b'}
+            meta = {"collection": "b"}
 
             field = IntField(default=1)
             embed = EmbeddedDocumentField(Embed, default=Embed)
@@ -820,7 +837,7 @@ class B(Document):
         self.assertEqual(record.embed.field, 2)
 
         # Request only the _id field and save
-        clone = B.objects().only('id').first()
+        clone = B.objects().only("id").first()
         clone.save()
 
         # Reload the record and see that the embed data is not lost
@@ -831,6 +848,7 @@ class B(Document):
 
     def test_bulk_insert(self):
         """Ensure that bulk insert works"""
+
         class Comment(EmbeddedDocument):
             name = StringField()
 
@@ -847,14 +865,13 @@ class Blog(Document):
         # Recreates the collection
         self.assertEqual(0, Blog.objects.count())
 
-        comment1 = Comment(name='testa')
-        comment2 = Comment(name='testb')
+        comment1 = Comment(name="testa")
+        comment2 = Comment(name="testb")
         post1 = Post(comments=[comment1, comment2])
         post2 = Post(comments=[comment2, comment2])
 
         # Check bulk insert using load_bulk=False
-        blogs = [Blog(title="%s" % i, posts=[post1, post2])
-                 for i in range(99)]
+        blogs = [Blog(title="%s" % i, posts=[post1, post2]) for i in range(99)]
         with query_counter() as q:
             self.assertEqual(q, 0)
             Blog.objects.insert(blogs, load_bulk=False)
@@ -866,8 +883,7 @@ class Blog(Document):
         Blog.ensure_indexes()
 
         # Check bulk insert using load_bulk=True
-        blogs = [Blog(title="%s" % i, posts=[post1, post2])
-                 for i in range(99)]
+        blogs = [Blog(title="%s" % i, posts=[post1, post2]) for i in range(99)]
         with query_counter() as q:
             self.assertEqual(q, 0)
             Blog.objects.insert(blogs)
@@ -875,8 +891,8 @@ class Blog(Document):
 
         Blog.drop_collection()
 
-        comment1 = Comment(name='testa')
-        comment2 = Comment(name='testb')
+        comment1 = Comment(name="testa")
+        comment2 = Comment(name="testb")
         post1 = Post(comments=[comment1, comment2])
         post2 = Post(comments=[comment2, comment2])
         blog1 = Blog(title="code", posts=[post1, post2])
@@ -892,8 +908,7 @@ class Blog(Document):
             blog = Blog.objects.first()
             Blog.objects.insert(blog)
         self.assertEqual(
-            str(cm.exception),
-            'Some documents have ObjectIds, use doc.update() instead'
+            str(cm.exception), "Some documents have ObjectIds, use doc.update() instead"
         )
 
         # test inserting a query set
@@ -901,8 +916,7 @@ class Blog(Document):
             blogs_qs = Blog.objects
             Blog.objects.insert(blogs_qs)
         self.assertEqual(
-            str(cm.exception),
-            'Some documents have ObjectIds, use doc.update() instead'
+            str(cm.exception), "Some documents have ObjectIds, use doc.update() instead"
         )
 
         # insert 1 new doc
@@ -948,13 +962,13 @@ class Blog(Document):
             name = StringField()
 
         Blog.drop_collection()
-        Blog(name='test').save()
+        Blog(name="test").save()
 
         with self.assertRaises(OperationError):
             Blog.objects.insert("HELLO WORLD")
 
         with self.assertRaises(OperationError):
-            Blog.objects.insert({'name': 'garbage'})
+            Blog.objects.insert({"name": "garbage"})
 
     def test_bulk_insert_update_input_document_ids(self):
         class Comment(Document):
@@ -1010,10 +1024,11 @@ def test_get_changed_fields_query_count(self):
         """Make sure we don't perform unnecessary db operations when
         none of document's fields were updated.
         """
+
         class Person(Document):
             name = StringField()
-            owns = ListField(ReferenceField('Organization'))
-            projects = ListField(ReferenceField('Project'))
+            owns = ListField(ReferenceField("Organization"))
+            projects = ListField(ReferenceField("Project"))
 
         class Organization(Document):
             name = StringField()
@@ -1070,8 +1085,8 @@ class Project(Document):
     def test_repeated_iteration(self):
         """Ensure that QuerySet rewinds itself one iteration finishes.
         """
-        self.Person(name='Person 1').save()
-        self.Person(name='Person 2').save()
+        self.Person(name="Person 1").save()
+        self.Person(name="Person 2").save()
 
         queryset = self.Person.objects
         people1 = [person for person in queryset]
@@ -1099,7 +1114,7 @@ def __repr__(self):
         for i in range(1000):
             Doc(number=i).save()
 
-        docs = Doc.objects.order_by('number')
+        docs = Doc.objects.order_by("number")
 
         self.assertEqual(docs.count(), 1000)
 
@@ -1107,88 +1122,89 @@ def __repr__(self):
         self.assertIn("Doc: 0", docs_string)
 
         self.assertEqual(docs.count(), 1000)
-        self.assertIn('(remaining elements truncated)', "%s" % docs)
+        self.assertIn("(remaining elements truncated)", "%s" % docs)
 
         # Limit and skip
         docs = docs[1:4]
-        self.assertEqual('[<Doc: 1>, <Doc: 2>, <Doc: 3>]', "%s" % docs)
+        self.assertEqual("[<Doc: 1>, <Doc: 2>, <Doc: 3>]", "%s" % docs)
 
         self.assertEqual(docs.count(with_limit_and_skip=True), 3)
         for doc in docs:
-            self.assertEqual('.. queryset mid-iteration ..', repr(docs))
+            self.assertEqual(".. queryset mid-iteration ..", repr(docs))
 
     def test_regex_query_shortcuts(self):
         """Ensure that contains, startswith, endswith, etc work.
         """
-        person = self.Person(name='Guido van Rossum')
+        person = self.Person(name="Guido van Rossum")
         person.save()
 
         # Test contains
-        obj = self.Person.objects(name__contains='van').first()
+        obj = self.Person.objects(name__contains="van").first()
         self.assertEqual(obj, person)
-        obj = self.Person.objects(name__contains='Van').first()
+        obj = self.Person.objects(name__contains="Van").first()
         self.assertEqual(obj, None)
 
         # Test icontains
-        obj = self.Person.objects(name__icontains='Van').first()
+        obj = self.Person.objects(name__icontains="Van").first()
         self.assertEqual(obj, person)
 
         # Test startswith
-        obj = self.Person.objects(name__startswith='Guido').first()
+        obj = self.Person.objects(name__startswith="Guido").first()
         self.assertEqual(obj, person)
-        obj = self.Person.objects(name__startswith='guido').first()
+        obj = self.Person.objects(name__startswith="guido").first()
         self.assertEqual(obj, None)
 
         # Test istartswith
-        obj = self.Person.objects(name__istartswith='guido').first()
+        obj = self.Person.objects(name__istartswith="guido").first()
         self.assertEqual(obj, person)
 
         # Test endswith
-        obj = self.Person.objects(name__endswith='Rossum').first()
+        obj = self.Person.objects(name__endswith="Rossum").first()
         self.assertEqual(obj, person)
-        obj = self.Person.objects(name__endswith='rossuM').first()
+        obj = self.Person.objects(name__endswith="rossuM").first()
         self.assertEqual(obj, None)
 
         # Test iendswith
-        obj = self.Person.objects(name__iendswith='rossuM').first()
+        obj = self.Person.objects(name__iendswith="rossuM").first()
         self.assertEqual(obj, person)
 
         # Test exact
-        obj = self.Person.objects(name__exact='Guido van Rossum').first()
+        obj = self.Person.objects(name__exact="Guido van Rossum").first()
         self.assertEqual(obj, person)
-        obj = self.Person.objects(name__exact='Guido van rossum').first()
+        obj = self.Person.objects(name__exact="Guido van rossum").first()
         self.assertEqual(obj, None)
-        obj = self.Person.objects(name__exact='Guido van Rossu').first()
+        obj = self.Person.objects(name__exact="Guido van Rossu").first()
         self.assertEqual(obj, None)
 
         # Test iexact
-        obj = self.Person.objects(name__iexact='gUIDO VAN rOSSUM').first()
+        obj = self.Person.objects(name__iexact="gUIDO VAN rOSSUM").first()
         self.assertEqual(obj, person)
-        obj = self.Person.objects(name__iexact='gUIDO VAN rOSSU').first()
+        obj = self.Person.objects(name__iexact="gUIDO VAN rOSSU").first()
         self.assertEqual(obj, None)
 
         # Test unsafe expressions
-        person = self.Person(name='Guido van Rossum [.\'Geek\']')
+        person = self.Person(name="Guido van Rossum [.'Geek']")
         person.save()
 
-        obj = self.Person.objects(name__icontains='[.\'Geek').first()
+        obj = self.Person.objects(name__icontains="[.'Geek").first()
         self.assertEqual(obj, person)
 
     def test_not(self):
         """Ensure that the __not operator works as expected.
         """
-        alice = self.Person(name='Alice', age=25)
+        alice = self.Person(name="Alice", age=25)
         alice.save()
 
-        obj = self.Person.objects(name__iexact='alice').first()
+        obj = self.Person.objects(name__iexact="alice").first()
         self.assertEqual(obj, alice)
 
-        obj = self.Person.objects(name__not__iexact='alice').first()
+        obj = self.Person.objects(name__not__iexact="alice").first()
         self.assertEqual(obj, None)
 
     def test_filter_chaining(self):
         """Ensure filters can be chained together.
         """
+
         class Blog(Document):
             id = StringField(primary_key=True)
 
@@ -1217,25 +1233,26 @@ def published(doc_cls, queryset):
             blog=blog_1,
             title="Blog Post #1",
             is_published=True,
-            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)
+            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0),
         )
         BlogPost.objects.create(
             blog=blog_2,
             title="Blog Post #2",
             is_published=True,
-            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0),
         )
         BlogPost.objects.create(
             blog=blog_3,
             title="Blog Post #3",
             is_published=True,
-            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
+            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0),
         )
 
         # find all published blog posts before 2010-01-07
         published_posts = BlogPost.published()
         published_posts = published_posts.filter(
-            published_date__lt=datetime.datetime(2010, 1, 7, 0, 0, 0))
+            published_date__lt=datetime.datetime(2010, 1, 7, 0, 0, 0)
+        )
         self.assertEqual(published_posts.count(), 2)
 
         blog_posts = BlogPost.objects
@@ -1247,11 +1264,11 @@ def published(doc_cls, queryset):
         Blog.drop_collection()
 
     def test_filter_chaining_with_regex(self):
-        person = self.Person(name='Guido van Rossum')
+        person = self.Person(name="Guido van Rossum")
         person.save()
 
         people = self.Person.objects
-        people = people.filter(name__startswith='Gui').filter(name__not__endswith='tum')
+        people = people.filter(name__startswith="Gui").filter(name__not__endswith="tum")
         self.assertEqual(people.count(), 1)
 
     def assertSequence(self, qs, expected):
@@ -1264,27 +1281,23 @@ def assertSequence(self, qs, expected):
     def test_ordering(self):
         """Ensure default ordering is applied and can be overridden.
         """
+
         class BlogPost(Document):
             title = StringField()
             published_date = DateTimeField()
 
-            meta = {
-                'ordering': ['-published_date']
-            }
+            meta = {"ordering": ["-published_date"]}
 
         BlogPost.drop_collection()
 
         blog_post_1 = BlogPost.objects.create(
-            title="Blog Post #1",
-            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)
+            title="Blog Post #1", published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)
         )
         blog_post_2 = BlogPost.objects.create(
-            title="Blog Post #2",
-            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+            title="Blog Post #2", published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
         )
         blog_post_3 = BlogPost.objects.create(
-            title="Blog Post #3",
-            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
+            title="Blog Post #3", published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
         )
 
         # get the "first" BlogPost using default ordering
@@ -1307,39 +1320,35 @@ class BlogPost(Document):
             title = StringField()
             published_date = DateTimeField()
 
-            meta = {
-                'ordering': ['-published_date']
-            }
+            meta = {"ordering": ["-published_date"]}
 
         BlogPost.drop_collection()
 
         # default ordering should be used by default
         with db_ops_tracker() as q:
-            BlogPost.objects.filter(title='whatever').first()
+            BlogPost.objects.filter(title="whatever").first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertEqual(
-                q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY],
-                {'published_date': -1}
+                q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY], {"published_date": -1}
             )
 
         # calling order_by() should clear the default ordering
         with db_ops_tracker() as q:
-            BlogPost.objects.filter(title='whatever').order_by().first()
+            BlogPost.objects.filter(title="whatever").order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
 
         # calling an explicit order_by should use a specified sort
         with db_ops_tracker() as q:
-            BlogPost.objects.filter(title='whatever').order_by('published_date').first()
+            BlogPost.objects.filter(title="whatever").order_by("published_date").first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertEqual(
-                q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY],
-                {'published_date': 1}
+                q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY], {"published_date": 1}
             )
 
         # calling order_by() after an explicit sort should clear it
         with db_ops_tracker() as q:
-            qs = BlogPost.objects.filter(title='whatever').order_by('published_date')
+            qs = BlogPost.objects.filter(title="whatever").order_by("published_date")
             qs.order_by().first()
             self.assertEqual(len(q.get_ops()), 1)
             self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
@@ -1353,21 +1362,20 @@ class BlogPost(Document):
             title = StringField()
             published_date = DateTimeField()
 
-            meta = {
-                'ordering': ['-published_date']
-            }
+            meta = {"ordering": ["-published_date"]}
 
         BlogPost.objects.create(
-            title='whatever', published_date=datetime.datetime.utcnow())
+            title="whatever", published_date=datetime.datetime.utcnow()
+        )
 
         with db_ops_tracker() as q:
-            BlogPost.objects.get(title='whatever')
+            BlogPost.objects.get(title="whatever")
             self.assertEqual(len(q.get_ops()), 1)
             self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
 
         # Ordering should be ignored for .get even if we set it explicitly
         with db_ops_tracker() as q:
-            BlogPost.objects.order_by('-title').get(title='whatever')
+            BlogPost.objects.order_by("-title").get(title="whatever")
             self.assertEqual(len(q.get_ops()), 1)
             self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
 
@@ -1375,6 +1383,7 @@ def test_find_embedded(self):
         """Ensure that an embedded document is properly returned from
         different manners of querying.
         """
+
         class User(EmbeddedDocument):
             name = StringField()
 
@@ -1384,23 +1393,20 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        user = User(name='Test User')
-        BlogPost.objects.create(
-            author=user,
-            content='Had a good coffee today...'
-        )
+        user = User(name="Test User")
+        BlogPost.objects.create(author=user, content="Had a good coffee today...")
 
         result = BlogPost.objects.first()
         self.assertIsInstance(result.author, User)
-        self.assertEqual(result.author.name, 'Test User')
+        self.assertEqual(result.author.name, "Test User")
 
         result = BlogPost.objects.get(author__name=user.name)
         self.assertIsInstance(result.author, User)
-        self.assertEqual(result.author.name, 'Test User')
+        self.assertEqual(result.author.name, "Test User")
 
-        result = BlogPost.objects.get(author={'name': user.name})
+        result = BlogPost.objects.get(author={"name": user.name})
         self.assertIsInstance(result.author, User)
-        self.assertEqual(result.author.name, 'Test User')
+        self.assertEqual(result.author.name, "Test User")
 
         # Fails, since the string is not a type that is able to represent the
         # author's document structure (should be dict)
@@ -1409,6 +1415,7 @@ class BlogPost(Document):
 
     def test_find_empty_embedded(self):
         """Ensure that you can save and find an empty embedded document."""
+
         class User(EmbeddedDocument):
             name = StringField()
 
@@ -1418,7 +1425,7 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        BlogPost.objects.create(content='Anonymous post...')
+        BlogPost.objects.create(content="Anonymous post...")
 
         result = BlogPost.objects.get(author=None)
         self.assertEqual(result.author, None)
@@ -1426,15 +1433,16 @@ class BlogPost(Document):
     def test_find_dict_item(self):
         """Ensure that DictField items may be found.
         """
+
         class BlogPost(Document):
             info = DictField()
 
         BlogPost.drop_collection()
 
-        post = BlogPost(info={'title': 'test'})
+        post = BlogPost(info={"title": "test"})
         post.save()
 
-        post_obj = BlogPost.objects(info__title='test').first()
+        post_obj = BlogPost.objects(info__title="test").first()
         self.assertEqual(post_obj.id, post.id)
 
         BlogPost.drop_collection()
@@ -1442,6 +1450,7 @@ class BlogPost(Document):
     def test_exec_js_query(self):
         """Ensure that queries are properly formed for use in exec_js.
         """
+
         class BlogPost(Document):
             hits = IntField()
             published = BooleanField()
@@ -1468,10 +1477,10 @@ class BlogPost(Document):
         """
 
         # Ensure that normal queries work
-        c = BlogPost.objects(published=True).exec_js(js_func, 'hits')
+        c = BlogPost.objects(published=True).exec_js(js_func, "hits")
         self.assertEqual(c, 2)
 
-        c = BlogPost.objects(published=False).exec_js(js_func, 'hits')
+        c = BlogPost.objects(published=False).exec_js(js_func, "hits")
         self.assertEqual(c, 1)
 
         BlogPost.drop_collection()
@@ -1479,22 +1488,22 @@ class BlogPost(Document):
     def test_exec_js_field_sub(self):
         """Ensure that field substitutions occur properly in exec_js functions.
         """
+
         class Comment(EmbeddedDocument):
-            content = StringField(db_field='body')
+            content = StringField(db_field="body")
 
         class BlogPost(Document):
-            name = StringField(db_field='doc-name')
-            comments = ListField(EmbeddedDocumentField(Comment),
-                                 db_field='cmnts')
+            name = StringField(db_field="doc-name")
+            comments = ListField(EmbeddedDocumentField(Comment), db_field="cmnts")
 
         BlogPost.drop_collection()
 
-        comments1 = [Comment(content='cool'), Comment(content='yay')]
-        post1 = BlogPost(name='post1', comments=comments1)
+        comments1 = [Comment(content="cool"), Comment(content="yay")]
+        post1 = BlogPost(name="post1", comments=comments1)
         post1.save()
 
-        comments2 = [Comment(content='nice stuff')]
-        post2 = BlogPost(name='post2', comments=comments2)
+        comments2 = [Comment(content="nice stuff")]
+        post2 = BlogPost(name="post2", comments=comments2)
         post2.save()
 
         code = """
@@ -1514,16 +1523,15 @@ class BlogPost(Document):
         """
 
         sub_code = BlogPost.objects._sub_js_fields(code)
-        code_chunks = ['doc["cmnts"];', 'doc["doc-name"],',
-                       'doc["cmnts"][i]["body"]']
+        code_chunks = ['doc["cmnts"];', 'doc["doc-name"],', 'doc["cmnts"][i]["body"]']
         for chunk in code_chunks:
             self.assertIn(chunk, sub_code)
 
         results = BlogPost.objects.exec_js(code)
         expected_results = [
-            {u'comment': u'cool', u'document': u'post1'},
-            {u'comment': u'yay', u'document': u'post1'},
-            {u'comment': u'nice stuff', u'document': u'post2'},
+            {u"comment": u"cool", u"document": u"post1"},
+            {u"comment": u"yay", u"document": u"post1"},
+            {u"comment": u"nice stuff", u"document": u"post2"},
         ]
         self.assertEqual(results, expected_results)
 
@@ -1552,55 +1560,60 @@ def test_delete(self):
     def test_reverse_delete_rule_cascade(self):
         """Ensure cascading deletion of referring documents from the database.
         """
+
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)
+
         BlogPost.drop_collection()
 
-        me = self.Person(name='Test User')
+        me = self.Person(name="Test User")
         me.save()
-        someoneelse = self.Person(name='Some-one Else')
+        someoneelse = self.Person(name="Some-one Else")
         someoneelse.save()
 
-        BlogPost(content='Watching TV', author=me).save()
-        BlogPost(content='Chilling out', author=me).save()
-        BlogPost(content='Pro Testing', author=someoneelse).save()
+        BlogPost(content="Watching TV", author=me).save()
+        BlogPost(content="Chilling out", author=me).save()
+        BlogPost(content="Pro Testing", author=someoneelse).save()
 
         self.assertEqual(3, BlogPost.objects.count())
-        self.Person.objects(name='Test User').delete()
+        self.Person.objects(name="Test User").delete()
         self.assertEqual(1, BlogPost.objects.count())
 
     def test_reverse_delete_rule_cascade_on_abstract_document(self):
         """Ensure cascading deletion of referring documents from the database
         does not fail on abstract document.
         """
+
         class AbstractBlogPost(Document):
-            meta = {'abstract': True}
+            meta = {"abstract": True}
             author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)
 
         class BlogPost(AbstractBlogPost):
             content = StringField()
+
         BlogPost.drop_collection()
 
-        me = self.Person(name='Test User')
+        me = self.Person(name="Test User")
         me.save()
-        someoneelse = self.Person(name='Some-one Else')
+        someoneelse = self.Person(name="Some-one Else")
         someoneelse.save()
 
-        BlogPost(content='Watching TV', author=me).save()
-        BlogPost(content='Chilling out', author=me).save()
-        BlogPost(content='Pro Testing', author=someoneelse).save()
+        BlogPost(content="Watching TV", author=me).save()
+        BlogPost(content="Chilling out", author=me).save()
+        BlogPost(content="Pro Testing", author=someoneelse).save()
 
         self.assertEqual(3, BlogPost.objects.count())
-        self.Person.objects(name='Test User').delete()
+        self.Person.objects(name="Test User").delete()
         self.assertEqual(1, BlogPost.objects.count())
 
     def test_reverse_delete_rule_cascade_cycle(self):
         """Ensure reference cascading doesn't loop if reference graph isn't
         a tree
         """
+
         class Dummy(Document):
-            reference = ReferenceField('self', reverse_delete_rule=CASCADE)
+            reference = ReferenceField("self", reverse_delete_rule=CASCADE)
 
         base = Dummy().save()
         other = Dummy(reference=base).save()
@@ -1616,14 +1629,15 @@ def test_reverse_delete_rule_cascade_complex_cycle(self):
         """Ensure reference cascading doesn't loop if reference graph isn't
         a tree
         """
+
         class Category(Document):
             name = StringField()
 
         class Dummy(Document):
-            reference = ReferenceField('self', reverse_delete_rule=CASCADE)
+            reference = ReferenceField("self", reverse_delete_rule=CASCADE)
             cat = ReferenceField(Category, reverse_delete_rule=CASCADE)
 
-        cat = Category(name='cat').save()
+        cat = Category(name="cat").save()
         base = Dummy(cat=cat).save()
         other = Dummy(reference=base).save()
         other2 = Dummy(reference=other).save()
@@ -1640,24 +1654,25 @@ def test_reverse_delete_rule_cascade_self_referencing(self):
         """Ensure self-referencing CASCADE deletes do not result in infinite
         loop
         """
+
         class Category(Document):
             name = StringField()
-            parent = ReferenceField('self', reverse_delete_rule=CASCADE)
+            parent = ReferenceField("self", reverse_delete_rule=CASCADE)
 
         Category.drop_collection()
 
         num_children = 3
-        base = Category(name='Root')
+        base = Category(name="Root")
         base.save()
 
         # Create a simple parent-child tree
         for i in range(num_children):
-            child_name = 'Child-%i' % i
+            child_name = "Child-%i" % i
             child = Category(name=child_name, parent=base)
             child.save()
 
             for i in range(num_children):
-                child_child_name = 'Child-Child-%i' % i
+                child_child_name = "Child-Child-%i" % i
                 child_child = Category(name=child_child_name, parent=child)
                 child_child.save()
 
@@ -1673,6 +1688,7 @@ class Category(Document):
     def test_reverse_delete_rule_nullify(self):
         """Ensure nullification of references to deleted documents.
         """
+
         class Category(Document):
             name = StringField()
 
@@ -1683,14 +1699,14 @@ class BlogPost(Document):
         BlogPost.drop_collection()
         Category.drop_collection()
 
-        lameness = Category(name='Lameness')
+        lameness = Category(name="Lameness")
         lameness.save()
 
-        post = BlogPost(content='Watching TV', category=lameness)
+        post = BlogPost(content="Watching TV", category=lameness)
         post.save()
 
         self.assertEqual(1, BlogPost.objects.count())
-        self.assertEqual('Lameness', BlogPost.objects.first().category.name)
+        self.assertEqual("Lameness", BlogPost.objects.first().category.name)
         Category.objects.delete()
         self.assertEqual(1, BlogPost.objects.count())
         self.assertEqual(None, BlogPost.objects.first().category)
@@ -1699,24 +1715,26 @@ def test_reverse_delete_rule_nullify_on_abstract_document(self):
         """Ensure nullification of references to deleted documents when
         reference is on an abstract document.
         """
+
         class AbstractBlogPost(Document):
-            meta = {'abstract': True}
+            meta = {"abstract": True}
             author = ReferenceField(self.Person, reverse_delete_rule=NULLIFY)
 
         class BlogPost(AbstractBlogPost):
             content = StringField()
+
         BlogPost.drop_collection()
 
-        me = self.Person(name='Test User')
+        me = self.Person(name="Test User")
         me.save()
-        someoneelse = self.Person(name='Some-one Else')
+        someoneelse = self.Person(name="Some-one Else")
         someoneelse.save()
 
-        BlogPost(content='Watching TV', author=me).save()
+        BlogPost(content="Watching TV", author=me).save()
 
         self.assertEqual(1, BlogPost.objects.count())
         self.assertEqual(me, BlogPost.objects.first().author)
-        self.Person.objects(name='Test User').delete()
+        self.Person.objects(name="Test User").delete()
         self.assertEqual(1, BlogPost.objects.count())
         self.assertEqual(None, BlogPost.objects.first().author)
 
@@ -1724,6 +1742,7 @@ def test_reverse_delete_rule_deny(self):
         """Ensure deletion gets denied on documents that still have references
         to them.
         """
+
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, reverse_delete_rule=DENY)
@@ -1731,10 +1750,10 @@ class BlogPost(Document):
         BlogPost.drop_collection()
         self.Person.drop_collection()
 
-        me = self.Person(name='Test User')
+        me = self.Person(name="Test User")
         me.save()
 
-        post = BlogPost(content='Watching TV', author=me)
+        post = BlogPost(content="Watching TV", author=me)
         post.save()
 
         self.assertRaises(OperationError, self.Person.objects.delete)
@@ -1743,18 +1762,20 @@ def test_reverse_delete_rule_deny_on_abstract_document(self):
         """Ensure deletion gets denied on documents that still have references
         to them, when reference is on an abstract document.
         """
+
         class AbstractBlogPost(Document):
-            meta = {'abstract': True}
+            meta = {"abstract": True}
             author = ReferenceField(self.Person, reverse_delete_rule=DENY)
 
         class BlogPost(AbstractBlogPost):
             content = StringField()
+
         BlogPost.drop_collection()
 
-        me = self.Person(name='Test User')
+        me = self.Person(name="Test User")
         me.save()
 
-        BlogPost(content='Watching TV', author=me).save()
+        BlogPost(content="Watching TV", author=me).save()
 
         self.assertEqual(1, BlogPost.objects.count())
         self.assertRaises(OperationError, self.Person.objects.delete)
@@ -1762,24 +1783,24 @@ class BlogPost(AbstractBlogPost):
     def test_reverse_delete_rule_pull(self):
         """Ensure pulling of references to deleted documents.
         """
+
         class BlogPost(Document):
             content = StringField()
-            authors = ListField(ReferenceField(self.Person,
-                                               reverse_delete_rule=PULL))
+            authors = ListField(ReferenceField(self.Person, reverse_delete_rule=PULL))
 
         BlogPost.drop_collection()
         self.Person.drop_collection()
 
-        me = self.Person(name='Test User')
+        me = self.Person(name="Test User")
         me.save()
 
-        someoneelse = self.Person(name='Some-one Else')
+        someoneelse = self.Person(name="Some-one Else")
         someoneelse.save()
 
-        post = BlogPost(content='Watching TV', authors=[me, someoneelse])
+        post = BlogPost(content="Watching TV", authors=[me, someoneelse])
         post.save()
 
-        another = BlogPost(content='Chilling Out', authors=[someoneelse])
+        another = BlogPost(content="Chilling Out", authors=[someoneelse])
         another.save()
 
         someoneelse.delete()
@@ -1793,10 +1814,10 @@ def test_reverse_delete_rule_pull_on_abstract_documents(self):
         """Ensure pulling of references to deleted documents when reference
         is defined on an abstract document..
         """
+
         class AbstractBlogPost(Document):
-            meta = {'abstract': True}
-            authors = ListField(ReferenceField(self.Person,
-                                               reverse_delete_rule=PULL))
+            meta = {"abstract": True}
+            authors = ListField(ReferenceField(self.Person, reverse_delete_rule=PULL))
 
         class BlogPost(AbstractBlogPost):
             content = StringField()
@@ -1804,16 +1825,16 @@ class BlogPost(AbstractBlogPost):
         BlogPost.drop_collection()
         self.Person.drop_collection()
 
-        me = self.Person(name='Test User')
+        me = self.Person(name="Test User")
         me.save()
 
-        someoneelse = self.Person(name='Some-one Else')
+        someoneelse = self.Person(name="Some-one Else")
         someoneelse.save()
 
-        post = BlogPost(content='Watching TV', authors=[me, someoneelse])
+        post = BlogPost(content="Watching TV", authors=[me, someoneelse])
         post.save()
 
-        another = BlogPost(content='Chilling Out', authors=[someoneelse])
+        another = BlogPost(content="Chilling Out", authors=[someoneelse])
         another.save()
 
         someoneelse.delete()
@@ -1824,7 +1845,6 @@ class BlogPost(AbstractBlogPost):
         self.assertEqual(another.authors, [])
 
     def test_delete_with_limits(self):
-
         class Log(Document):
             pass
 
@@ -1839,19 +1859,21 @@ class Log(Document):
     def test_delete_with_limit_handles_delete_rules(self):
         """Ensure cascading deletion of referring documents from the database.
         """
+
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, reverse_delete_rule=CASCADE)
+
         BlogPost.drop_collection()
 
-        me = self.Person(name='Test User')
+        me = self.Person(name="Test User")
         me.save()
-        someoneelse = self.Person(name='Some-one Else')
+        someoneelse = self.Person(name="Some-one Else")
         someoneelse.save()
 
-        BlogPost(content='Watching TV', author=me).save()
-        BlogPost(content='Chilling out', author=me).save()
-        BlogPost(content='Pro Testing', author=someoneelse).save()
+        BlogPost(content="Watching TV", author=me).save()
+        BlogPost(content="Chilling out", author=me).save()
+        BlogPost(content="Pro Testing", author=someoneelse).save()
 
         self.assertEqual(3, BlogPost.objects.count())
         self.Person.objects()[:1].delete()
@@ -1870,6 +1892,7 @@ def test_delete_edge_case_with_write_concern_0_return_None(self):
     def test_reference_field_find(self):
         """Ensure cascading deletion of referring documents from the database.
         """
+
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person)
@@ -1877,7 +1900,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
         self.Person.drop_collection()
 
-        me = self.Person(name='Test User').save()
+        me = self.Person(name="Test User").save()
         BlogPost(content="test 123", author=me).save()
 
         self.assertEqual(1, BlogPost.objects(author=me).count())
@@ -1886,12 +1909,12 @@ class BlogPost(Document):
 
         self.assertEqual(1, BlogPost.objects(author__in=[me]).count())
         self.assertEqual(1, BlogPost.objects(author__in=[me.pk]).count())
-        self.assertEqual(
-            1, BlogPost.objects(author__in=["%s" % me.pk]).count())
+        self.assertEqual(1, BlogPost.objects(author__in=["%s" % me.pk]).count())
 
     def test_reference_field_find_dbref(self):
         """Ensure cascading deletion of referring documents from the database.
         """
+
         class BlogPost(Document):
             content = StringField()
             author = ReferenceField(self.Person, dbref=True)
@@ -1899,7 +1922,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
         self.Person.drop_collection()
 
-        me = self.Person(name='Test User').save()
+        me = self.Person(name="Test User").save()
         BlogPost(content="test 123", author=me).save()
 
         self.assertEqual(1, BlogPost.objects(author=me).count())
@@ -1908,8 +1931,7 @@ class BlogPost(Document):
 
         self.assertEqual(1, BlogPost.objects(author__in=[me]).count())
         self.assertEqual(1, BlogPost.objects(author__in=[me.pk]).count())
-        self.assertEqual(
-            1, BlogPost.objects(author__in=["%s" % me.pk]).count())
+        self.assertEqual(1, BlogPost.objects(author__in=["%s" % me.pk]).count())
 
     def test_update_intfield_operator(self):
         class BlogPost(Document):
@@ -1946,7 +1968,7 @@ class BlogPost(Document):
         post = BlogPost(review=3.5)
         post.save()
 
-        BlogPost.objects.update_one(inc__review=0.1)             # test with floats
+        BlogPost.objects.update_one(inc__review=0.1)  # test with floats
         post.reload()
         self.assertEqual(float(post.review), 3.6)
 
@@ -1954,7 +1976,7 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(float(post.review), 3.5)
 
-        BlogPost.objects.update_one(inc__review=Decimal(0.12))   # test with Decimal
+        BlogPost.objects.update_one(inc__review=Decimal(0.12))  # test with Decimal
         post.reload()
         self.assertEqual(float(post.review), 3.62)
 
@@ -1972,38 +1994,39 @@ class BlogPost(Document):
         post.save()
 
         with self.assertRaises(OperationError):
-            BlogPost.objects.update_one(inc__review=0.1)             # test with floats
+            BlogPost.objects.update_one(inc__review=0.1)  # test with floats
 
     def test_update_listfield_operator(self):
         """Ensure that atomic updates work properly.
         """
+
         class BlogPost(Document):
             tags = ListField(StringField())
 
         BlogPost.drop_collection()
 
-        post = BlogPost(tags=['test'])
+        post = BlogPost(tags=["test"])
         post.save()
 
         # ListField operator
-        BlogPost.objects.update(push__tags='mongo')
+        BlogPost.objects.update(push__tags="mongo")
         post.reload()
-        self.assertIn('mongo', post.tags)
+        self.assertIn("mongo", post.tags)
 
-        BlogPost.objects.update_one(push_all__tags=['db', 'nosql'])
+        BlogPost.objects.update_one(push_all__tags=["db", "nosql"])
         post.reload()
-        self.assertIn('db', post.tags)
-        self.assertIn('nosql', post.tags)
+        self.assertIn("db", post.tags)
+        self.assertIn("nosql", post.tags)
 
         tags = post.tags[:-1]
         BlogPost.objects.update(pop__tags=1)
         post.reload()
         self.assertEqual(post.tags, tags)
 
-        BlogPost.objects.update_one(add_to_set__tags='unique')
-        BlogPost.objects.update_one(add_to_set__tags='unique')
+        BlogPost.objects.update_one(add_to_set__tags="unique")
+        BlogPost.objects.update_one(add_to_set__tags="unique")
         post.reload()
-        self.assertEqual(post.tags.count('unique'), 1)
+        self.assertEqual(post.tags.count("unique"), 1)
 
         BlogPost.drop_collection()
 
@@ -2013,18 +2036,19 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post = BlogPost(title='garbage').save()
+        post = BlogPost(title="garbage").save()
 
         self.assertNotEqual(post.title, None)
         BlogPost.objects.update_one(unset__title=1)
         post.reload()
         self.assertEqual(post.title, None)
         pymongo_doc = BlogPost.objects.as_pymongo().first()
-        self.assertNotIn('title', pymongo_doc)
+        self.assertNotIn("title", pymongo_doc)
 
     def test_update_push_with_position(self):
         """Ensure that the 'push' update with position works properly.
         """
+
         class BlogPost(Document):
             slug = StringField()
             tags = ListField(StringField())
@@ -2036,20 +2060,21 @@ class BlogPost(Document):
         BlogPost.objects.filter(id=post.id).update(push__tags="code")
         BlogPost.objects.filter(id=post.id).update(push__tags__0=["mongodb", "python"])
         post.reload()
-        self.assertEqual(post.tags, ['mongodb', 'python', 'code'])
+        self.assertEqual(post.tags, ["mongodb", "python", "code"])
 
         BlogPost.objects.filter(id=post.id).update(set__tags__2="java")
         post.reload()
-        self.assertEqual(post.tags, ['mongodb', 'python', 'java'])
+        self.assertEqual(post.tags, ["mongodb", "python", "java"])
 
         # test push with singular value
-        BlogPost.objects.filter(id=post.id).update(push__tags__0='scala')
+        BlogPost.objects.filter(id=post.id).update(push__tags__0="scala")
         post.reload()
-        self.assertEqual(post.tags, ['scala', 'mongodb', 'python', 'java'])
+        self.assertEqual(post.tags, ["scala", "mongodb", "python", "java"])
 
     def test_update_push_list_of_list(self):
         """Ensure that the 'push' update operation works in the list of list
         """
+
         class BlogPost(Document):
             slug = StringField()
             tags = ListField()
@@ -2065,6 +2090,7 @@ class BlogPost(Document):
     def test_update_push_and_pull_add_to_set(self):
         """Ensure that the 'pull' update operation works correctly.
         """
+
         class BlogPost(Document):
             slug = StringField()
             tags = ListField(StringField())
@@ -2078,8 +2104,7 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.tags, ["code"])
 
-        BlogPost.objects.filter(id=post.id).update(
-            push_all__tags=["mongodb", "code"])
+        BlogPost.objects.filter(id=post.id).update(push_all__tags=["mongodb", "code"])
         post.reload()
         self.assertEqual(post.tags, ["code", "mongodb", "code"])
 
@@ -2087,13 +2112,13 @@ class BlogPost(Document):
         post.reload()
         self.assertEqual(post.tags, ["mongodb"])
 
-        BlogPost.objects(slug="test").update(
-            pull_all__tags=["mongodb", "code"])
+        BlogPost.objects(slug="test").update(pull_all__tags=["mongodb", "code"])
         post.reload()
         self.assertEqual(post.tags, [])
 
         BlogPost.objects(slug="test").update(
-            __raw__={"$addToSet": {"tags": {"$each": ["code", "mongodb", "code"]}}})
+            __raw__={"$addToSet": {"tags": {"$each": ["code", "mongodb", "code"]}}}
+        )
         post.reload()
         self.assertEqual(post.tags, ["code", "mongodb"])
 
@@ -2101,13 +2126,13 @@ def test_add_to_set_each(self):
         class Item(Document):
             name = StringField(required=True)
             description = StringField(max_length=50)
-            parents = ListField(ReferenceField('self'))
+            parents = ListField(ReferenceField("self"))
 
         Item.drop_collection()
 
-        item = Item(name='test item').save()
-        parent_1 = Item(name='parent 1').save()
-        parent_2 = Item(name='parent 2').save()
+        item = Item(name="test item").save()
+        parent_1 = Item(name="parent 1").save()
+        parent_2 = Item(name="parent 2").save()
 
         item.update(add_to_set__parents=[parent_1, parent_2, parent_1])
         item.reload()
@@ -2115,12 +2140,11 @@ class Item(Document):
         self.assertEqual([parent_1, parent_2], item.parents)
 
     def test_pull_nested(self):
-
         class Collaborator(EmbeddedDocument):
             user = StringField()
 
             def __unicode__(self):
-                return '%s' % self.user
+                return "%s" % self.user
 
         class Site(Document):
             name = StringField(max_length=75, unique=True, required=True)
@@ -2128,23 +2152,21 @@ class Site(Document):
 
         Site.drop_collection()
 
-        c = Collaborator(user='Esteban')
+        c = Collaborator(user="Esteban")
         s = Site(name="test", collaborators=[c]).save()
 
-        Site.objects(id=s.id).update_one(pull__collaborators__user='Esteban')
+        Site.objects(id=s.id).update_one(pull__collaborators__user="Esteban")
         self.assertEqual(Site.objects.first().collaborators, [])
 
         with self.assertRaises(InvalidQueryError):
-            Site.objects(id=s.id).update_one(
-                pull_all__collaborators__user=['Ross'])
+            Site.objects(id=s.id).update_one(pull_all__collaborators__user=["Ross"])
 
     def test_pull_from_nested_embedded(self):
-
         class User(EmbeddedDocument):
             name = StringField()
 
             def __unicode__(self):
-                return '%s' % self.name
+                return "%s" % self.name
 
         class Collaborator(EmbeddedDocument):
             helpful = ListField(EmbeddedDocumentField(User))
@@ -2156,21 +2178,24 @@ class Site(Document):
 
         Site.drop_collection()
 
-        c = User(name='Esteban')
-        f = User(name='Frank')
-        s = Site(name="test", collaborators=Collaborator(
-            helpful=[c], unhelpful=[f])).save()
+        c = User(name="Esteban")
+        f = User(name="Frank")
+        s = Site(
+            name="test", collaborators=Collaborator(helpful=[c], unhelpful=[f])
+        ).save()
 
         Site.objects(id=s.id).update_one(pull__collaborators__helpful=c)
-        self.assertEqual(Site.objects.first().collaborators['helpful'], [])
+        self.assertEqual(Site.objects.first().collaborators["helpful"], [])
 
         Site.objects(id=s.id).update_one(
-            pull__collaborators__unhelpful={'name': 'Frank'})
-        self.assertEqual(Site.objects.first().collaborators['unhelpful'], [])
+            pull__collaborators__unhelpful={"name": "Frank"}
+        )
+        self.assertEqual(Site.objects.first().collaborators["unhelpful"], [])
 
         with self.assertRaises(InvalidQueryError):
             Site.objects(id=s.id).update_one(
-                pull_all__collaborators__helpful__name=['Ross'])
+                pull_all__collaborators__helpful__name=["Ross"]
+            )
 
     def test_pull_from_nested_embedded_using_in_nin(self):
         """Ensure that the 'pull' update operation works on embedded documents using 'in' and 'nin' operators.
@@ -2180,7 +2205,7 @@ class User(EmbeddedDocument):
             name = StringField()
 
             def __unicode__(self):
-                return '%s' % self.name
+                return "%s" % self.name
 
         class Collaborator(EmbeddedDocument):
             helpful = ListField(EmbeddedDocumentField(User))
@@ -2192,60 +2217,62 @@ class Site(Document):
 
         Site.drop_collection()
 
-        a = User(name='Esteban')
-        b = User(name='Frank')
-        x = User(name='Harry')
-        y = User(name='John')
+        a = User(name="Esteban")
+        b = User(name="Frank")
+        x = User(name="Harry")
+        y = User(name="John")
 
-        s = Site(name="test", collaborators=Collaborator(
-            helpful=[a, b], unhelpful=[x, y])).save()
+        s = Site(
+            name="test", collaborators=Collaborator(helpful=[a, b], unhelpful=[x, y])
+        ).save()
 
-        Site.objects(id=s.id).update_one(pull__collaborators__helpful__name__in=['Esteban'])  # Pull a
-        self.assertEqual(Site.objects.first().collaborators['helpful'], [b])
+        Site.objects(id=s.id).update_one(
+            pull__collaborators__helpful__name__in=["Esteban"]
+        )  # Pull a
+        self.assertEqual(Site.objects.first().collaborators["helpful"], [b])
 
-        Site.objects(id=s.id).update_one(pull__collaborators__unhelpful__name__nin=['John'])  # Pull x
-        self.assertEqual(Site.objects.first().collaborators['unhelpful'], [y])
+        Site.objects(id=s.id).update_one(
+            pull__collaborators__unhelpful__name__nin=["John"]
+        )  # Pull x
+        self.assertEqual(Site.objects.first().collaborators["unhelpful"], [y])
 
     def test_pull_from_nested_mapfield(self):
-
         class Collaborator(EmbeddedDocument):
             user = StringField()
 
             def __unicode__(self):
-                return '%s' % self.user
+                return "%s" % self.user
 
         class Site(Document):
             name = StringField(max_length=75, unique=True, required=True)
-            collaborators = MapField(
-                ListField(EmbeddedDocumentField(Collaborator)))
+            collaborators = MapField(ListField(EmbeddedDocumentField(Collaborator)))
 
         Site.drop_collection()
 
-        c = Collaborator(user='Esteban')
-        f = Collaborator(user='Frank')
-        s = Site(name="test", collaborators={'helpful': [c], 'unhelpful': [f]})
+        c = Collaborator(user="Esteban")
+        f = Collaborator(user="Frank")
+        s = Site(name="test", collaborators={"helpful": [c], "unhelpful": [f]})
         s.save()
 
-        Site.objects(id=s.id).update_one(
-            pull__collaborators__helpful__user='Esteban')
-        self.assertEqual(Site.objects.first().collaborators['helpful'], [])
+        Site.objects(id=s.id).update_one(pull__collaborators__helpful__user="Esteban")
+        self.assertEqual(Site.objects.first().collaborators["helpful"], [])
 
         Site.objects(id=s.id).update_one(
-            pull__collaborators__unhelpful={'user': 'Frank'})
-        self.assertEqual(Site.objects.first().collaborators['unhelpful'], [])
+            pull__collaborators__unhelpful={"user": "Frank"}
+        )
+        self.assertEqual(Site.objects.first().collaborators["unhelpful"], [])
 
         with self.assertRaises(InvalidQueryError):
             Site.objects(id=s.id).update_one(
-                pull_all__collaborators__helpful__user=['Ross'])
+                pull_all__collaborators__helpful__user=["Ross"]
+            )
 
     def test_pull_in_genericembedded_field(self):
-
         class Foo(EmbeddedDocument):
             name = StringField()
 
         class Bar(Document):
-            foos = ListField(GenericEmbeddedDocumentField(
-                choices=[Foo, ]))
+            foos = ListField(GenericEmbeddedDocumentField(choices=[Foo]))
 
         Bar.drop_collection()
 
@@ -2261,15 +2288,14 @@ class BlogTag(Document):
 
         BlogTag.drop_collection()
 
-        BlogTag(name='garbage').save()
-        default_update = BlogTag.objects.update_one(name='new')
+        BlogTag(name="garbage").save()
+        default_update = BlogTag.objects.update_one(name="new")
         self.assertEqual(default_update, 1)
 
-        full_result_update = BlogTag.objects.update_one(name='new', full_result=True)
+        full_result_update = BlogTag.objects.update_one(name="new", full_result=True)
         self.assertIsInstance(full_result_update, UpdateResult)
 
     def test_update_one_pop_generic_reference(self):
-
         class BlogTag(Document):
             name = StringField(required=True)
 
@@ -2280,9 +2306,9 @@ class BlogPost(Document):
         BlogPost.drop_collection()
         BlogTag.drop_collection()
 
-        tag_1 = BlogTag(name='code')
+        tag_1 = BlogTag(name="code")
         tag_1.save()
-        tag_2 = BlogTag(name='mongodb')
+        tag_2 = BlogTag(name="mongodb")
         tag_2.save()
 
         post = BlogPost(slug="test", tags=[tag_1])
@@ -2301,7 +2327,6 @@ class BlogPost(Document):
         BlogTag.drop_collection()
 
     def test_editting_embedded_objects(self):
-
         class BlogTag(EmbeddedDocument):
             name = StringField(required=True)
 
@@ -2311,8 +2336,8 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        tag_1 = BlogTag(name='code')
-        tag_2 = BlogTag(name='mongodb')
+        tag_1 = BlogTag(name="code")
+        tag_2 = BlogTag(name="mongodb")
 
         post = BlogPost(slug="test", tags=[tag_1])
         post.save()
@@ -2323,7 +2348,7 @@ class BlogPost(Document):
 
         BlogPost.objects(slug="test-2").update_one(set__tags__0__name="python")
         post.reload()
-        self.assertEqual(post.tags[0].name, 'python')
+        self.assertEqual(post.tags[0].name, "python")
 
         BlogPost.objects(slug="test-2").update_one(pop__tags=-1)
         post.reload()
@@ -2332,13 +2357,12 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
     def test_set_list_embedded_documents(self):
-
         class Author(EmbeddedDocument):
             name = StringField()
 
         class Message(Document):
             title = StringField()
-            authors = ListField(EmbeddedDocumentField('Author'))
+            authors = ListField(EmbeddedDocumentField("Author"))
 
         Message.drop_collection()
 
@@ -2346,15 +2370,19 @@ class Message(Document):
         message.save()
 
         Message.objects(authors__name="Harry").update_one(
-            set__authors__S=Author(name="Ross"))
+            set__authors__S=Author(name="Ross")
+        )
 
         message = message.reload()
         self.assertEqual(message.authors[0].name, "Ross")
 
         Message.objects(authors__name="Ross").update_one(
-            set__authors=[Author(name="Harry"),
-                          Author(name="Ross"),
-                          Author(name="Adam")])
+            set__authors=[
+                Author(name="Harry"),
+                Author(name="Ross"),
+                Author(name="Adam"),
+            ]
+        )
 
         message = message.reload()
         self.assertEqual(message.authors[0].name, "Harry")
@@ -2362,7 +2390,6 @@ class Message(Document):
         self.assertEqual(message.authors[2].name, "Adam")
 
     def test_set_generic_embedded_documents(self):
-
         class Bar(EmbeddedDocument):
             name = StringField()
 
@@ -2372,15 +2399,13 @@ class User(Document):
 
         User.drop_collection()
 
-        User(username='abc').save()
-        User.objects(username='abc').update(
-            set__bar=Bar(name='test'), upsert=True)
+        User(username="abc").save()
+        User.objects(username="abc").update(set__bar=Bar(name="test"), upsert=True)
 
-        user = User.objects(username='abc').first()
+        user = User.objects(username="abc").first()
         self.assertEqual(user.bar.name, "test")
 
     def test_reload_embedded_docs_instance(self):
-
         class SubDoc(EmbeddedDocument):
             val = IntField()
 
@@ -2393,7 +2418,6 @@ class Doc(Document):
         self.assertEqual(doc.pk, doc.embedded._instance.pk)
 
     def test_reload_list_embedded_docs_instance(self):
-
         class SubDoc(EmbeddedDocument):
             val = IntField()
 
@@ -2412,16 +2436,16 @@ def test_order_by(self):
         self.Person(name="User A", age=20).save()
         self.Person(name="User C", age=30).save()
 
-        names = [p.name for p in self.Person.objects.order_by('-age')]
-        self.assertEqual(names, ['User B', 'User C', 'User A'])
+        names = [p.name for p in self.Person.objects.order_by("-age")]
+        self.assertEqual(names, ["User B", "User C", "User A"])
 
-        names = [p.name for p in self.Person.objects.order_by('+age')]
-        self.assertEqual(names, ['User A', 'User C', 'User B'])
+        names = [p.name for p in self.Person.objects.order_by("+age")]
+        self.assertEqual(names, ["User A", "User C", "User B"])
 
-        names = [p.name for p in self.Person.objects.order_by('age')]
-        self.assertEqual(names, ['User A', 'User C', 'User B'])
+        names = [p.name for p in self.Person.objects.order_by("age")]
+        self.assertEqual(names, ["User A", "User C", "User B"])
 
-        ages = [p.age for p in self.Person.objects.order_by('-name')]
+        ages = [p.age for p in self.Person.objects.order_by("-name")]
         self.assertEqual(ages, [30, 40, 20])
 
     def test_order_by_optional(self):
@@ -2432,31 +2456,22 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         blog_post_3 = BlogPost.objects.create(
-            title="Blog Post #3",
-            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+            title="Blog Post #3", published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
         )
         blog_post_2 = BlogPost.objects.create(
-            title="Blog Post #2",
-            published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)
+            title="Blog Post #2", published_date=datetime.datetime(2010, 1, 5, 0, 0, 0)
         )
         blog_post_4 = BlogPost.objects.create(
-            title="Blog Post #4",
-            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
-        )
-        blog_post_1 = BlogPost.objects.create(
-            title="Blog Post #1",
-            published_date=None
+            title="Blog Post #4", published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
         )
+        blog_post_1 = BlogPost.objects.create(title="Blog Post #1", published_date=None)
 
         expected = [blog_post_1, blog_post_2, blog_post_3, blog_post_4]
-        self.assertSequence(BlogPost.objects.order_by('published_date'),
-                            expected)
-        self.assertSequence(BlogPost.objects.order_by('+published_date'),
-                            expected)
+        self.assertSequence(BlogPost.objects.order_by("published_date"), expected)
+        self.assertSequence(BlogPost.objects.order_by("+published_date"), expected)
 
         expected.reverse()
-        self.assertSequence(BlogPost.objects.order_by('-published_date'),
-                            expected)
+        self.assertSequence(BlogPost.objects.order_by("-published_date"), expected)
 
     def test_order_by_list(self):
         class BlogPost(Document):
@@ -2466,23 +2481,20 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         blog_post_1 = BlogPost.objects.create(
-            title="A",
-            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+            title="A", published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
         )
         blog_post_2 = BlogPost.objects.create(
-            title="B",
-            published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
+            title="B", published_date=datetime.datetime(2010, 1, 6, 0, 0, 0)
         )
         blog_post_3 = BlogPost.objects.create(
-            title="C",
-            published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
+            title="C", published_date=datetime.datetime(2010, 1, 7, 0, 0, 0)
         )
 
-        qs = BlogPost.objects.order_by('published_date', 'title')
+        qs = BlogPost.objects.order_by("published_date", "title")
         expected = [blog_post_1, blog_post_2, blog_post_3]
         self.assertSequence(qs, expected)
 
-        qs = BlogPost.objects.order_by('-published_date', '-title')
+        qs = BlogPost.objects.order_by("-published_date", "-title")
         expected.reverse()
         self.assertSequence(qs, expected)
 
@@ -2493,7 +2505,7 @@ def test_order_by_chaining(self):
         self.Person(name="User A", age=20).save()
         self.Person(name="User C", age=30).save()
 
-        only_age = self.Person.objects.order_by('-age').only('age')
+        only_age = self.Person.objects.order_by("-age").only("age")
 
         names = [p.name for p in only_age]
         ages = [p.age for p in only_age]
@@ -2502,19 +2514,19 @@ def test_order_by_chaining(self):
         self.assertEqual(names, [None, None, None])
         self.assertEqual(ages, [40, 30, 20])
 
-        qs = self.Person.objects.all().order_by('-age')
+        qs = self.Person.objects.all().order_by("-age")
         qs = qs.limit(10)
         ages = [p.age for p in qs]
         self.assertEqual(ages, [40, 30, 20])
 
         qs = self.Person.objects.all().limit(10)
-        qs = qs.order_by('-age')
+        qs = qs.order_by("-age")
 
         ages = [p.age for p in qs]
         self.assertEqual(ages, [40, 30, 20])
 
         qs = self.Person.objects.all().skip(0)
-        qs = qs.order_by('-age')
+        qs = qs.order_by("-age")
         ages = [p.age for p in qs]
         self.assertEqual(ages, [40, 30, 20])
 
@@ -2538,47 +2550,47 @@ class Author(Document):
         Author(author=person_b).save()
         Author(author=person_c).save()
 
-        names = [
-            a.author.name for a in Author.objects.order_by('-author__age')]
-        self.assertEqual(names, ['User A', 'User B', 'User C'])
+        names = [a.author.name for a in Author.objects.order_by("-author__age")]
+        self.assertEqual(names, ["User A", "User B", "User C"])
 
     def test_comment(self):
         """Make sure adding a comment to the query gets added to the query"""
         MONGO_VER = self.mongodb_version
         _, CMD_QUERY_KEY = get_key_compat(MONGO_VER)
-        QUERY_KEY = 'filter'
-        COMMENT_KEY = 'comment'
+        QUERY_KEY = "filter"
+        COMMENT_KEY = "comment"
 
         class User(Document):
             age = IntField()
 
         with db_ops_tracker() as q:
-            adult1 = (User.objects.filter(age__gte=18)
-                .comment('looking for an adult')
-                .first())
+            adult1 = (
+                User.objects.filter(age__gte=18).comment("looking for an adult").first()
+            )
 
-            adult2 = (User.objects.comment('looking for an adult')
-                .filter(age__gte=18)
-                .first())
+            adult2 = (
+                User.objects.comment("looking for an adult").filter(age__gte=18).first()
+            )
 
             ops = q.get_ops()
             self.assertEqual(len(ops), 2)
             for op in ops:
-                self.assertEqual(op[CMD_QUERY_KEY][QUERY_KEY], {'age': {'$gte': 18}})
-                self.assertEqual(op[CMD_QUERY_KEY][COMMENT_KEY], 'looking for an adult')
+                self.assertEqual(op[CMD_QUERY_KEY][QUERY_KEY], {"age": {"$gte": 18}})
+                self.assertEqual(op[CMD_QUERY_KEY][COMMENT_KEY], "looking for an adult")
 
     def test_map_reduce(self):
         """Ensure map/reduce is both mapping and reducing.
         """
+
         class BlogPost(Document):
             title = StringField()
-            tags = ListField(StringField(), db_field='post-tag-list')
+            tags = ListField(StringField(), db_field="post-tag-list")
 
         BlogPost.drop_collection()
 
-        BlogPost(title="Post #1", tags=['music', 'film', 'print']).save()
-        BlogPost(title="Post #2", tags=['music', 'film']).save()
-        BlogPost(title="Post #3", tags=['film', 'photography']).save()
+        BlogPost(title="Post #1", tags=["music", "film", "print"]).save()
+        BlogPost(title="Post #2", tags=["music", "film"]).save()
+        BlogPost(title="Post #3", tags=["film", "photography"]).save()
 
         map_f = """
             function() {
@@ -2628,8 +2640,8 @@ class BlogPost(Document):
         post2.save()
         post3.save()
 
-        self.assertEqual(BlogPost._fields['title'].db_field, '_id')
-        self.assertEqual(BlogPost._meta['id_field'], 'title')
+        self.assertEqual(BlogPost._fields["title"].db_field, "_id")
+        self.assertEqual(BlogPost._meta["id_field"], "title")
 
         map_f = """
             function() {
@@ -2661,16 +2673,14 @@ def test_map_reduce_custom_output(self):
         """
         Test map/reduce custom output
         """
-        register_connection('test2', 'mongoenginetest2')
+        register_connection("test2", "mongoenginetest2")
 
         class Family(Document):
-            id = IntField(
-                primary_key=True)
+            id = IntField(primary_key=True)
             log = StringField()
 
         class Person(Document):
-            id = IntField(
-                primary_key=True)
+            id = IntField(primary_key=True)
             name = StringField()
             age = IntField()
             family = ReferenceField(Family)
@@ -2745,7 +2755,8 @@ class Person(Document):
         cursor = Family.objects.map_reduce(
             map_f=map_family,
             reduce_f=reduce_f,
-            output={'replace': 'family_map', 'db_alias': 'test2'})
+            output={"replace": "family_map", "db_alias": "test2"},
+        )
 
         # start a map/reduce
         cursor.next()
@@ -2753,43 +2764,56 @@ class Person(Document):
         results = Person.objects.map_reduce(
             map_f=map_person,
             reduce_f=reduce_f,
-            output={'reduce': 'family_map', 'db_alias': 'test2'})
+            output={"reduce": "family_map", "db_alias": "test2"},
+        )
 
         results = list(results)
-        collection = get_db('test2').family_map
+        collection = get_db("test2").family_map
 
         self.assertEqual(
-            collection.find_one({'_id': 1}), {
-                '_id': 1,
-                'value': {
-                    'persons': [
-                        {'age': 21, 'name': u'Wilson Jr'},
-                        {'age': 45, 'name': u'Wilson Father'},
-                        {'age': 40, 'name': u'Eliana Costa'},
-                        {'age': 17, 'name': u'Tayza Mariana'}],
-                    'totalAge': 123}
-            })
+            collection.find_one({"_id": 1}),
+            {
+                "_id": 1,
+                "value": {
+                    "persons": [
+                        {"age": 21, "name": u"Wilson Jr"},
+                        {"age": 45, "name": u"Wilson Father"},
+                        {"age": 40, "name": u"Eliana Costa"},
+                        {"age": 17, "name": u"Tayza Mariana"},
+                    ],
+                    "totalAge": 123,
+                },
+            },
+        )
 
         self.assertEqual(
-            collection.find_one({'_id': 2}), {
-                '_id': 2,
-                'value': {
-                    'persons': [
-                        {'age': 16, 'name': u'Isabella Luanna'},
-                        {'age': 36, 'name': u'Sandra Mara'},
-                        {'age': 10, 'name': u'Igor Gabriel'}],
-                    'totalAge': 62}
-            })
+            collection.find_one({"_id": 2}),
+            {
+                "_id": 2,
+                "value": {
+                    "persons": [
+                        {"age": 16, "name": u"Isabella Luanna"},
+                        {"age": 36, "name": u"Sandra Mara"},
+                        {"age": 10, "name": u"Igor Gabriel"},
+                    ],
+                    "totalAge": 62,
+                },
+            },
+        )
 
         self.assertEqual(
-            collection.find_one({'_id': 3}), {
-                '_id': 3,
-                'value': {
-                    'persons': [
-                        {'age': 30, 'name': u'Arthur WA'},
-                        {'age': 25, 'name': u'Paula Leonel'}],
-                    'totalAge': 55}
-            })
+            collection.find_one({"_id": 3}),
+            {
+                "_id": 3,
+                "value": {
+                    "persons": [
+                        {"age": 30, "name": u"Arthur WA"},
+                        {"age": 25, "name": u"Paula Leonel"},
+                    ],
+                    "totalAge": 55,
+                },
+            },
+        )
 
     def test_map_reduce_finalize(self):
         """Ensure that map, reduce, and finalize run and introduce "scope"
@@ -2798,10 +2822,10 @@ def test_map_reduce_finalize(self):
         from time import mktime
 
         class Link(Document):
-            title = StringField(db_field='bpTitle')
+            title = StringField(db_field="bpTitle")
             up_votes = IntField()
             down_votes = IntField()
-            submitted = DateTimeField(db_field='sTime')
+            submitted = DateTimeField(db_field="sTime")
 
         Link.drop_collection()
 
@@ -2811,30 +2835,42 @@ class Link(Document):
         # Fri, 12 Feb 2010 14:36:00 -0600. Link ordering should
         # reflect order of insertion below, but is not influenced
         # by insertion order.
-        Link(title="Google Buzz auto-followed a woman's abusive ex ...",
-             up_votes=1079,
-             down_votes=553,
-             submitted=now - datetime.timedelta(hours=4)).save()
-        Link(title="We did it! Barbie is a computer engineer.",
-             up_votes=481,
-             down_votes=124,
-             submitted=now - datetime.timedelta(hours=2)).save()
-        Link(title="This Is A Mosquito Getting Killed By A Laser",
-             up_votes=1446,
-             down_votes=530,
-             submitted=now - datetime.timedelta(hours=13)).save()
-        Link(title="Arabic flashcards land physics student in jail.",
-             up_votes=215,
-             down_votes=105,
-             submitted=now - datetime.timedelta(hours=6)).save()
-        Link(title="The Burger Lab: Presenting, the Flood Burger",
-             up_votes=48,
-             down_votes=17,
-             submitted=now - datetime.timedelta(hours=5)).save()
-        Link(title="How to see polarization with the naked eye",
-             up_votes=74,
-             down_votes=13,
-             submitted=now - datetime.timedelta(hours=10)).save()
+        Link(
+            title="Google Buzz auto-followed a woman's abusive ex ...",
+            up_votes=1079,
+            down_votes=553,
+            submitted=now - datetime.timedelta(hours=4),
+        ).save()
+        Link(
+            title="We did it! Barbie is a computer engineer.",
+            up_votes=481,
+            down_votes=124,
+            submitted=now - datetime.timedelta(hours=2),
+        ).save()
+        Link(
+            title="This Is A Mosquito Getting Killed By A Laser",
+            up_votes=1446,
+            down_votes=530,
+            submitted=now - datetime.timedelta(hours=13),
+        ).save()
+        Link(
+            title="Arabic flashcards land physics student in jail.",
+            up_votes=215,
+            down_votes=105,
+            submitted=now - datetime.timedelta(hours=6),
+        ).save()
+        Link(
+            title="The Burger Lab: Presenting, the Flood Burger",
+            up_votes=48,
+            down_votes=17,
+            submitted=now - datetime.timedelta(hours=5),
+        ).save()
+        Link(
+            title="How to see polarization with the naked eye",
+            up_votes=74,
+            down_votes=13,
+            submitted=now - datetime.timedelta(hours=10),
+        ).save()
 
         map_f = """
             function() {
@@ -2885,17 +2921,15 @@ class Link(Document):
         # provide the reddit epoch (used for ranking) as a variable available
         # to all phases of the map/reduce operation: map, reduce, and finalize.
         reddit_epoch = mktime(datetime.datetime(2005, 12, 8, 7, 46, 43).timetuple())
-        scope = {'reddit_epoch': reddit_epoch}
+        scope = {"reddit_epoch": reddit_epoch}
 
         # run a map/reduce operation across all links. ordering is set
         # to "-value", which orders the "weight" value returned from
         # "finalize_f" in descending order.
         results = Link.objects.order_by("-value")
-        results = results.map_reduce(map_f,
-                                     reduce_f,
-                                     "myresults",
-                                     finalize_f=finalize_f,
-                                     scope=scope)
+        results = results.map_reduce(
+            map_f, reduce_f, "myresults", finalize_f=finalize_f, scope=scope
+        )
         results = list(results)
 
         # assert troublesome Buzz article is ranked 1st
@@ -2909,54 +2943,56 @@ class Link(Document):
     def test_item_frequencies(self):
         """Ensure that item frequencies are properly generated from lists.
         """
+
         class BlogPost(Document):
             hits = IntField()
-            tags = ListField(StringField(), db_field='blogTags')
+            tags = ListField(StringField(), db_field="blogTags")
 
         BlogPost.drop_collection()
 
-        BlogPost(hits=1, tags=['music', 'film', 'actors', 'watch']).save()
-        BlogPost(hits=2, tags=['music', 'watch']).save()
-        BlogPost(hits=2, tags=['music', 'actors']).save()
+        BlogPost(hits=1, tags=["music", "film", "actors", "watch"]).save()
+        BlogPost(hits=2, tags=["music", "watch"]).save()
+        BlogPost(hits=2, tags=["music", "actors"]).save()
 
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            self.assertEqual(
-                set(['music', 'film', 'actors', 'watch']), set(f.keys()))
-            self.assertEqual(f['music'], 3)
-            self.assertEqual(f['actors'], 2)
-            self.assertEqual(f['watch'], 2)
-            self.assertEqual(f['film'], 1)
-
-        exec_js = BlogPost.objects.item_frequencies('tags')
-        map_reduce = BlogPost.objects.item_frequencies('tags', map_reduce=True)
+            self.assertEqual(set(["music", "film", "actors", "watch"]), set(f.keys()))
+            self.assertEqual(f["music"], 3)
+            self.assertEqual(f["actors"], 2)
+            self.assertEqual(f["watch"], 2)
+            self.assertEqual(f["film"], 1)
+
+        exec_js = BlogPost.objects.item_frequencies("tags")
+        map_reduce = BlogPost.objects.item_frequencies("tags", map_reduce=True)
         test_assertions(exec_js)
         test_assertions(map_reduce)
 
         # Ensure query is taken into account
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            self.assertEqual(set(['music', 'actors', 'watch']), set(f.keys()))
-            self.assertEqual(f['music'], 2)
-            self.assertEqual(f['actors'], 1)
-            self.assertEqual(f['watch'], 1)
-
-        exec_js = BlogPost.objects(hits__gt=1).item_frequencies('tags')
-        map_reduce = BlogPost.objects(
-            hits__gt=1).item_frequencies('tags', map_reduce=True)
+            self.assertEqual(set(["music", "actors", "watch"]), set(f.keys()))
+            self.assertEqual(f["music"], 2)
+            self.assertEqual(f["actors"], 1)
+            self.assertEqual(f["watch"], 1)
+
+        exec_js = BlogPost.objects(hits__gt=1).item_frequencies("tags")
+        map_reduce = BlogPost.objects(hits__gt=1).item_frequencies(
+            "tags", map_reduce=True
+        )
         test_assertions(exec_js)
         test_assertions(map_reduce)
 
         # Check that normalization works
         def test_assertions(f):
-            self.assertAlmostEqual(f['music'], 3.0 / 8.0)
-            self.assertAlmostEqual(f['actors'], 2.0 / 8.0)
-            self.assertAlmostEqual(f['watch'], 2.0 / 8.0)
-            self.assertAlmostEqual(f['film'], 1.0 / 8.0)
+            self.assertAlmostEqual(f["music"], 3.0 / 8.0)
+            self.assertAlmostEqual(f["actors"], 2.0 / 8.0)
+            self.assertAlmostEqual(f["watch"], 2.0 / 8.0)
+            self.assertAlmostEqual(f["film"], 1.0 / 8.0)
 
-        exec_js = BlogPost.objects.item_frequencies('tags', normalize=True)
+        exec_js = BlogPost.objects.item_frequencies("tags", normalize=True)
         map_reduce = BlogPost.objects.item_frequencies(
-            'tags', normalize=True, map_reduce=True)
+            "tags", normalize=True, map_reduce=True
+        )
         test_assertions(exec_js)
         test_assertions(map_reduce)
 
@@ -2966,8 +3002,8 @@ def test_assertions(f):
             self.assertEqual(f[1], 1)
             self.assertEqual(f[2], 2)
 
-        exec_js = BlogPost.objects.item_frequencies('hits')
-        map_reduce = BlogPost.objects.item_frequencies('hits', map_reduce=True)
+        exec_js = BlogPost.objects.item_frequencies("hits")
+        map_reduce = BlogPost.objects.item_frequencies("hits", map_reduce=True)
         test_assertions(exec_js)
         test_assertions(map_reduce)
 
@@ -2987,57 +3023,56 @@ class Person(Document):
         Person.drop_collection()
 
         doc = Person(name="Guido")
-        doc.phone = Phone(number='62-3331-1656')
+        doc.phone = Phone(number="62-3331-1656")
         doc.save()
 
         doc = Person(name="Marr")
-        doc.phone = Phone(number='62-3331-1656')
+        doc.phone = Phone(number="62-3331-1656")
         doc.save()
 
         doc = Person(name="WP Junior")
-        doc.phone = Phone(number='62-3332-1656')
+        doc.phone = Phone(number="62-3332-1656")
         doc.save()
 
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            self.assertEqual(
-                set(['62-3331-1656', '62-3332-1656']), set(f.keys()))
-            self.assertEqual(f['62-3331-1656'], 2)
-            self.assertEqual(f['62-3332-1656'], 1)
+            self.assertEqual(set(["62-3331-1656", "62-3332-1656"]), set(f.keys()))
+            self.assertEqual(f["62-3331-1656"], 2)
+            self.assertEqual(f["62-3332-1656"], 1)
 
-        exec_js = Person.objects.item_frequencies('phone.number')
-        map_reduce = Person.objects.item_frequencies(
-            'phone.number', map_reduce=True)
+        exec_js = Person.objects.item_frequencies("phone.number")
+        map_reduce = Person.objects.item_frequencies("phone.number", map_reduce=True)
         test_assertions(exec_js)
         test_assertions(map_reduce)
 
         # Ensure query is taken into account
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            self.assertEqual(set(['62-3331-1656']), set(f.keys()))
-            self.assertEqual(f['62-3331-1656'], 2)
+            self.assertEqual(set(["62-3331-1656"]), set(f.keys()))
+            self.assertEqual(f["62-3331-1656"], 2)
 
-        exec_js = Person.objects(
-            phone__number='62-3331-1656').item_frequencies('phone.number')
-        map_reduce = Person.objects(
-            phone__number='62-3331-1656').item_frequencies('phone.number', map_reduce=True)
+        exec_js = Person.objects(phone__number="62-3331-1656").item_frequencies(
+            "phone.number"
+        )
+        map_reduce = Person.objects(phone__number="62-3331-1656").item_frequencies(
+            "phone.number", map_reduce=True
+        )
         test_assertions(exec_js)
         test_assertions(map_reduce)
 
         # Check that normalization works
         def test_assertions(f):
-            self.assertEqual(f['62-3331-1656'], 2.0 / 3.0)
-            self.assertEqual(f['62-3332-1656'], 1.0 / 3.0)
+            self.assertEqual(f["62-3331-1656"], 2.0 / 3.0)
+            self.assertEqual(f["62-3332-1656"], 1.0 / 3.0)
 
-        exec_js = Person.objects.item_frequencies(
-            'phone.number', normalize=True)
+        exec_js = Person.objects.item_frequencies("phone.number", normalize=True)
         map_reduce = Person.objects.item_frequencies(
-            'phone.number', normalize=True, map_reduce=True)
+            "phone.number", normalize=True, map_reduce=True
+        )
         test_assertions(exec_js)
         test_assertions(map_reduce)
 
     def test_item_frequencies_null_values(self):
-
         class Person(Document):
             name = StringField()
             city = StringField()
@@ -3047,16 +3082,15 @@ class Person(Document):
         Person(name="Wilson Snr", city="CRB").save()
         Person(name="Wilson Jr").save()
 
-        freq = Person.objects.item_frequencies('city')
-        self.assertEqual(freq, {'CRB': 1.0, None: 1.0})
-        freq = Person.objects.item_frequencies('city', normalize=True)
-        self.assertEqual(freq, {'CRB': 0.5, None: 0.5})
+        freq = Person.objects.item_frequencies("city")
+        self.assertEqual(freq, {"CRB": 1.0, None: 1.0})
+        freq = Person.objects.item_frequencies("city", normalize=True)
+        self.assertEqual(freq, {"CRB": 0.5, None: 0.5})
 
-        freq = Person.objects.item_frequencies('city', map_reduce=True)
-        self.assertEqual(freq, {'CRB': 1.0, None: 1.0})
-        freq = Person.objects.item_frequencies(
-            'city', normalize=True, map_reduce=True)
-        self.assertEqual(freq, {'CRB': 0.5, None: 0.5})
+        freq = Person.objects.item_frequencies("city", map_reduce=True)
+        self.assertEqual(freq, {"CRB": 1.0, None: 1.0})
+        freq = Person.objects.item_frequencies("city", normalize=True, map_reduce=True)
+        self.assertEqual(freq, {"CRB": 0.5, None: 0.5})
 
     def test_item_frequencies_with_null_embedded(self):
         class Data(EmbeddedDocument):
@@ -3080,11 +3114,11 @@ class Person(Document):
         p.extra = Extra(tag="friend")
         p.save()
 
-        ot = Person.objects.item_frequencies('extra.tag', map_reduce=False)
-        self.assertEqual(ot, {None: 1.0, u'friend': 1.0})
+        ot = Person.objects.item_frequencies("extra.tag", map_reduce=False)
+        self.assertEqual(ot, {None: 1.0, u"friend": 1.0})
 
-        ot = Person.objects.item_frequencies('extra.tag', map_reduce=True)
-        self.assertEqual(ot, {None: 1.0, u'friend': 1.0})
+        ot = Person.objects.item_frequencies("extra.tag", map_reduce=True)
+        self.assertEqual(ot, {None: 1.0, u"friend": 1.0})
 
     def test_item_frequencies_with_0_values(self):
         class Test(Document):
@@ -3095,9 +3129,9 @@ class Test(Document):
         t.val = 0
         t.save()
 
-        ot = Test.objects.item_frequencies('val', map_reduce=True)
+        ot = Test.objects.item_frequencies("val", map_reduce=True)
         self.assertEqual(ot, {0: 1})
-        ot = Test.objects.item_frequencies('val', map_reduce=False)
+        ot = Test.objects.item_frequencies("val", map_reduce=False)
         self.assertEqual(ot, {0: 1})
 
     def test_item_frequencies_with_False_values(self):
@@ -3109,9 +3143,9 @@ class Test(Document):
         t.val = False
         t.save()
 
-        ot = Test.objects.item_frequencies('val', map_reduce=True)
+        ot = Test.objects.item_frequencies("val", map_reduce=True)
         self.assertEqual(ot, {False: 1})
-        ot = Test.objects.item_frequencies('val', map_reduce=False)
+        ot = Test.objects.item_frequencies("val", map_reduce=False)
         self.assertEqual(ot, {False: 1})
 
     def test_item_frequencies_normalize(self):
@@ -3126,113 +3160,108 @@ class Test(Document):
         for i in range(20):
             Test(val=2).save()
 
-        freqs = Test.objects.item_frequencies(
-            'val', map_reduce=False, normalize=True)
+        freqs = Test.objects.item_frequencies("val", map_reduce=False, normalize=True)
         self.assertEqual(freqs, {1: 50.0 / 70, 2: 20.0 / 70})
 
-        freqs = Test.objects.item_frequencies(
-            'val', map_reduce=True, normalize=True)
+        freqs = Test.objects.item_frequencies("val", map_reduce=True, normalize=True)
         self.assertEqual(freqs, {1: 50.0 / 70, 2: 20.0 / 70})
 
     def test_average(self):
         """Ensure that field can be averaged correctly.
         """
-        self.Person(name='person', age=0).save()
-        self.assertEqual(int(self.Person.objects.average('age')), 0)
+        self.Person(name="person", age=0).save()
+        self.assertEqual(int(self.Person.objects.average("age")), 0)
 
         ages = [23, 54, 12, 94, 27]
         for i, age in enumerate(ages):
-            self.Person(name='test%s' % i, age=age).save()
+            self.Person(name="test%s" % i, age=age).save()
 
         avg = float(sum(ages)) / (len(ages) + 1)  # take into account the 0
-        self.assertAlmostEqual(int(self.Person.objects.average('age')), avg)
+        self.assertAlmostEqual(int(self.Person.objects.average("age")), avg)
 
-        self.Person(name='ageless person').save()
-        self.assertEqual(int(self.Person.objects.average('age')), avg)
+        self.Person(name="ageless person").save()
+        self.assertEqual(int(self.Person.objects.average("age")), avg)
 
         # dot notation
-        self.Person(
-            name='person meta', person_meta=self.PersonMeta(weight=0)).save()
+        self.Person(name="person meta", person_meta=self.PersonMeta(weight=0)).save()
         self.assertAlmostEqual(
-            int(self.Person.objects.average('person_meta.weight')), 0)
+            int(self.Person.objects.average("person_meta.weight")), 0
+        )
 
         for i, weight in enumerate(ages):
             self.Person(
-                name='test meta%i', person_meta=self.PersonMeta(weight=weight)).save()
+                name="test meta%i", person_meta=self.PersonMeta(weight=weight)
+            ).save()
 
         self.assertAlmostEqual(
-            int(self.Person.objects.average('person_meta.weight')), avg
+            int(self.Person.objects.average("person_meta.weight")), avg
         )
 
-        self.Person(name='test meta none').save()
-        self.assertEqual(
-            int(self.Person.objects.average('person_meta.weight')), avg
-        )
+        self.Person(name="test meta none").save()
+        self.assertEqual(int(self.Person.objects.average("person_meta.weight")), avg)
 
         # test summing over a filtered queryset
         over_50 = [a for a in ages if a >= 50]
         avg = float(sum(over_50)) / len(over_50)
-        self.assertEqual(
-            self.Person.objects.filter(age__gte=50).average('age'),
-            avg
-        )
+        self.assertEqual(self.Person.objects.filter(age__gte=50).average("age"), avg)
 
     def test_sum(self):
         """Ensure that field can be summed over correctly.
         """
         ages = [23, 54, 12, 94, 27]
         for i, age in enumerate(ages):
-            self.Person(name='test%s' % i, age=age).save()
+            self.Person(name="test%s" % i, age=age).save()
 
-        self.assertEqual(self.Person.objects.sum('age'), sum(ages))
+        self.assertEqual(self.Person.objects.sum("age"), sum(ages))
 
-        self.Person(name='ageless person').save()
-        self.assertEqual(self.Person.objects.sum('age'), sum(ages))
+        self.Person(name="ageless person").save()
+        self.assertEqual(self.Person.objects.sum("age"), sum(ages))
 
         for i, age in enumerate(ages):
-            self.Person(name='test meta%s' %
-                        i, person_meta=self.PersonMeta(weight=age)).save()
+            self.Person(
+                name="test meta%s" % i, person_meta=self.PersonMeta(weight=age)
+            ).save()
 
-        self.assertEqual(
-            self.Person.objects.sum('person_meta.weight'), sum(ages)
-        )
+        self.assertEqual(self.Person.objects.sum("person_meta.weight"), sum(ages))
 
-        self.Person(name='weightless person').save()
-        self.assertEqual(self.Person.objects.sum('age'), sum(ages))
+        self.Person(name="weightless person").save()
+        self.assertEqual(self.Person.objects.sum("age"), sum(ages))
 
         # test summing over a filtered queryset
         self.assertEqual(
-            self.Person.objects.filter(age__gte=50).sum('age'),
-            sum([a for a in ages if a >= 50])
+            self.Person.objects.filter(age__gte=50).sum("age"),
+            sum([a for a in ages if a >= 50]),
         )
 
     def test_sum_over_db_field(self):
         """Ensure that a field mapped to a db field with a different name
         can be summed over correctly.
         """
+
         class UserVisit(Document):
-            num_visits = IntField(db_field='visits')
+            num_visits = IntField(db_field="visits")
 
         UserVisit.drop_collection()
 
         UserVisit.objects.create(num_visits=10)
         UserVisit.objects.create(num_visits=5)
 
-        self.assertEqual(UserVisit.objects.sum('num_visits'), 15)
+        self.assertEqual(UserVisit.objects.sum("num_visits"), 15)
 
     def test_average_over_db_field(self):
         """Ensure that a field mapped to a db field with a different name
         can have its average computed correctly.
         """
+
         class UserVisit(Document):
-            num_visits = IntField(db_field='visits')
+            num_visits = IntField(db_field="visits")
 
         UserVisit.drop_collection()
 
         UserVisit.objects.create(num_visits=20)
         UserVisit.objects.create(num_visits=10)
 
-        self.assertEqual(UserVisit.objects.average('num_visits'), 15)
+        self.assertEqual(UserVisit.objects.average("num_visits"), 15)
 
     def test_embedded_average(self):
         class Pay(EmbeddedDocument):
@@ -3240,17 +3269,16 @@ class Pay(EmbeddedDocument):
 
         class Doc(Document):
             name = StringField()
-            pay = EmbeddedDocumentField(
-                Pay)
+            pay = EmbeddedDocumentField(Pay)
 
         Doc.drop_collection()
 
-        Doc(name='Wilson Junior', pay=Pay(value=150)).save()
-        Doc(name='Isabella Luanna', pay=Pay(value=530)).save()
-        Doc(name='Tayza mariana', pay=Pay(value=165)).save()
-        Doc(name='Eliana Costa', pay=Pay(value=115)).save()
+        Doc(name="Wilson Junior", pay=Pay(value=150)).save()
+        Doc(name="Isabella Luanna", pay=Pay(value=530)).save()
+        Doc(name="Tayza mariana", pay=Pay(value=165)).save()
+        Doc(name="Eliana Costa", pay=Pay(value=115)).save()
 
-        self.assertEqual(Doc.objects.average('pay.value'), 240)
+        self.assertEqual(Doc.objects.average("pay.value"), 240)
 
     def test_embedded_array_average(self):
         class Pay(EmbeddedDocument):
@@ -3262,12 +3290,12 @@ class Doc(Document):
 
         Doc.drop_collection()
 
-        Doc(name='Wilson Junior', pay=Pay(values=[150, 100])).save()
-        Doc(name='Isabella Luanna', pay=Pay(values=[530, 100])).save()
-        Doc(name='Tayza mariana', pay=Pay(values=[165, 100])).save()
-        Doc(name='Eliana Costa', pay=Pay(values=[115, 100])).save()
+        Doc(name="Wilson Junior", pay=Pay(values=[150, 100])).save()
+        Doc(name="Isabella Luanna", pay=Pay(values=[530, 100])).save()
+        Doc(name="Tayza mariana", pay=Pay(values=[165, 100])).save()
+        Doc(name="Eliana Costa", pay=Pay(values=[115, 100])).save()
 
-        self.assertEqual(Doc.objects.average('pay.values'), 170)
+        self.assertEqual(Doc.objects.average("pay.values"), 170)
 
     def test_array_average(self):
         class Doc(Document):
@@ -3280,7 +3308,7 @@ class Doc(Document):
         Doc(values=[165, 100]).save()
         Doc(values=[115, 100]).save()
 
-        self.assertEqual(Doc.objects.average('values'), 170)
+        self.assertEqual(Doc.objects.average("values"), 170)
 
     def test_embedded_sum(self):
         class Pay(EmbeddedDocument):
@@ -3292,12 +3320,12 @@ class Doc(Document):
 
         Doc.drop_collection()
 
-        Doc(name='Wilson Junior', pay=Pay(value=150)).save()
-        Doc(name='Isabella Luanna', pay=Pay(value=530)).save()
-        Doc(name='Tayza mariana', pay=Pay(value=165)).save()
-        Doc(name='Eliana Costa', pay=Pay(value=115)).save()
+        Doc(name="Wilson Junior", pay=Pay(value=150)).save()
+        Doc(name="Isabella Luanna", pay=Pay(value=530)).save()
+        Doc(name="Tayza mariana", pay=Pay(value=165)).save()
+        Doc(name="Eliana Costa", pay=Pay(value=115)).save()
 
-        self.assertEqual(Doc.objects.sum('pay.value'), 960)
+        self.assertEqual(Doc.objects.sum("pay.value"), 960)
 
     def test_embedded_array_sum(self):
         class Pay(EmbeddedDocument):
@@ -3309,12 +3337,12 @@ class Doc(Document):
 
         Doc.drop_collection()
 
-        Doc(name='Wilson Junior', pay=Pay(values=[150, 100])).save()
-        Doc(name='Isabella Luanna', pay=Pay(values=[530, 100])).save()
-        Doc(name='Tayza mariana', pay=Pay(values=[165, 100])).save()
-        Doc(name='Eliana Costa', pay=Pay(values=[115, 100])).save()
+        Doc(name="Wilson Junior", pay=Pay(values=[150, 100])).save()
+        Doc(name="Isabella Luanna", pay=Pay(values=[530, 100])).save()
+        Doc(name="Tayza mariana", pay=Pay(values=[165, 100])).save()
+        Doc(name="Eliana Costa", pay=Pay(values=[115, 100])).save()
 
-        self.assertEqual(Doc.objects.sum('pay.values'), 1360)
+        self.assertEqual(Doc.objects.sum("pay.values"), 1360)
 
     def test_array_sum(self):
         class Doc(Document):
@@ -3327,21 +3355,24 @@ class Doc(Document):
         Doc(values=[165, 100]).save()
         Doc(values=[115, 100]).save()
 
-        self.assertEqual(Doc.objects.sum('values'), 1360)
+        self.assertEqual(Doc.objects.sum("values"), 1360)
 
     def test_distinct(self):
         """Ensure that the QuerySet.distinct method works.
         """
-        self.Person(name='Mr Orange', age=20).save()
-        self.Person(name='Mr White', age=20).save()
-        self.Person(name='Mr Orange', age=30).save()
-        self.Person(name='Mr Pink', age=30).save()
-        self.assertEqual(set(self.Person.objects.distinct('name')),
-                         set(['Mr Orange', 'Mr White', 'Mr Pink']))
-        self.assertEqual(set(self.Person.objects.distinct('age')),
-                         set([20, 30]))
-        self.assertEqual(set(self.Person.objects(age=30).distinct('name')),
-                         set(['Mr Orange', 'Mr Pink']))
+        self.Person(name="Mr Orange", age=20).save()
+        self.Person(name="Mr White", age=20).save()
+        self.Person(name="Mr Orange", age=30).save()
+        self.Person(name="Mr Pink", age=30).save()
+        self.assertEqual(
+            set(self.Person.objects.distinct("name")),
+            set(["Mr Orange", "Mr White", "Mr Pink"]),
+        )
+        self.assertEqual(set(self.Person.objects.distinct("age")), set([20, 30]))
+        self.assertEqual(
+            set(self.Person.objects(age=30).distinct("name")),
+            set(["Mr Orange", "Mr Pink"]),
+        )
 
     def test_distinct_handles_references(self):
         class Foo(Document):
@@ -3367,53 +3398,58 @@ class News(Document):
             content = StringField()
             is_active = BooleanField(default=True)
 
-            meta = {'indexes': [
-                {'fields': ['$title', "$content"],
-                 'default_language': 'portuguese',
-                 'weights': {'title': 10, 'content': 2}
-                 }
-            ]}
+            meta = {
+                "indexes": [
+                    {
+                        "fields": ["$title", "$content"],
+                        "default_language": "portuguese",
+                        "weights": {"title": 10, "content": 2},
+                    }
+                ]
+            }
 
         News.drop_collection()
         info = News.objects._collection.index_information()
-        self.assertIn('title_text_content_text', info)
-        self.assertIn('textIndexVersion', info['title_text_content_text'])
+        self.assertIn("title_text_content_text", info)
+        self.assertIn("textIndexVersion", info["title_text_content_text"])
 
-        News(title="Neymar quebrou a vertebra",
-             content="O Brasil sofre com a perda de Neymar").save()
+        News(
+            title="Neymar quebrou a vertebra",
+            content="O Brasil sofre com a perda de Neymar",
+        ).save()
 
-        News(title="Brasil passa para as quartas de finais",
-             content="Com o brasil nas quartas de finais teremos um "
-             "jogo complicado com a alemanha").save()
+        News(
+            title="Brasil passa para as quartas de finais",
+            content="Com o brasil nas quartas de finais teremos um "
+            "jogo complicado com a alemanha",
+        ).save()
 
-        count = News.objects.search_text(
-            "neymar", language="portuguese").count()
+        count = News.objects.search_text("neymar", language="portuguese").count()
 
         self.assertEqual(count, 1)
 
-        count = News.objects.search_text(
-            "brasil -neymar").count()
+        count = News.objects.search_text("brasil -neymar").count()
 
         self.assertEqual(count, 1)
 
-        News(title=u"As eleições no Brasil já estão em planejamento",
-             content=u"A candidata dilma roussef já começa o teu planejamento",
-             is_active=False).save()
+        News(
+            title=u"As eleições no Brasil já estão em planejamento",
+            content=u"A candidata dilma roussef já começa o teu planejamento",
+            is_active=False,
+        ).save()
 
-        new = News.objects(is_active=False).search_text(
-            "dilma", language="pt").first()
+        new = News.objects(is_active=False).search_text("dilma", language="pt").first()
 
-        query = News.objects(is_active=False).search_text(
-            "dilma", language="pt")._query
+        query = News.objects(is_active=False).search_text("dilma", language="pt")._query
 
         self.assertEqual(
-            query, {'$text': {
-                '$search': 'dilma', '$language': 'pt'},
-                'is_active': False})
+            query,
+            {"$text": {"$search": "dilma", "$language": "pt"}, "is_active": False},
+        )
 
         self.assertFalse(new.is_active)
-        self.assertIn('dilma', new.content)
-        self.assertIn('planejamento', new.title)
+        self.assertIn("dilma", new.content)
+        self.assertIn("planejamento", new.title)
 
         query = News.objects.search_text("candidata")
         self.assertEqual(query._search_text, "candidata")
@@ -3422,15 +3458,14 @@ class News(Document):
         self.assertIsInstance(new.get_text_score(), float)
 
         # count
-        query = News.objects.search_text('brasil').order_by('$text_score')
+        query = News.objects.search_text("brasil").order_by("$text_score")
         self.assertEqual(query._search_text, "brasil")
 
         self.assertEqual(query.count(), 3)
-        self.assertEqual(query._query, {'$text': {'$search': 'brasil'}})
+        self.assertEqual(query._query, {"$text": {"$search": "brasil"}})
         cursor_args = query._cursor_args
-        cursor_args_fields = cursor_args['projection']
-        self.assertEqual(
-            cursor_args_fields, {'_text_score': {'$meta': 'textScore'}})
+        cursor_args_fields = cursor_args["projection"]
+        self.assertEqual(cursor_args_fields, {"_text_score": {"$meta": "textScore"}})
 
         text_scores = [i.get_text_score() for i in query]
         self.assertEqual(len(text_scores), 3)
@@ -3440,20 +3475,19 @@ class News(Document):
         max_text_score = text_scores[0]
 
         # get item
-        item = News.objects.search_text(
-            'brasil').order_by('$text_score').first()
+        item = News.objects.search_text("brasil").order_by("$text_score").first()
         self.assertEqual(item.get_text_score(), max_text_score)
 
     def test_distinct_handles_references_to_alias(self):
-        register_connection('testdb', 'mongoenginetest2')
+        register_connection("testdb", "mongoenginetest2")
 
         class Foo(Document):
             bar = ReferenceField("Bar")
-            meta = {'db_alias': 'testdb'}
+            meta = {"db_alias": "testdb"}
 
         class Bar(Document):
             text = StringField()
-            meta = {'db_alias': 'testdb'}
+            meta = {"db_alias": "testdb"}
 
         Bar.drop_collection()
         Foo.drop_collection()
@@ -3469,8 +3503,9 @@ class Bar(Document):
     def test_distinct_handles_db_field(self):
         """Ensure that distinct resolves field name to db_field as expected.
         """
+
         class Product(Document):
-            product_id = IntField(db_field='pid')
+            product_id = IntField(db_field="pid")
 
         Product.drop_collection()
 
@@ -3478,15 +3513,12 @@ class Product(Document):
         Product(product_id=2).save()
         Product(product_id=1).save()
 
-        self.assertEqual(set(Product.objects.distinct('product_id')),
-                         set([1, 2]))
-        self.assertEqual(set(Product.objects.distinct('pid')),
-                         set([1, 2]))
+        self.assertEqual(set(Product.objects.distinct("product_id")), set([1, 2]))
+        self.assertEqual(set(Product.objects.distinct("pid")), set([1, 2]))
 
         Product.drop_collection()
 
     def test_distinct_ListField_EmbeddedDocumentField(self):
-
         class Author(EmbeddedDocument):
             name = StringField()
 
@@ -3524,8 +3556,8 @@ class Book(Document):
 
         Book.drop_collection()
 
-        europe = Continent(continent_name='europe')
-        asia = Continent(continent_name='asia')
+        europe = Continent(continent_name="europe")
+        asia = Continent(continent_name="asia")
 
         scotland = Country(country_name="Scotland", continent=europe)
         tibet = Country(country_name="Tibet", continent=asia)
@@ -3544,13 +3576,12 @@ class Book(Document):
         self.assertEqual(continent_list, [europe, asia])
 
     def test_distinct_ListField_ReferenceField(self):
-
         class Bar(Document):
             text = StringField()
 
         class Foo(Document):
-            bar = ReferenceField('Bar')
-            bar_lst = ListField(ReferenceField('Bar'))
+            bar = ReferenceField("Bar")
+            bar_lst = ListField(ReferenceField("Bar"))
 
         Bar.drop_collection()
         Foo.drop_collection()
@@ -3569,6 +3600,7 @@ class Foo(Document):
     def test_custom_manager(self):
         """Ensure that custom QuerySetManager instances work as expected.
         """
+
         class BlogPost(Document):
             tags = ListField(StringField())
             deleted = BooleanField(default=False)
@@ -3586,32 +3618,30 @@ def objects_1_arg(qryset):
 
             @queryset_manager
             def music_posts(doc_cls, queryset, deleted=False):
-                return queryset(tags='music',
-                                deleted=deleted).order_by('date')
+                return queryset(tags="music", deleted=deleted).order_by("date")
 
         BlogPost.drop_collection()
 
-        post1 = BlogPost(tags=['music', 'film']).save()
-        post2 = BlogPost(tags=['music']).save()
-        post3 = BlogPost(tags=['film', 'actors']).save()
-        post4 = BlogPost(tags=['film', 'actors', 'music'], deleted=True).save()
+        post1 = BlogPost(tags=["music", "film"]).save()
+        post2 = BlogPost(tags=["music"]).save()
+        post3 = BlogPost(tags=["film", "actors"]).save()
+        post4 = BlogPost(tags=["film", "actors", "music"], deleted=True).save()
 
-        self.assertEqual([p.id for p in BlogPost.objects()],
-                         [post1.id, post2.id, post3.id])
-        self.assertEqual([p.id for p in BlogPost.objects_1_arg()],
-                         [post1.id, post2.id, post3.id])
-        self.assertEqual([p.id for p in BlogPost.music_posts()],
-                         [post1.id, post2.id])
+        self.assertEqual(
+            [p.id for p in BlogPost.objects()], [post1.id, post2.id, post3.id]
+        )
+        self.assertEqual(
+            [p.id for p in BlogPost.objects_1_arg()], [post1.id, post2.id, post3.id]
+        )
+        self.assertEqual([p.id for p in BlogPost.music_posts()], [post1.id, post2.id])
 
-        self.assertEqual([p.id for p in BlogPost.music_posts(True)],
-                         [post4.id])
+        self.assertEqual([p.id for p in BlogPost.music_posts(True)], [post4.id])
 
         BlogPost.drop_collection()
 
     def test_custom_manager_overriding_objects_works(self):
-
         class Foo(Document):
-            bar = StringField(default='bar')
+            bar = StringField(default="bar")
             active = BooleanField(default=False)
 
             @queryset_manager
@@ -3635,9 +3665,8 @@ def with_inactive(doc_cls, queryset):
         self.assertEqual(1, Foo.objects.count())
 
     def test_inherit_objects(self):
-
         class Foo(Document):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
             active = BooleanField(default=True)
 
             @queryset_manager
@@ -3652,9 +3681,8 @@ class Bar(Foo):
         self.assertEqual(0, Bar.objects.count())
 
     def test_inherit_objects_override(self):
-
         class Foo(Document):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
             active = BooleanField(default=True)
 
             @queryset_manager
@@ -3662,7 +3690,6 @@ def objects(klass, queryset):
                 return queryset(active=True)
 
         class Bar(Foo):
-
             @queryset_manager
             def objects(klass, queryset):
                 return queryset(active=False)
@@ -3675,12 +3702,13 @@ def objects(klass, queryset):
     def test_query_value_conversion(self):
         """Ensure that query values are properly converted when necessary.
         """
+
         class BlogPost(Document):
             author = ReferenceField(self.Person)
 
         BlogPost.drop_collection()
 
-        person = self.Person(name='test', age=30)
+        person = self.Person(name="test", age=30)
         person.save()
 
         post = BlogPost(author=person)
@@ -3701,14 +3729,15 @@ class BlogPost(Document):
     def test_update_value_conversion(self):
         """Ensure that values used in updates are converted before use.
         """
+
         class Group(Document):
             members = ListField(ReferenceField(self.Person))
 
         Group.drop_collection()
 
-        user1 = self.Person(name='user1')
+        user1 = self.Person(name="user1")
         user1.save()
-        user2 = self.Person(name='user2')
+        user2 = self.Person(name="user2")
         user2.save()
 
         group = Group()
@@ -3726,6 +3755,7 @@ class Group(Document):
     def test_bulk(self):
         """Ensure bulk querying by object id returns a proper dict.
         """
+
         class BlogPost(Document):
             title = StringField()
 
@@ -3764,13 +3794,13 @@ def tearDown(self):
     def test_custom_querysets(self):
         """Ensure that custom QuerySet classes may be used.
         """
-        class CustomQuerySet(QuerySet):
 
+        class CustomQuerySet(QuerySet):
             def not_empty(self):
                 return self.count() > 0
 
         class Post(Document):
-            meta = {'queryset_class': CustomQuerySet}
+            meta = {"queryset_class": CustomQuerySet}
 
         Post.drop_collection()
 
@@ -3787,7 +3817,6 @@ def test_custom_querysets_set_manager_directly(self):
         """
 
         class CustomQuerySet(QuerySet):
-
             def not_empty(self):
                 return self.count() > 0
 
@@ -3812,7 +3841,6 @@ def test_custom_querysets_managers_directly(self):
         """
 
         class CustomQuerySetManager(QuerySetManager):
-
             @staticmethod
             def get_queryset(doc_cls, queryset):
                 return queryset(is_published=True)
@@ -3835,12 +3863,11 @@ def test_custom_querysets_inherited(self):
         """
 
         class CustomQuerySet(QuerySet):
-
             def not_empty(self):
                 return self.count() > 0
 
         class Base(Document):
-            meta = {'abstract': True, 'queryset_class': CustomQuerySet}
+            meta = {"abstract": True, "queryset_class": CustomQuerySet}
 
         class Post(Base):
             pass
@@ -3859,7 +3886,6 @@ def test_custom_querysets_inherited_direct(self):
         """
 
         class CustomQuerySet(QuerySet):
-
             def not_empty(self):
                 return self.count() > 0
 
@@ -3867,7 +3893,7 @@ class CustomQuerySetManager(QuerySetManager):
             queryset_class = CustomQuerySet
 
         class Base(Document):
-            meta = {'abstract': True}
+            meta = {"abstract": True}
             objects = CustomQuerySetManager()
 
         class Post(Base):
@@ -3891,10 +3917,13 @@ class Post(Document):
         for i in range(10):
             Post(title="Post %s" % i).save()
 
-        self.assertEqual(5, Post.objects.limit(5).skip(5).count(with_limit_and_skip=True))
+        self.assertEqual(
+            5, Post.objects.limit(5).skip(5).count(with_limit_and_skip=True)
+        )
 
         self.assertEqual(
-            10, Post.objects.limit(5).skip(5).count(with_limit_and_skip=False))
+            10, Post.objects.limit(5).skip(5).count(with_limit_and_skip=False)
+        )
 
     def test_count_and_none(self):
         """Test count works with None()"""
@@ -3916,11 +3945,12 @@ class B(EmbeddedDocument):
         class A(Document):
             b = ListField(EmbeddedDocumentField(B))
 
-        self.assertEqual(A.objects(b=[{'c': 'c'}]).count(), 0)
+        self.assertEqual(A.objects(b=[{"c": "c"}]).count(), 0)
 
     def test_call_after_limits_set(self):
         """Ensure that re-filtering after slicing works
         """
+
         class Post(Document):
             title = StringField()
 
@@ -3937,6 +3967,7 @@ class Post(Document):
     def test_order_then_filter(self):
         """Ensure that ordering still works after filtering.
         """
+
         class Number(Document):
             n = IntField()
 
@@ -3946,14 +3977,15 @@ class Number(Document):
         n1 = Number.objects.create(n=1)
 
         self.assertEqual(list(Number.objects), [n2, n1])
-        self.assertEqual(list(Number.objects.order_by('n')), [n1, n2])
-        self.assertEqual(list(Number.objects.order_by('n').filter()), [n1, n2])
+        self.assertEqual(list(Number.objects.order_by("n")), [n1, n2])
+        self.assertEqual(list(Number.objects.order_by("n").filter()), [n1, n2])
 
         Number.drop_collection()
 
     def test_clone(self):
         """Ensure that cloning clones complex querysets
         """
+
         class Number(Document):
             n = IntField()
 
@@ -3983,19 +4015,20 @@ class Number(Document):
     def test_using(self):
         """Ensure that switching databases for a queryset is possible
         """
+
         class Number2(Document):
             n = IntField()
 
         Number2.drop_collection()
-        with switch_db(Number2, 'test2') as Number2:
+        with switch_db(Number2, "test2") as Number2:
             Number2.drop_collection()
 
         for i in range(1, 10):
             t = Number2(n=i)
-            t.switch_db('test2')
+            t.switch_db("test2")
             t.save()
 
-        self.assertEqual(len(Number2.objects.using('test2')), 9)
+        self.assertEqual(len(Number2.objects.using("test2")), 9)
 
     def test_unset_reference(self):
         class Comment(Document):
@@ -4007,7 +4040,7 @@ class Post(Document):
         Comment.drop_collection()
         Post.drop_collection()
 
-        comment = Comment.objects.create(text='test')
+        comment = Comment.objects.create(text="test")
         post = Post.objects.create(comment=comment)
 
         self.assertEqual(post.comment, comment)
@@ -4020,7 +4053,7 @@ class Post(Document):
 
     def test_order_works_with_custom_db_field_names(self):
         class Number(Document):
-            n = IntField(db_field='number')
+            n = IntField(db_field="number")
 
         Number.drop_collection()
 
@@ -4028,13 +4061,14 @@ class Number(Document):
         n1 = Number.objects.create(n=1)
 
         self.assertEqual(list(Number.objects), [n2, n1])
-        self.assertEqual(list(Number.objects.order_by('n')), [n1, n2])
+        self.assertEqual(list(Number.objects.order_by("n")), [n1, n2])
 
         Number.drop_collection()
 
     def test_order_works_with_primary(self):
         """Ensure that order_by and primary work.
         """
+
         class Number(Document):
             n = IntField(primary_key=True)
 
@@ -4044,28 +4078,29 @@ class Number(Document):
         Number(n=2).save()
         Number(n=3).save()
 
-        numbers = [n.n for n in Number.objects.order_by('-n')]
+        numbers = [n.n for n in Number.objects.order_by("-n")]
         self.assertEqual([3, 2, 1], numbers)
 
-        numbers = [n.n for n in Number.objects.order_by('+n')]
+        numbers = [n.n for n in Number.objects.order_by("+n")]
         self.assertEqual([1, 2, 3], numbers)
         Number.drop_collection()
 
     def test_ensure_index(self):
         """Ensure that manual creation of indexes works.
         """
+
         class Comment(Document):
             message = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
-        Comment.ensure_index('message')
+        Comment.ensure_index("message")
 
         info = Comment.objects._collection.index_information()
-        info = [(value['key'],
-                 value.get('unique', False),
-                 value.get('sparse', False))
-                for key, value in iteritems(info)]
-        self.assertIn(([('_cls', 1), ('message', 1)], False, False), info)
+        info = [
+            (value["key"], value.get("unique", False), value.get("sparse", False))
+            for key, value in iteritems(info)
+        ]
+        self.assertIn(([("_cls", 1), ("message", 1)], False, False), info)
 
     def test_where(self):
         """Ensure that where clauses work.
@@ -4084,23 +4119,25 @@ class IntPair(Document):
         b.save()
         c.save()
 
-        query = IntPair.objects.where('this[~fielda] >= this[~fieldb]')
-        self.assertEqual(
-            'this["fielda"] >= this["fieldb"]', query._where_clause)
+        query = IntPair.objects.where("this[~fielda] >= this[~fieldb]")
+        self.assertEqual('this["fielda"] >= this["fieldb"]', query._where_clause)
         results = list(query)
         self.assertEqual(2, len(results))
         self.assertIn(a, results)
         self.assertIn(c, results)
 
-        query = IntPair.objects.where('this[~fielda] == this[~fieldb]')
+        query = IntPair.objects.where("this[~fielda] == this[~fieldb]")
         results = list(query)
         self.assertEqual(1, len(results))
         self.assertIn(a, results)
 
         query = IntPair.objects.where(
-            'function() { return this[~fielda] >= this[~fieldb] }')
+            "function() { return this[~fielda] >= this[~fieldb] }"
+        )
         self.assertEqual(
-            'function() { return this["fielda"] >= this["fieldb"] }', query._where_clause)
+            'function() { return this["fielda"] >= this["fieldb"] }',
+            query._where_clause,
+        )
         results = list(query)
         self.assertEqual(2, len(results))
         self.assertIn(a, results)
@@ -4110,7 +4147,6 @@ class IntPair(Document):
             list(IntPair.objects.where(fielda__gte=3))
 
     def test_scalar(self):
-
         class Organization(Document):
             name = StringField()
 
@@ -4127,13 +4163,13 @@ class User(Document):
 
         # Efficient way to get all unique organization names for a given
         # set of users (Pretend this has additional filtering.)
-        user_orgs = set(User.objects.scalar('organization'))
-        orgs = Organization.objects(id__in=user_orgs).scalar('name')
-        self.assertEqual(list(orgs), ['White House'])
+        user_orgs = set(User.objects.scalar("organization"))
+        orgs = Organization.objects(id__in=user_orgs).scalar("name")
+        self.assertEqual(list(orgs), ["White House"])
 
         # Efficient for generating listings, too.
-        orgs = Organization.objects.scalar('name').in_bulk(list(user_orgs))
-        user_map = User.objects.scalar('name', 'organization')
+        orgs = Organization.objects.scalar("name").in_bulk(list(user_orgs))
+        user_map = User.objects.scalar("name", "organization")
         user_listing = [(user, orgs[org]) for user, org in user_map]
         self.assertEqual([("Bob Dole", "White House")], user_listing)
 
@@ -4148,7 +4184,7 @@ class TestDoc(Document):
         TestDoc(x=20, y=False).save()
         TestDoc(x=30, y=True).save()
 
-        plist = list(TestDoc.objects.scalar('x', 'y'))
+        plist = list(TestDoc.objects.scalar("x", "y"))
 
         self.assertEqual(len(plist), 3)
         self.assertEqual(plist[0], (10, True))
@@ -4166,21 +4202,16 @@ class UserDoc(Document):
         UserDoc(name="Eliana", age=37).save()
         UserDoc(name="Tayza", age=15).save()
 
-        ulist = list(UserDoc.objects.scalar('name', 'age'))
+        ulist = list(UserDoc.objects.scalar("name", "age"))
 
-        self.assertEqual(ulist, [
-            (u'Wilson Jr', 19),
-            (u'Wilson', 43),
-            (u'Eliana', 37),
-            (u'Tayza', 15)])
+        self.assertEqual(
+            ulist,
+            [(u"Wilson Jr", 19), (u"Wilson", 43), (u"Eliana", 37), (u"Tayza", 15)],
+        )
 
-        ulist = list(UserDoc.objects.scalar('name').order_by('age'))
+        ulist = list(UserDoc.objects.scalar("name").order_by("age"))
 
-        self.assertEqual(ulist, [
-            (u'Tayza'),
-            (u'Wilson Jr'),
-            (u'Eliana'),
-            (u'Wilson')])
+        self.assertEqual(ulist, [(u"Tayza"), (u"Wilson Jr"), (u"Eliana"), (u"Wilson")])
 
     def test_scalar_embedded(self):
         class Profile(EmbeddedDocument):
@@ -4197,30 +4228,45 @@ class Person(Document):
 
         Person.drop_collection()
 
-        Person(profile=Profile(name="Wilson Jr", age=19),
-               locale=Locale(city="Corumba-GO", country="Brazil")).save()
+        Person(
+            profile=Profile(name="Wilson Jr", age=19),
+            locale=Locale(city="Corumba-GO", country="Brazil"),
+        ).save()
 
-        Person(profile=Profile(name="Gabriel Falcao", age=23),
-               locale=Locale(city="New York", country="USA")).save()
+        Person(
+            profile=Profile(name="Gabriel Falcao", age=23),
+            locale=Locale(city="New York", country="USA"),
+        ).save()
 
-        Person(profile=Profile(name="Lincoln de souza", age=28),
-               locale=Locale(city="Belo Horizonte", country="Brazil")).save()
+        Person(
+            profile=Profile(name="Lincoln de souza", age=28),
+            locale=Locale(city="Belo Horizonte", country="Brazil"),
+        ).save()
 
-        Person(profile=Profile(name="Walter cruz", age=30),
-               locale=Locale(city="Brasilia", country="Brazil")).save()
+        Person(
+            profile=Profile(name="Walter cruz", age=30),
+            locale=Locale(city="Brasilia", country="Brazil"),
+        ).save()
 
         self.assertEqual(
-            list(Person.objects.order_by(
-                'profile__age').scalar('profile__name')),
-            [u'Wilson Jr', u'Gabriel Falcao', u'Lincoln de souza', u'Walter cruz'])
-
-        ulist = list(Person.objects.order_by('locale.city')
-                     .scalar('profile__name', 'profile__age', 'locale__city'))
-        self.assertEqual(ulist,
-                         [(u'Lincoln de souza', 28, u'Belo Horizonte'),
-                          (u'Walter cruz', 30, u'Brasilia'),
-                          (u'Wilson Jr', 19, u'Corumba-GO'),
-                          (u'Gabriel Falcao', 23, u'New York')])
+            list(Person.objects.order_by("profile__age").scalar("profile__name")),
+            [u"Wilson Jr", u"Gabriel Falcao", u"Lincoln de souza", u"Walter cruz"],
+        )
+
+        ulist = list(
+            Person.objects.order_by("locale.city").scalar(
+                "profile__name", "profile__age", "locale__city"
+            )
+        )
+        self.assertEqual(
+            ulist,
+            [
+                (u"Lincoln de souza", 28, u"Belo Horizonte"),
+                (u"Walter cruz", 30, u"Brasilia"),
+                (u"Wilson Jr", 19, u"Corumba-GO"),
+                (u"Gabriel Falcao", 23, u"New York"),
+            ],
+        )
 
     def test_scalar_decimal(self):
         from decimal import Decimal
@@ -4230,10 +4276,10 @@ class Person(Document):
             rating = DecimalField()
 
         Person.drop_collection()
-        Person(name="Wilson Jr", rating=Decimal('1.0')).save()
+        Person(name="Wilson Jr", rating=Decimal("1.0")).save()
 
-        ulist = list(Person.objects.scalar('name', 'rating'))
-        self.assertEqual(ulist, [(u'Wilson Jr', Decimal('1.0'))])
+        ulist = list(Person.objects.scalar("name", "rating"))
+        self.assertEqual(ulist, [(u"Wilson Jr", Decimal("1.0"))])
 
     def test_scalar_reference_field(self):
         class State(Document):
@@ -4251,8 +4297,8 @@ class Person(Document):
 
         Person(name="Wilson JR", state=s1).save()
 
-        plist = list(Person.objects.scalar('name', 'state'))
-        self.assertEqual(plist, [(u'Wilson JR', s1)])
+        plist = list(Person.objects.scalar("name", "state"))
+        self.assertEqual(plist, [(u"Wilson JR", s1)])
 
     def test_scalar_generic_reference_field(self):
         class State(Document):
@@ -4270,8 +4316,8 @@ class Person(Document):
 
         Person(name="Wilson JR", state=s1).save()
 
-        plist = list(Person.objects.scalar('name', 'state'))
-        self.assertEqual(plist, [(u'Wilson JR', s1)])
+        plist = list(Person.objects.scalar("name", "state"))
+        self.assertEqual(plist, [(u"Wilson JR", s1)])
 
     def test_generic_reference_field_with_only_and_as_pymongo(self):
         class TestPerson(Document):
@@ -4284,26 +4330,32 @@ class TestActivity(Document):
         TestPerson.drop_collection()
         TestActivity.drop_collection()
 
-        person = TestPerson(name='owner')
+        person = TestPerson(name="owner")
         person.save()
 
-        a1 = TestActivity(name='a1', owner=person)
+        a1 = TestActivity(name="a1", owner=person)
         a1.save()
 
-        activity = TestActivity.objects(owner=person).scalar('id', 'owner').no_dereference().first()
+        activity = (
+            TestActivity.objects(owner=person)
+            .scalar("id", "owner")
+            .no_dereference()
+            .first()
+        )
         self.assertEqual(activity[0], a1.pk)
-        self.assertEqual(activity[1]['_ref'], DBRef('test_person', person.pk))
+        self.assertEqual(activity[1]["_ref"], DBRef("test_person", person.pk))
 
-        activity = TestActivity.objects(owner=person).only('id', 'owner')[0]
+        activity = TestActivity.objects(owner=person).only("id", "owner")[0]
         self.assertEqual(activity.pk, a1.pk)
         self.assertEqual(activity.owner, person)
 
-        activity = TestActivity.objects(owner=person).only('id', 'owner').as_pymongo().first()
-        self.assertEqual(activity['_id'], a1.pk)
-        self.assertTrue(activity['owner']['_ref'], DBRef('test_person', person.pk))
+        activity = (
+            TestActivity.objects(owner=person).only("id", "owner").as_pymongo().first()
+        )
+        self.assertEqual(activity["_id"], a1.pk)
+        self.assertTrue(activity["owner"]["_ref"], DBRef("test_person", person.pk))
 
     def test_scalar_db_field(self):
-
         class TestDoc(Document):
             x = IntField()
             y = BooleanField()
@@ -4314,14 +4366,13 @@ class TestDoc(Document):
         TestDoc(x=20, y=False).save()
         TestDoc(x=30, y=True).save()
 
-        plist = list(TestDoc.objects.scalar('x', 'y'))
+        plist = list(TestDoc.objects.scalar("x", "y"))
         self.assertEqual(len(plist), 3)
         self.assertEqual(plist[0], (10, True))
         self.assertEqual(plist[1], (20, False))
         self.assertEqual(plist[2], (30, True))
 
     def test_scalar_primary_key(self):
-
         class SettingValue(Document):
             key = StringField(primary_key=True)
             value = StringField()
@@ -4330,8 +4381,8 @@ class SettingValue(Document):
         s = SettingValue(key="test", value="test value")
         s.save()
 
-        val = SettingValue.objects.scalar('key', 'value')
-        self.assertEqual(list(val), [('test', 'test value')])
+        val = SettingValue.objects.scalar("key", "value")
+        self.assertEqual(list(val), [("test", "test value")])
 
     def test_scalar_cursor_behaviour(self):
         """Ensure that a query returns a valid set of results.
@@ -4342,83 +4393,94 @@ def test_scalar_cursor_behaviour(self):
         person2.save()
 
         # Find all people in the collection
-        people = self.Person.objects.scalar('name')
+        people = self.Person.objects.scalar("name")
         self.assertEqual(people.count(), 2)
         results = list(people)
         self.assertEqual(results[0], "User A")
         self.assertEqual(results[1], "User B")
 
         # Use a query to filter the people found to just person1
-        people = self.Person.objects(age=20).scalar('name')
+        people = self.Person.objects(age=20).scalar("name")
         self.assertEqual(people.count(), 1)
         person = people.next()
         self.assertEqual(person, "User A")
 
         # Test limit
-        people = list(self.Person.objects.limit(1).scalar('name'))
+        people = list(self.Person.objects.limit(1).scalar("name"))
         self.assertEqual(len(people), 1)
-        self.assertEqual(people[0], 'User A')
+        self.assertEqual(people[0], "User A")
 
         # Test skip
-        people = list(self.Person.objects.skip(1).scalar('name'))
+        people = list(self.Person.objects.skip(1).scalar("name"))
         self.assertEqual(len(people), 1)
-        self.assertEqual(people[0], 'User B')
+        self.assertEqual(people[0], "User B")
 
         person3 = self.Person(name="User C", age=40)
         person3.save()
 
         # Test slice limit
-        people = list(self.Person.objects[:2].scalar('name'))
+        people = list(self.Person.objects[:2].scalar("name"))
         self.assertEqual(len(people), 2)
-        self.assertEqual(people[0], 'User A')
-        self.assertEqual(people[1], 'User B')
+        self.assertEqual(people[0], "User A")
+        self.assertEqual(people[1], "User B")
 
         # Test slice skip
-        people = list(self.Person.objects[1:].scalar('name'))
+        people = list(self.Person.objects[1:].scalar("name"))
         self.assertEqual(len(people), 2)
-        self.assertEqual(people[0], 'User B')
-        self.assertEqual(people[1], 'User C')
+        self.assertEqual(people[0], "User B")
+        self.assertEqual(people[1], "User C")
 
         # Test slice limit and skip
-        people = list(self.Person.objects[1:2].scalar('name'))
+        people = list(self.Person.objects[1:2].scalar("name"))
         self.assertEqual(len(people), 1)
-        self.assertEqual(people[0], 'User B')
+        self.assertEqual(people[0], "User B")
 
-        people = list(self.Person.objects[1:1].scalar('name'))
+        people = list(self.Person.objects[1:1].scalar("name"))
         self.assertEqual(len(people), 0)
 
         # Test slice out of range
-        people = list(self.Person.objects.scalar('name')[80000:80001])
+        people = list(self.Person.objects.scalar("name")[80000:80001])
         self.assertEqual(len(people), 0)
 
         # Test larger slice __repr__
         self.Person.objects.delete()
         for i in range(55):
-            self.Person(name='A%s' % i, age=i).save()
+            self.Person(name="A%s" % i, age=i).save()
 
-        self.assertEqual(self.Person.objects.scalar('name').count(), 55)
+        self.assertEqual(self.Person.objects.scalar("name").count(), 55)
         self.assertEqual(
-            "A0", "%s" % self.Person.objects.order_by('name').scalar('name').first())
+            "A0", "%s" % self.Person.objects.order_by("name").scalar("name").first()
+        )
         self.assertEqual(
-            "A0", "%s" % self.Person.objects.scalar('name').order_by('name')[0])
+            "A0", "%s" % self.Person.objects.scalar("name").order_by("name")[0]
+        )
         if six.PY3:
-            self.assertEqual("['A1', 'A2']", "%s" % self.Person.objects.order_by(
-                'age').scalar('name')[1:3])
-            self.assertEqual("['A51', 'A52']", "%s" % self.Person.objects.order_by(
-                'age').scalar('name')[51:53])
+            self.assertEqual(
+                "['A1', 'A2']",
+                "%s" % self.Person.objects.order_by("age").scalar("name")[1:3],
+            )
+            self.assertEqual(
+                "['A51', 'A52']",
+                "%s" % self.Person.objects.order_by("age").scalar("name")[51:53],
+            )
         else:
-            self.assertEqual("[u'A1', u'A2']", "%s" % self.Person.objects.order_by(
-                'age').scalar('name')[1:3])
-            self.assertEqual("[u'A51', u'A52']", "%s" % self.Person.objects.order_by(
-                'age').scalar('name')[51:53])
+            self.assertEqual(
+                "[u'A1', u'A2']",
+                "%s" % self.Person.objects.order_by("age").scalar("name")[1:3],
+            )
+            self.assertEqual(
+                "[u'A51', u'A52']",
+                "%s" % self.Person.objects.order_by("age").scalar("name")[51:53],
+            )
 
         # with_id and in_bulk
-        person = self.Person.objects.order_by('name').first()
-        self.assertEqual("A0", "%s" %
-                         self.Person.objects.scalar('name').with_id(person.id))
+        person = self.Person.objects.order_by("name").first()
+        self.assertEqual(
+            "A0", "%s" % self.Person.objects.scalar("name").with_id(person.id)
+        )
 
-        pks = self.Person.objects.order_by('age').scalar('pk')[1:3]
-        names = self.Person.objects.scalar('name').in_bulk(list(pks)).values()
+        pks = self.Person.objects.order_by("age").scalar("pk")[1:3]
+        names = self.Person.objects.scalar("name").in_bulk(list(pks)).values()
         if six.PY3:
             expected = "['A1', 'A2']"
         else:
@@ -4430,51 +4492,61 @@ class Foo(EmbeddedDocument):
             shape = StringField()
             color = StringField()
             thick = BooleanField()
-            meta = {'allow_inheritance': False}
+            meta = {"allow_inheritance": False}
 
         class Bar(Document):
             foo = ListField(EmbeddedDocumentField(Foo))
-            meta = {'allow_inheritance': False}
+            meta = {"allow_inheritance": False}
 
         Bar.drop_collection()
 
-        b1 = Bar(foo=[Foo(shape="square", color="purple", thick=False),
-                      Foo(shape="circle", color="red", thick=True)])
+        b1 = Bar(
+            foo=[
+                Foo(shape="square", color="purple", thick=False),
+                Foo(shape="circle", color="red", thick=True),
+            ]
+        )
         b1.save()
 
-        b2 = Bar(foo=[Foo(shape="square", color="red", thick=True),
-                      Foo(shape="circle", color="purple", thick=False)])
+        b2 = Bar(
+            foo=[
+                Foo(shape="square", color="red", thick=True),
+                Foo(shape="circle", color="purple", thick=False),
+            ]
+        )
         b2.save()
 
-        b3 = Bar(foo=[Foo(shape="square", thick=True),
-                      Foo(shape="circle", color="purple", thick=False)])
+        b3 = Bar(
+            foo=[
+                Foo(shape="square", thick=True),
+                Foo(shape="circle", color="purple", thick=False),
+            ]
+        )
         b3.save()
 
-        ak = list(
-            Bar.objects(foo__match={'shape': "square", "color": "purple"}))
+        ak = list(Bar.objects(foo__match={"shape": "square", "color": "purple"}))
         self.assertEqual([b1], ak)
 
-        ak = list(
-            Bar.objects(foo__elemMatch={'shape': "square", "color": "purple"}))
+        ak = list(Bar.objects(foo__elemMatch={"shape": "square", "color": "purple"}))
         self.assertEqual([b1], ak)
 
         ak = list(Bar.objects(foo__match=Foo(shape="square", color="purple")))
         self.assertEqual([b1], ak)
 
         ak = list(
-            Bar.objects(foo__elemMatch={'shape': "square", "color__exists": True}))
+            Bar.objects(foo__elemMatch={"shape": "square", "color__exists": True})
+        )
         self.assertEqual([b1, b2], ak)
 
-        ak = list(
-            Bar.objects(foo__match={'shape': "square", "color__exists": True}))
+        ak = list(Bar.objects(foo__match={"shape": "square", "color__exists": True}))
         self.assertEqual([b1, b2], ak)
 
         ak = list(
-            Bar.objects(foo__elemMatch={'shape': "square", "color__exists": False}))
+            Bar.objects(foo__elemMatch={"shape": "square", "color__exists": False})
+        )
         self.assertEqual([b3], ak)
 
-        ak = list(
-            Bar.objects(foo__match={'shape': "square", "color__exists": False}))
+        ak = list(Bar.objects(foo__match={"shape": "square", "color__exists": False}))
         self.assertEqual([b3], ak)
 
     def test_upsert_includes_cls(self):
@@ -4485,24 +4557,25 @@ class Test(Document):
             test = StringField()
 
         Test.drop_collection()
-        Test.objects(test='foo').update_one(upsert=True, set__test='foo')
-        self.assertNotIn('_cls', Test._collection.find_one())
+        Test.objects(test="foo").update_one(upsert=True, set__test="foo")
+        self.assertNotIn("_cls", Test._collection.find_one())
 
         class Test(Document):
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
             test = StringField()
 
         Test.drop_collection()
 
-        Test.objects(test='foo').update_one(upsert=True, set__test='foo')
-        self.assertIn('_cls', Test._collection.find_one())
+        Test.objects(test="foo").update_one(upsert=True, set__test="foo")
+        self.assertIn("_cls", Test._collection.find_one())
 
     def test_update_upsert_looks_like_a_digit(self):
         class MyDoc(DynamicDocument):
             pass
+
         MyDoc.drop_collection()
         self.assertEqual(1, MyDoc.objects.update_one(upsert=True, inc__47=1))
-        self.assertEqual(MyDoc.objects.get()['47'], 1)
+        self.assertEqual(MyDoc.objects.get()["47"], 1)
 
     def test_dictfield_key_looks_like_a_digit(self):
         """Only should work with DictField even if they have numeric keys."""
@@ -4511,86 +4584,84 @@ class MyDoc(Document):
             test = DictField()
 
         MyDoc.drop_collection()
-        doc = MyDoc(test={'47': 1})
+        doc = MyDoc(test={"47": 1})
         doc.save()
-        self.assertEqual(MyDoc.objects.only('test__47').get().test['47'], 1)
+        self.assertEqual(MyDoc.objects.only("test__47").get().test["47"], 1)
 
     def test_read_preference(self):
         class Bar(Document):
             txt = StringField()
 
-            meta = {
-                'indexes': ['txt']
-            }
+            meta = {"indexes": ["txt"]}
 
         Bar.drop_collection()
         bars = list(Bar.objects(read_preference=ReadPreference.PRIMARY))
         self.assertEqual([], bars)
 
-        self.assertRaises(TypeError, Bar.objects, read_preference='Primary')
+        self.assertRaises(TypeError, Bar.objects, read_preference="Primary")
 
         # read_preference as a kwarg
         bars = Bar.objects(read_preference=ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._cursor._Cursor__read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
+        )
 
         # read_preference as a query set method
         bars = Bar.objects.read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._cursor._Cursor__read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
+        )
 
         # read_preference after skip
-        bars = Bar.objects.skip(1) \
-            .read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._cursor._Cursor__read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
+        bars = Bar.objects.skip(1).read_preference(ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
+        )
 
         # read_preference after limit
-        bars = Bar.objects.limit(1) \
-            .read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._cursor._Cursor__read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
+        bars = Bar.objects.limit(1).read_preference(ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
+        )
 
         # read_preference after order_by
-        bars = Bar.objects.order_by('txt') \
-            .read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._cursor._Cursor__read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
+        bars = Bar.objects.order_by("txt").read_preference(
+            ReadPreference.SECONDARY_PREFERRED
+        )
+        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
+        )
 
         # read_preference after hint
-        bars = Bar.objects.hint([('txt', 1)]) \
-            .read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._cursor._Cursor__read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
+        bars = Bar.objects.hint([("txt", 1)]).read_preference(
+            ReadPreference.SECONDARY_PREFERRED
+        )
+        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
+        self.assertEqual(
+            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
+        )
 
     def test_read_preference_aggregation_framework(self):
         class Bar(Document):
             txt = StringField()
 
-            meta = {
-                'indexes': ['txt']
-            }
+            meta = {"indexes": ["txt"]}
+
         # Aggregates with read_preference
-        bars = Bar.objects \
-                    .read_preference(ReadPreference.SECONDARY_PREFERRED) \
-                    .aggregate()
-        self.assertEqual(bars._CommandCursor__collection.read_preference,
-                         ReadPreference.SECONDARY_PREFERRED)
+        bars = Bar.objects.read_preference(
+            ReadPreference.SECONDARY_PREFERRED
+        ).aggregate()
+        self.assertEqual(
+            bars._CommandCursor__collection.read_preference,
+            ReadPreference.SECONDARY_PREFERRED,
+        )
 
     def test_json_simple(self):
-
         class Embedded(EmbeddedDocument):
             string = StringField()
 
@@ -4603,7 +4674,7 @@ class Doc(Document):
         Doc(string="Bye", embedded_field=Embedded(string="Bye")).save()
 
         Doc().save()
-        json_data = Doc.objects.to_json(sort_keys=True, separators=(',', ':'))
+        json_data = Doc.objects.to_json(sort_keys=True, separators=(",", ":"))
         doc_objects = list(Doc.objects)
 
         self.assertEqual(doc_objects, Doc.objects.from_json(json_data))
@@ -4616,33 +4687,34 @@ class Simple(Document):
             pass
 
         class Doc(Document):
-            string_field = StringField(default='1')
+            string_field = StringField(default="1")
             int_field = IntField(default=1)
             float_field = FloatField(default=1.1)
             boolean_field = BooleanField(default=True)
             datetime_field = DateTimeField(default=datetime.datetime.now)
             embedded_document_field = EmbeddedDocumentField(
-                EmbeddedDoc, default=lambda: EmbeddedDoc())
+                EmbeddedDoc, default=lambda: EmbeddedDoc()
+            )
             list_field = ListField(default=lambda: [1, 2, 3])
             dict_field = DictField(default=lambda: {"hello": "world"})
             objectid_field = ObjectIdField(default=ObjectId)
-            reference_field = ReferenceField(
-                Simple, default=lambda: Simple().save())
+            reference_field = ReferenceField(Simple, default=lambda: Simple().save())
             map_field = MapField(IntField(), default=lambda: {"simple": 1})
             decimal_field = DecimalField(default=1.0)
             complex_datetime_field = ComplexDateTimeField(default=datetime.datetime.now)
             url_field = URLField(default="http://mongoengine.org/")
             dynamic_field = DynamicField(default=1)
             generic_reference_field = GenericReferenceField(
-                default=lambda: Simple().save())
-            sorted_list_field = SortedListField(IntField(),
-                                                default=lambda: [1, 2, 3])
+                default=lambda: Simple().save()
+            )
+            sorted_list_field = SortedListField(IntField(), default=lambda: [1, 2, 3])
             email_field = EmailField(default="ross@example.com")
             geo_point_field = GeoPointField(default=lambda: [1, 2])
             sequence_field = SequenceField()
             uuid_field = UUIDField(default=uuid.uuid4)
             generic_embedded_document_field = GenericEmbeddedDocumentField(
-                default=lambda: EmbeddedDoc())
+                default=lambda: EmbeddedDoc()
+            )
 
         Simple.drop_collection()
         Doc.drop_collection()
@@ -4667,111 +4739,96 @@ class User(Document):
 
         User.drop_collection()
 
-        User.objects.create(id='Bob', name="Bob Dole", age=89, price=Decimal('1.11'))
+        User.objects.create(id="Bob", name="Bob Dole", age=89, price=Decimal("1.11"))
         User.objects.create(
-            id='Barak',
+            id="Barak",
             name="Barak Obama",
             age=51,
-            price=Decimal('2.22'),
-            last_login=LastLogin(
-                location='White House',
-                ip='104.107.108.116'
-            )
+            price=Decimal("2.22"),
+            last_login=LastLogin(location="White House", ip="104.107.108.116"),
         )
 
         results = User.objects.as_pymongo()
+        self.assertEqual(set(results[0].keys()), set(["_id", "name", "age", "price"]))
         self.assertEqual(
-            set(results[0].keys()),
-            set(['_id', 'name', 'age', 'price'])
-        )
-        self.assertEqual(
-            set(results[1].keys()),
-            set(['_id', 'name', 'age', 'price', 'last_login'])
+            set(results[1].keys()), set(["_id", "name", "age", "price", "last_login"])
         )
 
-        results = User.objects.only('id', 'name').as_pymongo()
-        self.assertEqual(set(results[0].keys()), set(['_id', 'name']))
+        results = User.objects.only("id", "name").as_pymongo()
+        self.assertEqual(set(results[0].keys()), set(["_id", "name"]))
 
-        users = User.objects.only('name', 'price').as_pymongo()
+        users = User.objects.only("name", "price").as_pymongo()
         results = list(users)
         self.assertIsInstance(results[0], dict)
         self.assertIsInstance(results[1], dict)
-        self.assertEqual(results[0]['name'], 'Bob Dole')
-        self.assertEqual(results[0]['price'], 1.11)
-        self.assertEqual(results[1]['name'], 'Barak Obama')
-        self.assertEqual(results[1]['price'], 2.22)
+        self.assertEqual(results[0]["name"], "Bob Dole")
+        self.assertEqual(results[0]["price"], 1.11)
+        self.assertEqual(results[1]["name"], "Barak Obama")
+        self.assertEqual(results[1]["price"], 2.22)
 
-        users = User.objects.only('name', 'last_login').as_pymongo()
+        users = User.objects.only("name", "last_login").as_pymongo()
         results = list(users)
         self.assertIsInstance(results[0], dict)
         self.assertIsInstance(results[1], dict)
-        self.assertEqual(results[0], {
-            '_id': 'Bob',
-            'name': 'Bob Dole'
-        })
-        self.assertEqual(results[1], {
-            '_id': 'Barak',
-            'name': 'Barak Obama',
-            'last_login': {
-                'location': 'White House',
-                'ip': '104.107.108.116'
-            }
-        })
+        self.assertEqual(results[0], {"_id": "Bob", "name": "Bob Dole"})
+        self.assertEqual(
+            results[1],
+            {
+                "_id": "Barak",
+                "name": "Barak Obama",
+                "last_login": {"location": "White House", "ip": "104.107.108.116"},
+            },
+        )
 
     def test_as_pymongo_returns_cls_attribute_when_using_inheritance(self):
         class User(Document):
             name = StringField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         User.drop_collection()
 
         user = User(name="Bob Dole").save()
         result = User.objects.as_pymongo().first()
-        self.assertEqual(
-            result,
-            {
-                '_cls': 'User',
-                '_id': user.id,
-                'name': 'Bob Dole'
-            }
-        )
+        self.assertEqual(result, {"_cls": "User", "_id": user.id, "name": "Bob Dole"})
 
     def test_as_pymongo_json_limit_fields(self):
-
         class User(Document):
             email = EmailField(unique=True, required=True)
-            password_hash = StringField(
-                db_field='password_hash', required=True)
-            password_salt = StringField(
-                db_field='password_salt', required=True)
+            password_hash = StringField(db_field="password_hash", required=True)
+            password_salt = StringField(db_field="password_salt", required=True)
 
         User.drop_collection()
-        User(email="ross@example.com", password_salt="SomeSalt",
-             password_hash="SomeHash").save()
+        User(
+            email="ross@example.com", password_salt="SomeSalt", password_hash="SomeHash"
+        ).save()
 
         serialized_user = User.objects.exclude(
-            'password_salt', 'password_hash').as_pymongo()[0]
-        self.assertEqual({'_id', 'email'}, set(serialized_user.keys()))
+            "password_salt", "password_hash"
+        ).as_pymongo()[0]
+        self.assertEqual({"_id", "email"}, set(serialized_user.keys()))
 
         serialized_user = User.objects.exclude(
-            'id', 'password_salt', 'password_hash').to_json()
+            "id", "password_salt", "password_hash"
+        ).to_json()
         self.assertEqual('[{"email": "ross@example.com"}]', serialized_user)
 
-        serialized_user = User.objects.only('email').as_pymongo()[0]
-        self.assertEqual({'_id', 'email'}, set(serialized_user.keys()))
+        serialized_user = User.objects.only("email").as_pymongo()[0]
+        self.assertEqual({"_id", "email"}, set(serialized_user.keys()))
 
-        serialized_user = User.objects.exclude(
-            'password_salt').only('email').as_pymongo()[0]
-        self.assertEqual({'_id', 'email'}, set(serialized_user.keys()))
+        serialized_user = (
+            User.objects.exclude("password_salt").only("email").as_pymongo()[0]
+        )
+        self.assertEqual({"_id", "email"}, set(serialized_user.keys()))
 
-        serialized_user = User.objects.exclude(
-            'password_salt', 'id').only('email').as_pymongo()[0]
-        self.assertEqual({'email'}, set(serialized_user.keys()))
+        serialized_user = (
+            User.objects.exclude("password_salt", "id").only("email").as_pymongo()[0]
+        )
+        self.assertEqual({"email"}, set(serialized_user.keys()))
 
-        serialized_user = User.objects.exclude(
-            'password_salt', 'id').only('email').to_json()
-        self.assertEqual('[{"email": "ross@example.com"}]',
-                         serialized_user)
+        serialized_user = (
+            User.objects.exclude("password_salt", "id").only("email").to_json()
+        )
+        self.assertEqual('[{"email": "ross@example.com"}]', serialized_user)
 
     def test_only_after_count(self):
         """Test that only() works after count()"""
@@ -4780,9 +4837,9 @@ class User(Document):
             name = StringField()
             age = IntField()
             address = StringField()
+
         User.drop_collection()
-        user = User(name="User", age=50,
-                    address="Moscow, Russia").save()
+        user = User(name="User", age=50, address="Moscow, Russia").save()
 
         user_queryset = User.objects(age=50)
 
@@ -4796,7 +4853,6 @@ class User(Document):
         self.assertEqual(result, {"_id": user.id, "name": "User", "age": 50})
 
     def test_no_dereference(self):
-
         class Organization(Document):
             name = StringField()
 
@@ -4842,12 +4898,14 @@ class User(Document):
         self.assertFalse(qs_no_deref._auto_dereference)
 
         # Make sure the instance field is different from the class field
-        instance_org_field = user_no_deref._fields['organization']
+        instance_org_field = user_no_deref._fields["organization"]
         self.assertIsNot(instance_org_field, cls_organization_field)
         self.assertFalse(instance_org_field._auto_dereference)
 
         self.assertIsInstance(user_no_deref.organization, DBRef)
-        self.assertTrue(cls_organization_field._auto_dereference, True)  # Make sure the class Field wasn't altered
+        self.assertTrue(
+            cls_organization_field._auto_dereference, True
+        )  # Make sure the class Field wasn't altered
 
     def test_no_dereference_no_side_effect_on_existing_instance(self):
         # Relates to issue #1677 - ensures no regression of the bug
@@ -4863,8 +4921,7 @@ class User(Document):
         Organization.drop_collection()
 
         org = Organization(name="whatever").save()
-        User(organization=org,
-             organization_gen=org).save()
+        User(organization=org, organization_gen=org).save()
 
         qs = User.objects()
         user = qs.first()
@@ -4873,7 +4930,7 @@ class User(Document):
         user_no_deref = qs_no_deref.first()
 
         # ReferenceField
-        no_derf_org = user_no_deref.organization    # was triggering the bug
+        no_derf_org = user_no_deref.organization  # was triggering the bug
         self.assertIsInstance(no_derf_org, DBRef)
         self.assertIsInstance(user.organization, Organization)
 
@@ -4883,7 +4940,6 @@ class User(Document):
         self.assertIsInstance(user.organization_gen, Organization)
 
     def test_no_dereference_embedded_doc(self):
-
         class User(Document):
             name = StringField()
 
@@ -4906,17 +4962,15 @@ class Organization(Document):
 
         member = Member(name="Flash", user=user)
 
-        company = Organization(name="Mongo Inc",
-                               ceo=user,
-                               member=member,
-                               admins=[user],
-                               members=[member])
+        company = Organization(
+            name="Mongo Inc", ceo=user, member=member, admins=[user], members=[member]
+        )
         company.save()
 
         org = Organization.objects().no_dereference().first()
 
-        self.assertNotEqual(id(org._fields['admins']), id(Organization.admins))
-        self.assertFalse(org._fields['admins']._auto_dereference)
+        self.assertNotEqual(id(org._fields["admins"]), id(Organization.admins))
+        self.assertFalse(org._fields["admins"]._auto_dereference)
 
         admin = org.admins[0]
         self.assertIsInstance(admin, DBRef)
@@ -4981,14 +5035,14 @@ class Person(Document):
 
         Person.drop_collection()
         qs = Person.objects.no_cache()
-        self.assertEqual(repr(qs), '[]')
+        self.assertEqual(repr(qs), "[]")
 
     def test_no_cached_on_a_cached_queryset_raise_error(self):
         class Person(Document):
             name = StringField()
 
         Person.drop_collection()
-        Person(name='a').save()
+        Person(name="a").save()
         qs = Person.objects()
         _ = list(qs)
         with self.assertRaises(OperationError) as ctx_err:
@@ -5008,7 +5062,6 @@ class Person(Document):
         self.assertIsInstance(qs, QuerySet)
 
     def test_cache_not_cloned(self):
-
         class User(Document):
             name = StringField()
 
@@ -5020,7 +5073,7 @@ def __unicode__(self):
         User(name="Alice").save()
         User(name="Bob").save()
 
-        users = User.objects.all().order_by('name')
+        users = User.objects.all().order_by("name")
         self.assertEqual("%s" % users, "[<User: Alice>, <User: Bob>]")
         self.assertEqual(2, len(users._result_cache))
 
@@ -5030,6 +5083,7 @@ def __unicode__(self):
 
     def test_no_cache(self):
         """Ensure you can add meta data to file"""
+
         class Noddy(Document):
             fields = DictField()
 
@@ -5063,7 +5117,7 @@ class Noddy(Document):
 
     def test_nested_queryset_iterator(self):
         # Try iterating the same queryset twice, nested.
-        names = ['Alice', 'Bob', 'Chuck', 'David', 'Eric', 'Francis', 'George']
+        names = ["Alice", "Bob", "Chuck", "David", "Eric", "Francis", "George"]
 
         class User(Document):
             name = StringField()
@@ -5076,7 +5130,7 @@ def __unicode__(self):
         for name in names:
             User(name=name).save()
 
-        users = User.objects.all().order_by('name')
+        users = User.objects.all().order_by("name")
         outer_count = 0
         inner_count = 0
         inner_total_count = 0
@@ -5114,7 +5168,7 @@ class A(Document):
             x = IntField()
             y = IntField()
 
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class B(A):
             z = IntField()
@@ -5151,6 +5205,7 @@ class C(B):
     def test_query_generic_embedded_document(self):
         """Ensure that querying sub field on generic_embedded_field works
         """
+
         class A(EmbeddedDocument):
             a_name = StringField()
 
@@ -5161,19 +5216,16 @@ class Doc(Document):
             document = GenericEmbeddedDocumentField(choices=(A, B))
 
         Doc.drop_collection()
-        Doc(document=A(a_name='A doc')).save()
-        Doc(document=B(b_name='B doc')).save()
+        Doc(document=A(a_name="A doc")).save()
+        Doc(document=B(b_name="B doc")).save()
 
         # Using raw in filter working fine
-        self.assertEqual(Doc.objects(
-            __raw__={'document.a_name': 'A doc'}).count(), 1)
-        self.assertEqual(Doc.objects(
-            __raw__={'document.b_name': 'B doc'}).count(), 1)
-        self.assertEqual(Doc.objects(document__a_name='A doc').count(), 1)
-        self.assertEqual(Doc.objects(document__b_name='B doc').count(), 1)
+        self.assertEqual(Doc.objects(__raw__={"document.a_name": "A doc"}).count(), 1)
+        self.assertEqual(Doc.objects(__raw__={"document.b_name": "B doc"}).count(), 1)
+        self.assertEqual(Doc.objects(document__a_name="A doc").count(), 1)
+        self.assertEqual(Doc.objects(document__b_name="B doc").count(), 1)
 
     def test_query_reference_to_custom_pk_doc(self):
-
         class A(Document):
             id = StringField(primary_key=True)
 
@@ -5183,7 +5235,7 @@ class B(Document):
         A.drop_collection()
         B.drop_collection()
 
-        a = A.objects.create(id='custom_id')
+        a = A.objects.create(id="custom_id")
         B.objects.create(a=a)
 
         self.assertEqual(B.objects.count(), 1)
@@ -5191,13 +5243,10 @@ class B(Document):
         self.assertEqual(B.objects.get(a=a.id).a, a)
 
     def test_cls_query_in_subclassed_docs(self):
-
         class Animal(Document):
             name = StringField()
 
-            meta = {
-                'allow_inheritance': True
-            }
+            meta = {"allow_inheritance": True}
 
         class Dog(Animal):
             pass
@@ -5205,21 +5254,23 @@ class Dog(Animal):
         class Cat(Animal):
             pass
 
-        self.assertEqual(Animal.objects(name='Charlie')._query, {
-            'name': 'Charlie',
-            '_cls': {'$in': ('Animal', 'Animal.Dog', 'Animal.Cat')}
-        })
-        self.assertEqual(Dog.objects(name='Charlie')._query, {
-            'name': 'Charlie',
-            '_cls': 'Animal.Dog'
-        })
-        self.assertEqual(Cat.objects(name='Charlie')._query, {
-            'name': 'Charlie',
-            '_cls': 'Animal.Cat'
-        })
+        self.assertEqual(
+            Animal.objects(name="Charlie")._query,
+            {
+                "name": "Charlie",
+                "_cls": {"$in": ("Animal", "Animal.Dog", "Animal.Cat")},
+            },
+        )
+        self.assertEqual(
+            Dog.objects(name="Charlie")._query,
+            {"name": "Charlie", "_cls": "Animal.Dog"},
+        )
+        self.assertEqual(
+            Cat.objects(name="Charlie")._query,
+            {"name": "Charlie", "_cls": "Animal.Cat"},
+        )
 
     def test_can_have_field_same_name_as_query_operator(self):
-
         class Size(Document):
             name = StringField()
 
@@ -5236,7 +5287,6 @@ class Example(Document):
         self.assertEqual(Example.objects(size__in=[instance_size]).count(), 1)
 
     def test_cursor_in_an_if_stmt(self):
-
         class Test(Document):
             test_field = StringField()
 
@@ -5244,23 +5294,23 @@ class Test(Document):
         queryset = Test.objects
 
         if queryset:
-            raise AssertionError('Empty cursor returns True')
+            raise AssertionError("Empty cursor returns True")
 
         test = Test()
-        test.test_field = 'test'
+        test.test_field = "test"
         test.save()
 
         queryset = Test.objects
         if not test:
-            raise AssertionError('Cursor has data and returned False')
+            raise AssertionError("Cursor has data and returned False")
 
         queryset.next()
         if not queryset:
-            raise AssertionError('Cursor has data and it must returns True,'
-                                 ' even in the last item.')
+            raise AssertionError(
+                "Cursor has data and it must returns True, even in the last item."
+            )
 
     def test_bool_performance(self):
-
         class Person(Document):
             name = StringField()
 
@@ -5273,10 +5323,11 @@ class Person(Document):
                 pass
 
             self.assertEqual(q, 1)
-            op = q.db.system.profile.find({"ns":
-                                           {"$ne": "%s.system.indexes" % q.db.name}})[0]
+            op = q.db.system.profile.find(
+                {"ns": {"$ne": "%s.system.indexes" % q.db.name}}
+            )[0]
 
-            self.assertEqual(op['nreturned'], 1)
+            self.assertEqual(op["nreturned"], 1)
 
     def test_bool_with_ordering(self):
         ORDER_BY_KEY, CMD_QUERY_KEY = get_key_compat(self.mongodb_version)
@@ -5289,26 +5340,28 @@ class Person(Document):
         Person(name="Test").save()
 
         # Check that bool(queryset) does not uses the orderby
-        qs = Person.objects.order_by('name')
+        qs = Person.objects.order_by("name")
         with query_counter() as q:
 
             if bool(qs):
                 pass
 
-            op = q.db.system.profile.find({"ns":
-                                           {"$ne": "%s.system.indexes" % q.db.name}})[0]
+            op = q.db.system.profile.find(
+                {"ns": {"$ne": "%s.system.indexes" % q.db.name}}
+            )[0]
 
             self.assertNotIn(ORDER_BY_KEY, op[CMD_QUERY_KEY])
 
         # Check that normal query uses orderby
-        qs2 = Person.objects.order_by('name')
+        qs2 = Person.objects.order_by("name")
         with query_counter() as q:
 
             for x in qs2:
                 pass
 
-            op = q.db.system.profile.find({"ns":
-                                           {"$ne": "%s.system.indexes" % q.db.name}})[0]
+            op = q.db.system.profile.find(
+                {"ns": {"$ne": "%s.system.indexes" % q.db.name}}
+            )[0]
 
             self.assertIn(ORDER_BY_KEY, op[CMD_QUERY_KEY])
 
@@ -5317,9 +5370,7 @@ def test_bool_with_ordering_from_meta_dict(self):
 
         class Person(Document):
             name = StringField()
-            meta = {
-                'ordering': ['name']
-            }
+            meta = {"ordering": ["name"]}
 
         Person.drop_collection()
 
@@ -5332,15 +5383,20 @@ class Person(Document):
             if Person.objects:
                 pass
 
-            op = q.db.system.profile.find({"ns":
-                                           {"$ne": "%s.system.indexes" % q.db.name}})[0]
+            op = q.db.system.profile.find(
+                {"ns": {"$ne": "%s.system.indexes" % q.db.name}}
+            )[0]
 
-            self.assertNotIn('$orderby', op[CMD_QUERY_KEY],
-                             'BaseQuerySet must remove orderby from meta in boolen test')
+            self.assertNotIn(
+                "$orderby",
+                op[CMD_QUERY_KEY],
+                "BaseQuerySet must remove orderby from meta in boolen test",
+            )
 
-            self.assertEqual(Person.objects.first().name, 'A')
-            self.assertTrue(Person.objects._has_data(),
-                            'Cursor has data and returned False')
+            self.assertEqual(Person.objects.first().name, "A")
+            self.assertTrue(
+                Person.objects._has_data(), "Cursor has data and returned False"
+            )
 
     def test_queryset_aggregation_framework(self):
         class Person(Document):
@@ -5355,40 +5411,44 @@ class Person(Document):
         Person.objects.insert([p1, p2, p3])
 
         data = Person.objects(age__lte=22).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
+            {"$project": {"name": {"$toUpper": "$name"}}}
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p1.pk, 'name': "ISABELLA LUANNA"},
-            {'_id': p2.pk, 'name': "WILSON JUNIOR"}
-        ])
+        self.assertEqual(
+            list(data),
+            [
+                {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+                {"_id": p2.pk, "name": "WILSON JUNIOR"},
+            ],
+        )
 
-        data = Person.objects(age__lte=22).order_by('-name').aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
+        data = (
+            Person.objects(age__lte=22)
+            .order_by("-name")
+            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p2.pk, 'name': "WILSON JUNIOR"},
-            {'_id': p1.pk, 'name': "ISABELLA LUANNA"}
-        ])
+        self.assertEqual(
+            list(data),
+            [
+                {"_id": p2.pk, "name": "WILSON JUNIOR"},
+                {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+            ],
+        )
 
-        data = Person.objects(age__gte=17, age__lte=40).order_by('-age').aggregate({
-            '$group': {
-                '_id': None,
-                'total': {'$sum': 1},
-                'avg': {'$avg': '$age'}
-            }
-        })
-        self.assertEqual(list(data), [
-            {'_id': None, 'avg': 29, 'total': 2}
-        ])
-
-        data = Person.objects().aggregate({'$match': {'name': 'Isabella Luanna'}})
-        self.assertEqual(list(data), [
-            {u'_id': p1.pk,
-             u'age': 16,
-             u'name': u'Isabella Luanna'}]
-                         )
+        data = (
+            Person.objects(age__gte=17, age__lte=40)
+            .order_by("-age")
+            .aggregate(
+                {"$group": {"_id": None, "total": {"$sum": 1}, "avg": {"$avg": "$age"}}}
+            )
+        )
+        self.assertEqual(list(data), [{"_id": None, "avg": 29, "total": 2}])
+
+        data = Person.objects().aggregate({"$match": {"name": "Isabella Luanna"}})
+        self.assertEqual(
+            list(data), [{u"_id": p1.pk, u"age": 16, u"name": u"Isabella Luanna"}]
+        )
 
     def test_queryset_aggregation_with_skip(self):
         class Person(Document):
@@ -5403,13 +5463,16 @@ class Person(Document):
         Person.objects.insert([p1, p2, p3])
 
         data = Person.objects.skip(1).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
+            {"$project": {"name": {"$toUpper": "$name"}}}
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p2.pk, 'name': "WILSON JUNIOR"},
-            {'_id': p3.pk, 'name': "SANDRA MARA"}
-        ])
+        self.assertEqual(
+            list(data),
+            [
+                {"_id": p2.pk, "name": "WILSON JUNIOR"},
+                {"_id": p3.pk, "name": "SANDRA MARA"},
+            ],
+        )
 
     def test_queryset_aggregation_with_limit(self):
         class Person(Document):
@@ -5424,12 +5487,10 @@ class Person(Document):
         Person.objects.insert([p1, p2, p3])
 
         data = Person.objects.limit(1).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
+            {"$project": {"name": {"$toUpper": "$name"}}}
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p1.pk, 'name': "ISABELLA LUANNA"}
-        ])
+        self.assertEqual(list(data), [{"_id": p1.pk, "name": "ISABELLA LUANNA"}])
 
     def test_queryset_aggregation_with_sort(self):
         class Person(Document):
@@ -5443,15 +5504,18 @@ class Person(Document):
         p3 = Person(name="Sandra Mara", age=37)
         Person.objects.insert([p1, p2, p3])
 
-        data = Person.objects.order_by('name').aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
+        data = Person.objects.order_by("name").aggregate(
+            {"$project": {"name": {"$toUpper": "$name"}}}
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p1.pk, 'name': "ISABELLA LUANNA"},
-            {'_id': p3.pk, 'name': "SANDRA MARA"},
-            {'_id': p2.pk, 'name': "WILSON JUNIOR"}
-        ])
+        self.assertEqual(
+            list(data),
+            [
+                {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+                {"_id": p3.pk, "name": "SANDRA MARA"},
+                {"_id": p2.pk, "name": "WILSON JUNIOR"},
+            ],
+        )
 
     def test_queryset_aggregation_with_skip_with_limit(self):
         class Person(Document):
@@ -5466,18 +5530,18 @@ class Person(Document):
         Person.objects.insert([p1, p2, p3])
 
         data = list(
-            Person.objects.skip(1).limit(1).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
-            )
+            Person.objects.skip(1)
+            .limit(1)
+            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p2.pk, 'name': "WILSON JUNIOR"},
-        ])
+        self.assertEqual(list(data), [{"_id": p2.pk, "name": "WILSON JUNIOR"}])
 
         # Make sure limit/skip chaining order has no impact
-        data2 = Person.objects.limit(1).skip(1).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
+        data2 = (
+            Person.objects.limit(1)
+            .skip(1)
+            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
         self.assertEqual(data, list(data2))
@@ -5494,34 +5558,40 @@ class Person(Document):
         p3 = Person(name="Sandra Mara", age=37)
         Person.objects.insert([p1, p2, p3])
 
-        data = Person.objects.order_by('name').limit(2).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
+        data = (
+            Person.objects.order_by("name")
+            .limit(2)
+            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p1.pk, 'name': "ISABELLA LUANNA"},
-            {'_id': p3.pk, 'name': "SANDRA MARA"}
-        ])
+        self.assertEqual(
+            list(data),
+            [
+                {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+                {"_id": p3.pk, "name": "SANDRA MARA"},
+            ],
+        )
 
         # Verify adding limit/skip steps works as expected
-        data = Person.objects.order_by('name').limit(2).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}},
-            {'$limit': 1},
+        data = (
+            Person.objects.order_by("name")
+            .limit(2)
+            .aggregate({"$project": {"name": {"$toUpper": "$name"}}}, {"$limit": 1})
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p1.pk, 'name': "ISABELLA LUANNA"},
-        ])
+        self.assertEqual(list(data), [{"_id": p1.pk, "name": "ISABELLA LUANNA"}])
 
-        data = Person.objects.order_by('name').limit(2).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}},
-            {'$skip': 1},
-            {'$limit': 1},
+        data = (
+            Person.objects.order_by("name")
+            .limit(2)
+            .aggregate(
+                {"$project": {"name": {"$toUpper": "$name"}}},
+                {"$skip": 1},
+                {"$limit": 1},
+            )
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p3.pk, 'name': "SANDRA MARA"},
-        ])
+        self.assertEqual(list(data), [{"_id": p3.pk, "name": "SANDRA MARA"}])
 
     def test_queryset_aggregation_with_sort_with_skip(self):
         class Person(Document):
@@ -5535,13 +5605,13 @@ class Person(Document):
         p3 = Person(name="Sandra Mara", age=37)
         Person.objects.insert([p1, p2, p3])
 
-        data = Person.objects.order_by('name').skip(2).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
+        data = (
+            Person.objects.order_by("name")
+            .skip(2)
+            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p2.pk, 'name': "WILSON JUNIOR"}
-        ])
+        self.assertEqual(list(data), [{"_id": p2.pk, "name": "WILSON JUNIOR"}])
 
     def test_queryset_aggregation_with_sort_with_skip_with_limit(self):
         class Person(Document):
@@ -5555,35 +5625,42 @@ class Person(Document):
         p3 = Person(name="Sandra Mara", age=37)
         Person.objects.insert([p1, p2, p3])
 
-        data = Person.objects.order_by('name').skip(1).limit(1).aggregate(
-            {'$project': {'name': {'$toUpper': '$name'}}}
+        data = (
+            Person.objects.order_by("name")
+            .skip(1)
+            .limit(1)
+            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(list(data), [
-            {'_id': p3.pk, 'name': "SANDRA MARA"}
-        ])
+        self.assertEqual(list(data), [{"_id": p3.pk, "name": "SANDRA MARA"}])
 
     def test_delete_count(self):
         [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
-        self.assertEqual(self.Person.objects().delete(), 3)  # test ordinary QuerySey delete count
+        self.assertEqual(
+            self.Person.objects().delete(), 3
+        )  # test ordinary QuerySey delete count
 
         [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
 
-        self.assertEqual(self.Person.objects().skip(1).delete(), 2)  # test Document delete with existing documents
+        self.assertEqual(
+            self.Person.objects().skip(1).delete(), 2
+        )  # test Document delete with existing documents
 
         self.Person.objects().delete()
-        self.assertEqual(self.Person.objects().skip(1).delete(), 0)  # test Document delete without existing documents
+        self.assertEqual(
+            self.Person.objects().skip(1).delete(), 0
+        )  # test Document delete without existing documents
 
     def test_max_time_ms(self):
         # 778: max_time_ms can get only int or None as input
-        self.assertRaises(TypeError,
-                          self.Person.objects(name="name").max_time_ms,
-                          'not a number')
+        self.assertRaises(
+            TypeError, self.Person.objects(name="name").max_time_ms, "not a number"
+        )
 
     def test_subclass_field_query(self):
         class Animal(Document):
             is_mamal = BooleanField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class Cat(Animal):
             whiskers_length = FloatField()
@@ -5605,14 +5682,15 @@ class Person(Document):
 
         Person.drop_collection()
 
-        Person._get_collection().insert_one({'name': 'a', 'id': ''})
+        Person._get_collection().insert_one({"name": "a", "id": ""})
         for p in Person.objects():
-            self.assertEqual(p.name, 'a')
+            self.assertEqual(p.name, "a")
 
     def test_len_during_iteration(self):
         """Tests that calling len on a queyset during iteration doesn't
         stop paging.
         """
+
         class Data(Document):
             pass
 
@@ -5645,6 +5723,7 @@ def test_iteration_within_iteration(self):
         in a given queryset even if there are multiple iterations of it
         happening at the same time.
         """
+
         class Data(Document):
             pass
 
@@ -5663,6 +5742,7 @@ def test_in_operator_on_non_iterable(self):
         """Ensure that using the `__in` operator on a non-iterable raises an
         error.
         """
+
         class User(Document):
             name = StringField()
 
@@ -5673,9 +5753,10 @@ class BlogPost(Document):
         User.drop_collection()
         BlogPost.drop_collection()
 
-        author = User.objects.create(name='Test User')
-        post = BlogPost.objects.create(content='Had a good coffee today...',
-                                       authors=[author])
+        author = User.objects.create(name="Test User")
+        post = BlogPost.objects.create(
+            content="Had a good coffee today...", authors=[author]
+        )
 
         # Make sure using `__in` with a list works
         blog_posts = BlogPost.objects(authors__in=[author])
@@ -5699,5 +5780,5 @@ def test_create_count(self):
         self.assertEqual(self.Person.objects.count(with_limit_and_skip=True), 4)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 2c2d018cb..cfcd8c22b 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -9,25 +9,29 @@
 
 
 class TransformTest(unittest.TestCase):
-
     def setUp(self):
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
 
     def test_transform_query(self):
         """Ensure that the _transform_query function operates correctly.
         """
-        self.assertEqual(transform.query(name='test', age=30),
-                         {'name': 'test', 'age': 30})
-        self.assertEqual(transform.query(age__lt=30),
-                         {'age': {'$lt': 30}})
-        self.assertEqual(transform.query(age__gt=20, age__lt=50),
-                         {'age': {'$gt': 20, '$lt': 50}})
-        self.assertEqual(transform.query(age=20, age__gt=50),
-                         {'$and': [{'age': {'$gt': 50}}, {'age': 20}]})
-        self.assertEqual(transform.query(friend__age__gte=30),
-                         {'friend.age': {'$gte': 30}})
-        self.assertEqual(transform.query(name__exists=True),
-                         {'name': {'$exists': True}})
+        self.assertEqual(
+            transform.query(name="test", age=30), {"name": "test", "age": 30}
+        )
+        self.assertEqual(transform.query(age__lt=30), {"age": {"$lt": 30}})
+        self.assertEqual(
+            transform.query(age__gt=20, age__lt=50), {"age": {"$gt": 20, "$lt": 50}}
+        )
+        self.assertEqual(
+            transform.query(age=20, age__gt=50),
+            {"$and": [{"age": {"$gt": 50}}, {"age": 20}]},
+        )
+        self.assertEqual(
+            transform.query(friend__age__gte=30), {"friend.age": {"$gte": 30}}
+        )
+        self.assertEqual(
+            transform.query(name__exists=True), {"name": {"$exists": True}}
+        )
 
     def test_transform_update(self):
         class LisDoc(Document):
@@ -46,7 +50,11 @@ class Doc(Document):
         DicDoc().save()
         doc = Doc().save()
 
-        for k, v in (("set", "$set"), ("set_on_insert", "$setOnInsert"), ("push", "$push")):
+        for k, v in (
+            ("set", "$set"),
+            ("set_on_insert", "$setOnInsert"),
+            ("push", "$push"),
+        ):
             update = transform.update(DicDoc, **{"%s__dictField__test" % k: doc})
             self.assertIsInstance(update[v]["dictField.test"], dict)
 
@@ -57,55 +65,61 @@ class Doc(Document):
         update = transform.update(DicDoc, pull__dictField__test=doc)
         self.assertIsInstance(update["$pull"]["dictField"]["test"], dict)
 
-        update = transform.update(LisDoc, pull__foo__in=['a'])
-        self.assertEqual(update, {'$pull': {'foo': {'$in': ['a']}}})
+        update = transform.update(LisDoc, pull__foo__in=["a"])
+        self.assertEqual(update, {"$pull": {"foo": {"$in": ["a"]}}})
 
     def test_transform_update_push(self):
         """Ensure the differences in behvaior between 'push' and 'push_all'"""
+
         class BlogPost(Document):
             tags = ListField(StringField())
 
-        update = transform.update(BlogPost, push__tags=['mongo', 'db'])
-        self.assertEqual(update, {'$push': {'tags': ['mongo', 'db']}})
+        update = transform.update(BlogPost, push__tags=["mongo", "db"])
+        self.assertEqual(update, {"$push": {"tags": ["mongo", "db"]}})
 
-        update = transform.update(BlogPost, push_all__tags=['mongo', 'db'])
-        self.assertEqual(update, {'$push': {'tags': {'$each': ['mongo', 'db']}}})
+        update = transform.update(BlogPost, push_all__tags=["mongo", "db"])
+        self.assertEqual(update, {"$push": {"tags": {"$each": ["mongo", "db"]}}})
 
     def test_transform_update_no_operator_default_to_set(self):
         """Ensure the differences in behvaior between 'push' and 'push_all'"""
+
         class BlogPost(Document):
             tags = ListField(StringField())
 
-        update = transform.update(BlogPost, tags=['mongo', 'db'])
-        self.assertEqual(update, {'$set': {'tags': ['mongo', 'db']}})
+        update = transform.update(BlogPost, tags=["mongo", "db"])
+        self.assertEqual(update, {"$set": {"tags": ["mongo", "db"]}})
 
     def test_query_field_name(self):
         """Ensure that the correct field name is used when querying.
         """
+
         class Comment(EmbeddedDocument):
-            content = StringField(db_field='commentContent')
+            content = StringField(db_field="commentContent")
 
         class BlogPost(Document):
-            title = StringField(db_field='postTitle')
-            comments = ListField(EmbeddedDocumentField(Comment),
-                                 db_field='postComments')
+            title = StringField(db_field="postTitle")
+            comments = ListField(
+                EmbeddedDocumentField(Comment), db_field="postComments"
+            )
 
         BlogPost.drop_collection()
 
-        data = {'title': 'Post 1', 'comments': [Comment(content='test')]}
+        data = {"title": "Post 1", "comments": [Comment(content="test")]}
         post = BlogPost(**data)
         post.save()
 
-        self.assertIn('postTitle', BlogPost.objects(title=data['title'])._query)
-        self.assertFalse('title' in
-                         BlogPost.objects(title=data['title'])._query)
-        self.assertEqual(BlogPost.objects(title=data['title']).count(), 1)
+        self.assertIn("postTitle", BlogPost.objects(title=data["title"])._query)
+        self.assertFalse("title" in BlogPost.objects(title=data["title"])._query)
+        self.assertEqual(BlogPost.objects(title=data["title"]).count(), 1)
 
-        self.assertIn('_id', BlogPost.objects(pk=post.id)._query)
+        self.assertIn("_id", BlogPost.objects(pk=post.id)._query)
         self.assertEqual(BlogPost.objects(pk=post.id).count(), 1)
 
-        self.assertIn('postComments.commentContent', BlogPost.objects(comments__content='test')._query)
-        self.assertEqual(BlogPost.objects(comments__content='test').count(), 1)
+        self.assertIn(
+            "postComments.commentContent",
+            BlogPost.objects(comments__content="test")._query,
+        )
+        self.assertEqual(BlogPost.objects(comments__content="test").count(), 1)
 
         BlogPost.drop_collection()
 
@@ -113,18 +127,19 @@ def test_query_pk_field_name(self):
         """Ensure that the correct "primary key" field name is used when
         querying
         """
+
         class BlogPost(Document):
-            title = StringField(primary_key=True, db_field='postTitle')
+            title = StringField(primary_key=True, db_field="postTitle")
 
         BlogPost.drop_collection()
 
-        data = {'title': 'Post 1'}
+        data = {"title": "Post 1"}
         post = BlogPost(**data)
         post.save()
 
-        self.assertIn('_id', BlogPost.objects(pk=data['title'])._query)
-        self.assertIn('_id', BlogPost.objects(title=data['title'])._query)
-        self.assertEqual(BlogPost.objects(pk=data['title']).count(), 1)
+        self.assertIn("_id", BlogPost.objects(pk=data["title"])._query)
+        self.assertIn("_id", BlogPost.objects(title=data["title"])._query)
+        self.assertEqual(BlogPost.objects(pk=data["title"]).count(), 1)
 
         BlogPost.drop_collection()
 
@@ -156,78 +171,125 @@ def test_raw_query_and_Q_objects(self):
         """
         Test raw plays nicely
         """
+
         class Foo(Document):
             name = StringField()
             a = StringField()
             b = StringField()
             c = StringField()
 
-            meta = {
-                'allow_inheritance': False
-            }
+            meta = {"allow_inheritance": False}
 
-        query = Foo.objects(__raw__={'$nor': [{'name': 'bar'}]})._query
-        self.assertEqual(query, {'$nor': [{'name': 'bar'}]})
+        query = Foo.objects(__raw__={"$nor": [{"name": "bar"}]})._query
+        self.assertEqual(query, {"$nor": [{"name": "bar"}]})
 
-        q1 = {'$or': [{'a': 1}, {'b': 1}]}
+        q1 = {"$or": [{"a": 1}, {"b": 1}]}
         query = Foo.objects(Q(__raw__=q1) & Q(c=1))._query
-        self.assertEqual(query, {'$or': [{'a': 1}, {'b': 1}], 'c': 1})
+        self.assertEqual(query, {"$or": [{"a": 1}, {"b": 1}], "c": 1})
 
     def test_raw_and_merging(self):
         class Doc(Document):
-            meta = {'allow_inheritance': False}
-
-        raw_query = Doc.objects(__raw__={
-            'deleted': False,
-            'scraped': 'yes',
-            '$nor': [
-                {'views.extracted': 'no'},
-                {'attachments.views.extracted': 'no'}
-            ]
-        })._query
-
-        self.assertEqual(raw_query, {
-            'deleted': False,
-            'scraped': 'yes',
-            '$nor': [
-                {'views.extracted': 'no'},
-                {'attachments.views.extracted': 'no'}
-            ]
-        })
+            meta = {"allow_inheritance": False}
+
+        raw_query = Doc.objects(
+            __raw__={
+                "deleted": False,
+                "scraped": "yes",
+                "$nor": [
+                    {"views.extracted": "no"},
+                    {"attachments.views.extracted": "no"},
+                ],
+            }
+        )._query
+
+        self.assertEqual(
+            raw_query,
+            {
+                "deleted": False,
+                "scraped": "yes",
+                "$nor": [
+                    {"views.extracted": "no"},
+                    {"attachments.views.extracted": "no"},
+                ],
+            },
+        )
 
     def test_geojson_PointField(self):
         class Location(Document):
             loc = PointField()
 
         update = transform.update(Location, set__loc=[1, 2])
-        self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1, 2]}}})
+        self.assertEqual(
+            update, {"$set": {"loc": {"type": "Point", "coordinates": [1, 2]}}}
+        )
 
-        update = transform.update(Location, set__loc={"type": "Point", "coordinates": [1, 2]})
-        self.assertEqual(update, {'$set': {'loc': {"type": "Point", "coordinates": [1, 2]}}})
+        update = transform.update(
+            Location, set__loc={"type": "Point", "coordinates": [1, 2]}
+        )
+        self.assertEqual(
+            update, {"$set": {"loc": {"type": "Point", "coordinates": [1, 2]}}}
+        )
 
     def test_geojson_LineStringField(self):
         class Location(Document):
             line = LineStringField()
 
         update = transform.update(Location, set__line=[[1, 2], [2, 2]])
-        self.assertEqual(update, {'$set': {'line': {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}})
-
-        update = transform.update(Location, set__line={"type": "LineString", "coordinates": [[1, 2], [2, 2]]})
-        self.assertEqual(update, {'$set': {'line': {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}})
+        self.assertEqual(
+            update,
+            {"$set": {"line": {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}},
+        )
+
+        update = transform.update(
+            Location, set__line={"type": "LineString", "coordinates": [[1, 2], [2, 2]]}
+        )
+        self.assertEqual(
+            update,
+            {"$set": {"line": {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}},
+        )
 
     def test_geojson_PolygonField(self):
         class Location(Document):
             poly = PolygonField()
 
-        update = transform.update(Location, set__poly=[[[40, 5], [40, 6], [41, 6], [40, 5]]])
-        self.assertEqual(update, {'$set': {'poly': {"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]}}})
-
-        update = transform.update(Location, set__poly={"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]})
-        self.assertEqual(update, {'$set': {'poly': {"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]}}})
+        update = transform.update(
+            Location, set__poly=[[[40, 5], [40, 6], [41, 6], [40, 5]]]
+        )
+        self.assertEqual(
+            update,
+            {
+                "$set": {
+                    "poly": {
+                        "type": "Polygon",
+                        "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]],
+                    }
+                }
+            },
+        )
+
+        update = transform.update(
+            Location,
+            set__poly={
+                "type": "Polygon",
+                "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]],
+            },
+        )
+        self.assertEqual(
+            update,
+            {
+                "$set": {
+                    "poly": {
+                        "type": "Polygon",
+                        "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]],
+                    }
+                }
+            },
+        )
 
     def test_type(self):
         class Doc(Document):
             df = DynamicField()
+
         Doc(df=True).save()
         Doc(df=7).save()
         Doc(df="df").save()
@@ -252,7 +314,7 @@ class Doc(Document):
         self.assertEqual(1, Doc.objects(item__type__="axe").count())
         self.assertEqual(1, Doc.objects(item__name__="Heroic axe").count())
 
-        Doc.objects(id=doc.id).update(set__item__type__='sword')
+        Doc.objects(id=doc.id).update(set__item__type__="sword")
         self.assertEqual(1, Doc.objects(item__type__="sword").count())
         self.assertEqual(0, Doc.objects(item__type__="axe").count())
 
@@ -272,6 +334,7 @@ def test_update_pull_for_list_fields(self):
         Test added to check pull operation in update for
         EmbeddedDocumentListField which is inside a EmbeddedDocumentField
         """
+
         class Word(EmbeddedDocument):
             word = StringField()
             index = IntField()
@@ -284,18 +347,27 @@ class MainDoc(Document):
             title = StringField()
             content = EmbeddedDocumentField(SubDoc)
 
-        word = Word(word='abc', index=1)
+        word = Word(word="abc", index=1)
         update = transform.update(MainDoc, pull__content__text=word)
-        self.assertEqual(update, {'$pull': {'content.text': SON([('word', u'abc'), ('index', 1)])}})
+        self.assertEqual(
+            update, {"$pull": {"content.text": SON([("word", u"abc"), ("index", 1)])}}
+        )
+
+        update = transform.update(MainDoc, pull__content__heading="xyz")
+        self.assertEqual(update, {"$pull": {"content.heading": "xyz"}})
 
-        update = transform.update(MainDoc, pull__content__heading='xyz')
-        self.assertEqual(update, {'$pull': {'content.heading': 'xyz'}})
+        update = transform.update(MainDoc, pull__content__text__word__in=["foo", "bar"])
+        self.assertEqual(
+            update, {"$pull": {"content.text": {"word": {"$in": ["foo", "bar"]}}}}
+        )
 
-        update = transform.update(MainDoc, pull__content__text__word__in=['foo', 'bar'])
-        self.assertEqual(update, {'$pull': {'content.text': {'word': {'$in': ['foo', 'bar']}}}})
+        update = transform.update(
+            MainDoc, pull__content__text__word__nin=["foo", "bar"]
+        )
+        self.assertEqual(
+            update, {"$pull": {"content.text": {"word": {"$nin": ["foo", "bar"]}}}}
+        )
 
-        update = transform.update(MainDoc, pull__content__text__word__nin=['foo', 'bar'])
-        self.assertEqual(update, {'$pull': {'content.text': {'word': {'$nin': ['foo', 'bar']}}}})
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/queryset/visitor.py b/tests/queryset/visitor.py
index 22d274a85..0a22416fd 100644
--- a/tests/queryset/visitor.py
+++ b/tests/queryset/visitor.py
@@ -12,14 +12,13 @@
 
 
 class QTest(unittest.TestCase):
-
     def setUp(self):
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
 
         class Person(Document):
             name = StringField()
             age = IntField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         Person.drop_collection()
         self.Person = Person
@@ -30,22 +29,22 @@ def test_empty_q(self):
         q1 = Q()
         q2 = Q(age__gte=18)
         q3 = Q()
-        q4 = Q(name='test')
+        q4 = Q(name="test")
         q5 = Q()
 
         class Person(Document):
             name = StringField()
             age = IntField()
 
-        query = {'$or': [{'age': {'$gte': 18}}, {'name': 'test'}]}
+        query = {"$or": [{"age": {"$gte": 18}}, {"name": "test"}]}
         self.assertEqual((q1 | q2 | q3 | q4 | q5).to_query(Person), query)
 
-        query = {'age': {'$gte': 18}, 'name': 'test'}
+        query = {"age": {"$gte": 18}, "name": "test"}
         self.assertEqual((q1 & q2 & q3 & q4 & q5).to_query(Person), query)
 
     def test_q_with_dbref(self):
         """Ensure Q objects handle DBRefs correctly"""
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
 
         class User(Document):
             pass
@@ -62,15 +61,18 @@ class Post(Document):
     def test_and_combination(self):
         """Ensure that Q-objects correctly AND together.
         """
+
         class TestDoc(Document):
             x = IntField()
             y = StringField()
 
         query = (Q(x__lt=7) & Q(x__lt=3)).to_query(TestDoc)
-        self.assertEqual(query, {'$and': [{'x': {'$lt': 7}}, {'x': {'$lt': 3}}]})
+        self.assertEqual(query, {"$and": [{"x": {"$lt": 7}}, {"x": {"$lt": 3}}]})
 
         query = (Q(y="a") & Q(x__lt=7) & Q(x__lt=3)).to_query(TestDoc)
-        self.assertEqual(query, {'$and': [{'y': "a"}, {'x': {'$lt': 7}}, {'x': {'$lt': 3}}]})
+        self.assertEqual(
+            query, {"$and": [{"y": "a"}, {"x": {"$lt": 7}}, {"x": {"$lt": 3}}]}
+        )
 
         # Check normal cases work without an error
         query = Q(x__lt=7) & Q(x__gt=3)
@@ -78,69 +80,74 @@ class TestDoc(Document):
         q1 = Q(x__lt=7)
         q2 = Q(x__gt=3)
         query = (q1 & q2).to_query(TestDoc)
-        self.assertEqual(query, {'x': {'$lt': 7, '$gt': 3}})
+        self.assertEqual(query, {"x": {"$lt": 7, "$gt": 3}})
 
         # More complex nested example
-        query = Q(x__lt=100) & Q(y__ne='NotMyString')
-        query &= Q(y__in=['a', 'b', 'c']) & Q(x__gt=-100)
+        query = Q(x__lt=100) & Q(y__ne="NotMyString")
+        query &= Q(y__in=["a", "b", "c"]) & Q(x__gt=-100)
         mongo_query = {
-            'x': {'$lt': 100, '$gt': -100},
-            'y': {'$ne': 'NotMyString', '$in': ['a', 'b', 'c']},
+            "x": {"$lt": 100, "$gt": -100},
+            "y": {"$ne": "NotMyString", "$in": ["a", "b", "c"]},
         }
         self.assertEqual(query.to_query(TestDoc), mongo_query)
 
     def test_or_combination(self):
         """Ensure that Q-objects correctly OR together.
         """
+
         class TestDoc(Document):
             x = IntField()
 
         q1 = Q(x__lt=3)
         q2 = Q(x__gt=7)
         query = (q1 | q2).to_query(TestDoc)
-        self.assertEqual(query, {
-            '$or': [
-                {'x': {'$lt': 3}},
-                {'x': {'$gt': 7}},
-            ]
-        })
+        self.assertEqual(query, {"$or": [{"x": {"$lt": 3}}, {"x": {"$gt": 7}}]})
 
     def test_and_or_combination(self):
         """Ensure that Q-objects handle ANDing ORed components.
         """
+
         class TestDoc(Document):
             x = IntField()
             y = BooleanField()
 
         TestDoc.drop_collection()
 
-        query = (Q(x__gt=0) | Q(x__exists=False))
+        query = Q(x__gt=0) | Q(x__exists=False)
         query &= Q(x__lt=100)
-        self.assertEqual(query.to_query(TestDoc), {'$and': [
-            {'$or': [{'x': {'$gt': 0}},
-                     {'x': {'$exists': False}}]},
-            {'x': {'$lt': 100}}]
-        })
-
-        q1 = (Q(x__gt=0) | Q(x__exists=False))
-        q2 = (Q(x__lt=100) | Q(y=True))
+        self.assertEqual(
+            query.to_query(TestDoc),
+            {
+                "$and": [
+                    {"$or": [{"x": {"$gt": 0}}, {"x": {"$exists": False}}]},
+                    {"x": {"$lt": 100}},
+                ]
+            },
+        )
+
+        q1 = Q(x__gt=0) | Q(x__exists=False)
+        q2 = Q(x__lt=100) | Q(y=True)
         query = (q1 & q2).to_query(TestDoc)
 
         TestDoc(x=101).save()
         TestDoc(x=10).save()
         TestDoc(y=True).save()
 
-        self.assertEqual(query, {
-            '$and': [
-                {'$or': [{'x': {'$gt': 0}}, {'x': {'$exists': False}}]},
-                {'$or': [{'x': {'$lt': 100}}, {'y': True}]}
-            ]
-        })
+        self.assertEqual(
+            query,
+            {
+                "$and": [
+                    {"$or": [{"x": {"$gt": 0}}, {"x": {"$exists": False}}]},
+                    {"$or": [{"x": {"$lt": 100}}, {"y": True}]},
+                ]
+            },
+        )
         self.assertEqual(2, TestDoc.objects(q1 & q2).count())
 
     def test_or_and_or_combination(self):
         """Ensure that Q-objects handle ORing ANDed ORed components. :)
         """
+
         class TestDoc(Document):
             x = IntField()
             y = BooleanField()
@@ -151,18 +158,29 @@ class TestDoc(Document):
         TestDoc(x=99, y=False).save()
         TestDoc(x=101, y=False).save()
 
-        q1 = (Q(x__gt=0) & (Q(y=True) | Q(y__exists=False)))
-        q2 = (Q(x__lt=100) & (Q(y=False) | Q(y__exists=False)))
+        q1 = Q(x__gt=0) & (Q(y=True) | Q(y__exists=False))
+        q2 = Q(x__lt=100) & (Q(y=False) | Q(y__exists=False))
         query = (q1 | q2).to_query(TestDoc)
 
-        self.assertEqual(query, {
-            '$or': [
-                {'$and': [{'x': {'$gt': 0}},
-                          {'$or': [{'y': True}, {'y': {'$exists': False}}]}]},
-                {'$and': [{'x': {'$lt': 100}},
-                          {'$or': [{'y': False}, {'y': {'$exists': False}}]}]}
-            ]
-        })
+        self.assertEqual(
+            query,
+            {
+                "$or": [
+                    {
+                        "$and": [
+                            {"x": {"$gt": 0}},
+                            {"$or": [{"y": True}, {"y": {"$exists": False}}]},
+                        ]
+                    },
+                    {
+                        "$and": [
+                            {"x": {"$lt": 100}},
+                            {"$or": [{"y": False}, {"y": {"$exists": False}}]},
+                        ]
+                    },
+                ]
+            },
+        )
         self.assertEqual(2, TestDoc.objects(q1 | q2).count())
 
     def test_multiple_occurence_in_field(self):
@@ -170,8 +188,8 @@ class Test(Document):
             name = StringField(max_length=40)
             title = StringField(max_length=40)
 
-        q1 = Q(name__contains='te') | Q(title__contains='te')
-        q2 = Q(name__contains='12') | Q(title__contains='12')
+        q1 = Q(name__contains="te") | Q(title__contains="te")
+        q2 = Q(name__contains="12") | Q(title__contains="12")
 
         q3 = q1 & q2
 
@@ -180,7 +198,6 @@ class Test(Document):
         self.assertEqual(query["$and"][1], q2.to_query(Test))
 
     def test_q_clone(self):
-
         class TestDoc(Document):
             x = IntField()
 
@@ -205,6 +222,7 @@ class TestDoc(Document):
     def test_q(self):
         """Ensure that Q objects may be used to query for documents.
         """
+
         class BlogPost(Document):
             title = StringField()
             publish_date = DateTimeField()
@@ -212,22 +230,26 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        post1 = BlogPost(title='Test 1', publish_date=datetime.datetime(2010, 1, 8), published=False)
+        post1 = BlogPost(
+            title="Test 1", publish_date=datetime.datetime(2010, 1, 8), published=False
+        )
         post1.save()
 
-        post2 = BlogPost(title='Test 2', publish_date=datetime.datetime(2010, 1, 15), published=True)
+        post2 = BlogPost(
+            title="Test 2", publish_date=datetime.datetime(2010, 1, 15), published=True
+        )
         post2.save()
 
-        post3 = BlogPost(title='Test 3', published=True)
+        post3 = BlogPost(title="Test 3", published=True)
         post3.save()
 
-        post4 = BlogPost(title='Test 4', publish_date=datetime.datetime(2010, 1, 8))
+        post4 = BlogPost(title="Test 4", publish_date=datetime.datetime(2010, 1, 8))
         post4.save()
 
-        post5 = BlogPost(title='Test 1', publish_date=datetime.datetime(2010, 1, 15))
+        post5 = BlogPost(title="Test 1", publish_date=datetime.datetime(2010, 1, 15))
         post5.save()
 
-        post6 = BlogPost(title='Test 1', published=False)
+        post6 = BlogPost(title="Test 1", published=False)
         post6.save()
 
         # Check ObjectId lookup works
@@ -235,13 +257,13 @@ class BlogPost(Document):
         self.assertEqual(obj, post1)
 
         # Check Q object combination with one does not exist
-        q = BlogPost.objects(Q(title='Test 5') | Q(published=True))
+        q = BlogPost.objects(Q(title="Test 5") | Q(published=True))
         posts = [post.id for post in q]
 
         published_posts = (post2, post3)
         self.assertTrue(all(obj.id in posts for obj in published_posts))
 
-        q = BlogPost.objects(Q(title='Test 1') | Q(published=True))
+        q = BlogPost.objects(Q(title="Test 1") | Q(published=True))
         posts = [post.id for post in q]
         published_posts = (post1, post2, post3, post5, post6)
         self.assertTrue(all(obj.id in posts for obj in published_posts))
@@ -259,85 +281,91 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         # Check the 'in' operator
-        self.Person(name='user1', age=20).save()
-        self.Person(name='user2', age=20).save()
-        self.Person(name='user3', age=30).save()
-        self.Person(name='user4', age=40).save()
+        self.Person(name="user1", age=20).save()
+        self.Person(name="user2", age=20).save()
+        self.Person(name="user3", age=30).save()
+        self.Person(name="user4", age=40).save()
 
         self.assertEqual(self.Person.objects(Q(age__in=[20])).count(), 2)
         self.assertEqual(self.Person.objects(Q(age__in=[20, 30])).count(), 3)
 
         # Test invalid query objs
         with self.assertRaises(InvalidQueryError):
-            self.Person.objects('user1')
+            self.Person.objects("user1")
 
         # filter should fail, too
         with self.assertRaises(InvalidQueryError):
-            self.Person.objects.filter('user1')
+            self.Person.objects.filter("user1")
 
     def test_q_regex(self):
         """Ensure that Q objects can be queried using regexes.
         """
-        person = self.Person(name='Guido van Rossum')
+        person = self.Person(name="Guido van Rossum")
         person.save()
 
-        obj = self.Person.objects(Q(name=re.compile('^Gui'))).first()
+        obj = self.Person.objects(Q(name=re.compile("^Gui"))).first()
         self.assertEqual(obj, person)
-        obj = self.Person.objects(Q(name=re.compile('^gui'))).first()
+        obj = self.Person.objects(Q(name=re.compile("^gui"))).first()
         self.assertEqual(obj, None)
 
-        obj = self.Person.objects(Q(name=re.compile('^gui', re.I))).first()
+        obj = self.Person.objects(Q(name=re.compile("^gui", re.I))).first()
         self.assertEqual(obj, person)
 
-        obj = self.Person.objects(Q(name__not=re.compile('^bob'))).first()
+        obj = self.Person.objects(Q(name__not=re.compile("^bob"))).first()
         self.assertEqual(obj, person)
 
-        obj = self.Person.objects(Q(name__not=re.compile('^Gui'))).first()
+        obj = self.Person.objects(Q(name__not=re.compile("^Gui"))).first()
         self.assertEqual(obj, None)
 
     def test_q_repr(self):
-        self.assertEqual(repr(Q()), 'Q(**{})')
-        self.assertEqual(repr(Q(name='test')), "Q(**{'name': 'test'})")
+        self.assertEqual(repr(Q()), "Q(**{})")
+        self.assertEqual(repr(Q(name="test")), "Q(**{'name': 'test'})")
 
         self.assertEqual(
-            repr(Q(name='test') & Q(age__gte=18)),
-            "(Q(**{'name': 'test'}) & Q(**{'age__gte': 18}))")
+            repr(Q(name="test") & Q(age__gte=18)),
+            "(Q(**{'name': 'test'}) & Q(**{'age__gte': 18}))",
+        )
 
         self.assertEqual(
-            repr(Q(name='test') | Q(age__gte=18)),
-            "(Q(**{'name': 'test'}) | Q(**{'age__gte': 18}))")
+            repr(Q(name="test") | Q(age__gte=18)),
+            "(Q(**{'name': 'test'}) | Q(**{'age__gte': 18}))",
+        )
 
     def test_q_lists(self):
         """Ensure that Q objects query ListFields correctly.
         """
+
         class BlogPost(Document):
             tags = ListField(StringField())
 
         BlogPost.drop_collection()
 
-        BlogPost(tags=['python', 'mongo']).save()
-        BlogPost(tags=['python']).save()
+        BlogPost(tags=["python", "mongo"]).save()
+        BlogPost(tags=["python"]).save()
 
-        self.assertEqual(BlogPost.objects(Q(tags='mongo')).count(), 1)
-        self.assertEqual(BlogPost.objects(Q(tags='python')).count(), 2)
+        self.assertEqual(BlogPost.objects(Q(tags="mongo")).count(), 1)
+        self.assertEqual(BlogPost.objects(Q(tags="python")).count(), 2)
 
         BlogPost.drop_collection()
 
     def test_q_merge_queries_edge_case(self):
-
         class User(Document):
             email = EmailField(required=False)
             name = StringField()
 
         User.drop_collection()
         pk = ObjectId()
-        User(email='example@example.com', pk=pk).save()
+        User(email="example@example.com", pk=pk).save()
 
-        self.assertEqual(1, User.objects.filter(Q(email='example@example.com') |
-                                                Q(name='John Doe')).limit(2).filter(pk=pk).count())
+        self.assertEqual(
+            1,
+            User.objects.filter(Q(email="example@example.com") | Q(name="John Doe"))
+            .limit(2)
+            .filter(pk=pk)
+            .count(),
+        )
 
     def test_chained_q_or_filtering(self):
-
         class Post(EmbeddedDocument):
             name = StringField(required=True)
 
@@ -350,9 +378,16 @@ class Item(Document):
         Item(postables=[Post(name="a"), Post(name="c")]).save()
         Item(postables=[Post(name="a"), Post(name="b"), Post(name="c")]).save()
 
-        self.assertEqual(Item.objects(Q(postables__name="a") & Q(postables__name="b")).count(), 2)
-        self.assertEqual(Item.objects.filter(postables__name="a").filter(postables__name="b").count(), 2)
+        self.assertEqual(
+            Item.objects(Q(postables__name="a") & Q(postables__name="b")).count(), 2
+        )
+        self.assertEqual(
+            Item.objects.filter(postables__name="a")
+            .filter(postables__name="b")
+            .count(),
+            2,
+        )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_common.py b/tests/test_common.py
index 04ad5b346..5d7026686 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -5,7 +5,6 @@
 
 
 class TestCommon(unittest.TestCase):
-
     def test__import_class(self):
         doc_cls = _import_class("Document")
         self.assertIs(doc_cls, Document)
diff --git a/tests/test_connection.py b/tests/test_connection.py
index d3fcc395d..250071327 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -14,12 +14,21 @@
 from bson.tz_util import utc
 
 from mongoengine import (
-    connect, register_connection,
-    Document, DateTimeField,
-    disconnect_all, StringField)
+    connect,
+    register_connection,
+    Document,
+    DateTimeField,
+    disconnect_all,
+    StringField,
+)
 import mongoengine.connection
-from mongoengine.connection import (MongoEngineConnectionError, get_db,
-                                    get_connection, disconnect, DEFAULT_DATABASE_NAME)
+from mongoengine.connection import (
+    MongoEngineConnectionError,
+    get_db,
+    get_connection,
+    disconnect,
+    DEFAULT_DATABASE_NAME,
+)
 
 
 def get_tz_awareness(connection):
@@ -27,7 +36,6 @@ def get_tz_awareness(connection):
 
 
 class ConnectionTest(unittest.TestCase):
-
     @classmethod
     def setUpClass(cls):
         disconnect_all()
@@ -43,44 +51,46 @@ def tearDown(self):
 
     def test_connect(self):
         """Ensure that the connect() method works properly."""
-        connect('mongoenginetest')
+        connect("mongoenginetest")
 
         conn = get_connection()
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
         self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, 'mongoenginetest')
+        self.assertEqual(db.name, "mongoenginetest")
 
-        connect('mongoenginetest2', alias='testdb')
-        conn = get_connection('testdb')
+        connect("mongoenginetest2", alias="testdb")
+        conn = get_connection("testdb")
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
     def test_connect_disconnect_works_properly(self):
         class History1(Document):
             name = StringField()
-            meta = {'db_alias': 'db1'}
+            meta = {"db_alias": "db1"}
 
         class History2(Document):
             name = StringField()
-            meta = {'db_alias': 'db2'}
+            meta = {"db_alias": "db2"}
 
-        connect('db1', alias='db1')
-        connect('db2', alias='db2')
+        connect("db1", alias="db1")
+        connect("db2", alias="db2")
 
         History1.drop_collection()
         History2.drop_collection()
 
-        h = History1(name='default').save()
-        h1 = History2(name='db1').save()
+        h = History1(name="default").save()
+        h1 = History2(name="db1").save()
 
-        self.assertEqual(list(History1.objects().as_pymongo()),
-                         [{'_id': h.id, 'name': 'default'}])
-        self.assertEqual(list(History2.objects().as_pymongo()),
-                         [{'_id': h1.id, 'name': 'db1'}])
+        self.assertEqual(
+            list(History1.objects().as_pymongo()), [{"_id": h.id, "name": "default"}]
+        )
+        self.assertEqual(
+            list(History2.objects().as_pymongo()), [{"_id": h1.id, "name": "db1"}]
+        )
 
-        disconnect('db1')
-        disconnect('db2')
+        disconnect("db1")
+        disconnect("db2")
 
         with self.assertRaises(MongoEngineConnectionError):
             list(History1.objects().as_pymongo())
@@ -88,13 +98,15 @@ class History2(Document):
         with self.assertRaises(MongoEngineConnectionError):
             list(History2.objects().as_pymongo())
 
-        connect('db1', alias='db1')
-        connect('db2', alias='db2')
+        connect("db1", alias="db1")
+        connect("db2", alias="db2")
 
-        self.assertEqual(list(History1.objects().as_pymongo()),
-                         [{'_id': h.id, 'name': 'default'}])
-        self.assertEqual(list(History2.objects().as_pymongo()),
-                         [{'_id': h1.id, 'name': 'db1'}])
+        self.assertEqual(
+            list(History1.objects().as_pymongo()), [{"_id": h.id, "name": "default"}]
+        )
+        self.assertEqual(
+            list(History2.objects().as_pymongo()), [{"_id": h1.id, "name": "db1"}]
+        )
 
     def test_connect_different_documents_to_different_database(self):
         class History(Document):
@@ -102,99 +114,110 @@ class History(Document):
 
         class History1(Document):
             name = StringField()
-            meta = {'db_alias': 'db1'}
+            meta = {"db_alias": "db1"}
 
         class History2(Document):
             name = StringField()
-            meta = {'db_alias': 'db2'}
+            meta = {"db_alias": "db2"}
 
         connect()
-        connect('db1', alias='db1')
-        connect('db2', alias='db2')
+        connect("db1", alias="db1")
+        connect("db2", alias="db2")
 
         History.drop_collection()
         History1.drop_collection()
         History2.drop_collection()
 
-        h = History(name='default').save()
-        h1 = History1(name='db1').save()
-        h2 = History2(name='db2').save()
+        h = History(name="default").save()
+        h1 = History1(name="db1").save()
+        h2 = History2(name="db2").save()
 
         self.assertEqual(History._collection.database.name, DEFAULT_DATABASE_NAME)
-        self.assertEqual(History1._collection.database.name, 'db1')
-        self.assertEqual(History2._collection.database.name, 'db2')
+        self.assertEqual(History1._collection.database.name, "db1")
+        self.assertEqual(History2._collection.database.name, "db2")
 
-        self.assertEqual(list(History.objects().as_pymongo()),
-                         [{'_id': h.id, 'name': 'default'}])
-        self.assertEqual(list(History1.objects().as_pymongo()),
-                         [{'_id': h1.id, 'name': 'db1'}])
-        self.assertEqual(list(History2.objects().as_pymongo()),
-                         [{'_id': h2.id, 'name': 'db2'}])
+        self.assertEqual(
+            list(History.objects().as_pymongo()), [{"_id": h.id, "name": "default"}]
+        )
+        self.assertEqual(
+            list(History1.objects().as_pymongo()), [{"_id": h1.id, "name": "db1"}]
+        )
+        self.assertEqual(
+            list(History2.objects().as_pymongo()), [{"_id": h2.id, "name": "db2"}]
+        )
 
     def test_connect_fails_if_connect_2_times_with_default_alias(self):
-        connect('mongoenginetest')
+        connect("mongoenginetest")
 
         with self.assertRaises(MongoEngineConnectionError) as ctx_err:
-            connect('mongoenginetest2')
-        self.assertEqual("A different connection with alias `default` was already registered. Use disconnect() first", str(ctx_err.exception))
+            connect("mongoenginetest2")
+        self.assertEqual(
+            "A different connection with alias `default` was already registered. Use disconnect() first",
+            str(ctx_err.exception),
+        )
 
     def test_connect_fails_if_connect_2_times_with_custom_alias(self):
-        connect('mongoenginetest', alias='alias1')
+        connect("mongoenginetest", alias="alias1")
 
         with self.assertRaises(MongoEngineConnectionError) as ctx_err:
-            connect('mongoenginetest2', alias='alias1')
+            connect("mongoenginetest2", alias="alias1")
 
-        self.assertEqual("A different connection with alias `alias1` was already registered. Use disconnect() first", str(ctx_err.exception))
+        self.assertEqual(
+            "A different connection with alias `alias1` was already registered. Use disconnect() first",
+            str(ctx_err.exception),
+        )
 
-    def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way(self):
+    def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way(
+        self
+    ):
         """Intended to keep the detecton function simple but robust"""
-        db_name = 'mongoenginetest'
-        db_alias = 'alias1'
-        connect(db=db_name, alias=db_alias, host='localhost', port=27017)
+        db_name = "mongoenginetest"
+        db_alias = "alias1"
+        connect(db=db_name, alias=db_alias, host="localhost", port=27017)
 
         with self.assertRaises(MongoEngineConnectionError):
-            connect(host='mongodb://localhost:27017/%s' % db_name, alias=db_alias)
+            connect(host="mongodb://localhost:27017/%s" % db_name, alias=db_alias)
 
     def test_connect_passes_silently_connect_multiple_times_with_same_config(self):
         # test default connection to `test`
         connect()
         connect()
         self.assertEqual(len(mongoengine.connection._connections), 1)
-        connect('test01', alias='test01')
-        connect('test01', alias='test01')
+        connect("test01", alias="test01")
+        connect("test01", alias="test01")
         self.assertEqual(len(mongoengine.connection._connections), 2)
-        connect(host='mongodb://localhost:27017/mongoenginetest02', alias='test02')
-        connect(host='mongodb://localhost:27017/mongoenginetest02', alias='test02')
+        connect(host="mongodb://localhost:27017/mongoenginetest02", alias="test02")
+        connect(host="mongodb://localhost:27017/mongoenginetest02", alias="test02")
         self.assertEqual(len(mongoengine.connection._connections), 3)
 
     def test_connect_with_invalid_db_name(self):
         """Ensure that connect() method fails fast if db name is invalid
         """
         with self.assertRaises(InvalidName):
-            connect('mongomock://localhost')
+            connect("mongomock://localhost")
 
     def test_connect_with_db_name_external(self):
         """Ensure that connect() works if db name is $external
         """
         """Ensure that the connect() method works properly."""
-        connect('$external')
+        connect("$external")
 
         conn = get_connection()
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
         self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, '$external')
+        self.assertEqual(db.name, "$external")
 
-        connect('$external', alias='testdb')
-        conn = get_connection('testdb')
+        connect("$external", alias="testdb")
+        conn = get_connection("testdb")
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
     def test_connect_with_invalid_db_name_type(self):
         """Ensure that connect() method fails fast if db name has invalid type
         """
         with self.assertRaises(TypeError):
-            non_string_db_name = ['e. g. list instead of a string']
+            non_string_db_name = ["e. g. list instead of a string"]
             connect(non_string_db_name)
 
     def test_connect_in_mocking(self):
@@ -203,34 +226,47 @@ def test_connect_in_mocking(self):
         try:
             import mongomock
         except ImportError:
-            raise SkipTest('you need mongomock installed to run this testcase')
+            raise SkipTest("you need mongomock installed to run this testcase")
 
-        connect('mongoenginetest', host='mongomock://localhost')
+        connect("mongoenginetest", host="mongomock://localhost")
         conn = get_connection()
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect('mongoenginetest2', host='mongomock://localhost', alias='testdb2')
-        conn = get_connection('testdb2')
+        connect("mongoenginetest2", host="mongomock://localhost", alias="testdb2")
+        conn = get_connection("testdb2")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect('mongoenginetest3', host='mongodb://localhost', is_mock=True, alias='testdb3')
-        conn = get_connection('testdb3')
+        connect(
+            "mongoenginetest3",
+            host="mongodb://localhost",
+            is_mock=True,
+            alias="testdb3",
+        )
+        conn = get_connection("testdb3")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect('mongoenginetest4', is_mock=True, alias='testdb4')
-        conn = get_connection('testdb4')
+        connect("mongoenginetest4", is_mock=True, alias="testdb4")
+        conn = get_connection("testdb4")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host='mongodb://localhost:27017/mongoenginetest5', is_mock=True, alias='testdb5')
-        conn = get_connection('testdb5')
+        connect(
+            host="mongodb://localhost:27017/mongoenginetest5",
+            is_mock=True,
+            alias="testdb5",
+        )
+        conn = get_connection("testdb5")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host='mongomock://localhost:27017/mongoenginetest6', alias='testdb6')
-        conn = get_connection('testdb6')
+        connect(host="mongomock://localhost:27017/mongoenginetest6", alias="testdb6")
+        conn = get_connection("testdb6")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host='mongomock://localhost:27017/mongoenginetest7', is_mock=True, alias='testdb7')
-        conn = get_connection('testdb7')
+        connect(
+            host="mongomock://localhost:27017/mongoenginetest7",
+            is_mock=True,
+            alias="testdb7",
+        )
+        conn = get_connection("testdb7")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
     def test_connect_with_host_list(self):
@@ -241,30 +277,39 @@ def test_connect_with_host_list(self):
         try:
             import mongomock
         except ImportError:
-            raise SkipTest('you need mongomock installed to run this testcase')
+            raise SkipTest("you need mongomock installed to run this testcase")
 
-        connect(host=['mongomock://localhost'])
+        connect(host=["mongomock://localhost"])
         conn = get_connection()
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host=['mongodb://localhost'], is_mock=True, alias='testdb2')
-        conn = get_connection('testdb2')
+        connect(host=["mongodb://localhost"], is_mock=True, alias="testdb2")
+        conn = get_connection("testdb2")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host=['localhost'], is_mock=True, alias='testdb3')
-        conn = get_connection('testdb3')
+        connect(host=["localhost"], is_mock=True, alias="testdb3")
+        conn = get_connection("testdb3")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host=['mongomock://localhost:27017', 'mongomock://localhost:27018'], alias='testdb4')
-        conn = get_connection('testdb4')
+        connect(
+            host=["mongomock://localhost:27017", "mongomock://localhost:27018"],
+            alias="testdb4",
+        )
+        conn = get_connection("testdb4")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host=['mongodb://localhost:27017', 'mongodb://localhost:27018'], is_mock=True, alias='testdb5')
-        conn = get_connection('testdb5')
+        connect(
+            host=["mongodb://localhost:27017", "mongodb://localhost:27018"],
+            is_mock=True,
+            alias="testdb5",
+        )
+        conn = get_connection("testdb5")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
-        connect(host=['localhost:27017', 'localhost:27018'], is_mock=True, alias='testdb6')
-        conn = get_connection('testdb6')
+        connect(
+            host=["localhost:27017", "localhost:27018"], is_mock=True, alias="testdb6"
+        )
+        conn = get_connection("testdb6")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
     def test_disconnect_cleans_globals(self):
@@ -273,7 +318,7 @@ def test_disconnect_cleans_globals(self):
         dbs = mongoengine.connection._dbs
         connection_settings = mongoengine.connection._connection_settings
 
-        connect('mongoenginetest')
+        connect("mongoenginetest")
 
         self.assertEqual(len(connections), 1)
         self.assertEqual(len(dbs), 0)
@@ -292,7 +337,7 @@ class TestDoc(Document):
 
     def test_disconnect_cleans_cached_collection_attribute_in_document(self):
         """Ensure that the disconnect() method works properly"""
-        conn1 = connect('mongoenginetest')
+        conn1 = connect("mongoenginetest")
 
         class History(Document):
             pass
@@ -301,7 +346,7 @@ class History(Document):
 
         History.drop_collection()
 
-        History.objects.first()     # will trigger the caching of _collection attribute
+        History.objects.first()  # will trigger the caching of _collection attribute
         self.assertIsNotNone(History._collection)
 
         disconnect()
@@ -310,15 +355,17 @@ class History(Document):
 
         with self.assertRaises(MongoEngineConnectionError) as ctx_err:
             History.objects.first()
-        self.assertEqual("You have not defined a default connection", str(ctx_err.exception))
+        self.assertEqual(
+            "You have not defined a default connection", str(ctx_err.exception)
+        )
 
     def test_connect_disconnect_works_on_same_document(self):
         """Ensure that the connect/disconnect works properly with a single Document"""
-        db1 = 'db1'
-        db2 = 'db2'
+        db1 = "db1"
+        db2 = "db2"
 
         # Ensure freshness of the 2 databases through pymongo
-        client = MongoClient('localhost', 27017)
+        client = MongoClient("localhost", 27017)
         client.drop_database(db1)
         client.drop_database(db2)
 
@@ -328,44 +375,44 @@ def test_connect_disconnect_works_on_same_document(self):
         class User(Document):
             name = StringField(required=True)
 
-        user1 = User(name='John is in db1').save()
+        user1 = User(name="John is in db1").save()
         disconnect()
 
         # Make sure save doesnt work at this stage
         with self.assertRaises(MongoEngineConnectionError):
-            User(name='Wont work').save()
+            User(name="Wont work").save()
 
         # Save in db2
         connect(db2)
-        user2 = User(name='Bob is in db2').save()
+        user2 = User(name="Bob is in db2").save()
         disconnect()
 
         db1_users = list(client[db1].user.find())
-        self.assertEqual(db1_users, [{'_id': user1.id, 'name': 'John is in db1'}])
+        self.assertEqual(db1_users, [{"_id": user1.id, "name": "John is in db1"}])
         db2_users = list(client[db2].user.find())
-        self.assertEqual(db2_users, [{'_id': user2.id, 'name': 'Bob is in db2'}])
+        self.assertEqual(db2_users, [{"_id": user2.id, "name": "Bob is in db2"}])
 
     def test_disconnect_silently_pass_if_alias_does_not_exist(self):
         connections = mongoengine.connection._connections
         self.assertEqual(len(connections), 0)
-        disconnect(alias='not_exist')
+        disconnect(alias="not_exist")
 
     def test_disconnect_all(self):
         connections = mongoengine.connection._connections
         dbs = mongoengine.connection._dbs
         connection_settings = mongoengine.connection._connection_settings
 
-        connect('mongoenginetest')
-        connect('mongoenginetest2', alias='db1')
+        connect("mongoenginetest")
+        connect("mongoenginetest2", alias="db1")
 
         class History(Document):
             pass
 
         class History1(Document):
             name = StringField()
-            meta = {'db_alias': 'db1'}
+            meta = {"db_alias": "db1"}
 
-        History.drop_collection()   # will trigger the caching of _collection attribute
+        History.drop_collection()  # will trigger the caching of _collection attribute
         History.objects.first()
         History1.drop_collection()
         History1.objects.first()
@@ -398,11 +445,11 @@ def test_disconnect_all_silently_pass_if_no_connection_exist(self):
     def test_sharing_connections(self):
         """Ensure that connections are shared when the connection settings are exactly the same
         """
-        connect('mongoenginetests', alias='testdb1')
-        expected_connection = get_connection('testdb1')
+        connect("mongoenginetests", alias="testdb1")
+        expected_connection = get_connection("testdb1")
 
-        connect('mongoenginetests', alias='testdb2')
-        actual_connection = get_connection('testdb2')
+        connect("mongoenginetests", alias="testdb2")
+        actual_connection = get_connection("testdb2")
 
         expected_connection.server_info()
 
@@ -410,7 +457,7 @@ def test_sharing_connections(self):
 
     def test_connect_uri(self):
         """Ensure that the connect() method works properly with URIs."""
-        c = connect(db='mongoenginetest', alias='admin')
+        c = connect(db="mongoenginetest", alias="admin")
         c.admin.system.users.delete_many({})
         c.mongoenginetest.system.users.delete_many({})
 
@@ -418,14 +465,16 @@ def test_connect_uri(self):
         c.admin.authenticate("admin", "password")
         c.admin.command("createUser", "username", pwd="password", roles=["dbOwner"])
 
-        connect("testdb_uri", host='mongodb://username:password@localhost/mongoenginetest')
+        connect(
+            "testdb_uri", host="mongodb://username:password@localhost/mongoenginetest"
+        )
 
         conn = get_connection()
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
         self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, 'mongoenginetest')
+        self.assertEqual(db.name, "mongoenginetest")
 
         c.admin.system.users.delete_many({})
         c.mongoenginetest.system.users.delete_many({})
@@ -434,35 +483,35 @@ def test_connect_uri_without_db(self):
         """Ensure connect() method works properly if the URI doesn't
         include a database name.
         """
-        connect("mongoenginetest", host='mongodb://localhost/')
+        connect("mongoenginetest", host="mongodb://localhost/")
 
         conn = get_connection()
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
         self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, 'mongoenginetest')
+        self.assertEqual(db.name, "mongoenginetest")
 
     def test_connect_uri_default_db(self):
         """Ensure connect() defaults to the right database name if
         the URI and the database_name don't explicitly specify it.
         """
-        connect(host='mongodb://localhost/')
+        connect(host="mongodb://localhost/")
 
         conn = get_connection()
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
         self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, 'test')
+        self.assertEqual(db.name, "test")
 
     def test_uri_without_credentials_doesnt_override_conn_settings(self):
         """Ensure connect() uses the username & password params if the URI
         doesn't explicitly specify them.
         """
-        c = connect(host='mongodb://localhost/mongoenginetest',
-                    username='user',
-                    password='pass')
+        c = connect(
+            host="mongodb://localhost/mongoenginetest", username="user", password="pass"
+        )
 
         # OperationFailure means that mongoengine attempted authentication
         # w/ the provided username/password and failed - that's the desired
@@ -474,27 +523,31 @@ def test_connect_uri_with_authsource(self):
         option in the URI.
         """
         # Create users
-        c = connect('mongoenginetest')
+        c = connect("mongoenginetest")
 
         c.admin.system.users.delete_many({})
         c.admin.command("createUser", "username2", pwd="password", roles=["dbOwner"])
 
         # Authentication fails without "authSource"
         test_conn = connect(
-            'mongoenginetest', alias='test1',
-            host='mongodb://username2:password@localhost/mongoenginetest'
+            "mongoenginetest",
+            alias="test1",
+            host="mongodb://username2:password@localhost/mongoenginetest",
         )
         self.assertRaises(OperationFailure, test_conn.server_info)
 
         # Authentication succeeds with "authSource"
         authd_conn = connect(
-            'mongoenginetest', alias='test2',
-            host=('mongodb://username2:password@localhost/'
-                  'mongoenginetest?authSource=admin')
+            "mongoenginetest",
+            alias="test2",
+            host=(
+                "mongodb://username2:password@localhost/"
+                "mongoenginetest?authSource=admin"
+            ),
         )
-        db = get_db('test2')
+        db = get_db("test2")
         self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, 'mongoenginetest')
+        self.assertEqual(db.name, "mongoenginetest")
 
         # Clear all users
         authd_conn.admin.system.users.delete_many({})
@@ -502,82 +555,86 @@ def test_connect_uri_with_authsource(self):
     def test_register_connection(self):
         """Ensure that connections with different aliases may be registered.
         """
-        register_connection('testdb', 'mongoenginetest2')
+        register_connection("testdb", "mongoenginetest2")
 
         self.assertRaises(MongoEngineConnectionError, get_connection)
-        conn = get_connection('testdb')
+        conn = get_connection("testdb")
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
-        db = get_db('testdb')
+        db = get_db("testdb")
         self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, 'mongoenginetest2')
+        self.assertEqual(db.name, "mongoenginetest2")
 
     def test_register_connection_defaults(self):
         """Ensure that defaults are used when the host and port are None.
         """
-        register_connection('testdb', 'mongoenginetest', host=None, port=None)
+        register_connection("testdb", "mongoenginetest", host=None, port=None)
 
-        conn = get_connection('testdb')
+        conn = get_connection("testdb")
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
     def test_connection_kwargs(self):
         """Ensure that connection kwargs get passed to pymongo."""
-        connect('mongoenginetest', alias='t1', tz_aware=True)
-        conn = get_connection('t1')
+        connect("mongoenginetest", alias="t1", tz_aware=True)
+        conn = get_connection("t1")
 
         self.assertTrue(get_tz_awareness(conn))
 
-        connect('mongoenginetest2', alias='t2')
-        conn = get_connection('t2')
+        connect("mongoenginetest2", alias="t2")
+        conn = get_connection("t2")
         self.assertFalse(get_tz_awareness(conn))
 
     def test_connection_pool_via_kwarg(self):
         """Ensure we can specify a max connection pool size using
         a connection kwarg.
         """
-        pool_size_kwargs = {'maxpoolsize': 100}
+        pool_size_kwargs = {"maxpoolsize": 100}
 
-        conn = connect('mongoenginetest', alias='max_pool_size_via_kwarg', **pool_size_kwargs)
+        conn = connect(
+            "mongoenginetest", alias="max_pool_size_via_kwarg", **pool_size_kwargs
+        )
         self.assertEqual(conn.max_pool_size, 100)
 
     def test_connection_pool_via_uri(self):
         """Ensure we can specify a max connection pool size using
         an option in a connection URI.
         """
-        conn = connect(host='mongodb://localhost/test?maxpoolsize=100', alias='max_pool_size_via_uri')
+        conn = connect(
+            host="mongodb://localhost/test?maxpoolsize=100",
+            alias="max_pool_size_via_uri",
+        )
         self.assertEqual(conn.max_pool_size, 100)
 
     def test_write_concern(self):
         """Ensure write concern can be specified in connect() via
         a kwarg or as part of the connection URI.
         """
-        conn1 = connect(alias='conn1', host='mongodb://localhost/testing?w=1&j=true')
-        conn2 = connect('testing', alias='conn2', w=1, j=True)
-        self.assertEqual(conn1.write_concern.document, {'w': 1, 'j': True})
-        self.assertEqual(conn2.write_concern.document, {'w': 1, 'j': True})
+        conn1 = connect(alias="conn1", host="mongodb://localhost/testing?w=1&j=true")
+        conn2 = connect("testing", alias="conn2", w=1, j=True)
+        self.assertEqual(conn1.write_concern.document, {"w": 1, "j": True})
+        self.assertEqual(conn2.write_concern.document, {"w": 1, "j": True})
 
     def test_connect_with_replicaset_via_uri(self):
         """Ensure connect() works when specifying a replicaSet via the
         MongoDB URI.
         """
-        c = connect(host='mongodb://localhost/test?replicaSet=local-rs')
+        c = connect(host="mongodb://localhost/test?replicaSet=local-rs")
         db = get_db()
         self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, 'test')
+        self.assertEqual(db.name, "test")
 
     def test_connect_with_replicaset_via_kwargs(self):
         """Ensure connect() works when specifying a replicaSet via the
         connection kwargs
         """
-        c = connect(replicaset='local-rs')
-        self.assertEqual(c._MongoClient__options.replica_set_name,
-                         'local-rs')
+        c = connect(replicaset="local-rs")
+        self.assertEqual(c._MongoClient__options.replica_set_name, "local-rs")
         db = get_db()
         self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, 'test')
+        self.assertEqual(db.name, "test")
 
     def test_connect_tz_aware(self):
-        connect('mongoenginetest', tz_aware=True)
+        connect("mongoenginetest", tz_aware=True)
         d = datetime.datetime(2010, 5, 5, tzinfo=utc)
 
         class DateDoc(Document):
@@ -590,37 +647,39 @@ class DateDoc(Document):
         self.assertEqual(d, date_doc.the_date)
 
     def test_read_preference_from_parse(self):
-        conn = connect(host="mongodb://a1.vpc,a2.vpc,a3.vpc/prod?readPreference=secondaryPreferred")
+        conn = connect(
+            host="mongodb://a1.vpc,a2.vpc,a3.vpc/prod?readPreference=secondaryPreferred"
+        )
         self.assertEqual(conn.read_preference, ReadPreference.SECONDARY_PREFERRED)
 
     def test_multiple_connection_settings(self):
-        connect('mongoenginetest', alias='t1', host="localhost")
+        connect("mongoenginetest", alias="t1", host="localhost")
 
-        connect('mongoenginetest2', alias='t2', host="127.0.0.1")
+        connect("mongoenginetest2", alias="t2", host="127.0.0.1")
 
         mongo_connections = mongoengine.connection._connections
         self.assertEqual(len(mongo_connections.items()), 2)
-        self.assertIn('t1', mongo_connections.keys())
-        self.assertIn('t2', mongo_connections.keys())
+        self.assertIn("t1", mongo_connections.keys())
+        self.assertIn("t2", mongo_connections.keys())
 
         # Handle PyMongo 3+ Async Connection
         # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
         # Purposely not catching exception to fail test if thrown.
-        mongo_connections['t1'].server_info()
-        mongo_connections['t2'].server_info()
-        self.assertEqual(mongo_connections['t1'].address[0], 'localhost')
-        self.assertEqual(mongo_connections['t2'].address[0], '127.0.0.1')
+        mongo_connections["t1"].server_info()
+        mongo_connections["t2"].server_info()
+        self.assertEqual(mongo_connections["t1"].address[0], "localhost")
+        self.assertEqual(mongo_connections["t2"].address[0], "127.0.0.1")
 
     def test_connect_2_databases_uses_same_client_if_only_dbname_differs(self):
-        c1 = connect(alias='testdb1', db='testdb1')
-        c2 = connect(alias='testdb2', db='testdb2')
+        c1 = connect(alias="testdb1", db="testdb1")
+        c2 = connect(alias="testdb2", db="testdb2")
         self.assertIs(c1, c2)
 
     def test_connect_2_databases_uses_different_client_if_different_parameters(self):
-        c1 = connect(alias='testdb1', db='testdb1', username='u1')
-        c2 = connect(alias='testdb2', db='testdb2', username='u2')
+        c1 = connect(alias="testdb1", db="testdb1", username="u1")
+        c2 = connect(alias="testdb2", db="testdb2", username="u2")
         self.assertIsNot(c1, c2)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 529032fe6..dc9b9bf3d 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -2,17 +2,20 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from mongoengine.context_managers import (switch_db, switch_collection,
-                                          no_sub_classes, no_dereference,
-                                          query_counter)
+from mongoengine.context_managers import (
+    switch_db,
+    switch_collection,
+    no_sub_classes,
+    no_dereference,
+    query_counter,
+)
 from mongoengine.pymongo_support import count_documents
 
 
 class ContextManagersTest(unittest.TestCase):
-
     def test_switch_db_context_manager(self):
-        connect('mongoenginetest')
-        register_connection('testdb-1', 'mongoenginetest2')
+        connect("mongoenginetest")
+        register_connection("testdb-1", "mongoenginetest2")
 
         class Group(Document):
             name = StringField()
@@ -22,7 +25,7 @@ class Group(Document):
         Group(name="hello - default").save()
         self.assertEqual(1, Group.objects.count())
 
-        with switch_db(Group, 'testdb-1') as Group:
+        with switch_db(Group, "testdb-1") as Group:
 
             self.assertEqual(0, Group.objects.count())
 
@@ -36,21 +39,21 @@ class Group(Document):
         self.assertEqual(1, Group.objects.count())
 
     def test_switch_collection_context_manager(self):
-        connect('mongoenginetest')
-        register_connection(alias='testdb-1', db='mongoenginetest2')
+        connect("mongoenginetest")
+        register_connection(alias="testdb-1", db="mongoenginetest2")
 
         class Group(Document):
             name = StringField()
 
-        Group.drop_collection()         # drops in default
+        Group.drop_collection()  # drops in default
 
-        with switch_collection(Group, 'group1') as Group:
-            Group.drop_collection()     # drops in group1
+        with switch_collection(Group, "group1") as Group:
+            Group.drop_collection()  # drops in group1
 
         Group(name="hello - group").save()
         self.assertEqual(1, Group.objects.count())
 
-        with switch_collection(Group, 'group1') as Group:
+        with switch_collection(Group, "group1") as Group:
 
             self.assertEqual(0, Group.objects.count())
 
@@ -66,7 +69,7 @@ class Group(Document):
     def test_no_dereference_context_manager_object_id(self):
         """Ensure that DBRef items in ListFields aren't dereferenced.
         """
-        connect('mongoenginetest')
+        connect("mongoenginetest")
 
         class User(Document):
             name = StringField()
@@ -80,14 +83,14 @@ class Group(Document):
         Group.drop_collection()
 
         for i in range(1, 51):
-            User(name='user %s' % i).save()
+            User(name="user %s" % i).save()
 
         user = User.objects.first()
         Group(ref=user, members=User.objects, generic=user).save()
 
         with no_dereference(Group) as NoDeRefGroup:
-            self.assertTrue(Group._fields['members']._auto_dereference)
-            self.assertFalse(NoDeRefGroup._fields['members']._auto_dereference)
+            self.assertTrue(Group._fields["members"]._auto_dereference)
+            self.assertFalse(NoDeRefGroup._fields["members"]._auto_dereference)
 
         with no_dereference(Group) as Group:
             group = Group.objects.first()
@@ -104,7 +107,7 @@ class Group(Document):
     def test_no_dereference_context_manager_dbref(self):
         """Ensure that DBRef items in ListFields aren't dereferenced.
         """
-        connect('mongoenginetest')
+        connect("mongoenginetest")
 
         class User(Document):
             name = StringField()
@@ -118,31 +121,29 @@ class Group(Document):
         Group.drop_collection()
 
         for i in range(1, 51):
-            User(name='user %s' % i).save()
+            User(name="user %s" % i).save()
 
         user = User.objects.first()
         Group(ref=user, members=User.objects, generic=user).save()
 
         with no_dereference(Group) as NoDeRefGroup:
-            self.assertTrue(Group._fields['members']._auto_dereference)
-            self.assertFalse(NoDeRefGroup._fields['members']._auto_dereference)
+            self.assertTrue(Group._fields["members"]._auto_dereference)
+            self.assertFalse(NoDeRefGroup._fields["members"]._auto_dereference)
 
         with no_dereference(Group) as Group:
             group = Group.objects.first()
-            self.assertTrue(all([not isinstance(m, User)
-                                for m in group.members]))
+            self.assertTrue(all([not isinstance(m, User) for m in group.members]))
             self.assertNotIsInstance(group.ref, User)
             self.assertNotIsInstance(group.generic, User)
 
-        self.assertTrue(all([isinstance(m, User)
-                             for m in group.members]))
+        self.assertTrue(all([isinstance(m, User) for m in group.members]))
         self.assertIsInstance(group.ref, User)
         self.assertIsInstance(group.generic, User)
 
     def test_no_sub_classes(self):
         class A(Document):
             x = IntField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class B(A):
             z = IntField()
@@ -188,20 +189,20 @@ class C(B):
     def test_no_sub_classes_modification_to_document_class_are_temporary(self):
         class A(Document):
             x = IntField()
-            meta = {'allow_inheritance': True}
+            meta = {"allow_inheritance": True}
 
         class B(A):
             z = IntField()
 
-        self.assertEqual(A._subclasses, ('A', 'A.B'))
+        self.assertEqual(A._subclasses, ("A", "A.B"))
         with no_sub_classes(A):
-            self.assertEqual(A._subclasses, ('A',))
-        self.assertEqual(A._subclasses, ('A', 'A.B'))
+            self.assertEqual(A._subclasses, ("A",))
+        self.assertEqual(A._subclasses, ("A", "A.B"))
 
-        self.assertEqual(B._subclasses, ('A.B',))
+        self.assertEqual(B._subclasses, ("A.B",))
         with no_sub_classes(B):
-            self.assertEqual(B._subclasses, ('A.B',))
-        self.assertEqual(B._subclasses, ('A.B',))
+            self.assertEqual(B._subclasses, ("A.B",))
+        self.assertEqual(B._subclasses, ("A.B",))
 
     def test_no_subclass_context_manager_does_not_swallow_exception(self):
         class User(Document):
@@ -218,7 +219,7 @@ def test_query_counter_does_not_swallow_exception(self):
                 raise TypeError()
 
     def test_query_counter_temporarily_modifies_profiling_level(self):
-        connect('mongoenginetest')
+        connect("mongoenginetest")
         db = get_db()
 
         initial_profiling_level = db.profiling_level()
@@ -231,11 +232,13 @@ def test_query_counter_temporarily_modifies_profiling_level(self):
                 self.assertEqual(db.profiling_level(), 2)
             self.assertEqual(db.profiling_level(), NEW_LEVEL)
         except Exception:
-            db.set_profiling_level(initial_profiling_level)    # Ensures it gets reseted no matter the outcome of the test
+            db.set_profiling_level(
+                initial_profiling_level
+            )  # Ensures it gets reseted no matter the outcome of the test
             raise
 
     def test_query_counter(self):
-        connect('mongoenginetest')
+        connect("mongoenginetest")
         db = get_db()
 
         collection = db.query_counter
@@ -245,7 +248,7 @@ def issue_1_count_query():
             count_documents(collection, {})
 
         def issue_1_insert_query():
-            collection.insert_one({'test': 'garbage'})
+            collection.insert_one({"test": "garbage"})
 
         def issue_1_find_query():
             collection.find_one()
@@ -253,7 +256,9 @@ def issue_1_find_query():
         counter = 0
         with query_counter() as q:
             self.assertEqual(q, counter)
-            self.assertEqual(q, counter)    # Ensures previous count query did not get counted
+            self.assertEqual(
+                q, counter
+            )  # Ensures previous count query did not get counted
 
             for _ in range(10):
                 issue_1_insert_query()
@@ -270,23 +275,25 @@ def issue_1_find_query():
                 counter += 1
             self.assertEqual(q, counter)
 
-            self.assertEqual(int(q), counter)       # test __int__
+            self.assertEqual(int(q), counter)  # test __int__
             self.assertEqual(repr(q), str(int(q)))  # test __repr__
-            self.assertGreater(q, -1)               # test __gt__
-            self.assertGreaterEqual(q, int(q))      # test __gte__
+            self.assertGreater(q, -1)  # test __gt__
+            self.assertGreaterEqual(q, int(q))  # test __gte__
             self.assertNotEqual(q, -1)
             self.assertLess(q, 1000)
             self.assertLessEqual(q, int(q))
 
     def test_query_counter_counts_getmore_queries(self):
-        connect('mongoenginetest')
+        connect("mongoenginetest")
         db = get_db()
 
         collection = db.query_counter
         collection.drop()
 
-        many_docs = [{'test': 'garbage %s' % i} for i in range(150)]
-        collection.insert_many(many_docs)   # first batch of documents contains 101 documents
+        many_docs = [{"test": "garbage %s" % i} for i in range(150)]
+        collection.insert_many(
+            many_docs
+        )  # first batch of documents contains 101 documents
 
         with query_counter() as q:
             self.assertEqual(q, 0)
@@ -294,24 +301,26 @@ def test_query_counter_counts_getmore_queries(self):
             self.assertEqual(q, 2)  # 1st select + 1 getmore
 
     def test_query_counter_ignores_particular_queries(self):
-        connect('mongoenginetest')
+        connect("mongoenginetest")
         db = get_db()
 
         collection = db.query_counter
-        collection.insert_many([{'test': 'garbage %s' % i} for i in range(10)])
+        collection.insert_many([{"test": "garbage %s" % i} for i in range(10)])
 
         with query_counter() as q:
             self.assertEqual(q, 0)
             cursor = collection.find()
-            self.assertEqual(q, 0)      # cursor wasn't opened yet
-            _ = next(cursor)            # opens the cursor and fires the find query
+            self.assertEqual(q, 0)  # cursor wasn't opened yet
+            _ = next(cursor)  # opens the cursor and fires the find query
             self.assertEqual(q, 1)
 
-            cursor.close()              # issues a `killcursors` query that is ignored by the context
+            cursor.close()  # issues a `killcursors` query that is ignored by the context
             self.assertEqual(q, 1)
-            _ = db.system.indexes.find_one()    # queries on db.system.indexes are ignored as well
+            _ = (
+                db.system.indexes.find_one()
+            )  # queries on db.system.indexes are ignored as well
             self.assertEqual(q, 1)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index a9ef98e7f..7def2ac71 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -14,128 +14,129 @@ def _mark_as_changed(self, key):
 
 
 class TestBaseDict(unittest.TestCase):
-
     @staticmethod
     def _get_basedict(dict_items):
         """Get a BaseList bound to a fake document instance"""
         fake_doc = DocumentStub()
-        base_list = BaseDict(dict_items, instance=None, name='my_name')
-        base_list._instance = fake_doc  # hack to inject the mock, it does not work in the constructor
+        base_list = BaseDict(dict_items, instance=None, name="my_name")
+        base_list._instance = (
+            fake_doc
+        )  # hack to inject the mock, it does not work in the constructor
         return base_list
 
     def test___init___(self):
         class MyDoc(Document):
             pass
 
-        dict_items = {'k': 'v'}
+        dict_items = {"k": "v"}
         doc = MyDoc()
-        base_dict = BaseDict(dict_items, instance=doc, name='my_name')
+        base_dict = BaseDict(dict_items, instance=doc, name="my_name")
         self.assertIsInstance(base_dict._instance, Document)
-        self.assertEqual(base_dict._name, 'my_name')
+        self.assertEqual(base_dict._name, "my_name")
         self.assertEqual(base_dict, dict_items)
 
     def test_setdefault_calls_mark_as_changed(self):
         base_dict = self._get_basedict({})
-        base_dict.setdefault('k', 'v')
+        base_dict.setdefault("k", "v")
         self.assertEqual(base_dict._instance._changed_fields, [base_dict._name])
 
     def test_popitems_calls_mark_as_changed(self):
-        base_dict = self._get_basedict({'k': 'v'})
-        self.assertEqual(base_dict.popitem(), ('k', 'v'))
+        base_dict = self._get_basedict({"k": "v"})
+        self.assertEqual(base_dict.popitem(), ("k", "v"))
         self.assertEqual(base_dict._instance._changed_fields, [base_dict._name])
         self.assertFalse(base_dict)
 
     def test_pop_calls_mark_as_changed(self):
-        base_dict = self._get_basedict({'k': 'v'})
-        self.assertEqual(base_dict.pop('k'), 'v')
+        base_dict = self._get_basedict({"k": "v"})
+        self.assertEqual(base_dict.pop("k"), "v")
         self.assertEqual(base_dict._instance._changed_fields, [base_dict._name])
         self.assertFalse(base_dict)
 
     def test_pop_calls_does_not_mark_as_changed_when_it_fails(self):
-        base_dict = self._get_basedict({'k': 'v'})
+        base_dict = self._get_basedict({"k": "v"})
         with self.assertRaises(KeyError):
-            base_dict.pop('X')
+            base_dict.pop("X")
         self.assertFalse(base_dict._instance._changed_fields)
 
     def test_clear_calls_mark_as_changed(self):
-        base_dict = self._get_basedict({'k': 'v'})
+        base_dict = self._get_basedict({"k": "v"})
         base_dict.clear()
-        self.assertEqual(base_dict._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_dict._instance._changed_fields, ["my_name"])
         self.assertEqual(base_dict, {})
 
     def test___delitem___calls_mark_as_changed(self):
-        base_dict = self._get_basedict({'k': 'v'})
-        del base_dict['k']
-        self.assertEqual(base_dict._instance._changed_fields, ['my_name.k'])
+        base_dict = self._get_basedict({"k": "v"})
+        del base_dict["k"]
+        self.assertEqual(base_dict._instance._changed_fields, ["my_name.k"])
         self.assertEqual(base_dict, {})
 
     def test___getitem____KeyError(self):
         base_dict = self._get_basedict({})
         with self.assertRaises(KeyError):
-            base_dict['new']
+            base_dict["new"]
 
     def test___getitem____simple_value(self):
-        base_dict = self._get_basedict({'k': 'v'})
-        base_dict['k'] = 'v'
+        base_dict = self._get_basedict({"k": "v"})
+        base_dict["k"] = "v"
 
     def test___getitem____sublist_gets_converted_to_BaseList(self):
-        base_dict = self._get_basedict({'k': [0, 1, 2]})
-        sub_list = base_dict['k']
+        base_dict = self._get_basedict({"k": [0, 1, 2]})
+        sub_list = base_dict["k"]
         self.assertEqual(sub_list, [0, 1, 2])
         self.assertIsInstance(sub_list, BaseList)
         self.assertIs(sub_list._instance, base_dict._instance)
-        self.assertEqual(sub_list._name, 'my_name.k')
+        self.assertEqual(sub_list._name, "my_name.k")
         self.assertEqual(base_dict._instance._changed_fields, [])
 
         # Challenge mark_as_changed from sublist
         sub_list[1] = None
-        self.assertEqual(base_dict._instance._changed_fields, ['my_name.k.1'])
+        self.assertEqual(base_dict._instance._changed_fields, ["my_name.k.1"])
 
     def test___getitem____subdict_gets_converted_to_BaseDict(self):
-        base_dict = self._get_basedict({'k': {'subk': 'subv'}})
-        sub_dict = base_dict['k']
-        self.assertEqual(sub_dict, {'subk': 'subv'})
+        base_dict = self._get_basedict({"k": {"subk": "subv"}})
+        sub_dict = base_dict["k"]
+        self.assertEqual(sub_dict, {"subk": "subv"})
         self.assertIsInstance(sub_dict, BaseDict)
         self.assertIs(sub_dict._instance, base_dict._instance)
-        self.assertEqual(sub_dict._name, 'my_name.k')
+        self.assertEqual(sub_dict._name, "my_name.k")
         self.assertEqual(base_dict._instance._changed_fields, [])
 
         # Challenge mark_as_changed from subdict
-        sub_dict['subk'] = None
-        self.assertEqual(base_dict._instance._changed_fields, ['my_name.k.subk'])
+        sub_dict["subk"] = None
+        self.assertEqual(base_dict._instance._changed_fields, ["my_name.k.subk"])
 
     def test_get_sublist_gets_converted_to_BaseList_just_like__getitem__(self):
-        base_dict = self._get_basedict({'k': [0, 1, 2]})
-        sub_list = base_dict.get('k')
+        base_dict = self._get_basedict({"k": [0, 1, 2]})
+        sub_list = base_dict.get("k")
         self.assertEqual(sub_list, [0, 1, 2])
         self.assertIsInstance(sub_list, BaseList)
 
     def test_get_returns_the_same_as___getitem__(self):
-        base_dict = self._get_basedict({'k': [0, 1, 2]})
-        get_ = base_dict.get('k')
-        getitem_ = base_dict['k']
+        base_dict = self._get_basedict({"k": [0, 1, 2]})
+        get_ = base_dict.get("k")
+        getitem_ = base_dict["k"]
         self.assertEqual(get_, getitem_)
 
     def test_get_default(self):
         base_dict = self._get_basedict({})
         sentinel = object()
-        self.assertEqual(base_dict.get('new'), None)
-        self.assertIs(base_dict.get('new', sentinel), sentinel)
+        self.assertEqual(base_dict.get("new"), None)
+        self.assertIs(base_dict.get("new", sentinel), sentinel)
 
     def test___setitem___calls_mark_as_changed(self):
         base_dict = self._get_basedict({})
-        base_dict['k'] = 'v'
-        self.assertEqual(base_dict._instance._changed_fields, ['my_name.k'])
-        self.assertEqual(base_dict, {'k': 'v'})
+        base_dict["k"] = "v"
+        self.assertEqual(base_dict._instance._changed_fields, ["my_name.k"])
+        self.assertEqual(base_dict, {"k": "v"})
 
     def test_update_calls_mark_as_changed(self):
         base_dict = self._get_basedict({})
-        base_dict.update({'k': 'v'})
-        self.assertEqual(base_dict._instance._changed_fields, ['my_name'])
+        base_dict.update({"k": "v"})
+        self.assertEqual(base_dict._instance._changed_fields, ["my_name"])
 
     def test___setattr____not_tracked_by_changes(self):
         base_dict = self._get_basedict({})
-        base_dict.a_new_attr = 'test'
+        base_dict.a_new_attr = "test"
         self.assertEqual(base_dict._instance._changed_fields, [])
 
     def test___delattr____tracked_by_changes(self):
@@ -143,19 +144,20 @@ def test___delattr____tracked_by_changes(self):
         # This is even bad because it could be that there is an attribute
         # with the same name as a key
         base_dict = self._get_basedict({})
-        base_dict.a_new_attr = 'test'
+        base_dict.a_new_attr = "test"
         del base_dict.a_new_attr
-        self.assertEqual(base_dict._instance._changed_fields, ['my_name.a_new_attr'])
+        self.assertEqual(base_dict._instance._changed_fields, ["my_name.a_new_attr"])
 
 
 class TestBaseList(unittest.TestCase):
-
     @staticmethod
     def _get_baselist(list_items):
         """Get a BaseList bound to a fake document instance"""
         fake_doc = DocumentStub()
-        base_list = BaseList(list_items, instance=None, name='my_name')
-        base_list._instance = fake_doc  # hack to inject the mock, it does not work in the constructor
+        base_list = BaseList(list_items, instance=None, name="my_name")
+        base_list._instance = (
+            fake_doc
+        )  # hack to inject the mock, it does not work in the constructor
         return base_list
 
     def test___init___(self):
@@ -164,19 +166,19 @@ class MyDoc(Document):
 
         list_items = [True]
         doc = MyDoc()
-        base_list = BaseList(list_items, instance=doc, name='my_name')
+        base_list = BaseList(list_items, instance=doc, name="my_name")
         self.assertIsInstance(base_list._instance, Document)
-        self.assertEqual(base_list._name, 'my_name')
+        self.assertEqual(base_list._name, "my_name")
         self.assertEqual(base_list, list_items)
 
     def test___iter__(self):
         values = [True, False, True, False]
-        base_list = BaseList(values, instance=None, name='my_name')
+        base_list = BaseList(values, instance=None, name="my_name")
         self.assertEqual(values, list(base_list))
 
     def test___iter___allow_modification_while_iterating_withou_error(self):
         # regular list allows for this, thus this subclass must comply to that
-        base_list = BaseList([True, False, True, False], instance=None, name='my_name')
+        base_list = BaseList([True, False, True, False], instance=None, name="my_name")
         for idx, val in enumerate(base_list):
             if val:
                 base_list.pop(idx)
@@ -185,7 +187,7 @@ def test_append_calls_mark_as_changed(self):
         base_list = self._get_baselist([])
         self.assertFalse(base_list._instance._changed_fields)
         base_list.append(True)
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test_subclass_append(self):
         # Due to the way mark_as_changed_wrapper is implemented
@@ -193,7 +195,7 @@ def test_subclass_append(self):
         class SubBaseList(BaseList):
             pass
 
-        base_list = SubBaseList([], instance=None, name='my_name')
+        base_list = SubBaseList([], instance=None, name="my_name")
         base_list.append(True)
 
     def test___getitem__using_simple_index(self):
@@ -217,54 +219,45 @@ def test___getitem___using_slice_returns_list(self):
         self.assertEqual(base_list._instance._changed_fields, [])
 
     def test___getitem__sublist_returns_BaseList_bound_to_instance(self):
-        base_list = self._get_baselist(
-            [
-                [1, 2],
-                [3, 4]
-            ]
-        )
+        base_list = self._get_baselist([[1, 2], [3, 4]])
         sub_list = base_list[0]
         self.assertEqual(sub_list, [1, 2])
         self.assertIsInstance(sub_list, BaseList)
         self.assertIs(sub_list._instance, base_list._instance)
-        self.assertEqual(sub_list._name, 'my_name.0')
+        self.assertEqual(sub_list._name, "my_name.0")
         self.assertEqual(base_list._instance._changed_fields, [])
 
         # Challenge mark_as_changed from sublist
         sub_list[1] = None
-        self.assertEqual(base_list._instance._changed_fields, ['my_name.0.1'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name.0.1"])
 
     def test___getitem__subdict_returns_BaseList_bound_to_instance(self):
-        base_list = self._get_baselist(
-            [
-                {'subk': 'subv'}
-            ]
-        )
+        base_list = self._get_baselist([{"subk": "subv"}])
         sub_dict = base_list[0]
-        self.assertEqual(sub_dict, {'subk': 'subv'})
+        self.assertEqual(sub_dict, {"subk": "subv"})
         self.assertIsInstance(sub_dict, BaseDict)
         self.assertIs(sub_dict._instance, base_list._instance)
-        self.assertEqual(sub_dict._name, 'my_name.0')
+        self.assertEqual(sub_dict._name, "my_name.0")
         self.assertEqual(base_list._instance._changed_fields, [])
 
         # Challenge mark_as_changed from subdict
-        sub_dict['subk'] = None
-        self.assertEqual(base_list._instance._changed_fields, ['my_name.0.subk'])
+        sub_dict["subk"] = None
+        self.assertEqual(base_list._instance._changed_fields, ["my_name.0.subk"])
 
     def test_extend_calls_mark_as_changed(self):
         base_list = self._get_baselist([])
         base_list.extend([True])
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test_insert_calls_mark_as_changed(self):
         base_list = self._get_baselist([])
         base_list.insert(0, True)
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test_remove_calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         base_list.remove(True)
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test_remove_not_mark_as_changed_when_it_fails(self):
         base_list = self._get_baselist([True])
@@ -275,70 +268,76 @@ def test_remove_not_mark_as_changed_when_it_fails(self):
     def test_pop_calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         base_list.pop()
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test_reverse_calls_mark_as_changed(self):
         base_list = self._get_baselist([True, False])
         base_list.reverse()
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test___delitem___calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         del base_list[0]
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test___setitem___calls_with_full_slice_mark_as_changed(self):
         base_list = self._get_baselist([])
-        base_list[:] = [0, 1]      # Will use __setslice__ under py2 and __setitem__ under py3
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        base_list[:] = [
+            0,
+            1,
+        ]  # Will use __setslice__ under py2 and __setitem__ under py3
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
         self.assertEqual(base_list, [0, 1])
 
     def test___setitem___calls_with_partial_slice_mark_as_changed(self):
         base_list = self._get_baselist([0, 1, 2])
-        base_list[0:2] = [1, 0]     # Will use __setslice__ under py2 and __setitem__ under py3
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        base_list[0:2] = [
+            1,
+            0,
+        ]  # Will use __setslice__ under py2 and __setitem__ under py3
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
         self.assertEqual(base_list, [1, 0, 2])
 
     def test___setitem___calls_with_step_slice_mark_as_changed(self):
         base_list = self._get_baselist([0, 1, 2])
-        base_list[0:3:2] = [-1, -2]   # uses __setitem__ in both py2 & 3
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        base_list[0:3:2] = [-1, -2]  # uses __setitem__ in both py2 & 3
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
         self.assertEqual(base_list, [-1, 1, -2])
 
     def test___setitem___with_slice(self):
         base_list = self._get_baselist([0, 1, 2, 3, 4, 5])
         base_list[0:6:2] = [None, None, None]
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
         self.assertEqual(base_list, [None, 1, None, 3, None, 5])
 
     def test___setitem___item_0_calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         base_list[0] = False
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
         self.assertEqual(base_list, [False])
 
     def test___setitem___item_1_calls_mark_as_changed(self):
         base_list = self._get_baselist([True, True])
         base_list[1] = False
-        self.assertEqual(base_list._instance._changed_fields, ['my_name.1'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name.1"])
         self.assertEqual(base_list, [True, False])
 
     def test___delslice___calls_mark_as_changed(self):
         base_list = self._get_baselist([0, 1])
         del base_list[0:1]
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
         self.assertEqual(base_list, [1])
 
     def test___iadd___calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         base_list += [False]
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test___imul___calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         self.assertEqual(base_list._instance._changed_fields, [])
         base_list *= 2
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test_sort_calls_not_marked_as_changed_when_it_fails(self):
         base_list = self._get_baselist([True])
@@ -350,7 +349,7 @@ def test_sort_calls_not_marked_as_changed_when_it_fails(self):
     def test_sort_calls_mark_as_changed(self):
         base_list = self._get_baselist([True, False])
         base_list.sort()
-        self.assertEqual(base_list._instance._changed_fields, ['my_name'])
+        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
 
     def test_sort_calls_with_key(self):
         base_list = self._get_baselist([1, 2, 11])
@@ -371,7 +370,7 @@ def test_init(self):
 
     def test_iterkeys(self):
         d = self.dtype(a=1)
-        self.assertEqual(list(iterkeys(d)), ['a'])
+        self.assertEqual(list(iterkeys(d)), ["a"])
 
     def test_len(self):
         d = self.dtype(a=1)
@@ -379,9 +378,9 @@ def test_len(self):
 
     def test_pop(self):
         d = self.dtype(a=1)
-        self.assertIn('a', d)
-        d.pop('a')
-        self.assertNotIn('a', d)
+        self.assertIn("a", d)
+        d.pop("a")
+        self.assertNotIn("a", d)
 
     def test_repr(self):
         d = self.dtype(a=1, b=2, c=3)
@@ -416,7 +415,7 @@ def test_setattr_getattr(self):
         d = self.dtype()
         d.a = 1
         self.assertEqual(d.a, 1)
-        self.assertRaises(AttributeError, getattr, d, 'b')
+        self.assertRaises(AttributeError, getattr, d, "b")
 
     def test_setattr_raises_on_nonexisting_attr(self):
         d = self.dtype()
@@ -430,20 +429,20 @@ def test_setattr_getattr_special(self):
 
     def test_get(self):
         d = self.dtype(a=1)
-        self.assertEqual(d.get('a'), 1)
-        self.assertEqual(d.get('b', 'bla'), 'bla')
+        self.assertEqual(d.get("a"), 1)
+        self.assertEqual(d.get("b", "bla"), "bla")
 
     def test_items(self):
         d = self.dtype(a=1)
-        self.assertEqual(d.items(), [('a', 1)])
+        self.assertEqual(d.items(), [("a", 1)])
         d = self.dtype(a=1, b=2)
-        self.assertEqual(d.items(), [('a', 1), ('b', 2)])
+        self.assertEqual(d.items(), [("a", 1), ("b", 2)])
 
     def test_mappings_protocol(self):
         d = self.dtype(a=1, b=2)
-        self.assertEqual(dict(d), {'a': 1, 'b': 2})
-        self.assertEqual(dict(**d), {'a': 1, 'b': 2})
+        self.assertEqual(dict(d), {"a": 1, "b": 2})
+        self.assertEqual(dict(**d), {"a": 1, "b": 2})
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 9c5658108..4730e2e34 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -10,18 +10,18 @@
 
 
 class FieldTest(unittest.TestCase):
-
     @classmethod
     def setUpClass(cls):
-        cls.db = connect(db='mongoenginetest')
+        cls.db = connect(db="mongoenginetest")
 
     @classmethod
     def tearDownClass(cls):
-        cls.db.drop_database('mongoenginetest')
+        cls.db.drop_database("mongoenginetest")
 
     def test_list_item_dereference(self):
         """Ensure that DBRef items in ListFields are dereferenced.
         """
+
         class User(Document):
             name = StringField()
 
@@ -32,7 +32,7 @@ class Group(Document):
         Group.drop_collection()
 
         for i in range(1, 51):
-            user = User(name='user %s' % i)
+            user = User(name="user %s" % i)
             user.save()
 
         group = Group(members=User.objects)
@@ -47,7 +47,7 @@ class Group(Document):
             group_obj = Group.objects.first()
             self.assertEqual(q, 1)
 
-            len(group_obj._data['members'])
+            len(group_obj._data["members"])
             self.assertEqual(q, 1)
 
             len(group_obj.members)
@@ -80,6 +80,7 @@ class Group(Document):
     def test_list_item_dereference_dref_false(self):
         """Ensure that DBRef items in ListFields are dereferenced.
         """
+
         class User(Document):
             name = StringField()
 
@@ -90,7 +91,7 @@ class Group(Document):
         Group.drop_collection()
 
         for i in range(1, 51):
-            user = User(name='user %s' % i)
+            user = User(name="user %s" % i)
             user.save()
 
         group = Group(members=User.objects)
@@ -105,14 +106,14 @@ class Group(Document):
 
             [m for m in group_obj.members]
             self.assertEqual(q, 2)
-            self.assertTrue(group_obj._data['members']._dereferenced)
+            self.assertTrue(group_obj._data["members"]._dereferenced)
 
             # verifies that no additional queries gets executed
             # if we re-iterate over the ListField once it is
             # dereferenced
             [m for m in group_obj.members]
             self.assertEqual(q, 2)
-            self.assertTrue(group_obj._data['members']._dereferenced)
+            self.assertTrue(group_obj._data["members"]._dereferenced)
 
         # Document select_related
         with query_counter() as q:
@@ -136,6 +137,7 @@ class Group(Document):
     def test_list_item_dereference_orphan_dbref(self):
         """Ensure that orphan DBRef items in ListFields are dereferenced.
         """
+
         class User(Document):
             name = StringField()
 
@@ -146,7 +148,7 @@ class Group(Document):
         Group.drop_collection()
 
         for i in range(1, 51):
-            user = User(name='user %s' % i)
+            user = User(name="user %s" % i)
             user.save()
 
         group = Group(members=User.objects)
@@ -164,14 +166,14 @@ class Group(Document):
 
             [m for m in group_obj.members]
             self.assertEqual(q, 2)
-            self.assertTrue(group_obj._data['members']._dereferenced)
+            self.assertTrue(group_obj._data["members"]._dereferenced)
 
             # verifies that no additional queries gets executed
             # if we re-iterate over the ListField once it is
             # dereferenced
             [m for m in group_obj.members]
             self.assertEqual(q, 2)
-            self.assertTrue(group_obj._data['members']._dereferenced)
+            self.assertTrue(group_obj._data["members"]._dereferenced)
 
         User.drop_collection()
         Group.drop_collection()
@@ -179,6 +181,7 @@ class Group(Document):
     def test_list_item_dereference_dref_false_stores_as_type(self):
         """Ensure that DBRef items are stored as their type
         """
+
         class User(Document):
             my_id = IntField(primary_key=True)
             name = StringField()
@@ -189,17 +192,18 @@ class Group(Document):
         User.drop_collection()
         Group.drop_collection()
 
-        user = User(my_id=1, name='user 1').save()
+        user = User(my_id=1, name="user 1").save()
 
         Group(members=User.objects).save()
         group = Group.objects.first()
 
-        self.assertEqual(Group._get_collection().find_one()['members'], [1])
+        self.assertEqual(Group._get_collection().find_one()["members"], [1])
         self.assertEqual(group.members, [user])
 
     def test_handle_old_style_references(self):
         """Ensure that DBRef items in ListFields are dereferenced.
         """
+
         class User(Document):
             name = StringField()
 
@@ -210,7 +214,7 @@ class Group(Document):
         Group.drop_collection()
 
         for i in range(1, 26):
-            user = User(name='user %s' % i)
+            user = User(name="user %s" % i)
             user.save()
 
         group = Group(members=User.objects)
@@ -227,8 +231,8 @@ class Group(Document):
         group.save()
 
         group = Group.objects.first()
-        self.assertEqual(group.members[0].name, 'user 1')
-        self.assertEqual(group.members[-1].name, 'String!')
+        self.assertEqual(group.members[0].name, "user 1")
+        self.assertEqual(group.members[-1].name, "String!")
 
     def test_migrate_references(self):
         """Example of migrating ReferenceField storage
@@ -249,8 +253,8 @@ class Group(Document):
         group = Group(author=user, members=[user]).save()
 
         raw_data = Group._get_collection().find_one()
-        self.assertIsInstance(raw_data['author'], DBRef)
-        self.assertIsInstance(raw_data['members'][0], DBRef)
+        self.assertIsInstance(raw_data["author"], DBRef)
+        self.assertIsInstance(raw_data["members"][0], DBRef)
         group = Group.objects.first()
 
         self.assertEqual(group.author, user)
@@ -264,8 +268,8 @@ class Group(Document):
         # Migrate the data
         for g in Group.objects():
             # Explicitly mark as changed so resets
-            g._mark_as_changed('author')
-            g._mark_as_changed('members')
+            g._mark_as_changed("author")
+            g._mark_as_changed("members")
             g.save()
 
         group = Group.objects.first()
@@ -273,35 +277,36 @@ class Group(Document):
         self.assertEqual(group.members, [user])
 
         raw_data = Group._get_collection().find_one()
-        self.assertIsInstance(raw_data['author'], ObjectId)
-        self.assertIsInstance(raw_data['members'][0], ObjectId)
+        self.assertIsInstance(raw_data["author"], ObjectId)
+        self.assertIsInstance(raw_data["members"][0], ObjectId)
 
     def test_recursive_reference(self):
         """Ensure that ReferenceFields can reference their own documents.
         """
+
         class Employee(Document):
             name = StringField()
-            boss = ReferenceField('self')
-            friends = ListField(ReferenceField('self'))
+            boss = ReferenceField("self")
+            friends = ListField(ReferenceField("self"))
 
         Employee.drop_collection()
 
-        bill = Employee(name='Bill Lumbergh')
+        bill = Employee(name="Bill Lumbergh")
         bill.save()
 
-        michael = Employee(name='Michael Bolton')
+        michael = Employee(name="Michael Bolton")
         michael.save()
 
-        samir = Employee(name='Samir Nagheenanajar')
+        samir = Employee(name="Samir Nagheenanajar")
         samir.save()
 
         friends = [michael, samir]
-        peter = Employee(name='Peter Gibbons', boss=bill, friends=friends)
+        peter = Employee(name="Peter Gibbons", boss=bill, friends=friends)
         peter.save()
 
-        Employee(name='Funky Gibbon', boss=bill, friends=friends).save()
-        Employee(name='Funky Gibbon', boss=bill, friends=friends).save()
-        Employee(name='Funky Gibbon', boss=bill, friends=friends).save()
+        Employee(name="Funky Gibbon", boss=bill, friends=friends).save()
+        Employee(name="Funky Gibbon", boss=bill, friends=friends).save()
+        Employee(name="Funky Gibbon", boss=bill, friends=friends).save()
 
         with query_counter() as q:
             self.assertEqual(q, 0)
@@ -343,7 +348,6 @@ class Employee(Document):
                 self.assertEqual(q, 2)
 
     def test_list_of_lists_of_references(self):
-
         class User(Document):
             name = StringField()
 
@@ -357,9 +361,9 @@ class SimpleList(Document):
         Post.drop_collection()
         SimpleList.drop_collection()
 
-        u1 = User.objects.create(name='u1')
-        u2 = User.objects.create(name='u2')
-        u3 = User.objects.create(name='u3')
+        u1 = User.objects.create(name="u1")
+        u2 = User.objects.create(name="u2")
+        u3 = User.objects.create(name="u3")
 
         SimpleList.objects.create(users=[u1, u2, u3])
         self.assertEqual(SimpleList.objects.all()[0].users, [u1, u2, u3])
@@ -370,13 +374,14 @@ class SimpleList(Document):
     def test_circular_reference(self):
         """Ensure you can handle circular references
         """
+
         class Relation(EmbeddedDocument):
             name = StringField()
-            person = ReferenceField('Person')
+            person = ReferenceField("Person")
 
         class Person(Document):
             name = StringField()
-            relations = ListField(EmbeddedDocumentField('Relation'))
+            relations = ListField(EmbeddedDocumentField("Relation"))
 
             def __repr__(self):
                 return "<Person: %s>" % self.name
@@ -398,14 +403,17 @@ def __repr__(self):
         daughter.relations.append(self_rel)
         daughter.save()
 
-        self.assertEqual("[<Person: Mother>, <Person: Daughter>]", "%s" % Person.objects())
+        self.assertEqual(
+            "[<Person: Mother>, <Person: Daughter>]", "%s" % Person.objects()
+        )
 
     def test_circular_reference_on_self(self):
         """Ensure you can handle circular references
         """
+
         class Person(Document):
             name = StringField()
-            relations = ListField(ReferenceField('self'))
+            relations = ListField(ReferenceField("self"))
 
             def __repr__(self):
                 return "<Person: %s>" % self.name
@@ -424,14 +432,17 @@ def __repr__(self):
         daughter.relations.append(daughter)
         daughter.save()
 
-        self.assertEqual("[<Person: Mother>, <Person: Daughter>]", "%s" % Person.objects())
+        self.assertEqual(
+            "[<Person: Mother>, <Person: Daughter>]", "%s" % Person.objects()
+        )
 
     def test_circular_tree_reference(self):
         """Ensure you can handle circular references with more than one level
         """
+
         class Other(EmbeddedDocument):
             name = StringField()
-            friends = ListField(ReferenceField('Person'))
+            friends = ListField(ReferenceField("Person"))
 
         class Person(Document):
             name = StringField()
@@ -443,8 +454,8 @@ def __repr__(self):
         Person.drop_collection()
         paul = Person(name="Paul").save()
         maria = Person(name="Maria").save()
-        julia = Person(name='Julia').save()
-        anna = Person(name='Anna').save()
+        julia = Person(name="Julia").save()
+        anna = Person(name="Anna").save()
 
         paul.other.friends = [maria, julia, anna]
         paul.other.name = "Paul's friends"
@@ -464,11 +475,10 @@ def __repr__(self):
 
         self.assertEqual(
             "[<Person: Paul>, <Person: Maria>, <Person: Julia>, <Person: Anna>]",
-            "%s" % Person.objects()
+            "%s" % Person.objects(),
         )
 
     def test_generic_reference(self):
-
         class UserA(Document):
             name = StringField()
 
@@ -488,13 +498,13 @@ class Group(Document):
 
         members = []
         for i in range(1, 51):
-            a = UserA(name='User A %s' % i)
+            a = UserA(name="User A %s" % i)
             a.save()
 
-            b = UserB(name='User B %s' % i)
+            b = UserB(name="User B %s" % i)
             b.save()
 
-            c = UserC(name='User C %s' % i)
+            c = UserC(name="User C %s" % i)
             c.save()
 
             members += [a, b, c]
@@ -518,7 +528,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for m in group_obj.members:
-                self.assertIn('User', m.__class__.__name__)
+                self.assertIn("User", m.__class__.__name__)
 
         # Document select_related
         with query_counter() as q:
@@ -534,7 +544,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for m in group_obj.members:
-                self.assertIn('User', m.__class__.__name__)
+                self.assertIn("User", m.__class__.__name__)
 
         # Queryset select_related
         with query_counter() as q:
@@ -551,8 +561,7 @@ class Group(Document):
                 self.assertEqual(q, 4)
 
                 for m in group_obj.members:
-                    self.assertIn('User', m.__class__.__name__)
-
+                    self.assertIn("User", m.__class__.__name__)
 
     def test_generic_reference_orphan_dbref(self):
         """Ensure that generic orphan DBRef items in ListFields are dereferenced.
@@ -577,13 +586,13 @@ class Group(Document):
 
         members = []
         for i in range(1, 51):
-            a = UserA(name='User A %s' % i)
+            a = UserA(name="User A %s" % i)
             a.save()
 
-            b = UserB(name='User B %s' % i)
+            b = UserB(name="User B %s" % i)
             b.save()
 
-            c = UserC(name='User C %s' % i)
+            c = UserC(name="User C %s" % i)
             c.save()
 
             members += [a, b, c]
@@ -602,11 +611,11 @@ class Group(Document):
 
             [m for m in group_obj.members]
             self.assertEqual(q, 4)
-            self.assertTrue(group_obj._data['members']._dereferenced)
+            self.assertTrue(group_obj._data["members"]._dereferenced)
 
             [m for m in group_obj.members]
             self.assertEqual(q, 4)
-            self.assertTrue(group_obj._data['members']._dereferenced)
+            self.assertTrue(group_obj._data["members"]._dereferenced)
 
         UserA.drop_collection()
         UserB.drop_collection()
@@ -614,7 +623,6 @@ class Group(Document):
         Group.drop_collection()
 
     def test_list_field_complex(self):
-
         class UserA(Document):
             name = StringField()
 
@@ -634,13 +642,13 @@ class Group(Document):
 
         members = []
         for i in range(1, 51):
-            a = UserA(name='User A %s' % i)
+            a = UserA(name="User A %s" % i)
             a.save()
 
-            b = UserB(name='User B %s' % i)
+            b = UserB(name="User B %s" % i)
             b.save()
 
-            c = UserC(name='User C %s' % i)
+            c = UserC(name="User C %s" % i)
             c.save()
 
             members += [a, b, c]
@@ -664,7 +672,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for m in group_obj.members:
-                self.assertIn('User', m.__class__.__name__)
+                self.assertIn("User", m.__class__.__name__)
 
         # Document select_related
         with query_counter() as q:
@@ -680,7 +688,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for m in group_obj.members:
-                self.assertIn('User', m.__class__.__name__)
+                self.assertIn("User", m.__class__.__name__)
 
         # Queryset select_related
         with query_counter() as q:
@@ -697,7 +705,7 @@ class Group(Document):
                 self.assertEqual(q, 4)
 
                 for m in group_obj.members:
-                    self.assertIn('User', m.__class__.__name__)
+                    self.assertIn("User", m.__class__.__name__)
 
         UserA.drop_collection()
         UserB.drop_collection()
@@ -705,7 +713,6 @@ class Group(Document):
         Group.drop_collection()
 
     def test_map_field_reference(self):
-
         class User(Document):
             name = StringField()
 
@@ -717,7 +724,7 @@ class Group(Document):
 
         members = []
         for i in range(1, 51):
-            user = User(name='user %s' % i)
+            user = User(name="user %s" % i)
             user.save()
             members.append(user)
 
@@ -752,7 +759,7 @@ class Group(Document):
             for k, m in iteritems(group_obj.members):
                 self.assertIsInstance(m, User)
 
-       # Queryset select_related
+        # Queryset select_related
         with query_counter() as q:
             self.assertEqual(q, 0)
 
@@ -770,7 +777,6 @@ class Group(Document):
         Group.drop_collection()
 
     def test_dict_field(self):
-
         class UserA(Document):
             name = StringField()
 
@@ -790,13 +796,13 @@ class Group(Document):
 
         members = []
         for i in range(1, 51):
-            a = UserA(name='User A %s' % i)
+            a = UserA(name="User A %s" % i)
             a.save()
 
-            b = UserB(name='User B %s' % i)
+            b = UserB(name="User B %s" % i)
             b.save()
 
-            c = UserC(name='User C %s' % i)
+            c = UserC(name="User C %s" % i)
             c.save()
 
             members += [a, b, c]
@@ -819,7 +825,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for k, m in iteritems(group_obj.members):
-                self.assertIn('User', m.__class__.__name__)
+                self.assertIn("User", m.__class__.__name__)
 
         # Document select_related
         with query_counter() as q:
@@ -835,7 +841,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for k, m in iteritems(group_obj.members):
-                self.assertIn('User', m.__class__.__name__)
+                self.assertIn("User", m.__class__.__name__)
 
         # Queryset select_related
         with query_counter() as q:
@@ -852,7 +858,7 @@ class Group(Document):
                 self.assertEqual(q, 4)
 
                 for k, m in iteritems(group_obj.members):
-                    self.assertIn('User', m.__class__.__name__)
+                    self.assertIn("User", m.__class__.__name__)
 
         Group.objects.delete()
         Group().save()
@@ -873,10 +879,9 @@ class Group(Document):
         Group.drop_collection()
 
     def test_dict_field_no_field_inheritance(self):
-
         class UserA(Document):
             name = StringField()
-            meta = {'allow_inheritance': False}
+            meta = {"allow_inheritance": False}
 
         class Group(Document):
             members = DictField()
@@ -886,7 +891,7 @@ class Group(Document):
 
         members = []
         for i in range(1, 51):
-            a = UserA(name='User A %s' % i)
+            a = UserA(name="User A %s" % i)
             a.save()
 
             members += [a]
@@ -949,7 +954,6 @@ class Group(Document):
         Group.drop_collection()
 
     def test_generic_reference_map_field(self):
-
         class UserA(Document):
             name = StringField()
 
@@ -969,13 +973,13 @@ class Group(Document):
 
         members = []
         for i in range(1, 51):
-            a = UserA(name='User A %s' % i)
+            a = UserA(name="User A %s" % i)
             a.save()
 
-            b = UserB(name='User B %s' % i)
+            b = UserB(name="User B %s" % i)
             b.save()
 
-            c = UserC(name='User C %s' % i)
+            c = UserC(name="User C %s" % i)
             c.save()
 
             members += [a, b, c]
@@ -998,7 +1002,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for k, m in iteritems(group_obj.members):
-                self.assertIn('User', m.__class__.__name__)
+                self.assertIn("User", m.__class__.__name__)
 
         # Document select_related
         with query_counter() as q:
@@ -1014,7 +1018,7 @@ class Group(Document):
             self.assertEqual(q, 4)
 
             for k, m in iteritems(group_obj.members):
-                self.assertIn('User', m.__class__.__name__)
+                self.assertIn("User", m.__class__.__name__)
 
         # Queryset select_related
         with query_counter() as q:
@@ -1031,7 +1035,7 @@ class Group(Document):
                 self.assertEqual(q, 4)
 
                 for k, m in iteritems(group_obj.members):
-                    self.assertIn('User', m.__class__.__name__)
+                    self.assertIn("User", m.__class__.__name__)
 
         Group.objects.delete()
         Group().save()
@@ -1051,7 +1055,6 @@ class Group(Document):
         Group.drop_collection()
 
     def test_multidirectional_lists(self):
-
         class Asset(Document):
             name = StringField(max_length=250, required=True)
             path = StringField()
@@ -1062,10 +1065,10 @@ class Asset(Document):
 
         Asset.drop_collection()
 
-        root = Asset(name='', path="/", title="Site Root")
+        root = Asset(name="", path="/", title="Site Root")
         root.save()
 
-        company = Asset(name='company', title='Company', parent=root, parents=[root])
+        company = Asset(name="company", title="Company", parent=root, parents=[root])
         company.save()
 
         root.children = [company]
@@ -1076,7 +1079,6 @@ class Asset(Document):
         self.assertEqual(company.parents, [root])
 
     def test_dict_in_dbref_instance(self):
-
         class Person(Document):
             name = StringField(max_length=250, required=True)
 
@@ -1087,34 +1089,35 @@ class Room(Document):
         Person.drop_collection()
         Room.drop_collection()
 
-        bob = Person.objects.create(name='Bob')
+        bob = Person.objects.create(name="Bob")
         bob.save()
-        sarah = Person.objects.create(name='Sarah')
+        sarah = Person.objects.create(name="Sarah")
         sarah.save()
 
         room_101 = Room.objects.create(number="101")
         room_101.staffs_with_position = [
-            {'position_key': 'window', 'staff': sarah},
-            {'position_key': 'door', 'staff': bob.to_dbref()}]
+            {"position_key": "window", "staff": sarah},
+            {"position_key": "door", "staff": bob.to_dbref()},
+        ]
         room_101.save()
 
         room = Room.objects.first().select_related()
-        self.assertEqual(room.staffs_with_position[0]['staff'], sarah)
-        self.assertEqual(room.staffs_with_position[1]['staff'], bob)
+        self.assertEqual(room.staffs_with_position[0]["staff"], sarah)
+        self.assertEqual(room.staffs_with_position[1]["staff"], bob)
 
     def test_document_reload_no_inheritance(self):
         class Foo(Document):
-            meta = {'allow_inheritance': False}
-            bar = ReferenceField('Bar')
-            baz = ReferenceField('Baz')
+            meta = {"allow_inheritance": False}
+            bar = ReferenceField("Bar")
+            baz = ReferenceField("Baz")
 
         class Bar(Document):
-            meta = {'allow_inheritance': False}
-            msg = StringField(required=True, default='Blammo!')
+            meta = {"allow_inheritance": False}
+            msg = StringField(required=True, default="Blammo!")
 
         class Baz(Document):
-            meta = {'allow_inheritance': False}
-            msg = StringField(required=True, default='Kaboom!')
+            meta = {"allow_inheritance": False}
+            msg = StringField(required=True, default="Kaboom!")
 
         Foo.drop_collection()
         Bar.drop_collection()
@@ -1138,11 +1141,14 @@ def test_document_reload_reference_integrity(self):
         Ensure reloading a document with multiple similar id
         in different collections doesn't mix them.
         """
+
         class Topic(Document):
             id = IntField(primary_key=True)
+
         class User(Document):
             id = IntField(primary_key=True)
             name = StringField()
+
         class Message(Document):
             id = IntField(primary_key=True)
             topic = ReferenceField(Topic)
@@ -1154,23 +1160,24 @@ class Message(Document):
 
         # All objects share the same id, but each in a different collection
         topic = Topic(id=1).save()
-        user = User(id=1, name='user-name').save()
+        user = User(id=1, name="user-name").save()
         Message(id=1, topic=topic, author=user).save()
 
         concurrent_change_user = User.objects.get(id=1)
-        concurrent_change_user.name = 'new-name'
+        concurrent_change_user.name = "new-name"
         concurrent_change_user.save()
-        self.assertNotEqual(user.name, 'new-name')
+        self.assertNotEqual(user.name, "new-name")
 
         msg = Message.objects.get(id=1)
         msg.reload()
         self.assertEqual(msg.topic, topic)
         self.assertEqual(msg.author, user)
-        self.assertEqual(msg.author.name, 'new-name')
+        self.assertEqual(msg.author.name, "new-name")
 
     def test_list_lookup_not_checked_in_map(self):
         """Ensure we dereference list data correctly
         """
+
         class Comment(Document):
             id = IntField(primary_key=True)
             text = StringField()
@@ -1182,8 +1189,8 @@ class Message(Document):
         Comment.drop_collection()
         Message.drop_collection()
 
-        c1 = Comment(id=0, text='zero').save()
-        c2 = Comment(id=1, text='one').save()
+        c1 = Comment(id=0, text="zero").save()
+        c2 = Comment(id=1, text="one").save()
         Message(id=1, comments=[c1, c2]).save()
 
         msg = Message.objects.get(id=1)
@@ -1193,6 +1200,7 @@ class Message(Document):
     def test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries(self):
         """Ensure that DBRef items in ListFields are dereferenced.
         """
+
         class User(Document):
             name = StringField()
 
@@ -1204,7 +1212,7 @@ class Group(Document):
         Group.drop_collection()
 
         for i in range(1, 51):
-            User(name='user %s' % i).save()
+            User(name="user %s" % i).save()
 
         Group(name="Test", members=User.objects).save()
 
@@ -1222,6 +1230,7 @@ class Group(Document):
     def test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries(self):
         """Ensure that DBRef items in ListFields are dereferenced.
         """
+
         class User(Document):
             name = StringField()
 
@@ -1233,7 +1242,7 @@ class Group(Document):
         Group.drop_collection()
 
         for i in range(1, 51):
-            User(name='user %s' % i).save()
+            User(name="user %s" % i).save()
 
         Group(name="Test", members=User.objects).save()
 
@@ -1249,7 +1258,6 @@ class Group(Document):
             self.assertEqual(q, 2)
 
     def test_generic_reference_save_doesnt_cause_extra_queries(self):
-
         class UserA(Document):
             name = StringField()
 
@@ -1270,9 +1278,9 @@ class Group(Document):
 
         members = []
         for i in range(1, 51):
-            a = UserA(name='User A %s' % i).save()
-            b = UserB(name='User B %s' % i).save()
-            c = UserC(name='User C %s' % i).save()
+            a = UserA(name="User A %s" % i).save()
+            b = UserB(name="User B %s" % i).save()
+            c = UserC(name="User C %s" % i).save()
 
             members += [a, b, c]
 
@@ -1292,7 +1300,7 @@ class Group(Document):
     def test_objectid_reference_across_databases(self):
         # mongoenginetest - Is default connection alias from setUp()
         # Register Aliases
-        register_connection('testdb-1', 'mongoenginetest2')
+        register_connection("testdb-1", "mongoenginetest2")
 
         class User(Document):
             name = StringField()
@@ -1311,16 +1319,17 @@ class Book(Document):
 
         # Can't use query_counter across databases - so test the _data object
         book = Book.objects.first()
-        self.assertNotIsInstance(book._data['author'], User)
+        self.assertNotIsInstance(book._data["author"], User)
 
         book.select_related()
-        self.assertIsInstance(book._data['author'], User)
+        self.assertIsInstance(book._data["author"], User)
 
     def test_non_ascii_pk(self):
         """
         Ensure that dbref conversion to string does not fail when
         non-ascii characters are used in primary key
         """
+
         class Brand(Document):
             title = StringField(max_length=255, primary_key=True)
 
@@ -1341,7 +1350,7 @@ class BrandGroup(Document):
 
     def test_dereferencing_embedded_listfield_referencefield(self):
         class Tag(Document):
-            meta = {'collection': 'tags'}
+            meta = {"collection": "tags"}
             name = StringField()
 
         class Post(EmbeddedDocument):
@@ -1349,22 +1358,21 @@ class Post(EmbeddedDocument):
             tags = ListField(ReferenceField("Tag", dbref=True))
 
         class Page(Document):
-            meta = {'collection': 'pages'}
+            meta = {"collection": "pages"}
             tags = ListField(ReferenceField("Tag", dbref=True))
             posts = ListField(EmbeddedDocumentField(Post))
 
         Tag.drop_collection()
         Page.drop_collection()
 
-        tag = Tag(name='test').save()
-        post = Post(body='test body', tags=[tag])
+        tag = Tag(name="test").save()
+        post = Post(body="test body", tags=[tag])
         Page(tags=[tag], posts=[post]).save()
 
         page = Page.objects.first()
         self.assertEqual(page.tags[0], page.posts[0].tags[0])
 
     def test_select_related_follows_embedded_referencefields(self):
-
         class Song(Document):
             title = StringField()
 
@@ -1390,5 +1398,5 @@ class Playlist(Document):
             self.assertEqual(q, 2)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index cacdce8b9..5e3aa4935 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -12,7 +12,6 @@
 
 
 class ConnectionTest(unittest.TestCase):
-
     def setUp(self):
         mongoengine.connection._connection_settings = {}
         mongoengine.connection._connections = {}
@@ -28,9 +27,11 @@ def test_replicaset_uri_passes_read_preference(self):
         """
 
         try:
-            conn = mongoengine.connect(db='mongoenginetest',
-                           host="mongodb://localhost/mongoenginetest?replicaSet=rs",
-                           read_preference=READ_PREF)
+            conn = mongoengine.connect(
+                db="mongoenginetest",
+                host="mongodb://localhost/mongoenginetest?replicaSet=rs",
+                read_preference=READ_PREF,
+            )
         except MongoEngineConnectionError as e:
             return
 
@@ -41,5 +42,5 @@ def test_replicaset_uri_passes_read_preference(self):
         self.assertEqual(conn.read_preference, READ_PREF)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 34cb43c3a..1d0607d77 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -20,7 +20,7 @@ def get_signal_output(self, fn, *args, **kwargs):
         return signal_output
 
     def setUp(self):
-        connect(db='mongoenginetest')
+        connect(db="mongoenginetest")
 
         class Author(Document):
             # Make the id deterministic for easier testing
@@ -32,60 +32,63 @@ def __unicode__(self):
 
             @classmethod
             def pre_init(cls, sender, document, *args, **kwargs):
-                signal_output.append('pre_init signal, %s' % cls.__name__)
-                signal_output.append(kwargs['values'])
+                signal_output.append("pre_init signal, %s" % cls.__name__)
+                signal_output.append(kwargs["values"])
 
             @classmethod
             def post_init(cls, sender, document, **kwargs):
-                signal_output.append('post_init signal, %s, document._created = %s' % (document, document._created))
+                signal_output.append(
+                    "post_init signal, %s, document._created = %s"
+                    % (document, document._created)
+                )
 
             @classmethod
             def pre_save(cls, sender, document, **kwargs):
-                signal_output.append('pre_save signal, %s' % document)
+                signal_output.append("pre_save signal, %s" % document)
                 signal_output.append(kwargs)
 
             @classmethod
             def pre_save_post_validation(cls, sender, document, **kwargs):
-                signal_output.append('pre_save_post_validation signal, %s' % document)
-                if kwargs.pop('created', False):
-                    signal_output.append('Is created')
+                signal_output.append("pre_save_post_validation signal, %s" % document)
+                if kwargs.pop("created", False):
+                    signal_output.append("Is created")
                 else:
-                    signal_output.append('Is updated')
+                    signal_output.append("Is updated")
                 signal_output.append(kwargs)
 
             @classmethod
             def post_save(cls, sender, document, **kwargs):
                 dirty_keys = document._delta()[0].keys() + document._delta()[1].keys()
-                signal_output.append('post_save signal, %s' % document)
-                signal_output.append('post_save dirty keys, %s' % dirty_keys)
-                if kwargs.pop('created', False):
-                    signal_output.append('Is created')
+                signal_output.append("post_save signal, %s" % document)
+                signal_output.append("post_save dirty keys, %s" % dirty_keys)
+                if kwargs.pop("created", False):
+                    signal_output.append("Is created")
                 else:
-                    signal_output.append('Is updated')
+                    signal_output.append("Is updated")
                 signal_output.append(kwargs)
 
             @classmethod
             def pre_delete(cls, sender, document, **kwargs):
-                signal_output.append('pre_delete signal, %s' % document)
+                signal_output.append("pre_delete signal, %s" % document)
                 signal_output.append(kwargs)
 
             @classmethod
             def post_delete(cls, sender, document, **kwargs):
-                signal_output.append('post_delete signal, %s' % document)
+                signal_output.append("post_delete signal, %s" % document)
                 signal_output.append(kwargs)
 
             @classmethod
             def pre_bulk_insert(cls, sender, documents, **kwargs):
-                signal_output.append('pre_bulk_insert signal, %s' % documents)
+                signal_output.append("pre_bulk_insert signal, %s" % documents)
                 signal_output.append(kwargs)
 
             @classmethod
             def post_bulk_insert(cls, sender, documents, **kwargs):
-                signal_output.append('post_bulk_insert signal, %s' % documents)
-                if kwargs.pop('loaded', False):
-                    signal_output.append('Is loaded')
+                signal_output.append("post_bulk_insert signal, %s" % documents)
+                if kwargs.pop("loaded", False):
+                    signal_output.append("Is loaded")
                 else:
-                    signal_output.append('Not loaded')
+                    signal_output.append("Not loaded")
                 signal_output.append(kwargs)
 
         self.Author = Author
@@ -101,12 +104,12 @@ def __unicode__(self):
 
             @classmethod
             def pre_delete(cls, sender, document, **kwargs):
-                signal_output.append('pre_delete signal, %s' % document)
+                signal_output.append("pre_delete signal, %s" % document)
                 signal_output.append(kwargs)
 
             @classmethod
             def post_delete(cls, sender, document, **kwargs):
-                signal_output.append('post_delete signal, %s' % document)
+                signal_output.append("post_delete signal, %s" % document)
                 signal_output.append(kwargs)
 
         self.Another = Another
@@ -117,11 +120,11 @@ class ExplicitId(Document):
 
             @classmethod
             def post_save(cls, sender, document, **kwargs):
-                if 'created' in kwargs:
-                    if kwargs['created']:
-                        signal_output.append('Is created')
+                if "created" in kwargs:
+                    if kwargs["created"]:
+                        signal_output.append("Is created")
                     else:
-                        signal_output.append('Is updated')
+                        signal_output.append("Is updated")
 
         self.ExplicitId = ExplicitId
         ExplicitId.drop_collection()
@@ -136,9 +139,13 @@ def __unicode__(self):
 
             @classmethod
             def pre_bulk_insert(cls, sender, documents, **kwargs):
-                signal_output.append('pre_bulk_insert signal, %s' %
-                                     [(doc, {'active': documents[n].active})
-                                      for n, doc in enumerate(documents)])
+                signal_output.append(
+                    "pre_bulk_insert signal, %s"
+                    % [
+                        (doc, {"active": documents[n].active})
+                        for n, doc in enumerate(documents)
+                    ]
+                )
 
                 # make changes here, this is just an example -
                 # it could be anything that needs pre-validation or looks-ups before bulk bulk inserting
@@ -149,13 +156,17 @@ def pre_bulk_insert(cls, sender, documents, **kwargs):
 
             @classmethod
             def post_bulk_insert(cls, sender, documents, **kwargs):
-                signal_output.append('post_bulk_insert signal, %s' %
-                                     [(doc, {'active': documents[n].active})
-                                      for n, doc in enumerate(documents)])
-                if kwargs.pop('loaded', False):
-                    signal_output.append('Is loaded')
+                signal_output.append(
+                    "post_bulk_insert signal, %s"
+                    % [
+                        (doc, {"active": documents[n].active})
+                        for n, doc in enumerate(documents)
+                    ]
+                )
+                if kwargs.pop("loaded", False):
+                    signal_output.append("Is loaded")
                 else:
-                    signal_output.append('Not loaded')
+                    signal_output.append("Not loaded")
                 signal_output.append(kwargs)
 
         self.Post = Post
@@ -178,7 +189,9 @@ def post_bulk_insert(cls, sender, documents, **kwargs):
         signals.pre_init.connect(Author.pre_init, sender=Author)
         signals.post_init.connect(Author.post_init, sender=Author)
         signals.pre_save.connect(Author.pre_save, sender=Author)
-        signals.pre_save_post_validation.connect(Author.pre_save_post_validation, sender=Author)
+        signals.pre_save_post_validation.connect(
+            Author.pre_save_post_validation, sender=Author
+        )
         signals.post_save.connect(Author.post_save, sender=Author)
         signals.pre_delete.connect(Author.pre_delete, sender=Author)
         signals.post_delete.connect(Author.post_delete, sender=Author)
@@ -199,7 +212,9 @@ def tearDown(self):
         signals.post_delete.disconnect(self.Author.post_delete)
         signals.pre_delete.disconnect(self.Author.pre_delete)
         signals.post_save.disconnect(self.Author.post_save)
-        signals.pre_save_post_validation.disconnect(self.Author.pre_save_post_validation)
+        signals.pre_save_post_validation.disconnect(
+            self.Author.pre_save_post_validation
+        )
         signals.pre_save.disconnect(self.Author.pre_save)
         signals.pre_bulk_insert.disconnect(self.Author.pre_bulk_insert)
         signals.post_bulk_insert.disconnect(self.Author.post_bulk_insert)
@@ -236,203 +251,236 @@ def test_model_signals(self):
         """ Model saves should throw some signals. """
 
         def create_author():
-            self.Author(name='Bill Shakespeare')
+            self.Author(name="Bill Shakespeare")
 
         def bulk_create_author_with_load():
-            a1 = self.Author(name='Bill Shakespeare')
+            a1 = self.Author(name="Bill Shakespeare")
             self.Author.objects.insert([a1], load_bulk=True)
 
         def bulk_create_author_without_load():
-            a1 = self.Author(name='Bill Shakespeare')
+            a1 = self.Author(name="Bill Shakespeare")
             self.Author.objects.insert([a1], load_bulk=False)
 
         def load_existing_author():
-            a  = self.Author(name='Bill Shakespeare')
+            a = self.Author(name="Bill Shakespeare")
             a.save()
             self.get_signal_output(lambda: None)  # eliminate signal output
-            a1 = self.Author.objects(name='Bill Shakespeare')[0]
-
-        self.assertEqual(self.get_signal_output(create_author), [
-            "pre_init signal, Author",
-            {'name': 'Bill Shakespeare'},
-            "post_init signal, Bill Shakespeare, document._created = True",
-        ])
-
-        a1 = self.Author(name='Bill Shakespeare')
-        self.assertEqual(self.get_signal_output(a1.save), [
-            "pre_save signal, Bill Shakespeare",
-            {},
-            "pre_save_post_validation signal, Bill Shakespeare",
-            "Is created",
-            {},
-            "post_save signal, Bill Shakespeare",
-            "post_save dirty keys, ['name']",
-            "Is created",
-            {}
-        ])
+            a1 = self.Author.objects(name="Bill Shakespeare")[0]
+
+        self.assertEqual(
+            self.get_signal_output(create_author),
+            [
+                "pre_init signal, Author",
+                {"name": "Bill Shakespeare"},
+                "post_init signal, Bill Shakespeare, document._created = True",
+            ],
+        )
+
+        a1 = self.Author(name="Bill Shakespeare")
+        self.assertEqual(
+            self.get_signal_output(a1.save),
+            [
+                "pre_save signal, Bill Shakespeare",
+                {},
+                "pre_save_post_validation signal, Bill Shakespeare",
+                "Is created",
+                {},
+                "post_save signal, Bill Shakespeare",
+                "post_save dirty keys, ['name']",
+                "Is created",
+                {},
+            ],
+        )
 
         a1.reload()
-        a1.name = 'William Shakespeare'
-        self.assertEqual(self.get_signal_output(a1.save), [
-            "pre_save signal, William Shakespeare",
-            {},
-            "pre_save_post_validation signal, William Shakespeare",
-            "Is updated",
-            {},
-            "post_save signal, William Shakespeare",
-            "post_save dirty keys, ['name']",
-            "Is updated",
-            {}
-        ])
-
-        self.assertEqual(self.get_signal_output(a1.delete), [
-            'pre_delete signal, William Shakespeare',
-            {},
-            'post_delete signal, William Shakespeare',
-            {}
-        ])
-
-        self.assertEqual(self.get_signal_output(load_existing_author), [
-            "pre_init signal, Author",
-            {'id': 2, 'name': 'Bill Shakespeare'},
-            "post_init signal, Bill Shakespeare, document._created = False"
-        ])
-
-        self.assertEqual(self.get_signal_output(bulk_create_author_with_load), [
-            'pre_init signal, Author',
-            {'name': 'Bill Shakespeare'},
-            'post_init signal, Bill Shakespeare, document._created = True',
-            'pre_bulk_insert signal, [<Author: Bill Shakespeare>]',
-            {},
-            'pre_init signal, Author',
-            {'id': 3, 'name': 'Bill Shakespeare'},
-            'post_init signal, Bill Shakespeare, document._created = False',
-            'post_bulk_insert signal, [<Author: Bill Shakespeare>]',
-            'Is loaded',
-            {}
-        ])
-
-        self.assertEqual(self.get_signal_output(bulk_create_author_without_load), [
-            "pre_init signal, Author",
-            {'name': 'Bill Shakespeare'},
-            "post_init signal, Bill Shakespeare, document._created = True",
-            "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
-            {},
-            "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
-            "Not loaded",
-            {}
-        ])
+        a1.name = "William Shakespeare"
+        self.assertEqual(
+            self.get_signal_output(a1.save),
+            [
+                "pre_save signal, William Shakespeare",
+                {},
+                "pre_save_post_validation signal, William Shakespeare",
+                "Is updated",
+                {},
+                "post_save signal, William Shakespeare",
+                "post_save dirty keys, ['name']",
+                "Is updated",
+                {},
+            ],
+        )
+
+        self.assertEqual(
+            self.get_signal_output(a1.delete),
+            [
+                "pre_delete signal, William Shakespeare",
+                {},
+                "post_delete signal, William Shakespeare",
+                {},
+            ],
+        )
+
+        self.assertEqual(
+            self.get_signal_output(load_existing_author),
+            [
+                "pre_init signal, Author",
+                {"id": 2, "name": "Bill Shakespeare"},
+                "post_init signal, Bill Shakespeare, document._created = False",
+            ],
+        )
+
+        self.assertEqual(
+            self.get_signal_output(bulk_create_author_with_load),
+            [
+                "pre_init signal, Author",
+                {"name": "Bill Shakespeare"},
+                "post_init signal, Bill Shakespeare, document._created = True",
+                "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
+                {},
+                "pre_init signal, Author",
+                {"id": 3, "name": "Bill Shakespeare"},
+                "post_init signal, Bill Shakespeare, document._created = False",
+                "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
+                "Is loaded",
+                {},
+            ],
+        )
+
+        self.assertEqual(
+            self.get_signal_output(bulk_create_author_without_load),
+            [
+                "pre_init signal, Author",
+                {"name": "Bill Shakespeare"},
+                "post_init signal, Bill Shakespeare, document._created = True",
+                "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
+                {},
+                "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
+                "Not loaded",
+                {},
+            ],
+        )
 
     def test_signal_kwargs(self):
         """ Make sure signal_kwargs is passed to signals calls. """
 
         def live_and_let_die():
-            a = self.Author(name='Bill Shakespeare')
-            a.save(signal_kwargs={'live': True, 'die': False})
-            a.delete(signal_kwargs={'live': False, 'die': True})
-
-        self.assertEqual(self.get_signal_output(live_and_let_die), [
-            "pre_init signal, Author",
-            {'name': 'Bill Shakespeare'},
-            "post_init signal, Bill Shakespeare, document._created = True",
-            "pre_save signal, Bill Shakespeare",
-            {'die': False, 'live': True},
-            "pre_save_post_validation signal, Bill Shakespeare",
-            "Is created",
-            {'die': False, 'live': True},
-            "post_save signal, Bill Shakespeare",
-            "post_save dirty keys, ['name']",
-            "Is created",
-            {'die': False, 'live': True},
-            'pre_delete signal, Bill Shakespeare',
-            {'die': True, 'live': False},
-            'post_delete signal, Bill Shakespeare',
-            {'die': True, 'live': False}
-        ])
+            a = self.Author(name="Bill Shakespeare")
+            a.save(signal_kwargs={"live": True, "die": False})
+            a.delete(signal_kwargs={"live": False, "die": True})
+
+        self.assertEqual(
+            self.get_signal_output(live_and_let_die),
+            [
+                "pre_init signal, Author",
+                {"name": "Bill Shakespeare"},
+                "post_init signal, Bill Shakespeare, document._created = True",
+                "pre_save signal, Bill Shakespeare",
+                {"die": False, "live": True},
+                "pre_save_post_validation signal, Bill Shakespeare",
+                "Is created",
+                {"die": False, "live": True},
+                "post_save signal, Bill Shakespeare",
+                "post_save dirty keys, ['name']",
+                "Is created",
+                {"die": False, "live": True},
+                "pre_delete signal, Bill Shakespeare",
+                {"die": True, "live": False},
+                "post_delete signal, Bill Shakespeare",
+                {"die": True, "live": False},
+            ],
+        )
 
         def bulk_create_author():
-            a1 = self.Author(name='Bill Shakespeare')
-            self.Author.objects.insert([a1], signal_kwargs={'key': True})
-
-        self.assertEqual(self.get_signal_output(bulk_create_author), [
-            'pre_init signal, Author',
-            {'name': 'Bill Shakespeare'},
-            'post_init signal, Bill Shakespeare, document._created = True',
-            'pre_bulk_insert signal, [<Author: Bill Shakespeare>]',
-            {'key': True},
-            'pre_init signal, Author',
-            {'id': 2, 'name': 'Bill Shakespeare'},
-            'post_init signal, Bill Shakespeare, document._created = False',
-            'post_bulk_insert signal, [<Author: Bill Shakespeare>]',
-            'Is loaded',
-            {'key': True}
-        ])
+            a1 = self.Author(name="Bill Shakespeare")
+            self.Author.objects.insert([a1], signal_kwargs={"key": True})
+
+        self.assertEqual(
+            self.get_signal_output(bulk_create_author),
+            [
+                "pre_init signal, Author",
+                {"name": "Bill Shakespeare"},
+                "post_init signal, Bill Shakespeare, document._created = True",
+                "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
+                {"key": True},
+                "pre_init signal, Author",
+                {"id": 2, "name": "Bill Shakespeare"},
+                "post_init signal, Bill Shakespeare, document._created = False",
+                "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
+                "Is loaded",
+                {"key": True},
+            ],
+        )
 
     def test_queryset_delete_signals(self):
         """ Queryset delete should throw some signals. """
 
-        self.Another(name='Bill Shakespeare').save()
-        self.assertEqual(self.get_signal_output(self.Another.objects.delete), [
-            'pre_delete signal, Bill Shakespeare',
-            {},
-            'post_delete signal, Bill Shakespeare',
-            {}
-        ])
+        self.Another(name="Bill Shakespeare").save()
+        self.assertEqual(
+            self.get_signal_output(self.Another.objects.delete),
+            [
+                "pre_delete signal, Bill Shakespeare",
+                {},
+                "post_delete signal, Bill Shakespeare",
+                {},
+            ],
+        )
 
     def test_signals_with_explicit_doc_ids(self):
         """ Model saves must have a created flag the first time."""
         ei = self.ExplicitId(id=123)
         # post save must received the created flag, even if there's already
         # an object id present
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
         # second time, it must be an update
-        self.assertEqual(self.get_signal_output(ei.save), ['Is updated'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is updated"])
 
     def test_signals_with_switch_collection(self):
         ei = self.ExplicitId(id=123)
         ei.switch_collection("explicit__1")
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
         ei.switch_collection("explicit__1")
-        self.assertEqual(self.get_signal_output(ei.save), ['Is updated'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is updated"])
 
         ei.switch_collection("explicit__1", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
         ei.switch_collection("explicit__1", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
 
     def test_signals_with_switch_db(self):
-        connect('mongoenginetest')
-        register_connection('testdb-1', 'mongoenginetest2')
+        connect("mongoenginetest")
+        register_connection("testdb-1", "mongoenginetest2")
 
         ei = self.ExplicitId(id=123)
         ei.switch_db("testdb-1")
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
         ei.switch_db("testdb-1")
-        self.assertEqual(self.get_signal_output(ei.save), ['Is updated'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is updated"])
 
         ei.switch_db("testdb-1", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
         ei.switch_db("testdb-1", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ['Is created'])
+        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
 
     def test_signals_bulk_insert(self):
         def bulk_set_active_post():
             posts = [
-                self.Post(title='Post 1'),
-                self.Post(title='Post 2'),
-                self.Post(title='Post 3')
+                self.Post(title="Post 1"),
+                self.Post(title="Post 2"),
+                self.Post(title="Post 3"),
             ]
             self.Post.objects.insert(posts)
 
         results = self.get_signal_output(bulk_set_active_post)
-        self.assertEqual(results, [
-            "pre_bulk_insert signal, [(<Post: Post 1>, {'active': False}), (<Post: Post 2>, {'active': False}), (<Post: Post 3>, {'active': False})]",
-            {},
-            "post_bulk_insert signal, [(<Post: Post 1>, {'active': True}), (<Post: Post 2>, {'active': True}), (<Post: Post 3>, {'active': True})]",
-            'Is loaded',
-            {}
-        ])
+        self.assertEqual(
+            results,
+            [
+                "pre_bulk_insert signal, [(<Post: Post 1>, {'active': False}), (<Post: Post 2>, {'active': False}), (<Post: Post 3>, {'active': False})]",
+                {},
+                "post_bulk_insert signal, [(<Post: Post 1>, {'active': True}), (<Post: Post 2>, {'active': True}), (<Post: Post 3>, {'active': True})]",
+                "Is loaded",
+                {},
+            ],
+        )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 562cc1ff0..2d1e8b009 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -7,32 +7,33 @@
 
 
 class LazyRegexCompilerTest(unittest.TestCase):
-
     def test_lazy_regex_compiler_verify_laziness_of_descriptor(self):
         class UserEmail(object):
-            EMAIL_REGEX = LazyRegexCompiler('@', flags=32)
+            EMAIL_REGEX = LazyRegexCompiler("@", flags=32)
 
-        descriptor = UserEmail.__dict__['EMAIL_REGEX']
+        descriptor = UserEmail.__dict__["EMAIL_REGEX"]
         self.assertIsNone(descriptor._compiled_regex)
 
         regex = UserEmail.EMAIL_REGEX
-        self.assertEqual(regex, re.compile('@', flags=32))
-        self.assertEqual(regex.search('user@domain.com').group(), '@')
+        self.assertEqual(regex, re.compile("@", flags=32))
+        self.assertEqual(regex.search("user@domain.com").group(), "@")
 
         user_email = UserEmail()
         self.assertIs(user_email.EMAIL_REGEX, UserEmail.EMAIL_REGEX)
 
     def test_lazy_regex_compiler_verify_cannot_set_descriptor_on_instance(self):
         class UserEmail(object):
-            EMAIL_REGEX = LazyRegexCompiler('@')
+            EMAIL_REGEX = LazyRegexCompiler("@")
 
         user_email = UserEmail()
         with self.assertRaises(AttributeError):
-            user_email.EMAIL_REGEX = re.compile('@')
+            user_email.EMAIL_REGEX = re.compile("@")
 
     def test_lazy_regex_compiler_verify_can_override_class_attr(self):
         class UserEmail(object):
-            EMAIL_REGEX = LazyRegexCompiler('@')
+            EMAIL_REGEX = LazyRegexCompiler("@")
 
-        UserEmail.EMAIL_REGEX = re.compile('cookies')
-        self.assertEqual(UserEmail.EMAIL_REGEX.search('Cake & cookies').group(), 'cookies')
+        UserEmail.EMAIL_REGEX = re.compile("cookies")
+        self.assertEqual(
+            UserEmail.EMAIL_REGEX.search("Cake & cookies").group(), "cookies"
+        )
diff --git a/tests/utils.py b/tests/utils.py
index 27d5ada7a..eb3f016f2 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -8,7 +8,7 @@
 from mongoengine.mongodb_support import get_mongodb_version
 
 
-MONGO_TEST_DB = 'mongoenginetest'   # standard name for the test database
+MONGO_TEST_DB = "mongoenginetest"  # standard name for the test database
 
 
 class MongoDBTestCase(unittest.TestCase):
@@ -53,12 +53,15 @@ def requires_mongodb_gte_36(func):
     :param mongo_version_req: The mongodb version requirement (tuple(int, int))
     :param oper: The operator to apply (e.g: operator.ge)
     """
+
     def _inner(*args, **kwargs):
         mongodb_v = get_mongodb_version()
         if oper(mongodb_v, mongo_version_req):
             return func(*args, **kwargs)
 
-        raise SkipTest('Needs MongoDB v{}+'.format('.'.join(str(n) for n in mongo_version_req)))
+        raise SkipTest(
+            "Needs MongoDB v{}+".format(".".join(str(n) for n in mongo_version_req))
+        )
 
     _inner.__name__ = func.__name__
     _inner.__doc__ = func.__doc__

From 82f0eb1cbc7b068b643df690680cd1dd5424f529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Thu, 27 Jun 2019 15:07:02 +0200
Subject: [PATCH 0885/1519] Add a max_length param to the ListField (#2107)

This is similar to the `max_length` param of a `StringField`.

Sometimes you don't want your lists to be able to grow indefinitely.
---
 mongoengine/fields.py  | 15 ++++++++++++++-
 tests/fields/fields.py | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 7ab2276d9..9b9fef6eb 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -916,8 +916,9 @@ class ListField(ComplexBaseField):
         Required means it cannot be empty - as the default for ListFields is []
     """
 
-    def __init__(self, field=None, **kwargs):
+    def __init__(self, field=None, max_length=None, **kwargs):
         self.field = field
+        self.max_length = max_length
         kwargs.setdefault("default", lambda: [])
         super(ListField, self).__init__(**kwargs)
 
@@ -939,9 +940,21 @@ def validate(self, value):
         """Make sure that a list of valid fields is being used."""
         if not isinstance(value, (list, tuple, BaseQuerySet)):
             self.error("Only lists and tuples may be used in a list field")
+
+        # Validate that max_length is not exceeded.
+        # NOTE It's still possible to bypass this enforcement by using $push.
+        # However, if the document is reloaded after $push and then re-saved,
+        # the validation error will be raised.
+        if self.max_length is not None and len(value) > self.max_length:
+            self.error("List is too long")
+
         super(ListField, self).validate(value)
 
     def prepare_query_value(self, op, value):
+        # Validate that the `set` operator doesn't contain more items than `max_length`.
+        if op == "set" and self.max_length is not None and len(value) > self.max_length:
+            self.error("List is too long")
+
         if self.field:
 
             # If the value is iterable and it's not a string nor a
diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index 87acf27f9..b77ba753d 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1010,6 +1010,38 @@ class Simple(Document):
             e.mapping = ["abc"]
             e.save()
 
+    def test_list_field_max_length(self):
+        """Ensure ListField's max_length is respected."""
+
+        class Foo(Document):
+            items = ListField(IntField(), max_length=5)
+
+        foo = Foo()
+        for i in range(1, 7):
+            foo.items.append(i)
+            if i < 6:
+                foo.save()
+            else:
+                with self.assertRaises(ValidationError) as cm:
+                    foo.save()
+                self.assertIn("List is too long", str(cm.exception))
+
+    def test_list_field_max_length(self):
+        """Ensure ListField's max_length is respected."""
+
+        class Foo(Document):
+            items = ListField(IntField(), max_length=5)
+
+        foo = Foo()
+        for i in range(1, 7):
+            foo.items.append(i)
+            if i < 6:
+                foo.save()
+            else:
+                with self.assertRaises(ValidationError) as cm:
+                    foo.save()
+                self.assertIn("List is too long", str(cm.exception))
+
     def test_list_field_rejects_strings(self):
         """Strings aren't valid list field data types."""
 

From 609f50d26191c1f2541c241de341985cc85427ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Thu, 27 Jun 2019 16:45:31 +0200
Subject: [PATCH 0886/1519] Fix the duplicate ListField max_length test (#2110)

This is a follow-up after #2107.

Not sure what happened here, but in
https://github.com/MongoEngine/mongoengine/pull/2107/commits/87194856ecc5076bec2a186bae60c5d5b25c01ed
I committed a copy-paste of the same test instead of a test validating the
max_length behavior along with a "set" operator.
---
 tests/fields/fields.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
index b77ba753d..49e9508ca 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -1026,21 +1026,16 @@ class Foo(Document):
                     foo.save()
                 self.assertIn("List is too long", str(cm.exception))
 
-    def test_list_field_max_length(self):
-        """Ensure ListField's max_length is respected."""
+    def test_list_field_max_length_set_operator(self):
+        """Ensure ListField's max_length is respected for a "set" operator."""
 
         class Foo(Document):
-            items = ListField(IntField(), max_length=5)
+            items = ListField(IntField(), max_length=3)
 
-        foo = Foo()
-        for i in range(1, 7):
-            foo.items.append(i)
-            if i < 6:
-                foo.save()
-            else:
-                with self.assertRaises(ValidationError) as cm:
-                    foo.save()
-                self.assertIn("List is too long", str(cm.exception))
+        foo = Foo.objects.create(items=[1, 2, 3])
+        with self.assertRaises(ValidationError) as cm:
+            foo.modify(set__items=[1, 2, 3, 4])
+        self.assertIn("List is too long", str(cm.exception))
 
     def test_list_field_rejects_strings(self):
         """Strings aren't valid list field data types."""

From 2769967e1e3390d1c99bd666f846a3fbaa0061c2 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Thu, 27 Jun 2019 17:41:29 +0200
Subject: [PATCH 0887/1519] Update the changelog [ci skip]

---
 docs/changelog.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b30bd52fd..d053a8db2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,8 +6,10 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- BREAKING CHANGE: Drop support for positional arguments when instantiating a document. #2103
+- BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
   - From now on keyword arguments (e.g. `Doc(field_name=value)`) are required.
+- The codebase is now formatted using `black`. #2109
+- `ListField` now accepts an optional `max_length` parameter. #2110
 
 Changes in 0.18.2
 =================

From 9170eea784e7d7ac344779f818672a572a7258aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Sun, 30 Jun 2019 09:23:32 +0200
Subject: [PATCH 0888/1519] Rename MongoEngineConnectionError to
 ConnectionFailure (#2111)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I originally changed the exception name from `ConnectionError` to
`MongoEngineConnectionError` in
https://github.com/MongoEngine/mongoengine/pull/1428/commits/b02904ee750a30f8e2246a326376b40358543101,
inspired by landscape.io's package health report, which argued that
`ConnectionError` is already a built-in exception in Python 3 (which it is:
https://docs.python.org/3/library/exceptions.html#ConnectionError).

I do agree that we shouldn't override built-in exceptions. [0] That said, it’s
silly to add a "MongoEngine" prefix to any class within the `mongoengine`
module (and *especially* to *just one* exception class out of many). I've
decided to do what PyMongo does (
https://github.com/mongodb/mongo-python-driver/blob/8855a510a80a30268ffd4b90be65fb26929648e2/pymongo/errors.py#L59)
and call this exception `ConnectionFailure`.

Note that this is a breaking change and people will need to rename
`MongoEngineConnectionError`s in their code to `ConnectionFailure`. Moreover,
if they use PyMongo's `ConnectionFailure` for anything, they'll need to take
    extra care to avoid conflicts, e.g. by using:
```
from mongoengine import ConnectionFailure as MongoEngineConnectionFailure
```

[0] Note that some popular packages still overwrite `ConnectionError`, e.g.
https://github.com/kennethreitz/requests/blob/4983a9bde39c6320aa4f3e34e50dac6e263dab6f/requests/exceptions.py#L32
or
https://github.com/andymccurdy/redis-py/blob/0be4d2920684345eb52115c7142c39d65356e7d4/redis/exceptions.py#L8
---
 docs/changelog.rst                  |  2 ++
 mongoengine/connection.py           | 16 +++++++---------
 tests/test_connection.py            | 22 +++++++++++-----------
 tests/test_replicaset_connection.py |  4 ++--
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d053a8db2..7eac72df4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,8 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- BREAKING CHANGE: Renamed `MongoEngineConnectionError` to `ConnectionFailure` #2111
+  - If you catch/use `MongoEngineConnectionError` in your code, you'll have to rename it.
 - BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
   - From now on keyword arguments (e.g. `Doc(field_name=value)`) are required.
 - The codebase is now formatted using `black`. #2109
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index ef0dd27cd..b1e12a962 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -5,7 +5,7 @@
 __all__ = [
     "DEFAULT_CONNECTION_NAME",
     "DEFAULT_DATABASE_NAME",
-    "MongoEngineConnectionError",
+    "ConnectionFailure",
     "connect",
     "disconnect",
     "disconnect_all",
@@ -27,7 +27,7 @@
 READ_PREFERENCE = ReadPreference.PRIMARY
 
 
-class MongoEngineConnectionError(Exception):
+class ConnectionFailure(Exception):
     """Error raised when the database connection can't be established or
     when a connection with a requested alias can't be retrieved.
     """
@@ -252,13 +252,13 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
         return _connections[alias]
 
     # Validate that the requested alias exists in the _connection_settings.
-    # Raise MongoEngineConnectionError if it doesn't.
+    # Raise ConnectionFailure if it doesn't.
     if alias not in _connection_settings:
         if alias == DEFAULT_CONNECTION_NAME:
             msg = "You have not defined a default connection"
         else:
             msg = 'Connection with alias "%s" has not been defined' % alias
-        raise MongoEngineConnectionError(msg)
+        raise ConnectionFailure(msg)
 
     def _clean_settings(settings_dict):
         irrelevant_fields_set = {
@@ -305,14 +305,12 @@ def _clean_settings(settings_dict):
 def _create_connection(alias, connection_class, **connection_settings):
     """
     Create the new connection for this alias. Raise
-    MongoEngineConnectionError if it can't be established.
+    ConnectionFailure if it can't be established.
     """
     try:
         return connection_class(**connection_settings)
     except Exception as e:
-        raise MongoEngineConnectionError(
-            "Cannot connect to database %s :\n%s" % (alias, e)
-        )
+        raise ConnectionFailure("Cannot connect to database %s :\n%s" % (alias, e))
 
 
 def _find_existing_connection(connection_settings):
@@ -393,7 +391,7 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
                 u"A different connection with alias `{}` was already "
                 u"registered. Use disconnect() first"
             ).format(alias)
-            raise MongoEngineConnectionError(err_msg)
+            raise ConnectionFailure(err_msg)
     else:
         register_connection(alias, db, **kwargs)
 
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 250071327..f9c9d098c 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -23,7 +23,7 @@
 )
 import mongoengine.connection
 from mongoengine.connection import (
-    MongoEngineConnectionError,
+    ConnectionFailure,
     get_db,
     get_connection,
     disconnect,
@@ -92,10 +92,10 @@ class History2(Document):
         disconnect("db1")
         disconnect("db2")
 
-        with self.assertRaises(MongoEngineConnectionError):
+        with self.assertRaises(ConnectionFailure):
             list(History1.objects().as_pymongo())
 
-        with self.assertRaises(MongoEngineConnectionError):
+        with self.assertRaises(ConnectionFailure):
             list(History2.objects().as_pymongo())
 
         connect("db1", alias="db1")
@@ -149,7 +149,7 @@ class History2(Document):
     def test_connect_fails_if_connect_2_times_with_default_alias(self):
         connect("mongoenginetest")
 
-        with self.assertRaises(MongoEngineConnectionError) as ctx_err:
+        with self.assertRaises(ConnectionFailure) as ctx_err:
             connect("mongoenginetest2")
         self.assertEqual(
             "A different connection with alias `default` was already registered. Use disconnect() first",
@@ -159,7 +159,7 @@ def test_connect_fails_if_connect_2_times_with_default_alias(self):
     def test_connect_fails_if_connect_2_times_with_custom_alias(self):
         connect("mongoenginetest", alias="alias1")
 
-        with self.assertRaises(MongoEngineConnectionError) as ctx_err:
+        with self.assertRaises(ConnectionFailure) as ctx_err:
             connect("mongoenginetest2", alias="alias1")
 
         self.assertEqual(
@@ -175,7 +175,7 @@ def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way
         db_alias = "alias1"
         connect(db=db_name, alias=db_alias, host="localhost", port=27017)
 
-        with self.assertRaises(MongoEngineConnectionError):
+        with self.assertRaises(ConnectionFailure):
             connect(host="mongodb://localhost:27017/%s" % db_name, alias=db_alias)
 
     def test_connect_passes_silently_connect_multiple_times_with_same_config(self):
@@ -353,7 +353,7 @@ class History(Document):
 
         self.assertIsNone(History._collection)
 
-        with self.assertRaises(MongoEngineConnectionError) as ctx_err:
+        with self.assertRaises(ConnectionFailure) as ctx_err:
             History.objects.first()
         self.assertEqual(
             "You have not defined a default connection", str(ctx_err.exception)
@@ -379,7 +379,7 @@ class User(Document):
         disconnect()
 
         # Make sure save doesnt work at this stage
-        with self.assertRaises(MongoEngineConnectionError):
+        with self.assertRaises(ConnectionFailure):
             User(name="Wont work").save()
 
         # Save in db2
@@ -433,10 +433,10 @@ class History1(Document):
         self.assertEqual(len(dbs), 0)
         self.assertEqual(len(connection_settings), 0)
 
-        with self.assertRaises(MongoEngineConnectionError):
+        with self.assertRaises(ConnectionFailure):
             History.objects.first()
 
-        with self.assertRaises(MongoEngineConnectionError):
+        with self.assertRaises(ConnectionFailure):
             History1.objects.first()
 
     def test_disconnect_all_silently_pass_if_no_connection_exist(self):
@@ -557,7 +557,7 @@ def test_register_connection(self):
         """
         register_connection("testdb", "mongoenginetest2")
 
-        self.assertRaises(MongoEngineConnectionError, get_connection)
+        self.assertRaises(ConnectionFailure, get_connection)
         conn = get_connection("testdb")
         self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
 
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index 5e3aa4935..6dfab407b 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -4,7 +4,7 @@
 from pymongo import MongoClient
 
 import mongoengine
-from mongoengine.connection import MongoEngineConnectionError
+from mongoengine.connection import ConnectionFailure
 
 
 CONN_CLASS = MongoClient
@@ -32,7 +32,7 @@ def test_replicaset_uri_passes_read_preference(self):
                 host="mongodb://localhost/mongoenginetest?replicaSet=rs",
                 read_preference=READ_PREF,
             )
-        except MongoEngineConnectionError as e:
+        except ConnectionFailure as e:
             return
 
         if not isinstance(conn, CONN_CLASS):

From d37a30e0838e10e95457c63f8842a22362c04bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 30 Jun 2019 20:46:40 +0200
Subject: [PATCH 0889/1519] improve doc (based on review)

---
 docs/guide/validation.rst          | 10 +++++-----
 mongoengine/base/datastructures.py |  2 +-
 mongoengine/fields.py              |  2 +-
 mongoengine/mongodb_support.py     |  2 +-
 tests/utils.py                     |  4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/guide/validation.rst b/docs/guide/validation.rst
index 793a797a1..5f0346bd0 100644
--- a/docs/guide/validation.rst
+++ b/docs/guide/validation.rst
@@ -2,15 +2,15 @@
 Document Validation
 ====================
 
-By design, mongoengine strictly validates the documents right before they are inserted in MongoDB
+By design, MongoEngine strictly validates the documents right before they are inserted in MongoDB
 and make sure they are consistent with the fields defined in your models.
 
 Mongoengine will not validate a document when an object is loaded from the DB into an instance
-of your model but this operation will fail under some circumstances (e.g: if there is a field in
-the document fetched from the database that is not defined in your model)
+of your model but this operation will fail under some circumstances (e.g. if there is a field in
+the document fetched from the database that is not defined in your model).
 
 
-Builtin validation
+Built-in validation
 =================
 
 Mongoengine provides different fields that encapsulate the corresponding validation
@@ -73,7 +73,7 @@ Note that `clean` runs before the validation when you save a Document.
 
 * Adding custom Field classes
 
-We recommend as much as possible to use the standard field but it is also possible
+We recommend as much as possible to use fields provided by MongoEngine. However, it is also possible
 to subclass a Field and encapsulate some validation by overriding the `validate` method
 
 .. code-block:: python
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index fafc08b73..b693b9145 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -217,7 +217,7 @@ def filter(self, **kwargs):
         Filters the list by only including embedded documents with the
         given keyword arguments.
 
-        This method only supports simple comparison (e.g: .filter(name='John Doe'))
+        This method only supports simple comparison (e.g. .filter(name='John Doe'))
         and does not support operators like __gte, __lte, __icontains like queryset.filter does
 
         :param kwargs: The keyword arguments corresponding to the fields to
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index aa5aa8052..591cf01a9 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -385,7 +385,7 @@ def __init__(self, min_value=None, max_value=None, force_string=False,
         :param max_value: Validation rule for the maximum acceptable value.
         :param force_string: Store the value as a string (instead of a float).
          Be aware that this affects query sorting and operation like lte, gte (as string comparison is applied)
-         and some query operator won't work (e.g: inc, dec)
+         and some query operator won't work (e.g. inc, dec)
         :param precision: Number of decimal places to store.
         :param rounding: The rounding rule from the python decimal library:
 
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index b20ebc1e6..423cd92b2 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -15,5 +15,5 @@ def get_mongodb_version():
 
     :return: tuple(int, int)
     """
-    version_list = get_connection().server_info()['versionArray'][:2]     # e.g: (3, 2)
+    version_list = get_connection().server_info()['versionArray'][:2]     # e.g. (3, 2)
     return tuple(version_list)
diff --git a/tests/utils.py b/tests/utils.py
index 27d5ada7a..be7a8095d 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -4,7 +4,7 @@
 from nose.plugins.skip import SkipTest
 
 from mongoengine import connect
-from mongoengine.connection import get_db, disconnect_all
+from mongoengine.connection import disconnect_all, get_db
 from mongoengine.mongodb_support import get_mongodb_version
 
 
@@ -51,7 +51,7 @@ def requires_mongodb_gte_36(func):
     ran against MongoDB < v3.6.
 
     :param mongo_version_req: The mongodb version requirement (tuple(int, int))
-    :param oper: The operator to apply (e.g: operator.ge)
+    :param oper: The operator to apply (e.g. operator.ge)
     """
     def _inner(*args, **kwargs):
         mongodb_v = get_mongodb_version()

From 4d5eba317eb77eacc2a0974ee0995acbcec6d6aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 30 Jun 2019 20:55:19 +0200
Subject: [PATCH 0890/1519] convert travis test on latest python/mongo/pymongo
 from python 3.6 to 3.7

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cf66da6a6..9d0b5b4b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ matrix:
   include:
   - python: 2.7
     env: MONGODB=${MONGODB_3_4} PYMONGO=3.4.x
-  - python: 3.6
+  - python: 3.7
     env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
 
 

From 06a21e038addd4ac05e36acb5f2bfa810cf59209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 30 Jun 2019 21:03:13 +0200
Subject: [PATCH 0891/1519] Use global constants for mongo/pymongo in
 travis.yml

---
 .travis.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8af73c6bd..0aba2ae8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,10 @@ env:
   global:
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
+    - PYMONGO_3_X=3.x
+    - PYMONGO_3_4=3.4.x
   matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=3.x
+    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_X}
 
 matrix:
 
@@ -40,11 +42,11 @@ matrix:
 
   include:
   - python: 2.7
-    env: MONGODB=${MONGODB_3_4} PYMONGO=3.4.x
+    env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4}
   - python: 3.6
-    env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_X}
   - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=3.x
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_X}
 
 
 install:
@@ -105,5 +107,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = 3.x) && ($MONGODB = 3.4.17)
+    condition: ($PYMONGO = ${PYMONGO_3_X}) && ($MONGODB = ${MONGODB_3_4})
     python: 2.7

From d0b87f7f82579c28e19e6f665839b597e9a037a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 1 Jul 2019 10:18:47 +0200
Subject: [PATCH 0892/1519] Drop the deprecated "format" param from
 BaseQuerySet.explain (#2113)

That option was pretty useless. You can very easily do:
```
import pprint
(...)

plan = SomeDoc.objects(...).explain()
pprint.pformat(plan)
```
---
 docs/changelog.rst           |  1 +
 mongoengine/queryset/base.py | 19 ++-----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7eac72df4..b9114eb5d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- BREAKING CHANGE: Removed the deprecated `format` param from `QuerySet.explain` #2113
 - BREAKING CHANGE: Renamed `MongoEngineConnectionError` to `ConnectionFailure` #2111
   - If you catch/use `MongoEngineConnectionError` in your code, you'll have to rename it.
 - BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 78e853999..42c4b927c 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -2,7 +2,6 @@
 
 import copy
 import itertools
-import pprint
 import re
 import warnings
 
@@ -1109,25 +1108,11 @@ def comment(self, text):
         """
         return self._chainable_method("comment", text)
 
-    def explain(self, format=False):
+    def explain(self):
         """Return an explain plan record for the
         :class:`~mongoengine.queryset.QuerySet`\ 's cursor.
-
-        :param format: format the plan before returning it
         """
-        plan = self._cursor.explain()
-
-        # TODO remove this option completely - it's useless. If somebody
-        # wants to pretty-print the output, they easily can.
-        if format:
-            msg = (
-                '"format" param of BaseQuerySet.explain has been '
-                "deprecated and will be removed in future versions."
-            )
-            warnings.warn(msg, DeprecationWarning)
-            plan = pprint.pformat(plan)
-
-        return plan
+        return self._cursor.explain()
 
     # DEPRECATED. Has no more impact on PyMongo 3+
     def snapshot(self, enabled):

From de80f0ccff487f32b0ce171093f33c67e3a7d019 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 2 Jul 2019 18:26:48 +0200
Subject: [PATCH 0893/1519] Clean up the changelog [ci skip]

Mostly making sure that code is formatted using backticks and that wording and
punctuation are consistent.
---
 docs/changelog.rst | 294 ++++++++++++++++++++++-----------------------
 1 file changed, 144 insertions(+), 150 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b9114eb5d..4dcb72980 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -16,210 +16,204 @@ Development
 
 Changes in 0.18.2
 =================
-- Replace some of the deprecated PyMongo v2.x methods with their v3.x equivalents #2097
-- Various code clarity and documentation improvements
+- Replace deprecated PyMongo v2.x methods with their v3.x equivalents in the `SequenceField` #2097
+- Various code clarity and documentation improvements.
 
 Changes in 0.18.1
 =================
-- Fix a bug introduced in 0.18.0 which was causing `.save()` to update all the fields
-    instead of updating only the modified fields. This bug only occurs when using custom pk #2082
-- Add Python 3.7 in travis #2058
+- Fix a bug introduced in 0.18.0 which was causing `.save()` to update all the fields instead of updating only the modified fields. This bug only occurred when using a custom PK. #2082
+- Add Python 3.7 to Travis CI. #2058
 
 Changes in 0.18.0
 =================
 - Drop support for EOL'd MongoDB v2.6, v3.0, and v3.2.
-- MongoEngine now requires PyMongo >= v3.4. Travis CI now tests against MongoDB v3.4 – v3.6 and PyMongo v3.4 – v3.6 (#2017 #2066).
-- Improve performance by avoiding a call to `to_mongo` in `Document.save()` #2049
+- MongoEngine now requires PyMongo >= v3.4. Travis CI now tests against MongoDB v3.4 – v3.6 and PyMongo v3.4 – v3.6. #2017 #2066
+- Improve performance by avoiding a call to `to_mongo` in `Document.save()`. #2049
 - Connection/disconnection improvements:
-    - Expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`
-    - Fix disconnecting #566 #1599 #605 #607 #1213 #565
-    - Improve documentation of `connect`/`disconnect`
-    - Fix issue when using multiple connections to the same mongo with different credentials #2047
-    - `connect` fails immediately when db name contains invalid characters #2031 #1718
-- Fix the default write concern of `Document.save` that was overwriting the connection write concern #568
-- Fix querying on `List(EmbeddedDocument)` subclasses fields #1961 #1492
-- Fix querying on `(Generic)EmbeddedDocument` subclasses fields #475
-- Fix `QuerySet.aggregate` so that it takes limit and skip value into account #2029
-- Generate unique indices for `SortedListField` and `EmbeddedDocumentListFields` #2020
-- BREAKING CHANGE: Changed the behavior of a custom field validator (i.e `validation` parameter of a `Field`). It is now expected to raise a `ValidationError` instead of returning True/False #2050
-- BREAKING CHANGES (associated with connect/disconnect fixes):
+    - Expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`.
+    - Fix disconnecting. #566 #1599 #605 #607 #1213 #565
+    - Improve documentation of `connect`/`disconnect`.
+    - Fix issue when using multiple connections to the same mongo with different credentials. #2047
+    - `connect` fails immediately when db name contains invalid characters. #2031 #1718
+- Fix the default write concern of `Document.save` that was overwriting the connection write concern. #568
+- Fix querying on `List(EmbeddedDocument)` subclasses fields. #1961 #1492
+- Fix querying on `(Generic)EmbeddedDocument` subclasses fields. #475
+- Fix `QuerySet.aggregate` so that it takes limit and skip value into account. #2029
+- Generate unique indices for `SortedListField` and `EmbeddedDocumentListFields`. #2020
+- BREAKING CHANGE: Changed the behavior of a custom field validator (i.e `validation` parameter of a `Field`). It is now expected to raise a `ValidationError` instead of returning `True`/`False`. #2050
+- BREAKING CHANGES (associated with connection/disconnection fixes):
     - Calling `connect` 2 times with the same alias and different parameter will raise an error (should call `disconnect` first).
     - `disconnect` now clears `mongoengine.connection._connection_settings`.
     - `disconnect` now clears the cached attribute `Document._collection`.
-- BREAKING CHANGE: `EmbeddedDocument.save` & `.reload` is no longier exist #1552
+- BREAKING CHANGE: `EmbeddedDocument.save` & `.reload` is no longer exist. #1552
 
 Changes in 0.17.0
 =================
-- Fix .only() working improperly after using .count() of the same instance of QuerySet
-- Fix batch_size that was not copied when cloning a queryset object #2011
-- POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (_cls, _id) when using `QuerySet.as_pymongo` #1976
-- Document a BREAKING CHANGE introduced in 0.15.3 and not reported at that time (#1995)
-- Fix InvalidStringData error when using modify on a BinaryField #1127
-- DEPRECATION: `EmbeddedDocument.save` & `.reload` are marked as deprecated and will be removed in a next version of mongoengine #1552
-- Fix test suite and CI to support MongoDB 3.4 #1445
-- Fix reference fields querying the database on each access if value contains orphan DBRefs
+- Fix `.only()` working improperly after using `.count()` of the same instance of a `QuerySet`.
+- Fix `batch_size` that was not copied when cloning a `QuerySet` object. #2011
+- POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (`_cls`, `_id`) when using `QuerySet.as_pymongo`. #1976
+- Document a BREAKING CHANGE introduced in 0.15.3 and not reported at that time. #1995
+- Fix `InvalidStringData` error when using `modify` on a `BinaryField`. #1127
+- DEPRECATION: `EmbeddedDocument.save` & `.reload` are marked as deprecated and will be removed in a next version of MongoEngine. #1552
+- Fix test suite and CI to support MongoDB v3.4. #1445
+- Fix reference fields querying the database on each access if value contains orphan DBRefs.
 
 =================
 Changes in 0.16.3
 =================
-- Fix $push with $position operator not working with lists in embedded document #1965
+- Fix `$push` with the `$position` operator not working with lists in embedded documents. #1965
 
 =================
 Changes in 0.16.2
 =================
-- Fix .save() that fails when called with write_concern=None (regression of 0.16.1) #1958
+- Fix `.save()` that fails when called with `write_concern=None` (regression of 0.16.1). #1958
 
 =================
 Changes in 0.16.1
 =================
-- Fix `_cls` that is not set properly in Document constructor (regression) #1950
-- Fix bug in _delta method - Update of a ListField depends on an unrelated dynamic field update #1733
-- Remove deprecated `save()` method and used `insert_one()` #1899
+- Fix `_cls` that is not set properly in the Document constructor (regression). #1950
+- Fix a bug in the `_delta` method - update of a ListField depends on an unrelated dynamic field update. #1733
+- Remove PyMongo's deprecated `save()` method and use `insert_one()` instead. #1899
 
 =================
 Changes in 0.16.0
 =================
-- Various improvements to the doc
-- Improvement to code quality
 - POTENTIAL BREAKING CHANGES:
-    - EmbeddedDocumentField will no longer accept references to Document classes in its constructor #1661
-    - Get rid of the `basecls` parameter from the DictField constructor (dead code) #1876
-    - default value of ComplexDateTime is now None (and no longer the current datetime) #1368
-- Fix unhashable TypeError when referencing a Document with a compound key in an EmbeddedDocument #1685
-- Fix bug where an EmbeddedDocument with the same id as its parent would not be tracked for changes #1768
-- Fix the fact that bulk `insert()` was not setting primary keys of inserted documents instances #1919
-- Fix bug when referencing the abstract class in a ReferenceField #1920
-- Allow modification to the document made in pre_save_post_validation to be taken into account #1202
-- Replaced MongoDB 2.4 tests in CI by MongoDB 3.2 #1903
-- Fix side effects of using queryset.`no_dereference` on other documents #1677
-- Fix TypeError when using lazy django translation objects as translated choices #1879
-- Improve 2-3 codebase compatibility #1889
-- Fix the support for changing the default value of ComplexDateTime #1368
-- Improves error message in case an EmbeddedDocumentListField receives an EmbeddedDocument instance
-    instead of a list #1877
-- Fix the Decimal operator inc/dec #1517 #1320
-- Ignore killcursors queries in `query_counter` context manager #1869
-- Fix the fact that `query_counter` was modifying the initial profiling_level in case it was != 0 #1870
-- Repaired the `no_sub_classes` context manager + fix the fact that it was swallowing exceptions #1865
-- Fix index creation error that was swallowed by hasattr under python2 #1688
-- QuerySet limit function behaviour: Passing 0 as parameter will return all the documents in the cursor #1611
-- bulk insert updates the ids of the input documents instances #1919
-- Fix an harmless bug related to GenericReferenceField where modifications in the generic-referenced document
-    were tracked in the parent #1934
-- Improve validator of BinaryField #273
-- Implemented lazy regex compiling in Field classes to improve 'import mongoengine' performance #1806
-- Updated GridFSProxy.__str__  so that it would always print both the filename and grid_id #710
-- Add __repr__ to Q and QCombination #1843
-- fix bug in BaseList.__iter__ operator (was occuring when modifying a BaseList while iterating over it) #1676
-- Added field `DateField`#513
+    - `EmbeddedDocumentField` will no longer accept references to Document classes in its constructor. #1661
+    - Get rid of the `basecls` parameter from the `DictField` constructor (dead code). #1876
+    - Default value of the `ComplexDateTime` field is now `None` (and no longer the current datetime). #1368
+- Fix an unhashable `TypeError` when referencing a `Document` with a compound key in an `EmbeddedDocument`. #1685
+- Fix a bug where an `EmbeddedDocument` with the same id as its parent would not be tracked for changes. #1768
+- Fix the fact that bulk `insert()` was not setting primary keys of inserted document instances. #1919
+- Fix a bug when referencing the abstract class in a `ReferenceField`. #1920
+- Allow modification to the document made in `pre_save_post_validation` to be taken into account. #1202
+- Replaced MongoDB v2.4 tests in Travis CI with MongoDB v3.2. #1903
+- Fix side effects of using `QuerySet.no_dereference` on other documents. #1677
+- Fix `TypeError` when using lazy django translation objects as translated choices. #1879
+- Improve Python 2-3 codebase compatibility. #1889
+- Fix the support for changing the default value of the `ComplexDateTime` field. #1368
+- Improve error message in case an `EmbeddedDocumentListField` receives an `EmbeddedDocument` instance instead of a list. #1877
+- Fix the Decimal operator inc/dec. #1517 #1320
+- Ignore `killcursors` queries in `query_counter` context manager. #1869
+- Fix the fact that `query_counter` was modifying the initial profiling level in case it was != 0. #1870
+- Repair the `no_sub_classes` context manager + fix the fact that it was swallowing exceptions. #1865
+- Fix index creation error that was swallowed by `hasattr` under Python 2. #1688
+- `QuerySet.limit` function behaviour: Passing 0 as parameter will return all the documents in the cursor. #1611
+- Bulk insert updates the IDs of the input documents instances. #1919
+- Fix a harmless bug related to `GenericReferenceField` where modifications in the generic-referenced document were tracked in the parent. #1934
+- Improve validation of the `BinaryField`. #273
+- Implement lazy regex compiling in Field classes to improve `import mongoengine` performance. #1806
+- Update `GridFSProxy.__str__`  so that it would always print both the filename and grid_id. #710
+- Add `__repr__` to `Q` and `QCombination` classes. #1843
+- Fix bug in the `BaseList.__iter__` operator (was occuring when modifying a BaseList while iterating over it). #1676
+- Added a `DateField`. #513
+- Various improvements to the documentation.
+- Various code quality improvements.
 
 Changes in 0.15.3
 =================
--  BREAKING CHANGES: `Queryset.update/update_one` methods now returns an UpdateResult when `full_result=True` is provided and no longer a dict (relates to #1491)
--  Subfield resolve error in generic_emdedded_document query #1651 #1652
--  use each modifier only with $position #1673 #1675
--  Improve LazyReferenceField and GenericLazyReferenceField with nested fields #1704
--  Fix validation error instance in GenericEmbeddedDocumentField #1067
--  Update cached fields when fields argument is given #1712
--  Add a db parameter to register_connection for compatibility with connect
--  Use insert_one, insert_many in Document.insert #1491
--  Use new update_one, update_many on document/queryset update #1491
--  Use insert_one, insert_many in Document.insert #1491
--  Fix reload(fields) affect changed fields #1371
--  Fix Read-only access to database fails when trying to create indexes #1338
+-  BREAKING CHANGES: `Queryset.update/update_one` methods now return an `UpdateResult` when `full_result=True` is provided and no longer a dict. #1491
+-  Fix the subfield resolve error in `generic_emdedded_document` query. #1651 #1652
+-  Use each modifier only with `$position`. #1673 #1675
+-  Improve `LazyReferenceField` and `GenericLazyReferenceField` with nested fields. #1704
+-  Fix validation error instance in `GenericEmbeddedDocumentField`. #1067
+-  Update cached fields when fields argument is given. #1712
+-  Add a db parameter to `register_connection` for compatibility with `connect`.
+-  Use PyMongo v3.x's `insert_one` and `insert_many` in `Document.insert`. #1491
+-  Use PyMongo v3.x's `update_one` and `update_many` in `Document.update` and `QuerySet.update`. #1491
+-  Fix how `reload(fields)` affects changed fields. #1371
+-  Fix a bug where the read-only access to the database fails when trying to create indexes. #1338
 
 Changes in 0.15.0
 =================
-- Add LazyReferenceField and GenericLazyReferenceField to address #1230
+- Add `LazyReferenceField` and `GenericLazyReferenceField`. #1230
 
 Changes in 0.14.1
 =================
-- Removed SemiStrictDict and started using a regular dict for `BaseDocument._data` #1630
-- Added support for the `$position` param in the `$push` operator #1566
-- Fixed `DateTimeField` interpreting an empty string as today #1533
-- Added a missing `__ne__` method to the `GridFSProxy` class #1632
-- Fixed `BaseQuerySet._fields_to_db_fields` #1553
+- Remove `SemiStrictDict` and start using a regular dict for `BaseDocument._data`. #1630
+- Add support for the `$position` param in the `$push` operator. #1566
+- Fix `DateTimeField` interpreting an empty string as today. #1533
+- Add a missing `__ne__` method to the `GridFSProxy` class. #1632
+- Fix `BaseQuerySet._fields_to_db_fields`. #1553
 
 Changes in 0.14.0
 =================
-- BREAKING CHANGE: Removed the `coerce_types` param from `QuerySet.as_pymongo` #1549
-- POTENTIAL BREAKING CHANGE: Made EmbeddedDocument not hashable by default #1528
-- Improved code quality #1531, #1540, #1541, #1547
+- BREAKING CHANGE: Remov the `coerce_types` param from `QuerySet.as_pymongo`. #1549
+- POTENTIAL BREAKING CHANGE: Make `EmbeddedDocument` not hashable by default. #1528
+- Improv code quality. #1531, #1540, #1541, #1547
 
 Changes in 0.13.0
 =================
-- POTENTIAL BREAKING CHANGE: Added Unicode support to the `EmailField`, see
-  docs/upgrade.rst for details.
+- POTENTIAL BREAKING CHANGE: Added Unicode support to the `EmailField`, see docs/upgrade.rst for details.
 
 Changes in 0.12.0
 =================
-- POTENTIAL BREAKING CHANGE: Fixed limit/skip/hint/batch_size chaining #1476
-- POTENTIAL BREAKING CHANGE: Changed a public `QuerySet.clone_into` method to a private `QuerySet._clone_into` #1476
-- Fixed the way `Document.objects.create` works with duplicate IDs #1485
-- Fixed connecting to a replica set with PyMongo 2.x #1436
-- Fixed using sets in field choices #1481
-- Fixed deleting items from a `ListField` #1318
-- Fixed an obscure error message when filtering by `field__in=non_iterable`. #1237
-- Fixed behavior of a `dec` update operator #1450
-- Added a `rename` update operator #1454
-- Added validation for the `db_field` parameter #1448
-- Fixed the error message displayed when querying an `EmbeddedDocumentField` by an invalid value #1440
-- Fixed the error message displayed when validating unicode URLs #1486
-- Raise an error when trying to save an abstract document #1449
+- POTENTIAL BREAKING CHANGE: Fix `limit`/`skip`/`hint`/`batch_size` chaining. #1476
+- POTENTIAL BREAKING CHANGE: Change a public `QuerySet.clone_into` method to a private `QuerySet._clone_into`. #1476
+- Fix the way `Document.objects.create` works with duplicate IDs. #1485
+- Fix connecting to a replica set with PyMongo 2.x. #1436
+- Fix using sets in field choices. #1481
+- Fix deleting items from a `ListField`. #1318
+- Fix an obscure error message when filtering by `field__in=non_iterable`. #1237
+- Fix behavior of a `dec` update operator. #1450
+- Add a `rename` update operator. #1454
+- Add validation for the `db_field` parameter. #1448
+- Fix the error message displayed when querying an `EmbeddedDocumentField` by an invalid value. #1440
+- Fix the error message displayed when validating Unicode URLs. #1486
+- Raise an error when trying to save an abstract document. #1449
 
 Changes in 0.11.0
 =================
-- BREAKING CHANGE: Renamed `ConnectionError` to `MongoEngineConnectionError` since the former is a built-in exception name in Python v3.x. #1428
-- BREAKING CHANGE: Dropped Python 2.6 support. #1428
+- BREAKING CHANGE: Rename `ConnectionError` to `MongoEngineConnectionError` since the former is a built-in exception name in Python v3.x. #1428
+- BREAKING CHANGE: Drop Python v2.6 support. #1428
 - BREAKING CHANGE: `from mongoengine.base import ErrorClass` won't work anymore for any error from `mongoengine.errors` (e.g. `ValidationError`). Use `from mongoengine.errors import ErrorClass instead`. #1428
 - BREAKING CHANGE: Accessing a broken reference will raise a `DoesNotExist` error. In the past it used to return `None`. #1334
 - Fixed absent rounding for DecimalField when `force_string` is set. #1103
 
 Changes in 0.10.8
 =================
-- Added support for QuerySet.batch_size (#1426)
-- Fixed query set iteration within iteration #1427
-- Fixed an issue where specifying a MongoDB URI host would override more information than it should #1421
-- Added ability to filter the generic reference field by ObjectId and DBRef #1425
-- Fixed delete cascade for models with a custom primary key field #1247
-- Added ability to specify an authentication mechanism (e.g. X.509) #1333
-- Added support for falsey primary keys (e.g. doc.pk = 0) #1354
-- Fixed QuerySet#sum/average for fields w/ explicit db_field #1417
-- Fixed filtering by embedded_doc=None #1422
-- Added support for cursor.comment #1420
-- Fixed doc.get_<field>_display #1419
-- Fixed __repr__ method of the StrictDict #1424
-- Added a deprecation warning for Python 2.6
+- Add support for `QuerySet.batch_size`. (#1426)
+- Fix a query set iteration within an iteration. #1427
+- Fix an issue where specifying a MongoDB URI host would override more information than it should. #1421
+- Add an ability to filter the `GenericReferenceField` by an `ObjectId` and a `DBRef`. #1425
+- Fix cascading deletes for models with a custom primary key field. #1247
+- Add ability to specify an authentication mechanism (e.g. X.509). #1333
+- Add support for falsy primary keys (e.g. `doc.pk = 0`). #1354
+- Fix `QuerySet.sum/average` for fields w/ an explicit `db_field`. #1417
+- Fix filtering by `embedded_doc=None`. #1422
+- Add support for `Cursor.comment`. #1420
+- Fix `doc.get_<field>_display` methods. #1419
+- Fix the `__repr__` method of the `StrictDict` #1424
+- Add a deprecation warning for Python v2.6.
 
 Changes in 0.10.7
 =================
-- Dropped Python 3.2 support #1390
-- Fixed the bug where dynamic doc has index inside a dict field #1278
-- Fixed: ListField minus index assignment does not work #1128
-- Fixed cascade delete mixing among collections #1224
-- Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls #1206
+- Drop Python 3.2 support #1390
+- Fix a bug where a dynamic doc has an index inside a dict field. #1278
+- Fix: `ListField` minus index assignment does not work. #1128
+- Fix cascade delete mixing among collections. #1224
+- Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls. #1206
 - Raise `OperationError` when trying to do a `drop_collection` on document with no collection set.
-- count on ListField of EmbeddedDocumentField fails. #1187
-- Fixed long fields stored as int32 in Python 3. #1253
-- MapField now handles unicodes keys correctly. #1267
-- ListField now handles negative indicies correctly. #1270
-- Fixed AttributeError when initializing EmbeddedDocument with positional args. #681
-- Fixed no_cursor_timeout error with pymongo 3.0+ #1304
-- Replaced map-reduce based QuerySet.sum/average with aggregation-based implementations #1336
-- Fixed support for `__` to escape field names that match operators names in `update` #1351
-- Fixed BaseDocument#_mark_as_changed #1369
-- Added support for pickling QuerySet instances. #1397
-- Fixed connecting to a list of hosts #1389
-- Fixed a bug where accessing broken references wouldn't raise a DoesNotExist error #1334
-- Fixed not being able to specify use_db_field=False on ListField(EmbeddedDocumentField) instances #1218
-- Improvements to the dictionary fields docs #1383
+- Fix a bug where a count on `ListField` of `EmbeddedDocumentField` fails. #1187
+- Fix `LongField` values stored as int32 in Python 3. #1253
+- `MapField` now handles unicode keys correctly. #1267
+- `ListField` now handles negative indicies correctly. #1270
+- Fix an `AttributeError` when initializing an `EmbeddedDocument` with positional args. #681
+- Fix a `no_cursor_timeout` error with PyMongo v3.x. #1304
+- Replace map-reduce based `QuerySet.sum/average` with aggregation-based implementations. #1336
+- Fix support for `__` to escape field names that match operators' names in `update`. #1351
+- Fix `BaseDocument._mark_as_changed`. #1369
+- Add support for pickling `QuerySet` instances. #1397
+- Fix connecting to a list of hosts. #1389
+- Fix a bug where accessing broken references wouldn't raise a `DoesNotExist` error. #1334
+- Fix not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances. #1218
+- Improvements to the dictionary field's docs. #1383
 
 Changes in 0.10.6
 =================
 - Add support for mocking MongoEngine based on mongomock. #1151
-- Fixed not being able to run tests on Windows. #1153
+- Fix not being able to run tests on Windows. #1153
 - Allow creation of sparse compound indexes. #1114
-- count on ListField of EmbeddedDocumentField fails. #1187
 
 Changes in 0.10.5
 =================
@@ -227,12 +221,12 @@ Changes in 0.10.5
 
 Changes in 0.10.4
 =================
-- SaveConditionError is now importable from the top level package. #1165
-- upsert_one method added. #1157
+- `SaveConditionError` is now importable from the top level package. #1165
+- Add a `QuerySet.upsert_one` method. #1157
 
 Changes in 0.10.3
 =================
-- Fix `read_preference` (it had chaining issues with PyMongo 2.x and it didn't work at all with PyMongo 3.x) #1042
+- Fix `read_preference` (it had chaining issues with PyMongo v2.x and it didn't work at all with PyMongo v3.x). #1042
 
 Changes in 0.10.2
 =================
@@ -242,16 +236,16 @@ Changes in 0.10.2
 
 Changes in 0.10.1
 =================
-- Fix infinite recursion with CASCADE delete rules under specific conditions. #1046
-- Fix CachedReferenceField bug when loading cached docs as DBRef but failing to save them. #1047
-- Fix ignored chained options #842
-- Document save's save_condition error raises `SaveConditionError` exception #1070
-- Fix Document.reload for DynamicDocument. #1050
-- StrictDict & SemiStrictDict are shadowed at init time. #1105
-- Fix ListField minus index assignment does not work. #1119
-- Remove code that marks field as changed when the field has default but not existed in database #1126
-- Remove test dependencies (nose and rednose) from install dependencies list. #1079
-- Recursively build query when using elemMatch operator. #1130
+- Fix infinite recursion with cascade delete rules under specific conditions. #1046
+- Fix `CachedReferenceField` bug when loading cached docs as `DBRef` but failing to save them. #1047
+- Fix ignored chained options. #842
+- `Document.save`'s `save_condition` error raises a `SaveConditionError` exception. #1070
+- Fix `Document.reload` for the `DynamicDocument`. #1050
+- `StrictDict` & `SemiStrictDict` are shadowed at init time. #1105
+- Fix `ListField` negative index assignment not working. #1119
+- Remove code that marks a field as changed when the field has a default value but does not exist in the database. #1126
+- Remove test dependencies (nose and rednose) from install dependencies. #1079
+- Recursively build a query when using the `elemMatch` operator. #1130
 - Fix instance back references for lists of embedded documents. #1131
 
 Changes in 0.10.0

From 483c840fc8247c2c52dec44eb9f73486a70c3fff Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 2 Jul 2019 18:29:28 +0200
Subject: [PATCH 0894/1519] One more changelog tweak [ci skip]

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4dcb72980..052364a9c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -45,7 +45,7 @@ Changes in 0.18.0
     - Calling `connect` 2 times with the same alias and different parameter will raise an error (should call `disconnect` first).
     - `disconnect` now clears `mongoengine.connection._connection_settings`.
     - `disconnect` now clears the cached attribute `Document._collection`.
-- BREAKING CHANGE: `EmbeddedDocument.save` & `.reload` is no longer exist. #1552
+- BREAKING CHANGE: `EmbeddedDocument.save` & `.reload` no longer exist. #1552
 
 Changes in 0.17.0
 =================

From b593764ded7245b12722d931f599c4a962146e21 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 2 Jul 2019 18:35:29 +0200
Subject: [PATCH 0895/1519] One more changelog tweak [ci skip]

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 052364a9c..e4d38b24a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -168,7 +168,7 @@ Changes in 0.11.0
 - BREAKING CHANGE: Drop Python v2.6 support. #1428
 - BREAKING CHANGE: `from mongoengine.base import ErrorClass` won't work anymore for any error from `mongoengine.errors` (e.g. `ValidationError`). Use `from mongoengine.errors import ErrorClass instead`. #1428
 - BREAKING CHANGE: Accessing a broken reference will raise a `DoesNotExist` error. In the past it used to return `None`. #1334
-- Fixed absent rounding for DecimalField when `force_string` is set. #1103
+- Fix absent rounding for the `DecimalField` when `force_string` is set. #1103
 
 Changes in 0.10.8
 =================

From bbed312bdd6fd1bf991cff9bf5289ac7f94ab77f Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Tue, 2 Jul 2019 18:42:50 +0200
Subject: [PATCH 0896/1519] Final changelog tweaks [ci skip]

---
 docs/changelog.rst | 52 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e4d38b24a..a78c9e13b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -49,12 +49,12 @@ Changes in 0.18.0
 
 Changes in 0.17.0
 =================
-- Fix `.only()` working improperly after using `.count()` of the same instance of a `QuerySet`.
-- Fix `batch_size` that was not copied when cloning a `QuerySet` object. #2011
 - POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (`_cls`, `_id`) when using `QuerySet.as_pymongo`. #1976
 - Document a BREAKING CHANGE introduced in 0.15.3 and not reported at that time. #1995
-- Fix `InvalidStringData` error when using `modify` on a `BinaryField`. #1127
 - DEPRECATION: `EmbeddedDocument.save` & `.reload` are marked as deprecated and will be removed in a next version of MongoEngine. #1552
+- Fix `.only()` working improperly after using `.count()` of the same instance of a `QuerySet`.
+- Fix `batch_size` that was not copied when cloning a `QuerySet` object. #2011
+- Fix `InvalidStringData` error when using `modify` on a `BinaryField`. #1127
 - Fix test suite and CI to support MongoDB v3.4. #1445
 - Fix reference fields querying the database on each access if value contains orphan DBRefs.
 
@@ -71,8 +71,8 @@ Changes in 0.16.2
 =================
 Changes in 0.16.1
 =================
-- Fix `_cls` that is not set properly in the Document constructor (regression). #1950
-- Fix a bug in the `_delta` method - update of a ListField depends on an unrelated dynamic field update. #1733
+- Fix `_cls` that is not set properly in the `Document` constructor (regression). #1950
+- Fix a bug in the `_delta` method - update of a `ListField` depends on an unrelated dynamic field update. #1733
 - Remove PyMongo's deprecated `save()` method and use `insert_one()` instead. #1899
 
 =================
@@ -84,16 +84,16 @@ Changes in 0.16.0
     - Default value of the `ComplexDateTime` field is now `None` (and no longer the current datetime). #1368
 - Fix an unhashable `TypeError` when referencing a `Document` with a compound key in an `EmbeddedDocument`. #1685
 - Fix a bug where an `EmbeddedDocument` with the same id as its parent would not be tracked for changes. #1768
-- Fix the fact that bulk `insert()` was not setting primary keys of inserted document instances. #1919
-- Fix a bug when referencing the abstract class in a `ReferenceField`. #1920
-- Allow modification to the document made in `pre_save_post_validation` to be taken into account. #1202
-- Replaced MongoDB v2.4 tests in Travis CI with MongoDB v3.2. #1903
+- Fix the fact that a bulk `QuerySet.insert` was not setting primary keys of inserted document instances. #1919
+- Fix a bug when referencing an abstract class in a `ReferenceField`. #1920
+- Allow modifications to the document made in `pre_save_post_validation` to be taken into account. #1202
+- Replace MongoDB v2.4 tests in Travis CI with MongoDB v3.2. #1903
 - Fix side effects of using `QuerySet.no_dereference` on other documents. #1677
-- Fix `TypeError` when using lazy django translation objects as translated choices. #1879
+- Fix `TypeError` when using lazy Django translation objects as translated choices. #1879
 - Improve Python 2-3 codebase compatibility. #1889
-- Fix the support for changing the default value of the `ComplexDateTime` field. #1368
+- Fix support for changing the default value of the `ComplexDateTime` field. #1368
 - Improve error message in case an `EmbeddedDocumentListField` receives an `EmbeddedDocument` instance instead of a list. #1877
-- Fix the Decimal operator inc/dec. #1517 #1320
+- Fix the `inc` and `dec` operators for the `DecimalField`. #1517 #1320
 - Ignore `killcursors` queries in `query_counter` context manager. #1869
 - Fix the fact that `query_counter` was modifying the initial profiling level in case it was != 0. #1870
 - Repair the `no_sub_classes` context manager + fix the fact that it was swallowing exceptions. #1865
@@ -106,23 +106,23 @@ Changes in 0.16.0
 - Update `GridFSProxy.__str__`  so that it would always print both the filename and grid_id. #710
 - Add `__repr__` to `Q` and `QCombination` classes. #1843
 - Fix bug in the `BaseList.__iter__` operator (was occuring when modifying a BaseList while iterating over it). #1676
-- Added a `DateField`. #513
+- Add a `DateField`. #513
 - Various improvements to the documentation.
 - Various code quality improvements.
 
 Changes in 0.15.3
 =================
--  BREAKING CHANGES: `Queryset.update/update_one` methods now return an `UpdateResult` when `full_result=True` is provided and no longer a dict. #1491
--  Fix the subfield resolve error in `generic_emdedded_document` query. #1651 #1652
--  Use each modifier only with `$position`. #1673 #1675
--  Improve `LazyReferenceField` and `GenericLazyReferenceField` with nested fields. #1704
--  Fix validation error instance in `GenericEmbeddedDocumentField`. #1067
--  Update cached fields when fields argument is given. #1712
--  Add a db parameter to `register_connection` for compatibility with `connect`.
--  Use PyMongo v3.x's `insert_one` and `insert_many` in `Document.insert`. #1491
--  Use PyMongo v3.x's `update_one` and `update_many` in `Document.update` and `QuerySet.update`. #1491
--  Fix how `reload(fields)` affects changed fields. #1371
--  Fix a bug where the read-only access to the database fails when trying to create indexes. #1338
+- `Queryset.update/update_one` methods now return an `UpdateResult` when `full_result=True` is provided and no longer a dict. #1491
+- Improve `LazyReferenceField` and `GenericLazyReferenceField` with nested fields. #1704
+- Fix the subfield resolve error in `generic_emdedded_document` query. #1651 #1652
+- Use each modifier only with `$position`. #1673 #1675
+- Fix validation errors in the `GenericEmbeddedDocumentField`. #1067
+- Update cached fields when a `fields` argument is given. #1712
+- Add a `db` parameter to `register_connection` for compatibility with `connect`.
+- Use PyMongo v3.x's `insert_one` and `insert_many` in `Document.insert`. #1491
+- Use PyMongo v3.x's `update_one` and `update_many` in `Document.update` and `QuerySet.update`. #1491
+- Fix how `reload(fields)` affects changed fields. #1371
+- Fix a bug where the read-only access to the database fails when trying to create indexes. #1338
 
 Changes in 0.15.0
 =================
@@ -138,9 +138,9 @@ Changes in 0.14.1
 
 Changes in 0.14.0
 =================
-- BREAKING CHANGE: Remov the `coerce_types` param from `QuerySet.as_pymongo`. #1549
+- BREAKING CHANGE: Remove the `coerce_types` param from `QuerySet.as_pymongo`. #1549
 - POTENTIAL BREAKING CHANGE: Make `EmbeddedDocument` not hashable by default. #1528
-- Improv code quality. #1531, #1540, #1541, #1547
+- Improve code quality. #1531, #1540, #1541, #1547
 
 Changes in 0.13.0
 =================

From e9400446030ecc29fede088a7abe2c501a737b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 2 Jul 2019 23:06:31 +0200
Subject: [PATCH 0897/1519] fixes in  .travis.yml and tox.ini based on PR
 review

---
 .travis.yml | 8 ++++----
 tox.ini     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4021cb8f4..34acd952d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,10 @@ env:
   global:
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
-    - PYMONGO_3_X=3.x
+    - PYMONGO_3_6=3.6
     - PYMONGO_3_4=3.4.x
   matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_X}
+    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_6}
 
 matrix:
 
@@ -46,7 +46,7 @@ matrix:
   - python: 2.7
     env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4}
   - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_X}
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
 
 
 install:
@@ -107,5 +107,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = ${PYMONGO_3_X}) && ($MONGODB = ${MONGODB_3_4})
+    condition: ($PYMONGO = ${PYMONGO_3_6}) && ($MONGODB = ${MONGODB_3_4})
     python: 2.7
diff --git a/tox.ini b/tox.ini
index 40bcea8a0..5e62e58bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ commands =
     python setup.py nosetests {posargs}
 deps =
     nose
-    mg34x: PyMongo>=3.4,<3.5
-    mg3x: PyMongo>=3.0,<3.7
+    mg34: pymongo>=3.4,<3.5
+    mg36: pymongo>=3.6,<3.7
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 951a532a9f30693903fa41ad3ec9cbe2cf0f7790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 3 Jul 2019 09:15:28 +0200
Subject: [PATCH 0898/1519] additional fix in travis/tox

---
 .travis.yml | 2 +-
 tox.ini     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 34acd952d..54a6befdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ env:
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
     - PYMONGO_3_6=3.6
-    - PYMONGO_3_4=3.4.x
+    - PYMONGO_3_4=3.4
   matrix:
     - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_6}
 
diff --git a/tox.ini b/tox.ini
index 5e62e58bc..a1ae84441 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,pypy,pypy3}-{mg35,mg3x}
+envlist = {py27,py35,pypy,pypy3}-{mg34,mg36}
 
 [testenv]
 commands =

From 50555ec73e8fdd978ca755eadef948321d2ef73c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Wed, 3 Jul 2019 11:07:55 +0200
Subject: [PATCH 0899/1519] Better management of the automatic "_cls" field
 (#2112)

* Rename BaseQuerySet._initial_query to BaseQuerySet._cls_query

This new name more accurately reflects the purpose of the dict. It is either
empty for documents that don't use inheritance or it contains a `{"_cls": ...}`
shape query. There was nothing "initial" about it per se.

* Drop read_preference as a kwarg on BaseQuerySet.__call__/filter

It was a poor design choice to offer two different ways to do the same thing:
1. `SomeDoc.objects(foo=bar, bar=baz).read_preference(...)`
2. `SomeDoc.objects(foo=bar, bar=baz, read_preference=...)`

Option 1 is good because it's immediately obvious which part defines the query
to be used and which part defines the read preference.

Option 2 is bad because you don't immediately know whether `read_preference`
is a query kwarg or a reserved keyword with some special behavior. If you
wanted to be particularly cruel, you could even write
`SomeDoc.objects(foo=bar, read_preference=..., bar=baz)`.

THIS IS A BREAKING CHANGE. From now on you have to use the
`BaseQuerySet.read_preference(...)` method.

* Add a BaseQuerySet.clear_cls_query method + get rid of the class_check kwarg

This is similar to what the previous commit did to read preference except that
in this case we were still missing a `BaseQuerySet` method for clearing the
`_cls` query.

Now, instead of the undocumented, untested, and confusing interface:
    `ParentDoc.objects(foo=bar, bar=baz, class_check=False)`
We do:
    `ParentDoc.objects(foo=bar, bar=baz).clear_cls_query()`
---
 docs/changelog.rst           |  4 +++
 mongoengine/queryset/base.py | 57 ++++++++++++++++----------------
 tests/queryset/queryset.py   | 63 +++++++++++++++++++++++++++---------
 3 files changed, 80 insertions(+), 44 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a78c9e13b..6512c1d3f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,10 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- BREAKING CHANGE: `class_check` and `read_preference` keyword arguments are no longer available when filtering a `QuerySet`. #2112
+  - Instead of `Doc.objects(foo=bar, read_preference=...)` use `Doc.objects(foo=bar).read_preference(...)`.
+  - Instead of `Doc.objects(foo=bar, class_check=False)` use `Doc.objects(foo=bar).clear_cls_query(...)`.
+  - This change also renames the private `QuerySet._initial_query` attribute to `_cls_query`.
 - BREAKING CHANGE: Removed the deprecated `format` param from `QuerySet.explain` #2113
 - BREAKING CHANGE: Renamed `MongoEngineConnectionError` to `ConnectionFailure` #2111
   - If you catch/use `MongoEngineConnectionError` in your code, you'll have to rename it.
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 42c4b927c..ba3ac95aa 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -53,13 +53,12 @@ def __init__(self, document, collection):
         self._collection_obj = collection
         self._mongo_query = None
         self._query_obj = Q()
-        self._initial_query = {}
+        self._cls_query = {}
         self._where_clause = None
         self._loaded_fields = QueryFieldList()
         self._ordering = None
         self._snapshot = False
         self._timeout = True
-        self._class_check = True
         self._slave_okay = False
         self._read_preference = None
         self._iter = False
@@ -72,9 +71,9 @@ def __init__(self, document, collection):
         # subclasses of the class being used
         if document._meta.get("allow_inheritance") is True:
             if len(self._document._subclasses) == 1:
-                self._initial_query = {"_cls": self._document._subclasses[0]}
+                self._cls_query = {"_cls": self._document._subclasses[0]}
             else:
-                self._initial_query = {"_cls": {"$in": self._document._subclasses}}
+                self._cls_query = {"_cls": {"$in": self._document._subclasses}}
             self._loaded_fields = QueryFieldList(always_include=["_cls"])
 
         self._cursor_obj = None
@@ -86,23 +85,19 @@ def __init__(self, document, collection):
         self._max_time_ms = None
         self._comment = None
 
-    def __call__(self, q_obj=None, class_check=True, read_preference=None, **query):
+    def __call__(self, q_obj=None, **query):
         """Filter the selected documents by calling the
         :class:`~mongoengine.queryset.QuerySet` with a query.
 
         :param q_obj: a :class:`~mongoengine.queryset.Q` object to be used in
             the query; the :class:`~mongoengine.queryset.QuerySet` is filtered
             multiple times with different :class:`~mongoengine.queryset.Q`
-            objects, only the last one will be used
-        :param class_check: If set to False bypass class name check when
-            querying collection
-        :param read_preference: if set, overrides connection-level
-            read_preference from `ReplicaSetConnection`.
-        :param query: Django-style query keyword arguments
+            objects, only the last one will be used.
+        :param query: Django-style query keyword arguments.
         """
         query = Q(**query)
         if q_obj:
-            # make sure proper query object is passed
+            # Make sure proper query object is passed.
             if not isinstance(q_obj, QNode):
                 msg = (
                     "Not a query object: %s. "
@@ -111,16 +106,10 @@ def __call__(self, q_obj=None, class_check=True, read_preference=None, **query):
                 raise InvalidQueryError(msg)
             query &= q_obj
 
-        if read_preference is None:
-            queryset = self.clone()
-        else:
-            # Use the clone provided when setting read_preference
-            queryset = self.read_preference(read_preference)
-
+        queryset = self.clone()
         queryset._query_obj &= query
         queryset._mongo_query = None
         queryset._cursor_obj = None
-        queryset._class_check = class_check
 
         return queryset
 
@@ -222,8 +211,7 @@ def all(self):
         return self.__call__()
 
     def filter(self, *q_objs, **query):
-        """An alias of :meth:`~mongoengine.queryset.QuerySet.__call__`
-        """
+        """An alias of :meth:`~mongoengine.queryset.QuerySet.__call__`"""
         return self.__call__(*q_objs, **query)
 
     def search_text(self, text, language=None):
@@ -743,7 +731,7 @@ def no_sub_classes(self):
         Do NOT return any inherited documents.
         """
         if self._document._meta.get("allow_inheritance") is True:
-            self._initial_query = {"_cls": self._document._class_name}
+            self._cls_query = {"_cls": self._document._class_name}
 
         return self
 
@@ -777,7 +765,7 @@ def _clone_into(self, new_qs):
 
         copy_props = (
             "_mongo_query",
-            "_initial_query",
+            "_cls_query",
             "_none",
             "_query_obj",
             "_where_clause",
@@ -785,7 +773,6 @@ def _clone_into(self, new_qs):
             "_ordering",
             "_snapshot",
             "_timeout",
-            "_class_check",
             "_slave_okay",
             "_read_preference",
             "_iter",
@@ -1100,6 +1087,20 @@ def order_by(self, *keys):
 
         return queryset
 
+    def clear_cls_query(self):
+        """Clear the default "_cls" query.
+
+        By default, all queries generated for documents that allow inheritance
+        include an extra "_cls" clause. In most cases this is desirable, but
+        sometimes you might achieve better performance if you clear that
+        default query.
+
+        Scan the code for `_cls_query` to get more details.
+        """
+        queryset = self.clone()
+        queryset._cls_query = {}
+        return queryset
+
     def comment(self, text):
         """Add a comment to the query.
 
@@ -1651,13 +1652,11 @@ def __deepcopy__(self, memo):
     def _query(self):
         if self._mongo_query is None:
             self._mongo_query = self._query_obj.to_query(self._document)
-            if self._class_check and self._initial_query:
+            if self._cls_query:
                 if "_cls" in self._mongo_query:
-                    self._mongo_query = {
-                        "$and": [self._initial_query, self._mongo_query]
-                    }
+                    self._mongo_query = {"$and": [self._cls_query, self._mongo_query]}
                 else:
-                    self._mongo_query.update(self._initial_query)
+                    self._mongo_query.update(self._cls_query)
         return self._mongo_query
 
     @property
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 21f350123..9dc68f2e5 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -4588,6 +4588,44 @@ class MyDoc(Document):
         doc.save()
         self.assertEqual(MyDoc.objects.only("test__47").get().test["47"], 1)
 
+    def test_clear_cls_query(self):
+        class Parent(Document):
+            name = StringField()
+            meta = {"allow_inheritance": True}
+
+        class Child(Parent):
+            age = IntField()
+
+        Parent.drop_collection()
+
+        # Default query includes the "_cls" check.
+        self.assertEqual(
+            Parent.objects._query, {"_cls": {"$in": ("Parent", "Parent.Child")}}
+        )
+
+        # Clearing the "_cls" query should work.
+        self.assertEqual(Parent.objects.clear_cls_query()._query, {})
+
+        # Clearing the "_cls" query should not persist across queryset instances.
+        self.assertEqual(
+            Parent.objects._query, {"_cls": {"$in": ("Parent", "Parent.Child")}}
+        )
+
+        # The rest of the query should not be cleared.
+        self.assertEqual(
+            Parent.objects.filter(name="xyz").clear_cls_query()._query, {"name": "xyz"}
+        )
+
+        Parent.objects.create(name="foo")
+        Child.objects.create(name="bar", age=1)
+        self.assertEqual(Parent.objects.clear_cls_query().count(), 2)
+        self.assertEqual(Parent.objects.count(), 2)
+        self.assertEqual(Child.objects().count(), 1)
+
+        # XXX This isn't really how you'd want to use `clear_cls_query()`, but
+        # it's a decent test to validate its behavior nonetheless.
+        self.assertEqual(Child.objects.clear_cls_query().count(), 2)
+
     def test_read_preference(self):
         class Bar(Document):
             txt = StringField()
@@ -4595,40 +4633,35 @@ class Bar(Document):
             meta = {"indexes": ["txt"]}
 
         Bar.drop_collection()
-        bars = list(Bar.objects(read_preference=ReadPreference.PRIMARY))
-        self.assertEqual([], bars)
+        bar = Bar.objects.create(txt="xyz")
 
-        self.assertRaises(TypeError, Bar.objects, read_preference="Primary")
+        bars = list(Bar.objects.read_preference(ReadPreference.PRIMARY))
+        self.assertEqual(bars, [bar])
 
-        # read_preference as a kwarg
-        bars = Bar.objects(read_preference=ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
-        )
-
-        # read_preference as a query set method
         bars = Bar.objects.read_preference(ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(
             bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
         )
 
-        # read_preference after skip
+        # Make sure that `.read_preference(...)` does accept string values.
+        self.assertRaises(TypeError, Bar.objects.read_preference, "Primary")
+
+        # Make sure read preference is respected after a `.skip(...)`.
         bars = Bar.objects.skip(1).read_preference(ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(
             bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
         )
 
-        # read_preference after limit
+        # Make sure read preference is respected after a `.limit(...)`.
         bars = Bar.objects.limit(1).read_preference(ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(
             bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
         )
 
-        # read_preference after order_by
+        # Make sure read preference is respected after an `.order_by(...)`.
         bars = Bar.objects.order_by("txt").read_preference(
             ReadPreference.SECONDARY_PREFERRED
         )
@@ -4637,7 +4670,7 @@ class Bar(Document):
             bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
         )
 
-        # read_preference after hint
+        # Make sure read preference is respected after a `.hint(...)`.
         bars = Bar.objects.hint([("txt", 1)]).read_preference(
             ReadPreference.SECONDARY_PREFERRED
         )

From 8fdf6649683a32702c1c1af0a82925fe55aacd20 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 3 Jul 2019 11:08:51 +0200
Subject: [PATCH 0900/1519] Changelog tweaks [ci skip]

---
 docs/changelog.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6512c1d3f..4e2aaa669 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,8 +10,8 @@ Development
   - Instead of `Doc.objects(foo=bar, read_preference=...)` use `Doc.objects(foo=bar).read_preference(...)`.
   - Instead of `Doc.objects(foo=bar, class_check=False)` use `Doc.objects(foo=bar).clear_cls_query(...)`.
   - This change also renames the private `QuerySet._initial_query` attribute to `_cls_query`.
-- BREAKING CHANGE: Removed the deprecated `format` param from `QuerySet.explain` #2113
-- BREAKING CHANGE: Renamed `MongoEngineConnectionError` to `ConnectionFailure` #2111
+- BREAKING CHANGE: Removed the deprecated `format` param from `QuerySet.explain`. #2113
+- BREAKING CHANGE: Renamed `MongoEngineConnectionError` to `ConnectionFailure`. #2111
   - If you catch/use `MongoEngineConnectionError` in your code, you'll have to rename it.
 - BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
   - From now on keyword arguments (e.g. `Doc(field_name=value)`) are required.
@@ -20,7 +20,7 @@ Development
 
 Changes in 0.18.2
 =================
-- Replace deprecated PyMongo v2.x methods with their v3.x equivalents in the `SequenceField` #2097
+- Replace deprecated PyMongo v2.x methods with their v3.x equivalents in the `SequenceField`. #2097
 - Various code clarity and documentation improvements.
 
 Changes in 0.18.1

From 058203a0ec0c73c20e9df7953f6659be550edd8c Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Wed, 3 Jul 2019 11:12:25 +0200
Subject: [PATCH 0901/1519] More changelog tweaks [ci skip]

The main change is that we're now using double backticks (``), which are the
correct way to format code in an RST file.
---
 docs/changelog.rst | 285 ++++++++++++++++++++++-----------------------
 1 file changed, 141 insertions(+), 144 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4e2aaa669..ecdbf381e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,211 +6,211 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- BREAKING CHANGE: `class_check` and `read_preference` keyword arguments are no longer available when filtering a `QuerySet`. #2112
-  - Instead of `Doc.objects(foo=bar, read_preference=...)` use `Doc.objects(foo=bar).read_preference(...)`.
-  - Instead of `Doc.objects(foo=bar, class_check=False)` use `Doc.objects(foo=bar).clear_cls_query(...)`.
-  - This change also renames the private `QuerySet._initial_query` attribute to `_cls_query`.
-- BREAKING CHANGE: Removed the deprecated `format` param from `QuerySet.explain`. #2113
-- BREAKING CHANGE: Renamed `MongoEngineConnectionError` to `ConnectionFailure`. #2111
-  - If you catch/use `MongoEngineConnectionError` in your code, you'll have to rename it.
+- BREAKING CHANGE: ``class_check`` and ``read_preference`` keyword arguments are no longer available when filtering a ``QuerySet``. #2112
+  - Instead of ``Doc.objects(foo=bar, read_preference=...)`` use ``Doc.objects(foo=bar).read_preference(...)``.
+  - Instead of ``Doc.objects(foo=bar, class_check=False)`` use ``Doc.objects(foo=bar).clear_cls_query(...)``.
+  - This change also renames the private ``QuerySet._initial_query`` attribute to ``_cls_query``.
+- BREAKING CHANGE: Removed the deprecated ``format`` param from ``QuerySet.explain``. #2113
+- BREAKING CHANGE: Renamed ``MongoEngineConnectionError`` to ``ConnectionFailure``. #2111
+  - If you catch/use ``MongoEngineConnectionError`` in your code, you'll have to rename it.
 - BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
-  - From now on keyword arguments (e.g. `Doc(field_name=value)`) are required.
-- The codebase is now formatted using `black`. #2109
-- `ListField` now accepts an optional `max_length` parameter. #2110
+  - From now on keyword arguments (e.g. ``Doc(field_name=value)``) are required.
+- The codebase is now formatted using ``black``. #2109
+- ``ListField`` now accepts an optional ``max_length`` parameter. #2110
 
 Changes in 0.18.2
 =================
-- Replace deprecated PyMongo v2.x methods with their v3.x equivalents in the `SequenceField`. #2097
+- Replace deprecated PyMongo v2.x methods with their v3.x equivalents in the ``SequenceField``. #2097
 - Various code clarity and documentation improvements.
 
 Changes in 0.18.1
 =================
-- Fix a bug introduced in 0.18.0 which was causing `.save()` to update all the fields instead of updating only the modified fields. This bug only occurred when using a custom PK. #2082
+- Fix a bug introduced in 0.18.0 which was causing ``Document.save`` to update all the fields instead of updating only the modified fields. This bug only occurred when using a custom PK. #2082
 - Add Python 3.7 to Travis CI. #2058
 
 Changes in 0.18.0
 =================
 - Drop support for EOL'd MongoDB v2.6, v3.0, and v3.2.
 - MongoEngine now requires PyMongo >= v3.4. Travis CI now tests against MongoDB v3.4 – v3.6 and PyMongo v3.4 – v3.6. #2017 #2066
-- Improve performance by avoiding a call to `to_mongo` in `Document.save()`. #2049
+- Improve performance by avoiding a call to ``to_mongo`` in ``Document.save``. #2049
 - Connection/disconnection improvements:
-    - Expose `mongoengine.connection.disconnect` and `mongoengine.connection.disconnect_all`.
+    - Expose ``mongoengine.connection.disconnect`` and ``mongoengine.connection.disconnect_all``.
     - Fix disconnecting. #566 #1599 #605 #607 #1213 #565
-    - Improve documentation of `connect`/`disconnect`.
+    - Improve documentation of ``connect``/``disconnect``.
     - Fix issue when using multiple connections to the same mongo with different credentials. #2047
-    - `connect` fails immediately when db name contains invalid characters. #2031 #1718
-- Fix the default write concern of `Document.save` that was overwriting the connection write concern. #568
-- Fix querying on `List(EmbeddedDocument)` subclasses fields. #1961 #1492
-- Fix querying on `(Generic)EmbeddedDocument` subclasses fields. #475
-- Fix `QuerySet.aggregate` so that it takes limit and skip value into account. #2029
-- Generate unique indices for `SortedListField` and `EmbeddedDocumentListFields`. #2020
-- BREAKING CHANGE: Changed the behavior of a custom field validator (i.e `validation` parameter of a `Field`). It is now expected to raise a `ValidationError` instead of returning `True`/`False`. #2050
+    - ``connect`` fails immediately when db name contains invalid characters. #2031 #1718
+- Fix the default write concern of ``Document.save`` that was overwriting the connection write concern. #568
+- Fix querying on ``List(EmbeddedDocument)`` subclasses fields. #1961 #1492
+- Fix querying on ``(Generic)EmbeddedDocument`` subclasses fields. #475
+- Fix ``QuerySet.aggregate`` so that it takes limit and skip value into account. #2029
+- Generate unique indices for ``SortedListField`` and ``EmbeddedDocumentListFields``. #2020
+- BREAKING CHANGE: Changed the behavior of a custom field validator (i.e ``validation`` parameter of a ``Field``). It is now expected to raise a ``ValidationError`` instead of returning ``True``/``False``. #2050
 - BREAKING CHANGES (associated with connection/disconnection fixes):
-    - Calling `connect` 2 times with the same alias and different parameter will raise an error (should call `disconnect` first).
-    - `disconnect` now clears `mongoengine.connection._connection_settings`.
-    - `disconnect` now clears the cached attribute `Document._collection`.
-- BREAKING CHANGE: `EmbeddedDocument.save` & `.reload` no longer exist. #1552
+    - Calling ``connect`` 2 times with the same alias and different parameter will raise an error (should call ``disconnect`` first).
+    - ``disconnect`` now clears ``mongoengine.connection._connection_settings``.
+    - ``disconnect`` now clears the cached attribute ``Document._collection``.
+- BREAKING CHANGE: ``EmbeddedDocument.save`` & ``.reload`` no longer exist. #1552
 
 Changes in 0.17.0
 =================
-- POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (`_cls`, `_id`) when using `QuerySet.as_pymongo`. #1976
+- POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (``_cls``, ``_id``) when using ``QuerySet.as_pymongo``. #1976
 - Document a BREAKING CHANGE introduced in 0.15.3 and not reported at that time. #1995
-- DEPRECATION: `EmbeddedDocument.save` & `.reload` are marked as deprecated and will be removed in a next version of MongoEngine. #1552
-- Fix `.only()` working improperly after using `.count()` of the same instance of a `QuerySet`.
-- Fix `batch_size` that was not copied when cloning a `QuerySet` object. #2011
-- Fix `InvalidStringData` error when using `modify` on a `BinaryField`. #1127
+- DEPRECATION: ``EmbeddedDocument.save`` & ``.reload`` are marked as deprecated and will be removed in a next version of MongoEngine. #1552
+- Fix ``QuerySet.only`` working improperly after using ``QuerySet.count`` of the same instance of a ``QuerySet``.
+- Fix ``batch_size`` that was not copied when cloning a ``QuerySet`` object. #2011
+- Fix ``InvalidStringData`` error when using ``modify`` on a ``BinaryField``. #1127
 - Fix test suite and CI to support MongoDB v3.4. #1445
 - Fix reference fields querying the database on each access if value contains orphan DBRefs.
 
 =================
 Changes in 0.16.3
 =================
-- Fix `$push` with the `$position` operator not working with lists in embedded documents. #1965
+- Fix ``$push`` with the ``$position`` operator not working with lists in embedded documents. #1965
 
 =================
 Changes in 0.16.2
 =================
-- Fix `.save()` that fails when called with `write_concern=None` (regression of 0.16.1). #1958
+- Fix ``Document.save`` that fails when called with ``write_concern=None`` (regression of 0.16.1). #1958
 
 =================
 Changes in 0.16.1
 =================
-- Fix `_cls` that is not set properly in the `Document` constructor (regression). #1950
-- Fix a bug in the `_delta` method - update of a `ListField` depends on an unrelated dynamic field update. #1733
-- Remove PyMongo's deprecated `save()` method and use `insert_one()` instead. #1899
+- Fix ``_cls`` that is not set properly in the ``Document`` constructor (regression). #1950
+- Fix a bug in the ``_delta`` method - update of a ``ListField`` depends on an unrelated dynamic field update. #1733
+- Remove PyMongo's deprecated ``Collection.save`` method and use ``Collection.insert_one`` instead. #1899
 
 =================
 Changes in 0.16.0
 =================
 - POTENTIAL BREAKING CHANGES:
-    - `EmbeddedDocumentField` will no longer accept references to Document classes in its constructor. #1661
-    - Get rid of the `basecls` parameter from the `DictField` constructor (dead code). #1876
-    - Default value of the `ComplexDateTime` field is now `None` (and no longer the current datetime). #1368
-- Fix an unhashable `TypeError` when referencing a `Document` with a compound key in an `EmbeddedDocument`. #1685
-- Fix a bug where an `EmbeddedDocument` with the same id as its parent would not be tracked for changes. #1768
-- Fix the fact that a bulk `QuerySet.insert` was not setting primary keys of inserted document instances. #1919
-- Fix a bug when referencing an abstract class in a `ReferenceField`. #1920
-- Allow modifications to the document made in `pre_save_post_validation` to be taken into account. #1202
+    - ``EmbeddedDocumentField`` will no longer accept references to Document classes in its constructor. #1661
+    - Get rid of the ``basecls`` parameter from the ``DictField`` constructor (dead code). #1876
+    - Default value of the ``ComplexDateTime`` field is now ``None`` (and no longer the current datetime). #1368
+- Fix an unhashable ``TypeError`` when referencing a ``Document`` with a compound key in an ``EmbeddedDocument``. #1685
+- Fix a bug where an ``EmbeddedDocument`` with the same id as its parent would not be tracked for changes. #1768
+- Fix the fact that a bulk ``QuerySet.insert`` was not setting primary keys of inserted document instances. #1919
+- Fix a bug when referencing an abstract class in a ``ReferenceField``. #1920
+- Allow modifications to the document made in ``pre_save_post_validation`` to be taken into account. #1202
 - Replace MongoDB v2.4 tests in Travis CI with MongoDB v3.2. #1903
-- Fix side effects of using `QuerySet.no_dereference` on other documents. #1677
-- Fix `TypeError` when using lazy Django translation objects as translated choices. #1879
+- Fix side effects of using ``QuerySet.no_dereference`` on other documents. #1677
+- Fix ``TypeError`` when using lazy Django translation objects as translated choices. #1879
 - Improve Python 2-3 codebase compatibility. #1889
-- Fix support for changing the default value of the `ComplexDateTime` field. #1368
-- Improve error message in case an `EmbeddedDocumentListField` receives an `EmbeddedDocument` instance instead of a list. #1877
-- Fix the `inc` and `dec` operators for the `DecimalField`. #1517 #1320
-- Ignore `killcursors` queries in `query_counter` context manager. #1869
-- Fix the fact that `query_counter` was modifying the initial profiling level in case it was != 0. #1870
-- Repair the `no_sub_classes` context manager + fix the fact that it was swallowing exceptions. #1865
-- Fix index creation error that was swallowed by `hasattr` under Python 2. #1688
-- `QuerySet.limit` function behaviour: Passing 0 as parameter will return all the documents in the cursor. #1611
+- Fix support for changing the default value of the ``ComplexDateTime`` field. #1368
+- Improve error message in case an ``EmbeddedDocumentListField`` receives an ``EmbeddedDocument`` instance instead of a list. #1877
+- Fix the ``inc`` and ``dec`` operators for the ``DecimalField``. #1517 #1320
+- Ignore ``killcursors`` queries in ``query_counter`` context manager. #1869
+- Fix the fact that ``query_counter`` was modifying the initial profiling level in case it was != 0. #1870
+- Repair the ``no_sub_classes`` context manager + fix the fact that it was swallowing exceptions. #1865
+- Fix index creation error that was swallowed by ``hasattr`` under Python 2. #1688
+- ``QuerySet.limit`` function behaviour: Passing 0 as parameter will return all the documents in the cursor. #1611
 - Bulk insert updates the IDs of the input documents instances. #1919
-- Fix a harmless bug related to `GenericReferenceField` where modifications in the generic-referenced document were tracked in the parent. #1934
-- Improve validation of the `BinaryField`. #273
-- Implement lazy regex compiling in Field classes to improve `import mongoengine` performance. #1806
-- Update `GridFSProxy.__str__`  so that it would always print both the filename and grid_id. #710
-- Add `__repr__` to `Q` and `QCombination` classes. #1843
-- Fix bug in the `BaseList.__iter__` operator (was occuring when modifying a BaseList while iterating over it). #1676
-- Add a `DateField`. #513
+- Fix a harmless bug related to ``GenericReferenceField`` where modifications in the generic-referenced document were tracked in the parent. #1934
+- Improve validation of the ``BinaryField``. #273
+- Implement lazy regex compiling in Field classes to improve ``import mongoengine`` performance. #1806
+- Update ``GridFSProxy.__str__``  so that it would always print both the filename and grid_id. #710
+- Add ``__repr__`` to ``Q`` and ``QCombination`` classes. #1843
+- Fix bug in the ``BaseList.__iter__`` operator (was occuring when modifying a BaseList while iterating over it). #1676
+- Add a ``DateField``. #513
 - Various improvements to the documentation.
 - Various code quality improvements.
 
 Changes in 0.15.3
 =================
-- `Queryset.update/update_one` methods now return an `UpdateResult` when `full_result=True` is provided and no longer a dict. #1491
-- Improve `LazyReferenceField` and `GenericLazyReferenceField` with nested fields. #1704
-- Fix the subfield resolve error in `generic_emdedded_document` query. #1651 #1652
-- Use each modifier only with `$position`. #1673 #1675
-- Fix validation errors in the `GenericEmbeddedDocumentField`. #1067
-- Update cached fields when a `fields` argument is given. #1712
-- Add a `db` parameter to `register_connection` for compatibility with `connect`.
-- Use PyMongo v3.x's `insert_one` and `insert_many` in `Document.insert`. #1491
-- Use PyMongo v3.x's `update_one` and `update_many` in `Document.update` and `QuerySet.update`. #1491
-- Fix how `reload(fields)` affects changed fields. #1371
+- ``Queryset.update/update_one`` methods now return an ``UpdateResult`` when ``full_result=True`` is provided and no longer a dict. #1491
+- Improve ``LazyReferenceField`` and ``GenericLazyReferenceField`` with nested fields. #1704
+- Fix the subfield resolve error in ``generic_emdedded_document`` query. #1651 #1652
+- Use each modifier only with ``$position``. #1673 #1675
+- Fix validation errors in the ``GenericEmbeddedDocumentField``. #1067
+- Update cached fields when a ``fields`` argument is given. #1712
+- Add a ``db`` parameter to ``register_connection`` for compatibility with ``connect``.
+- Use PyMongo v3.x's ``insert_one`` and ``insert_many`` in ``Document.insert``. #1491
+- Use PyMongo v3.x's ``update_one`` and ``update_many`` in ``Document.update`` and ``QuerySet.update``. #1491
+- Fix how ``reload(fields)`` affects changed fields. #1371
 - Fix a bug where the read-only access to the database fails when trying to create indexes. #1338
 
 Changes in 0.15.0
 =================
-- Add `LazyReferenceField` and `GenericLazyReferenceField`. #1230
+- Add ``LazyReferenceField`` and ``GenericLazyReferenceField``. #1230
 
 Changes in 0.14.1
 =================
-- Remove `SemiStrictDict` and start using a regular dict for `BaseDocument._data`. #1630
-- Add support for the `$position` param in the `$push` operator. #1566
-- Fix `DateTimeField` interpreting an empty string as today. #1533
-- Add a missing `__ne__` method to the `GridFSProxy` class. #1632
-- Fix `BaseQuerySet._fields_to_db_fields`. #1553
+- Remove ``SemiStrictDict`` and start using a regular dict for ``BaseDocument._data``. #1630
+- Add support for the ``$position`` param in the ``$push`` operator. #1566
+- Fix ``DateTimeField`` interpreting an empty string as today. #1533
+- Add a missing ``__ne__`` method to the ``GridFSProxy`` class. #1632
+- Fix ``BaseQuerySet._fields_to_db_fields``. #1553
 
 Changes in 0.14.0
 =================
-- BREAKING CHANGE: Remove the `coerce_types` param from `QuerySet.as_pymongo`. #1549
-- POTENTIAL BREAKING CHANGE: Make `EmbeddedDocument` not hashable by default. #1528
+- BREAKING CHANGE: Remove the ``coerce_types`` param from ``QuerySet.as_pymongo``. #1549
+- POTENTIAL BREAKING CHANGE: Make ``EmbeddedDocument`` not hashable by default. #1528
 - Improve code quality. #1531, #1540, #1541, #1547
 
 Changes in 0.13.0
 =================
-- POTENTIAL BREAKING CHANGE: Added Unicode support to the `EmailField`, see docs/upgrade.rst for details.
+- POTENTIAL BREAKING CHANGE: Added Unicode support to the ``EmailField``, see docs/upgrade.rst for details.
 
 Changes in 0.12.0
 =================
-- POTENTIAL BREAKING CHANGE: Fix `limit`/`skip`/`hint`/`batch_size` chaining. #1476
-- POTENTIAL BREAKING CHANGE: Change a public `QuerySet.clone_into` method to a private `QuerySet._clone_into`. #1476
-- Fix the way `Document.objects.create` works with duplicate IDs. #1485
+- POTENTIAL BREAKING CHANGE: Fix ``limit``/``skip``/``hint``/``batch_size`` chaining. #1476
+- POTENTIAL BREAKING CHANGE: Change a public ``QuerySet.clone_into`` method to a private ``QuerySet._clone_into``. #1476
+- Fix the way ``Document.objects.create`` works with duplicate IDs. #1485
 - Fix connecting to a replica set with PyMongo 2.x. #1436
 - Fix using sets in field choices. #1481
-- Fix deleting items from a `ListField`. #1318
-- Fix an obscure error message when filtering by `field__in=non_iterable`. #1237
-- Fix behavior of a `dec` update operator. #1450
-- Add a `rename` update operator. #1454
-- Add validation for the `db_field` parameter. #1448
-- Fix the error message displayed when querying an `EmbeddedDocumentField` by an invalid value. #1440
+- Fix deleting items from a ``ListField``. #1318
+- Fix an obscure error message when filtering by ``field__in=non_iterable``. #1237
+- Fix behavior of a ``dec`` update operator. #1450
+- Add a ``rename`` update operator. #1454
+- Add validation for the ``db_field`` parameter. #1448
+- Fix the error message displayed when querying an ``EmbeddedDocumentField`` by an invalid value. #1440
 - Fix the error message displayed when validating Unicode URLs. #1486
 - Raise an error when trying to save an abstract document. #1449
 
 Changes in 0.11.0
 =================
-- BREAKING CHANGE: Rename `ConnectionError` to `MongoEngineConnectionError` since the former is a built-in exception name in Python v3.x. #1428
+- BREAKING CHANGE: Rename ``ConnectionError`` to ``MongoEngineConnectionError`` since the former is a built-in exception name in Python v3.x. #1428
 - BREAKING CHANGE: Drop Python v2.6 support. #1428
-- BREAKING CHANGE: `from mongoengine.base import ErrorClass` won't work anymore for any error from `mongoengine.errors` (e.g. `ValidationError`). Use `from mongoengine.errors import ErrorClass instead`. #1428
-- BREAKING CHANGE: Accessing a broken reference will raise a `DoesNotExist` error. In the past it used to return `None`. #1334
-- Fix absent rounding for the `DecimalField` when `force_string` is set. #1103
+- BREAKING CHANGE: ``from mongoengine.base import ErrorClass`` won't work anymore for any error from ``mongoengine.errors`` (e.g. ``ValidationError``). Use ``from mongoengine.errors import ErrorClass instead``. #1428
+- BREAKING CHANGE: Accessing a broken reference will raise a ``DoesNotExist`` error. In the past it used to return ``None``. #1334
+- Fix absent rounding for the ``DecimalField`` when ``force_string`` is set. #1103
 
 Changes in 0.10.8
 =================
-- Add support for `QuerySet.batch_size`. (#1426)
+- Add support for ``QuerySet.batch_size``. (#1426)
 - Fix a query set iteration within an iteration. #1427
 - Fix an issue where specifying a MongoDB URI host would override more information than it should. #1421
-- Add an ability to filter the `GenericReferenceField` by an `ObjectId` and a `DBRef`. #1425
+- Add an ability to filter the ``GenericReferenceField`` by an ``ObjectId`` and a ``DBRef``. #1425
 - Fix cascading deletes for models with a custom primary key field. #1247
 - Add ability to specify an authentication mechanism (e.g. X.509). #1333
-- Add support for falsy primary keys (e.g. `doc.pk = 0`). #1354
-- Fix `QuerySet.sum/average` for fields w/ an explicit `db_field`. #1417
-- Fix filtering by `embedded_doc=None`. #1422
-- Add support for `Cursor.comment`. #1420
-- Fix `doc.get_<field>_display` methods. #1419
-- Fix the `__repr__` method of the `StrictDict` #1424
+- Add support for falsy primary keys (e.g. ``doc.pk = 0``). #1354
+- Fix ``QuerySet.sum/average`` for fields w/ an explicit ``db_field``. #1417
+- Fix filtering by ``embedded_doc=None``. #1422
+- Add support for ``Cursor.comment``. #1420
+- Fix ``doc.get_<field>_display`` methods. #1419
+- Fix the ``__repr__`` method of the ``StrictDict`` #1424
 - Add a deprecation warning for Python v2.6.
 
 Changes in 0.10.7
 =================
 - Drop Python 3.2 support #1390
 - Fix a bug where a dynamic doc has an index inside a dict field. #1278
-- Fix: `ListField` minus index assignment does not work. #1128
+- Fix: ``ListField`` minus index assignment does not work. #1128
 - Fix cascade delete mixing among collections. #1224
-- Add `signal_kwargs` argument to `Document.save`, `Document.delete` and `BaseQuerySet.insert` to be passed to signals calls. #1206
-- Raise `OperationError` when trying to do a `drop_collection` on document with no collection set.
-- Fix a bug where a count on `ListField` of `EmbeddedDocumentField` fails. #1187
-- Fix `LongField` values stored as int32 in Python 3. #1253
-- `MapField` now handles unicode keys correctly. #1267
-- `ListField` now handles negative indicies correctly. #1270
-- Fix an `AttributeError` when initializing an `EmbeddedDocument` with positional args. #681
-- Fix a `no_cursor_timeout` error with PyMongo v3.x. #1304
-- Replace map-reduce based `QuerySet.sum/average` with aggregation-based implementations. #1336
-- Fix support for `__` to escape field names that match operators' names in `update`. #1351
-- Fix `BaseDocument._mark_as_changed`. #1369
-- Add support for pickling `QuerySet` instances. #1397
+- Add ``signal_kwargs`` argument to ``Document.save``, ``Document.delete`` and ``BaseQuerySet.insert`` to be passed to signals calls. #1206
+- Raise ``OperationError`` when trying to do a ``drop_collection`` on document with no collection set.
+- Fix a bug where a count on ``ListField`` of ``EmbeddedDocumentField`` fails. #1187
+- Fix ``LongField`` values stored as int32 in Python 3. #1253
+- ``MapField`` now handles unicode keys correctly. #1267
+- ``ListField`` now handles negative indicies correctly. #1270
+- Fix an ``AttributeError`` when initializing an ``EmbeddedDocument`` with positional args. #681
+- Fix a ``no_cursor_timeout`` error with PyMongo v3.x. #1304
+- Replace map-reduce based ``QuerySet.sum/average`` with aggregation-based implementations. #1336
+- Fix support for ``__`` to escape field names that match operators' names in ``update``. #1351
+- Fix ``BaseDocument._mark_as_changed``. #1369
+- Add support for pickling ``QuerySet`` instances. #1397
 - Fix connecting to a list of hosts. #1389
-- Fix a bug where accessing broken references wouldn't raise a `DoesNotExist` error. #1334
-- Fix not being able to specify `use_db_field=False` on `ListField(EmbeddedDocumentField)` instances. #1218
+- Fix a bug where accessing broken references wouldn't raise a ``DoesNotExist`` error. #1334
+- Fix not being able to specify ``use_db_field=False`` on ``ListField(EmbeddedDocumentField)`` instances. #1218
 - Improvements to the dictionary field's docs. #1383
 
 Changes in 0.10.6
@@ -225,12 +225,12 @@ Changes in 0.10.5
 
 Changes in 0.10.4
 =================
-- `SaveConditionError` is now importable from the top level package. #1165
-- Add a `QuerySet.upsert_one` method. #1157
+- ``SaveConditionError`` is now importable from the top level package. #1165
+- Add a ``QuerySet.upsert_one`` method. #1157
 
 Changes in 0.10.3
 =================
-- Fix `read_preference` (it had chaining issues with PyMongo v2.x and it didn't work at all with PyMongo v3.x). #1042
+- Fix ``read_preference`` (it had chaining issues with PyMongo v2.x and it didn't work at all with PyMongo v3.x). #1042
 
 Changes in 0.10.2
 =================
@@ -241,15 +241,15 @@ Changes in 0.10.2
 Changes in 0.10.1
 =================
 - Fix infinite recursion with cascade delete rules under specific conditions. #1046
-- Fix `CachedReferenceField` bug when loading cached docs as `DBRef` but failing to save them. #1047
+- Fix ``CachedReferenceField`` bug when loading cached docs as ``DBRef`` but failing to save them. #1047
 - Fix ignored chained options. #842
-- `Document.save`'s `save_condition` error raises a `SaveConditionError` exception. #1070
-- Fix `Document.reload` for the `DynamicDocument`. #1050
-- `StrictDict` & `SemiStrictDict` are shadowed at init time. #1105
-- Fix `ListField` negative index assignment not working. #1119
+- ``Document.save``'s ``save_condition`` error raises a ``SaveConditionError`` exception. #1070
+- Fix ``Document.reload`` for the ``DynamicDocument``. #1050
+- ``StrictDict`` & ``SemiStrictDict`` are shadowed at init time. #1105
+- Fix ``ListField`` negative index assignment not working. #1119
 - Remove code that marks a field as changed when the field has a default value but does not exist in the database. #1126
 - Remove test dependencies (nose and rednose) from install dependencies. #1079
-- Recursively build a query when using the `elemMatch` operator. #1130
+- Recursively build a query when using the ``elemMatch`` operator. #1130
 - Fix instance back references for lists of embedded documents. #1131
 
 Changes in 0.10.0
@@ -260,7 +260,7 @@ Changes in 0.10.0
 - Removed get_or_create() deprecated since 0.8.0. #300
 - Improve Document._created status when switch collection and db #1020
 - Queryset update doesn't go through field validation #453
-- Added support for specifying authentication source as option `authSource` in URI. #967
+- Added support for specifying authentication source as option ``authSource`` in URI. #967
 - Fixed mark_as_changed to handle higher/lower level fields changed. #927
 - ListField of embedded docs doesn't set the _instance attribute when iterating over it #914
 - Support += and *= for ListField #595
@@ -276,7 +276,7 @@ Changes in 0.10.0
 - Fixes some internal _id handling issue. #961
 - Updated URL and Email Field regex validators, added schemes argument to URLField validation. #652
 - Capped collection multiple of 256. #1011
-- Added `BaseQuerySet.aggregate_sum` and `BaseQuerySet.aggregate_average` methods.
+- Added ``BaseQuerySet.aggregate_sum`` and ``BaseQuerySet.aggregate_average`` methods.
 - Fix for delete with write_concern {'w': 0}. #1008
 - Allow dynamic lookup for more than two parts. #882
 - Added support for min_distance on geo queries. #831
@@ -285,10 +285,10 @@ Changes in 0.10.0
 Changes in 0.9.0
 ================
 - Update FileField when creating a new file #714
-- Added `EmbeddedDocumentListField` for Lists of Embedded Documents. #826
+- Added ``EmbeddedDocumentListField`` for Lists of Embedded Documents. #826
 - ComplexDateTimeField should fall back to None when null=True #864
 - Request Support for $min, $max Field update operators #863
-- `BaseDict` does not follow `setdefault` #866
+- ``BaseDict`` does not follow ``setdefault`` #866
 - Add support for $type operator # 766
 - Fix tests for pymongo 2.8+ #877
 - No module named 'django.utils.importlib' (Django dev) #872
@@ -309,13 +309,13 @@ Changes in 0.9.0
 - Stop ensure_indexes running on a secondaries unless connection is through mongos #746
 - Not overriding default values when loading a subset of fields #399
 - Saving document doesn't create new fields in existing collection #620
-- Added `Queryset.aggregate` wrapper to aggregation framework #703
+- Added ``Queryset.aggregate`` wrapper to aggregation framework #703
 - Added support to show original model fields on to_json calls instead of db_field #697
 - Added Queryset.search_text to Text indexes searchs #700
 - Fixed tests for Django 1.7 #696
 - Follow ReferenceFields in EmbeddedDocuments with select_related #690
 - Added preliminary support for text indexes #680
-- Added `elemMatch` operator as well - `match` is too obscure #653
+- Added ``elemMatch`` operator as well - ``match`` is too obscure #653
 - Added support for progressive JPEG #486 #548
 - Allow strings to be used in index creation #675
 - Fixed EmbeddedDoc weakref proxy issue #592
@@ -351,11 +351,11 @@ Changes in 0.9.0
 - Increase email field length to accommodate new TLDs #726
 - index_cls is ignored when deciding to set _cls as index prefix #733
 - Make 'db' argument to connection optional #737
-- Allow atomic update for the entire `DictField` #742
+- Allow atomic update for the entire ``DictField`` #742
 - Added MultiPointField, MultiLineField, MultiPolygonField
 - Fix multiple connections aliases being rewritten #748
 - Fixed a few instances where reverse_delete_rule was written as reverse_delete_rules. #791
-- Make `in_bulk()` respect `no_dereference()` #775
+- Make ``in_bulk()`` respect ``no_dereference()`` #775
 - Handle None from model __str__; Fixes #753 #754
 - _get_changed_fields fix for embedded documents with id field. #925
 
@@ -409,18 +409,18 @@ Changes in 0.8.4
 
 Changes in 0.8.3
 ================
-- Fixed EmbeddedDocuments with `id` also storing `_id` (#402)
+- Fixed EmbeddedDocuments with ``id`` also storing ``_id`` (#402)
 - Added get_proxy_object helper to filefields (#391)
 - Added QuerySetNoCache and QuerySet.no_cache() for lower memory consumption (#365)
 - Fixed sum and average mapreduce dot notation support (#375, #376, #393)
 - Fixed as_pymongo to return the id (#386)
-- Document.select_related() now respects `db_alias` (#377)
+- Document.select_related() now respects ``db_alias`` (#377)
 - Reload uses shard_key if applicable (#384)
 - Dynamic fields are ordered based on creation and stored in _fields_ordered (#396)
 
   **Potential breaking change:** http://docs.mongoengine.org/en/latest/upgrade.html#to-0-8-3
 
-- Fixed pickling dynamic documents `_dynamic_fields` (#387)
+- Fixed pickling dynamic documents ``_dynamic_fields`` (#387)
 - Fixed ListField setslice and delslice dirty tracking (#390)
 - Added Django 1.5 PY3 support (#392)
 - Added match ($elemMatch) support for EmbeddedDocuments (#379)
@@ -461,7 +461,7 @@ Changes in 0.8.0
 ================
 - Fixed querying ReferenceField custom_id (#317)
 - Fixed pickle issues with collections (#316)
-- Added `get_next_value` preview for SequenceFields (#319)
+- Added ``get_next_value`` preview for SequenceFields (#319)
 - Added no_sub_classes context manager and queryset helper (#312)
 - Querysets now utilises a local cache
 - Changed __len__ behaviour in the queryset (#247, #311)
@@ -490,7 +490,7 @@ Changes in 0.8.0
 - Updated connection to use MongoClient (#262, #274)
 - Fixed db_alias and inherited Documents (#143)
 - Documentation update for document errors (#124)
-- Deprecated `get_or_create` (#35)
+- Deprecated ``get_or_create`` (#35)
 - Updated inheritable objects created by upsert now contain _cls (#118)
 - Added support for creating documents with embedded documents in a single operation (#6)
 - Added to_json and from_json to Document (#1)
@@ -611,7 +611,7 @@ Changes in 0.7.0
 - Fixed UnboundLocalError in composite index with pk field (#88)
 - Updated ReferenceField's to optionally store ObjectId strings
   this will become the default in 0.8 (#89)
-- Added FutureWarning - save will default to `cascade=False` in 0.8
+- Added FutureWarning - save will default to ``cascade=False`` in 0.8
 - Added example of indexing embedded document fields (#75)
 - Fixed ImageField resizing when forcing size (#80)
 - Add flexibility for fields handling bad data (#78)
@@ -707,7 +707,7 @@ Changes in 0.6.8
 ================
 - Fixed FileField losing reference when no default set
 - Removed possible race condition from FileField (grid_file)
-- Added assignment to save, can now do: `b = MyDoc(**kwargs).save()`
+- Added assignment to save, can now do: ``b = MyDoc(**kwargs).save()``
 - Added support for pull operations on nested EmbeddedDocuments
 - Added support for choices with GenericReferenceFields
 - Added support for choices with GenericEmbeddedDocumentFields
@@ -722,7 +722,7 @@ Changes in 0.6.7
 - Fixed indexing on '_id' or 'pk' or 'id'
 - Invalid data from the DB now raises a InvalidDocumentError
 - Cleaned up the Validation Error - docs and code
-- Added meta `auto_create_index` so you can disable index creation
+- Added meta ``auto_create_index`` so you can disable index creation
 - Added write concern options to inserts
 - Fixed typo in meta for index options
 - Bug fix Read preference now passed correctly
@@ -763,7 +763,6 @@ Changes in 0.6.1
 
 Changes in 0.6
 ==============
-
 - Added FutureWarning to inherited classes not declaring 'allow_inheritance' as the default will change in 0.7
 - Added support for covered indexes when inheritance is off
 - No longer always upsert on save for items with a '_id'
@@ -988,7 +987,6 @@ Changes in v0.1.3
   querying takes place
 - A few minor bugfixes
 
-
 Changes in v0.1.2
 =================
 - Query values may be processed before before being used in queries
@@ -997,7 +995,6 @@ Changes in v0.1.2
 - Added ``BooleanField``
 - Added ``Document.reload()`` method
 
-
 Changes in v0.1.1
 =================
 - Documents may now use capped collections

From 1338839b52dfefe3a63dd78bd4006900a6784a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Wed, 3 Jul 2019 11:18:56 +0200
Subject: [PATCH 0902/1519] Update changelog.rst

---
 docs/changelog.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ecdbf381e..e9f342e16 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,14 +7,14 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - BREAKING CHANGE: ``class_check`` and ``read_preference`` keyword arguments are no longer available when filtering a ``QuerySet``. #2112
-  - Instead of ``Doc.objects(foo=bar, read_preference=...)`` use ``Doc.objects(foo=bar).read_preference(...)``.
-  - Instead of ``Doc.objects(foo=bar, class_check=False)`` use ``Doc.objects(foo=bar).clear_cls_query(...)``.
-  - This change also renames the private ``QuerySet._initial_query`` attribute to ``_cls_query``.
+    - Instead of ``Doc.objects(foo=bar, read_preference=...)`` use ``Doc.objects(foo=bar).read_preference(...)``.
+    - Instead of ``Doc.objects(foo=bar, class_check=False)`` use ``Doc.objects(foo=bar).clear_cls_query(...)``.
+    - This change also renames the private ``QuerySet._initial_query`` attribute to ``_cls_query``.
 - BREAKING CHANGE: Removed the deprecated ``format`` param from ``QuerySet.explain``. #2113
 - BREAKING CHANGE: Renamed ``MongoEngineConnectionError`` to ``ConnectionFailure``. #2111
-  - If you catch/use ``MongoEngineConnectionError`` in your code, you'll have to rename it.
+    - If you catch/use ``MongoEngineConnectionError`` in your code, you'll have to rename it.
 - BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
-  - From now on keyword arguments (e.g. ``Doc(field_name=value)``) are required.
+    - From now on keyword arguments (e.g. ``Doc(field_name=value)``) are required.
 - The codebase is now formatted using ``black``. #2109
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
 

From abe8070c36bbbd1598b4752bd5fb3b082b33c955 Mon Sep 17 00:00:00 2001
From: Andreas Doll <fuseki@posteo.de>
Date: Mon, 8 Jul 2019 14:16:09 +0200
Subject: [PATCH 0903/1519] Document register_connection arguments in correct
 order (#2121)

Put the documentation of the parameter 'name' of the function
'register_connection' in order of appearance in the function signature.
---
 mongoengine/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index b1e12a962..8aa95daa2 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -178,8 +178,8 @@ def register_connection(
 
     : param alias: the name that will be used to refer to this connection
         throughout MongoEngine
-    : param name: the name of the specific database to use
     : param db: the name of the database to use, for compatibility with connect
+    : param name: the name of the specific database to use
     : param host: the host name of the: program: `mongod` instance to connect to
     : param port: the port that the: program: `mongod` instance is running on
     : param read_preference: The read preference for the collection

From aa76ccdd25d58c6563a0548ea13f42ffbe46d2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Tue, 9 Jul 2019 12:08:26 +0200
Subject: [PATCH 0904/1519] Fix Document._object_key (#2125)

Previous implementation of `Document._object_key` was *pretending* to work on
MongoEngine-level fields (e.g. using "pk" instead of "_id" and separating
nested field parts by "__" instead of "."), but then it was also attempting to
transform field names from the `shard_key` into DB-level fields.

This, expectedly, didn't really work well. Most of the test cases added in this
commit were failing prior to the code fixes.
---
 docs/changelog.rst           |  3 +-
 mongoengine/base/document.py |  1 +
 mongoengine/document.py      | 16 ++++----
 tests/document/instance.py   | 76 +++++++++++++++++++++++++++++++++---
 4 files changed, 82 insertions(+), 14 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e9f342e16..7cf74d666 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,8 +15,9 @@ Development
     - If you catch/use ``MongoEngineConnectionError`` in your code, you'll have to rename it.
 - BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
     - From now on keyword arguments (e.g. ``Doc(field_name=value)``) are required.
-- The codebase is now formatted using ``black``. #2109
+- Fix updating/modifying/deleting/reloading a document that's sharded by a field with ``db_field`` specified. #2125
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
+- The codebase is now formatted using ``black``. #2109
 
 Changes in 0.18.2
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 928a00c20..f5109b443 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -202,6 +202,7 @@ def __setattr__(self, name, value):
             self__initialised = self._initialised
         except AttributeError:
             self__initialised = False
+
         # Check if the user has created a new instance of a class
         if (
             self._is_document
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 41166df45..23968f17d 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -575,22 +575,24 @@ def _qs(self):
 
     @property
     def _object_key(self):
-        """Get the query dict that can be used to fetch this object from
-        the database.
+        """Return a query dict that can be used to fetch this document.
 
         Most of the time the dict is a simple PK lookup, but in case of
         a sharded collection with a compound shard key, it can contain a more
         complex query.
+
+        Note that the dict returned by this method uses MongoEngine field
+        names instead of PyMongo field names (e.g. "pk" instead of "_id",
+        "some__nested__field" instead of "some.nested.field", etc.).
         """
         select_dict = {"pk": self.pk}
         shard_key = self.__class__._meta.get("shard_key", tuple())
         for k in shard_key:
-            path = self._lookup_field(k.split("."))
-            actual_key = [p.db_field for p in path]
             val = self
-            for ak in actual_key:
-                val = getattr(val, ak)
-            select_dict["__".join(actual_key)] = val
+            field_parts = k.split(".")
+            for part in field_parts:
+                val = getattr(val, part)
+            select_dict["__".join(field_parts)] = val
         return select_dict
 
     def update(self, **kwargs):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 49606cffd..9c854f8d7 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -466,21 +466,33 @@ class Animal(Document):
             meta = {"shard_key": ("superphylum",)}
 
         Animal.drop_collection()
-        doc = Animal(superphylum="Deuterostomia")
-        doc.save()
+        doc = Animal.objects.create(superphylum="Deuterostomia")
 
         mongo_db = get_mongodb_version()
         CMD_QUERY_KEY = "command" if mongo_db >= MONGODB_36 else "query"
-
         with query_counter() as q:
             doc.reload()
             query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
             self.assertEqual(
-                set(query_op[CMD_QUERY_KEY]["filter"].keys()),
-                set(["_id", "superphylum"]),
+                set(query_op[CMD_QUERY_KEY]["filter"].keys()), {"_id", "superphylum"}
             )
 
-        Animal.drop_collection()
+    def test_reload_sharded_with_db_field(self):
+        class Person(Document):
+            nationality = StringField(db_field="country")
+            meta = {"shard_key": ("nationality",)}
+
+        Person.drop_collection()
+        doc = Person.objects.create(nationality="Poland")
+
+        mongo_db = get_mongodb_version()
+        CMD_QUERY_KEY = "command" if mongo_db >= MONGODB_36 else "query"
+        with query_counter() as q:
+            doc.reload()
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.person"})[0]
+            self.assertEqual(
+                set(query_op[CMD_QUERY_KEY]["filter"].keys()), {"_id", "country"}
+            )
 
     def test_reload_sharded_nested(self):
         class SuperPhylum(EmbeddedDocument):
@@ -3616,5 +3628,57 @@ class User(Document):
             User.objects().select_related()
 
 
+class ObjectKeyTestCase(MongoDBTestCase):
+    def test_object_key_simple_document(self):
+        class Book(Document):
+            title = StringField()
+
+        book = Book(title="Whatever")
+        self.assertEqual(book._object_key, {"pk": None})
+
+        book.pk = ObjectId()
+        self.assertEqual(book._object_key, {"pk": book.pk})
+
+    def test_object_key_with_custom_primary_key(self):
+        class Book(Document):
+            isbn = StringField(primary_key=True)
+            title = StringField()
+
+        book = Book(title="Sapiens")
+        self.assertEqual(book._object_key, {"pk": None})
+
+        book = Book(pk="0062316117")
+        self.assertEqual(book._object_key, {"pk": "0062316117"})
+
+    def test_object_key_in_a_sharded_collection(self):
+        class Book(Document):
+            title = StringField()
+            meta = {"shard_key": ("pk", "title")}
+
+        book = Book()
+        self.assertEqual(book._object_key, {"pk": None, "title": None})
+        book = Book(pk=ObjectId(), title="Sapiens")
+        self.assertEqual(book._object_key, {"pk": book.pk, "title": "Sapiens"})
+
+    def test_object_key_with_custom_db_field(self):
+        class Book(Document):
+            author = StringField(db_field="creator")
+            meta = {"shard_key": ("pk", "author")}
+
+        book = Book(pk=ObjectId(), author="Author")
+        self.assertEqual(book._object_key, {"pk": book.pk, "author": "Author"})
+
+    def test_object_key_with_nested_shard_key(self):
+        class Author(EmbeddedDocument):
+            name = StringField()
+
+        class Book(Document):
+            author = EmbeddedDocumentField(Author)
+            meta = {"shard_key": ("pk", "author.name")}
+
+        book = Book(pk=ObjectId(), author=Author(name="Author"))
+        self.assertEqual(book._object_key, {"pk": book.pk, "author__name": "Author"})
+
+
 if __name__ == "__main__":
     unittest.main()

From 290d9df3eb6491f22a8feea0f2e9e909bc94b621 Mon Sep 17 00:00:00 2001
From: Nuno Rodrigues <nunomr@gmail.com>
Date: Fri, 12 Jul 2019 13:33:19 +0100
Subject: [PATCH 0905/1519] Set default database when using mongomock.

When passing host `mongomock://localhost/some-default-database` to `connect` the default database was `"test"` instead of `"some-default-database"`.

Fixes: #2130
---
 mongoengine/connection.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 8aa95daa2..01e9a7af9 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -103,7 +103,13 @@ def _get_connection_settings(
         if entity.startswith("mongomock://"):
             conn_settings["is_mock"] = True
             # `mongomock://` is not a valid url prefix and must be replaced by `mongodb://`
-            resolved_hosts.append(entity.replace("mongomock://", "mongodb://", 1))
+            new_entity = entity.replace("mongomock://", "mongodb://", 1)
+            resolved_hosts.append(new_entity)
+
+            uri_dict = uri_parser.parse_uri(new_entity)
+
+            if uri_dict.get("database"):
+                conn_settings["name"] = uri_dict.get("database")
 
         # Handle URI style connections, only updating connection params which
         # were explicitly specified in the URI.

From 1aba145bc6f8f944cd66a5710a7d7d46bd4fe841 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 15 Jul 2019 09:32:26 +0200
Subject: [PATCH 0906/1519] Split requirements into requirements.txt and
 requirements-lint.txt

I'm doing this because it makes sense to separate which requirements are
needed to develop the package and which are purely needed for static code
analysis. That said, the trigger for this commit was that ReadTheDocs
automatically tries to install everything that's in requirements.txt and,
since `black` isn't available on Python 2.7, it was failing. See
https://readthedocs.org/projects/mongoengine-odm/builds/9371765/.

Refs #2105
---
 requirements-lint.txt | 3 +++
 requirements.txt      | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 requirements-lint.txt

diff --git a/requirements-lint.txt b/requirements-lint.txt
new file mode 100644
index 000000000..9dc6123b1
--- /dev/null
+++ b/requirements-lint.txt
@@ -0,0 +1,3 @@
+black
+flake8
+flake8-import-order
diff --git a/requirements.txt b/requirements.txt
index 62ad8766b..46eabac3f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,5 @@
-black
 nose
 pymongo>=3.4
 six==1.10.0
-flake8
-flake8-import-order
 Sphinx==1.5.5
 sphinx-rtd-theme==0.2.4

From 921c1fa412c81e2c01fb529d7192a1b141ab48da Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 15 Jul 2019 09:50:29 +0200
Subject: [PATCH 0907/1519] Dummy commit to confirm that the new RTD webhook
 works


From 79454b5eed0cda6e66c939234a548695a0209c83 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 15 Jul 2019 09:54:18 +0200
Subject: [PATCH 0908/1519] Fix formatting of the changelog

RTD didn't render it properly previously.

Refs #2105
---
 docs/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7cf74d666..d3b547eee 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -3,6 +3,7 @@
 Changelog
 =========
 
+===========
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
@@ -19,16 +20,19 @@ Development
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
 - The codebase is now formatted using ``black``. #2109
 
+=================
 Changes in 0.18.2
 =================
 - Replace deprecated PyMongo v2.x methods with their v3.x equivalents in the ``SequenceField``. #2097
 - Various code clarity and documentation improvements.
 
+=================
 Changes in 0.18.1
 =================
 - Fix a bug introduced in 0.18.0 which was causing ``Document.save`` to update all the fields instead of updating only the modified fields. This bug only occurred when using a custom PK. #2082
 - Add Python 3.7 to Travis CI. #2058
 
+=================
 Changes in 0.18.0
 =================
 - Drop support for EOL'd MongoDB v2.6, v3.0, and v3.2.
@@ -52,6 +56,7 @@ Changes in 0.18.0
     - ``disconnect`` now clears the cached attribute ``Document._collection``.
 - BREAKING CHANGE: ``EmbeddedDocument.save`` & ``.reload`` no longer exist. #1552
 
+=================
 Changes in 0.17.0
 =================
 - POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (``_cls``, ``_id``) when using ``QuerySet.as_pymongo``. #1976

From d09af430e89618736cd5e3594b9b3e2a9e1b5649 Mon Sep 17 00:00:00 2001
From: Stefan Wojcik <wojcikstefan@gmail.com>
Date: Mon, 15 Jul 2019 09:57:48 +0200
Subject: [PATCH 0909/1519] =?UTF-8?q?Fix=20formatting=20of=20the=20changel?=
 =?UTF-8?q?og=20=E2=80=93=20part=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

RTD didn't render it properly previously.

Refs #2105
---
 docs/changelog.rst | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d3b547eee..55fa4b256 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -3,7 +3,6 @@
 Changelog
 =========
 
-===========
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
@@ -20,19 +19,16 @@ Development
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
 - The codebase is now formatted using ``black``. #2109
 
-=================
 Changes in 0.18.2
 =================
 - Replace deprecated PyMongo v2.x methods with their v3.x equivalents in the ``SequenceField``. #2097
 - Various code clarity and documentation improvements.
 
-=================
 Changes in 0.18.1
 =================
 - Fix a bug introduced in 0.18.0 which was causing ``Document.save`` to update all the fields instead of updating only the modified fields. This bug only occurred when using a custom PK. #2082
 - Add Python 3.7 to Travis CI. #2058
 
-=================
 Changes in 0.18.0
 =================
 - Drop support for EOL'd MongoDB v2.6, v3.0, and v3.2.
@@ -56,7 +52,6 @@ Changes in 0.18.0
     - ``disconnect`` now clears the cached attribute ``Document._collection``.
 - BREAKING CHANGE: ``EmbeddedDocument.save`` & ``.reload`` no longer exist. #1552
 
-=================
 Changes in 0.17.0
 =================
 - POTENTIAL BREAKING CHANGE: All result fields are now passed, including internal fields (``_cls``, ``_id``) when using ``QuerySet.as_pymongo``. #1976
@@ -68,24 +63,20 @@ Changes in 0.17.0
 - Fix test suite and CI to support MongoDB v3.4. #1445
 - Fix reference fields querying the database on each access if value contains orphan DBRefs.
 
-=================
 Changes in 0.16.3
 =================
 - Fix ``$push`` with the ``$position`` operator not working with lists in embedded documents. #1965
 
-=================
 Changes in 0.16.2
 =================
 - Fix ``Document.save`` that fails when called with ``write_concern=None`` (regression of 0.16.1). #1958
 
-=================
 Changes in 0.16.1
 =================
 - Fix ``_cls`` that is not set properly in the ``Document`` constructor (regression). #1950
 - Fix a bug in the ``_delta`` method - update of a ``ListField`` depends on an unrelated dynamic field update. #1733
 - Remove PyMongo's deprecated ``Collection.save`` method and use ``Collection.insert_one`` instead. #1899
 
-=================
 Changes in 0.16.0
 =================
 - POTENTIAL BREAKING CHANGES:

From ac416aeeb3e30716b1da2f21465191ab81263eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20W=C3=B3jcik?= <wojcikstefan@gmail.com>
Date: Mon, 15 Jul 2019 12:15:55 +0200
Subject: [PATCH 0910/1519] Improve BaseDocument.from_json tests and
 documentation (#2127)

---
 mongoengine/base/document.py |  20 ++++--
 tests/document/instance.py   | 121 ++++++++++++++++++++++-------------
 2 files changed, 90 insertions(+), 51 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index f5109b443..a962a82b6 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -463,13 +463,21 @@ def to_json(self, *args, **kwargs):
     def from_json(cls, json_data, created=False):
         """Converts json data to a Document instance
 
-        :param json_data: The json data to load into the Document
-        :param created: If True, the document will be considered as a brand new document
-                        If False and an id is provided, it will consider that the data being
-                        loaded corresponds to what's already in the database (This has an impact of subsequent call to .save())
-                        If False and no id is provided, it will consider the data as a new document
-                        (default ``False``)
+        :param str json_data: The json data to load into the Document
+        :param bool created: Boolean defining whether to consider the newly
+            instantiated document as brand new or as persisted already:
+            * If True, consider the document as brand new, no matter what data
+              it's loaded with (i.e. even if an ID is loaded).
+            * If False and an ID is NOT provided, consider the document as
+              brand new.
+            * If False and an ID is provided, assume that the object has
+              already been persisted (this has an impact on the subsequent
+              call to .save()).
+            * Defaults to ``False``.
         """
+        # TODO should `created` default to False? If the object already exists
+        # in the DB, you would likely retrieve it from MongoDB itself through
+        # a query, not load it from JSON data.
         return cls._from_son(json_util.loads(json_data), created=created)
 
     def __expand_dynamic_values(self, name, value):
diff --git a/tests/document/instance.py b/tests/document/instance.py
index 9c854f8d7..d8841a407 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -3429,83 +3429,114 @@ class Person(Document):
 
         self.assertEqual(Person.objects(height=189).count(), 1)
 
-    def test_from_son(self):
-        # 771
-        class MyPerson(self.Person):
-            meta = dict(shard_key=["id"])
+    def test_shard_key_mutability_after_from_json(self):
+        """Ensure that a document ID can be modified after from_json.
 
-        p = MyPerson.from_json('{"name": "name", "age": 27}', created=True)
-        self.assertEqual(p.id, None)
-        p.id = (
-            "12345"
-        )  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
-        p = MyPerson._from_son({"name": "name", "age": 27}, created=True)
-        self.assertEqual(p.id, None)
-        p.id = (
-            "12345"
-        )  # in case it is not working: "OperationError: Shard Keys are immutable..." will be raised here
+        If you instantiate a document by using from_json/_from_son and you
+        indicate that this should be considered a new document (vs a doc that
+        already exists in the database), then you should be able to modify
+        fields that are part of its shard key (note that this is not permitted
+        on docs that are already persisted).
+
+        See https://github.com/mongoengine/mongoengine/issues/771 for details.
+        """
 
-    def test_from_son_created_False_without_id(self):
-        class MyPerson(Document):
+        class Person(Document):
             name = StringField()
+            age = IntField()
+            meta = {"shard_key": ("id", "name")}
 
-        MyPerson.objects.delete()
+        p = Person.from_json('{"name": "name", "age": 27}', created=True)
+        self.assertEqual(p._created, True)
+        p.name = "new name"
+        p.id = "12345"
+        self.assertEqual(p.name, "new name")
+        self.assertEqual(p.id, "12345")
 
-        p = MyPerson.from_json('{"name": "a_fancy_name"}', created=False)
-        self.assertFalse(p._created)
-        self.assertIsNone(p.id)
+    def test_shard_key_mutability_after_from_son(self):
+        """Ensure that a document ID can be modified after _from_son.
+
+        See `test_shard_key_mutability_after_from_json` above for more details.
+        """
+
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+            meta = {"shard_key": ("id", "name")}
+
+        p = Person._from_son({"name": "name", "age": 27}, created=True)
+        self.assertEqual(p._created, True)
+        p.name = "new name"
+        p.id = "12345"
+        self.assertEqual(p.name, "new name")
+        self.assertEqual(p.id, "12345")
+
+    def test_from_json_created_false_without_an_id(self):
+        class Person(Document):
+            name = StringField()
+
+        Person.objects.delete()
+
+        p = Person.from_json('{"name": "name"}', created=False)
+        self.assertEqual(p._created, False)
+        self.assertEqual(p.id, None)
+
+        # Make sure the document is subsequently persisted correctly.
         p.save()
-        self.assertIsNotNone(p.id)
-        saved_p = MyPerson.objects.get(id=p.id)
-        self.assertEqual(saved_p.name, "a_fancy_name")
+        self.assertTrue(p.id is not None)
+        saved_p = Person.objects.get(id=p.id)
+        self.assertEqual(saved_p.name, "name")
+
+    def test_from_json_created_false_with_an_id(self):
+        """See https://github.com/mongoengine/mongoengine/issues/1854"""
 
-    def test_from_son_created_False_with_id(self):
-        # 1854
-        class MyPerson(Document):
+        class Person(Document):
             name = StringField()
 
-        MyPerson.objects.delete()
+        Person.objects.delete()
 
-        p = MyPerson.from_json(
-            '{"_id": "5b85a8b04ec5dc2da388296e", "name": "a_fancy_name"}', created=False
+        p = Person.from_json(
+            '{"_id": "5b85a8b04ec5dc2da388296e", "name": "name"}', created=False
         )
-        self.assertFalse(p._created)
+        self.assertEqual(p._created, False)
         self.assertEqual(p._changed_fields, [])
-        self.assertEqual(p.name, "a_fancy_name")
+        self.assertEqual(p.name, "name")
         self.assertEqual(p.id, ObjectId("5b85a8b04ec5dc2da388296e"))
         p.save()
 
         with self.assertRaises(DoesNotExist):
-            # Since created=False and we gave an id in the json and _changed_fields is empty
-            # mongoengine assumes that the document exits with that structure already
-            # and calling .save() didn't save anything
-            MyPerson.objects.get(id=p.id)
+            # Since the object is considered as already persisted (thanks to
+            # `created=False` and an existing ID), and we haven't changed any
+            # fields (i.e. `_changed_fields` is empty), the document is
+            # considered unchanged and hence the `save()` call above did
+            # nothing.
+            Person.objects.get(id=p.id)
 
         self.assertFalse(p._created)
-        p.name = "a new fancy name"
+        p.name = "a new name"
         self.assertEqual(p._changed_fields, ["name"])
         p.save()
-        saved_p = MyPerson.objects.get(id=p.id)
+        saved_p = Person.objects.get(id=p.id)
         self.assertEqual(saved_p.name, p.name)
 
-    def test_from_son_created_True_with_an_id(self):
-        class MyPerson(Document):
+    def test_from_json_created_true_with_an_id(self):
+        class Person(Document):
             name = StringField()
 
-        MyPerson.objects.delete()
+        Person.objects.delete()
 
-        p = MyPerson.from_json(
-            '{"_id": "5b85a8b04ec5dc2da388296e", "name": "a_fancy_name"}', created=True
+        p = Person.from_json(
+            '{"_id": "5b85a8b04ec5dc2da388296e", "name": "name"}', created=True
         )
         self.assertTrue(p._created)
         self.assertEqual(p._changed_fields, [])
-        self.assertEqual(p.name, "a_fancy_name")
+        self.assertEqual(p.name, "name")
         self.assertEqual(p.id, ObjectId("5b85a8b04ec5dc2da388296e"))
         p.save()
 
-        saved_p = MyPerson.objects.get(id=p.id)
+        saved_p = Person.objects.get(id=p.id)
         self.assertEqual(saved_p, p)
-        self.assertEqual(p.name, "a_fancy_name")
+        self.assertEqual(saved_p.name, "name")
 
     def test_null_field(self):
         # 734

From 2d02551d0a41405664dc26604e90669f6e65aca6 Mon Sep 17 00:00:00 2001
From: Nuno Rodrigues <nunomr@gmail.com>
Date: Mon, 15 Jul 2019 16:53:24 +0000
Subject: [PATCH 0911/1519] Add test

---
 tests/test_connection.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index f9c9d098c..78f7e52fc 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -4,6 +4,8 @@
 from pymongo.errors import OperationFailure, InvalidName
 from pymongo import ReadPreference
 
+from mongoengine import Document
+
 try:
     import unittest2 as unittest
 except ImportError:
@@ -269,6 +271,14 @@ def test_connect_in_mocking(self):
         conn = get_connection("testdb7")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
+        disconnect_all()
+        class SomeDocument(Document): pass
+        conn = connect(host="mongomock://localhost:27017/mongoenginetest8")
+        some_document = SomeDocument()
+        some_document.save()
+        self.assertEqual(conn.get_default_database().name, "mongoenginetest8")
+        self.assertEqual(conn.database_names()[0], "mongoenginetest8")
+
     def test_connect_with_host_list(self):
         """Ensure that the connect() method works when host is a list
 

From 2424ece0c52e2253fbfec45a3b11cbda9e4a5b45 Mon Sep 17 00:00:00 2001
From: Nuno Rodrigues <nunomr@gmail.com>
Date: Tue, 16 Jul 2019 13:40:46 +0000
Subject: [PATCH 0912/1519] Fix a linting error

---
 tests/test_connection.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 78f7e52fc..571419581 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -272,7 +272,10 @@ def test_connect_in_mocking(self):
         self.assertIsInstance(conn, mongomock.MongoClient)
 
         disconnect_all()
-        class SomeDocument(Document): pass
+
+        class SomeDocument(Document):
+            pass
+
         conn = connect(host="mongomock://localhost:27017/mongoenginetest8")
         some_document = SomeDocument()
         some_document.save()

From 05a22d5a54b8bd7a6a411732db90464fbbb29371 Mon Sep 17 00:00:00 2001
From: Nuno Rodrigues <nunomr@gmail.com>
Date: Mon, 22 Jul 2019 08:42:17 +0000
Subject: [PATCH 0913/1519] Extract test to its own method

---
 tests/test_connection.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 571419581..b7dc92687 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -271,16 +271,25 @@ def test_connect_in_mocking(self):
         conn = get_connection("testdb7")
         self.assertIsInstance(conn, mongomock.MongoClient)
 
+    def test_default_database_with_mocking(self):
+        """Ensure that the default database is correctly set when using mongomock.
+        """
+        try:
+            import mongomock
+        except ImportError:
+            raise SkipTest("you need mongomock installed to run this testcase")
+
         disconnect_all()
 
         class SomeDocument(Document):
             pass
 
-        conn = connect(host="mongomock://localhost:27017/mongoenginetest8")
+        conn = connect(host="mongomock://localhost:27017/mongoenginetest")
         some_document = SomeDocument()
+        # database won't exist until we save a document
         some_document.save()
-        self.assertEqual(conn.get_default_database().name, "mongoenginetest8")
-        self.assertEqual(conn.database_names()[0], "mongoenginetest8")
+        self.assertEqual(conn.get_default_database().name, "mongoenginetest")
+        self.assertEqual(conn.database_names()[0], "mongoenginetest")
 
     def test_connect_with_host_list(self):
         """Ensure that the connect() method works when host is a list

From f4a06ad65d4bcec40384391d1f3fcf94a70f5111 Mon Sep 17 00:00:00 2001
From: Nuno Rodrigues <nunomr@gmail.com>
Date: Mon, 22 Jul 2019 08:45:35 +0000
Subject: [PATCH 0914/1519] Optimize database name getter calls

---
 mongoengine/connection.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 01e9a7af9..4e0c60b0e 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -108,8 +108,9 @@ def _get_connection_settings(
 
             uri_dict = uri_parser.parse_uri(new_entity)
 
-            if uri_dict.get("database"):
-                conn_settings["name"] = uri_dict.get("database")
+            database = uri_dict.get("database")
+            if database:
+                conn_settings["name"] = database
 
         # Handle URI style connections, only updating connection params which
         # were explicitly specified in the URI.
@@ -117,8 +118,9 @@ def _get_connection_settings(
             uri_dict = uri_parser.parse_uri(entity)
             resolved_hosts.append(entity)
 
-            if uri_dict.get("database"):
-                conn_settings["name"] = uri_dict.get("database")
+            database = uri_dict.get("database")
+            if database:
+                conn_settings["name"] = database
 
             for param in ("read_preference", "username", "password"):
                 if uri_dict.get(param):

From c68e3e1238bf77997dbe65415935abe8528ffef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 24 Jul 2019 21:37:16 +0200
Subject: [PATCH 0915/1519] Add test case for list update by negative index

---
 tests/document/instance.py | 49 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/tests/document/instance.py b/tests/document/instance.py
index d8841a407..d0193b608 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -39,10 +39,10 @@
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
 
-__all__ = ("InstanceTest",)
+__all__ = ("TestDocumentInstance",)
 
 
-class InstanceTest(MongoDBTestCase):
+class TestDocumentInstance(MongoDBTestCase):
     def setUp(self):
         class Job(EmbeddedDocument):
             name = StringField()
@@ -3599,6 +3599,51 @@ class A(Document):
             self.assertEqual(b._instance, a)
         self.assertEqual(idx, 2)
 
+    def test_updating_listfield_manipulate_list(self):
+        class Company(Document):
+            name = StringField()
+            employees = ListField(field=DictField())
+
+        Company.drop_collection()
+
+        comp = Company(name="BigBank", employees=[{"name": "John"}])
+        comp.save()
+        comp.employees.append({"name": "Bill"})
+        comp.save()
+
+        stored_comp = get_as_pymongo(comp)
+        self.assertEqual(
+            stored_comp,
+            {
+                "_id": comp.id,
+                "employees": [{"name": "John"}, {"name": "Bill"}],
+                "name": "BigBank",
+            },
+        )
+
+        comp = comp.reload()
+        comp.employees[0]["color"] = "red"
+        comp.employees[-1]["color"] = "blue"
+        comp.employees[-1].update({"size": "xl"})
+        comp.save()
+
+        assert len(comp.employees) == 2
+        assert comp.employees[0] == {"name": "John", "color": "red"}
+        assert comp.employees[1] == {"name": "Bill", "size": "xl", "color": "blue"}
+
+        stored_comp = get_as_pymongo(comp)
+        self.assertEqual(
+            stored_comp,
+            {
+                "_id": comp.id,
+                "employees": [
+                    {"name": "John", "color": "red"},
+                    {"size": "xl", "color": "blue", "name": "Bill"},
+                ],
+                "name": "BigBank",
+            },
+        )
+
     def test_falsey_pk(self):
         """Ensure that we can create and update a document with Falsey PK."""
 

From b887ea96236c62a04a6962dabc747dda14eb1057 Mon Sep 17 00:00:00 2001
From: otrofimov <otofymov@sciforce.solutions>
Date: Thu, 8 Aug 2019 11:55:45 +0300
Subject: [PATCH 0916/1519] Implement collation for queryset

---
 mongoengine/queryset/base.py | 31 +++++++++++++++++++++++++++++++
 tests/document/indexes.py    | 29 +++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ba3ac95aa..b0e1bff28 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -80,6 +80,7 @@ def __init__(self, document, collection):
         self._limit = None
         self._skip = None
         self._hint = -1  # Using -1 as None is a valid value for hint
+        self._collation = None
         self._batch_size = None
         self.only_fields = []
         self._max_time_ms = None
@@ -781,6 +782,7 @@ def _clone_into(self, new_qs):
             "_limit",
             "_skip",
             "_hint",
+            "_collation",
             "_auto_dereference",
             "_search_text",
             "only_fields",
@@ -863,6 +865,32 @@ def hint(self, index=None):
 
         return queryset
 
+    def collation(self, collation=None):
+        """
+        Collation allows users to specify language-specific rules for string
+        comparison, such as rules for lettercase and accent marks.
+        :param collation: `~pymongo.collation.Collation` or dict with
+        following fields:
+            {
+                locale: str,
+                caseLevel: bool,
+                caseFirst: str,
+                strength: int,
+                numericOrdering: bool,
+                alternate: str,
+                maxVariable: str,
+                backwards: str
+            }
+        Collation should be added to indexes like in test example
+        """
+        queryset = self.clone()
+        queryset._collation = collation
+
+        if queryset._cursor_obj:
+            queryset._cursor_obj.collation(collation)
+
+        return queryset
+
     def batch_size(self, size):
         """Limit the number of documents returned in a single batch (each
         batch requires a round trip to the server).
@@ -1636,6 +1664,9 @@ def _cursor(self):
         if self._hint != -1:
             self._cursor_obj.hint(self._hint)
 
+        if self._collation is not None:
+            self._cursor_obj.collation(self._collation)
+
         if self._batch_size is not None:
             self._cursor_obj.batch_size(self._batch_size)
 
diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 570e619e1..0bc23d1c6 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -539,6 +539,35 @@ class BlogPost(Document):
         with self.assertRaises(ValueError):
             BlogPost.objects.hint(("tags", 1)).count()
 
+    def test_collation(self):
+        base = {'locale': "en", 'strength': 2}
+
+        class BlogPost(Document):
+            name = StringField()
+            meta = {"indexes": [
+                {"fields": ["name"], "name": 'name_index',
+                 'collation': base}
+            ]}
+
+        BlogPost.drop_collection()
+
+        names = tuple("%sag %i" % ('t' if n % 2 == 0 else 'T', n) for n in range(10))
+        for name in names:
+            BlogPost(name=name).save()
+
+        query_result = BlogPost.objects.collation(base).order_by('name')
+        self.assertEqual([x.name for x in query_result],
+                         sorted(names, key=lambda x: x.lower()))
+        self.assertEqual(10, query_result.count())
+
+        incorrect_collation = {'arndom': 'wrdo'}
+        with self.assertRaises(OperationFailure):
+            BlogPost.objects.collation(incorrect_collation).count()
+
+        query_result = BlogPost.objects.collation({}).order_by('name')
+        self.assertEqual([x.name for x in query_result],
+                         sorted(names))
+
     def test_unique(self):
         """Ensure that uniqueness constraints are applied to fields.
         """

From fbb3bf869c9cdea0b6c5060e2f57fabf5b8c5e5d Mon Sep 17 00:00:00 2001
From: otrofimov <otofymov@sciforce.solutions>
Date: Thu, 8 Aug 2019 15:56:20 +0300
Subject: [PATCH 0917/1519] compatibility with black

---
 tests/document/indexes.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index 0bc23d1c6..fa3d17069 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -540,33 +540,34 @@ class BlogPost(Document):
             BlogPost.objects.hint(("tags", 1)).count()
 
     def test_collation(self):
-        base = {'locale': "en", 'strength': 2}
+        base = {"locale": "en", "strength": 2}
 
         class BlogPost(Document):
             name = StringField()
-            meta = {"indexes": [
-                {"fields": ["name"], "name": 'name_index',
-                 'collation': base}
-            ]}
+            meta = {
+                "indexes": [
+                    {"fields": ["name"], "name": "name_index", "collation": base}
+                ]
+            }
 
         BlogPost.drop_collection()
 
-        names = tuple("%sag %i" % ('t' if n % 2 == 0 else 'T', n) for n in range(10))
+        names = tuple("%sag %i" % ("t" if n % 2 == 0 else "T", n) for n in range(10))
         for name in names:
             BlogPost(name=name).save()
 
-        query_result = BlogPost.objects.collation(base).order_by('name')
-        self.assertEqual([x.name for x in query_result],
-                         sorted(names, key=lambda x: x.lower()))
+        query_result = BlogPost.objects.collation(base).order_by("name")
+        self.assertEqual(
+            [x.name for x in query_result], sorted(names, key=lambda x: x.lower())
+        )
         self.assertEqual(10, query_result.count())
 
-        incorrect_collation = {'arndom': 'wrdo'}
+        incorrect_collation = {"arndom": "wrdo"}
         with self.assertRaises(OperationFailure):
             BlogPost.objects.collation(incorrect_collation).count()
 
-        query_result = BlogPost.objects.collation({}).order_by('name')
-        self.assertEqual([x.name for x in query_result],
-                         sorted(names))
+        query_result = BlogPost.objects.collation({}).order_by("name")
+        self.assertEqual([x.name for x in query_result], sorted(names))
 
     def test_unique(self):
         """Ensure that uniqueness constraints are applied to fields.

From eecbb5ca90192a28354efd817f1383ad674100ba Mon Sep 17 00:00:00 2001
From: Ali Mirlou <alimirlou@gmail.com>
Date: Tue, 20 Aug 2019 19:53:49 +0430
Subject: [PATCH 0918/1519] Fix small typo

---
 mongoengine/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 9b9fef6eb..f8f527a33 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2291,7 +2291,7 @@ class LineStringField(GeoJsonBaseField):
     .. code-block:: js
 
         {'type' : 'LineString' ,
-         'coordinates' : [[x1, y1], [x1, y1] ... [xn, yn]]}
+         'coordinates' : [[x1, y1], [x2, y2] ... [xn, yn]]}
 
     You can either pass a dict with the full information or a list of points.
 

From e86cf962e99e15eaa59e14380ff50fd9e25ac6fc Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Wed, 21 Aug 2019 13:08:30 +0200
Subject: [PATCH 0919/1519] Change misleading error message

---
 mongoengine/queryset/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ba3ac95aa..46b20d786 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -355,8 +355,8 @@ def insert(
         except pymongo.errors.BulkWriteError as err:
             # inserting documents that already have an _id field will
             # give huge performance debt or raise
-            message = u"Document must not have _id value before bulk write (%s)"
-            raise NotUniqueError(message % six.text_type(err))
+            message = u"Bulk write error: (%s)"
+            raise NotUniqueError(message % six.text_type(err.details))
         except pymongo.errors.OperationFailure as err:
             message = "Could not save document (%s)"
             if re.match("^E1100[01] duplicate key", six.text_type(err)):

From 71a6f3d1a46702bf5d66e704519671e828626cd2 Mon Sep 17 00:00:00 2001
From: otrofimov <otofymov@sciforce.solutions>
Date: Wed, 21 Aug 2019 18:26:10 +0300
Subject: [PATCH 0920/1519] test_collation: Added test with
 `pymongo.collation.Collation` object Readable list of BlogPost names for test

---
 tests/document/indexes.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/document/indexes.py b/tests/document/indexes.py
index fa3d17069..dcd3fc6af 100644
--- a/tests/document/indexes.py
+++ b/tests/document/indexes.py
@@ -3,6 +3,7 @@
 from datetime import datetime
 
 from nose.plugins.skip import SkipTest
+from pymongo.collation import Collation
 from pymongo.errors import OperationFailure
 import pymongo
 from six import iteritems
@@ -552,7 +553,7 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        names = tuple("%sag %i" % ("t" if n % 2 == 0 else "T", n) for n in range(10))
+        names = ["tag1", "Tag2", "tag3", "Tag4", "tag5"]
         for name in names:
             BlogPost(name=name).save()
 
@@ -560,7 +561,13 @@ class BlogPost(Document):
         self.assertEqual(
             [x.name for x in query_result], sorted(names, key=lambda x: x.lower())
         )
-        self.assertEqual(10, query_result.count())
+        self.assertEqual(5, query_result.count())
+
+        query_result = BlogPost.objects.collation(Collation(**base)).order_by("name")
+        self.assertEqual(
+            [x.name for x in query_result], sorted(names, key=lambda x: x.lower())
+        )
+        self.assertEqual(5, query_result.count())
 
         incorrect_collation = {"arndom": "wrdo"}
         with self.assertRaises(OperationFailure):

From ddececbfead80b2565c4c086a9cbd52ed07e17c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 28 Aug 2019 16:01:44 +0300
Subject: [PATCH 0921/1519] rename all test files so that they are prefixed by
 test_{orginal_filename}.py

---
 tests/__init__.py                             |  4 --
 tests/all_warnings/__init__.py                | 40 --------------
 tests/all_warnings/test_warnings.py           | 37 +++++++++++++
 tests/document/__init__.py                    | 13 -----
 ...class_methods.py => test_class_methods.py} |  7 +--
 tests/document/{delta.py => test_delta.py}    |  4 +-
 .../document/{dynamic.py => test_dynamic.py}  |  2 +-
 .../document/{indexes.py => test_indexes.py}  |  5 +-
 .../{inheritance.py => test_inheritance.py}   |  8 ++-
 .../{instance.py => test_instance.py}         |  4 +-
 ...lisation.py => test_json_serialisation.py} | 11 +---
 .../{validation.py => test_validation.py}     |  8 +--
 tests/fields/__init__.py                      |  3 --
 tests/fields/test_binary_field.py             |  5 +-
 tests/fields/{fields.py => test_fields.py}    | 53 +++++++++----------
 .../{file_tests.py => test_file_field.py}     |  6 +--
 tests/fields/{geo.py => test_geo_fields.py}   | 10 +---
 tests/queryset/__init__.py                    |  6 ---
 .../{field_list.py => test_field_list.py}     |  6 +--
 tests/queryset/{geo.py => test_geo.py}        |  5 +-
 .../{queryset.py => test_queryset.py}         |  2 +-
 21 files changed, 87 insertions(+), 152 deletions(-)
 create mode 100644 tests/all_warnings/test_warnings.py
 rename tests/document/{class_methods.py => test_class_methods.py} (99%)
 rename tests/document/{delta.py => test_delta.py} (99%)
 rename tests/document/{dynamic.py => test_dynamic.py} (99%)
 rename tests/document/{indexes.py => test_indexes.py} (99%)
 rename tests/document/{inheritance.py => test_inheritance.py} (99%)
 rename tests/document/{instance.py => test_instance.py} (99%)
 rename tests/document/{json_serialisation.py => test_json_serialisation.py} (95%)
 rename tests/document/{validation.py => test_validation.py} (97%)
 rename tests/fields/{fields.py => test_fields.py} (99%)
 rename tests/fields/{file_tests.py => test_file_field.py} (99%)
 rename tests/fields/{geo.py => test_geo_fields.py} (98%)
 rename tests/queryset/{field_list.py => test_field_list.py} (99%)
 rename tests/queryset/{geo.py => test_geo.py} (99%)
 rename tests/queryset/{queryset.py => test_queryset.py} (99%)

diff --git a/tests/__init__.py b/tests/__init__.py
index 08db71864..e69de29bb 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +0,0 @@
-from .all_warnings import AllWarnings
-from .document import *
-from .queryset import *
-from .fields import *
diff --git a/tests/all_warnings/__init__.py b/tests/all_warnings/__init__.py
index a755e7a38..e69de29bb 100644
--- a/tests/all_warnings/__init__.py
+++ b/tests/all_warnings/__init__.py
@@ -1,40 +0,0 @@
-"""
-This test has been put into a module.  This is because it tests warnings that
-only get triggered on first hit.  This way we can ensure its imported into the
-top level and called first by the test suite.
-"""
-import unittest
-import warnings
-
-from mongoengine import *
-
-
-__all__ = ("AllWarnings",)
-
-
-class AllWarnings(unittest.TestCase):
-    def setUp(self):
-        connect(db="mongoenginetest")
-        self.warning_list = []
-        self.showwarning_default = warnings.showwarning
-        warnings.showwarning = self.append_to_warning_list
-
-    def append_to_warning_list(self, message, category, *args):
-        self.warning_list.append({"message": message, "category": category})
-
-    def tearDown(self):
-        # restore default handling of warnings
-        warnings.showwarning = self.showwarning_default
-
-    def test_document_collection_syntax_warning(self):
-        class NonAbstractBase(Document):
-            meta = {"allow_inheritance": True}
-
-        class InheritedDocumentFailTest(NonAbstractBase):
-            meta = {"collection": "fail"}
-
-        warning = self.warning_list[0]
-        self.assertEqual(SyntaxWarning, warning["category"])
-        self.assertEqual(
-            "non_abstract_base", InheritedDocumentFailTest._get_collection_name()
-        )
diff --git a/tests/all_warnings/test_warnings.py b/tests/all_warnings/test_warnings.py
new file mode 100644
index 000000000..672046179
--- /dev/null
+++ b/tests/all_warnings/test_warnings.py
@@ -0,0 +1,37 @@
+"""
+This test has been put into a module.  This is because it tests warnings that
+only get triggered on first hit.  This way we can ensure its imported into the
+top level and called first by the test suite.
+"""
+import unittest
+import warnings
+
+from mongoengine import *
+
+
+class TestAllWarnings(unittest.TestCase):
+    def setUp(self):
+        connect(db="mongoenginetest")
+        self.warning_list = []
+        self.showwarning_default = warnings.showwarning
+        warnings.showwarning = self.append_to_warning_list
+
+    def append_to_warning_list(self, message, category, *args):
+        self.warning_list.append({"message": message, "category": category})
+
+    def tearDown(self):
+        # restore default handling of warnings
+        warnings.showwarning = self.showwarning_default
+
+    def test_document_collection_syntax_warning(self):
+        class NonAbstractBase(Document):
+            meta = {"allow_inheritance": True}
+
+        class InheritedDocumentFailTest(NonAbstractBase):
+            meta = {"collection": "fail"}
+
+        warning = self.warning_list[0]
+        self.assertEqual(SyntaxWarning, warning["category"])
+        self.assertEqual(
+            "non_abstract_base", InheritedDocumentFailTest._get_collection_name()
+        )
diff --git a/tests/document/__init__.py b/tests/document/__init__.py
index f2230c48e..e69de29bb 100644
--- a/tests/document/__init__.py
+++ b/tests/document/__init__.py
@@ -1,13 +0,0 @@
-import unittest
-
-from .class_methods import *
-from .delta import *
-from .dynamic import *
-from .indexes import *
-from .inheritance import *
-from .instance import *
-from .json_serialisation import *
-from .validation import *
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/document/class_methods.py b/tests/document/test_class_methods.py
similarity index 99%
rename from tests/document/class_methods.py
rename to tests/document/test_class_methods.py
index 87f1215b8..c5df08434 100644
--- a/tests/document/class_methods.py
+++ b/tests/document/test_class_methods.py
@@ -2,15 +2,12 @@
 import unittest
 
 from mongoengine import *
+from mongoengine.connection import get_db
 from mongoengine.pymongo_support import list_collection_names
-
 from mongoengine.queryset import NULLIFY, PULL
-from mongoengine.connection import get_db
-
-__all__ = ("ClassMethodsTest",)
 
 
-class ClassMethodsTest(unittest.TestCase):
+class TestClassMethods(unittest.TestCase):
     def setUp(self):
         connect(db="mongoenginetest")
         self.db = get_db()
diff --git a/tests/document/delta.py b/tests/document/test_delta.py
similarity index 99%
rename from tests/document/delta.py
rename to tests/document/test_delta.py
index 8f1575e62..632d9b3f0 100644
--- a/tests/document/delta.py
+++ b/tests/document/test_delta.py
@@ -7,9 +7,9 @@
 from tests.utils import MongoDBTestCase
 
 
-class DeltaTest(MongoDBTestCase):
+class TestDelta(MongoDBTestCase):
     def setUp(self):
-        super(DeltaTest, self).setUp()
+        super(TestDelta, self).setUp()
 
         class Person(Document):
             name = StringField()
diff --git a/tests/document/dynamic.py b/tests/document/test_dynamic.py
similarity index 99%
rename from tests/document/dynamic.py
rename to tests/document/test_dynamic.py
index 414d33522..6b517d247 100644
--- a/tests/document/dynamic.py
+++ b/tests/document/test_dynamic.py
@@ -179,7 +179,7 @@ def test_complex_data_lookups(self):
 
     def test_three_level_complex_data_lookups(self):
         """Ensure you can query three level document dynamic fields"""
-        p = self.Person.objects.create(misc={"hello": {"hello2": "world"}})
+        self.Person.objects.create(misc={"hello": {"hello2": "world"}})
         self.assertEqual(1, self.Person.objects(misc__hello__hello2="world").count())
 
     def test_complex_embedded_document_validation(self):
diff --git a/tests/document/indexes.py b/tests/document/test_indexes.py
similarity index 99%
rename from tests/document/indexes.py
rename to tests/document/test_indexes.py
index 570e619e1..f94eb359b 100644
--- a/tests/document/indexes.py
+++ b/tests/document/test_indexes.py
@@ -4,16 +4,13 @@
 
 from nose.plugins.skip import SkipTest
 from pymongo.errors import OperationFailure
-import pymongo
 from six import iteritems
 
 from mongoengine import *
 from mongoengine.connection import get_db
 
-__all__ = ("IndexesTest",)
 
-
-class IndexesTest(unittest.TestCase):
+class TestIndexes(unittest.TestCase):
     def setUp(self):
         self.connection = connect(db="mongoenginetest")
         self.db = get_db()
diff --git a/tests/document/inheritance.py b/tests/document/test_inheritance.py
similarity index 99%
rename from tests/document/inheritance.py
rename to tests/document/test_inheritance.py
index 4f21d5f4c..4bb46e58c 100644
--- a/tests/document/inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -15,13 +15,11 @@
     StringField,
 )
 from mongoengine.pymongo_support import list_collection_names
-from tests.utils import MongoDBTestCase
 from tests.fixtures import Base
-
-__all__ = ("InheritanceTest",)
+from tests.utils import MongoDBTestCase
 
 
-class InheritanceTest(MongoDBTestCase):
+class TestInheritance(MongoDBTestCase):
     def tearDown(self):
         for collection in list_collection_names(self.db):
             self.db.drop_collection(collection)
@@ -401,7 +399,7 @@ class FinalDocument(Document):
         class Animal(FinalDocument):
             name = StringField()
 
-        with self.assertRaises(ValueError) as cm:
+        with self.assertRaises(ValueError):
 
             class Mammal(Animal):
                 pass
diff --git a/tests/document/instance.py b/tests/document/test_instance.py
similarity index 99%
rename from tests/document/instance.py
rename to tests/document/test_instance.py
index d8841a407..9b4a16e5a 100644
--- a/tests/document/instance.py
+++ b/tests/document/test_instance.py
@@ -39,10 +39,8 @@
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
 
-__all__ = ("InstanceTest",)
 
-
-class InstanceTest(MongoDBTestCase):
+class TestInstance(MongoDBTestCase):
     def setUp(self):
         class Job(EmbeddedDocument):
             name = StringField()
diff --git a/tests/document/json_serialisation.py b/tests/document/test_json_serialisation.py
similarity index 95%
rename from tests/document/json_serialisation.py
rename to tests/document/test_json_serialisation.py
index 33d5a6d9e..26a4a6c1c 100644
--- a/tests/document/json_serialisation.py
+++ b/tests/document/test_json_serialisation.py
@@ -1,21 +1,14 @@
 import unittest
 import uuid
 
-from nose.plugins.skip import SkipTest
 from datetime import datetime
 from bson import ObjectId
 
-import pymongo
-
 from mongoengine import *
+from tests.utils import MongoDBTestCase
 
-__all__ = ("TestJson",)
-
-
-class TestJson(unittest.TestCase):
-    def setUp(self):
-        connect(db="mongoenginetest")
 
+class TestJson(MongoDBTestCase):
     def test_json_names(self):
         """
         Going to test reported issue:
diff --git a/tests/document/validation.py b/tests/document/test_validation.py
similarity index 97%
rename from tests/document/validation.py
rename to tests/document/test_validation.py
index 78199231d..7449dd33b 100644
--- a/tests/document/validation.py
+++ b/tests/document/test_validation.py
@@ -3,14 +3,10 @@
 from datetime import datetime
 
 from mongoengine import *
+from tests.utils import MongoDBTestCase
 
-__all__ = ("ValidatorErrorTest",)
-
-
-class ValidatorErrorTest(unittest.TestCase):
-    def setUp(self):
-        connect(db="mongoenginetest")
 
+class TestValidatorError(MongoDBTestCase):
     def test_to_dict(self):
         """Ensure a ValidationError handles error to_dict correctly.
         """
diff --git a/tests/fields/__init__.py b/tests/fields/__init__.py
index 4994d0c67..e69de29bb 100644
--- a/tests/fields/__init__.py
+++ b/tests/fields/__init__.py
@@ -1,3 +0,0 @@
-from .fields import *
-from .file_tests import *
-from .geo import *
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index df4bf2de9..719df9227 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 import uuid
 
+from bson import Binary
 from nose.plugins.skip import SkipTest
 import six
 
-from bson import Binary
-
 from mongoengine import *
 from tests.utils import MongoDBTestCase
 
@@ -77,8 +76,6 @@ class Attachment(Document):
         self.assertEqual(0, Attachment.objects.count())
 
     def test_primary_filter_by_binary_pk_as_str(self):
-        raise SkipTest("Querying by id as string is not currently supported")
-
         class Attachment(Document):
             id = BinaryField(primary_key=True)
 
diff --git a/tests/fields/fields.py b/tests/fields/test_fields.py
similarity index 99%
rename from tests/fields/fields.py
rename to tests/fields/test_fields.py
index 49e9508ca..d9279c22e 100644
--- a/tests/fields/fields.py
+++ b/tests/fields/test_fields.py
@@ -2,39 +2,38 @@
 import datetime
 import unittest
 
-from nose.plugins.skip import SkipTest
-
 from bson import DBRef, ObjectId, SON
+from nose.plugins.skip import SkipTest
 
 from mongoengine import (
-    Document,
-    StringField,
-    IntField,
-    DateTimeField,
-    DateField,
-    ValidationError,
+    BooleanField,
     ComplexDateTimeField,
-    FloatField,
-    ListField,
-    ReferenceField,
+    DateField,
+    DateTimeField,
     DictField,
-    EmbeddedDocument,
-    EmbeddedDocumentField,
-    GenericReferenceField,
+    Document,
     DoesNotExist,
-    NotRegistered,
-    OperationError,
+    DynamicDocument,
     DynamicField,
-    FieldDoesNotExist,
+    EmbeddedDocument,
+    EmbeddedDocumentField,
     EmbeddedDocumentListField,
+    FieldDoesNotExist,
+    FloatField,
+    GenericLazyReferenceField,
+    GenericReferenceField,
+    IntField,
+    LazyReferenceField,
+    ListField,
     MultipleObjectsReturned,
+    NotRegistered,
     NotUniqueError,
-    BooleanField,
     ObjectIdField,
+    OperationError,
+    ReferenceField,
     SortedListField,
-    GenericLazyReferenceField,
-    LazyReferenceField,
-    DynamicDocument,
+    StringField,
+    ValidationError,
 )
 from mongoengine.base import BaseField, EmbeddedDocumentList, _document_registry
 from mongoengine.errors import DeprecatedError
@@ -42,7 +41,7 @@
 from tests.utils import MongoDBTestCase
 
 
-class FieldTest(MongoDBTestCase):
+class TestField(MongoDBTestCase):
     def test_default_values_nothing_set(self):
         """Ensure that default field values are used when creating
         a document.
@@ -343,7 +342,7 @@ class HandleNoneFields(Document):
         doc.save()
 
         # Unset all the fields
-        obj = HandleNoneFields._get_collection().update(
+        HandleNoneFields._get_collection().update(
             {"_id": doc.id},
             {"$unset": {"str_fld": 1, "int_fld": 1, "flt_fld": 1, "comp_dt_fld": 1}},
         )
@@ -416,13 +415,13 @@ class User(Document):
         # name starting with $
         with self.assertRaises(ValueError):
 
-            class User(Document):
+            class UserX1(Document):
                 name = StringField(db_field="$name")
 
         # name containing a null character
         with self.assertRaises(ValueError):
 
-            class User(Document):
+            class UserX2(Document):
                 name = StringField(db_field="name\0")
 
     def test_list_validation(self):
@@ -2267,7 +2266,7 @@ class Doc(Document):
             Doc(bar="test")
 
 
-class EmbeddedDocumentListFieldTestCase(MongoDBTestCase):
+class TestEmbeddedDocumentListField(MongoDBTestCase):
     def setUp(self):
         """
         Create two BlogPost entries in the database, each with
@@ -2320,7 +2319,7 @@ class Title(Document):
 
         # Test with a Document
         post = self.BlogPost(comments=Title(content="garbage"))
-        with self.assertRaises(ValidationError) as e:
+        with self.assertRaises(ValidationError):
             post.validate()
         self.assertIn("'comments'", str(ctx_err.exception))
         self.assertIn(
diff --git a/tests/fields/file_tests.py b/tests/fields/test_file_field.py
similarity index 99%
rename from tests/fields/file_tests.py
rename to tests/fields/test_file_field.py
index dd2fe6096..49eb5bc29 100644
--- a/tests/fields/file_tests.py
+++ b/tests/fields/test_file_field.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 import copy
 import os
-import unittest
 import tempfile
+import unittest
 
 import gridfs
+from nose.plugins.skip import SkipTest
 import six
 
-from nose.plugins.skip import SkipTest
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.python_support import StringIO
@@ -35,7 +35,7 @@ def get_file(path):
     return bytes_io
 
 
-class FileTest(MongoDBTestCase):
+class TestFileField(MongoDBTestCase):
     def tearDown(self):
         self.db.drop_collection("fs.files")
         self.db.drop_collection("fs.chunks")
diff --git a/tests/fields/geo.py b/tests/fields/test_geo_fields.py
similarity index 98%
rename from tests/fields/geo.py
rename to tests/fields/test_geo_fields.py
index 446d71718..ff4cbc834 100644
--- a/tests/fields/geo.py
+++ b/tests/fields/test_geo_fields.py
@@ -2,16 +2,10 @@
 import unittest
 
 from mongoengine import *
-from mongoengine.connection import get_db
+from tests.utils import MongoDBTestCase
 
-__all__ = ("GeoFieldTest",)
-
-
-class GeoFieldTest(unittest.TestCase):
-    def setUp(self):
-        connect(db="mongoenginetest")
-        self.db = get_db()
 
+class TestGeoField(MongoDBTestCase):
     def _test_for_expected_error(self, Cls, loc, expected):
         try:
             Cls(loc=loc).validate()
diff --git a/tests/queryset/__init__.py b/tests/queryset/__init__.py
index 31016966b..e69de29bb 100644
--- a/tests/queryset/__init__.py
+++ b/tests/queryset/__init__.py
@@ -1,6 +0,0 @@
-from .transform import *
-from .field_list import *
-from .queryset import *
-from .visitor import *
-from .geo import *
-from .modify import *
diff --git a/tests/queryset/field_list.py b/tests/queryset/test_field_list.py
similarity index 99%
rename from tests/queryset/field_list.py
rename to tests/queryset/test_field_list.py
index 9f0fe8277..703c20312 100644
--- a/tests/queryset/field_list.py
+++ b/tests/queryset/test_field_list.py
@@ -3,10 +3,8 @@
 from mongoengine import *
 from mongoengine.queryset import QueryFieldList
 
-__all__ = ("QueryFieldListTest", "OnlyExcludeAllTest")
 
-
-class QueryFieldListTest(unittest.TestCase):
+class TestQueryFieldList(unittest.TestCase):
     def test_empty(self):
         q = QueryFieldList()
         self.assertFalse(q)
@@ -66,7 +64,7 @@ def test_using_a_slice(self):
         self.assertEqual(q.as_dict(), {"a": {"$slice": 5}})
 
 
-class OnlyExcludeAllTest(unittest.TestCase):
+class TestOnlyExcludeAll(unittest.TestCase):
     def setUp(self):
         connect(db="mongoenginetest")
 
diff --git a/tests/queryset/geo.py b/tests/queryset/test_geo.py
similarity index 99%
rename from tests/queryset/geo.py
rename to tests/queryset/test_geo.py
index 95dc913da..343f864ba 100644
--- a/tests/queryset/geo.py
+++ b/tests/queryset/test_geo.py
@@ -6,10 +6,7 @@
 from tests.utils import MongoDBTestCase
 
 
-__all__ = ("GeoQueriesTest",)
-
-
-class GeoQueriesTest(MongoDBTestCase):
+class TestGeoQueries(MongoDBTestCase):
     def _create_event_data(self, point_field_class=GeoPointField):
         """Create some sample data re-used in many of the tests below."""
 
diff --git a/tests/queryset/queryset.py b/tests/queryset/test_queryset.py
similarity index 99%
rename from tests/queryset/queryset.py
rename to tests/queryset/test_queryset.py
index 9dc68f2e5..a9ecaef56 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -41,7 +41,7 @@ def get_key_compat(mongo_ver):
     return ORDER_BY_KEY, CMD_QUERY_KEY
 
 
-class QuerySetTest(unittest.TestCase):
+class TestQueryset(unittest.TestCase):
     def setUp(self):
         connect(db="mongoenginetest")
         connect(db="mongoenginetest2", alias="test2")

From a06e605e671bfcbe336addd780ae7c9e79069b99 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Thu, 29 Aug 2019 11:11:27 +0200
Subject: [PATCH 0922/1519] Add BulkWriteError exception

---
 mongoengine/errors.py        | 5 +++++
 mongoengine/queryset/base.py | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 9852f2a1d..b76243d38 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -12,6 +12,7 @@
     "InvalidQueryError",
     "OperationError",
     "NotUniqueError",
+    "BulkWriteError",
     "FieldDoesNotExist",
     "ValidationError",
     "SaveConditionError",
@@ -51,6 +52,10 @@ class NotUniqueError(OperationError):
     pass
 
 
+class BulkWriteError(OperationError):
+    pass
+
+
 class SaveConditionError(OperationError):
     pass
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 46b20d786..6d3fb41a0 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -20,6 +20,7 @@
 from mongoengine.connection import get_db
 from mongoengine.context_managers import set_write_concern, switch_db
 from mongoengine.errors import (
+    BulkWriteError,
     InvalidQueryError,
     LookUpError,
     NotUniqueError,
@@ -356,7 +357,7 @@ def insert(
             # inserting documents that already have an _id field will
             # give huge performance debt or raise
             message = u"Bulk write error: (%s)"
-            raise NotUniqueError(message % six.text_type(err.details))
+            raise BulkWriteError(message % six.text_type(err.details))
         except pymongo.errors.OperationFailure as err:
             message = "Could not save document (%s)"
             if re.match("^E1100[01] duplicate key", six.text_type(err)):

From 2267b7e7d740409dd1b9f648d1fe5b9e1cfdb7a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 30 Aug 2019 16:27:56 +0300
Subject: [PATCH 0923/1519] rename remaining files for pytest migration

---
 tests/queryset/{modify.py => test_modify.py}       |  6 ++----
 tests/queryset/{pickable.py => test_pickable.py}   | 11 +++--------
 tests/queryset/{transform.py => test_transform.py} |  4 +---
 tests/queryset/{visitor.py => test_visitor.py}     |  4 +---
 4 files changed, 7 insertions(+), 18 deletions(-)
 rename tests/queryset/{modify.py => test_modify.py} (96%)
 rename tests/queryset/{pickable.py => test_pickable.py} (87%)
 rename tests/queryset/{transform.py => test_transform.py} (99%)
 rename tests/queryset/{visitor.py => test_visitor.py} (99%)

diff --git a/tests/queryset/modify.py b/tests/queryset/test_modify.py
similarity index 96%
rename from tests/queryset/modify.py
rename to tests/queryset/test_modify.py
index e092d11cc..60f4884c9 100644
--- a/tests/queryset/modify.py
+++ b/tests/queryset/test_modify.py
@@ -1,8 +1,6 @@
 import unittest
 
-from mongoengine import connect, Document, IntField, StringField, ListField
-
-__all__ = ("FindAndModifyTest",)
+from mongoengine import Document, IntField, ListField, StringField, connect
 
 
 class Doc(Document):
@@ -10,7 +8,7 @@ class Doc(Document):
     value = IntField()
 
 
-class FindAndModifyTest(unittest.TestCase):
+class TestFindAndModify(unittest.TestCase):
     def setUp(self):
         connect(db="mongoenginetest")
         Doc.drop_collection()
diff --git a/tests/queryset/pickable.py b/tests/queryset/test_pickable.py
similarity index 87%
rename from tests/queryset/pickable.py
rename to tests/queryset/test_pickable.py
index 0945fcbcb..fbdd1ff03 100644
--- a/tests/queryset/pickable.py
+++ b/tests/queryset/test_pickable.py
@@ -1,10 +1,8 @@
 import pickle
 import unittest
-from pymongo.mongo_client import MongoClient
-from mongoengine import Document, StringField, IntField
-from mongoengine.connection import connect
 
-__author__ = "stas"
+from mongoengine import Document, IntField, StringField
+from mongoengine.connection import connect
 
 
 class Person(Document):
@@ -20,11 +18,8 @@ class TestQuerysetPickable(unittest.TestCase):
 
     def setUp(self):
         super(TestQuerysetPickable, self).setUp()
-
-        connection = connect(db="test")  # type: pymongo.mongo_client.MongoClient
-
+        connection = connect(db="test")
         connection.drop_database("test")
-
         self.john = Person.objects.create(name="John", age=21)
 
     def test_picke_simple_qs(self):
diff --git a/tests/queryset/transform.py b/tests/queryset/test_transform.py
similarity index 99%
rename from tests/queryset/transform.py
rename to tests/queryset/test_transform.py
index cfcd8c22b..8207351d5 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/test_transform.py
@@ -5,10 +5,8 @@
 from mongoengine import *
 from mongoengine.queryset import Q, transform
 
-__all__ = ("TransformTest",)
 
-
-class TransformTest(unittest.TestCase):
+class TestTransform(unittest.TestCase):
     def setUp(self):
         connect(db="mongoenginetest")
 
diff --git a/tests/queryset/visitor.py b/tests/queryset/test_visitor.py
similarity index 99%
rename from tests/queryset/visitor.py
rename to tests/queryset/test_visitor.py
index 0a22416fd..acadabd4b 100644
--- a/tests/queryset/visitor.py
+++ b/tests/queryset/test_visitor.py
@@ -8,10 +8,8 @@
 from mongoengine.errors import InvalidQueryError
 from mongoengine.queryset import Q
 
-__all__ = ("QTest",)
 
-
-class QTest(unittest.TestCase):
+class TestQ(unittest.TestCase):
     def setUp(self):
         connect(db="mongoenginetest")
 

From 693195f70be3b675757f700e40c6a66a74aa4b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 31 Aug 2019 22:28:31 +0300
Subject: [PATCH 0924/1519] fix test_pickable that was brought back to life
 recently

---
 tests/queryset/test_pickable.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/queryset/test_pickable.py b/tests/queryset/test_pickable.py
index fbdd1ff03..8c4e34261 100644
--- a/tests/queryset/test_pickable.py
+++ b/tests/queryset/test_pickable.py
@@ -3,6 +3,7 @@
 
 from mongoengine import Document, IntField, StringField
 from mongoengine.connection import connect
+from tests.utils import MongoDBTestCase
 
 
 class Person(Document):
@@ -10,7 +11,7 @@ class Person(Document):
     age = IntField()
 
 
-class TestQuerysetPickable(unittest.TestCase):
+class TestQuerysetPickable(MongoDBTestCase):
     """
     Test for adding pickling support for QuerySet instances
     See issue https://github.com/MongoEngine/mongoengine/issues/442
@@ -18,8 +19,6 @@ class TestQuerysetPickable(unittest.TestCase):
 
     def setUp(self):
         super(TestQuerysetPickable, self).setUp()
-        connection = connect(db="test")
-        connection.drop_database("test")
         self.john = Person.objects.create(name="John", age=21)
 
     def test_picke_simple_qs(self):

From 47f8a126ca167cb8fe020e3cc5604b155dfcdebc Mon Sep 17 00:00:00 2001
From: Arto Jantunen <arto@vainu.io>
Date: Tue, 3 Sep 2019 14:36:06 +0300
Subject: [PATCH 0925/1519] Only set no_cursor_timeout when requested

Previously this was always set for all requests. The parameter is only
documented as supported for certain queries, so this was probably wrong.

Mongo version 4.2 fails update queries that have this parameter set making
mongoengine unusable there. Fixes #2148.
---
 mongoengine/queryset/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ba3ac95aa..ffa099acb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1576,7 +1576,9 @@ def _cursor_args(self):
         if self._snapshot:
             msg = "The snapshot option is not anymore available with PyMongo 3+"
             warnings.warn(msg, DeprecationWarning)
-        cursor_args = {"no_cursor_timeout": not self._timeout}
+        cursor_args = {}
+        if not self._timeout:
+            cursor_args["no_cursor_timeout"] = True
 
         if self._loaded_fields:
             cursor_args[fields_name] = self._loaded_fields.as_dict()

From 1dbe7a3163033703720f4ccd3c6391b5f3f8d490 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul.b@gmail.com>
Date: Tue, 3 Sep 2019 16:17:09 +0200
Subject: [PATCH 0926/1519] Add log in changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 55fa4b256..5422f113d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -18,6 +18,7 @@ Development
 - Fix updating/modifying/deleting/reloading a document that's sharded by a field with ``db_field`` specified. #2125
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
 - The codebase is now formatted using ``black``. #2109
+- In bulk write insert, the detailed error message would raise in exception.
 
 Changes in 0.18.2
 =================

From 7d94af0e3181751894884cbfcd55fe9383db028b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 11 Sep 2019 21:53:30 +0200
Subject: [PATCH 0927/1519] add test coverage for no_cursor_timeout to support
 recent fix

---
 mongoengine/queryset/base.py    |  1 +
 tests/queryset/test_queryset.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ffa099acb..570ad37f1 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1576,6 +1576,7 @@ def _cursor_args(self):
         if self._snapshot:
             msg = "The snapshot option is not anymore available with PyMongo 3+"
             warnings.warn(msg, DeprecationWarning)
+
         cursor_args = {}
         if not self._timeout:
             cursor_args["no_cursor_timeout"] = True
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index a9ecaef56..e7e59905d 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -5809,9 +5809,19 @@ def test_create_count(self):
         self.Person.objects.create(name="Baz")
         self.assertEqual(self.Person.objects.count(with_limit_and_skip=True), 3)
 
-        newPerson = self.Person.objects.create(name="Foo_1")
+        self.Person.objects.create(name="Foo_1")
         self.assertEqual(self.Person.objects.count(with_limit_and_skip=True), 4)
 
+    def test_no_cursor_timeout(self):
+        qs = self.Person.objects()
+        self.assertEqual(qs._cursor_args, {})  # ensure no regression of  #2148
+
+        qs = self.Person.objects().timeout(True)
+        self.assertEqual(qs._cursor_args, {})
+
+        qs = self.Person.objects().timeout(False)
+        self.assertEqual(qs._cursor_args, {"no_cursor_timeout": True})
+
 
 if __name__ == "__main__":
     unittest.main()

From 7ac74b1c1f60967852bea294c318adc0a45e347e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 15 Sep 2019 23:27:34 +0200
Subject: [PATCH 0928/1519] Document Model.objects.aggregate entrypoint with an
 example

---
 docs/guide/querying.rst | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 151855a63..50218aed0 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -349,9 +349,9 @@ Just as with limiting and skipping results, there is a method on a
 You could technically use ``len(User.objects)`` to get the same result, but it
 would be significantly slower than :meth:`~mongoengine.queryset.QuerySet.count`.
 When you execute a server-side count query, you let MongoDB do the heavy
-lifting and you receive a single integer over the wire. Meanwhile, len()
+lifting and you receive a single integer over the wire. Meanwhile, ``len()``
 retrieves all the results, places them in a local cache, and finally counts
-them. If we compare the performance of the two operations, len() is much slower
+them. If we compare the performance of the two operations, ``len()`` is much slower
 than :meth:`~mongoengine.queryset.QuerySet.count`.
 
 Further aggregation
@@ -386,6 +386,18 @@ would be generating "tag-clouds"::
     top_tags = sorted(tag_freqs.items(), key=itemgetter(1), reverse=True)[:10]
 
 
+MongoDB aggregation API
+-----------------------
+If you need to run aggregation pipelines, MongoEngine provides an entry point to `pymongo's aggregation framework <https://api.mongodb.com/python/current/examples/aggregation.html#aggregation-framework>`_
+ through :meth:`~mongoengine.queryset.base.aggregate`. Checkout pymongo's documentation for the syntax and pipeline.
+An example of its use would be ::
+
+        class Person(Document):
+            name = StringField()
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects().aggregate(*pipeline)    # Would return e.g: [{"_id": ObjectId('5d7eac82aae098e4ed3784c7'), "name": "JOHN DOE"}]
+
 Query efficiency and performance
 ================================
 

From be2c4f2b3cdfe13d9abe92312409761d91f0040c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 16 Sep 2019 21:15:35 +0200
Subject: [PATCH 0929/1519] fix formatting and improve doc based on review

---
 docs/guide/querying.rst | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 50218aed0..d64c169c4 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -388,15 +388,22 @@ would be generating "tag-clouds"::
 
 MongoDB aggregation API
 -----------------------
-If you need to run aggregation pipelines, MongoEngine provides an entry point to `pymongo's aggregation framework <https://api.mongodb.com/python/current/examples/aggregation.html#aggregation-framework>`_
- through :meth:`~mongoengine.queryset.base.aggregate`. Checkout pymongo's documentation for the syntax and pipeline.
-An example of its use would be ::
+If you need to run aggregation pipelines, MongoEngine provides an entry point `Pymongo's aggregation framework <https://api.mongodb.com/python/current/examples/aggregation.html#aggregation-framework>`_
+through :meth:`~mongoengine.queryset.QuerySet.aggregate`. Check out Pymongo's documentation for the syntax and pipeline.
+An example of its use would be::
 
         class Person(Document):
             name = StringField()
 
-        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
-        data = Person.objects().aggregate(*pipeline)    # Would return e.g: [{"_id": ObjectId('5d7eac82aae098e4ed3784c7'), "name": "JOHN DOE"}]
+        Person(name='John').save()
+        Person(name='Bob').save()
+
+        pipeline = [
+            {"$sort" : {"name" : -1}},
+            {"$project": {"_id": 0, "name": {"$toUpper": "$name"}}}
+            ]
+        data = Person.objects().aggregate(*pipeline)
+        assert data == [{'name': 'BOB'}, {'name': 'JOHN'}]
 
 Query efficiency and performance
 ================================

From 8f288fe45875050ac39985dcf9bcc304b6c1f15e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 29 Sep 2019 22:48:46 +0200
Subject: [PATCH 0930/1519] add mongodb 4.0 to travis and docs

---
 .travis.yml | 10 ++++++----
 README.rst  |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 54a6befdc..21321841e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@
 # with a very large number of jobs, hence we only test a subset of all the
 # combinations:
 # * MongoDB v3.4 & the latest PyMongo v3.x is currently the "main" setup,
-#   tested against Python v2.7, v3.5, v3.6, and PyPy.
+#   tested against Python v2.7, v3.5, v3.6, v3.7, PyPy and PyPy3.
 # * Besides that, we test the lowest actively supported Python/MongoDB/PyMongo
 #   combination: MongoDB v3.4, PyMongo v3.4, Python v2.7.
 # * MongoDB v3.6 is tested against Python v3.6, and PyMongo v3.6, v3.7, v3.8.
@@ -30,15 +30,16 @@ dist: xenial
 
 env:
   global:
+    - MONGODB_4_0=4.0.12
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
+    - PYMONGO_3_9=3.9
     - PYMONGO_3_6=3.6
     - PYMONGO_3_4=3.4
   matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_6}
+    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_9}
 
 matrix:
-
   # Finish the build as soon as one job fails
   fast_finish: true
 
@@ -47,7 +48,8 @@ matrix:
     env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4}
   - python: 3.7
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
-
+  - python: 3.7
+    env: MONGODB=${MONGODB_4_0} PYMONGO=${PYMONGO_3_9}
 
 install:
   # Install Mongo
diff --git a/README.rst b/README.rst
index 679980f82..82b328932 100644
--- a/README.rst
+++ b/README.rst
@@ -26,10 +26,10 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v3.4 and v3.6. Future versions
+MongoEngine is currently tested against MongoDB v3.4, v3.6 and v4.0. Future versions
 should be supported as well, but aren't actively tested at the moment. Make
 sure to open an issue or submit a pull request if you experience any problems
-with MongoDB version > 3.6.
+with MongoDB version > 4.0.
 
 Installation
 ============

From b61c8cd104975b5fb47681387abc443c8c8430b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 1 Oct 2019 22:17:19 +0200
Subject: [PATCH 0931/1519] fix tox envs

---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index a1ae84441..a7921c61a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,pypy,pypy3}-{mg34,mg36}
+envlist = {py27,py35,pypy,pypy3}-{mg34,mg36, mg39}
 
 [testenv]
 commands =
@@ -8,5 +8,6 @@ deps =
     nose
     mg34: pymongo>=3.4,<3.5
     mg36: pymongo>=3.6,<3.7
+    mg39: pymongo>=3.9,<4.0
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From e3cd553f8211d473b54fb3c91da8bf9fa2ad053d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 4 Oct 2019 21:30:32 +0200
Subject: [PATCH 0932/1519] add latest pymongo 3.9 as part of the CI

---
 .travis.yml                     |  5 ++++-
 mongoengine/queryset/base.py    |  1 +
 tests/queryset/test_queryset.py | 26 +++++++++-----------------
 tox.ini                         |  1 +
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 54a6befdc..af1e2b147 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,11 @@ env:
   global:
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
+    - PYMONGO_3_9=3.9
     - PYMONGO_3_6=3.6
     - PYMONGO_3_4=3.4
   matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_6}
+    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_9}
 
 matrix:
 
@@ -47,6 +48,8 @@ matrix:
     env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4}
   - python: 3.7
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
+  - python: 3.7
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
 
 
 install:
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index cde06d542..a09cbf99d 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1639,6 +1639,7 @@ def _cursor(self):
             ).find(self._query, **self._cursor_args)
         else:
             self._cursor_obj = self._collection.find(self._query, **self._cursor_args)
+
         # Apply "where" clauses to cursor
         if self._where_clause:
             where_clause = self._sub_js_fields(self._where_clause)
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index e7e59905d..162132548 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4641,43 +4641,35 @@ class Bar(Document):
         bars = Bar.objects.read_preference(ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
         self.assertEqual(
-            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
+            bars._cursor.collection.read_preference, ReadPreference.SECONDARY_PREFERRED
         )
 
         # Make sure that `.read_preference(...)` does accept string values.
         self.assertRaises(TypeError, Bar.objects.read_preference, "Primary")
 
+        def assert_read_pref(qs, expected_read_pref):
+            self.assertEqual(qs._read_preference, expected_read_pref)
+            self.assertEqual(qs._cursor.collection.read_preference, expected_read_pref)
+
         # Make sure read preference is respected after a `.skip(...)`.
         bars = Bar.objects.skip(1).read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
-        )
+        assert_read_pref(bars, ReadPreference.SECONDARY_PREFERRED)
 
         # Make sure read preference is respected after a `.limit(...)`.
         bars = Bar.objects.limit(1).read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
-        )
+        assert_read_pref(bars, ReadPreference.SECONDARY_PREFERRED)
 
         # Make sure read preference is respected after an `.order_by(...)`.
         bars = Bar.objects.order_by("txt").read_preference(
             ReadPreference.SECONDARY_PREFERRED
         )
-        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
-        )
+        assert_read_pref(bars, ReadPreference.SECONDARY_PREFERRED)
 
         # Make sure read preference is respected after a `.hint(...)`.
         bars = Bar.objects.hint([("txt", 1)]).read_preference(
             ReadPreference.SECONDARY_PREFERRED
         )
-        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._cursor._Cursor__read_preference, ReadPreference.SECONDARY_PREFERRED
-        )
+        assert_read_pref(bars, ReadPreference.SECONDARY_PREFERRED)
 
     def test_read_preference_aggregation_framework(self):
         class Bar(Document):
diff --git a/tox.ini b/tox.ini
index a1ae84441..b4a578186 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,5 +8,6 @@ deps =
     nose
     mg34: pymongo>=3.4,<3.5
     mg36: pymongo>=3.6,<3.7
+    mg39: pymongo>=3.9,<4.0
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 71e8d9a49067f1c790739f43fb3ff35baf01c458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 10 Sep 2019 23:02:32 +0200
Subject: [PATCH 0933/1519] Added a FAQ to doc and Document the fact that we
 dont support motor

---
 docs/faq.rst   | 13 +++++++++++++
 docs/index.rst |  4 ++++
 2 files changed, 17 insertions(+)
 create mode 100644 docs/faq.rst

diff --git a/docs/faq.rst b/docs/faq.rst
new file mode 100644
index 000000000..27cd69373
--- /dev/null
+++ b/docs/faq.rst
@@ -0,0 +1,13 @@
+==========================
+Frequently Asked Questions
+==========================
+
+Does MongoEngine support asynchronous drivers (Motor, TxMongo)?
+---------------------------------------------------------------
+
+No, MongoEngine is exclusively based on PyMongo and isn't designed to support other driver.
+If this is a requirement for your project, check the alternative:  `uMongo`_ and `MotorEngine`_.
+
+.. _uMongo: https://umongo.readthedocs.io/
+.. _MotorEngine: https://motorengine.readthedocs.io/
+
diff --git a/docs/index.rst b/docs/index.rst
index 2102df026..686ef547b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,6 +23,9 @@ MongoDB. To install it, simply run
 :doc:`upgrade`
   How to upgrade MongoEngine.
 
+:doc:`faq`
+  Frequently Asked Questions
+
 :doc:`django`
   Using MongoEngine and Django
 
@@ -73,6 +76,7 @@ formats for offline reading.
     apireference
     changelog
     upgrade
+    faq
     django
 
 Indices and tables

From 19f12f3f2f380987c23dcafb8f288eb51177363d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 4 Oct 2019 21:51:12 +0200
Subject: [PATCH 0934/1519] document pymongo in RTD and make it point to github

---
 docs/index.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/index.rst b/docs/index.rst
index 686ef547b..662968d48 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -29,6 +29,12 @@ MongoDB. To install it, simply run
 :doc:`django`
   Using MongoEngine and Django
 
+MongoDB and driver support
+--------------------------
+
+MongoEngine is based on the PyMongo driver and tested against multiple versions of MongoDB.
+For further details, please refer to the `readme <https://github.com/MongoEngine/mongoengine#mongoengine>`_.
+
 Community
 ---------
 

From 1e17b5ac66148387a18d078f4b21cc406beef4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 5 Oct 2019 14:24:54 +0200
Subject: [PATCH 0935/1519] Fix docstring format to improve pycharm inspection

---
 mongoengine/base/document.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index a962a82b6..2be8dd6f6 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -62,13 +62,13 @@ def __init__(self, *args, **values):
         """
         Initialise a document or an embedded document.
 
-        :param dict values: A dictionary of keys and values for the document.
+        :param values: A dictionary of keys and values for the document.
             It may contain additional reserved keywords, e.g. "__auto_convert".
-        :param bool __auto_convert: If True, supplied values will be converted
+        :param __auto_convert: If True, supplied values will be converted
             to Python-type values via each field's `to_python` method.
-        :param set __only_fields: A set of fields that have been loaded for
+        :param __only_fields: A set of fields that have been loaded for
             this document. Empty if all fields have been loaded.
-        :param bool _created: Indicates whether this is a brand new document
+        :param _created: Indicates whether this is a brand new document
             or whether it's already been persisted before. Defaults to true.
         """
         self._initialised = False

From 5bcc6791947f0520a171dc5d4b843c9321efe683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 10 Oct 2019 22:55:44 +0200
Subject: [PATCH 0936/1519] fix 2 pymongo deprecation warnings

---
 tests/test_connection.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index b7dc92687..071f42079 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,35 +1,33 @@
 import datetime
 
+from bson.tz_util import utc
+from nose.plugins.skip import SkipTest
+import pymongo
 from pymongo import MongoClient
-from pymongo.errors import OperationFailure, InvalidName
 from pymongo import ReadPreference
+from pymongo.errors import InvalidName, OperationFailure
 
-from mongoengine import Document
 
 try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-from nose.plugins.skip import SkipTest
-
-import pymongo
-from bson.tz_util import utc
 
+import mongoengine.connection
 from mongoengine import (
-    connect,
-    register_connection,
-    Document,
     DateTimeField,
-    disconnect_all,
+    Document,
     StringField,
+    connect,
+    disconnect_all,
+    register_connection,
 )
-import mongoengine.connection
 from mongoengine.connection import (
     ConnectionFailure,
-    get_db,
-    get_connection,
-    disconnect,
     DEFAULT_DATABASE_NAME,
+    disconnect,
+    get_connection,
+    get_db,
 )
 
 
@@ -289,7 +287,7 @@ class SomeDocument(Document):
         # database won't exist until we save a document
         some_document.save()
         self.assertEqual(conn.get_default_database().name, "mongoenginetest")
-        self.assertEqual(conn.database_names()[0], "mongoenginetest")
+        self.assertEqual(conn.list_database_names()[0], "mongoenginetest")
 
     def test_connect_with_host_list(self):
         """Ensure that the connect() method works when host is a list
@@ -631,8 +629,10 @@ def test_write_concern(self):
         """Ensure write concern can be specified in connect() via
         a kwarg or as part of the connection URI.
         """
-        conn1 = connect(alias="conn1", host="mongodb://localhost/testing?w=1&j=true")
-        conn2 = connect("testing", alias="conn2", w=1, j=True)
+        conn1 = connect(
+            alias="conn1", host="mongodb://localhost/testing?w=1&journal=true"
+        )
+        conn2 = connect("testing", alias="conn2", w=1, journal=True)
         self.assertEqual(conn1.write_concern.document, {"w": 1, "j": True})
         self.assertEqual(conn2.write_concern.document, {"w": 1, "j": True})
 

From c60ed32f3a795a36f15e419fb09fe40b826947d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 16 Oct 2019 21:25:17 +0200
Subject: [PATCH 0937/1519] Documented how pymongo.monitoring can be used with
 MongoEngine

---
 docs/changelog.rst                |  2 +
 docs/guide/index.rst              |  1 +
 docs/guide/logging-monitoring.rst | 80 +++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 docs/guide/logging-monitoring.rst

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5422f113d..58d7f2723 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,8 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Documentation improvements:
+    - Documented how `pymongo.monitoring` can be used to log all queries issued by MongoEngine to the driver.
 - BREAKING CHANGE: ``class_check`` and ``read_preference`` keyword arguments are no longer available when filtering a ``QuerySet``. #2112
     - Instead of ``Doc.objects(foo=bar, read_preference=...)`` use ``Doc.objects(foo=bar).read_preference(...)``.
     - Instead of ``Doc.objects(foo=bar, class_check=False)`` use ``Doc.objects(foo=bar).clear_cls_query(...)``.
diff --git a/docs/guide/index.rst b/docs/guide/index.rst
index 46eb7af2c..a0364ec19 100644
--- a/docs/guide/index.rst
+++ b/docs/guide/index.rst
@@ -13,4 +13,5 @@ User Guide
    gridfs
    signals
    text-indexes
+   logging-monitoring
    mongomock
diff --git a/docs/guide/logging-monitoring.rst b/docs/guide/logging-monitoring.rst
new file mode 100644
index 000000000..9f523b79c
--- /dev/null
+++ b/docs/guide/logging-monitoring.rst
@@ -0,0 +1,80 @@
+==================
+Logging/Monitoring
+==================
+
+It is possible to use `pymongo.monitoring <https://api.mongodb.com/python/current/api/pymongo/monitoring.html>`_ to monitor
+the driver events (e.g: queries, connections, etc). This can be handy if you want to monitor the queries issued by
+MongoEngine to the driver.
+
+To use `pymongo.monitoring` with MongoEngine, you need to make sure that you are registering the listeners
+**before** establishing the database connection (i.e calling `connect`):
+
+The following snippet provides a basic logging of all command events:
+
+.. code-block:: python
+
+    import logging
+    from pymongo import monitoring
+    from mongoengine import *
+
+    log = logging.getLogger()
+    log.setLevel(logging.DEBUG)
+    logging.basicConfig(level=logging.DEBUG)
+
+
+    class CommandLogger(monitoring.CommandListener):
+
+        def started(self, event):
+            log.debug("Command {0.command_name} with request id "
+                     "{0.request_id} started on server "
+                     "{0.connection_id}".format(event))
+
+        def succeeded(self, event):
+            log.debug("Command {0.command_name} with request id "
+                     "{0.request_id} on server {0.connection_id} "
+                     "succeeded in {0.duration_micros} "
+                     "microseconds".format(event))
+
+        def failed(self, event):
+            log.debug("Command {0.command_name} with request id "
+                     "{0.request_id} on server {0.connection_id} "
+                     "failed in {0.duration_micros} "
+                     "microseconds".format(event))
+
+    monitoring.register(CommandLogger())
+
+
+    class Jedi(Document):
+        name = StringField()
+
+
+    connect()
+
+
+    log.info('GO!')
+
+    log.info('Saving an item through MongoEngine...')
+    Jedi(name='Obi-Wan Kenobii').save()
+
+    log.info('Querying through MongoEngine...')
+    obiwan = Jedi.objects.first()
+
+    log.info('Updating through MongoEngine...')
+    obiwan.name = 'Obi-Wan Kenobi'
+    obiwan.save()
+
+
+Executing this prints the following output::
+
+    INFO:root:GO!
+    INFO:root:Saving an item through MongoEngine...
+    DEBUG:root:Command insert with request id 1681692777 started on server ('localhost', 27017)
+    DEBUG:root:Command insert with request id 1681692777 on server ('localhost', 27017) succeeded in 562 microseconds
+    INFO:root:Querying through MongoEngine...
+    DEBUG:root:Command find with request id 1714636915 started on server ('localhost', 27017)
+    DEBUG:root:Command find with request id 1714636915 on server ('localhost', 27017) succeeded in 341 microseconds
+    INFO:root:Updating through MongoEngine...
+    DEBUG:root:Command update with request id 1957747793 started on server ('localhost', 27017)
+    DEBUG:root:Command update with request id 1957747793 on server ('localhost', 27017) succeeded in 455 microseconds
+
+More details can of course be obtained by checking the `event` argument from the `CommandListener`.

From 8bf5370b6cdac97e00b314d6cd57016494a25873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 28 Oct 2019 22:05:13 +0100
Subject: [PATCH 0938/1519] Improve error message from InvalidDocumentError
 whenever an embedded document has a bad shape (e.g due to migration)

---
 docs/changelog.rst              |  1 +
 mongoengine/base/document.py    |  9 +++++++--
 tests/document/test_instance.py | 23 +++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5422f113d..a717b8374 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,6 +15,7 @@ Development
     - If you catch/use ``MongoEngineConnectionError`` in your code, you'll have to rename it.
 - BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
     - From now on keyword arguments (e.g. ``Doc(field_name=value)``) are required.
+- Improve error message related to InvalidDocumentError #2180
 - Fix updating/modifying/deleting/reloading a document that's sharded by a field with ``db_field`` specified. #2125
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
 - The codebase is now formatted using ``black``. #2109
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index a962a82b6..a967436a7 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -732,7 +732,10 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
             only_fields = []
 
         if son and not isinstance(son, dict):
-            raise ValueError("The source SON object needs to be of type 'dict'")
+            raise ValueError(
+                "The source SON object needs to be of type 'dict' but a '%s' was found"
+                % type(son)
+            )
 
         # Get the class name from the document, falling back to the given
         # class if unavailable
@@ -770,7 +773,9 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
                     errors_dict[field_name] = e
 
         if errors_dict:
-            errors = "\n".join(["%s - %s" % (k, v) for k, v in errors_dict.items()])
+            errors = "\n".join(
+                ["Field '%s' - %s" % (k, v) for k, v in errors_dict.items()]
+            )
             msg = "Invalid data to create a `%s` instance.\n%s" % (
                 cls._class_name,
                 errors,
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 9b4a16e5a..60e5313d2 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3656,6 +3656,29 @@ class User(Document):
         with self.assertRaises(DuplicateKeyError):
             User.objects().select_related()
 
+    def test_embedded_document_failed_while_loading_instance_when_it_is_not_a_dict(
+        self
+    ):
+        class LightSaber(EmbeddedDocument):
+            color = StringField()
+
+        class Jedi(Document):
+            light_saber = EmbeddedDocumentField(LightSaber)
+
+        coll = Jedi._get_collection()
+        Jedi(light_saber=LightSaber(color="red")).save()
+        _ = list(Jedi.objects)  # Ensure a proper document loads without errors
+
+        # Forces a document with a wrong shape (may occur in case of migration)
+        coll.insert_one({"light_saber": "I_should_be_a_dict"})
+
+        with self.assertRaises(InvalidDocumentError) as cm:
+            list(Jedi.objects)
+        self.assertEqual(
+            str(cm.exception),
+            "Invalid data to create a `Jedi` instance.\nField 'light_saber' - The source SON object needs to be of type 'dict' but a '<type 'unicode'>' was found",
+        )
+
 
 class ObjectKeyTestCase(MongoDBTestCase):
     def test_object_key_simple_document(self):

From 54ca7bf09fa70a4fba3d83d8fc77090cddaaae67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 28 Oct 2019 22:38:21 +0100
Subject: [PATCH 0939/1519] fix associated test to avoid discrepencies btw py2
 and py3

---
 tests/document/test_instance.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 60e5313d2..7a868d299 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3670,13 +3670,16 @@ class Jedi(Document):
         _ = list(Jedi.objects)  # Ensure a proper document loads without errors
 
         # Forces a document with a wrong shape (may occur in case of migration)
-        coll.insert_one({"light_saber": "I_should_be_a_dict"})
+        value = u"I_should_be_a_dict"
+        coll.insert_one({"light_saber": value})
 
         with self.assertRaises(InvalidDocumentError) as cm:
             list(Jedi.objects)
+
         self.assertEqual(
             str(cm.exception),
-            "Invalid data to create a `Jedi` instance.\nField 'light_saber' - The source SON object needs to be of type 'dict' but a '<type 'unicode'>' was found",
+            "Invalid data to create a `Jedi` instance.\nField 'light_saber' - The source SON object needs to be of type 'dict' but a '%s' was found"
+            % type(value),
         )
 
 

From bbfa97886188584ffcc7cfb73d084e2206832c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 25 Aug 2019 15:21:30 +0300
Subject: [PATCH 0940/1519] switch test runner from nose to pytest

---
 .travis.yml      |  6 ++---
 README.rst       | 11 ++++----
 setup.cfg        | 11 ++++----
 setup.py         | 66 ++++++++++++++++++++++++++++++++++++++++++++++--
 tests/test_ci.py |  9 +++++++
 tox.ini          |  2 +-
 6 files changed, 87 insertions(+), 18 deletions(-)
 create mode 100644 tests/test_ci.py

diff --git a/.travis.yml b/.travis.yml
index af1e2b147..9d2ba8c1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,8 +63,8 @@ install:
   - pip install flake8 flake8-import-order
   - pip install tox         # tox 3.11.0 has requirement virtualenv>=14.0.0
   - pip install virtualenv  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
-  # Install the tox venv.
-  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -e test
+  # Install the tox venv (we make pytest avoid running the test by giving a bad pattern)
+  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
   # Install black for Python v3.7 only.
   - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then pip install black; fi
 
@@ -76,7 +76,7 @@ before_script:
   - mongo --eval 'db.version();'    # Make sure mongo is awake
 
 script:
-  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- --with-coverage
+  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') #-- --with-coverage
 
 # For now only submit coveralls for Python v2.7. Python v3.x currently shows
 # 0% coverage. That's caused by 'use_2to3', which builds the py3-compatible
diff --git a/README.rst b/README.rst
index 679980f82..853d8fbe7 100644
--- a/README.rst
+++ b/README.rst
@@ -116,7 +116,8 @@ Some simple examples of what MongoEngine code looks like:
 Tests
 =====
 To run the test suite, ensure you are running a local instance of MongoDB on
-the standard port and have ``nose`` installed. Then, run ``python setup.py nosetests``.
+the standard port and have ``pytest`` installed. Then, run ``python setup.py test``
+or simply ``pytest``.
 
 To run the test suite on every supported Python and PyMongo version, you can
 use ``tox``. You'll need to make sure you have each supported Python version
@@ -129,16 +130,14 @@ installed in your environment and then:
     # Run the test suites
     $ tox
 
-If you wish to run a subset of tests, use the nosetests convention:
+If you wish to run a subset of tests, use the pytest convention:
 
 .. code-block:: shell
 
     # Run all the tests in a particular test file
-    $ python setup.py nosetests --tests tests/fields/fields.py
+    $ pytest tests/fields/test_fields.py
     # Run only particular test class in that file
-    $ python setup.py nosetests --tests tests/fields/fields.py:FieldTest
-    # Use the -s option if you want to print some debug statements or use pdb
-    $ python setup.py nosetests --tests tests/fields/fields.py:FieldTest -s
+    $ pytest tests/fields/test_fields.py::TestField
 
 Community
 =========
diff --git a/setup.cfg b/setup.cfg
index 4bded428e..ae1b4f7ec 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,11 +1,10 @@
-[nosetests]
-verbosity=2
-detailed-errors=1
-#tests=tests
-cover-package=mongoengine
-
 [flake8]
 ignore=E501,F401,F403,F405,I201,I202,W504, W605, W503
 exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
 max-complexity=47
 application-import-names=mongoengine,tests
+
+[tool:pytest]
+# Limits the discovery to tests directory
+# avoids that it runs for instance the benchmark
+testpaths = tests
diff --git a/setup.py b/setup.py
index c73a93ff2..81cc97447 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,9 @@
 import os
 import sys
+
+from pkg_resources import normalize_path
 from setuptools import find_packages, setup
+from setuptools.command.test import test as TestCommand
 
 # Hack to silence atexit traceback in newer python versions
 try:
@@ -24,6 +27,65 @@ def get_version(version_tuple):
     return ".".join(map(str, version_tuple))
 
 
+class PyTest(TestCommand):
+    """Will force pytest to search for tests inside the build directory
+    for 2to3 converted code (used by tox), instead of the current directory.
+    Required as long as we need 2to3
+
+    Known Limitation: https://tox.readthedocs.io/en/latest/example/pytest.html#known-issues-and-limitations
+    Source: https://www.hackzine.org/python-testing-with-pytest-and-2to3-plus-tox-and-travis-ci.html
+    """
+
+    # https://pytest.readthedocs.io/en/2.7.3/goodpractises.html#integration-with-setuptools-test-commands
+    # Allows to provide pytest command arguments through the test runner command `python setup.py test`
+    # e.g: `python setup.py test -a "-k=test"`
+    user_options = [("pytest-args=", "a", "Arguments to pass to py.test")]
+
+    def initialize_options(self):
+        TestCommand.initialize_options(self)
+        self.pytest_args = ""
+
+    def finalize_options(self):
+        TestCommand.finalize_options(self)
+        self.test_args = ["tests"]
+        self.test_suite = True
+
+    def run_tests(self):
+        # import here, cause outside the eggs aren't loaded
+        from pkg_resources import _namespace_packages
+        import pytest
+
+        # Purge modules under test from sys.modules. The test loader will
+        # re-import them from the build location. Required when 2to3 is used
+        # with namespace packages.
+        if sys.version_info >= (3,) and getattr(self.distribution, "use_2to3", False):
+            print("Hack for 2to3", self.test_args)
+            module = self.test_args[-1].split(".")[0]
+            if module in _namespace_packages:
+                del_modules = []
+                if module in sys.modules:
+                    del_modules.append(module)
+                module += "."
+                for name in sys.modules:
+                    if name.startswith(module):
+                        del_modules.append(name)
+                map(sys.modules.__delitem__, del_modules)
+
+            # Run on the build directory for 2to3-built code
+            # This will prevent the old 2.x code from being found
+            # by py.test discovery mechanism, that apparently
+            # ignores sys.path..
+            ei_cmd = self.get_finalized_command("egg_info")
+            self.test_args = [normalize_path(ei_cmd.egg_base)]
+
+        print(self.test_args, self.pytest_args)
+        cmd_args = self.test_args + ([self.pytest_args] if self.pytest_args else [])
+        print(cmd_args)
+        errno = pytest.main(cmd_args)
+
+        sys.exit(errno)
+
+
 # Dirty hack to get version number from monogengine/__init__.py - we can't
 # import it as it depends on PyMongo and PyMongo isn't installed until this
 # file is read
@@ -51,7 +113,7 @@ def get_version(version_tuple):
 
 extra_opts = {
     "packages": find_packages(exclude=["tests", "tests.*"]),
-    "tests_require": ["nose", "coverage==4.2", "blinker", "Pillow>=2.0.0"],
+    "tests_require": ["pytest<5.0", "coverage==4.2", "blinker", "Pillow>=2.0.0"],
 }
 if sys.version_info[0] == 3:
     extra_opts["use_2to3"] = True
@@ -79,6 +141,6 @@ def get_version(version_tuple):
     platforms=["any"],
     classifiers=CLASSIFIERS,
     install_requires=["pymongo>=3.4", "six"],
-    test_suite="nose.collector",
+    cmdclass={"test": PyTest},
     **extra_opts
 )
diff --git a/tests/test_ci.py b/tests/test_ci.py
new file mode 100644
index 000000000..04a800ebf
--- /dev/null
+++ b/tests/test_ci.py
@@ -0,0 +1,9 @@
+def test_ci_placeholder():
+    # This empty test is used within the CI to
+    # setup the tox venv without running the test suite
+    # if we simply skip all test with pytest -k=wrong_pattern
+    # pytest command would return with exit_code=5 (i.e "no tests run")
+    # making travis fail
+    # this empty test is the recommended way to handle this
+    # as described in https://github.com/pytest-dev/pytest/issues/2393
+    pass
diff --git a/tox.ini b/tox.ini
index b4a578186..94ccc9cfe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist = {py27,py35,pypy,pypy3}-{mg34,mg36}
 
 [testenv]
 commands =
-    python setup.py nosetests {posargs}
+    python setup.py test {posargs}
 deps =
     nose
     mg34: pymongo>=3.4,<3.5

From 5a16dda50d228d7670bfa7467be7e6124369406f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 26 Aug 2019 17:12:56 +0300
Subject: [PATCH 0941/1519] fix coverage for pytest runner

---
 .travis.yml | 4 ++--
 setup.py    | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9d2ba8c1e..2992d4166 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,13 +76,13 @@ before_script:
   - mongo --eval 'db.version();'    # Make sure mongo is awake
 
 script:
-  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') #-- --with-coverage
+  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
 
 # For now only submit coveralls for Python v2.7. Python v3.x currently shows
 # 0% coverage. That's caused by 'use_2to3', which builds the py3-compatible
 # code in a separate dir and runs tests on that.
 after_success:
-- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls --verbose; fi
+- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then cat .coverage & coveralls --verbose; fi
 
 notifications:
   irc: irc.freenode.org#mongoengine
diff --git a/setup.py b/setup.py
index 81cc97447..94f71162d 100644
--- a/setup.py
+++ b/setup.py
@@ -113,7 +113,13 @@ def run_tests(self):
 
 extra_opts = {
     "packages": find_packages(exclude=["tests", "tests.*"]),
-    "tests_require": ["pytest<5.0", "coverage==4.2", "blinker", "Pillow>=2.0.0"],
+    "tests_require": [
+        "pytest<5.0",
+        "pytest-cov",
+        "coverage",
+        "blinker",
+        "Pillow>=2.0.0",
+    ],
 }
 if sys.version_info[0] == 3:
     extra_opts["use_2to3"] = True

From 51ea3e3c6ff562260616127cde2f806008abc85d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 28 Aug 2019 15:07:27 +0300
Subject: [PATCH 0942/1519] fix for recent coverage/coveralls compatibility
 issue

---
 .travis.yml | 4 ++--
 setup.py    | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2992d4166..cbf34cde7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,7 +63,7 @@ install:
   - pip install flake8 flake8-import-order
   - pip install tox         # tox 3.11.0 has requirement virtualenv>=14.0.0
   - pip install virtualenv  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
-  # Install the tox venv (we make pytest avoid running the test by giving a bad pattern)
+  # tox dryrun to setup the tox venv (we run a mock test).
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
   # Install black for Python v3.7 only.
   - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then pip install black; fi
@@ -82,7 +82,7 @@ script:
 # 0% coverage. That's caused by 'use_2to3', which builds the py3-compatible
 # code in a separate dir and runs tests on that.
 after_success:
-- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then cat .coverage & coveralls --verbose; fi
+- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls --verbose; else echo "coveralls only sent for py27"; fi
 
 notifications:
   irc: irc.freenode.org#mongoengine
diff --git a/setup.py b/setup.py
index 94f71162d..2bc1ae1ca 100644
--- a/setup.py
+++ b/setup.py
@@ -37,8 +37,9 @@ class PyTest(TestCommand):
     """
 
     # https://pytest.readthedocs.io/en/2.7.3/goodpractises.html#integration-with-setuptools-test-commands
-    # Allows to provide pytest command arguments through the test runner command `python setup.py test`
+    # Allows to provide pytest command argument through the test runner command `python setup.py test`
     # e.g: `python setup.py test -a "-k=test"`
+    # This only works for 1 argument though
     user_options = [("pytest-args=", "a", "Arguments to pass to py.test")]
 
     def initialize_options(self):
@@ -59,7 +60,6 @@ def run_tests(self):
         # re-import them from the build location. Required when 2to3 is used
         # with namespace packages.
         if sys.version_info >= (3,) and getattr(self.distribution, "use_2to3", False):
-            print("Hack for 2to3", self.test_args)
             module = self.test_args[-1].split(".")[0]
             if module in _namespace_packages:
                 del_modules = []
@@ -78,11 +78,8 @@ def run_tests(self):
             ei_cmd = self.get_finalized_command("egg_info")
             self.test_args = [normalize_path(ei_cmd.egg_base)]
 
-        print(self.test_args, self.pytest_args)
         cmd_args = self.test_args + ([self.pytest_args] if self.pytest_args else [])
-        print(cmd_args)
         errno = pytest.main(cmd_args)
-
         sys.exit(errno)
 
 
@@ -116,7 +113,7 @@ def run_tests(self):
     "tests_require": [
         "pytest<5.0",
         "pytest-cov",
-        "coverage",
+        "coverage<5.0",  # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
         "blinker",
         "Pillow>=2.0.0",
     ],

From 6040b4b494f93efea415ad6e05a1d33e5834e6c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 31 Oct 2019 21:33:19 +0100
Subject: [PATCH 0943/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 58d7f2723..249d99b13 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -19,6 +19,7 @@ Development
     - From now on keyword arguments (e.g. ``Doc(field_name=value)``) are required.
 - Fix updating/modifying/deleting/reloading a document that's sharded by a field with ``db_field`` specified. #2125
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
+- Switch from nosetest to pytest as test runner #2114
 - The codebase is now formatted using ``black``. #2109
 - In bulk write insert, the detailed error message would raise in exception.
 

From 37ca79e9c58e04ce0fd3a6775d804eb4dad6d8c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 31 Oct 2019 22:39:53 +0100
Subject: [PATCH 0944/1519] fix black formatting

---
 docs/conf.py                                 |  3 ++-
 mongoengine/context_managers.py              |  4 ++--
 mongoengine/queryset/base.py                 |  4 +---
 tests/document/test_instance.py              |  4 ++--
 tests/fields/test_complex_datetime_field.py  |  2 +-
 tests/fields/test_embedded_document_field.py | 12 +++++-------
 tests/fields/test_fields.py                  |  8 ++++----
 tests/fields/test_reference_field.py         |  2 +-
 tests/test_common.py                         |  2 +-
 tests/test_connection.py                     |  2 +-
 tests/test_context_managers.py               |  6 +++---
 tests/test_datastructures.py                 | 10 +++++-----
 tests/test_replicaset_connection.py          |  2 +-
 tests/test_utils.py                          |  2 +-
 tests/utils.py                               |  2 +-
 15 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 0d642e0c6..48c8e859c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -11,7 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
+import sys
 
 import sphinx_rtd_theme
 
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 3424a5d5e..d8dfeaac4 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -247,8 +247,8 @@ def _get_count(self):
             - self._ctx_query_counter
         )
         self._ctx_query_counter += (
-            1
-        )  # Account for the query we just issued to gather the information
+            1  # Account for the query we just issued to gather the information
+        )
         return count
 
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index a09cbf99d..a648391ea 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1193,9 +1193,7 @@ def read_preference(self, read_preference):
         validate_read_preference("read_preference", read_preference)
         queryset = self.clone()
         queryset._read_preference = read_preference
-        queryset._cursor_obj = (
-            None
-        )  # we need to re-create the cursor object whenever we apply read_preference
+        queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_preference
         return queryset
 
     def scalar(self, *fields):
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 9b4a16e5a..203e2cce8 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -1615,7 +1615,7 @@ class User(self.Person):
         self.assertEqual(person.active, False)
 
     def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_embedded_doc(
-        self
+        self,
     ):
         # Refers to Issue #1685
         class EmbeddedChildModel(EmbeddedDocument):
@@ -1629,7 +1629,7 @@ class ParentModel(Document):
         self.assertEqual(changed_fields, [])
 
     def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_different_doc(
-        self
+        self,
     ):
         # Refers to Issue #1685
         class User(Document):
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index 4eea5bdcc..611c0ff80 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import datetime
-import math
 import itertools
+import math
 import re
 
 from mongoengine import *
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 6b4207818..8db8c180f 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,17 +1,15 @@
 # -*- coding: utf-8 -*-
 from mongoengine import (
     Document,
-    StringField,
-    ValidationError,
     EmbeddedDocument,
     EmbeddedDocumentField,
-    InvalidQueryError,
-    LookUpError,
-    IntField,
     GenericEmbeddedDocumentField,
+    IntField,
+    InvalidQueryError,
     ListField,
-    EmbeddedDocumentListField,
-    ReferenceField,
+    LookUpError,
+    StringField,
+    ValidationError,
 )
 
 from tests.utils import MongoDBTestCase
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index d9279c22e..bd2149e6b 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -79,7 +79,7 @@ class Person(Document):
         self.assertEqual(data_to_be_saved, ["age", "created", "day", "name", "userid"])
 
     def test_custom_field_validation_raise_deprecated_error_when_validation_return_something(
-        self
+        self,
     ):
         # Covers introduction of a breaking change in the validation parameter (0.18)
         def _not_empty(z):
@@ -202,7 +202,7 @@ class Person(Document):
         self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
 
     def test_default_value_is_not_used_when_changing_value_to_empty_list_for_strict_doc(
-        self
+        self,
     ):
         """List field with default can be set to the empty list (strict)"""
         # Issue #1733
@@ -216,7 +216,7 @@ class Doc(Document):
         self.assertEqual(reloaded.x, [])
 
     def test_default_value_is_not_used_when_changing_value_to_empty_list_for_dyn_doc(
-        self
+        self,
     ):
         """List field with default can be set to the empty list (dynamic)"""
         # Issue #1733
@@ -1245,7 +1245,7 @@ class A(Document):
         self.assertEqual(a.b.c.txt, "hi")
 
     def test_embedded_document_field_cant_reference_using_a_str_if_it_does_not_exist_yet(
-        self
+        self,
     ):
         raise SkipTest(
             "Using a string reference in an EmbeddedDocumentField does not work if the class isnt registerd yet"
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index 5fd053fe0..783a46daa 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from bson import SON, DBRef
+from bson import DBRef, SON
 
 from mongoengine import *
 
diff --git a/tests/test_common.py b/tests/test_common.py
index 5d7026686..28f0b992a 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1,7 +1,7 @@
 import unittest
 
-from mongoengine.common import _import_class
 from mongoengine import Document
+from mongoengine.common import _import_class
 
 
 class TestCommon(unittest.TestCase):
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 071f42079..1519a8350 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -168,7 +168,7 @@ def test_connect_fails_if_connect_2_times_with_custom_alias(self):
         )
 
     def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way(
-        self
+        self,
     ):
         """Intended to keep the detecton function simple but robust"""
         db_name = "mongoenginetest"
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index dc9b9bf3d..32e48a702 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -3,11 +3,11 @@
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.context_managers import (
-    switch_db,
-    switch_collection,
-    no_sub_classes,
     no_dereference,
+    no_sub_classes,
     query_counter,
+    switch_collection,
+    switch_db,
 )
 from mongoengine.pymongo_support import count_documents
 
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 7def2ac71..ff7598be9 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -2,7 +2,7 @@
 from six import iterkeys
 
 from mongoengine import Document
-from mongoengine.base.datastructures import StrictDict, BaseList, BaseDict
+from mongoengine.base.datastructures import BaseDict, BaseList, StrictDict
 
 
 class DocumentStub(object):
@@ -20,8 +20,8 @@ def _get_basedict(dict_items):
         fake_doc = DocumentStub()
         base_list = BaseDict(dict_items, instance=None, name="my_name")
         base_list._instance = (
-            fake_doc
-        )  # hack to inject the mock, it does not work in the constructor
+            fake_doc  # hack to inject the mock, it does not work in the constructor
+        )
         return base_list
 
     def test___init___(self):
@@ -156,8 +156,8 @@ def _get_baselist(list_items):
         fake_doc = DocumentStub()
         base_list = BaseList(list_items, instance=None, name="my_name")
         base_list._instance = (
-            fake_doc
-        )  # hack to inject the mock, it does not work in the constructor
+            fake_doc  # hack to inject the mock, it does not work in the constructor
+        )
         return base_list
 
     def test___init___(self):
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index 6dfab407b..e92f3d09b 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -1,7 +1,7 @@
 import unittest
 
-from pymongo import ReadPreference
 from pymongo import MongoClient
+from pymongo import ReadPreference
 
 import mongoengine
 from mongoengine.connection import ConnectionFailure
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 2d1e8b009..897c19b25 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,5 +1,5 @@
-import unittest
 import re
+import unittest
 
 from mongoengine.base.utils import LazyRegexCompiler
 
diff --git a/tests/utils.py b/tests/utils.py
index eb3f016f2..0719d6efe 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -4,7 +4,7 @@
 from nose.plugins.skip import SkipTest
 
 from mongoengine import connect
-from mongoengine.connection import get_db, disconnect_all
+from mongoengine.connection import disconnect_all, get_db
 from mongoengine.mongodb_support import get_mongodb_version
 
 

From ac25f4b98bd8c4b6daad46faf1e8a163928d7bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 30 Aug 2019 16:13:30 +0300
Subject: [PATCH 0945/1519] ran unittest2pytest

---
 tests/all_warnings/test_warnings.py          |    6 +-
 tests/document/test_class_methods.py         |  133 +-
 tests/document/test_delta.py                 |  652 +++----
 tests/document/test_dynamic.py               |  193 +-
 tests/document/test_indexes.py               |  285 ++-
 tests/document/test_inheritance.py           |  256 ++-
 tests/document/test_instance.py              | 1053 +++++------
 tests/document/test_json_serialisation.py    |    8 +-
 tests/document/test_validation.py            |   76 +-
 tests/fields/test_binary_field.py            |   40 +-
 tests/fields/test_boolean_field.py           |   16 +-
 tests/fields/test_cached_reference_field.py  |  181 +-
 tests/fields/test_complex_datetime_field.py  |   46 +-
 tests/fields/test_date_field.py              |   45 +-
 tests/fields/test_datetime_field.py          |   71 +-
 tests/fields/test_decimal_field.py           |   30 +-
 tests/fields/test_dict_field.py              |  139 +-
 tests/fields/test_email_field.py             |   37 +-
 tests/fields/test_embedded_document_field.py |  103 +-
 tests/fields/test_fields.py                  |  851 ++++-----
 tests/fields/test_file_field.py              |  166 +-
 tests/fields/test_float_field.py             |   20 +-
 tests/fields/test_geo_fields.py              |   46 +-
 tests/fields/test_int_field.py               |   14 +-
 tests/fields/test_lazy_reference_field.py    |  118 +-
 tests/fields/test_long_field.py              |   16 +-
 tests/fields/test_map_field.py               |   31 +-
 tests/fields/test_reference_field.py         |   46 +-
 tests/fields/test_sequence_field.py          |   99 +-
 tests/fields/test_url_field.py               |   15 +-
 tests/fields/test_uuid_field.py              |   19 +-
 tests/queryset/test_field_list.py            |  197 +-
 tests/queryset/test_geo.py                   |  205 +-
 tests/queryset/test_modify.py                |   32 +-
 tests/queryset/test_pickable.py              |   10 +-
 tests/queryset/test_queryset.py              | 1784 +++++++++---------
 tests/queryset/test_transform.py             |  178 +-
 tests/queryset/test_visitor.py               |  172 +-
 tests/test_common.py                         |    6 +-
 tests/test_connection.py                     |  254 ++-
 tests/test_context_managers.py               |  139 +-
 tests/test_datastructures.py                 |  241 +--
 tests/test_dereference.py                    |  386 ++--
 tests/test_replicaset_connection.py          |    2 +-
 tests/test_signals.py                        |  273 ++-
 tests/test_utils.py                          |   15 +-
 46 files changed, 4262 insertions(+), 4443 deletions(-)

diff --git a/tests/all_warnings/test_warnings.py b/tests/all_warnings/test_warnings.py
index 672046179..a99101212 100644
--- a/tests/all_warnings/test_warnings.py
+++ b/tests/all_warnings/test_warnings.py
@@ -31,7 +31,5 @@ class InheritedDocumentFailTest(NonAbstractBase):
             meta = {"collection": "fail"}
 
         warning = self.warning_list[0]
-        self.assertEqual(SyntaxWarning, warning["category"])
-        self.assertEqual(
-            "non_abstract_base", InheritedDocumentFailTest._get_collection_name()
-        )
+        assert SyntaxWarning == warning["category"]
+        assert "non_abstract_base" == InheritedDocumentFailTest._get_collection_name()
diff --git a/tests/document/test_class_methods.py b/tests/document/test_class_methods.py
index c5df08434..98909d2f4 100644
--- a/tests/document/test_class_methods.py
+++ b/tests/document/test_class_methods.py
@@ -29,43 +29,40 @@ def tearDown(self):
     def test_definition(self):
         """Ensure that document may be defined using fields.
         """
-        self.assertEqual(
-            ["_cls", "age", "id", "name"], sorted(self.Person._fields.keys())
-        )
-        self.assertEqual(
-            ["IntField", "ObjectIdField", "StringField", "StringField"],
-            sorted([x.__class__.__name__ for x in self.Person._fields.values()]),
+        assert ["_cls", "age", "id", "name"] == sorted(self.Person._fields.keys())
+        assert ["IntField", "ObjectIdField", "StringField", "StringField"] == sorted(
+            [x.__class__.__name__ for x in self.Person._fields.values()]
         )
 
     def test_get_db(self):
         """Ensure that get_db returns the expected db.
         """
         db = self.Person._get_db()
-        self.assertEqual(self.db, db)
+        assert self.db == db
 
     def test_get_collection_name(self):
         """Ensure that get_collection_name returns the expected collection
         name.
         """
         collection_name = "person"
-        self.assertEqual(collection_name, self.Person._get_collection_name())
+        assert collection_name == self.Person._get_collection_name()
 
     def test_get_collection(self):
         """Ensure that get_collection returns the expected collection.
         """
         collection_name = "person"
         collection = self.Person._get_collection()
-        self.assertEqual(self.db[collection_name], collection)
+        assert self.db[collection_name] == collection
 
     def test_drop_collection(self):
         """Ensure that the collection may be dropped from the database.
         """
         collection_name = "person"
         self.Person(name="Test").save()
-        self.assertIn(collection_name, list_collection_names(self.db))
+        assert collection_name in list_collection_names(self.db)
 
         self.Person.drop_collection()
-        self.assertNotIn(collection_name, list_collection_names(self.db))
+        assert collection_name not in list_collection_names(self.db)
 
     def test_register_delete_rule(self):
         """Ensure that register delete rule adds a delete rule to the document
@@ -75,12 +72,10 @@ def test_register_delete_rule(self):
         class Job(Document):
             employee = ReferenceField(self.Person)
 
-        self.assertEqual(self.Person._meta.get("delete_rules"), None)
+        assert self.Person._meta.get("delete_rules") == None
 
         self.Person.register_delete_rule(Job, "employee", NULLIFY)
-        self.assertEqual(
-            self.Person._meta["delete_rules"], {(Job, "employee"): NULLIFY}
-        )
+        assert self.Person._meta["delete_rules"] == {(Job, "employee"): NULLIFY}
 
     def test_compare_indexes(self):
         """ Ensure that the indexes are properly created and that
@@ -98,22 +93,22 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         BlogPost.ensure_indexes()
-        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
+        assert BlogPost.compare_indexes() == {"missing": [], "extra": []}
 
         BlogPost.ensure_index(["author", "description"])
-        self.assertEqual(
-            BlogPost.compare_indexes(),
-            {"missing": [], "extra": [[("author", 1), ("description", 1)]]},
-        )
+        assert BlogPost.compare_indexes() == {
+            "missing": [],
+            "extra": [[("author", 1), ("description", 1)]],
+        }
 
         BlogPost._get_collection().drop_index("author_1_description_1")
-        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
+        assert BlogPost.compare_indexes() == {"missing": [], "extra": []}
 
         BlogPost._get_collection().drop_index("author_1_title_1")
-        self.assertEqual(
-            BlogPost.compare_indexes(),
-            {"missing": [[("author", 1), ("title", 1)]], "extra": []},
-        )
+        assert BlogPost.compare_indexes() == {
+            "missing": [[("author", 1), ("title", 1)]],
+            "extra": [],
+        }
 
     def test_compare_indexes_inheritance(self):
         """ Ensure that the indexes are properly created and that
@@ -138,22 +133,22 @@ class BlogPostWithTags(BlogPost):
 
         BlogPost.ensure_indexes()
         BlogPostWithTags.ensure_indexes()
-        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
+        assert BlogPost.compare_indexes() == {"missing": [], "extra": []}
 
         BlogPostWithTags.ensure_index(["author", "tag_list"])
-        self.assertEqual(
-            BlogPost.compare_indexes(),
-            {"missing": [], "extra": [[("_cls", 1), ("author", 1), ("tag_list", 1)]]},
-        )
+        assert BlogPost.compare_indexes() == {
+            "missing": [],
+            "extra": [[("_cls", 1), ("author", 1), ("tag_list", 1)]],
+        }
 
         BlogPostWithTags._get_collection().drop_index("_cls_1_author_1_tag_list_1")
-        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
+        assert BlogPost.compare_indexes() == {"missing": [], "extra": []}
 
         BlogPostWithTags._get_collection().drop_index("_cls_1_author_1_tags_1")
-        self.assertEqual(
-            BlogPost.compare_indexes(),
-            {"missing": [[("_cls", 1), ("author", 1), ("tags", 1)]], "extra": []},
-        )
+        assert BlogPost.compare_indexes() == {
+            "missing": [[("_cls", 1), ("author", 1), ("tags", 1)]],
+            "extra": [],
+        }
 
     def test_compare_indexes_multiple_subclasses(self):
         """ Ensure that compare_indexes behaves correctly if called from a
@@ -182,13 +177,9 @@ class BlogPostWithCustomField(BlogPost):
         BlogPostWithTags.ensure_indexes()
         BlogPostWithCustomField.ensure_indexes()
 
-        self.assertEqual(BlogPost.compare_indexes(), {"missing": [], "extra": []})
-        self.assertEqual(
-            BlogPostWithTags.compare_indexes(), {"missing": [], "extra": []}
-        )
-        self.assertEqual(
-            BlogPostWithCustomField.compare_indexes(), {"missing": [], "extra": []}
-        )
+        assert BlogPost.compare_indexes() == {"missing": [], "extra": []}
+        assert BlogPostWithTags.compare_indexes() == {"missing": [], "extra": []}
+        assert BlogPostWithCustomField.compare_indexes() == {"missing": [], "extra": []}
 
     def test_compare_indexes_for_text_indexes(self):
         """ Ensure that compare_indexes behaves correctly for text indexes """
@@ -210,7 +201,7 @@ class Doc(Document):
         Doc.ensure_indexes()
         actual = Doc.compare_indexes()
         expected = {"missing": [], "extra": []}
-        self.assertEqual(actual, expected)
+        assert actual == expected
 
     def test_list_indexes_inheritance(self):
         """ ensure that all of the indexes are listed regardless of the super-
@@ -240,19 +231,14 @@ class BlogPostWithTagsAndExtraText(BlogPostWithTags):
         BlogPostWithTags.ensure_indexes()
         BlogPostWithTagsAndExtraText.ensure_indexes()
 
-        self.assertEqual(BlogPost.list_indexes(), BlogPostWithTags.list_indexes())
-        self.assertEqual(
-            BlogPost.list_indexes(), BlogPostWithTagsAndExtraText.list_indexes()
-        )
-        self.assertEqual(
-            BlogPost.list_indexes(),
-            [
-                [("_cls", 1), ("author", 1), ("tags", 1)],
-                [("_cls", 1), ("author", 1), ("tags", 1), ("extra_text", 1)],
-                [(u"_id", 1)],
-                [("_cls", 1)],
-            ],
-        )
+        assert BlogPost.list_indexes() == BlogPostWithTags.list_indexes()
+        assert BlogPost.list_indexes() == BlogPostWithTagsAndExtraText.list_indexes()
+        assert BlogPost.list_indexes() == [
+            [("_cls", 1), ("author", 1), ("tags", 1)],
+            [("_cls", 1), ("author", 1), ("tags", 1), ("extra_text", 1)],
+            [(u"_id", 1)],
+            [("_cls", 1)],
+        ]
 
     def test_register_delete_rule_inherited(self):
         class Vaccine(Document):
@@ -271,8 +257,8 @@ class Animal(Document):
         class Cat(Animal):
             name = StringField(required=True)
 
-        self.assertEqual(Vaccine._meta["delete_rules"][(Animal, "vaccine_made")], PULL)
-        self.assertEqual(Vaccine._meta["delete_rules"][(Cat, "vaccine_made")], PULL)
+        assert Vaccine._meta["delete_rules"][(Animal, "vaccine_made")] == PULL
+        assert Vaccine._meta["delete_rules"][(Cat, "vaccine_made")] == PULL
 
     def test_collection_naming(self):
         """Ensure that a collection with a specified name may be used.
@@ -281,19 +267,17 @@ def test_collection_naming(self):
         class DefaultNamingTest(Document):
             pass
 
-        self.assertEqual(
-            "default_naming_test", DefaultNamingTest._get_collection_name()
-        )
+        assert "default_naming_test" == DefaultNamingTest._get_collection_name()
 
         class CustomNamingTest(Document):
             meta = {"collection": "pimp_my_collection"}
 
-        self.assertEqual("pimp_my_collection", CustomNamingTest._get_collection_name())
+        assert "pimp_my_collection" == CustomNamingTest._get_collection_name()
 
         class DynamicNamingTest(Document):
             meta = {"collection": lambda c: "DYNAMO"}
 
-        self.assertEqual("DYNAMO", DynamicNamingTest._get_collection_name())
+        assert "DYNAMO" == DynamicNamingTest._get_collection_name()
 
         # Use Abstract class to handle backwards compatibility
         class BaseDocument(Document):
@@ -302,14 +286,12 @@ class BaseDocument(Document):
         class OldNamingConvention(BaseDocument):
             pass
 
-        self.assertEqual(
-            "oldnamingconvention", OldNamingConvention._get_collection_name()
-        )
+        assert "oldnamingconvention" == OldNamingConvention._get_collection_name()
 
         class InheritedAbstractNamingTest(BaseDocument):
             meta = {"collection": "wibble"}
 
-        self.assertEqual("wibble", InheritedAbstractNamingTest._get_collection_name())
+        assert "wibble" == InheritedAbstractNamingTest._get_collection_name()
 
         # Mixin tests
         class BaseMixin(object):
@@ -318,8 +300,9 @@ class BaseMixin(object):
         class OldMixinNamingConvention(Document, BaseMixin):
             pass
 
-        self.assertEqual(
-            "oldmixinnamingconvention", OldMixinNamingConvention._get_collection_name()
+        assert (
+            "oldmixinnamingconvention"
+            == OldMixinNamingConvention._get_collection_name()
         )
 
         class BaseMixin(object):
@@ -331,7 +314,7 @@ class BaseDocument(Document, BaseMixin):
         class MyDocument(BaseDocument):
             pass
 
-        self.assertEqual("basedocument", MyDocument._get_collection_name())
+        assert "basedocument" == MyDocument._get_collection_name()
 
     def test_custom_collection_name_operations(self):
         """Ensure that a collection with a specified name is used as expected.
@@ -343,16 +326,16 @@ class Person(Document):
             meta = {"collection": collection_name}
 
         Person(name="Test User").save()
-        self.assertIn(collection_name, list_collection_names(self.db))
+        assert collection_name in list_collection_names(self.db)
 
         user_obj = self.db[collection_name].find_one()
-        self.assertEqual(user_obj["name"], "Test User")
+        assert user_obj["name"] == "Test User"
 
         user_obj = Person.objects[0]
-        self.assertEqual(user_obj.name, "Test User")
+        assert user_obj.name == "Test User"
 
         Person.drop_collection()
-        self.assertNotIn(collection_name, list_collection_names(self.db))
+        assert collection_name not in list_collection_names(self.db)
 
     def test_collection_name_and_primary(self):
         """Ensure that a collection with a specified name may be used.
@@ -365,7 +348,7 @@ class Person(Document):
         Person(name="Test User").save()
 
         user_obj = Person.objects.first()
-        self.assertEqual(user_obj.name, "Test User")
+        assert user_obj.name == "Test User"
 
         Person.drop_collection()
 
diff --git a/tests/document/test_delta.py b/tests/document/test_delta.py
index 632d9b3f0..2324211b1 100644
--- a/tests/document/test_delta.py
+++ b/tests/document/test_delta.py
@@ -41,40 +41,40 @@ class Doc(DocClass):
         doc.save()
 
         doc = Doc.objects.first()
-        self.assertEqual(doc._get_changed_fields(), [])
-        self.assertEqual(doc._delta(), ({}, {}))
+        assert doc._get_changed_fields() == []
+        assert doc._delta() == ({}, {})
 
         doc.string_field = "hello"
-        self.assertEqual(doc._get_changed_fields(), ["string_field"])
-        self.assertEqual(doc._delta(), ({"string_field": "hello"}, {}))
+        assert doc._get_changed_fields() == ["string_field"]
+        assert doc._delta() == ({"string_field": "hello"}, {})
 
         doc._changed_fields = []
         doc.int_field = 1
-        self.assertEqual(doc._get_changed_fields(), ["int_field"])
-        self.assertEqual(doc._delta(), ({"int_field": 1}, {}))
+        assert doc._get_changed_fields() == ["int_field"]
+        assert doc._delta() == ({"int_field": 1}, {})
 
         doc._changed_fields = []
         dict_value = {"hello": "world", "ping": "pong"}
         doc.dict_field = dict_value
-        self.assertEqual(doc._get_changed_fields(), ["dict_field"])
-        self.assertEqual(doc._delta(), ({"dict_field": dict_value}, {}))
+        assert doc._get_changed_fields() == ["dict_field"]
+        assert doc._delta() == ({"dict_field": dict_value}, {})
 
         doc._changed_fields = []
         list_value = ["1", 2, {"hello": "world"}]
         doc.list_field = list_value
-        self.assertEqual(doc._get_changed_fields(), ["list_field"])
-        self.assertEqual(doc._delta(), ({"list_field": list_value}, {}))
+        assert doc._get_changed_fields() == ["list_field"]
+        assert doc._delta() == ({"list_field": list_value}, {})
 
         # Test unsetting
         doc._changed_fields = []
         doc.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(), ["dict_field"])
-        self.assertEqual(doc._delta(), ({}, {"dict_field": 1}))
+        assert doc._get_changed_fields() == ["dict_field"]
+        assert doc._delta() == ({}, {"dict_field": 1})
 
         doc._changed_fields = []
         doc.list_field = []
-        self.assertEqual(doc._get_changed_fields(), ["list_field"])
-        self.assertEqual(doc._delta(), ({}, {"list_field": 1}))
+        assert doc._get_changed_fields() == ["list_field"]
+        assert doc._delta() == ({}, {"list_field": 1})
 
     def test_delta_recursive(self):
         self.delta_recursive(Document, EmbeddedDocument)
@@ -102,8 +102,8 @@ class Doc(DocClass):
         doc.save()
 
         doc = Doc.objects.first()
-        self.assertEqual(doc._get_changed_fields(), [])
-        self.assertEqual(doc._delta(), ({}, {}))
+        assert doc._get_changed_fields() == []
+        assert doc._delta() == ({}, {})
 
         embedded_1 = Embedded()
         embedded_1.id = "010101"
@@ -113,7 +113,7 @@ class Doc(DocClass):
         embedded_1.list_field = ["1", 2, {"hello": "world"}]
         doc.embedded_field = embedded_1
 
-        self.assertEqual(doc._get_changed_fields(), ["embedded_field"])
+        assert doc._get_changed_fields() == ["embedded_field"]
 
         embedded_delta = {
             "id": "010101",
@@ -122,27 +122,27 @@ class Doc(DocClass):
             "dict_field": {"hello": "world"},
             "list_field": ["1", 2, {"hello": "world"}],
         }
-        self.assertEqual(doc.embedded_field._delta(), (embedded_delta, {}))
-        self.assertEqual(doc._delta(), ({"embedded_field": embedded_delta}, {}))
+        assert doc.embedded_field._delta() == (embedded_delta, {})
+        assert doc._delta() == ({"embedded_field": embedded_delta}, {})
 
         doc.save()
         doc = doc.reload(10)
 
         doc.embedded_field.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(), ["embedded_field.dict_field"])
-        self.assertEqual(doc.embedded_field._delta(), ({}, {"dict_field": 1}))
-        self.assertEqual(doc._delta(), ({}, {"embedded_field.dict_field": 1}))
+        assert doc._get_changed_fields() == ["embedded_field.dict_field"]
+        assert doc.embedded_field._delta() == ({}, {"dict_field": 1})
+        assert doc._delta() == ({}, {"embedded_field.dict_field": 1})
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.dict_field, {})
+        assert doc.embedded_field.dict_field == {}
 
         doc.embedded_field.list_field = []
-        self.assertEqual(doc._get_changed_fields(), ["embedded_field.list_field"])
-        self.assertEqual(doc.embedded_field._delta(), ({}, {"list_field": 1}))
-        self.assertEqual(doc._delta(), ({}, {"embedded_field.list_field": 1}))
+        assert doc._get_changed_fields() == ["embedded_field.list_field"]
+        assert doc.embedded_field._delta() == ({}, {"list_field": 1})
+        assert doc._delta() == ({}, {"embedded_field.list_field": 1})
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field, [])
+        assert doc.embedded_field.list_field == []
 
         embedded_2 = Embedded()
         embedded_2.string_field = "hello"
@@ -151,148 +151,128 @@ class Doc(DocClass):
         embedded_2.list_field = ["1", 2, {"hello": "world"}]
 
         doc.embedded_field.list_field = ["1", 2, embedded_2]
-        self.assertEqual(doc._get_changed_fields(), ["embedded_field.list_field"])
-
-        self.assertEqual(
-            doc.embedded_field._delta(),
-            (
-                {
-                    "list_field": [
-                        "1",
-                        2,
-                        {
-                            "_cls": "Embedded",
-                            "string_field": "hello",
-                            "dict_field": {"hello": "world"},
-                            "int_field": 1,
-                            "list_field": ["1", 2, {"hello": "world"}],
-                        },
-                    ]
-                },
-                {},
-            ),
-        )
-
-        self.assertEqual(
-            doc._delta(),
-            (
-                {
-                    "embedded_field.list_field": [
-                        "1",
-                        2,
-                        {
-                            "_cls": "Embedded",
-                            "string_field": "hello",
-                            "dict_field": {"hello": "world"},
-                            "int_field": 1,
-                            "list_field": ["1", 2, {"hello": "world"}],
-                        },
-                    ]
-                },
-                {},
-            ),
+        assert doc._get_changed_fields() == ["embedded_field.list_field"]
+
+        assert doc.embedded_field._delta() == (
+            {
+                "list_field": [
+                    "1",
+                    2,
+                    {
+                        "_cls": "Embedded",
+                        "string_field": "hello",
+                        "dict_field": {"hello": "world"},
+                        "int_field": 1,
+                        "list_field": ["1", 2, {"hello": "world"}],
+                    },
+                ]
+            },
+            {},
+        )
+
+        assert doc._delta() == (
+            {
+                "embedded_field.list_field": [
+                    "1",
+                    2,
+                    {
+                        "_cls": "Embedded",
+                        "string_field": "hello",
+                        "dict_field": {"hello": "world"},
+                        "int_field": 1,
+                        "list_field": ["1", 2, {"hello": "world"}],
+                    },
+                ]
+            },
+            {},
         )
         doc.save()
         doc = doc.reload(10)
 
-        self.assertEqual(doc.embedded_field.list_field[0], "1")
-        self.assertEqual(doc.embedded_field.list_field[1], 2)
+        assert doc.embedded_field.list_field[0] == "1"
+        assert doc.embedded_field.list_field[1] == 2
         for k in doc.embedded_field.list_field[2]._fields:
-            self.assertEqual(doc.embedded_field.list_field[2][k], embedded_2[k])
+            assert doc.embedded_field.list_field[2][k] == embedded_2[k]
 
         doc.embedded_field.list_field[2].string_field = "world"
-        self.assertEqual(
-            doc._get_changed_fields(), ["embedded_field.list_field.2.string_field"]
-        )
-        self.assertEqual(
-            doc.embedded_field._delta(), ({"list_field.2.string_field": "world"}, {})
+        assert doc._get_changed_fields() == ["embedded_field.list_field.2.string_field"]
+        assert doc.embedded_field._delta() == (
+            {"list_field.2.string_field": "world"},
+            {},
         )
-        self.assertEqual(
-            doc._delta(), ({"embedded_field.list_field.2.string_field": "world"}, {})
+        assert doc._delta() == (
+            {"embedded_field.list_field.2.string_field": "world"},
+            {},
         )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].string_field, "world")
+        assert doc.embedded_field.list_field[2].string_field == "world"
 
         # Test multiple assignments
         doc.embedded_field.list_field[2].string_field = "hello world"
         doc.embedded_field.list_field[2] = doc.embedded_field.list_field[2]
-        self.assertEqual(doc._get_changed_fields(), ["embedded_field.list_field.2"])
-        self.assertEqual(
-            doc.embedded_field._delta(),
-            (
-                {
-                    "list_field.2": {
-                        "_cls": "Embedded",
-                        "string_field": "hello world",
-                        "int_field": 1,
-                        "list_field": ["1", 2, {"hello": "world"}],
-                        "dict_field": {"hello": "world"},
-                    }
-                },
-                {},
-            ),
-        )
-        self.assertEqual(
-            doc._delta(),
-            (
-                {
-                    "embedded_field.list_field.2": {
-                        "_cls": "Embedded",
-                        "string_field": "hello world",
-                        "int_field": 1,
-                        "list_field": ["1", 2, {"hello": "world"}],
-                        "dict_field": {"hello": "world"},
-                    }
-                },
-                {},
-            ),
+        assert doc._get_changed_fields() == ["embedded_field.list_field.2"]
+        assert doc.embedded_field._delta() == (
+            {
+                "list_field.2": {
+                    "_cls": "Embedded",
+                    "string_field": "hello world",
+                    "int_field": 1,
+                    "list_field": ["1", 2, {"hello": "world"}],
+                    "dict_field": {"hello": "world"},
+                }
+            },
+            {},
+        )
+        assert doc._delta() == (
+            {
+                "embedded_field.list_field.2": {
+                    "_cls": "Embedded",
+                    "string_field": "hello world",
+                    "int_field": 1,
+                    "list_field": ["1", 2, {"hello": "world"}],
+                    "dict_field": {"hello": "world"},
+                }
+            },
+            {},
         )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].string_field, "hello world")
+        assert doc.embedded_field.list_field[2].string_field == "hello world"
 
         # Test list native methods
         doc.embedded_field.list_field[2].list_field.pop(0)
-        self.assertEqual(
-            doc._delta(),
-            ({"embedded_field.list_field.2.list_field": [2, {"hello": "world"}]}, {}),
+        assert doc._delta() == (
+            {"embedded_field.list_field.2.list_field": [2, {"hello": "world"}]},
+            {},
         )
         doc.save()
         doc = doc.reload(10)
 
         doc.embedded_field.list_field[2].list_field.append(1)
-        self.assertEqual(
-            doc._delta(),
-            (
-                {"embedded_field.list_field.2.list_field": [2, {"hello": "world"}, 1]},
-                {},
-            ),
+        assert doc._delta() == (
+            {"embedded_field.list_field.2.list_field": [2, {"hello": "world"}, 1]},
+            {},
         )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(
-            doc.embedded_field.list_field[2].list_field, [2, {"hello": "world"}, 1]
-        )
+        assert doc.embedded_field.list_field[2].list_field == [2, {"hello": "world"}, 1]
 
         doc.embedded_field.list_field[2].list_field.sort(key=str)
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(
-            doc.embedded_field.list_field[2].list_field, [1, 2, {"hello": "world"}]
-        )
+        assert doc.embedded_field.list_field[2].list_field == [1, 2, {"hello": "world"}]
 
         del doc.embedded_field.list_field[2].list_field[2]["hello"]
-        self.assertEqual(
-            doc._delta(), ({}, {"embedded_field.list_field.2.list_field.2.hello": 1})
+        assert doc._delta() == (
+            {},
+            {"embedded_field.list_field.2.list_field.2.hello": 1},
         )
         doc.save()
         doc = doc.reload(10)
 
         del doc.embedded_field.list_field[2].list_field
-        self.assertEqual(
-            doc._delta(), ({}, {"embedded_field.list_field.2.list_field": 1})
-        )
+        assert doc._delta() == ({}, {"embedded_field.list_field.2.list_field": 1})
 
         doc.save()
         doc = doc.reload(10)
@@ -302,12 +282,8 @@ class Doc(DocClass):
         doc = doc.reload(10)
 
         doc.dict_field["Embedded"].string_field = "Hello World"
-        self.assertEqual(
-            doc._get_changed_fields(), ["dict_field.Embedded.string_field"]
-        )
-        self.assertEqual(
-            doc._delta(), ({"dict_field.Embedded.string_field": "Hello World"}, {})
-        )
+        assert doc._get_changed_fields() == ["dict_field.Embedded.string_field"]
+        assert doc._delta() == ({"dict_field.Embedded.string_field": "Hello World"}, {})
 
     def test_circular_reference_deltas(self):
         self.circular_reference_deltas(Document, Document)
@@ -338,8 +314,8 @@ class Organization(DocClass2):
 
         p = Person.objects[0].select_related()
         o = Organization.objects.first()
-        self.assertEqual(p.owns[0], o)
-        self.assertEqual(o.owner, p)
+        assert p.owns[0] == o
+        assert o.owner == p
 
     def test_circular_reference_deltas_2(self):
         self.circular_reference_deltas_2(Document, Document)
@@ -379,9 +355,9 @@ class Organization(DocClass2):
         e = Person.objects.get(name="employee")
         o = Organization.objects.first()
 
-        self.assertEqual(p.owns[0], o)
-        self.assertEqual(o.owner, p)
-        self.assertEqual(e.employer, o)
+        assert p.owns[0] == o
+        assert o.owner == p
+        assert e.employer == o
 
         return person, organization, employee
 
@@ -401,40 +377,40 @@ class Doc(DocClass):
         doc.save()
 
         doc = Doc.objects.first()
-        self.assertEqual(doc._get_changed_fields(), [])
-        self.assertEqual(doc._delta(), ({}, {}))
+        assert doc._get_changed_fields() == []
+        assert doc._delta() == ({}, {})
 
         doc.string_field = "hello"
-        self.assertEqual(doc._get_changed_fields(), ["db_string_field"])
-        self.assertEqual(doc._delta(), ({"db_string_field": "hello"}, {}))
+        assert doc._get_changed_fields() == ["db_string_field"]
+        assert doc._delta() == ({"db_string_field": "hello"}, {})
 
         doc._changed_fields = []
         doc.int_field = 1
-        self.assertEqual(doc._get_changed_fields(), ["db_int_field"])
-        self.assertEqual(doc._delta(), ({"db_int_field": 1}, {}))
+        assert doc._get_changed_fields() == ["db_int_field"]
+        assert doc._delta() == ({"db_int_field": 1}, {})
 
         doc._changed_fields = []
         dict_value = {"hello": "world", "ping": "pong"}
         doc.dict_field = dict_value
-        self.assertEqual(doc._get_changed_fields(), ["db_dict_field"])
-        self.assertEqual(doc._delta(), ({"db_dict_field": dict_value}, {}))
+        assert doc._get_changed_fields() == ["db_dict_field"]
+        assert doc._delta() == ({"db_dict_field": dict_value}, {})
 
         doc._changed_fields = []
         list_value = ["1", 2, {"hello": "world"}]
         doc.list_field = list_value
-        self.assertEqual(doc._get_changed_fields(), ["db_list_field"])
-        self.assertEqual(doc._delta(), ({"db_list_field": list_value}, {}))
+        assert doc._get_changed_fields() == ["db_list_field"]
+        assert doc._delta() == ({"db_list_field": list_value}, {})
 
         # Test unsetting
         doc._changed_fields = []
         doc.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(), ["db_dict_field"])
-        self.assertEqual(doc._delta(), ({}, {"db_dict_field": 1}))
+        assert doc._get_changed_fields() == ["db_dict_field"]
+        assert doc._delta() == ({}, {"db_dict_field": 1})
 
         doc._changed_fields = []
         doc.list_field = []
-        self.assertEqual(doc._get_changed_fields(), ["db_list_field"])
-        self.assertEqual(doc._delta(), ({}, {"db_list_field": 1}))
+        assert doc._get_changed_fields() == ["db_list_field"]
+        assert doc._delta() == ({}, {"db_list_field": 1})
 
         # Test it saves that data
         doc = Doc()
@@ -447,10 +423,10 @@ class Doc(DocClass):
         doc.save()
         doc = doc.reload(10)
 
-        self.assertEqual(doc.string_field, "hello")
-        self.assertEqual(doc.int_field, 1)
-        self.assertEqual(doc.dict_field, {"hello": "world"})
-        self.assertEqual(doc.list_field, ["1", 2, {"hello": "world"}])
+        assert doc.string_field == "hello"
+        assert doc.int_field == 1
+        assert doc.dict_field == {"hello": "world"}
+        assert doc.list_field == ["1", 2, {"hello": "world"}]
 
     def test_delta_recursive_db_field(self):
         self.delta_recursive_db_field(Document, EmbeddedDocument)
@@ -479,8 +455,8 @@ class Doc(DocClass):
         doc.save()
 
         doc = Doc.objects.first()
-        self.assertEqual(doc._get_changed_fields(), [])
-        self.assertEqual(doc._delta(), ({}, {}))
+        assert doc._get_changed_fields() == []
+        assert doc._delta() == ({}, {})
 
         embedded_1 = Embedded()
         embedded_1.string_field = "hello"
@@ -489,7 +465,7 @@ class Doc(DocClass):
         embedded_1.list_field = ["1", 2, {"hello": "world"}]
         doc.embedded_field = embedded_1
 
-        self.assertEqual(doc._get_changed_fields(), ["db_embedded_field"])
+        assert doc._get_changed_fields() == ["db_embedded_field"]
 
         embedded_delta = {
             "db_string_field": "hello",
@@ -497,27 +473,27 @@ class Doc(DocClass):
             "db_dict_field": {"hello": "world"},
             "db_list_field": ["1", 2, {"hello": "world"}],
         }
-        self.assertEqual(doc.embedded_field._delta(), (embedded_delta, {}))
-        self.assertEqual(doc._delta(), ({"db_embedded_field": embedded_delta}, {}))
+        assert doc.embedded_field._delta() == (embedded_delta, {})
+        assert doc._delta() == ({"db_embedded_field": embedded_delta}, {})
 
         doc.save()
         doc = doc.reload(10)
 
         doc.embedded_field.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(), ["db_embedded_field.db_dict_field"])
-        self.assertEqual(doc.embedded_field._delta(), ({}, {"db_dict_field": 1}))
-        self.assertEqual(doc._delta(), ({}, {"db_embedded_field.db_dict_field": 1}))
+        assert doc._get_changed_fields() == ["db_embedded_field.db_dict_field"]
+        assert doc.embedded_field._delta() == ({}, {"db_dict_field": 1})
+        assert doc._delta() == ({}, {"db_embedded_field.db_dict_field": 1})
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.dict_field, {})
+        assert doc.embedded_field.dict_field == {}
 
         doc.embedded_field.list_field = []
-        self.assertEqual(doc._get_changed_fields(), ["db_embedded_field.db_list_field"])
-        self.assertEqual(doc.embedded_field._delta(), ({}, {"db_list_field": 1}))
-        self.assertEqual(doc._delta(), ({}, {"db_embedded_field.db_list_field": 1}))
+        assert doc._get_changed_fields() == ["db_embedded_field.db_list_field"]
+        assert doc.embedded_field._delta() == ({}, {"db_list_field": 1})
+        assert doc._delta() == ({}, {"db_embedded_field.db_list_field": 1})
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field, [])
+        assert doc.embedded_field.list_field == []
 
         embedded_2 = Embedded()
         embedded_2.string_field = "hello"
@@ -526,166 +502,142 @@ class Doc(DocClass):
         embedded_2.list_field = ["1", 2, {"hello": "world"}]
 
         doc.embedded_field.list_field = ["1", 2, embedded_2]
-        self.assertEqual(doc._get_changed_fields(), ["db_embedded_field.db_list_field"])
-        self.assertEqual(
-            doc.embedded_field._delta(),
-            (
-                {
-                    "db_list_field": [
-                        "1",
-                        2,
-                        {
-                            "_cls": "Embedded",
-                            "db_string_field": "hello",
-                            "db_dict_field": {"hello": "world"},
-                            "db_int_field": 1,
-                            "db_list_field": ["1", 2, {"hello": "world"}],
-                        },
-                    ]
-                },
-                {},
-            ),
-        )
-
-        self.assertEqual(
-            doc._delta(),
-            (
-                {
-                    "db_embedded_field.db_list_field": [
-                        "1",
-                        2,
-                        {
-                            "_cls": "Embedded",
-                            "db_string_field": "hello",
-                            "db_dict_field": {"hello": "world"},
-                            "db_int_field": 1,
-                            "db_list_field": ["1", 2, {"hello": "world"}],
-                        },
-                    ]
-                },
-                {},
-            ),
+        assert doc._get_changed_fields() == ["db_embedded_field.db_list_field"]
+        assert doc.embedded_field._delta() == (
+            {
+                "db_list_field": [
+                    "1",
+                    2,
+                    {
+                        "_cls": "Embedded",
+                        "db_string_field": "hello",
+                        "db_dict_field": {"hello": "world"},
+                        "db_int_field": 1,
+                        "db_list_field": ["1", 2, {"hello": "world"}],
+                    },
+                ]
+            },
+            {},
+        )
+
+        assert doc._delta() == (
+            {
+                "db_embedded_field.db_list_field": [
+                    "1",
+                    2,
+                    {
+                        "_cls": "Embedded",
+                        "db_string_field": "hello",
+                        "db_dict_field": {"hello": "world"},
+                        "db_int_field": 1,
+                        "db_list_field": ["1", 2, {"hello": "world"}],
+                    },
+                ]
+            },
+            {},
         )
         doc.save()
         doc = doc.reload(10)
 
-        self.assertEqual(doc.embedded_field.list_field[0], "1")
-        self.assertEqual(doc.embedded_field.list_field[1], 2)
+        assert doc.embedded_field.list_field[0] == "1"
+        assert doc.embedded_field.list_field[1] == 2
         for k in doc.embedded_field.list_field[2]._fields:
-            self.assertEqual(doc.embedded_field.list_field[2][k], embedded_2[k])
+            assert doc.embedded_field.list_field[2][k] == embedded_2[k]
 
         doc.embedded_field.list_field[2].string_field = "world"
-        self.assertEqual(
-            doc._get_changed_fields(),
-            ["db_embedded_field.db_list_field.2.db_string_field"],
-        )
-        self.assertEqual(
-            doc.embedded_field._delta(),
-            ({"db_list_field.2.db_string_field": "world"}, {}),
+        assert doc._get_changed_fields() == [
+            "db_embedded_field.db_list_field.2.db_string_field"
+        ]
+        assert doc.embedded_field._delta() == (
+            {"db_list_field.2.db_string_field": "world"},
+            {},
         )
-        self.assertEqual(
-            doc._delta(),
-            ({"db_embedded_field.db_list_field.2.db_string_field": "world"}, {}),
+        assert doc._delta() == (
+            {"db_embedded_field.db_list_field.2.db_string_field": "world"},
+            {},
         )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].string_field, "world")
+        assert doc.embedded_field.list_field[2].string_field == "world"
 
         # Test multiple assignments
         doc.embedded_field.list_field[2].string_field = "hello world"
         doc.embedded_field.list_field[2] = doc.embedded_field.list_field[2]
-        self.assertEqual(
-            doc._get_changed_fields(), ["db_embedded_field.db_list_field.2"]
-        )
-        self.assertEqual(
-            doc.embedded_field._delta(),
-            (
-                {
-                    "db_list_field.2": {
-                        "_cls": "Embedded",
-                        "db_string_field": "hello world",
-                        "db_int_field": 1,
-                        "db_list_field": ["1", 2, {"hello": "world"}],
-                        "db_dict_field": {"hello": "world"},
-                    }
-                },
-                {},
-            ),
-        )
-        self.assertEqual(
-            doc._delta(),
-            (
-                {
-                    "db_embedded_field.db_list_field.2": {
-                        "_cls": "Embedded",
-                        "db_string_field": "hello world",
-                        "db_int_field": 1,
-                        "db_list_field": ["1", 2, {"hello": "world"}],
-                        "db_dict_field": {"hello": "world"},
-                    }
-                },
-                {},
-            ),
+        assert doc._get_changed_fields() == ["db_embedded_field.db_list_field.2"]
+        assert doc.embedded_field._delta() == (
+            {
+                "db_list_field.2": {
+                    "_cls": "Embedded",
+                    "db_string_field": "hello world",
+                    "db_int_field": 1,
+                    "db_list_field": ["1", 2, {"hello": "world"}],
+                    "db_dict_field": {"hello": "world"},
+                }
+            },
+            {},
+        )
+        assert doc._delta() == (
+            {
+                "db_embedded_field.db_list_field.2": {
+                    "_cls": "Embedded",
+                    "db_string_field": "hello world",
+                    "db_int_field": 1,
+                    "db_list_field": ["1", 2, {"hello": "world"}],
+                    "db_dict_field": {"hello": "world"},
+                }
+            },
+            {},
         )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(doc.embedded_field.list_field[2].string_field, "hello world")
+        assert doc.embedded_field.list_field[2].string_field == "hello world"
 
         # Test list native methods
         doc.embedded_field.list_field[2].list_field.pop(0)
-        self.assertEqual(
-            doc._delta(),
-            (
-                {
-                    "db_embedded_field.db_list_field.2.db_list_field": [
-                        2,
-                        {"hello": "world"},
-                    ]
-                },
-                {},
-            ),
+        assert doc._delta() == (
+            {
+                "db_embedded_field.db_list_field.2.db_list_field": [
+                    2,
+                    {"hello": "world"},
+                ]
+            },
+            {},
         )
         doc.save()
         doc = doc.reload(10)
 
         doc.embedded_field.list_field[2].list_field.append(1)
-        self.assertEqual(
-            doc._delta(),
-            (
-                {
-                    "db_embedded_field.db_list_field.2.db_list_field": [
-                        2,
-                        {"hello": "world"},
-                        1,
-                    ]
-                },
-                {},
-            ),
+        assert doc._delta() == (
+            {
+                "db_embedded_field.db_list_field.2.db_list_field": [
+                    2,
+                    {"hello": "world"},
+                    1,
+                ]
+            },
+            {},
         )
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(
-            doc.embedded_field.list_field[2].list_field, [2, {"hello": "world"}, 1]
-        )
+        assert doc.embedded_field.list_field[2].list_field == [2, {"hello": "world"}, 1]
 
         doc.embedded_field.list_field[2].list_field.sort(key=str)
         doc.save()
         doc = doc.reload(10)
-        self.assertEqual(
-            doc.embedded_field.list_field[2].list_field, [1, 2, {"hello": "world"}]
-        )
+        assert doc.embedded_field.list_field[2].list_field == [1, 2, {"hello": "world"}]
 
         del doc.embedded_field.list_field[2].list_field[2]["hello"]
-        self.assertEqual(
-            doc._delta(),
-            ({}, {"db_embedded_field.db_list_field.2.db_list_field.2.hello": 1}),
+        assert doc._delta() == (
+            {},
+            {"db_embedded_field.db_list_field.2.db_list_field.2.hello": 1},
         )
         doc.save()
         doc = doc.reload(10)
 
         del doc.embedded_field.list_field[2].list_field
-        self.assertEqual(
-            doc._delta(), ({}, {"db_embedded_field.db_list_field.2.db_list_field": 1})
+        assert doc._delta() == (
+            {},
+            {"db_embedded_field.db_list_field.2.db_list_field": 1},
         )
 
     def test_delta_for_dynamic_documents(self):
@@ -696,14 +648,16 @@ class Person(DynamicDocument):
         Person.drop_collection()
 
         p = Person(name="James", age=34)
-        self.assertEqual(
-            p._delta(), (SON([("_cls", "Person"), ("name", "James"), ("age", 34)]), {})
+        assert p._delta() == (
+            SON([("_cls", "Person"), ("name", "James"), ("age", 34)]),
+            {},
         )
 
         p.doc = 123
         del p.doc
-        self.assertEqual(
-            p._delta(), (SON([("_cls", "Person"), ("name", "James"), ("age", 34)]), {})
+        assert p._delta() == (
+            SON([("_cls", "Person"), ("name", "James"), ("age", 34)]),
+            {},
         )
 
         p = Person()
@@ -712,18 +666,18 @@ class Person(DynamicDocument):
         p.save()
 
         p.age = 24
-        self.assertEqual(p.age, 24)
-        self.assertEqual(p._get_changed_fields(), ["age"])
-        self.assertEqual(p._delta(), ({"age": 24}, {}))
+        assert p.age == 24
+        assert p._get_changed_fields() == ["age"]
+        assert p._delta() == ({"age": 24}, {})
 
         p = Person.objects(age=22).get()
         p.age = 24
-        self.assertEqual(p.age, 24)
-        self.assertEqual(p._get_changed_fields(), ["age"])
-        self.assertEqual(p._delta(), ({"age": 24}, {}))
+        assert p.age == 24
+        assert p._get_changed_fields() == ["age"]
+        assert p._delta() == ({"age": 24}, {})
 
         p.save()
-        self.assertEqual(1, Person.objects(age=24).count())
+        assert 1 == Person.objects(age=24).count()
 
     def test_dynamic_delta(self):
         class Doc(DynamicDocument):
@@ -734,40 +688,40 @@ class Doc(DynamicDocument):
         doc.save()
 
         doc = Doc.objects.first()
-        self.assertEqual(doc._get_changed_fields(), [])
-        self.assertEqual(doc._delta(), ({}, {}))
+        assert doc._get_changed_fields() == []
+        assert doc._delta() == ({}, {})
 
         doc.string_field = "hello"
-        self.assertEqual(doc._get_changed_fields(), ["string_field"])
-        self.assertEqual(doc._delta(), ({"string_field": "hello"}, {}))
+        assert doc._get_changed_fields() == ["string_field"]
+        assert doc._delta() == ({"string_field": "hello"}, {})
 
         doc._changed_fields = []
         doc.int_field = 1
-        self.assertEqual(doc._get_changed_fields(), ["int_field"])
-        self.assertEqual(doc._delta(), ({"int_field": 1}, {}))
+        assert doc._get_changed_fields() == ["int_field"]
+        assert doc._delta() == ({"int_field": 1}, {})
 
         doc._changed_fields = []
         dict_value = {"hello": "world", "ping": "pong"}
         doc.dict_field = dict_value
-        self.assertEqual(doc._get_changed_fields(), ["dict_field"])
-        self.assertEqual(doc._delta(), ({"dict_field": dict_value}, {}))
+        assert doc._get_changed_fields() == ["dict_field"]
+        assert doc._delta() == ({"dict_field": dict_value}, {})
 
         doc._changed_fields = []
         list_value = ["1", 2, {"hello": "world"}]
         doc.list_field = list_value
-        self.assertEqual(doc._get_changed_fields(), ["list_field"])
-        self.assertEqual(doc._delta(), ({"list_field": list_value}, {}))
+        assert doc._get_changed_fields() == ["list_field"]
+        assert doc._delta() == ({"list_field": list_value}, {})
 
         # Test unsetting
         doc._changed_fields = []
         doc.dict_field = {}
-        self.assertEqual(doc._get_changed_fields(), ["dict_field"])
-        self.assertEqual(doc._delta(), ({}, {"dict_field": 1}))
+        assert doc._get_changed_fields() == ["dict_field"]
+        assert doc._delta() == ({}, {"dict_field": 1})
 
         doc._changed_fields = []
         doc.list_field = []
-        self.assertEqual(doc._get_changed_fields(), ["list_field"])
-        self.assertEqual(doc._delta(), ({}, {"list_field": 1}))
+        assert doc._get_changed_fields() == ["list_field"]
+        assert doc._delta() == ({}, {"list_field": 1})
 
     def test_delta_with_dbref_true(self):
         person, organization, employee = self.circular_reference_deltas_2(
@@ -775,16 +729,16 @@ def test_delta_with_dbref_true(self):
         )
         employee.name = "test"
 
-        self.assertEqual(organization._get_changed_fields(), [])
+        assert organization._get_changed_fields() == []
 
         updates, removals = organization._delta()
-        self.assertEqual({}, removals)
-        self.assertEqual({}, updates)
+        assert {} == removals
+        assert {} == updates
 
         organization.employees.append(person)
         updates, removals = organization._delta()
-        self.assertEqual({}, removals)
-        self.assertIn("employees", updates)
+        assert {} == removals
+        assert "employees" in updates
 
     def test_delta_with_dbref_false(self):
         person, organization, employee = self.circular_reference_deltas_2(
@@ -792,16 +746,16 @@ def test_delta_with_dbref_false(self):
         )
         employee.name = "test"
 
-        self.assertEqual(organization._get_changed_fields(), [])
+        assert organization._get_changed_fields() == []
 
         updates, removals = organization._delta()
-        self.assertEqual({}, removals)
-        self.assertEqual({}, updates)
+        assert {} == removals
+        assert {} == updates
 
         organization.employees.append(person)
         updates, removals = organization._delta()
-        self.assertEqual({}, removals)
-        self.assertIn("employees", updates)
+        assert {} == removals
+        assert "employees" in updates
 
     def test_nested_nested_fields_mark_as_changed(self):
         class EmbeddedDoc(EmbeddedDocument):
@@ -821,11 +775,11 @@ class MyDoc(Document):
         subdoc = mydoc.subs["a"]["b"]
         subdoc.name = "bar"
 
-        self.assertEqual(["name"], subdoc._get_changed_fields())
-        self.assertEqual(["subs.a.b.name"], mydoc._get_changed_fields())
+        assert ["name"] == subdoc._get_changed_fields()
+        assert ["subs.a.b.name"] == mydoc._get_changed_fields()
 
         mydoc._clear_changed_fields()
-        self.assertEqual([], mydoc._get_changed_fields())
+        assert [] == mydoc._get_changed_fields()
 
     def test_lower_level_mark_as_changed(self):
         class EmbeddedDoc(EmbeddedDocument):
@@ -840,17 +794,17 @@ class MyDoc(Document):
 
         mydoc = MyDoc.objects.first()
         mydoc.subs["a"] = EmbeddedDoc()
-        self.assertEqual(["subs.a"], mydoc._get_changed_fields())
+        assert ["subs.a"] == mydoc._get_changed_fields()
 
         subdoc = mydoc.subs["a"]
         subdoc.name = "bar"
 
-        self.assertEqual(["name"], subdoc._get_changed_fields())
-        self.assertEqual(["subs.a"], mydoc._get_changed_fields())
+        assert ["name"] == subdoc._get_changed_fields()
+        assert ["subs.a"] == mydoc._get_changed_fields()
         mydoc.save()
 
         mydoc._clear_changed_fields()
-        self.assertEqual([], mydoc._get_changed_fields())
+        assert [] == mydoc._get_changed_fields()
 
     def test_upper_level_mark_as_changed(self):
         class EmbeddedDoc(EmbeddedDocument):
@@ -867,15 +821,15 @@ class MyDoc(Document):
         subdoc = mydoc.subs["a"]
         subdoc.name = "bar"
 
-        self.assertEqual(["name"], subdoc._get_changed_fields())
-        self.assertEqual(["subs.a.name"], mydoc._get_changed_fields())
+        assert ["name"] == subdoc._get_changed_fields()
+        assert ["subs.a.name"] == mydoc._get_changed_fields()
 
         mydoc.subs["a"] = EmbeddedDoc()
-        self.assertEqual(["subs.a"], mydoc._get_changed_fields())
+        assert ["subs.a"] == mydoc._get_changed_fields()
         mydoc.save()
 
         mydoc._clear_changed_fields()
-        self.assertEqual([], mydoc._get_changed_fields())
+        assert [] == mydoc._get_changed_fields()
 
     def test_referenced_object_changed_attributes(self):
         """Ensures that when you save a new reference to a field, the referenced object isn't altered"""
@@ -902,22 +856,22 @@ class User(Document):
         org1.reload()
         org2.reload()
         user.reload()
-        self.assertEqual(org1.name, "Org 1")
-        self.assertEqual(org2.name, "Org 2")
-        self.assertEqual(user.name, "Fred")
+        assert org1.name == "Org 1"
+        assert org2.name == "Org 2"
+        assert user.name == "Fred"
 
         user.name = "Harold"
         user.org = org2
 
         org2.name = "New Org 2"
-        self.assertEqual(org2.name, "New Org 2")
+        assert org2.name == "New Org 2"
 
         user.save()
         org2.save()
 
-        self.assertEqual(org2.name, "New Org 2")
+        assert org2.name == "New Org 2"
         org2.reload()
-        self.assertEqual(org2.name, "New Org 2")
+        assert org2.name == "New Org 2"
 
     def test_delta_for_nested_map_fields(self):
         class UInfoDocument(Document):
@@ -950,12 +904,12 @@ class Doc(Document):
         d.users["007"]["rolist"].append(EmbeddedRole(type="oops"))
         d.users["007"]["info"] = uinfo
         delta = d._delta()
-        self.assertEqual(True, "users.007.roles.666" in delta[0])
-        self.assertEqual(True, "users.007.rolist" in delta[0])
-        self.assertEqual(True, "users.007.info" in delta[0])
-        self.assertEqual("superadmin", delta[0]["users.007.roles.666"]["type"])
-        self.assertEqual("oops", delta[0]["users.007.rolist"][0]["type"])
-        self.assertEqual(uinfo.id, delta[0]["users.007.info"])
+        assert True == ("users.007.roles.666" in delta[0])
+        assert True == ("users.007.rolist" in delta[0])
+        assert True == ("users.007.info" in delta[0])
+        assert "superadmin" == delta[0]["users.007.roles.666"]["type"]
+        assert "oops" == delta[0]["users.007.rolist"][0]["type"]
+        assert uinfo.id == delta[0]["users.007.info"]
 
 
 if __name__ == "__main__":
diff --git a/tests/document/test_dynamic.py b/tests/document/test_dynamic.py
index 6b517d247..a6f468624 100644
--- a/tests/document/test_dynamic.py
+++ b/tests/document/test_dynamic.py
@@ -2,6 +2,7 @@
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase
+import pytest
 
 __all__ = ("TestDynamicDocument",)
 
@@ -25,15 +26,15 @@ def test_simple_dynamic_document(self):
         p.name = "James"
         p.age = 34
 
-        self.assertEqual(p.to_mongo(), {"_cls": "Person", "name": "James", "age": 34})
-        self.assertEqual(p.to_mongo().keys(), ["_cls", "name", "age"])
+        assert p.to_mongo() == {"_cls": "Person", "name": "James", "age": 34}
+        assert p.to_mongo().keys() == ["_cls", "name", "age"]
         p.save()
-        self.assertEqual(p.to_mongo().keys(), ["_id", "_cls", "name", "age"])
+        assert p.to_mongo().keys() == ["_id", "_cls", "name", "age"]
 
-        self.assertEqual(self.Person.objects.first().age, 34)
+        assert self.Person.objects.first().age == 34
 
         # Confirm no changes to self.Person
-        self.assertFalse(hasattr(self.Person, "age"))
+        assert not hasattr(self.Person, "age")
 
     def test_change_scope_of_variable(self):
         """Test changing the scope of a dynamic field has no adverse effects"""
@@ -47,7 +48,7 @@ def test_change_scope_of_variable(self):
         p.save()
 
         p = self.Person.objects.get()
-        self.assertEqual(p.misc, {"hello": "world"})
+        assert p.misc == {"hello": "world"}
 
     def test_delete_dynamic_field(self):
         """Test deleting a dynamic field works"""
@@ -62,19 +63,19 @@ def test_delete_dynamic_field(self):
         p.save()
 
         p = self.Person.objects.get()
-        self.assertEqual(p.misc, {"hello": "world"})
+        assert p.misc == {"hello": "world"}
         collection = self.db[self.Person._get_collection_name()]
         obj = collection.find_one()
-        self.assertEqual(sorted(obj.keys()), ["_cls", "_id", "misc", "name"])
+        assert sorted(obj.keys()) == ["_cls", "_id", "misc", "name"]
 
         del p.misc
         p.save()
 
         p = self.Person.objects.get()
-        self.assertFalse(hasattr(p, "misc"))
+        assert not hasattr(p, "misc")
 
         obj = collection.find_one()
-        self.assertEqual(sorted(obj.keys()), ["_cls", "_id", "name"])
+        assert sorted(obj.keys()) == ["_cls", "_id", "name"]
 
     def test_reload_after_unsetting(self):
         p = self.Person()
@@ -88,12 +89,12 @@ def test_reload_dynamic_field(self):
         p = self.Person.objects.create()
         p.update(age=1)
 
-        self.assertEqual(len(p._data), 3)
-        self.assertEqual(sorted(p._data.keys()), ["_cls", "id", "name"])
+        assert len(p._data) == 3
+        assert sorted(p._data.keys()) == ["_cls", "id", "name"]
 
         p.reload()
-        self.assertEqual(len(p._data), 4)
-        self.assertEqual(sorted(p._data.keys()), ["_cls", "age", "id", "name"])
+        assert len(p._data) == 4
+        assert sorted(p._data.keys()) == ["_cls", "age", "id", "name"]
 
     def test_fields_without_underscore(self):
         """Ensure we can query dynamic fields"""
@@ -103,16 +104,18 @@ def test_fields_without_underscore(self):
         p.save()
 
         raw_p = Person.objects.as_pymongo().get(id=p.id)
-        self.assertEqual(raw_p, {"_cls": u"Person", "_id": p.id, "name": u"Dean"})
+        assert raw_p == {"_cls": u"Person", "_id": p.id, "name": u"Dean"}
 
         p.name = "OldDean"
         p.newattr = "garbage"
         p.save()
         raw_p = Person.objects.as_pymongo().get(id=p.id)
-        self.assertEqual(
-            raw_p,
-            {"_cls": u"Person", "_id": p.id, "name": "OldDean", "newattr": u"garbage"},
-        )
+        assert raw_p == {
+            "_cls": u"Person",
+            "_id": p.id,
+            "name": "OldDean",
+            "newattr": u"garbage",
+        }
 
     def test_fields_containing_underscore(self):
         """Ensure we can query dynamic fields"""
@@ -127,14 +130,14 @@ class WeirdPerson(DynamicDocument):
         p.save()
 
         raw_p = WeirdPerson.objects.as_pymongo().get(id=p.id)
-        self.assertEqual(raw_p, {"_id": p.id, "_name": u"Dean", "name": u"Dean"})
+        assert raw_p == {"_id": p.id, "_name": u"Dean", "name": u"Dean"}
 
         p.name = "OldDean"
         p._name = "NewDean"
         p._newattr1 = "garbage"  # Unknown fields won't be added
         p.save()
         raw_p = WeirdPerson.objects.as_pymongo().get(id=p.id)
-        self.assertEqual(raw_p, {"_id": p.id, "_name": u"NewDean", "name": u"OldDean"})
+        assert raw_p == {"_id": p.id, "_name": u"NewDean", "name": u"OldDean"}
 
     def test_dynamic_document_queries(self):
         """Ensure we can query dynamic fields"""
@@ -143,10 +146,10 @@ def test_dynamic_document_queries(self):
         p.age = 22
         p.save()
 
-        self.assertEqual(1, self.Person.objects(age=22).count())
+        assert 1 == self.Person.objects(age=22).count()
         p = self.Person.objects(age=22)
         p = p.get()
-        self.assertEqual(22, p.age)
+        assert 22 == p.age
 
     def test_complex_dynamic_document_queries(self):
         class Person(DynamicDocument):
@@ -166,8 +169,8 @@ class Person(DynamicDocument):
         p2.age = 10
         p2.save()
 
-        self.assertEqual(Person.objects(age__icontains="ten").count(), 2)
-        self.assertEqual(Person.objects(age__gte=10).count(), 1)
+        assert Person.objects(age__icontains="ten").count() == 2
+        assert Person.objects(age__gte=10).count() == 1
 
     def test_complex_data_lookups(self):
         """Ensure you can query dynamic document dynamic fields"""
@@ -175,12 +178,12 @@ def test_complex_data_lookups(self):
         p.misc = {"hello": "world"}
         p.save()
 
-        self.assertEqual(1, self.Person.objects(misc__hello="world").count())
+        assert 1 == self.Person.objects(misc__hello="world").count()
 
     def test_three_level_complex_data_lookups(self):
         """Ensure you can query three level document dynamic fields"""
         self.Person.objects.create(misc={"hello": {"hello2": "world"}})
-        self.assertEqual(1, self.Person.objects(misc__hello__hello2="world").count())
+        assert 1 == self.Person.objects(misc__hello__hello2="world").count()
 
     def test_complex_embedded_document_validation(self):
         """Ensure embedded dynamic documents may be validated"""
@@ -198,11 +201,13 @@ class Doc(DynamicDocument):
         embedded_doc_1.validate()
 
         embedded_doc_2 = Embedded(content="this is not a url")
-        self.assertRaises(ValidationError, embedded_doc_2.validate)
+        with pytest.raises(ValidationError):
+            embedded_doc_2.validate()
 
         doc.embedded_field_1 = embedded_doc_1
         doc.embedded_field_2 = embedded_doc_2
-        self.assertRaises(ValidationError, doc.validate)
+        with pytest.raises(ValidationError):
+            doc.validate()
 
     def test_inheritance(self):
         """Ensure that dynamic document plays nice with inheritance"""
@@ -212,11 +217,9 @@ class Employee(self.Person):
 
         Employee.drop_collection()
 
-        self.assertIn("name", Employee._fields)
-        self.assertIn("salary", Employee._fields)
-        self.assertEqual(
-            Employee._get_collection_name(), self.Person._get_collection_name()
-        )
+        assert "name" in Employee._fields
+        assert "salary" in Employee._fields
+        assert Employee._get_collection_name() == self.Person._get_collection_name()
 
         joe_bloggs = Employee()
         joe_bloggs.name = "Joe Bloggs"
@@ -224,11 +227,11 @@ class Employee(self.Person):
         joe_bloggs.age = 20
         joe_bloggs.save()
 
-        self.assertEqual(1, self.Person.objects(age=20).count())
-        self.assertEqual(1, Employee.objects(age=20).count())
+        assert 1 == self.Person.objects(age=20).count()
+        assert 1 == Employee.objects(age=20).count()
 
         joe_bloggs = self.Person.objects.first()
-        self.assertIsInstance(joe_bloggs, Employee)
+        assert isinstance(joe_bloggs, Employee)
 
     def test_embedded_dynamic_document(self):
         """Test dynamic embedded documents"""
@@ -249,26 +252,23 @@ class Doc(DynamicDocument):
         embedded_1.list_field = ["1", 2, {"hello": "world"}]
         doc.embedded_field = embedded_1
 
-        self.assertEqual(
-            doc.to_mongo(),
-            {
-                "embedded_field": {
-                    "_cls": "Embedded",
-                    "string_field": "hello",
-                    "int_field": 1,
-                    "dict_field": {"hello": "world"},
-                    "list_field": ["1", 2, {"hello": "world"}],
-                }
-            },
-        )
+        assert doc.to_mongo() == {
+            "embedded_field": {
+                "_cls": "Embedded",
+                "string_field": "hello",
+                "int_field": 1,
+                "dict_field": {"hello": "world"},
+                "list_field": ["1", 2, {"hello": "world"}],
+            }
+        }
         doc.save()
 
         doc = Doc.objects.first()
-        self.assertEqual(doc.embedded_field.__class__, Embedded)
-        self.assertEqual(doc.embedded_field.string_field, "hello")
-        self.assertEqual(doc.embedded_field.int_field, 1)
-        self.assertEqual(doc.embedded_field.dict_field, {"hello": "world"})
-        self.assertEqual(doc.embedded_field.list_field, ["1", 2, {"hello": "world"}])
+        assert doc.embedded_field.__class__ == Embedded
+        assert doc.embedded_field.string_field == "hello"
+        assert doc.embedded_field.int_field == 1
+        assert doc.embedded_field.dict_field == {"hello": "world"}
+        assert doc.embedded_field.list_field == ["1", 2, {"hello": "world"}]
 
     def test_complex_embedded_documents(self):
         """Test complex dynamic embedded documents setups"""
@@ -296,44 +296,41 @@ class Doc(DynamicDocument):
         embedded_1.list_field = ["1", 2, embedded_2]
         doc.embedded_field = embedded_1
 
-        self.assertEqual(
-            doc.to_mongo(),
-            {
-                "embedded_field": {
-                    "_cls": "Embedded",
-                    "string_field": "hello",
-                    "int_field": 1,
-                    "dict_field": {"hello": "world"},
-                    "list_field": [
-                        "1",
-                        2,
-                        {
-                            "_cls": "Embedded",
-                            "string_field": "hello",
-                            "int_field": 1,
-                            "dict_field": {"hello": "world"},
-                            "list_field": ["1", 2, {"hello": "world"}],
-                        },
-                    ],
-                }
-            },
-        )
+        assert doc.to_mongo() == {
+            "embedded_field": {
+                "_cls": "Embedded",
+                "string_field": "hello",
+                "int_field": 1,
+                "dict_field": {"hello": "world"},
+                "list_field": [
+                    "1",
+                    2,
+                    {
+                        "_cls": "Embedded",
+                        "string_field": "hello",
+                        "int_field": 1,
+                        "dict_field": {"hello": "world"},
+                        "list_field": ["1", 2, {"hello": "world"}],
+                    },
+                ],
+            }
+        }
         doc.save()
         doc = Doc.objects.first()
-        self.assertEqual(doc.embedded_field.__class__, Embedded)
-        self.assertEqual(doc.embedded_field.string_field, "hello")
-        self.assertEqual(doc.embedded_field.int_field, 1)
-        self.assertEqual(doc.embedded_field.dict_field, {"hello": "world"})
-        self.assertEqual(doc.embedded_field.list_field[0], "1")
-        self.assertEqual(doc.embedded_field.list_field[1], 2)
+        assert doc.embedded_field.__class__ == Embedded
+        assert doc.embedded_field.string_field == "hello"
+        assert doc.embedded_field.int_field == 1
+        assert doc.embedded_field.dict_field == {"hello": "world"}
+        assert doc.embedded_field.list_field[0] == "1"
+        assert doc.embedded_field.list_field[1] == 2
 
         embedded_field = doc.embedded_field.list_field[2]
 
-        self.assertEqual(embedded_field.__class__, Embedded)
-        self.assertEqual(embedded_field.string_field, "hello")
-        self.assertEqual(embedded_field.int_field, 1)
-        self.assertEqual(embedded_field.dict_field, {"hello": "world"})
-        self.assertEqual(embedded_field.list_field, ["1", 2, {"hello": "world"}])
+        assert embedded_field.__class__ == Embedded
+        assert embedded_field.string_field == "hello"
+        assert embedded_field.int_field == 1
+        assert embedded_field.dict_field == {"hello": "world"}
+        assert embedded_field.list_field == ["1", 2, {"hello": "world"}]
 
     def test_dynamic_and_embedded(self):
         """Ensure embedded documents play nicely"""
@@ -352,18 +349,18 @@ class Person(DynamicDocument):
         person.address.city = "Lundenne"
         person.save()
 
-        self.assertEqual(Person.objects.first().address.city, "Lundenne")
+        assert Person.objects.first().address.city == "Lundenne"
 
         person = Person.objects.first()
         person.address = Address(city="Londinium")
         person.save()
 
-        self.assertEqual(Person.objects.first().address.city, "Londinium")
+        assert Person.objects.first().address.city == "Londinium"
 
         person = Person.objects.first()
         person.age = 35
         person.save()
-        self.assertEqual(Person.objects.first().age, 35)
+        assert Person.objects.first().age == 35
 
     def test_dynamic_embedded_works_with_only(self):
         """Ensure custom fieldnames on a dynamic embedded document are found by qs.only()"""
@@ -380,10 +377,10 @@ class Person(DynamicDocument):
             name="Eric", address=Address(city="San Francisco", street_number="1337")
         ).save()
 
-        self.assertEqual(Person.objects.first().address.street_number, "1337")
-        self.assertEqual(
-            Person.objects.only("address__street_number").first().address.street_number,
-            "1337",
+        assert Person.objects.first().address.street_number == "1337"
+        assert (
+            Person.objects.only("address__street_number").first().address.street_number
+            == "1337"
         )
 
     def test_dynamic_and_embedded_dict_access(self):
@@ -408,20 +405,20 @@ class Person(DynamicDocument):
         person["address"]["city"] = "Lundenne"
         person.save()
 
-        self.assertEqual(Person.objects.first().address.city, "Lundenne")
+        assert Person.objects.first().address.city == "Lundenne"
 
-        self.assertEqual(Person.objects.first().phone, "555-1212")
+        assert Person.objects.first().phone == "555-1212"
 
         person = Person.objects.first()
         person.address = Address(city="Londinium")
         person.save()
 
-        self.assertEqual(Person.objects.first().address.city, "Londinium")
+        assert Person.objects.first().address.city == "Londinium"
 
         person = Person.objects.first()
         person["age"] = 35
         person.save()
-        self.assertEqual(Person.objects.first().age, 35)
+        assert Person.objects.first().age == 35
 
 
 if __name__ == "__main__":
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 1b0304c4a..cc1aae52e 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -9,6 +9,7 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
+import pytest
 
 
 class TestIndexes(unittest.TestCase):
@@ -53,15 +54,15 @@ class BlogPost(InheritFrom):
             {"fields": [("tags", 1)]},
             {"fields": [("category", 1), ("addDate", -1)]},
         ]
-        self.assertEqual(expected_specs, BlogPost._meta["index_specs"])
+        assert expected_specs == BlogPost._meta["index_specs"]
 
         BlogPost.ensure_indexes()
         info = BlogPost.objects._collection.index_information()
         # _id, '-date', 'tags', ('cat', 'date')
-        self.assertEqual(len(info), 4)
+        assert len(info) == 4
         info = [value["key"] for key, value in iteritems(info)]
         for expected in expected_specs:
-            self.assertIn(expected["fields"], info)
+            assert expected["fields"] in info
 
     def _index_test_inheritance(self, InheritFrom):
         class BlogPost(InheritFrom):
@@ -78,7 +79,7 @@ class BlogPost(InheritFrom):
             {"fields": [("_cls", 1), ("tags", 1)]},
             {"fields": [("_cls", 1), ("category", 1), ("addDate", -1)]},
         ]
-        self.assertEqual(expected_specs, BlogPost._meta["index_specs"])
+        assert expected_specs == BlogPost._meta["index_specs"]
 
         BlogPost.ensure_indexes()
         info = BlogPost.objects._collection.index_information()
@@ -86,17 +87,17 @@ class BlogPost(InheritFrom):
         # NB: there is no index on _cls by itself, since
         # the indices on -date and tags will both contain
         # _cls as first element in the key
-        self.assertEqual(len(info), 4)
+        assert len(info) == 4
         info = [value["key"] for key, value in iteritems(info)]
         for expected in expected_specs:
-            self.assertIn(expected["fields"], info)
+            assert expected["fields"] in info
 
         class ExtendedBlogPost(BlogPost):
             title = StringField()
             meta = {"indexes": ["title"]}
 
         expected_specs.append({"fields": [("_cls", 1), ("title", 1)]})
-        self.assertEqual(expected_specs, ExtendedBlogPost._meta["index_specs"])
+        assert expected_specs == ExtendedBlogPost._meta["index_specs"]
 
         BlogPost.drop_collection()
 
@@ -104,7 +105,7 @@ class ExtendedBlogPost(BlogPost):
         info = ExtendedBlogPost.objects._collection.index_information()
         info = [value["key"] for key, value in iteritems(info)]
         for expected in expected_specs:
-            self.assertIn(expected["fields"], info)
+            assert expected["fields"] in info
 
     def test_indexes_document_inheritance(self):
         """Ensure that indexes are used when meta[indexes] is specified for
@@ -128,10 +129,8 @@ class A(Document):
         class B(A):
             description = StringField()
 
-        self.assertEqual(A._meta["index_specs"], B._meta["index_specs"])
-        self.assertEqual(
-            [{"fields": [("_cls", 1), ("title", 1)]}], A._meta["index_specs"]
-        )
+        assert A._meta["index_specs"] == B._meta["index_specs"]
+        assert [{"fields": [("_cls", 1), ("title", 1)]}] == A._meta["index_specs"]
 
     def test_index_no_cls(self):
         """Ensure index specs are inhertited correctly"""
@@ -144,11 +143,11 @@ class A(Document):
                 "index_cls": False,
             }
 
-        self.assertEqual([("title", 1)], A._meta["index_specs"][0]["fields"])
+        assert [("title", 1)] == A._meta["index_specs"][0]["fields"]
         A._get_collection().drop_indexes()
         A.ensure_indexes()
         info = A._get_collection().index_information()
-        self.assertEqual(len(info.keys()), 2)
+        assert len(info.keys()) == 2
 
         class B(A):
             c = StringField()
@@ -158,8 +157,8 @@ class B(A):
                 "allow_inheritance": True,
             }
 
-        self.assertEqual([("c", 1)], B._meta["index_specs"][1]["fields"])
-        self.assertEqual([("_cls", 1), ("d", 1)], B._meta["index_specs"][2]["fields"])
+        assert [("c", 1)] == B._meta["index_specs"][1]["fields"]
+        assert [("_cls", 1), ("d", 1)] == B._meta["index_specs"][2]["fields"]
 
     def test_build_index_spec_is_not_destructive(self):
         class MyDoc(Document):
@@ -167,12 +166,12 @@ class MyDoc(Document):
 
             meta = {"indexes": ["keywords"], "allow_inheritance": False}
 
-        self.assertEqual(MyDoc._meta["index_specs"], [{"fields": [("keywords", 1)]}])
+        assert MyDoc._meta["index_specs"] == [{"fields": [("keywords", 1)]}]
 
         # Force index creation
         MyDoc.ensure_indexes()
 
-        self.assertEqual(MyDoc._meta["index_specs"], [{"fields": [("keywords", 1)]}])
+        assert MyDoc._meta["index_specs"] == [{"fields": [("keywords", 1)]}]
 
     def test_embedded_document_index_meta(self):
         """Ensure that embedded document indexes are created explicitly
@@ -187,7 +186,7 @@ class Person(Document):
 
             meta = {"indexes": ["rank.title"], "allow_inheritance": False}
 
-        self.assertEqual([{"fields": [("rank.title", 1)]}], Person._meta["index_specs"])
+        assert [{"fields": [("rank.title", 1)]}] == Person._meta["index_specs"]
 
         Person.drop_collection()
 
@@ -195,7 +194,7 @@ class Person(Document):
         list(Person.objects)
         info = Person.objects._collection.index_information()
         info = [value["key"] for key, value in iteritems(info)]
-        self.assertIn([("rank.title", 1)], info)
+        assert [("rank.title", 1)] in info
 
     def test_explicit_geo2d_index(self):
         """Ensure that geo2d indexes work when created via meta[indexes]
@@ -205,14 +204,12 @@ class Place(Document):
             location = DictField()
             meta = {"allow_inheritance": True, "indexes": ["*location.point"]}
 
-        self.assertEqual(
-            [{"fields": [("location.point", "2d")]}], Place._meta["index_specs"]
-        )
+        assert [{"fields": [("location.point", "2d")]}] == Place._meta["index_specs"]
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
         info = [value["key"] for key, value in iteritems(info)]
-        self.assertIn([("location.point", "2d")], info)
+        assert [("location.point", "2d")] in info
 
     def test_explicit_geo2d_index_embedded(self):
         """Ensure that geo2d indexes work when created via meta[indexes]
@@ -225,14 +222,14 @@ class Place(Document):
             current = DictField(field=EmbeddedDocumentField("EmbeddedLocation"))
             meta = {"allow_inheritance": True, "indexes": ["*current.location.point"]}
 
-        self.assertEqual(
-            [{"fields": [("current.location.point", "2d")]}], Place._meta["index_specs"]
-        )
+        assert [{"fields": [("current.location.point", "2d")]}] == Place._meta[
+            "index_specs"
+        ]
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
         info = [value["key"] for key, value in iteritems(info)]
-        self.assertIn([("current.location.point", "2d")], info)
+        assert [("current.location.point", "2d")] in info
 
     def test_explicit_geosphere_index(self):
         """Ensure that geosphere indexes work when created via meta[indexes]
@@ -242,14 +239,14 @@ class Place(Document):
             location = DictField()
             meta = {"allow_inheritance": True, "indexes": ["(location.point"]}
 
-        self.assertEqual(
-            [{"fields": [("location.point", "2dsphere")]}], Place._meta["index_specs"]
-        )
+        assert [{"fields": [("location.point", "2dsphere")]}] == Place._meta[
+            "index_specs"
+        ]
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
         info = [value["key"] for key, value in iteritems(info)]
-        self.assertIn([("location.point", "2dsphere")], info)
+        assert [("location.point", "2dsphere")] in info
 
     def test_explicit_geohaystack_index(self):
         """Ensure that geohaystack indexes work when created via meta[indexes]
@@ -264,15 +261,14 @@ class Place(Document):
             name = StringField()
             meta = {"indexes": [(")location.point", "name")]}
 
-        self.assertEqual(
-            [{"fields": [("location.point", "geoHaystack"), ("name", 1)]}],
-            Place._meta["index_specs"],
-        )
+        assert [
+            {"fields": [("location.point", "geoHaystack"), ("name", 1)]}
+        ] == Place._meta["index_specs"]
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
         info = [value["key"] for key, value in iteritems(info)]
-        self.assertIn([("location.point", "geoHaystack")], info)
+        assert [("location.point", "geoHaystack")] in info
 
     def test_create_geohaystack_index(self):
         """Ensure that geohaystack indexes can be created
@@ -285,7 +281,7 @@ class Place(Document):
         Place.create_index({"fields": (")location.point", "name")}, bucketSize=10)
         info = Place._get_collection().index_information()
         info = [value["key"] for key, value in iteritems(info)]
-        self.assertIn([("location.point", "geoHaystack"), ("name", 1)], info)
+        assert [("location.point", "geoHaystack"), ("name", 1)] in info
 
     def test_dictionary_indexes(self):
         """Ensure that indexes are used when meta[indexes] contains
@@ -298,16 +294,15 @@ class BlogPost(Document):
             tags = ListField(StringField())
             meta = {"indexes": [{"fields": ["-date"], "unique": True, "sparse": True}]}
 
-        self.assertEqual(
-            [{"fields": [("addDate", -1)], "unique": True, "sparse": True}],
-            BlogPost._meta["index_specs"],
-        )
+        assert [
+            {"fields": [("addDate", -1)], "unique": True, "sparse": True}
+        ] == BlogPost._meta["index_specs"]
 
         BlogPost.drop_collection()
 
         info = BlogPost.objects._collection.index_information()
         # _id, '-date'
-        self.assertEqual(len(info), 2)
+        assert len(info) == 2
 
         # Indexes are lazy so use list() to perform query
         list(BlogPost.objects)
@@ -316,7 +311,7 @@ class BlogPost(Document):
             (value["key"], value.get("unique", False), value.get("sparse", False))
             for key, value in iteritems(info)
         ]
-        self.assertIn(([("addDate", -1)], True, True), info)
+        assert ([("addDate", -1)], True, True) in info
 
         BlogPost.drop_collection()
 
@@ -338,11 +333,9 @@ class Person(UserBase):
 
         Person(name="test", user_guid="123").save()
 
-        self.assertEqual(1, Person.objects.count())
+        assert 1 == Person.objects.count()
         info = Person.objects._collection.index_information()
-        self.assertEqual(
-            sorted(info.keys()), ["_cls_1_name_1", "_cls_1_user_guid_1", "_id_"]
-        )
+        assert sorted(info.keys()) == ["_cls_1_name_1", "_cls_1_user_guid_1", "_id_"]
 
     def test_disable_index_creation(self):
         """Tests setting auto_create_index to False on the connection will
@@ -365,13 +358,13 @@ class MongoUser(User):
         User(user_guid="123").save()
         MongoUser(user_guid="123").save()
 
-        self.assertEqual(2, User.objects.count())
+        assert 2 == User.objects.count()
         info = User.objects._collection.index_information()
-        self.assertEqual(list(info.keys()), ["_id_"])
+        assert list(info.keys()) == ["_id_"]
 
         User.ensure_indexes()
         info = User.objects._collection.index_information()
-        self.assertEqual(sorted(info.keys()), ["_cls_1_user_guid_1", "_id_"])
+        assert sorted(info.keys()) == ["_cls_1_user_guid_1", "_id_"]
 
     def test_embedded_document_index(self):
         """Tests settings an index on an embedded document
@@ -389,7 +382,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         info = BlogPost.objects._collection.index_information()
-        self.assertEqual(sorted(info.keys()), ["_id_", "date.yr_-1"])
+        assert sorted(info.keys()) == ["_id_", "date.yr_-1"]
 
     def test_list_embedded_document_index(self):
         """Ensure list embedded documents can be indexed
@@ -408,7 +401,7 @@ class BlogPost(Document):
 
         info = BlogPost.objects._collection.index_information()
         # we don't use _cls in with list fields by default
-        self.assertEqual(sorted(info.keys()), ["_id_", "tags.tag_1"])
+        assert sorted(info.keys()) == ["_id_", "tags.tag_1"]
 
         post1 = BlogPost(
             title="Embedded Indexes tests in place",
@@ -426,7 +419,7 @@ class RecursiveDocument(Document):
 
         RecursiveDocument.ensure_indexes()
         info = RecursiveDocument._get_collection().index_information()
-        self.assertEqual(sorted(info.keys()), ["_cls_1", "_id_"])
+        assert sorted(info.keys()) == ["_cls_1", "_id_"]
 
     def test_covered_index(self):
         """Ensure that covered indexes can be used
@@ -446,46 +439,45 @@ class Test(Document):
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
         query_plan = Test.objects(id=obj.id).exclude("a").explain()
-        self.assertEqual(
+        assert (
             query_plan.get("queryPlanner")
             .get("winningPlan")
             .get("inputStage")
-            .get("stage"),
-            "IDHACK",
+            .get("stage")
+            == "IDHACK"
         )
 
         query_plan = Test.objects(id=obj.id).only("id").explain()
-        self.assertEqual(
+        assert (
             query_plan.get("queryPlanner")
             .get("winningPlan")
             .get("inputStage")
-            .get("stage"),
-            "IDHACK",
+            .get("stage")
+            == "IDHACK"
         )
 
         query_plan = Test.objects(a=1).only("a").exclude("id").explain()
-        self.assertEqual(
+        assert (
             query_plan.get("queryPlanner")
             .get("winningPlan")
             .get("inputStage")
-            .get("stage"),
-            "IXSCAN",
+            .get("stage")
+            == "IXSCAN"
         )
-        self.assertEqual(
-            query_plan.get("queryPlanner").get("winningPlan").get("stage"), "PROJECTION"
+        assert (
+            query_plan.get("queryPlanner").get("winningPlan").get("stage")
+            == "PROJECTION"
         )
 
         query_plan = Test.objects(a=1).explain()
-        self.assertEqual(
+        assert (
             query_plan.get("queryPlanner")
             .get("winningPlan")
             .get("inputStage")
-            .get("stage"),
-            "IXSCAN",
-        )
-        self.assertEqual(
-            query_plan.get("queryPlanner").get("winningPlan").get("stage"), "FETCH"
+            .get("stage")
+            == "IXSCAN"
         )
+        assert query_plan.get("queryPlanner").get("winningPlan").get("stage") == "FETCH"
 
     def test_index_on_id(self):
         class BlogPost(Document):
@@ -498,9 +490,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
         indexes = BlogPost.objects._collection.index_information()
-        self.assertEqual(
-            indexes["categories_1__id_1"]["key"], [("categories", 1), ("_id", 1)]
-        )
+        assert indexes["categories_1__id_1"]["key"] == [("categories", 1), ("_id", 1)]
 
     def test_hint(self):
         TAGS_INDEX_NAME = "tags_1"
@@ -516,25 +506,25 @@ class BlogPost(Document):
             BlogPost(tags=tags).save()
 
         # Hinting by shape should work.
-        self.assertEqual(BlogPost.objects.hint([("tags", 1)]).count(), 10)
+        assert BlogPost.objects.hint([("tags", 1)]).count() == 10
 
         # Hinting by index name should work.
-        self.assertEqual(BlogPost.objects.hint(TAGS_INDEX_NAME).count(), 10)
+        assert BlogPost.objects.hint(TAGS_INDEX_NAME).count() == 10
 
         # Clearing the hint should work fine.
-        self.assertEqual(BlogPost.objects.hint().count(), 10)
-        self.assertEqual(BlogPost.objects.hint([("ZZ", 1)]).hint().count(), 10)
+        assert BlogPost.objects.hint().count() == 10
+        assert BlogPost.objects.hint([("ZZ", 1)]).hint().count() == 10
 
         # Hinting on a non-existent index shape should fail.
-        with self.assertRaises(OperationFailure):
+        with pytest.raises(OperationFailure):
             BlogPost.objects.hint([("ZZ", 1)]).count()
 
         # Hinting on a non-existent index name should fail.
-        with self.assertRaises(OperationFailure):
+        with pytest.raises(OperationFailure):
             BlogPost.objects.hint("Bad Name").count()
 
         # Invalid shape argument (missing list brackets) should fail.
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             BlogPost.objects.hint(("tags", 1)).count()
 
     def test_collation(self):
@@ -588,11 +578,14 @@ class BlogPost(Document):
 
         # Two posts with the same slug is not allowed
         post2 = BlogPost(title="test2", slug="test")
-        self.assertRaises(NotUniqueError, post2.save)
-        self.assertRaises(NotUniqueError, BlogPost.objects.insert, post2)
+        with pytest.raises(NotUniqueError):
+            post2.save()
+        with pytest.raises(NotUniqueError):
+            BlogPost.objects.insert(post2)
 
         # Ensure backwards compatibility for errors
-        self.assertRaises(OperationError, post2.save)
+        with pytest.raises(OperationError):
+            post2.save()
 
     def test_primary_key_unique_not_working(self):
         """Relates to #1445"""
@@ -602,23 +595,21 @@ class Blog(Document):
 
         Blog.drop_collection()
 
-        with self.assertRaises(OperationFailure) as ctx_err:
+        with pytest.raises(OperationFailure) as ctx_err:
             Blog(id="garbage").save()
 
         # One of the errors below should happen. Which one depends on the
         # PyMongo version and dict order.
         err_msg = str(ctx_err.exception)
-        self.assertTrue(
-            any(
-                [
-                    "The field 'unique' is not valid for an _id index specification"
-                    in err_msg,
-                    "The field 'background' is not valid for an _id index specification"
-                    in err_msg,
-                    "The field 'sparse' is not valid for an _id index specification"
-                    in err_msg,
-                ]
-            )
+        assert any(
+            [
+                "The field 'unique' is not valid for an _id index specification"
+                in err_msg,
+                "The field 'background' is not valid for an _id index specification"
+                in err_msg,
+                "The field 'sparse' is not valid for an _id index specification"
+                in err_msg,
+            ]
         )
 
     def test_unique_with(self):
@@ -644,7 +635,8 @@ class BlogPost(Document):
 
         # Now there will be two docs with the same slug and the same day: fail
         post3 = BlogPost(title="test3", date=Date(year=2010), slug="test")
-        self.assertRaises(OperationError, post3.save)
+        with pytest.raises(OperationError):
+            post3.save()
 
     def test_unique_embedded_document(self):
         """Ensure that uniqueness constraints are applied to fields on embedded documents.
@@ -669,7 +661,8 @@ class BlogPost(Document):
 
         # Now there will be two docs with the same sub.slug
         post3 = BlogPost(title="test3", sub=SubDocument(year=2010, slug="test"))
-        self.assertRaises(NotUniqueError, post3.save)
+        with pytest.raises(NotUniqueError):
+            post3.save()
 
     def test_unique_embedded_document_in_list(self):
         """
@@ -699,7 +692,8 @@ class BlogPost(Document):
 
         post2 = BlogPost(title="test2", subs=[SubDocument(year=2014, slug="conflict")])
 
-        self.assertRaises(NotUniqueError, post2.save)
+        with pytest.raises(NotUniqueError):
+            post2.save()
 
     def test_unique_embedded_document_in_sorted_list(self):
         """
@@ -729,12 +723,13 @@ class BlogPost(Document):
 
         # confirm that the unique index is created
         indexes = BlogPost._get_collection().index_information()
-        self.assertIn("subs.slug_1", indexes)
-        self.assertTrue(indexes["subs.slug_1"]["unique"])
+        assert "subs.slug_1" in indexes
+        assert indexes["subs.slug_1"]["unique"]
 
         post2 = BlogPost(title="test2", subs=[SubDocument(year=2014, slug="conflict")])
 
-        self.assertRaises(NotUniqueError, post2.save)
+        with pytest.raises(NotUniqueError):
+            post2.save()
 
     def test_unique_embedded_document_in_embedded_document_list(self):
         """
@@ -764,12 +759,13 @@ class BlogPost(Document):
 
         # confirm that the unique index is created
         indexes = BlogPost._get_collection().index_information()
-        self.assertIn("subs.slug_1", indexes)
-        self.assertTrue(indexes["subs.slug_1"]["unique"])
+        assert "subs.slug_1" in indexes
+        assert indexes["subs.slug_1"]["unique"]
 
         post2 = BlogPost(title="test2", subs=[SubDocument(year=2014, slug="conflict")])
 
-        self.assertRaises(NotUniqueError, post2.save)
+        with pytest.raises(NotUniqueError):
+            post2.save()
 
     def test_unique_with_embedded_document_and_embedded_unique(self):
         """Ensure that uniqueness constraints are applied to fields on
@@ -795,11 +791,13 @@ class BlogPost(Document):
 
         # Now there will be two docs with the same sub.slug
         post3 = BlogPost(title="test3", sub=SubDocument(year=2010, slug="test"))
-        self.assertRaises(NotUniqueError, post3.save)
+        with pytest.raises(NotUniqueError):
+            post3.save()
 
         # Now there will be two docs with the same title and year
         post3 = BlogPost(title="test1", sub=SubDocument(year=2009, slug="test-1"))
-        self.assertRaises(NotUniqueError, post3.save)
+        with pytest.raises(NotUniqueError):
+            post3.save()
 
     def test_ttl_indexes(self):
         class Log(Document):
@@ -811,7 +809,7 @@ class Log(Document):
         # Indexes are lazy so use list() to perform query
         list(Log.objects)
         info = Log.objects._collection.index_information()
-        self.assertEqual(3600, info["created_1"]["expireAfterSeconds"])
+        assert 3600 == info["created_1"]["expireAfterSeconds"]
 
     def test_index_drop_dups_silently_ignored(self):
         class Customer(Document):
@@ -839,14 +837,14 @@ class Customer(Document):
         cust.save()
 
         cust_dupe = Customer(cust_id=1)
-        with self.assertRaises(NotUniqueError):
+        with pytest.raises(NotUniqueError):
             cust_dupe.save()
 
         cust = Customer(cust_id=2)
         cust.save()
 
         # duplicate key on update
-        with self.assertRaises(NotUniqueError):
+        with pytest.raises(NotUniqueError):
             cust.cust_id = 1
             cust.save()
 
@@ -867,8 +865,8 @@ class User(Document):
         user = User(name="huangz", password="secret2")
         user.save()
 
-        self.assertEqual(User.objects.count(), 1)
-        self.assertEqual(User.objects.get().password, "secret2")
+        assert User.objects.count() == 1
+        assert User.objects.get().password == "secret2"
 
     def test_unique_and_primary_create(self):
         """Create a new record with a duplicate primary key
@@ -882,11 +880,11 @@ class User(Document):
         User.drop_collection()
 
         User.objects.create(name="huangz", password="secret")
-        with self.assertRaises(NotUniqueError):
+        with pytest.raises(NotUniqueError):
             User.objects.create(name="huangz", password="secret2")
 
-        self.assertEqual(User.objects.count(), 1)
-        self.assertEqual(User.objects.get().password, "secret")
+        assert User.objects.count() == 1
+        assert User.objects.get().password == "secret"
 
     def test_index_with_pk(self):
         """Ensure you can use `pk` as part of a query"""
@@ -910,7 +908,7 @@ class BlogPost(Document):
         info = BlogPost.objects._collection.index_information()
         info = [value["key"] for key, value in iteritems(info)]
         index_item = [("_id", 1), ("comments.comment_id", 1)]
-        self.assertIn(index_item, info)
+        assert index_item in info
 
     def test_compound_key_embedded(self):
         class CompoundKey(EmbeddedDocument):
@@ -924,10 +922,8 @@ class ReportEmbedded(Document):
         my_key = CompoundKey(name="n", term="ok")
         report = ReportEmbedded(text="OK", key=my_key).save()
 
-        self.assertEqual(
-            {"text": "OK", "_id": {"term": "ok", "name": "n"}}, report.to_mongo()
-        )
-        self.assertEqual(report, ReportEmbedded.objects.get(pk=my_key))
+        assert {"text": "OK", "_id": {"term": "ok", "name": "n"}} == report.to_mongo()
+        assert report == ReportEmbedded.objects.get(pk=my_key)
 
     def test_compound_key_dictfield(self):
         class ReportDictField(Document):
@@ -937,15 +933,13 @@ class ReportDictField(Document):
         my_key = {"name": "n", "term": "ok"}
         report = ReportDictField(text="OK", key=my_key).save()
 
-        self.assertEqual(
-            {"text": "OK", "_id": {"term": "ok", "name": "n"}}, report.to_mongo()
-        )
+        assert {"text": "OK", "_id": {"term": "ok", "name": "n"}} == report.to_mongo()
 
         # We can't directly call ReportDictField.objects.get(pk=my_key),
         # because dicts are unordered, and if the order in MongoDB is
         # different than the one in `my_key`, this test will fail.
-        self.assertEqual(report, ReportDictField.objects.get(pk__name=my_key["name"]))
-        self.assertEqual(report, ReportDictField.objects.get(pk__term=my_key["term"]))
+        assert report == ReportDictField.objects.get(pk__name=my_key["name"])
+        assert report == ReportDictField.objects.get(pk__term=my_key["term"])
 
     def test_string_indexes(self):
         class MyDoc(Document):
@@ -954,8 +948,8 @@ class MyDoc(Document):
 
         info = MyDoc.objects._collection.index_information()
         info = [value["key"] for key, value in iteritems(info)]
-        self.assertIn([("provider_ids.foo", 1)], info)
-        self.assertIn([("provider_ids.bar", 1)], info)
+        assert [("provider_ids.foo", 1)] in info
+        assert [("provider_ids.bar", 1)] in info
 
     def test_sparse_compound_indexes(self):
         class MyDoc(Document):
@@ -967,11 +961,10 @@ class MyDoc(Document):
             }
 
         info = MyDoc.objects._collection.index_information()
-        self.assertEqual(
-            [("provider_ids.foo", 1), ("provider_ids.bar", 1)],
-            info["provider_ids.foo_1_provider_ids.bar_1"]["key"],
-        )
-        self.assertTrue(info["provider_ids.foo_1_provider_ids.bar_1"]["sparse"])
+        assert [("provider_ids.foo", 1), ("provider_ids.bar", 1)] == info[
+            "provider_ids.foo_1_provider_ids.bar_1"
+        ]["key"]
+        assert info["provider_ids.foo_1_provider_ids.bar_1"]["sparse"]
 
     def test_text_indexes(self):
         class Book(Document):
@@ -979,9 +972,9 @@ class Book(Document):
             meta = {"indexes": ["$title"]}
 
         indexes = Book.objects._collection.index_information()
-        self.assertIn("title_text", indexes)
+        assert "title_text" in indexes
         key = indexes["title_text"]["key"]
-        self.assertIn(("_fts", "text"), key)
+        assert ("_fts", "text") in key
 
     def test_hashed_indexes(self):
         class Book(Document):
@@ -989,8 +982,8 @@ class Book(Document):
             meta = {"indexes": ["#ref_id"]}
 
         indexes = Book.objects._collection.index_information()
-        self.assertIn("ref_id_hashed", indexes)
-        self.assertIn(("ref_id", "hashed"), indexes["ref_id_hashed"]["key"])
+        assert "ref_id_hashed" in indexes
+        assert ("ref_id", "hashed") in indexes["ref_id_hashed"]["key"]
 
     def test_indexes_after_database_drop(self):
         """
@@ -1027,7 +1020,8 @@ class BlogPost(Document):
 
             # Create Post #2
             post2 = BlogPost(title="test2", slug="test")
-            self.assertRaises(NotUniqueError, post2.save)
+            with pytest.raises(NotUniqueError):
+                post2.save()
         finally:
             # Drop the temporary database at the end
             connection.drop_database("tempdatabase")
@@ -1074,15 +1068,12 @@ class TestChildDoc(TestDoc):
                     "dropDups"
                 ]  # drop the index dropDups - it is deprecated in MongoDB 3+
 
-        self.assertEqual(
-            index_info,
-            {
-                "txt_1": {"key": [("txt", 1)], "background": False},
-                "_id_": {"key": [("_id", 1)]},
-                "txt2_1": {"key": [("txt2", 1)], "background": False},
-                "_cls_1": {"key": [("_cls", 1)], "background": False},
-            },
-        )
+        assert index_info == {
+            "txt_1": {"key": [("txt", 1)], "background": False},
+            "_id_": {"key": [("_id", 1)]},
+            "txt2_1": {"key": [("txt2", 1)], "background": False},
+            "_cls_1": {"key": [("_cls", 1)], "background": False},
+        }
 
     def test_compound_index_underscore_cls_not_overwritten(self):
         """
@@ -1105,7 +1096,7 @@ class TestDoc(Document):
         TestDoc.ensure_indexes()
 
         index_info = TestDoc._get_collection().index_information()
-        self.assertIn("shard_1_1__cls_1_txt_1_1", index_info)
+        assert "shard_1_1__cls_1_txt_1_1" in index_info
 
 
 if __name__ == "__main__":
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index 4bb46e58c..6a913b3e5 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -17,6 +17,7 @@
 from mongoengine.pymongo_support import list_collection_names
 from tests.fixtures import Base
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestInheritance(MongoDBTestCase):
@@ -37,12 +38,12 @@ class DataDoc(Document):
             meta = {"allow_inheritance": True}
 
         test_doc = DataDoc(name="test", embed=EmbedData(data="data"))
-        self.assertEqual(test_doc._cls, "DataDoc")
-        self.assertEqual(test_doc.embed._cls, "EmbedData")
+        assert test_doc._cls == "DataDoc"
+        assert test_doc.embed._cls == "EmbedData"
         test_doc.save()
         saved_doc = DataDoc.objects.with_id(test_doc.id)
-        self.assertEqual(test_doc._cls, saved_doc._cls)
-        self.assertEqual(test_doc.embed._cls, saved_doc.embed._cls)
+        assert test_doc._cls == saved_doc._cls
+        assert test_doc.embed._cls == saved_doc.embed._cls
         test_doc.delete()
 
     def test_superclasses(self):
@@ -67,12 +68,12 @@ class Dog(Mammal):
         class Human(Mammal):
             pass
 
-        self.assertEqual(Animal._superclasses, ())
-        self.assertEqual(Fish._superclasses, ("Animal",))
-        self.assertEqual(Guppy._superclasses, ("Animal", "Animal.Fish"))
-        self.assertEqual(Mammal._superclasses, ("Animal",))
-        self.assertEqual(Dog._superclasses, ("Animal", "Animal.Mammal"))
-        self.assertEqual(Human._superclasses, ("Animal", "Animal.Mammal"))
+        assert Animal._superclasses == ()
+        assert Fish._superclasses == ("Animal",)
+        assert Guppy._superclasses == ("Animal", "Animal.Fish")
+        assert Mammal._superclasses == ("Animal",)
+        assert Dog._superclasses == ("Animal", "Animal.Mammal")
+        assert Human._superclasses == ("Animal", "Animal.Mammal")
 
     def test_external_superclasses(self):
         """Ensure that the correct list of super classes is assembled when
@@ -97,18 +98,12 @@ class Dog(Mammal):
         class Human(Mammal):
             pass
 
-        self.assertEqual(Animal._superclasses, ("Base",))
-        self.assertEqual(Fish._superclasses, ("Base", "Base.Animal"))
-        self.assertEqual(
-            Guppy._superclasses, ("Base", "Base.Animal", "Base.Animal.Fish")
-        )
-        self.assertEqual(Mammal._superclasses, ("Base", "Base.Animal"))
-        self.assertEqual(
-            Dog._superclasses, ("Base", "Base.Animal", "Base.Animal.Mammal")
-        )
-        self.assertEqual(
-            Human._superclasses, ("Base", "Base.Animal", "Base.Animal.Mammal")
-        )
+        assert Animal._superclasses == ("Base",)
+        assert Fish._superclasses == ("Base", "Base.Animal")
+        assert Guppy._superclasses == ("Base", "Base.Animal", "Base.Animal.Fish")
+        assert Mammal._superclasses == ("Base", "Base.Animal")
+        assert Dog._superclasses == ("Base", "Base.Animal", "Base.Animal.Mammal")
+        assert Human._superclasses == ("Base", "Base.Animal", "Base.Animal.Mammal")
 
     def test_subclasses(self):
         """Ensure that the correct list of _subclasses (subclasses) is
@@ -133,24 +128,22 @@ class Dog(Mammal):
         class Human(Mammal):
             pass
 
-        self.assertEqual(
-            Animal._subclasses,
-            (
-                "Animal",
-                "Animal.Fish",
-                "Animal.Fish.Guppy",
-                "Animal.Mammal",
-                "Animal.Mammal.Dog",
-                "Animal.Mammal.Human",
-            ),
+        assert Animal._subclasses == (
+            "Animal",
+            "Animal.Fish",
+            "Animal.Fish.Guppy",
+            "Animal.Mammal",
+            "Animal.Mammal.Dog",
+            "Animal.Mammal.Human",
         )
-        self.assertEqual(Fish._subclasses, ("Animal.Fish", "Animal.Fish.Guppy"))
-        self.assertEqual(Guppy._subclasses, ("Animal.Fish.Guppy",))
-        self.assertEqual(
-            Mammal._subclasses,
-            ("Animal.Mammal", "Animal.Mammal.Dog", "Animal.Mammal.Human"),
+        assert Fish._subclasses == ("Animal.Fish", "Animal.Fish.Guppy")
+        assert Guppy._subclasses == ("Animal.Fish.Guppy",)
+        assert Mammal._subclasses == (
+            "Animal.Mammal",
+            "Animal.Mammal.Dog",
+            "Animal.Mammal.Human",
         )
-        self.assertEqual(Human._subclasses, ("Animal.Mammal.Human",))
+        assert Human._subclasses == ("Animal.Mammal.Human",)
 
     def test_external_subclasses(self):
         """Ensure that the correct list of _subclasses (subclasses) is
@@ -175,30 +168,22 @@ class Dog(Mammal):
         class Human(Mammal):
             pass
 
-        self.assertEqual(
-            Animal._subclasses,
-            (
-                "Base.Animal",
-                "Base.Animal.Fish",
-                "Base.Animal.Fish.Guppy",
-                "Base.Animal.Mammal",
-                "Base.Animal.Mammal.Dog",
-                "Base.Animal.Mammal.Human",
-            ),
-        )
-        self.assertEqual(
-            Fish._subclasses, ("Base.Animal.Fish", "Base.Animal.Fish.Guppy")
+        assert Animal._subclasses == (
+            "Base.Animal",
+            "Base.Animal.Fish",
+            "Base.Animal.Fish.Guppy",
+            "Base.Animal.Mammal",
+            "Base.Animal.Mammal.Dog",
+            "Base.Animal.Mammal.Human",
         )
-        self.assertEqual(Guppy._subclasses, ("Base.Animal.Fish.Guppy",))
-        self.assertEqual(
-            Mammal._subclasses,
-            (
-                "Base.Animal.Mammal",
-                "Base.Animal.Mammal.Dog",
-                "Base.Animal.Mammal.Human",
-            ),
+        assert Fish._subclasses == ("Base.Animal.Fish", "Base.Animal.Fish.Guppy")
+        assert Guppy._subclasses == ("Base.Animal.Fish.Guppy",)
+        assert Mammal._subclasses == (
+            "Base.Animal.Mammal",
+            "Base.Animal.Mammal.Dog",
+            "Base.Animal.Mammal.Human",
         )
-        self.assertEqual(Human._subclasses, ("Base.Animal.Mammal.Human",))
+        assert Human._subclasses == ("Base.Animal.Mammal.Human",)
 
     def test_dynamic_declarations(self):
         """Test that declaring an extra class updates meta data"""
@@ -206,33 +191,31 @@ def test_dynamic_declarations(self):
         class Animal(Document):
             meta = {"allow_inheritance": True}
 
-        self.assertEqual(Animal._superclasses, ())
-        self.assertEqual(Animal._subclasses, ("Animal",))
+        assert Animal._superclasses == ()
+        assert Animal._subclasses == ("Animal",)
 
         # Test dynamically adding a class changes the meta data
         class Fish(Animal):
             pass
 
-        self.assertEqual(Animal._superclasses, ())
-        self.assertEqual(Animal._subclasses, ("Animal", "Animal.Fish"))
+        assert Animal._superclasses == ()
+        assert Animal._subclasses == ("Animal", "Animal.Fish")
 
-        self.assertEqual(Fish._superclasses, ("Animal",))
-        self.assertEqual(Fish._subclasses, ("Animal.Fish",))
+        assert Fish._superclasses == ("Animal",)
+        assert Fish._subclasses == ("Animal.Fish",)
 
         # Test dynamically adding an inherited class changes the meta data
         class Pike(Fish):
             pass
 
-        self.assertEqual(Animal._superclasses, ())
-        self.assertEqual(
-            Animal._subclasses, ("Animal", "Animal.Fish", "Animal.Fish.Pike")
-        )
+        assert Animal._superclasses == ()
+        assert Animal._subclasses == ("Animal", "Animal.Fish", "Animal.Fish.Pike")
 
-        self.assertEqual(Fish._superclasses, ("Animal",))
-        self.assertEqual(Fish._subclasses, ("Animal.Fish", "Animal.Fish.Pike"))
+        assert Fish._superclasses == ("Animal",)
+        assert Fish._subclasses == ("Animal.Fish", "Animal.Fish.Pike")
 
-        self.assertEqual(Pike._superclasses, ("Animal", "Animal.Fish"))
-        self.assertEqual(Pike._subclasses, ("Animal.Fish.Pike",))
+        assert Pike._superclasses == ("Animal", "Animal.Fish")
+        assert Pike._subclasses == ("Animal.Fish.Pike",)
 
     def test_inheritance_meta_data(self):
         """Ensure that document may inherit fields from a superclass document.
@@ -247,10 +230,10 @@ class Person(Document):
         class Employee(Person):
             salary = IntField()
 
-        self.assertEqual(
-            ["_cls", "age", "id", "name", "salary"], sorted(Employee._fields.keys())
+        assert ["_cls", "age", "id", "name", "salary"] == sorted(
+            Employee._fields.keys()
         )
-        self.assertEqual(Employee._get_collection_name(), Person._get_collection_name())
+        assert Employee._get_collection_name() == Person._get_collection_name()
 
     def test_inheritance_to_mongo_keys(self):
         """Ensure that document may inherit fields from a superclass document.
@@ -265,17 +248,17 @@ class Person(Document):
         class Employee(Person):
             salary = IntField()
 
-        self.assertEqual(
-            ["_cls", "age", "id", "name", "salary"], sorted(Employee._fields.keys())
-        )
-        self.assertEqual(
-            Person(name="Bob", age=35).to_mongo().keys(), ["_cls", "name", "age"]
-        )
-        self.assertEqual(
-            Employee(name="Bob", age=35, salary=0).to_mongo().keys(),
-            ["_cls", "name", "age", "salary"],
+        assert ["_cls", "age", "id", "name", "salary"] == sorted(
+            Employee._fields.keys()
         )
-        self.assertEqual(Employee._get_collection_name(), Person._get_collection_name())
+        assert Person(name="Bob", age=35).to_mongo().keys() == ["_cls", "name", "age"]
+        assert Employee(name="Bob", age=35, salary=0).to_mongo().keys() == [
+            "_cls",
+            "name",
+            "age",
+            "salary",
+        ]
+        assert Employee._get_collection_name() == Person._get_collection_name()
 
     def test_indexes_and_multiple_inheritance(self):
         """ Ensure that all of the indexes are created for a document with
@@ -301,13 +284,10 @@ class C(A, B):
 
         C.ensure_indexes()
 
-        self.assertEqual(
-            sorted(
-                [idx["key"] for idx in C._get_collection().index_information().values()]
-            ),
-            sorted(
-                [[(u"_cls", 1), (u"b", 1)], [(u"_id", 1)], [(u"_cls", 1), (u"a", 1)]]
-            ),
+        assert sorted(
+            [idx["key"] for idx in C._get_collection().index_information().values()]
+        ) == sorted(
+            [[(u"_cls", 1), (u"b", 1)], [(u"_id", 1)], [(u"_cls", 1), (u"a", 1)]]
         )
 
     def test_polymorphic_queries(self):
@@ -338,13 +318,13 @@ class Human(Mammal):
         Human().save()
 
         classes = [obj.__class__ for obj in Animal.objects]
-        self.assertEqual(classes, [Animal, Fish, Mammal, Dog, Human])
+        assert classes == [Animal, Fish, Mammal, Dog, Human]
 
         classes = [obj.__class__ for obj in Mammal.objects]
-        self.assertEqual(classes, [Mammal, Dog, Human])
+        assert classes == [Mammal, Dog, Human]
 
         classes = [obj.__class__ for obj in Human.objects]
-        self.assertEqual(classes, [Human])
+        assert classes == [Human]
 
     def test_allow_inheritance(self):
         """Ensure that inheritance is disabled by default on simple
@@ -355,20 +335,20 @@ class Animal(Document):
             name = StringField()
 
         # can't inherit because Animal didn't explicitly allow inheritance
-        with self.assertRaises(ValueError) as cm:
+        with pytest.raises(ValueError) as cm:
 
             class Dog(Animal):
                 pass
 
-        self.assertIn("Document Animal may not be subclassed", str(cm.exception))
+        assert "Document Animal may not be subclassed" in str(cm.exception)
 
         # Check that _cls etc aren't present on simple documents
         dog = Animal(name="dog").save()
-        self.assertEqual(dog.to_mongo().keys(), ["_id", "name"])
+        assert dog.to_mongo().keys() == ["_id", "name"]
 
         collection = self.db[Animal._get_collection_name()]
         obj = collection.find_one()
-        self.assertNotIn("_cls", obj)
+        assert "_cls" not in obj
 
     def test_cant_turn_off_inheritance_on_subclass(self):
         """Ensure if inheritance is on in a subclass you cant turn it off.
@@ -378,14 +358,14 @@ class Animal(Document):
             name = StringField()
             meta = {"allow_inheritance": True}
 
-        with self.assertRaises(ValueError) as cm:
+        with pytest.raises(ValueError) as cm:
 
             class Mammal(Animal):
                 meta = {"allow_inheritance": False}
 
-        self.assertEqual(
-            str(cm.exception),
-            'Only direct subclasses of Document may set "allow_inheritance" to False',
+        assert (
+            str(cm.exception)
+            == 'Only direct subclasses of Document may set "allow_inheritance" to False'
         )
 
     def test_allow_inheritance_abstract_document(self):
@@ -399,14 +379,14 @@ class FinalDocument(Document):
         class Animal(FinalDocument):
             name = StringField()
 
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
 
             class Mammal(Animal):
                 pass
 
         # Check that _cls isn't present in simple documents
         doc = Animal(name="dog")
-        self.assertNotIn("_cls", doc.to_mongo())
+        assert "_cls" not in doc.to_mongo()
 
     def test_using_abstract_class_in_reference_field(self):
         # Ensures no regression of #1920
@@ -452,10 +432,10 @@ class EuropeanCity(City):
             name = StringField()
 
         berlin = EuropeanCity(name="Berlin", continent="Europe")
-        self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
-        self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
-        self.assertEqual(len(berlin._fields_ordered), 3)
-        self.assertEqual(berlin._fields_ordered[0], "id")
+        assert len(berlin._db_field_map) == len(berlin._fields_ordered)
+        assert len(berlin._reverse_db_field_map) == len(berlin._fields_ordered)
+        assert len(berlin._fields_ordered) == 3
+        assert berlin._fields_ordered[0] == "id"
 
     def test_auto_id_not_set_if_specific_in_parent_class(self):
         class City(Document):
@@ -467,10 +447,10 @@ class EuropeanCity(City):
             name = StringField()
 
         berlin = EuropeanCity(name="Berlin", continent="Europe")
-        self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
-        self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
-        self.assertEqual(len(berlin._fields_ordered), 3)
-        self.assertEqual(berlin._fields_ordered[0], "city_id")
+        assert len(berlin._db_field_map) == len(berlin._fields_ordered)
+        assert len(berlin._reverse_db_field_map) == len(berlin._fields_ordered)
+        assert len(berlin._fields_ordered) == 3
+        assert berlin._fields_ordered[0] == "city_id"
 
     def test_auto_id_vs_non_pk_id_field(self):
         class City(Document):
@@ -482,12 +462,12 @@ class EuropeanCity(City):
             name = StringField()
 
         berlin = EuropeanCity(name="Berlin", continent="Europe")
-        self.assertEqual(len(berlin._db_field_map), len(berlin._fields_ordered))
-        self.assertEqual(len(berlin._reverse_db_field_map), len(berlin._fields_ordered))
-        self.assertEqual(len(berlin._fields_ordered), 4)
-        self.assertEqual(berlin._fields_ordered[0], "auto_id_0")
+        assert len(berlin._db_field_map) == len(berlin._fields_ordered)
+        assert len(berlin._reverse_db_field_map) == len(berlin._fields_ordered)
+        assert len(berlin._fields_ordered) == 4
+        assert berlin._fields_ordered[0] == "auto_id_0"
         berlin.save()
-        self.assertEqual(berlin.pk, berlin.auto_id_0)
+        assert berlin.pk == berlin.auto_id_0
 
     def test_abstract_document_creation_does_not_fail(self):
         class City(Document):
@@ -495,9 +475,9 @@ class City(Document):
             meta = {"abstract": True, "allow_inheritance": False}
 
         city = City(continent="asia")
-        self.assertEqual(None, city.pk)
+        assert None == city.pk
         # TODO: expected error? Shouldn't we create a new error type?
-        with self.assertRaises(KeyError):
+        with pytest.raises(KeyError):
             setattr(city, "pk", 1)
 
     def test_allow_inheritance_embedded_document(self):
@@ -506,20 +486,20 @@ def test_allow_inheritance_embedded_document(self):
         class Comment(EmbeddedDocument):
             content = StringField()
 
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
 
             class SpecialComment(Comment):
                 pass
 
         doc = Comment(content="test")
-        self.assertNotIn("_cls", doc.to_mongo())
+        assert "_cls" not in doc.to_mongo()
 
         class Comment(EmbeddedDocument):
             content = StringField()
             meta = {"allow_inheritance": True}
 
         doc = Comment(content="test")
-        self.assertIn("_cls", doc.to_mongo())
+        assert "_cls" in doc.to_mongo()
 
     def test_document_inheritance(self):
         """Ensure mutliple inheritance of abstract documents
@@ -537,7 +517,7 @@ class MyDocument(DateCreatedDocument, DateUpdatedDocument):
                 pass
 
         except Exception:
-            self.assertTrue(False, "Couldn't create MyDocument class")
+            assert False, "Couldn't create MyDocument class"
 
     def test_abstract_documents(self):
         """Ensure that a document superclass can be marked as abstract
@@ -574,20 +554,20 @@ class Human(Mammal):
 
         for k, v in iteritems(defaults):
             for cls in [Animal, Fish, Guppy]:
-                self.assertEqual(cls._meta[k], v)
+                assert cls._meta[k] == v
 
-        self.assertNotIn("collection", Animal._meta)
-        self.assertNotIn("collection", Mammal._meta)
+        assert "collection" not in Animal._meta
+        assert "collection" not in Mammal._meta
 
-        self.assertEqual(Animal._get_collection_name(), None)
-        self.assertEqual(Mammal._get_collection_name(), None)
+        assert Animal._get_collection_name() == None
+        assert Mammal._get_collection_name() == None
 
-        self.assertEqual(Fish._get_collection_name(), "fish")
-        self.assertEqual(Guppy._get_collection_name(), "fish")
-        self.assertEqual(Human._get_collection_name(), "human")
+        assert Fish._get_collection_name() == "fish"
+        assert Guppy._get_collection_name() == "fish"
+        assert Human._get_collection_name() == "human"
 
         # ensure that a subclass of a non-abstract class can't be abstract
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
 
             class EvilHuman(Human):
                 evil = BooleanField(default=True)
@@ -601,7 +581,7 @@ class A(EmbeddedDocument):
         class B(A):
             pass
 
-        self.assertFalse(B._meta["abstract"])
+        assert not B._meta["abstract"]
 
     def test_inherited_collections(self):
         """Ensure that subclassed documents don't override parents'
@@ -647,8 +627,8 @@ class AlcoholicDrink(Drink):
         real_person = Drinker(drink=beer)
         real_person.save()
 
-        self.assertEqual(Drinker.objects[0].drink.name, red_bull.name)
-        self.assertEqual(Drinker.objects[1].drink.name, beer.name)
+        assert Drinker.objects[0].drink.name == red_bull.name
+        assert Drinker.objects[1].drink.name == beer.name
 
 
 if __name__ == "__main__":
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 203e2cce8..01dc492b1 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -36,6 +36,7 @@
     PickleTest,
 )
 from tests.utils import MongoDBTestCase, get_as_pymongo
+import pytest
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
 
@@ -63,18 +64,17 @@ def tearDown(self):
             self.db.drop_collection(collection)
 
     def assertDbEqual(self, docs):
-        self.assertEqual(
-            list(self.Person._get_collection().find().sort("id")),
-            sorted(docs, key=lambda doc: doc["_id"]),
+        assert list(self.Person._get_collection().find().sort("id")) == sorted(
+            docs, key=lambda doc: doc["_id"]
         )
 
     def assertHasInstance(self, field, instance):
-        self.assertTrue(hasattr(field, "_instance"))
-        self.assertTrue(field._instance is not None)
+        assert hasattr(field, "_instance")
+        assert field._instance is not None
         if isinstance(field._instance, weakref.ProxyType):
-            self.assertTrue(field._instance.__eq__(instance))
+            assert field._instance.__eq__(instance)
         else:
-            self.assertEqual(field._instance, instance)
+            assert field._instance == instance
 
     def test_capped_collection(self):
         """Ensure that capped collections work properly."""
@@ -89,16 +89,16 @@ class Log(Document):
         for _ in range(10):
             Log().save()
 
-        self.assertEqual(Log.objects.count(), 10)
+        assert Log.objects.count() == 10
 
         # Check that extra documents don't increase the size
         Log().save()
-        self.assertEqual(Log.objects.count(), 10)
+        assert Log.objects.count() == 10
 
         options = Log.objects._collection.options()
-        self.assertEqual(options["capped"], True)
-        self.assertEqual(options["max"], 10)
-        self.assertEqual(options["size"], 4096)
+        assert options["capped"] == True
+        assert options["max"] == 10
+        assert options["size"] == 4096
 
         # Check that the document cannot be redefined with different options
         class Log(Document):
@@ -106,7 +106,7 @@ class Log(Document):
             meta = {"max_documents": 11}
 
         # Accessing Document.objects creates the collection
-        with self.assertRaises(InvalidCollectionError):
+        with pytest.raises(InvalidCollectionError):
             Log.objects
 
     def test_capped_collection_default(self):
@@ -122,9 +122,9 @@ class Log(Document):
         Log().save()
 
         options = Log.objects._collection.options()
-        self.assertEqual(options["capped"], True)
-        self.assertEqual(options["max"], 10)
-        self.assertEqual(options["size"], 10 * 2 ** 20)
+        assert options["capped"] == True
+        assert options["max"] == 10
+        assert options["size"] == 10 * 2 ** 20
 
         # Check that the document with default value can be recreated
         class Log(Document):
@@ -150,8 +150,8 @@ class Log(Document):
         Log().save()
 
         options = Log.objects._collection.options()
-        self.assertEqual(options["capped"], True)
-        self.assertTrue(options["size"] >= 10000)
+        assert options["capped"] == True
+        assert options["size"] >= 10000
 
         # Check that the document with odd max_size value can be recreated
         class Log(Document):
@@ -173,7 +173,7 @@ def __unicode__(self):
 
         doc = Article(title=u"привет мир")
 
-        self.assertEqual("<Article: привет мир>", repr(doc))
+        assert "<Article: привет мир>" == repr(doc)
 
     def test_repr_none(self):
         """Ensure None values are handled correctly."""
@@ -185,11 +185,11 @@ def __str__(self):
                 return None
 
         doc = Article(title=u"привет мир")
-        self.assertEqual("<Article: None>", repr(doc))
+        assert "<Article: None>" == repr(doc)
 
     def test_queryset_resurrects_dropped_collection(self):
         self.Person.drop_collection()
-        self.assertEqual([], list(self.Person.objects()))
+        assert [] == list(self.Person.objects())
 
         # Ensure works correctly with inhertited classes
         class Actor(self.Person):
@@ -197,7 +197,7 @@ class Actor(self.Person):
 
         Actor.objects()
         self.Person.drop_collection()
-        self.assertEqual([], list(Actor.objects()))
+        assert [] == list(Actor.objects())
 
     def test_polymorphic_references(self):
         """Ensure that the correct subclasses are returned from a query
@@ -237,7 +237,7 @@ class Zoo(Document):
         zoo.reload()
 
         classes = [a.__class__ for a in Zoo.objects.first().animals]
-        self.assertEqual(classes, [Animal, Fish, Mammal, Dog, Human])
+        assert classes == [Animal, Fish, Mammal, Dog, Human]
 
         Zoo.drop_collection()
 
@@ -250,7 +250,7 @@ class Zoo(Document):
         zoo.reload()
 
         classes = [a.__class__ for a in Zoo.objects.first().animals]
-        self.assertEqual(classes, [Animal, Fish, Mammal, Dog, Human])
+        assert classes == [Animal, Fish, Mammal, Dog, Human]
 
     def test_reference_inheritance(self):
         class Stats(Document):
@@ -275,7 +275,7 @@ class CompareStats(Document):
         cmp_stats = CompareStats(stats=list_stats)
         cmp_stats.save()
 
-        self.assertEqual(list_stats, CompareStats.objects.first().stats)
+        assert list_stats == CompareStats.objects.first().stats
 
     def test_db_field_load(self):
         """Ensure we load data correctly from the right db field."""
@@ -294,8 +294,8 @@ def rank(self):
 
         Person(name="Fred").save()
 
-        self.assertEqual(Person.objects.get(name="Jack").rank, "Corporal")
-        self.assertEqual(Person.objects.get(name="Fred").rank, "Private")
+        assert Person.objects.get(name="Jack").rank == "Corporal"
+        assert Person.objects.get(name="Fred").rank == "Private"
 
     def test_db_embedded_doc_field_load(self):
         """Ensure we load embedded document data correctly."""
@@ -318,8 +318,8 @@ def rank(self):
         Person(name="Jack", rank_=Rank(title="Corporal")).save()
         Person(name="Fred").save()
 
-        self.assertEqual(Person.objects.get(name="Jack").rank, "Corporal")
-        self.assertEqual(Person.objects.get(name="Fred").rank, "Private")
+        assert Person.objects.get(name="Jack").rank == "Corporal"
+        assert Person.objects.get(name="Fred").rank == "Private"
 
     def test_custom_id_field(self):
         """Ensure that documents may be created with custom primary keys."""
@@ -332,15 +332,15 @@ class User(Document):
 
         User.drop_collection()
 
-        self.assertEqual(User._fields["username"].db_field, "_id")
-        self.assertEqual(User._meta["id_field"], "username")
+        assert User._fields["username"].db_field == "_id"
+        assert User._meta["id_field"] == "username"
 
         User.objects.create(username="test", name="test user")
         user = User.objects.first()
-        self.assertEqual(user.id, "test")
-        self.assertEqual(user.pk, "test")
+        assert user.id == "test"
+        assert user.pk == "test"
         user_dict = User.objects._collection.find_one()
-        self.assertEqual(user_dict["_id"], "test")
+        assert user_dict["_id"] == "test"
 
     def test_change_custom_id_field_in_subclass(self):
         """Subclasses cannot override which field is the primary key."""
@@ -350,13 +350,13 @@ class User(Document):
             name = StringField()
             meta = {"allow_inheritance": True}
 
-        with self.assertRaises(ValueError) as e:
+        with pytest.raises(ValueError) as e:
 
             class EmailUser(User):
                 email = StringField(primary_key=True)
 
         exc = e.exception
-        self.assertEqual(str(exc), "Cannot override primary key field")
+        assert str(exc) == "Cannot override primary key field"
 
     def test_custom_id_field_is_required(self):
         """Ensure the custom primary key field is required."""
@@ -365,10 +365,10 @@ class User(Document):
             username = StringField(primary_key=True)
             name = StringField()
 
-        with self.assertRaises(ValidationError) as e:
+        with pytest.raises(ValidationError) as e:
             User(name="test").save()
         exc = e.exception
-        self.assertTrue("Field is required: ['username']" in str(exc))
+        assert "Field is required: ['username']" in str(exc)
 
     def test_document_not_registered(self):
         class Place(Document):
@@ -388,7 +388,7 @@ class NicePlace(Place):
         # and the NicePlace model not being imported in at query time.
         del _document_registry["Place.NicePlace"]
 
-        with self.assertRaises(NotRegistered):
+        with pytest.raises(NotRegistered):
             list(Place.objects.all())
 
     def test_document_registry_regressions(self):
@@ -401,26 +401,27 @@ class Area(Location):
 
         Location.drop_collection()
 
-        self.assertEqual(Area, get_document("Area"))
-        self.assertEqual(Area, get_document("Location.Area"))
+        assert Area == get_document("Area")
+        assert Area == get_document("Location.Area")
 
     def test_creation(self):
         """Ensure that document may be created using keyword arguments."""
         person = self.Person(name="Test User", age=30)
-        self.assertEqual(person.name, "Test User")
-        self.assertEqual(person.age, 30)
+        assert person.name == "Test User"
+        assert person.age == 30
 
     def test_to_dbref(self):
         """Ensure that you can get a dbref of a document."""
         person = self.Person(name="Test User", age=30)
-        self.assertRaises(OperationError, person.to_dbref)
+        with pytest.raises(OperationError):
+            person.to_dbref()
         person.save()
         person.to_dbref()
 
     def test_key_like_attribute_access(self):
         person = self.Person(age=30)
-        self.assertEqual(person["age"], 30)
-        with self.assertRaises(KeyError):
+        assert person["age"] == 30
+        with pytest.raises(KeyError):
             person["unknown_attr"]
 
     def test_save_abstract_document(self):
@@ -430,7 +431,7 @@ class Doc(Document):
             name = StringField()
             meta = {"abstract": True}
 
-        with self.assertRaises(InvalidDocumentError):
+        with pytest.raises(InvalidDocumentError):
             Doc(name="aaa").save()
 
     def test_reload(self):
@@ -443,20 +444,20 @@ def test_reload(self):
         person_obj.age = 21
         person_obj.save()
 
-        self.assertEqual(person.name, "Test User")
-        self.assertEqual(person.age, 20)
+        assert person.name == "Test User"
+        assert person.age == 20
 
         person.reload("age")
-        self.assertEqual(person.name, "Test User")
-        self.assertEqual(person.age, 21)
+        assert person.name == "Test User"
+        assert person.age == 21
 
         person.reload()
-        self.assertEqual(person.name, "Mr Test User")
-        self.assertEqual(person.age, 21)
+        assert person.name == "Mr Test User"
+        assert person.age == 21
 
         person.reload()
-        self.assertEqual(person.name, "Mr Test User")
-        self.assertEqual(person.age, 21)
+        assert person.name == "Mr Test User"
+        assert person.age == 21
 
     def test_reload_sharded(self):
         class Animal(Document):
@@ -471,9 +472,10 @@ class Animal(Document):
         with query_counter() as q:
             doc.reload()
             query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
-            self.assertEqual(
-                set(query_op[CMD_QUERY_KEY]["filter"].keys()), {"_id", "superphylum"}
-            )
+            assert set(query_op[CMD_QUERY_KEY]["filter"].keys()) == {
+                "_id",
+                "superphylum",
+            }
 
     def test_reload_sharded_with_db_field(self):
         class Person(Document):
@@ -488,9 +490,7 @@ class Person(Document):
         with query_counter() as q:
             doc.reload()
             query_op = q.db.system.profile.find({"ns": "mongoenginetest.person"})[0]
-            self.assertEqual(
-                set(query_op[CMD_QUERY_KEY]["filter"].keys()), {"_id", "country"}
-            )
+            assert set(query_op[CMD_QUERY_KEY]["filter"].keys()) == {"_id", "country"}
 
     def test_reload_sharded_nested(self):
         class SuperPhylum(EmbeddedDocument):
@@ -526,15 +526,11 @@ class Animal(Document):
             doc.name = "Cat"
             doc.save()
             query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
-            self.assertEqual(query_op["op"], "update")
+            assert query_op["op"] == "update"
             if mongo_db <= MONGODB_34:
-                self.assertEqual(
-                    set(query_op["query"].keys()), set(["_id", "is_mammal"])
-                )
+                assert set(query_op["query"].keys()) == set(["_id", "is_mammal"])
             else:
-                self.assertEqual(
-                    set(query_op["command"]["q"].keys()), set(["_id", "is_mammal"])
-                )
+                assert set(query_op["command"]["q"].keys()) == set(["_id", "is_mammal"])
 
         Animal.drop_collection()
 
@@ -551,12 +547,12 @@ class User(Document):
         user.name = "John"
         user.number = 2
 
-        self.assertEqual(user._get_changed_fields(), ["name", "number"])
+        assert user._get_changed_fields() == ["name", "number"]
         user.reload("number")
-        self.assertEqual(user._get_changed_fields(), ["name"])
+        assert user._get_changed_fields() == ["name"]
         user.save()
         user.reload()
-        self.assertEqual(user.name, "John")
+        assert user.name == "John"
 
     def test_reload_referencing(self):
         """Ensures reloading updates weakrefs correctly."""
@@ -587,47 +583,44 @@ class Doc(Document):
         doc.embedded_field.list_field.append(1)
         doc.embedded_field.dict_field["woot"] = "woot"
 
-        self.assertEqual(
-            doc._get_changed_fields(),
-            [
-                "list_field",
-                "dict_field.woot",
-                "embedded_field.list_field",
-                "embedded_field.dict_field.woot",
-            ],
-        )
+        assert doc._get_changed_fields() == [
+            "list_field",
+            "dict_field.woot",
+            "embedded_field.list_field",
+            "embedded_field.dict_field.woot",
+        ]
         doc.save()
 
-        self.assertEqual(len(doc.list_field), 4)
+        assert len(doc.list_field) == 4
         doc = doc.reload(10)
-        self.assertEqual(doc._get_changed_fields(), [])
-        self.assertEqual(len(doc.list_field), 4)
-        self.assertEqual(len(doc.dict_field), 2)
-        self.assertEqual(len(doc.embedded_field.list_field), 4)
-        self.assertEqual(len(doc.embedded_field.dict_field), 2)
+        assert doc._get_changed_fields() == []
+        assert len(doc.list_field) == 4
+        assert len(doc.dict_field) == 2
+        assert len(doc.embedded_field.list_field) == 4
+        assert len(doc.embedded_field.dict_field) == 2
 
         doc.list_field.append(1)
         doc.save()
         doc.dict_field["extra"] = 1
         doc = doc.reload(10, "list_field")
-        self.assertEqual(doc._get_changed_fields(), ["dict_field.extra"])
-        self.assertEqual(len(doc.list_field), 5)
-        self.assertEqual(len(doc.dict_field), 3)
-        self.assertEqual(len(doc.embedded_field.list_field), 4)
-        self.assertEqual(len(doc.embedded_field.dict_field), 2)
+        assert doc._get_changed_fields() == ["dict_field.extra"]
+        assert len(doc.list_field) == 5
+        assert len(doc.dict_field) == 3
+        assert len(doc.embedded_field.list_field) == 4
+        assert len(doc.embedded_field.dict_field) == 2
 
     def test_reload_doesnt_exist(self):
         class Foo(Document):
             pass
 
         f = Foo()
-        with self.assertRaises(Foo.DoesNotExist):
+        with pytest.raises(Foo.DoesNotExist):
             f.reload()
 
         f.save()
         f.delete()
 
-        with self.assertRaises(Foo.DoesNotExist):
+        with pytest.raises(Foo.DoesNotExist):
             f.reload()
 
     def test_reload_of_non_strict_with_special_field_name(self):
@@ -646,27 +639,29 @@ class Post(Document):
 
         post = Post.objects.first()
         post.reload()
-        self.assertEqual(post.title, "Items eclipse")
-        self.assertEqual(post.items, ["more lorem", "even more ipsum"])
+        assert post.title == "Items eclipse"
+        assert post.items == ["more lorem", "even more ipsum"]
 
     def test_dictionary_access(self):
         """Ensure that dictionary-style field access works properly."""
         person = self.Person(name="Test User", age=30, job=self.Job())
-        self.assertEqual(person["name"], "Test User")
+        assert person["name"] == "Test User"
 
-        self.assertRaises(KeyError, person.__getitem__, "salary")
-        self.assertRaises(KeyError, person.__setitem__, "salary", 50)
+        with pytest.raises(KeyError):
+            person.__getitem__("salary")
+        with pytest.raises(KeyError):
+            person.__setitem__("salary", 50)
 
         person["name"] = "Another User"
-        self.assertEqual(person["name"], "Another User")
+        assert person["name"] == "Another User"
 
         # Length = length(assigned fields + id)
-        self.assertEqual(len(person), 5)
+        assert len(person) == 5
 
-        self.assertIn("age", person)
+        assert "age" in person
         person.age = None
-        self.assertNotIn("age", person)
-        self.assertNotIn("nationality", person)
+        assert "age" not in person
+        assert "nationality" not in person
 
     def test_embedded_document_to_mongo(self):
         class Person(EmbeddedDocument):
@@ -678,20 +673,20 @@ class Person(EmbeddedDocument):
         class Employee(Person):
             salary = IntField()
 
-        self.assertEqual(
-            Person(name="Bob", age=35).to_mongo().keys(), ["_cls", "name", "age"]
-        )
-        self.assertEqual(
-            Employee(name="Bob", age=35, salary=0).to_mongo().keys(),
-            ["_cls", "name", "age", "salary"],
-        )
+        assert Person(name="Bob", age=35).to_mongo().keys() == ["_cls", "name", "age"]
+        assert Employee(name="Bob", age=35, salary=0).to_mongo().keys() == [
+            "_cls",
+            "name",
+            "age",
+            "salary",
+        ]
 
     def test_embedded_document_to_mongo_id(self):
         class SubDoc(EmbeddedDocument):
             id = StringField(required=True)
 
         sub_doc = SubDoc(id="abc")
-        self.assertEqual(sub_doc.to_mongo().keys(), ["id"])
+        assert sub_doc.to_mongo().keys() == ["id"]
 
     def test_embedded_document(self):
         """Ensure that embedded documents are set up correctly."""
@@ -699,8 +694,8 @@ def test_embedded_document(self):
         class Comment(EmbeddedDocument):
             content = StringField()
 
-        self.assertIn("content", Comment._fields)
-        self.assertNotIn("id", Comment._fields)
+        assert "content" in Comment._fields
+        assert "id" not in Comment._fields
 
     def test_embedded_document_instance(self):
         """Ensure that embedded documents can reference parent instance."""
@@ -753,7 +748,7 @@ class Doc(Document):
             .to_mongo(use_db_field=False)
             .to_dict()
         )
-        self.assertEqual(d["embedded_field"], [{"string": "Hi"}])
+        assert d["embedded_field"] == [{"string": "Hi"}]
 
     def test_instance_is_set_on_setattr(self):
         class Email(EmbeddedDocument):
@@ -796,7 +791,7 @@ class TestDocument(Document):
             def clean(self):
                 raise CustomError()
 
-        with self.assertRaises(CustomError):
+        with pytest.raises(CustomError):
             TestDocument().save()
 
         TestDocument().save(clean=False)
@@ -816,10 +811,10 @@ def pre_save_post_validation(cls, sender, document, **kwargs):
         BlogPost.drop_collection()
 
         post = BlogPost(content="unchecked").save()
-        self.assertEqual(post.content, "checked")
+        assert post.content == "checked"
         # Make sure pre_save_post_validation changes makes it to the db
         raw_doc = get_as_pymongo(post)
-        self.assertEqual(raw_doc, {"content": "checked", "_id": post.id})
+        assert raw_doc == {"content": "checked", "_id": post.id}
 
         # Important to disconnect as it could cause some assertions in test_signals
         # to fail (due to the garbage collection timing of this signal)
@@ -840,17 +835,17 @@ def clean(self):
         # Ensure clean=False prevent call to clean
         t = TestDocument(status="published")
         t.save(clean=False)
-        self.assertEqual(t.status, "published")
-        self.assertEqual(t.cleaned, False)
+        assert t.status == "published"
+        assert t.cleaned == False
 
         t = TestDocument(status="published")
-        self.assertEqual(t.cleaned, False)
+        assert t.cleaned == False
         t.save(clean=True)
-        self.assertEqual(t.status, "published")
-        self.assertEqual(t.cleaned, True)
+        assert t.status == "published"
+        assert t.cleaned == True
         raw_doc = get_as_pymongo(t)
         # Make sure clean changes makes it to the db
-        self.assertEqual(raw_doc, {"status": "published", "cleaned": True, "_id": t.id})
+        assert raw_doc == {"status": "published", "cleaned": True, "_id": t.id}
 
     def test_document_embedded_clean(self):
         class TestEmbeddedDocument(EmbeddedDocument):
@@ -875,15 +870,15 @@ class TestDocument(Document):
 
         t = TestDocument(doc=TestEmbeddedDocument(x=10, y=25, z=15))
 
-        with self.assertRaises(ValidationError) as cm:
+        with pytest.raises(ValidationError) as cm:
             t.save()
 
         expected_msg = "Value of z != x + y"
-        self.assertIn(expected_msg, cm.exception.message)
-        self.assertEqual(cm.exception.to_dict(), {"doc": {"__all__": expected_msg}})
+        assert expected_msg in cm.exception.message
+        assert cm.exception.to_dict() == {"doc": {"__all__": expected_msg}}
 
         t = TestDocument(doc=TestEmbeddedDocument(x=10, y=25)).save()
-        self.assertEqual(t.doc.z, 35)
+        assert t.doc.z == 35
 
         # Asserts not raises
         t = TestDocument(doc=TestEmbeddedDocument(x=15, y=35, z=5))
@@ -892,7 +887,7 @@ class TestDocument(Document):
     def test_modify_empty(self):
         doc = self.Person(name="bob", age=10).save()
 
-        with self.assertRaises(InvalidDocumentError):
+        with pytest.raises(InvalidDocumentError):
             self.Person().modify(set__age=10)
 
         self.assertDbEqual([dict(doc.to_mongo())])
@@ -902,7 +897,7 @@ def test_modify_invalid_query(self):
         doc2 = self.Person(name="jim", age=20).save()
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             doc1.modify({"id": doc2.id}, set__value=20)
 
         self.assertDbEqual(docs)
@@ -913,7 +908,7 @@ def test_modify_match_another_document(self):
         docs = [dict(doc1.to_mongo()), dict(doc2.to_mongo())]
 
         n_modified = doc1.modify({"name": doc2.name}, set__age=100)
-        self.assertEqual(n_modified, 0)
+        assert n_modified == 0
 
         self.assertDbEqual(docs)
 
@@ -923,7 +918,7 @@ def test_modify_not_exists(self):
         docs = [dict(doc1.to_mongo())]
 
         n_modified = doc2.modify({"name": doc2.name}, set__age=100)
-        self.assertEqual(n_modified, 0)
+        assert n_modified == 0
 
         self.assertDbEqual(docs)
 
@@ -943,13 +938,13 @@ def test_modify_update(self):
         n_modified = doc.modify(
             set__age=21, set__job__name="MongoDB", unset__job__years=True
         )
-        self.assertEqual(n_modified, 1)
+        assert n_modified == 1
         doc_copy.age = 21
         doc_copy.job.name = "MongoDB"
         del doc_copy.job.years
 
-        self.assertEqual(doc.to_json(), doc_copy.to_json())
-        self.assertEqual(doc._get_changed_fields(), [])
+        assert doc.to_json() == doc_copy.to_json()
+        assert doc._get_changed_fields() == []
 
         self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
 
@@ -965,27 +960,25 @@ class BlogPost(Document):
             tags=["python"], content=Content(keywords=["ipsum"])
         )
 
-        self.assertEqual(post.tags, ["python"])
+        assert post.tags == ["python"]
         post.modify(push__tags__0=["code", "mongo"])
-        self.assertEqual(post.tags, ["code", "mongo", "python"])
+        assert post.tags == ["code", "mongo", "python"]
 
         # Assert same order of the list items is maintained in the db
-        self.assertEqual(
-            BlogPost._get_collection().find_one({"_id": post.pk})["tags"],
-            ["code", "mongo", "python"],
-        )
+        assert BlogPost._get_collection().find_one({"_id": post.pk})["tags"] == [
+            "code",
+            "mongo",
+            "python",
+        ]
 
-        self.assertEqual(post.content.keywords, ["ipsum"])
+        assert post.content.keywords == ["ipsum"]
         post.modify(push__content__keywords__0=["lorem"])
-        self.assertEqual(post.content.keywords, ["lorem", "ipsum"])
+        assert post.content.keywords == ["lorem", "ipsum"]
 
         # Assert same order of the list items is maintained in the db
-        self.assertEqual(
-            BlogPost._get_collection().find_one({"_id": post.pk})["content"][
-                "keywords"
-            ],
-            ["lorem", "ipsum"],
-        )
+        assert BlogPost._get_collection().find_one({"_id": post.pk})["content"][
+            "keywords"
+        ] == ["lorem", "ipsum"]
 
     def test_save(self):
         """Ensure that a document may be saved in the database."""
@@ -996,28 +989,30 @@ def test_save(self):
 
         # Ensure that the object is in the database
         raw_doc = get_as_pymongo(person)
-        self.assertEqual(
-            raw_doc,
-            {"_cls": "Person", "name": "Test User", "age": 30, "_id": person.id},
-        )
+        assert raw_doc == {
+            "_cls": "Person",
+            "name": "Test User",
+            "age": 30,
+            "_id": person.id,
+        }
 
     def test_save_skip_validation(self):
         class Recipient(Document):
             email = EmailField(required=True)
 
         recipient = Recipient(email="not-an-email")
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             recipient.save()
 
         recipient.save(validate=False)
         raw_doc = get_as_pymongo(recipient)
-        self.assertEqual(raw_doc, {"email": "not-an-email", "_id": recipient.id})
+        assert raw_doc == {"email": "not-an-email", "_id": recipient.id}
 
     def test_save_with_bad_id(self):
         class Clown(Document):
             id = IntField(primary_key=True)
 
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             Clown(id="not_an_int").save()
 
     def test_save_to_a_value_that_equates_to_false(self):
@@ -1037,7 +1032,7 @@ class User(Document):
         user.save()
 
         user.reload()
-        self.assertEqual(user.thing.count, 0)
+        assert user.thing.count == 0
 
     def test_save_max_recursion_not_hit(self):
         class Person(Document):
@@ -1085,7 +1080,7 @@ class Foo(Document):
             b.name = "world"
             b.save()
 
-            self.assertEqual(b.picture, b.bar.picture, b.bar.bar.picture)
+            assert b.picture == b.bar.picture, b.bar.bar.picture
 
     def test_save_cascades(self):
         class Person(Document):
@@ -1107,7 +1102,7 @@ class Person(Document):
         p.save(cascade=True)
 
         p1.reload()
-        self.assertEqual(p1.name, p.parent.name)
+        assert p1.name == p.parent.name
 
     def test_save_cascade_kwargs(self):
         class Person(Document):
@@ -1127,7 +1122,7 @@ class Person(Document):
 
         p1.reload()
         p2.reload()
-        self.assertEqual(p1.name, p2.parent.name)
+        assert p1.name == p2.parent.name
 
     def test_save_cascade_meta_false(self):
         class Person(Document):
@@ -1151,11 +1146,11 @@ class Person(Document):
         p.save()
 
         p1.reload()
-        self.assertNotEqual(p1.name, p.parent.name)
+        assert p1.name != p.parent.name
 
         p.save(cascade=True)
         p1.reload()
-        self.assertEqual(p1.name, p.parent.name)
+        assert p1.name == p.parent.name
 
     def test_save_cascade_meta_true(self):
         class Person(Document):
@@ -1179,7 +1174,7 @@ class Person(Document):
         p.save()
 
         p1.reload()
-        self.assertNotEqual(p1.name, p.parent.name)
+        assert p1.name != p.parent.name
 
     def test_save_cascades_generically(self):
         class Person(Document):
@@ -1200,11 +1195,11 @@ class Person(Document):
         p.save()
 
         p1.reload()
-        self.assertNotEqual(p1.name, p.parent.name)
+        assert p1.name != p.parent.name
 
         p.save(cascade=True)
         p1.reload()
-        self.assertEqual(p1.name, p.parent.name)
+        assert p1.name == p.parent.name
 
     def test_save_atomicity_condition(self):
         class Widget(Document):
@@ -1226,64 +1221,61 @@ def UUID(i):
         # ignore save_condition on new record creation
         w1.save(save_condition={"save_id": UUID(42)})
         w1.reload()
-        self.assertFalse(w1.toggle)
-        self.assertEqual(w1.save_id, UUID(1))
-        self.assertEqual(w1.count, 0)
+        assert not w1.toggle
+        assert w1.save_id == UUID(1)
+        assert w1.count == 0
 
         # mismatch in save_condition prevents save and raise exception
         flip(w1)
-        self.assertTrue(w1.toggle)
-        self.assertEqual(w1.count, 1)
-        self.assertRaises(
-            SaveConditionError, w1.save, save_condition={"save_id": UUID(42)}
-        )
+        assert w1.toggle
+        assert w1.count == 1
+        with pytest.raises(SaveConditionError):
+            w1.save(save_condition={"save_id": UUID(42)})
         w1.reload()
-        self.assertFalse(w1.toggle)
-        self.assertEqual(w1.count, 0)
+        assert not w1.toggle
+        assert w1.count == 0
 
         # matched save_condition allows save
         flip(w1)
-        self.assertTrue(w1.toggle)
-        self.assertEqual(w1.count, 1)
+        assert w1.toggle
+        assert w1.count == 1
         w1.save(save_condition={"save_id": UUID(1)})
         w1.reload()
-        self.assertTrue(w1.toggle)
-        self.assertEqual(w1.count, 1)
+        assert w1.toggle
+        assert w1.count == 1
 
         # save_condition can be used to ensure atomic read & updates
         # i.e., prevent interleaved reads and writes from separate contexts
         w2 = Widget.objects.get()
-        self.assertEqual(w1, w2)
+        assert w1 == w2
         old_id = w1.save_id
 
         flip(w1)
         w1.save_id = UUID(2)
         w1.save(save_condition={"save_id": old_id})
         w1.reload()
-        self.assertFalse(w1.toggle)
-        self.assertEqual(w1.count, 2)
+        assert not w1.toggle
+        assert w1.count == 2
         flip(w2)
         flip(w2)
-        self.assertRaises(
-            SaveConditionError, w2.save, save_condition={"save_id": old_id}
-        )
+        with pytest.raises(SaveConditionError):
+            w2.save(save_condition={"save_id": old_id})
         w2.reload()
-        self.assertFalse(w2.toggle)
-        self.assertEqual(w2.count, 2)
+        assert not w2.toggle
+        assert w2.count == 2
 
         # save_condition uses mongoengine-style operator syntax
         flip(w1)
         w1.save(save_condition={"count__lt": w1.count})
         w1.reload()
-        self.assertTrue(w1.toggle)
-        self.assertEqual(w1.count, 3)
+        assert w1.toggle
+        assert w1.count == 3
         flip(w1)
-        self.assertRaises(
-            SaveConditionError, w1.save, save_condition={"count__gte": w1.count}
-        )
+        with pytest.raises(SaveConditionError):
+            w1.save(save_condition={"count__gte": w1.count})
         w1.reload()
-        self.assertTrue(w1.toggle)
-        self.assertEqual(w1.count, 3)
+        assert w1.toggle
+        assert w1.count == 3
 
     def test_save_update_selectively(self):
         class WildBoy(Document):
@@ -1303,8 +1295,8 @@ class WildBoy(Document):
         boy2.save()
 
         fresh_boy = WildBoy.objects().first()
-        self.assertEqual(fresh_boy.age, 99)
-        self.assertEqual(fresh_boy.name, "Bob")
+        assert fresh_boy.age == 99
+        assert fresh_boy.name == "Bob"
 
     def test_save_update_selectively_with_custom_pk(self):
         # Prevents regression of #2082
@@ -1326,8 +1318,8 @@ class WildBoy(Document):
         boy2.save()
 
         fresh_boy = WildBoy.objects().first()
-        self.assertEqual(fresh_boy.age, 99)
-        self.assertEqual(fresh_boy.name, "Bob")
+        assert fresh_boy.age == 99
+        assert fresh_boy.name == "Bob"
 
     def test_update(self):
         """Ensure that an existing document is updated instead of be
@@ -1343,20 +1335,20 @@ def test_update(self):
         same_person.save()
 
         # Confirm only one object
-        self.assertEqual(self.Person.objects.count(), 1)
+        assert self.Person.objects.count() == 1
 
         # reload
         person.reload()
         same_person.reload()
 
         # Confirm the same
-        self.assertEqual(person, same_person)
-        self.assertEqual(person.name, same_person.name)
-        self.assertEqual(person.age, same_person.age)
+        assert person == same_person
+        assert person.name == same_person.name
+        assert person.age == same_person.age
 
         # Confirm the saved values
-        self.assertEqual(person.name, "Test")
-        self.assertEqual(person.age, 30)
+        assert person.name == "Test"
+        assert person.age == 30
 
         # Test only / exclude only updates included fields
         person = self.Person.objects.only("name").get()
@@ -1364,8 +1356,8 @@ def test_update(self):
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, "User")
-        self.assertEqual(person.age, 30)
+        assert person.name == "User"
+        assert person.age == 30
 
         # test exclude only updates set fields
         person = self.Person.objects.exclude("name").get()
@@ -1373,8 +1365,8 @@ def test_update(self):
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, "User")
-        self.assertEqual(person.age, 21)
+        assert person.name == "User"
+        assert person.age == 21
 
         # Test only / exclude can set non excluded / included fields
         person = self.Person.objects.only("name").get()
@@ -1383,8 +1375,8 @@ def test_update(self):
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, "Test")
-        self.assertEqual(person.age, 30)
+        assert person.name == "Test"
+        assert person.age == 30
 
         # test exclude only updates set fields
         person = self.Person.objects.exclude("name").get()
@@ -1393,8 +1385,8 @@ def test_update(self):
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, "User")
-        self.assertEqual(person.age, 21)
+        assert person.name == "User"
+        assert person.age == 21
 
         # Confirm does remove unrequired fields
         person = self.Person.objects.exclude("name").get()
@@ -1402,8 +1394,8 @@ def test_update(self):
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, "User")
-        self.assertEqual(person.age, None)
+        assert person.name == "User"
+        assert person.age == None
 
         person = self.Person.objects.get()
         person.name = None
@@ -1411,20 +1403,20 @@ def test_update(self):
         person.save()
 
         person.reload()
-        self.assertEqual(person.name, None)
-        self.assertEqual(person.age, None)
+        assert person.name == None
+        assert person.age == None
 
     def test_update_rename_operator(self):
         """Test the $rename operator."""
         coll = self.Person._get_collection()
         doc = self.Person(name="John").save()
         raw_doc = coll.find_one({"_id": doc.pk})
-        self.assertEqual(set(raw_doc.keys()), set(["_id", "_cls", "name"]))
+        assert set(raw_doc.keys()) == set(["_id", "_cls", "name"])
 
         doc.update(rename__name="first_name")
         raw_doc = coll.find_one({"_id": doc.pk})
-        self.assertEqual(set(raw_doc.keys()), set(["_id", "_cls", "first_name"]))
-        self.assertEqual(raw_doc["first_name"], "John")
+        assert set(raw_doc.keys()) == set(["_id", "_cls", "first_name"])
+        assert raw_doc["first_name"] == "John"
 
     def test_inserts_if_you_set_the_pk(self):
         p1 = self.Person(name="p1", id=bson.ObjectId()).save()
@@ -1432,7 +1424,7 @@ def test_inserts_if_you_set_the_pk(self):
         p2.id = bson.ObjectId()
         p2.save()
 
-        self.assertEqual(2, self.Person.objects.count())
+        assert 2 == self.Person.objects.count()
 
     def test_can_save_if_not_included(self):
         class EmbeddedDoc(EmbeddedDocument):
@@ -1480,13 +1472,13 @@ class Doc(Document):
         my_doc.save()
 
         my_doc = Doc.objects.get(string_field="string")
-        self.assertEqual(my_doc.string_field, "string")
-        self.assertEqual(my_doc.int_field, 1)
+        assert my_doc.string_field == "string"
+        assert my_doc.int_field == 1
 
     def test_document_update(self):
 
         # try updating a non-saved document
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             person = self.Person(name="dcrosta")
             person.update(set__name="Dan Crosta")
 
@@ -1497,10 +1489,10 @@ def test_document_update(self):
         author.reload()
 
         p1 = self.Person.objects.first()
-        self.assertEqual(p1.name, author.name)
+        assert p1.name == author.name
 
         # try sending an empty update
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             person = self.Person.objects.first()
             person.update()
 
@@ -1509,7 +1501,7 @@ def test_document_update(self):
         person = self.Person.objects.first()
         person.update(name="Dan")
         person.reload()
-        self.assertEqual("Dan", person.name)
+        assert "Dan" == person.name
 
     def test_update_unique_field(self):
         class Doc(Document):
@@ -1518,7 +1510,7 @@ class Doc(Document):
         doc1 = Doc(name="first").save()
         doc2 = Doc(name="second").save()
 
-        with self.assertRaises(NotUniqueError):
+        with pytest.raises(NotUniqueError):
             doc2.update(set__name=doc1.name)
 
     def test_embedded_update(self):
@@ -1540,7 +1532,7 @@ class Site(Document):
         site.save()
 
         site = Site.objects.first()
-        self.assertEqual(site.page.log_message, "Error: Dummy message")
+        assert site.page.log_message == "Error: Dummy message"
 
     def test_update_list_field(self):
         """Test update on `ListField` with $pull + $in.
@@ -1558,7 +1550,7 @@ class Doc(Document):
         doc.update(pull__foo__in=["a", "c"])
 
         doc = Doc.objects.first()
-        self.assertEqual(doc.foo, ["b"])
+        assert doc.foo == ["b"]
 
     def test_embedded_update_db_field(self):
         """Test update on `EmbeddedDocumentField` fields when db_field
@@ -1584,7 +1576,7 @@ class Site(Document):
         site.save()
 
         site = Site.objects.first()
-        self.assertEqual(site.page.log_message, "Error: Dummy message")
+        assert site.page.log_message == "Error: Dummy message"
 
     def test_save_only_changed_fields(self):
         """Ensure save only sets / unsets changed fields."""
@@ -1610,9 +1602,9 @@ class User(self.Person):
         same_person.save()
 
         person = self.Person.objects.get()
-        self.assertEqual(person.name, "User")
-        self.assertEqual(person.age, 21)
-        self.assertEqual(person.active, False)
+        assert person.name == "User"
+        assert person.age == 21
+        assert person.active == False
 
     def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_embedded_doc(
         self,
@@ -1626,7 +1618,7 @@ class ParentModel(Document):
 
         emb = EmbeddedChildModel(id={"1": [1]})
         changed_fields = ParentModel(child=emb)._get_changed_fields()
-        self.assertEqual(changed_fields, [])
+        assert changed_fields == []
 
     def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_different_doc(
         self,
@@ -1647,8 +1639,8 @@ class Message(Document):
         message = Message(id=1, author=user).save()
 
         message.author.name = "tutu"
-        self.assertEqual(message._get_changed_fields(), [])
-        self.assertEqual(user._get_changed_fields(), ["name"])
+        assert message._get_changed_fields() == []
+        assert user._get_changed_fields() == ["name"]
 
     def test__get_changed_fields_same_ids_embedded(self):
         # Refers to Issue #1768
@@ -1667,11 +1659,11 @@ class Message(Document):
         message = Message(id=1, author=user).save()
 
         message.author.name = "tutu"
-        self.assertEqual(message._get_changed_fields(), ["author.name"])
+        assert message._get_changed_fields() == ["author.name"]
         message.save()
 
         message_fetched = Message.objects.with_id(message.id)
-        self.assertEqual(message_fetched.author.name, "tutu")
+        assert message_fetched.author.name == "tutu"
 
     def test_query_count_when_saving(self):
         """Ensure references don't cause extra fetches when saving"""
@@ -1707,65 +1699,65 @@ class UserSubscription(Document):
         user = User.objects.first()
         # Even if stored as ObjectId's internally mongoengine uses DBRefs
         # As ObjectId's aren't automatically derefenced
-        self.assertIsInstance(user._data["orgs"][0], DBRef)
-        self.assertIsInstance(user.orgs[0], Organization)
-        self.assertIsInstance(user._data["orgs"][0], Organization)
+        assert isinstance(user._data["orgs"][0], DBRef)
+        assert isinstance(user.orgs[0], Organization)
+        assert isinstance(user._data["orgs"][0], Organization)
 
         # Changing a value
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             sub = UserSubscription.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
             sub.name = "Test Sub"
             sub.save()
-            self.assertEqual(q, 2)
+            assert q == 2
 
         # Changing a value that will cascade
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             sub = UserSubscription.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
             sub.user.name = "Test"
-            self.assertEqual(q, 2)
+            assert q == 2
             sub.save(cascade=True)
-            self.assertEqual(q, 3)
+            assert q == 3
 
         # Changing a value and one that will cascade
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             sub = UserSubscription.objects.first()
             sub.name = "Test Sub 2"
-            self.assertEqual(q, 1)
+            assert q == 1
             sub.user.name = "Test 2"
-            self.assertEqual(q, 2)
+            assert q == 2
             sub.save(cascade=True)
-            self.assertEqual(q, 4)  # One for the UserSub and one for the User
+            assert q == 4  # One for the UserSub and one for the User
 
         # Saving with just the refs
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             sub = UserSubscription(user=u1.pk, feed=f1.pk)
-            self.assertEqual(q, 0)
+            assert q == 0
             sub.save()
-            self.assertEqual(q, 1)
+            assert q == 1
 
         # Saving with just the refs on a ListField
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             User(name="Bob", orgs=[o1.pk, o2.pk]).save()
-            self.assertEqual(q, 1)
+            assert q == 1
 
         # Saving new objects
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             user = User.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
             feed = Feed.objects.first()
-            self.assertEqual(q, 2)
+            assert q == 2
             sub = UserSubscription(user=user, feed=feed)
-            self.assertEqual(q, 2)  # Check no change
+            assert q == 2  # Check no change
             sub.save()
-            self.assertEqual(q, 3)
+            assert q == 3
 
     def test_set_unset_one_operation(self):
         """Ensure that $set and $unset actions are performed in the
@@ -1781,14 +1773,14 @@ class FooBar(Document):
         # write an entity with a single prop
         foo = FooBar(foo="foo").save()
 
-        self.assertEqual(foo.foo, "foo")
+        assert foo.foo == "foo"
         del foo.foo
         foo.bar = "bar"
 
         with query_counter() as q:
-            self.assertEqual(0, q)
+            assert 0 == q
             foo.save()
-            self.assertEqual(1, q)
+            assert 1 == q
 
     def test_save_only_changed_fields_recursive(self):
         """Ensure save only sets / unsets changed fields."""
@@ -1810,34 +1802,34 @@ class User(self.Person):
         person.reload()
 
         person = self.Person.objects.get()
-        self.assertTrue(person.comments[0].published)
+        assert person.comments[0].published
 
         person.comments[0].published = False
         person.save()
 
         person = self.Person.objects.get()
-        self.assertFalse(person.comments[0].published)
+        assert not person.comments[0].published
 
         # Simple dict w
         person.comments_dict["first_post"] = Comment()
         person.save()
 
         person = self.Person.objects.get()
-        self.assertTrue(person.comments_dict["first_post"].published)
+        assert person.comments_dict["first_post"].published
 
         person.comments_dict["first_post"].published = False
         person.save()
 
         person = self.Person.objects.get()
-        self.assertFalse(person.comments_dict["first_post"].published)
+        assert not person.comments_dict["first_post"].published
 
     def test_delete(self):
         """Ensure that document may be deleted using the delete method."""
         person = self.Person(name="Test User", age=30)
         person.save()
-        self.assertEqual(self.Person.objects.count(), 1)
+        assert self.Person.objects.count() == 1
         person.delete()
-        self.assertEqual(self.Person.objects.count(), 0)
+        assert self.Person.objects.count() == 0
 
     def test_save_custom_id(self):
         """Ensure that a document may be saved with a custom _id."""
@@ -1849,7 +1841,7 @@ def test_save_custom_id(self):
         # Ensure that the object is in the database with the correct _id
         collection = self.db[self.Person._get_collection_name()]
         person_obj = collection.find_one({"name": "Test User"})
-        self.assertEqual(str(person_obj["_id"]), "497ce96f395f2f052a494fd4")
+        assert str(person_obj["_id"]) == "497ce96f395f2f052a494fd4"
 
     def test_save_custom_pk(self):
         """Ensure that a document may be saved with a custom _id using
@@ -1862,7 +1854,7 @@ def test_save_custom_pk(self):
         # Ensure that the object is in the database with the correct _id
         collection = self.db[self.Person._get_collection_name()]
         person_obj = collection.find_one({"name": "Test User"})
-        self.assertEqual(str(person_obj["_id"]), "497ce96f395f2f052a494fd4")
+        assert str(person_obj["_id"]) == "497ce96f395f2f052a494fd4"
 
     def test_save_list(self):
         """Ensure that a list field may be properly saved."""
@@ -1885,9 +1877,9 @@ class BlogPost(Document):
 
         collection = self.db[BlogPost._get_collection_name()]
         post_obj = collection.find_one()
-        self.assertEqual(post_obj["tags"], tags)
+        assert post_obj["tags"] == tags
         for comment_obj, comment in zip(post_obj["comments"], comments):
-            self.assertEqual(comment_obj["content"], comment["content"])
+            assert comment_obj["content"] == comment["content"]
 
     def test_list_search_by_embedded(self):
         class User(Document):
@@ -1944,9 +1936,9 @@ class Page(Document):
         p4 = Page(comments=[Comment(user=u2, comment="Heavy Metal song")])
         p4.save()
 
-        self.assertEqual([p1, p2], list(Page.objects.filter(comments__user=u1)))
-        self.assertEqual([p1, p2, p4], list(Page.objects.filter(comments__user=u2)))
-        self.assertEqual([p1, p3], list(Page.objects.filter(comments__user=u3)))
+        assert [p1, p2] == list(Page.objects.filter(comments__user=u1))
+        assert [p1, p2, p4] == list(Page.objects.filter(comments__user=u2))
+        assert [p1, p3] == list(Page.objects.filter(comments__user=u3))
 
     def test_save_embedded_document(self):
         """Ensure that a document with an embedded document field may
@@ -1968,11 +1960,11 @@ class Employee(self.Person):
         # Ensure that the object is in the database
         collection = self.db[self.Person._get_collection_name()]
         employee_obj = collection.find_one({"name": "Test Employee"})
-        self.assertEqual(employee_obj["name"], "Test Employee")
-        self.assertEqual(employee_obj["age"], 50)
+        assert employee_obj["name"] == "Test Employee"
+        assert employee_obj["age"] == 50
 
         # Ensure that the 'details' embedded object saved correctly
-        self.assertEqual(employee_obj["details"]["position"], "Developer")
+        assert employee_obj["details"]["position"] == "Developer"
 
     def test_embedded_update_after_save(self):
         """Test update of `EmbeddedDocumentField` attached to a newly
@@ -1994,7 +1986,7 @@ class Site(Document):
         site.save()
 
         site = Site.objects.first()
-        self.assertEqual(site.page.log_message, "Error: Dummy message")
+        assert site.page.log_message == "Error: Dummy message"
 
     def test_updating_an_embedded_document(self):
         """Ensure that a document with an embedded document field may
@@ -2019,18 +2011,18 @@ class Employee(self.Person):
         promoted_employee.save()
 
         promoted_employee.reload()
-        self.assertEqual(promoted_employee.name, "Test Employee")
-        self.assertEqual(promoted_employee.age, 50)
+        assert promoted_employee.name == "Test Employee"
+        assert promoted_employee.age == 50
 
         # Ensure that the 'details' embedded object saved correctly
-        self.assertEqual(promoted_employee.details.position, "Senior Developer")
+        assert promoted_employee.details.position == "Senior Developer"
 
         # Test removal
         promoted_employee.details = None
         promoted_employee.save()
 
         promoted_employee.reload()
-        self.assertEqual(promoted_employee.details, None)
+        assert promoted_employee.details == None
 
     def test_object_mixins(self):
         class NameMixin(object):
@@ -2039,12 +2031,12 @@ class NameMixin(object):
         class Foo(EmbeddedDocument, NameMixin):
             quantity = IntField()
 
-        self.assertEqual(["name", "quantity"], sorted(Foo._fields.keys()))
+        assert ["name", "quantity"] == sorted(Foo._fields.keys())
 
         class Bar(Document, NameMixin):
             widgets = StringField()
 
-        self.assertEqual(["id", "name", "widgets"], sorted(Bar._fields.keys()))
+        assert ["id", "name", "widgets"] == sorted(Bar._fields.keys())
 
     def test_mixin_inheritance(self):
         class BaseMixIn(object):
@@ -2064,10 +2056,10 @@ class TestDoc(Document, DoubleMixIn):
 
         t = TestDoc.objects.first()
 
-        self.assertEqual(t.age, 19)
-        self.assertEqual(t.comment, "great!")
-        self.assertEqual(t.data, "test")
-        self.assertEqual(t.count, 12)
+        assert t.age == 19
+        assert t.comment == "great!"
+        assert t.data == "test"
+        assert t.count == 12
 
     def test_save_reference(self):
         """Ensure that a document reference field may be saved in the
@@ -2092,22 +2084,22 @@ class BlogPost(Document):
         post_obj = BlogPost.objects.first()
 
         # Test laziness
-        self.assertIsInstance(post_obj._data["author"], bson.DBRef)
-        self.assertIsInstance(post_obj.author, self.Person)
-        self.assertEqual(post_obj.author.name, "Test User")
+        assert isinstance(post_obj._data["author"], bson.DBRef)
+        assert isinstance(post_obj.author, self.Person)
+        assert post_obj.author.name == "Test User"
 
         # Ensure that the dereferenced object may be changed and saved
         post_obj.author.age = 25
         post_obj.author.save()
 
         author = list(self.Person.objects(name="Test User"))[-1]
-        self.assertEqual(author.age, 25)
+        assert author.age == 25
 
     def test_duplicate_db_fields_raise_invalid_document_error(self):
         """Ensure a InvalidDocumentError is thrown if duplicate fields
         declare the same db_field.
         """
-        with self.assertRaises(InvalidDocumentError):
+        with pytest.raises(InvalidDocumentError):
 
             class Foo(Document):
                 name = StringField()
@@ -2125,7 +2117,7 @@ class Word(Document):
             forms = ListField(StringField(), default=list)
             occurs = ListField(EmbeddedDocumentField(Occurrence), default=list)
 
-        with self.assertRaises(InvalidDocumentError):
+        with pytest.raises(InvalidDocumentError):
             Word._from_son(
                 {
                     "stem": [1, 2, 3],
@@ -2136,7 +2128,7 @@ class Word(Document):
             )
 
         # Tests for issue #1438: https://github.com/MongoEngine/mongoengine/issues/1438
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             Word._from_son("this is not a valid SON dict")
 
     def test_reverse_delete_rule_cascade_and_nullify(self):
@@ -2165,12 +2157,12 @@ class BlogPost(Document):
 
         reviewer.delete()
         # No effect on the BlogPost
-        self.assertEqual(BlogPost.objects.count(), 1)
-        self.assertEqual(BlogPost.objects.get().reviewer, None)
+        assert BlogPost.objects.count() == 1
+        assert BlogPost.objects.get().reviewer == None
 
         # Delete the Person, which should lead to deletion of the BlogPost, too
         author.delete()
-        self.assertEqual(BlogPost.objects.count(), 0)
+        assert BlogPost.objects.count() == 0
 
     def test_reverse_delete_rule_pull(self):
         """Ensure that a referenced document is also deleted with
@@ -2189,7 +2181,7 @@ class Record(Document):
         parent_record.save()
 
         child_record.delete()
-        self.assertEqual(Record.objects(name="parent").get().children, [])
+        assert Record.objects(name="parent").get().children == []
 
     def test_reverse_delete_rule_with_custom_id_field(self):
         """Ensure that a referenced document with custom primary key
@@ -2211,11 +2203,11 @@ class Book(Document):
         book = Book(author=user, reviewer=reviewer).save()
 
         reviewer.delete()
-        self.assertEqual(Book.objects.count(), 1)
-        self.assertEqual(Book.objects.get().reviewer, None)
+        assert Book.objects.count() == 1
+        assert Book.objects.get().reviewer == None
 
         user.delete()
-        self.assertEqual(Book.objects.count(), 0)
+        assert Book.objects.count() == 0
 
     def test_reverse_delete_rule_with_shared_id_among_collections(self):
         """Ensure that cascade delete rule doesn't mix id among
@@ -2239,16 +2231,16 @@ class Book(Document):
 
         user_2.delete()
         # Deleting user_2 should also delete book_1 but not book_2
-        self.assertEqual(Book.objects.count(), 1)
-        self.assertEqual(Book.objects.get(), book_2)
+        assert Book.objects.count() == 1
+        assert Book.objects.get() == book_2
 
         user_3 = User(id=3).save()
         book_3 = Book(id=3, author=user_3).save()
 
         user_3.delete()
         # Deleting user_3 should also delete book_3
-        self.assertEqual(Book.objects.count(), 1)
-        self.assertEqual(Book.objects.get(), book_2)
+        assert Book.objects.count() == 1
+        assert Book.objects.get() == book_2
 
     def test_reverse_delete_rule_with_document_inheritance(self):
         """Ensure that a referenced document is also deleted upon
@@ -2278,12 +2270,12 @@ class BlogPost(Document):
         post.save()
 
         reviewer.delete()
-        self.assertEqual(BlogPost.objects.count(), 1)
-        self.assertEqual(BlogPost.objects.get().reviewer, None)
+        assert BlogPost.objects.count() == 1
+        assert BlogPost.objects.get().reviewer == None
 
         # Delete the Writer should lead to deletion of the BlogPost
         author.delete()
-        self.assertEqual(BlogPost.objects.count(), 0)
+        assert BlogPost.objects.count() == 0
 
     def test_reverse_delete_rule_cascade_and_nullify_complex_field(self):
         """Ensure that a referenced document is also deleted upon
@@ -2315,12 +2307,12 @@ class BlogPost(Document):
 
         # Deleting the reviewer should have no effect on the BlogPost
         reviewer.delete()
-        self.assertEqual(BlogPost.objects.count(), 1)
-        self.assertEqual(BlogPost.objects.get().reviewers, [])
+        assert BlogPost.objects.count() == 1
+        assert BlogPost.objects.get().reviewers == []
 
         # Delete the Person, which should lead to deletion of the BlogPost, too
         author.delete()
-        self.assertEqual(BlogPost.objects.count(), 0)
+        assert BlogPost.objects.count() == 0
 
     def test_reverse_delete_rule_cascade_triggers_pre_delete_signal(self):
         """Ensure the pre_delete signal is triggered upon a cascading
@@ -2357,7 +2349,7 @@ def pre_delete(cls, sender, document, **kwargs):
 
         # the pre-delete signal should have decremented the editor's queue
         editor = Editor.objects(name="Max P.").get()
-        self.assertEqual(editor.review_queue, 0)
+        assert editor.review_queue == 0
 
     def test_two_way_reverse_delete_rule(self):
         """Ensure that Bi-Directional relationships work with
@@ -2389,11 +2381,11 @@ class Foo(Document):
 
         f.delete()
 
-        self.assertEqual(Bar.objects.count(), 1)  # No effect on the BlogPost
-        self.assertEqual(Bar.objects.get().foo, None)
+        assert Bar.objects.count() == 1  # No effect on the BlogPost
+        assert Bar.objects.get().foo == None
 
     def test_invalid_reverse_delete_rule_raise_errors(self):
-        with self.assertRaises(InvalidDocumentError):
+        with pytest.raises(InvalidDocumentError):
 
             class Blog(Document):
                 content = StringField()
@@ -2404,7 +2396,7 @@ class Blog(Document):
                     field=ReferenceField(self.Person, reverse_delete_rule=NULLIFY)
                 )
 
-        with self.assertRaises(InvalidDocumentError):
+        with pytest.raises(InvalidDocumentError):
 
             class Parents(EmbeddedDocument):
                 father = ReferenceField("Person", reverse_delete_rule=DENY)
@@ -2441,7 +2433,7 @@ class Comment(Document):
         # Delete the Person, which should lead to deletion of the BlogPost,
         # and, recursively to the Comment, too
         author.delete()
-        self.assertEqual(Comment.objects.count(), 0)
+        assert Comment.objects.count() == 0
 
     def test_reverse_delete_rule_deny(self):
         """Ensure that a document cannot be referenced if there are
@@ -2463,19 +2455,18 @@ class BlogPost(Document):
         post.save()
 
         # Delete the Person should be denied
-        self.assertRaises(OperationError, author.delete)  # Should raise denied error
-        self.assertEqual(
-            BlogPost.objects.count(), 1
-        )  # No objects may have been deleted
-        self.assertEqual(self.Person.objects.count(), 1)
+        with pytest.raises(OperationError):
+            author.delete()  # Should raise denied error
+        assert BlogPost.objects.count() == 1  # No objects may have been deleted
+        assert self.Person.objects.count() == 1
 
         # Other users, that don't have BlogPosts must be removable, like normal
         author = self.Person(name="Another User")
         author.save()
 
-        self.assertEqual(self.Person.objects.count(), 2)
+        assert self.Person.objects.count() == 2
         author.delete()
-        self.assertEqual(self.Person.objects.count(), 1)
+        assert self.Person.objects.count() == 1
 
     def subclasses_and_unique_keys_works(self):
         class A(Document):
@@ -2491,8 +2482,8 @@ class B(A):
         A().save()
         B(foo=True).save()
 
-        self.assertEqual(A.objects.count(), 2)
-        self.assertEqual(B.objects.count(), 1)
+        assert A.objects.count() == 2
+        assert B.objects.count() == 1
 
     def test_document_hash(self):
         """Test document in list, dict, set."""
@@ -2518,12 +2509,12 @@ class BlogPost(Document):
         # Make sure docs are properly identified in a list (__eq__ is used
         # for the comparison).
         all_user_list = list(User.objects.all())
-        self.assertIn(u1, all_user_list)
-        self.assertIn(u2, all_user_list)
-        self.assertIn(u3, all_user_list)
-        self.assertNotIn(u4, all_user_list)  # New object
-        self.assertNotIn(b1, all_user_list)  # Other object
-        self.assertNotIn(b2, all_user_list)  # Other object
+        assert u1 in all_user_list
+        assert u2 in all_user_list
+        assert u3 in all_user_list
+        assert u4 not in all_user_list  # New object
+        assert b1 not in all_user_list  # Other object
+        assert b2 not in all_user_list  # Other object
 
         # Make sure docs can be used as keys in a dict (__hash__ is used
         # for hashing the docs).
@@ -2531,27 +2522,27 @@ class BlogPost(Document):
         for u in User.objects.all():
             all_user_dic[u] = "OK"
 
-        self.assertEqual(all_user_dic.get(u1, False), "OK")
-        self.assertEqual(all_user_dic.get(u2, False), "OK")
-        self.assertEqual(all_user_dic.get(u3, False), "OK")
-        self.assertEqual(all_user_dic.get(u4, False), False)  # New object
-        self.assertEqual(all_user_dic.get(b1, False), False)  # Other object
-        self.assertEqual(all_user_dic.get(b2, False), False)  # Other object
+        assert all_user_dic.get(u1, False) == "OK"
+        assert all_user_dic.get(u2, False) == "OK"
+        assert all_user_dic.get(u3, False) == "OK"
+        assert all_user_dic.get(u4, False) == False  # New object
+        assert all_user_dic.get(b1, False) == False  # Other object
+        assert all_user_dic.get(b2, False) == False  # Other object
 
         # Make sure docs are properly identified in a set (__hash__ is used
         # for hashing the docs).
         all_user_set = set(User.objects.all())
-        self.assertIn(u1, all_user_set)
-        self.assertNotIn(u4, all_user_set)
-        self.assertNotIn(b1, all_user_list)
-        self.assertNotIn(b2, all_user_list)
+        assert u1 in all_user_set
+        assert u4 not in all_user_set
+        assert b1 not in all_user_list
+        assert b2 not in all_user_list
 
         # Make sure duplicate docs aren't accepted in the set
-        self.assertEqual(len(all_user_set), 3)
+        assert len(all_user_set) == 3
         all_user_set.add(u1)
         all_user_set.add(u2)
         all_user_set.add(u3)
-        self.assertEqual(len(all_user_set), 3)
+        assert len(all_user_set) == 3
 
     def test_picklable(self):
         pickle_doc = PickleTest(number=1, string="One", lists=["1", "2"])
@@ -2564,21 +2555,21 @@ def test_picklable(self):
         pickled_doc = pickle.dumps(pickle_doc)
         resurrected = pickle.loads(pickled_doc)
 
-        self.assertEqual(resurrected, pickle_doc)
+        assert resurrected == pickle_doc
 
         # Test pickling changed data
         pickle_doc.lists.append("3")
         pickled_doc = pickle.dumps(pickle_doc)
         resurrected = pickle.loads(pickled_doc)
 
-        self.assertEqual(resurrected, pickle_doc)
+        assert resurrected == pickle_doc
         resurrected.string = "Two"
         resurrected.save()
 
         pickle_doc = PickleTest.objects.first()
-        self.assertEqual(resurrected, pickle_doc)
-        self.assertEqual(pickle_doc.string, "Two")
-        self.assertEqual(pickle_doc.lists, ["1", "2", "3"])
+        assert resurrected == pickle_doc
+        assert pickle_doc.string == "Two"
+        assert pickle_doc.lists == ["1", "2", "3"]
 
     def test_regular_document_pickle(self):
         pickle_doc = PickleTest(number=1, string="One", lists=["1", "2"])
@@ -2594,11 +2585,12 @@ def test_regular_document_pickle(self):
         fixtures.PickleTest = fixtures.NewDocumentPickleTest
 
         resurrected = pickle.loads(pickled_doc)
-        self.assertEqual(resurrected.__class__, fixtures.NewDocumentPickleTest)
-        self.assertEqual(
-            resurrected._fields_ordered, fixtures.NewDocumentPickleTest._fields_ordered
+        assert resurrected.__class__ == fixtures.NewDocumentPickleTest
+        assert (
+            resurrected._fields_ordered
+            == fixtures.NewDocumentPickleTest._fields_ordered
         )
-        self.assertNotEqual(resurrected._fields_ordered, pickle_doc._fields_ordered)
+        assert resurrected._fields_ordered != pickle_doc._fields_ordered
 
         # The local PickleTest is still a ref to the original
         fixtures.PickleTest = PickleTest
@@ -2617,19 +2609,17 @@ def test_dynamic_document_pickle(self):
         pickled_doc = pickle.dumps(pickle_doc)
         resurrected = pickle.loads(pickled_doc)
 
-        self.assertEqual(resurrected, pickle_doc)
-        self.assertEqual(resurrected._fields_ordered, pickle_doc._fields_ordered)
-        self.assertEqual(
-            resurrected._dynamic_fields.keys(), pickle_doc._dynamic_fields.keys()
-        )
+        assert resurrected == pickle_doc
+        assert resurrected._fields_ordered == pickle_doc._fields_ordered
+        assert resurrected._dynamic_fields.keys() == pickle_doc._dynamic_fields.keys()
 
-        self.assertEqual(resurrected.embedded, pickle_doc.embedded)
-        self.assertEqual(
-            resurrected.embedded._fields_ordered, pickle_doc.embedded._fields_ordered
+        assert resurrected.embedded == pickle_doc.embedded
+        assert (
+            resurrected.embedded._fields_ordered == pickle_doc.embedded._fields_ordered
         )
-        self.assertEqual(
-            resurrected.embedded._dynamic_fields.keys(),
-            pickle_doc.embedded._dynamic_fields.keys(),
+        assert (
+            resurrected.embedded._dynamic_fields.keys()
+            == pickle_doc.embedded._dynamic_fields.keys()
         )
 
     def test_picklable_on_signals(self):
@@ -2642,7 +2632,7 @@ def test_override_method_with_field(self):
         """Test creating a field with a field name that would override
         the "validate" method.
         """
-        with self.assertRaises(InvalidDocumentError):
+        with pytest.raises(InvalidDocumentError):
 
             class Blog(Document):
                 validate = DictField()
@@ -2659,7 +2649,7 @@ class A(Document):
         a = A()
         a.save()
         a.reload()
-        self.assertEqual(a.b.field1, "field1")
+        assert a.b.field1 == "field1"
 
         class C(EmbeddedDocument):
             c_field = StringField(default="cfield")
@@ -2676,7 +2666,7 @@ class A(Document):
         a.save()
 
         a.reload()
-        self.assertEqual(a.b.field2.c_field, "new value")
+        assert a.b.field2.c_field == "new value"
 
     def test_can_save_false_values(self):
         """Ensures you can save False values on save."""
@@ -2692,7 +2682,7 @@ class Doc(Document):
         d.archived = False
         d.save()
 
-        self.assertEqual(Doc.objects(archived=False).count(), 1)
+        assert Doc.objects(archived=False).count() == 1
 
     def test_can_save_false_values_dynamic(self):
         """Ensures you can save False values on dynamic docs."""
@@ -2707,7 +2697,7 @@ class Doc(DynamicDocument):
         d.archived = False
         d.save()
 
-        self.assertEqual(Doc.objects(archived=False).count(), 1)
+        assert Doc.objects(archived=False).count() == 1
 
     def test_do_not_save_unchanged_references(self):
         """Ensures cascading saves dont auto update"""
@@ -2768,8 +2758,8 @@ class Book(Document):
         hp = Book.objects.create(name="Harry Potter")
 
         # Selects
-        self.assertEqual(User.objects.first(), bob)
-        self.assertEqual(Book.objects.first(), hp)
+        assert User.objects.first() == bob
+        assert Book.objects.first() == hp
 
         # DeReference
         class AuthorBooks(Document):
@@ -2783,27 +2773,23 @@ class AuthorBooks(Document):
         ab = AuthorBooks.objects.create(author=bob, book=hp)
 
         # select
-        self.assertEqual(AuthorBooks.objects.first(), ab)
-        self.assertEqual(AuthorBooks.objects.first().book, hp)
-        self.assertEqual(AuthorBooks.objects.first().author, bob)
-        self.assertEqual(AuthorBooks.objects.filter(author=bob).first(), ab)
-        self.assertEqual(AuthorBooks.objects.filter(book=hp).first(), ab)
+        assert AuthorBooks.objects.first() == ab
+        assert AuthorBooks.objects.first().book == hp
+        assert AuthorBooks.objects.first().author == bob
+        assert AuthorBooks.objects.filter(author=bob).first() == ab
+        assert AuthorBooks.objects.filter(book=hp).first() == ab
 
         # DB Alias
-        self.assertEqual(User._get_db(), get_db("testdb-1"))
-        self.assertEqual(Book._get_db(), get_db("testdb-2"))
-        self.assertEqual(AuthorBooks._get_db(), get_db("testdb-3"))
+        assert User._get_db() == get_db("testdb-1")
+        assert Book._get_db() == get_db("testdb-2")
+        assert AuthorBooks._get_db() == get_db("testdb-3")
 
         # Collections
-        self.assertEqual(
-            User._get_collection(), get_db("testdb-1")[User._get_collection_name()]
-        )
-        self.assertEqual(
-            Book._get_collection(), get_db("testdb-2")[Book._get_collection_name()]
-        )
-        self.assertEqual(
-            AuthorBooks._get_collection(),
-            get_db("testdb-3")[AuthorBooks._get_collection_name()],
+        assert User._get_collection() == get_db("testdb-1")[User._get_collection_name()]
+        assert Book._get_collection() == get_db("testdb-2")[Book._get_collection_name()]
+        assert (
+            AuthorBooks._get_collection()
+            == get_db("testdb-3")[AuthorBooks._get_collection_name()]
         )
 
     def test_db_alias_overrides(self):
@@ -2826,9 +2812,9 @@ class B(A):
 
         A.objects.all()
 
-        self.assertEqual("testdb-2", B._meta.get("db_alias"))
-        self.assertEqual("mongoenginetest", A._get_collection().database.name)
-        self.assertEqual("mongoenginetest2", B._get_collection().database.name)
+        assert "testdb-2" == B._meta.get("db_alias")
+        assert "mongoenginetest" == A._get_collection().database.name
+        assert "mongoenginetest2" == B._get_collection().database.name
 
     def test_db_alias_propagates(self):
         """db_alias propagates?"""
@@ -2841,7 +2827,7 @@ class A(Document):
         class B(A):
             pass
 
-        self.assertEqual("testdb-1", B._meta.get("db_alias"))
+        assert "testdb-1" == B._meta.get("db_alias")
 
     def test_db_ref_usage(self):
         """DB Ref usage in dict_fields."""
@@ -2898,11 +2884,9 @@ def __str__(self):
         Book.objects.create(name="9", author=jon, extra={"a": peter.to_dbref()})
 
         # Checks
-        self.assertEqual(
-            ",".join([str(b) for b in Book.objects.all()]), "1,2,3,4,5,6,7,8,9"
-        )
+        assert ",".join([str(b) for b in Book.objects.all()]) == "1,2,3,4,5,6,7,8,9"
         # bob related books
-        self.assertEqual(
+        assert (
             ",".join(
                 [
                     str(b)
@@ -2910,12 +2894,12 @@ def __str__(self):
                         Q(extra__a=bob) | Q(author=bob) | Q(extra__b=bob)
                     )
                 ]
-            ),
-            "1,2,3,4",
+            )
+            == "1,2,3,4"
         )
 
         # Susan & Karl related books
-        self.assertEqual(
+        assert (
             ",".join(
                 [
                     str(b)
@@ -2925,12 +2909,12 @@ def __str__(self):
                         | Q(extra__b__all=[karl.to_dbref(), susan.to_dbref()])
                     )
                 ]
-            ),
-            "1",
+            )
+            == "1"
         )
 
         # $Where
-        self.assertEqual(
+        assert (
             u",".join(
                 [
                     str(b)
@@ -2943,8 +2927,8 @@ def __str__(self):
                         }
                     )
                 ]
-            ),
-            "1,2",
+            )
+            == "1,2"
         )
 
     def test_switch_db_instance(self):
@@ -2958,7 +2942,7 @@ class Group(Document):
             Group.drop_collection()
 
         Group(name="hello - default").save()
-        self.assertEqual(1, Group.objects.count())
+        assert 1 == Group.objects.count()
 
         group = Group.objects.first()
         group.switch_db("testdb-1")
@@ -2967,10 +2951,10 @@ class Group(Document):
 
         with switch_db(Group, "testdb-1") as Group:
             group = Group.objects.first()
-            self.assertEqual("hello - testdb!", group.name)
+            assert "hello - testdb!" == group.name
 
         group = Group.objects.first()
-        self.assertEqual("hello - default", group.name)
+        assert "hello - default" == group.name
 
         # Slightly contrived now - perform an update
         # Only works as they have the same object_id
@@ -2979,12 +2963,12 @@ class Group(Document):
 
         with switch_db(Group, "testdb-1") as Group:
             group = Group.objects.first()
-            self.assertEqual("hello - update", group.name)
+            assert "hello - update" == group.name
             Group.drop_collection()
-            self.assertEqual(0, Group.objects.count())
+            assert 0 == Group.objects.count()
 
         group = Group.objects.first()
-        self.assertEqual("hello - default", group.name)
+        assert "hello - default" == group.name
 
         # Totally contrived now - perform a delete
         # Only works as they have the same object_id
@@ -2992,10 +2976,10 @@ class Group(Document):
         group.delete()
 
         with switch_db(Group, "testdb-1") as Group:
-            self.assertEqual(0, Group.objects.count())
+            assert 0 == Group.objects.count()
 
         group = Group.objects.first()
-        self.assertEqual("hello - default", group.name)
+        assert "hello - default" == group.name
 
     def test_load_undefined_fields(self):
         class User(Document):
@@ -3007,7 +2991,8 @@ class User(Document):
             {"name": "John", "foo": "Bar", "data": [1, 2, 3]}
         )
 
-        self.assertRaises(FieldDoesNotExist, User.objects.first)
+        with pytest.raises(FieldDoesNotExist):
+            User.objects.first()
 
     def test_load_undefined_fields_with_strict_false(self):
         class User(Document):
@@ -3022,11 +3007,11 @@ class User(Document):
         )
 
         user = User.objects.first()
-        self.assertEqual(user.name, "John")
-        self.assertFalse(hasattr(user, "foo"))
-        self.assertEqual(user._data["foo"], "Bar")
-        self.assertFalse(hasattr(user, "data"))
-        self.assertEqual(user._data["data"], [1, 2, 3])
+        assert user.name == "John"
+        assert not hasattr(user, "foo")
+        assert user._data["foo"] == "Bar"
+        assert not hasattr(user, "data")
+        assert user._data["data"] == [1, 2, 3]
 
     def test_load_undefined_fields_on_embedded_document(self):
         class Thing(EmbeddedDocument):
@@ -3045,7 +3030,8 @@ class User(Document):
             }
         )
 
-        self.assertRaises(FieldDoesNotExist, User.objects.first)
+        with pytest.raises(FieldDoesNotExist):
+            User.objects.first()
 
     def test_load_undefined_fields_on_embedded_document_with_strict_false_on_doc(self):
         class Thing(EmbeddedDocument):
@@ -3066,7 +3052,8 @@ class User(Document):
             }
         )
 
-        self.assertRaises(FieldDoesNotExist, User.objects.first)
+        with pytest.raises(FieldDoesNotExist):
+            User.objects.first()
 
     def test_load_undefined_fields_on_embedded_document_with_strict_false(self):
         class Thing(EmbeddedDocument):
@@ -3088,12 +3075,12 @@ class User(Document):
         )
 
         user = User.objects.first()
-        self.assertEqual(user.name, "John")
-        self.assertEqual(user.thing.name, "My thing")
-        self.assertFalse(hasattr(user.thing, "foo"))
-        self.assertEqual(user.thing._data["foo"], "Bar")
-        self.assertFalse(hasattr(user.thing, "data"))
-        self.assertEqual(user.thing._data["data"], [1, 2, 3])
+        assert user.name == "John"
+        assert user.thing.name == "My thing"
+        assert not hasattr(user.thing, "foo")
+        assert user.thing._data["foo"] == "Bar"
+        assert not hasattr(user.thing, "data")
+        assert user.thing._data["data"] == [1, 2, 3]
 
     def test_spaces_in_keys(self):
         class Embedded(DynamicEmbeddedDocument):
@@ -3108,7 +3095,7 @@ class Doc(DynamicDocument):
         doc.save()
 
         one = Doc.objects.filter(**{"hello world": 1}).count()
-        self.assertEqual(1, one)
+        assert 1 == one
 
     def test_shard_key(self):
         class LogEntry(Document):
@@ -3123,13 +3110,13 @@ class LogEntry(Document):
         log.machine = "Localhost"
         log.save()
 
-        self.assertTrue(log.id is not None)
+        assert log.id is not None
 
         log.log = "Saving"
         log.save()
 
         # try to change the shard key
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             log.machine = "127.0.0.1"
 
     def test_shard_key_in_embedded_document(self):
@@ -3145,13 +3132,13 @@ class Bar(Document):
         bar_doc = Bar(foo=foo_doc, bar="world")
         bar_doc.save()
 
-        self.assertTrue(bar_doc.id is not None)
+        assert bar_doc.id is not None
 
         bar_doc.bar = "baz"
         bar_doc.save()
 
         # try to change the shard key
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             bar_doc.foo.foo = "something"
             bar_doc.save()
 
@@ -3168,13 +3155,13 @@ class LogEntry(Document):
         log.machine = "Localhost"
         log.save()
 
-        self.assertTrue(log.id is not None)
+        assert log.id is not None
 
         log.log = "Saving"
         log.save()
 
         # try to change the shard key
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             log.machine = "127.0.0.1"
 
     def test_kwargs_simple(self):
@@ -3191,8 +3178,8 @@ def __eq__(self, other):
         classic_doc = Doc(doc_name="my doc", doc=Embedded(name="embedded doc"))
         dict_doc = Doc(**{"doc_name": "my doc", "doc": {"name": "embedded doc"}})
 
-        self.assertEqual(classic_doc, dict_doc)
-        self.assertEqual(classic_doc._data, dict_doc._data)
+        assert classic_doc == dict_doc
+        assert classic_doc._data == dict_doc._data
 
     def test_kwargs_complex(self):
         class Embedded(EmbeddedDocument):
@@ -3216,48 +3203,48 @@ def __eq__(self, other):
             }
         )
 
-        self.assertEqual(classic_doc, dict_doc)
-        self.assertEqual(classic_doc._data, dict_doc._data)
+        assert classic_doc == dict_doc
+        assert classic_doc._data == dict_doc._data
 
     def test_positional_creation(self):
         """Document cannot be instantiated using positional arguments."""
-        with self.assertRaises(TypeError) as e:
+        with pytest.raises(TypeError) as e:
             person = self.Person("Test User", 42)
         expected_msg = (
             "Instantiating a document with positional arguments is not "
             "supported. Please use `field_name=value` keyword arguments."
         )
-        self.assertEqual(str(e.exception), expected_msg)
+        assert str(e.exception) == expected_msg
 
     def test_mixed_creation(self):
         """Document cannot be instantiated using mixed arguments."""
-        with self.assertRaises(TypeError) as e:
+        with pytest.raises(TypeError) as e:
             person = self.Person("Test User", age=42)
         expected_msg = (
             "Instantiating a document with positional arguments is not "
             "supported. Please use `field_name=value` keyword arguments."
         )
-        self.assertEqual(str(e.exception), expected_msg)
+        assert str(e.exception) == expected_msg
 
     def test_positional_creation_embedded(self):
         """Embedded document cannot be created using positional arguments."""
-        with self.assertRaises(TypeError) as e:
+        with pytest.raises(TypeError) as e:
             job = self.Job("Test Job", 4)
         expected_msg = (
             "Instantiating a document with positional arguments is not "
             "supported. Please use `field_name=value` keyword arguments."
         )
-        self.assertEqual(str(e.exception), expected_msg)
+        assert str(e.exception) == expected_msg
 
     def test_mixed_creation_embedded(self):
         """Embedded document cannot be created using mixed arguments."""
-        with self.assertRaises(TypeError) as e:
+        with pytest.raises(TypeError) as e:
             job = self.Job("Test Job", years=4)
         expected_msg = (
             "Instantiating a document with positional arguments is not "
             "supported. Please use `field_name=value` keyword arguments."
         )
-        self.assertEqual(str(e.exception), expected_msg)
+        assert str(e.exception) == expected_msg
 
     def test_data_contains_id_field(self):
         """Ensure that asking for _data returns 'id'."""
@@ -3269,8 +3256,8 @@ class Person(Document):
         Person(name="Harry Potter").save()
 
         person = Person.objects.first()
-        self.assertIn("id", person._data.keys())
-        self.assertEqual(person._data.get("id"), person.id)
+        assert "id" in person._data.keys()
+        assert person._data.get("id") == person.id
 
     def test_complex_nesting_document_and_embedded_document(self):
         class Macro(EmbeddedDocument):
@@ -3310,8 +3297,8 @@ def save(self, *args, **kwargs):
         system.save()
 
         system = NodesSystem.objects.first()
-        self.assertEqual(
-            "UNDEFINED", system.nodes["node"].parameters["param"].macros["test"].value
+        assert (
+            "UNDEFINED" == system.nodes["node"].parameters["param"].macros["test"].value
         )
 
     def test_embedded_document_equality(self):
@@ -3328,9 +3315,9 @@ class Embedded(EmbeddedDocument):
         f1 = Embedded._from_son(e.to_mongo())
         f2 = Embedded._from_son(e.to_mongo())
 
-        self.assertEqual(f1, f2)
+        assert f1 == f2
         f1.ref  # Dereferences lazily
-        self.assertEqual(f1, f2)
+        assert f1 == f2
 
     def test_dbref_equality(self):
         class Test2(Document):
@@ -3361,36 +3348,36 @@ class Test(Document):
 
         dbref2 = f._data["test2"]
         obj2 = f.test2
-        self.assertIsInstance(dbref2, DBRef)
-        self.assertIsInstance(obj2, Test2)
-        self.assertEqual(obj2.id, dbref2.id)
-        self.assertEqual(obj2, dbref2)
-        self.assertEqual(dbref2, obj2)
+        assert isinstance(dbref2, DBRef)
+        assert isinstance(obj2, Test2)
+        assert obj2.id == dbref2.id
+        assert obj2 == dbref2
+        assert dbref2 == obj2
 
         dbref3 = f._data["test3"]
         obj3 = f.test3
-        self.assertIsInstance(dbref3, DBRef)
-        self.assertIsInstance(obj3, Test3)
-        self.assertEqual(obj3.id, dbref3.id)
-        self.assertEqual(obj3, dbref3)
-        self.assertEqual(dbref3, obj3)
-
-        self.assertEqual(obj2.id, obj3.id)
-        self.assertEqual(dbref2.id, dbref3.id)
-        self.assertNotEqual(dbref2, dbref3)
-        self.assertNotEqual(dbref3, dbref2)
-        self.assertNotEqual(dbref2, dbref3)
-        self.assertNotEqual(dbref3, dbref2)
-
-        self.assertNotEqual(obj2, dbref3)
-        self.assertNotEqual(dbref3, obj2)
-        self.assertNotEqual(obj2, dbref3)
-        self.assertNotEqual(dbref3, obj2)
-
-        self.assertNotEqual(obj3, dbref2)
-        self.assertNotEqual(dbref2, obj3)
-        self.assertNotEqual(obj3, dbref2)
-        self.assertNotEqual(dbref2, obj3)
+        assert isinstance(dbref3, DBRef)
+        assert isinstance(obj3, Test3)
+        assert obj3.id == dbref3.id
+        assert obj3 == dbref3
+        assert dbref3 == obj3
+
+        assert obj2.id == obj3.id
+        assert dbref2.id == dbref3.id
+        assert dbref2 != dbref3
+        assert dbref3 != dbref2
+        assert dbref2 != dbref3
+        assert dbref3 != dbref2
+
+        assert obj2 != dbref3
+        assert dbref3 != obj2
+        assert obj2 != dbref3
+        assert dbref3 != obj2
+
+        assert obj3 != dbref2
+        assert dbref2 != obj3
+        assert obj3 != dbref2
+        assert dbref2 != obj3
 
     def test_default_values(self):
         class Person(Document):
@@ -3405,7 +3392,7 @@ class Person(Document):
         p2.name = "alon2"
         p2.save()
         p3 = Person.objects().only("created_on")[0]
-        self.assertEqual(orig_created_on, p3.created_on)
+        assert orig_created_on == p3.created_on
 
         class Person(Document):
             created_on = DateTimeField(default=lambda: datetime.utcnow())
@@ -3414,10 +3401,10 @@ class Person(Document):
 
         p4 = Person.objects()[0]
         p4.save()
-        self.assertEqual(p4.height, 189)
+        assert p4.height == 189
 
         # However the default will not be fixed in DB
-        self.assertEqual(Person.objects(height=189).count(), 0)
+        assert Person.objects(height=189).count() == 0
 
         # alter DB for the new default
         coll = Person._get_collection()
@@ -3425,7 +3412,7 @@ class Person(Document):
             if "height" not in person:
                 coll.update_one({"_id": person["_id"]}, {"$set": {"height": 189}})
 
-        self.assertEqual(Person.objects(height=189).count(), 1)
+        assert Person.objects(height=189).count() == 1
 
     def test_shard_key_mutability_after_from_json(self):
         """Ensure that a document ID can be modified after from_json.
@@ -3445,11 +3432,11 @@ class Person(Document):
             meta = {"shard_key": ("id", "name")}
 
         p = Person.from_json('{"name": "name", "age": 27}', created=True)
-        self.assertEqual(p._created, True)
+        assert p._created == True
         p.name = "new name"
         p.id = "12345"
-        self.assertEqual(p.name, "new name")
-        self.assertEqual(p.id, "12345")
+        assert p.name == "new name"
+        assert p.id == "12345"
 
     def test_shard_key_mutability_after_from_son(self):
         """Ensure that a document ID can be modified after _from_son.
@@ -3463,11 +3450,11 @@ class Person(Document):
             meta = {"shard_key": ("id", "name")}
 
         p = Person._from_son({"name": "name", "age": 27}, created=True)
-        self.assertEqual(p._created, True)
+        assert p._created == True
         p.name = "new name"
         p.id = "12345"
-        self.assertEqual(p.name, "new name")
-        self.assertEqual(p.id, "12345")
+        assert p.name == "new name"
+        assert p.id == "12345"
 
     def test_from_json_created_false_without_an_id(self):
         class Person(Document):
@@ -3476,14 +3463,14 @@ class Person(Document):
         Person.objects.delete()
 
         p = Person.from_json('{"name": "name"}', created=False)
-        self.assertEqual(p._created, False)
-        self.assertEqual(p.id, None)
+        assert p._created == False
+        assert p.id == None
 
         # Make sure the document is subsequently persisted correctly.
         p.save()
-        self.assertTrue(p.id is not None)
+        assert p.id is not None
         saved_p = Person.objects.get(id=p.id)
-        self.assertEqual(saved_p.name, "name")
+        assert saved_p.name == "name"
 
     def test_from_json_created_false_with_an_id(self):
         """See https://github.com/mongoengine/mongoengine/issues/1854"""
@@ -3496,13 +3483,13 @@ class Person(Document):
         p = Person.from_json(
             '{"_id": "5b85a8b04ec5dc2da388296e", "name": "name"}', created=False
         )
-        self.assertEqual(p._created, False)
-        self.assertEqual(p._changed_fields, [])
-        self.assertEqual(p.name, "name")
-        self.assertEqual(p.id, ObjectId("5b85a8b04ec5dc2da388296e"))
+        assert p._created == False
+        assert p._changed_fields == []
+        assert p.name == "name"
+        assert p.id == ObjectId("5b85a8b04ec5dc2da388296e")
         p.save()
 
-        with self.assertRaises(DoesNotExist):
+        with pytest.raises(DoesNotExist):
             # Since the object is considered as already persisted (thanks to
             # `created=False` and an existing ID), and we haven't changed any
             # fields (i.e. `_changed_fields` is empty), the document is
@@ -3510,12 +3497,12 @@ class Person(Document):
             # nothing.
             Person.objects.get(id=p.id)
 
-        self.assertFalse(p._created)
+        assert not p._created
         p.name = "a new name"
-        self.assertEqual(p._changed_fields, ["name"])
+        assert p._changed_fields == ["name"]
         p.save()
         saved_p = Person.objects.get(id=p.id)
-        self.assertEqual(saved_p.name, p.name)
+        assert saved_p.name == p.name
 
     def test_from_json_created_true_with_an_id(self):
         class Person(Document):
@@ -3526,15 +3513,15 @@ class Person(Document):
         p = Person.from_json(
             '{"_id": "5b85a8b04ec5dc2da388296e", "name": "name"}', created=True
         )
-        self.assertTrue(p._created)
-        self.assertEqual(p._changed_fields, [])
-        self.assertEqual(p.name, "name")
-        self.assertEqual(p.id, ObjectId("5b85a8b04ec5dc2da388296e"))
+        assert p._created
+        assert p._changed_fields == []
+        assert p.name == "name"
+        assert p.id == ObjectId("5b85a8b04ec5dc2da388296e")
         p.save()
 
         saved_p = Person.objects.get(id=p.id)
-        self.assertEqual(saved_p, p)
-        self.assertEqual(saved_p.name, "name")
+        assert saved_p == p
+        assert saved_p.name == "name"
 
     def test_null_field(self):
         # 734
@@ -3553,13 +3540,13 @@ class User(Document):
         u_from_db = User.objects.get(name="user")
         u_from_db.height = None
         u_from_db.save()
-        self.assertEqual(u_from_db.height, None)
+        assert u_from_db.height == None
         # 864
-        self.assertEqual(u_from_db.str_fld, None)
-        self.assertEqual(u_from_db.int_fld, None)
-        self.assertEqual(u_from_db.flt_fld, None)
-        self.assertEqual(u_from_db.dt_fld, None)
-        self.assertEqual(u_from_db.cdt_fld, None)
+        assert u_from_db.str_fld == None
+        assert u_from_db.int_fld == None
+        assert u_from_db.flt_fld == None
+        assert u_from_db.dt_fld == None
+        assert u_from_db.cdt_fld == None
 
         # 735
         User.objects.delete()
@@ -3567,7 +3554,7 @@ class User(Document):
         u.save()
         User.objects(name="user").update_one(set__height=None, upsert=True)
         u_from_db = User.objects.get(name="user")
-        self.assertEqual(u_from_db.height, None)
+        assert u_from_db.height == None
 
     def test_not_saved_eq(self):
         """Ensure we can compare documents not saved.
@@ -3578,8 +3565,8 @@ class Person(Document):
 
         p = Person()
         p1 = Person()
-        self.assertNotEqual(p, p1)
-        self.assertEqual(p, p)
+        assert p != p1
+        assert p == p
 
     def test_list_iter(self):
         # 914
@@ -3592,10 +3579,10 @@ class A(Document):
         A.objects.delete()
         A(l=[B(v="1"), B(v="2"), B(v="3")]).save()
         a = A.objects.get()
-        self.assertEqual(a.l._instance, a)
+        assert a.l._instance == a
         for idx, b in enumerate(a.l):
-            self.assertEqual(b._instance, a)
-        self.assertEqual(idx, 2)
+            assert b._instance == a
+        assert idx == 2
 
     def test_falsey_pk(self):
         """Ensure that we can create and update a document with Falsey PK."""
@@ -3625,7 +3612,7 @@ class BlogPost(Document):
 
         blog.update(push__tags__0=["mongodb", "code"])
         blog.reload()
-        self.assertEqual(blog.tags, ["mongodb", "code", "python"])
+        assert blog.tags == ["mongodb", "code", "python"]
 
     def test_push_nested_list(self):
         """Ensure that push update works in nested list"""
@@ -3637,7 +3624,7 @@ class BlogPost(Document):
         blog = BlogPost(slug="test").save()
         blog.update(push__tags=["value1", 123])
         blog.reload()
-        self.assertEqual(blog.tags, [["value1", 123]])
+        assert blog.tags == [["value1", 123]]
 
     def test_accessing_objects_with_indexes_error(self):
         insert_result = self.db.company.insert_many(
@@ -3653,7 +3640,7 @@ class User(Document):
             company = ReferenceField(Company)
 
         # Ensure index creation exception aren't swallowed (#1688)
-        with self.assertRaises(DuplicateKeyError):
+        with pytest.raises(DuplicateKeyError):
             User.objects().select_related()
 
 
@@ -3663,10 +3650,10 @@ class Book(Document):
             title = StringField()
 
         book = Book(title="Whatever")
-        self.assertEqual(book._object_key, {"pk": None})
+        assert book._object_key == {"pk": None}
 
         book.pk = ObjectId()
-        self.assertEqual(book._object_key, {"pk": book.pk})
+        assert book._object_key == {"pk": book.pk}
 
     def test_object_key_with_custom_primary_key(self):
         class Book(Document):
@@ -3674,10 +3661,10 @@ class Book(Document):
             title = StringField()
 
         book = Book(title="Sapiens")
-        self.assertEqual(book._object_key, {"pk": None})
+        assert book._object_key == {"pk": None}
 
         book = Book(pk="0062316117")
-        self.assertEqual(book._object_key, {"pk": "0062316117"})
+        assert book._object_key == {"pk": "0062316117"}
 
     def test_object_key_in_a_sharded_collection(self):
         class Book(Document):
@@ -3685,9 +3672,9 @@ class Book(Document):
             meta = {"shard_key": ("pk", "title")}
 
         book = Book()
-        self.assertEqual(book._object_key, {"pk": None, "title": None})
+        assert book._object_key == {"pk": None, "title": None}
         book = Book(pk=ObjectId(), title="Sapiens")
-        self.assertEqual(book._object_key, {"pk": book.pk, "title": "Sapiens"})
+        assert book._object_key == {"pk": book.pk, "title": "Sapiens"}
 
     def test_object_key_with_custom_db_field(self):
         class Book(Document):
@@ -3695,7 +3682,7 @@ class Book(Document):
             meta = {"shard_key": ("pk", "author")}
 
         book = Book(pk=ObjectId(), author="Author")
-        self.assertEqual(book._object_key, {"pk": book.pk, "author": "Author"})
+        assert book._object_key == {"pk": book.pk, "author": "Author"}
 
     def test_object_key_with_nested_shard_key(self):
         class Author(EmbeddedDocument):
@@ -3706,7 +3693,7 @@ class Book(Document):
             meta = {"shard_key": ("pk", "author.name")}
 
         book = Book(pk=ObjectId(), author=Author(name="Author"))
-        self.assertEqual(book._object_key, {"pk": book.pk, "author__name": "Author"})
+        assert book._object_key == {"pk": book.pk, "author__name": "Author"}
 
 
 if __name__ == "__main__":
diff --git a/tests/document/test_json_serialisation.py b/tests/document/test_json_serialisation.py
index 26a4a6c1c..593d34f8d 100644
--- a/tests/document/test_json_serialisation.py
+++ b/tests/document/test_json_serialisation.py
@@ -32,7 +32,7 @@ class Doc(Document):
 
         expected_json = """{"embedded":{"string":"Inner Hello"},"string":"Hello"}"""
 
-        self.assertEqual(doc_json, expected_json)
+        assert doc_json == expected_json
 
     def test_json_simple(self):
         class Embedded(EmbeddedDocument):
@@ -52,9 +52,9 @@ def __eq__(self, other):
 
         doc_json = doc.to_json(sort_keys=True, separators=(",", ":"))
         expected_json = """{"embedded_field":{"string":"Hi"},"string":"Hi"}"""
-        self.assertEqual(doc_json, expected_json)
+        assert doc_json == expected_json
 
-        self.assertEqual(doc, Doc.from_json(doc.to_json()))
+        assert doc == Doc.from_json(doc.to_json())
 
     def test_json_complex(self):
         class EmbeddedDoc(EmbeddedDocument):
@@ -99,7 +99,7 @@ def __eq__(self, other):
                 return json.loads(self.to_json()) == json.loads(other.to_json())
 
         doc = Doc()
-        self.assertEqual(doc, Doc.from_json(doc.to_json()))
+        assert doc == Doc.from_json(doc.to_json())
 
 
 if __name__ == "__main__":
diff --git a/tests/document/test_validation.py b/tests/document/test_validation.py
index 7449dd33b..806019943 100644
--- a/tests/document/test_validation.py
+++ b/tests/document/test_validation.py
@@ -4,6 +4,7 @@
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestValidatorError(MongoDBTestCase):
@@ -11,12 +12,12 @@ def test_to_dict(self):
         """Ensure a ValidationError handles error to_dict correctly.
         """
         error = ValidationError("root")
-        self.assertEqual(error.to_dict(), {})
+        assert error.to_dict() == {}
 
         # 1st level error schema
         error.errors = {"1st": ValidationError("bad 1st")}
-        self.assertIn("1st", error.to_dict())
-        self.assertEqual(error.to_dict()["1st"], "bad 1st")
+        assert "1st" in error.to_dict()
+        assert error.to_dict()["1st"] == "bad 1st"
 
         # 2nd level error schema
         error.errors = {
@@ -24,10 +25,10 @@ def test_to_dict(self):
                 "bad 1st", errors={"2nd": ValidationError("bad 2nd")}
             )
         }
-        self.assertIn("1st", error.to_dict())
-        self.assertIsInstance(error.to_dict()["1st"], dict)
-        self.assertIn("2nd", error.to_dict()["1st"])
-        self.assertEqual(error.to_dict()["1st"]["2nd"], "bad 2nd")
+        assert "1st" in error.to_dict()
+        assert isinstance(error.to_dict()["1st"], dict)
+        assert "2nd" in error.to_dict()["1st"]
+        assert error.to_dict()["1st"]["2nd"] == "bad 2nd"
 
         # moar levels
         error.errors = {
@@ -45,13 +46,13 @@ def test_to_dict(self):
                 },
             )
         }
-        self.assertIn("1st", error.to_dict())
-        self.assertIn("2nd", error.to_dict()["1st"])
-        self.assertIn("3rd", error.to_dict()["1st"]["2nd"])
-        self.assertIn("4th", error.to_dict()["1st"]["2nd"]["3rd"])
-        self.assertEqual(error.to_dict()["1st"]["2nd"]["3rd"]["4th"], "Inception")
+        assert "1st" in error.to_dict()
+        assert "2nd" in error.to_dict()["1st"]
+        assert "3rd" in error.to_dict()["1st"]["2nd"]
+        assert "4th" in error.to_dict()["1st"]["2nd"]["3rd"]
+        assert error.to_dict()["1st"]["2nd"]["3rd"]["4th"] == "Inception"
 
-        self.assertEqual(error.message, "root(2nd.3rd.4th.Inception: ['1st'])")
+        assert error.message == "root(2nd.3rd.4th.Inception: ['1st'])"
 
     def test_model_validation(self):
         class User(Document):
@@ -61,19 +62,19 @@ class User(Document):
         try:
             User().validate()
         except ValidationError as e:
-            self.assertIn("User:None", e.message)
-            self.assertEqual(
-                e.to_dict(),
-                {"username": "Field is required", "name": "Field is required"},
-            )
+            assert "User:None" in e.message
+            assert e.to_dict() == {
+                "username": "Field is required",
+                "name": "Field is required",
+            }
 
         user = User(username="RossC0", name="Ross").save()
         user.name = None
         try:
             user.save()
         except ValidationError as e:
-            self.assertIn("User:RossC0", e.message)
-            self.assertEqual(e.to_dict(), {"name": "Field is required"})
+            assert "User:RossC0" in e.message
+            assert e.to_dict() == {"name": "Field is required"}
 
     def test_fields_rewrite(self):
         class BasePerson(Document):
@@ -85,7 +86,8 @@ class Person(BasePerson):
             name = StringField(required=True)
 
         p = Person(age=15)
-        self.assertRaises(ValidationError, p.validate)
+        with pytest.raises(ValidationError):
+            p.validate()
 
     def test_embedded_document_validation(self):
         """Ensure that embedded documents may be validated.
@@ -96,17 +98,19 @@ class Comment(EmbeddedDocument):
             content = StringField(required=True)
 
         comment = Comment()
-        self.assertRaises(ValidationError, comment.validate)
+        with pytest.raises(ValidationError):
+            comment.validate()
 
         comment.content = "test"
         comment.validate()
 
         comment.date = 4
-        self.assertRaises(ValidationError, comment.validate)
+        with pytest.raises(ValidationError):
+            comment.validate()
 
         comment.date = datetime.now()
         comment.validate()
-        self.assertEqual(comment._instance, None)
+        assert comment._instance == None
 
     def test_embedded_db_field_validate(self):
         class SubDoc(EmbeddedDocument):
@@ -119,10 +123,8 @@ class Doc(Document):
         try:
             Doc(id="bad").validate()
         except ValidationError as e:
-            self.assertIn("SubDoc:None", e.message)
-            self.assertEqual(
-                e.to_dict(), {"e": {"val": "OK could not be converted to int"}}
-            )
+            assert "SubDoc:None" in e.message
+            assert e.to_dict() == {"e": {"val": "OK could not be converted to int"}}
 
         Doc.drop_collection()
 
@@ -130,18 +132,16 @@ class Doc(Document):
 
         doc = Doc.objects.first()
         keys = doc._data.keys()
-        self.assertEqual(2, len(keys))
-        self.assertIn("e", keys)
-        self.assertIn("id", keys)
+        assert 2 == len(keys)
+        assert "e" in keys
+        assert "id" in keys
 
         doc.e.val = "OK"
         try:
             doc.save()
         except ValidationError as e:
-            self.assertIn("Doc:test", e.message)
-            self.assertEqual(
-                e.to_dict(), {"e": {"val": "OK could not be converted to int"}}
-            )
+            assert "Doc:test" in e.message
+            assert e.to_dict() == {"e": {"val": "OK could not be converted to int"}}
 
     def test_embedded_weakref(self):
         class SubDoc(EmbeddedDocument):
@@ -157,14 +157,16 @@ class Doc(Document):
 
         s = SubDoc()
 
-        self.assertRaises(ValidationError, s.validate)
+        with pytest.raises(ValidationError):
+            s.validate()
 
         d1.e = s
         d2.e = s
 
         del d1
 
-        self.assertRaises(ValidationError, d2.validate)
+        with pytest.raises(ValidationError):
+            d2.validate()
 
     def test_parent_reference_in_child_document(self):
         """
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index 719df9227..86ee26541 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -7,6 +7,7 @@
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase
+import pytest
 
 BIN_VALUE = six.b(
     "\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5"
@@ -31,8 +32,8 @@ class Attachment(Document):
         attachment.save()
 
         attachment_1 = Attachment.objects().first()
-        self.assertEqual(MIME_TYPE, attachment_1.content_type)
-        self.assertEqual(BLOB, six.binary_type(attachment_1.blob))
+        assert MIME_TYPE == attachment_1.content_type
+        assert BLOB == six.binary_type(attachment_1.blob)
 
     def test_validation_succeeds(self):
         """Ensure that valid values can be assigned to binary fields.
@@ -45,13 +46,15 @@ class AttachmentSizeLimit(Document):
             blob = BinaryField(max_bytes=4)
 
         attachment_required = AttachmentRequired()
-        self.assertRaises(ValidationError, attachment_required.validate)
+        with pytest.raises(ValidationError):
+            attachment_required.validate()
         attachment_required.blob = Binary(six.b("\xe6\x00\xc4\xff\x07"))
         attachment_required.validate()
 
         _5_BYTES = six.b("\xe6\x00\xc4\xff\x07")
         _4_BYTES = six.b("\xe6\x00\xc4\xff")
-        self.assertRaises(ValidationError, AttachmentSizeLimit(blob=_5_BYTES).validate)
+        with pytest.raises(ValidationError):
+            AttachmentSizeLimit(blob=_5_BYTES).validate()
         AttachmentSizeLimit(blob=_4_BYTES).validate()
 
     def test_validation_fails(self):
@@ -61,7 +64,8 @@ class Attachment(Document):
             blob = BinaryField()
 
         for invalid_data in (2, u"Im_a_unicode", ["some_str"]):
-            self.assertRaises(ValidationError, Attachment(blob=invalid_data).validate)
+            with pytest.raises(ValidationError):
+                Attachment(blob=invalid_data).validate()
 
     def test__primary(self):
         class Attachment(Document):
@@ -70,10 +74,10 @@ class Attachment(Document):
         Attachment.drop_collection()
         binary_id = uuid.uuid4().bytes
         att = Attachment(id=binary_id).save()
-        self.assertEqual(1, Attachment.objects.count())
-        self.assertEqual(1, Attachment.objects.filter(id=att.id).count())
+        assert 1 == Attachment.objects.count()
+        assert 1 == Attachment.objects.filter(id=att.id).count()
         att.delete()
-        self.assertEqual(0, Attachment.objects.count())
+        assert 0 == Attachment.objects.count()
 
     def test_primary_filter_by_binary_pk_as_str(self):
         class Attachment(Document):
@@ -82,9 +86,9 @@ class Attachment(Document):
         Attachment.drop_collection()
         binary_id = uuid.uuid4().bytes
         att = Attachment(id=binary_id).save()
-        self.assertEqual(1, Attachment.objects.filter(id=binary_id).count())
+        assert 1 == Attachment.objects.filter(id=binary_id).count()
         att.delete()
-        self.assertEqual(0, Attachment.objects.count())
+        assert 0 == Attachment.objects.count()
 
     def test_match_querying_with_bytes(self):
         class MyDocument(Document):
@@ -94,7 +98,7 @@ class MyDocument(Document):
 
         doc = MyDocument(bin_field=BIN_VALUE).save()
         matched_doc = MyDocument.objects(bin_field=BIN_VALUE).first()
-        self.assertEqual(matched_doc.id, doc.id)
+        assert matched_doc.id == doc.id
 
     def test_match_querying_with_binary(self):
         class MyDocument(Document):
@@ -105,7 +109,7 @@ class MyDocument(Document):
         doc = MyDocument(bin_field=BIN_VALUE).save()
 
         matched_doc = MyDocument.objects(bin_field=Binary(BIN_VALUE)).first()
-        self.assertEqual(matched_doc.id, doc.id)
+        assert matched_doc.id == doc.id
 
     def test_modify_operation__set(self):
         """Ensures no regression of bug #1127"""
@@ -119,11 +123,11 @@ class MyDocument(Document):
         doc = MyDocument.objects(some_field="test").modify(
             upsert=True, new=True, set__bin_field=BIN_VALUE
         )
-        self.assertEqual(doc.some_field, "test")
+        assert doc.some_field == "test"
         if six.PY3:
-            self.assertEqual(doc.bin_field, BIN_VALUE)
+            assert doc.bin_field == BIN_VALUE
         else:
-            self.assertEqual(doc.bin_field, Binary(BIN_VALUE))
+            assert doc.bin_field == Binary(BIN_VALUE)
 
     def test_update_one(self):
         """Ensures no regression of bug #1127"""
@@ -139,9 +143,9 @@ class MyDocument(Document):
         n_updated = MyDocument.objects(bin_field=bin_data).update_one(
             bin_field=BIN_VALUE
         )
-        self.assertEqual(n_updated, 1)
+        assert n_updated == 1
         fetched = MyDocument.objects.with_id(doc.id)
         if six.PY3:
-            self.assertEqual(fetched.bin_field, BIN_VALUE)
+            assert fetched.bin_field == BIN_VALUE
         else:
-            self.assertEqual(fetched.bin_field, Binary(BIN_VALUE))
+            assert fetched.bin_field == Binary(BIN_VALUE)
diff --git a/tests/fields/test_boolean_field.py b/tests/fields/test_boolean_field.py
index 22ebb6f7f..b38b5ea4d 100644
--- a/tests/fields/test_boolean_field.py
+++ b/tests/fields/test_boolean_field.py
@@ -2,6 +2,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase, get_as_pymongo
+import pytest
 
 
 class TestBooleanField(MongoDBTestCase):
@@ -11,7 +12,7 @@ class Person(Document):
 
         person = Person(admin=True)
         person.save()
-        self.assertEqual(get_as_pymongo(person), {"_id": person.id, "admin": True})
+        assert get_as_pymongo(person) == {"_id": person.id, "admin": True}
 
     def test_validation(self):
         """Ensure that invalid values cannot be assigned to boolean
@@ -26,11 +27,14 @@ class Person(Document):
         person.validate()
 
         person.admin = 2
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
         person.admin = "Yes"
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
         person.admin = "False"
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
     def test_weirdness_constructor(self):
         """When attribute is set in contructor, it gets cast into a bool
@@ -42,7 +46,7 @@ class Person(Document):
             admin = BooleanField()
 
         new_person = Person(admin="False")
-        self.assertTrue(new_person.admin)
+        assert new_person.admin
 
         new_person = Person(admin="0")
-        self.assertTrue(new_person.admin)
+        assert new_person.admin
diff --git a/tests/fields/test_cached_reference_field.py b/tests/fields/test_cached_reference_field.py
index 4e4675870..e404aae0b 100644
--- a/tests/fields/test_cached_reference_field.py
+++ b/tests/fields/test_cached_reference_field.py
@@ -4,6 +4,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestCachedReferenceField(MongoDBTestCase):
@@ -46,29 +47,29 @@ class Ocorrence(Document):
         a = Animal(name="Leopard", tag="heavy")
         a.save()
 
-        self.assertEqual(Animal._cached_reference_fields, [Ocorrence.animal])
+        assert Animal._cached_reference_fields == [Ocorrence.animal]
         o = Ocorrence(person="teste", animal=a)
         o.save()
 
         p = Ocorrence(person="Wilson")
         p.save()
 
-        self.assertEqual(Ocorrence.objects(animal=None).count(), 1)
+        assert Ocorrence.objects(animal=None).count() == 1
 
-        self.assertEqual(a.to_mongo(fields=["tag"]), {"tag": "heavy", "_id": a.pk})
+        assert a.to_mongo(fields=["tag"]) == {"tag": "heavy", "_id": a.pk}
 
-        self.assertEqual(o.to_mongo()["animal"]["tag"], "heavy")
+        assert o.to_mongo()["animal"]["tag"] == "heavy"
 
         # counts
         Ocorrence(person="teste 2").save()
         Ocorrence(person="teste 3").save()
 
         count = Ocorrence.objects(animal__tag="heavy").count()
-        self.assertEqual(count, 1)
+        assert count == 1
 
         ocorrence = Ocorrence.objects(animal__tag="heavy").first()
-        self.assertEqual(ocorrence.person, "teste")
-        self.assertIsInstance(ocorrence.animal, Animal)
+        assert ocorrence.person == "teste"
+        assert isinstance(ocorrence.animal, Animal)
 
     def test_with_decimal(self):
         class PersonAuto(Document):
@@ -88,10 +89,11 @@ class SocialTest(Document):
         s = SocialTest(group="dev", person=p)
         s.save()
 
-        self.assertEqual(
-            SocialTest.objects._collection.find_one({"person.salary": 7000.00}),
-            {"_id": s.pk, "group": s.group, "person": {"_id": p.pk, "salary": 7000.00}},
-        )
+        assert SocialTest.objects._collection.find_one({"person.salary": 7000.00}) == {
+            "_id": s.pk,
+            "group": s.group,
+            "person": {"_id": p.pk, "salary": 7000.00},
+        }
 
     def test_cached_reference_field_reference(self):
         class Group(Document):
@@ -131,18 +133,15 @@ class SocialData(Document):
         s2 = SocialData(obs="testing 321", person=p3, tags=["tag3", "tag4"])
         s2.save()
 
-        self.assertEqual(
-            SocialData.objects._collection.find_one({"tags": "tag2"}),
-            {
-                "_id": s1.pk,
-                "obs": "testing 123",
-                "tags": ["tag1", "tag2"],
-                "person": {"_id": p1.pk, "group": g1.pk},
-            },
-        )
+        assert SocialData.objects._collection.find_one({"tags": "tag2"}) == {
+            "_id": s1.pk,
+            "obs": "testing 123",
+            "tags": ["tag1", "tag2"],
+            "person": {"_id": p1.pk, "group": g1.pk},
+        }
 
-        self.assertEqual(SocialData.objects(person__group=g2).count(), 1)
-        self.assertEqual(SocialData.objects(person__group=g2).first(), s2)
+        assert SocialData.objects(person__group=g2).count() == 1
+        assert SocialData.objects(person__group=g2).first() == s2
 
     def test_cached_reference_field_push_with_fields(self):
         class Product(Document):
@@ -157,26 +156,20 @@ class Basket(Document):
         product1 = Product(name="abc").save()
         product2 = Product(name="def").save()
         basket = Basket(products=[product1]).save()
-        self.assertEqual(
-            Basket.objects._collection.find_one(),
-            {
-                "_id": basket.pk,
-                "products": [{"_id": product1.pk, "name": product1.name}],
-            },
-        )
+        assert Basket.objects._collection.find_one() == {
+            "_id": basket.pk,
+            "products": [{"_id": product1.pk, "name": product1.name}],
+        }
         # push to list
         basket.update(push__products=product2)
         basket.reload()
-        self.assertEqual(
-            Basket.objects._collection.find_one(),
-            {
-                "_id": basket.pk,
-                "products": [
-                    {"_id": product1.pk, "name": product1.name},
-                    {"_id": product2.pk, "name": product2.name},
-                ],
-            },
-        )
+        assert Basket.objects._collection.find_one() == {
+            "_id": basket.pk,
+            "products": [
+                {"_id": product1.pk, "name": product1.name},
+                {"_id": product2.pk, "name": product2.name},
+            ],
+        }
 
     def test_cached_reference_field_update_all(self):
         class Person(Document):
@@ -194,37 +187,31 @@ class Person(Document):
         a2.save()
 
         a2 = Person.objects.with_id(a2.id)
-        self.assertEqual(a2.father.tp, a1.tp)
-
-        self.assertEqual(
-            dict(a2.to_mongo()),
-            {
-                "_id": a2.pk,
-                "name": u"Wilson Junior",
-                "tp": u"pf",
-                "father": {"_id": a1.pk, "tp": u"pj"},
-            },
-        )
+        assert a2.father.tp == a1.tp
+
+        assert dict(a2.to_mongo()) == {
+            "_id": a2.pk,
+            "name": u"Wilson Junior",
+            "tp": u"pf",
+            "father": {"_id": a1.pk, "tp": u"pj"},
+        }
 
-        self.assertEqual(Person.objects(father=a1)._query, {"father._id": a1.pk})
-        self.assertEqual(Person.objects(father=a1).count(), 1)
+        assert Person.objects(father=a1)._query == {"father._id": a1.pk}
+        assert Person.objects(father=a1).count() == 1
 
         Person.objects.update(set__tp="pf")
         Person.father.sync_all()
 
         a2.reload()
-        self.assertEqual(
-            dict(a2.to_mongo()),
-            {
-                "_id": a2.pk,
-                "name": u"Wilson Junior",
-                "tp": u"pf",
-                "father": {"_id": a1.pk, "tp": u"pf"},
-            },
-        )
+        assert dict(a2.to_mongo()) == {
+            "_id": a2.pk,
+            "name": u"Wilson Junior",
+            "tp": u"pf",
+            "father": {"_id": a1.pk, "tp": u"pf"},
+        }
 
     def test_cached_reference_fields_on_embedded_documents(self):
-        with self.assertRaises(InvalidDocumentError):
+        with pytest.raises(InvalidDocumentError):
 
             class Test(Document):
                 name = StringField()
@@ -255,15 +242,12 @@ class Person(Document):
         a1.save()
 
         a2.reload()
-        self.assertEqual(
-            dict(a2.to_mongo()),
-            {
-                "_id": a2.pk,
-                "name": "Wilson Junior",
-                "tp": "pf",
-                "father": {"_id": a1.pk, "tp": "pf"},
-            },
-        )
+        assert dict(a2.to_mongo()) == {
+            "_id": a2.pk,
+            "name": "Wilson Junior",
+            "tp": "pf",
+            "father": {"_id": a1.pk, "tp": "pf"},
+        }
 
     def test_cached_reference_auto_sync_disabled(self):
         class Persone(Document):
@@ -284,15 +268,12 @@ class Persone(Document):
         a1.tp = "pf"
         a1.save()
 
-        self.assertEqual(
-            Persone.objects._collection.find_one({"_id": a2.pk}),
-            {
-                "_id": a2.pk,
-                "name": "Wilson Junior",
-                "tp": "pf",
-                "father": {"_id": a1.pk, "tp": "pj"},
-            },
-        )
+        assert Persone.objects._collection.find_one({"_id": a2.pk}) == {
+            "_id": a2.pk,
+            "name": "Wilson Junior",
+            "tp": "pf",
+            "father": {"_id": a1.pk, "tp": "pj"},
+        }
 
     def test_cached_reference_embedded_fields(self):
         class Owner(EmbeddedDocument):
@@ -320,28 +301,29 @@ class Ocorrence(Document):
 
         o = Ocorrence(person="teste", animal=a)
         o.save()
-        self.assertEqual(
-            dict(a.to_mongo(fields=["tag", "owner.tp"])),
-            {"_id": a.pk, "tag": "heavy", "owner": {"t": "u"}},
-        )
-        self.assertEqual(o.to_mongo()["animal"]["tag"], "heavy")
-        self.assertEqual(o.to_mongo()["animal"]["owner"]["t"], "u")
+        assert dict(a.to_mongo(fields=["tag", "owner.tp"])) == {
+            "_id": a.pk,
+            "tag": "heavy",
+            "owner": {"t": "u"},
+        }
+        assert o.to_mongo()["animal"]["tag"] == "heavy"
+        assert o.to_mongo()["animal"]["owner"]["t"] == "u"
 
         # Check to_mongo with fields
-        self.assertNotIn("animal", o.to_mongo(fields=["person"]))
+        assert "animal" not in o.to_mongo(fields=["person"])
 
         # counts
         Ocorrence(person="teste 2").save()
         Ocorrence(person="teste 3").save()
 
         count = Ocorrence.objects(animal__tag="heavy", animal__owner__tp="u").count()
-        self.assertEqual(count, 1)
+        assert count == 1
 
         ocorrence = Ocorrence.objects(
             animal__tag="heavy", animal__owner__tp="u"
         ).first()
-        self.assertEqual(ocorrence.person, "teste")
-        self.assertIsInstance(ocorrence.animal, Animal)
+        assert ocorrence.person == "teste"
+        assert isinstance(ocorrence.animal, Animal)
 
     def test_cached_reference_embedded_list_fields(self):
         class Owner(EmbeddedDocument):
@@ -370,13 +352,14 @@ class Ocorrence(Document):
 
         o = Ocorrence(person="teste 2", animal=a)
         o.save()
-        self.assertEqual(
-            dict(a.to_mongo(fields=["tag", "owner.tags"])),
-            {"_id": a.pk, "tag": "heavy", "owner": {"tags": ["cool", "funny"]}},
-        )
+        assert dict(a.to_mongo(fields=["tag", "owner.tags"])) == {
+            "_id": a.pk,
+            "tag": "heavy",
+            "owner": {"tags": ["cool", "funny"]},
+        }
 
-        self.assertEqual(o.to_mongo()["animal"]["tag"], "heavy")
-        self.assertEqual(o.to_mongo()["animal"]["owner"]["tags"], ["cool", "funny"])
+        assert o.to_mongo()["animal"]["tag"] == "heavy"
+        assert o.to_mongo()["animal"]["owner"]["tags"] == ["cool", "funny"]
 
         # counts
         Ocorrence(person="teste 2").save()
@@ -385,10 +368,10 @@ class Ocorrence(Document):
         query = Ocorrence.objects(
             animal__tag="heavy", animal__owner__tags="cool"
         )._query
-        self.assertEqual(query, {"animal.owner.tags": "cool", "animal.tag": "heavy"})
+        assert query == {"animal.owner.tags": "cool", "animal.tag": "heavy"}
 
         ocorrence = Ocorrence.objects(
             animal__tag="heavy", animal__owner__tags="cool"
         ).first()
-        self.assertEqual(ocorrence.person, "teste 2")
-        self.assertIsInstance(ocorrence.animal, Animal)
+        assert ocorrence.person == "teste 2"
+        assert isinstance(ocorrence.animal, Animal)
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index 611c0ff80..f0a6b96e3 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -28,7 +28,7 @@ class LogEntry(Document):
         log.date = d1
         log.save()
         log.reload()
-        self.assertEqual(log.date, d1)
+        assert log.date == d1
 
         # Post UTC - microseconds are rounded (down) nearest millisecond - with
         # default datetimefields
@@ -36,7 +36,7 @@ class LogEntry(Document):
         log.date = d1
         log.save()
         log.reload()
-        self.assertEqual(log.date, d1)
+        assert log.date == d1
 
         # Pre UTC dates microseconds below 1000 are dropped - with default
         # datetimefields
@@ -44,7 +44,7 @@ class LogEntry(Document):
         log.date = d1
         log.save()
         log.reload()
-        self.assertEqual(log.date, d1)
+        assert log.date == d1
 
         # Pre UTC microseconds above 1000 is wonky - with default datetimefields
         # log.date has an invalid microsecond value so I can't construct
@@ -54,9 +54,9 @@ class LogEntry(Document):
             log.date = d1
             log.save()
             log.reload()
-            self.assertEqual(log.date, d1)
+            assert log.date == d1
             log1 = LogEntry.objects.get(date=d1)
-            self.assertEqual(log, log1)
+            assert log == log1
 
         # Test string padding
         microsecond = map(int, [math.pow(10, x) for x in range(6)])
@@ -64,7 +64,7 @@ class LogEntry(Document):
 
         for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
             stored = LogEntry(date=datetime.datetime(*values)).to_mongo()["date"]
-            self.assertTrue(
+            assert (
                 re.match("^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$", stored)
                 is not None
             )
@@ -73,7 +73,7 @@ class LogEntry(Document):
         stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()[
             "date_with_dots"
         ]
-        self.assertTrue(
+        assert (
             re.match("^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$", stored) is not None
         )
 
@@ -93,40 +93,40 @@ class LogEntry(Document):
         log.save()
 
         log1 = LogEntry.objects.get(date=d1)
-        self.assertEqual(log, log1)
+        assert log == log1
 
         # create extra 59 log entries for a total of 60
         for i in range(1951, 2010):
             d = datetime.datetime(i, 1, 1, 0, 0, 1, 999)
             LogEntry(date=d).save()
 
-        self.assertEqual(LogEntry.objects.count(), 60)
+        assert LogEntry.objects.count() == 60
 
         # Test ordering
         logs = LogEntry.objects.order_by("date")
         i = 0
         while i < 59:
-            self.assertTrue(logs[i].date <= logs[i + 1].date)
+            assert logs[i].date <= logs[i + 1].date
             i += 1
 
         logs = LogEntry.objects.order_by("-date")
         i = 0
         while i < 59:
-            self.assertTrue(logs[i].date >= logs[i + 1].date)
+            assert logs[i].date >= logs[i + 1].date
             i += 1
 
         # Test searching
         logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 30)
+        assert logs.count() == 30
 
         logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 30)
+        assert logs.count() == 30
 
         logs = LogEntry.objects.filter(
             date__lte=datetime.datetime(2011, 1, 1),
             date__gte=datetime.datetime(2000, 1, 1),
         )
-        self.assertEqual(logs.count(), 10)
+        assert logs.count() == 10
 
         LogEntry.drop_collection()
 
@@ -137,17 +137,17 @@ class LogEntry(Document):
         logs = list(LogEntry.objects.order_by("date"))
         for next_idx, log in enumerate(logs[:-1], start=1):
             next_log = logs[next_idx]
-            self.assertTrue(log.date < next_log.date)
+            assert log.date < next_log.date
 
         logs = list(LogEntry.objects.order_by("-date"))
         for next_idx, log in enumerate(logs[:-1], start=1):
             next_log = logs[next_idx]
-            self.assertTrue(log.date > next_log.date)
+            assert log.date > next_log.date
 
         logs = LogEntry.objects.filter(
             date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000)
         )
-        self.assertEqual(logs.count(), 4)
+        assert logs.count() == 4
 
     def test_no_default_value(self):
         class Log(Document):
@@ -156,11 +156,11 @@ class Log(Document):
         Log.drop_collection()
 
         log = Log()
-        self.assertIsNone(log.timestamp)
+        assert log.timestamp is None
         log.save()
 
         fetched_log = Log.objects.with_id(log.id)
-        self.assertIsNone(fetched_log.timestamp)
+        assert fetched_log.timestamp is None
 
     def test_default_static_value(self):
         NOW = datetime.datetime.utcnow()
@@ -171,11 +171,11 @@ class Log(Document):
         Log.drop_collection()
 
         log = Log()
-        self.assertEqual(log.timestamp, NOW)
+        assert log.timestamp == NOW
         log.save()
 
         fetched_log = Log.objects.with_id(log.id)
-        self.assertEqual(fetched_log.timestamp, NOW)
+        assert fetched_log.timestamp == NOW
 
     def test_default_callable(self):
         NOW = datetime.datetime.utcnow()
@@ -186,8 +186,8 @@ class Log(Document):
         Log.drop_collection()
 
         log = Log()
-        self.assertGreaterEqual(log.timestamp, NOW)
+        assert log.timestamp >= NOW
         log.save()
 
         fetched_log = Log.objects.with_id(log.id)
-        self.assertGreaterEqual(fetched_log.timestamp, NOW)
+        assert fetched_log.timestamp >= NOW
diff --git a/tests/fields/test_date_field.py b/tests/fields/test_date_field.py
index da5721345..46fa4f0f4 100644
--- a/tests/fields/test_date_field.py
+++ b/tests/fields/test_date_field.py
@@ -10,6 +10,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestDateField(MongoDBTestCase):
@@ -23,7 +24,8 @@ class MyDoc(Document):
             dt = DateField()
 
         md = MyDoc(dt="")
-        self.assertRaises(ValidationError, md.save)
+        with pytest.raises(ValidationError):
+            md.save()
 
     def test_date_from_whitespace_string(self):
         """
@@ -35,7 +37,8 @@ class MyDoc(Document):
             dt = DateField()
 
         md = MyDoc(dt="   ")
-        self.assertRaises(ValidationError, md.save)
+        with pytest.raises(ValidationError):
+            md.save()
 
     def test_default_values_today(self):
         """Ensure that default field values are used when creating
@@ -47,9 +50,9 @@ class Person(Document):
 
         person = Person()
         person.validate()
-        self.assertEqual(person.day, person.day)
-        self.assertEqual(person.day, datetime.date.today())
-        self.assertEqual(person._data["day"], person.day)
+        assert person.day == person.day
+        assert person.day == datetime.date.today()
+        assert person._data["day"] == person.day
 
     def test_date(self):
         """Tests showing pymongo date fields
@@ -67,7 +70,7 @@ class LogEntry(Document):
         log.date = datetime.date.today()
         log.save()
         log.reload()
-        self.assertEqual(log.date, datetime.date.today())
+        assert log.date == datetime.date.today()
 
         d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 999)
         d2 = datetime.datetime(1970, 1, 1, 0, 0, 1)
@@ -75,16 +78,16 @@ class LogEntry(Document):
         log.date = d1
         log.save()
         log.reload()
-        self.assertEqual(log.date, d1.date())
-        self.assertEqual(log.date, d2.date())
+        assert log.date == d1.date()
+        assert log.date == d2.date()
 
         d1 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9999)
         d2 = datetime.datetime(1970, 1, 1, 0, 0, 1, 9000)
         log.date = d1
         log.save()
         log.reload()
-        self.assertEqual(log.date, d1.date())
-        self.assertEqual(log.date, d2.date())
+        assert log.date == d1.date()
+        assert log.date == d2.date()
 
         if not six.PY3:
             # Pre UTC dates microseconds below 1000 are dropped
@@ -94,8 +97,8 @@ class LogEntry(Document):
             log.date = d1
             log.save()
             log.reload()
-            self.assertEqual(log.date, d1.date())
-            self.assertEqual(log.date, d2.date())
+            assert log.date == d1.date()
+            assert log.date == d2.date()
 
     def test_regular_usage(self):
         """Tests for regular datetime fields"""
@@ -113,35 +116,35 @@ class LogEntry(Document):
 
         for query in (d1, d1.isoformat(" ")):
             log1 = LogEntry.objects.get(date=query)
-            self.assertEqual(log, log1)
+            assert log == log1
 
         if dateutil:
             log1 = LogEntry.objects.get(date=d1.isoformat("T"))
-            self.assertEqual(log, log1)
+            assert log == log1
 
         # create additional 19 log entries for a total of 20
         for i in range(1971, 1990):
             d = datetime.datetime(i, 1, 1, 0, 0, 1)
             LogEntry(date=d).save()
 
-        self.assertEqual(LogEntry.objects.count(), 20)
+        assert LogEntry.objects.count() == 20
 
         # Test ordering
         logs = LogEntry.objects.order_by("date")
         i = 0
         while i < 19:
-            self.assertTrue(logs[i].date <= logs[i + 1].date)
+            assert logs[i].date <= logs[i + 1].date
             i += 1
 
         logs = LogEntry.objects.order_by("-date")
         i = 0
         while i < 19:
-            self.assertTrue(logs[i].date >= logs[i + 1].date)
+            assert logs[i].date >= logs[i + 1].date
             i += 1
 
         # Test searching
         logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 10)
+        assert logs.count() == 10
 
     def test_validation(self):
         """Ensure that invalid values cannot be assigned to datetime
@@ -166,6 +169,8 @@ class LogEntry(Document):
             log.validate()
 
         log.time = -1
-        self.assertRaises(ValidationError, log.validate)
+        with pytest.raises(ValidationError):
+            log.validate()
         log.time = "ABC"
-        self.assertRaises(ValidationError, log.validate)
+        with pytest.raises(ValidationError):
+            log.validate()
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index c911390a0..8db491c66 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -11,6 +11,7 @@
 from mongoengine import connection
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestDateTimeField(MongoDBTestCase):
@@ -24,7 +25,8 @@ class MyDoc(Document):
             dt = DateTimeField()
 
         md = MyDoc(dt="")
-        self.assertRaises(ValidationError, md.save)
+        with pytest.raises(ValidationError):
+            md.save()
 
     def test_datetime_from_whitespace_string(self):
         """
@@ -36,7 +38,8 @@ class MyDoc(Document):
             dt = DateTimeField()
 
         md = MyDoc(dt="   ")
-        self.assertRaises(ValidationError, md.save)
+        with pytest.raises(ValidationError):
+            md.save()
 
     def test_default_value_utcnow(self):
         """Ensure that default field values are used when creating
@@ -50,11 +53,9 @@ class Person(Document):
         person = Person()
         person.validate()
         person_created_t0 = person.created
-        self.assertLess(person.created - utcnow, dt.timedelta(seconds=1))
-        self.assertEqual(
-            person_created_t0, person.created
-        )  # make sure it does not change
-        self.assertEqual(person._data["created"], person.created)
+        assert person.created - utcnow < dt.timedelta(seconds=1)
+        assert person_created_t0 == person.created  # make sure it does not change
+        assert person._data["created"] == person.created
 
     def test_handling_microseconds(self):
         """Tests showing pymongo datetime fields handling of microseconds.
@@ -74,7 +75,7 @@ class LogEntry(Document):
         log.date = dt.date.today()
         log.save()
         log.reload()
-        self.assertEqual(log.date.date(), dt.date.today())
+        assert log.date.date() == dt.date.today()
 
         # Post UTC - microseconds are rounded (down) nearest millisecond and
         # dropped
@@ -84,8 +85,8 @@ class LogEntry(Document):
         log.date = d1
         log.save()
         log.reload()
-        self.assertNotEqual(log.date, d1)
-        self.assertEqual(log.date, d2)
+        assert log.date != d1
+        assert log.date == d2
 
         # Post UTC - microseconds are rounded (down) nearest millisecond
         d1 = dt.datetime(1970, 1, 1, 0, 0, 1, 9999)
@@ -93,8 +94,8 @@ class LogEntry(Document):
         log.date = d1
         log.save()
         log.reload()
-        self.assertNotEqual(log.date, d1)
-        self.assertEqual(log.date, d2)
+        assert log.date != d1
+        assert log.date == d2
 
         if not six.PY3:
             # Pre UTC dates microseconds below 1000 are dropped
@@ -104,8 +105,8 @@ class LogEntry(Document):
             log.date = d1
             log.save()
             log.reload()
-            self.assertNotEqual(log.date, d1)
-            self.assertEqual(log.date, d2)
+            assert log.date != d1
+            assert log.date == d2
 
     def test_regular_usage(self):
         """Tests for regular datetime fields"""
@@ -123,43 +124,43 @@ class LogEntry(Document):
 
         for query in (d1, d1.isoformat(" ")):
             log1 = LogEntry.objects.get(date=query)
-            self.assertEqual(log, log1)
+            assert log == log1
 
         if dateutil:
             log1 = LogEntry.objects.get(date=d1.isoformat("T"))
-            self.assertEqual(log, log1)
+            assert log == log1
 
         # create additional 19 log entries for a total of 20
         for i in range(1971, 1990):
             d = dt.datetime(i, 1, 1, 0, 0, 1)
             LogEntry(date=d).save()
 
-        self.assertEqual(LogEntry.objects.count(), 20)
+        assert LogEntry.objects.count() == 20
 
         # Test ordering
         logs = LogEntry.objects.order_by("date")
         i = 0
         while i < 19:
-            self.assertTrue(logs[i].date <= logs[i + 1].date)
+            assert logs[i].date <= logs[i + 1].date
             i += 1
 
         logs = LogEntry.objects.order_by("-date")
         i = 0
         while i < 19:
-            self.assertTrue(logs[i].date >= logs[i + 1].date)
+            assert logs[i].date >= logs[i + 1].date
             i += 1
 
         # Test searching
         logs = LogEntry.objects.filter(date__gte=dt.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 10)
+        assert logs.count() == 10
 
         logs = LogEntry.objects.filter(date__lte=dt.datetime(1980, 1, 1))
-        self.assertEqual(logs.count(), 10)
+        assert logs.count() == 10
 
         logs = LogEntry.objects.filter(
             date__lte=dt.datetime(1980, 1, 1), date__gte=dt.datetime(1975, 1, 1)
         )
-        self.assertEqual(logs.count(), 5)
+        assert logs.count() == 5
 
     def test_datetime_validation(self):
         """Ensure that invalid values cannot be assigned to datetime
@@ -187,15 +188,20 @@ class LogEntry(Document):
             log.validate()
 
         log.time = -1
-        self.assertRaises(ValidationError, log.validate)
+        with pytest.raises(ValidationError):
+            log.validate()
         log.time = "ABC"
-        self.assertRaises(ValidationError, log.validate)
+        with pytest.raises(ValidationError):
+            log.validate()
         log.time = "2019-05-16 21:GARBAGE:12"
-        self.assertRaises(ValidationError, log.validate)
+        with pytest.raises(ValidationError):
+            log.validate()
         log.time = "2019-05-16 21:42:57.GARBAGE"
-        self.assertRaises(ValidationError, log.validate)
+        with pytest.raises(ValidationError):
+            log.validate()
         log.time = "2019-05-16 21:42:57.123.456"
-        self.assertRaises(ValidationError, log.validate)
+        with pytest.raises(ValidationError):
+            log.validate()
 
     def test_parse_datetime_as_str(self):
         class DTDoc(Document):
@@ -206,15 +212,16 @@ class DTDoc(Document):
         # make sure that passing a parsable datetime works
         dtd = DTDoc()
         dtd.date = date_str
-        self.assertIsInstance(dtd.date, six.string_types)
+        assert isinstance(dtd.date, six.string_types)
         dtd.save()
         dtd.reload()
 
-        self.assertIsInstance(dtd.date, dt.datetime)
-        self.assertEqual(str(dtd.date), date_str)
+        assert isinstance(dtd.date, dt.datetime)
+        assert str(dtd.date) == date_str
 
         dtd.date = "January 1st, 9999999999"
-        self.assertRaises(ValidationError, dtd.validate)
+        with pytest.raises(ValidationError):
+            dtd.validate()
 
 
 class TestDateTimeTzAware(MongoDBTestCase):
@@ -235,4 +242,4 @@ class LogEntry(Document):
 
         log = LogEntry.objects.first()
         log.time = dt.datetime(2013, 1, 1, 0, 0, 0)
-        self.assertEqual(["time"], log._changed_fields)
+        assert ["time"] == log._changed_fields
diff --git a/tests/fields/test_decimal_field.py b/tests/fields/test_decimal_field.py
index 30b7e5ea4..b5b953633 100644
--- a/tests/fields/test_decimal_field.py
+++ b/tests/fields/test_decimal_field.py
@@ -4,6 +4,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestDecimalField(MongoDBTestCase):
@@ -18,21 +19,26 @@ class Person(Document):
 
         Person(height=Decimal("1.89")).save()
         person = Person.objects.first()
-        self.assertEqual(person.height, Decimal("1.89"))
+        assert person.height == Decimal("1.89")
 
         person.height = "2.0"
         person.save()
         person.height = 0.01
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
         person.height = Decimal("0.01")
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
         person.height = Decimal("4.0")
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
         person.height = "something invalid"
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person_2 = Person(height="something invalid")
-        self.assertRaises(ValidationError, person_2.validate)
+        with pytest.raises(ValidationError):
+            person_2.validate()
 
     def test_comparison(self):
         class Person(Document):
@@ -45,11 +51,11 @@ class Person(Document):
         Person(money=8).save()
         Person(money=10).save()
 
-        self.assertEqual(2, Person.objects(money__gt=Decimal("7")).count())
-        self.assertEqual(2, Person.objects(money__gt=7).count())
-        self.assertEqual(2, Person.objects(money__gt="7").count())
+        assert 2 == Person.objects(money__gt=Decimal("7")).count()
+        assert 2 == Person.objects(money__gt=7).count()
+        assert 2 == Person.objects(money__gt="7").count()
 
-        self.assertEqual(3, Person.objects(money__gte="7").count())
+        assert 3 == Person.objects(money__gte="7").count()
 
     def test_storage(self):
         class Person(Document):
@@ -87,7 +93,7 @@ class Person(Document):
         ]
         expected.extend(expected)
         actual = list(Person.objects.exclude("id").as_pymongo())
-        self.assertEqual(expected, actual)
+        assert expected == actual
 
         # How it comes out locally
         expected = [
@@ -101,4 +107,4 @@ class Person(Document):
         expected.extend(expected)
         for field_name in ["float_value", "string_value"]:
             actual = list(Person.objects().scalar(field_name))
-            self.assertEqual(expected, actual)
+            assert expected == actual
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 07bab85b3..56df682f9 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -3,6 +3,7 @@
 from mongoengine.base import BaseDict
 
 from tests.utils import MongoDBTestCase, get_as_pymongo
+import pytest
 
 
 class TestDictField(MongoDBTestCase):
@@ -14,7 +15,7 @@ class BlogPost(Document):
 
         info = {"testkey": "testvalue"}
         post = BlogPost(info=info).save()
-        self.assertEqual(get_as_pymongo(post), {"_id": post.id, "info": info})
+        assert get_as_pymongo(post) == {"_id": post.id, "info": info}
 
     def test_general_things(self):
         """Ensure that dict types work as expected."""
@@ -26,25 +27,32 @@ class BlogPost(Document):
 
         post = BlogPost()
         post.info = "my post"
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.info = ["test", "test"]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.info = {"$title": "test"}
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.info = {"nested": {"$title": "test"}}
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.info = {"the.title": "test"}
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.info = {"nested": {"the.title": "test"}}
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.info = {1: "test"}
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.info = {"title": "test"}
         post.save()
@@ -61,33 +69,27 @@ class BlogPost(Document):
         post.info = {"details": {"test": 3}}
         post.save()
 
-        self.assertEqual(BlogPost.objects.count(), 4)
-        self.assertEqual(BlogPost.objects.filter(info__title__exact="test").count(), 1)
-        self.assertEqual(
-            BlogPost.objects.filter(info__details__test__exact="test").count(), 1
-        )
+        assert BlogPost.objects.count() == 4
+        assert BlogPost.objects.filter(info__title__exact="test").count() == 1
+        assert BlogPost.objects.filter(info__details__test__exact="test").count() == 1
 
         post = BlogPost.objects.filter(info__title__exact="dollar_sign").first()
-        self.assertIn("te$t", post["info"]["details"])
+        assert "te$t" in post["info"]["details"]
 
         # Confirm handles non strings or non existing keys
-        self.assertEqual(
-            BlogPost.objects.filter(info__details__test__exact=5).count(), 0
-        )
-        self.assertEqual(
-            BlogPost.objects.filter(info__made_up__test__exact="test").count(), 0
-        )
+        assert BlogPost.objects.filter(info__details__test__exact=5).count() == 0
+        assert BlogPost.objects.filter(info__made_up__test__exact="test").count() == 0
 
         post = BlogPost.objects.create(info={"title": "original"})
         post.info.update({"title": "updated"})
         post.save()
         post.reload()
-        self.assertEqual("updated", post.info["title"])
+        assert "updated" == post.info["title"]
 
         post.info.setdefault("authors", [])
         post.save()
         post.reload()
-        self.assertEqual([], post.info["authors"])
+        assert [] == post.info["authors"]
 
     def test_dictfield_dump_document(self):
         """Ensure a DictField can handle another document's dump."""
@@ -114,10 +116,8 @@ class ToEmbedChild(ToEmbedParent):
         ).save()
         doc = Doc(field=to_embed.to_mongo().to_dict())
         doc.save()
-        self.assertIsInstance(doc.field, dict)
-        self.assertEqual(
-            doc.field, {"_id": 2, "recursive": {"_id": 1, "recursive": {}}}
-        )
+        assert isinstance(doc.field, dict)
+        assert doc.field == {"_id": 2, "recursive": {"_id": 1, "recursive": {}}}
         # Same thing with a Document with a _cls field
         to_embed_recursive = ToEmbedChild(id=1).save()
         to_embed_child = ToEmbedChild(
@@ -125,7 +125,7 @@ class ToEmbedChild(ToEmbedParent):
         ).save()
         doc = Doc(field=to_embed_child.to_mongo().to_dict())
         doc.save()
-        self.assertIsInstance(doc.field, dict)
+        assert isinstance(doc.field, dict)
         expected = {
             "_id": 2,
             "_cls": "ToEmbedParent.ToEmbedChild",
@@ -135,7 +135,7 @@ class ToEmbedChild(ToEmbedParent):
                 "recursive": {},
             },
         }
-        self.assertEqual(doc.field, expected)
+        assert doc.field == expected
 
     def test_dictfield_strict(self):
         """Ensure that dict field handles validation if provided a strict field type."""
@@ -150,7 +150,7 @@ class Simple(Document):
         e.save()
 
         # try creating an invalid mapping
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             e.mapping["somestring"] = "abc"
             e.save()
 
@@ -184,22 +184,21 @@ class Simple(Document):
         e.save()
 
         e2 = Simple.objects.get(id=e.id)
-        self.assertIsInstance(e2.mapping["somestring"], StringSetting)
-        self.assertIsInstance(e2.mapping["someint"], IntegerSetting)
+        assert isinstance(e2.mapping["somestring"], StringSetting)
+        assert isinstance(e2.mapping["someint"], IntegerSetting)
 
         # Test querying
-        self.assertEqual(Simple.objects.filter(mapping__someint__value=42).count(), 1)
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__number=1).count(), 1
-        )
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__complex__value=42).count(), 1
+        assert Simple.objects.filter(mapping__someint__value=42).count() == 1
+        assert Simple.objects.filter(mapping__nested_dict__number=1).count() == 1
+        assert (
+            Simple.objects.filter(mapping__nested_dict__complex__value=42).count() == 1
         )
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__0__value=42).count(), 1
+        assert (
+            Simple.objects.filter(mapping__nested_dict__list__0__value=42).count() == 1
         )
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__1__value="foo").count(), 1
+        assert (
+            Simple.objects.filter(mapping__nested_dict__list__1__value="foo").count()
+            == 1
         )
 
         # Confirm can update
@@ -207,11 +206,13 @@ class Simple(Document):
         Simple.objects().update(
             set__mapping__nested_dict__list__1=StringSetting(value="Boo")
         )
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__1__value="foo").count(), 0
+        assert (
+            Simple.objects.filter(mapping__nested_dict__list__1__value="foo").count()
+            == 0
         )
-        self.assertEqual(
-            Simple.objects.filter(mapping__nested_dict__list__1__value="Boo").count(), 1
+        assert (
+            Simple.objects.filter(mapping__nested_dict__list__1__value="Boo").count()
+            == 1
         )
 
     def test_push_dict(self):
@@ -221,12 +222,12 @@ class MyModel(Document):
         doc = MyModel(events=[{"a": 1}]).save()
         raw_doc = get_as_pymongo(doc)
         expected_raw_doc = {"_id": doc.id, "events": [{"a": 1}]}
-        self.assertEqual(raw_doc, expected_raw_doc)
+        assert raw_doc == expected_raw_doc
 
         MyModel.objects(id=doc.id).update(push__events={})
         raw_doc = get_as_pymongo(doc)
         expected_raw_doc = {"_id": doc.id, "events": [{"a": 1}, {}]}
-        self.assertEqual(raw_doc, expected_raw_doc)
+        assert raw_doc == expected_raw_doc
 
     def test_ensure_unique_default_instances(self):
         """Ensure that every field has it's own unique default instance."""
@@ -239,8 +240,8 @@ class D(Document):
         d1.data["foo"] = "bar"
         d1.data2["foo"] = "bar"
         d2 = D()
-        self.assertEqual(d2.data, {})
-        self.assertEqual(d2.data2, {})
+        assert d2.data == {}
+        assert d2.data2 == {}
 
     def test_dict_field_invalid_dict_value(self):
         class DictFieldTest(Document):
@@ -250,11 +251,13 @@ class DictFieldTest(Document):
 
         test = DictFieldTest(dictionary=None)
         test.dictionary  # Just access to test getter
-        self.assertRaises(ValidationError, test.validate)
+        with pytest.raises(ValidationError):
+            test.validate()
 
         test = DictFieldTest(dictionary=False)
         test.dictionary  # Just access to test getter
-        self.assertRaises(ValidationError, test.validate)
+        with pytest.raises(ValidationError):
+            test.validate()
 
     def test_dict_field_raises_validation_error_if_wrongly_assign_embedded_doc(self):
         class DictFieldTest(Document):
@@ -267,12 +270,10 @@ class Embedded(EmbeddedDocument):
 
         embed = Embedded(name="garbage")
         doc = DictFieldTest(dictionary=embed)
-        with self.assertRaises(ValidationError) as ctx_err:
+        with pytest.raises(ValidationError) as ctx_err:
             doc.validate()
-        self.assertIn("'dictionary'", str(ctx_err.exception))
-        self.assertIn(
-            "Only dictionaries may be used in a DictField", str(ctx_err.exception)
-        )
+        assert "'dictionary'" in str(ctx_err.exception)
+        assert "Only dictionaries may be used in a DictField" in str(ctx_err.exception)
 
     def test_atomic_update_dict_field(self):
         """Ensure that the entire DictField can be atomically updated."""
@@ -287,11 +288,11 @@ class Simple(Document):
         e.save()
         e.update(set__mapping={"ints": [3, 4]})
         e.reload()
-        self.assertEqual(BaseDict, type(e.mapping))
-        self.assertEqual({"ints": [3, 4]}, e.mapping)
+        assert BaseDict == type(e.mapping)
+        assert {"ints": [3, 4]} == e.mapping
 
         # try creating an invalid mapping
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             e.update(set__mapping={"somestrings": ["foo", "bar"]})
 
     def test_dictfield_with_referencefield_complex_nesting_cases(self):
@@ -329,13 +330,13 @@ class Simple(Document):
         e.save()
 
         s = Simple.objects.first()
-        self.assertIsInstance(s.mapping0["someint"], Doc)
-        self.assertIsInstance(s.mapping1["someint"], Doc)
-        self.assertIsInstance(s.mapping2["someint"][0], Doc)
-        self.assertIsInstance(s.mapping3["someint"][0], Doc)
-        self.assertIsInstance(s.mapping4["someint"]["d"], Doc)
-        self.assertIsInstance(s.mapping5["someint"]["d"], Doc)
-        self.assertIsInstance(s.mapping6["someint"][0]["d"], Doc)
-        self.assertIsInstance(s.mapping7["someint"][0]["d"], Doc)
-        self.assertIsInstance(s.mapping8["someint"][0]["d"][0], Doc)
-        self.assertIsInstance(s.mapping9["someint"][0]["d"][0], Doc)
+        assert isinstance(s.mapping0["someint"], Doc)
+        assert isinstance(s.mapping1["someint"], Doc)
+        assert isinstance(s.mapping2["someint"][0], Doc)
+        assert isinstance(s.mapping3["someint"][0], Doc)
+        assert isinstance(s.mapping4["someint"]["d"], Doc)
+        assert isinstance(s.mapping5["someint"]["d"], Doc)
+        assert isinstance(s.mapping6["someint"][0]["d"], Doc)
+        assert isinstance(s.mapping7["someint"][0]["d"], Doc)
+        assert isinstance(s.mapping8["someint"][0]["d"][0], Doc)
+        assert isinstance(s.mapping9["someint"][0]["d"][0], Doc)
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
index 06ec51513..b8d3d1690 100644
--- a/tests/fields/test_email_field.py
+++ b/tests/fields/test_email_field.py
@@ -5,6 +5,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestEmailField(MongoDBTestCase):
@@ -27,7 +28,8 @@ class User(Document):
         user.validate()
 
         user = User(email="ross@example.com.")
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
         # unicode domain
         user = User(email=u"user@пример.рф")
@@ -35,11 +37,13 @@ class User(Document):
 
         # invalid unicode domain
         user = User(email=u"user@пример")
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
         # invalid data type
         user = User(email=123)
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
     def test_email_field_unicode_user(self):
         # Don't run this test on pypy3, which doesn't support unicode regex:
@@ -52,7 +56,8 @@ class User(Document):
 
         # unicode user shouldn't validate by default...
         user = User(email=u"Dörte@Sörensen.example.com")
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
         # ...but it should be fine with allow_utf8_user set to True
         class User(Document):
@@ -67,7 +72,8 @@ class User(Document):
 
         # localhost domain shouldn't validate by default...
         user = User(email="me@localhost")
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
         # ...but it should be fine if it's whitelisted
         class User(Document):
@@ -82,9 +88,9 @@ class User(Document):
 
         invalid_idn = ".google.com"
         user = User(email="me@%s" % invalid_idn)
-        with self.assertRaises(ValidationError) as ctx_err:
+        with pytest.raises(ValidationError) as ctx_err:
             user.validate()
-        self.assertIn("domain failed IDN encoding", str(ctx_err.exception))
+        assert "domain failed IDN encoding" in str(ctx_err.exception)
 
     def test_email_field_ip_domain(self):
         class User(Document):
@@ -96,13 +102,16 @@ class User(Document):
 
         # IP address as a domain shouldn't validate by default...
         user = User(email=valid_ipv4)
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
         user = User(email=valid_ipv6)
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
         user = User(email=invalid_ip)
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
         # ...but it should be fine with allow_ip_domain set to True
         class User(Document):
@@ -116,7 +125,8 @@ class User(Document):
 
         # invalid IP should still fail validation
         user = User(email=invalid_ip)
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
     def test_email_field_honors_regex(self):
         class User(Document):
@@ -124,8 +134,9 @@ class User(Document):
 
         # Fails regex validation
         user = User(email="me@foo.com")
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
         # Passes regex validation
         user = User(email="me@example.com")
-        self.assertIsNone(user.validate())
+        assert user.validate() is None
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 8db8c180f..4fcf6bf13 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -13,6 +13,7 @@
 )
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestEmbeddedDocumentField(MongoDBTestCase):
@@ -21,13 +22,13 @@ class MyDoc(EmbeddedDocument):
             name = StringField()
 
         field = EmbeddedDocumentField(MyDoc)
-        self.assertEqual(field.document_type_obj, MyDoc)
+        assert field.document_type_obj == MyDoc
 
         field2 = EmbeddedDocumentField("MyDoc")
-        self.assertEqual(field2.document_type_obj, "MyDoc")
+        assert field2.document_type_obj == "MyDoc"
 
     def test___init___throw_error_if_document_type_is_not_EmbeddedDocument(self):
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             EmbeddedDocumentField(dict)
 
     def test_document_type_throw_error_if_not_EmbeddedDocument_subclass(self):
@@ -35,11 +36,11 @@ class MyDoc(Document):
             name = StringField()
 
         emb = EmbeddedDocumentField("MyDoc")
-        with self.assertRaises(ValidationError) as ctx:
+        with pytest.raises(ValidationError) as ctx:
             emb.document_type
-        self.assertIn(
-            "Invalid embedded document class provided to an EmbeddedDocumentField",
-            str(ctx.exception),
+        assert (
+            "Invalid embedded document class provided to an EmbeddedDocumentField"
+            in str(ctx.exception)
         )
 
     def test_embedded_document_field_only_allow_subclasses_of_embedded_document(self):
@@ -47,12 +48,12 @@ def test_embedded_document_field_only_allow_subclasses_of_embedded_document(self
         class MyDoc(Document):
             name = StringField()
 
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
 
             class MyFailingDoc(Document):
                 emb = EmbeddedDocumentField(MyDoc)
 
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
 
             class MyFailingdoc2(Document):
                 emb = EmbeddedDocumentField("MyDoc")
@@ -71,24 +72,24 @@ class Person(Document):
         p = Person(settings=AdminSettings(foo1="bar1", foo2="bar2"), name="John").save()
 
         # Test non exiting attribute
-        with self.assertRaises(InvalidQueryError) as ctx_err:
+        with pytest.raises(InvalidQueryError) as ctx_err:
             Person.objects(settings__notexist="bar").first()
-        self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
+        assert unicode(ctx_err.exception) == u'Cannot resolve field "notexist"'
 
-        with self.assertRaises(LookUpError):
+        with pytest.raises(LookUpError):
             Person.objects.only("settings.notexist")
 
         # Test existing attribute
-        self.assertEqual(Person.objects(settings__foo1="bar1").first().id, p.id)
+        assert Person.objects(settings__foo1="bar1").first().id == p.id
         only_p = Person.objects.only("settings.foo1").first()
-        self.assertEqual(only_p.settings.foo1, p.settings.foo1)
-        self.assertIsNone(only_p.settings.foo2)
-        self.assertIsNone(only_p.name)
+        assert only_p.settings.foo1 == p.settings.foo1
+        assert only_p.settings.foo2 is None
+        assert only_p.name is None
 
         exclude_p = Person.objects.exclude("settings.foo1").first()
-        self.assertIsNone(exclude_p.settings.foo1)
-        self.assertEqual(exclude_p.settings.foo2, p.settings.foo2)
-        self.assertEqual(exclude_p.name, p.name)
+        assert exclude_p.settings.foo1 is None
+        assert exclude_p.settings.foo2 == p.settings.foo2
+        assert exclude_p.name == p.name
 
     def test_query_embedded_document_attribute_with_inheritance(self):
         class BaseSettings(EmbeddedDocument):
@@ -107,17 +108,17 @@ class Person(Document):
         p.save()
 
         # Test non exiting attribute
-        with self.assertRaises(InvalidQueryError) as ctx_err:
-            self.assertEqual(Person.objects(settings__notexist="bar").first().id, p.id)
-        self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
+        with pytest.raises(InvalidQueryError) as ctx_err:
+            assert Person.objects(settings__notexist="bar").first().id == p.id
+        assert unicode(ctx_err.exception) == u'Cannot resolve field "notexist"'
 
         # Test existing attribute
-        self.assertEqual(Person.objects(settings__base_foo="basefoo").first().id, p.id)
-        self.assertEqual(Person.objects(settings__sub_foo="subfoo").first().id, p.id)
+        assert Person.objects(settings__base_foo="basefoo").first().id == p.id
+        assert Person.objects(settings__sub_foo="subfoo").first().id == p.id
 
         only_p = Person.objects.only("settings.base_foo", "settings._cls").first()
-        self.assertEqual(only_p.settings.base_foo, "basefoo")
-        self.assertIsNone(only_p.settings.sub_foo)
+        assert only_p.settings.base_foo == "basefoo"
+        assert only_p.settings.sub_foo is None
 
     def test_query_list_embedded_document_with_inheritance(self):
         class Post(EmbeddedDocument):
@@ -137,14 +138,14 @@ class Record(Document):
         record_text = Record(posts=[TextPost(content="a", title="foo")]).save()
 
         records = list(Record.objects(posts__author=record_movie.posts[0].author))
-        self.assertEqual(len(records), 1)
-        self.assertEqual(records[0].id, record_movie.id)
+        assert len(records) == 1
+        assert records[0].id == record_movie.id
 
         records = list(Record.objects(posts__content=record_text.posts[0].content))
-        self.assertEqual(len(records), 1)
-        self.assertEqual(records[0].id, record_text.id)
+        assert len(records) == 1
+        assert records[0].id == record_text.id
 
-        self.assertEqual(Record.objects(posts__title="foo").count(), 2)
+        assert Record.objects(posts__title="foo").count() == 2
 
 
 class TestGenericEmbeddedDocumentField(MongoDBTestCase):
@@ -167,13 +168,13 @@ class Person(Document):
         person.save()
 
         person = Person.objects.first()
-        self.assertIsInstance(person.like, Car)
+        assert isinstance(person.like, Car)
 
         person.like = Dish(food="arroz", number=15)
         person.save()
 
         person = Person.objects.first()
-        self.assertIsInstance(person.like, Dish)
+        assert isinstance(person.like, Dish)
 
     def test_generic_embedded_document_choices(self):
         """Ensure you can limit GenericEmbeddedDocument choices."""
@@ -193,13 +194,14 @@ class Person(Document):
 
         person = Person(name="Test User")
         person.like = Car(name="Fiat")
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person.like = Dish(food="arroz", number=15)
         person.save()
 
         person = Person.objects.first()
-        self.assertIsInstance(person.like, Dish)
+        assert isinstance(person.like, Dish)
 
     def test_generic_list_embedded_document_choices(self):
         """Ensure you can limit GenericEmbeddedDocument choices inside
@@ -221,13 +223,14 @@ class Person(Document):
 
         person = Person(name="Test User")
         person.likes = [Car(name="Fiat")]
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person.likes = [Dish(food="arroz", number=15)]
         person.save()
 
         person = Person.objects.first()
-        self.assertIsInstance(person.likes[0], Dish)
+        assert isinstance(person.likes[0], Dish)
 
     def test_choices_validation_documents(self):
         """
@@ -263,7 +266,8 @@ class BlogPost(Document):
 
         # Single Entry Failure
         post = BlogPost(comments=[ModeratorComments(author="mod1", message="message1")])
-        self.assertRaises(ValidationError, post.save)
+        with pytest.raises(ValidationError):
+            post.save()
 
         # Mixed Entry Failure
         post = BlogPost(
@@ -272,7 +276,8 @@ class BlogPost(Document):
                 UserComments(author="user2", message="message2"),
             ]
         )
-        self.assertRaises(ValidationError, post.save)
+        with pytest.raises(ValidationError):
+            post.save()
 
     def test_choices_validation_documents_inheritance(self):
         """
@@ -311,16 +316,16 @@ class Person(Document):
         p2 = Person(settings=NonAdminSettings(foo2="bar2")).save()
 
         # Test non exiting attribute
-        with self.assertRaises(InvalidQueryError) as ctx_err:
+        with pytest.raises(InvalidQueryError) as ctx_err:
             Person.objects(settings__notexist="bar").first()
-        self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
+        assert unicode(ctx_err.exception) == u'Cannot resolve field "notexist"'
 
-        with self.assertRaises(LookUpError):
+        with pytest.raises(LookUpError):
             Person.objects.only("settings.notexist")
 
         # Test existing attribute
-        self.assertEqual(Person.objects(settings__foo1="bar1").first().id, p1.id)
-        self.assertEqual(Person.objects(settings__foo2="bar2").first().id, p2.id)
+        assert Person.objects(settings__foo1="bar1").first().id == p1.id
+        assert Person.objects(settings__foo2="bar2").first().id == p2.id
 
     def test_query_generic_embedded_document_attribute_with_inheritance(self):
         class BaseSettings(EmbeddedDocument):
@@ -339,10 +344,10 @@ class Person(Document):
         p.save()
 
         # Test non exiting attribute
-        with self.assertRaises(InvalidQueryError) as ctx_err:
-            self.assertEqual(Person.objects(settings__notexist="bar").first().id, p.id)
-        self.assertEqual(unicode(ctx_err.exception), u'Cannot resolve field "notexist"')
+        with pytest.raises(InvalidQueryError) as ctx_err:
+            assert Person.objects(settings__notexist="bar").first().id == p.id
+        assert unicode(ctx_err.exception) == u'Cannot resolve field "notexist"'
 
         # Test existing attribute
-        self.assertEqual(Person.objects(settings__base_foo="basefoo").first().id, p.id)
-        self.assertEqual(Person.objects(settings__sub_foo="subfoo").first().id, p.id)
+        assert Person.objects(settings__base_foo="basefoo").first().id == p.id
+        assert Person.objects(settings__sub_foo="subfoo").first().id == p.id
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index bd2149e6b..b27d95d2b 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -39,6 +39,7 @@
 from mongoengine.errors import DeprecatedError
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestField(MongoDBTestCase):
@@ -58,25 +59,25 @@ class Person(Document):
 
         # Confirm saving now would store values
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ["age", "created", "day", "name", "userid"])
+        assert data_to_be_saved == ["age", "created", "day", "name", "userid"]
 
-        self.assertTrue(person.validate() is None)
+        assert person.validate() is None
 
-        self.assertEqual(person.name, person.name)
-        self.assertEqual(person.age, person.age)
-        self.assertEqual(person.userid, person.userid)
-        self.assertEqual(person.created, person.created)
-        self.assertEqual(person.day, person.day)
+        assert person.name == person.name
+        assert person.age == person.age
+        assert person.userid == person.userid
+        assert person.created == person.created
+        assert person.day == person.day
 
-        self.assertEqual(person._data["name"], person.name)
-        self.assertEqual(person._data["age"], person.age)
-        self.assertEqual(person._data["userid"], person.userid)
-        self.assertEqual(person._data["created"], person.created)
-        self.assertEqual(person._data["day"], person.day)
+        assert person._data["name"] == person.name
+        assert person._data["age"] == person.age
+        assert person._data["userid"] == person.userid
+        assert person._data["created"] == person.created
+        assert person._data["day"] == person.day
 
         # Confirm introspection changes nothing
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ["age", "created", "day", "name", "userid"])
+        assert data_to_be_saved == ["age", "created", "day", "name", "userid"]
 
     def test_custom_field_validation_raise_deprecated_error_when_validation_return_something(
         self,
@@ -95,13 +96,13 @@ class Person(Document):
             "it should raise a ValidationError if validation fails"
         )
 
-        with self.assertRaises(DeprecatedError) as ctx_err:
+        with pytest.raises(DeprecatedError) as ctx_err:
             Person(name="").validate()
-        self.assertEqual(str(ctx_err.exception), error)
+        assert str(ctx_err.exception) == error
 
-        with self.assertRaises(DeprecatedError) as ctx_err:
+        with pytest.raises(DeprecatedError) as ctx_err:
             Person(name="").save()
-        self.assertEqual(str(ctx_err.exception), error)
+        assert str(ctx_err.exception) == error
 
     def test_custom_field_validation_raise_validation_error(self):
         def _not_empty(z):
@@ -113,18 +114,16 @@ class Person(Document):
 
         Person.drop_collection()
 
-        with self.assertRaises(ValidationError) as ctx_err:
+        with pytest.raises(ValidationError) as ctx_err:
             Person(name="").validate()
-        self.assertEqual(
-            "ValidationError (Person:None) (cantbeempty: ['name'])",
-            str(ctx_err.exception),
+        assert "ValidationError (Person:None) (cantbeempty: ['name'])" == str(
+            ctx_err.exception
         )
 
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             Person(name="").save()
-        self.assertEqual(
-            "ValidationError (Person:None) (cantbeempty: ['name'])",
-            str(ctx_err.exception),
+        assert "ValidationError (Person:None) (cantbeempty: ['name'])" == str(
+            ctx_err.exception
         )
 
         Person(name="garbage").validate()
@@ -146,23 +145,23 @@ class Person(Document):
 
         # Confirm saving now would store values
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
+        assert data_to_be_saved == ["age", "created", "userid"]
 
-        self.assertTrue(person.validate() is None)
+        assert person.validate() is None
 
-        self.assertEqual(person.name, person.name)
-        self.assertEqual(person.age, person.age)
-        self.assertEqual(person.userid, person.userid)
-        self.assertEqual(person.created, person.created)
+        assert person.name == person.name
+        assert person.age == person.age
+        assert person.userid == person.userid
+        assert person.created == person.created
 
-        self.assertEqual(person._data["name"], person.name)
-        self.assertEqual(person._data["age"], person.age)
-        self.assertEqual(person._data["userid"], person.userid)
-        self.assertEqual(person._data["created"], person.created)
+        assert person._data["name"] == person.name
+        assert person._data["age"] == person.age
+        assert person._data["userid"] == person.userid
+        assert person._data["created"] == person.created
 
         # Confirm introspection changes nothing
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
+        assert data_to_be_saved == ["age", "created", "userid"]
 
     def test_default_values_when_setting_to_None(self):
         """Ensure that default field values are used when creating
@@ -183,23 +182,23 @@ class Person(Document):
 
         # Confirm saving now would store values
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
+        assert data_to_be_saved == ["age", "created", "userid"]
 
-        self.assertTrue(person.validate() is None)
+        assert person.validate() is None
 
-        self.assertEqual(person.name, None)
-        self.assertEqual(person.age, 30)
-        self.assertEqual(person.userid, "test")
-        self.assertIsInstance(person.created, datetime.datetime)
+        assert person.name == None
+        assert person.age == 30
+        assert person.userid == "test"
+        assert isinstance(person.created, datetime.datetime)
 
-        self.assertEqual(person._data["name"], person.name)
-        self.assertEqual(person._data["age"], person.age)
-        self.assertEqual(person._data["userid"], person.userid)
-        self.assertEqual(person._data["created"], person.created)
+        assert person._data["name"] == person.name
+        assert person._data["age"] == person.age
+        assert person._data["userid"] == person.userid
+        assert person._data["created"] == person.created
 
         # Confirm introspection changes nothing
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
+        assert data_to_be_saved == ["age", "created", "userid"]
 
     def test_default_value_is_not_used_when_changing_value_to_empty_list_for_strict_doc(
         self,
@@ -213,7 +212,7 @@ class Doc(Document):
         doc.x = []
         doc.save()
         reloaded = Doc.objects.get(id=doc.id)
-        self.assertEqual(reloaded.x, [])
+        assert reloaded.x == []
 
     def test_default_value_is_not_used_when_changing_value_to_empty_list_for_dyn_doc(
         self,
@@ -228,7 +227,7 @@ class Doc(DynamicDocument):
         doc.y = 2  # Was triggering the bug
         doc.save()
         reloaded = Doc.objects.get(id=doc.id)
-        self.assertEqual(reloaded.x, [])
+        assert reloaded.x == []
 
     def test_default_values_when_deleting_value(self):
         """Ensure that default field values are used after non-default
@@ -253,24 +252,24 @@ class Person(Document):
         del person.created
 
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
+        assert data_to_be_saved == ["age", "created", "userid"]
 
-        self.assertTrue(person.validate() is None)
+        assert person.validate() is None
 
-        self.assertEqual(person.name, None)
-        self.assertEqual(person.age, 30)
-        self.assertEqual(person.userid, "test")
-        self.assertIsInstance(person.created, datetime.datetime)
-        self.assertNotEqual(person.created, datetime.datetime(2014, 6, 12))
+        assert person.name == None
+        assert person.age == 30
+        assert person.userid == "test"
+        assert isinstance(person.created, datetime.datetime)
+        assert person.created != datetime.datetime(2014, 6, 12)
 
-        self.assertEqual(person._data["name"], person.name)
-        self.assertEqual(person._data["age"], person.age)
-        self.assertEqual(person._data["userid"], person.userid)
-        self.assertEqual(person._data["created"], person.created)
+        assert person._data["name"] == person.name
+        assert person._data["age"] == person.age
+        assert person._data["userid"] == person.userid
+        assert person._data["created"] == person.created
 
         # Confirm introspection changes nothing
         data_to_be_saved = sorted(person.to_mongo().keys())
-        self.assertEqual(data_to_be_saved, ["age", "created", "userid"])
+        assert data_to_be_saved == ["age", "created", "userid"]
 
     def test_required_values(self):
         """Ensure that required field constraints are enforced."""
@@ -281,9 +280,11 @@ class Person(Document):
             userid = StringField()
 
         person = Person(name="Test User")
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
         person = Person(age=30)
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
     def test_not_required_handles_none_in_update(self):
         """Ensure that every fields should accept None if required is
@@ -311,15 +312,15 @@ class HandleNoneFields(Document):
             set__flt_fld=None,
             set__comp_dt_fld=None,
         )
-        self.assertEqual(res, 1)
+        assert res == 1
 
         # Retrive data from db and verify it.
         ret = HandleNoneFields.objects.all()[0]
-        self.assertIsNone(ret.str_fld)
-        self.assertIsNone(ret.int_fld)
-        self.assertIsNone(ret.flt_fld)
+        assert ret.str_fld is None
+        assert ret.int_fld is None
+        assert ret.flt_fld is None
 
-        self.assertIsNone(ret.comp_dt_fld)
+        assert ret.comp_dt_fld is None
 
     def test_not_required_handles_none_from_database(self):
         """Ensure that every field can handle null values from the
@@ -349,14 +350,15 @@ class HandleNoneFields(Document):
 
         # Retrive data from db and verify it.
         ret = HandleNoneFields.objects.first()
-        self.assertIsNone(ret.str_fld)
-        self.assertIsNone(ret.int_fld)
-        self.assertIsNone(ret.flt_fld)
-        self.assertIsNone(ret.comp_dt_fld)
+        assert ret.str_fld is None
+        assert ret.int_fld is None
+        assert ret.flt_fld is None
+        assert ret.comp_dt_fld is None
 
         # Retrieved object shouldn't pass validation when a re-save is
         # attempted.
-        self.assertRaises(ValidationError, ret.validate)
+        with pytest.raises(ValidationError):
+            ret.validate()
 
     def test_default_id_validation_as_objectid(self):
         """Ensure that invalid values cannot be assigned to an
@@ -367,13 +369,15 @@ class Person(Document):
             name = StringField()
 
         person = Person(name="Test User")
-        self.assertEqual(person.id, None)
+        assert person.id == None
 
         person.id = 47
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person.id = "abc"
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person.id = str(ObjectId())
         person.validate()
@@ -386,19 +390,22 @@ class Person(Document):
             userid = StringField(r"[0-9a-z_]+$")
 
         person = Person(name=34)
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         # Test regex validation on userid
         person = Person(userid="test.User")
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person.userid = "test_user"
-        self.assertEqual(person.userid, "test_user")
+        assert person.userid == "test_user"
         person.validate()
 
         # Test max length validation on name
         person = Person(name="Name that is more than twenty characters")
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person.name = "Shorter name"
         person.validate()
@@ -407,19 +414,19 @@ def test_db_field_validation(self):
         """Ensure that db_field doesn't accept invalid values."""
 
         # dot in the name
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
 
             class User(Document):
                 name = StringField(db_field="user.name")
 
         # name starting with $
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
 
             class UserX1(Document):
                 name = StringField(db_field="$name")
 
         # name containing a null character
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
 
             class UserX2(Document):
                 name = StringField(db_field="name\0")
@@ -455,9 +462,11 @@ class BlogPost(Document):
         post.validate()
 
         post.tags = "fun"
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
         post.tags = [1, 2]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.tags = ["fun", "leisure"]
         post.validate()
@@ -465,30 +474,36 @@ class BlogPost(Document):
         post.validate()
 
         post.access_list = "a,b"
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.access_list = ["c", "d"]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.access_list = ["a", "b"]
         post.validate()
 
-        self.assertEqual(post.get_access_list_display(), u"Administration, Manager")
+        assert post.get_access_list_display() == u"Administration, Manager"
 
         post.comments = ["a"]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
         post.comments = "yay"
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         comments = [Comment(content="Good for you"), Comment(content="Yay.")]
         post.comments = comments
         post.validate()
 
         post.authors = [Comment()]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.authors = [User()]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         user = User()
         user.save()
@@ -496,34 +511,42 @@ class BlogPost(Document):
         post.validate()
 
         post.authors_as_lazy = [Comment()]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.authors_as_lazy = [User()]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.authors_as_lazy = [user]
         post.validate()
 
         post.generic = [1, 2]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.generic = [User(), Comment()]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.generic = [Comment()]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.generic = [user]
         post.validate()
 
         post.generic_as_lazy = [1, 2]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.generic_as_lazy = [User(), Comment()]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.generic_as_lazy = [Comment()]
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.generic_as_lazy = [user]
         post.validate()
@@ -549,7 +572,7 @@ class BlogPost(Document):
         post.tags = ["leisure", "fun"]
         post.save()
         post.reload()
-        self.assertEqual(post.tags, ["fun", "leisure"])
+        assert post.tags == ["fun", "leisure"]
 
         comment1 = Comment(content="Good for you", order=1)
         comment2 = Comment(content="Yay.", order=0)
@@ -557,15 +580,15 @@ class BlogPost(Document):
         post.comments = comments
         post.save()
         post.reload()
-        self.assertEqual(post.comments[0].content, comment2.content)
-        self.assertEqual(post.comments[1].content, comment1.content)
+        assert post.comments[0].content == comment2.content
+        assert post.comments[1].content == comment1.content
 
         post.comments[0].order = 2
         post.save()
         post.reload()
 
-        self.assertEqual(post.comments[0].content, comment1.content)
-        self.assertEqual(post.comments[1].content, comment2.content)
+        assert post.comments[0].content == comment1.content
+        assert post.comments[1].content == comment2.content
 
     def test_reverse_list_sorting(self):
         """Ensure that a reverse sorted list field properly sorts values"""
@@ -590,9 +613,9 @@ class CategoryList(Document):
         catlist.save()
         catlist.reload()
 
-        self.assertEqual(catlist.categories[0].name, cat2.name)
-        self.assertEqual(catlist.categories[1].name, cat3.name)
-        self.assertEqual(catlist.categories[2].name, cat1.name)
+        assert catlist.categories[0].name == cat2.name
+        assert catlist.categories[1].name == cat3.name
+        assert catlist.categories[2].name == cat1.name
 
     def test_list_field(self):
         """Ensure that list types work as expected."""
@@ -604,10 +627,12 @@ class BlogPost(Document):
 
         post = BlogPost()
         post.info = "my post"
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.info = {"title": "test"}
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
 
         post.info = ["test"]
         post.save()
@@ -620,15 +645,13 @@ class BlogPost(Document):
         post.info = [{"test": 3}]
         post.save()
 
-        self.assertEqual(BlogPost.objects.count(), 3)
-        self.assertEqual(BlogPost.objects.filter(info__exact="test").count(), 1)
-        self.assertEqual(BlogPost.objects.filter(info__0__test="test").count(), 1)
+        assert BlogPost.objects.count() == 3
+        assert BlogPost.objects.filter(info__exact="test").count() == 1
+        assert BlogPost.objects.filter(info__0__test="test").count() == 1
 
         # Confirm handles non strings or non existing keys
-        self.assertEqual(BlogPost.objects.filter(info__0__test__exact="5").count(), 0)
-        self.assertEqual(
-            BlogPost.objects.filter(info__100__test__exact="test").count(), 0
-        )
+        assert BlogPost.objects.filter(info__0__test__exact="5").count() == 0
+        assert BlogPost.objects.filter(info__100__test__exact="test").count() == 0
 
         # test queries by list
         post = BlogPost()
@@ -637,12 +660,12 @@ class BlogPost(Document):
         post = BlogPost.objects(info=["1", "2"]).get()
         post.info += ["3", "4"]
         post.save()
-        self.assertEqual(BlogPost.objects(info=["1", "2", "3", "4"]).count(), 1)
+        assert BlogPost.objects(info=["1", "2", "3", "4"]).count() == 1
         post = BlogPost.objects(info=["1", "2", "3", "4"]).get()
         post.info *= 2
         post.save()
-        self.assertEqual(
-            BlogPost.objects(info=["1", "2", "3", "4", "1", "2", "3", "4"]).count(), 1
+        assert (
+            BlogPost.objects(info=["1", "2", "3", "4", "1", "2", "3", "4"]).count() == 1
         )
 
     def test_list_field_manipulative_operators(self):
@@ -670,165 +693,149 @@ def reset_post():
         reset_post()
         temp = ["a", "b"]
         post.info = post.info + temp
-        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "a", "b"])
+        assert post.info == ["0", "1", "2", "3", "4", "5", "a", "b"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "a", "b"])
+        assert post.info == ["0", "1", "2", "3", "4", "5", "a", "b"]
 
         # '__delitem__(index)'
         # aka 'del list[index]'
         # aka 'operator.delitem(list, index)'
         reset_post()
         del post.info[2]  # del from middle ('2')
-        self.assertEqual(post.info, ["0", "1", "3", "4", "5"])
+        assert post.info == ["0", "1", "3", "4", "5"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "1", "3", "4", "5"])
+        assert post.info == ["0", "1", "3", "4", "5"]
 
         # '__delitem__(slice(i, j))'
         # aka 'del list[i:j]'
         # aka 'operator.delitem(list, slice(i,j))'
         reset_post()
         del post.info[1:3]  # removes '1', '2'
-        self.assertEqual(post.info, ["0", "3", "4", "5"])
+        assert post.info == ["0", "3", "4", "5"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "3", "4", "5"])
+        assert post.info == ["0", "3", "4", "5"]
 
         # '__iadd__'
         # aka 'list += list'
         reset_post()
         temp = ["a", "b"]
         post.info += temp
-        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "a", "b"])
+        assert post.info == ["0", "1", "2", "3", "4", "5", "a", "b"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "a", "b"])
+        assert post.info == ["0", "1", "2", "3", "4", "5", "a", "b"]
 
         # '__imul__'
         # aka 'list *= number'
         reset_post()
         post.info *= 2
-        self.assertEqual(
-            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
-        )
+        assert post.info == ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
         post.save()
         post.reload()
-        self.assertEqual(
-            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
-        )
+        assert post.info == ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
 
         # '__mul__'
         # aka 'listA*listB'
         reset_post()
         post.info = post.info * 2
-        self.assertEqual(
-            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
-        )
+        assert post.info == ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
         post.save()
         post.reload()
-        self.assertEqual(
-            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
-        )
+        assert post.info == ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
 
         # '__rmul__'
         # aka 'listB*listA'
         reset_post()
         post.info = 2 * post.info
-        self.assertEqual(
-            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
-        )
+        assert post.info == ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
         post.save()
         post.reload()
-        self.assertEqual(
-            post.info, ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
-        )
+        assert post.info == ["0", "1", "2", "3", "4", "5", "0", "1", "2", "3", "4", "5"]
 
         # '__setitem__(index, value)'
         # aka 'list[index]=value'
         # aka 'setitem(list, value)'
         reset_post()
         post.info[4] = "a"
-        self.assertEqual(post.info, ["0", "1", "2", "3", "a", "5"])
+        assert post.info == ["0", "1", "2", "3", "a", "5"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "1", "2", "3", "a", "5"])
+        assert post.info == ["0", "1", "2", "3", "a", "5"]
 
         # __setitem__(index, value) with a negative index
         reset_post()
         post.info[-2] = "a"
-        self.assertEqual(post.info, ["0", "1", "2", "3", "a", "5"])
+        assert post.info == ["0", "1", "2", "3", "a", "5"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "1", "2", "3", "a", "5"])
+        assert post.info == ["0", "1", "2", "3", "a", "5"]
 
         # '__setitem__(slice(i, j), listB)'
         # aka 'listA[i:j] = listB'
         # aka 'setitem(listA, slice(i, j), listB)'
         reset_post()
         post.info[1:3] = ["h", "e", "l", "l", "o"]
-        self.assertEqual(post.info, ["0", "h", "e", "l", "l", "o", "3", "4", "5"])
+        assert post.info == ["0", "h", "e", "l", "l", "o", "3", "4", "5"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "h", "e", "l", "l", "o", "3", "4", "5"])
+        assert post.info == ["0", "h", "e", "l", "l", "o", "3", "4", "5"]
 
         # '__setitem__(slice(i, j), listB)' with negative i and j
         reset_post()
         post.info[-5:-3] = ["h", "e", "l", "l", "o"]
-        self.assertEqual(post.info, ["0", "h", "e", "l", "l", "o", "3", "4", "5"])
+        assert post.info == ["0", "h", "e", "l", "l", "o", "3", "4", "5"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "h", "e", "l", "l", "o", "3", "4", "5"])
+        assert post.info == ["0", "h", "e", "l", "l", "o", "3", "4", "5"]
 
         # negative
 
         # 'append'
         reset_post()
         post.info.append("h")
-        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "h"])
+        assert post.info == ["0", "1", "2", "3", "4", "5", "h"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "1", "2", "3", "4", "5", "h"])
+        assert post.info == ["0", "1", "2", "3", "4", "5", "h"]
 
         # 'extend'
         reset_post()
         post.info.extend(["h", "e", "l", "l", "o"])
-        self.assertEqual(
-            post.info, ["0", "1", "2", "3", "4", "5", "h", "e", "l", "l", "o"]
-        )
+        assert post.info == ["0", "1", "2", "3", "4", "5", "h", "e", "l", "l", "o"]
         post.save()
         post.reload()
-        self.assertEqual(
-            post.info, ["0", "1", "2", "3", "4", "5", "h", "e", "l", "l", "o"]
-        )
+        assert post.info == ["0", "1", "2", "3", "4", "5", "h", "e", "l", "l", "o"]
         # 'insert'
 
         # 'pop'
         reset_post()
         x = post.info.pop(2)
         y = post.info.pop()
-        self.assertEqual(post.info, ["0", "1", "3", "4"])
-        self.assertEqual(x, "2")
-        self.assertEqual(y, "5")
+        assert post.info == ["0", "1", "3", "4"]
+        assert x == "2"
+        assert y == "5"
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "1", "3", "4"])
+        assert post.info == ["0", "1", "3", "4"]
 
         # 'remove'
         reset_post()
         post.info.remove("2")
-        self.assertEqual(post.info, ["0", "1", "3", "4", "5"])
+        assert post.info == ["0", "1", "3", "4", "5"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["0", "1", "3", "4", "5"])
+        assert post.info == ["0", "1", "3", "4", "5"]
 
         # 'reverse'
         reset_post()
         post.info.reverse()
-        self.assertEqual(post.info, ["5", "4", "3", "2", "1", "0"])
+        assert post.info == ["5", "4", "3", "2", "1", "0"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, ["5", "4", "3", "2", "1", "0"])
+        assert post.info == ["5", "4", "3", "2", "1", "0"]
 
         # 'sort': though this operator method does manipulate the list, it is
         # tested in the 'test_list_field_lexicograpic_operators' function
@@ -844,7 +851,8 @@ class BlogPost(Document):
 
         # '__hash__'
         # aka 'hash(list)'
-        self.assertRaises(TypeError, lambda: hash(post.info))
+        with pytest.raises(TypeError):
+            hash(post.info)
 
     def test_list_field_lexicographic_operators(self):
         """Ensure that ListField works with standard list operators that
@@ -883,32 +891,32 @@ class BlogPost(Document):
         blogLargeB.reload()
 
         # '__eq__' aka '=='
-        self.assertEqual(blogLargeA.text_info, blogLargeB.text_info)
-        self.assertEqual(blogLargeA.bool_info, blogLargeB.bool_info)
+        assert blogLargeA.text_info == blogLargeB.text_info
+        assert blogLargeA.bool_info == blogLargeB.bool_info
 
         # '__ge__' aka '>='
-        self.assertGreaterEqual(blogLargeA.text_info, blogSmall.text_info)
-        self.assertGreaterEqual(blogLargeA.text_info, blogLargeB.text_info)
-        self.assertGreaterEqual(blogLargeA.bool_info, blogSmall.bool_info)
-        self.assertGreaterEqual(blogLargeA.bool_info, blogLargeB.bool_info)
+        assert blogLargeA.text_info >= blogSmall.text_info
+        assert blogLargeA.text_info >= blogLargeB.text_info
+        assert blogLargeA.bool_info >= blogSmall.bool_info
+        assert blogLargeA.bool_info >= blogLargeB.bool_info
 
         # '__gt__' aka '>'
-        self.assertGreaterEqual(blogLargeA.text_info, blogSmall.text_info)
-        self.assertGreaterEqual(blogLargeA.bool_info, blogSmall.bool_info)
+        assert blogLargeA.text_info >= blogSmall.text_info
+        assert blogLargeA.bool_info >= blogSmall.bool_info
 
         # '__le__' aka '<='
-        self.assertLessEqual(blogSmall.text_info, blogLargeB.text_info)
-        self.assertLessEqual(blogLargeA.text_info, blogLargeB.text_info)
-        self.assertLessEqual(blogSmall.bool_info, blogLargeB.bool_info)
-        self.assertLessEqual(blogLargeA.bool_info, blogLargeB.bool_info)
+        assert blogSmall.text_info <= blogLargeB.text_info
+        assert blogLargeA.text_info <= blogLargeB.text_info
+        assert blogSmall.bool_info <= blogLargeB.bool_info
+        assert blogLargeA.bool_info <= blogLargeB.bool_info
 
         # '__lt__' aka '<'
-        self.assertLess(blogSmall.text_info, blogLargeB.text_info)
-        self.assertLess(blogSmall.bool_info, blogLargeB.bool_info)
+        assert blogSmall.text_info < blogLargeB.text_info
+        assert blogSmall.bool_info < blogLargeB.bool_info
 
         # '__ne__' aka '!='
-        self.assertNotEqual(blogSmall.text_info, blogLargeB.text_info)
-        self.assertNotEqual(blogSmall.bool_info, blogLargeB.bool_info)
+        assert blogSmall.text_info != blogLargeB.text_info
+        assert blogSmall.bool_info != blogLargeB.bool_info
 
         # 'sort'
         blogLargeB.bool_info = [True, False, True, False]
@@ -920,14 +928,14 @@ class BlogPost(Document):
             ObjectId("54495ad94c934721ede76d23"),
             ObjectId("54495ad94c934721ede76f90"),
         ]
-        self.assertEqual(blogLargeB.text_info, ["a", "j", "z"])
-        self.assertEqual(blogLargeB.oid_info, sorted_target_list)
-        self.assertEqual(blogLargeB.bool_info, [False, False, True, True])
+        assert blogLargeB.text_info == ["a", "j", "z"]
+        assert blogLargeB.oid_info == sorted_target_list
+        assert blogLargeB.bool_info == [False, False, True, True]
         blogLargeB.save()
         blogLargeB.reload()
-        self.assertEqual(blogLargeB.text_info, ["a", "j", "z"])
-        self.assertEqual(blogLargeB.oid_info, sorted_target_list)
-        self.assertEqual(blogLargeB.bool_info, [False, False, True, True])
+        assert blogLargeB.text_info == ["a", "j", "z"]
+        assert blogLargeB.oid_info == sorted_target_list
+        assert blogLargeB.bool_info == [False, False, True, True]
 
     def test_list_assignment(self):
         """Ensure that list field element assignment and slicing work."""
@@ -944,37 +952,37 @@ class BlogPost(Document):
         post.info[0] = 1
         post.save()
         post.reload()
-        self.assertEqual(post.info[0], 1)
+        assert post.info[0] == 1
 
         post.info[1:3] = ["n2", "n3"]
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, "n2", "n3", "4", 5])
+        assert post.info == [1, "n2", "n3", "4", 5]
 
         post.info[-1] = "n5"
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, "n2", "n3", "4", "n5"])
+        assert post.info == [1, "n2", "n3", "4", "n5"]
 
         post.info[-2] = 4
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, "n2", "n3", 4, "n5"])
+        assert post.info == [1, "n2", "n3", 4, "n5"]
 
         post.info[1:-1] = [2]
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, 2, "n5"])
+        assert post.info == [1, 2, "n5"]
 
         post.info[:-1] = [1, "n2", "n3", 4]
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, "n2", "n3", 4, "n5"])
+        assert post.info == [1, "n2", "n3", 4, "n5"]
 
         post.info[-4:3] = [2, 3]
         post.save()
         post.reload()
-        self.assertEqual(post.info, [1, 2, 3, 4, "n5"])
+        assert post.info == [1, 2, 3, 4, "n5"]
 
     def test_list_field_passed_in_value(self):
         class Foo(Document):
@@ -988,7 +996,7 @@ class Bar(Document):
 
         foo = Foo(bars=[])
         foo.bars.append(bar)
-        self.assertEqual(repr(foo.bars), "[<Bar: Bar object>]")
+        assert repr(foo.bars) == "[<Bar: Bar object>]"
 
     def test_list_field_strict(self):
         """Ensure that list field handles validation if provided
@@ -1005,7 +1013,7 @@ class Simple(Document):
         e.save()
 
         # try creating an invalid mapping
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             e.mapping = ["abc"]
             e.save()
 
@@ -1021,9 +1029,9 @@ class Foo(Document):
             if i < 6:
                 foo.save()
             else:
-                with self.assertRaises(ValidationError) as cm:
+                with pytest.raises(ValidationError) as cm:
                     foo.save()
-                self.assertIn("List is too long", str(cm.exception))
+                assert "List is too long" in str(cm.exception)
 
     def test_list_field_max_length_set_operator(self):
         """Ensure ListField's max_length is respected for a "set" operator."""
@@ -1032,9 +1040,9 @@ class Foo(Document):
             items = ListField(IntField(), max_length=3)
 
         foo = Foo.objects.create(items=[1, 2, 3])
-        with self.assertRaises(ValidationError) as cm:
+        with pytest.raises(ValidationError) as cm:
             foo.modify(set__items=[1, 2, 3, 4])
-        self.assertIn("List is too long", str(cm.exception))
+        assert "List is too long" in str(cm.exception)
 
     def test_list_field_rejects_strings(self):
         """Strings aren't valid list field data types."""
@@ -1046,7 +1054,8 @@ class Simple(Document):
 
         e = Simple()
         e.mapping = "hello world"
-        self.assertRaises(ValidationError, e.save)
+        with pytest.raises(ValidationError):
+            e.save()
 
     def test_complex_field_required(self):
         """Ensure required cant be None / Empty."""
@@ -1058,7 +1067,8 @@ class Simple(Document):
 
         e = Simple()
         e.mapping = []
-        self.assertRaises(ValidationError, e.save)
+        with pytest.raises(ValidationError):
+            e.save()
 
         class Simple(Document):
             mapping = DictField(required=True)
@@ -1066,7 +1076,8 @@ class Simple(Document):
         Simple.drop_collection()
         e = Simple()
         e.mapping = {}
-        self.assertRaises(ValidationError, e.save)
+        with pytest.raises(ValidationError):
+            e.save()
 
     def test_complex_field_same_value_not_changed(self):
         """If a complex field is set to the same value, it should not
@@ -1080,7 +1091,7 @@ class Simple(Document):
 
         e = Simple().save()
         e.mapping = []
-        self.assertEqual([], e._changed_fields)
+        assert [] == e._changed_fields
 
         class Simple(Document):
             mapping = DictField()
@@ -1089,7 +1100,7 @@ class Simple(Document):
 
         e = Simple().save()
         e.mapping = {}
-        self.assertEqual([], e._changed_fields)
+        assert [] == e._changed_fields
 
     def test_slice_marks_field_as_changed(self):
         class Simple(Document):
@@ -1097,11 +1108,11 @@ class Simple(Document):
 
         simple = Simple(widgets=[1, 2, 3, 4]).save()
         simple.widgets[:3] = []
-        self.assertEqual(["widgets"], simple._changed_fields)
+        assert ["widgets"] == simple._changed_fields
         simple.save()
 
         simple = simple.reload()
-        self.assertEqual(simple.widgets, [4])
+        assert simple.widgets == [4]
 
     def test_del_slice_marks_field_as_changed(self):
         class Simple(Document):
@@ -1109,11 +1120,11 @@ class Simple(Document):
 
         simple = Simple(widgets=[1, 2, 3, 4]).save()
         del simple.widgets[:3]
-        self.assertEqual(["widgets"], simple._changed_fields)
+        assert ["widgets"] == simple._changed_fields
         simple.save()
 
         simple = simple.reload()
-        self.assertEqual(simple.widgets, [4])
+        assert simple.widgets == [4]
 
     def test_list_field_with_negative_indices(self):
         class Simple(Document):
@@ -1121,11 +1132,11 @@ class Simple(Document):
 
         simple = Simple(widgets=[1, 2, 3, 4]).save()
         simple.widgets[-1] = 5
-        self.assertEqual(["widgets.3"], simple._changed_fields)
+        assert ["widgets.3"] == simple._changed_fields
         simple.save()
 
         simple = simple.reload()
-        self.assertEqual(simple.widgets, [1, 2, 3, 5])
+        assert simple.widgets == [1, 2, 3, 5]
 
     def test_list_field_complex(self):
         """Ensure that the list fields can handle the complex types."""
@@ -1159,33 +1170,23 @@ class Simple(Document):
         e.save()
 
         e2 = Simple.objects.get(id=e.id)
-        self.assertIsInstance(e2.mapping[0], StringSetting)
-        self.assertIsInstance(e2.mapping[1], IntegerSetting)
+        assert isinstance(e2.mapping[0], StringSetting)
+        assert isinstance(e2.mapping[1], IntegerSetting)
 
         # Test querying
-        self.assertEqual(Simple.objects.filter(mapping__1__value=42).count(), 1)
-        self.assertEqual(Simple.objects.filter(mapping__2__number=1).count(), 1)
-        self.assertEqual(
-            Simple.objects.filter(mapping__2__complex__value=42).count(), 1
-        )
-        self.assertEqual(
-            Simple.objects.filter(mapping__2__list__0__value=42).count(), 1
-        )
-        self.assertEqual(
-            Simple.objects.filter(mapping__2__list__1__value="foo").count(), 1
-        )
+        assert Simple.objects.filter(mapping__1__value=42).count() == 1
+        assert Simple.objects.filter(mapping__2__number=1).count() == 1
+        assert Simple.objects.filter(mapping__2__complex__value=42).count() == 1
+        assert Simple.objects.filter(mapping__2__list__0__value=42).count() == 1
+        assert Simple.objects.filter(mapping__2__list__1__value="foo").count() == 1
 
         # Confirm can update
         Simple.objects().update(set__mapping__1=IntegerSetting(value=10))
-        self.assertEqual(Simple.objects.filter(mapping__1__value=10).count(), 1)
+        assert Simple.objects.filter(mapping__1__value=10).count() == 1
 
         Simple.objects().update(set__mapping__2__list__1=StringSetting(value="Boo"))
-        self.assertEqual(
-            Simple.objects.filter(mapping__2__list__1__value="foo").count(), 0
-        )
-        self.assertEqual(
-            Simple.objects.filter(mapping__2__list__1__value="Boo").count(), 1
-        )
+        assert Simple.objects.filter(mapping__2__list__1__value="foo").count() == 0
+        assert Simple.objects.filter(mapping__2__list__1__value="Boo").count() == 1
 
     def test_embedded_db_field(self):
         class Embedded(EmbeddedDocument):
@@ -1203,9 +1204,9 @@ class Test(Document):
         Test.objects.update_one(inc__embedded__number=1)
 
         test = Test.objects.get()
-        self.assertEqual(test.embedded.number, 2)
+        assert test.embedded.number == 2
         doc = self.db.test.find_one()
-        self.assertEqual(doc["x"]["i"], 2)
+        assert doc["x"]["i"] == 2
 
     def test_double_embedded_db_field(self):
         """Make sure multiple layers of embedded docs resolve db fields
@@ -1242,7 +1243,7 @@ class A(Document):
             b = EmbeddedDocumentField(B, db_field="fb")
 
         a = A._from_son(SON([("fb", SON([("fc", SON([("txt", "hi")]))]))]))
-        self.assertEqual(a.b.c.txt, "hi")
+        assert a.b.c.txt == "hi"
 
     def test_embedded_document_field_cant_reference_using_a_str_if_it_does_not_exist_yet(
         self,
@@ -1277,18 +1278,21 @@ class Person(Document):
 
         person = Person(name="Test User")
         person.preferences = "My Preferences"
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         # Check that only the right embedded doc works
         person.preferences = Comment(content="Nice blog post...")
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         # Check that the embedded doc is valid
         person.preferences = PersonPreferences()
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person.preferences = PersonPreferences(food="Cheese", number=47)
-        self.assertEqual(person.preferences.food, "Cheese")
+        assert person.preferences.food == "Cheese"
         person.validate()
 
     def test_embedded_document_inheritance(self):
@@ -1314,7 +1318,7 @@ class BlogPost(Document):
         post.author = PowerUser(name="Test User", power=47)
         post.save()
 
-        self.assertEqual(47, BlogPost.objects.first().author.power)
+        assert 47 == BlogPost.objects.first().author.power
 
     def test_embedded_document_inheritance_with_list(self):
         """Ensure that nested list of subclassed embedded documents is
@@ -1339,7 +1343,7 @@ class User(Basedoc):
         foobar = User(groups=[group])
         foobar.save()
 
-        self.assertEqual(content, User.objects.first().groups[0].content)
+        assert content == User.objects.first().groups[0].content
 
     def test_reference_miss(self):
         """Ensure an exception is raised when dereferencing an unknown
@@ -1362,16 +1366,18 @@ class Bar(Document):
         # Reference is no longer valid
         foo.delete()
         bar = Bar.objects.get()
-        self.assertRaises(DoesNotExist, getattr, bar, "ref")
-        self.assertRaises(DoesNotExist, getattr, bar, "generic_ref")
+        with pytest.raises(DoesNotExist):
+            getattr(bar, "ref")
+        with pytest.raises(DoesNotExist):
+            getattr(bar, "generic_ref")
 
         # When auto_dereference is disabled, there is no trouble returning DBRef
         bar = Bar.objects.get()
         expected = foo.to_dbref()
         bar._fields["ref"]._auto_dereference = False
-        self.assertEqual(bar.ref, expected)
+        assert bar.ref == expected
         bar._fields["generic_ref"]._auto_dereference = False
-        self.assertEqual(bar.generic_ref, {"_ref": expected, "_cls": "Foo"})
+        assert bar.generic_ref == {"_ref": expected, "_cls": "Foo"}
 
     def test_list_item_dereference(self):
         """Ensure that DBRef items in ListFields are dereferenced.
@@ -1396,8 +1402,8 @@ class Group(Document):
 
         group_obj = Group.objects.first()
 
-        self.assertEqual(group_obj.members[0].name, user1.name)
-        self.assertEqual(group_obj.members[1].name, user2.name)
+        assert group_obj.members[0].name == user1.name
+        assert group_obj.members[1].name == user2.name
 
     def test_recursive_reference(self):
         """Ensure that ReferenceFields can reference their own documents.
@@ -1424,8 +1430,8 @@ class Employee(Document):
         peter.save()
 
         peter = Employee.objects.with_id(peter.id)
-        self.assertEqual(peter.boss, bill)
-        self.assertEqual(peter.friends, friends)
+        assert peter.boss == bill
+        assert peter.friends == friends
 
     def test_recursive_embedding(self):
         """Ensure that EmbeddedDocumentFields can contain their own documents.
@@ -1450,18 +1456,18 @@ class Tree(Document):
         tree.save()
 
         tree = Tree.objects.first()
-        self.assertEqual(len(tree.children), 1)
+        assert len(tree.children) == 1
 
-        self.assertEqual(len(tree.children[0].children), 1)
+        assert len(tree.children[0].children) == 1
 
         third_child = TreeNode(name="Child 3")
         tree.children[0].children.append(third_child)
         tree.save()
 
-        self.assertEqual(len(tree.children), 1)
-        self.assertEqual(tree.children[0].name, first_child.name)
-        self.assertEqual(tree.children[0].children[0].name, second_child.name)
-        self.assertEqual(tree.children[0].children[1].name, third_child.name)
+        assert len(tree.children) == 1
+        assert tree.children[0].name == first_child.name
+        assert tree.children[0].children[0].name == second_child.name
+        assert tree.children[0].children[1].name == third_child.name
 
         # Test updating
         tree.children[0].name = "I am Child 1"
@@ -1469,28 +1475,28 @@ class Tree(Document):
         tree.children[0].children[1].name = "I am Child 3"
         tree.save()
 
-        self.assertEqual(tree.children[0].name, "I am Child 1")
-        self.assertEqual(tree.children[0].children[0].name, "I am Child 2")
-        self.assertEqual(tree.children[0].children[1].name, "I am Child 3")
+        assert tree.children[0].name == "I am Child 1"
+        assert tree.children[0].children[0].name == "I am Child 2"
+        assert tree.children[0].children[1].name == "I am Child 3"
 
         # Test removal
-        self.assertEqual(len(tree.children[0].children), 2)
+        assert len(tree.children[0].children) == 2
         del tree.children[0].children[1]
 
         tree.save()
-        self.assertEqual(len(tree.children[0].children), 1)
+        assert len(tree.children[0].children) == 1
 
         tree.children[0].children.pop(0)
         tree.save()
-        self.assertEqual(len(tree.children[0].children), 0)
-        self.assertEqual(tree.children[0].children, [])
+        assert len(tree.children[0].children) == 0
+        assert tree.children[0].children == []
 
         tree.children[0].children.insert(0, third_child)
         tree.children[0].children.insert(0, second_child)
         tree.save()
-        self.assertEqual(len(tree.children[0].children), 2)
-        self.assertEqual(tree.children[0].children[0].name, second_child.name)
-        self.assertEqual(tree.children[0].children[1].name, third_child.name)
+        assert len(tree.children[0].children) == 2
+        assert tree.children[0].children[0].name == second_child.name
+        assert tree.children[0].children[1].name == third_child.name
 
     def test_drop_abstract_document(self):
         """Ensure that an abstract document cannot be dropped given it
@@ -1501,7 +1507,8 @@ class AbstractDoc(Document):
             name = StringField()
             meta = {"abstract": True}
 
-        self.assertRaises(OperationError, AbstractDoc.drop_collection)
+        with pytest.raises(OperationError):
+            AbstractDoc.drop_collection()
 
     def test_reference_class_with_abstract_parent(self):
         """Ensure that a class with an abstract parent can be referenced.
@@ -1525,7 +1532,7 @@ class Brother(Sibling):
         brother = Brother(name="Bob", sibling=sister)
         brother.save()
 
-        self.assertEqual(Brother.objects[0].sibling.name, sister.name)
+        assert Brother.objects[0].sibling.name == sister.name
 
     def test_reference_abstract_class(self):
         """Ensure that an abstract class instance cannot be used in the
@@ -1547,7 +1554,8 @@ class Brother(Sibling):
 
         sister = Sibling(name="Alice")
         brother = Brother(name="Bob", sibling=sister)
-        self.assertRaises(ValidationError, brother.save)
+        with pytest.raises(ValidationError):
+            brother.save()
 
     def test_abstract_reference_base_type(self):
         """Ensure that an an abstract reference fails validation when given a
@@ -1570,7 +1578,8 @@ class Mother(Document):
         mother = Mother(name="Carol")
         mother.save()
         brother = Brother(name="Bob", sibling=mother)
-        self.assertRaises(ValidationError, brother.save)
+        with pytest.raises(ValidationError):
+            brother.save()
 
     def test_generic_reference(self):
         """Ensure that a GenericReferenceField properly dereferences items.
@@ -1601,16 +1610,16 @@ class Bookmark(Document):
 
         bm = Bookmark.objects(bookmark_object=post_1).first()
 
-        self.assertEqual(bm.bookmark_object, post_1)
-        self.assertIsInstance(bm.bookmark_object, Post)
+        assert bm.bookmark_object == post_1
+        assert isinstance(bm.bookmark_object, Post)
 
         bm.bookmark_object = link_1
         bm.save()
 
         bm = Bookmark.objects(bookmark_object=link_1).first()
 
-        self.assertEqual(bm.bookmark_object, link_1)
-        self.assertIsInstance(bm.bookmark_object, Link)
+        assert bm.bookmark_object == link_1
+        assert isinstance(bm.bookmark_object, Link)
 
     def test_generic_reference_list(self):
         """Ensure that a ListField properly dereferences generic references.
@@ -1640,8 +1649,8 @@ class User(Document):
 
         user = User.objects(bookmarks__all=[post_1, link_1]).first()
 
-        self.assertEqual(user.bookmarks[0], post_1)
-        self.assertEqual(user.bookmarks[1], link_1)
+        assert user.bookmarks[0] == post_1
+        assert user.bookmarks[1] == link_1
 
     def test_generic_reference_document_not_registered(self):
         """Ensure dereferencing out of the document registry throws a
@@ -1682,7 +1691,7 @@ class Person(Document):
         Person.drop_collection()
 
         Person(name="Wilson Jr").save()
-        self.assertEqual(repr(Person.objects(city=None)), "[<Person: Person object>]")
+        assert repr(Person.objects(city=None)) == "[<Person: Person object>]"
 
     def test_generic_reference_choices(self):
         """Ensure that a GenericReferenceField can handle choices."""
@@ -1707,13 +1716,14 @@ class Bookmark(Document):
         post_1.save()
 
         bm = Bookmark(bookmark_object=link_1)
-        self.assertRaises(ValidationError, bm.validate)
+        with pytest.raises(ValidationError):
+            bm.validate()
 
         bm = Bookmark(bookmark_object=post_1)
         bm.save()
 
         bm = Bookmark.objects.first()
-        self.assertEqual(bm.bookmark_object, post_1)
+        assert bm.bookmark_object == post_1
 
     def test_generic_reference_string_choices(self):
         """Ensure that a GenericReferenceField can handle choices as strings
@@ -1745,7 +1755,8 @@ class Bookmark(Document):
         bm.save()
 
         bm = Bookmark(bookmark_object=bm)
-        self.assertRaises(ValidationError, bm.validate)
+        with pytest.raises(ValidationError):
+            bm.validate()
 
     def test_generic_reference_choices_no_dereference(self):
         """Ensure that a GenericReferenceField can handle choices on
@@ -1798,13 +1809,14 @@ class User(Document):
         post_1.save()
 
         user = User(bookmarks=[link_1])
-        self.assertRaises(ValidationError, user.validate)
+        with pytest.raises(ValidationError):
+            user.validate()
 
         user = User(bookmarks=[post_1])
         user.save()
 
         user = User.objects.first()
-        self.assertEqual(user.bookmarks, [post_1])
+        assert user.bookmarks == [post_1]
 
     def test_generic_reference_list_item_modification(self):
         """Ensure that modifications of related documents (through generic reference) don't influence on querying
@@ -1832,8 +1844,8 @@ class User(Document):
 
         user = User.objects(bookmarks__all=[post_1]).first()
 
-        self.assertNotEqual(user, None)
-        self.assertEqual(user.bookmarks[0], post_1)
+        assert user != None
+        assert user.bookmarks[0] == post_1
 
     def test_generic_reference_filter_by_dbref(self):
         """Ensure we can search for a specific generic reference by
@@ -1849,7 +1861,7 @@ class Doc(Document):
         doc2 = Doc.objects.create(ref=doc1)
 
         doc = Doc.objects.get(ref=DBRef("doc", doc1.pk))
-        self.assertEqual(doc, doc2)
+        assert doc == doc2
 
     def test_generic_reference_is_not_tracked_in_parent_doc(self):
         """Ensure that modifications of related documents (through generic reference) don't influence
@@ -1871,11 +1883,11 @@ class Doc2(Document):
         doc2 = Doc2(ref=doc1, refs=[doc11]).save()
 
         doc2.ref.name = "garbage2"
-        self.assertEqual(doc2._get_changed_fields(), [])
+        assert doc2._get_changed_fields() == []
 
         doc2.refs[0].name = "garbage3"
-        self.assertEqual(doc2._get_changed_fields(), [])
-        self.assertEqual(doc2._delta(), ({}, {}))
+        assert doc2._get_changed_fields() == []
+        assert doc2._delta() == ({}, {})
 
     def test_generic_reference_field(self):
         """Ensure we can search for a specific generic reference by
@@ -1890,10 +1902,10 @@ class Doc(Document):
         doc1 = Doc.objects.create()
         doc2 = Doc.objects.create(ref=doc1)
 
-        self.assertIsInstance(doc1.pk, ObjectId)
+        assert isinstance(doc1.pk, ObjectId)
 
         doc = Doc.objects.get(ref=doc1.pk)
-        self.assertEqual(doc, doc2)
+        assert doc == doc2
 
     def test_choices_allow_using_sets_as_choices(self):
         """Ensure that sets can be used when setting choices
@@ -1933,7 +1945,7 @@ class Shirt(Document):
             size = StringField(choices=("S", "M"))
 
         shirt = Shirt(size="XS")
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             shirt.validate()
 
     def test_choices_get_field_display(self):
@@ -1964,24 +1976,25 @@ class Shirt(Document):
         shirt2 = Shirt()
 
         # Make sure get_<field>_display returns the default value (or None)
-        self.assertEqual(shirt1.get_size_display(), None)
-        self.assertEqual(shirt1.get_style_display(), "Wide")
+        assert shirt1.get_size_display() == None
+        assert shirt1.get_style_display() == "Wide"
 
         shirt1.size = "XXL"
         shirt1.style = "B"
         shirt2.size = "M"
         shirt2.style = "S"
-        self.assertEqual(shirt1.get_size_display(), "Extra Extra Large")
-        self.assertEqual(shirt1.get_style_display(), "Baggy")
-        self.assertEqual(shirt2.get_size_display(), "Medium")
-        self.assertEqual(shirt2.get_style_display(), "Small")
+        assert shirt1.get_size_display() == "Extra Extra Large"
+        assert shirt1.get_style_display() == "Baggy"
+        assert shirt2.get_size_display() == "Medium"
+        assert shirt2.get_style_display() == "Small"
 
         # Set as Z - an invalid choice
         shirt1.size = "Z"
         shirt1.style = "Z"
-        self.assertEqual(shirt1.get_size_display(), "Z")
-        self.assertEqual(shirt1.get_style_display(), "Z")
-        self.assertRaises(ValidationError, shirt1.validate)
+        assert shirt1.get_size_display() == "Z"
+        assert shirt1.get_style_display() == "Z"
+        with pytest.raises(ValidationError):
+            shirt1.validate()
 
     def test_simple_choices_validation(self):
         """Ensure that value is in a container of allowed values.
@@ -1999,7 +2012,8 @@ class Shirt(Document):
         shirt.validate()
 
         shirt.size = "XS"
-        self.assertRaises(ValidationError, shirt.validate)
+        with pytest.raises(ValidationError):
+            shirt.validate()
 
     def test_simple_choices_get_field_display(self):
         """Test dynamic helper for returning the display value of a choices
@@ -2016,20 +2030,21 @@ class Shirt(Document):
 
         shirt = Shirt()
 
-        self.assertEqual(shirt.get_size_display(), None)
-        self.assertEqual(shirt.get_style_display(), "Small")
+        assert shirt.get_size_display() == None
+        assert shirt.get_style_display() == "Small"
 
         shirt.size = "XXL"
         shirt.style = "Baggy"
-        self.assertEqual(shirt.get_size_display(), "XXL")
-        self.assertEqual(shirt.get_style_display(), "Baggy")
+        assert shirt.get_size_display() == "XXL"
+        assert shirt.get_style_display() == "Baggy"
 
         # Set as Z - an invalid choice
         shirt.size = "Z"
         shirt.style = "Z"
-        self.assertEqual(shirt.get_size_display(), "Z")
-        self.assertEqual(shirt.get_style_display(), "Z")
-        self.assertRaises(ValidationError, shirt.validate)
+        assert shirt.get_size_display() == "Z"
+        assert shirt.get_style_display() == "Z"
+        with pytest.raises(ValidationError):
+            shirt.validate()
 
     def test_simple_choices_validation_invalid_value(self):
         """Ensure that error messages are correct.
@@ -2060,8 +2075,8 @@ class Shirt(Document):
         except ValidationError as error:
             # get the validation rules
             error_dict = error.to_dict()
-            self.assertEqual(error_dict["size"], SIZE_MESSAGE)
-            self.assertEqual(error_dict["color"], COLOR_MESSAGE)
+            assert error_dict["size"] == SIZE_MESSAGE
+            assert error_dict["color"] == COLOR_MESSAGE
 
     def test_recursive_validation(self):
         """Ensure that a validation result to_dict is available."""
@@ -2082,26 +2097,25 @@ class Post(Document):
         post.comments.append(Comment(content="hello", author=bob))
         post.comments.append(Comment(author=bob))
 
-        self.assertRaises(ValidationError, post.validate)
+        with pytest.raises(ValidationError):
+            post.validate()
         try:
             post.validate()
         except ValidationError as error:
             # ValidationError.errors property
-            self.assertTrue(hasattr(error, "errors"))
-            self.assertIsInstance(error.errors, dict)
-            self.assertIn("comments", error.errors)
-            self.assertIn(1, error.errors["comments"])
-            self.assertIsInstance(
-                error.errors["comments"][1]["content"], ValidationError
-            )
+            assert hasattr(error, "errors")
+            assert isinstance(error.errors, dict)
+            assert "comments" in error.errors
+            assert 1 in error.errors["comments"]
+            assert isinstance(error.errors["comments"][1]["content"], ValidationError)
 
             # ValidationError.schema property
             error_dict = error.to_dict()
-            self.assertIsInstance(error_dict, dict)
-            self.assertIn("comments", error_dict)
-            self.assertIn(1, error_dict["comments"])
-            self.assertIn("content", error_dict["comments"][1])
-            self.assertEqual(error_dict["comments"][1]["content"], u"Field is required")
+            assert isinstance(error_dict, dict)
+            assert "comments" in error_dict
+            assert 1 in error_dict["comments"]
+            assert "content" in error_dict["comments"][1]
+            assert error_dict["comments"][1]["content"] == u"Field is required"
 
         post.comments[1].content = "here we go"
         post.validate()
@@ -2131,10 +2145,10 @@ class TestDoc(Document):
         doc.items = tuples
         doc.save()
         x = TestDoc.objects().get()
-        self.assertIsNotNone(x)
-        self.assertEqual(len(x.items), 1)
-        self.assertIn(tuple(x.items[0]), tuples)
-        self.assertIn(x.items[0], tuples)
+        assert x is not None
+        assert len(x.items) == 1
+        assert tuple(x.items[0]) in tuples
+        assert x.items[0] in tuples
 
     def test_dynamic_fields_class(self):
         class Doc2(Document):
@@ -2150,13 +2164,14 @@ class Doc(Document):
 
         doc2 = Doc2(field_1="hello")
         doc = Doc(my_id=1, embed_me=doc2, field_x="x")
-        self.assertRaises(OperationError, doc.save)
+        with pytest.raises(OperationError):
+            doc.save()
 
         doc2.save()
         doc.save()
 
         doc = Doc.objects.get()
-        self.assertEqual(doc.embed_me.field_1, "hello")
+        assert doc.embed_me.field_1 == "hello"
 
     def test_dynamic_fields_embedded_class(self):
         class Embed(EmbeddedDocument):
@@ -2172,7 +2187,7 @@ class Doc(Document):
         Doc(my_id=1, embed_me=Embed(field_1="hello"), field_x="x").save()
 
         doc = Doc.objects.get()
-        self.assertEqual(doc.embed_me.field_1, "hello")
+        assert doc.embed_me.field_1 == "hello"
 
     def test_dynamicfield_dump_document(self):
         """Ensure a DynamicField can handle another document's dump."""
@@ -2197,15 +2212,15 @@ class ToEmbedChild(ToEmbedParent):
         to_embed = ToEmbed(id=2, recursive=to_embed_recursive).save()
         doc = Doc(field=to_embed)
         doc.save()
-        self.assertIsInstance(doc.field, ToEmbed)
-        self.assertEqual(doc.field, to_embed)
+        assert isinstance(doc.field, ToEmbed)
+        assert doc.field == to_embed
         # Same thing with a Document with a _cls field
         to_embed_recursive = ToEmbedChild(id=1).save()
         to_embed_child = ToEmbedChild(id=2, recursive=to_embed_recursive).save()
         doc = Doc(field=to_embed_child)
         doc.save()
-        self.assertIsInstance(doc.field, ToEmbedChild)
-        self.assertEqual(doc.field, to_embed_child)
+        assert isinstance(doc.field, ToEmbedChild)
+        assert doc.field == to_embed_child
 
     def test_cls_field(self):
         class Animal(Document):
@@ -2227,10 +2242,10 @@ class Human(Mammal):
         Dog().save()
         Fish().save()
         Human().save()
-        self.assertEqual(
-            Animal.objects(_cls__in=["Animal.Mammal.Dog", "Animal.Fish"]).count(), 2
+        assert (
+            Animal.objects(_cls__in=["Animal.Mammal.Dog", "Animal.Fish"]).count() == 2
         )
-        self.assertEqual(Animal.objects(_cls__in=["Animal.Fish.Guppy"]).count(), 0)
+        assert Animal.objects(_cls__in=["Animal.Fish.Guppy"]).count() == 0
 
     def test_sparse_field(self):
         class Doc(Document):
@@ -2249,7 +2264,7 @@ def test_undefined_field_exception(self):
         class Doc(Document):
             foo = StringField()
 
-        with self.assertRaises(FieldDoesNotExist):
+        with pytest.raises(FieldDoesNotExist):
             Doc(bar="test")
 
     def test_undefined_field_exception_with_strict(self):
@@ -2262,7 +2277,7 @@ class Doc(Document):
             foo = StringField()
             meta = {"strict": False}
 
-        with self.assertRaises(FieldDoesNotExist):
+        with pytest.raises(FieldDoesNotExist):
             Doc(bar="test")
 
 
@@ -2310,20 +2325,20 @@ class Title(Document):
         # Test with an embeddedDocument instead of a list(embeddedDocument)
         # It's an edge case but it used to fail with a vague error, making it difficult to troubleshoot it
         post = self.BlogPost(comments=comment)
-        with self.assertRaises(ValidationError) as ctx_err:
+        with pytest.raises(ValidationError) as ctx_err:
             post.validate()
-        self.assertIn("'comments'", str(ctx_err.exception))
-        self.assertIn(
-            "Only lists and tuples may be used in a list field", str(ctx_err.exception)
+        assert "'comments'" in str(ctx_err.exception)
+        assert "Only lists and tuples may be used in a list field" in str(
+            ctx_err.exception
         )
 
         # Test with a Document
         post = self.BlogPost(comments=Title(content="garbage"))
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             post.validate()
-        self.assertIn("'comments'", str(ctx_err.exception))
-        self.assertIn(
-            "Only lists and tuples may be used in a list field", str(ctx_err.exception)
+        assert "'comments'" in str(ctx_err.exception)
+        assert "Only lists and tuples may be used in a list field" in str(
+            ctx_err.exception
         )
 
     def test_no_keyword_filter(self):
@@ -2334,7 +2349,7 @@ def test_no_keyword_filter(self):
         filtered = self.post1.comments.filter()
 
         # Ensure nothing was changed
-        self.assertListEqual(filtered, self.post1.comments)
+        assert filtered == self.post1.comments
 
     def test_single_keyword_filter(self):
         """
@@ -2344,10 +2359,10 @@ def test_single_keyword_filter(self):
         filtered = self.post1.comments.filter(author="user1")
 
         # Ensure only 1 entry was returned.
-        self.assertEqual(len(filtered), 1)
+        assert len(filtered) == 1
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(filtered[0].author, "user1")
+        assert filtered[0].author == "user1"
 
     def test_multi_keyword_filter(self):
         """
@@ -2357,11 +2372,11 @@ def test_multi_keyword_filter(self):
         filtered = self.post2.comments.filter(author="user2", message="message2")
 
         # Ensure only 1 entry was returned.
-        self.assertEqual(len(filtered), 1)
+        assert len(filtered) == 1
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(filtered[0].author, "user2")
-        self.assertEqual(filtered[0].message, "message2")
+        assert filtered[0].author == "user2"
+        assert filtered[0].message == "message2"
 
     def test_chained_filter(self):
         """
@@ -2370,18 +2385,18 @@ def test_chained_filter(self):
         filtered = self.post2.comments.filter(author="user2").filter(message="message2")
 
         # Ensure only 1 entry was returned.
-        self.assertEqual(len(filtered), 1)
+        assert len(filtered) == 1
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(filtered[0].author, "user2")
-        self.assertEqual(filtered[0].message, "message2")
+        assert filtered[0].author == "user2"
+        assert filtered[0].message == "message2"
 
     def test_unknown_keyword_filter(self):
         """
         Tests the filter method of a List of Embedded Documents
         when the keyword is not a known keyword.
         """
-        with self.assertRaises(AttributeError):
+        with pytest.raises(AttributeError):
             self.post2.comments.filter(year=2)
 
     def test_no_keyword_exclude(self):
@@ -2392,7 +2407,7 @@ def test_no_keyword_exclude(self):
         filtered = self.post1.comments.exclude()
 
         # Ensure everything was removed
-        self.assertListEqual(filtered, [])
+        assert filtered == []
 
     def test_single_keyword_exclude(self):
         """
@@ -2402,10 +2417,10 @@ def test_single_keyword_exclude(self):
         excluded = self.post1.comments.exclude(author="user1")
 
         # Ensure only 1 entry was returned.
-        self.assertEqual(len(excluded), 1)
+        assert len(excluded) == 1
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(excluded[0].author, "user2")
+        assert excluded[0].author == "user2"
 
     def test_multi_keyword_exclude(self):
         """
@@ -2415,11 +2430,11 @@ def test_multi_keyword_exclude(self):
         excluded = self.post2.comments.exclude(author="user3", message="message1")
 
         # Ensure only 2 entries were returned.
-        self.assertEqual(len(excluded), 2)
+        assert len(excluded) == 2
 
         # Ensure the entries returned are the correct entries.
-        self.assertEqual(excluded[0].author, "user2")
-        self.assertEqual(excluded[1].author, "user2")
+        assert excluded[0].author == "user2"
+        assert excluded[1].author == "user2"
 
     def test_non_matching_exclude(self):
         """
@@ -2429,14 +2444,14 @@ def test_non_matching_exclude(self):
         excluded = self.post2.comments.exclude(author="user4")
 
         # Ensure the 3 entries still exist.
-        self.assertEqual(len(excluded), 3)
+        assert len(excluded) == 3
 
     def test_unknown_keyword_exclude(self):
         """
         Tests the exclude method of a List of Embedded Documents
         when the keyword is not a known keyword.
         """
-        with self.assertRaises(AttributeError):
+        with pytest.raises(AttributeError):
             self.post2.comments.exclude(year=2)
 
     def test_chained_filter_exclude(self):
@@ -2449,25 +2464,25 @@ def test_chained_filter_exclude(self):
         )
 
         # Ensure only 1 entry was returned.
-        self.assertEqual(len(excluded), 1)
+        assert len(excluded) == 1
 
         # Ensure the entry returned is the correct entry.
-        self.assertEqual(excluded[0].author, "user2")
-        self.assertEqual(excluded[0].message, "message3")
+        assert excluded[0].author == "user2"
+        assert excluded[0].message == "message3"
 
     def test_count(self):
         """
         Tests the count method of a List of Embedded Documents.
         """
-        self.assertEqual(self.post1.comments.count(), 2)
-        self.assertEqual(self.post1.comments.count(), len(self.post1.comments))
+        assert self.post1.comments.count() == 2
+        assert self.post1.comments.count() == len(self.post1.comments)
 
     def test_filtered_count(self):
         """
         Tests the filter + count method of a List of Embedded Documents.
         """
         count = self.post1.comments.filter(author="user1").count()
-        self.assertEqual(count, 1)
+        assert count == 1
 
     def test_single_keyword_get(self):
         """
@@ -2475,8 +2490,8 @@ def test_single_keyword_get(self):
         single keyword.
         """
         comment = self.post1.comments.get(author="user1")
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, "user1")
+        assert isinstance(comment, self.Comments)
+        assert comment.author == "user1"
 
     def test_multi_keyword_get(self):
         """
@@ -2484,16 +2499,16 @@ def test_multi_keyword_get(self):
         multiple keywords.
         """
         comment = self.post2.comments.get(author="user2", message="message2")
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, "user2")
-        self.assertEqual(comment.message, "message2")
+        assert isinstance(comment, self.Comments)
+        assert comment.author == "user2"
+        assert comment.message == "message2"
 
     def test_no_keyword_multiple_return_get(self):
         """
         Tests the get method of a List of Embedded Documents without
         a keyword to return multiple documents.
         """
-        with self.assertRaises(MultipleObjectsReturned):
+        with pytest.raises(MultipleObjectsReturned):
             self.post1.comments.get()
 
     def test_keyword_multiple_return_get(self):
@@ -2501,7 +2516,7 @@ def test_keyword_multiple_return_get(self):
         Tests the get method of a List of Embedded Documents with a keyword
         to return multiple documents.
         """
-        with self.assertRaises(MultipleObjectsReturned):
+        with pytest.raises(MultipleObjectsReturned):
             self.post2.comments.get(author="user2")
 
     def test_unknown_keyword_get(self):
@@ -2509,7 +2524,7 @@ def test_unknown_keyword_get(self):
         Tests the get method of a List of Embedded Documents with an
         unknown keyword.
         """
-        with self.assertRaises(AttributeError):
+        with pytest.raises(AttributeError):
             self.post2.comments.get(year=2020)
 
     def test_no_result_get(self):
@@ -2517,7 +2532,7 @@ def test_no_result_get(self):
         Tests the get method of a List of Embedded Documents where get
         returns no results.
         """
-        with self.assertRaises(DoesNotExist):
+        with pytest.raises(DoesNotExist):
             self.post1.comments.get(author="user3")
 
     def test_first(self):
@@ -2528,8 +2543,8 @@ def test_first(self):
         comment = self.post1.comments.first()
 
         # Ensure a Comment object was returned.
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment, self.post1.comments[0])
+        assert isinstance(comment, self.Comments)
+        assert comment == self.post1.comments[0]
 
     def test_create(self):
         """
@@ -2539,14 +2554,12 @@ def test_create(self):
         self.post1.save()
 
         # Ensure the returned value is the comment object.
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, "user4")
-        self.assertEqual(comment.message, "message1")
+        assert isinstance(comment, self.Comments)
+        assert comment.author == "user4"
+        assert comment.message == "message1"
 
         # Ensure the new comment was actually saved to the database.
-        self.assertIn(
-            comment, self.BlogPost.objects(comments__author="user4")[0].comments
-        )
+        assert comment in self.BlogPost.objects(comments__author="user4")[0].comments
 
     def test_filtered_create(self):
         """
@@ -2560,14 +2573,12 @@ def test_filtered_create(self):
         self.post1.save()
 
         # Ensure the returned value is the comment object.
-        self.assertIsInstance(comment, self.Comments)
-        self.assertEqual(comment.author, "user4")
-        self.assertEqual(comment.message, "message1")
+        assert isinstance(comment, self.Comments)
+        assert comment.author == "user4"
+        assert comment.message == "message1"
 
         # Ensure the new comment was actually saved to the database.
-        self.assertIn(
-            comment, self.BlogPost.objects(comments__author="user4")[0].comments
-        )
+        assert comment in self.BlogPost.objects(comments__author="user4")[0].comments
 
     def test_no_keyword_update(self):
         """
@@ -2579,13 +2590,13 @@ def test_no_keyword_update(self):
         self.post1.save()
 
         # Ensure that nothing was altered.
-        self.assertIn(original[0], self.BlogPost.objects(id=self.post1.id)[0].comments)
+        assert original[0] in self.BlogPost.objects(id=self.post1.id)[0].comments
 
-        self.assertIn(original[1], self.BlogPost.objects(id=self.post1.id)[0].comments)
+        assert original[1] in self.BlogPost.objects(id=self.post1.id)[0].comments
 
         # Ensure the method returned 0 as the number of entries
         # modified
-        self.assertEqual(number, 0)
+        assert number == 0
 
     def test_single_keyword_update(self):
         """
@@ -2598,12 +2609,12 @@ def test_single_keyword_update(self):
         comments = self.BlogPost.objects(id=self.post1.id)[0].comments
 
         # Ensure that the database was updated properly.
-        self.assertEqual(comments[0].author, "user4")
-        self.assertEqual(comments[1].author, "user4")
+        assert comments[0].author == "user4"
+        assert comments[1].author == "user4"
 
         # Ensure the method returned 2 as the number of entries
         # modified
-        self.assertEqual(number, 2)
+        assert number == 2
 
     def test_unicode(self):
         """
@@ -2615,7 +2626,7 @@ def test_unicode(self):
                 self.Comments(author="user2", message=u"хабарлама"),
             ]
         ).save()
-        self.assertEqual(post.comments.get(message=u"сообщение").author, "user1")
+        assert post.comments.get(message=u"сообщение").author == "user1"
 
     def test_save(self):
         """
@@ -2627,7 +2638,7 @@ def test_save(self):
         comments.save()
 
         # Ensure that the new comment has been added to the database.
-        self.assertIn(new_comment, self.BlogPost.objects(id=self.post1.id)[0].comments)
+        assert new_comment in self.BlogPost.objects(id=self.post1.id)[0].comments
 
     def test_delete(self):
         """
@@ -2638,17 +2649,17 @@ def test_delete(self):
 
         # Ensure that all the comments under post1 were deleted in the
         # database.
-        self.assertListEqual(self.BlogPost.objects(id=self.post1.id)[0].comments, [])
+        assert self.BlogPost.objects(id=self.post1.id)[0].comments == []
 
         # Ensure that post1 comments were deleted from the list.
-        self.assertListEqual(self.post1.comments, [])
+        assert self.post1.comments == []
 
         # Ensure that comments still returned a EmbeddedDocumentList object.
-        self.assertIsInstance(self.post1.comments, EmbeddedDocumentList)
+        assert isinstance(self.post1.comments, EmbeddedDocumentList)
 
         # Ensure that the delete method returned 2 as the number of entries
         # deleted from the database
-        self.assertEqual(number, 2)
+        assert number == 2
 
     def test_empty_list_embedded_documents_with_unique_field(self):
         """
@@ -2664,7 +2675,7 @@ class A(Document):
             my_list = ListField(EmbeddedDocumentField(EmbeddedWithUnique))
 
         A(my_list=[]).save()
-        with self.assertRaises(NotUniqueError):
+        with pytest.raises(NotUniqueError):
             A(my_list=[]).save()
 
         class EmbeddedWithSparseUnique(EmbeddedDocument):
@@ -2689,16 +2700,16 @@ def test_filtered_delete(self):
         self.post1.save()
 
         # Ensure that only the user2 comment was deleted.
-        self.assertNotIn(comment, self.BlogPost.objects(id=self.post1.id)[0].comments)
-        self.assertEqual(len(self.BlogPost.objects(id=self.post1.id)[0].comments), 1)
+        assert comment not in self.BlogPost.objects(id=self.post1.id)[0].comments
+        assert len(self.BlogPost.objects(id=self.post1.id)[0].comments) == 1
 
         # Ensure that the user2 comment no longer exists in the list.
-        self.assertNotIn(comment, self.post1.comments)
-        self.assertEqual(len(self.post1.comments), 1)
+        assert comment not in self.post1.comments
+        assert len(self.post1.comments) == 1
 
         # Ensure that the delete method returned 1 as the number of entries
         # deleted from the database
-        self.assertEqual(number, 1)
+        assert number == 1
 
     def test_custom_data(self):
         """
@@ -2714,10 +2725,10 @@ class CustomData(Document):
         CustomData.drop_collection()
 
         a1 = CustomData(a_field=1, c_field=2).save()
-        self.assertEqual(2, a1.c_field)
-        self.assertFalse(hasattr(a1.c_field, "custom_data"))
-        self.assertTrue(hasattr(CustomData.c_field, "custom_data"))
-        self.assertEqual(custom_data["a"], CustomData.c_field.custom_data["a"])
+        assert 2 == a1.c_field
+        assert not hasattr(a1.c_field, "custom_data")
+        assert hasattr(CustomData.c_field, "custom_data")
+        assert custom_data["a"] == CustomData.c_field.custom_data["a"]
 
 
 if __name__ == "__main__":
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index 49eb5bc29..0746db338 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -64,13 +64,13 @@ class PutFile(Document):
         putfile.save()
 
         result = PutFile.objects.first()
-        self.assertEqual(putfile, result)
-        self.assertEqual(
-            "%s" % result.the_file,
-            "<GridFSProxy: hello (%s)>" % result.the_file.grid_id,
+        assert putfile == result
+        assert (
+            "%s" % result.the_file
+            == "<GridFSProxy: hello (%s)>" % result.the_file.grid_id
         )
-        self.assertEqual(result.the_file.read(), text)
-        self.assertEqual(result.the_file.content_type, content_type)
+        assert result.the_file.read() == text
+        assert result.the_file.content_type == content_type
         result.the_file.delete()  # Remove file from GridFS
         PutFile.objects.delete()
 
@@ -85,9 +85,9 @@ class PutFile(Document):
         putfile.save()
 
         result = PutFile.objects.first()
-        self.assertEqual(putfile, result)
-        self.assertEqual(result.the_file.read(), text)
-        self.assertEqual(result.the_file.content_type, content_type)
+        assert putfile == result
+        assert result.the_file.read() == text
+        assert result.the_file.content_type == content_type
         result.the_file.delete()
 
     def test_file_fields_stream(self):
@@ -111,19 +111,19 @@ class StreamFile(Document):
         streamfile.save()
 
         result = StreamFile.objects.first()
-        self.assertEqual(streamfile, result)
-        self.assertEqual(result.the_file.read(), text + more_text)
-        self.assertEqual(result.the_file.content_type, content_type)
+        assert streamfile == result
+        assert result.the_file.read() == text + more_text
+        assert result.the_file.content_type == content_type
         result.the_file.seek(0)
-        self.assertEqual(result.the_file.tell(), 0)
-        self.assertEqual(result.the_file.read(len(text)), text)
-        self.assertEqual(result.the_file.tell(), len(text))
-        self.assertEqual(result.the_file.read(len(more_text)), more_text)
-        self.assertEqual(result.the_file.tell(), len(text + more_text))
+        assert result.the_file.tell() == 0
+        assert result.the_file.read(len(text)) == text
+        assert result.the_file.tell() == len(text)
+        assert result.the_file.read(len(more_text)) == more_text
+        assert result.the_file.tell() == len(text + more_text)
         result.the_file.delete()
 
         # Ensure deleted file returns None
-        self.assertTrue(result.the_file.read() is None)
+        assert result.the_file.read() is None
 
     def test_file_fields_stream_after_none(self):
         """Ensure that a file field can be written to after it has been saved as
@@ -148,19 +148,19 @@ class StreamFile(Document):
         streamfile.save()
 
         result = StreamFile.objects.first()
-        self.assertEqual(streamfile, result)
-        self.assertEqual(result.the_file.read(), text + more_text)
+        assert streamfile == result
+        assert result.the_file.read() == text + more_text
         # self.assertEqual(result.the_file.content_type, content_type)
         result.the_file.seek(0)
-        self.assertEqual(result.the_file.tell(), 0)
-        self.assertEqual(result.the_file.read(len(text)), text)
-        self.assertEqual(result.the_file.tell(), len(text))
-        self.assertEqual(result.the_file.read(len(more_text)), more_text)
-        self.assertEqual(result.the_file.tell(), len(text + more_text))
+        assert result.the_file.tell() == 0
+        assert result.the_file.read(len(text)) == text
+        assert result.the_file.tell() == len(text)
+        assert result.the_file.read(len(more_text)) == more_text
+        assert result.the_file.tell() == len(text + more_text)
         result.the_file.delete()
 
         # Ensure deleted file returns None
-        self.assertTrue(result.the_file.read() is None)
+        assert result.the_file.read() is None
 
     def test_file_fields_set(self):
         class SetFile(Document):
@@ -176,16 +176,16 @@ class SetFile(Document):
         setfile.save()
 
         result = SetFile.objects.first()
-        self.assertEqual(setfile, result)
-        self.assertEqual(result.the_file.read(), text)
+        assert setfile == result
+        assert result.the_file.read() == text
 
         # Try replacing file with new one
         result.the_file.replace(more_text)
         result.save()
 
         result = SetFile.objects.first()
-        self.assertEqual(setfile, result)
-        self.assertEqual(result.the_file.read(), more_text)
+        assert setfile == result
+        assert result.the_file.read() == more_text
         result.the_file.delete()
 
     def test_file_field_no_default(self):
@@ -205,28 +205,28 @@ class GridDocument(Document):
             doc_b = GridDocument.objects.with_id(doc_a.id)
             doc_b.the_file.replace(f, filename="doc_b")
             doc_b.save()
-            self.assertNotEqual(doc_b.the_file.grid_id, None)
+            assert doc_b.the_file.grid_id != None
 
             # Test it matches
             doc_c = GridDocument.objects.with_id(doc_b.id)
-            self.assertEqual(doc_b.the_file.grid_id, doc_c.the_file.grid_id)
+            assert doc_b.the_file.grid_id == doc_c.the_file.grid_id
 
             # Test with default
             doc_d = GridDocument(the_file=six.b(""))
             doc_d.save()
 
             doc_e = GridDocument.objects.with_id(doc_d.id)
-            self.assertEqual(doc_d.the_file.grid_id, doc_e.the_file.grid_id)
+            assert doc_d.the_file.grid_id == doc_e.the_file.grid_id
 
             doc_e.the_file.replace(f, filename="doc_e")
             doc_e.save()
 
             doc_f = GridDocument.objects.with_id(doc_e.id)
-            self.assertEqual(doc_e.the_file.grid_id, doc_f.the_file.grid_id)
+            assert doc_e.the_file.grid_id == doc_f.the_file.grid_id
 
         db = GridDocument._get_db()
         grid_fs = gridfs.GridFS(db)
-        self.assertEqual(["doc_b", "doc_e"], grid_fs.list())
+        assert ["doc_b", "doc_e"] == grid_fs.list()
 
     def test_file_uniqueness(self):
         """Ensure that each instance of a FileField is unique
@@ -246,8 +246,8 @@ class TestFile(Document):
         test_file_dupe = TestFile()
         data = test_file_dupe.the_file.read()  # Should be None
 
-        self.assertNotEqual(test_file.name, test_file_dupe.name)
-        self.assertNotEqual(test_file.the_file.read(), data)
+        assert test_file.name != test_file_dupe.name
+        assert test_file.the_file.read() != data
 
         TestFile.drop_collection()
 
@@ -268,8 +268,8 @@ class Animal(Document):
         marmot.save()
 
         marmot = Animal.objects.get()
-        self.assertEqual(marmot.photo.content_type, "image/jpeg")
-        self.assertEqual(marmot.photo.foo, "bar")
+        assert marmot.photo.content_type == "image/jpeg"
+        assert marmot.photo.foo == "bar"
 
     def test_file_reassigning(self):
         class TestFile(Document):
@@ -278,12 +278,12 @@ class TestFile(Document):
         TestFile.drop_collection()
 
         test_file = TestFile(the_file=get_file(TEST_IMAGE_PATH)).save()
-        self.assertEqual(test_file.the_file.get().length, 8313)
+        assert test_file.the_file.get().length == 8313
 
         test_file = TestFile.objects.first()
         test_file.the_file = get_file(TEST_IMAGE2_PATH)
         test_file.save()
-        self.assertEqual(test_file.the_file.get().length, 4971)
+        assert test_file.the_file.get().length == 4971
 
     def test_file_boolean(self):
         """Ensure that a boolean test of a FileField indicates its presence
@@ -295,13 +295,13 @@ class TestFile(Document):
         TestFile.drop_collection()
 
         test_file = TestFile()
-        self.assertFalse(bool(test_file.the_file))
+        assert not bool(test_file.the_file)
         test_file.the_file.put(six.b("Hello, World!"), content_type="text/plain")
         test_file.save()
-        self.assertTrue(bool(test_file.the_file))
+        assert bool(test_file.the_file)
 
         test_file = TestFile.objects.first()
-        self.assertEqual(test_file.the_file.content_type, "text/plain")
+        assert test_file.the_file.content_type == "text/plain"
 
     def test_file_cmp(self):
         """Test comparing against other types"""
@@ -310,7 +310,7 @@ class TestFile(Document):
             the_file = FileField()
 
         test_file = TestFile()
-        self.assertNotIn(test_file.the_file, [{"test": 1}])
+        assert test_file.the_file not in [{"test": 1}]
 
     def test_file_disk_space(self):
         """ Test disk space usage when we delete/replace a file """
@@ -330,16 +330,16 @@ class TestFile(Document):
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEqual(len(list(files)), 1)
-        self.assertEqual(len(list(chunks)), 1)
+        assert len(list(files)) == 1
+        assert len(list(chunks)) == 1
 
         # Deleting the docoument should delete the files
         testfile.delete()
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEqual(len(list(files)), 0)
-        self.assertEqual(len(list(chunks)), 0)
+        assert len(list(files)) == 0
+        assert len(list(chunks)) == 0
 
         # Test case where we don't store a file in the first place
         testfile = TestFile()
@@ -347,15 +347,15 @@ class TestFile(Document):
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEqual(len(list(files)), 0)
-        self.assertEqual(len(list(chunks)), 0)
+        assert len(list(files)) == 0
+        assert len(list(chunks)) == 0
 
         testfile.delete()
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEqual(len(list(files)), 0)
-        self.assertEqual(len(list(chunks)), 0)
+        assert len(list(files)) == 0
+        assert len(list(chunks)) == 0
 
         # Test case where we overwrite the file
         testfile = TestFile()
@@ -368,15 +368,15 @@ class TestFile(Document):
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEqual(len(list(files)), 1)
-        self.assertEqual(len(list(chunks)), 1)
+        assert len(list(files)) == 1
+        assert len(list(chunks)) == 1
 
         testfile.delete()
 
         files = db.fs.files.find()
         chunks = db.fs.chunks.find()
-        self.assertEqual(len(list(files)), 0)
-        self.assertEqual(len(list(chunks)), 0)
+        assert len(list(files)) == 0
+        assert len(list(chunks)) == 0
 
     def test_image_field(self):
         if not HAS_PIL:
@@ -396,9 +396,7 @@ class TestImage(Document):
                 t.image.put(f)
                 self.fail("Should have raised an invalidation error")
             except ValidationError as e:
-                self.assertEqual(
-                    "%s" % e, "Invalid image: cannot identify image file %s" % f
-                )
+                assert "%s" % e == "Invalid image: cannot identify image file %s" % f
 
         t = TestImage()
         t.image.put(get_file(TEST_IMAGE_PATH))
@@ -406,11 +404,11 @@ class TestImage(Document):
 
         t = TestImage.objects.first()
 
-        self.assertEqual(t.image.format, "PNG")
+        assert t.image.format == "PNG"
 
         w, h = t.image.size
-        self.assertEqual(w, 371)
-        self.assertEqual(h, 76)
+        assert w == 371
+        assert h == 76
 
         t.image.delete()
 
@@ -424,12 +422,12 @@ class TestFile(Document):
         TestFile.drop_collection()
 
         test_file = TestFile(the_file=get_file(TEST_IMAGE_PATH)).save()
-        self.assertEqual(test_file.the_file.size, (371, 76))
+        assert test_file.the_file.size == (371, 76)
 
         test_file = TestFile.objects.first()
         test_file.the_file = get_file(TEST_IMAGE2_PATH)
         test_file.save()
-        self.assertEqual(test_file.the_file.size, (45, 101))
+        assert test_file.the_file.size == (45, 101)
 
     def test_image_field_resize(self):
         if not HAS_PIL:
@@ -446,11 +444,11 @@ class TestImage(Document):
 
         t = TestImage.objects.first()
 
-        self.assertEqual(t.image.format, "PNG")
+        assert t.image.format == "PNG"
         w, h = t.image.size
 
-        self.assertEqual(w, 185)
-        self.assertEqual(h, 37)
+        assert w == 185
+        assert h == 37
 
         t.image.delete()
 
@@ -469,11 +467,11 @@ class TestImage(Document):
 
         t = TestImage.objects.first()
 
-        self.assertEqual(t.image.format, "PNG")
+        assert t.image.format == "PNG"
         w, h = t.image.size
 
-        self.assertEqual(w, 185)
-        self.assertEqual(h, 37)
+        assert w == 185
+        assert h == 37
 
         t.image.delete()
 
@@ -492,9 +490,9 @@ class TestImage(Document):
 
         t = TestImage.objects.first()
 
-        self.assertEqual(t.image.thumbnail.format, "PNG")
-        self.assertEqual(t.image.thumbnail.width, 92)
-        self.assertEqual(t.image.thumbnail.height, 18)
+        assert t.image.thumbnail.format == "PNG"
+        assert t.image.thumbnail.width == 92
+        assert t.image.thumbnail.height == 18
 
         t.image.delete()
 
@@ -518,17 +516,17 @@ class TestFile(Document):
         test_file.save()
 
         data = get_db("test_files").macumba.files.find_one()
-        self.assertEqual(data.get("name"), "hello.txt")
+        assert data.get("name") == "hello.txt"
 
         test_file = TestFile.objects.first()
-        self.assertEqual(test_file.the_file.read(), six.b("Hello, World!"))
+        assert test_file.the_file.read() == six.b("Hello, World!")
 
         test_file = TestFile.objects.first()
         test_file.the_file = six.b("HELLO, WORLD!")
         test_file.save()
 
         test_file = TestFile.objects.first()
-        self.assertEqual(test_file.the_file.read(), six.b("HELLO, WORLD!"))
+        assert test_file.the_file.read() == six.b("HELLO, WORLD!")
 
     def test_copyable(self):
         class PutFile(Document):
@@ -546,8 +544,8 @@ class PutFile(Document):
         class TestFile(Document):
             name = StringField()
 
-        self.assertEqual(putfile, copy.copy(putfile))
-        self.assertEqual(putfile, copy.deepcopy(putfile))
+        assert putfile == copy.copy(putfile)
+        assert putfile == copy.deepcopy(putfile)
 
     def test_get_image_by_grid_id(self):
 
@@ -569,9 +567,7 @@ class TestImage(Document):
         test = TestImage.objects.first()
         grid_id = test.image1.grid_id
 
-        self.assertEqual(
-            1, TestImage.objects(Q(image1=grid_id) or Q(image2=grid_id)).count()
-        )
+        assert 1 == TestImage.objects(Q(image1=grid_id) or Q(image2=grid_id)).count()
 
     def test_complex_field_filefield(self):
         """Ensure you can add meta data to file"""
@@ -593,9 +589,9 @@ class Animal(Document):
         marmot.save()
 
         marmot = Animal.objects.get()
-        self.assertEqual(marmot.photos[0].content_type, "image/jpeg")
-        self.assertEqual(marmot.photos[0].foo, "bar")
-        self.assertEqual(marmot.photos[0].get().length, 8313)
+        assert marmot.photos[0].content_type == "image/jpeg"
+        assert marmot.photos[0].foo == "bar"
+        assert marmot.photos[0].get().length == 8313
 
 
 if __name__ == "__main__":
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
index 9f357ce55..d755fb4e4 100644
--- a/tests/fields/test_float_field.py
+++ b/tests/fields/test_float_field.py
@@ -4,6 +4,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestFloatField(MongoDBTestCase):
@@ -16,8 +17,8 @@ class TestDocument(Document):
         TestDocument(float_fld=None).save()
         TestDocument(float_fld=1).save()
 
-        self.assertEqual(1, TestDocument.objects(float_fld__ne=None).count())
-        self.assertEqual(1, TestDocument.objects(float_fld__ne=1).count())
+        assert 1 == TestDocument.objects(float_fld__ne=None).count()
+        assert 1 == TestDocument.objects(float_fld__ne=1).count()
 
     def test_validation(self):
         """Ensure that invalid values cannot be assigned to float fields.
@@ -34,16 +35,20 @@ class BigPerson(Document):
         person.validate()
 
         person.height = "2.0"
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person.height = 0.01
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person.height = 4.0
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
         person_2 = Person(height="something invalid")
-        self.assertRaises(ValidationError, person_2.validate)
+        with pytest.raises(ValidationError):
+            person_2.validate()
 
         big_person = BigPerson()
 
@@ -55,4 +60,5 @@ class BigPerson(Document):
         big_person.validate()
 
         big_person.height = 2 ** 100000  # Too big for a float value
-        self.assertRaises(ValidationError, big_person.validate)
+        with pytest.raises(ValidationError):
+            big_person.validate()
diff --git a/tests/fields/test_geo_fields.py b/tests/fields/test_geo_fields.py
index ff4cbc834..1b912a4b8 100644
--- a/tests/fields/test_geo_fields.py
+++ b/tests/fields/test_geo_fields.py
@@ -11,7 +11,7 @@ def _test_for_expected_error(self, Cls, loc, expected):
             Cls(loc=loc).validate()
             self.fail("Should not validate the location {0}".format(loc))
         except ValidationError as e:
-            self.assertEqual(expected, e.to_dict()["loc"])
+            assert expected == e.to_dict()["loc"]
 
     def test_geopoint_validation(self):
         class Location(Document):
@@ -299,7 +299,7 @@ class Event(Document):
             location = GeoPointField()
 
         geo_indicies = Event._geo_indices()
-        self.assertEqual(geo_indicies, [{"fields": [("location", "2d")]}])
+        assert geo_indicies == [{"fields": [("location", "2d")]}]
 
     def test_geopoint_embedded_indexes(self):
         """Ensure that indexes are created automatically for GeoPointFields on
@@ -315,7 +315,7 @@ class Event(Document):
             venue = EmbeddedDocumentField(Venue)
 
         geo_indicies = Event._geo_indices()
-        self.assertEqual(geo_indicies, [{"fields": [("venue.location", "2d")]}])
+        assert geo_indicies == [{"fields": [("venue.location", "2d")]}]
 
     def test_indexes_2dsphere(self):
         """Ensure that indexes are created automatically for GeoPointFields.
@@ -328,9 +328,9 @@ class Event(Document):
             polygon = PolygonField()
 
         geo_indicies = Event._geo_indices()
-        self.assertIn({"fields": [("line", "2dsphere")]}, geo_indicies)
-        self.assertIn({"fields": [("polygon", "2dsphere")]}, geo_indicies)
-        self.assertIn({"fields": [("point", "2dsphere")]}, geo_indicies)
+        assert {"fields": [("line", "2dsphere")]} in geo_indicies
+        assert {"fields": [("polygon", "2dsphere")]} in geo_indicies
+        assert {"fields": [("point", "2dsphere")]} in geo_indicies
 
     def test_indexes_2dsphere_embedded(self):
         """Ensure that indexes are created automatically for GeoPointFields.
@@ -347,9 +347,9 @@ class Event(Document):
             venue = EmbeddedDocumentField(Venue)
 
         geo_indicies = Event._geo_indices()
-        self.assertIn({"fields": [("venue.line", "2dsphere")]}, geo_indicies)
-        self.assertIn({"fields": [("venue.polygon", "2dsphere")]}, geo_indicies)
-        self.assertIn({"fields": [("venue.point", "2dsphere")]}, geo_indicies)
+        assert {"fields": [("venue.line", "2dsphere")]} in geo_indicies
+        assert {"fields": [("venue.polygon", "2dsphere")]} in geo_indicies
+        assert {"fields": [("venue.point", "2dsphere")]} in geo_indicies
 
     def test_geo_indexes_recursion(self):
         class Location(Document):
@@ -365,12 +365,12 @@ class Parent(Document):
 
         Parent(name="Berlin").save()
         info = Parent._get_collection().index_information()
-        self.assertNotIn("location_2d", info)
+        assert "location_2d" not in info
         info = Location._get_collection().index_information()
-        self.assertIn("location_2d", info)
+        assert "location_2d" in info
 
-        self.assertEqual(len(Parent._geo_indices()), 0)
-        self.assertEqual(len(Location._geo_indices()), 1)
+        assert len(Parent._geo_indices()) == 0
+        assert len(Location._geo_indices()) == 1
 
     def test_geo_indexes_auto_index(self):
 
@@ -381,16 +381,16 @@ class Log(Document):
 
             meta = {"indexes": [[("location", "2dsphere"), ("datetime", 1)]]}
 
-        self.assertEqual([], Log._geo_indices())
+        assert [] == Log._geo_indices()
 
         Log.drop_collection()
         Log.ensure_indexes()
 
         info = Log._get_collection().index_information()
-        self.assertEqual(
-            info["location_2dsphere_datetime_1"]["key"],
-            [("location", "2dsphere"), ("datetime", 1)],
-        )
+        assert info["location_2dsphere_datetime_1"]["key"] == [
+            ("location", "2dsphere"),
+            ("datetime", 1),
+        ]
 
         # Test listing explicitly
         class Log(Document):
@@ -401,16 +401,16 @@ class Log(Document):
                 "indexes": [{"fields": [("location", "2dsphere"), ("datetime", 1)]}]
             }
 
-        self.assertEqual([], Log._geo_indices())
+        assert [] == Log._geo_indices()
 
         Log.drop_collection()
         Log.ensure_indexes()
 
         info = Log._get_collection().index_information()
-        self.assertEqual(
-            info["location_2dsphere_datetime_1"]["key"],
-            [("location", "2dsphere"), ("datetime", 1)],
-        )
+        assert info["location_2dsphere_datetime_1"]["key"] == [
+            ("location", "2dsphere"),
+            ("datetime", 1),
+        ]
 
 
 if __name__ == "__main__":
diff --git a/tests/fields/test_int_field.py b/tests/fields/test_int_field.py
index b7db0416a..65a5fbad0 100644
--- a/tests/fields/test_int_field.py
+++ b/tests/fields/test_int_field.py
@@ -2,6 +2,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestIntField(MongoDBTestCase):
@@ -23,11 +24,14 @@ class Person(Document):
         person.validate()
 
         person.age = -1
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
         person.age = 120
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
         person.age = "ten"
-        self.assertRaises(ValidationError, person.validate)
+        with pytest.raises(ValidationError):
+            person.validate()
 
     def test_ne_operator(self):
         class TestDocument(Document):
@@ -38,5 +42,5 @@ class TestDocument(Document):
         TestDocument(int_fld=None).save()
         TestDocument(int_fld=1).save()
 
-        self.assertEqual(1, TestDocument.objects(int_fld__ne=None).count())
-        self.assertEqual(1, TestDocument.objects(int_fld__ne=1).count())
+        assert 1 == TestDocument.objects(int_fld__ne=None).count()
+        assert 1 == TestDocument.objects(int_fld__ne=1).count()
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index 2a686d7fa..8150574d6 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -5,13 +5,15 @@
 from mongoengine.base import LazyReference
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestLazyReferenceField(MongoDBTestCase):
     def test_lazy_reference_config(self):
         # Make sure ReferenceField only accepts a document class or a string
         # with a document class name.
-        self.assertRaises(ValidationError, LazyReferenceField, EmbeddedDocument)
+        with pytest.raises(ValidationError):
+            LazyReferenceField(EmbeddedDocument)
 
     def test___repr__(self):
         class Animal(Document):
@@ -25,7 +27,7 @@ class Ocurrence(Document):
 
         animal = Animal()
         oc = Ocurrence(animal=animal)
-        self.assertIn("LazyReference", repr(oc.animal))
+        assert "LazyReference" in repr(oc.animal)
 
     def test___getattr___unknown_attr_raises_attribute_error(self):
         class Animal(Document):
@@ -39,7 +41,7 @@ class Ocurrence(Document):
 
         animal = Animal().save()
         oc = Ocurrence(animal=animal)
-        with self.assertRaises(AttributeError):
+        with pytest.raises(AttributeError):
             oc.animal.not_exist
 
     def test_lazy_reference_simple(self):
@@ -57,19 +59,19 @@ class Ocurrence(Document):
         animal = Animal(name="Leopard", tag="heavy").save()
         Ocurrence(person="test", animal=animal).save()
         p = Ocurrence.objects.get()
-        self.assertIsInstance(p.animal, LazyReference)
+        assert isinstance(p.animal, LazyReference)
         fetched_animal = p.animal.fetch()
-        self.assertEqual(fetched_animal, animal)
+        assert fetched_animal == animal
         # `fetch` keep cache on referenced document by default...
         animal.tag = "not so heavy"
         animal.save()
         double_fetch = p.animal.fetch()
-        self.assertIs(fetched_animal, double_fetch)
-        self.assertEqual(double_fetch.tag, "heavy")
+        assert fetched_animal is double_fetch
+        assert double_fetch.tag == "heavy"
         # ...unless specified otherwise
         fetch_force = p.animal.fetch(force=True)
-        self.assertIsNot(fetch_force, fetched_animal)
-        self.assertEqual(fetch_force.tag, "not so heavy")
+        assert fetch_force is not fetched_animal
+        assert fetch_force.tag == "not so heavy"
 
     def test_lazy_reference_fetch_invalid_ref(self):
         class Animal(Document):
@@ -87,8 +89,8 @@ class Ocurrence(Document):
         Ocurrence(person="test", animal=animal).save()
         animal.delete()
         p = Ocurrence.objects.get()
-        self.assertIsInstance(p.animal, LazyReference)
-        with self.assertRaises(DoesNotExist):
+        assert isinstance(p.animal, LazyReference)
+        with pytest.raises(DoesNotExist):
             p.animal.fetch()
 
     def test_lazy_reference_set(self):
@@ -122,7 +124,7 @@ class SubAnimal(Animal):
         ):
             p = Ocurrence(person="test", animal=ref).save()
             p.reload()
-            self.assertIsInstance(p.animal, LazyReference)
+            assert isinstance(p.animal, LazyReference)
             p.animal.fetch()
 
     def test_lazy_reference_bad_set(self):
@@ -149,7 +151,7 @@ class BadDoc(Document):
             DBRef(baddoc._get_collection_name(), animal.pk),
             LazyReference(BadDoc, animal.pk),
         ):
-            with self.assertRaises(ValidationError):
+            with pytest.raises(ValidationError):
                 p = Ocurrence(person="test", animal=bad).save()
 
     def test_lazy_reference_query_conversion(self):
@@ -179,14 +181,14 @@ class BlogPost(Document):
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
+        assert post.id == post1.id
 
         post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
+        assert post.id == post2.id
 
         # Same thing by passing a LazyReference instance
         post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
-        self.assertEqual(post.id, post2.id)
+        assert post.id == post2.id
 
     def test_lazy_reference_query_conversion_dbref(self):
         """Ensure that LazyReferenceFields can be queried using objects and values
@@ -215,14 +217,14 @@ class BlogPost(Document):
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
+        assert post.id == post1.id
 
         post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
+        assert post.id == post2.id
 
         # Same thing by passing a LazyReference instance
         post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
-        self.assertEqual(post.id, post2.id)
+        assert post.id == post2.id
 
     def test_lazy_reference_passthrough(self):
         class Animal(Document):
@@ -239,20 +241,20 @@ class Ocurrence(Document):
         animal = Animal(name="Leopard", tag="heavy").save()
         Ocurrence(animal=animal, animal_passthrough=animal).save()
         p = Ocurrence.objects.get()
-        self.assertIsInstance(p.animal, LazyReference)
-        with self.assertRaises(KeyError):
+        assert isinstance(p.animal, LazyReference)
+        with pytest.raises(KeyError):
             p.animal["name"]
-        with self.assertRaises(AttributeError):
+        with pytest.raises(AttributeError):
             p.animal.name
-        self.assertEqual(p.animal.pk, animal.pk)
+        assert p.animal.pk == animal.pk
 
-        self.assertEqual(p.animal_passthrough.name, "Leopard")
-        self.assertEqual(p.animal_passthrough["name"], "Leopard")
+        assert p.animal_passthrough.name == "Leopard"
+        assert p.animal_passthrough["name"] == "Leopard"
 
         # Should not be able to access referenced document's methods
-        with self.assertRaises(AttributeError):
+        with pytest.raises(AttributeError):
             p.animal.save
-        with self.assertRaises(KeyError):
+        with pytest.raises(KeyError):
             p.animal["save"]
 
     def test_lazy_reference_not_set(self):
@@ -269,7 +271,7 @@ class Ocurrence(Document):
 
         Ocurrence(person="foo").save()
         p = Ocurrence.objects.get()
-        self.assertIs(p.animal, None)
+        assert p.animal is None
 
     def test_lazy_reference_equality(self):
         class Animal(Document):
@@ -280,12 +282,12 @@ class Animal(Document):
 
         animal = Animal(name="Leopard", tag="heavy").save()
         animalref = LazyReference(Animal, animal.pk)
-        self.assertEqual(animal, animalref)
-        self.assertEqual(animalref, animal)
+        assert animal == animalref
+        assert animalref == animal
 
         other_animalref = LazyReference(Animal, ObjectId("54495ad94c934721ede76f90"))
-        self.assertNotEqual(animal, other_animalref)
-        self.assertNotEqual(other_animalref, animal)
+        assert animal != other_animalref
+        assert other_animalref != animal
 
     def test_lazy_reference_embedded(self):
         class Animal(Document):
@@ -308,12 +310,12 @@ class Ocurrence(Document):
         animal2 = Animal(name="cheeta").save()
 
         def check_fields_type(occ):
-            self.assertIsInstance(occ.direct, LazyReference)
+            assert isinstance(occ.direct, LazyReference)
             for elem in occ.in_list:
-                self.assertIsInstance(elem, LazyReference)
-            self.assertIsInstance(occ.in_embedded.direct, LazyReference)
+                assert isinstance(elem, LazyReference)
+            assert isinstance(occ.in_embedded.direct, LazyReference)
             for elem in occ.in_embedded.in_list:
-                self.assertIsInstance(elem, LazyReference)
+                assert isinstance(elem, LazyReference)
 
         occ = Ocurrence(
             in_list=[animal1, animal2],
@@ -346,19 +348,19 @@ class Ocurrence(Document):
         animal = Animal(name="Leopard", tag="heavy").save()
         Ocurrence(person="test", animal=animal).save()
         p = Ocurrence.objects.get()
-        self.assertIsInstance(p.animal, LazyReference)
+        assert isinstance(p.animal, LazyReference)
         fetched_animal = p.animal.fetch()
-        self.assertEqual(fetched_animal, animal)
+        assert fetched_animal == animal
         # `fetch` keep cache on referenced document by default...
         animal.tag = "not so heavy"
         animal.save()
         double_fetch = p.animal.fetch()
-        self.assertIs(fetched_animal, double_fetch)
-        self.assertEqual(double_fetch.tag, "heavy")
+        assert fetched_animal is double_fetch
+        assert double_fetch.tag == "heavy"
         # ...unless specified otherwise
         fetch_force = p.animal.fetch(force=True)
-        self.assertIsNot(fetch_force, fetched_animal)
-        self.assertEqual(fetch_force.tag, "not so heavy")
+        assert fetch_force is not fetched_animal
+        assert fetch_force.tag == "not so heavy"
 
     def test_generic_lazy_reference_choices(self):
         class Animal(Document):
@@ -385,13 +387,13 @@ class Ocurrence(Document):
 
         occ_animal = Ocurrence(living_thing=animal, thing=animal).save()
         occ_vegetal = Ocurrence(living_thing=vegetal, thing=vegetal).save()
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             Ocurrence(living_thing=mineral).save()
 
         occ = Ocurrence.objects.get(living_thing=animal)
-        self.assertEqual(occ, occ_animal)
-        self.assertIsInstance(occ.thing, LazyReference)
-        self.assertIsInstance(occ.living_thing, LazyReference)
+        assert occ == occ_animal
+        assert isinstance(occ.thing, LazyReference)
+        assert isinstance(occ.living_thing, LazyReference)
 
         occ.thing = vegetal
         occ.living_thing = vegetal
@@ -399,7 +401,7 @@ class Ocurrence(Document):
 
         occ.thing = mineral
         occ.living_thing = mineral
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             occ.save()
 
     def test_generic_lazy_reference_set(self):
@@ -434,7 +436,7 @@ class SubAnimal(Animal):
         ):
             p = Ocurrence(person="test", animal=ref).save()
             p.reload()
-            self.assertIsInstance(p.animal, (LazyReference, Document))
+            assert isinstance(p.animal, (LazyReference, Document))
             p.animal.fetch()
 
     def test_generic_lazy_reference_bad_set(self):
@@ -455,7 +457,7 @@ class BadDoc(Document):
         animal = Animal(name="Leopard", tag="heavy").save()
         baddoc = BadDoc().save()
         for bad in (42, "foo", baddoc, LazyReference(BadDoc, animal.pk)):
-            with self.assertRaises(ValidationError):
+            with pytest.raises(ValidationError):
                 p = Ocurrence(person="test", animal=bad).save()
 
     def test_generic_lazy_reference_query_conversion(self):
@@ -481,14 +483,14 @@ class BlogPost(Document):
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
+        assert post.id == post1.id
 
         post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
+        assert post.id == post2.id
 
         # Same thing by passing a LazyReference instance
         post = BlogPost.objects(author=LazyReference(Member, m2.pk)).first()
-        self.assertEqual(post.id, post2.id)
+        assert post.id == post2.id
 
     def test_generic_lazy_reference_not_set(self):
         class Animal(Document):
@@ -504,7 +506,7 @@ class Ocurrence(Document):
 
         Ocurrence(person="foo").save()
         p = Ocurrence.objects.get()
-        self.assertIs(p.animal, None)
+        assert p.animal is None
 
     def test_generic_lazy_reference_accepts_string_instead_of_class(self):
         class Animal(Document):
@@ -521,7 +523,7 @@ class Ocurrence(Document):
         animal = Animal().save()
         Ocurrence(animal=animal).save()
         p = Ocurrence.objects.get()
-        self.assertEqual(p.animal, animal)
+        assert p.animal == animal
 
     def test_generic_lazy_reference_embedded(self):
         class Animal(Document):
@@ -544,12 +546,12 @@ class Ocurrence(Document):
         animal2 = Animal(name="cheeta").save()
 
         def check_fields_type(occ):
-            self.assertIsInstance(occ.direct, LazyReference)
+            assert isinstance(occ.direct, LazyReference)
             for elem in occ.in_list:
-                self.assertIsInstance(elem, LazyReference)
-            self.assertIsInstance(occ.in_embedded.direct, LazyReference)
+                assert isinstance(elem, LazyReference)
+            assert isinstance(occ.in_embedded.direct, LazyReference)
             for elem in occ.in_embedded.in_list:
-                self.assertIsInstance(elem, LazyReference)
+                assert isinstance(elem, LazyReference)
 
         occ = Ocurrence(
             in_list=[animal1, animal2],
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index ab86eccd1..51f8e255d 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -10,6 +10,7 @@
 from mongoengine.connection import get_db
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestLongField(MongoDBTestCase):
@@ -24,10 +25,10 @@ class TestLongFieldConsideredAsInt64(Document):
 
         doc = TestLongFieldConsideredAsInt64(some_long=42).save()
         db = get_db()
-        self.assertIsInstance(
+        assert isinstance(
             db.test_long_field_considered_as_int64.find()[0]["some_long"], Int64
         )
-        self.assertIsInstance(doc.some_long, six.integer_types)
+        assert isinstance(doc.some_long, six.integer_types)
 
     def test_long_validation(self):
         """Ensure that invalid values cannot be assigned to long fields.
@@ -41,11 +42,14 @@ class TestDocument(Document):
         doc.validate()
 
         doc.value = -1
-        self.assertRaises(ValidationError, doc.validate)
+        with pytest.raises(ValidationError):
+            doc.validate()
         doc.value = 120
-        self.assertRaises(ValidationError, doc.validate)
+        with pytest.raises(ValidationError):
+            doc.validate()
         doc.value = "ten"
-        self.assertRaises(ValidationError, doc.validate)
+        with pytest.raises(ValidationError):
+            doc.validate()
 
     def test_long_ne_operator(self):
         class TestDocument(Document):
@@ -56,4 +60,4 @@ class TestDocument(Document):
         TestDocument(long_fld=None).save()
         TestDocument(long_fld=1).save()
 
-        self.assertEqual(1, TestDocument.objects(long_fld__ne=None).count())
+        assert 1 == TestDocument.objects(long_fld__ne=None).count()
diff --git a/tests/fields/test_map_field.py b/tests/fields/test_map_field.py
index 54f70aa17..fd56ddd0b 100644
--- a/tests/fields/test_map_field.py
+++ b/tests/fields/test_map_field.py
@@ -4,6 +4,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestMapField(MongoDBTestCase):
@@ -19,11 +20,11 @@ class Simple(Document):
         e.mapping["someint"] = 1
         e.save()
 
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             e.mapping["somestring"] = "abc"
             e.save()
 
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
 
             class NoDeclaredType(Document):
                 mapping = MapField()
@@ -51,10 +52,10 @@ class Extensible(Document):
         e.save()
 
         e2 = Extensible.objects.get(id=e.id)
-        self.assertIsInstance(e2.mapping["somestring"], StringSetting)
-        self.assertIsInstance(e2.mapping["someint"], IntegerSetting)
+        assert isinstance(e2.mapping["somestring"], StringSetting)
+        assert isinstance(e2.mapping["someint"], IntegerSetting)
 
-        with self.assertRaises(ValidationError):
+        with pytest.raises(ValidationError):
             e.mapping["someint"] = 123
             e.save()
 
@@ -74,9 +75,9 @@ class Test(Document):
         Test.objects.update_one(inc__my_map__DICTIONARY_KEY__number=1)
 
         test = Test.objects.get()
-        self.assertEqual(test.my_map["DICTIONARY_KEY"].number, 2)
+        assert test.my_map["DICTIONARY_KEY"].number == 2
         doc = self.db.test.find_one()
-        self.assertEqual(doc["x"]["DICTIONARY_KEY"]["i"], 2)
+        assert doc["x"]["DICTIONARY_KEY"]["i"] == 2
 
     def test_mapfield_numerical_index(self):
         """Ensure that MapField accept numeric strings as indexes."""
@@ -116,13 +117,13 @@ class Log(Document):
             actions={"friends": Action(operation="drink", object="beer")},
         ).save()
 
-        self.assertEqual(1, Log.objects(visited__friends__exists=True).count())
+        assert 1 == Log.objects(visited__friends__exists=True).count()
 
-        self.assertEqual(
-            1,
-            Log.objects(
+        assert (
+            1
+            == Log.objects(
                 actions__friends__operation="drink", actions__friends__object="beer"
-            ).count(),
+            ).count()
         )
 
     def test_map_field_unicode(self):
@@ -139,7 +140,7 @@ class BlogPost(Document):
 
         tree.save()
 
-        self.assertEqual(
-            BlogPost.objects.get(id=tree.id).info_dict[u"éééé"].description,
-            u"VALUE: éééé",
+        assert (
+            BlogPost.objects.get(id=tree.id).info_dict[u"éééé"].description
+            == u"VALUE: éééé"
         )
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index 783a46daa..783d13150 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -4,6 +4,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestReferenceField(MongoDBTestCase):
@@ -24,19 +25,22 @@ class BlogPost(Document):
 
         # Make sure ReferenceField only accepts a document class or a string
         # with a document class name.
-        self.assertRaises(ValidationError, ReferenceField, EmbeddedDocument)
+        with pytest.raises(ValidationError):
+            ReferenceField(EmbeddedDocument)
 
         user = User(name="Test User")
 
         # Ensure that the referenced object must have been saved
         post1 = BlogPost(content="Chips and gravy taste good.")
         post1.author = user
-        self.assertRaises(ValidationError, post1.save)
+        with pytest.raises(ValidationError):
+            post1.save()
 
         # Check that an invalid object type cannot be used
         post2 = BlogPost(content="Chips and chilli taste good.")
         post1.author = post2
-        self.assertRaises(ValidationError, post1.validate)
+        with pytest.raises(ValidationError):
+            post1.validate()
 
         # Ensure ObjectID's are accepted as references
         user_object_id = user.pk
@@ -52,7 +56,8 @@ class BlogPost(Document):
         # Make sure referencing a saved document of the *wrong* type fails
         post2.save()
         post1.author = post2
-        self.assertRaises(ValidationError, post1.validate)
+        with pytest.raises(ValidationError):
+            post1.validate()
 
     def test_objectid_reference_fields(self):
         """Make sure storing Object ID references works."""
@@ -67,7 +72,7 @@ class Person(Document):
         Person(name="Ross", parent=p1.pk).save()
 
         p = Person.objects.get(name="Ross")
-        self.assertEqual(p.parent, p1)
+        assert p.parent == p1
 
     def test_dbref_reference_fields(self):
         """Make sure storing references as bson.dbref.DBRef works."""
@@ -81,13 +86,12 @@ class Person(Document):
         p1 = Person(name="John").save()
         Person(name="Ross", parent=p1).save()
 
-        self.assertEqual(
-            Person._get_collection().find_one({"name": "Ross"})["parent"],
-            DBRef("person", p1.pk),
+        assert Person._get_collection().find_one({"name": "Ross"})["parent"] == DBRef(
+            "person", p1.pk
         )
 
         p = Person.objects.get(name="Ross")
-        self.assertEqual(p.parent, p1)
+        assert p.parent == p1
 
     def test_dbref_to_mongo(self):
         """Make sure that calling to_mongo on a ReferenceField which
@@ -100,9 +104,7 @@ class Person(Document):
             parent = ReferenceField("self", dbref=False)
 
         p = Person(name="Steve", parent=DBRef("person", "abcdefghijklmnop"))
-        self.assertEqual(
-            p.to_mongo(), SON([("name", u"Steve"), ("parent", "abcdefghijklmnop")])
-        )
+        assert p.to_mongo() == SON([("name", u"Steve"), ("parent", "abcdefghijklmnop")])
 
     def test_objectid_reference_fields(self):
         class Person(Document):
@@ -116,10 +118,10 @@ class Person(Document):
 
         col = Person._get_collection()
         data = col.find_one({"name": "Ross"})
-        self.assertEqual(data["parent"], p1.pk)
+        assert data["parent"] == p1.pk
 
         p = Person.objects.get(name="Ross")
-        self.assertEqual(p.parent, p1)
+        assert p.parent == p1
 
     def test_undefined_reference(self):
         """Ensure that ReferenceFields may reference undefined Documents.
@@ -144,14 +146,14 @@ class Company(Document):
         me.save()
 
         obj = Product.objects(company=ten_gen).first()
-        self.assertEqual(obj, mongodb)
-        self.assertEqual(obj.company, ten_gen)
+        assert obj == mongodb
+        assert obj.company == ten_gen
 
         obj = Product.objects(company=None).first()
-        self.assertEqual(obj, me)
+        assert obj == me
 
         obj = Product.objects.get(company=None)
-        self.assertEqual(obj, me)
+        assert obj == me
 
     def test_reference_query_conversion(self):
         """Ensure that ReferenceFields can be queried using objects and values
@@ -180,10 +182,10 @@ class BlogPost(Document):
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
+        assert post.id == post1.id
 
         post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
+        assert post.id == post2.id
 
     def test_reference_query_conversion_dbref(self):
         """Ensure that ReferenceFields can be queried using objects and values
@@ -212,7 +214,7 @@ class BlogPost(Document):
         post2.save()
 
         post = BlogPost.objects(author=m1).first()
-        self.assertEqual(post.id, post1.id)
+        assert post.id == post1.id
 
         post = BlogPost.objects(author=m2).first()
-        self.assertEqual(post.id, post2.id)
+        assert post.id == post2.id
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
index f2c8388b1..aa83f7100 100644
--- a/tests/fields/test_sequence_field.py
+++ b/tests/fields/test_sequence_field.py
@@ -18,17 +18,17 @@ class Person(Document):
             Person(name="Person %s" % x).save()
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
+        assert ids == range(1, 11)
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         Person.id.set_next_value(1000)
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 1000)
+        assert c["next"] == 1000
 
     def test_sequence_field_get_next_value(self):
         class Person(Document):
@@ -41,10 +41,10 @@ class Person(Document):
         for x in range(10):
             Person(name="Person %s" % x).save()
 
-        self.assertEqual(Person.id.get_next_value(), 11)
+        assert Person.id.get_next_value() == 11
         self.db["mongoengine.counters"].drop()
 
-        self.assertEqual(Person.id.get_next_value(), 1)
+        assert Person.id.get_next_value() == 1
 
         class Person(Document):
             id = SequenceField(primary_key=True, value_decorator=str)
@@ -56,10 +56,10 @@ class Person(Document):
         for x in range(10):
             Person(name="Person %s" % x).save()
 
-        self.assertEqual(Person.id.get_next_value(), "11")
+        assert Person.id.get_next_value() == "11"
         self.db["mongoengine.counters"].drop()
 
-        self.assertEqual(Person.id.get_next_value(), "1")
+        assert Person.id.get_next_value() == "1"
 
     def test_sequence_field_sequence_name(self):
         class Person(Document):
@@ -73,17 +73,17 @@ class Person(Document):
             Person(name="Person %s" % x).save()
 
         c = self.db["mongoengine.counters"].find_one({"_id": "jelly.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
+        assert ids == range(1, 11)
 
         c = self.db["mongoengine.counters"].find_one({"_id": "jelly.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         Person.id.set_next_value(1000)
         c = self.db["mongoengine.counters"].find_one({"_id": "jelly.id"})
-        self.assertEqual(c["next"], 1000)
+        assert c["next"] == 1000
 
     def test_multiple_sequence_fields(self):
         class Person(Document):
@@ -98,24 +98,24 @@ class Person(Document):
             Person(name="Person %s" % x).save()
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
+        assert ids == range(1, 11)
 
         counters = [i.counter for i in Person.objects]
-        self.assertEqual(counters, range(1, 11))
+        assert counters == range(1, 11)
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         Person.id.set_next_value(1000)
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 1000)
+        assert c["next"] == 1000
 
         Person.counter.set_next_value(999)
         c = self.db["mongoengine.counters"].find_one({"_id": "person.counter"})
-        self.assertEqual(c["next"], 999)
+        assert c["next"] == 999
 
     def test_sequence_fields_reload(self):
         class Animal(Document):
@@ -127,20 +127,20 @@ class Animal(Document):
 
         a = Animal(name="Boi").save()
 
-        self.assertEqual(a.counter, 1)
+        assert a.counter == 1
         a.reload()
-        self.assertEqual(a.counter, 1)
+        assert a.counter == 1
 
         a.counter = None
-        self.assertEqual(a.counter, 2)
+        assert a.counter == 2
         a.save()
 
-        self.assertEqual(a.counter, 2)
+        assert a.counter == 2
 
         a = Animal.objects.first()
-        self.assertEqual(a.counter, 2)
+        assert a.counter == 2
         a.reload()
-        self.assertEqual(a.counter, 2)
+        assert a.counter == 2
 
     def test_multiple_sequence_fields_on_docs(self):
         class Animal(Document):
@@ -160,22 +160,22 @@ class Person(Document):
             Person(name="Person %s" % x).save()
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         c = self.db["mongoengine.counters"].find_one({"_id": "animal.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, range(1, 11))
+        assert ids == range(1, 11)
 
         id = [i.id for i in Animal.objects]
-        self.assertEqual(id, range(1, 11))
+        assert id == range(1, 11)
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         c = self.db["mongoengine.counters"].find_one({"_id": "animal.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
     def test_sequence_field_value_decorator(self):
         class Person(Document):
@@ -190,13 +190,13 @@ class Person(Document):
             p.save()
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        self.assertEqual(ids, map(str, range(1, 11)))
+        assert ids == map(str, range(1, 11))
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
-        self.assertEqual(c["next"], 10)
+        assert c["next"] == 10
 
     def test_embedded_sequence_field(self):
         class Comment(EmbeddedDocument):
@@ -218,10 +218,10 @@ class Post(Document):
             ],
         ).save()
         c = self.db["mongoengine.counters"].find_one({"_id": "comment.id"})
-        self.assertEqual(c["next"], 2)
+        assert c["next"] == 2
         post = Post.objects.first()
-        self.assertEqual(1, post.comments[0].id)
-        self.assertEqual(2, post.comments[1].id)
+        assert 1 == post.comments[0].id
+        assert 2 == post.comments[1].id
 
     def test_inherited_sequencefield(self):
         class Base(Document):
@@ -241,16 +241,14 @@ class Bar(Base):
         foo = Foo(name="Foo")
         foo.save()
 
-        self.assertTrue(
-            "base.counter" in self.db["mongoengine.counters"].find().distinct("_id")
-        )
-        self.assertFalse(
+        assert "base.counter" in self.db["mongoengine.counters"].find().distinct("_id")
+        assert not (
             ("foo.counter" or "bar.counter")
             in self.db["mongoengine.counters"].find().distinct("_id")
         )
-        self.assertNotEqual(foo.counter, bar.counter)
-        self.assertEqual(foo._fields["counter"].owner_document, Base)
-        self.assertEqual(bar._fields["counter"].owner_document, Base)
+        assert foo.counter != bar.counter
+        assert foo._fields["counter"].owner_document == Base
+        assert bar._fields["counter"].owner_document == Base
 
     def test_no_inherited_sequencefield(self):
         class Base(Document):
@@ -269,13 +267,12 @@ class Bar(Base):
         foo = Foo(name="Foo")
         foo.save()
 
-        self.assertFalse(
+        assert not (
             "base.counter" in self.db["mongoengine.counters"].find().distinct("_id")
         )
-        self.assertTrue(
-            ("foo.counter" and "bar.counter")
-            in self.db["mongoengine.counters"].find().distinct("_id")
-        )
-        self.assertEqual(foo.counter, bar.counter)
-        self.assertEqual(foo._fields["counter"].owner_document, Foo)
-        self.assertEqual(bar._fields["counter"].owner_document, Bar)
+        assert ("foo.counter" and "bar.counter") in self.db[
+            "mongoengine.counters"
+        ].find().distinct("_id")
+        assert foo.counter == bar.counter
+        assert foo._fields["counter"].owner_document == Foo
+        assert bar._fields["counter"].owner_document == Bar
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index 81baf8d04..e7df0e08f 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -2,6 +2,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
+import pytest
 
 
 class TestURLField(MongoDBTestCase):
@@ -13,7 +14,8 @@ class Link(Document):
 
         link = Link()
         link.url = "google"
-        self.assertRaises(ValidationError, link.validate)
+        with pytest.raises(ValidationError):
+            link.validate()
 
         link.url = "http://www.google.com:8080/"
         link.validate()
@@ -29,11 +31,11 @@ class Link(Document):
 
         # TODO fix URL validation - this *IS* a valid URL
         # For now we just want to make sure that the error message is correct
-        with self.assertRaises(ValidationError) as ctx_err:
+        with pytest.raises(ValidationError) as ctx_err:
             link.validate()
-        self.assertEqual(
-            unicode(ctx_err.exception),
-            u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])",
+        assert (
+            unicode(ctx_err.exception)
+            == u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])"
         )
 
     def test_url_scheme_validation(self):
@@ -48,7 +50,8 @@ class SchemeLink(Document):
 
         link = Link()
         link.url = "ws://google.com"
-        self.assertRaises(ValidationError, link.validate)
+        with pytest.raises(ValidationError):
+            link.validate()
 
         scheme_link = SchemeLink()
         scheme_link.url = "ws://google.com"
diff --git a/tests/fields/test_uuid_field.py b/tests/fields/test_uuid_field.py
index 647dceafa..b1413f954 100644
--- a/tests/fields/test_uuid_field.py
+++ b/tests/fields/test_uuid_field.py
@@ -4,6 +4,7 @@
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase, get_as_pymongo
+import pytest
 
 
 class Person(Document):
@@ -14,9 +15,7 @@ class TestUUIDField(MongoDBTestCase):
     def test_storage(self):
         uid = uuid.uuid4()
         person = Person(api_key=uid).save()
-        self.assertEqual(
-            get_as_pymongo(person), {"_id": person.id, "api_key": str(uid)}
-        )
+        assert get_as_pymongo(person) == {"_id": person.id, "api_key": str(uid)}
 
     def test_field_string(self):
         """Test UUID fields storing as String
@@ -25,8 +24,8 @@ def test_field_string(self):
 
         uu = uuid.uuid4()
         Person(api_key=uu).save()
-        self.assertEqual(1, Person.objects(api_key=uu).count())
-        self.assertEqual(uu, Person.objects.first().api_key)
+        assert 1 == Person.objects(api_key=uu).count()
+        assert uu == Person.objects.first().api_key
 
         person = Person()
         valid = (uuid.uuid4(), uuid.uuid1())
@@ -40,7 +39,8 @@ def test_field_string(self):
         )
         for api_key in invalid:
             person.api_key = api_key
-            self.assertRaises(ValidationError, person.validate)
+            with pytest.raises(ValidationError):
+                person.validate()
 
     def test_field_binary(self):
         """Test UUID fields storing as Binary object."""
@@ -48,8 +48,8 @@ def test_field_binary(self):
 
         uu = uuid.uuid4()
         Person(api_key=uu).save()
-        self.assertEqual(1, Person.objects(api_key=uu).count())
-        self.assertEqual(uu, Person.objects.first().api_key)
+        assert 1 == Person.objects(api_key=uu).count()
+        assert uu == Person.objects.first().api_key
 
         person = Person()
         valid = (uuid.uuid4(), uuid.uuid1())
@@ -63,4 +63,5 @@ def test_field_binary(self):
         )
         for api_key in invalid:
             person.api_key = api_key
-            self.assertRaises(ValidationError, person.validate)
+            with pytest.raises(ValidationError):
+                person.validate()
diff --git a/tests/queryset/test_field_list.py b/tests/queryset/test_field_list.py
index 703c20312..d33c4c866 100644
--- a/tests/queryset/test_field_list.py
+++ b/tests/queryset/test_field_list.py
@@ -2,66 +2,67 @@
 
 from mongoengine import *
 from mongoengine.queryset import QueryFieldList
+import pytest
 
 
 class TestQueryFieldList(unittest.TestCase):
     def test_empty(self):
         q = QueryFieldList()
-        self.assertFalse(q)
+        assert not q
 
         q = QueryFieldList(always_include=["_cls"])
-        self.assertFalse(q)
+        assert not q
 
     def test_include_include(self):
         q = QueryFieldList()
         q += QueryFieldList(
             fields=["a", "b"], value=QueryFieldList.ONLY, _only_called=True
         )
-        self.assertEqual(q.as_dict(), {"a": 1, "b": 1})
+        assert q.as_dict() == {"a": 1, "b": 1}
         q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {"a": 1, "b": 1, "c": 1})
+        assert q.as_dict() == {"a": 1, "b": 1, "c": 1}
 
     def test_include_exclude(self):
         q = QueryFieldList()
         q += QueryFieldList(fields=["a", "b"], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {"a": 1, "b": 1})
+        assert q.as_dict() == {"a": 1, "b": 1}
         q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.EXCLUDE)
-        self.assertEqual(q.as_dict(), {"a": 1})
+        assert q.as_dict() == {"a": 1}
 
     def test_exclude_exclude(self):
         q = QueryFieldList()
         q += QueryFieldList(fields=["a", "b"], value=QueryFieldList.EXCLUDE)
-        self.assertEqual(q.as_dict(), {"a": 0, "b": 0})
+        assert q.as_dict() == {"a": 0, "b": 0}
         q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.EXCLUDE)
-        self.assertEqual(q.as_dict(), {"a": 0, "b": 0, "c": 0})
+        assert q.as_dict() == {"a": 0, "b": 0, "c": 0}
 
     def test_exclude_include(self):
         q = QueryFieldList()
         q += QueryFieldList(fields=["a", "b"], value=QueryFieldList.EXCLUDE)
-        self.assertEqual(q.as_dict(), {"a": 0, "b": 0})
+        assert q.as_dict() == {"a": 0, "b": 0}
         q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {"c": 1})
+        assert q.as_dict() == {"c": 1}
 
     def test_always_include(self):
         q = QueryFieldList(always_include=["x", "y"])
         q += QueryFieldList(fields=["a", "b", "x"], value=QueryFieldList.EXCLUDE)
         q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {"x": 1, "y": 1, "c": 1})
+        assert q.as_dict() == {"x": 1, "y": 1, "c": 1}
 
     def test_reset(self):
         q = QueryFieldList(always_include=["x", "y"])
         q += QueryFieldList(fields=["a", "b", "x"], value=QueryFieldList.EXCLUDE)
         q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {"x": 1, "y": 1, "c": 1})
+        assert q.as_dict() == {"x": 1, "y": 1, "c": 1}
         q.reset()
-        self.assertFalse(q)
+        assert not q
         q += QueryFieldList(fields=["b", "c"], value=QueryFieldList.ONLY)
-        self.assertEqual(q.as_dict(), {"x": 1, "y": 1, "b": 1, "c": 1})
+        assert q.as_dict() == {"x": 1, "y": 1, "b": 1, "c": 1}
 
     def test_using_a_slice(self):
         q = QueryFieldList()
         q += QueryFieldList(fields=["a"], value={"$slice": 5})
-        self.assertEqual(q.as_dict(), {"a": {"$slice": 5}})
+        assert q.as_dict() == {"a": {"$slice": 5}}
 
 
 class TestOnlyExcludeAll(unittest.TestCase):
@@ -90,25 +91,23 @@ class MyDoc(Document):
         only = ["b", "c"]
 
         qs = MyDoc.objects.fields(**{i: 1 for i in include})
-        self.assertEqual(
-            qs._loaded_fields.as_dict(), {"a": 1, "b": 1, "c": 1, "d": 1, "e": 1}
-        )
+        assert qs._loaded_fields.as_dict() == {"a": 1, "b": 1, "c": 1, "d": 1, "e": 1}
         qs = qs.only(*only)
-        self.assertEqual(qs._loaded_fields.as_dict(), {"b": 1, "c": 1})
+        assert qs._loaded_fields.as_dict() == {"b": 1, "c": 1}
         qs = qs.exclude(*exclude)
-        self.assertEqual(qs._loaded_fields.as_dict(), {"b": 1, "c": 1})
+        assert qs._loaded_fields.as_dict() == {"b": 1, "c": 1}
 
         qs = MyDoc.objects.fields(**{i: 1 for i in include})
         qs = qs.exclude(*exclude)
-        self.assertEqual(qs._loaded_fields.as_dict(), {"a": 1, "b": 1, "c": 1})
+        assert qs._loaded_fields.as_dict() == {"a": 1, "b": 1, "c": 1}
         qs = qs.only(*only)
-        self.assertEqual(qs._loaded_fields.as_dict(), {"b": 1, "c": 1})
+        assert qs._loaded_fields.as_dict() == {"b": 1, "c": 1}
 
         qs = MyDoc.objects.exclude(*exclude)
         qs = qs.fields(**{i: 1 for i in include})
-        self.assertEqual(qs._loaded_fields.as_dict(), {"a": 1, "b": 1, "c": 1})
+        assert qs._loaded_fields.as_dict() == {"a": 1, "b": 1, "c": 1}
         qs = qs.only(*only)
-        self.assertEqual(qs._loaded_fields.as_dict(), {"b": 1, "c": 1})
+        assert qs._loaded_fields.as_dict() == {"b": 1, "c": 1}
 
     def test_slicing(self):
         class MyDoc(Document):
@@ -127,15 +126,16 @@ class MyDoc(Document):
         qs = qs.exclude(*exclude)
         qs = qs.only(*only)
         qs = qs.fields(slice__b=5)
-        self.assertEqual(qs._loaded_fields.as_dict(), {"b": {"$slice": 5}, "c": 1})
+        assert qs._loaded_fields.as_dict() == {"b": {"$slice": 5}, "c": 1}
 
         qs = qs.fields(slice__c=[5, 1])
-        self.assertEqual(
-            qs._loaded_fields.as_dict(), {"b": {"$slice": 5}, "c": {"$slice": [5, 1]}}
-        )
+        assert qs._loaded_fields.as_dict() == {
+            "b": {"$slice": 5},
+            "c": {"$slice": [5, 1]},
+        }
 
         qs = qs.exclude("c")
-        self.assertEqual(qs._loaded_fields.as_dict(), {"b": {"$slice": 5}})
+        assert qs._loaded_fields.as_dict() == {"b": {"$slice": 5}}
 
     def test_mix_slice_with_other_fields(self):
         class MyDoc(Document):
@@ -144,7 +144,7 @@ class MyDoc(Document):
             c = ListField()
 
         qs = MyDoc.objects.fields(a=1, b=0, slice__c=2)
-        self.assertEqual(qs._loaded_fields.as_dict(), {"c": {"$slice": 2}, "a": 1})
+        assert qs._loaded_fields.as_dict() == {"c": {"$slice": 2}, "a": 1}
 
     def test_only(self):
         """Ensure that QuerySet.only only returns the requested fields.
@@ -153,20 +153,20 @@ def test_only(self):
         person.save()
 
         obj = self.Person.objects.only("name").get()
-        self.assertEqual(obj.name, person.name)
-        self.assertEqual(obj.age, None)
+        assert obj.name == person.name
+        assert obj.age == None
 
         obj = self.Person.objects.only("age").get()
-        self.assertEqual(obj.name, None)
-        self.assertEqual(obj.age, person.age)
+        assert obj.name == None
+        assert obj.age == person.age
 
         obj = self.Person.objects.only("name", "age").get()
-        self.assertEqual(obj.name, person.name)
-        self.assertEqual(obj.age, person.age)
+        assert obj.name == person.name
+        assert obj.age == person.age
 
         obj = self.Person.objects.only(*("id", "name")).get()
-        self.assertEqual(obj.name, person.name)
-        self.assertEqual(obj.age, None)
+        assert obj.name == person.name
+        assert obj.age == None
 
         # Check polymorphism still works
         class Employee(self.Person):
@@ -176,12 +176,12 @@ class Employee(self.Person):
         employee.save()
 
         obj = self.Person.objects(id=employee.id).only("age").get()
-        self.assertIsInstance(obj, Employee)
+        assert isinstance(obj, Employee)
 
         # Check field names are looked up properly
         obj = Employee.objects(id=employee.id).only("salary").get()
-        self.assertEqual(obj.salary, employee.salary)
-        self.assertEqual(obj.name, None)
+        assert obj.salary == employee.salary
+        assert obj.name == None
 
     def test_only_with_subfields(self):
         class User(EmbeddedDocument):
@@ -215,29 +215,29 @@ class BlogPost(Document):
         post.save()
 
         obj = BlogPost.objects.only("author.name").get()
-        self.assertEqual(obj.content, None)
-        self.assertEqual(obj.author.email, None)
-        self.assertEqual(obj.author.name, "Test User")
-        self.assertEqual(obj.comments, [])
+        assert obj.content == None
+        assert obj.author.email == None
+        assert obj.author.name == "Test User"
+        assert obj.comments == []
 
         obj = BlogPost.objects.only("various.test_dynamic.some").get()
-        self.assertEqual(obj.various["test_dynamic"].some, True)
+        assert obj.various["test_dynamic"].some == True
 
         obj = BlogPost.objects.only("content", "comments.title").get()
-        self.assertEqual(obj.content, "Had a good coffee today...")
-        self.assertEqual(obj.author, None)
-        self.assertEqual(obj.comments[0].title, "I aggree")
-        self.assertEqual(obj.comments[1].title, "Coffee")
-        self.assertEqual(obj.comments[0].text, None)
-        self.assertEqual(obj.comments[1].text, None)
+        assert obj.content == "Had a good coffee today..."
+        assert obj.author == None
+        assert obj.comments[0].title == "I aggree"
+        assert obj.comments[1].title == "Coffee"
+        assert obj.comments[0].text == None
+        assert obj.comments[1].text == None
 
         obj = BlogPost.objects.only("comments").get()
-        self.assertEqual(obj.content, None)
-        self.assertEqual(obj.author, None)
-        self.assertEqual(obj.comments[0].title, "I aggree")
-        self.assertEqual(obj.comments[1].title, "Coffee")
-        self.assertEqual(obj.comments[0].text, "Great post!")
-        self.assertEqual(obj.comments[1].text, "I hate coffee")
+        assert obj.content == None
+        assert obj.author == None
+        assert obj.comments[0].title == "I aggree"
+        assert obj.comments[1].title == "Coffee"
+        assert obj.comments[0].text == "Great post!"
+        assert obj.comments[1].text == "I hate coffee"
 
         BlogPost.drop_collection()
 
@@ -266,10 +266,10 @@ class BlogPost(Document):
         post.save()
 
         obj = BlogPost.objects.exclude("author", "comments.text").get()
-        self.assertEqual(obj.author, None)
-        self.assertEqual(obj.content, "Had a good coffee today...")
-        self.assertEqual(obj.comments[0].title, "I aggree")
-        self.assertEqual(obj.comments[0].text, None)
+        assert obj.author == None
+        assert obj.content == "Had a good coffee today..."
+        assert obj.comments[0].title == "I aggree"
+        assert obj.comments[0].text == None
 
         BlogPost.drop_collection()
 
@@ -301,18 +301,18 @@ class Email(Document):
         email.save()
 
         obj = Email.objects.exclude("content_type").exclude("body").get()
-        self.assertEqual(obj.sender, "me")
-        self.assertEqual(obj.to, "you")
-        self.assertEqual(obj.subject, "From Russia with Love")
-        self.assertEqual(obj.body, None)
-        self.assertEqual(obj.content_type, None)
+        assert obj.sender == "me"
+        assert obj.to == "you"
+        assert obj.subject == "From Russia with Love"
+        assert obj.body == None
+        assert obj.content_type == None
 
         obj = Email.objects.only("sender", "to").exclude("body", "sender").get()
-        self.assertEqual(obj.sender, None)
-        self.assertEqual(obj.to, "you")
-        self.assertEqual(obj.subject, None)
-        self.assertEqual(obj.body, None)
-        self.assertEqual(obj.content_type, None)
+        assert obj.sender == None
+        assert obj.to == "you"
+        assert obj.subject == None
+        assert obj.body == None
+        assert obj.content_type == None
 
         obj = (
             Email.objects.exclude("attachments.content")
@@ -320,13 +320,13 @@ class Email(Document):
             .only("to", "attachments.name")
             .get()
         )
-        self.assertEqual(obj.attachments[0].name, "file1.doc")
-        self.assertEqual(obj.attachments[0].content, None)
-        self.assertEqual(obj.sender, None)
-        self.assertEqual(obj.to, "you")
-        self.assertEqual(obj.subject, None)
-        self.assertEqual(obj.body, None)
-        self.assertEqual(obj.content_type, None)
+        assert obj.attachments[0].name == "file1.doc"
+        assert obj.attachments[0].content == None
+        assert obj.sender == None
+        assert obj.to == "you"
+        assert obj.subject == None
+        assert obj.body == None
+        assert obj.content_type == None
 
         Email.drop_collection()
 
@@ -355,11 +355,11 @@ class Email(Document):
             .all_fields()
             .get()
         )
-        self.assertEqual(obj.sender, "me")
-        self.assertEqual(obj.to, "you")
-        self.assertEqual(obj.subject, "From Russia with Love")
-        self.assertEqual(obj.body, "Hello!")
-        self.assertEqual(obj.content_type, "text/plain")
+        assert obj.sender == "me"
+        assert obj.to == "you"
+        assert obj.subject == "From Russia with Love"
+        assert obj.body == "Hello!"
+        assert obj.content_type == "text/plain"
 
         Email.drop_collection()
 
@@ -377,27 +377,27 @@ class Numbers(Document):
 
         # first three
         numbers = Numbers.objects.fields(slice__n=3).get()
-        self.assertEqual(numbers.n, [0, 1, 2])
+        assert numbers.n == [0, 1, 2]
 
         # last three
         numbers = Numbers.objects.fields(slice__n=-3).get()
-        self.assertEqual(numbers.n, [-3, -2, -1])
+        assert numbers.n == [-3, -2, -1]
 
         # skip 2, limit 3
         numbers = Numbers.objects.fields(slice__n=[2, 3]).get()
-        self.assertEqual(numbers.n, [2, 3, 4])
+        assert numbers.n == [2, 3, 4]
 
         # skip to fifth from last, limit 4
         numbers = Numbers.objects.fields(slice__n=[-5, 4]).get()
-        self.assertEqual(numbers.n, [-5, -4, -3, -2])
+        assert numbers.n == [-5, -4, -3, -2]
 
         # skip to fifth from last, limit 10
         numbers = Numbers.objects.fields(slice__n=[-5, 10]).get()
-        self.assertEqual(numbers.n, [-5, -4, -3, -2, -1])
+        assert numbers.n == [-5, -4, -3, -2, -1]
 
         # skip to fifth from last, limit 10 dict method
         numbers = Numbers.objects.fields(n={"$slice": [-5, 10]}).get()
-        self.assertEqual(numbers.n, [-5, -4, -3, -2, -1])
+        assert numbers.n == [-5, -4, -3, -2, -1]
 
     def test_slicing_nested_fields(self):
         """Ensure that query slicing an embedded array works.
@@ -417,27 +417,27 @@ class Numbers(Document):
 
         # first three
         numbers = Numbers.objects.fields(slice__embedded__n=3).get()
-        self.assertEqual(numbers.embedded.n, [0, 1, 2])
+        assert numbers.embedded.n == [0, 1, 2]
 
         # last three
         numbers = Numbers.objects.fields(slice__embedded__n=-3).get()
-        self.assertEqual(numbers.embedded.n, [-3, -2, -1])
+        assert numbers.embedded.n == [-3, -2, -1]
 
         # skip 2, limit 3
         numbers = Numbers.objects.fields(slice__embedded__n=[2, 3]).get()
-        self.assertEqual(numbers.embedded.n, [2, 3, 4])
+        assert numbers.embedded.n == [2, 3, 4]
 
         # skip to fifth from last, limit 4
         numbers = Numbers.objects.fields(slice__embedded__n=[-5, 4]).get()
-        self.assertEqual(numbers.embedded.n, [-5, -4, -3, -2])
+        assert numbers.embedded.n == [-5, -4, -3, -2]
 
         # skip to fifth from last, limit 10
         numbers = Numbers.objects.fields(slice__embedded__n=[-5, 10]).get()
-        self.assertEqual(numbers.embedded.n, [-5, -4, -3, -2, -1])
+        assert numbers.embedded.n == [-5, -4, -3, -2, -1]
 
         # skip to fifth from last, limit 10 dict method
         numbers = Numbers.objects.fields(embedded__n={"$slice": [-5, 10]}).get()
-        self.assertEqual(numbers.embedded.n, [-5, -4, -3, -2, -1])
+        assert numbers.embedded.n == [-5, -4, -3, -2, -1]
 
     def test_exclude_from_subclasses_docs(self):
         class Base(Document):
@@ -456,9 +456,10 @@ class User(Base):
         User(username="mongodb", password="secret").save()
 
         user = Base.objects().exclude("password", "wibble").first()
-        self.assertEqual(user.password, None)
+        assert user.password == None
 
-        self.assertRaises(LookUpError, Base.objects.exclude, "made_up")
+        with pytest.raises(LookUpError):
+            Base.objects.exclude("made_up")
 
 
 if __name__ == "__main__":
diff --git a/tests/queryset/test_geo.py b/tests/queryset/test_geo.py
index 343f864ba..a546fdb64 100644
--- a/tests/queryset/test_geo.py
+++ b/tests/queryset/test_geo.py
@@ -48,14 +48,14 @@ def test_near(self):
         # note that "near" will show the san francisco event, too,
         # although it sorts to last.
         events = self.Event.objects(location__near=[-87.67892, 41.9120459])
-        self.assertEqual(events.count(), 3)
-        self.assertEqual(list(events), [event1, event3, event2])
+        assert events.count() == 3
+        assert list(events) == [event1, event3, event2]
 
         # ensure ordering is respected by "near"
         events = self.Event.objects(location__near=[-87.67892, 41.9120459])
         events = events.order_by("-date")
-        self.assertEqual(events.count(), 3)
-        self.assertEqual(list(events), [event3, event1, event2])
+        assert events.count() == 3
+        assert list(events) == [event3, event1, event2]
 
     def test_near_and_max_distance(self):
         """Ensure the "max_distance" operator works alongside the "near"
@@ -66,8 +66,8 @@ def test_near_and_max_distance(self):
         # find events within 10 degrees of san francisco
         point = [-122.415579, 37.7566023]
         events = self.Event.objects(location__near=point, location__max_distance=10)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0], event2)
+        assert events.count() == 1
+        assert events[0] == event2
 
     def test_near_and_min_distance(self):
         """Ensure the "min_distance" operator works alongside the "near"
@@ -78,7 +78,7 @@ def test_near_and_min_distance(self):
         # find events at least 10 degrees away of san francisco
         point = [-122.415579, 37.7566023]
         events = self.Event.objects(location__near=point, location__min_distance=10)
-        self.assertEqual(events.count(), 2)
+        assert events.count() == 2
 
     def test_within_distance(self):
         """Make sure the "within_distance" operator works."""
@@ -87,29 +87,29 @@ def test_within_distance(self):
         # find events within 5 degrees of pitchfork office, chicago
         point_and_distance = [[-87.67892, 41.9120459], 5]
         events = self.Event.objects(location__within_distance=point_and_distance)
-        self.assertEqual(events.count(), 2)
+        assert events.count() == 2
         events = list(events)
-        self.assertNotIn(event2, events)
-        self.assertIn(event1, events)
-        self.assertIn(event3, events)
+        assert event2 not in events
+        assert event1 in events
+        assert event3 in events
 
         # find events within 10 degrees of san francisco
         point_and_distance = [[-122.415579, 37.7566023], 10]
         events = self.Event.objects(location__within_distance=point_and_distance)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0], event2)
+        assert events.count() == 1
+        assert events[0] == event2
 
         # find events within 1 degree of greenpoint, broolyn, nyc, ny
         point_and_distance = [[-73.9509714, 40.7237134], 1]
         events = self.Event.objects(location__within_distance=point_and_distance)
-        self.assertEqual(events.count(), 0)
+        assert events.count() == 0
 
         # ensure ordering is respected by "within_distance"
         point_and_distance = [[-87.67892, 41.9120459], 10]
         events = self.Event.objects(location__within_distance=point_and_distance)
         events = events.order_by("-date")
-        self.assertEqual(events.count(), 2)
-        self.assertEqual(events[0], event3)
+        assert events.count() == 2
+        assert events[0] == event3
 
     def test_within_box(self):
         """Ensure the "within_box" operator works."""
@@ -118,8 +118,8 @@ def test_within_box(self):
         # check that within_box works
         box = [(-125.0, 35.0), (-100.0, 40.0)]
         events = self.Event.objects(location__within_box=box)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0].id, event2.id)
+        assert events.count() == 1
+        assert events[0].id == event2.id
 
     def test_within_polygon(self):
         """Ensure the "within_polygon" operator works."""
@@ -133,8 +133,8 @@ def test_within_polygon(self):
             (-87.656164, 41.898061),
         ]
         events = self.Event.objects(location__within_polygon=polygon)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0].id, event1.id)
+        assert events.count() == 1
+        assert events[0].id == event1.id
 
         polygon2 = [
             (-1.742249, 54.033586),
@@ -142,7 +142,7 @@ def test_within_polygon(self):
             (-4.40094, 53.389881),
         ]
         events = self.Event.objects(location__within_polygon=polygon2)
-        self.assertEqual(events.count(), 0)
+        assert events.count() == 0
 
     def test_2dsphere_near(self):
         """Make sure the "near" operator works with a PointField, which
@@ -154,14 +154,14 @@ def test_2dsphere_near(self):
         # note that "near" will show the san francisco event, too,
         # although it sorts to last.
         events = self.Event.objects(location__near=[-87.67892, 41.9120459])
-        self.assertEqual(events.count(), 3)
-        self.assertEqual(list(events), [event1, event3, event2])
+        assert events.count() == 3
+        assert list(events) == [event1, event3, event2]
 
         # ensure ordering is respected by "near"
         events = self.Event.objects(location__near=[-87.67892, 41.9120459])
         events = events.order_by("-date")
-        self.assertEqual(events.count(), 3)
-        self.assertEqual(list(events), [event3, event1, event2])
+        assert events.count() == 3
+        assert list(events) == [event3, event1, event2]
 
     def test_2dsphere_near_and_max_distance(self):
         """Ensure the "max_distance" operator works alongside the "near"
@@ -172,21 +172,21 @@ def test_2dsphere_near_and_max_distance(self):
         # find events within 10km of san francisco
         point = [-122.415579, 37.7566023]
         events = self.Event.objects(location__near=point, location__max_distance=10000)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0], event2)
+        assert events.count() == 1
+        assert events[0] == event2
 
         # find events within 1km of greenpoint, broolyn, nyc, ny
         events = self.Event.objects(
             location__near=[-73.9509714, 40.7237134], location__max_distance=1000
         )
-        self.assertEqual(events.count(), 0)
+        assert events.count() == 0
 
         # ensure ordering is respected by "near"
         events = self.Event.objects(
             location__near=[-87.67892, 41.9120459], location__max_distance=10000
         ).order_by("-date")
-        self.assertEqual(events.count(), 2)
-        self.assertEqual(events[0], event3)
+        assert events.count() == 2
+        assert events[0] == event3
 
     def test_2dsphere_geo_within_box(self):
         """Ensure the "geo_within_box" operator works with a 2dsphere
@@ -197,8 +197,8 @@ def test_2dsphere_geo_within_box(self):
         # check that within_box works
         box = [(-125.0, 35.0), (-100.0, 40.0)]
         events = self.Event.objects(location__geo_within_box=box)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0].id, event2.id)
+        assert events.count() == 1
+        assert events[0].id == event2.id
 
     def test_2dsphere_geo_within_polygon(self):
         """Ensure the "geo_within_polygon" operator works with a
@@ -214,8 +214,8 @@ def test_2dsphere_geo_within_polygon(self):
             (-87.656164, 41.898061),
         ]
         events = self.Event.objects(location__geo_within_polygon=polygon)
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0].id, event1.id)
+        assert events.count() == 1
+        assert events[0].id == event1.id
 
         polygon2 = [
             (-1.742249, 54.033586),
@@ -223,7 +223,7 @@ def test_2dsphere_geo_within_polygon(self):
             (-4.40094, 53.389881),
         ]
         events = self.Event.objects(location__geo_within_polygon=polygon2)
-        self.assertEqual(events.count(), 0)
+        assert events.count() == 0
 
     def test_2dsphere_near_and_min_max_distance(self):
         """Ensure "min_distace" and "max_distance" operators work well
@@ -237,15 +237,15 @@ def test_2dsphere_near_and_min_max_distance(self):
             location__min_distance=1000,
             location__max_distance=10000,
         ).order_by("-date")
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0], event3)
+        assert events.count() == 1
+        assert events[0] == event3
 
         # ensure ordering is respected by "near" with "min_distance"
         events = self.Event.objects(
             location__near=[-87.67892, 41.9120459], location__min_distance=10000
         ).order_by("-date")
-        self.assertEqual(events.count(), 1)
-        self.assertEqual(events[0], event2)
+        assert events.count() == 1
+        assert events[0] == event2
 
     def test_2dsphere_geo_within_center(self):
         """Make sure the "geo_within_center" operator works with a
@@ -256,11 +256,11 @@ def test_2dsphere_geo_within_center(self):
         # find events within 5 degrees of pitchfork office, chicago
         point_and_distance = [[-87.67892, 41.9120459], 2]
         events = self.Event.objects(location__geo_within_center=point_and_distance)
-        self.assertEqual(events.count(), 2)
+        assert events.count() == 2
         events = list(events)
-        self.assertNotIn(event2, events)
-        self.assertIn(event1, events)
-        self.assertIn(event3, events)
+        assert event2 not in events
+        assert event1 in events
+        assert event3 in events
 
     def _test_embedded(self, point_field_class):
         """Helper test method ensuring given point field class works
@@ -290,8 +290,8 @@ class Event(Document):
         # note that "near" will show the san francisco event, too,
         # although it sorts to last.
         events = Event.objects(venue__location__near=[-87.67892, 41.9120459])
-        self.assertEqual(events.count(), 3)
-        self.assertEqual(list(events), [event1, event3, event2])
+        assert events.count() == 3
+        assert list(events) == [event1, event3, event2]
 
     def test_geo_spatial_embedded(self):
         """Make sure GeoPointField works properly in an embedded document."""
@@ -319,55 +319,55 @@ class Point(Document):
         # Finds both points because they are within 60 km of the reference
         # point equidistant between them.
         points = Point.objects(location__near_sphere=[-122, 37.5])
-        self.assertEqual(points.count(), 2)
+        assert points.count() == 2
 
         # Same behavior for _within_spherical_distance
         points = Point.objects(
             location__within_spherical_distance=[[-122, 37.5], 60 / earth_radius]
         )
-        self.assertEqual(points.count(), 2)
+        assert points.count() == 2
 
         points = Point.objects(
             location__near_sphere=[-122, 37.5], location__max_distance=60 / earth_radius
         )
-        self.assertEqual(points.count(), 2)
+        assert points.count() == 2
 
         # Test query works with max_distance, being farer from one point
         points = Point.objects(
             location__near_sphere=[-122, 37.8], location__max_distance=60 / earth_radius
         )
         close_point = points.first()
-        self.assertEqual(points.count(), 1)
+        assert points.count() == 1
 
         # Test query works with min_distance, being farer from one point
         points = Point.objects(
             location__near_sphere=[-122, 37.8], location__min_distance=60 / earth_radius
         )
-        self.assertEqual(points.count(), 1)
+        assert points.count() == 1
         far_point = points.first()
-        self.assertNotEqual(close_point, far_point)
+        assert close_point != far_point
 
         # Finds both points, but orders the north point first because it's
         # closer to the reference point to the north.
         points = Point.objects(location__near_sphere=[-122, 38.5])
-        self.assertEqual(points.count(), 2)
-        self.assertEqual(points[0].id, north_point.id)
-        self.assertEqual(points[1].id, south_point.id)
+        assert points.count() == 2
+        assert points[0].id == north_point.id
+        assert points[1].id == south_point.id
 
         # Finds both points, but orders the south point first because it's
         # closer to the reference point to the south.
         points = Point.objects(location__near_sphere=[-122, 36.5])
-        self.assertEqual(points.count(), 2)
-        self.assertEqual(points[0].id, south_point.id)
-        self.assertEqual(points[1].id, north_point.id)
+        assert points.count() == 2
+        assert points[0].id == south_point.id
+        assert points[1].id == north_point.id
 
         # Finds only one point because only the first point is within 60km of
         # the reference point to the south.
         points = Point.objects(
             location__within_spherical_distance=[[-122, 36.5], 60 / earth_radius]
         )
-        self.assertEqual(points.count(), 1)
-        self.assertEqual(points[0].id, south_point.id)
+        assert points.count() == 1
+        assert points[0].id == south_point.id
 
     def test_linestring(self):
         class Road(Document):
@@ -381,13 +381,13 @@ class Road(Document):
         # near
         point = {"type": "Point", "coordinates": [40, 5]}
         roads = Road.objects.filter(line__near=point["coordinates"]).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(line__near=point).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(line__near={"$geometry": point}).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         # Within
         polygon = {
@@ -395,37 +395,37 @@ class Road(Document):
             "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
         }
         roads = Road.objects.filter(line__geo_within=polygon["coordinates"]).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(line__geo_within=polygon).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(line__geo_within={"$geometry": polygon}).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         # Intersects
         line = {"type": "LineString", "coordinates": [[40, 5], [40, 6]]}
         roads = Road.objects.filter(line__geo_intersects=line["coordinates"]).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(line__geo_intersects=line).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(line__geo_intersects={"$geometry": line}).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         polygon = {
             "type": "Polygon",
             "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
         }
         roads = Road.objects.filter(line__geo_intersects=polygon["coordinates"]).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(line__geo_intersects=polygon).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(line__geo_intersects={"$geometry": polygon}).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
     def test_polygon(self):
         class Road(Document):
@@ -439,13 +439,13 @@ class Road(Document):
         # near
         point = {"type": "Point", "coordinates": [40, 5]}
         roads = Road.objects.filter(poly__near=point["coordinates"]).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(poly__near=point).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(poly__near={"$geometry": point}).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         # Within
         polygon = {
@@ -453,37 +453,37 @@ class Road(Document):
             "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
         }
         roads = Road.objects.filter(poly__geo_within=polygon["coordinates"]).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(poly__geo_within=polygon).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(poly__geo_within={"$geometry": polygon}).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         # Intersects
         line = {"type": "LineString", "coordinates": [[40, 5], [41, 6]]}
         roads = Road.objects.filter(poly__geo_intersects=line["coordinates"]).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(poly__geo_intersects=line).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(poly__geo_intersects={"$geometry": line}).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         polygon = {
             "type": "Polygon",
             "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
         }
         roads = Road.objects.filter(poly__geo_intersects=polygon["coordinates"]).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(poly__geo_intersects=polygon).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
         roads = Road.objects.filter(poly__geo_intersects={"$geometry": polygon}).count()
-        self.assertEqual(1, roads)
+        assert 1 == roads
 
     def test_aspymongo_with_only(self):
         """Ensure as_pymongo works with only"""
@@ -495,13 +495,10 @@ class Place(Document):
         p = Place(location=[24.946861267089844, 60.16311983618494])
         p.save()
         qs = Place.objects().only("location")
-        self.assertDictEqual(
-            qs.as_pymongo()[0]["location"],
-            {
-                u"type": u"Point",
-                u"coordinates": [24.946861267089844, 60.16311983618494],
-            },
-        )
+        assert qs.as_pymongo()[0]["location"] == {
+            u"type": u"Point",
+            u"coordinates": [24.946861267089844, 60.16311983618494],
+        }
 
     def test_2dsphere_point_sets_correctly(self):
         class Location(Document):
@@ -511,11 +508,11 @@ class Location(Document):
 
         Location(loc=[1, 2]).save()
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(loc["loc"], {"type": "Point", "coordinates": [1, 2]})
+        assert loc["loc"] == {"type": "Point", "coordinates": [1, 2]}
 
         Location.objects.update(set__loc=[2, 1])
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(loc["loc"], {"type": "Point", "coordinates": [2, 1]})
+        assert loc["loc"] == {"type": "Point", "coordinates": [2, 1]}
 
     def test_2dsphere_linestring_sets_correctly(self):
         class Location(Document):
@@ -525,15 +522,11 @@ class Location(Document):
 
         Location(line=[[1, 2], [2, 2]]).save()
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(
-            loc["line"], {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}
-        )
+        assert loc["line"] == {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}
 
         Location.objects.update(set__line=[[2, 1], [1, 2]])
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(
-            loc["line"], {"type": "LineString", "coordinates": [[2, 1], [1, 2]]}
-        )
+        assert loc["line"] == {"type": "LineString", "coordinates": [[2, 1], [1, 2]]}
 
     def test_geojson_PolygonField(self):
         class Location(Document):
@@ -543,17 +536,17 @@ class Location(Document):
 
         Location(poly=[[[40, 5], [40, 6], [41, 6], [40, 5]]]).save()
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(
-            loc["poly"],
-            {"type": "Polygon", "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]]},
-        )
+        assert loc["poly"] == {
+            "type": "Polygon",
+            "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]],
+        }
 
         Location.objects.update(set__poly=[[[40, 4], [40, 6], [41, 6], [40, 4]]])
         loc = Location.objects.as_pymongo()[0]
-        self.assertEqual(
-            loc["poly"],
-            {"type": "Polygon", "coordinates": [[[40, 4], [40, 6], [41, 6], [40, 4]]]},
-        )
+        assert loc["poly"] == {
+            "type": "Polygon",
+            "coordinates": [[[40, 4], [40, 6], [41, 6], [40, 4]]],
+        }
 
 
 if __name__ == "__main__":
diff --git a/tests/queryset/test_modify.py b/tests/queryset/test_modify.py
index 60f4884c9..293a463e0 100644
--- a/tests/queryset/test_modify.py
+++ b/tests/queryset/test_modify.py
@@ -14,14 +14,14 @@ def setUp(self):
         Doc.drop_collection()
 
     def assertDbEqual(self, docs):
-        self.assertEqual(list(Doc._collection.find().sort("id")), docs)
+        assert list(Doc._collection.find().sort("id")) == docs
 
     def test_modify(self):
         Doc(id=0, value=0).save()
         doc = Doc(id=1, value=1).save()
 
         old_doc = Doc.objects(id=1).modify(set__value=-1)
-        self.assertEqual(old_doc.to_json(), doc.to_json())
+        assert old_doc.to_json() == doc.to_json()
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
     def test_modify_with_new(self):
@@ -30,18 +30,18 @@ def test_modify_with_new(self):
 
         new_doc = Doc.objects(id=1).modify(set__value=-1, new=True)
         doc.value = -1
-        self.assertEqual(new_doc.to_json(), doc.to_json())
+        assert new_doc.to_json() == doc.to_json()
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
     def test_modify_not_existing(self):
         Doc(id=0, value=0).save()
-        self.assertEqual(Doc.objects(id=1).modify(set__value=-1), None)
+        assert Doc.objects(id=1).modify(set__value=-1) == None
         self.assertDbEqual([{"_id": 0, "value": 0}])
 
     def test_modify_with_upsert(self):
         Doc(id=0, value=0).save()
         old_doc = Doc.objects(id=1).modify(set__value=1, upsert=True)
-        self.assertEqual(old_doc, None)
+        assert old_doc == None
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}])
 
     def test_modify_with_upsert_existing(self):
@@ -49,13 +49,13 @@ def test_modify_with_upsert_existing(self):
         doc = Doc(id=1, value=1).save()
 
         old_doc = Doc.objects(id=1).modify(set__value=-1, upsert=True)
-        self.assertEqual(old_doc.to_json(), doc.to_json())
+        assert old_doc.to_json() == doc.to_json()
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
     def test_modify_with_upsert_with_new(self):
         Doc(id=0, value=0).save()
         new_doc = Doc.objects(id=1).modify(upsert=True, new=True, set__value=1)
-        self.assertEqual(new_doc.to_mongo(), {"_id": 1, "value": 1})
+        assert new_doc.to_mongo() == {"_id": 1, "value": 1}
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}])
 
     def test_modify_with_remove(self):
@@ -63,12 +63,12 @@ def test_modify_with_remove(self):
         doc = Doc(id=1, value=1).save()
 
         old_doc = Doc.objects(id=1).modify(remove=True)
-        self.assertEqual(old_doc.to_json(), doc.to_json())
+        assert old_doc.to_json() == doc.to_json()
         self.assertDbEqual([{"_id": 0, "value": 0}])
 
     def test_find_and_modify_with_remove_not_existing(self):
         Doc(id=0, value=0).save()
-        self.assertEqual(Doc.objects(id=1).modify(remove=True), None)
+        assert Doc.objects(id=1).modify(remove=True) == None
         self.assertDbEqual([{"_id": 0, "value": 0}])
 
     def test_modify_with_order_by(self):
@@ -78,7 +78,7 @@ def test_modify_with_order_by(self):
         doc = Doc(id=3, value=0).save()
 
         old_doc = Doc.objects().order_by("-id").modify(set__value=-1)
-        self.assertEqual(old_doc.to_json(), doc.to_json())
+        assert old_doc.to_json() == doc.to_json()
         self.assertDbEqual(
             [
                 {"_id": 0, "value": 3},
@@ -93,7 +93,7 @@ def test_modify_with_fields(self):
         Doc(id=1, value=1).save()
 
         old_doc = Doc.objects(id=1).only("id").modify(set__value=-1)
-        self.assertEqual(old_doc.to_mongo(), {"_id": 1})
+        assert old_doc.to_mongo() == {"_id": 1}
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
     def test_modify_with_push(self):
@@ -106,23 +106,23 @@ class BlogPost(Document):
 
         # Push a new tag via modify with new=False (default).
         BlogPost(id=blog.id).modify(push__tags="code")
-        self.assertEqual(blog.tags, [])
+        assert blog.tags == []
         blog.reload()
-        self.assertEqual(blog.tags, ["code"])
+        assert blog.tags == ["code"]
 
         # Push a new tag via modify with new=True.
         blog = BlogPost.objects(id=blog.id).modify(push__tags="java", new=True)
-        self.assertEqual(blog.tags, ["code", "java"])
+        assert blog.tags == ["code", "java"]
 
         # Push a new tag with a positional argument.
         blog = BlogPost.objects(id=blog.id).modify(push__tags__0="python", new=True)
-        self.assertEqual(blog.tags, ["python", "code", "java"])
+        assert blog.tags == ["python", "code", "java"]
 
         # Push multiple new tags with a positional argument.
         blog = BlogPost.objects(id=blog.id).modify(
             push__tags__1=["go", "rust"], new=True
         )
-        self.assertEqual(blog.tags, ["python", "go", "rust", "code", "java"])
+        assert blog.tags == ["python", "go", "rust", "code", "java"]
 
 
 if __name__ == "__main__":
diff --git a/tests/queryset/test_pickable.py b/tests/queryset/test_pickable.py
index 8c4e34261..d41f56df4 100644
--- a/tests/queryset/test_pickable.py
+++ b/tests/queryset/test_pickable.py
@@ -37,13 +37,13 @@ def test_unpickle(self):
 
         loadedQs = self._get_loaded(qs)
 
-        self.assertEqual(qs.count(), loadedQs.count())
+        assert qs.count() == loadedQs.count()
 
         # can update loadedQs
         loadedQs.update(age=23)
 
         # check
-        self.assertEqual(Person.objects.first().age, 23)
+        assert Person.objects.first().age == 23
 
     def test_pickle_support_filtration(self):
         Person.objects.create(name="Alice", age=22)
@@ -51,9 +51,9 @@ def test_pickle_support_filtration(self):
         Person.objects.create(name="Bob", age=23)
 
         qs = Person.objects.filter(age__gte=22)
-        self.assertEqual(qs.count(), 2)
+        assert qs.count() == 2
 
         loaded = self._get_loaded(qs)
 
-        self.assertEqual(loaded.count(), 2)
-        self.assertEqual(loaded.filter(name="Bob").first().age, 23)
+        assert loaded.count() == 2
+        assert loaded.filter(name="Bob").first().age == 23
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 162132548..d154de8dd 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -24,6 +24,7 @@
     QuerySetManager,
     queryset_manager,
 )
+import pytest
 
 
 class db_ops_tracker(query_counter):
@@ -64,11 +65,11 @@ class Person(Document):
     def test_initialisation(self):
         """Ensure that a QuerySet is correctly initialised by QuerySetManager.
         """
-        self.assertIsInstance(self.Person.objects, QuerySet)
-        self.assertEqual(
-            self.Person.objects._collection.name, self.Person._get_collection_name()
+        assert isinstance(self.Person.objects, QuerySet)
+        assert (
+            self.Person.objects._collection.name == self.Person._get_collection_name()
         )
-        self.assertIsInstance(
+        assert isinstance(
             self.Person.objects._collection, pymongo.collection.Collection
         )
 
@@ -78,11 +79,11 @@ class BlogPost(Document):
             author2 = GenericReferenceField()
 
         # test addressing a field from a reference
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             list(BlogPost.objects(author__name="test"))
 
         # should fail for a generic reference as well
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             list(BlogPost.objects(author2__name="test"))
 
     def test_find(self):
@@ -92,27 +93,27 @@ def test_find(self):
 
         # Find all people in the collection
         people = self.Person.objects
-        self.assertEqual(people.count(), 2)
+        assert people.count() == 2
         results = list(people)
 
-        self.assertIsInstance(results[0], self.Person)
-        self.assertIsInstance(results[0].id, ObjectId)
+        assert isinstance(results[0], self.Person)
+        assert isinstance(results[0].id, ObjectId)
 
-        self.assertEqual(results[0], user_a)
-        self.assertEqual(results[0].name, "User A")
-        self.assertEqual(results[0].age, 20)
+        assert results[0] == user_a
+        assert results[0].name == "User A"
+        assert results[0].age == 20
 
-        self.assertEqual(results[1], user_b)
-        self.assertEqual(results[1].name, "User B")
-        self.assertEqual(results[1].age, 30)
+        assert results[1] == user_b
+        assert results[1].name == "User B"
+        assert results[1].age == 30
 
         # Filter people by age
         people = self.Person.objects(age=20)
-        self.assertEqual(people.count(), 1)
+        assert people.count() == 1
         person = people.next()
-        self.assertEqual(person, user_a)
-        self.assertEqual(person.name, "User A")
-        self.assertEqual(person.age, 20)
+        assert person == user_a
+        assert person.name == "User A"
+        assert person.age == 20
 
     def test_limit(self):
         """Ensure that QuerySet.limit works as expected."""
@@ -121,27 +122,27 @@ def test_limit(self):
 
         # Test limit on a new queryset
         people = list(self.Person.objects.limit(1))
-        self.assertEqual(len(people), 1)
-        self.assertEqual(people[0], user_a)
+        assert len(people) == 1
+        assert people[0] == user_a
 
         # Test limit on an existing queryset
         people = self.Person.objects
-        self.assertEqual(len(people), 2)
+        assert len(people) == 2
         people2 = people.limit(1)
-        self.assertEqual(len(people), 2)
-        self.assertEqual(len(people2), 1)
-        self.assertEqual(people2[0], user_a)
+        assert len(people) == 2
+        assert len(people2) == 1
+        assert people2[0] == user_a
 
         # Test limit with 0 as parameter
         people = self.Person.objects.limit(0)
-        self.assertEqual(people.count(with_limit_and_skip=True), 2)
-        self.assertEqual(len(people), 2)
+        assert people.count(with_limit_and_skip=True) == 2
+        assert len(people) == 2
 
         # Test chaining of only after limit
         person = self.Person.objects().limit(1).only("name").first()
-        self.assertEqual(person, user_a)
-        self.assertEqual(person.name, "User A")
-        self.assertEqual(person.age, None)
+        assert person == user_a
+        assert person.name == "User A"
+        assert person.age == None
 
     def test_skip(self):
         """Ensure that QuerySet.skip works as expected."""
@@ -150,26 +151,26 @@ def test_skip(self):
 
         # Test skip on a new queryset
         people = list(self.Person.objects.skip(1))
-        self.assertEqual(len(people), 1)
-        self.assertEqual(people[0], user_b)
+        assert len(people) == 1
+        assert people[0] == user_b
 
         # Test skip on an existing queryset
         people = self.Person.objects
-        self.assertEqual(len(people), 2)
+        assert len(people) == 2
         people2 = people.skip(1)
-        self.assertEqual(len(people), 2)
-        self.assertEqual(len(people2), 1)
-        self.assertEqual(people2[0], user_b)
+        assert len(people) == 2
+        assert len(people2) == 1
+        assert people2[0] == user_b
 
         # Test chaining of only after skip
         person = self.Person.objects().skip(1).only("name").first()
-        self.assertEqual(person, user_b)
-        self.assertEqual(person.name, "User B")
-        self.assertEqual(person.age, None)
+        assert person == user_b
+        assert person.name == "User B"
+        assert person.age == None
 
     def test___getitem___invalid_index(self):
         """Ensure slicing a queryset works as expected."""
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             self.Person.objects()["a"]
 
     def test_slice(self):
@@ -180,27 +181,27 @@ def test_slice(self):
 
         # Test slice limit
         people = list(self.Person.objects[:2])
-        self.assertEqual(len(people), 2)
-        self.assertEqual(people[0], user_a)
-        self.assertEqual(people[1], user_b)
+        assert len(people) == 2
+        assert people[0] == user_a
+        assert people[1] == user_b
 
         # Test slice skip
         people = list(self.Person.objects[1:])
-        self.assertEqual(len(people), 2)
-        self.assertEqual(people[0], user_b)
-        self.assertEqual(people[1], user_c)
+        assert len(people) == 2
+        assert people[0] == user_b
+        assert people[1] == user_c
 
         # Test slice limit and skip
         people = list(self.Person.objects[1:2])
-        self.assertEqual(len(people), 1)
-        self.assertEqual(people[0], user_b)
+        assert len(people) == 1
+        assert people[0] == user_b
 
         # Test slice limit and skip on an existing queryset
         people = self.Person.objects
-        self.assertEqual(len(people), 3)
+        assert len(people) == 3
         people2 = people[1:2]
-        self.assertEqual(len(people2), 1)
-        self.assertEqual(people2[0], user_b)
+        assert len(people2) == 1
+        assert people2[0] == user_b
 
         # Test slice limit and skip cursor reset
         qs = self.Person.objects[1:2]
@@ -208,31 +209,31 @@ def test_slice(self):
         qs._cursor
         qs._cursor_obj = None
         people = list(qs)
-        self.assertEqual(len(people), 1)
-        self.assertEqual(people[0].name, "User B")
+        assert len(people) == 1
+        assert people[0].name == "User B"
 
         # Test empty slice
         people = list(self.Person.objects[1:1])
-        self.assertEqual(len(people), 0)
+        assert len(people) == 0
 
         # Test slice out of range
         people = list(self.Person.objects[80000:80001])
-        self.assertEqual(len(people), 0)
+        assert len(people) == 0
 
         # Test larger slice __repr__
         self.Person.objects.delete()
         for i in range(55):
             self.Person(name="A%s" % i, age=i).save()
 
-        self.assertEqual(self.Person.objects.count(), 55)
-        self.assertEqual("Person object", "%s" % self.Person.objects[0])
-        self.assertEqual(
-            "[<Person: Person object>, <Person: Person object>]",
-            "%s" % self.Person.objects[1:3],
+        assert self.Person.objects.count() == 55
+        assert "Person object" == "%s" % self.Person.objects[0]
+        assert (
+            "[<Person: Person object>, <Person: Person object>]"
+            == "%s" % self.Person.objects[1:3]
         )
-        self.assertEqual(
-            "[<Person: Person object>, <Person: Person object>]",
-            "%s" % self.Person.objects[51:53],
+        assert (
+            "[<Person: Person object>, <Person: Person object>]"
+            == "%s" % self.Person.objects[51:53]
         )
 
     def test_find_one(self):
@@ -245,40 +246,42 @@ def test_find_one(self):
 
         # Retrieve the first person from the database
         person = self.Person.objects.first()
-        self.assertIsInstance(person, self.Person)
-        self.assertEqual(person.name, "User A")
-        self.assertEqual(person.age, 20)
+        assert isinstance(person, self.Person)
+        assert person.name == "User A"
+        assert person.age == 20
 
         # Use a query to filter the people found to just person2
         person = self.Person.objects(age=30).first()
-        self.assertEqual(person.name, "User B")
+        assert person.name == "User B"
 
         person = self.Person.objects(age__lt=30).first()
-        self.assertEqual(person.name, "User A")
+        assert person.name == "User A"
 
         # Use array syntax
         person = self.Person.objects[0]
-        self.assertEqual(person.name, "User A")
+        assert person.name == "User A"
 
         person = self.Person.objects[1]
-        self.assertEqual(person.name, "User B")
+        assert person.name == "User B"
 
-        with self.assertRaises(IndexError):
+        with pytest.raises(IndexError):
             self.Person.objects[2]
 
         # Find a document using just the object id
         person = self.Person.objects.with_id(person1.id)
-        self.assertEqual(person.name, "User A")
+        assert person.name == "User A"
 
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             self.Person.objects(name="User A").with_id(person1.id)
 
     def test_find_only_one(self):
         """Ensure that a query using ``get`` returns at most one result.
         """
         # Try retrieving when no objects exists
-        self.assertRaises(DoesNotExist, self.Person.objects.get)
-        self.assertRaises(self.Person.DoesNotExist, self.Person.objects.get)
+        with pytest.raises(DoesNotExist):
+            self.Person.objects.get()
+        with pytest.raises(self.Person.DoesNotExist):
+            self.Person.objects.get()
 
         person1 = self.Person(name="User A", age=20)
         person1.save()
@@ -286,15 +289,17 @@ def test_find_only_one(self):
         person2.save()
 
         # Retrieve the first person from the database
-        self.assertRaises(MultipleObjectsReturned, self.Person.objects.get)
-        self.assertRaises(self.Person.MultipleObjectsReturned, self.Person.objects.get)
+        with pytest.raises(MultipleObjectsReturned):
+            self.Person.objects.get()
+        with pytest.raises(self.Person.MultipleObjectsReturned):
+            self.Person.objects.get()
 
         # Use a query to filter the people found to just person2
         person = self.Person.objects.get(age=30)
-        self.assertEqual(person.name, "User B")
+        assert person.name == "User B"
 
         person = self.Person.objects.get(age__lt=30)
-        self.assertEqual(person.name, "User A")
+        assert person.name == "User A"
 
     def test_find_array_position(self):
         """Ensure that query by array position works.
@@ -313,10 +318,10 @@ class Blog(Document):
         Blog.drop_collection()
 
         Blog.objects.create(tags=["a", "b"])
-        self.assertEqual(Blog.objects(tags__0="a").count(), 1)
-        self.assertEqual(Blog.objects(tags__0="b").count(), 0)
-        self.assertEqual(Blog.objects(tags__1="a").count(), 0)
-        self.assertEqual(Blog.objects(tags__1="b").count(), 1)
+        assert Blog.objects(tags__0="a").count() == 1
+        assert Blog.objects(tags__0="b").count() == 0
+        assert Blog.objects(tags__1="a").count() == 0
+        assert Blog.objects(tags__1="b").count() == 1
 
         Blog.drop_collection()
 
@@ -328,19 +333,19 @@ class Blog(Document):
         blog2 = Blog.objects.create(posts=[post2, post1])
 
         blog = Blog.objects(posts__0__comments__0__name="testa").get()
-        self.assertEqual(blog, blog1)
+        assert blog == blog1
 
         blog = Blog.objects(posts__0__comments__0__name="testb").get()
-        self.assertEqual(blog, blog2)
+        assert blog == blog2
 
         query = Blog.objects(posts__1__comments__1__name="testb")
-        self.assertEqual(query.count(), 2)
+        assert query.count() == 2
 
         query = Blog.objects(posts__1__comments__1__name="testa")
-        self.assertEqual(query.count(), 0)
+        assert query.count() == 0
 
         query = Blog.objects(posts__0__comments__1__name="testa")
-        self.assertEqual(query.count(), 0)
+        assert query.count() == 0
 
         Blog.drop_collection()
 
@@ -351,8 +356,8 @@ class A(Document):
         A.drop_collection()
         A().save()
 
-        self.assertEqual(list(A.objects.none()), [])
-        self.assertEqual(list(A.objects.none().all()), [])
+        assert list(A.objects.none()) == []
+        assert list(A.objects.none().all()) == []
 
     def test_chaining(self):
         class A(Document):
@@ -376,12 +381,12 @@ class B(Document):
         # Doesn't work
         q2 = B.objects.filter(ref__in=[a1, a2])
         q2 = q2.filter(ref=a1)._query
-        self.assertEqual(q1, q2)
+        assert q1 == q2
 
         a_objects = A.objects(s="test1")
         query = B.objects(ref__in=a_objects)
         query = query.filter(boolfield=True)
-        self.assertEqual(query.count(), 1)
+        assert query.count() == 1
 
     def test_batch_size(self):
         """Ensure that batch_size works."""
@@ -398,7 +403,7 @@ class A(Document):
         cnt = 0
         for a in A.objects.batch_size(10):
             cnt += 1
-        self.assertEqual(cnt, 100)
+        assert cnt == 100
 
         # test chaining
         qs = A.objects.all()
@@ -406,11 +411,11 @@ class A(Document):
         cnt = 0
         for a in qs:
             cnt += 1
-        self.assertEqual(cnt, 9)
+        assert cnt == 9
 
         # test invalid batch size
         qs = A.objects.batch_size(-1)
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             list(qs)
 
     def test_batch_size_cloned(self):
@@ -419,9 +424,9 @@ class A(Document):
 
         # test that batch size gets cloned
         qs = A.objects.batch_size(5)
-        self.assertEqual(qs._batch_size, 5)
+        assert qs._batch_size == 5
         qs_clone = qs.clone()
-        self.assertEqual(qs_clone._batch_size, 5)
+        assert qs_clone._batch_size == 5
 
     def test_update_write_concern(self):
         """Test that passing write_concern works"""
@@ -437,18 +442,18 @@ def test_update_write_concern(self):
 
         result = self.Person.objects.update(set__name="Ross", write_concern={"w": 1})
 
-        self.assertEqual(result, 2)
+        assert result == 2
         result = self.Person.objects.update(set__name="Ross", write_concern={"w": 0})
-        self.assertEqual(result, None)
+        assert result == None
 
         result = self.Person.objects.update_one(
             set__name="Test User", write_concern={"w": 1}
         )
-        self.assertEqual(result, 1)
+        assert result == 1
         result = self.Person.objects.update_one(
             set__name="Test User", write_concern={"w": 0}
         )
-        self.assertEqual(result, None)
+        assert result == None
 
     def test_update_update_has_a_value(self):
         """Test to ensure that update is passed a value to update to"""
@@ -456,10 +461,10 @@ def test_update_update_has_a_value(self):
 
         author = self.Person.objects.create(name="Test User")
 
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             self.Person.objects(pk=author.pk).update({})
 
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             self.Person.objects(pk=author.pk).update_one({})
 
     def test_update_array_position(self):
@@ -492,7 +497,7 @@ class Blog(Document):
         # Update all of the first comments of second posts of all blogs
         Blog.objects().update(set__posts__1__comments__0__name="testc")
         testc_blogs = Blog.objects(posts__1__comments__0__name="testc")
-        self.assertEqual(testc_blogs.count(), 2)
+        assert testc_blogs.count() == 2
 
         Blog.drop_collection()
         Blog.objects.create(posts=[post1, post2])
@@ -501,10 +506,10 @@ class Blog(Document):
         # Update only the first blog returned by the query
         Blog.objects().update_one(set__posts__1__comments__1__name="testc")
         testc_blogs = Blog.objects(posts__1__comments__1__name="testc")
-        self.assertEqual(testc_blogs.count(), 1)
+        assert testc_blogs.count() == 1
 
         # Check that using this indexing syntax on a non-list fails
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             Blog.objects().update(set__posts__1__comments__0__name__1="asdf")
 
         Blog.drop_collection()
@@ -531,8 +536,8 @@ class BlogPost(Document):
         BlogPost.objects(comments__by="jane").update(inc__comments__S__votes=1)
 
         post = BlogPost.objects.first()
-        self.assertEqual(post.comments[1].by, "jane")
-        self.assertEqual(post.comments[1].votes, 8)
+        assert post.comments[1].by == "jane"
+        assert post.comments[1].votes == 8
 
     def test_update_using_positional_operator_matches_first(self):
 
@@ -547,7 +552,7 @@ class Simple(Document):
         Simple.objects(x=2).update(inc__x__S=1)
 
         simple = Simple.objects.first()
-        self.assertEqual(simple.x, [1, 3, 3, 2])
+        assert simple.x == [1, 3, 3, 2]
         Simple.drop_collection()
 
         # You can set multiples
@@ -559,10 +564,10 @@ class Simple(Document):
         Simple.objects(x=3).update(set__x__S=0)
 
         s = Simple.objects()
-        self.assertEqual(s[0].x, [1, 2, 0, 4])
-        self.assertEqual(s[1].x, [2, 0, 4, 5])
-        self.assertEqual(s[2].x, [0, 4, 5, 6])
-        self.assertEqual(s[3].x, [4, 5, 6, 7])
+        assert s[0].x == [1, 2, 0, 4]
+        assert s[1].x == [2, 0, 4, 5]
+        assert s[2].x == [0, 4, 5, 6]
+        assert s[3].x == [4, 5, 6, 7]
 
         # Using "$unset" with an expression like this "array.$" will result in
         # the array item becoming None, not being removed.
@@ -570,14 +575,14 @@ class Simple(Document):
         Simple(x=[1, 2, 3, 4, 3, 2, 3, 4]).save()
         Simple.objects(x=3).update(unset__x__S=1)
         simple = Simple.objects.first()
-        self.assertEqual(simple.x, [1, 2, None, 4, 3, 2, 3, 4])
+        assert simple.x == [1, 2, None, 4, 3, 2, 3, 4]
 
         # Nested updates arent supported yet..
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             Simple.drop_collection()
             Simple(x=[{"test": [1, 2, 3, 4]}]).save()
             Simple.objects(x__test=2).update(set__x__S__test__S=3)
-            self.assertEqual(simple.x, [1, 2, 3, 4])
+            assert simple.x == [1, 2, 3, 4]
 
     def test_update_using_positional_operator_embedded_document(self):
         """Ensure that the embedded documents can be updated using the positional
@@ -606,8 +611,8 @@ class BlogPost(Document):
         )
 
         post = BlogPost.objects.first()
-        self.assertEqual(post.comments[0].by, "joe")
-        self.assertEqual(post.comments[0].votes.score, 4)
+        assert post.comments[0].by == "joe"
+        assert post.comments[0].votes.score == 4
 
     def test_update_min_max(self):
         class Scores(Document):
@@ -617,14 +622,14 @@ class Scores(Document):
         scores = Scores.objects.create(high_score=800, low_score=200)
 
         Scores.objects(id=scores.id).update(min__low_score=150)
-        self.assertEqual(Scores.objects.get(id=scores.id).low_score, 150)
+        assert Scores.objects.get(id=scores.id).low_score == 150
         Scores.objects(id=scores.id).update(min__low_score=250)
-        self.assertEqual(Scores.objects.get(id=scores.id).low_score, 150)
+        assert Scores.objects.get(id=scores.id).low_score == 150
 
         Scores.objects(id=scores.id).update(max__high_score=1000)
-        self.assertEqual(Scores.objects.get(id=scores.id).high_score, 1000)
+        assert Scores.objects.get(id=scores.id).high_score == 1000
         Scores.objects(id=scores.id).update(max__high_score=500)
-        self.assertEqual(Scores.objects.get(id=scores.id).high_score, 1000)
+        assert Scores.objects.get(id=scores.id).high_score == 1000
 
     def test_update_multiple(self):
         class Product(Document):
@@ -634,10 +639,10 @@ class Product(Document):
         product = Product.objects.create(item="ABC", price=10.99)
         product = Product.objects.create(item="ABC", price=10.99)
         Product.objects(id=product.id).update(mul__price=1.25)
-        self.assertEqual(Product.objects.get(id=product.id).price, 13.7375)
+        assert Product.objects.get(id=product.id).price == 13.7375
         unknown_product = Product.objects.create(item="Unknown")
         Product.objects(id=unknown_product.id).update(mul__price=100)
-        self.assertEqual(Product.objects.get(id=unknown_product.id).price, 0)
+        assert Product.objects.get(id=unknown_product.id).price == 0
 
     def test_updates_can_have_match_operators(self):
         class Comment(EmbeddedDocument):
@@ -663,7 +668,7 @@ class Post(Document):
 
         Post.objects().update_one(pull__comments__vote__lt=1)
 
-        self.assertEqual(1, len(Post.objects.first().comments))
+        assert 1 == len(Post.objects.first().comments)
 
     def test_mapfield_update(self):
         """Ensure that the MapField can be updated."""
@@ -684,8 +689,8 @@ class Club(Document):
         Club.objects().update(set__members={"John": Member(gender="F", age=14)})
 
         club = Club.objects().first()
-        self.assertEqual(club.members["John"].gender, "F")
-        self.assertEqual(club.members["John"].age, 14)
+        assert club.members["John"].gender == "F"
+        assert club.members["John"].age == 14
 
     def test_dictfield_update(self):
         """Ensure that the DictField can be updated."""
@@ -700,25 +705,25 @@ class Club(Document):
         Club.objects().update(set__members={"John": {"gender": "F", "age": 14}})
 
         club = Club.objects().first()
-        self.assertEqual(club.members["John"]["gender"], "F")
-        self.assertEqual(club.members["John"]["age"], 14)
+        assert club.members["John"]["gender"] == "F"
+        assert club.members["John"]["age"] == 14
 
     def test_update_results(self):
         self.Person.drop_collection()
 
         result = self.Person(name="Bob", age=25).update(upsert=True, full_result=True)
-        self.assertIsInstance(result, UpdateResult)
-        self.assertIn("upserted", result.raw_result)
-        self.assertFalse(result.raw_result["updatedExisting"])
+        assert isinstance(result, UpdateResult)
+        assert "upserted" in result.raw_result
+        assert not result.raw_result["updatedExisting"]
 
         bob = self.Person.objects.first()
         result = bob.update(set__age=30, full_result=True)
-        self.assertIsInstance(result, UpdateResult)
-        self.assertTrue(result.raw_result["updatedExisting"])
+        assert isinstance(result, UpdateResult)
+        assert result.raw_result["updatedExisting"]
 
         self.Person(name="Bob", age=20).save()
         result = self.Person.objects(name="Bob").update(set__name="bobby", multi=True)
-        self.assertEqual(result, 2)
+        assert result == 2
 
     def test_update_validate(self):
         class EmDoc(EmbeddedDocument):
@@ -730,13 +735,12 @@ class Doc(Document):
             cdt_f = ComplexDateTimeField()
             ed_f = EmbeddedDocumentField(EmDoc)
 
-        self.assertRaises(ValidationError, Doc.objects().update, str_f=1, upsert=True)
-        self.assertRaises(
-            ValidationError, Doc.objects().update, dt_f="datetime", upsert=True
-        )
-        self.assertRaises(
-            ValidationError, Doc.objects().update, ed_f__str_f=1, upsert=True
-        )
+        with pytest.raises(ValidationError):
+            Doc.objects().update(str_f=1, upsert=True)
+        with pytest.raises(ValidationError):
+            Doc.objects().update(dt_f="datetime", upsert=True)
+        with pytest.raises(ValidationError):
+            Doc.objects().update(ed_f__str_f=1, upsert=True)
 
     def test_update_related_models(self):
         class TestPerson(Document):
@@ -757,20 +761,20 @@ class TestOrganization(Document):
         o.owner = p
         p.name = "p2"
 
-        self.assertEqual(o._get_changed_fields(), ["owner"])
-        self.assertEqual(p._get_changed_fields(), ["name"])
+        assert o._get_changed_fields() == ["owner"]
+        assert p._get_changed_fields() == ["name"]
 
         o.save()
 
-        self.assertEqual(o._get_changed_fields(), [])
-        self.assertEqual(p._get_changed_fields(), ["name"])  # Fails; it's empty
+        assert o._get_changed_fields() == []
+        assert p._get_changed_fields() == ["name"]  # Fails; it's empty
 
         # This will do NOTHING at all, even though we changed the name
         p.save()
 
         p.reload()
 
-        self.assertEqual(p.name, "p2")  # Fails; it's still `p1`
+        assert p.name == "p2"  # Fails; it's still `p1`
 
     def test_upsert(self):
         self.Person.drop_collection()
@@ -778,25 +782,25 @@ def test_upsert(self):
         self.Person.objects(pk=ObjectId(), name="Bob", age=30).update(upsert=True)
 
         bob = self.Person.objects.first()
-        self.assertEqual("Bob", bob.name)
-        self.assertEqual(30, bob.age)
+        assert "Bob" == bob.name
+        assert 30 == bob.age
 
     def test_upsert_one(self):
         self.Person.drop_collection()
 
         bob = self.Person.objects(name="Bob", age=30).upsert_one()
 
-        self.assertEqual("Bob", bob.name)
-        self.assertEqual(30, bob.age)
+        assert "Bob" == bob.name
+        assert 30 == bob.age
 
         bob.name = "Bobby"
         bob.save()
 
         bobby = self.Person.objects(name="Bobby", age=30).upsert_one()
 
-        self.assertEqual("Bobby", bobby.name)
-        self.assertEqual(30, bobby.age)
-        self.assertEqual(bob.id, bobby.id)
+        assert "Bobby" == bobby.name
+        assert 30 == bobby.age
+        assert bob.id == bobby.id
 
     def test_set_on_insert(self):
         self.Person.drop_collection()
@@ -806,8 +810,8 @@ def test_set_on_insert(self):
         )
 
         bob = self.Person.objects.first()
-        self.assertEqual("Bob", bob.name)
-        self.assertEqual(30, bob.age)
+        assert "Bob" == bob.name
+        assert 30 == bob.age
 
     def test_save_and_only_on_fields_with_default(self):
         class Embed(EmbeddedDocument):
@@ -832,9 +836,9 @@ class B(Document):
 
         # Checking it was saved correctly
         record.reload()
-        self.assertEqual(record.field, 2)
-        self.assertEqual(record.embed_no_default.field, 2)
-        self.assertEqual(record.embed.field, 2)
+        assert record.field == 2
+        assert record.embed_no_default.field == 2
+        assert record.embed.field == 2
 
         # Request only the _id field and save
         clone = B.objects().only("id").first()
@@ -842,9 +846,9 @@ class B(Document):
 
         # Reload the record and see that the embed data is not lost
         record.reload()
-        self.assertEqual(record.field, 2)
-        self.assertEqual(record.embed_no_default.field, 2)
-        self.assertEqual(record.embed.field, 2)
+        assert record.field == 2
+        assert record.embed_no_default.field == 2
+        assert record.embed.field == 2
 
     def test_bulk_insert(self):
         """Ensure that bulk insert works"""
@@ -863,7 +867,7 @@ class Blog(Document):
         Blog.drop_collection()
 
         # Recreates the collection
-        self.assertEqual(0, Blog.objects.count())
+        assert 0 == Blog.objects.count()
 
         comment1 = Comment(name="testa")
         comment2 = Comment(name="testb")
@@ -873,11 +877,11 @@ class Blog(Document):
         # Check bulk insert using load_bulk=False
         blogs = [Blog(title="%s" % i, posts=[post1, post2]) for i in range(99)]
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             Blog.objects.insert(blogs, load_bulk=False)
-            self.assertEqual(q, 1)  # 1 entry containing the list of inserts
+            assert q == 1  # 1 entry containing the list of inserts
 
-        self.assertEqual(Blog.objects.count(), len(blogs))
+        assert Blog.objects.count() == len(blogs)
 
         Blog.drop_collection()
         Blog.ensure_indexes()
@@ -885,9 +889,9 @@ class Blog(Document):
         # Check bulk insert using load_bulk=True
         blogs = [Blog(title="%s" % i, posts=[post1, post2]) for i in range(99)]
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             Blog.objects.insert(blogs)
-            self.assertEqual(q, 2)  # 1 for insert 1 for fetch
+            assert q == 2  # 1 for insert 1 for fetch
 
         Blog.drop_collection()
 
@@ -898,25 +902,27 @@ class Blog(Document):
         blog1 = Blog(title="code", posts=[post1, post2])
         blog2 = Blog(title="mongodb", posts=[post2, post1])
         blog1, blog2 = Blog.objects.insert([blog1, blog2])
-        self.assertEqual(blog1.title, "code")
-        self.assertEqual(blog2.title, "mongodb")
+        assert blog1.title == "code"
+        assert blog2.title == "mongodb"
 
-        self.assertEqual(Blog.objects.count(), 2)
+        assert Blog.objects.count() == 2
 
         # test inserting an existing document (shouldn't be allowed)
-        with self.assertRaises(OperationError) as cm:
+        with pytest.raises(OperationError) as cm:
             blog = Blog.objects.first()
             Blog.objects.insert(blog)
-        self.assertEqual(
-            str(cm.exception), "Some documents have ObjectIds, use doc.update() instead"
+        assert (
+            str(cm.exception)
+            == "Some documents have ObjectIds, use doc.update() instead"
         )
 
         # test inserting a query set
-        with self.assertRaises(OperationError) as cm:
+        with pytest.raises(OperationError) as cm:
             blogs_qs = Blog.objects
             Blog.objects.insert(blogs_qs)
-        self.assertEqual(
-            str(cm.exception), "Some documents have ObjectIds, use doc.update() instead"
+        assert (
+            str(cm.exception)
+            == "Some documents have ObjectIds, use doc.update() instead"
         )
 
         # insert 1 new doc
@@ -927,13 +933,13 @@ class Blog(Document):
 
         blog1 = Blog(title="code", posts=[post1, post2])
         blog1 = Blog.objects.insert(blog1)
-        self.assertEqual(blog1.title, "code")
-        self.assertEqual(Blog.objects.count(), 1)
+        assert blog1.title == "code"
+        assert Blog.objects.count() == 1
 
         Blog.drop_collection()
         blog1 = Blog(title="code", posts=[post1, post2])
         obj_id = Blog.objects.insert(blog1, load_bulk=False)
-        self.assertIsInstance(obj_id, ObjectId)
+        assert isinstance(obj_id, ObjectId)
 
         Blog.drop_collection()
         post3 = Post(comments=[comment1, comment1])
@@ -941,10 +947,10 @@ class Blog(Document):
         blog2 = Blog(title="bar", posts=[post2, post3])
         Blog.objects.insert([blog1, blog2])
 
-        with self.assertRaises(NotUniqueError):
+        with pytest.raises(NotUniqueError):
             Blog.objects.insert(Blog(title=blog2.title))
 
-        self.assertEqual(Blog.objects.count(), 2)
+        assert Blog.objects.count() == 2
 
     def test_bulk_insert_different_class_fails(self):
         class Blog(Document):
@@ -954,7 +960,7 @@ class Author(Document):
             pass
 
         # try inserting a different document class
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             Blog.objects.insert(Author())
 
     def test_bulk_insert_with_wrong_type(self):
@@ -964,10 +970,10 @@ class Blog(Document):
         Blog.drop_collection()
         Blog(name="test").save()
 
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             Blog.objects.insert("HELLO WORLD")
 
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             Blog.objects.insert({"name": "garbage"})
 
     def test_bulk_insert_update_input_document_ids(self):
@@ -979,23 +985,23 @@ class Comment(Document):
         # Test with bulk
         comments = [Comment(idx=idx) for idx in range(20)]
         for com in comments:
-            self.assertIsNone(com.id)
+            assert com.id is None
 
         returned_comments = Comment.objects.insert(comments, load_bulk=True)
 
         for com in comments:
-            self.assertIsInstance(com.id, ObjectId)
+            assert isinstance(com.id, ObjectId)
 
         input_mapping = {com.id: com.idx for com in comments}
         saved_mapping = {com.id: com.idx for com in returned_comments}
-        self.assertEqual(input_mapping, saved_mapping)
+        assert input_mapping == saved_mapping
 
         Comment.drop_collection()
 
         # Test with just one
         comment = Comment(idx=0)
         inserted_comment_id = Comment.objects.insert(comment, load_bulk=False)
-        self.assertEqual(comment.id, inserted_comment_id)
+        assert comment.id == inserted_comment_id
 
     def test_bulk_insert_accepts_doc_with_ids(self):
         class Comment(Document):
@@ -1017,7 +1023,7 @@ class Comment(Document):
 
         Comment.objects.insert(com1)
 
-        with self.assertRaises(NotUniqueError):
+        with pytest.raises(NotUniqueError):
             Comment.objects.insert(com1)
 
     def test_get_changed_fields_query_count(self):
@@ -1050,28 +1056,28 @@ class Project(Document):
         o1 = Organization(name="o1", employees=[p1]).save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             # Fetching a document should result in a query.
             org = Organization.objects.get(id=o1.id)
-            self.assertEqual(q, 1)
+            assert q == 1
 
             # Checking changed fields of a newly fetched document should not
             # result in a query.
             org._get_changed_fields()
-            self.assertEqual(q, 1)
+            assert q == 1
 
         # Saving a doc without changing any of its fields should not result
         # in a query (with or without cascade=False).
         org = Organization.objects.get(id=o1.id)
         with query_counter() as q:
             org.save()
-            self.assertEqual(q, 0)
+            assert q == 0
 
         org = Organization.objects.get(id=o1.id)
         with query_counter() as q:
             org.save(cascade=False)
-            self.assertEqual(q, 0)
+            assert q == 0
 
         # Saving a doc after you append a reference to it should result in
         # two db operations (a query for the reference and an update).
@@ -1080,7 +1086,7 @@ class Project(Document):
         with query_counter() as q:
             org.employees.append(p2)  # dereferences p2
             org.save()  # saves the org
-            self.assertEqual(q, 2)
+            assert q == 2
 
     def test_repeated_iteration(self):
         """Ensure that QuerySet rewinds itself one iteration finishes.
@@ -1097,8 +1103,8 @@ def test_repeated_iteration(self):
             break
         people3 = [person for person in queryset]
 
-        self.assertEqual(people1, people2)
-        self.assertEqual(people1, people3)
+        assert people1 == people2
+        assert people1 == people3
 
     def test_repr(self):
         """Test repr behavior isnt destructive"""
@@ -1116,21 +1122,21 @@ def __repr__(self):
 
         docs = Doc.objects.order_by("number")
 
-        self.assertEqual(docs.count(), 1000)
+        assert docs.count() == 1000
 
         docs_string = "%s" % docs
-        self.assertIn("Doc: 0", docs_string)
+        assert "Doc: 0" in docs_string
 
-        self.assertEqual(docs.count(), 1000)
-        self.assertIn("(remaining elements truncated)", "%s" % docs)
+        assert docs.count() == 1000
+        assert "(remaining elements truncated)" in "%s" % docs
 
         # Limit and skip
         docs = docs[1:4]
-        self.assertEqual("[<Doc: 1>, <Doc: 2>, <Doc: 3>]", "%s" % docs)
+        assert "[<Doc: 1>, <Doc: 2>, <Doc: 3>]" == "%s" % docs
 
-        self.assertEqual(docs.count(with_limit_and_skip=True), 3)
+        assert docs.count(with_limit_and_skip=True) == 3
         for doc in docs:
-            self.assertEqual(".. queryset mid-iteration ..", repr(docs))
+            assert ".. queryset mid-iteration .." == repr(docs)
 
     def test_regex_query_shortcuts(self):
         """Ensure that contains, startswith, endswith, etc work.
@@ -1140,54 +1146,54 @@ def test_regex_query_shortcuts(self):
 
         # Test contains
         obj = self.Person.objects(name__contains="van").first()
-        self.assertEqual(obj, person)
+        assert obj == person
         obj = self.Person.objects(name__contains="Van").first()
-        self.assertEqual(obj, None)
+        assert obj == None
 
         # Test icontains
         obj = self.Person.objects(name__icontains="Van").first()
-        self.assertEqual(obj, person)
+        assert obj == person
 
         # Test startswith
         obj = self.Person.objects(name__startswith="Guido").first()
-        self.assertEqual(obj, person)
+        assert obj == person
         obj = self.Person.objects(name__startswith="guido").first()
-        self.assertEqual(obj, None)
+        assert obj == None
 
         # Test istartswith
         obj = self.Person.objects(name__istartswith="guido").first()
-        self.assertEqual(obj, person)
+        assert obj == person
 
         # Test endswith
         obj = self.Person.objects(name__endswith="Rossum").first()
-        self.assertEqual(obj, person)
+        assert obj == person
         obj = self.Person.objects(name__endswith="rossuM").first()
-        self.assertEqual(obj, None)
+        assert obj == None
 
         # Test iendswith
         obj = self.Person.objects(name__iendswith="rossuM").first()
-        self.assertEqual(obj, person)
+        assert obj == person
 
         # Test exact
         obj = self.Person.objects(name__exact="Guido van Rossum").first()
-        self.assertEqual(obj, person)
+        assert obj == person
         obj = self.Person.objects(name__exact="Guido van rossum").first()
-        self.assertEqual(obj, None)
+        assert obj == None
         obj = self.Person.objects(name__exact="Guido van Rossu").first()
-        self.assertEqual(obj, None)
+        assert obj == None
 
         # Test iexact
         obj = self.Person.objects(name__iexact="gUIDO VAN rOSSUM").first()
-        self.assertEqual(obj, person)
+        assert obj == person
         obj = self.Person.objects(name__iexact="gUIDO VAN rOSSU").first()
-        self.assertEqual(obj, None)
+        assert obj == None
 
         # Test unsafe expressions
         person = self.Person(name="Guido van Rossum [.'Geek']")
         person.save()
 
         obj = self.Person.objects(name__icontains="[.'Geek").first()
-        self.assertEqual(obj, person)
+        assert obj == person
 
     def test_not(self):
         """Ensure that the __not operator works as expected.
@@ -1196,10 +1202,10 @@ def test_not(self):
         alice.save()
 
         obj = self.Person.objects(name__iexact="alice").first()
-        self.assertEqual(obj, alice)
+        assert obj == alice
 
         obj = self.Person.objects(name__not__iexact="alice").first()
-        self.assertEqual(obj, None)
+        assert obj == None
 
     def test_filter_chaining(self):
         """Ensure filters can be chained together.
@@ -1253,12 +1259,12 @@ def published(doc_cls, queryset):
         published_posts = published_posts.filter(
             published_date__lt=datetime.datetime(2010, 1, 7, 0, 0, 0)
         )
-        self.assertEqual(published_posts.count(), 2)
+        assert published_posts.count() == 2
 
         blog_posts = BlogPost.objects
         blog_posts = blog_posts.filter(blog__in=[blog_1, blog_2])
         blog_posts = blog_posts.filter(blog=blog_3)
-        self.assertEqual(blog_posts.count(), 0)
+        assert blog_posts.count() == 0
 
         BlogPost.drop_collection()
         Blog.drop_collection()
@@ -1269,14 +1275,14 @@ def test_filter_chaining_with_regex(self):
 
         people = self.Person.objects
         people = people.filter(name__startswith="Gui").filter(name__not__endswith="tum")
-        self.assertEqual(people.count(), 1)
+        assert people.count() == 1
 
     def assertSequence(self, qs, expected):
         qs = list(qs)
         expected = list(expected)
-        self.assertEqual(len(qs), len(expected))
+        assert len(qs) == len(expected)
         for i in range(len(qs)):
-            self.assertEqual(qs[i], expected[i])
+            assert qs[i] == expected[i]
 
     def test_ordering(self):
         """Ensure default ordering is applied and can be overridden.
@@ -1327,31 +1333,27 @@ class BlogPost(Document):
         # default ordering should be used by default
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title="whatever").first()
-            self.assertEqual(len(q.get_ops()), 1)
-            self.assertEqual(
-                q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY], {"published_date": -1}
-            )
+            assert len(q.get_ops()) == 1
+            assert q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY] == {"published_date": -1}
 
         # calling order_by() should clear the default ordering
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title="whatever").order_by().first()
-            self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
+            assert len(q.get_ops()) == 1
+            assert ORDER_BY_KEY not in q.get_ops()[0][CMD_QUERY_KEY]
 
         # calling an explicit order_by should use a specified sort
         with db_ops_tracker() as q:
             BlogPost.objects.filter(title="whatever").order_by("published_date").first()
-            self.assertEqual(len(q.get_ops()), 1)
-            self.assertEqual(
-                q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY], {"published_date": 1}
-            )
+            assert len(q.get_ops()) == 1
+            assert q.get_ops()[0][CMD_QUERY_KEY][ORDER_BY_KEY] == {"published_date": 1}
 
         # calling order_by() after an explicit sort should clear it
         with db_ops_tracker() as q:
             qs = BlogPost.objects.filter(title="whatever").order_by("published_date")
             qs.order_by().first()
-            self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
+            assert len(q.get_ops()) == 1
+            assert ORDER_BY_KEY not in q.get_ops()[0][CMD_QUERY_KEY]
 
     def test_no_ordering_for_get(self):
         """ Ensure that Doc.objects.get doesn't use any ordering.
@@ -1370,14 +1372,14 @@ class BlogPost(Document):
 
         with db_ops_tracker() as q:
             BlogPost.objects.get(title="whatever")
-            self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
+            assert len(q.get_ops()) == 1
+            assert ORDER_BY_KEY not in q.get_ops()[0][CMD_QUERY_KEY]
 
         # Ordering should be ignored for .get even if we set it explicitly
         with db_ops_tracker() as q:
             BlogPost.objects.order_by("-title").get(title="whatever")
-            self.assertEqual(len(q.get_ops()), 1)
-            self.assertNotIn(ORDER_BY_KEY, q.get_ops()[0][CMD_QUERY_KEY])
+            assert len(q.get_ops()) == 1
+            assert ORDER_BY_KEY not in q.get_ops()[0][CMD_QUERY_KEY]
 
     def test_find_embedded(self):
         """Ensure that an embedded document is properly returned from
@@ -1397,20 +1399,20 @@ class BlogPost(Document):
         BlogPost.objects.create(author=user, content="Had a good coffee today...")
 
         result = BlogPost.objects.first()
-        self.assertIsInstance(result.author, User)
-        self.assertEqual(result.author.name, "Test User")
+        assert isinstance(result.author, User)
+        assert result.author.name == "Test User"
 
         result = BlogPost.objects.get(author__name=user.name)
-        self.assertIsInstance(result.author, User)
-        self.assertEqual(result.author.name, "Test User")
+        assert isinstance(result.author, User)
+        assert result.author.name == "Test User"
 
         result = BlogPost.objects.get(author={"name": user.name})
-        self.assertIsInstance(result.author, User)
-        self.assertEqual(result.author.name, "Test User")
+        assert isinstance(result.author, User)
+        assert result.author.name == "Test User"
 
         # Fails, since the string is not a type that is able to represent the
         # author's document structure (should be dict)
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             BlogPost.objects.get(author=user.name)
 
     def test_find_empty_embedded(self):
@@ -1428,7 +1430,7 @@ class BlogPost(Document):
         BlogPost.objects.create(content="Anonymous post...")
 
         result = BlogPost.objects.get(author=None)
-        self.assertEqual(result.author, None)
+        assert result.author == None
 
     def test_find_dict_item(self):
         """Ensure that DictField items may be found.
@@ -1443,7 +1445,7 @@ class BlogPost(Document):
         post.save()
 
         post_obj = BlogPost.objects(info__title="test").first()
-        self.assertEqual(post_obj.id, post.id)
+        assert post_obj.id == post.id
 
         BlogPost.drop_collection()
 
@@ -1478,10 +1480,10 @@ class BlogPost(Document):
 
         # Ensure that normal queries work
         c = BlogPost.objects(published=True).exec_js(js_func, "hits")
-        self.assertEqual(c, 2)
+        assert c == 2
 
         c = BlogPost.objects(published=False).exec_js(js_func, "hits")
-        self.assertEqual(c, 1)
+        assert c == 1
 
         BlogPost.drop_collection()
 
@@ -1525,7 +1527,7 @@ class BlogPost(Document):
         sub_code = BlogPost.objects._sub_js_fields(code)
         code_chunks = ['doc["cmnts"];', 'doc["doc-name"],', 'doc["cmnts"][i]["body"]']
         for chunk in code_chunks:
-            self.assertIn(chunk, sub_code)
+            assert chunk in sub_code
 
         results = BlogPost.objects.exec_js(code)
         expected_results = [
@@ -1533,12 +1535,12 @@ class BlogPost(Document):
             {u"comment": u"yay", u"document": u"post1"},
             {u"comment": u"nice stuff", u"document": u"post2"},
         ]
-        self.assertEqual(results, expected_results)
+        assert results == expected_results
 
         # Test template style
         code = "{{~comments.content}}"
         sub_code = BlogPost.objects._sub_js_fields(code)
-        self.assertEqual("cmnts.body", sub_code)
+        assert "cmnts.body" == sub_code
 
         BlogPost.drop_collection()
 
@@ -1549,13 +1551,13 @@ def test_delete(self):
         self.Person(name="User B", age=30).save()
         self.Person(name="User C", age=40).save()
 
-        self.assertEqual(self.Person.objects.count(), 3)
+        assert self.Person.objects.count() == 3
 
         self.Person.objects(age__lt=30).delete()
-        self.assertEqual(self.Person.objects.count(), 2)
+        assert self.Person.objects.count() == 2
 
         self.Person.objects.delete()
-        self.assertEqual(self.Person.objects.count(), 0)
+        assert self.Person.objects.count() == 0
 
     def test_reverse_delete_rule_cascade(self):
         """Ensure cascading deletion of referring documents from the database.
@@ -1576,9 +1578,9 @@ class BlogPost(Document):
         BlogPost(content="Chilling out", author=me).save()
         BlogPost(content="Pro Testing", author=someoneelse).save()
 
-        self.assertEqual(3, BlogPost.objects.count())
+        assert 3 == BlogPost.objects.count()
         self.Person.objects(name="Test User").delete()
-        self.assertEqual(1, BlogPost.objects.count())
+        assert 1 == BlogPost.objects.count()
 
     def test_reverse_delete_rule_cascade_on_abstract_document(self):
         """Ensure cascading deletion of referring documents from the database
@@ -1603,9 +1605,9 @@ class BlogPost(AbstractBlogPost):
         BlogPost(content="Chilling out", author=me).save()
         BlogPost(content="Pro Testing", author=someoneelse).save()
 
-        self.assertEqual(3, BlogPost.objects.count())
+        assert 3 == BlogPost.objects.count()
         self.Person.objects(name="Test User").delete()
-        self.assertEqual(1, BlogPost.objects.count())
+        assert 1 == BlogPost.objects.count()
 
     def test_reverse_delete_rule_cascade_cycle(self):
         """Ensure reference cascading doesn't loop if reference graph isn't
@@ -1622,8 +1624,10 @@ class Dummy(Document):
 
         base.delete()
 
-        self.assertRaises(DoesNotExist, base.reload)
-        self.assertRaises(DoesNotExist, other.reload)
+        with pytest.raises(DoesNotExist):
+            base.reload()
+        with pytest.raises(DoesNotExist):
+            other.reload()
 
     def test_reverse_delete_rule_cascade_complex_cycle(self):
         """Ensure reference cascading doesn't loop if reference graph isn't
@@ -1646,9 +1650,12 @@ class Dummy(Document):
 
         cat.delete()
 
-        self.assertRaises(DoesNotExist, base.reload)
-        self.assertRaises(DoesNotExist, other.reload)
-        self.assertRaises(DoesNotExist, other2.reload)
+        with pytest.raises(DoesNotExist):
+            base.reload()
+        with pytest.raises(DoesNotExist):
+            other.reload()
+        with pytest.raises(DoesNotExist):
+            other2.reload()
 
     def test_reverse_delete_rule_cascade_self_referencing(self):
         """Ensure self-referencing CASCADE deletes do not result in infinite
@@ -1677,13 +1684,13 @@ class Category(Document):
                 child_child.save()
 
         tree_size = 1 + num_children + (num_children * num_children)
-        self.assertEqual(tree_size, Category.objects.count())
-        self.assertEqual(num_children, Category.objects(parent=base).count())
+        assert tree_size == Category.objects.count()
+        assert num_children == Category.objects(parent=base).count()
 
         # The delete should effectively wipe out the Category collection
         # without resulting in infinite parent-child cascade recursion
         base.delete()
-        self.assertEqual(0, Category.objects.count())
+        assert 0 == Category.objects.count()
 
     def test_reverse_delete_rule_nullify(self):
         """Ensure nullification of references to deleted documents.
@@ -1705,11 +1712,11 @@ class BlogPost(Document):
         post = BlogPost(content="Watching TV", category=lameness)
         post.save()
 
-        self.assertEqual(1, BlogPost.objects.count())
-        self.assertEqual("Lameness", BlogPost.objects.first().category.name)
+        assert 1 == BlogPost.objects.count()
+        assert "Lameness" == BlogPost.objects.first().category.name
         Category.objects.delete()
-        self.assertEqual(1, BlogPost.objects.count())
-        self.assertEqual(None, BlogPost.objects.first().category)
+        assert 1 == BlogPost.objects.count()
+        assert None == BlogPost.objects.first().category
 
     def test_reverse_delete_rule_nullify_on_abstract_document(self):
         """Ensure nullification of references to deleted documents when
@@ -1732,11 +1739,11 @@ class BlogPost(AbstractBlogPost):
 
         BlogPost(content="Watching TV", author=me).save()
 
-        self.assertEqual(1, BlogPost.objects.count())
-        self.assertEqual(me, BlogPost.objects.first().author)
+        assert 1 == BlogPost.objects.count()
+        assert me == BlogPost.objects.first().author
         self.Person.objects(name="Test User").delete()
-        self.assertEqual(1, BlogPost.objects.count())
-        self.assertEqual(None, BlogPost.objects.first().author)
+        assert 1 == BlogPost.objects.count()
+        assert None == BlogPost.objects.first().author
 
     def test_reverse_delete_rule_deny(self):
         """Ensure deletion gets denied on documents that still have references
@@ -1756,7 +1763,8 @@ class BlogPost(Document):
         post = BlogPost(content="Watching TV", author=me)
         post.save()
 
-        self.assertRaises(OperationError, self.Person.objects.delete)
+        with pytest.raises(OperationError):
+            self.Person.objects.delete()
 
     def test_reverse_delete_rule_deny_on_abstract_document(self):
         """Ensure deletion gets denied on documents that still have references
@@ -1777,8 +1785,9 @@ class BlogPost(AbstractBlogPost):
 
         BlogPost(content="Watching TV", author=me).save()
 
-        self.assertEqual(1, BlogPost.objects.count())
-        self.assertRaises(OperationError, self.Person.objects.delete)
+        assert 1 == BlogPost.objects.count()
+        with pytest.raises(OperationError):
+            self.Person.objects.delete()
 
     def test_reverse_delete_rule_pull(self):
         """Ensure pulling of references to deleted documents.
@@ -1807,8 +1816,8 @@ class BlogPost(Document):
         post.reload()
         another.reload()
 
-        self.assertEqual(post.authors, [me])
-        self.assertEqual(another.authors, [])
+        assert post.authors == [me]
+        assert another.authors == []
 
     def test_reverse_delete_rule_pull_on_abstract_documents(self):
         """Ensure pulling of references to deleted documents when reference
@@ -1841,8 +1850,8 @@ class BlogPost(AbstractBlogPost):
         post.reload()
         another.reload()
 
-        self.assertEqual(post.authors, [me])
-        self.assertEqual(another.authors, [])
+        assert post.authors == [me]
+        assert another.authors == []
 
     def test_delete_with_limits(self):
         class Log(Document):
@@ -1854,7 +1863,7 @@ class Log(Document):
             Log().save()
 
         Log.objects()[3:5].delete()
-        self.assertEqual(8, Log.objects.count())
+        assert 8 == Log.objects.count()
 
     def test_delete_with_limit_handles_delete_rules(self):
         """Ensure cascading deletion of referring documents from the database.
@@ -1875,9 +1884,9 @@ class BlogPost(Document):
         BlogPost(content="Chilling out", author=me).save()
         BlogPost(content="Pro Testing", author=someoneelse).save()
 
-        self.assertEqual(3, BlogPost.objects.count())
+        assert 3 == BlogPost.objects.count()
         self.Person.objects()[:1].delete()
-        self.assertEqual(1, BlogPost.objects.count())
+        assert 1 == BlogPost.objects.count()
 
     def test_delete_edge_case_with_write_concern_0_return_None(self):
         """Return None if the delete operation is unacknowledged.
@@ -1887,7 +1896,7 @@ def test_delete_edge_case_with_write_concern_0_return_None(self):
         """
         p1 = self.Person(name="User Z", age=20).save()
         del_result = p1.delete(w=0)
-        self.assertEqual(None, del_result)
+        assert None == del_result
 
     def test_reference_field_find(self):
         """Ensure cascading deletion of referring documents from the database.
@@ -1903,13 +1912,13 @@ class BlogPost(Document):
         me = self.Person(name="Test User").save()
         BlogPost(content="test 123", author=me).save()
 
-        self.assertEqual(1, BlogPost.objects(author=me).count())
-        self.assertEqual(1, BlogPost.objects(author=me.pk).count())
-        self.assertEqual(1, BlogPost.objects(author="%s" % me.pk).count())
+        assert 1 == BlogPost.objects(author=me).count()
+        assert 1 == BlogPost.objects(author=me.pk).count()
+        assert 1 == BlogPost.objects(author="%s" % me.pk).count()
 
-        self.assertEqual(1, BlogPost.objects(author__in=[me]).count())
-        self.assertEqual(1, BlogPost.objects(author__in=[me.pk]).count())
-        self.assertEqual(1, BlogPost.objects(author__in=["%s" % me.pk]).count())
+        assert 1 == BlogPost.objects(author__in=[me]).count()
+        assert 1 == BlogPost.objects(author__in=[me.pk]).count()
+        assert 1 == BlogPost.objects(author__in=["%s" % me.pk]).count()
 
     def test_reference_field_find_dbref(self):
         """Ensure cascading deletion of referring documents from the database.
@@ -1925,13 +1934,13 @@ class BlogPost(Document):
         me = self.Person(name="Test User").save()
         BlogPost(content="test 123", author=me).save()
 
-        self.assertEqual(1, BlogPost.objects(author=me).count())
-        self.assertEqual(1, BlogPost.objects(author=me.pk).count())
-        self.assertEqual(1, BlogPost.objects(author="%s" % me.pk).count())
+        assert 1 == BlogPost.objects(author=me).count()
+        assert 1 == BlogPost.objects(author=me.pk).count()
+        assert 1 == BlogPost.objects(author="%s" % me.pk).count()
 
-        self.assertEqual(1, BlogPost.objects(author__in=[me]).count())
-        self.assertEqual(1, BlogPost.objects(author__in=[me.pk]).count())
-        self.assertEqual(1, BlogPost.objects(author__in=["%s" % me.pk]).count())
+        assert 1 == BlogPost.objects(author__in=[me]).count()
+        assert 1 == BlogPost.objects(author__in=[me.pk]).count()
+        assert 1 == BlogPost.objects(author__in=["%s" % me.pk]).count()
 
     def test_update_intfield_operator(self):
         class BlogPost(Document):
@@ -1944,20 +1953,20 @@ class BlogPost(Document):
 
         BlogPost.objects.update_one(set__hits=10)
         post.reload()
-        self.assertEqual(post.hits, 10)
+        assert post.hits == 10
 
         BlogPost.objects.update_one(inc__hits=1)
         post.reload()
-        self.assertEqual(post.hits, 11)
+        assert post.hits == 11
 
         BlogPost.objects.update_one(dec__hits=1)
         post.reload()
-        self.assertEqual(post.hits, 10)
+        assert post.hits == 10
 
         # Negative dec operator is equal to a positive inc operator
         BlogPost.objects.update_one(dec__hits=-1)
         post.reload()
-        self.assertEqual(post.hits, 11)
+        assert post.hits == 11
 
     def test_update_decimalfield_operator(self):
         class BlogPost(Document):
@@ -1970,19 +1979,19 @@ class BlogPost(Document):
 
         BlogPost.objects.update_one(inc__review=0.1)  # test with floats
         post.reload()
-        self.assertEqual(float(post.review), 3.6)
+        assert float(post.review) == 3.6
 
         BlogPost.objects.update_one(dec__review=0.1)
         post.reload()
-        self.assertEqual(float(post.review), 3.5)
+        assert float(post.review) == 3.5
 
         BlogPost.objects.update_one(inc__review=Decimal(0.12))  # test with Decimal
         post.reload()
-        self.assertEqual(float(post.review), 3.62)
+        assert float(post.review) == 3.62
 
         BlogPost.objects.update_one(dec__review=Decimal(0.12))
         post.reload()
-        self.assertEqual(float(post.review), 3.5)
+        assert float(post.review) == 3.5
 
     def test_update_decimalfield_operator_not_working_with_force_string(self):
         class BlogPost(Document):
@@ -1993,7 +2002,7 @@ class BlogPost(Document):
         post = BlogPost(review=3.5)
         post.save()
 
-        with self.assertRaises(OperationError):
+        with pytest.raises(OperationError):
             BlogPost.objects.update_one(inc__review=0.1)  # test with floats
 
     def test_update_listfield_operator(self):
@@ -2011,22 +2020,22 @@ class BlogPost(Document):
         # ListField operator
         BlogPost.objects.update(push__tags="mongo")
         post.reload()
-        self.assertIn("mongo", post.tags)
+        assert "mongo" in post.tags
 
         BlogPost.objects.update_one(push_all__tags=["db", "nosql"])
         post.reload()
-        self.assertIn("db", post.tags)
-        self.assertIn("nosql", post.tags)
+        assert "db" in post.tags
+        assert "nosql" in post.tags
 
         tags = post.tags[:-1]
         BlogPost.objects.update(pop__tags=1)
         post.reload()
-        self.assertEqual(post.tags, tags)
+        assert post.tags == tags
 
         BlogPost.objects.update_one(add_to_set__tags="unique")
         BlogPost.objects.update_one(add_to_set__tags="unique")
         post.reload()
-        self.assertEqual(post.tags.count("unique"), 1)
+        assert post.tags.count("unique") == 1
 
         BlogPost.drop_collection()
 
@@ -2038,12 +2047,12 @@ class BlogPost(Document):
 
         post = BlogPost(title="garbage").save()
 
-        self.assertNotEqual(post.title, None)
+        assert post.title != None
         BlogPost.objects.update_one(unset__title=1)
         post.reload()
-        self.assertEqual(post.title, None)
+        assert post.title == None
         pymongo_doc = BlogPost.objects.as_pymongo().first()
-        self.assertNotIn("title", pymongo_doc)
+        assert "title" not in pymongo_doc
 
     def test_update_push_with_position(self):
         """Ensure that the 'push' update with position works properly.
@@ -2060,16 +2069,16 @@ class BlogPost(Document):
         BlogPost.objects.filter(id=post.id).update(push__tags="code")
         BlogPost.objects.filter(id=post.id).update(push__tags__0=["mongodb", "python"])
         post.reload()
-        self.assertEqual(post.tags, ["mongodb", "python", "code"])
+        assert post.tags == ["mongodb", "python", "code"]
 
         BlogPost.objects.filter(id=post.id).update(set__tags__2="java")
         post.reload()
-        self.assertEqual(post.tags, ["mongodb", "python", "java"])
+        assert post.tags == ["mongodb", "python", "java"]
 
         # test push with singular value
         BlogPost.objects.filter(id=post.id).update(push__tags__0="scala")
         post.reload()
-        self.assertEqual(post.tags, ["scala", "mongodb", "python", "java"])
+        assert post.tags == ["scala", "mongodb", "python", "java"]
 
     def test_update_push_list_of_list(self):
         """Ensure that the 'push' update operation works in the list of list
@@ -2085,7 +2094,7 @@ class BlogPost(Document):
 
         BlogPost.objects.filter(slug="test").update(push__tags=["value1", 123])
         post.reload()
-        self.assertEqual(post.tags, [["value1", 123]])
+        assert post.tags == [["value1", 123]]
 
     def test_update_push_and_pull_add_to_set(self):
         """Ensure that the 'pull' update operation works correctly.
@@ -2102,25 +2111,25 @@ class BlogPost(Document):
 
         BlogPost.objects.filter(id=post.id).update(push__tags="code")
         post.reload()
-        self.assertEqual(post.tags, ["code"])
+        assert post.tags == ["code"]
 
         BlogPost.objects.filter(id=post.id).update(push_all__tags=["mongodb", "code"])
         post.reload()
-        self.assertEqual(post.tags, ["code", "mongodb", "code"])
+        assert post.tags == ["code", "mongodb", "code"]
 
         BlogPost.objects(slug="test").update(pull__tags="code")
         post.reload()
-        self.assertEqual(post.tags, ["mongodb"])
+        assert post.tags == ["mongodb"]
 
         BlogPost.objects(slug="test").update(pull_all__tags=["mongodb", "code"])
         post.reload()
-        self.assertEqual(post.tags, [])
+        assert post.tags == []
 
         BlogPost.objects(slug="test").update(
             __raw__={"$addToSet": {"tags": {"$each": ["code", "mongodb", "code"]}}}
         )
         post.reload()
-        self.assertEqual(post.tags, ["code", "mongodb"])
+        assert post.tags == ["code", "mongodb"]
 
     def test_add_to_set_each(self):
         class Item(Document):
@@ -2137,7 +2146,7 @@ class Item(Document):
         item.update(add_to_set__parents=[parent_1, parent_2, parent_1])
         item.reload()
 
-        self.assertEqual([parent_1, parent_2], item.parents)
+        assert [parent_1, parent_2] == item.parents
 
     def test_pull_nested(self):
         class Collaborator(EmbeddedDocument):
@@ -2156,9 +2165,9 @@ class Site(Document):
         s = Site(name="test", collaborators=[c]).save()
 
         Site.objects(id=s.id).update_one(pull__collaborators__user="Esteban")
-        self.assertEqual(Site.objects.first().collaborators, [])
+        assert Site.objects.first().collaborators == []
 
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             Site.objects(id=s.id).update_one(pull_all__collaborators__user=["Ross"])
 
     def test_pull_from_nested_embedded(self):
@@ -2185,14 +2194,14 @@ class Site(Document):
         ).save()
 
         Site.objects(id=s.id).update_one(pull__collaborators__helpful=c)
-        self.assertEqual(Site.objects.first().collaborators["helpful"], [])
+        assert Site.objects.first().collaborators["helpful"] == []
 
         Site.objects(id=s.id).update_one(
             pull__collaborators__unhelpful={"name": "Frank"}
         )
-        self.assertEqual(Site.objects.first().collaborators["unhelpful"], [])
+        assert Site.objects.first().collaborators["unhelpful"] == []
 
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             Site.objects(id=s.id).update_one(
                 pull_all__collaborators__helpful__name=["Ross"]
             )
@@ -2229,12 +2238,12 @@ class Site(Document):
         Site.objects(id=s.id).update_one(
             pull__collaborators__helpful__name__in=["Esteban"]
         )  # Pull a
-        self.assertEqual(Site.objects.first().collaborators["helpful"], [b])
+        assert Site.objects.first().collaborators["helpful"] == [b]
 
         Site.objects(id=s.id).update_one(
             pull__collaborators__unhelpful__name__nin=["John"]
         )  # Pull x
-        self.assertEqual(Site.objects.first().collaborators["unhelpful"], [y])
+        assert Site.objects.first().collaborators["unhelpful"] == [y]
 
     def test_pull_from_nested_mapfield(self):
         class Collaborator(EmbeddedDocument):
@@ -2255,14 +2264,14 @@ class Site(Document):
         s.save()
 
         Site.objects(id=s.id).update_one(pull__collaborators__helpful__user="Esteban")
-        self.assertEqual(Site.objects.first().collaborators["helpful"], [])
+        assert Site.objects.first().collaborators["helpful"] == []
 
         Site.objects(id=s.id).update_one(
             pull__collaborators__unhelpful={"user": "Frank"}
         )
-        self.assertEqual(Site.objects.first().collaborators["unhelpful"], [])
+        assert Site.objects.first().collaborators["unhelpful"] == []
 
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             Site.objects(id=s.id).update_one(
                 pull_all__collaborators__helpful__user=["Ross"]
             )
@@ -2280,7 +2289,7 @@ class Bar(Document):
         bar = Bar(foos=[foo]).save()
         Bar.objects(id=bar.id).update(pull__foos=foo)
         bar.reload()
-        self.assertEqual(len(bar.foos), 0)
+        assert len(bar.foos) == 0
 
     def test_update_one_check_return_with_full_result(self):
         class BlogTag(Document):
@@ -2290,10 +2299,10 @@ class BlogTag(Document):
 
         BlogTag(name="garbage").save()
         default_update = BlogTag.objects.update_one(name="new")
-        self.assertEqual(default_update, 1)
+        assert default_update == 1
 
         full_result_update = BlogTag.objects.update_one(name="new", full_result=True)
-        self.assertIsInstance(full_result_update, UpdateResult)
+        assert isinstance(full_result_update, UpdateResult)
 
     def test_update_one_pop_generic_reference(self):
         class BlogTag(Document):
@@ -2316,12 +2325,12 @@ class BlogPost(Document):
 
         post = BlogPost(slug="test-2", tags=[tag_1, tag_2])
         post.save()
-        self.assertEqual(len(post.tags), 2)
+        assert len(post.tags) == 2
 
         BlogPost.objects(slug="test-2").update_one(pop__tags=-1)
 
         post.reload()
-        self.assertEqual(len(post.tags), 1)
+        assert len(post.tags) == 1
 
         BlogPost.drop_collection()
         BlogTag.drop_collection()
@@ -2344,15 +2353,15 @@ class BlogPost(Document):
 
         post = BlogPost(slug="test-2", tags=[tag_1, tag_2])
         post.save()
-        self.assertEqual(len(post.tags), 2)
+        assert len(post.tags) == 2
 
         BlogPost.objects(slug="test-2").update_one(set__tags__0__name="python")
         post.reload()
-        self.assertEqual(post.tags[0].name, "python")
+        assert post.tags[0].name == "python"
 
         BlogPost.objects(slug="test-2").update_one(pop__tags=-1)
         post.reload()
-        self.assertEqual(len(post.tags), 1)
+        assert len(post.tags) == 1
 
         BlogPost.drop_collection()
 
@@ -2374,7 +2383,7 @@ class Message(Document):
         )
 
         message = message.reload()
-        self.assertEqual(message.authors[0].name, "Ross")
+        assert message.authors[0].name == "Ross"
 
         Message.objects(authors__name="Ross").update_one(
             set__authors=[
@@ -2385,9 +2394,9 @@ class Message(Document):
         )
 
         message = message.reload()
-        self.assertEqual(message.authors[0].name, "Harry")
-        self.assertEqual(message.authors[1].name, "Ross")
-        self.assertEqual(message.authors[2].name, "Adam")
+        assert message.authors[0].name == "Harry"
+        assert message.authors[1].name == "Ross"
+        assert message.authors[2].name == "Adam"
 
     def test_set_generic_embedded_documents(self):
         class Bar(EmbeddedDocument):
@@ -2403,7 +2412,7 @@ class User(Document):
         User.objects(username="abc").update(set__bar=Bar(name="test"), upsert=True)
 
         user = User.objects(username="abc").first()
-        self.assertEqual(user.bar.name, "test")
+        assert user.bar.name == "test"
 
     def test_reload_embedded_docs_instance(self):
         class SubDoc(EmbeddedDocument):
@@ -2415,7 +2424,7 @@ class Doc(Document):
         doc = Doc(embedded=SubDoc(val=0)).save()
         doc.reload()
 
-        self.assertEqual(doc.pk, doc.embedded._instance.pk)
+        assert doc.pk == doc.embedded._instance.pk
 
     def test_reload_list_embedded_docs_instance(self):
         class SubDoc(EmbeddedDocument):
@@ -2427,7 +2436,7 @@ class Doc(Document):
         doc = Doc(embedded=[SubDoc(val=0)]).save()
         doc.reload()
 
-        self.assertEqual(doc.pk, doc.embedded[0]._instance.pk)
+        assert doc.pk == doc.embedded[0]._instance.pk
 
     def test_order_by(self):
         """Ensure that QuerySets may be ordered.
@@ -2437,16 +2446,16 @@ def test_order_by(self):
         self.Person(name="User C", age=30).save()
 
         names = [p.name for p in self.Person.objects.order_by("-age")]
-        self.assertEqual(names, ["User B", "User C", "User A"])
+        assert names == ["User B", "User C", "User A"]
 
         names = [p.name for p in self.Person.objects.order_by("+age")]
-        self.assertEqual(names, ["User A", "User C", "User B"])
+        assert names == ["User A", "User C", "User B"]
 
         names = [p.name for p in self.Person.objects.order_by("age")]
-        self.assertEqual(names, ["User A", "User C", "User B"])
+        assert names == ["User A", "User C", "User B"]
 
         ages = [p.age for p in self.Person.objects.order_by("-name")]
-        self.assertEqual(ages, [30, 40, 20])
+        assert ages == [30, 40, 20]
 
     def test_order_by_optional(self):
         class BlogPost(Document):
@@ -2511,24 +2520,24 @@ def test_order_by_chaining(self):
         ages = [p.age for p in only_age]
 
         # The .only('age') clause should mean that all names are None
-        self.assertEqual(names, [None, None, None])
-        self.assertEqual(ages, [40, 30, 20])
+        assert names == [None, None, None]
+        assert ages == [40, 30, 20]
 
         qs = self.Person.objects.all().order_by("-age")
         qs = qs.limit(10)
         ages = [p.age for p in qs]
-        self.assertEqual(ages, [40, 30, 20])
+        assert ages == [40, 30, 20]
 
         qs = self.Person.objects.all().limit(10)
         qs = qs.order_by("-age")
 
         ages = [p.age for p in qs]
-        self.assertEqual(ages, [40, 30, 20])
+        assert ages == [40, 30, 20]
 
         qs = self.Person.objects.all().skip(0)
         qs = qs.order_by("-age")
         ages = [p.age for p in qs]
-        self.assertEqual(ages, [40, 30, 20])
+        assert ages == [40, 30, 20]
 
     def test_confirm_order_by_reference_wont_work(self):
         """Ordering by reference is not possible.  Use map / reduce.. or
@@ -2551,7 +2560,7 @@ class Author(Document):
         Author(author=person_c).save()
 
         names = [a.author.name for a in Author.objects.order_by("-author__age")]
-        self.assertEqual(names, ["User A", "User B", "User C"])
+        assert names == ["User A", "User B", "User C"]
 
     def test_comment(self):
         """Make sure adding a comment to the query gets added to the query"""
@@ -2573,10 +2582,10 @@ class User(Document):
             )
 
             ops = q.get_ops()
-            self.assertEqual(len(ops), 2)
+            assert len(ops) == 2
             for op in ops:
-                self.assertEqual(op[CMD_QUERY_KEY][QUERY_KEY], {"age": {"$gte": 18}})
-                self.assertEqual(op[CMD_QUERY_KEY][COMMENT_KEY], "looking for an adult")
+                assert op[CMD_QUERY_KEY][QUERY_KEY] == {"age": {"$gte": 18}}
+                assert op[CMD_QUERY_KEY][COMMENT_KEY] == "looking for an adult"
 
     def test_map_reduce(self):
         """Ensure map/reduce is both mapping and reducing.
@@ -2613,13 +2622,13 @@ class BlogPost(Document):
         # run a map/reduce operation spanning all posts
         results = BlogPost.objects.map_reduce(map_f, reduce_f, "myresults")
         results = list(results)
-        self.assertEqual(len(results), 4)
+        assert len(results) == 4
 
         music = list(filter(lambda r: r.key == "music", results))[0]
-        self.assertEqual(music.value, 2)
+        assert music.value == 2
 
         film = list(filter(lambda r: r.key == "film", results))[0]
-        self.assertEqual(film.value, 3)
+        assert film.value == 3
 
         BlogPost.drop_collection()
 
@@ -2640,8 +2649,8 @@ class BlogPost(Document):
         post2.save()
         post3.save()
 
-        self.assertEqual(BlogPost._fields["title"].db_field, "_id")
-        self.assertEqual(BlogPost._meta["id_field"], "title")
+        assert BlogPost._fields["title"].db_field == "_id"
+        assert BlogPost._meta["id_field"] == "title"
 
         map_f = """
             function() {
@@ -2663,9 +2672,9 @@ class BlogPost(Document):
         results = BlogPost.objects.map_reduce(map_f, reduce_f, "myresults")
         results = list(results)
 
-        self.assertEqual(results[0].object, post1)
-        self.assertEqual(results[1].object, post2)
-        self.assertEqual(results[2].object, post3)
+        assert results[0].object == post1
+        assert results[1].object == post2
+        assert results[2].object == post3
 
         BlogPost.drop_collection()
 
@@ -2770,50 +2779,41 @@ class Person(Document):
         results = list(results)
         collection = get_db("test2").family_map
 
-        self.assertEqual(
-            collection.find_one({"_id": 1}),
-            {
-                "_id": 1,
-                "value": {
-                    "persons": [
-                        {"age": 21, "name": u"Wilson Jr"},
-                        {"age": 45, "name": u"Wilson Father"},
-                        {"age": 40, "name": u"Eliana Costa"},
-                        {"age": 17, "name": u"Tayza Mariana"},
-                    ],
-                    "totalAge": 123,
-                },
+        assert collection.find_one({"_id": 1}) == {
+            "_id": 1,
+            "value": {
+                "persons": [
+                    {"age": 21, "name": u"Wilson Jr"},
+                    {"age": 45, "name": u"Wilson Father"},
+                    {"age": 40, "name": u"Eliana Costa"},
+                    {"age": 17, "name": u"Tayza Mariana"},
+                ],
+                "totalAge": 123,
             },
-        )
+        }
 
-        self.assertEqual(
-            collection.find_one({"_id": 2}),
-            {
-                "_id": 2,
-                "value": {
-                    "persons": [
-                        {"age": 16, "name": u"Isabella Luanna"},
-                        {"age": 36, "name": u"Sandra Mara"},
-                        {"age": 10, "name": u"Igor Gabriel"},
-                    ],
-                    "totalAge": 62,
-                },
+        assert collection.find_one({"_id": 2}) == {
+            "_id": 2,
+            "value": {
+                "persons": [
+                    {"age": 16, "name": u"Isabella Luanna"},
+                    {"age": 36, "name": u"Sandra Mara"},
+                    {"age": 10, "name": u"Igor Gabriel"},
+                ],
+                "totalAge": 62,
             },
-        )
+        }
 
-        self.assertEqual(
-            collection.find_one({"_id": 3}),
-            {
-                "_id": 3,
-                "value": {
-                    "persons": [
-                        {"age": 30, "name": u"Arthur WA"},
-                        {"age": 25, "name": u"Paula Leonel"},
-                    ],
-                    "totalAge": 55,
-                },
+        assert collection.find_one({"_id": 3}) == {
+            "_id": 3,
+            "value": {
+                "persons": [
+                    {"age": 30, "name": u"Arthur WA"},
+                    {"age": 25, "name": u"Paula Leonel"},
+                ],
+                "totalAge": 55,
             },
-        )
+        }
 
     def test_map_reduce_finalize(self):
         """Ensure that map, reduce, and finalize run and introduce "scope"
@@ -2933,10 +2933,10 @@ class Link(Document):
         results = list(results)
 
         # assert troublesome Buzz article is ranked 1st
-        self.assertTrue(results[0].object.title.startswith("Google Buzz"))
+        assert results[0].object.title.startswith("Google Buzz")
 
         # assert laser vision is ranked last
-        self.assertTrue(results[-1].object.title.startswith("How to see"))
+        assert results[-1].object.title.startswith("How to see")
 
         Link.drop_collection()
 
@@ -2956,11 +2956,11 @@ class BlogPost(Document):
 
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            self.assertEqual(set(["music", "film", "actors", "watch"]), set(f.keys()))
-            self.assertEqual(f["music"], 3)
-            self.assertEqual(f["actors"], 2)
-            self.assertEqual(f["watch"], 2)
-            self.assertEqual(f["film"], 1)
+            assert set(["music", "film", "actors", "watch"]) == set(f.keys())
+            assert f["music"] == 3
+            assert f["actors"] == 2
+            assert f["watch"] == 2
+            assert f["film"] == 1
 
         exec_js = BlogPost.objects.item_frequencies("tags")
         map_reduce = BlogPost.objects.item_frequencies("tags", map_reduce=True)
@@ -2970,10 +2970,10 @@ def test_assertions(f):
         # Ensure query is taken into account
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            self.assertEqual(set(["music", "actors", "watch"]), set(f.keys()))
-            self.assertEqual(f["music"], 2)
-            self.assertEqual(f["actors"], 1)
-            self.assertEqual(f["watch"], 1)
+            assert set(["music", "actors", "watch"]) == set(f.keys())
+            assert f["music"] == 2
+            assert f["actors"] == 1
+            assert f["watch"] == 1
 
         exec_js = BlogPost.objects(hits__gt=1).item_frequencies("tags")
         map_reduce = BlogPost.objects(hits__gt=1).item_frequencies(
@@ -2984,10 +2984,10 @@ def test_assertions(f):
 
         # Check that normalization works
         def test_assertions(f):
-            self.assertAlmostEqual(f["music"], 3.0 / 8.0)
-            self.assertAlmostEqual(f["actors"], 2.0 / 8.0)
-            self.assertAlmostEqual(f["watch"], 2.0 / 8.0)
-            self.assertAlmostEqual(f["film"], 1.0 / 8.0)
+            assert round(abs(f["music"] - 3.0 / 8.0), 7) == 0
+            assert round(abs(f["actors"] - 2.0 / 8.0), 7) == 0
+            assert round(abs(f["watch"] - 2.0 / 8.0), 7) == 0
+            assert round(abs(f["film"] - 1.0 / 8.0), 7) == 0
 
         exec_js = BlogPost.objects.item_frequencies("tags", normalize=True)
         map_reduce = BlogPost.objects.item_frequencies(
@@ -2998,9 +2998,9 @@ def test_assertions(f):
 
         # Check item_frequencies works for non-list fields
         def test_assertions(f):
-            self.assertEqual(set([1, 2]), set(f.keys()))
-            self.assertEqual(f[1], 1)
-            self.assertEqual(f[2], 2)
+            assert set([1, 2]) == set(f.keys())
+            assert f[1] == 1
+            assert f[2] == 2
 
         exec_js = BlogPost.objects.item_frequencies("hits")
         map_reduce = BlogPost.objects.item_frequencies("hits", map_reduce=True)
@@ -3036,9 +3036,9 @@ class Person(Document):
 
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            self.assertEqual(set(["62-3331-1656", "62-3332-1656"]), set(f.keys()))
-            self.assertEqual(f["62-3331-1656"], 2)
-            self.assertEqual(f["62-3332-1656"], 1)
+            assert set(["62-3331-1656", "62-3332-1656"]) == set(f.keys())
+            assert f["62-3331-1656"] == 2
+            assert f["62-3332-1656"] == 1
 
         exec_js = Person.objects.item_frequencies("phone.number")
         map_reduce = Person.objects.item_frequencies("phone.number", map_reduce=True)
@@ -3048,8 +3048,8 @@ def test_assertions(f):
         # Ensure query is taken into account
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            self.assertEqual(set(["62-3331-1656"]), set(f.keys()))
-            self.assertEqual(f["62-3331-1656"], 2)
+            assert set(["62-3331-1656"]) == set(f.keys())
+            assert f["62-3331-1656"] == 2
 
         exec_js = Person.objects(phone__number="62-3331-1656").item_frequencies(
             "phone.number"
@@ -3062,8 +3062,8 @@ def test_assertions(f):
 
         # Check that normalization works
         def test_assertions(f):
-            self.assertEqual(f["62-3331-1656"], 2.0 / 3.0)
-            self.assertEqual(f["62-3332-1656"], 1.0 / 3.0)
+            assert f["62-3331-1656"] == 2.0 / 3.0
+            assert f["62-3332-1656"] == 1.0 / 3.0
 
         exec_js = Person.objects.item_frequencies("phone.number", normalize=True)
         map_reduce = Person.objects.item_frequencies(
@@ -3083,14 +3083,14 @@ class Person(Document):
         Person(name="Wilson Jr").save()
 
         freq = Person.objects.item_frequencies("city")
-        self.assertEqual(freq, {"CRB": 1.0, None: 1.0})
+        assert freq == {"CRB": 1.0, None: 1.0}
         freq = Person.objects.item_frequencies("city", normalize=True)
-        self.assertEqual(freq, {"CRB": 0.5, None: 0.5})
+        assert freq == {"CRB": 0.5, None: 0.5}
 
         freq = Person.objects.item_frequencies("city", map_reduce=True)
-        self.assertEqual(freq, {"CRB": 1.0, None: 1.0})
+        assert freq == {"CRB": 1.0, None: 1.0}
         freq = Person.objects.item_frequencies("city", normalize=True, map_reduce=True)
-        self.assertEqual(freq, {"CRB": 0.5, None: 0.5})
+        assert freq == {"CRB": 0.5, None: 0.5}
 
     def test_item_frequencies_with_null_embedded(self):
         class Data(EmbeddedDocument):
@@ -3115,10 +3115,10 @@ class Person(Document):
         p.save()
 
         ot = Person.objects.item_frequencies("extra.tag", map_reduce=False)
-        self.assertEqual(ot, {None: 1.0, u"friend": 1.0})
+        assert ot == {None: 1.0, u"friend": 1.0}
 
         ot = Person.objects.item_frequencies("extra.tag", map_reduce=True)
-        self.assertEqual(ot, {None: 1.0, u"friend": 1.0})
+        assert ot == {None: 1.0, u"friend": 1.0}
 
     def test_item_frequencies_with_0_values(self):
         class Test(Document):
@@ -3130,9 +3130,9 @@ class Test(Document):
         t.save()
 
         ot = Test.objects.item_frequencies("val", map_reduce=True)
-        self.assertEqual(ot, {0: 1})
+        assert ot == {0: 1}
         ot = Test.objects.item_frequencies("val", map_reduce=False)
-        self.assertEqual(ot, {0: 1})
+        assert ot == {0: 1}
 
     def test_item_frequencies_with_False_values(self):
         class Test(Document):
@@ -3144,9 +3144,9 @@ class Test(Document):
         t.save()
 
         ot = Test.objects.item_frequencies("val", map_reduce=True)
-        self.assertEqual(ot, {False: 1})
+        assert ot == {False: 1}
         ot = Test.objects.item_frequencies("val", map_reduce=False)
-        self.assertEqual(ot, {False: 1})
+        assert ot == {False: 1}
 
     def test_item_frequencies_normalize(self):
         class Test(Document):
@@ -3161,31 +3161,32 @@ class Test(Document):
             Test(val=2).save()
 
         freqs = Test.objects.item_frequencies("val", map_reduce=False, normalize=True)
-        self.assertEqual(freqs, {1: 50.0 / 70, 2: 20.0 / 70})
+        assert freqs == {1: 50.0 / 70, 2: 20.0 / 70}
 
         freqs = Test.objects.item_frequencies("val", map_reduce=True, normalize=True)
-        self.assertEqual(freqs, {1: 50.0 / 70, 2: 20.0 / 70})
+        assert freqs == {1: 50.0 / 70, 2: 20.0 / 70}
 
     def test_average(self):
         """Ensure that field can be averaged correctly.
         """
         self.Person(name="person", age=0).save()
-        self.assertEqual(int(self.Person.objects.average("age")), 0)
+        assert int(self.Person.objects.average("age")) == 0
 
         ages = [23, 54, 12, 94, 27]
         for i, age in enumerate(ages):
             self.Person(name="test%s" % i, age=age).save()
 
         avg = float(sum(ages)) / (len(ages) + 1)  # take into account the 0
-        self.assertAlmostEqual(int(self.Person.objects.average("age")), avg)
+        assert round(abs(int(self.Person.objects.average("age")) - avg), 7) == 0
 
         self.Person(name="ageless person").save()
-        self.assertEqual(int(self.Person.objects.average("age")), avg)
+        assert int(self.Person.objects.average("age")) == avg
 
         # dot notation
         self.Person(name="person meta", person_meta=self.PersonMeta(weight=0)).save()
-        self.assertAlmostEqual(
-            int(self.Person.objects.average("person_meta.weight")), 0
+        assert (
+            round(abs(int(self.Person.objects.average("person_meta.weight")) - 0), 7)
+            == 0
         )
 
         for i, weight in enumerate(ages):
@@ -3193,17 +3194,18 @@ def test_average(self):
                 name="test meta%i", person_meta=self.PersonMeta(weight=weight)
             ).save()
 
-        self.assertAlmostEqual(
-            int(self.Person.objects.average("person_meta.weight")), avg
+        assert (
+            round(abs(int(self.Person.objects.average("person_meta.weight")) - avg), 7)
+            == 0
         )
 
         self.Person(name="test meta none").save()
-        self.assertEqual(int(self.Person.objects.average("person_meta.weight")), avg)
+        assert int(self.Person.objects.average("person_meta.weight")) == avg
 
         # test summing over a filtered queryset
         over_50 = [a for a in ages if a >= 50]
         avg = float(sum(over_50)) / len(over_50)
-        self.assertEqual(self.Person.objects.filter(age__gte=50).average("age"), avg)
+        assert self.Person.objects.filter(age__gte=50).average("age") == avg
 
     def test_sum(self):
         """Ensure that field can be summed over correctly.
@@ -3212,25 +3214,24 @@ def test_sum(self):
         for i, age in enumerate(ages):
             self.Person(name="test%s" % i, age=age).save()
 
-        self.assertEqual(self.Person.objects.sum("age"), sum(ages))
+        assert self.Person.objects.sum("age") == sum(ages)
 
         self.Person(name="ageless person").save()
-        self.assertEqual(self.Person.objects.sum("age"), sum(ages))
+        assert self.Person.objects.sum("age") == sum(ages)
 
         for i, age in enumerate(ages):
             self.Person(
                 name="test meta%s" % i, person_meta=self.PersonMeta(weight=age)
             ).save()
 
-        self.assertEqual(self.Person.objects.sum("person_meta.weight"), sum(ages))
+        assert self.Person.objects.sum("person_meta.weight") == sum(ages)
 
         self.Person(name="weightless person").save()
-        self.assertEqual(self.Person.objects.sum("age"), sum(ages))
+        assert self.Person.objects.sum("age") == sum(ages)
 
         # test summing over a filtered queryset
-        self.assertEqual(
-            self.Person.objects.filter(age__gte=50).sum("age"),
-            sum([a for a in ages if a >= 50]),
+        assert self.Person.objects.filter(age__gte=50).sum("age") == sum(
+            [a for a in ages if a >= 50]
         )
 
     def test_sum_over_db_field(self):
@@ -3246,7 +3247,7 @@ class UserVisit(Document):
         UserVisit.objects.create(num_visits=10)
         UserVisit.objects.create(num_visits=5)
 
-        self.assertEqual(UserVisit.objects.sum("num_visits"), 15)
+        assert UserVisit.objects.sum("num_visits") == 15
 
     def test_average_over_db_field(self):
         """Ensure that a field mapped to a db field with a different name
@@ -3261,7 +3262,7 @@ class UserVisit(Document):
         UserVisit.objects.create(num_visits=20)
         UserVisit.objects.create(num_visits=10)
 
-        self.assertEqual(UserVisit.objects.average("num_visits"), 15)
+        assert UserVisit.objects.average("num_visits") == 15
 
     def test_embedded_average(self):
         class Pay(EmbeddedDocument):
@@ -3278,7 +3279,7 @@ class Doc(Document):
         Doc(name="Tayza mariana", pay=Pay(value=165)).save()
         Doc(name="Eliana Costa", pay=Pay(value=115)).save()
 
-        self.assertEqual(Doc.objects.average("pay.value"), 240)
+        assert Doc.objects.average("pay.value") == 240
 
     def test_embedded_array_average(self):
         class Pay(EmbeddedDocument):
@@ -3295,7 +3296,7 @@ class Doc(Document):
         Doc(name="Tayza mariana", pay=Pay(values=[165, 100])).save()
         Doc(name="Eliana Costa", pay=Pay(values=[115, 100])).save()
 
-        self.assertEqual(Doc.objects.average("pay.values"), 170)
+        assert Doc.objects.average("pay.values") == 170
 
     def test_array_average(self):
         class Doc(Document):
@@ -3308,7 +3309,7 @@ class Doc(Document):
         Doc(values=[165, 100]).save()
         Doc(values=[115, 100]).save()
 
-        self.assertEqual(Doc.objects.average("values"), 170)
+        assert Doc.objects.average("values") == 170
 
     def test_embedded_sum(self):
         class Pay(EmbeddedDocument):
@@ -3325,7 +3326,7 @@ class Doc(Document):
         Doc(name="Tayza mariana", pay=Pay(value=165)).save()
         Doc(name="Eliana Costa", pay=Pay(value=115)).save()
 
-        self.assertEqual(Doc.objects.sum("pay.value"), 960)
+        assert Doc.objects.sum("pay.value") == 960
 
     def test_embedded_array_sum(self):
         class Pay(EmbeddedDocument):
@@ -3342,7 +3343,7 @@ class Doc(Document):
         Doc(name="Tayza mariana", pay=Pay(values=[165, 100])).save()
         Doc(name="Eliana Costa", pay=Pay(values=[115, 100])).save()
 
-        self.assertEqual(Doc.objects.sum("pay.values"), 1360)
+        assert Doc.objects.sum("pay.values") == 1360
 
     def test_array_sum(self):
         class Doc(Document):
@@ -3355,7 +3356,7 @@ class Doc(Document):
         Doc(values=[165, 100]).save()
         Doc(values=[115, 100]).save()
 
-        self.assertEqual(Doc.objects.sum("values"), 1360)
+        assert Doc.objects.sum("values") == 1360
 
     def test_distinct(self):
         """Ensure that the QuerySet.distinct method works.
@@ -3364,14 +3365,12 @@ def test_distinct(self):
         self.Person(name="Mr White", age=20).save()
         self.Person(name="Mr Orange", age=30).save()
         self.Person(name="Mr Pink", age=30).save()
-        self.assertEqual(
-            set(self.Person.objects.distinct("name")),
-            set(["Mr Orange", "Mr White", "Mr Pink"]),
+        assert set(self.Person.objects.distinct("name")) == set(
+            ["Mr Orange", "Mr White", "Mr Pink"]
         )
-        self.assertEqual(set(self.Person.objects.distinct("age")), set([20, 30]))
-        self.assertEqual(
-            set(self.Person.objects(age=30).distinct("name")),
-            set(["Mr Orange", "Mr Pink"]),
+        assert set(self.Person.objects.distinct("age")) == set([20, 30])
+        assert set(self.Person.objects(age=30).distinct("name")) == set(
+            ["Mr Orange", "Mr Pink"]
         )
 
     def test_distinct_handles_references(self):
@@ -3390,7 +3389,7 @@ class Bar(Document):
         foo = Foo(bar=bar)
         foo.save()
 
-        self.assertEqual(Foo.objects.distinct("bar"), [bar])
+        assert Foo.objects.distinct("bar") == [bar]
 
     def test_text_indexes(self):
         class News(Document):
@@ -3410,8 +3409,8 @@ class News(Document):
 
         News.drop_collection()
         info = News.objects._collection.index_information()
-        self.assertIn("title_text_content_text", info)
-        self.assertIn("textIndexVersion", info["title_text_content_text"])
+        assert "title_text_content_text" in info
+        assert "textIndexVersion" in info["title_text_content_text"]
 
         News(
             title="Neymar quebrou a vertebra",
@@ -3426,11 +3425,11 @@ class News(Document):
 
         count = News.objects.search_text("neymar", language="portuguese").count()
 
-        self.assertEqual(count, 1)
+        assert count == 1
 
         count = News.objects.search_text("brasil -neymar").count()
 
-        self.assertEqual(count, 1)
+        assert count == 1
 
         News(
             title=u"As eleições no Brasil já estão em planejamento",
@@ -3442,41 +3441,41 @@ class News(Document):
 
         query = News.objects(is_active=False).search_text("dilma", language="pt")._query
 
-        self.assertEqual(
-            query,
-            {"$text": {"$search": "dilma", "$language": "pt"}, "is_active": False},
-        )
+        assert query == {
+            "$text": {"$search": "dilma", "$language": "pt"},
+            "is_active": False,
+        }
 
-        self.assertFalse(new.is_active)
-        self.assertIn("dilma", new.content)
-        self.assertIn("planejamento", new.title)
+        assert not new.is_active
+        assert "dilma" in new.content
+        assert "planejamento" in new.title
 
         query = News.objects.search_text("candidata")
-        self.assertEqual(query._search_text, "candidata")
+        assert query._search_text == "candidata"
         new = query.first()
 
-        self.assertIsInstance(new.get_text_score(), float)
+        assert isinstance(new.get_text_score(), float)
 
         # count
         query = News.objects.search_text("brasil").order_by("$text_score")
-        self.assertEqual(query._search_text, "brasil")
+        assert query._search_text == "brasil"
 
-        self.assertEqual(query.count(), 3)
-        self.assertEqual(query._query, {"$text": {"$search": "brasil"}})
+        assert query.count() == 3
+        assert query._query == {"$text": {"$search": "brasil"}}
         cursor_args = query._cursor_args
         cursor_args_fields = cursor_args["projection"]
-        self.assertEqual(cursor_args_fields, {"_text_score": {"$meta": "textScore"}})
+        assert cursor_args_fields == {"_text_score": {"$meta": "textScore"}}
 
         text_scores = [i.get_text_score() for i in query]
-        self.assertEqual(len(text_scores), 3)
+        assert len(text_scores) == 3
 
-        self.assertTrue(text_scores[0] > text_scores[1])
-        self.assertTrue(text_scores[1] > text_scores[2])
+        assert text_scores[0] > text_scores[1]
+        assert text_scores[1] > text_scores[2]
         max_text_score = text_scores[0]
 
         # get item
         item = News.objects.search_text("brasil").order_by("$text_score").first()
-        self.assertEqual(item.get_text_score(), max_text_score)
+        assert item.get_text_score() == max_text_score
 
     def test_distinct_handles_references_to_alias(self):
         register_connection("testdb", "mongoenginetest2")
@@ -3498,7 +3497,7 @@ class Bar(Document):
         foo = Foo(bar=bar)
         foo.save()
 
-        self.assertEqual(Foo.objects.distinct("bar"), [bar])
+        assert Foo.objects.distinct("bar") == [bar]
 
     def test_distinct_handles_db_field(self):
         """Ensure that distinct resolves field name to db_field as expected.
@@ -3513,8 +3512,8 @@ class Product(Document):
         Product(product_id=2).save()
         Product(product_id=1).save()
 
-        self.assertEqual(set(Product.objects.distinct("product_id")), set([1, 2]))
-        self.assertEqual(set(Product.objects.distinct("pid")), set([1, 2]))
+        assert set(Product.objects.distinct("product_id")) == set([1, 2])
+        assert set(Product.objects.distinct("pid")) == set([1, 2])
 
         Product.drop_collection()
 
@@ -3536,7 +3535,7 @@ class Book(Document):
         Book.objects.create(title="The Stories", authors=[mark_twain, john_tolkien])
 
         authors = Book.objects.distinct("authors")
-        self.assertEqual(authors, [mark_twain, john_tolkien])
+        assert authors == [mark_twain, john_tolkien]
 
     def test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField(self):
         class Continent(EmbeddedDocument):
@@ -3570,10 +3569,10 @@ class Book(Document):
         Book.objects.create(title="The Stories", authors=[mark_twain, john_tolkien])
 
         country_list = Book.objects.distinct("authors.country")
-        self.assertEqual(country_list, [scotland, tibet])
+        assert country_list == [scotland, tibet]
 
         continent_list = Book.objects.distinct("authors.country.continent")
-        self.assertEqual(continent_list, [europe, asia])
+        assert continent_list == [europe, asia]
 
     def test_distinct_ListField_ReferenceField(self):
         class Bar(Document):
@@ -3595,7 +3594,7 @@ class Foo(Document):
         foo = Foo(bar=bar_1, bar_lst=[bar_1, bar_2])
         foo.save()
 
-        self.assertEqual(Foo.objects.distinct("bar_lst"), [bar_1, bar_2])
+        assert Foo.objects.distinct("bar_lst") == [bar_1, bar_2]
 
     def test_custom_manager(self):
         """Ensure that custom QuerySetManager instances work as expected.
@@ -3627,15 +3626,15 @@ def music_posts(doc_cls, queryset, deleted=False):
         post3 = BlogPost(tags=["film", "actors"]).save()
         post4 = BlogPost(tags=["film", "actors", "music"], deleted=True).save()
 
-        self.assertEqual(
-            [p.id for p in BlogPost.objects()], [post1.id, post2.id, post3.id]
-        )
-        self.assertEqual(
-            [p.id for p in BlogPost.objects_1_arg()], [post1.id, post2.id, post3.id]
-        )
-        self.assertEqual([p.id for p in BlogPost.music_posts()], [post1.id, post2.id])
+        assert [p.id for p in BlogPost.objects()] == [post1.id, post2.id, post3.id]
+        assert [p.id for p in BlogPost.objects_1_arg()] == [
+            post1.id,
+            post2.id,
+            post3.id,
+        ]
+        assert [p.id for p in BlogPost.music_posts()] == [post1.id, post2.id]
 
-        self.assertEqual([p.id for p in BlogPost.music_posts(True)], [post4.id])
+        assert [p.id for p in BlogPost.music_posts(True)] == [post4.id]
 
         BlogPost.drop_collection()
 
@@ -3657,12 +3656,12 @@ def with_inactive(doc_cls, queryset):
         Foo(active=True).save()
         Foo(active=False).save()
 
-        self.assertEqual(1, Foo.objects.count())
-        self.assertEqual(1, Foo.with_inactive.count())
+        assert 1 == Foo.objects.count()
+        assert 1 == Foo.with_inactive.count()
 
         Foo.with_inactive.first().delete()
-        self.assertEqual(0, Foo.with_inactive.count())
-        self.assertEqual(1, Foo.objects.count())
+        assert 0 == Foo.with_inactive.count()
+        assert 1 == Foo.objects.count()
 
     def test_inherit_objects(self):
         class Foo(Document):
@@ -3678,7 +3677,7 @@ class Bar(Foo):
 
         Bar.drop_collection()
         Bar.objects.create(active=False)
-        self.assertEqual(0, Bar.objects.count())
+        assert 0 == Bar.objects.count()
 
     def test_inherit_objects_override(self):
         class Foo(Document):
@@ -3696,8 +3695,8 @@ def objects(klass, queryset):
 
         Bar.drop_collection()
         Bar.objects.create(active=False)
-        self.assertEqual(0, Foo.objects.count())
-        self.assertEqual(1, Bar.objects.count())
+        assert 0 == Foo.objects.count()
+        assert 1 == Bar.objects.count()
 
     def test_query_value_conversion(self):
         """Ensure that query values are properly converted when necessary.
@@ -3718,11 +3717,11 @@ class BlogPost(Document):
         # while using a ReferenceField's name - the document should be
         # converted to an DBRef, which is legal, unlike a Document object
         post_obj = BlogPost.objects(author=person).first()
-        self.assertEqual(post.id, post_obj.id)
+        assert post.id == post_obj.id
 
         # Test that lists of values work when using the 'in', 'nin' and 'all'
         post_obj = BlogPost.objects(author__in=[person]).first()
-        self.assertEqual(post.id, post_obj.id)
+        assert post.id == post_obj.id
 
         BlogPost.drop_collection()
 
@@ -3746,9 +3745,9 @@ class Group(Document):
         Group.objects(id=group.id).update(set__members=[user1, user2])
         group.reload()
 
-        self.assertEqual(len(group.members), 2)
-        self.assertEqual(group.members[0].name, user1.name)
-        self.assertEqual(group.members[1].name, user2.name)
+        assert len(group.members) == 2
+        assert group.members[0].name == user1.name
+        assert group.members[1].name == user2.name
 
         Group.drop_collection()
 
@@ -3776,15 +3775,15 @@ class BlogPost(Document):
         ids = [post_1.id, post_2.id, post_5.id]
         objects = BlogPost.objects.in_bulk(ids)
 
-        self.assertEqual(len(objects), 3)
+        assert len(objects) == 3
 
-        self.assertIn(post_1.id, objects)
-        self.assertIn(post_2.id, objects)
-        self.assertIn(post_5.id, objects)
+        assert post_1.id in objects
+        assert post_2.id in objects
+        assert post_5.id in objects
 
-        self.assertEqual(objects[post_1.id].title, post_1.title)
-        self.assertEqual(objects[post_2.id].title, post_2.title)
-        self.assertEqual(objects[post_5.id].title, post_5.title)
+        assert objects[post_1.id].title == post_1.title
+        assert objects[post_2.id].title == post_2.title
+        assert objects[post_5.id].title == post_5.title
 
         BlogPost.drop_collection()
 
@@ -3804,11 +3803,11 @@ class Post(Document):
 
         Post.drop_collection()
 
-        self.assertIsInstance(Post.objects, CustomQuerySet)
-        self.assertFalse(Post.objects.not_empty())
+        assert isinstance(Post.objects, CustomQuerySet)
+        assert not Post.objects.not_empty()
 
         Post().save()
-        self.assertTrue(Post.objects.not_empty())
+        assert Post.objects.not_empty()
 
         Post.drop_collection()
 
@@ -3828,11 +3827,11 @@ class Post(Document):
 
         Post.drop_collection()
 
-        self.assertIsInstance(Post.objects, CustomQuerySet)
-        self.assertFalse(Post.objects.not_empty())
+        assert isinstance(Post.objects, CustomQuerySet)
+        assert not Post.objects.not_empty()
 
         Post().save()
-        self.assertTrue(Post.objects.not_empty())
+        assert Post.objects.not_empty()
 
         Post.drop_collection()
 
@@ -3853,8 +3852,8 @@ class Post(Document):
 
         Post().save()
         Post(is_published=True).save()
-        self.assertEqual(Post.objects.count(), 2)
-        self.assertEqual(Post.published.count(), 1)
+        assert Post.objects.count() == 2
+        assert Post.published.count() == 1
 
         Post.drop_collection()
 
@@ -3873,11 +3872,11 @@ class Post(Base):
             pass
 
         Post.drop_collection()
-        self.assertIsInstance(Post.objects, CustomQuerySet)
-        self.assertFalse(Post.objects.not_empty())
+        assert isinstance(Post.objects, CustomQuerySet)
+        assert not Post.objects.not_empty()
 
         Post().save()
-        self.assertTrue(Post.objects.not_empty())
+        assert Post.objects.not_empty()
 
         Post.drop_collection()
 
@@ -3900,11 +3899,11 @@ class Post(Base):
             pass
 
         Post.drop_collection()
-        self.assertIsInstance(Post.objects, CustomQuerySet)
-        self.assertFalse(Post.objects.not_empty())
+        assert isinstance(Post.objects, CustomQuerySet)
+        assert not Post.objects.not_empty()
 
         Post().save()
-        self.assertTrue(Post.objects.not_empty())
+        assert Post.objects.not_empty()
 
         Post.drop_collection()
 
@@ -3917,13 +3916,9 @@ class Post(Document):
         for i in range(10):
             Post(title="Post %s" % i).save()
 
-        self.assertEqual(
-            5, Post.objects.limit(5).skip(5).count(with_limit_and_skip=True)
-        )
+        assert 5 == Post.objects.limit(5).skip(5).count(with_limit_and_skip=True)
 
-        self.assertEqual(
-            10, Post.objects.limit(5).skip(5).count(with_limit_and_skip=False)
-        )
+        assert 10 == Post.objects.limit(5).skip(5).count(with_limit_and_skip=False)
 
     def test_count_and_none(self):
         """Test count works with None()"""
@@ -3935,8 +3930,8 @@ class MyDoc(Document):
         for i in range(0, 10):
             MyDoc().save()
 
-        self.assertEqual(MyDoc.objects.count(), 10)
-        self.assertEqual(MyDoc.objects.none().count(), 0)
+        assert MyDoc.objects.count() == 10
+        assert MyDoc.objects.none().count() == 0
 
     def test_count_list_embedded(self):
         class B(EmbeddedDocument):
@@ -3945,7 +3940,7 @@ class B(EmbeddedDocument):
         class A(Document):
             b = ListField(EmbeddedDocumentField(B))
 
-        self.assertEqual(A.objects(b=[{"c": "c"}]).count(), 0)
+        assert A.objects(b=[{"c": "c"}]).count() == 0
 
     def test_call_after_limits_set(self):
         """Ensure that re-filtering after slicing works
@@ -3960,7 +3955,7 @@ class Post(Document):
         Post(title="Post 2").save()
 
         posts = Post.objects.all()[0:1]
-        self.assertEqual(len(list(posts())), 1)
+        assert len(list(posts())) == 1
 
         Post.drop_collection()
 
@@ -3976,9 +3971,9 @@ class Number(Document):
         n2 = Number.objects.create(n=2)
         n1 = Number.objects.create(n=1)
 
-        self.assertEqual(list(Number.objects), [n2, n1])
-        self.assertEqual(list(Number.objects.order_by("n")), [n1, n2])
-        self.assertEqual(list(Number.objects.order_by("n").filter()), [n1, n2])
+        assert list(Number.objects) == [n2, n1]
+        assert list(Number.objects.order_by("n")) == [n1, n2]
+        assert list(Number.objects.order_by("n").filter()) == [n1, n2]
 
         Number.drop_collection()
 
@@ -3997,18 +3992,18 @@ class Number(Document):
 
         test = Number.objects
         test2 = test.clone()
-        self.assertNotEqual(test, test2)
-        self.assertEqual(test.count(), test2.count())
+        assert test != test2
+        assert test.count() == test2.count()
 
         test = test.filter(n__gt=11)
         test2 = test.clone()
-        self.assertNotEqual(test, test2)
-        self.assertEqual(test.count(), test2.count())
+        assert test != test2
+        assert test.count() == test2.count()
 
         test = test.limit(10)
         test2 = test.clone()
-        self.assertNotEqual(test, test2)
-        self.assertEqual(test.count(), test2.count())
+        assert test != test2
+        assert test.count() == test2.count()
 
         Number.drop_collection()
 
@@ -4028,7 +4023,7 @@ class Number2(Document):
             t.switch_db("test2")
             t.save()
 
-        self.assertEqual(len(Number2.objects.using("test2")), 9)
+        assert len(Number2.objects.using("test2")) == 9
 
     def test_unset_reference(self):
         class Comment(Document):
@@ -4043,10 +4038,10 @@ class Post(Document):
         comment = Comment.objects.create(text="test")
         post = Post.objects.create(comment=comment)
 
-        self.assertEqual(post.comment, comment)
+        assert post.comment == comment
         Post.objects.update(unset__comment=1)
         post.reload()
-        self.assertEqual(post.comment, None)
+        assert post.comment == None
 
         Comment.drop_collection()
         Post.drop_collection()
@@ -4060,8 +4055,8 @@ class Number(Document):
         n2 = Number.objects.create(n=2)
         n1 = Number.objects.create(n=1)
 
-        self.assertEqual(list(Number.objects), [n2, n1])
-        self.assertEqual(list(Number.objects.order_by("n")), [n1, n2])
+        assert list(Number.objects) == [n2, n1]
+        assert list(Number.objects.order_by("n")) == [n1, n2]
 
         Number.drop_collection()
 
@@ -4079,10 +4074,10 @@ class Number(Document):
         Number(n=3).save()
 
         numbers = [n.n for n in Number.objects.order_by("-n")]
-        self.assertEqual([3, 2, 1], numbers)
+        assert [3, 2, 1] == numbers
 
         numbers = [n.n for n in Number.objects.order_by("+n")]
-        self.assertEqual([1, 2, 3], numbers)
+        assert [1, 2, 3] == numbers
         Number.drop_collection()
 
     def test_ensure_index(self):
@@ -4100,7 +4095,7 @@ class Comment(Document):
             (value["key"], value.get("unique", False), value.get("sparse", False))
             for key, value in iteritems(info)
         ]
-        self.assertIn(([("_cls", 1), ("message", 1)], False, False), info)
+        assert ([("_cls", 1), ("message", 1)], False, False) in info
 
     def test_where(self):
         """Ensure that where clauses work.
@@ -4120,30 +4115,30 @@ class IntPair(Document):
         c.save()
 
         query = IntPair.objects.where("this[~fielda] >= this[~fieldb]")
-        self.assertEqual('this["fielda"] >= this["fieldb"]', query._where_clause)
+        assert 'this["fielda"] >= this["fieldb"]' == query._where_clause
         results = list(query)
-        self.assertEqual(2, len(results))
-        self.assertIn(a, results)
-        self.assertIn(c, results)
+        assert 2 == len(results)
+        assert a in results
+        assert c in results
 
         query = IntPair.objects.where("this[~fielda] == this[~fieldb]")
         results = list(query)
-        self.assertEqual(1, len(results))
-        self.assertIn(a, results)
+        assert 1 == len(results)
+        assert a in results
 
         query = IntPair.objects.where(
             "function() { return this[~fielda] >= this[~fieldb] }"
         )
-        self.assertEqual(
-            'function() { return this["fielda"] >= this["fieldb"] }',
-            query._where_clause,
+        assert (
+            'function() { return this["fielda"] >= this["fieldb"] }'
+            == query._where_clause
         )
         results = list(query)
-        self.assertEqual(2, len(results))
-        self.assertIn(a, results)
-        self.assertIn(c, results)
+        assert 2 == len(results)
+        assert a in results
+        assert c in results
 
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             list(IntPair.objects.where(fielda__gte=3))
 
     def test_scalar(self):
@@ -4165,13 +4160,13 @@ class User(Document):
         # set of users (Pretend this has additional filtering.)
         user_orgs = set(User.objects.scalar("organization"))
         orgs = Organization.objects(id__in=user_orgs).scalar("name")
-        self.assertEqual(list(orgs), ["White House"])
+        assert list(orgs) == ["White House"]
 
         # Efficient for generating listings, too.
         orgs = Organization.objects.scalar("name").in_bulk(list(user_orgs))
         user_map = User.objects.scalar("name", "organization")
         user_listing = [(user, orgs[org]) for user, org in user_map]
-        self.assertEqual([("Bob Dole", "White House")], user_listing)
+        assert [("Bob Dole", "White House")] == user_listing
 
     def test_scalar_simple(self):
         class TestDoc(Document):
@@ -4186,10 +4181,10 @@ class TestDoc(Document):
 
         plist = list(TestDoc.objects.scalar("x", "y"))
 
-        self.assertEqual(len(plist), 3)
-        self.assertEqual(plist[0], (10, True))
-        self.assertEqual(plist[1], (20, False))
-        self.assertEqual(plist[2], (30, True))
+        assert len(plist) == 3
+        assert plist[0] == (10, True)
+        assert plist[1] == (20, False)
+        assert plist[2] == (30, True)
 
         class UserDoc(Document):
             name = StringField()
@@ -4204,14 +4199,16 @@ class UserDoc(Document):
 
         ulist = list(UserDoc.objects.scalar("name", "age"))
 
-        self.assertEqual(
-            ulist,
-            [(u"Wilson Jr", 19), (u"Wilson", 43), (u"Eliana", 37), (u"Tayza", 15)],
-        )
+        assert ulist == [
+            (u"Wilson Jr", 19),
+            (u"Wilson", 43),
+            (u"Eliana", 37),
+            (u"Tayza", 15),
+        ]
 
         ulist = list(UserDoc.objects.scalar("name").order_by("age"))
 
-        self.assertEqual(ulist, [(u"Tayza"), (u"Wilson Jr"), (u"Eliana"), (u"Wilson")])
+        assert ulist == [(u"Tayza"), (u"Wilson Jr"), (u"Eliana"), (u"Wilson")]
 
     def test_scalar_embedded(self):
         class Profile(EmbeddedDocument):
@@ -4248,25 +4245,21 @@ class Person(Document):
             locale=Locale(city="Brasilia", country="Brazil"),
         ).save()
 
-        self.assertEqual(
-            list(Person.objects.order_by("profile__age").scalar("profile__name")),
-            [u"Wilson Jr", u"Gabriel Falcao", u"Lincoln de souza", u"Walter cruz"],
-        )
+        assert list(
+            Person.objects.order_by("profile__age").scalar("profile__name")
+        ) == [u"Wilson Jr", u"Gabriel Falcao", u"Lincoln de souza", u"Walter cruz"]
 
         ulist = list(
             Person.objects.order_by("locale.city").scalar(
                 "profile__name", "profile__age", "locale__city"
             )
         )
-        self.assertEqual(
-            ulist,
-            [
-                (u"Lincoln de souza", 28, u"Belo Horizonte"),
-                (u"Walter cruz", 30, u"Brasilia"),
-                (u"Wilson Jr", 19, u"Corumba-GO"),
-                (u"Gabriel Falcao", 23, u"New York"),
-            ],
-        )
+        assert ulist == [
+            (u"Lincoln de souza", 28, u"Belo Horizonte"),
+            (u"Walter cruz", 30, u"Brasilia"),
+            (u"Wilson Jr", 19, u"Corumba-GO"),
+            (u"Gabriel Falcao", 23, u"New York"),
+        ]
 
     def test_scalar_decimal(self):
         from decimal import Decimal
@@ -4279,7 +4272,7 @@ class Person(Document):
         Person(name="Wilson Jr", rating=Decimal("1.0")).save()
 
         ulist = list(Person.objects.scalar("name", "rating"))
-        self.assertEqual(ulist, [(u"Wilson Jr", Decimal("1.0"))])
+        assert ulist == [(u"Wilson Jr", Decimal("1.0"))]
 
     def test_scalar_reference_field(self):
         class State(Document):
@@ -4298,7 +4291,7 @@ class Person(Document):
         Person(name="Wilson JR", state=s1).save()
 
         plist = list(Person.objects.scalar("name", "state"))
-        self.assertEqual(plist, [(u"Wilson JR", s1)])
+        assert plist == [(u"Wilson JR", s1)]
 
     def test_scalar_generic_reference_field(self):
         class State(Document):
@@ -4317,7 +4310,7 @@ class Person(Document):
         Person(name="Wilson JR", state=s1).save()
 
         plist = list(Person.objects.scalar("name", "state"))
-        self.assertEqual(plist, [(u"Wilson JR", s1)])
+        assert plist == [(u"Wilson JR", s1)]
 
     def test_generic_reference_field_with_only_and_as_pymongo(self):
         class TestPerson(Document):
@@ -4342,18 +4335,18 @@ class TestActivity(Document):
             .no_dereference()
             .first()
         )
-        self.assertEqual(activity[0], a1.pk)
-        self.assertEqual(activity[1]["_ref"], DBRef("test_person", person.pk))
+        assert activity[0] == a1.pk
+        assert activity[1]["_ref"] == DBRef("test_person", person.pk)
 
         activity = TestActivity.objects(owner=person).only("id", "owner")[0]
-        self.assertEqual(activity.pk, a1.pk)
-        self.assertEqual(activity.owner, person)
+        assert activity.pk == a1.pk
+        assert activity.owner == person
 
         activity = (
             TestActivity.objects(owner=person).only("id", "owner").as_pymongo().first()
         )
-        self.assertEqual(activity["_id"], a1.pk)
-        self.assertTrue(activity["owner"]["_ref"], DBRef("test_person", person.pk))
+        assert activity["_id"] == a1.pk
+        assert activity["owner"]["_ref"], DBRef("test_person", person.pk)
 
     def test_scalar_db_field(self):
         class TestDoc(Document):
@@ -4367,10 +4360,10 @@ class TestDoc(Document):
         TestDoc(x=30, y=True).save()
 
         plist = list(TestDoc.objects.scalar("x", "y"))
-        self.assertEqual(len(plist), 3)
-        self.assertEqual(plist[0], (10, True))
-        self.assertEqual(plist[1], (20, False))
-        self.assertEqual(plist[2], (30, True))
+        assert len(plist) == 3
+        assert plist[0] == (10, True)
+        assert plist[1] == (20, False)
+        assert plist[2] == (30, True)
 
     def test_scalar_primary_key(self):
         class SettingValue(Document):
@@ -4382,7 +4375,7 @@ class SettingValue(Document):
         s.save()
 
         val = SettingValue.objects.scalar("key", "value")
-        self.assertEqual(list(val), [("test", "test value")])
+        assert list(val) == [("test", "test value")]
 
     def test_scalar_cursor_behaviour(self):
         """Ensure that a query returns a valid set of results.
@@ -4394,90 +4387,86 @@ def test_scalar_cursor_behaviour(self):
 
         # Find all people in the collection
         people = self.Person.objects.scalar("name")
-        self.assertEqual(people.count(), 2)
+        assert people.count() == 2
         results = list(people)
-        self.assertEqual(results[0], "User A")
-        self.assertEqual(results[1], "User B")
+        assert results[0] == "User A"
+        assert results[1] == "User B"
 
         # Use a query to filter the people found to just person1
         people = self.Person.objects(age=20).scalar("name")
-        self.assertEqual(people.count(), 1)
+        assert people.count() == 1
         person = people.next()
-        self.assertEqual(person, "User A")
+        assert person == "User A"
 
         # Test limit
         people = list(self.Person.objects.limit(1).scalar("name"))
-        self.assertEqual(len(people), 1)
-        self.assertEqual(people[0], "User A")
+        assert len(people) == 1
+        assert people[0] == "User A"
 
         # Test skip
         people = list(self.Person.objects.skip(1).scalar("name"))
-        self.assertEqual(len(people), 1)
-        self.assertEqual(people[0], "User B")
+        assert len(people) == 1
+        assert people[0] == "User B"
 
         person3 = self.Person(name="User C", age=40)
         person3.save()
 
         # Test slice limit
         people = list(self.Person.objects[:2].scalar("name"))
-        self.assertEqual(len(people), 2)
-        self.assertEqual(people[0], "User A")
-        self.assertEqual(people[1], "User B")
+        assert len(people) == 2
+        assert people[0] == "User A"
+        assert people[1] == "User B"
 
         # Test slice skip
         people = list(self.Person.objects[1:].scalar("name"))
-        self.assertEqual(len(people), 2)
-        self.assertEqual(people[0], "User B")
-        self.assertEqual(people[1], "User C")
+        assert len(people) == 2
+        assert people[0] == "User B"
+        assert people[1] == "User C"
 
         # Test slice limit and skip
         people = list(self.Person.objects[1:2].scalar("name"))
-        self.assertEqual(len(people), 1)
-        self.assertEqual(people[0], "User B")
+        assert len(people) == 1
+        assert people[0] == "User B"
 
         people = list(self.Person.objects[1:1].scalar("name"))
-        self.assertEqual(len(people), 0)
+        assert len(people) == 0
 
         # Test slice out of range
         people = list(self.Person.objects.scalar("name")[80000:80001])
-        self.assertEqual(len(people), 0)
+        assert len(people) == 0
 
         # Test larger slice __repr__
         self.Person.objects.delete()
         for i in range(55):
             self.Person(name="A%s" % i, age=i).save()
 
-        self.assertEqual(self.Person.objects.scalar("name").count(), 55)
-        self.assertEqual(
-            "A0", "%s" % self.Person.objects.order_by("name").scalar("name").first()
-        )
-        self.assertEqual(
-            "A0", "%s" % self.Person.objects.scalar("name").order_by("name")[0]
+        assert self.Person.objects.scalar("name").count() == 55
+        assert (
+            "A0" == "%s" % self.Person.objects.order_by("name").scalar("name").first()
         )
+        assert "A0" == "%s" % self.Person.objects.scalar("name").order_by("name")[0]
         if six.PY3:
-            self.assertEqual(
-                "['A1', 'A2']",
-                "%s" % self.Person.objects.order_by("age").scalar("name")[1:3],
+            assert (
+                "['A1', 'A2']"
+                == "%s" % self.Person.objects.order_by("age").scalar("name")[1:3]
             )
-            self.assertEqual(
-                "['A51', 'A52']",
-                "%s" % self.Person.objects.order_by("age").scalar("name")[51:53],
+            assert (
+                "['A51', 'A52']"
+                == "%s" % self.Person.objects.order_by("age").scalar("name")[51:53]
             )
         else:
-            self.assertEqual(
-                "[u'A1', u'A2']",
-                "%s" % self.Person.objects.order_by("age").scalar("name")[1:3],
+            assert (
+                "[u'A1', u'A2']"
+                == "%s" % self.Person.objects.order_by("age").scalar("name")[1:3]
             )
-            self.assertEqual(
-                "[u'A51', u'A52']",
-                "%s" % self.Person.objects.order_by("age").scalar("name")[51:53],
+            assert (
+                "[u'A51', u'A52']"
+                == "%s" % self.Person.objects.order_by("age").scalar("name")[51:53]
             )
 
         # with_id and in_bulk
         person = self.Person.objects.order_by("name").first()
-        self.assertEqual(
-            "A0", "%s" % self.Person.objects.scalar("name").with_id(person.id)
-        )
+        assert "A0" == "%s" % self.Person.objects.scalar("name").with_id(person.id)
 
         pks = self.Person.objects.order_by("age").scalar("pk")[1:3]
         names = self.Person.objects.scalar("name").in_bulk(list(pks)).values()
@@ -4485,7 +4474,7 @@ def test_scalar_cursor_behaviour(self):
             expected = "['A1', 'A2']"
         else:
             expected = "[u'A1', u'A2']"
-        self.assertEqual(expected, "%s" % sorted(names))
+        assert expected == "%s" % sorted(names)
 
     def test_elem_match(self):
         class Foo(EmbeddedDocument):
@@ -4525,29 +4514,29 @@ class Bar(Document):
         b3.save()
 
         ak = list(Bar.objects(foo__match={"shape": "square", "color": "purple"}))
-        self.assertEqual([b1], ak)
+        assert [b1] == ak
 
         ak = list(Bar.objects(foo__elemMatch={"shape": "square", "color": "purple"}))
-        self.assertEqual([b1], ak)
+        assert [b1] == ak
 
         ak = list(Bar.objects(foo__match=Foo(shape="square", color="purple")))
-        self.assertEqual([b1], ak)
+        assert [b1] == ak
 
         ak = list(
             Bar.objects(foo__elemMatch={"shape": "square", "color__exists": True})
         )
-        self.assertEqual([b1, b2], ak)
+        assert [b1, b2] == ak
 
         ak = list(Bar.objects(foo__match={"shape": "square", "color__exists": True}))
-        self.assertEqual([b1, b2], ak)
+        assert [b1, b2] == ak
 
         ak = list(
             Bar.objects(foo__elemMatch={"shape": "square", "color__exists": False})
         )
-        self.assertEqual([b3], ak)
+        assert [b3] == ak
 
         ak = list(Bar.objects(foo__match={"shape": "square", "color__exists": False}))
-        self.assertEqual([b3], ak)
+        assert [b3] == ak
 
     def test_upsert_includes_cls(self):
         """Upserts should include _cls information for inheritable classes
@@ -4558,7 +4547,7 @@ class Test(Document):
 
         Test.drop_collection()
         Test.objects(test="foo").update_one(upsert=True, set__test="foo")
-        self.assertNotIn("_cls", Test._collection.find_one())
+        assert "_cls" not in Test._collection.find_one()
 
         class Test(Document):
             meta = {"allow_inheritance": True}
@@ -4567,15 +4556,15 @@ class Test(Document):
         Test.drop_collection()
 
         Test.objects(test="foo").update_one(upsert=True, set__test="foo")
-        self.assertIn("_cls", Test._collection.find_one())
+        assert "_cls" in Test._collection.find_one()
 
     def test_update_upsert_looks_like_a_digit(self):
         class MyDoc(DynamicDocument):
             pass
 
         MyDoc.drop_collection()
-        self.assertEqual(1, MyDoc.objects.update_one(upsert=True, inc__47=1))
-        self.assertEqual(MyDoc.objects.get()["47"], 1)
+        assert 1 == MyDoc.objects.update_one(upsert=True, inc__47=1)
+        assert MyDoc.objects.get()["47"] == 1
 
     def test_dictfield_key_looks_like_a_digit(self):
         """Only should work with DictField even if they have numeric keys."""
@@ -4586,7 +4575,7 @@ class MyDoc(Document):
         MyDoc.drop_collection()
         doc = MyDoc(test={"47": 1})
         doc.save()
-        self.assertEqual(MyDoc.objects.only("test__47").get().test["47"], 1)
+        assert MyDoc.objects.only("test__47").get().test["47"] == 1
 
     def test_clear_cls_query(self):
         class Parent(Document):
@@ -4599,32 +4588,28 @@ class Child(Parent):
         Parent.drop_collection()
 
         # Default query includes the "_cls" check.
-        self.assertEqual(
-            Parent.objects._query, {"_cls": {"$in": ("Parent", "Parent.Child")}}
-        )
+        assert Parent.objects._query == {"_cls": {"$in": ("Parent", "Parent.Child")}}
 
         # Clearing the "_cls" query should work.
-        self.assertEqual(Parent.objects.clear_cls_query()._query, {})
+        assert Parent.objects.clear_cls_query()._query == {}
 
         # Clearing the "_cls" query should not persist across queryset instances.
-        self.assertEqual(
-            Parent.objects._query, {"_cls": {"$in": ("Parent", "Parent.Child")}}
-        )
+        assert Parent.objects._query == {"_cls": {"$in": ("Parent", "Parent.Child")}}
 
         # The rest of the query should not be cleared.
-        self.assertEqual(
-            Parent.objects.filter(name="xyz").clear_cls_query()._query, {"name": "xyz"}
-        )
+        assert Parent.objects.filter(name="xyz").clear_cls_query()._query == {
+            "name": "xyz"
+        }
 
         Parent.objects.create(name="foo")
         Child.objects.create(name="bar", age=1)
-        self.assertEqual(Parent.objects.clear_cls_query().count(), 2)
-        self.assertEqual(Parent.objects.count(), 2)
-        self.assertEqual(Child.objects().count(), 1)
+        assert Parent.objects.clear_cls_query().count() == 2
+        assert Parent.objects.count() == 2
+        assert Child.objects().count() == 1
 
         # XXX This isn't really how you'd want to use `clear_cls_query()`, but
         # it's a decent test to validate its behavior nonetheless.
-        self.assertEqual(Child.objects.clear_cls_query().count(), 2)
+        assert Child.objects.clear_cls_query().count() == 2
 
     def test_read_preference(self):
         class Bar(Document):
@@ -4636,20 +4621,21 @@ class Bar(Document):
         bar = Bar.objects.create(txt="xyz")
 
         bars = list(Bar.objects.read_preference(ReadPreference.PRIMARY))
-        self.assertEqual(bars, [bar])
+        assert bars == [bar]
 
         bars = Bar.objects.read_preference(ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(bars._read_preference, ReadPreference.SECONDARY_PREFERRED)
-        self.assertEqual(
-            bars._cursor.collection.read_preference, ReadPreference.SECONDARY_PREFERRED
+        assert bars._read_preference == ReadPreference.SECONDARY_PREFERRED
+        assert (
+            bars._cursor.collection.read_preference == ReadPreference.SECONDARY_PREFERRED
         )
 
         # Make sure that `.read_preference(...)` does accept string values.
-        self.assertRaises(TypeError, Bar.objects.read_preference, "Primary")
+        with pytest.raises(TypeError):
+            Bar.objects.read_preference("Primary")
 
         def assert_read_pref(qs, expected_read_pref):
-            self.assertEqual(qs._read_preference, expected_read_pref)
-            self.assertEqual(qs._cursor.collection.read_preference, expected_read_pref)
+            assert qs._read_preference == expected_read_pref
+            assert qs._cursor.collection.read_preference == expected_read_pref
 
         # Make sure read preference is respected after a `.skip(...)`.
         bars = Bar.objects.skip(1).read_preference(ReadPreference.SECONDARY_PREFERRED)
@@ -4681,9 +4667,9 @@ class Bar(Document):
         bars = Bar.objects.read_preference(
             ReadPreference.SECONDARY_PREFERRED
         ).aggregate()
-        self.assertEqual(
-            bars._CommandCursor__collection.read_preference,
-            ReadPreference.SECONDARY_PREFERRED,
+        assert (
+            bars._CommandCursor__collection.read_preference
+            == ReadPreference.SECONDARY_PREFERRED
         )
 
     def test_json_simple(self):
@@ -4702,7 +4688,7 @@ class Doc(Document):
         json_data = Doc.objects.to_json(sort_keys=True, separators=(",", ":"))
         doc_objects = list(Doc.objects)
 
-        self.assertEqual(doc_objects, Doc.objects.from_json(json_data))
+        assert doc_objects == Doc.objects.from_json(json_data)
 
     def test_json_complex(self):
         class EmbeddedDoc(EmbeddedDocument):
@@ -4748,7 +4734,7 @@ class Doc(Document):
         json_data = Doc.objects.to_json()
         doc_objects = list(Doc.objects)
 
-        self.assertEqual(doc_objects, Doc.objects.from_json(json_data))
+        assert doc_objects == Doc.objects.from_json(json_data)
 
     def test_as_pymongo(self):
         class LastLogin(EmbeddedDocument):
@@ -4774,36 +4760,33 @@ class User(Document):
         )
 
         results = User.objects.as_pymongo()
-        self.assertEqual(set(results[0].keys()), set(["_id", "name", "age", "price"]))
-        self.assertEqual(
-            set(results[1].keys()), set(["_id", "name", "age", "price", "last_login"])
+        assert set(results[0].keys()) == set(["_id", "name", "age", "price"])
+        assert set(results[1].keys()) == set(
+            ["_id", "name", "age", "price", "last_login"]
         )
 
         results = User.objects.only("id", "name").as_pymongo()
-        self.assertEqual(set(results[0].keys()), set(["_id", "name"]))
+        assert set(results[0].keys()) == set(["_id", "name"])
 
         users = User.objects.only("name", "price").as_pymongo()
         results = list(users)
-        self.assertIsInstance(results[0], dict)
-        self.assertIsInstance(results[1], dict)
-        self.assertEqual(results[0]["name"], "Bob Dole")
-        self.assertEqual(results[0]["price"], 1.11)
-        self.assertEqual(results[1]["name"], "Barak Obama")
-        self.assertEqual(results[1]["price"], 2.22)
+        assert isinstance(results[0], dict)
+        assert isinstance(results[1], dict)
+        assert results[0]["name"] == "Bob Dole"
+        assert results[0]["price"] == 1.11
+        assert results[1]["name"] == "Barak Obama"
+        assert results[1]["price"] == 2.22
 
         users = User.objects.only("name", "last_login").as_pymongo()
         results = list(users)
-        self.assertIsInstance(results[0], dict)
-        self.assertIsInstance(results[1], dict)
-        self.assertEqual(results[0], {"_id": "Bob", "name": "Bob Dole"})
-        self.assertEqual(
-            results[1],
-            {
-                "_id": "Barak",
-                "name": "Barak Obama",
-                "last_login": {"location": "White House", "ip": "104.107.108.116"},
-            },
-        )
+        assert isinstance(results[0], dict)
+        assert isinstance(results[1], dict)
+        assert results[0] == {"_id": "Bob", "name": "Bob Dole"}
+        assert results[1] == {
+            "_id": "Barak",
+            "name": "Barak Obama",
+            "last_login": {"location": "White House", "ip": "104.107.108.116"},
+        }
 
     def test_as_pymongo_returns_cls_attribute_when_using_inheritance(self):
         class User(Document):
@@ -4814,7 +4797,7 @@ class User(Document):
 
         user = User(name="Bob Dole").save()
         result = User.objects.as_pymongo().first()
-        self.assertEqual(result, {"_cls": "User", "_id": user.id, "name": "Bob Dole"})
+        assert result == {"_cls": "User", "_id": user.id, "name": "Bob Dole"}
 
     def test_as_pymongo_json_limit_fields(self):
         class User(Document):
@@ -4830,30 +4813,30 @@ class User(Document):
         serialized_user = User.objects.exclude(
             "password_salt", "password_hash"
         ).as_pymongo()[0]
-        self.assertEqual({"_id", "email"}, set(serialized_user.keys()))
+        assert {"_id", "email"} == set(serialized_user.keys())
 
         serialized_user = User.objects.exclude(
             "id", "password_salt", "password_hash"
         ).to_json()
-        self.assertEqual('[{"email": "ross@example.com"}]', serialized_user)
+        assert '[{"email": "ross@example.com"}]' == serialized_user
 
         serialized_user = User.objects.only("email").as_pymongo()[0]
-        self.assertEqual({"_id", "email"}, set(serialized_user.keys()))
+        assert {"_id", "email"} == set(serialized_user.keys())
 
         serialized_user = (
             User.objects.exclude("password_salt").only("email").as_pymongo()[0]
         )
-        self.assertEqual({"_id", "email"}, set(serialized_user.keys()))
+        assert {"_id", "email"} == set(serialized_user.keys())
 
         serialized_user = (
             User.objects.exclude("password_salt", "id").only("email").as_pymongo()[0]
         )
-        self.assertEqual({"email"}, set(serialized_user.keys()))
+        assert {"email"} == set(serialized_user.keys())
 
         serialized_user = (
             User.objects.exclude("password_salt", "id").only("email").to_json()
         )
-        self.assertEqual('[{"email": "ross@example.com"}]', serialized_user)
+        assert '[{"email": "ross@example.com"}]' == serialized_user
 
     def test_only_after_count(self):
         """Test that only() works after count()"""
@@ -4869,13 +4852,13 @@ class User(Document):
         user_queryset = User.objects(age=50)
 
         result = user_queryset.only("name", "age").as_pymongo().first()
-        self.assertEqual(result, {"_id": user.id, "name": "User", "age": 50})
+        assert result == {"_id": user.id, "name": "User", "age": 50}
 
         result = user_queryset.count()
-        self.assertEqual(result, 1)
+        assert result == 1
 
         result = user_queryset.only("name", "age").as_pymongo().first()
-        self.assertEqual(result, {"_id": user.id, "name": "User", "age": 50})
+        assert result == {"_id": user.id, "name": "User", "age": 50}
 
     def test_no_dereference(self):
         class Organization(Document):
@@ -4894,12 +4877,12 @@ class User(Document):
         qs = User.objects()
         qs_user = qs.first()
 
-        self.assertIsInstance(qs.first().organization, Organization)
+        assert isinstance(qs.first().organization, Organization)
 
-        self.assertIsInstance(qs.no_dereference().first().organization, DBRef)
+        assert isinstance(qs.no_dereference().first().organization, DBRef)
 
-        self.assertIsInstance(qs_user.organization, Organization)
-        self.assertIsInstance(qs.first().organization, Organization)
+        assert isinstance(qs_user.organization, Organization)
+        assert isinstance(qs.first().organization, Organization)
 
     def test_no_dereference_internals(self):
         # Test the internals on which queryset.no_dereference relies on
@@ -4913,24 +4896,24 @@ class User(Document):
         Organization.drop_collection()
 
         cls_organization_field = User.organization
-        self.assertTrue(cls_organization_field._auto_dereference, True)  # default
+        assert cls_organization_field._auto_dereference, True  # default
 
         org = Organization(name="whatever").save()
         User(organization=org).save()
 
         qs_no_deref = User.objects().no_dereference()
         user_no_deref = qs_no_deref.first()
-        self.assertFalse(qs_no_deref._auto_dereference)
+        assert not qs_no_deref._auto_dereference
 
         # Make sure the instance field is different from the class field
         instance_org_field = user_no_deref._fields["organization"]
-        self.assertIsNot(instance_org_field, cls_organization_field)
-        self.assertFalse(instance_org_field._auto_dereference)
+        assert instance_org_field is not cls_organization_field
+        assert not instance_org_field._auto_dereference
 
-        self.assertIsInstance(user_no_deref.organization, DBRef)
-        self.assertTrue(
-            cls_organization_field._auto_dereference, True
-        )  # Make sure the class Field wasn't altered
+        assert isinstance(user_no_deref.organization, DBRef)
+        assert (
+            cls_organization_field._auto_dereference
+        ), True  # Make sure the class Field wasn't altered
 
     def test_no_dereference_no_side_effect_on_existing_instance(self):
         # Relates to issue #1677 - ensures no regression of the bug
@@ -4956,13 +4939,13 @@ class User(Document):
 
         # ReferenceField
         no_derf_org = user_no_deref.organization  # was triggering the bug
-        self.assertIsInstance(no_derf_org, DBRef)
-        self.assertIsInstance(user.organization, Organization)
+        assert isinstance(no_derf_org, DBRef)
+        assert isinstance(user.organization, Organization)
 
         # GenericReferenceField
         no_derf_org_gen = user_no_deref.organization_gen
-        self.assertIsInstance(no_derf_org_gen, dict)
-        self.assertIsInstance(user.organization_gen, Organization)
+        assert isinstance(no_derf_org_gen, dict)
+        assert isinstance(user.organization_gen, Organization)
 
     def test_no_dereference_embedded_doc(self):
         class User(Document):
@@ -4994,13 +4977,13 @@ class Organization(Document):
 
         org = Organization.objects().no_dereference().first()
 
-        self.assertNotEqual(id(org._fields["admins"]), id(Organization.admins))
-        self.assertFalse(org._fields["admins"]._auto_dereference)
+        assert id(org._fields["admins"]) != id(Organization.admins)
+        assert not org._fields["admins"]._auto_dereference
 
         admin = org.admins[0]
-        self.assertIsInstance(admin, DBRef)
-        self.assertIsInstance(org.member.user, DBRef)
-        self.assertIsInstance(org.members[0].user, DBRef)
+        assert isinstance(admin, DBRef)
+        assert isinstance(org.member.user, DBRef)
+        assert isinstance(org.members[0].user, DBRef)
 
     def test_cached_queryset(self):
         class Person(Document):
@@ -5011,11 +4994,11 @@ class Person(Document):
             Person(name="No: %s" % i).save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             people = Person.objects
 
             [x for x in people]
-            self.assertEqual(100, len(people._result_cache))
+            assert 100 == len(people._result_cache)
 
             import platform
 
@@ -5023,15 +5006,15 @@ class Person(Document):
                 # PyPy evaluates __len__ when iterating with list comprehensions while CPython does not.
                 # This may be a bug in PyPy (PyPy/#1802) but it does not affect
                 # the behavior of MongoEngine.
-                self.assertEqual(None, people._len)
-            self.assertEqual(q, 1)
+                assert None == people._len
+            assert q == 1
 
             list(people)
-            self.assertEqual(100, people._len)  # Caused by list calling len
-            self.assertEqual(q, 1)
+            assert 100 == people._len  # Caused by list calling len
+            assert q == 1
 
             people.count(with_limit_and_skip=True)  # count is cached
-            self.assertEqual(q, 1)
+            assert q == 1
 
     def test_no_cached_queryset(self):
         class Person(Document):
@@ -5042,17 +5025,17 @@ class Person(Document):
             Person(name="No: %s" % i).save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             people = Person.objects.no_cache()
 
             [x for x in people]
-            self.assertEqual(q, 1)
+            assert q == 1
 
             list(people)
-            self.assertEqual(q, 2)
+            assert q == 2
 
             people.count()
-            self.assertEqual(q, 3)
+            assert q == 3
 
     def test_no_cached_queryset__repr__(self):
         class Person(Document):
@@ -5060,7 +5043,7 @@ class Person(Document):
 
         Person.drop_collection()
         qs = Person.objects.no_cache()
-        self.assertEqual(repr(qs), "[]")
+        assert repr(qs) == "[]"
 
     def test_no_cached_on_a_cached_queryset_raise_error(self):
         class Person(Document):
@@ -5070,9 +5053,9 @@ class Person(Document):
         Person(name="a").save()
         qs = Person.objects()
         _ = list(qs)
-        with self.assertRaises(OperationError) as ctx_err:
+        with pytest.raises(OperationError) as ctx_err:
             qs.no_cache()
-        self.assertEqual("QuerySet already cached", str(ctx_err.exception))
+        assert "QuerySet already cached" == str(ctx_err.exception)
 
     def test_no_cached_queryset_no_cache_back_to_cache(self):
         class Person(Document):
@@ -5080,11 +5063,11 @@ class Person(Document):
 
         Person.drop_collection()
         qs = Person.objects()
-        self.assertIsInstance(qs, QuerySet)
+        assert isinstance(qs, QuerySet)
         qs = qs.no_cache()
-        self.assertIsInstance(qs, QuerySetNoCache)
+        assert isinstance(qs, QuerySetNoCache)
         qs = qs.cache()
-        self.assertIsInstance(qs, QuerySet)
+        assert isinstance(qs, QuerySet)
 
     def test_cache_not_cloned(self):
         class User(Document):
@@ -5099,12 +5082,12 @@ def __unicode__(self):
         User(name="Bob").save()
 
         users = User.objects.all().order_by("name")
-        self.assertEqual("%s" % users, "[<User: Alice>, <User: Bob>]")
-        self.assertEqual(2, len(users._result_cache))
+        assert "%s" % users == "[<User: Alice>, <User: Bob>]"
+        assert 2 == len(users._result_cache)
 
         users = users.filter(name="Bob")
-        self.assertEqual("%s" % users, "[<User: Bob>]")
-        self.assertEqual(1, len(users._result_cache))
+        assert "%s" % users == "[<User: Bob>]"
+        assert 1 == len(users._result_cache)
 
     def test_no_cache(self):
         """Ensure you can add meta data to file"""
@@ -5122,23 +5105,23 @@ class Noddy(Document):
         docs = Noddy.objects.no_cache()
 
         counter = len([1 for i in docs])
-        self.assertEqual(counter, 100)
+        assert counter == 100
 
-        self.assertEqual(len(list(docs)), 100)
+        assert len(list(docs)) == 100
 
         # Can't directly get a length of a no-cache queryset.
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             len(docs)
 
         # Another iteration over the queryset should result in another db op.
         with query_counter() as q:
             list(docs)
-            self.assertEqual(q, 1)
+            assert q == 1
 
         # ... and another one to double-check.
         with query_counter() as q:
             list(docs)
-            self.assertEqual(q, 1)
+            assert q == 1
 
     def test_nested_queryset_iterator(self):
         # Try iterating the same queryset twice, nested.
@@ -5161,32 +5144,32 @@ def __unicode__(self):
         inner_total_count = 0
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
-            self.assertEqual(users.count(with_limit_and_skip=True), 7)
+            assert users.count(with_limit_and_skip=True) == 7
 
             for i, outer_user in enumerate(users):
-                self.assertEqual(outer_user.name, names[i])
+                assert outer_user.name == names[i]
                 outer_count += 1
                 inner_count = 0
 
                 # Calling len might disrupt the inner loop if there are bugs
-                self.assertEqual(users.count(with_limit_and_skip=True), 7)
+                assert users.count(with_limit_and_skip=True) == 7
 
                 for j, inner_user in enumerate(users):
-                    self.assertEqual(inner_user.name, names[j])
+                    assert inner_user.name == names[j]
                     inner_count += 1
                     inner_total_count += 1
 
                 # inner loop should always be executed seven times
-                self.assertEqual(inner_count, 7)
+                assert inner_count == 7
 
             # outer loop should be executed seven times total
-            self.assertEqual(outer_count, 7)
+            assert outer_count == 7
             # inner loop should be executed fourtynine times total
-            self.assertEqual(inner_total_count, 7 * 7)
+            assert inner_total_count == 7 * 7
 
-            self.assertEqual(q, 2)
+            assert q == 2
 
     def test_no_sub_classes(self):
         class A(Document):
@@ -5209,23 +5192,23 @@ class C(B):
         B(x=30, y=50).save()
         C(x=40, y=60).save()
 
-        self.assertEqual(A.objects.no_sub_classes().count(), 2)
-        self.assertEqual(A.objects.count(), 5)
+        assert A.objects.no_sub_classes().count() == 2
+        assert A.objects.count() == 5
 
-        self.assertEqual(B.objects.no_sub_classes().count(), 2)
-        self.assertEqual(B.objects.count(), 3)
+        assert B.objects.no_sub_classes().count() == 2
+        assert B.objects.count() == 3
 
-        self.assertEqual(C.objects.no_sub_classes().count(), 1)
-        self.assertEqual(C.objects.count(), 1)
+        assert C.objects.no_sub_classes().count() == 1
+        assert C.objects.count() == 1
 
         for obj in A.objects.no_sub_classes():
-            self.assertEqual(obj.__class__, A)
+            assert obj.__class__ == A
 
         for obj in B.objects.no_sub_classes():
-            self.assertEqual(obj.__class__, B)
+            assert obj.__class__ == B
 
         for obj in C.objects.no_sub_classes():
-            self.assertEqual(obj.__class__, C)
+            assert obj.__class__ == C
 
     def test_query_generic_embedded_document(self):
         """Ensure that querying sub field on generic_embedded_field works
@@ -5245,10 +5228,10 @@ class Doc(Document):
         Doc(document=B(b_name="B doc")).save()
 
         # Using raw in filter working fine
-        self.assertEqual(Doc.objects(__raw__={"document.a_name": "A doc"}).count(), 1)
-        self.assertEqual(Doc.objects(__raw__={"document.b_name": "B doc"}).count(), 1)
-        self.assertEqual(Doc.objects(document__a_name="A doc").count(), 1)
-        self.assertEqual(Doc.objects(document__b_name="B doc").count(), 1)
+        assert Doc.objects(__raw__={"document.a_name": "A doc"}).count() == 1
+        assert Doc.objects(__raw__={"document.b_name": "B doc"}).count() == 1
+        assert Doc.objects(document__a_name="A doc").count() == 1
+        assert Doc.objects(document__b_name="B doc").count() == 1
 
     def test_query_reference_to_custom_pk_doc(self):
         class A(Document):
@@ -5263,9 +5246,9 @@ class B(Document):
         a = A.objects.create(id="custom_id")
         B.objects.create(a=a)
 
-        self.assertEqual(B.objects.count(), 1)
-        self.assertEqual(B.objects.get(a=a).a, a)
-        self.assertEqual(B.objects.get(a=a.id).a, a)
+        assert B.objects.count() == 1
+        assert B.objects.get(a=a).a == a
+        assert B.objects.get(a=a.id).a == a
 
     def test_cls_query_in_subclassed_docs(self):
         class Animal(Document):
@@ -5279,21 +5262,18 @@ class Dog(Animal):
         class Cat(Animal):
             pass
 
-        self.assertEqual(
-            Animal.objects(name="Charlie")._query,
-            {
-                "name": "Charlie",
-                "_cls": {"$in": ("Animal", "Animal.Dog", "Animal.Cat")},
-            },
-        )
-        self.assertEqual(
-            Dog.objects(name="Charlie")._query,
-            {"name": "Charlie", "_cls": "Animal.Dog"},
-        )
-        self.assertEqual(
-            Cat.objects(name="Charlie")._query,
-            {"name": "Charlie", "_cls": "Animal.Cat"},
-        )
+        assert Animal.objects(name="Charlie")._query == {
+            "name": "Charlie",
+            "_cls": {"$in": ("Animal", "Animal.Dog", "Animal.Cat")},
+        }
+        assert Dog.objects(name="Charlie")._query == {
+            "name": "Charlie",
+            "_cls": "Animal.Dog",
+        }
+        assert Cat.objects(name="Charlie")._query == {
+            "name": "Charlie",
+            "_cls": "Animal.Cat",
+        }
 
     def test_can_have_field_same_name_as_query_operator(self):
         class Size(Document):
@@ -5308,8 +5288,8 @@ class Example(Document):
         instance_size = Size(name="Large").save()
         Example(size=instance_size).save()
 
-        self.assertEqual(Example.objects(size=instance_size).count(), 1)
-        self.assertEqual(Example.objects(size__in=[instance_size]).count(), 1)
+        assert Example.objects(size=instance_size).count() == 1
+        assert Example.objects(size__in=[instance_size]).count() == 1
 
     def test_cursor_in_an_if_stmt(self):
         class Test(Document):
@@ -5347,12 +5327,12 @@ class Person(Document):
             if Person.objects:
                 pass
 
-            self.assertEqual(q, 1)
+            assert q == 1
             op = q.db.system.profile.find(
                 {"ns": {"$ne": "%s.system.indexes" % q.db.name}}
             )[0]
 
-            self.assertEqual(op["nreturned"], 1)
+            assert op["nreturned"] == 1
 
     def test_bool_with_ordering(self):
         ORDER_BY_KEY, CMD_QUERY_KEY = get_key_compat(self.mongodb_version)
@@ -5375,7 +5355,7 @@ class Person(Document):
                 {"ns": {"$ne": "%s.system.indexes" % q.db.name}}
             )[0]
 
-            self.assertNotIn(ORDER_BY_KEY, op[CMD_QUERY_KEY])
+            assert ORDER_BY_KEY not in op[CMD_QUERY_KEY]
 
         # Check that normal query uses orderby
         qs2 = Person.objects.order_by("name")
@@ -5388,7 +5368,7 @@ class Person(Document):
                 {"ns": {"$ne": "%s.system.indexes" % q.db.name}}
             )[0]
 
-            self.assertIn(ORDER_BY_KEY, op[CMD_QUERY_KEY])
+            assert ORDER_BY_KEY in op[CMD_QUERY_KEY]
 
     def test_bool_with_ordering_from_meta_dict(self):
         ORDER_BY_KEY, CMD_QUERY_KEY = get_key_compat(self.mongodb_version)
@@ -5412,16 +5392,12 @@ class Person(Document):
                 {"ns": {"$ne": "%s.system.indexes" % q.db.name}}
             )[0]
 
-            self.assertNotIn(
-                "$orderby",
-                op[CMD_QUERY_KEY],
-                "BaseQuerySet must remove orderby from meta in boolen test",
-            )
+            assert (
+                "$orderby" not in op[CMD_QUERY_KEY]
+            ), "BaseQuerySet must remove orderby from meta in boolen test"
 
-            self.assertEqual(Person.objects.first().name, "A")
-            self.assertTrue(
-                Person.objects._has_data(), "Cursor has data and returned False"
-            )
+            assert Person.objects.first().name == "A"
+            assert Person.objects._has_data(), "Cursor has data and returned False"
 
     def test_queryset_aggregation_framework(self):
         class Person(Document):
@@ -5439,13 +5415,10 @@ class Person(Document):
             {"$project": {"name": {"$toUpper": "$name"}}}
         )
 
-        self.assertEqual(
-            list(data),
-            [
-                {"_id": p1.pk, "name": "ISABELLA LUANNA"},
-                {"_id": p2.pk, "name": "WILSON JUNIOR"},
-            ],
-        )
+        assert list(data) == [
+            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+            {"_id": p2.pk, "name": "WILSON JUNIOR"},
+        ]
 
         data = (
             Person.objects(age__lte=22)
@@ -5453,13 +5426,10 @@ class Person(Document):
             .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(
-            list(data),
-            [
-                {"_id": p2.pk, "name": "WILSON JUNIOR"},
-                {"_id": p1.pk, "name": "ISABELLA LUANNA"},
-            ],
-        )
+        assert list(data) == [
+            {"_id": p2.pk, "name": "WILSON JUNIOR"},
+            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+        ]
 
         data = (
             Person.objects(age__gte=17, age__lte=40)
@@ -5468,12 +5438,10 @@ class Person(Document):
                 {"$group": {"_id": None, "total": {"$sum": 1}, "avg": {"$avg": "$age"}}}
             )
         )
-        self.assertEqual(list(data), [{"_id": None, "avg": 29, "total": 2}])
+        assert list(data) == [{"_id": None, "avg": 29, "total": 2}]
 
         data = Person.objects().aggregate({"$match": {"name": "Isabella Luanna"}})
-        self.assertEqual(
-            list(data), [{u"_id": p1.pk, u"age": 16, u"name": u"Isabella Luanna"}]
-        )
+        assert list(data) == [{u"_id": p1.pk, u"age": 16, u"name": u"Isabella Luanna"}]
 
     def test_queryset_aggregation_with_skip(self):
         class Person(Document):
@@ -5491,13 +5459,10 @@ class Person(Document):
             {"$project": {"name": {"$toUpper": "$name"}}}
         )
 
-        self.assertEqual(
-            list(data),
-            [
-                {"_id": p2.pk, "name": "WILSON JUNIOR"},
-                {"_id": p3.pk, "name": "SANDRA MARA"},
-            ],
-        )
+        assert list(data) == [
+            {"_id": p2.pk, "name": "WILSON JUNIOR"},
+            {"_id": p3.pk, "name": "SANDRA MARA"},
+        ]
 
     def test_queryset_aggregation_with_limit(self):
         class Person(Document):
@@ -5515,7 +5480,7 @@ class Person(Document):
             {"$project": {"name": {"$toUpper": "$name"}}}
         )
 
-        self.assertEqual(list(data), [{"_id": p1.pk, "name": "ISABELLA LUANNA"}])
+        assert list(data) == [{"_id": p1.pk, "name": "ISABELLA LUANNA"}]
 
     def test_queryset_aggregation_with_sort(self):
         class Person(Document):
@@ -5533,14 +5498,11 @@ class Person(Document):
             {"$project": {"name": {"$toUpper": "$name"}}}
         )
 
-        self.assertEqual(
-            list(data),
-            [
-                {"_id": p1.pk, "name": "ISABELLA LUANNA"},
-                {"_id": p3.pk, "name": "SANDRA MARA"},
-                {"_id": p2.pk, "name": "WILSON JUNIOR"},
-            ],
-        )
+        assert list(data) == [
+            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+            {"_id": p3.pk, "name": "SANDRA MARA"},
+            {"_id": p2.pk, "name": "WILSON JUNIOR"},
+        ]
 
     def test_queryset_aggregation_with_skip_with_limit(self):
         class Person(Document):
@@ -5560,7 +5522,7 @@ class Person(Document):
             .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(list(data), [{"_id": p2.pk, "name": "WILSON JUNIOR"}])
+        assert list(data) == [{"_id": p2.pk, "name": "WILSON JUNIOR"}]
 
         # Make sure limit/skip chaining order has no impact
         data2 = (
@@ -5569,7 +5531,7 @@ class Person(Document):
             .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(data, list(data2))
+        assert data == list(data2)
 
     def test_queryset_aggregation_with_sort_with_limit(self):
         class Person(Document):
@@ -5589,13 +5551,10 @@ class Person(Document):
             .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(
-            list(data),
-            [
-                {"_id": p1.pk, "name": "ISABELLA LUANNA"},
-                {"_id": p3.pk, "name": "SANDRA MARA"},
-            ],
-        )
+        assert list(data) == [
+            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+            {"_id": p3.pk, "name": "SANDRA MARA"},
+        ]
 
         # Verify adding limit/skip steps works as expected
         data = (
@@ -5604,7 +5563,7 @@ class Person(Document):
             .aggregate({"$project": {"name": {"$toUpper": "$name"}}}, {"$limit": 1})
         )
 
-        self.assertEqual(list(data), [{"_id": p1.pk, "name": "ISABELLA LUANNA"}])
+        assert list(data) == [{"_id": p1.pk, "name": "ISABELLA LUANNA"}]
 
         data = (
             Person.objects.order_by("name")
@@ -5616,7 +5575,7 @@ class Person(Document):
             )
         )
 
-        self.assertEqual(list(data), [{"_id": p3.pk, "name": "SANDRA MARA"}])
+        assert list(data) == [{"_id": p3.pk, "name": "SANDRA MARA"}]
 
     def test_queryset_aggregation_with_sort_with_skip(self):
         class Person(Document):
@@ -5636,7 +5595,7 @@ class Person(Document):
             .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(list(data), [{"_id": p2.pk, "name": "WILSON JUNIOR"}])
+        assert list(data) == [{"_id": p2.pk, "name": "WILSON JUNIOR"}]
 
     def test_queryset_aggregation_with_sort_with_skip_with_limit(self):
         class Person(Document):
@@ -5657,30 +5616,29 @@ class Person(Document):
             .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
         )
 
-        self.assertEqual(list(data), [{"_id": p3.pk, "name": "SANDRA MARA"}])
+        assert list(data) == [{"_id": p3.pk, "name": "SANDRA MARA"}]
 
     def test_delete_count(self):
         [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
-        self.assertEqual(
-            self.Person.objects().delete(), 3
+        assert (
+            self.Person.objects().delete() == 3
         )  # test ordinary QuerySey delete count
 
         [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
 
-        self.assertEqual(
-            self.Person.objects().skip(1).delete(), 2
+        assert (
+            self.Person.objects().skip(1).delete() == 2
         )  # test Document delete with existing documents
 
         self.Person.objects().delete()
-        self.assertEqual(
-            self.Person.objects().skip(1).delete(), 0
+        assert (
+            self.Person.objects().skip(1).delete() == 0
         )  # test Document delete without existing documents
 
     def test_max_time_ms(self):
         # 778: max_time_ms can get only int or None as input
-        self.assertRaises(
-            TypeError, self.Person.objects(name="name").max_time_ms, "not a number"
-        )
+        with pytest.raises(TypeError):
+            self.Person.objects(name="name").max_time_ms("not a number")
 
     def test_subclass_field_query(self):
         class Animal(Document):
@@ -5698,8 +5656,8 @@ class ScottishCat(Cat):
         Animal(is_mamal=False).save()
         Cat(is_mamal=True, whiskers_length=5.1).save()
         ScottishCat(is_mamal=True, folded_ears=True).save()
-        self.assertEqual(Animal.objects(folded_ears=True).count(), 1)
-        self.assertEqual(Animal.objects(whiskers_length=5.1).count(), 1)
+        assert Animal.objects(folded_ears=True).count() == 1
+        assert Animal.objects(whiskers_length=5.1).count() == 1
 
     def test_loop_over_invalid_id_does_not_crash(self):
         class Person(Document):
@@ -5709,7 +5667,7 @@ class Person(Document):
 
         Person._get_collection().insert_one({"name": "a", "id": ""})
         for p in Person.objects():
-            self.assertEqual(p.name, "a")
+            assert p.name == "a"
 
     def test_len_during_iteration(self):
         """Tests that calling len on a queyset during iteration doesn't
@@ -5733,7 +5691,7 @@ class Data(Document):
         for i, r in enumerate(records):
             if i == 58:
                 len(records)
-        self.assertEqual(i, 249)
+        assert i == 249
 
         # Assert the same behavior is true even if we didn't pre-populate the
         # result cache.
@@ -5741,7 +5699,7 @@ class Data(Document):
         for i, r in enumerate(records):
             if i == 58:
                 len(records)
-        self.assertEqual(i, 249)
+        assert i == 249
 
     def test_iteration_within_iteration(self):
         """You should be able to reliably iterate over all the documents
@@ -5760,8 +5718,8 @@ class Data(Document):
             for j, doc2 in enumerate(qs):
                 pass
 
-        self.assertEqual(i, 249)
-        self.assertEqual(j, 249)
+        assert i == 249
+        assert j == 249
 
     def test_in_operator_on_non_iterable(self):
         """Ensure that using the `__in` operator on a non-iterable raises an
@@ -5785,24 +5743,26 @@ class BlogPost(Document):
 
         # Make sure using `__in` with a list works
         blog_posts = BlogPost.objects(authors__in=[author])
-        self.assertEqual(list(blog_posts), [post])
+        assert list(blog_posts) == [post]
 
         # Using `__in` with a non-iterable should raise a TypeError
-        self.assertRaises(TypeError, BlogPost.objects(authors__in=author.pk).count)
+        with pytest.raises(TypeError):
+            BlogPost.objects(authors__in=author.pk).count()
 
         # Using `__in` with a `Document` (which is seemingly iterable but not
         # in a way we'd expect) should raise a TypeError, too
-        self.assertRaises(TypeError, BlogPost.objects(authors__in=author).count)
+        with pytest.raises(TypeError):
+            BlogPost.objects(authors__in=author).count()
 
     def test_create_count(self):
         self.Person.drop_collection()
         self.Person.objects.create(name="Foo")
         self.Person.objects.create(name="Bar")
         self.Person.objects.create(name="Baz")
-        self.assertEqual(self.Person.objects.count(with_limit_and_skip=True), 3)
+        assert self.Person.objects.count(with_limit_and_skip=True) == 3
 
-        self.Person.objects.create(name="Foo_1")
-        self.assertEqual(self.Person.objects.count(with_limit_and_skip=True), 4)
+        newPerson = self.Person.objects.create(name="Foo_1")
+        assert self.Person.objects.count(with_limit_and_skip=True) == 4
 
     def test_no_cursor_timeout(self):
         qs = self.Person.objects()
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index 8207351d5..be28c3b82 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -4,6 +4,7 @@
 
 from mongoengine import *
 from mongoengine.queryset import Q, transform
+import pytest
 
 
 class TestTransform(unittest.TestCase):
@@ -13,23 +14,16 @@ def setUp(self):
     def test_transform_query(self):
         """Ensure that the _transform_query function operates correctly.
         """
-        self.assertEqual(
-            transform.query(name="test", age=30), {"name": "test", "age": 30}
-        )
-        self.assertEqual(transform.query(age__lt=30), {"age": {"$lt": 30}})
-        self.assertEqual(
-            transform.query(age__gt=20, age__lt=50), {"age": {"$gt": 20, "$lt": 50}}
-        )
-        self.assertEqual(
-            transform.query(age=20, age__gt=50),
-            {"$and": [{"age": {"$gt": 50}}, {"age": 20}]},
-        )
-        self.assertEqual(
-            transform.query(friend__age__gte=30), {"friend.age": {"$gte": 30}}
-        )
-        self.assertEqual(
-            transform.query(name__exists=True), {"name": {"$exists": True}}
-        )
+        assert transform.query(name="test", age=30) == {"name": "test", "age": 30}
+        assert transform.query(age__lt=30) == {"age": {"$lt": 30}}
+        assert transform.query(age__gt=20, age__lt=50) == {
+            "age": {"$gt": 20, "$lt": 50}
+        }
+        assert transform.query(age=20, age__gt=50) == {
+            "$and": [{"age": {"$gt": 50}}, {"age": 20}]
+        }
+        assert transform.query(friend__age__gte=30) == {"friend.age": {"$gte": 30}}
+        assert transform.query(name__exists=True) == {"name": {"$exists": True}}
 
     def test_transform_update(self):
         class LisDoc(Document):
@@ -54,17 +48,17 @@ class Doc(Document):
             ("push", "$push"),
         ):
             update = transform.update(DicDoc, **{"%s__dictField__test" % k: doc})
-            self.assertIsInstance(update[v]["dictField.test"], dict)
+            assert isinstance(update[v]["dictField.test"], dict)
 
         # Update special cases
         update = transform.update(DicDoc, unset__dictField__test=doc)
-        self.assertEqual(update["$unset"]["dictField.test"], 1)
+        assert update["$unset"]["dictField.test"] == 1
 
         update = transform.update(DicDoc, pull__dictField__test=doc)
-        self.assertIsInstance(update["$pull"]["dictField"]["test"], dict)
+        assert isinstance(update["$pull"]["dictField"]["test"], dict)
 
         update = transform.update(LisDoc, pull__foo__in=["a"])
-        self.assertEqual(update, {"$pull": {"foo": {"$in": ["a"]}}})
+        assert update == {"$pull": {"foo": {"$in": ["a"]}}}
 
     def test_transform_update_push(self):
         """Ensure the differences in behvaior between 'push' and 'push_all'"""
@@ -73,10 +67,10 @@ class BlogPost(Document):
             tags = ListField(StringField())
 
         update = transform.update(BlogPost, push__tags=["mongo", "db"])
-        self.assertEqual(update, {"$push": {"tags": ["mongo", "db"]}})
+        assert update == {"$push": {"tags": ["mongo", "db"]}}
 
         update = transform.update(BlogPost, push_all__tags=["mongo", "db"])
-        self.assertEqual(update, {"$push": {"tags": {"$each": ["mongo", "db"]}}})
+        assert update == {"$push": {"tags": {"$each": ["mongo", "db"]}}}
 
     def test_transform_update_no_operator_default_to_set(self):
         """Ensure the differences in behvaior between 'push' and 'push_all'"""
@@ -85,7 +79,7 @@ class BlogPost(Document):
             tags = ListField(StringField())
 
         update = transform.update(BlogPost, tags=["mongo", "db"])
-        self.assertEqual(update, {"$set": {"tags": ["mongo", "db"]}})
+        assert update == {"$set": {"tags": ["mongo", "db"]}}
 
     def test_query_field_name(self):
         """Ensure that the correct field name is used when querying.
@@ -106,18 +100,18 @@ class BlogPost(Document):
         post = BlogPost(**data)
         post.save()
 
-        self.assertIn("postTitle", BlogPost.objects(title=data["title"])._query)
-        self.assertFalse("title" in BlogPost.objects(title=data["title"])._query)
-        self.assertEqual(BlogPost.objects(title=data["title"]).count(), 1)
+        assert "postTitle" in BlogPost.objects(title=data["title"])._query
+        assert not ("title" in BlogPost.objects(title=data["title"])._query)
+        assert BlogPost.objects(title=data["title"]).count() == 1
 
-        self.assertIn("_id", BlogPost.objects(pk=post.id)._query)
-        self.assertEqual(BlogPost.objects(pk=post.id).count(), 1)
+        assert "_id" in BlogPost.objects(pk=post.id)._query
+        assert BlogPost.objects(pk=post.id).count() == 1
 
-        self.assertIn(
-            "postComments.commentContent",
-            BlogPost.objects(comments__content="test")._query,
+        assert (
+            "postComments.commentContent"
+            in BlogPost.objects(comments__content="test")._query
         )
-        self.assertEqual(BlogPost.objects(comments__content="test").count(), 1)
+        assert BlogPost.objects(comments__content="test").count() == 1
 
         BlogPost.drop_collection()
 
@@ -135,9 +129,9 @@ class BlogPost(Document):
         post = BlogPost(**data)
         post.save()
 
-        self.assertIn("_id", BlogPost.objects(pk=data["title"])._query)
-        self.assertIn("_id", BlogPost.objects(title=data["title"])._query)
-        self.assertEqual(BlogPost.objects(pk=data["title"]).count(), 1)
+        assert "_id" in BlogPost.objects(pk=data["title"])._query
+        assert "_id" in BlogPost.objects(title=data["title"])._query
+        assert BlogPost.objects(pk=data["title"]).count() == 1
 
         BlogPost.drop_collection()
 
@@ -163,7 +157,7 @@ class B(Document):
         q2 = B.objects.filter(a__in=[a1, a2])
         q2 = q2.filter(a=a1)._query
 
-        self.assertEqual(q1, q2)
+        assert q1 == q2
 
     def test_raw_query_and_Q_objects(self):
         """
@@ -179,11 +173,11 @@ class Foo(Document):
             meta = {"allow_inheritance": False}
 
         query = Foo.objects(__raw__={"$nor": [{"name": "bar"}]})._query
-        self.assertEqual(query, {"$nor": [{"name": "bar"}]})
+        assert query == {"$nor": [{"name": "bar"}]}
 
         q1 = {"$or": [{"a": 1}, {"b": 1}]}
         query = Foo.objects(Q(__raw__=q1) & Q(c=1))._query
-        self.assertEqual(query, {"$or": [{"a": 1}, {"b": 1}], "c": 1})
+        assert query == {"$or": [{"a": 1}, {"b": 1}], "c": 1}
 
     def test_raw_and_merging(self):
         class Doc(Document):
@@ -200,51 +194,39 @@ class Doc(Document):
             }
         )._query
 
-        self.assertEqual(
-            raw_query,
-            {
-                "deleted": False,
-                "scraped": "yes",
-                "$nor": [
-                    {"views.extracted": "no"},
-                    {"attachments.views.extracted": "no"},
-                ],
-            },
-        )
+        assert raw_query == {
+            "deleted": False,
+            "scraped": "yes",
+            "$nor": [{"views.extracted": "no"}, {"attachments.views.extracted": "no"}],
+        }
 
     def test_geojson_PointField(self):
         class Location(Document):
             loc = PointField()
 
         update = transform.update(Location, set__loc=[1, 2])
-        self.assertEqual(
-            update, {"$set": {"loc": {"type": "Point", "coordinates": [1, 2]}}}
-        )
+        assert update == {"$set": {"loc": {"type": "Point", "coordinates": [1, 2]}}}
 
         update = transform.update(
             Location, set__loc={"type": "Point", "coordinates": [1, 2]}
         )
-        self.assertEqual(
-            update, {"$set": {"loc": {"type": "Point", "coordinates": [1, 2]}}}
-        )
+        assert update == {"$set": {"loc": {"type": "Point", "coordinates": [1, 2]}}}
 
     def test_geojson_LineStringField(self):
         class Location(Document):
             line = LineStringField()
 
         update = transform.update(Location, set__line=[[1, 2], [2, 2]])
-        self.assertEqual(
-            update,
-            {"$set": {"line": {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}},
-        )
+        assert update == {
+            "$set": {"line": {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}
+        }
 
         update = transform.update(
             Location, set__line={"type": "LineString", "coordinates": [[1, 2], [2, 2]]}
         )
-        self.assertEqual(
-            update,
-            {"$set": {"line": {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}},
-        )
+        assert update == {
+            "$set": {"line": {"type": "LineString", "coordinates": [[1, 2], [2, 2]]}}
+        }
 
     def test_geojson_PolygonField(self):
         class Location(Document):
@@ -253,17 +235,14 @@ class Location(Document):
         update = transform.update(
             Location, set__poly=[[[40, 5], [40, 6], [41, 6], [40, 5]]]
         )
-        self.assertEqual(
-            update,
-            {
-                "$set": {
-                    "poly": {
-                        "type": "Polygon",
-                        "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]],
-                    }
+        assert update == {
+            "$set": {
+                "poly": {
+                    "type": "Polygon",
+                    "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]],
                 }
-            },
-        )
+            }
+        }
 
         update = transform.update(
             Location,
@@ -272,17 +251,14 @@ class Location(Document):
                 "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]],
             },
         )
-        self.assertEqual(
-            update,
-            {
-                "$set": {
-                    "poly": {
-                        "type": "Polygon",
-                        "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]],
-                    }
+        assert update == {
+            "$set": {
+                "poly": {
+                    "type": "Polygon",
+                    "coordinates": [[[40, 5], [40, 6], [41, 6], [40, 5]]],
                 }
-            },
-        )
+            }
+        }
 
     def test_type(self):
         class Doc(Document):
@@ -291,10 +267,10 @@ class Doc(Document):
         Doc(df=True).save()
         Doc(df=7).save()
         Doc(df="df").save()
-        self.assertEqual(Doc.objects(df__type=1).count(), 0)  # double
-        self.assertEqual(Doc.objects(df__type=8).count(), 1)  # bool
-        self.assertEqual(Doc.objects(df__type=2).count(), 1)  # str
-        self.assertEqual(Doc.objects(df__type=16).count(), 1)  # int
+        assert Doc.objects(df__type=1).count() == 0  # double
+        assert Doc.objects(df__type=8).count() == 1  # bool
+        assert Doc.objects(df__type=2).count() == 1  # str
+        assert Doc.objects(df__type=16).count() == 1  # int
 
     def test_last_field_name_like_operator(self):
         class EmbeddedItem(EmbeddedDocument):
@@ -309,12 +285,12 @@ class Doc(Document):
         doc = Doc(item=EmbeddedItem(type="axe", name="Heroic axe"))
         doc.save()
 
-        self.assertEqual(1, Doc.objects(item__type__="axe").count())
-        self.assertEqual(1, Doc.objects(item__name__="Heroic axe").count())
+        assert 1 == Doc.objects(item__type__="axe").count()
+        assert 1 == Doc.objects(item__name__="Heroic axe").count()
 
         Doc.objects(id=doc.id).update(set__item__type__="sword")
-        self.assertEqual(1, Doc.objects(item__type__="sword").count())
-        self.assertEqual(0, Doc.objects(item__type__="axe").count())
+        assert 1 == Doc.objects(item__type__="sword").count()
+        assert 0 == Doc.objects(item__type__="axe").count()
 
     def test_understandable_error_raised(self):
         class Event(Document):
@@ -324,7 +300,7 @@ class Event(Document):
         box = [(35.0, -125.0), (40.0, -100.0)]
         # I *meant* to execute location__within_box=box
         events = Event.objects(location__within=box)
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             events.count()
 
     def test_update_pull_for_list_fields(self):
@@ -347,24 +323,20 @@ class MainDoc(Document):
 
         word = Word(word="abc", index=1)
         update = transform.update(MainDoc, pull__content__text=word)
-        self.assertEqual(
-            update, {"$pull": {"content.text": SON([("word", u"abc"), ("index", 1)])}}
-        )
+        assert update == {
+            "$pull": {"content.text": SON([("word", u"abc"), ("index", 1)])}
+        }
 
         update = transform.update(MainDoc, pull__content__heading="xyz")
-        self.assertEqual(update, {"$pull": {"content.heading": "xyz"}})
+        assert update == {"$pull": {"content.heading": "xyz"}}
 
         update = transform.update(MainDoc, pull__content__text__word__in=["foo", "bar"])
-        self.assertEqual(
-            update, {"$pull": {"content.text": {"word": {"$in": ["foo", "bar"]}}}}
-        )
+        assert update == {"$pull": {"content.text": {"word": {"$in": ["foo", "bar"]}}}}
 
         update = transform.update(
             MainDoc, pull__content__text__word__nin=["foo", "bar"]
         )
-        self.assertEqual(
-            update, {"$pull": {"content.text": {"word": {"$nin": ["foo", "bar"]}}}}
-        )
+        assert update == {"$pull": {"content.text": {"word": {"$nin": ["foo", "bar"]}}}}
 
 
 if __name__ == "__main__":
diff --git a/tests/queryset/test_visitor.py b/tests/queryset/test_visitor.py
index acadabd4b..a41f9278b 100644
--- a/tests/queryset/test_visitor.py
+++ b/tests/queryset/test_visitor.py
@@ -7,6 +7,7 @@
 from mongoengine import *
 from mongoengine.errors import InvalidQueryError
 from mongoengine.queryset import Q
+import pytest
 
 
 class TestQ(unittest.TestCase):
@@ -35,10 +36,10 @@ class Person(Document):
             age = IntField()
 
         query = {"$or": [{"age": {"$gte": 18}}, {"name": "test"}]}
-        self.assertEqual((q1 | q2 | q3 | q4 | q5).to_query(Person), query)
+        assert (q1 | q2 | q3 | q4 | q5).to_query(Person) == query
 
         query = {"age": {"$gte": 18}, "name": "test"}
-        self.assertEqual((q1 & q2 & q3 & q4 & q5).to_query(Person), query)
+        assert (q1 & q2 & q3 & q4 & q5).to_query(Person) == query
 
     def test_q_with_dbref(self):
         """Ensure Q objects handle DBRefs correctly"""
@@ -53,8 +54,8 @@ class Post(Document):
         user = User.objects.create()
         Post.objects.create(created_user=user)
 
-        self.assertEqual(Post.objects.filter(created_user=user).count(), 1)
-        self.assertEqual(Post.objects.filter(Q(created_user=user)).count(), 1)
+        assert Post.objects.filter(created_user=user).count() == 1
+        assert Post.objects.filter(Q(created_user=user)).count() == 1
 
     def test_and_combination(self):
         """Ensure that Q-objects correctly AND together.
@@ -65,12 +66,10 @@ class TestDoc(Document):
             y = StringField()
 
         query = (Q(x__lt=7) & Q(x__lt=3)).to_query(TestDoc)
-        self.assertEqual(query, {"$and": [{"x": {"$lt": 7}}, {"x": {"$lt": 3}}]})
+        assert query == {"$and": [{"x": {"$lt": 7}}, {"x": {"$lt": 3}}]}
 
         query = (Q(y="a") & Q(x__lt=7) & Q(x__lt=3)).to_query(TestDoc)
-        self.assertEqual(
-            query, {"$and": [{"y": "a"}, {"x": {"$lt": 7}}, {"x": {"$lt": 3}}]}
-        )
+        assert query == {"$and": [{"y": "a"}, {"x": {"$lt": 7}}, {"x": {"$lt": 3}}]}
 
         # Check normal cases work without an error
         query = Q(x__lt=7) & Q(x__gt=3)
@@ -78,7 +77,7 @@ class TestDoc(Document):
         q1 = Q(x__lt=7)
         q2 = Q(x__gt=3)
         query = (q1 & q2).to_query(TestDoc)
-        self.assertEqual(query, {"x": {"$lt": 7, "$gt": 3}})
+        assert query == {"x": {"$lt": 7, "$gt": 3}}
 
         # More complex nested example
         query = Q(x__lt=100) & Q(y__ne="NotMyString")
@@ -87,7 +86,7 @@ class TestDoc(Document):
             "x": {"$lt": 100, "$gt": -100},
             "y": {"$ne": "NotMyString", "$in": ["a", "b", "c"]},
         }
-        self.assertEqual(query.to_query(TestDoc), mongo_query)
+        assert query.to_query(TestDoc) == mongo_query
 
     def test_or_combination(self):
         """Ensure that Q-objects correctly OR together.
@@ -99,7 +98,7 @@ class TestDoc(Document):
         q1 = Q(x__lt=3)
         q2 = Q(x__gt=7)
         query = (q1 | q2).to_query(TestDoc)
-        self.assertEqual(query, {"$or": [{"x": {"$lt": 3}}, {"x": {"$gt": 7}}]})
+        assert query == {"$or": [{"x": {"$lt": 3}}, {"x": {"$gt": 7}}]}
 
     def test_and_or_combination(self):
         """Ensure that Q-objects handle ANDing ORed components.
@@ -113,15 +112,12 @@ class TestDoc(Document):
 
         query = Q(x__gt=0) | Q(x__exists=False)
         query &= Q(x__lt=100)
-        self.assertEqual(
-            query.to_query(TestDoc),
-            {
-                "$and": [
-                    {"$or": [{"x": {"$gt": 0}}, {"x": {"$exists": False}}]},
-                    {"x": {"$lt": 100}},
-                ]
-            },
-        )
+        assert query.to_query(TestDoc) == {
+            "$and": [
+                {"$or": [{"x": {"$gt": 0}}, {"x": {"$exists": False}}]},
+                {"x": {"$lt": 100}},
+            ]
+        }
 
         q1 = Q(x__gt=0) | Q(x__exists=False)
         q2 = Q(x__lt=100) | Q(y=True)
@@ -131,16 +127,13 @@ class TestDoc(Document):
         TestDoc(x=10).save()
         TestDoc(y=True).save()
 
-        self.assertEqual(
-            query,
-            {
-                "$and": [
-                    {"$or": [{"x": {"$gt": 0}}, {"x": {"$exists": False}}]},
-                    {"$or": [{"x": {"$lt": 100}}, {"y": True}]},
-                ]
-            },
-        )
-        self.assertEqual(2, TestDoc.objects(q1 & q2).count())
+        assert query == {
+            "$and": [
+                {"$or": [{"x": {"$gt": 0}}, {"x": {"$exists": False}}]},
+                {"$or": [{"x": {"$lt": 100}}, {"y": True}]},
+            ]
+        }
+        assert 2 == TestDoc.objects(q1 & q2).count()
 
     def test_or_and_or_combination(self):
         """Ensure that Q-objects handle ORing ANDed ORed components. :)
@@ -160,26 +153,23 @@ class TestDoc(Document):
         q2 = Q(x__lt=100) & (Q(y=False) | Q(y__exists=False))
         query = (q1 | q2).to_query(TestDoc)
 
-        self.assertEqual(
-            query,
-            {
-                "$or": [
-                    {
-                        "$and": [
-                            {"x": {"$gt": 0}},
-                            {"$or": [{"y": True}, {"y": {"$exists": False}}]},
-                        ]
-                    },
-                    {
-                        "$and": [
-                            {"x": {"$lt": 100}},
-                            {"$or": [{"y": False}, {"y": {"$exists": False}}]},
-                        ]
-                    },
-                ]
-            },
-        )
-        self.assertEqual(2, TestDoc.objects(q1 | q2).count())
+        assert query == {
+            "$or": [
+                {
+                    "$and": [
+                        {"x": {"$gt": 0}},
+                        {"$or": [{"y": True}, {"y": {"$exists": False}}]},
+                    ]
+                },
+                {
+                    "$and": [
+                        {"x": {"$lt": 100}},
+                        {"$or": [{"y": False}, {"y": {"$exists": False}}]},
+                    ]
+                },
+            ]
+        }
+        assert 2 == TestDoc.objects(q1 | q2).count()
 
     def test_multiple_occurence_in_field(self):
         class Test(Document):
@@ -192,8 +182,8 @@ class Test(Document):
         q3 = q1 & q2
 
         query = q3.to_query(Test)
-        self.assertEqual(query["$and"][0], q1.to_query(Test))
-        self.assertEqual(query["$and"][1], q2.to_query(Test))
+        assert query["$and"][0] == q1.to_query(Test)
+        assert query["$and"][1] == q2.to_query(Test)
 
     def test_q_clone(self):
         class TestDoc(Document):
@@ -207,15 +197,15 @@ class TestDoc(Document):
         # Check normal cases work without an error
         test = TestDoc.objects(Q(x__lt=7) & Q(x__gt=3))
 
-        self.assertEqual(test.count(), 3)
+        assert test.count() == 3
 
         test2 = test.clone()
-        self.assertEqual(test2.count(), 3)
-        self.assertNotEqual(test2, test)
+        assert test2.count() == 3
+        assert test2 != test
 
         test3 = test2.filter(x=6)
-        self.assertEqual(test3.count(), 1)
-        self.assertEqual(test.count(), 3)
+        assert test3.count() == 1
+        assert test.count() == 3
 
     def test_q(self):
         """Ensure that Q objects may be used to query for documents.
@@ -252,19 +242,19 @@ class BlogPost(Document):
 
         # Check ObjectId lookup works
         obj = BlogPost.objects(id=post1.id).first()
-        self.assertEqual(obj, post1)
+        assert obj == post1
 
         # Check Q object combination with one does not exist
         q = BlogPost.objects(Q(title="Test 5") | Q(published=True))
         posts = [post.id for post in q]
 
         published_posts = (post2, post3)
-        self.assertTrue(all(obj.id in posts for obj in published_posts))
+        assert all(obj.id in posts for obj in published_posts)
 
         q = BlogPost.objects(Q(title="Test 1") | Q(published=True))
         posts = [post.id for post in q]
         published_posts = (post1, post2, post3, post5, post6)
-        self.assertTrue(all(obj.id in posts for obj in published_posts))
+        assert all(obj.id in posts for obj in published_posts)
 
         # Check Q object combination
         date = datetime.datetime(2010, 1, 10)
@@ -272,9 +262,9 @@ class BlogPost(Document):
         posts = [post.id for post in q]
 
         published_posts = (post1, post2, post3, post4)
-        self.assertTrue(all(obj.id in posts for obj in published_posts))
+        assert all(obj.id in posts for obj in published_posts)
 
-        self.assertFalse(any(obj.id in posts for obj in [post5, post6]))
+        assert not any(obj.id in posts for obj in [post5, post6])
 
         BlogPost.drop_collection()
 
@@ -284,15 +274,15 @@ class BlogPost(Document):
         self.Person(name="user3", age=30).save()
         self.Person(name="user4", age=40).save()
 
-        self.assertEqual(self.Person.objects(Q(age__in=[20])).count(), 2)
-        self.assertEqual(self.Person.objects(Q(age__in=[20, 30])).count(), 3)
+        assert self.Person.objects(Q(age__in=[20])).count() == 2
+        assert self.Person.objects(Q(age__in=[20, 30])).count() == 3
 
         # Test invalid query objs
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             self.Person.objects("user1")
 
         # filter should fail, too
-        with self.assertRaises(InvalidQueryError):
+        with pytest.raises(InvalidQueryError):
             self.Person.objects.filter("user1")
 
     def test_q_regex(self):
@@ -302,31 +292,31 @@ def test_q_regex(self):
         person.save()
 
         obj = self.Person.objects(Q(name=re.compile("^Gui"))).first()
-        self.assertEqual(obj, person)
+        assert obj == person
         obj = self.Person.objects(Q(name=re.compile("^gui"))).first()
-        self.assertEqual(obj, None)
+        assert obj == None
 
         obj = self.Person.objects(Q(name=re.compile("^gui", re.I))).first()
-        self.assertEqual(obj, person)
+        assert obj == person
 
         obj = self.Person.objects(Q(name__not=re.compile("^bob"))).first()
-        self.assertEqual(obj, person)
+        assert obj == person
 
         obj = self.Person.objects(Q(name__not=re.compile("^Gui"))).first()
-        self.assertEqual(obj, None)
+        assert obj == None
 
     def test_q_repr(self):
-        self.assertEqual(repr(Q()), "Q(**{})")
-        self.assertEqual(repr(Q(name="test")), "Q(**{'name': 'test'})")
+        assert repr(Q()) == "Q(**{})"
+        assert repr(Q(name="test")) == "Q(**{'name': 'test'})"
 
-        self.assertEqual(
-            repr(Q(name="test") & Q(age__gte=18)),
-            "(Q(**{'name': 'test'}) & Q(**{'age__gte': 18}))",
+        assert (
+            repr(Q(name="test") & Q(age__gte=18))
+            == "(Q(**{'name': 'test'}) & Q(**{'age__gte': 18}))"
         )
 
-        self.assertEqual(
-            repr(Q(name="test") | Q(age__gte=18)),
-            "(Q(**{'name': 'test'}) | Q(**{'age__gte': 18}))",
+        assert (
+            repr(Q(name="test") | Q(age__gte=18))
+            == "(Q(**{'name': 'test'}) | Q(**{'age__gte': 18}))"
         )
 
     def test_q_lists(self):
@@ -341,8 +331,8 @@ class BlogPost(Document):
         BlogPost(tags=["python", "mongo"]).save()
         BlogPost(tags=["python"]).save()
 
-        self.assertEqual(BlogPost.objects(Q(tags="mongo")).count(), 1)
-        self.assertEqual(BlogPost.objects(Q(tags="python")).count(), 2)
+        assert BlogPost.objects(Q(tags="mongo")).count() == 1
+        assert BlogPost.objects(Q(tags="python")).count() == 2
 
         BlogPost.drop_collection()
 
@@ -355,12 +345,12 @@ class User(Document):
         pk = ObjectId()
         User(email="example@example.com", pk=pk).save()
 
-        self.assertEqual(
-            1,
-            User.objects.filter(Q(email="example@example.com") | Q(name="John Doe"))
+        assert (
+            1
+            == User.objects.filter(Q(email="example@example.com") | Q(name="John Doe"))
             .limit(2)
             .filter(pk=pk)
-            .count(),
+            .count()
         )
 
     def test_chained_q_or_filtering(self):
@@ -376,14 +366,12 @@ class Item(Document):
         Item(postables=[Post(name="a"), Post(name="c")]).save()
         Item(postables=[Post(name="a"), Post(name="b"), Post(name="c")]).save()
 
-        self.assertEqual(
-            Item.objects(Q(postables__name="a") & Q(postables__name="b")).count(), 2
+        assert (
+            Item.objects(Q(postables__name="a") & Q(postables__name="b")).count() == 2
         )
-        self.assertEqual(
-            Item.objects.filter(postables__name="a")
-            .filter(postables__name="b")
-            .count(),
-            2,
+        assert (
+            Item.objects.filter(postables__name="a").filter(postables__name="b").count()
+            == 2
         )
 
 
diff --git a/tests/test_common.py b/tests/test_common.py
index 28f0b992a..6b6f18dec 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1,5 +1,7 @@
 import unittest
 
+import pytest
+
 from mongoengine import Document
 from mongoengine.common import _import_class
 
@@ -7,8 +9,8 @@
 class TestCommon(unittest.TestCase):
     def test__import_class(self):
         doc_cls = _import_class("Document")
-        self.assertIs(doc_cls, Document)
+        assert doc_cls is Document
 
     def test__import_class_raise_if_not_known(self):
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             _import_class("UnknownClass")
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 1519a8350..c73b67d19 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -29,6 +29,7 @@
     get_connection,
     get_db,
 )
+import pytest
 
 
 def get_tz_awareness(connection):
@@ -54,15 +55,15 @@ def test_connect(self):
         connect("mongoenginetest")
 
         conn = get_connection()
-        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
-        self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, "mongoenginetest")
+        assert isinstance(db, pymongo.database.Database)
+        assert db.name == "mongoenginetest"
 
         connect("mongoenginetest2", alias="testdb")
         conn = get_connection("testdb")
-        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
     def test_connect_disconnect_works_properly(self):
         class History1(Document):
@@ -82,31 +83,27 @@ class History2(Document):
         h = History1(name="default").save()
         h1 = History2(name="db1").save()
 
-        self.assertEqual(
-            list(History1.objects().as_pymongo()), [{"_id": h.id, "name": "default"}]
-        )
-        self.assertEqual(
-            list(History2.objects().as_pymongo()), [{"_id": h1.id, "name": "db1"}]
-        )
+        assert list(History1.objects().as_pymongo()) == [
+            {"_id": h.id, "name": "default"}
+        ]
+        assert list(History2.objects().as_pymongo()) == [{"_id": h1.id, "name": "db1"}]
 
         disconnect("db1")
         disconnect("db2")
 
-        with self.assertRaises(ConnectionFailure):
+        with pytest.raises(ConnectionFailure):
             list(History1.objects().as_pymongo())
 
-        with self.assertRaises(ConnectionFailure):
+        with pytest.raises(ConnectionFailure):
             list(History2.objects().as_pymongo())
 
         connect("db1", alias="db1")
         connect("db2", alias="db2")
 
-        self.assertEqual(
-            list(History1.objects().as_pymongo()), [{"_id": h.id, "name": "default"}]
-        )
-        self.assertEqual(
-            list(History2.objects().as_pymongo()), [{"_id": h1.id, "name": "db1"}]
-        )
+        assert list(History1.objects().as_pymongo()) == [
+            {"_id": h.id, "name": "default"}
+        ]
+        assert list(History2.objects().as_pymongo()) == [{"_id": h1.id, "name": "db1"}]
 
     def test_connect_different_documents_to_different_database(self):
         class History(Document):
@@ -132,39 +129,35 @@ class History2(Document):
         h1 = History1(name="db1").save()
         h2 = History2(name="db2").save()
 
-        self.assertEqual(History._collection.database.name, DEFAULT_DATABASE_NAME)
-        self.assertEqual(History1._collection.database.name, "db1")
-        self.assertEqual(History2._collection.database.name, "db2")
+        assert History._collection.database.name == DEFAULT_DATABASE_NAME
+        assert History1._collection.database.name == "db1"
+        assert History2._collection.database.name == "db2"
 
-        self.assertEqual(
-            list(History.objects().as_pymongo()), [{"_id": h.id, "name": "default"}]
-        )
-        self.assertEqual(
-            list(History1.objects().as_pymongo()), [{"_id": h1.id, "name": "db1"}]
-        )
-        self.assertEqual(
-            list(History2.objects().as_pymongo()), [{"_id": h2.id, "name": "db2"}]
-        )
+        assert list(History.objects().as_pymongo()) == [
+            {"_id": h.id, "name": "default"}
+        ]
+        assert list(History1.objects().as_pymongo()) == [{"_id": h1.id, "name": "db1"}]
+        assert list(History2.objects().as_pymongo()) == [{"_id": h2.id, "name": "db2"}]
 
     def test_connect_fails_if_connect_2_times_with_default_alias(self):
         connect("mongoenginetest")
 
-        with self.assertRaises(ConnectionFailure) as ctx_err:
+        with pytest.raises(ConnectionFailure) as ctx_err:
             connect("mongoenginetest2")
-        self.assertEqual(
-            "A different connection with alias `default` was already registered. Use disconnect() first",
-            str(ctx_err.exception),
+        assert (
+            "A different connection with alias `default` was already registered. Use disconnect() first"
+            == str(ctx_err.exception)
         )
 
     def test_connect_fails_if_connect_2_times_with_custom_alias(self):
         connect("mongoenginetest", alias="alias1")
 
-        with self.assertRaises(ConnectionFailure) as ctx_err:
+        with pytest.raises(ConnectionFailure) as ctx_err:
             connect("mongoenginetest2", alias="alias1")
 
-        self.assertEqual(
-            "A different connection with alias `alias1` was already registered. Use disconnect() first",
-            str(ctx_err.exception),
+        assert (
+            "A different connection with alias `alias1` was already registered. Use disconnect() first"
+            == str(ctx_err.exception)
         )
 
     def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way(
@@ -175,25 +168,25 @@ def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way
         db_alias = "alias1"
         connect(db=db_name, alias=db_alias, host="localhost", port=27017)
 
-        with self.assertRaises(ConnectionFailure):
+        with pytest.raises(ConnectionFailure):
             connect(host="mongodb://localhost:27017/%s" % db_name, alias=db_alias)
 
     def test_connect_passes_silently_connect_multiple_times_with_same_config(self):
         # test default connection to `test`
         connect()
         connect()
-        self.assertEqual(len(mongoengine.connection._connections), 1)
+        assert len(mongoengine.connection._connections) == 1
         connect("test01", alias="test01")
         connect("test01", alias="test01")
-        self.assertEqual(len(mongoengine.connection._connections), 2)
+        assert len(mongoengine.connection._connections) == 2
         connect(host="mongodb://localhost:27017/mongoenginetest02", alias="test02")
         connect(host="mongodb://localhost:27017/mongoenginetest02", alias="test02")
-        self.assertEqual(len(mongoengine.connection._connections), 3)
+        assert len(mongoengine.connection._connections) == 3
 
     def test_connect_with_invalid_db_name(self):
         """Ensure that connect() method fails fast if db name is invalid
         """
-        with self.assertRaises(InvalidName):
+        with pytest.raises(InvalidName):
             connect("mongomock://localhost")
 
     def test_connect_with_db_name_external(self):
@@ -203,20 +196,20 @@ def test_connect_with_db_name_external(self):
         connect("$external")
 
         conn = get_connection()
-        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
-        self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, "$external")
+        assert isinstance(db, pymongo.database.Database)
+        assert db.name == "$external"
 
         connect("$external", alias="testdb")
         conn = get_connection("testdb")
-        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
     def test_connect_with_invalid_db_name_type(self):
         """Ensure that connect() method fails fast if db name has invalid type
         """
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             non_string_db_name = ["e. g. list instead of a string"]
             connect(non_string_db_name)
 
@@ -230,11 +223,11 @@ def test_connect_in_mocking(self):
 
         connect("mongoenginetest", host="mongomock://localhost")
         conn = get_connection()
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect("mongoenginetest2", host="mongomock://localhost", alias="testdb2")
         conn = get_connection("testdb2")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect(
             "mongoenginetest3",
@@ -243,11 +236,11 @@ def test_connect_in_mocking(self):
             alias="testdb3",
         )
         conn = get_connection("testdb3")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect("mongoenginetest4", is_mock=True, alias="testdb4")
         conn = get_connection("testdb4")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect(
             host="mongodb://localhost:27017/mongoenginetest5",
@@ -255,11 +248,11 @@ def test_connect_in_mocking(self):
             alias="testdb5",
         )
         conn = get_connection("testdb5")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect(host="mongomock://localhost:27017/mongoenginetest6", alias="testdb6")
         conn = get_connection("testdb6")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect(
             host="mongomock://localhost:27017/mongoenginetest7",
@@ -267,7 +260,7 @@ def test_connect_in_mocking(self):
             alias="testdb7",
         )
         conn = get_connection("testdb7")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
     def test_default_database_with_mocking(self):
         """Ensure that the default database is correctly set when using mongomock.
@@ -286,8 +279,8 @@ class SomeDocument(Document):
         some_document = SomeDocument()
         # database won't exist until we save a document
         some_document.save()
-        self.assertEqual(conn.get_default_database().name, "mongoenginetest")
-        self.assertEqual(conn.list_database_names()[0], "mongoenginetest")
+        assert conn.get_default_database().name == "mongoenginetest"
+        assert conn.database_names()[0] == "mongoenginetest"
 
     def test_connect_with_host_list(self):
         """Ensure that the connect() method works when host is a list
@@ -301,22 +294,22 @@ def test_connect_with_host_list(self):
 
         connect(host=["mongomock://localhost"])
         conn = get_connection()
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect(host=["mongodb://localhost"], is_mock=True, alias="testdb2")
         conn = get_connection("testdb2")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect(host=["localhost"], is_mock=True, alias="testdb3")
         conn = get_connection("testdb3")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect(
             host=["mongomock://localhost:27017", "mongomock://localhost:27018"],
             alias="testdb4",
         )
         conn = get_connection("testdb4")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect(
             host=["mongodb://localhost:27017", "mongodb://localhost:27018"],
@@ -324,13 +317,13 @@ def test_connect_with_host_list(self):
             alias="testdb5",
         )
         conn = get_connection("testdb5")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
         connect(
             host=["localhost:27017", "localhost:27018"], is_mock=True, alias="testdb6"
         )
         conn = get_connection("testdb6")
-        self.assertIsInstance(conn, mongomock.MongoClient)
+        assert isinstance(conn, mongomock.MongoClient)
 
     def test_disconnect_cleans_globals(self):
         """Ensure that the disconnect() method cleans the globals objects"""
@@ -340,20 +333,20 @@ def test_disconnect_cleans_globals(self):
 
         connect("mongoenginetest")
 
-        self.assertEqual(len(connections), 1)
-        self.assertEqual(len(dbs), 0)
-        self.assertEqual(len(connection_settings), 1)
+        assert len(connections) == 1
+        assert len(dbs) == 0
+        assert len(connection_settings) == 1
 
         class TestDoc(Document):
             pass
 
         TestDoc.drop_collection()  # triggers the db
-        self.assertEqual(len(dbs), 1)
+        assert len(dbs) == 1
 
         disconnect()
-        self.assertEqual(len(connections), 0)
-        self.assertEqual(len(dbs), 0)
-        self.assertEqual(len(connection_settings), 0)
+        assert len(connections) == 0
+        assert len(dbs) == 0
+        assert len(connection_settings) == 0
 
     def test_disconnect_cleans_cached_collection_attribute_in_document(self):
         """Ensure that the disconnect() method works properly"""
@@ -362,22 +355,20 @@ def test_disconnect_cleans_cached_collection_attribute_in_document(self):
         class History(Document):
             pass
 
-        self.assertIsNone(History._collection)
+        assert History._collection is None
 
         History.drop_collection()
 
         History.objects.first()  # will trigger the caching of _collection attribute
-        self.assertIsNotNone(History._collection)
+        assert History._collection is not None
 
         disconnect()
 
-        self.assertIsNone(History._collection)
+        assert History._collection is None
 
-        with self.assertRaises(ConnectionFailure) as ctx_err:
+        with pytest.raises(ConnectionFailure) as ctx_err:
             History.objects.first()
-        self.assertEqual(
-            "You have not defined a default connection", str(ctx_err.exception)
-        )
+        assert "You have not defined a default connection" == str(ctx_err.exception)
 
     def test_connect_disconnect_works_on_same_document(self):
         """Ensure that the connect/disconnect works properly with a single Document"""
@@ -399,7 +390,7 @@ class User(Document):
         disconnect()
 
         # Make sure save doesnt work at this stage
-        with self.assertRaises(ConnectionFailure):
+        with pytest.raises(ConnectionFailure):
             User(name="Wont work").save()
 
         # Save in db2
@@ -408,13 +399,13 @@ class User(Document):
         disconnect()
 
         db1_users = list(client[db1].user.find())
-        self.assertEqual(db1_users, [{"_id": user1.id, "name": "John is in db1"}])
+        assert db1_users == [{"_id": user1.id, "name": "John is in db1"}]
         db2_users = list(client[db2].user.find())
-        self.assertEqual(db2_users, [{"_id": user2.id, "name": "Bob is in db2"}])
+        assert db2_users == [{"_id": user2.id, "name": "Bob is in db2"}]
 
     def test_disconnect_silently_pass_if_alias_does_not_exist(self):
         connections = mongoengine.connection._connections
-        self.assertEqual(len(connections), 0)
+        assert len(connections) == 0
         disconnect(alias="not_exist")
 
     def test_disconnect_all(self):
@@ -437,26 +428,26 @@ class History1(Document):
         History1.drop_collection()
         History1.objects.first()
 
-        self.assertIsNotNone(History._collection)
-        self.assertIsNotNone(History1._collection)
+        assert History._collection is not None
+        assert History1._collection is not None
 
-        self.assertEqual(len(connections), 2)
-        self.assertEqual(len(dbs), 2)
-        self.assertEqual(len(connection_settings), 2)
+        assert len(connections) == 2
+        assert len(dbs) == 2
+        assert len(connection_settings) == 2
 
         disconnect_all()
 
-        self.assertIsNone(History._collection)
-        self.assertIsNone(History1._collection)
+        assert History._collection is None
+        assert History1._collection is None
 
-        self.assertEqual(len(connections), 0)
-        self.assertEqual(len(dbs), 0)
-        self.assertEqual(len(connection_settings), 0)
+        assert len(connections) == 0
+        assert len(dbs) == 0
+        assert len(connection_settings) == 0
 
-        with self.assertRaises(ConnectionFailure):
+        with pytest.raises(ConnectionFailure):
             History.objects.first()
 
-        with self.assertRaises(ConnectionFailure):
+        with pytest.raises(ConnectionFailure):
             History1.objects.first()
 
     def test_disconnect_all_silently_pass_if_no_connection_exist(self):
@@ -473,7 +464,7 @@ def test_sharing_connections(self):
 
         expected_connection.server_info()
 
-        self.assertEqual(expected_connection, actual_connection)
+        assert expected_connection == actual_connection
 
     def test_connect_uri(self):
         """Ensure that the connect() method works properly with URIs."""
@@ -490,11 +481,11 @@ def test_connect_uri(self):
         )
 
         conn = get_connection()
-        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
-        self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, "mongoenginetest")
+        assert isinstance(db, pymongo.database.Database)
+        assert db.name == "mongoenginetest"
 
         c.admin.system.users.delete_many({})
         c.mongoenginetest.system.users.delete_many({})
@@ -506,11 +497,11 @@ def test_connect_uri_without_db(self):
         connect("mongoenginetest", host="mongodb://localhost/")
 
         conn = get_connection()
-        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
-        self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, "mongoenginetest")
+        assert isinstance(db, pymongo.database.Database)
+        assert db.name == "mongoenginetest"
 
     def test_connect_uri_default_db(self):
         """Ensure connect() defaults to the right database name if
@@ -519,11 +510,11 @@ def test_connect_uri_default_db(self):
         connect(host="mongodb://localhost/")
 
         conn = get_connection()
-        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db()
-        self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, "test")
+        assert isinstance(db, pymongo.database.Database)
+        assert db.name == "test"
 
     def test_uri_without_credentials_doesnt_override_conn_settings(self):
         """Ensure connect() uses the username & password params if the URI
@@ -536,7 +527,8 @@ def test_uri_without_credentials_doesnt_override_conn_settings(self):
         # OperationFailure means that mongoengine attempted authentication
         # w/ the provided username/password and failed - that's the desired
         # behavior. If the MongoDB URI would override the credentials
-        self.assertRaises(OperationFailure, get_db)
+        with pytest.raises(OperationFailure):
+            get_db()
 
     def test_connect_uri_with_authsource(self):
         """Ensure that the connect() method works well with `authSource`
@@ -554,7 +546,8 @@ def test_connect_uri_with_authsource(self):
             alias="test1",
             host="mongodb://username2:password@localhost/mongoenginetest",
         )
-        self.assertRaises(OperationFailure, test_conn.server_info)
+        with pytest.raises(OperationFailure):
+            test_conn.server_info()
 
         # Authentication succeeds with "authSource"
         authd_conn = connect(
@@ -566,8 +559,8 @@ def test_connect_uri_with_authsource(self):
             ),
         )
         db = get_db("test2")
-        self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, "mongoenginetest")
+        assert isinstance(db, pymongo.database.Database)
+        assert db.name == "mongoenginetest"
 
         # Clear all users
         authd_conn.admin.system.users.delete_many({})
@@ -577,13 +570,14 @@ def test_register_connection(self):
         """
         register_connection("testdb", "mongoenginetest2")
 
-        self.assertRaises(ConnectionFailure, get_connection)
+        with pytest.raises(ConnectionFailure):
+            get_connection()
         conn = get_connection("testdb")
-        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
         db = get_db("testdb")
-        self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, "mongoenginetest2")
+        assert isinstance(db, pymongo.database.Database)
+        assert db.name == "mongoenginetest2"
 
     def test_register_connection_defaults(self):
         """Ensure that defaults are used when the host and port are None.
@@ -591,18 +585,18 @@ def test_register_connection_defaults(self):
         register_connection("testdb", "mongoenginetest", host=None, port=None)
 
         conn = get_connection("testdb")
-        self.assertIsInstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
     def test_connection_kwargs(self):
         """Ensure that connection kwargs get passed to pymongo."""
         connect("mongoenginetest", alias="t1", tz_aware=True)
         conn = get_connection("t1")
 
-        self.assertTrue(get_tz_awareness(conn))
+        assert get_tz_awareness(conn)
 
         connect("mongoenginetest2", alias="t2")
         conn = get_connection("t2")
-        self.assertFalse(get_tz_awareness(conn))
+        assert not get_tz_awareness(conn)
 
     def test_connection_pool_via_kwarg(self):
         """Ensure we can specify a max connection pool size using
@@ -613,7 +607,7 @@ def test_connection_pool_via_kwarg(self):
         conn = connect(
             "mongoenginetest", alias="max_pool_size_via_kwarg", **pool_size_kwargs
         )
-        self.assertEqual(conn.max_pool_size, 100)
+        assert conn.max_pool_size == 100
 
     def test_connection_pool_via_uri(self):
         """Ensure we can specify a max connection pool size using
@@ -623,7 +617,7 @@ def test_connection_pool_via_uri(self):
             host="mongodb://localhost/test?maxpoolsize=100",
             alias="max_pool_size_via_uri",
         )
-        self.assertEqual(conn.max_pool_size, 100)
+        assert conn.max_pool_size == 100
 
     def test_write_concern(self):
         """Ensure write concern can be specified in connect() via
@@ -642,18 +636,18 @@ def test_connect_with_replicaset_via_uri(self):
         """
         c = connect(host="mongodb://localhost/test?replicaSet=local-rs")
         db = get_db()
-        self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, "test")
+        assert isinstance(db, pymongo.database.Database)
+        assert db.name == "test"
 
     def test_connect_with_replicaset_via_kwargs(self):
         """Ensure connect() works when specifying a replicaSet via the
         connection kwargs
         """
         c = connect(replicaset="local-rs")
-        self.assertEqual(c._MongoClient__options.replica_set_name, "local-rs")
+        assert c._MongoClient__options.replica_set_name == "local-rs"
         db = get_db()
-        self.assertIsInstance(db, pymongo.database.Database)
-        self.assertEqual(db.name, "test")
+        assert isinstance(db, pymongo.database.Database)
+        assert db.name == "test"
 
     def test_connect_tz_aware(self):
         connect("mongoenginetest", tz_aware=True)
@@ -666,13 +660,13 @@ class DateDoc(Document):
         DateDoc(the_date=d).save()
 
         date_doc = DateDoc.objects.first()
-        self.assertEqual(d, date_doc.the_date)
+        assert d == date_doc.the_date
 
     def test_read_preference_from_parse(self):
         conn = connect(
             host="mongodb://a1.vpc,a2.vpc,a3.vpc/prod?readPreference=secondaryPreferred"
         )
-        self.assertEqual(conn.read_preference, ReadPreference.SECONDARY_PREFERRED)
+        assert conn.read_preference == ReadPreference.SECONDARY_PREFERRED
 
     def test_multiple_connection_settings(self):
         connect("mongoenginetest", alias="t1", host="localhost")
@@ -680,27 +674,27 @@ def test_multiple_connection_settings(self):
         connect("mongoenginetest2", alias="t2", host="127.0.0.1")
 
         mongo_connections = mongoengine.connection._connections
-        self.assertEqual(len(mongo_connections.items()), 2)
-        self.assertIn("t1", mongo_connections.keys())
-        self.assertIn("t2", mongo_connections.keys())
+        assert len(mongo_connections.items()) == 2
+        assert "t1" in mongo_connections.keys()
+        assert "t2" in mongo_connections.keys()
 
         # Handle PyMongo 3+ Async Connection
         # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
         # Purposely not catching exception to fail test if thrown.
         mongo_connections["t1"].server_info()
         mongo_connections["t2"].server_info()
-        self.assertEqual(mongo_connections["t1"].address[0], "localhost")
-        self.assertEqual(mongo_connections["t2"].address[0], "127.0.0.1")
+        assert mongo_connections["t1"].address[0] == "localhost"
+        assert mongo_connections["t2"].address[0] == "127.0.0.1"
 
     def test_connect_2_databases_uses_same_client_if_only_dbname_differs(self):
         c1 = connect(alias="testdb1", db="testdb1")
         c2 = connect(alias="testdb2", db="testdb2")
-        self.assertIs(c1, c2)
+        assert c1 is c2
 
     def test_connect_2_databases_uses_different_client_if_different_parameters(self):
         c1 = connect(alias="testdb1", db="testdb1", username="u1")
         c2 = connect(alias="testdb2", db="testdb2", username="u2")
-        self.assertIsNot(c1, c2)
+        assert c1 is not c2
 
 
 if __name__ == "__main__":
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 32e48a702..cf4dd100b 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -10,6 +10,7 @@
     switch_db,
 )
 from mongoengine.pymongo_support import count_documents
+import pytest
 
 
 class ContextManagersTest(unittest.TestCase):
@@ -23,20 +24,20 @@ class Group(Document):
         Group.drop_collection()
 
         Group(name="hello - default").save()
-        self.assertEqual(1, Group.objects.count())
+        assert 1 == Group.objects.count()
 
         with switch_db(Group, "testdb-1") as Group:
 
-            self.assertEqual(0, Group.objects.count())
+            assert 0 == Group.objects.count()
 
             Group(name="hello").save()
 
-            self.assertEqual(1, Group.objects.count())
+            assert 1 == Group.objects.count()
 
             Group.drop_collection()
-            self.assertEqual(0, Group.objects.count())
+            assert 0 == Group.objects.count()
 
-        self.assertEqual(1, Group.objects.count())
+        assert 1 == Group.objects.count()
 
     def test_switch_collection_context_manager(self):
         connect("mongoenginetest")
@@ -51,20 +52,20 @@ class Group(Document):
             Group.drop_collection()  # drops in group1
 
         Group(name="hello - group").save()
-        self.assertEqual(1, Group.objects.count())
+        assert 1 == Group.objects.count()
 
         with switch_collection(Group, "group1") as Group:
 
-            self.assertEqual(0, Group.objects.count())
+            assert 0 == Group.objects.count()
 
             Group(name="hello - group1").save()
 
-            self.assertEqual(1, Group.objects.count())
+            assert 1 == Group.objects.count()
 
             Group.drop_collection()
-            self.assertEqual(0, Group.objects.count())
+            assert 0 == Group.objects.count()
 
-        self.assertEqual(1, Group.objects.count())
+        assert 1 == Group.objects.count()
 
     def test_no_dereference_context_manager_object_id(self):
         """Ensure that DBRef items in ListFields aren't dereferenced.
@@ -89,20 +90,20 @@ class Group(Document):
         Group(ref=user, members=User.objects, generic=user).save()
 
         with no_dereference(Group) as NoDeRefGroup:
-            self.assertTrue(Group._fields["members"]._auto_dereference)
-            self.assertFalse(NoDeRefGroup._fields["members"]._auto_dereference)
+            assert Group._fields["members"]._auto_dereference
+            assert not NoDeRefGroup._fields["members"]._auto_dereference
 
         with no_dereference(Group) as Group:
             group = Group.objects.first()
             for m in group.members:
-                self.assertNotIsInstance(m, User)
-            self.assertNotIsInstance(group.ref, User)
-            self.assertNotIsInstance(group.generic, User)
+                assert not isinstance(m, User)
+            assert not isinstance(group.ref, User)
+            assert not isinstance(group.generic, User)
 
         for m in group.members:
-            self.assertIsInstance(m, User)
-        self.assertIsInstance(group.ref, User)
-        self.assertIsInstance(group.generic, User)
+            assert isinstance(m, User)
+        assert isinstance(group.ref, User)
+        assert isinstance(group.generic, User)
 
     def test_no_dereference_context_manager_dbref(self):
         """Ensure that DBRef items in ListFields aren't dereferenced.
@@ -127,18 +128,18 @@ class Group(Document):
         Group(ref=user, members=User.objects, generic=user).save()
 
         with no_dereference(Group) as NoDeRefGroup:
-            self.assertTrue(Group._fields["members"]._auto_dereference)
-            self.assertFalse(NoDeRefGroup._fields["members"]._auto_dereference)
+            assert Group._fields["members"]._auto_dereference
+            assert not NoDeRefGroup._fields["members"]._auto_dereference
 
         with no_dereference(Group) as Group:
             group = Group.objects.first()
-            self.assertTrue(all([not isinstance(m, User) for m in group.members]))
-            self.assertNotIsInstance(group.ref, User)
-            self.assertNotIsInstance(group.generic, User)
+            assert all([not isinstance(m, User) for m in group.members])
+            assert not isinstance(group.ref, User)
+            assert not isinstance(group.generic, User)
 
-        self.assertTrue(all([isinstance(m, User) for m in group.members]))
-        self.assertIsInstance(group.ref, User)
-        self.assertIsInstance(group.generic, User)
+        assert all([isinstance(m, User) for m in group.members])
+        assert isinstance(group.ref, User)
+        assert isinstance(group.generic, User)
 
     def test_no_sub_classes(self):
         class A(Document):
@@ -159,32 +160,32 @@ class C(B):
         B(x=30).save()
         C(x=40).save()
 
-        self.assertEqual(A.objects.count(), 5)
-        self.assertEqual(B.objects.count(), 3)
-        self.assertEqual(C.objects.count(), 1)
+        assert A.objects.count() == 5
+        assert B.objects.count() == 3
+        assert C.objects.count() == 1
 
         with no_sub_classes(A):
-            self.assertEqual(A.objects.count(), 2)
+            assert A.objects.count() == 2
 
             for obj in A.objects:
-                self.assertEqual(obj.__class__, A)
+                assert obj.__class__ == A
 
         with no_sub_classes(B):
-            self.assertEqual(B.objects.count(), 2)
+            assert B.objects.count() == 2
 
             for obj in B.objects:
-                self.assertEqual(obj.__class__, B)
+                assert obj.__class__ == B
 
         with no_sub_classes(C):
-            self.assertEqual(C.objects.count(), 1)
+            assert C.objects.count() == 1
 
             for obj in C.objects:
-                self.assertEqual(obj.__class__, C)
+                assert obj.__class__ == C
 
         # Confirm context manager exit correctly
-        self.assertEqual(A.objects.count(), 5)
-        self.assertEqual(B.objects.count(), 3)
-        self.assertEqual(C.objects.count(), 1)
+        assert A.objects.count() == 5
+        assert B.objects.count() == 3
+        assert C.objects.count() == 1
 
     def test_no_sub_classes_modification_to_document_class_are_temporary(self):
         class A(Document):
@@ -194,27 +195,27 @@ class A(Document):
         class B(A):
             z = IntField()
 
-        self.assertEqual(A._subclasses, ("A", "A.B"))
+        assert A._subclasses == ("A", "A.B")
         with no_sub_classes(A):
-            self.assertEqual(A._subclasses, ("A",))
-        self.assertEqual(A._subclasses, ("A", "A.B"))
+            assert A._subclasses == ("A",)
+        assert A._subclasses == ("A", "A.B")
 
-        self.assertEqual(B._subclasses, ("A.B",))
+        assert B._subclasses == ("A.B",)
         with no_sub_classes(B):
-            self.assertEqual(B._subclasses, ("A.B",))
-        self.assertEqual(B._subclasses, ("A.B",))
+            assert B._subclasses == ("A.B",)
+        assert B._subclasses == ("A.B",)
 
     def test_no_subclass_context_manager_does_not_swallow_exception(self):
         class User(Document):
             name = StringField()
 
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             with no_sub_classes(User):
                 raise TypeError()
 
     def test_query_counter_does_not_swallow_exception(self):
 
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             with query_counter() as q:
                 raise TypeError()
 
@@ -227,10 +228,10 @@ def test_query_counter_temporarily_modifies_profiling_level(self):
         try:
             NEW_LEVEL = 1
             db.set_profiling_level(NEW_LEVEL)
-            self.assertEqual(db.profiling_level(), NEW_LEVEL)
+            assert db.profiling_level() == NEW_LEVEL
             with query_counter() as q:
-                self.assertEqual(db.profiling_level(), 2)
-            self.assertEqual(db.profiling_level(), NEW_LEVEL)
+                assert db.profiling_level() == 2
+            assert db.profiling_level() == NEW_LEVEL
         except Exception:
             db.set_profiling_level(
                 initial_profiling_level
@@ -255,33 +256,31 @@ def issue_1_find_query():
 
         counter = 0
         with query_counter() as q:
-            self.assertEqual(q, counter)
-            self.assertEqual(
-                q, counter
-            )  # Ensures previous count query did not get counted
+            assert q == counter
+            assert q == counter  # Ensures previous count query did not get counted
 
             for _ in range(10):
                 issue_1_insert_query()
                 counter += 1
-            self.assertEqual(q, counter)
+            assert q == counter
 
             for _ in range(4):
                 issue_1_find_query()
                 counter += 1
-            self.assertEqual(q, counter)
+            assert q == counter
 
             for _ in range(3):
                 issue_1_count_query()
                 counter += 1
-            self.assertEqual(q, counter)
+            assert q == counter
 
-            self.assertEqual(int(q), counter)  # test __int__
-            self.assertEqual(repr(q), str(int(q)))  # test __repr__
-            self.assertGreater(q, -1)  # test __gt__
-            self.assertGreaterEqual(q, int(q))  # test __gte__
-            self.assertNotEqual(q, -1)
-            self.assertLess(q, 1000)
-            self.assertLessEqual(q, int(q))
+            assert int(q) == counter  # test __int__
+            assert repr(q) == str(int(q))  # test __repr__
+            assert q > -1  # test __gt__
+            assert q >= int(q)  # test __gte__
+            assert q != -1
+            assert q < 1000
+            assert q <= int(q)
 
     def test_query_counter_counts_getmore_queries(self):
         connect("mongoenginetest")
@@ -296,9 +295,9 @@ def test_query_counter_counts_getmore_queries(self):
         )  # first batch of documents contains 101 documents
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             list(collection.find())
-            self.assertEqual(q, 2)  # 1st select + 1 getmore
+            assert q == 2  # 1st select + 1 getmore
 
     def test_query_counter_ignores_particular_queries(self):
         connect("mongoenginetest")
@@ -308,18 +307,18 @@ def test_query_counter_ignores_particular_queries(self):
         collection.insert_many([{"test": "garbage %s" % i} for i in range(10)])
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             cursor = collection.find()
-            self.assertEqual(q, 0)  # cursor wasn't opened yet
+            assert q == 0  # cursor wasn't opened yet
             _ = next(cursor)  # opens the cursor and fires the find query
-            self.assertEqual(q, 1)
+            assert q == 1
 
             cursor.close()  # issues a `killcursors` query that is ignored by the context
-            self.assertEqual(q, 1)
+            assert q == 1
             _ = (
                 db.system.indexes.find_one()
             )  # queries on db.system.indexes are ignored as well
-            self.assertEqual(q, 1)
+            assert q == 1
 
 
 if __name__ == "__main__":
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index ff7598be9..3a6029c1a 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,6 +1,8 @@
 import unittest
 from six import iterkeys
 
+import pytest
+
 from mongoengine import Document
 from mongoengine.base.datastructures import BaseDict, BaseList, StrictDict
 
@@ -31,48 +33,48 @@ class MyDoc(Document):
         dict_items = {"k": "v"}
         doc = MyDoc()
         base_dict = BaseDict(dict_items, instance=doc, name="my_name")
-        self.assertIsInstance(base_dict._instance, Document)
-        self.assertEqual(base_dict._name, "my_name")
-        self.assertEqual(base_dict, dict_items)
+        assert isinstance(base_dict._instance, Document)
+        assert base_dict._name == "my_name"
+        assert base_dict == dict_items
 
     def test_setdefault_calls_mark_as_changed(self):
         base_dict = self._get_basedict({})
         base_dict.setdefault("k", "v")
-        self.assertEqual(base_dict._instance._changed_fields, [base_dict._name])
+        assert base_dict._instance._changed_fields == [base_dict._name]
 
     def test_popitems_calls_mark_as_changed(self):
         base_dict = self._get_basedict({"k": "v"})
-        self.assertEqual(base_dict.popitem(), ("k", "v"))
-        self.assertEqual(base_dict._instance._changed_fields, [base_dict._name])
-        self.assertFalse(base_dict)
+        assert base_dict.popitem() == ("k", "v")
+        assert base_dict._instance._changed_fields == [base_dict._name]
+        assert not base_dict
 
     def test_pop_calls_mark_as_changed(self):
         base_dict = self._get_basedict({"k": "v"})
-        self.assertEqual(base_dict.pop("k"), "v")
-        self.assertEqual(base_dict._instance._changed_fields, [base_dict._name])
-        self.assertFalse(base_dict)
+        assert base_dict.pop("k") == "v"
+        assert base_dict._instance._changed_fields == [base_dict._name]
+        assert not base_dict
 
     def test_pop_calls_does_not_mark_as_changed_when_it_fails(self):
         base_dict = self._get_basedict({"k": "v"})
-        with self.assertRaises(KeyError):
+        with pytest.raises(KeyError):
             base_dict.pop("X")
-        self.assertFalse(base_dict._instance._changed_fields)
+        assert not base_dict._instance._changed_fields
 
     def test_clear_calls_mark_as_changed(self):
         base_dict = self._get_basedict({"k": "v"})
         base_dict.clear()
-        self.assertEqual(base_dict._instance._changed_fields, ["my_name"])
-        self.assertEqual(base_dict, {})
+        assert base_dict._instance._changed_fields == ["my_name"]
+        assert base_dict == {}
 
     def test___delitem___calls_mark_as_changed(self):
         base_dict = self._get_basedict({"k": "v"})
         del base_dict["k"]
-        self.assertEqual(base_dict._instance._changed_fields, ["my_name.k"])
-        self.assertEqual(base_dict, {})
+        assert base_dict._instance._changed_fields == ["my_name.k"]
+        assert base_dict == {}
 
     def test___getitem____KeyError(self):
         base_dict = self._get_basedict({})
-        with self.assertRaises(KeyError):
+        with pytest.raises(KeyError):
             base_dict["new"]
 
     def test___getitem____simple_value(self):
@@ -82,62 +84,62 @@ def test___getitem____simple_value(self):
     def test___getitem____sublist_gets_converted_to_BaseList(self):
         base_dict = self._get_basedict({"k": [0, 1, 2]})
         sub_list = base_dict["k"]
-        self.assertEqual(sub_list, [0, 1, 2])
-        self.assertIsInstance(sub_list, BaseList)
-        self.assertIs(sub_list._instance, base_dict._instance)
-        self.assertEqual(sub_list._name, "my_name.k")
-        self.assertEqual(base_dict._instance._changed_fields, [])
+        assert sub_list == [0, 1, 2]
+        assert isinstance(sub_list, BaseList)
+        assert sub_list._instance is base_dict._instance
+        assert sub_list._name == "my_name.k"
+        assert base_dict._instance._changed_fields == []
 
         # Challenge mark_as_changed from sublist
         sub_list[1] = None
-        self.assertEqual(base_dict._instance._changed_fields, ["my_name.k.1"])
+        assert base_dict._instance._changed_fields == ["my_name.k.1"]
 
     def test___getitem____subdict_gets_converted_to_BaseDict(self):
         base_dict = self._get_basedict({"k": {"subk": "subv"}})
         sub_dict = base_dict["k"]
-        self.assertEqual(sub_dict, {"subk": "subv"})
-        self.assertIsInstance(sub_dict, BaseDict)
-        self.assertIs(sub_dict._instance, base_dict._instance)
-        self.assertEqual(sub_dict._name, "my_name.k")
-        self.assertEqual(base_dict._instance._changed_fields, [])
+        assert sub_dict == {"subk": "subv"}
+        assert isinstance(sub_dict, BaseDict)
+        assert sub_dict._instance is base_dict._instance
+        assert sub_dict._name == "my_name.k"
+        assert base_dict._instance._changed_fields == []
 
         # Challenge mark_as_changed from subdict
         sub_dict["subk"] = None
-        self.assertEqual(base_dict._instance._changed_fields, ["my_name.k.subk"])
+        assert base_dict._instance._changed_fields == ["my_name.k.subk"]
 
     def test_get_sublist_gets_converted_to_BaseList_just_like__getitem__(self):
         base_dict = self._get_basedict({"k": [0, 1, 2]})
         sub_list = base_dict.get("k")
-        self.assertEqual(sub_list, [0, 1, 2])
-        self.assertIsInstance(sub_list, BaseList)
+        assert sub_list == [0, 1, 2]
+        assert isinstance(sub_list, BaseList)
 
     def test_get_returns_the_same_as___getitem__(self):
         base_dict = self._get_basedict({"k": [0, 1, 2]})
         get_ = base_dict.get("k")
         getitem_ = base_dict["k"]
-        self.assertEqual(get_, getitem_)
+        assert get_ == getitem_
 
     def test_get_default(self):
         base_dict = self._get_basedict({})
         sentinel = object()
-        self.assertEqual(base_dict.get("new"), None)
-        self.assertIs(base_dict.get("new", sentinel), sentinel)
+        assert base_dict.get("new") == None
+        assert base_dict.get("new", sentinel) is sentinel
 
     def test___setitem___calls_mark_as_changed(self):
         base_dict = self._get_basedict({})
         base_dict["k"] = "v"
-        self.assertEqual(base_dict._instance._changed_fields, ["my_name.k"])
-        self.assertEqual(base_dict, {"k": "v"})
+        assert base_dict._instance._changed_fields == ["my_name.k"]
+        assert base_dict == {"k": "v"}
 
     def test_update_calls_mark_as_changed(self):
         base_dict = self._get_basedict({})
         base_dict.update({"k": "v"})
-        self.assertEqual(base_dict._instance._changed_fields, ["my_name"])
+        assert base_dict._instance._changed_fields == ["my_name"]
 
     def test___setattr____not_tracked_by_changes(self):
         base_dict = self._get_basedict({})
         base_dict.a_new_attr = "test"
-        self.assertEqual(base_dict._instance._changed_fields, [])
+        assert base_dict._instance._changed_fields == []
 
     def test___delattr____tracked_by_changes(self):
         # This is probably a bug as __setattr__ is not tracked
@@ -146,7 +148,7 @@ def test___delattr____tracked_by_changes(self):
         base_dict = self._get_basedict({})
         base_dict.a_new_attr = "test"
         del base_dict.a_new_attr
-        self.assertEqual(base_dict._instance._changed_fields, ["my_name.a_new_attr"])
+        assert base_dict._instance._changed_fields == ["my_name.a_new_attr"]
 
 
 class TestBaseList(unittest.TestCase):
@@ -167,14 +169,14 @@ class MyDoc(Document):
         list_items = [True]
         doc = MyDoc()
         base_list = BaseList(list_items, instance=doc, name="my_name")
-        self.assertIsInstance(base_list._instance, Document)
-        self.assertEqual(base_list._name, "my_name")
-        self.assertEqual(base_list, list_items)
+        assert isinstance(base_list._instance, Document)
+        assert base_list._name == "my_name"
+        assert base_list == list_items
 
     def test___iter__(self):
         values = [True, False, True, False]
         base_list = BaseList(values, instance=None, name="my_name")
-        self.assertEqual(values, list(base_list))
+        assert values == list(base_list)
 
     def test___iter___allow_modification_while_iterating_withou_error(self):
         # regular list allows for this, thus this subclass must comply to that
@@ -185,9 +187,9 @@ def test___iter___allow_modification_while_iterating_withou_error(self):
 
     def test_append_calls_mark_as_changed(self):
         base_list = self._get_baselist([])
-        self.assertFalse(base_list._instance._changed_fields)
+        assert not base_list._instance._changed_fields
         base_list.append(True)
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test_subclass_append(self):
         # Due to the way mark_as_changed_wrapper is implemented
@@ -200,85 +202,85 @@ class SubBaseList(BaseList):
 
     def test___getitem__using_simple_index(self):
         base_list = self._get_baselist([0, 1, 2])
-        self.assertEqual(base_list[0], 0)
-        self.assertEqual(base_list[1], 1)
-        self.assertEqual(base_list[-1], 2)
+        assert base_list[0] == 0
+        assert base_list[1] == 1
+        assert base_list[-1] == 2
 
     def test___getitem__using_slice(self):
         base_list = self._get_baselist([0, 1, 2])
-        self.assertEqual(base_list[1:3], [1, 2])
-        self.assertEqual(base_list[0:3:2], [0, 2])
+        assert base_list[1:3] == [1, 2]
+        assert base_list[0:3:2] == [0, 2]
 
     def test___getitem___using_slice_returns_list(self):
         # Bug: using slice does not properly handles the instance
         # and mark_as_changed behaviour.
         base_list = self._get_baselist([0, 1, 2])
         sliced = base_list[1:3]
-        self.assertEqual(sliced, [1, 2])
-        self.assertIsInstance(sliced, list)
-        self.assertEqual(base_list._instance._changed_fields, [])
+        assert sliced == [1, 2]
+        assert isinstance(sliced, list)
+        assert base_list._instance._changed_fields == []
 
     def test___getitem__sublist_returns_BaseList_bound_to_instance(self):
         base_list = self._get_baselist([[1, 2], [3, 4]])
         sub_list = base_list[0]
-        self.assertEqual(sub_list, [1, 2])
-        self.assertIsInstance(sub_list, BaseList)
-        self.assertIs(sub_list._instance, base_list._instance)
-        self.assertEqual(sub_list._name, "my_name.0")
-        self.assertEqual(base_list._instance._changed_fields, [])
+        assert sub_list == [1, 2]
+        assert isinstance(sub_list, BaseList)
+        assert sub_list._instance is base_list._instance
+        assert sub_list._name == "my_name.0"
+        assert base_list._instance._changed_fields == []
 
         # Challenge mark_as_changed from sublist
         sub_list[1] = None
-        self.assertEqual(base_list._instance._changed_fields, ["my_name.0.1"])
+        assert base_list._instance._changed_fields == ["my_name.0.1"]
 
     def test___getitem__subdict_returns_BaseList_bound_to_instance(self):
         base_list = self._get_baselist([{"subk": "subv"}])
         sub_dict = base_list[0]
-        self.assertEqual(sub_dict, {"subk": "subv"})
-        self.assertIsInstance(sub_dict, BaseDict)
-        self.assertIs(sub_dict._instance, base_list._instance)
-        self.assertEqual(sub_dict._name, "my_name.0")
-        self.assertEqual(base_list._instance._changed_fields, [])
+        assert sub_dict == {"subk": "subv"}
+        assert isinstance(sub_dict, BaseDict)
+        assert sub_dict._instance is base_list._instance
+        assert sub_dict._name == "my_name.0"
+        assert base_list._instance._changed_fields == []
 
         # Challenge mark_as_changed from subdict
         sub_dict["subk"] = None
-        self.assertEqual(base_list._instance._changed_fields, ["my_name.0.subk"])
+        assert base_list._instance._changed_fields == ["my_name.0.subk"]
 
     def test_extend_calls_mark_as_changed(self):
         base_list = self._get_baselist([])
         base_list.extend([True])
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test_insert_calls_mark_as_changed(self):
         base_list = self._get_baselist([])
         base_list.insert(0, True)
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test_remove_calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         base_list.remove(True)
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test_remove_not_mark_as_changed_when_it_fails(self):
         base_list = self._get_baselist([True])
-        with self.assertRaises(ValueError):
+        with pytest.raises(ValueError):
             base_list.remove(False)
-        self.assertFalse(base_list._instance._changed_fields)
+        assert not base_list._instance._changed_fields
 
     def test_pop_calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         base_list.pop()
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test_reverse_calls_mark_as_changed(self):
         base_list = self._get_baselist([True, False])
         base_list.reverse()
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test___delitem___calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         del base_list[0]
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test___setitem___calls_with_full_slice_mark_as_changed(self):
         base_list = self._get_baselist([])
@@ -286,8 +288,8 @@ def test___setitem___calls_with_full_slice_mark_as_changed(self):
             0,
             1,
         ]  # Will use __setslice__ under py2 and __setitem__ under py3
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
-        self.assertEqual(base_list, [0, 1])
+        assert base_list._instance._changed_fields == ["my_name"]
+        assert base_list == [0, 1]
 
     def test___setitem___calls_with_partial_slice_mark_as_changed(self):
         base_list = self._get_baselist([0, 1, 2])
@@ -295,66 +297,66 @@ def test___setitem___calls_with_partial_slice_mark_as_changed(self):
             1,
             0,
         ]  # Will use __setslice__ under py2 and __setitem__ under py3
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
-        self.assertEqual(base_list, [1, 0, 2])
+        assert base_list._instance._changed_fields == ["my_name"]
+        assert base_list == [1, 0, 2]
 
     def test___setitem___calls_with_step_slice_mark_as_changed(self):
         base_list = self._get_baselist([0, 1, 2])
         base_list[0:3:2] = [-1, -2]  # uses __setitem__ in both py2 & 3
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
-        self.assertEqual(base_list, [-1, 1, -2])
+        assert base_list._instance._changed_fields == ["my_name"]
+        assert base_list == [-1, 1, -2]
 
     def test___setitem___with_slice(self):
         base_list = self._get_baselist([0, 1, 2, 3, 4, 5])
         base_list[0:6:2] = [None, None, None]
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
-        self.assertEqual(base_list, [None, 1, None, 3, None, 5])
+        assert base_list._instance._changed_fields == ["my_name"]
+        assert base_list == [None, 1, None, 3, None, 5]
 
     def test___setitem___item_0_calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         base_list[0] = False
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
-        self.assertEqual(base_list, [False])
+        assert base_list._instance._changed_fields == ["my_name"]
+        assert base_list == [False]
 
     def test___setitem___item_1_calls_mark_as_changed(self):
         base_list = self._get_baselist([True, True])
         base_list[1] = False
-        self.assertEqual(base_list._instance._changed_fields, ["my_name.1"])
-        self.assertEqual(base_list, [True, False])
+        assert base_list._instance._changed_fields == ["my_name.1"]
+        assert base_list == [True, False]
 
     def test___delslice___calls_mark_as_changed(self):
         base_list = self._get_baselist([0, 1])
         del base_list[0:1]
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
-        self.assertEqual(base_list, [1])
+        assert base_list._instance._changed_fields == ["my_name"]
+        assert base_list == [1]
 
     def test___iadd___calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         base_list += [False]
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test___imul___calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
-        self.assertEqual(base_list._instance._changed_fields, [])
+        assert base_list._instance._changed_fields == []
         base_list *= 2
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test_sort_calls_not_marked_as_changed_when_it_fails(self):
         base_list = self._get_baselist([True])
-        with self.assertRaises(TypeError):
+        with pytest.raises(TypeError):
             base_list.sort(key=1)
 
-        self.assertEqual(base_list._instance._changed_fields, [])
+        assert base_list._instance._changed_fields == []
 
     def test_sort_calls_mark_as_changed(self):
         base_list = self._get_baselist([True, False])
         base_list.sort()
-        self.assertEqual(base_list._instance._changed_fields, ["my_name"])
+        assert base_list._instance._changed_fields == ["my_name"]
 
     def test_sort_calls_with_key(self):
         base_list = self._get_baselist([1, 2, 11])
         base_list.sort(key=lambda i: str(i))
-        self.assertEqual(base_list, [1, 11, 2])
+        assert base_list == [1, 11, 2]
 
 
 class TestStrictDict(unittest.TestCase):
@@ -366,32 +368,32 @@ def setUp(self):
 
     def test_init(self):
         d = self.dtype(a=1, b=1, c=1)
-        self.assertEqual((d.a, d.b, d.c), (1, 1, 1))
+        assert (d.a, d.b, d.c) == (1, 1, 1)
 
     def test_iterkeys(self):
         d = self.dtype(a=1)
-        self.assertEqual(list(iterkeys(d)), ["a"])
+        assert list(iterkeys(d)) == ["a"]
 
     def test_len(self):
         d = self.dtype(a=1)
-        self.assertEqual(len(d), 1)
+        assert len(d) == 1
 
     def test_pop(self):
         d = self.dtype(a=1)
-        self.assertIn("a", d)
+        assert "a" in d
         d.pop("a")
-        self.assertNotIn("a", d)
+        assert "a" not in d
 
     def test_repr(self):
         d = self.dtype(a=1, b=2, c=3)
-        self.assertEqual(repr(d), '{"a": 1, "b": 2, "c": 3}')
+        assert repr(d) == '{"a": 1, "b": 2, "c": 3}'
 
         # make sure quotes are escaped properly
         d = self.dtype(a='"', b="'", c="")
-        self.assertEqual(repr(d), '{"a": \'"\', "b": "\'", "c": \'\'}')
+        assert repr(d) == '{"a": \'"\', "b": "\'", "c": \'\'}'
 
     def test_init_fails_on_nonexisting_attrs(self):
-        with self.assertRaises(AttributeError):
+        with pytest.raises(AttributeError):
             self.dtype(a=1, b=2, d=3)
 
     def test_eq(self):
@@ -403,45 +405,46 @@ def test_eq(self):
         h = self.strict_dict_class(("a", "c", "b"))(a=1, b=1, c=1)
         i = self.strict_dict_class(("a", "c", "b"))(a=1, b=1, c=2)
 
-        self.assertEqual(d, dd)
-        self.assertNotEqual(d, e)
-        self.assertNotEqual(d, f)
-        self.assertNotEqual(d, g)
-        self.assertNotEqual(f, d)
-        self.assertEqual(d, h)
-        self.assertNotEqual(d, i)
+        assert d == dd
+        assert d != e
+        assert d != f
+        assert d != g
+        assert f != d
+        assert d == h
+        assert d != i
 
     def test_setattr_getattr(self):
         d = self.dtype()
         d.a = 1
-        self.assertEqual(d.a, 1)
-        self.assertRaises(AttributeError, getattr, d, "b")
+        assert d.a == 1
+        with pytest.raises(AttributeError):
+            getattr(d, "b")
 
     def test_setattr_raises_on_nonexisting_attr(self):
         d = self.dtype()
-        with self.assertRaises(AttributeError):
+        with pytest.raises(AttributeError):
             d.x = 1
 
     def test_setattr_getattr_special(self):
         d = self.strict_dict_class(["items"])
         d.items = 1
-        self.assertEqual(d.items, 1)
+        assert d.items == 1
 
     def test_get(self):
         d = self.dtype(a=1)
-        self.assertEqual(d.get("a"), 1)
-        self.assertEqual(d.get("b", "bla"), "bla")
+        assert d.get("a") == 1
+        assert d.get("b", "bla") == "bla"
 
     def test_items(self):
         d = self.dtype(a=1)
-        self.assertEqual(d.items(), [("a", 1)])
+        assert d.items() == [("a", 1)]
         d = self.dtype(a=1, b=2)
-        self.assertEqual(d.items(), [("a", 1), ("b", 2)])
+        assert d.items() == [("a", 1), ("b", 2)]
 
     def test_mappings_protocol(self):
         d = self.dtype(a=1, b=2)
-        self.assertEqual(dict(d), {"a": 1, "b": 2})
-        self.assertEqual(dict(**d), {"a": 1, "b": 2})
+        assert dict(d) == {"a": 1, "b": 2}
+        assert dict(**d) == {"a": 1, "b": 2}
 
 
 if __name__ == "__main__":
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 4730e2e34..b9d928833 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -42,37 +42,37 @@ class Group(Document):
         group.save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             len(group_obj._data["members"])
-            self.assertEqual(q, 1)
+            assert q == 1
 
             len(group_obj.members)
-            self.assertEqual(q, 2)
+            assert q == 2
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
+            assert q == 2
 
         # Document select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first().select_related()
-            self.assertEqual(q, 2)
+            assert q == 2
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
+            assert q == 2
 
         # Queryset select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             group_objs = Group.objects.select_related()
-            self.assertEqual(q, 2)
+            assert q == 2
             for group_obj in group_objs:
                 [m for m in group_obj.members]
-                self.assertEqual(q, 2)
+                assert q == 2
 
         User.drop_collection()
         Group.drop_collection()
@@ -99,40 +99,40 @@ class Group(Document):
         group.reload()  # Confirm reload works
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
-            self.assertTrue(group_obj._data["members"]._dereferenced)
+            assert q == 2
+            assert group_obj._data["members"]._dereferenced
 
             # verifies that no additional queries gets executed
             # if we re-iterate over the ListField once it is
             # dereferenced
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
-            self.assertTrue(group_obj._data["members"]._dereferenced)
+            assert q == 2
+            assert group_obj._data["members"]._dereferenced
 
         # Document select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first().select_related()
 
-            self.assertEqual(q, 2)
+            assert q == 2
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
+            assert q == 2
 
         # Queryset select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
             group_objs = Group.objects.select_related()
-            self.assertEqual(q, 2)
+            assert q == 2
             for group_obj in group_objs:
                 [m for m in group_obj.members]
-                self.assertEqual(q, 2)
+                assert q == 2
 
     def test_list_item_dereference_orphan_dbref(self):
         """Ensure that orphan DBRef items in ListFields are dereferenced.
@@ -159,21 +159,21 @@ class Group(Document):
         # Group.members list is an orphan DBRef
         User.objects[0].delete()
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
-            self.assertTrue(group_obj._data["members"]._dereferenced)
+            assert q == 2
+            assert group_obj._data["members"]._dereferenced
 
             # verifies that no additional queries gets executed
             # if we re-iterate over the ListField once it is
             # dereferenced
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
-            self.assertTrue(group_obj._data["members"]._dereferenced)
+            assert q == 2
+            assert group_obj._data["members"]._dereferenced
 
         User.drop_collection()
         Group.drop_collection()
@@ -197,8 +197,8 @@ class Group(Document):
         Group(members=User.objects).save()
         group = Group.objects.first()
 
-        self.assertEqual(Group._get_collection().find_one()["members"], [1])
-        self.assertEqual(group.members, [user])
+        assert Group._get_collection().find_one()["members"] == [1]
+        assert group.members == [user]
 
     def test_handle_old_style_references(self):
         """Ensure that DBRef items in ListFields are dereferenced.
@@ -231,8 +231,8 @@ class Group(Document):
         group.save()
 
         group = Group.objects.first()
-        self.assertEqual(group.members[0].name, "user 1")
-        self.assertEqual(group.members[-1].name, "String!")
+        assert group.members[0].name == "user 1"
+        assert group.members[-1].name == "String!"
 
     def test_migrate_references(self):
         """Example of migrating ReferenceField storage
@@ -253,12 +253,12 @@ class Group(Document):
         group = Group(author=user, members=[user]).save()
 
         raw_data = Group._get_collection().find_one()
-        self.assertIsInstance(raw_data["author"], DBRef)
-        self.assertIsInstance(raw_data["members"][0], DBRef)
+        assert isinstance(raw_data["author"], DBRef)
+        assert isinstance(raw_data["members"][0], DBRef)
         group = Group.objects.first()
 
-        self.assertEqual(group.author, user)
-        self.assertEqual(group.members, [user])
+        assert group.author == user
+        assert group.members == [user]
 
         # Migrate the model definition
         class Group(Document):
@@ -273,12 +273,12 @@ class Group(Document):
             g.save()
 
         group = Group.objects.first()
-        self.assertEqual(group.author, user)
-        self.assertEqual(group.members, [user])
+        assert group.author == user
+        assert group.members == [user]
 
         raw_data = Group._get_collection().find_one()
-        self.assertIsInstance(raw_data["author"], ObjectId)
-        self.assertIsInstance(raw_data["members"][0], ObjectId)
+        assert isinstance(raw_data["author"], ObjectId)
+        assert isinstance(raw_data["members"][0], ObjectId)
 
     def test_recursive_reference(self):
         """Ensure that ReferenceFields can reference their own documents.
@@ -309,43 +309,43 @@ class Employee(Document):
         Employee(name="Funky Gibbon", boss=bill, friends=friends).save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             peter = Employee.objects.with_id(peter.id)
-            self.assertEqual(q, 1)
+            assert q == 1
 
             peter.boss
-            self.assertEqual(q, 2)
+            assert q == 2
 
             peter.friends
-            self.assertEqual(q, 3)
+            assert q == 3
 
         # Document select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             peter = Employee.objects.with_id(peter.id).select_related()
-            self.assertEqual(q, 2)
+            assert q == 2
 
-            self.assertEqual(peter.boss, bill)
-            self.assertEqual(q, 2)
+            assert peter.boss == bill
+            assert q == 2
 
-            self.assertEqual(peter.friends, friends)
-            self.assertEqual(q, 2)
+            assert peter.friends == friends
+            assert q == 2
 
         # Queryset select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             employees = Employee.objects(boss=bill).select_related()
-            self.assertEqual(q, 2)
+            assert q == 2
 
             for employee in employees:
-                self.assertEqual(employee.boss, bill)
-                self.assertEqual(q, 2)
+                assert employee.boss == bill
+                assert q == 2
 
-                self.assertEqual(employee.friends, friends)
-                self.assertEqual(q, 2)
+                assert employee.friends == friends
+                assert q == 2
 
     def test_list_of_lists_of_references(self):
         class User(Document):
@@ -366,10 +366,10 @@ class SimpleList(Document):
         u3 = User.objects.create(name="u3")
 
         SimpleList.objects.create(users=[u1, u2, u3])
-        self.assertEqual(SimpleList.objects.all()[0].users, [u1, u2, u3])
+        assert SimpleList.objects.all()[0].users == [u1, u2, u3]
 
         Post.objects.create(user_lists=[[u1, u2], [u3]])
-        self.assertEqual(Post.objects.all()[0].user_lists, [[u1, u2], [u3]])
+        assert Post.objects.all()[0].user_lists == [[u1, u2], [u3]]
 
     def test_circular_reference(self):
         """Ensure you can handle circular references
@@ -403,9 +403,7 @@ def __repr__(self):
         daughter.relations.append(self_rel)
         daughter.save()
 
-        self.assertEqual(
-            "[<Person: Mother>, <Person: Daughter>]", "%s" % Person.objects()
-        )
+        assert "[<Person: Mother>, <Person: Daughter>]" == "%s" % Person.objects()
 
     def test_circular_reference_on_self(self):
         """Ensure you can handle circular references
@@ -432,9 +430,7 @@ def __repr__(self):
         daughter.relations.append(daughter)
         daughter.save()
 
-        self.assertEqual(
-            "[<Person: Mother>, <Person: Daughter>]", "%s" % Person.objects()
-        )
+        assert "[<Person: Mother>, <Person: Daughter>]" == "%s" % Person.objects()
 
     def test_circular_tree_reference(self):
         """Ensure you can handle circular references with more than one level
@@ -473,9 +469,9 @@ def __repr__(self):
         anna.other.name = "Anna's friends"
         anna.save()
 
-        self.assertEqual(
-            "[<Person: Paul>, <Person: Maria>, <Person: Julia>, <Person: Anna>]",
-            "%s" % Person.objects(),
+        assert (
+            "[<Person: Paul>, <Person: Maria>, <Person: Julia>, <Person: Anna>]"
+            == "%s" % Person.objects()
         )
 
     def test_generic_reference(self):
@@ -516,52 +512,52 @@ class Group(Document):
         group.save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for m in group_obj.members:
-                self.assertIn("User", m.__class__.__name__)
+                assert "User" in m.__class__.__name__
 
         # Document select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first().select_related()
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for m in group_obj.members:
-                self.assertIn("User", m.__class__.__name__)
+                assert "User" in m.__class__.__name__
 
         # Queryset select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_objs = Group.objects.select_related()
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for group_obj in group_objs:
                 [m for m in group_obj.members]
-                self.assertEqual(q, 4)
+                assert q == 4
 
                 [m for m in group_obj.members]
-                self.assertEqual(q, 4)
+                assert q == 4
 
                 for m in group_obj.members:
-                    self.assertIn("User", m.__class__.__name__)
+                    assert "User" in m.__class__.__name__
 
     def test_generic_reference_orphan_dbref(self):
         """Ensure that generic orphan DBRef items in ListFields are dereferenced.
@@ -604,18 +600,18 @@ class Group(Document):
         # an orphan DBRef in the GenericReference ListField
         UserA.objects[0].delete()
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
-            self.assertTrue(group_obj._data["members"]._dereferenced)
+            assert q == 4
+            assert group_obj._data["members"]._dereferenced
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
-            self.assertTrue(group_obj._data["members"]._dereferenced)
+            assert q == 4
+            assert group_obj._data["members"]._dereferenced
 
         UserA.drop_collection()
         UserB.drop_collection()
@@ -660,52 +656,52 @@ class Group(Document):
         group.save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for m in group_obj.members:
-                self.assertIn("User", m.__class__.__name__)
+                assert "User" in m.__class__.__name__
 
         # Document select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first().select_related()
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for m in group_obj.members:
-                self.assertIn("User", m.__class__.__name__)
+                assert "User" in m.__class__.__name__
 
         # Queryset select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_objs = Group.objects.select_related()
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for group_obj in group_objs:
                 [m for m in group_obj.members]
-                self.assertEqual(q, 4)
+                assert q == 4
 
                 [m for m in group_obj.members]
-                self.assertEqual(q, 4)
+                assert q == 4
 
                 for m in group_obj.members:
-                    self.assertIn("User", m.__class__.__name__)
+                    assert "User" in m.__class__.__name__
 
         UserA.drop_collection()
         UserB.drop_collection()
@@ -735,43 +731,43 @@ class Group(Document):
         group.save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
+            assert q == 2
 
             for k, m in iteritems(group_obj.members):
-                self.assertIsInstance(m, User)
+                assert isinstance(m, User)
 
         # Document select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first().select_related()
-            self.assertEqual(q, 2)
+            assert q == 2
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
+            assert q == 2
 
             for k, m in iteritems(group_obj.members):
-                self.assertIsInstance(m, User)
+                assert isinstance(m, User)
 
         # Queryset select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_objs = Group.objects.select_related()
-            self.assertEqual(q, 2)
+            assert q == 2
 
             for group_obj in group_objs:
                 [m for m in group_obj.members]
-                self.assertEqual(q, 2)
+                assert q == 2
 
                 for k, m in iteritems(group_obj.members):
-                    self.assertIsInstance(m, User)
+                    assert isinstance(m, User)
 
         User.drop_collection()
         Group.drop_collection()
@@ -813,65 +809,65 @@ class Group(Document):
         group.save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for k, m in iteritems(group_obj.members):
-                self.assertIn("User", m.__class__.__name__)
+                assert "User" in m.__class__.__name__
 
         # Document select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first().select_related()
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for k, m in iteritems(group_obj.members):
-                self.assertIn("User", m.__class__.__name__)
+                assert "User" in m.__class__.__name__
 
         # Queryset select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_objs = Group.objects.select_related()
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for group_obj in group_objs:
                 [m for m in group_obj.members]
-                self.assertEqual(q, 4)
+                assert q == 4
 
                 [m for m in group_obj.members]
-                self.assertEqual(q, 4)
+                assert q == 4
 
                 for k, m in iteritems(group_obj.members):
-                    self.assertIn("User", m.__class__.__name__)
+                    assert "User" in m.__class__.__name__
 
         Group.objects.delete()
         Group().save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 1)
-            self.assertEqual(group_obj.members, {})
+            assert q == 1
+            assert group_obj.members == {}
 
         UserA.drop_collection()
         UserB.drop_collection()
@@ -903,52 +899,52 @@ class Group(Document):
         group.save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
+            assert q == 2
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
+            assert q == 2
 
             for k, m in iteritems(group_obj.members):
-                self.assertIsInstance(m, UserA)
+                assert isinstance(m, UserA)
 
         # Document select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first().select_related()
-            self.assertEqual(q, 2)
+            assert q == 2
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
+            assert q == 2
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 2)
+            assert q == 2
 
             for k, m in iteritems(group_obj.members):
-                self.assertIsInstance(m, UserA)
+                assert isinstance(m, UserA)
 
         # Queryset select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_objs = Group.objects.select_related()
-            self.assertEqual(q, 2)
+            assert q == 2
 
             for group_obj in group_objs:
                 [m for m in group_obj.members]
-                self.assertEqual(q, 2)
+                assert q == 2
 
                 [m for m in group_obj.members]
-                self.assertEqual(q, 2)
+                assert q == 2
 
                 for k, m in iteritems(group_obj.members):
-                    self.assertIsInstance(m, UserA)
+                    assert isinstance(m, UserA)
 
         UserA.drop_collection()
         Group.drop_collection()
@@ -990,64 +986,64 @@ class Group(Document):
         group.save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for k, m in iteritems(group_obj.members):
-                self.assertIn("User", m.__class__.__name__)
+                assert "User" in m.__class__.__name__
 
         # Document select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first().select_related()
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for k, m in iteritems(group_obj.members):
-                self.assertIn("User", m.__class__.__name__)
+                assert "User" in m.__class__.__name__
 
         # Queryset select_related
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_objs = Group.objects.select_related()
-            self.assertEqual(q, 4)
+            assert q == 4
 
             for group_obj in group_objs:
                 [m for m in group_obj.members]
-                self.assertEqual(q, 4)
+                assert q == 4
 
                 [m for m in group_obj.members]
-                self.assertEqual(q, 4)
+                assert q == 4
 
                 for k, m in iteritems(group_obj.members):
-                    self.assertIn("User", m.__class__.__name__)
+                    assert "User" in m.__class__.__name__
 
         Group.objects.delete()
         Group().save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             [m for m in group_obj.members]
-            self.assertEqual(q, 1)
+            assert q == 1
 
         UserA.drop_collection()
         UserB.drop_collection()
@@ -1075,8 +1071,8 @@ class Asset(Document):
         root.save()
 
         root = root.reload()
-        self.assertEqual(root.children, [company])
-        self.assertEqual(company.parents, [root])
+        assert root.children == [company]
+        assert company.parents == [root]
 
     def test_dict_in_dbref_instance(self):
         class Person(Document):
@@ -1102,8 +1098,8 @@ class Room(Document):
         room_101.save()
 
         room = Room.objects.first().select_related()
-        self.assertEqual(room.staffs_with_position[0]["staff"], sarah)
-        self.assertEqual(room.staffs_with_position[1]["staff"], bob)
+        assert room.staffs_with_position[0]["staff"] == sarah
+        assert room.staffs_with_position[1]["staff"] == bob
 
     def test_document_reload_no_inheritance(self):
         class Foo(Document):
@@ -1133,8 +1129,8 @@ class Baz(Document):
         foo.save()
         foo.reload()
 
-        self.assertEqual(type(foo.bar), Bar)
-        self.assertEqual(type(foo.baz), Baz)
+        assert type(foo.bar) == Bar
+        assert type(foo.baz) == Baz
 
     def test_document_reload_reference_integrity(self):
         """
@@ -1166,13 +1162,13 @@ class Message(Document):
         concurrent_change_user = User.objects.get(id=1)
         concurrent_change_user.name = "new-name"
         concurrent_change_user.save()
-        self.assertNotEqual(user.name, "new-name")
+        assert user.name != "new-name"
 
         msg = Message.objects.get(id=1)
         msg.reload()
-        self.assertEqual(msg.topic, topic)
-        self.assertEqual(msg.author, user)
-        self.assertEqual(msg.author.name, "new-name")
+        assert msg.topic == topic
+        assert msg.author == user
+        assert msg.author.name == "new-name"
 
     def test_list_lookup_not_checked_in_map(self):
         """Ensure we dereference list data correctly
@@ -1194,8 +1190,8 @@ class Message(Document):
         Message(id=1, comments=[c1, c2]).save()
 
         msg = Message.objects.get(id=1)
-        self.assertEqual(0, msg.comments[0].id)
-        self.assertEqual(1, msg.comments[1].id)
+        assert 0 == msg.comments[0].id
+        assert 1 == msg.comments[1].id
 
     def test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries(self):
         """Ensure that DBRef items in ListFields are dereferenced.
@@ -1217,15 +1213,15 @@ class Group(Document):
         Group(name="Test", members=User.objects).save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             group_obj.name = "new test"
             group_obj.save()
 
-            self.assertEqual(q, 2)
+            assert q == 2
 
     def test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries(self):
         """Ensure that DBRef items in ListFields are dereferenced.
@@ -1247,15 +1243,15 @@ class Group(Document):
         Group(name="Test", members=User.objects).save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             group_obj.name = "new test"
             group_obj.save()
 
-            self.assertEqual(q, 2)
+            assert q == 2
 
     def test_generic_reference_save_doesnt_cause_extra_queries(self):
         class UserA(Document):
@@ -1287,15 +1283,15 @@ class Group(Document):
         Group(name="test", members=members).save()
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             group_obj = Group.objects.first()
-            self.assertEqual(q, 1)
+            assert q == 1
 
             group_obj.name = "new test"
             group_obj.save()
 
-            self.assertEqual(q, 2)
+            assert q == 2
 
     def test_objectid_reference_across_databases(self):
         # mongoenginetest - Is default connection alias from setUp()
@@ -1319,10 +1315,10 @@ class Book(Document):
 
         # Can't use query_counter across databases - so test the _data object
         book = Book.objects.first()
-        self.assertNotIsInstance(book._data["author"], User)
+        assert not isinstance(book._data["author"], User)
 
         book.select_related()
-        self.assertIsInstance(book._data["author"], User)
+        assert isinstance(book._data["author"], User)
 
     def test_non_ascii_pk(self):
         """
@@ -1346,7 +1342,7 @@ class BrandGroup(Document):
         BrandGroup(title="top_brands", brands=[brand1, brand2]).save()
         brand_groups = BrandGroup.objects().all()
 
-        self.assertEqual(2, len([brand for bg in brand_groups for brand in bg.brands]))
+        assert 2 == len([brand for bg in brand_groups for brand in bg.brands])
 
     def test_dereferencing_embedded_listfield_referencefield(self):
         class Tag(Document):
@@ -1370,7 +1366,7 @@ class Page(Document):
         Page(tags=[tag], posts=[post]).save()
 
         page = Page.objects.first()
-        self.assertEqual(page.tags[0], page.posts[0].tags[0])
+        assert page.tags[0] == page.posts[0].tags[0]
 
     def test_select_related_follows_embedded_referencefields(self):
         class Song(Document):
@@ -1390,12 +1386,12 @@ class Playlist(Document):
         playlist = Playlist.objects.create(items=items)
 
         with query_counter() as q:
-            self.assertEqual(q, 0)
+            assert q == 0
 
             playlist = Playlist.objects.first().select_related()
             songs = [item.song for item in playlist.items]
 
-            self.assertEqual(q, 2)
+            assert q == 2
 
 
 if __name__ == "__main__":
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index e92f3d09b..c1ea407ca 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -39,7 +39,7 @@ def test_replicaset_uri_passes_read_preference(self):
             # really???
             return
 
-        self.assertEqual(conn.read_preference, READ_PREF)
+        assert conn.read_preference == READ_PREF
 
 
 if __name__ == "__main__":
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 1d0607d77..b217712b8 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -245,7 +245,7 @@ def tearDown(self):
         # Note that there is a chance that the following assert fails in case
         # some receivers (eventually created in other tests)
         # gets garbage collected (https://pythonhosted.org/blinker/#blinker.base.Signal.connect)
-        self.assertEqual(self.pre_signals, post_signals)
+        assert self.pre_signals == post_signals
 
     def test_model_signals(self):
         """ Model saves should throw some signals. """
@@ -267,97 +267,76 @@ def load_existing_author():
             self.get_signal_output(lambda: None)  # eliminate signal output
             a1 = self.Author.objects(name="Bill Shakespeare")[0]
 
-        self.assertEqual(
-            self.get_signal_output(create_author),
-            [
-                "pre_init signal, Author",
-                {"name": "Bill Shakespeare"},
-                "post_init signal, Bill Shakespeare, document._created = True",
-            ],
-        )
+        assert self.get_signal_output(create_author) == [
+            "pre_init signal, Author",
+            {"name": "Bill Shakespeare"},
+            "post_init signal, Bill Shakespeare, document._created = True",
+        ]
 
         a1 = self.Author(name="Bill Shakespeare")
-        self.assertEqual(
-            self.get_signal_output(a1.save),
-            [
-                "pre_save signal, Bill Shakespeare",
-                {},
-                "pre_save_post_validation signal, Bill Shakespeare",
-                "Is created",
-                {},
-                "post_save signal, Bill Shakespeare",
-                "post_save dirty keys, ['name']",
-                "Is created",
-                {},
-            ],
-        )
+        assert self.get_signal_output(a1.save) == [
+            "pre_save signal, Bill Shakespeare",
+            {},
+            "pre_save_post_validation signal, Bill Shakespeare",
+            "Is created",
+            {},
+            "post_save signal, Bill Shakespeare",
+            "post_save dirty keys, ['name']",
+            "Is created",
+            {},
+        ]
 
         a1.reload()
         a1.name = "William Shakespeare"
-        self.assertEqual(
-            self.get_signal_output(a1.save),
-            [
-                "pre_save signal, William Shakespeare",
-                {},
-                "pre_save_post_validation signal, William Shakespeare",
-                "Is updated",
-                {},
-                "post_save signal, William Shakespeare",
-                "post_save dirty keys, ['name']",
-                "Is updated",
-                {},
-            ],
-        )
-
-        self.assertEqual(
-            self.get_signal_output(a1.delete),
-            [
-                "pre_delete signal, William Shakespeare",
-                {},
-                "post_delete signal, William Shakespeare",
-                {},
-            ],
-        )
-
-        self.assertEqual(
-            self.get_signal_output(load_existing_author),
-            [
-                "pre_init signal, Author",
-                {"id": 2, "name": "Bill Shakespeare"},
-                "post_init signal, Bill Shakespeare, document._created = False",
-            ],
-        )
-
-        self.assertEqual(
-            self.get_signal_output(bulk_create_author_with_load),
-            [
-                "pre_init signal, Author",
-                {"name": "Bill Shakespeare"},
-                "post_init signal, Bill Shakespeare, document._created = True",
-                "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
-                {},
-                "pre_init signal, Author",
-                {"id": 3, "name": "Bill Shakespeare"},
-                "post_init signal, Bill Shakespeare, document._created = False",
-                "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
-                "Is loaded",
-                {},
-            ],
-        )
-
-        self.assertEqual(
-            self.get_signal_output(bulk_create_author_without_load),
-            [
-                "pre_init signal, Author",
-                {"name": "Bill Shakespeare"},
-                "post_init signal, Bill Shakespeare, document._created = True",
-                "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
-                {},
-                "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
-                "Not loaded",
-                {},
-            ],
-        )
+        assert self.get_signal_output(a1.save) == [
+            "pre_save signal, William Shakespeare",
+            {},
+            "pre_save_post_validation signal, William Shakespeare",
+            "Is updated",
+            {},
+            "post_save signal, William Shakespeare",
+            "post_save dirty keys, ['name']",
+            "Is updated",
+            {},
+        ]
+
+        assert self.get_signal_output(a1.delete) == [
+            "pre_delete signal, William Shakespeare",
+            {},
+            "post_delete signal, William Shakespeare",
+            {},
+        ]
+
+        assert self.get_signal_output(load_existing_author) == [
+            "pre_init signal, Author",
+            {"id": 2, "name": "Bill Shakespeare"},
+            "post_init signal, Bill Shakespeare, document._created = False",
+        ]
+
+        assert self.get_signal_output(bulk_create_author_with_load) == [
+            "pre_init signal, Author",
+            {"name": "Bill Shakespeare"},
+            "post_init signal, Bill Shakespeare, document._created = True",
+            "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
+            {},
+            "pre_init signal, Author",
+            {"id": 3, "name": "Bill Shakespeare"},
+            "post_init signal, Bill Shakespeare, document._created = False",
+            "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
+            "Is loaded",
+            {},
+        ]
+
+        assert self.get_signal_output(bulk_create_author_without_load) == [
+            "pre_init signal, Author",
+            {"name": "Bill Shakespeare"},
+            "post_init signal, Bill Shakespeare, document._created = True",
+            "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
+            {},
+            "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
+            "Not loaded",
+            {},
+        ]
 
     def test_signal_kwargs(self):
         """ Make sure signal_kwargs is passed to signals calls. """
@@ -367,83 +346,74 @@ def live_and_let_die():
             a.save(signal_kwargs={"live": True, "die": False})
             a.delete(signal_kwargs={"live": False, "die": True})
 
-        self.assertEqual(
-            self.get_signal_output(live_and_let_die),
-            [
-                "pre_init signal, Author",
-                {"name": "Bill Shakespeare"},
-                "post_init signal, Bill Shakespeare, document._created = True",
-                "pre_save signal, Bill Shakespeare",
-                {"die": False, "live": True},
-                "pre_save_post_validation signal, Bill Shakespeare",
-                "Is created",
-                {"die": False, "live": True},
-                "post_save signal, Bill Shakespeare",
-                "post_save dirty keys, ['name']",
-                "Is created",
-                {"die": False, "live": True},
-                "pre_delete signal, Bill Shakespeare",
-                {"die": True, "live": False},
-                "post_delete signal, Bill Shakespeare",
-                {"die": True, "live": False},
-            ],
-        )
+        assert self.get_signal_output(live_and_let_die) == [
+            "pre_init signal, Author",
+            {"name": "Bill Shakespeare"},
+            "post_init signal, Bill Shakespeare, document._created = True",
+            "pre_save signal, Bill Shakespeare",
+            {"die": False, "live": True},
+            "pre_save_post_validation signal, Bill Shakespeare",
+            "Is created",
+            {"die": False, "live": True},
+            "post_save signal, Bill Shakespeare",
+            "post_save dirty keys, ['name']",
+            "Is created",
+            {"die": False, "live": True},
+            "pre_delete signal, Bill Shakespeare",
+            {"die": True, "live": False},
+            "post_delete signal, Bill Shakespeare",
+            {"die": True, "live": False},
+        ]
 
         def bulk_create_author():
             a1 = self.Author(name="Bill Shakespeare")
             self.Author.objects.insert([a1], signal_kwargs={"key": True})
 
-        self.assertEqual(
-            self.get_signal_output(bulk_create_author),
-            [
-                "pre_init signal, Author",
-                {"name": "Bill Shakespeare"},
-                "post_init signal, Bill Shakespeare, document._created = True",
-                "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
-                {"key": True},
-                "pre_init signal, Author",
-                {"id": 2, "name": "Bill Shakespeare"},
-                "post_init signal, Bill Shakespeare, document._created = False",
-                "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
-                "Is loaded",
-                {"key": True},
-            ],
-        )
+        assert self.get_signal_output(bulk_create_author) == [
+            "pre_init signal, Author",
+            {"name": "Bill Shakespeare"},
+            "post_init signal, Bill Shakespeare, document._created = True",
+            "pre_bulk_insert signal, [<Author: Bill Shakespeare>]",
+            {"key": True},
+            "pre_init signal, Author",
+            {"id": 2, "name": "Bill Shakespeare"},
+            "post_init signal, Bill Shakespeare, document._created = False",
+            "post_bulk_insert signal, [<Author: Bill Shakespeare>]",
+            "Is loaded",
+            {"key": True},
+        ]
 
     def test_queryset_delete_signals(self):
         """ Queryset delete should throw some signals. """
 
         self.Another(name="Bill Shakespeare").save()
-        self.assertEqual(
-            self.get_signal_output(self.Another.objects.delete),
-            [
-                "pre_delete signal, Bill Shakespeare",
-                {},
-                "post_delete signal, Bill Shakespeare",
-                {},
-            ],
-        )
+        assert self.get_signal_output(self.Another.objects.delete) == [
+            "pre_delete signal, Bill Shakespeare",
+            {},
+            "post_delete signal, Bill Shakespeare",
+            {},
+        ]
 
     def test_signals_with_explicit_doc_ids(self):
         """ Model saves must have a created flag the first time."""
         ei = self.ExplicitId(id=123)
         # post save must received the created flag, even if there's already
         # an object id present
-        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
+        assert self.get_signal_output(ei.save) == ["Is created"]
         # second time, it must be an update
-        self.assertEqual(self.get_signal_output(ei.save), ["Is updated"])
+        assert self.get_signal_output(ei.save) == ["Is updated"]
 
     def test_signals_with_switch_collection(self):
         ei = self.ExplicitId(id=123)
         ei.switch_collection("explicit__1")
-        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
+        assert self.get_signal_output(ei.save) == ["Is created"]
         ei.switch_collection("explicit__1")
-        self.assertEqual(self.get_signal_output(ei.save), ["Is updated"])
+        assert self.get_signal_output(ei.save) == ["Is updated"]
 
         ei.switch_collection("explicit__1", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
+        assert self.get_signal_output(ei.save) == ["Is created"]
         ei.switch_collection("explicit__1", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
+        assert self.get_signal_output(ei.save) == ["Is created"]
 
     def test_signals_with_switch_db(self):
         connect("mongoenginetest")
@@ -451,14 +421,14 @@ def test_signals_with_switch_db(self):
 
         ei = self.ExplicitId(id=123)
         ei.switch_db("testdb-1")
-        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
+        assert self.get_signal_output(ei.save) == ["Is created"]
         ei.switch_db("testdb-1")
-        self.assertEqual(self.get_signal_output(ei.save), ["Is updated"])
+        assert self.get_signal_output(ei.save) == ["Is updated"]
 
         ei.switch_db("testdb-1", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
+        assert self.get_signal_output(ei.save) == ["Is created"]
         ei.switch_db("testdb-1", keep_created=False)
-        self.assertEqual(self.get_signal_output(ei.save), ["Is created"])
+        assert self.get_signal_output(ei.save) == ["Is created"]
 
     def test_signals_bulk_insert(self):
         def bulk_set_active_post():
@@ -470,16 +440,13 @@ def bulk_set_active_post():
             self.Post.objects.insert(posts)
 
         results = self.get_signal_output(bulk_set_active_post)
-        self.assertEqual(
-            results,
-            [
-                "pre_bulk_insert signal, [(<Post: Post 1>, {'active': False}), (<Post: Post 2>, {'active': False}), (<Post: Post 3>, {'active': False})]",
-                {},
-                "post_bulk_insert signal, [(<Post: Post 1>, {'active': True}), (<Post: Post 2>, {'active': True}), (<Post: Post 3>, {'active': True})]",
-                "Is loaded",
-                {},
-            ],
-        )
+        assert results == [
+            "pre_bulk_insert signal, [(<Post: Post 1>, {'active': False}), (<Post: Post 2>, {'active': False}), (<Post: Post 3>, {'active': False})]",
+            {},
+            "post_bulk_insert signal, [(<Post: Post 1>, {'active': True}), (<Post: Post 2>, {'active': True}), (<Post: Post 3>, {'active': True})]",
+            "Is loaded",
+            {},
+        ]
 
 
 if __name__ == "__main__":
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 897c19b25..ccb44aacf 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -2,6 +2,7 @@
 import unittest
 
 from mongoengine.base.utils import LazyRegexCompiler
+import pytest
 
 signal_output = []
 
@@ -12,21 +13,21 @@ class UserEmail(object):
             EMAIL_REGEX = LazyRegexCompiler("@", flags=32)
 
         descriptor = UserEmail.__dict__["EMAIL_REGEX"]
-        self.assertIsNone(descriptor._compiled_regex)
+        assert descriptor._compiled_regex is None
 
         regex = UserEmail.EMAIL_REGEX
-        self.assertEqual(regex, re.compile("@", flags=32))
-        self.assertEqual(regex.search("user@domain.com").group(), "@")
+        assert regex == re.compile("@", flags=32)
+        assert regex.search("user@domain.com").group() == "@"
 
         user_email = UserEmail()
-        self.assertIs(user_email.EMAIL_REGEX, UserEmail.EMAIL_REGEX)
+        assert user_email.EMAIL_REGEX is UserEmail.EMAIL_REGEX
 
     def test_lazy_regex_compiler_verify_cannot_set_descriptor_on_instance(self):
         class UserEmail(object):
             EMAIL_REGEX = LazyRegexCompiler("@")
 
         user_email = UserEmail()
-        with self.assertRaises(AttributeError):
+        with pytest.raises(AttributeError):
             user_email.EMAIL_REGEX = re.compile("@")
 
     def test_lazy_regex_compiler_verify_can_override_class_attr(self):
@@ -34,6 +35,4 @@ class UserEmail(object):
             EMAIL_REGEX = LazyRegexCompiler("@")
 
         UserEmail.EMAIL_REGEX = re.compile("cookies")
-        self.assertEqual(
-            UserEmail.EMAIL_REGEX.search("Cake & cookies").group(), "cookies"
-        )
+        assert UserEmail.EMAIL_REGEX.search("Cake & cookies").group() == "cookies"

From 3e764d068c2b09c500b6226505e662389e6427b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 31 Aug 2019 22:40:54 +0300
Subject: [PATCH 0946/1519] fix remaining assertRaises

---
 tests/document/test_indexes.py               |  4 +-
 tests/document/test_inheritance.py           | 10 ++---
 tests/document/test_instance.py              | 36 +++++++--------
 tests/fields/test_dict_field.py              |  8 ++--
 tests/fields/test_email_field.py             |  5 ++-
 tests/fields/test_embedded_document_field.py | 20 ++++-----
 tests/fields/test_fields.py                  | 46 +++++++++-----------
 tests/fields/test_url_field.py               |  4 +-
 tests/queryset/test_queryset.py              | 11 +++--
 tests/test_connection.py                     | 12 ++---
 10 files changed, 76 insertions(+), 80 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index cc1aae52e..6c31054a9 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -595,12 +595,12 @@ class Blog(Document):
 
         Blog.drop_collection()
 
-        with pytest.raises(OperationFailure) as ctx_err:
+        with pytest.raises(OperationFailure) as exc_info:
             Blog(id="garbage").save()
 
         # One of the errors below should happen. Which one depends on the
         # PyMongo version and dict order.
-        err_msg = str(ctx_err.exception)
+        err_msg = str(exc_info.value)
         assert any(
             [
                 "The field 'unique' is not valid for an _id index specification"
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index 6a913b3e5..3e5156539 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -335,13 +335,13 @@ class Animal(Document):
             name = StringField()
 
         # can't inherit because Animal didn't explicitly allow inheritance
-        with pytest.raises(ValueError) as cm:
+        with pytest.raises(
+            ValueError, match="Document Animal may not be subclassed"
+        ) as exc_info:
 
             class Dog(Animal):
                 pass
 
-        assert "Document Animal may not be subclassed" in str(cm.exception)
-
         # Check that _cls etc aren't present on simple documents
         dog = Animal(name="dog").save()
         assert dog.to_mongo().keys() == ["_id", "name"]
@@ -358,13 +358,13 @@ class Animal(Document):
             name = StringField()
             meta = {"allow_inheritance": True}
 
-        with pytest.raises(ValueError) as cm:
+        with pytest.raises(ValueError) as exc_info:
 
             class Mammal(Animal):
                 meta = {"allow_inheritance": False}
 
         assert (
-            str(cm.exception)
+            str(exc_info.value)
             == 'Only direct subclasses of Document may set "allow_inheritance" to False'
         )
 
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 01dc492b1..c7bc113e7 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -350,14 +350,11 @@ class User(Document):
             name = StringField()
             meta = {"allow_inheritance": True}
 
-        with pytest.raises(ValueError) as e:
+        with pytest.raises(ValueError, match="Cannot override primary key field") as e:
 
             class EmailUser(User):
                 email = StringField(primary_key=True)
 
-        exc = e.exception
-        assert str(exc) == "Cannot override primary key field"
-
     def test_custom_id_field_is_required(self):
         """Ensure the custom primary key field is required."""
 
@@ -365,10 +362,9 @@ class User(Document):
             username = StringField(primary_key=True)
             name = StringField()
 
-        with pytest.raises(ValidationError) as e:
+        with pytest.raises(ValidationError) as exc_info:
             User(name="test").save()
-        exc = e.exception
-        assert "Field is required: ['username']" in str(exc)
+        assert "Field is required: ['username']" in str(exc_info.value)
 
     def test_document_not_registered(self):
         class Place(Document):
@@ -870,12 +866,12 @@ class TestDocument(Document):
 
         t = TestDocument(doc=TestEmbeddedDocument(x=10, y=25, z=15))
 
-        with pytest.raises(ValidationError) as cm:
+        with pytest.raises(ValidationError) as exc_info:
             t.save()
 
         expected_msg = "Value of z != x + y"
-        assert expected_msg in cm.exception.message
-        assert cm.exception.to_dict() == {"doc": {"__all__": expected_msg}}
+        assert expected_msg in str(exc_info.value)
+        assert exc_info.value.to_dict() == {"doc": {"__all__": expected_msg}}
 
         t = TestDocument(doc=TestEmbeddedDocument(x=10, y=25)).save()
         assert t.doc.z == 35
@@ -3208,43 +3204,47 @@ def __eq__(self, other):
 
     def test_positional_creation(self):
         """Document cannot be instantiated using positional arguments."""
-        with pytest.raises(TypeError) as e:
+        with pytest.raises(TypeError) as exc_info:
             person = self.Person("Test User", 42)
+
         expected_msg = (
             "Instantiating a document with positional arguments is not "
             "supported. Please use `field_name=value` keyword arguments."
         )
-        assert str(e.exception) == expected_msg
+        assert str(exc_info.value) == expected_msg
 
     def test_mixed_creation(self):
         """Document cannot be instantiated using mixed arguments."""
-        with pytest.raises(TypeError) as e:
+        with pytest.raises(TypeError) as exc_info:
             person = self.Person("Test User", age=42)
+
         expected_msg = (
             "Instantiating a document with positional arguments is not "
             "supported. Please use `field_name=value` keyword arguments."
         )
-        assert str(e.exception) == expected_msg
+        assert str(exc_info.value) == expected_msg
 
     def test_positional_creation_embedded(self):
         """Embedded document cannot be created using positional arguments."""
-        with pytest.raises(TypeError) as e:
+        with pytest.raises(TypeError) as exc_info:
             job = self.Job("Test Job", 4)
+
         expected_msg = (
             "Instantiating a document with positional arguments is not "
             "supported. Please use `field_name=value` keyword arguments."
         )
-        assert str(e.exception) == expected_msg
+        assert str(exc_info.value) == expected_msg
 
     def test_mixed_creation_embedded(self):
         """Embedded document cannot be created using mixed arguments."""
-        with pytest.raises(TypeError) as e:
+        with pytest.raises(TypeError) as exc_info:
             job = self.Job("Test Job", years=4)
+
         expected_msg = (
             "Instantiating a document with positional arguments is not "
             "supported. Please use `field_name=value` keyword arguments."
         )
-        assert str(e.exception) == expected_msg
+        assert str(exc_info.value) == expected_msg
 
     def test_data_contains_id_field(self):
         """Ensure that asking for _data returns 'id'."""
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 56df682f9..7dda2a9c7 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -270,10 +270,12 @@ class Embedded(EmbeddedDocument):
 
         embed = Embedded(name="garbage")
         doc = DictFieldTest(dictionary=embed)
-        with pytest.raises(ValidationError) as ctx_err:
+        with pytest.raises(ValidationError) as exc_info:
             doc.validate()
-        assert "'dictionary'" in str(ctx_err.exception)
-        assert "Only dictionaries may be used in a DictField" in str(ctx_err.exception)
+
+        error_msg = str(exc_info.value)
+        assert "'dictionary'" in error_msg
+        assert "Only dictionaries may be used in a DictField" in error_msg
 
     def test_atomic_update_dict_field(self):
         """Ensure that the entire DictField can be atomically updated."""
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
index b8d3d1690..902a7c42d 100644
--- a/tests/fields/test_email_field.py
+++ b/tests/fields/test_email_field.py
@@ -88,9 +88,10 @@ class User(Document):
 
         invalid_idn = ".google.com"
         user = User(email="me@%s" % invalid_idn)
-        with pytest.raises(ValidationError) as ctx_err:
+
+        with pytest.raises(ValidationError) as exc_info:
             user.validate()
-        assert "domain failed IDN encoding" in str(ctx_err.exception)
+        assert "domain failed IDN encoding" in str(exc_info.value)
 
     def test_email_field_ip_domain(self):
         class User(Document):
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 4fcf6bf13..9e6871cca 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -36,11 +36,11 @@ class MyDoc(Document):
             name = StringField()
 
         emb = EmbeddedDocumentField("MyDoc")
-        with pytest.raises(ValidationError) as ctx:
+        with pytest.raises(ValidationError) as exc_info:
             emb.document_type
         assert (
             "Invalid embedded document class provided to an EmbeddedDocumentField"
-            in str(ctx.exception)
+            in str(exc_info.value)
         )
 
     def test_embedded_document_field_only_allow_subclasses_of_embedded_document(self):
@@ -72,9 +72,9 @@ class Person(Document):
         p = Person(settings=AdminSettings(foo1="bar1", foo2="bar2"), name="John").save()
 
         # Test non exiting attribute
-        with pytest.raises(InvalidQueryError) as ctx_err:
+        with pytest.raises(InvalidQueryError) as exc_info:
             Person.objects(settings__notexist="bar").first()
-        assert unicode(ctx_err.exception) == u'Cannot resolve field "notexist"'
+        assert unicode(exc_info.value) == u'Cannot resolve field "notexist"'
 
         with pytest.raises(LookUpError):
             Person.objects.only("settings.notexist")
@@ -108,9 +108,9 @@ class Person(Document):
         p.save()
 
         # Test non exiting attribute
-        with pytest.raises(InvalidQueryError) as ctx_err:
+        with pytest.raises(InvalidQueryError) as exc_info:
             assert Person.objects(settings__notexist="bar").first().id == p.id
-        assert unicode(ctx_err.exception) == u'Cannot resolve field "notexist"'
+        assert unicode(exc_info.value) == u'Cannot resolve field "notexist"'
 
         # Test existing attribute
         assert Person.objects(settings__base_foo="basefoo").first().id == p.id
@@ -316,9 +316,9 @@ class Person(Document):
         p2 = Person(settings=NonAdminSettings(foo2="bar2")).save()
 
         # Test non exiting attribute
-        with pytest.raises(InvalidQueryError) as ctx_err:
+        with pytest.raises(InvalidQueryError) as exc_info:
             Person.objects(settings__notexist="bar").first()
-        assert unicode(ctx_err.exception) == u'Cannot resolve field "notexist"'
+        assert unicode(exc_info.value) == u'Cannot resolve field "notexist"'
 
         with pytest.raises(LookUpError):
             Person.objects.only("settings.notexist")
@@ -344,9 +344,9 @@ class Person(Document):
         p.save()
 
         # Test non exiting attribute
-        with pytest.raises(InvalidQueryError) as ctx_err:
+        with pytest.raises(InvalidQueryError) as exc_info:
             assert Person.objects(settings__notexist="bar").first().id == p.id
-        assert unicode(ctx_err.exception) == u'Cannot resolve field "notexist"'
+        assert unicode(exc_info.value) == u'Cannot resolve field "notexist"'
 
         # Test existing attribute
         assert Person.objects(settings__base_foo="basefoo").first().id == p.id
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index b27d95d2b..0ce65087b 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -96,13 +96,13 @@ class Person(Document):
             "it should raise a ValidationError if validation fails"
         )
 
-        with pytest.raises(DeprecatedError) as ctx_err:
+        with pytest.raises(DeprecatedError) as exc_info:
             Person(name="").validate()
-        assert str(ctx_err.exception) == error
+        assert str(exc_info.value) == error
 
-        with pytest.raises(DeprecatedError) as ctx_err:
+        with pytest.raises(DeprecatedError) as exc_info:
             Person(name="").save()
-        assert str(ctx_err.exception) == error
+        assert str(exc_info.value) == error
 
     def test_custom_field_validation_raise_validation_error(self):
         def _not_empty(z):
@@ -114,16 +114,10 @@ class Person(Document):
 
         Person.drop_collection()
 
-        with pytest.raises(ValidationError) as ctx_err:
+        with pytest.raises(ValidationError) as exc_info:
             Person(name="").validate()
         assert "ValidationError (Person:None) (cantbeempty: ['name'])" == str(
-            ctx_err.exception
-        )
-
-        with pytest.raises(ValidationError):
-            Person(name="").save()
-        assert "ValidationError (Person:None) (cantbeempty: ['name'])" == str(
-            ctx_err.exception
+            exc_info.value
         )
 
         Person(name="garbage").validate()
@@ -1029,9 +1023,9 @@ class Foo(Document):
             if i < 6:
                 foo.save()
             else:
-                with pytest.raises(ValidationError) as cm:
+                with pytest.raises(ValidationError) as exc_info:
                     foo.save()
-                assert "List is too long" in str(cm.exception)
+                assert "List is too long" in str(exc_info.value)
 
     def test_list_field_max_length_set_operator(self):
         """Ensure ListField's max_length is respected for a "set" operator."""
@@ -1040,9 +1034,9 @@ class Foo(Document):
             items = ListField(IntField(), max_length=3)
 
         foo = Foo.objects.create(items=[1, 2, 3])
-        with pytest.raises(ValidationError) as cm:
+        with pytest.raises(ValidationError) as exc_info:
             foo.modify(set__items=[1, 2, 3, 4])
-        assert "List is too long" in str(cm.exception)
+        assert "List is too long" in str(exc_info.value)
 
     def test_list_field_rejects_strings(self):
         """Strings aren't valid list field data types."""
@@ -2325,21 +2319,21 @@ class Title(Document):
         # Test with an embeddedDocument instead of a list(embeddedDocument)
         # It's an edge case but it used to fail with a vague error, making it difficult to troubleshoot it
         post = self.BlogPost(comments=comment)
-        with pytest.raises(ValidationError) as ctx_err:
+        with pytest.raises(ValidationError) as exc_info:
             post.validate()
-        assert "'comments'" in str(ctx_err.exception)
-        assert "Only lists and tuples may be used in a list field" in str(
-            ctx_err.exception
-        )
+
+        error_msg = str(exc_info.value)
+        assert "'comments'" in error_msg
+        assert "Only lists and tuples may be used in a list field" in error_msg
 
         # Test with a Document
         post = self.BlogPost(comments=Title(content="garbage"))
-        with pytest.raises(ValidationError):
+        with pytest.raises(ValidationError) as exc_info:
             post.validate()
-        assert "'comments'" in str(ctx_err.exception)
-        assert "Only lists and tuples may be used in a list field" in str(
-            ctx_err.exception
-        )
+
+        error_msg = str(exc_info.value)
+        assert "'comments'" in error_msg
+        assert "Only lists and tuples may be used in a list field" in error_msg
 
     def test_no_keyword_filter(self):
         """
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index e7df0e08f..e125f56a9 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -31,10 +31,10 @@ class Link(Document):
 
         # TODO fix URL validation - this *IS* a valid URL
         # For now we just want to make sure that the error message is correct
-        with pytest.raises(ValidationError) as ctx_err:
+        with pytest.raises(ValidationError) as exc_info:
             link.validate()
         assert (
-            unicode(ctx_err.exception)
+            unicode(exc_info.value)
             == u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])"
         )
 
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index d154de8dd..31abb42fc 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -908,20 +908,20 @@ class Blog(Document):
         assert Blog.objects.count() == 2
 
         # test inserting an existing document (shouldn't be allowed)
-        with pytest.raises(OperationError) as cm:
+        with pytest.raises(OperationError) as exc_info:
             blog = Blog.objects.first()
             Blog.objects.insert(blog)
         assert (
-            str(cm.exception)
+            str(exc_info.value)
             == "Some documents have ObjectIds, use doc.update() instead"
         )
 
         # test inserting a query set
-        with pytest.raises(OperationError) as cm:
+        with pytest.raises(OperationError) as exc_info:
             blogs_qs = Blog.objects
             Blog.objects.insert(blogs_qs)
         assert (
-            str(cm.exception)
+            str(exc_info.value)
             == "Some documents have ObjectIds, use doc.update() instead"
         )
 
@@ -5053,9 +5053,8 @@ class Person(Document):
         Person(name="a").save()
         qs = Person.objects()
         _ = list(qs)
-        with pytest.raises(OperationError) as ctx_err:
+        with pytest.raises(OperationError, match="QuerySet already cached") as ctx_err:
             qs.no_cache()
-        assert "QuerySet already cached" == str(ctx_err.exception)
 
     def test_no_cached_queryset_no_cache_back_to_cache(self):
         class Person(Document):
diff --git a/tests/test_connection.py b/tests/test_connection.py
index c73b67d19..8db69b0c3 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -142,22 +142,22 @@ class History2(Document):
     def test_connect_fails_if_connect_2_times_with_default_alias(self):
         connect("mongoenginetest")
 
-        with pytest.raises(ConnectionFailure) as ctx_err:
+        with pytest.raises(ConnectionFailure) as exc_info:
             connect("mongoenginetest2")
         assert (
             "A different connection with alias `default` was already registered. Use disconnect() first"
-            == str(ctx_err.exception)
+            == str(exc_info.value)
         )
 
     def test_connect_fails_if_connect_2_times_with_custom_alias(self):
         connect("mongoenginetest", alias="alias1")
 
-        with pytest.raises(ConnectionFailure) as ctx_err:
+        with pytest.raises(ConnectionFailure) as exc_info:
             connect("mongoenginetest2", alias="alias1")
 
         assert (
             "A different connection with alias `alias1` was already registered. Use disconnect() first"
-            == str(ctx_err.exception)
+            == str(exc_info.value)
         )
 
     def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way(
@@ -366,9 +366,9 @@ class History(Document):
 
         assert History._collection is None
 
-        with pytest.raises(ConnectionFailure) as ctx_err:
+        with pytest.raises(ConnectionFailure) as exc_info:
             History.objects.first()
-        assert "You have not defined a default connection" == str(ctx_err.exception)
+        assert "You have not defined a default connection" == str(exc_info.value)
 
     def test_connect_disconnect_works_on_same_document(self):
         """Ensure that the connect/disconnect works properly with a single Document"""

From c61c6a85253e76fe5ef8d7da48af94d248e3786f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 31 Aug 2019 22:51:13 +0300
Subject: [PATCH 0947/1519] fix == None assertions

---
 tests/document/test_class_methods.py |  2 +-
 tests/document/test_inheritance.py   |  4 +--
 tests/document/test_instance.py      | 32 +++++++++---------
 tests/document/test_validation.py    |  2 +-
 tests/fields/test_fields.py          | 10 +++---
 tests/queryset/test_field_list.py    | 50 ++++++++++++++--------------
 tests/queryset/test_modify.py        |  6 ++--
 tests/queryset/test_queryset.py      | 28 ++++++++--------
 tests/queryset/test_visitor.py       |  4 +--
 tests/test_datastructures.py         |  2 +-
 10 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/tests/document/test_class_methods.py b/tests/document/test_class_methods.py
index 98909d2f4..be883b2a2 100644
--- a/tests/document/test_class_methods.py
+++ b/tests/document/test_class_methods.py
@@ -72,7 +72,7 @@ def test_register_delete_rule(self):
         class Job(Document):
             employee = ReferenceField(self.Person)
 
-        assert self.Person._meta.get("delete_rules") == None
+        assert self.Person._meta.get("delete_rules") is None
 
         self.Person.register_delete_rule(Job, "employee", NULLIFY)
         assert self.Person._meta["delete_rules"] == {(Job, "employee"): NULLIFY}
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index 3e5156539..b6b6088ad 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -559,8 +559,8 @@ class Human(Mammal):
         assert "collection" not in Animal._meta
         assert "collection" not in Mammal._meta
 
-        assert Animal._get_collection_name() == None
-        assert Mammal._get_collection_name() == None
+        assert Animal._get_collection_name() is None
+        assert Mammal._get_collection_name() is None
 
         assert Fish._get_collection_name() == "fish"
         assert Guppy._get_collection_name() == "fish"
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index c7bc113e7..578153559 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -1391,7 +1391,7 @@ def test_update(self):
 
         person.reload()
         assert person.name == "User"
-        assert person.age == None
+        assert person.age is None
 
         person = self.Person.objects.get()
         person.name = None
@@ -1399,8 +1399,8 @@ def test_update(self):
         person.save()
 
         person.reload()
-        assert person.name == None
-        assert person.age == None
+        assert person.name is None
+        assert person.age is None
 
     def test_update_rename_operator(self):
         """Test the $rename operator."""
@@ -2018,7 +2018,7 @@ class Employee(self.Person):
         promoted_employee.save()
 
         promoted_employee.reload()
-        assert promoted_employee.details == None
+        assert promoted_employee.details is None
 
     def test_object_mixins(self):
         class NameMixin(object):
@@ -2154,7 +2154,7 @@ class BlogPost(Document):
         reviewer.delete()
         # No effect on the BlogPost
         assert BlogPost.objects.count() == 1
-        assert BlogPost.objects.get().reviewer == None
+        assert BlogPost.objects.get().reviewer is None
 
         # Delete the Person, which should lead to deletion of the BlogPost, too
         author.delete()
@@ -2200,7 +2200,7 @@ class Book(Document):
 
         reviewer.delete()
         assert Book.objects.count() == 1
-        assert Book.objects.get().reviewer == None
+        assert Book.objects.get().reviewer is None
 
         user.delete()
         assert Book.objects.count() == 0
@@ -2267,7 +2267,7 @@ class BlogPost(Document):
 
         reviewer.delete()
         assert BlogPost.objects.count() == 1
-        assert BlogPost.objects.get().reviewer == None
+        assert BlogPost.objects.get().reviewer is None
 
         # Delete the Writer should lead to deletion of the BlogPost
         author.delete()
@@ -2378,7 +2378,7 @@ class Foo(Document):
         f.delete()
 
         assert Bar.objects.count() == 1  # No effect on the BlogPost
-        assert Bar.objects.get().foo == None
+        assert Bar.objects.get().foo is None
 
     def test_invalid_reverse_delete_rule_raise_errors(self):
         with pytest.raises(InvalidDocumentError):
@@ -3464,7 +3464,7 @@ class Person(Document):
 
         p = Person.from_json('{"name": "name"}', created=False)
         assert p._created == False
-        assert p.id == None
+        assert p.id is None
 
         # Make sure the document is subsequently persisted correctly.
         p.save()
@@ -3540,13 +3540,13 @@ class User(Document):
         u_from_db = User.objects.get(name="user")
         u_from_db.height = None
         u_from_db.save()
-        assert u_from_db.height == None
+        assert u_from_db.height is None
         # 864
-        assert u_from_db.str_fld == None
-        assert u_from_db.int_fld == None
-        assert u_from_db.flt_fld == None
-        assert u_from_db.dt_fld == None
-        assert u_from_db.cdt_fld == None
+        assert u_from_db.str_fld is None
+        assert u_from_db.int_fld is None
+        assert u_from_db.flt_fld is None
+        assert u_from_db.dt_fld is None
+        assert u_from_db.cdt_fld is None
 
         # 735
         User.objects.delete()
@@ -3554,7 +3554,7 @@ class User(Document):
         u.save()
         User.objects(name="user").update_one(set__height=None, upsert=True)
         u_from_db = User.objects.get(name="user")
-        assert u_from_db.height == None
+        assert u_from_db.height is None
 
     def test_not_saved_eq(self):
         """Ensure we can compare documents not saved.
diff --git a/tests/document/test_validation.py b/tests/document/test_validation.py
index 806019943..dfae5baee 100644
--- a/tests/document/test_validation.py
+++ b/tests/document/test_validation.py
@@ -110,7 +110,7 @@ class Comment(EmbeddedDocument):
 
         comment.date = datetime.now()
         comment.validate()
-        assert comment._instance == None
+        assert comment._instance is None
 
     def test_embedded_db_field_validate(self):
         class SubDoc(EmbeddedDocument):
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 0ce65087b..21cc78be9 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -180,7 +180,7 @@ class Person(Document):
 
         assert person.validate() is None
 
-        assert person.name == None
+        assert person.name is None
         assert person.age == 30
         assert person.userid == "test"
         assert isinstance(person.created, datetime.datetime)
@@ -250,7 +250,7 @@ class Person(Document):
 
         assert person.validate() is None
 
-        assert person.name == None
+        assert person.name is None
         assert person.age == 30
         assert person.userid == "test"
         assert isinstance(person.created, datetime.datetime)
@@ -363,7 +363,7 @@ class Person(Document):
             name = StringField()
 
         person = Person(name="Test User")
-        assert person.id == None
+        assert person.id is None
 
         person.id = 47
         with pytest.raises(ValidationError):
@@ -1970,7 +1970,7 @@ class Shirt(Document):
         shirt2 = Shirt()
 
         # Make sure get_<field>_display returns the default value (or None)
-        assert shirt1.get_size_display() == None
+        assert shirt1.get_size_display() is None
         assert shirt1.get_style_display() == "Wide"
 
         shirt1.size = "XXL"
@@ -2024,7 +2024,7 @@ class Shirt(Document):
 
         shirt = Shirt()
 
-        assert shirt.get_size_display() == None
+        assert shirt.get_size_display() is None
         assert shirt.get_style_display() == "Small"
 
         shirt.size = "XXL"
diff --git a/tests/queryset/test_field_list.py b/tests/queryset/test_field_list.py
index d33c4c866..a2bf6f1fa 100644
--- a/tests/queryset/test_field_list.py
+++ b/tests/queryset/test_field_list.py
@@ -154,10 +154,10 @@ def test_only(self):
 
         obj = self.Person.objects.only("name").get()
         assert obj.name == person.name
-        assert obj.age == None
+        assert obj.age is None
 
         obj = self.Person.objects.only("age").get()
-        assert obj.name == None
+        assert obj.name is None
         assert obj.age == person.age
 
         obj = self.Person.objects.only("name", "age").get()
@@ -166,7 +166,7 @@ def test_only(self):
 
         obj = self.Person.objects.only(*("id", "name")).get()
         assert obj.name == person.name
-        assert obj.age == None
+        assert obj.age is None
 
         # Check polymorphism still works
         class Employee(self.Person):
@@ -181,7 +181,7 @@ class Employee(self.Person):
         # Check field names are looked up properly
         obj = Employee.objects(id=employee.id).only("salary").get()
         assert obj.salary == employee.salary
-        assert obj.name == None
+        assert obj.name is None
 
     def test_only_with_subfields(self):
         class User(EmbeddedDocument):
@@ -215,8 +215,8 @@ class BlogPost(Document):
         post.save()
 
         obj = BlogPost.objects.only("author.name").get()
-        assert obj.content == None
-        assert obj.author.email == None
+        assert obj.content is None
+        assert obj.author.email is None
         assert obj.author.name == "Test User"
         assert obj.comments == []
 
@@ -225,15 +225,15 @@ class BlogPost(Document):
 
         obj = BlogPost.objects.only("content", "comments.title").get()
         assert obj.content == "Had a good coffee today..."
-        assert obj.author == None
+        assert obj.author is None
         assert obj.comments[0].title == "I aggree"
         assert obj.comments[1].title == "Coffee"
-        assert obj.comments[0].text == None
-        assert obj.comments[1].text == None
+        assert obj.comments[0].text is None
+        assert obj.comments[1].text is None
 
         obj = BlogPost.objects.only("comments").get()
-        assert obj.content == None
-        assert obj.author == None
+        assert obj.content is None
+        assert obj.author is None
         assert obj.comments[0].title == "I aggree"
         assert obj.comments[1].title == "Coffee"
         assert obj.comments[0].text == "Great post!"
@@ -266,10 +266,10 @@ class BlogPost(Document):
         post.save()
 
         obj = BlogPost.objects.exclude("author", "comments.text").get()
-        assert obj.author == None
+        assert obj.author is None
         assert obj.content == "Had a good coffee today..."
         assert obj.comments[0].title == "I aggree"
-        assert obj.comments[0].text == None
+        assert obj.comments[0].text is None
 
         BlogPost.drop_collection()
 
@@ -304,15 +304,15 @@ class Email(Document):
         assert obj.sender == "me"
         assert obj.to == "you"
         assert obj.subject == "From Russia with Love"
-        assert obj.body == None
-        assert obj.content_type == None
+        assert obj.body is None
+        assert obj.content_type is None
 
         obj = Email.objects.only("sender", "to").exclude("body", "sender").get()
-        assert obj.sender == None
+        assert obj.sender is None
         assert obj.to == "you"
-        assert obj.subject == None
-        assert obj.body == None
-        assert obj.content_type == None
+        assert obj.subject is None
+        assert obj.body is None
+        assert obj.content_type is None
 
         obj = (
             Email.objects.exclude("attachments.content")
@@ -321,12 +321,12 @@ class Email(Document):
             .get()
         )
         assert obj.attachments[0].name == "file1.doc"
-        assert obj.attachments[0].content == None
-        assert obj.sender == None
+        assert obj.attachments[0].content is None
+        assert obj.sender is None
         assert obj.to == "you"
-        assert obj.subject == None
-        assert obj.body == None
-        assert obj.content_type == None
+        assert obj.subject is None
+        assert obj.body is None
+        assert obj.content_type is None
 
         Email.drop_collection()
 
@@ -456,7 +456,7 @@ class User(Base):
         User(username="mongodb", password="secret").save()
 
         user = Base.objects().exclude("password", "wibble").first()
-        assert user.password == None
+        assert user.password is None
 
         with pytest.raises(LookUpError):
             Base.objects.exclude("made_up")
diff --git a/tests/queryset/test_modify.py b/tests/queryset/test_modify.py
index 293a463e0..556e6d9ee 100644
--- a/tests/queryset/test_modify.py
+++ b/tests/queryset/test_modify.py
@@ -35,13 +35,13 @@ def test_modify_with_new(self):
 
     def test_modify_not_existing(self):
         Doc(id=0, value=0).save()
-        assert Doc.objects(id=1).modify(set__value=-1) == None
+        assert Doc.objects(id=1).modify(set__value=-1) is None
         self.assertDbEqual([{"_id": 0, "value": 0}])
 
     def test_modify_with_upsert(self):
         Doc(id=0, value=0).save()
         old_doc = Doc.objects(id=1).modify(set__value=1, upsert=True)
-        assert old_doc == None
+        assert old_doc is None
         self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}])
 
     def test_modify_with_upsert_existing(self):
@@ -68,7 +68,7 @@ def test_modify_with_remove(self):
 
     def test_find_and_modify_with_remove_not_existing(self):
         Doc(id=0, value=0).save()
-        assert Doc.objects(id=1).modify(remove=True) == None
+        assert Doc.objects(id=1).modify(remove=True) is None
         self.assertDbEqual([{"_id": 0, "value": 0}])
 
     def test_modify_with_order_by(self):
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 31abb42fc..f36066099 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -142,7 +142,7 @@ def test_limit(self):
         person = self.Person.objects().limit(1).only("name").first()
         assert person == user_a
         assert person.name == "User A"
-        assert person.age == None
+        assert person.age is None
 
     def test_skip(self):
         """Ensure that QuerySet.skip works as expected."""
@@ -166,7 +166,7 @@ def test_skip(self):
         person = self.Person.objects().skip(1).only("name").first()
         assert person == user_b
         assert person.name == "User B"
-        assert person.age == None
+        assert person.age is None
 
     def test___getitem___invalid_index(self):
         """Ensure slicing a queryset works as expected."""
@@ -444,7 +444,7 @@ def test_update_write_concern(self):
 
         assert result == 2
         result = self.Person.objects.update(set__name="Ross", write_concern={"w": 0})
-        assert result == None
+        assert result is None
 
         result = self.Person.objects.update_one(
             set__name="Test User", write_concern={"w": 1}
@@ -453,7 +453,7 @@ def test_update_write_concern(self):
         result = self.Person.objects.update_one(
             set__name="Test User", write_concern={"w": 0}
         )
-        assert result == None
+        assert result is None
 
     def test_update_update_has_a_value(self):
         """Test to ensure that update is passed a value to update to"""
@@ -1148,7 +1148,7 @@ def test_regex_query_shortcuts(self):
         obj = self.Person.objects(name__contains="van").first()
         assert obj == person
         obj = self.Person.objects(name__contains="Van").first()
-        assert obj == None
+        assert obj is None
 
         # Test icontains
         obj = self.Person.objects(name__icontains="Van").first()
@@ -1158,7 +1158,7 @@ def test_regex_query_shortcuts(self):
         obj = self.Person.objects(name__startswith="Guido").first()
         assert obj == person
         obj = self.Person.objects(name__startswith="guido").first()
-        assert obj == None
+        assert obj is None
 
         # Test istartswith
         obj = self.Person.objects(name__istartswith="guido").first()
@@ -1168,7 +1168,7 @@ def test_regex_query_shortcuts(self):
         obj = self.Person.objects(name__endswith="Rossum").first()
         assert obj == person
         obj = self.Person.objects(name__endswith="rossuM").first()
-        assert obj == None
+        assert obj is None
 
         # Test iendswith
         obj = self.Person.objects(name__iendswith="rossuM").first()
@@ -1178,15 +1178,15 @@ def test_regex_query_shortcuts(self):
         obj = self.Person.objects(name__exact="Guido van Rossum").first()
         assert obj == person
         obj = self.Person.objects(name__exact="Guido van rossum").first()
-        assert obj == None
+        assert obj is None
         obj = self.Person.objects(name__exact="Guido van Rossu").first()
-        assert obj == None
+        assert obj is None
 
         # Test iexact
         obj = self.Person.objects(name__iexact="gUIDO VAN rOSSUM").first()
         assert obj == person
         obj = self.Person.objects(name__iexact="gUIDO VAN rOSSU").first()
-        assert obj == None
+        assert obj is None
 
         # Test unsafe expressions
         person = self.Person(name="Guido van Rossum [.'Geek']")
@@ -1205,7 +1205,7 @@ def test_not(self):
         assert obj == alice
 
         obj = self.Person.objects(name__not__iexact="alice").first()
-        assert obj == None
+        assert obj is None
 
     def test_filter_chaining(self):
         """Ensure filters can be chained together.
@@ -1430,7 +1430,7 @@ class BlogPost(Document):
         BlogPost.objects.create(content="Anonymous post...")
 
         result = BlogPost.objects.get(author=None)
-        assert result.author == None
+        assert result.author is None
 
     def test_find_dict_item(self):
         """Ensure that DictField items may be found.
@@ -2050,7 +2050,7 @@ class BlogPost(Document):
         assert post.title != None
         BlogPost.objects.update_one(unset__title=1)
         post.reload()
-        assert post.title == None
+        assert post.title is None
         pymongo_doc = BlogPost.objects.as_pymongo().first()
         assert "title" not in pymongo_doc
 
@@ -4041,7 +4041,7 @@ class Post(Document):
         assert post.comment == comment
         Post.objects.update(unset__comment=1)
         post.reload()
-        assert post.comment == None
+        assert post.comment is None
 
         Comment.drop_collection()
         Post.drop_collection()
diff --git a/tests/queryset/test_visitor.py b/tests/queryset/test_visitor.py
index a41f9278b..9706d0126 100644
--- a/tests/queryset/test_visitor.py
+++ b/tests/queryset/test_visitor.py
@@ -294,7 +294,7 @@ def test_q_regex(self):
         obj = self.Person.objects(Q(name=re.compile("^Gui"))).first()
         assert obj == person
         obj = self.Person.objects(Q(name=re.compile("^gui"))).first()
-        assert obj == None
+        assert obj is None
 
         obj = self.Person.objects(Q(name=re.compile("^gui", re.I))).first()
         assert obj == person
@@ -303,7 +303,7 @@ def test_q_regex(self):
         assert obj == person
 
         obj = self.Person.objects(Q(name__not=re.compile("^Gui"))).first()
-        assert obj == None
+        assert obj is None
 
     def test_q_repr(self):
         assert repr(Q()) == "Q(**{})"
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 3a6029c1a..24cda40df 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -122,7 +122,7 @@ def test_get_returns_the_same_as___getitem__(self):
     def test_get_default(self):
         base_dict = self._get_basedict({})
         sentinel = object()
-        assert base_dict.get("new") == None
+        assert base_dict.get("new") is None
         assert base_dict.get("new", sentinel) is sentinel
 
     def test___setitem___calls_mark_as_changed(self):

From bc0c55e49a58f1a8104ffa77f1b7b87c605504da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 1 Sep 2019 15:03:29 +0300
Subject: [PATCH 0948/1519] improve tests health (flake8 warnings)

---
 tests/document/test_dynamic.py               |  3 +-
 tests/document/test_indexes.py               |  2 +-
 tests/document/test_inheritance.py           |  8 ++--
 tests/document/test_instance.py              | 40 ++++++++++----------
 tests/document/test_validation.py            |  3 +-
 tests/fields/test_binary_field.py            |  3 +-
 tests/fields/test_boolean_field.py           |  4 +-
 tests/fields/test_cached_reference_field.py  |  4 +-
 tests/fields/test_date_field.py              |  4 +-
 tests/fields/test_datetime_field.py          |  3 +-
 tests/fields/test_decimal_field.py           |  4 +-
 tests/fields/test_dict_field.py              |  5 ++-
 tests/fields/test_email_field.py             |  4 +-
 tests/fields/test_embedded_document_field.py |  3 +-
 tests/fields/test_fields.py                  |  4 +-
 tests/fields/test_file_field.py              |  3 +-
 tests/fields/test_float_field.py             |  2 +-
 tests/fields/test_int_field.py               |  3 +-
 tests/fields/test_lazy_reference_field.py    |  2 +-
 tests/fields/test_long_field.py              |  2 +-
 tests/fields/test_map_field.py               |  4 +-
 tests/fields/test_reference_field.py         | 18 +--------
 tests/fields/test_url_field.py               |  3 +-
 tests/fields/test_uuid_field.py              |  4 +-
 tests/fixtures.py                            |  4 +-
 tests/queryset/test_field_list.py            |  5 ++-
 tests/queryset/test_queryset.py              | 26 ++++++-------
 tests/queryset/test_transform.py             |  2 +-
 tests/queryset/test_visitor.py               |  2 +-
 tests/test_connection.py                     |  7 ++--
 tests/test_context_managers.py               |  4 +-
 tests/test_datastructures.py                 |  2 +-
 tests/test_replicaset_connection.py          |  6 +--
 tests/test_utils.py                          |  3 +-
 34 files changed, 91 insertions(+), 105 deletions(-)

diff --git a/tests/document/test_dynamic.py b/tests/document/test_dynamic.py
index a6f468624..0032dfd93 100644
--- a/tests/document/test_dynamic.py
+++ b/tests/document/test_dynamic.py
@@ -1,8 +1,9 @@
 import unittest
 
+import pytest
+
 from mongoengine import *
 from tests.utils import MongoDBTestCase
-import pytest
 
 __all__ = ("TestDynamicDocument",)
 
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 6c31054a9..dc6c5c8e2 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -5,11 +5,11 @@
 from nose.plugins.skip import SkipTest
 from pymongo.collation import Collation
 from pymongo.errors import OperationFailure
+import pytest
 from six import iteritems
 
 from mongoengine import *
 from mongoengine.connection import get_db
-import pytest
 
 
 class TestIndexes(unittest.TestCase):
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index b6b6088ad..5072f8419 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -2,6 +2,7 @@
 import unittest
 import warnings
 
+import pytest
 from six import iteritems
 
 from mongoengine import (
@@ -17,7 +18,6 @@
 from mongoengine.pymongo_support import list_collection_names
 from tests.fixtures import Base
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestInheritance(MongoDBTestCase):
@@ -335,9 +335,7 @@ class Animal(Document):
             name = StringField()
 
         # can't inherit because Animal didn't explicitly allow inheritance
-        with pytest.raises(
-            ValueError, match="Document Animal may not be subclassed"
-        ) as exc_info:
+        with pytest.raises(ValueError, match="Document Animal may not be subclassed"):
 
             class Dog(Animal):
                 pass
@@ -475,7 +473,7 @@ class City(Document):
             meta = {"abstract": True, "allow_inheritance": False}
 
         city = City(continent="asia")
-        assert None == city.pk
+        assert city.pk is None
         # TODO: expected error? Shouldn't we create a new error type?
         with pytest.raises(KeyError):
             setattr(city, "pk", 1)
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 578153559..9d5331296 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -9,6 +9,7 @@
 import bson
 from bson import DBRef, ObjectId
 from pymongo.errors import DuplicateKeyError
+import pytest
 from six import iteritems
 
 from mongoengine import *
@@ -36,7 +37,6 @@
     PickleTest,
 )
 from tests.utils import MongoDBTestCase, get_as_pymongo
-import pytest
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
 
@@ -96,7 +96,7 @@ class Log(Document):
         assert Log.objects.count() == 10
 
         options = Log.objects._collection.options()
-        assert options["capped"] == True
+        assert options["capped"] is True
         assert options["max"] == 10
         assert options["size"] == 4096
 
@@ -122,7 +122,7 @@ class Log(Document):
         Log().save()
 
         options = Log.objects._collection.options()
-        assert options["capped"] == True
+        assert options["capped"] is True
         assert options["max"] == 10
         assert options["size"] == 10 * 2 ** 20
 
@@ -150,7 +150,7 @@ class Log(Document):
         Log().save()
 
         options = Log.objects._collection.options()
-        assert options["capped"] == True
+        assert options["capped"] is True
         assert options["size"] >= 10000
 
         # Check that the document with odd max_size value can be recreated
@@ -350,7 +350,7 @@ class User(Document):
             name = StringField()
             meta = {"allow_inheritance": True}
 
-        with pytest.raises(ValueError, match="Cannot override primary key field") as e:
+        with pytest.raises(ValueError, match="Cannot override primary key field"):
 
             class EmailUser(User):
                 email = StringField(primary_key=True)
@@ -620,7 +620,7 @@ class Foo(Document):
             f.reload()
 
     def test_reload_of_non_strict_with_special_field_name(self):
-        """Ensures reloading works for documents with meta strict == False."""
+        """Ensures reloading works for documents with meta strict is False."""
 
         class Post(Document):
             meta = {"strict": False}
@@ -832,13 +832,13 @@ def clean(self):
         t = TestDocument(status="published")
         t.save(clean=False)
         assert t.status == "published"
-        assert t.cleaned == False
+        assert t.cleaned is False
 
         t = TestDocument(status="published")
-        assert t.cleaned == False
+        assert t.cleaned is False
         t.save(clean=True)
         assert t.status == "published"
-        assert t.cleaned == True
+        assert t.cleaned is True
         raw_doc = get_as_pymongo(t)
         # Make sure clean changes makes it to the db
         assert raw_doc == {"status": "published", "cleaned": True, "_id": t.id}
@@ -1600,7 +1600,7 @@ class User(self.Person):
         person = self.Person.objects.get()
         assert person.name == "User"
         assert person.age == 21
-        assert person.active == False
+        assert person.active is False
 
     def test__get_changed_fields_same_ids_reference_field_does_not_enters_infinite_loop_embedded_doc(
         self,
@@ -2521,9 +2521,9 @@ class BlogPost(Document):
         assert all_user_dic.get(u1, False) == "OK"
         assert all_user_dic.get(u2, False) == "OK"
         assert all_user_dic.get(u3, False) == "OK"
-        assert all_user_dic.get(u4, False) == False  # New object
-        assert all_user_dic.get(b1, False) == False  # Other object
-        assert all_user_dic.get(b2, False) == False  # Other object
+        assert all_user_dic.get(u4, False) is False  # New object
+        assert all_user_dic.get(b1, False) is False  # Other object
+        assert all_user_dic.get(b2, False) is False  # Other object
 
         # Make sure docs are properly identified in a set (__hash__ is used
         # for hashing the docs).
@@ -3216,7 +3216,7 @@ def test_positional_creation(self):
     def test_mixed_creation(self):
         """Document cannot be instantiated using mixed arguments."""
         with pytest.raises(TypeError) as exc_info:
-            person = self.Person("Test User", age=42)
+            self.Person("Test User", age=42)
 
         expected_msg = (
             "Instantiating a document with positional arguments is not "
@@ -3227,7 +3227,7 @@ def test_mixed_creation(self):
     def test_positional_creation_embedded(self):
         """Embedded document cannot be created using positional arguments."""
         with pytest.raises(TypeError) as exc_info:
-            job = self.Job("Test Job", 4)
+            self.Job("Test Job", 4)
 
         expected_msg = (
             "Instantiating a document with positional arguments is not "
@@ -3238,7 +3238,7 @@ def test_positional_creation_embedded(self):
     def test_mixed_creation_embedded(self):
         """Embedded document cannot be created using mixed arguments."""
         with pytest.raises(TypeError) as exc_info:
-            job = self.Job("Test Job", years=4)
+            self.Job("Test Job", years=4)
 
         expected_msg = (
             "Instantiating a document with positional arguments is not "
@@ -3432,7 +3432,7 @@ class Person(Document):
             meta = {"shard_key": ("id", "name")}
 
         p = Person.from_json('{"name": "name", "age": 27}', created=True)
-        assert p._created == True
+        assert p._created is True
         p.name = "new name"
         p.id = "12345"
         assert p.name == "new name"
@@ -3450,7 +3450,7 @@ class Person(Document):
             meta = {"shard_key": ("id", "name")}
 
         p = Person._from_son({"name": "name", "age": 27}, created=True)
-        assert p._created == True
+        assert p._created is True
         p.name = "new name"
         p.id = "12345"
         assert p.name == "new name"
@@ -3463,7 +3463,7 @@ class Person(Document):
         Person.objects.delete()
 
         p = Person.from_json('{"name": "name"}', created=False)
-        assert p._created == False
+        assert p._created is False
         assert p.id is None
 
         # Make sure the document is subsequently persisted correctly.
@@ -3483,7 +3483,7 @@ class Person(Document):
         p = Person.from_json(
             '{"_id": "5b85a8b04ec5dc2da388296e", "name": "name"}', created=False
         )
-        assert p._created == False
+        assert p._created is False
         assert p._changed_fields == []
         assert p.name == "name"
         assert p.id == ObjectId("5b85a8b04ec5dc2da388296e")
diff --git a/tests/document/test_validation.py b/tests/document/test_validation.py
index dfae5baee..2439f2831 100644
--- a/tests/document/test_validation.py
+++ b/tests/document/test_validation.py
@@ -2,9 +2,10 @@
 import unittest
 from datetime import datetime
 
+import pytest
+
 from mongoengine import *
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestValidatorError(MongoDBTestCase):
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index 86ee26541..e2a1b8d62 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -2,12 +2,11 @@
 import uuid
 
 from bson import Binary
-from nose.plugins.skip import SkipTest
+import pytest
 import six
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase
-import pytest
 
 BIN_VALUE = six.b(
     "\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5"
diff --git a/tests/fields/test_boolean_field.py b/tests/fields/test_boolean_field.py
index b38b5ea4d..041f9f56b 100644
--- a/tests/fields/test_boolean_field.py
+++ b/tests/fields/test_boolean_field.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from mongoengine import *
+import pytest
 
+from mongoengine import *
 from tests.utils import MongoDBTestCase, get_as_pymongo
-import pytest
 
 
 class TestBooleanField(MongoDBTestCase):
diff --git a/tests/fields/test_cached_reference_field.py b/tests/fields/test_cached_reference_field.py
index e404aae0b..bb4c57d27 100644
--- a/tests/fields/test_cached_reference_field.py
+++ b/tests/fields/test_cached_reference_field.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from decimal import Decimal
 
-from mongoengine import *
+import pytest
 
+from mongoengine import *
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestCachedReferenceField(MongoDBTestCase):
diff --git a/tests/fields/test_date_field.py b/tests/fields/test_date_field.py
index 46fa4f0f4..e94ed0ceb 100644
--- a/tests/fields/test_date_field.py
+++ b/tests/fields/test_date_field.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+import pytest
 import six
 
 try:
@@ -8,9 +10,7 @@
     dateutil = None
 
 from mongoengine import *
-
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestDateField(MongoDBTestCase):
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 8db491c66..70debac58 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import datetime as dt
+
+import pytest
 import six
 
 try:
@@ -11,7 +13,6 @@
 from mongoengine import connection
 
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestDateTimeField(MongoDBTestCase):
diff --git a/tests/fields/test_decimal_field.py b/tests/fields/test_decimal_field.py
index b5b953633..c531166f5 100644
--- a/tests/fields/test_decimal_field.py
+++ b/tests/fields/test_decimal_field.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from decimal import Decimal
 
-from mongoengine import *
+import pytest
 
+from mongoengine import *
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestDecimalField(MongoDBTestCase):
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 7dda2a9c7..e88128f99 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
+import pytest
+
 from mongoengine import *
 from mongoengine.base import BaseDict
 
 from tests.utils import MongoDBTestCase, get_as_pymongo
-import pytest
 
 
 class TestDictField(MongoDBTestCase):
@@ -290,7 +291,7 @@ class Simple(Document):
         e.save()
         e.update(set__mapping={"ints": [3, 4]})
         e.reload()
-        assert BaseDict == type(e.mapping)
+        assert isinstance(e.mapping, BaseDict)
         assert {"ints": [3, 4]} == e.mapping
 
         # try creating an invalid mapping
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
index 902a7c42d..55255df5f 100644
--- a/tests/fields/test_email_field.py
+++ b/tests/fields/test_email_field.py
@@ -2,10 +2,10 @@
 import sys
 from unittest import SkipTest
 
-from mongoengine import *
+import pytest
 
+from mongoengine import *
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestEmailField(MongoDBTestCase):
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 9e6871cca..eeddac1ee 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import pytest
+
 from mongoengine import (
     Document,
     EmbeddedDocument,
@@ -13,7 +15,6 @@
 )
 
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestEmbeddedDocumentField(MongoDBTestCase):
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 21cc78be9..b8c916f87 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -4,6 +4,7 @@
 
 from bson import DBRef, ObjectId, SON
 from nose.plugins.skip import SkipTest
+import pytest
 
 from mongoengine import (
     BooleanField,
@@ -39,7 +40,6 @@
 from mongoengine.errors import DeprecatedError
 
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestField(MongoDBTestCase):
@@ -1838,7 +1838,7 @@ class User(Document):
 
         user = User.objects(bookmarks__all=[post_1]).first()
 
-        assert user != None
+        assert user is not None
         assert user.bookmarks[0] == post_1
 
     def test_generic_reference_filter_by_dbref(self):
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index 0746db338..fb8cacffa 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -137,7 +137,6 @@ class StreamFile(Document):
 
         text = six.b("Hello, World!")
         more_text = six.b("Foo Bar")
-        content_type = "text/plain"
 
         streamfile = StreamFile()
         streamfile.save()
@@ -205,7 +204,7 @@ class GridDocument(Document):
             doc_b = GridDocument.objects.with_id(doc_a.id)
             doc_b.the_file.replace(f, filename="doc_b")
             doc_b.save()
-            assert doc_b.the_file.grid_id != None
+            assert doc_b.the_file.grid_id is not None
 
             # Test it matches
             doc_c = GridDocument.objects.with_id(doc_b.id)
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
index d755fb4e4..a1cd7a0a3 100644
--- a/tests/fields/test_float_field.py
+++ b/tests/fields/test_float_field.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
+import pytest
 import six
 
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestFloatField(MongoDBTestCase):
diff --git a/tests/fields/test_int_field.py b/tests/fields/test_int_field.py
index 65a5fbad0..1f9c5a773 100644
--- a/tests/fields/test_int_field.py
+++ b/tests/fields/test_int_field.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
+import pytest
+
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestIntField(MongoDBTestCase):
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index 8150574d6..b5b8690e3 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from bson import DBRef, ObjectId
+import pytest
 
 from mongoengine import *
 from mongoengine.base import LazyReference
 
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestLazyReferenceField(MongoDBTestCase):
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index 51f8e255d..da4f04c89 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import pytest
 import six
 
 try:
@@ -10,7 +11,6 @@
 from mongoengine.connection import get_db
 
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestLongField(MongoDBTestCase):
diff --git a/tests/fields/test_map_field.py b/tests/fields/test_map_field.py
index fd56ddd0b..8b8b1c469 100644
--- a/tests/fields/test_map_field.py
+++ b/tests/fields/test_map_field.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import datetime
 
-from mongoengine import *
+import pytest
 
+from mongoengine import *
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestMapField(MongoDBTestCase):
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index 783d13150..949eac671 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 from bson import DBRef, SON
+import pytest
 
 from mongoengine import *
-
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestReferenceField(MongoDBTestCase):
@@ -59,21 +58,6 @@ class BlogPost(Document):
         with pytest.raises(ValidationError):
             post1.validate()
 
-    def test_objectid_reference_fields(self):
-        """Make sure storing Object ID references works."""
-
-        class Person(Document):
-            name = StringField()
-            parent = ReferenceField("self")
-
-        Person.drop_collection()
-
-        p1 = Person(name="John").save()
-        Person(name="Ross", parent=p1.pk).save()
-
-        p = Person.objects.get(name="Ross")
-        assert p.parent == p1
-
     def test_dbref_reference_fields(self):
         """Make sure storing references as bson.dbref.DBRef works."""
 
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index e125f56a9..948a4788f 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
+import pytest
+
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
-import pytest
 
 
 class TestURLField(MongoDBTestCase):
diff --git a/tests/fields/test_uuid_field.py b/tests/fields/test_uuid_field.py
index b1413f954..21b7a0907 100644
--- a/tests/fields/test_uuid_field.py
+++ b/tests/fields/test_uuid_field.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import uuid
 
-from mongoengine import *
+import pytest
 
+from mongoengine import *
 from tests.utils import MongoDBTestCase, get_as_pymongo
-import pytest
 
 
 class Person(Document):
diff --git a/tests/fixtures.py b/tests/fixtures.py
index 9f06f1abf..59fc3bf3e 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -42,11 +42,11 @@ class PickleSignalsTest(Document):
 
     @classmethod
     def post_save(self, sender, document, created, **kwargs):
-        pickled = pickle.dumps(document)
+        pickle.dumps(document)
 
     @classmethod
     def post_delete(self, sender, document, **kwargs):
-        pickled = pickle.dumps(document)
+        pickle.dumps(document)
 
 
 signals.post_save.connect(PickleSignalsTest.post_save, sender=PickleSignalsTest)
diff --git a/tests/queryset/test_field_list.py b/tests/queryset/test_field_list.py
index a2bf6f1fa..fbdde23bf 100644
--- a/tests/queryset/test_field_list.py
+++ b/tests/queryset/test_field_list.py
@@ -1,8 +1,9 @@
 import unittest
 
+import pytest
+
 from mongoengine import *
 from mongoengine.queryset import QueryFieldList
-import pytest
 
 
 class TestQueryFieldList(unittest.TestCase):
@@ -221,7 +222,7 @@ class BlogPost(Document):
         assert obj.comments == []
 
         obj = BlogPost.objects.only("various.test_dynamic.some").get()
-        assert obj.various["test_dynamic"].some == True
+        assert obj.various["test_dynamic"].some is True
 
         obj = BlogPost.objects.only("content", "comments.title").get()
         assert obj.content == "Had a good coffee today..."
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index f36066099..79f5793d1 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -9,6 +9,7 @@
 import pymongo
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import UpdateResult
+import pytest
 import six
 from six import iteritems
 
@@ -24,7 +25,6 @@
     QuerySetManager,
     queryset_manager,
 )
-import pytest
 
 
 class db_ops_tracker(query_counter):
@@ -1712,11 +1712,11 @@ class BlogPost(Document):
         post = BlogPost(content="Watching TV", category=lameness)
         post.save()
 
-        assert 1 == BlogPost.objects.count()
-        assert "Lameness" == BlogPost.objects.first().category.name
+        assert BlogPost.objects.count() == 1
+        assert BlogPost.objects.first().category.name == "Lameness"
         Category.objects.delete()
-        assert 1 == BlogPost.objects.count()
-        assert None == BlogPost.objects.first().category
+        assert BlogPost.objects.count() == 1
+        assert BlogPost.objects.first().category is None
 
     def test_reverse_delete_rule_nullify_on_abstract_document(self):
         """Ensure nullification of references to deleted documents when
@@ -1739,11 +1739,11 @@ class BlogPost(AbstractBlogPost):
 
         BlogPost(content="Watching TV", author=me).save()
 
-        assert 1 == BlogPost.objects.count()
-        assert me == BlogPost.objects.first().author
+        assert BlogPost.objects.count() == 1
+        assert BlogPost.objects.first().author == me
         self.Person.objects(name="Test User").delete()
-        assert 1 == BlogPost.objects.count()
-        assert None == BlogPost.objects.first().author
+        assert BlogPost.objects.count() == 1
+        assert BlogPost.objects.first().author is None
 
     def test_reverse_delete_rule_deny(self):
         """Ensure deletion gets denied on documents that still have references
@@ -1896,7 +1896,7 @@ def test_delete_edge_case_with_write_concern_0_return_None(self):
         """
         p1 = self.Person(name="User Z", age=20).save()
         del_result = p1.delete(w=0)
-        assert None == del_result
+        assert del_result is None
 
     def test_reference_field_find(self):
         """Ensure cascading deletion of referring documents from the database.
@@ -2047,7 +2047,7 @@ class BlogPost(Document):
 
         post = BlogPost(title="garbage").save()
 
-        assert post.title != None
+        assert post.title is not None
         BlogPost.objects.update_one(unset__title=1)
         post.reload()
         assert post.title is None
@@ -5006,7 +5006,7 @@ class Person(Document):
                 # PyPy evaluates __len__ when iterating with list comprehensions while CPython does not.
                 # This may be a bug in PyPy (PyPy/#1802) but it does not affect
                 # the behavior of MongoEngine.
-                assert None == people._len
+                assert people._len is None
             assert q == 1
 
             list(people)
@@ -5053,7 +5053,7 @@ class Person(Document):
         Person(name="a").save()
         qs = Person.objects()
         _ = list(qs)
-        with pytest.raises(OperationError, match="QuerySet already cached") as ctx_err:
+        with pytest.raises(OperationError, match="QuerySet already cached"):
             qs.no_cache()
 
     def test_no_cached_queryset_no_cache_back_to_cache(self):
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index be28c3b82..3898809e6 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -1,10 +1,10 @@
 import unittest
 
 from bson.son import SON
+import pytest
 
 from mongoengine import *
 from mongoengine.queryset import Q, transform
-import pytest
 
 
 class TestTransform(unittest.TestCase):
diff --git a/tests/queryset/test_visitor.py b/tests/queryset/test_visitor.py
index 9706d0126..e597e3d83 100644
--- a/tests/queryset/test_visitor.py
+++ b/tests/queryset/test_visitor.py
@@ -3,11 +3,11 @@
 import unittest
 
 from bson import ObjectId
+import pytest
 
 from mongoengine import *
 from mongoengine.errors import InvalidQueryError
 from mongoengine.queryset import Q
-import pytest
 
 
 class TestQ(unittest.TestCase):
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 8db69b0c3..07edcbba4 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -3,10 +3,10 @@
 from bson.tz_util import utc
 from nose.plugins.skip import SkipTest
 import pymongo
-from pymongo import MongoClient
-from pymongo import ReadPreference
-from pymongo.errors import InvalidName, OperationFailure
 
+from pymongo import MongoClient, ReadPreference
+from pymongo.errors import InvalidName, OperationFailure
+import pytest
 
 try:
     import unittest2 as unittest
@@ -29,7 +29,6 @@
     get_connection,
     get_db,
 )
-import pytest
 
 
 def get_tz_awareness(connection):
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index cf4dd100b..d68afbb0f 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -1,5 +1,7 @@
 import unittest
 
+import pytest
+
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.context_managers import (
@@ -10,7 +12,6 @@
     switch_db,
 )
 from mongoengine.pymongo_support import count_documents
-import pytest
 
 
 class ContextManagersTest(unittest.TestCase):
@@ -214,7 +215,6 @@ class User(Document):
                 raise TypeError()
 
     def test_query_counter_does_not_swallow_exception(self):
-
         with pytest.raises(TypeError):
             with query_counter() as q:
                 raise TypeError()
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 24cda40df..ad421a725 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,7 +1,7 @@
 import unittest
-from six import iterkeys
 
 import pytest
+from six import iterkeys
 
 from mongoengine import Document
 from mongoengine.base.datastructures import BaseDict, BaseList, StrictDict
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index c1ea407ca..5d83da002 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -1,7 +1,6 @@
 import unittest
 
-from pymongo import MongoClient
-from pymongo import ReadPreference
+from pymongo import MongoClient, ReadPreference
 
 import mongoengine
 from mongoengine.connection import ConnectionFailure
@@ -25,14 +24,13 @@ def tearDown(self):
     def test_replicaset_uri_passes_read_preference(self):
         """Requires a replica set called "rs" on port 27017
         """
-
         try:
             conn = mongoengine.connect(
                 db="mongoenginetest",
                 host="mongodb://localhost/mongoenginetest?replicaSet=rs",
                 read_preference=READ_PREF,
             )
-        except ConnectionFailure as e:
+        except ConnectionFailure:
             return
 
         if not isinstance(conn, CONN_CLASS):
diff --git a/tests/test_utils.py b/tests/test_utils.py
index ccb44aacf..ef396571c 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,9 +1,10 @@
 import re
 import unittest
 
-from mongoengine.base.utils import LazyRegexCompiler
 import pytest
 
+from mongoengine.base.utils import LazyRegexCompiler
+
 signal_output = []
 
 

From 799cdafae63b3ac22aafed4400bff10796a8ffee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 1 Sep 2019 15:27:11 +0300
Subject: [PATCH 0949/1519] remove references to nose

---
 CONTRIBUTING.rst                 |  2 +-
 requirements.txt                 |  1 -
 setup.py                         |  2 +-
 tests/document/test_indexes.py   |  3 +--
 tests/fields/test_email_field.py |  6 ------
 tests/fields/test_fields.py      | 13 ++++++-------
 tests/fields/test_file_field.py  | 29 +++++++++--------------------
 tests/test_connection.py         | 31 +++++++++++++++----------------
 tests/utils.py                   | 10 ++++------
 tox.ini                          |  1 -
 10 files changed, 37 insertions(+), 61 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 4711c1d3c..56bae31fe 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -54,7 +54,7 @@ General Guidelines
   should adapt to the breaking change in docs/upgrade.rst.
 - Write inline documentation for new classes and methods.
 - Write tests and make sure they pass (make sure you have a mongod
-  running on the default port, then execute ``python setup.py nosetests``
+  running on the default port, then execute ``python setup.py test``
   from the cmd line to run the test suite).
 - Ensure tests pass on all supported Python, PyMongo, and MongoDB versions.
   You can test various Python and PyMongo versions locally by executing
diff --git a/requirements.txt b/requirements.txt
index 46eabac3f..43e5261bd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-nose
 pymongo>=3.4
 six==1.10.0
 Sphinx==1.5.5
diff --git a/setup.py b/setup.py
index 2bc1ae1ca..939e8e50e 100644
--- a/setup.py
+++ b/setup.py
@@ -120,7 +120,7 @@ def run_tests(self):
 }
 if sys.version_info[0] == 3:
     extra_opts["use_2to3"] = True
-    if "test" in sys.argv or "nosetests" in sys.argv:
+    if "test" in sys.argv:
         extra_opts["packages"] = find_packages()
         extra_opts["package_data"] = {
             "tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index dc6c5c8e2..90402c464 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -2,7 +2,6 @@
 import unittest
 from datetime import datetime
 
-from nose.plugins.skip import SkipTest
 from pymongo.collation import Collation
 from pymongo.errors import OperationFailure
 import pytest
@@ -251,7 +250,7 @@ class Place(Document):
     def test_explicit_geohaystack_index(self):
         """Ensure that geohaystack indexes work when created via meta[indexes]
         """
-        raise SkipTest(
+        pytest.skip(
             "GeoHaystack index creation is not supported for now"
             "from meta, as it requires a bucketSize parameter."
         )
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
index 55255df5f..5a58ede42 100644
--- a/tests/fields/test_email_field.py
+++ b/tests/fields/test_email_field.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import sys
-from unittest import SkipTest
 
 import pytest
 
@@ -46,11 +45,6 @@ class User(Document):
             user.validate()
 
     def test_email_field_unicode_user(self):
-        # Don't run this test on pypy3, which doesn't support unicode regex:
-        # https://bitbucket.org/pypy/pypy/issues/1821/regular-expression-doesnt-find-unicode
-        if sys.version_info[:2] == (3, 2):
-            raise SkipTest("unicode email addresses are not supported on PyPy 3")
-
         class User(Document):
             email = EmailField()
 
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index b8c916f87..652f69033 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -3,7 +3,6 @@
 import unittest
 
 from bson import DBRef, ObjectId, SON
-from nose.plugins.skip import SkipTest
 import pytest
 
 from mongoengine import (
@@ -1239,17 +1238,17 @@ class A(Document):
         a = A._from_son(SON([("fb", SON([("fc", SON([("txt", "hi")]))]))]))
         assert a.b.c.txt == "hi"
 
+    @pytest.mark.xfail(
+        reason="Using a string reference in an EmbeddedDocumentField does not work if the class isnt registerd yet",
+        raises=NotRegistered,
+    )
     def test_embedded_document_field_cant_reference_using_a_str_if_it_does_not_exist_yet(
         self,
     ):
-        raise SkipTest(
-            "Using a string reference in an EmbeddedDocumentField does not work if the class isnt registerd yet"
-        )
-
         class MyDoc2(Document):
-            emb = EmbeddedDocumentField("MyDoc")
+            emb = EmbeddedDocumentField("MyFunkyDoc123")
 
-        class MyDoc(EmbeddedDocument):
+        class MyFunkyDoc123(EmbeddedDocument):
             name = StringField()
 
     def test_embedded_document_validation(self):
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index fb8cacffa..bfc86511a 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -5,7 +5,7 @@
 import unittest
 
 import gridfs
-from nose.plugins.skip import SkipTest
+import pytest
 import six
 
 from mongoengine import *
@@ -21,6 +21,8 @@
 
 from tests.utils import MongoDBTestCase
 
+require_pil = pytest.mark.skipif(not HAS_PIL, reason="PIL not installed")
+
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "mongoengine.png")
 TEST_IMAGE2_PATH = os.path.join(os.path.dirname(__file__), "mongodb_leaf.png")
 
@@ -377,10 +379,8 @@ class TestFile(Document):
         assert len(list(files)) == 0
         assert len(list(chunks)) == 0
 
+    @require_pil
     def test_image_field(self):
-        if not HAS_PIL:
-            raise SkipTest("PIL not installed")
-
         class TestImage(Document):
             image = ImageField()
 
@@ -411,10 +411,8 @@ class TestImage(Document):
 
         t.image.delete()
 
+    @require_pil
     def test_image_field_reassigning(self):
-        if not HAS_PIL:
-            raise SkipTest("PIL not installed")
-
         class TestFile(Document):
             the_file = ImageField()
 
@@ -428,10 +426,8 @@ class TestFile(Document):
         test_file.save()
         assert test_file.the_file.size == (45, 101)
 
+    @require_pil
     def test_image_field_resize(self):
-        if not HAS_PIL:
-            raise SkipTest("PIL not installed")
-
         class TestImage(Document):
             image = ImageField(size=(185, 37))
 
@@ -451,10 +447,8 @@ class TestImage(Document):
 
         t.image.delete()
 
+    @require_pil
     def test_image_field_resize_force(self):
-        if not HAS_PIL:
-            raise SkipTest("PIL not installed")
-
         class TestImage(Document):
             image = ImageField(size=(185, 37, True))
 
@@ -474,10 +468,8 @@ class TestImage(Document):
 
         t.image.delete()
 
+    @require_pil
     def test_image_field_thumbnail(self):
-        if not HAS_PIL:
-            raise SkipTest("PIL not installed")
-
         class TestImage(Document):
             image = ImageField(thumbnail_size=(92, 18))
 
@@ -546,11 +538,8 @@ class TestFile(Document):
         assert putfile == copy.copy(putfile)
         assert putfile == copy.deepcopy(putfile)
 
+    @require_pil
     def test_get_image_by_grid_id(self):
-
-        if not HAS_PIL:
-            raise SkipTest("PIL not installed")
-
         class TestImage(Document):
 
             image1 = ImageField()
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 07edcbba4..acaab9048 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,7 +1,6 @@
 import datetime
 
 from bson.tz_util import utc
-from nose.plugins.skip import SkipTest
 import pymongo
 
 from pymongo import MongoClient, ReadPreference
@@ -35,6 +34,18 @@ def get_tz_awareness(connection):
     return connection.codec_options.tz_aware
 
 
+try:
+    import mongomock
+
+    MONGOMOCK_INSTALLED = True
+except ImportError:
+    MONGOMOCK_INSTALLED = False
+
+require_mongomock = pytest.mark.skipif(
+    not MONGOMOCK_INSTALLED, reason="you need mongomock installed to run this testcase"
+)
+
+
 class ConnectionTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -212,14 +223,10 @@ def test_connect_with_invalid_db_name_type(self):
             non_string_db_name = ["e. g. list instead of a string"]
             connect(non_string_db_name)
 
+    @require_mongomock
     def test_connect_in_mocking(self):
         """Ensure that the connect() method works properly in mocking.
         """
-        try:
-            import mongomock
-        except ImportError:
-            raise SkipTest("you need mongomock installed to run this testcase")
-
         connect("mongoenginetest", host="mongomock://localhost")
         conn = get_connection()
         assert isinstance(conn, mongomock.MongoClient)
@@ -261,14 +268,10 @@ def test_connect_in_mocking(self):
         conn = get_connection("testdb7")
         assert isinstance(conn, mongomock.MongoClient)
 
+    @require_mongomock
     def test_default_database_with_mocking(self):
         """Ensure that the default database is correctly set when using mongomock.
         """
-        try:
-            import mongomock
-        except ImportError:
-            raise SkipTest("you need mongomock installed to run this testcase")
-
         disconnect_all()
 
         class SomeDocument(Document):
@@ -281,16 +284,12 @@ class SomeDocument(Document):
         assert conn.get_default_database().name == "mongoenginetest"
         assert conn.database_names()[0] == "mongoenginetest"
 
+    @require_mongomock
     def test_connect_with_host_list(self):
         """Ensure that the connect() method works when host is a list
 
         Uses mongomock to test w/o needing multiple mongod/mongos processes
         """
-        try:
-            import mongomock
-        except ImportError:
-            raise SkipTest("you need mongomock installed to run this testcase")
-
         connect(host=["mongomock://localhost"])
         conn = get_connection()
         assert isinstance(conn, mongomock.MongoClient)
diff --git a/tests/utils.py b/tests/utils.py
index 0719d6efe..7ee22c3c7 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,7 +1,6 @@
-import operator
 import unittest
 
-from nose.plugins.skip import SkipTest
+import pytest
 
 from mongoengine import connect
 from mongoengine.connection import disconnect_all, get_db
@@ -37,7 +36,7 @@ def get_as_pymongo(doc):
 def _decorated_with_ver_requirement(func, mongo_version_req, oper):
     """Return a MongoDB version requirement decorator.
 
-    The resulting decorator will raise a SkipTest exception if the current
+    The resulting decorator will skip the test if the current
     MongoDB version doesn't match the provided version/operator.
 
     For example, if you define a decorator like so:
@@ -59,9 +58,8 @@ def _inner(*args, **kwargs):
         if oper(mongodb_v, mongo_version_req):
             return func(*args, **kwargs)
 
-        raise SkipTest(
-            "Needs MongoDB v{}+".format(".".join(str(n) for n in mongo_version_req))
-        )
+        pretty_version = ".".join(str(n) for n in mongo_version_req)
+        pytest.skip("Needs MongoDB v{}+".format(pretty_version))
 
     _inner.__name__ = func.__name__
     _inner.__doc__ = func.__doc__
diff --git a/tox.ini b/tox.ini
index 94ccc9cfe..349b55774 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,6 @@ envlist = {py27,py35,pypy,pypy3}-{mg34,mg36}
 commands =
     python setup.py test {posargs}
 deps =
-    nose
     mg34: pymongo>=3.4,<3.5
     mg36: pymongo>=3.6,<3.7
     mg39: pymongo>=3.9,<4.0

From d8924ed8920f856d3754db38c7c5e8adf0f96ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 2 Sep 2019 08:50:46 +0300
Subject: [PATCH 0950/1519] remove inheritance from unittest.TestCase on basic
 test classes

---
 tests/queryset/test_field_list.py |  2 +-
 tests/test_common.py              |  2 +-
 tests/test_context_managers.py    |  2 +-
 tests/test_datastructures.py      | 10 +++++-----
 tests/test_signals.py             |  2 +-
 tests/test_utils.py               |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/queryset/test_field_list.py b/tests/queryset/test_field_list.py
index fbdde23bf..be7903fd3 100644
--- a/tests/queryset/test_field_list.py
+++ b/tests/queryset/test_field_list.py
@@ -6,7 +6,7 @@
 from mongoengine.queryset import QueryFieldList
 
 
-class TestQueryFieldList(unittest.TestCase):
+class TestQueryFieldList:
     def test_empty(self):
         q = QueryFieldList()
         assert not q
diff --git a/tests/test_common.py b/tests/test_common.py
index 6b6f18dec..1779a91bb 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -6,7 +6,7 @@
 from mongoengine.common import _import_class
 
 
-class TestCommon(unittest.TestCase):
+class TestCommon:
     def test__import_class(self):
         doc_cls = _import_class("Document")
         assert doc_cls is Document
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index d68afbb0f..c10a02242 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -14,7 +14,7 @@
 from mongoengine.pymongo_support import count_documents
 
 
-class ContextManagersTest(unittest.TestCase):
+class TestContextManagers:
     def test_switch_db_context_manager(self):
         connect("mongoenginetest")
         register_connection("testdb-1", "mongoenginetest2")
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index ad421a725..7b5d7d113 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -15,7 +15,7 @@ def _mark_as_changed(self, key):
         self._changed_fields.append(key)
 
 
-class TestBaseDict(unittest.TestCase):
+class TestBaseDict:
     @staticmethod
     def _get_basedict(dict_items):
         """Get a BaseList bound to a fake document instance"""
@@ -151,7 +151,7 @@ def test___delattr____tracked_by_changes(self):
         assert base_dict._instance._changed_fields == ["my_name.a_new_attr"]
 
 
-class TestBaseList(unittest.TestCase):
+class TestBaseList:
     @staticmethod
     def _get_baselist(list_items):
         """Get a BaseList bound to a fake document instance"""
@@ -360,12 +360,12 @@ def test_sort_calls_with_key(self):
 
 
 class TestStrictDict(unittest.TestCase):
-    def strict_dict_class(self, *args, **kwargs):
-        return StrictDict.create(*args, **kwargs)
-
     def setUp(self):
         self.dtype = self.strict_dict_class(("a", "b", "c"))
 
+    def strict_dict_class(self, *args, **kwargs):
+        return StrictDict.create(*args, **kwargs)
+
     def test_init(self):
         d = self.dtype(a=1, b=1, c=1)
         assert (d.a, d.b, d.c) == (1, 1, 1)
diff --git a/tests/test_signals.py b/tests/test_signals.py
index b217712b8..d79eaf754 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -7,7 +7,7 @@
 signal_output = []
 
 
-class SignalTests(unittest.TestCase):
+class TestSignal(unittest.TestCase):
     """
     Testing signals before/after saving and deleting.
     """
diff --git a/tests/test_utils.py b/tests/test_utils.py
index ef396571c..dd1782734 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -8,7 +8,7 @@
 signal_output = []
 
 
-class LazyRegexCompilerTest(unittest.TestCase):
+class TestLazyRegexCompiler:
     def test_lazy_regex_compiler_verify_laziness_of_descriptor(self):
         class UserEmail(object):
             EMAIL_REGEX = LazyRegexCompiler("@", flags=32)

From 81647d67a0c97b3d0fac6cb687c385fc2827a108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 31 Oct 2019 23:06:40 +0100
Subject: [PATCH 0951/1519] fix recent tests update with unittest2pytest

---
 tests/document/test_indexes.py  | 16 ++++++----------
 tests/queryset/test_queryset.py |  9 +++++----
 tests/test_connection.py        |  4 ++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 90402c464..be857b590 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -544,23 +544,19 @@ class BlogPost(Document):
             BlogPost(name=name).save()
 
         query_result = BlogPost.objects.collation(base).order_by("name")
-        self.assertEqual(
-            [x.name for x in query_result], sorted(names, key=lambda x: x.lower())
-        )
-        self.assertEqual(5, query_result.count())
+        assert [x.name for x in query_result] == sorted(names, key=lambda x: x.lower())
+        assert 5 == query_result.count()
 
         query_result = BlogPost.objects.collation(Collation(**base)).order_by("name")
-        self.assertEqual(
-            [x.name for x in query_result], sorted(names, key=lambda x: x.lower())
-        )
-        self.assertEqual(5, query_result.count())
+        assert [x.name for x in query_result] == sorted(names, key=lambda x: x.lower())
+        assert 5 == query_result.count()
 
         incorrect_collation = {"arndom": "wrdo"}
-        with self.assertRaises(OperationFailure):
+        with pytest.raises(OperationFailure):
             BlogPost.objects.collation(incorrect_collation).count()
 
         query_result = BlogPost.objects.collation({}).order_by("name")
-        self.assertEqual([x.name for x in query_result], sorted(names))
+        assert [x.name for x in query_result] == sorted(names)
 
     def test_unique(self):
         """Ensure that uniqueness constraints are applied to fields.
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 79f5793d1..7812ab665 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4626,7 +4626,8 @@ class Bar(Document):
         bars = Bar.objects.read_preference(ReadPreference.SECONDARY_PREFERRED)
         assert bars._read_preference == ReadPreference.SECONDARY_PREFERRED
         assert (
-            bars._cursor.collection.read_preference == ReadPreference.SECONDARY_PREFERRED
+            bars._cursor.collection.read_preference
+            == ReadPreference.SECONDARY_PREFERRED
         )
 
         # Make sure that `.read_preference(...)` does accept string values.
@@ -5765,13 +5766,13 @@ def test_create_count(self):
 
     def test_no_cursor_timeout(self):
         qs = self.Person.objects()
-        self.assertEqual(qs._cursor_args, {})  # ensure no regression of  #2148
+        assert qs._cursor_args == {}  # ensure no regression of  #2148
 
         qs = self.Person.objects().timeout(True)
-        self.assertEqual(qs._cursor_args, {})
+        assert qs._cursor_args == {}
 
         qs = self.Person.objects().timeout(False)
-        self.assertEqual(qs._cursor_args, {"no_cursor_timeout": True})
+        assert qs._cursor_args == {"no_cursor_timeout": True}
 
 
 if __name__ == "__main__":
diff --git a/tests/test_connection.py b/tests/test_connection.py
index acaab9048..e40a69940 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -625,8 +625,8 @@ def test_write_concern(self):
             alias="conn1", host="mongodb://localhost/testing?w=1&journal=true"
         )
         conn2 = connect("testing", alias="conn2", w=1, journal=True)
-        self.assertEqual(conn1.write_concern.document, {"w": 1, "j": True})
-        self.assertEqual(conn2.write_concern.document, {"w": 1, "j": True})
+        assert conn1.write_concern.document == {"w": 1, "j": True}
+        assert conn2.write_concern.document == {"w": 1, "j": True}
 
     def test_connect_with_replicaset_via_uri(self):
         """Ensure connect() works when specifying a replicaSet via the

From ff749a7a0a7b9a86b3745cad393effcf594db5f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Philip=20G=C3=B6pfert?=
 <jgoepfert@techfak.uni-bielefeld.de>
Date: Wed, 6 Nov 2019 10:35:16 +0100
Subject: [PATCH 0952/1519] Specify version of requirement

In `README.rst`, a version of `six` of at least `1.10.0` is specified. This was missing from the requirements, potentially leading to broken installations.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 939e8e50e..ceb5afad8 100644
--- a/setup.py
+++ b/setup.py
@@ -143,7 +143,7 @@ def run_tests(self):
     long_description=LONG_DESCRIPTION,
     platforms=["any"],
     classifiers=CLASSIFIERS,
-    install_requires=["pymongo>=3.4", "six"],
+    install_requires=["pymongo>=3.4", "six>=1.10.0"],
     cmdclass={"test": PyTest},
     **extra_opts
 )

From d3420918cd9804243900c8566b7e155044e668cb Mon Sep 17 00:00:00 2001
From: Eloi Zalczer <ezalczer@dxomark.com>
Date: Mon, 18 Nov 2019 17:16:06 +0100
Subject: [PATCH 0953/1519] Added alias parameter in query_counter

---
 mongoengine/context_managers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index d8dfeaac4..5920b724d 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -182,10 +182,10 @@ class query_counter(object):
     - Some queries are ignored by default by the counter (killcursors, db.system.indexes)
     """
 
-    def __init__(self):
+    def __init__(self, alias=DEFAULT_CONNECTION_NAME):
         """Construct the query_counter
         """
-        self.db = get_db()
+        self.db = get_db(alias=alias)
         self.initial_profiling_level = None
         self._ctx_query_counter = 0  # number of queries issued by the context
 

From 0bf08db7b943eba85d7e0dd85d161df4e615a371 Mon Sep 17 00:00:00 2001
From: Eloi Zalczer <ezalczer@dxomark.com>
Date: Mon, 2 Dec 2019 10:07:33 +0100
Subject: [PATCH 0954/1519] Added test case for query_counter alias

---
 tests/document/test_instance.py | 40 ++++++++++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 1d3e18d04..c8ad2ff3a 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -2825,6 +2825,44 @@ class B(A):
 
         assert "testdb-1" == B._meta.get("db_alias")
 
+    def test_query_counter_alias(self):
+        """query_counter works properly with db aliases?"""
+        # Register a connection with db_alias testdb-1
+        register_connection("testdb-1", "mongoenginetest2")
+
+        class A(Document):
+            """Uses default db_alias
+            """
+
+            name = StringField()
+
+        class B(Document):
+            """Uses testdb-1 db_alias
+            """
+
+            name = StringField()
+            meta = {"db_alias": "testdb-1"}
+
+        with query_counter() as q:
+            assert q == 0
+            a = A.objects.create(name="A")
+            assert q == 1
+            a = A.objects.first()
+            assert q == 2
+            a.name = "Test A"
+            a.save()
+            assert q == 3
+
+        with query_counter(alias="testdb-1") as q:
+            assert q == 0
+            b = B.objects.create(name="B")
+            assert q == 1
+            b = B.objects.first()
+            assert q == 2
+            b.name = "Test B"
+            b.save()
+            assert q == 3
+
     def test_db_ref_usage(self):
         """DB Ref usage in dict_fields."""
 
@@ -3644,7 +3682,7 @@ class User(Document):
             User.objects().select_related()
 
     def test_embedded_document_failed_while_loading_instance_when_it_is_not_a_dict(
-        self
+        self,
     ):
         class LightSaber(EmbeddedDocument):
             color = StringField()

From 0458ef869eb07d98c2ebb4da82dc3ca0bcd94a49 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Tue, 3 Dec 2019 00:42:10 +0100
Subject: [PATCH 0955/1519] Add __eq__ to Q and Q operations

---
 mongoengine/queryset/visitor.py | 12 ++++++++++++
 tests/queryset/test_visitor.py  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index 0fe139fd2..058c722ab 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -96,9 +96,11 @@ def _combine(self, other, operation):
         """Combine this node with another node into a QCombination
         object.
         """
+        # If the other Q() is empty, ignore it and just use `self`.
         if getattr(other, "empty", True):
             return self
 
+        # Or if this Q is empty, ignore it and just use `other`.
         if self.empty:
             return other
 
@@ -146,6 +148,13 @@ def accept(self, visitor):
     def empty(self):
         return not bool(self.children)
 
+    def __eq__(self, other):
+        return (
+            self.__class__ == other.__class__
+            and self.operation == other.operation
+            and self.children == other.children
+        )
+
 
 class Q(QNode):
     """A simple query object, used in a query tree to build up more complex
@@ -164,3 +173,6 @@ def accept(self, visitor):
     @property
     def empty(self):
         return not bool(self.query)
+
+    def __eq__(self, other):
+        return self.__class__ == other.__class__ and self.query == other.query
diff --git a/tests/queryset/test_visitor.py b/tests/queryset/test_visitor.py
index e597e3d83..e8504abd2 100644
--- a/tests/queryset/test_visitor.py
+++ b/tests/queryset/test_visitor.py
@@ -374,6 +374,38 @@ class Item(Document):
             == 2
         )
 
+    def test_equality(self):
+        assert Q(name="John") == Q(name="John")
+        assert Q() == Q()
+
+    def test_inequality(self):
+        assert Q(name="John") != Q(name="Ralph")
+
+    def test_operation_equality(self):
+        q1 = Q(name="John") | Q(title="Sir") & Q(surname="Paul")
+        q2 = Q(name="John") | Q(title="Sir") & Q(surname="Paul")
+        assert q1 == q2
+
+    def test_operation_inequality(self):
+        q1 = Q(name="John") | Q(title="Sir")
+        q2 = Q(title="Sir") | Q(name="John")
+        assert q1 != q2
+
+    def test_combine_and_empty(self):
+        q = Q(x=1)
+        assert q & Q() == q
+        assert Q() & q == q
+
+    def test_combine_and_both_empty(self):
+        assert Q() & Q() == Q()
+
+    def test_combine_or_empty(self):
+        q = Q(x=1)
+        assert q | Q() == q
+        assert Q() | q == q
+
+    def test_combine_or_both_empty(self):
+        assert Q() | Q() == Q()
 
 if __name__ == "__main__":
     unittest.main()

From 091238a2cfd3e77fba724ad8264bae78c360c675 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Tue, 3 Dec 2019 00:54:46 +0100
Subject: [PATCH 0956/1519] Update Authors

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 45a754cc3..aa044bd25 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -252,3 +252,4 @@ that much better:
  * Paulo Amaral (https://github.com/pauloAmaral)
  * Gaurav Dadhania (https://github.com/GVRV)
  * Yurii Andrieiev (https://github.com/yandrieiev)
+ * Filip Kucharczyk (https://github.com/Pacu2)

From f7f0e10d4d3748381007617a119758e40bdd76bb Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Tue, 3 Dec 2019 00:54:53 +0100
Subject: [PATCH 0957/1519] Update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0b4893a6a..102e826d9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,6 +23,7 @@ Development
 - Switch from nosetest to pytest as test runner #2114
 - The codebase is now formatted using ``black``. #2109
 - In bulk write insert, the detailed error message would raise in exception.
+- Added ability to compare Q and Q operations #2204
 
 Changes in 0.18.2
 =================

From 3f75f30f2675375fef0bf14fdbff63480676e056 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Tue, 3 Dec 2019 09:03:49 +0100
Subject: [PATCH 0958/1519] Run black

---
 tests/queryset/test_visitor.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/queryset/test_visitor.py b/tests/queryset/test_visitor.py
index e8504abd2..afa008394 100644
--- a/tests/queryset/test_visitor.py
+++ b/tests/queryset/test_visitor.py
@@ -407,5 +407,6 @@ def test_combine_or_empty(self):
     def test_combine_or_both_empty(self):
         assert Q() | Q() == Q()
 
+
 if __name__ == "__main__":
     unittest.main()

From af82c07acc3226f7ed65818536680343f2fd83c6 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Tue, 3 Dec 2019 09:19:02 +0100
Subject: [PATCH 0959/1519] Reformat with black

---
 tests/document/test_instance.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 1d3e18d04..173e02f2e 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3644,7 +3644,7 @@ class User(Document):
             User.objects().select_related()
 
     def test_embedded_document_failed_while_loading_instance_when_it_is_not_a_dict(
-        self
+        self,
     ):
         class LightSaber(EmbeddedDocument):
             color = StringField()

From 78b240b740b34de450d30a00c669a9283a8b37de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 4 Dec 2019 21:49:17 +0100
Subject: [PATCH 0960/1519] updated changelog + improved query_counter test

---
 docs/changelog.rst              |  1 +
 mongoengine/context_managers.py |  2 +-
 tests/document/test_instance.py | 38 ---------------------------
 tests/test_context_managers.py  | 46 +++++++++++++++++++++++++++++++++
 4 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 102e826d9..99081957f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -24,6 +24,7 @@ Development
 - The codebase is now formatted using ``black``. #2109
 - In bulk write insert, the detailed error message would raise in exception.
 - Added ability to compare Q and Q operations #2204
+- Added ability to use a db alias on query_counter #2194
 
 Changes in 0.18.2
 =================
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 5920b724d..1592ceef4 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -171,7 +171,7 @@ def __exit__(self, t, value, traceback):
 class query_counter(object):
     """Query_counter context manager to get the number of queries.
     This works by updating the `profiling_level` of the database so that all queries get logged,
-    resetting the db.system.profile collection at the beginnig of the context and counting the new entries.
+    resetting the db.system.profile collection at the beginning of the context and counting the new entries.
 
     This was designed for debugging purpose. In fact it is a global counter so queries issued by other threads/processes
     can interfere with it
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index c8ad2ff3a..173e02f2e 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -2825,44 +2825,6 @@ class B(A):
 
         assert "testdb-1" == B._meta.get("db_alias")
 
-    def test_query_counter_alias(self):
-        """query_counter works properly with db aliases?"""
-        # Register a connection with db_alias testdb-1
-        register_connection("testdb-1", "mongoenginetest2")
-
-        class A(Document):
-            """Uses default db_alias
-            """
-
-            name = StringField()
-
-        class B(Document):
-            """Uses testdb-1 db_alias
-            """
-
-            name = StringField()
-            meta = {"db_alias": "testdb-1"}
-
-        with query_counter() as q:
-            assert q == 0
-            a = A.objects.create(name="A")
-            assert q == 1
-            a = A.objects.first()
-            assert q == 2
-            a.name = "Test A"
-            a.save()
-            assert q == 3
-
-        with query_counter(alias="testdb-1") as q:
-            assert q == 0
-            b = B.objects.create(name="B")
-            assert q == 1
-            b = B.objects.first()
-            assert q == 2
-            b.name = "Test B"
-            b.save()
-            assert q == 3
-
     def test_db_ref_usage(self):
         """DB Ref usage in dict_fields."""
 
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index c10a02242..fa3f59608 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -282,6 +282,52 @@ def issue_1_find_query():
             assert q < 1000
             assert q <= int(q)
 
+    def test_query_counter_alias(self):
+        """query_counter works properly with db aliases?"""
+        # Register a connection with db_alias testdb-1
+        register_connection("testdb-1", "mongoenginetest2")
+
+        class A(Document):
+            """Uses default db_alias"""
+
+            name = StringField()
+
+        class B(Document):
+            """Uses testdb-1 db_alias"""
+
+            name = StringField()
+            meta = {"db_alias": "testdb-1"}
+
+        A.drop_collection()
+        B.drop_collection()
+
+        with query_counter() as q:
+            assert q == 0
+            A.objects.create(name="A")
+            assert q == 1
+            a = A.objects.first()
+            assert q == 2
+            a.name = "Test A"
+            a.save()
+            assert q == 3
+            # querying the other db should'nt alter the counter
+            B.objects().first()
+            assert q == 3
+
+        with query_counter(alias="testdb-1") as q:
+            assert q == 0
+            B.objects.create(name="B")
+            assert q == 1
+            b = B.objects.first()
+            assert q == 2
+            b.name = "Test B"
+            b.save()
+            assert b.name == "Test B"
+            assert q == 3
+            # querying the other db should'nt alter the counter
+            A.objects().first()
+            assert q == 3
+
     def test_query_counter_counts_getmore_queries(self):
         connect("mongoenginetest")
         db = get_db()

From cb77bb6b69bb80c79c97d2f0792d173fc2f443d4 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 00:21:03 +0100
Subject: [PATCH 0961/1519] Implement __bool__ on Q and QCombination

---
 mongoengine/queryset/base.py    |  2 +-
 mongoengine/queryset/visitor.py | 20 ++++++++++++++++----
 tests/queryset/test_visitor.py  | 11 +++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index a648391ea..c6f467ccb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -686,7 +686,7 @@ def with_id(self, object_id):
         .. versionchanged:: 0.6 Raises InvalidQueryError if filter has been set
         """
         queryset = self.clone()
-        if not queryset._query_obj.empty:
+        if queryset._query_obj:
             msg = "Cannot use a filter whilst using `with_id`"
             raise InvalidQueryError(msg)
         return queryset.filter(pk=object_id).first()
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index 058c722ab..a7295ae59 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -2,6 +2,8 @@
 
 from mongoengine.errors import InvalidQueryError
 from mongoengine.queryset import transform
+import warnings
+
 
 __all__ = ("Q", "QNode")
 
@@ -101,13 +103,15 @@ def _combine(self, other, operation):
             return self
 
         # Or if this Q is empty, ignore it and just use `other`.
-        if self.empty:
+        if not self:
             return other
 
         return QCombination(operation, [self, other])
 
     @property
     def empty(self):
+        msg = "'empty' property is deprecated in favour of using 'not bool(filter)"
+        warnings.warn(msg, DeprecationWarning)
         return False
 
     def __or__(self, other):
@@ -137,6 +141,9 @@ def __repr__(self):
         op = " & " if self.operation is self.AND else " | "
         return "(%s)" % op.join([repr(node) for node in self.children])
 
+    def __bool__(self):
+        return bool(self.children)
+
     def accept(self, visitor):
         for i in range(len(self.children)):
             if isinstance(self.children[i], QNode):
@@ -146,6 +153,8 @@ def accept(self, visitor):
 
     @property
     def empty(self):
+        msg = "'empty' property is deprecated in favour of using 'not bool(filter)"
+        warnings.warn(msg, DeprecationWarning)
         return not bool(self.children)
 
     def __eq__(self, other):
@@ -167,12 +176,15 @@ def __init__(self, **query):
     def __repr__(self):
         return "Q(**%s)" % repr(self.query)
 
+    def __bool__(self):
+        return bool(self.query)
+
+    def __eq__(self, other):
+        return self.__class__ == other.__class__ and self.query == other.query
+
     def accept(self, visitor):
         return visitor.visit_query(self)
 
     @property
     def empty(self):
         return not bool(self.query)
-
-    def __eq__(self, other):
-        return self.__class__ == other.__class__ and self.query == other.query
diff --git a/tests/queryset/test_visitor.py b/tests/queryset/test_visitor.py
index afa008394..81e0f253f 100644
--- a/tests/queryset/test_visitor.py
+++ b/tests/queryset/test_visitor.py
@@ -407,6 +407,17 @@ def test_combine_or_empty(self):
     def test_combine_or_both_empty(self):
         assert Q() | Q() == Q()
 
+    def test_q_bool(self):
+        assert Q(name="John")
+        assert not Q()
+
+    def test_combine_bool(self):
+        assert not Q() & Q()
+        assert Q() & Q(name="John")
+        assert Q(name="John") & Q()
+        assert Q() | Q(name="John")
+        assert Q(name="John") | Q()
+
 
 if __name__ == "__main__":
     unittest.main()

From bd6c52e025fbe60473a6f009b100eb4d8edbfe83 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 00:30:03 +0100
Subject: [PATCH 0962/1519] Changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 99081957f..e2ffa41e5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,6 +25,7 @@ Development
 - In bulk write insert, the detailed error message would raise in exception.
 - Added ability to compare Q and Q operations #2204
 - Added ability to use a db alias on query_counter #2194
+- Added ability to check if Q or Q operations is empty by parsing them to bool #2210
 
 Changes in 0.18.2
 =================

From 5f14d958ac32925df18e757f77f729f3bfb79c5a Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 00:46:57 +0100
Subject: [PATCH 0963/1519] Sort imports

---
 mongoengine/queryset/visitor.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index a7295ae59..8038d23fb 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -1,9 +1,8 @@
 import copy
+import warnings
 
 from mongoengine.errors import InvalidQueryError
 from mongoengine.queryset import transform
-import warnings
-
 
 __all__ = ("Q", "QNode")
 

From 17151f67c2cdd98e97f3f4f539af167b84927ee2 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 00:53:39 +0100
Subject: [PATCH 0964/1519] Reformat repo with pre-commit hooks

---
 docs/django.rst              | 4 ++--
 docs/faq.rst                 | 1 -
 docs/guide/connecting.rst    | 2 +-
 docs/guide/mongomock.rst     | 4 ++--
 docs/guide/signals.rst       | 4 ++--
 docs/guide/text-indexes.rst  | 6 +++---
 docs/index.rst               | 1 -
 mongoengine/queryset/base.py | 4 +++-
 python-mongoengine.spec      | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/django.rst b/docs/django.rst
index b8a52165d..d43a205ed 100644
--- a/docs/django.rst
+++ b/docs/django.rst
@@ -13,7 +13,7 @@ Help Wanted!
 
 The MongoEngine team is looking for help contributing and maintaining a new
 Django extension for MongoEngine! If you have Django experience and would like
-to help contribute to the project, please get in touch on the 
-`mailing list <http://groups.google.com/group/mongoengine-users>`_ or by 
+to help contribute to the project, please get in touch on the
+`mailing list <http://groups.google.com/group/mongoengine-users>`_ or by
 simply contributing on
 `GitHub <https://github.com/MongoEngine/django-mongoengine>`_.
diff --git a/docs/faq.rst b/docs/faq.rst
index 27cd69373..49c730235 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -10,4 +10,3 @@ If this is a requirement for your project, check the alternative:  `uMongo`_ and
 
 .. _uMongo: https://umongo.readthedocs.io/
 .. _MotorEngine: https://motorengine.readthedocs.io/
-
diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index aac139023..ac2146a67 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -86,7 +86,7 @@ using 3 different databases to store data::
         connect(alias='user-db-alias', db='user-db')
         connect(alias='book-db-alias', db='book-db')
         connect(alias='users-books-db-alias', db='users-books-db')
-        
+
         class User(Document):
             name = StringField()
 
diff --git a/docs/guide/mongomock.rst b/docs/guide/mongomock.rst
index d70ee6a62..9f199ce5b 100644
--- a/docs/guide/mongomock.rst
+++ b/docs/guide/mongomock.rst
@@ -2,10 +2,10 @@
 Use mongomock for testing
 ==============================
 
-`mongomock <https://github.com/vmalloc/mongomock/>`_ is a package to do just 
+`mongomock <https://github.com/vmalloc/mongomock/>`_ is a package to do just
 what the name implies, mocking a mongo database.
 
-To use with mongoengine, simply specify mongomock when connecting with 
+To use with mongoengine, simply specify mongomock when connecting with
 mongoengine:
 
 .. code-block:: python
diff --git a/docs/guide/signals.rst b/docs/guide/signals.rst
index 06bccb3bd..e52146102 100644
--- a/docs/guide/signals.rst
+++ b/docs/guide/signals.rst
@@ -44,8 +44,8 @@ Available signals include:
 
 `post_save`
   Called within :meth:`~mongoengine.Document.save` after most actions
-  (validation, insert/update, and cascades, but not clearing dirty flags) have 
-  completed successfully.  Passed the additional boolean keyword argument 
+  (validation, insert/update, and cascades, but not clearing dirty flags) have
+  completed successfully.  Passed the additional boolean keyword argument
   `created` to indicate if the save was an insert or an update.
 
 `pre_delete`
diff --git a/docs/guide/text-indexes.rst b/docs/guide/text-indexes.rst
index 92a4471a9..a5eaf7d8a 100644
--- a/docs/guide/text-indexes.rst
+++ b/docs/guide/text-indexes.rst
@@ -8,7 +8,7 @@ After MongoDB 2.4 version, supports search documents by text indexes.
 Defining a Document with text index
 ===================================
 Use the *$* prefix to set a text index, Look the declaration::
-  
+
   class News(Document):
       title = StringField()
       content = StringField()
@@ -35,10 +35,10 @@ Saving a document::
        content="Various improvements").save()
 
 Next, start a text search using :attr:`QuerySet.search_text` method::
-  
+
   document = News.objects.search_text('testing').first()
   document.title # may be: "Using mongodb text search"
-  
+
   document = News.objects.search_text('released').first()
   document.title # may be: "MongoEngine 0.9 released"
 
diff --git a/docs/index.rst b/docs/index.rst
index 662968d48..15f3c5908 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -91,4 +91,3 @@ Indices and tables
 * :ref:`genindex`
 * :ref:`modindex`
 * :ref:`search`
-
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index a648391ea..a09cbf99d 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1193,7 +1193,9 @@ def read_preference(self, read_preference):
         validate_read_preference("read_preference", read_preference)
         queryset = self.clone()
         queryset._read_preference = read_preference
-        queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_preference
+        queryset._cursor_obj = (
+            None
+        )  # we need to re-create the cursor object whenever we apply read_preference
         return queryset
 
     def scalar(self, *fields):
diff --git a/python-mongoengine.spec b/python-mongoengine.spec
index eddb488d3..635c779fd 100644
--- a/python-mongoengine.spec
+++ b/python-mongoengine.spec
@@ -51,4 +51,4 @@ rm -rf $RPM_BUILD_ROOT
 # %{python_sitearch}/*
 
 %changelog
-* See: http://docs.mongoengine.org/en/latest/changelog.html
\ No newline at end of file
+* See: http://docs.mongoengine.org/en/latest/changelog.html

From 5b9f2bac87cafab072e224f9f5c0caa123d26c8f Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 00:54:20 +0100
Subject: [PATCH 0965/1519] Add pre-commit

---
 .pre-commit-config.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..cac25e41f
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,13 @@
+repos:
+    - repo: https://github.com/ambv/black
+      rev: 19.3b0
+      hooks:
+        - id: black
+          language_version: python3
+
+    - repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v2.2.3
+      hooks:
+        - id: trailing-whitespace
+        - id: end-of-file-fixer
+        - id: flake8

From 648b28876d152be2a6e1f28b79ddb4f82e05e78b Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 00:55:16 +0100
Subject: [PATCH 0966/1519] Rename requirements-lint.txt to
 requirements-dev.txt

---
 requirements-lint.txt => requirements-dev.txt | 4 ++++
 1 file changed, 4 insertions(+)
 rename requirements-lint.txt => requirements-dev.txt (51%)

diff --git a/requirements-lint.txt b/requirements-dev.txt
similarity index 51%
rename from requirements-lint.txt
rename to requirements-dev.txt
index 9dc6123b1..e57131c58 100644
--- a/requirements-lint.txt
+++ b/requirements-dev.txt
@@ -1,3 +1,7 @@
 black
 flake8
 flake8-import-order
+pre-commit
+pytest
+ipdb
+ipython

From abc159b7b95380d0da6f9bc7cef427a31f3139e6 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 01:10:54 +0100
Subject: [PATCH 0967/1519] Update Contributing, changelog

---
 CONTRIBUTING.rst     | 24 ++++++++++++++++++++++--
 docs/changelog.rst   |  2 ++
 requirements-dev.txt |  1 +
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 56bae31fe..b571acf11 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -31,8 +31,28 @@ build. You should ensure that your code is properly converted by
 Style Guide
 -----------
 
-MongoEngine uses `black <https://github.com/python/black>`_ for code
-formatting.
+MongoEngine uses various tools to maintain a common coding style.
+
+To install all development tools, simply run the following commands:
+
+.. code-block:: console
+
+    $ python -m pip install -r requirements-dev.txt
+
+
+You can install `pre-commit <https://pre-commit.com/>`_ into your git hooks,
+to automatically check and fix any formatting issue before creating a
+git commit.
+
+Simply run the following command:
+
+.. code-block:: console
+
+    $ pre-commit install
+
+See the ``.pre-commit-config.yaml`` configuration file for more information
+on how it works.
+
 
 Testing
 -------
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 99081957f..933d02316 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,6 +25,8 @@ Development
 - In bulk write insert, the detailed error message would raise in exception.
 - Added ability to compare Q and Q operations #2204
 - Added ability to use a db alias on query_counter #2194
+- Added pre-commit
+- Renamed requirements-lint.txt to requirements-dev.txt
 
 Changes in 0.18.2
 =================
diff --git a/requirements-dev.txt b/requirements-dev.txt
index e57131c58..ee788e7aa 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -5,3 +5,4 @@ pre-commit
 pytest
 ipdb
 ipython
+tox

From 37ffeafeff79e615ca0aa3140b5db638a1cd252b Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 01:13:05 +0100
Subject: [PATCH 0968/1519] Replace 'pip' with 'python -m pip install' in docs

---
 README.rst                | 6 +++---
 docs/guide/installing.rst | 2 +-
 docs/index.rst            | 2 +-
 docs/tutorial.rst         | 2 +-
 docs/upgrade.rst          | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.rst b/README.rst
index 853d8fbe7..bae7c52ca 100644
--- a/README.rst
+++ b/README.rst
@@ -34,7 +34,7 @@ with MongoDB version > 3.6.
 Installation
 ============
 We recommend the use of `virtualenv <https://virtualenv.pypa.io/>`_ and of
-`pip <https://pip.pypa.io/>`_. You can then use ``pip install -U mongoengine``.
+`pip <https://pip.pypa.io/>`_. You can then use ``python -m pip install -U mongoengine``.
 You may also have `setuptools <http://peak.telecommunity.com/DevCenter/setuptools>`_
 and thus you can use ``easy_install -U mongoengine``. Another option is
 `pipenv <https://docs.pipenv.org/>`_. You can then use ``pipenv install mongoengine``
@@ -44,7 +44,7 @@ run ``python setup.py install``.
 
 Dependencies
 ============
-All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_.
+All of the dependencies can easily be installed via `python -m pip <https://pip.pypa.io/>`_.
 At the very least, you'll need these two packages to use MongoEngine:
 
 - pymongo>=3.4
@@ -126,7 +126,7 @@ installed in your environment and then:
 .. code-block:: shell
 
     # Install tox
-    $ pip install tox
+    $ python -m pip install tox
     # Run the test suites
     $ tox
 
diff --git a/docs/guide/installing.rst b/docs/guide/installing.rst
index b89d48f0d..2c962ad90 100644
--- a/docs/guide/installing.rst
+++ b/docs/guide/installing.rst
@@ -12,7 +12,7 @@ MongoEngine is available on PyPI, so you can use :program:`pip`:
 
 .. code-block:: console
 
-    $ pip install mongoengine
+    $ python -m pip install mongoengine
 
 Alternatively, if you don't have setuptools installed, `download it from PyPi
 <http://pypi.python.org/pypi/mongoengine/>`_ and run
diff --git a/docs/index.rst b/docs/index.rst
index 15f3c5908..a42ff8573 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -7,7 +7,7 @@ MongoDB. To install it, simply run
 
 .. code-block:: console
 
-    $ pip install -U mongoengine
+    $ python -m pip install -U mongoengine
 
 :doc:`tutorial`
   A quick tutorial building a tumblelog to get you up and running with
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index bcd0d17f4..b7885c346 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -18,7 +18,7 @@ location --- running it locally will be easier, but if that is not an option
 then it may be run on a remote server. If you haven't installed MongoEngine,
 simply use pip to install it like so::
 
-    $ pip install mongoengine
+    $ python -m pip install mongoengine
 
 Before we can start using MongoEngine, we need to tell it how to connect to our
 instance of :program:`mongod`. For this we use the :func:`~mongoengine.connect`
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 082dbadcb..285bf24c1 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -85,10 +85,10 @@ by default from now on.
 
 The 0.8.7 package on pypi was corrupted.  If upgrading from 0.8.7 to 0.9.0 please follow: ::
 
-    pip uninstall pymongo
-    pip uninstall mongoengine
-    pip install pymongo==2.8
-    pip install mongoengine
+    python -m pip uninstall pymongo
+    python -m pip uninstall mongoengine
+    python -m pip install pymongo==2.8
+    python -m pip install mongoengine
 
 0.8.7
 *****

From d3d7f0e670b09fdd571fa6f2cf18ee36b793b6c7 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 01:18:29 +0100
Subject: [PATCH 0969/1519] Changelog

---
 CONTRIBUTING.rst   | 2 +-
 docs/changelog.rst | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b571acf11..27759f8f6 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -44,7 +44,7 @@ You can install `pre-commit <https://pre-commit.com/>`_ into your git hooks,
 to automatically check and fix any formatting issue before creating a
 git commit.
 
-Simply run the following command:
+To enable ``pre-commit`` simply run:
 
 .. code-block:: console
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 933d02316..38f1a85eb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -25,8 +25,8 @@ Development
 - In bulk write insert, the detailed error message would raise in exception.
 - Added ability to compare Q and Q operations #2204
 - Added ability to use a db alias on query_counter #2194
-- Added pre-commit
-- Renamed requirements-lint.txt to requirements-dev.txt
+- Added pre-commit #2212
+- Renamed requirements-lint.txt to requirements-dev.txt #2212
 
 Changes in 0.18.2
 =================

From 90fecc56ddf53872f72774b75d27090acd6315ff Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 01:33:35 +0100
Subject: [PATCH 0970/1519] Reformat with black

---
 mongoengine/queryset/base.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index a09cbf99d..a648391ea 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1193,9 +1193,7 @@ def read_preference(self, read_preference):
         validate_read_preference("read_preference", read_preference)
         queryset = self.clone()
         queryset._read_preference = read_preference
-        queryset._cursor_obj = (
-            None
-        )  # we need to re-create the cursor object whenever we apply read_preference
+        queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_preference
         return queryset
 
     def scalar(self, *fields):

From 6e8196d475953f88bd70207e81234bc07e1526d0 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Thu, 5 Dec 2019 01:31:37 +0100
Subject: [PATCH 0971/1519] Python 2.x compatibility

---
 mongoengine/queryset/visitor.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index 8038d23fb..7faed8974 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -143,6 +143,8 @@ def __repr__(self):
     def __bool__(self):
         return bool(self.children)
 
+    __nonzero__ = __bool__  # For Py2 support
+
     def accept(self, visitor):
         for i in range(len(self.children)):
             if isinstance(self.children[i], QNode):
@@ -178,6 +180,8 @@ def __repr__(self):
     def __bool__(self):
         return bool(self.query)
 
+    __nonzero__ = __bool__  # For Py2 support
+
     def __eq__(self, other):
         return self.__class__ == other.__class__ and self.query == other.query
 

From 1b38309d70efc122720d9c5d3fcc6d362436ed62 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Fri, 6 Dec 2019 10:14:22 +0100
Subject: [PATCH 0972/1519] Revert 'empty' usage to it's previous state

---
 mongoengine/queryset/base.py    | 2 +-
 mongoengine/queryset/visitor.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c6f467ccb..a648391ea 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -686,7 +686,7 @@ def with_id(self, object_id):
         .. versionchanged:: 0.6 Raises InvalidQueryError if filter has been set
         """
         queryset = self.clone()
-        if queryset._query_obj:
+        if not queryset._query_obj.empty:
             msg = "Cannot use a filter whilst using `with_id`"
             raise InvalidQueryError(msg)
         return queryset.filter(pk=object_id).first()
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index 7faed8974..470839c14 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -102,14 +102,14 @@ def _combine(self, other, operation):
             return self
 
         # Or if this Q is empty, ignore it and just use `other`.
-        if not self:
+        if self.empty:
             return other
 
         return QCombination(operation, [self, other])
 
     @property
     def empty(self):
-        msg = "'empty' property is deprecated in favour of using 'not bool(filter)"
+        msg = "'empty' property is deprecated in favour of using 'not bool(filter)'"
         warnings.warn(msg, DeprecationWarning)
         return False
 
@@ -154,7 +154,7 @@ def accept(self, visitor):
 
     @property
     def empty(self):
-        msg = "'empty' property is deprecated in favour of using 'not bool(filter)"
+        msg = "'empty' property is deprecated in favour of using 'not bool(filter)'"
         warnings.warn(msg, DeprecationWarning)
         return not bool(self.children)
 

From e83132f32c254f04cb505d1ede1d90f0dac84b18 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Tue, 10 Dec 2019 11:51:33 +0100
Subject: [PATCH 0973/1519] Note deprecation of 'empty' in changelog

---
 docs/changelog.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e2ffa41e5..bc01a4030 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,6 +17,9 @@ Development
     - If you catch/use ``MongoEngineConnectionError`` in your code, you'll have to rename it.
 - BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
     - From now on keyword arguments (e.g. ``Doc(field_name=value)``) are required.
+- DEPRECATION: ``Q.empty`` & ``QNode.empty`` are marked as deprecated and will be removed in a next version of MongoEngine. #2210
+    - Added ability to check if Q or QNode are empty by parsing them to bool.
+    - Instead of ``Q(name="John").empty`` use ``not Q(name="John")``.
 - Improve error message related to InvalidDocumentError #2180
 - Fix updating/modifying/deleting/reloading a document that's sharded by a field with ``db_field`` specified. #2125
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
@@ -25,7 +28,6 @@ Development
 - In bulk write insert, the detailed error message would raise in exception.
 - Added ability to compare Q and Q operations #2204
 - Added ability to use a db alias on query_counter #2194
-- Added ability to check if Q or Q operations is empty by parsing them to bool #2210
 
 Changes in 0.18.2
 =================

From b2053144241f8f579993eff2c4de3084f074535f Mon Sep 17 00:00:00 2001
From: Matt Simpson <mcsimps2@gmail.com>
Date: Tue, 10 Dec 2019 11:09:22 -0500
Subject: [PATCH 0974/1519] Add ability for dict keys to have . or $ in MongoDB
 >= 3.6

Starting in MongoDB >= 3.6, it is valid for dictionary keys to have $ or . in them as long as they don't start with $.  Additional tests added.
---
 AUTHORS                         |  1 +
 mongoengine/fields.py           | 19 ++++++++++++++++++-
 tests/fields/test_dict_field.py | 19 +++++++++++++++----
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index aa044bd25..1271a8d99 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -253,3 +253,4 @@ that much better:
  * Gaurav Dadhania (https://github.com/GVRV)
  * Yurii Andrieiev (https://github.com/yandrieiev)
  * Filip Kucharczyk (https://github.com/Pacu2)
+ * Matthew Simpson (https://github.com/mcsimps2)
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f8f527a33..c3d937407 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -41,6 +41,7 @@
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
+from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
 from mongoengine.python_support import StringIO
 from mongoengine.queryset import DO_NOTHING
 from mongoengine.queryset.base import BaseQuerySet
@@ -1051,6 +1052,15 @@ def key_has_dot_or_dollar(d):
             return True
 
 
+def key_starts_with_dollar(d):
+    """Helper function to recursively determine if any key in a
+    dictionary starts with a dollar
+    """
+    for k, v in d.items():
+        if (k.startswith("$")) or (isinstance(v, dict) and key_starts_with_dollar(v)):
+            return True
+
+
 class DictField(ComplexBaseField):
     """A dictionary field that wraps a standard Python dictionary. This is
     similar to an embedded document, but the structure is not defined.
@@ -1077,11 +1087,18 @@ def validate(self, value):
         if key_not_string(value):
             msg = "Invalid dictionary key - documents must have only string keys"
             self.error(msg)
-        if key_has_dot_or_dollar(value):
+
+        curr_mongo_ver = get_mongodb_version()
+
+        if curr_mongo_ver < MONGODB_36 and key_has_dot_or_dollar(value):
             self.error(
                 'Invalid dictionary key name - keys may not contain "."'
                 ' or startswith "$" characters'
             )
+        elif curr_mongo_ver >= MONGODB_36 and key_starts_with_dollar(value):
+            self.error(
+                'Invalid dictionary key name - keys may not startswith "$" characters'
+            )
         super(DictField, self).validate(value)
 
     def lookup_member(self, member_name):
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index e88128f99..44e628f6c 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -3,6 +3,7 @@
 
 from mongoengine import *
 from mongoengine.base import BaseDict
+from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
 
 from tests.utils import MongoDBTestCase, get_as_pymongo
 
@@ -43,16 +44,26 @@ class BlogPost(Document):
         with pytest.raises(ValidationError):
             post.validate()
 
-        post.info = {"the.title": "test"}
+        post.info = {"$title.test": "test"}
         with pytest.raises(ValidationError):
             post.validate()
 
-        post.info = {"nested": {"the.title": "test"}}
+        post.info = {1: "test"}
         with pytest.raises(ValidationError):
             post.validate()
 
-        post.info = {1: "test"}
-        with pytest.raises(ValidationError):
+        post.info = {"nested": {"the.title": "test"}}
+        if get_mongodb_version() < MONGODB_36:
+            with pytest.raises(ValidationError):
+                post.validate()
+        else:
+            post.validate()
+
+        post.info = {"dollar_and_dot": {"te$st.test": "test"}}
+        if get_mongodb_version() < MONGODB_36:
+            with pytest.raises(ValidationError):
+                post.validate()
+        else:
             post.validate()
 
         post.info = {"title": "test"}

From 3b099f936a02444b3bf02c7dcdf13b1f2fc3b895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 13 Dec 2019 21:32:45 +0100
Subject: [PATCH 0975/1519] provide additional details on how inheritance works
 in doc

---
 docs/guide/defining-documents.rst | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 9dcca88c4..652c5cd9c 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -744,7 +744,7 @@ Document inheritance
 
 To create a specialised type of a :class:`~mongoengine.Document` you have
 defined, you may subclass it and add any extra fields or methods you may need.
-As this is new class is not a direct subclass of
+As this new class is not a direct subclass of
 :class:`~mongoengine.Document`, it will not be stored in its own collection; it
 will use the same collection as its superclass uses. This allows for more
 convenient and efficient retrieval of related documents -- all you need do is
@@ -767,6 +767,27 @@ document.::
           Setting :attr:`allow_inheritance` to True should also be used in
           :class:`~mongoengine.EmbeddedDocument` class in case you need to subclass it
 
+When it comes to querying using :attr:`.objects()`, querying `Page.objects()` will query
+both `Page` and `DatedPage` whereas querying `DatedPage` will only query the `DatedPage` documents.
+Behind the scenes, MongoEngine deals with inheritance by adding a :attr:`_cls` attribute that contains
+the class name in every documents. When a document is loaded, MongoEngine checks
+it's :attr:`_cls` attribute and use that class to construct the instance.::
+
+    Page(title='a funky title').save()
+    DatedPage(title='another title', date=datetime.utcnow()).save()
+
+    print(Page.objects().count())         # 2
+    print(DatedPage.objects().count())    # 1
+
+    # print documents in their native form
+    # we remove 'id' to avoid polluting the output with unnecessary detail
+    qs = Page.objects.exclude('id').as_pymongo()
+    print(list(qs))
+    # [
+    #   {'_cls': u 'Page', 'title': 'a funky title'},
+    #   {'_cls': u 'Page.DatedPage', 'title': u 'another title', 'date': datetime.datetime(2019, 12, 13, 20, 16, 59, 993000)}
+    # ]
+
 Working with existing data
 --------------------------
 As MongoEngine no longer defaults to needing :attr:`_cls`, you can quickly and

From 2ca905b6e53794a4725d7519b8aca64f4d2ebd31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 14 Jun 2019 23:30:01 +0200
Subject: [PATCH 0976/1519] Finalize python2/3 codebase compatibility and get
 rid of 2to3

---
 mongoengine/base/datastructures.py           |  4 ++--
 mongoengine/base/document.py                 |  4 ++--
 mongoengine/fields.py                        |  8 +-------
 mongoengine/queryset/base.py                 |  2 +-
 setup.py                                     |  4 ++--
 tests/fields/test_embedded_document_field.py | 10 ++++++----
 tests/fields/test_long_field.py              |  6 +-----
 tests/fields/test_sequence_field.py          | 14 +++++++-------
 tests/fields/test_url_field.py               |  7 ++++---
 tests/queryset/test_queryset.py              |  8 ++++----
 tests/test_signals.py                        |  2 +-
 11 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index d1b5ae761..a9abf6ea8 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -422,10 +422,10 @@ def __len__(self):
         return len(list(iteritems(self)))
 
     def __eq__(self, other):
-        return self.items() == other.items()
+        return list(self.items()) == list(other.items())
 
     def __ne__(self, other):
-        return self.items() != other.items()
+        return list(self.items()) != list(other.items())
 
     @classmethod
     def create(cls, allowed_keys):
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index ad691362d..4948e6725 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -92,7 +92,7 @@ def __init__(self, *args, **values):
         # if so raise an Exception.
         if not self._dynamic and (self._meta.get("strict", True) or _created):
             _undefined_fields = set(values.keys()) - set(
-                self._fields.keys() + ["id", "pk", "_cls", "_text_score"]
+                list(self._fields.keys()) + ["id", "pk", "_cls", "_text_score"]
             )
             if _undefined_fields:
                 msg = ('The fields "{0}" do not exist on the document "{1}"').format(
@@ -670,7 +670,7 @@ def _delta(self):
                 del set_data["_id"]
 
         # Determine if any changed items were actually unset.
-        for path, value in set_data.items():
+        for path, value in list(set_data.items()):
             if value or isinstance(
                 value, (numbers.Number, bool)
             ):  # Account for 0 and True that are truthy
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f8f527a33..bef85dd7a 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -8,6 +8,7 @@
 from operator import itemgetter
 
 from bson import Binary, DBRef, ObjectId, SON
+from bson.int64 import Int64
 import gridfs
 import pymongo
 from pymongo import ReturnDocument
@@ -21,11 +22,6 @@
 else:
     import dateutil.parser
 
-try:
-    from bson.int64 import Int64
-except ImportError:
-    Int64 = long
-
 
 from mongoengine.base import (
     BaseDocument,
@@ -53,8 +49,6 @@
     ImageOps = None
 
 if six.PY3:
-    # Useless as long as 2to3 gets executed
-    # as it turns `long` into `int` blindly
     long = int
 
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index a648391ea..d31760503 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -989,7 +989,7 @@ def only(self, *fields):
         .. versionchanged:: 0.5 - Added subfield support
         """
         fields = {f: QueryFieldList.ONLY for f in fields}
-        self.only_fields = fields.keys()
+        self.only_fields = list(fields.keys())
         return self.fields(True, **fields)
 
     def exclude(self, *fields):
diff --git a/setup.py b/setup.py
index ceb5afad8..c6e99f539 100644
--- a/setup.py
+++ b/setup.py
@@ -118,8 +118,8 @@ def run_tests(self):
         "Pillow>=2.0.0",
     ],
 }
+
 if sys.version_info[0] == 3:
-    extra_opts["use_2to3"] = True
     if "test" in sys.argv:
         extra_opts["packages"] = find_packages()
         extra_opts["package_data"] = {
@@ -143,7 +143,7 @@ def run_tests(self):
     long_description=LONG_DESCRIPTION,
     platforms=["any"],
     classifiers=CLASSIFIERS,
-    install_requires=["pymongo>=3.4", "six>=1.10.0"],
+    install_requires=['pymongo>=3.4', 'six', 'future'],
     cmdclass={"test": PyTest},
     **extra_opts
 )
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index eeddac1ee..b80f4d8ca 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from builtins import str
+
 import pytest
 
 from mongoengine import (
@@ -75,7 +77,7 @@ class Person(Document):
         # Test non exiting attribute
         with pytest.raises(InvalidQueryError) as exc_info:
             Person.objects(settings__notexist="bar").first()
-        assert unicode(exc_info.value) == u'Cannot resolve field "notexist"'
+        assert str(exc_info.value) == u'Cannot resolve field "notexist"'
 
         with pytest.raises(LookUpError):
             Person.objects.only("settings.notexist")
@@ -111,7 +113,7 @@ class Person(Document):
         # Test non exiting attribute
         with pytest.raises(InvalidQueryError) as exc_info:
             assert Person.objects(settings__notexist="bar").first().id == p.id
-        assert unicode(exc_info.value) == u'Cannot resolve field "notexist"'
+        assert str(exc_info.value) == u'Cannot resolve field "notexist"'
 
         # Test existing attribute
         assert Person.objects(settings__base_foo="basefoo").first().id == p.id
@@ -319,7 +321,7 @@ class Person(Document):
         # Test non exiting attribute
         with pytest.raises(InvalidQueryError) as exc_info:
             Person.objects(settings__notexist="bar").first()
-        assert unicode(exc_info.value) == u'Cannot resolve field "notexist"'
+        assert str(exc_info.value) == u'Cannot resolve field "notexist"'
 
         with pytest.raises(LookUpError):
             Person.objects.only("settings.notexist")
@@ -347,7 +349,7 @@ class Person(Document):
         # Test non exiting attribute
         with pytest.raises(InvalidQueryError) as exc_info:
             assert Person.objects(settings__notexist="bar").first().id == p.id
-        assert unicode(exc_info.value) == u'Cannot resolve field "notexist"'
+        assert str(exc_info.value) == u'Cannot resolve field "notexist"'
 
         # Test existing attribute
         assert Person.objects(settings__base_foo="basefoo").first().id == p.id
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index da4f04c89..b39a714c1 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -1,12 +1,8 @@
 # -*- coding: utf-8 -*-
 import pytest
+from bson.int64 import Int64
 import six
 
-try:
-    from bson.int64 import Int64
-except ImportError:
-    Int64 = long
-
 from mongoengine import *
 from mongoengine.connection import get_db
 
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
index aa83f7100..f96f6b062 100644
--- a/tests/fields/test_sequence_field.py
+++ b/tests/fields/test_sequence_field.py
@@ -21,7 +21,7 @@ class Person(Document):
         assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        assert ids == range(1, 11)
+        assert ids == list(range(1, 11))
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
         assert c["next"] == 10
@@ -76,7 +76,7 @@ class Person(Document):
         assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        assert ids == range(1, 11)
+        assert ids == list(range(1, 11))
 
         c = self.db["mongoengine.counters"].find_one({"_id": "jelly.id"})
         assert c["next"] == 10
@@ -101,10 +101,10 @@ class Person(Document):
         assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        assert ids == range(1, 11)
+        assert ids == list(range(1, 11))
 
         counters = [i.counter for i in Person.objects]
-        assert counters == range(1, 11)
+        assert counters == list(range(1, 11))
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
         assert c["next"] == 10
@@ -166,10 +166,10 @@ class Person(Document):
         assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        assert ids == range(1, 11)
+        assert ids == list(range(1, 11))
 
         id = [i.id for i in Animal.objects]
-        assert id == range(1, 11)
+        assert id == list(range(1, 11))
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
         assert c["next"] == 10
@@ -193,7 +193,7 @@ class Person(Document):
         assert c["next"] == 10
 
         ids = [i.id for i in Person.objects]
-        assert ids == map(str, range(1, 11))
+        assert ids == [str(i) for i in range(1, 11)]
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
         assert c["next"] == 10
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index 948a4788f..98f5d4fd2 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import pytest
 
+from builtins import str
+
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
@@ -35,9 +37,8 @@ class Link(Document):
         with pytest.raises(ValidationError) as exc_info:
             link.validate()
         assert (
-            unicode(exc_info.value)
-            == u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])"
-        )
+            str(exc_info.exception)
+            == u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])")
 
     def test_url_scheme_validation(self):
         """Ensure that URLFields validate urls with specific schemes properly.
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 7812ab665..49dab1696 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -110,7 +110,7 @@ def test_find(self):
         # Filter people by age
         people = self.Person.objects(age=20)
         assert people.count() == 1
-        person = people.next()
+        person = next(people)
         assert person == user_a
         assert person.name == "User A"
         assert person.age == 20
@@ -2768,7 +2768,7 @@ class Person(Document):
         )
 
         # start a map/reduce
-        cursor.next()
+        next(cursor)
 
         results = Person.objects.map_reduce(
             map_f=map_person,
@@ -4395,7 +4395,7 @@ def test_scalar_cursor_behaviour(self):
         # Use a query to filter the people found to just person1
         people = self.Person.objects(age=20).scalar("name")
         assert people.count() == 1
-        person = people.next()
+        person = next(people)
         assert person == "User A"
 
         # Test limit
@@ -5309,7 +5309,7 @@ class Test(Document):
         if not test:
             raise AssertionError("Cursor has data and returned False")
 
-        queryset.next()
+        next(queryset)
         if not queryset:
             raise AssertionError(
                 "Cursor has data and it must returns True, even in the last item."
diff --git a/tests/test_signals.py b/tests/test_signals.py
index d79eaf754..13ea5a055 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -58,7 +58,7 @@ def pre_save_post_validation(cls, sender, document, **kwargs):
 
             @classmethod
             def post_save(cls, sender, document, **kwargs):
-                dirty_keys = document._delta()[0].keys() + document._delta()[1].keys()
+                dirty_keys = list(document._delta()[0].keys()) + list(document._delta()[1].keys())
                 signal_output.append("post_save signal, %s" % document)
                 signal_output.append("post_save dirty keys, %s" % dirty_keys)
                 if kwargs.pop("created", False):

From 009f9a2b14fb1bde3465ea702784c1381d617c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 15 Jun 2019 12:24:13 +0200
Subject: [PATCH 0977/1519] set dist as xenial to avoid relying on flaky travis
 default dist

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index cbf34cde7..0a96e7625 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,8 @@ python:
 
 dist: xenial
 
+dist: xenial
+
 env:
   global:
     - MONGODB_3_4=3.4.17

From a3e432eb68db6be7944ad1cf96c0526d7a10d39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 15 Jun 2019 14:37:47 +0200
Subject: [PATCH 0978/1519] remove references to '2to3' in doc, travis, etc

---
 .landscape.yml             |  9 ++-------
 .travis.yml                |  4 ++--
 CONTRIBUTING.rst           | 18 +++++++++++++-----
 benchmarks/test_inserts.py |  7 +++++++
 mongoengine/document.py    |  4 ----
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/.landscape.yml b/.landscape.yml
index a27bbb034..4f13a5eb0 100644
--- a/.landscape.yml
+++ b/.landscape.yml
@@ -5,17 +5,12 @@ pylint:
 
     options:
         additional-builtins:
-            # add xrange and long as valid built-ins. In Python 3, xrange is
-            # translated into range and long is translated into int via 2to3 (see
-            # "use_2to3" in setup.py). This should be removed when we drop Python
-            # 2 support (which probably won't happen any time soon).
-            - xrange
+            # add long as valid built-ins.
             - long
 
 pyflakes:
     disable:
-        # undefined variables are already covered by pylint (and exclude
-        # xrange & long)
+        # undefined variables are already covered by pylint (and exclude long)
         - F821
 
 ignore-paths:
diff --git a/.travis.yml b/.travis.yml
index 0a96e7625..ecd5163dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,7 +73,7 @@ install:
 before_script:
   - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
   - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then flake8 .; else echo "flake8 only runs on py27"; fi   # Run flake8 for Python 2.7 only
+  - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then flake8 .; else echo "flake8 only runs on py37"; fi         # Run flake8 for Python 3.7 only
   - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then black --check .; else echo "black only runs on py37"; fi   # Run black for Python 3.7 only
   - mongo --eval 'db.version();'    # Make sure mongo is awake
 
@@ -84,7 +84,7 @@ script:
 # 0% coverage. That's caused by 'use_2to3', which builds the py3-compatible
 # code in a separate dir and runs tests on that.
 after_success:
-- if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then coveralls --verbose; else echo "coveralls only sent for py27"; fi
+- coveralls --verbose
 
 notifications:
   irc: irc.freenode.org#mongoengine
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 56bae31fe..a71c2cec8 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -22,11 +22,19 @@ Supported Interpreters
 
 MongoEngine supports CPython 2.7 and newer. Language
 features not supported by all interpreters can not be used.
-The codebase is written in python 2 so you must be using python 2
-when developing new features. Compatibility of the library with Python 3
-relies on the 2to3 package that gets executed as part of the installation
-build. You should ensure that your code is properly converted by
-`2to3 <http://docs.python.org/library/2to3.html>`_.
+The codebase is written in a compatible manner for python 2 & 3 so it
+is important that this is taken into account when it comes to discrepencies
+between the 2 versions (check this https://python-future.org/compatible_idioms.html).
+Travis runs run the tests against the different versions as a safety net.
+
+Python 2/3 compatibility
+----------------------
+
+The codebase is written in a compatible manner for python 2 & 3 so it
+is important that this is taken into account when it comes to discrepencies
+between the 2 versions (check this https://python-future.org/compatible_idioms.html).
+Travis runs run the tests against the different versions as a safety net.
+
 
 Style Guide
 -----------
diff --git a/benchmarks/test_inserts.py b/benchmarks/test_inserts.py
index fd017bae3..af6399f79 100644
--- a/benchmarks/test_inserts.py
+++ b/benchmarks/test_inserts.py
@@ -3,13 +3,17 @@
 
 def main():
     setup = """
+from builtins import range
+
 from pymongo import MongoClient
+
 connection = MongoClient()
 connection.drop_database('mongoengine_benchmark_test')
 """
 
     stmt = """
 from pymongo import MongoClient
+
 connection = MongoClient()
 
 db = connection.mongoengine_benchmark_test
@@ -55,7 +59,10 @@ def main():
     print("{}s".format(t.timeit(1)))
 
     setup = """
+from builtins import range
+
 from pymongo import MongoClient
+
 connection = MongoClient()
 connection.drop_database('mongoengine_benchmark_test')
 connection.close()
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 23968f17d..fc6b9f166 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -71,7 +71,6 @@ class EmbeddedDocument(six.with_metaclass(DocumentMetaclass, BaseDocument)):
 
     __slots__ = ("_instance",)
 
-    # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
     my_metaclass = DocumentMetaclass
 
@@ -156,7 +155,6 @@ class Document(six.with_metaclass(TopLevelDocumentMetaclass, BaseDocument)):
     in the :attr:`meta` dictionary.
     """
 
-    # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
     my_metaclass = TopLevelDocumentMetaclass
 
@@ -1045,7 +1043,6 @@ class DynamicDocument(six.with_metaclass(TopLevelDocumentMetaclass, Document)):
         There is one caveat on Dynamic Documents: undeclared fields cannot start with `_`
     """
 
-    # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
     my_metaclass = TopLevelDocumentMetaclass
 
@@ -1069,7 +1066,6 @@ class DynamicEmbeddedDocument(six.with_metaclass(DocumentMetaclass, EmbeddedDocu
     information about dynamic documents.
     """
 
-    # The __metaclass__ attribute is removed by 2to3 when running with Python3
     # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
     my_metaclass = DocumentMetaclass
 

From 44b7f792fead6a3fa61dcb75a9a4d3c7ecdc90b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 16 Jun 2019 22:45:04 +0200
Subject: [PATCH 0979/1519] fix benchmarks prints

---
 benchmarks/test_basic_doc_ops.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/benchmarks/test_basic_doc_ops.py b/benchmarks/test_basic_doc_ops.py
index e840f97ad..c74594feb 100644
--- a/benchmarks/test_basic_doc_ops.py
+++ b/benchmarks/test_basic_doc_ops.py
@@ -135,7 +135,6 @@ def create_and_delete_company():
         % (timeit(create_and_delete_company, 10) * 10 ** 3)
     )
 
-
 if __name__ == "__main__":
     test_basic()
     print("-" * 100)

From 7e0ba1b3359f494a750400042245662a58ae472c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 16 Jun 2019 23:09:46 +0200
Subject: [PATCH 0980/1519] clean remaining references to 2to3

---
 .travis.yml      | 3 ---
 CONTRIBUTING.rst | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ecd5163dd..de32e6bfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -80,9 +80,6 @@ before_script:
 script:
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
 
-# For now only submit coveralls for Python v2.7. Python v3.x currently shows
-# 0% coverage. That's caused by 'use_2to3', which builds the py3-compatible
-# code in a separate dir and runs tests on that.
 after_success:
 - coveralls --verbose
 
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index a71c2cec8..445319e5b 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -22,10 +22,6 @@ Supported Interpreters
 
 MongoEngine supports CPython 2.7 and newer. Language
 features not supported by all interpreters can not be used.
-The codebase is written in a compatible manner for python 2 & 3 so it
-is important that this is taken into account when it comes to discrepencies
-between the 2 versions (check this https://python-future.org/compatible_idioms.html).
-Travis runs run the tests against the different versions as a safety net.
 
 Python 2/3 compatibility
 ----------------------

From 82af5e4a1920578fbd9dc36de8c1760311fb9837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 18 Jun 2019 22:55:51 +0200
Subject: [PATCH 0981/1519] fix small finding from review on py2py3 compat

---
 mongoengine/base/document.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 4948e6725..4e4df92f9 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -3,6 +3,7 @@
 from functools import partial
 
 from bson import DBRef, ObjectId, SON, json_util
+from future.utils import listitems
 import pymongo
 import six
 from six import iteritems
@@ -670,7 +671,7 @@ def _delta(self):
                 del set_data["_id"]
 
         # Determine if any changed items were actually unset.
-        for path, value in list(set_data.items()):
+        for path, value in listitems(set_data):
             if value or isinstance(
                 value, (numbers.Number, bool)
             ):  # Account for 0 and True that are truthy

From 64c0cace85ae528892409b9f34c343aff1bfbe60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 19 Jul 2019 21:50:47 +0200
Subject: [PATCH 0982/1519] fix from code review regarding py2py3 compat

---
 CONTRIBUTING.rst                    |  4 ++--
 mongoengine/base/datastructures.py  |  5 +++--
 tests/fields/test_sequence_field.py | 10 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 445319e5b..b04ae9688 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -28,8 +28,8 @@ Python 2/3 compatibility
 
 The codebase is written in a compatible manner for python 2 & 3 so it
 is important that this is taken into account when it comes to discrepencies
-between the 2 versions (check this https://python-future.org/compatible_idioms.html).
-Travis runs run the tests against the different versions as a safety net.
+between the two versions (see https://python-future.org/compatible_idioms.html).
+Travis runs the tests against different Python versions as a safety net.
 
 
 Style Guide
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index a9abf6ea8..f8b4cd921 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,6 +1,7 @@
 import weakref
 
 from bson import DBRef
+from future.utils import listitems
 import six
 from six import iteritems
 
@@ -422,10 +423,10 @@ def __len__(self):
         return len(list(iteritems(self)))
 
     def __eq__(self, other):
-        return list(self.items()) == list(other.items())
+        return listitems(self) == listitems(other)
 
     def __ne__(self, other):
-        return list(self.items()) != list(other.items())
+        return not(self == other)
 
     @classmethod
     def create(cls, allowed_keys):
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
index f96f6b062..8e6615a1b 100644
--- a/tests/fields/test_sequence_field.py
+++ b/tests/fields/test_sequence_field.py
@@ -267,12 +267,12 @@ class Bar(Base):
         foo = Foo(name="Foo")
         foo.save()
 
-        assert not (
-            "base.counter" in self.db["mongoengine.counters"].find().distinct("_id")
+        assert (
+            "base.counter" not in self.db["mongoengine.counters"].find().distinct("_id")
         )
-        assert ("foo.counter" and "bar.counter") in self.db[
-            "mongoengine.counters"
-        ].find().distinct("_id")
+        existing_counters = self.db["mongoengine.counters"].find().distinct("_id")
+        assert "foo.counter" in existing_counters
+        assert "bar.counter" in existing_counters
         assert foo.counter == bar.counter
         assert foo._fields["counter"].owner_document == Foo
         assert bar._fields["counter"].owner_document == Bar

From 45a7520fc3c9b22452d78ee2b5ae9c11f616b6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 21 Jul 2019 22:54:14 +0200
Subject: [PATCH 0983/1519] make use past.builtins.long

---
 mongoengine/fields.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index bef85dd7a..562cc9063 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -10,6 +10,7 @@
 from bson import Binary, DBRef, ObjectId, SON
 from bson.int64 import Int64
 import gridfs
+from past.builtins import long
 import pymongo
 from pymongo import ReturnDocument
 import six
@@ -48,9 +49,6 @@
     Image = None
     ImageOps = None
 
-if six.PY3:
-    long = int
-
 
 __all__ = (
     "StringField",

From 6bc4e602bb5fef6c48ccc3233645eed729f2d9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 14 Dec 2019 00:05:48 +0100
Subject: [PATCH 0984/1519] additional fix

---
 tests/fields/test_url_field.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index 98f5d4fd2..477bced72 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
-import pytest
-
 from builtins import str
 
-from mongoengine import *
+import pytest
 
+from mongoengine import *
 from tests.utils import MongoDBTestCase
 
 
@@ -37,8 +36,9 @@ class Link(Document):
         with pytest.raises(ValidationError) as exc_info:
             link.validate()
         assert (
-            str(exc_info.exception)
-            == u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])")
+            str(exc_info.value)
+            == u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])"
+        )
 
     def test_url_scheme_validation(self):
         """Ensure that URLFields validate urls with specific schemes properly.

From 9166ba91d713924f91983cfbe959c4981e4f0711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 14 Dec 2019 15:39:02 +0100
Subject: [PATCH 0985/1519] fix minor styling issue

---
 benchmarks/test_basic_doc_ops.py    | 1 +
 mongoengine/base/datastructures.py  | 2 +-
 setup.py                            | 2 +-
 tests/fields/test_sequence_field.py | 4 ++--
 tests/test_signals.py               | 4 +++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/benchmarks/test_basic_doc_ops.py b/benchmarks/test_basic_doc_ops.py
index c74594feb..e840f97ad 100644
--- a/benchmarks/test_basic_doc_ops.py
+++ b/benchmarks/test_basic_doc_ops.py
@@ -135,6 +135,7 @@ def create_and_delete_company():
         % (timeit(create_and_delete_company, 10) * 10 ** 3)
     )
 
+
 if __name__ == "__main__":
     test_basic()
     print("-" * 100)
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index f8b4cd921..8c93f5962 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -426,7 +426,7 @@ def __eq__(self, other):
         return listitems(self) == listitems(other)
 
     def __ne__(self, other):
-        return not(self == other)
+        return not (self == other)
 
     @classmethod
     def create(cls, allowed_keys):
diff --git a/setup.py b/setup.py
index c6e99f539..19cd4be75 100644
--- a/setup.py
+++ b/setup.py
@@ -143,7 +143,7 @@ def run_tests(self):
     long_description=LONG_DESCRIPTION,
     platforms=["any"],
     classifiers=CLASSIFIERS,
-    install_requires=['pymongo>=3.4', 'six', 'future'],
+    install_requires=["pymongo>=3.4", "six", "future"],
     cmdclass={"test": PyTest},
     **extra_opts
 )
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
index 8e6615a1b..81d648fda 100644
--- a/tests/fields/test_sequence_field.py
+++ b/tests/fields/test_sequence_field.py
@@ -267,8 +267,8 @@ class Bar(Base):
         foo = Foo(name="Foo")
         foo.save()
 
-        assert (
-            "base.counter" not in self.db["mongoengine.counters"].find().distinct("_id")
+        assert "base.counter" not in self.db["mongoengine.counters"].find().distinct(
+            "_id"
         )
         existing_counters = self.db["mongoengine.counters"].find().distinct("_id")
         assert "foo.counter" in existing_counters
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 13ea5a055..451e01ffd 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -58,7 +58,9 @@ def pre_save_post_validation(cls, sender, document, **kwargs):
 
             @classmethod
             def post_save(cls, sender, document, **kwargs):
-                dirty_keys = list(document._delta()[0].keys()) + list(document._delta()[1].keys())
+                dirty_keys = list(document._delta()[0].keys()) + list(
+                    document._delta()[1].keys()
+                )
                 signal_output.append("post_save signal, %s" % document)
                 signal_output.append("post_save dirty keys, %s" % dirty_keys)
                 if kwargs.pop("created", False):

From d8c0631dabe7d900691ec9c25366c45f3112c50e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 14 Dec 2019 21:23:28 +0100
Subject: [PATCH 0986/1519] added entry in changelog for py2py3 compatibility

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bc01a4030..bac5ee174 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Codebase is now compatible with both Python2 and Python3 (no more relying on 2to3 during installation) #2087
 - Documentation improvements:
     - Documented how `pymongo.monitoring` can be used to log all queries issued by MongoEngine to the driver.
 - BREAKING CHANGE: ``class_check`` and ``read_preference`` keyword arguments are no longer available when filtering a ``QuerySet``. #2112

From 280a73af3bea8e9232a5ebe761d451840f025135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 14 Dec 2019 21:44:59 +0100
Subject: [PATCH 0987/1519] minor fix in doc of NULLIFY to improve #834

---
 docs/guide/defining-documents.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 9dcca88c4..82388d3d5 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -352,7 +352,7 @@ Its value can take any of the following constants:
   Deletion is denied if there still exist references to the object being
   deleted.
 :const:`mongoengine.NULLIFY`
-  Any object's fields still referring to the object being deleted are removed
+  Any object's fields still referring to the object being deleted are set to None
   (using MongoDB's "unset" operation), effectively nullifying the relationship.
 :const:`mongoengine.CASCADE`
   Any object containing fields that are referring to the object being deleted

From 50882e5bb09b74faddfac3cb93afd278ea94ced2 Mon Sep 17 00:00:00 2001
From: Eric Timmons <etimmons@mit.edu>
Date: Wed, 16 Oct 2019 09:49:40 -0400
Subject: [PATCH 0988/1519] Add failing test

Test that __eq__ for EmbeddedDocuments with LazyReferenceFields works as
expected.
---
 tests/document/test_instance.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 173e02f2e..6ba6827eb 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3319,6 +3319,38 @@ class Embedded(EmbeddedDocument):
         f1.ref  # Dereferences lazily
         assert f1 == f2
 
+    def test_embedded_document_equality_with_lazy_ref(self):
+        class Job(EmbeddedDocument):
+            boss = LazyReferenceField('Person')
+
+        class Person(Document):
+            job = EmbeddedDocumentField(Job)
+
+        Person.drop_collection()
+
+        boss = Person()
+        worker = Person(job=Job(boss=boss))
+        boss.save()
+        worker.save()
+
+        worker1 = Person.objects.get(id=worker.id)
+
+        # worker1.job should be equal to the job used originally to create the
+        # document.
+        self.assertEqual(worker1.job, worker.job)
+
+        # worker1.job should be equal to a newly created Job EmbeddedDocument
+        # using either the Boss object or his ID.
+        self.assertEqual(worker1.job, Job(boss=boss))
+        self.assertEqual(worker1.job, Job(boss=boss.id))
+
+        # The above equalities should also hold after worker1.job.boss has been
+        # fetch()ed.
+        worker1.job.boss.fetch()
+        self.assertEqual(worker1.job, worker.job)
+        self.assertEqual(worker1.job, Job(boss=boss))
+        self.assertEqual(worker1.job, Job(boss=boss.id))
+
     def test_dbref_equality(self):
         class Test2(Document):
             name = StringField()

From dc7b96a5691335e970b13fb30ef62426b126e2bd Mon Sep 17 00:00:00 2001
From: Eric Timmons <etimmons@mit.edu>
Date: Wed, 16 Oct 2019 09:50:47 -0400
Subject: [PATCH 0989/1519] Make python value for LazyReferenceFields be a
 DBRef

Previously, when reading a LazyReferenceField from the DB, it was stored
internally in the parent document's _data field as an ObjectId. However, this
meant that equality tests using an enclosing EmbeddedDocument would not return
True when the EmbeddedDocument being compared to contained a DBRef or Document
in _data. Enclosing Documents were largely unaffected because they look at the
primary key for equality (which EmbeddedDocuments lack).

This makes the internal Python representation of a LazyReferenceField (before
the LazyReference itself has been constructed) a DBRef, using code identical to
ReferenceField.
---
 mongoengine/fields.py           | 9 +++++++++
 tests/document/test_instance.py | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f8f527a33..0c29d1bca 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2502,6 +2502,15 @@ def to_mongo(self, value):
         else:
             return pk
 
+    def to_python(self, value):
+        """Convert a MongoDB-compatible type to a Python type."""
+        if not self.dbref and not isinstance(
+            value, (DBRef, Document, EmbeddedDocument)
+        ):
+            collection = self.document_type._get_collection_name()
+            value = DBRef(collection, self.document_type.id.to_python(value))
+        return value
+
     def validate(self, value):
         if isinstance(value, LazyReference):
             if value.collection != self.document_type._get_collection_name():
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 6ba6827eb..07376b4b1 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3321,7 +3321,7 @@ class Embedded(EmbeddedDocument):
 
     def test_embedded_document_equality_with_lazy_ref(self):
         class Job(EmbeddedDocument):
-            boss = LazyReferenceField('Person')
+            boss = LazyReferenceField("Person")
 
         class Person(Document):
             job = EmbeddedDocumentField(Job)

From 0d4e61d489a9264863cecdfed08fc9e67a74d03a Mon Sep 17 00:00:00 2001
From: Eric Timmons <etimmons@mit.edu>
Date: Wed, 16 Oct 2019 10:01:19 -0400
Subject: [PATCH 0990/1519] Add daewok to AUTHORS per contributing guidelines

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index aa044bd25..374e2f7fc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -253,3 +253,4 @@ that much better:
  * Gaurav Dadhania (https://github.com/GVRV)
  * Yurii Andrieiev (https://github.com/yandrieiev)
  * Filip Kucharczyk (https://github.com/Pacu2)
+ * Eric Timmons (https://github.com/daewok)

From 68dc2925fbea13702fa23ced0afd786d77b2ca28 Mon Sep 17 00:00:00 2001
From: Eric Timmons <etimmons@mit.edu>
Date: Sun, 15 Dec 2019 12:08:04 -0500
Subject: [PATCH 0991/1519] Add LazyReferenceField with dbref=True to
 embedded_document equality test

---
 tests/document/test_instance.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 07376b4b1..b899684fd 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3322,6 +3322,7 @@ class Embedded(EmbeddedDocument):
     def test_embedded_document_equality_with_lazy_ref(self):
         class Job(EmbeddedDocument):
             boss = LazyReferenceField("Person")
+            boss_dbref = LazyReferenceField("Person", dbref=True)
 
         class Person(Document):
             job = EmbeddedDocumentField(Job)
@@ -3329,7 +3330,7 @@ class Person(Document):
         Person.drop_collection()
 
         boss = Person()
-        worker = Person(job=Job(boss=boss))
+        worker = Person(job=Job(boss=boss, boss_dbref=boss))
         boss.save()
         worker.save()
 
@@ -3341,15 +3342,15 @@ class Person(Document):
 
         # worker1.job should be equal to a newly created Job EmbeddedDocument
         # using either the Boss object or his ID.
-        self.assertEqual(worker1.job, Job(boss=boss))
-        self.assertEqual(worker1.job, Job(boss=boss.id))
+        self.assertEqual(worker1.job, Job(boss=boss, boss_dbref=boss))
+        self.assertEqual(worker1.job, Job(boss=boss.id, boss_dbref=boss.id))
 
         # The above equalities should also hold after worker1.job.boss has been
         # fetch()ed.
         worker1.job.boss.fetch()
         self.assertEqual(worker1.job, worker.job)
-        self.assertEqual(worker1.job, Job(boss=boss))
-        self.assertEqual(worker1.job, Job(boss=boss.id))
+        self.assertEqual(worker1.job, Job(boss=boss, boss_dbref=boss))
+        self.assertEqual(worker1.job, Job(boss=boss.id, boss_dbref=boss.id))
 
     def test_dbref_equality(self):
         class Test2(Document):

From 329f030a41da4d93aaec1f3ccee634e898f7d289 Mon Sep 17 00:00:00 2001
From: Eric Timmons <etimmons@mit.edu>
Date: Sun, 15 Dec 2019 20:15:13 -0500
Subject: [PATCH 0992/1519] Always store a DBRef, Document, or EmbeddedDocument
 in LazyReferenceField._data

This is required to handle the case of equality tests on a LazyReferenceField
with dbref=True when comparing against a field instantiated with an ObjectId.
---
 mongoengine/fields.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 0c29d1bca..a385559dd 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2504,9 +2504,7 @@ def to_mongo(self, value):
 
     def to_python(self, value):
         """Convert a MongoDB-compatible type to a Python type."""
-        if not self.dbref and not isinstance(
-            value, (DBRef, Document, EmbeddedDocument)
-        ):
+        if not isinstance(value, (DBRef, Document, EmbeddedDocument)):
             collection = self.document_type._get_collection_name()
             value = DBRef(collection, self.document_type.id.to_python(value))
         return value

From cfd4d6a161556ef4a8aa355468384554eb684442 Mon Sep 17 00:00:00 2001
From: Eric Timmons <etimmons@mit.edu>
Date: Sun, 15 Dec 2019 12:02:24 -0500
Subject: [PATCH 0993/1519] Add breaking change to changelog for
 LazyReferenceField representation in _data

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bc01a4030..b308c5fba 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,6 +17,7 @@ Development
     - If you catch/use ``MongoEngineConnectionError`` in your code, you'll have to rename it.
 - BREAKING CHANGE: Positional arguments when instantiating a document are no longer supported. #2103
     - From now on keyword arguments (e.g. ``Doc(field_name=value)``) are required.
+- BREAKING CHANGE: A ``LazyReferenceField`` is now stored in the ``_data`` field of its parent as a ``DBRef``, ``Document``, or ``EmbeddedDocument`` (``ObjectId`` is no longer allowed). #2182
 - DEPRECATION: ``Q.empty`` & ``QNode.empty`` are marked as deprecated and will be removed in a next version of MongoEngine. #2210
     - Added ability to check if Q or QNode are empty by parsing them to bool.
     - Instead of ``Q(name="John").empty`` use ``not Q(name="John")``.

From ae326678ec0d7345645120c864b8b15cac741dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 20 Dec 2019 22:09:04 +0100
Subject: [PATCH 0994/1519] updated changelog for upcoming 0.19.0

---
 docs/changelog.rst | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b308c5fba..5c1e838ae 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,8 +6,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- Documentation improvements:
-    - Documented how `pymongo.monitoring` can be used to log all queries issued by MongoEngine to the driver.
+
+Changes in 0.19.0
+=================
 - BREAKING CHANGE: ``class_check`` and ``read_preference`` keyword arguments are no longer available when filtering a ``QuerySet``. #2112
     - Instead of ``Doc.objects(foo=bar, read_preference=...)`` use ``Doc.objects(foo=bar).read_preference(...)``.
     - Instead of ``Doc.objects(foo=bar, class_check=False)`` use ``Doc.objects(foo=bar).clear_cls_query(...)``.
@@ -21,14 +22,16 @@ Development
 - DEPRECATION: ``Q.empty`` & ``QNode.empty`` are marked as deprecated and will be removed in a next version of MongoEngine. #2210
     - Added ability to check if Q or QNode are empty by parsing them to bool.
     - Instead of ``Q(name="John").empty`` use ``not Q(name="John")``.
-- Improve error message related to InvalidDocumentError #2180
 - Fix updating/modifying/deleting/reloading a document that's sharded by a field with ``db_field`` specified. #2125
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
-- Switch from nosetest to pytest as test runner #2114
-- The codebase is now formatted using ``black``. #2109
-- In bulk write insert, the detailed error message would raise in exception.
+- Improve error message related to InvalidDocumentError #2180
+- Added BulkWriteError to replace NotUniqueError which was misleading in bulk write insert #2152
 - Added ability to compare Q and Q operations #2204
 - Added ability to use a db alias on query_counter #2194
+- Switch from nosetest to pytest as test runner #2114
+- The codebase is now formatted using ``black``. #2109
+- Documentation improvements:
+    - Documented how `pymongo.monitoring` can be used to log all queries issued by MongoEngine to the driver.
 
 Changes in 0.18.2
 =================

From 12d8bd5a22f0cee1f99f87b37bbaec94f0a002bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 20 Dec 2019 22:11:43 +0100
Subject: [PATCH 0995/1519] bump version to 0.19.0

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index d7093d28e..c41b5e705 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -28,7 +28,7 @@
 )
 
 
-VERSION = (0, 18, 2)
+VERSION = (0, 19, 0)
 
 
 def get_version():

From d44533d95651559a65ce72664dca9ede98aa58e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 20 Dec 2019 22:41:22 +0100
Subject: [PATCH 0996/1519] completed the changelog with missing details

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5c1e838ae..93776a705 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -23,11 +23,13 @@ Changes in 0.19.0
     - Added ability to check if Q or QNode are empty by parsing them to bool.
     - Instead of ``Q(name="John").empty`` use ``not Q(name="John")``.
 - Fix updating/modifying/deleting/reloading a document that's sharded by a field with ``db_field`` specified. #2125
+- Only set no_cursor_timeout when requested (fixes an incompatibility with MongoDB 4.2) #2148
 - ``ListField`` now accepts an optional ``max_length`` parameter. #2110
 - Improve error message related to InvalidDocumentError #2180
 - Added BulkWriteError to replace NotUniqueError which was misleading in bulk write insert #2152
 - Added ability to compare Q and Q operations #2204
 - Added ability to use a db alias on query_counter #2194
+- Added ability to specify collations for querysets with ``Doc.objects.collation`` #2024
 - Switch from nosetest to pytest as test runner #2114
 - The codebase is now formatted using ``black``. #2109
 - Documentation improvements:

From 332bd767d43af14bbb783e779d585cd2dbcf21de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 20 Dec 2019 22:51:08 +0100
Subject: [PATCH 0997/1519] minor fixes in tests

---
 docs/guide/mongomock.rst        |  6 +++---
 tests/document/test_instance.py | 22 +++++++++++-----------
 tests/fields/test_file_field.py |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/guide/mongomock.rst b/docs/guide/mongomock.rst
index d70ee6a62..040ff912a 100644
--- a/docs/guide/mongomock.rst
+++ b/docs/guide/mongomock.rst
@@ -2,10 +2,10 @@
 Use mongomock for testing
 ==============================
 
-`mongomock <https://github.com/vmalloc/mongomock/>`_ is a package to do just 
+`mongomock <https://github.com/vmalloc/mongomock/>`_ is a package to do just
 what the name implies, mocking a mongo database.
 
-To use with mongoengine, simply specify mongomock when connecting with 
+To use with mongoengine, simply specify mongomock when connecting with
 mongoengine:
 
 .. code-block:: python
@@ -45,4 +45,4 @@ Example of test file:
             pers.save()
 
             fresh_pers = Person.objects().first()
-            self.assertEqual(fresh_pers.name, 'John')
+            assert fresh_pers.name ==  'John'
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index b899684fd..609d06908 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3338,19 +3338,19 @@ class Person(Document):
 
         # worker1.job should be equal to the job used originally to create the
         # document.
-        self.assertEqual(worker1.job, worker.job)
+        assert worker1.job == worker.job
 
         # worker1.job should be equal to a newly created Job EmbeddedDocument
         # using either the Boss object or his ID.
-        self.assertEqual(worker1.job, Job(boss=boss, boss_dbref=boss))
-        self.assertEqual(worker1.job, Job(boss=boss.id, boss_dbref=boss.id))
+        assert worker1.job == Job(boss=boss, boss_dbref=boss)
+        assert worker1.job == Job(boss=boss.id, boss_dbref=boss.id)
 
         # The above equalities should also hold after worker1.job.boss has been
         # fetch()ed.
         worker1.job.boss.fetch()
-        self.assertEqual(worker1.job, worker.job)
-        self.assertEqual(worker1.job, Job(boss=boss, boss_dbref=boss))
-        self.assertEqual(worker1.job, Job(boss=boss.id, boss_dbref=boss.id))
+        assert worker1.job == worker.job
+        assert worker1.job == Job(boss=boss, boss_dbref=boss)
+        assert worker1.job == Job(boss=boss.id, boss_dbref=boss.id)
 
     def test_dbref_equality(self):
         class Test2(Document):
@@ -3693,13 +3693,13 @@ class Jedi(Document):
         value = u"I_should_be_a_dict"
         coll.insert_one({"light_saber": value})
 
-        with self.assertRaises(InvalidDocumentError) as cm:
+        with pytest.raises(InvalidDocumentError) as exc_info:
             list(Jedi.objects)
 
-        self.assertEqual(
-            str(cm.exception),
-            "Invalid data to create a `Jedi` instance.\nField 'light_saber' - The source SON object needs to be of type 'dict' but a '%s' was found"
-            % type(value),
+        assert str(
+            exc_info.value
+        ) == "Invalid data to create a `Jedi` instance.\nField 'light_saber' - The source SON object needs to be of type 'dict' but a '%s' was found" % type(
+            value
         )
 
 
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index bfc86511a..b8ece1a9b 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -151,7 +151,7 @@ class StreamFile(Document):
         result = StreamFile.objects.first()
         assert streamfile == result
         assert result.the_file.read() == text + more_text
-        # self.assertEqual(result.the_file.content_type, content_type)
+        # assert result.the_file.content_type == content_type
         result.the_file.seek(0)
         assert result.the_file.tell() == 0
         assert result.the_file.read(len(text)) == text

From 1170de1e8e30b976895c1c92cca134089dc5b806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 20 Dec 2019 23:16:29 +0100
Subject: [PATCH 0998/1519] added explicit doc for order_by #2117

---
 docs/guide/mongomock.rst |  2 +-
 docs/guide/querying.rst  | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/docs/guide/mongomock.rst b/docs/guide/mongomock.rst
index 040ff912a..141d7b69d 100644
--- a/docs/guide/mongomock.rst
+++ b/docs/guide/mongomock.rst
@@ -21,7 +21,7 @@ or with an alias:
     conn = get_connection('testdb')
 
 Example of test file:
---------
+---------------------
 .. code-block:: python
 
     import unittest
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index d64c169c4..121325ae7 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -222,6 +222,18 @@ keyword argument::
 
 .. versionadded:: 0.4
 
+Sorting/Ordering results
+========================
+It is possible to order the results by 1 or more keys using :meth:`~mongoengine.queryset.QuerySet.order_by`.
+The order may be specified by prepending each of the keys by "+" or "-". Ascending order is assumed if there's no prefix.::
+
+    # Order by ascending date
+    blogs = BlogPost.objects().order_by('date')    # equivalent to .order_by('+date')
+
+    # Order by ascending date first, then descending title
+    blogs = BlogPost.objects().order_by('+date', '-title')
+
+
 Limiting and skipping results
 =============================
 Just as with traditional ORMs, you may limit the number of results returned or
@@ -585,7 +597,8 @@ cannot use the `$` syntax in keyword arguments it has been mapped to `S`::
     ['database', 'mongodb']
 
 From MongoDB version 2.6, push operator supports $position value which allows
-to push values with index.
+to push values with index::
+
     >>> post = BlogPost(title="Test", tags=["mongo"])
     >>> post.save()
     >>> post.update(push__tags__0=["database", "code"])

From 8e892dccfe01e284a99928a6ee4fbb1e0c35519d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 20 Dec 2019 23:51:01 +0100
Subject: [PATCH 0999/1519] document recent merged PR in changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 93776a705..06eb8d0ce 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -30,6 +30,7 @@ Changes in 0.19.0
 - Added ability to compare Q and Q operations #2204
 - Added ability to use a db alias on query_counter #2194
 - Added ability to specify collations for querysets with ``Doc.objects.collation`` #2024
+- Fix updates of a list field by negative index #2094
 - Switch from nosetest to pytest as test runner #2114
 - The codebase is now formatted using ``black``. #2109
 - Documentation improvements:

From 488604ff2e6cdadeed538de0dfb9fe36e27473b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 24 Dec 2019 00:00:15 +0100
Subject: [PATCH 1000/1519] test python 3.8

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cbf34cde7..c825571b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ python:
 - 3.5
 - 3.6
 - 3.7
+- 3.8
 - pypy
 - pypy3
 
@@ -50,7 +51,8 @@ matrix:
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
   - python: 3.7
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
-
+  - python: 3.8
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
 
 install:
   # Install Mongo

From 62c8597a3b33dfd34cc785687c747606a0bbba9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 24 Dec 2019 11:15:23 +0100
Subject: [PATCH 1001/1519] fix pypi deployment version match

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cbf34cde7..6680a7e50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,5 +110,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = ${PYMONGO_3_6}) && ($MONGODB = ${MONGODB_3_4})
+    condition: ($PYMONGO = ${PYMONGO_3_9}) && ($MONGODB = ${MONGODB_3_4})
     python: 2.7

From ca4967311d3328fcc7abb84f8e9cdda7409e8dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 26 Dec 2019 21:00:34 +0100
Subject: [PATCH 1002/1519] update python 3.8 config

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 971a51a2d..42f2a112d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,8 +51,6 @@ matrix:
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
   - python: 3.7
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
-  - python: 3.8
-    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
 
 install:
   # Install Mongo

From f0d1ee2cb41f1c9794eeee4de445fb27a7a77f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 26 Dec 2019 21:03:34 +0100
Subject: [PATCH 1003/1519] update travis config + improve readmecode

---
 .travis.yml | 2 +-
 README.rst  | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 42f2a112d..809fbad81 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@
 # with a very large number of jobs, hence we only test a subset of all the
 # combinations:
 # * MongoDB v3.4 & the latest PyMongo v3.x is currently the "main" setup,
-#   tested against Python v2.7, v3.5, v3.6, and PyPy.
+#   tested against Python v2.7, v3.5, v3.6, v3.7, v3.8 and PyPy.
 # * Besides that, we test the lowest actively supported Python/MongoDB/PyMongo
 #   combination: MongoDB v3.4, PyMongo v3.4, Python v2.7.
 # * MongoDB v3.6 is tested against Python v3.6, and PyMongo v3.6, v3.7, v3.8.
diff --git a/README.rst b/README.rst
index 853d8fbe7..3b85fd48f 100644
--- a/README.rst
+++ b/README.rst
@@ -91,12 +91,11 @@ Some simple examples of what MongoEngine code looks like:
 
     # Iterate over all posts using the BlogPost superclass
     >>> for post in BlogPost.objects:
-    ...     print '===', post.title, '==='
+    ...     print('===', post.title, '===')
     ...     if isinstance(post, TextPost):
-    ...         print post.content
+    ...         print(post.content)
     ...     elif isinstance(post, LinkPost):
-    ...         print 'Link:', post.url
-    ...     print
+    ...         print('Link:', post.url)
     ...
 
     # Count all blog posts and its subtypes

From aa02f87b69787ac678d4ee740e1cb2e5e6753fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 27 Dec 2019 09:23:15 +0100
Subject: [PATCH 1004/1519] change & deprecate .aggregate api to mimic
 pymongo's interface + separate the aggregation tests from the large
 test_queryset.py file

---
 docs/guide/querying.rst                     |   4 +-
 mongoengine/queryset/base.py                |  29 ++-
 tests/queryset/test_queryset.py             | 236 +-----------------
 tests/queryset/test_queryset_aggregation.py | 255 ++++++++++++++++++++
 4 files changed, 277 insertions(+), 247 deletions(-)
 create mode 100644 tests/queryset/test_queryset_aggregation.py

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 121325ae7..07de03788 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -400,7 +400,7 @@ would be generating "tag-clouds"::
 
 MongoDB aggregation API
 -----------------------
-If you need to run aggregation pipelines, MongoEngine provides an entry point `Pymongo's aggregation framework <https://api.mongodb.com/python/current/examples/aggregation.html#aggregation-framework>`_
+If you need to run aggregation pipelines, MongoEngine provides an entry point to `Pymongo's aggregation framework <https://api.mongodb.com/python/current/examples/aggregation.html#aggregation-framework>`_
 through :meth:`~mongoengine.queryset.QuerySet.aggregate`. Check out Pymongo's documentation for the syntax and pipeline.
 An example of its use would be::
 
@@ -414,7 +414,7 @@ An example of its use would be::
             {"$sort" : {"name" : -1}},
             {"$project": {"_id": 0, "name": {"$toUpper": "$name"}}}
             ]
-        data = Person.objects().aggregate(*pipeline)
+        data = Person.objects().aggregate(pipeline)
         assert data == [{'name': 'BOB'}, {'name': 'JOHN'}]
 
 Query efficiency and performance
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index a648391ea..aa5f2584d 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1255,16 +1255,25 @@ def from_json(self, json_data):
             for data in son_data
         ]
 
-    def aggregate(self, *pipeline, **kwargs):
-        """
-        Perform a aggregate function based in your queryset params
+    def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
+        """Perform a aggregate function based in your queryset params
+
         :param pipeline: list of aggregation commands,\
             see: http://docs.mongodb.org/manual/core/aggregation-pipeline/
-
+        :param suppl_pipeline: unpacked list of pipeline (added to support deprecation of the old interface)
+            parameter will be removed shortly
         .. versionadded:: 0.9
         """
-        initial_pipeline = []
+        using_deprecated_interface = isinstance(pipeline, dict) or bool(suppl_pipeline)
+        user_pipeline = [pipeline] if isinstance(pipeline, dict) else list(pipeline)
+
+        if using_deprecated_interface:
+            msg = "Calling .aggregate() with un unpacked list (*pipeline) is deprecated, it will soon change and will expect a list (similar to pymongo.Collection.aggregate interface), see documentation"
+            warnings.warn(msg, DeprecationWarning)
+
+        user_pipeline += suppl_pipeline
 
+        initial_pipeline = []
         if self._query:
             initial_pipeline.append({"$match": self._query})
 
@@ -1281,14 +1290,14 @@ def aggregate(self, *pipeline, **kwargs):
         if self._skip is not None:
             initial_pipeline.append({"$skip": self._skip})
 
-        pipeline = initial_pipeline + list(pipeline)
+        final_pipeline = initial_pipeline + user_pipeline
 
+        collection = self._collection
         if self._read_preference is not None:
-            return self._collection.with_options(
+            collection = self._collection.with_options(
                 read_preference=self._read_preference
-            ).aggregate(pipeline, cursor={}, **kwargs)
-
-        return self._collection.aggregate(pipeline, cursor={}, **kwargs)
+            )
+        return collection.aggregate(final_pipeline, cursor={}, **kwargs)
 
     # JS functionality
     def map_reduce(
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 7812ab665..b30350e67 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -14,7 +14,7 @@
 from six import iteritems
 
 from mongoengine import *
-from mongoengine.connection import get_connection, get_db
+from mongoengine.connection import get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
 from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
@@ -4658,21 +4658,6 @@ def assert_read_pref(qs, expected_read_pref):
         )
         assert_read_pref(bars, ReadPreference.SECONDARY_PREFERRED)
 
-    def test_read_preference_aggregation_framework(self):
-        class Bar(Document):
-            txt = StringField()
-
-            meta = {"indexes": ["txt"]}
-
-        # Aggregates with read_preference
-        bars = Bar.objects.read_preference(
-            ReadPreference.SECONDARY_PREFERRED
-        ).aggregate()
-        assert (
-            bars._CommandCursor__collection.read_preference
-            == ReadPreference.SECONDARY_PREFERRED
-        )
-
     def test_json_simple(self):
         class Embedded(EmbeddedDocument):
             string = StringField()
@@ -5399,225 +5384,6 @@ class Person(Document):
             assert Person.objects.first().name == "A"
             assert Person.objects._has_data(), "Cursor has data and returned False"
 
-    def test_queryset_aggregation_framework(self):
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-
-        Person.drop_collection()
-
-        p1 = Person(name="Isabella Luanna", age=16)
-        p2 = Person(name="Wilson Junior", age=21)
-        p3 = Person(name="Sandra Mara", age=37)
-        Person.objects.insert([p1, p2, p3])
-
-        data = Person.objects(age__lte=22).aggregate(
-            {"$project": {"name": {"$toUpper": "$name"}}}
-        )
-
-        assert list(data) == [
-            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
-            {"_id": p2.pk, "name": "WILSON JUNIOR"},
-        ]
-
-        data = (
-            Person.objects(age__lte=22)
-            .order_by("-name")
-            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
-        )
-
-        assert list(data) == [
-            {"_id": p2.pk, "name": "WILSON JUNIOR"},
-            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
-        ]
-
-        data = (
-            Person.objects(age__gte=17, age__lte=40)
-            .order_by("-age")
-            .aggregate(
-                {"$group": {"_id": None, "total": {"$sum": 1}, "avg": {"$avg": "$age"}}}
-            )
-        )
-        assert list(data) == [{"_id": None, "avg": 29, "total": 2}]
-
-        data = Person.objects().aggregate({"$match": {"name": "Isabella Luanna"}})
-        assert list(data) == [{u"_id": p1.pk, u"age": 16, u"name": u"Isabella Luanna"}]
-
-    def test_queryset_aggregation_with_skip(self):
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-
-        Person.drop_collection()
-
-        p1 = Person(name="Isabella Luanna", age=16)
-        p2 = Person(name="Wilson Junior", age=21)
-        p3 = Person(name="Sandra Mara", age=37)
-        Person.objects.insert([p1, p2, p3])
-
-        data = Person.objects.skip(1).aggregate(
-            {"$project": {"name": {"$toUpper": "$name"}}}
-        )
-
-        assert list(data) == [
-            {"_id": p2.pk, "name": "WILSON JUNIOR"},
-            {"_id": p3.pk, "name": "SANDRA MARA"},
-        ]
-
-    def test_queryset_aggregation_with_limit(self):
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-
-        Person.drop_collection()
-
-        p1 = Person(name="Isabella Luanna", age=16)
-        p2 = Person(name="Wilson Junior", age=21)
-        p3 = Person(name="Sandra Mara", age=37)
-        Person.objects.insert([p1, p2, p3])
-
-        data = Person.objects.limit(1).aggregate(
-            {"$project": {"name": {"$toUpper": "$name"}}}
-        )
-
-        assert list(data) == [{"_id": p1.pk, "name": "ISABELLA LUANNA"}]
-
-    def test_queryset_aggregation_with_sort(self):
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-
-        Person.drop_collection()
-
-        p1 = Person(name="Isabella Luanna", age=16)
-        p2 = Person(name="Wilson Junior", age=21)
-        p3 = Person(name="Sandra Mara", age=37)
-        Person.objects.insert([p1, p2, p3])
-
-        data = Person.objects.order_by("name").aggregate(
-            {"$project": {"name": {"$toUpper": "$name"}}}
-        )
-
-        assert list(data) == [
-            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
-            {"_id": p3.pk, "name": "SANDRA MARA"},
-            {"_id": p2.pk, "name": "WILSON JUNIOR"},
-        ]
-
-    def test_queryset_aggregation_with_skip_with_limit(self):
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-
-        Person.drop_collection()
-
-        p1 = Person(name="Isabella Luanna", age=16)
-        p2 = Person(name="Wilson Junior", age=21)
-        p3 = Person(name="Sandra Mara", age=37)
-        Person.objects.insert([p1, p2, p3])
-
-        data = list(
-            Person.objects.skip(1)
-            .limit(1)
-            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
-        )
-
-        assert list(data) == [{"_id": p2.pk, "name": "WILSON JUNIOR"}]
-
-        # Make sure limit/skip chaining order has no impact
-        data2 = (
-            Person.objects.limit(1)
-            .skip(1)
-            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
-        )
-
-        assert data == list(data2)
-
-    def test_queryset_aggregation_with_sort_with_limit(self):
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-
-        Person.drop_collection()
-
-        p1 = Person(name="Isabella Luanna", age=16)
-        p2 = Person(name="Wilson Junior", age=21)
-        p3 = Person(name="Sandra Mara", age=37)
-        Person.objects.insert([p1, p2, p3])
-
-        data = (
-            Person.objects.order_by("name")
-            .limit(2)
-            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
-        )
-
-        assert list(data) == [
-            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
-            {"_id": p3.pk, "name": "SANDRA MARA"},
-        ]
-
-        # Verify adding limit/skip steps works as expected
-        data = (
-            Person.objects.order_by("name")
-            .limit(2)
-            .aggregate({"$project": {"name": {"$toUpper": "$name"}}}, {"$limit": 1})
-        )
-
-        assert list(data) == [{"_id": p1.pk, "name": "ISABELLA LUANNA"}]
-
-        data = (
-            Person.objects.order_by("name")
-            .limit(2)
-            .aggregate(
-                {"$project": {"name": {"$toUpper": "$name"}}},
-                {"$skip": 1},
-                {"$limit": 1},
-            )
-        )
-
-        assert list(data) == [{"_id": p3.pk, "name": "SANDRA MARA"}]
-
-    def test_queryset_aggregation_with_sort_with_skip(self):
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-
-        Person.drop_collection()
-
-        p1 = Person(name="Isabella Luanna", age=16)
-        p2 = Person(name="Wilson Junior", age=21)
-        p3 = Person(name="Sandra Mara", age=37)
-        Person.objects.insert([p1, p2, p3])
-
-        data = (
-            Person.objects.order_by("name")
-            .skip(2)
-            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
-        )
-
-        assert list(data) == [{"_id": p2.pk, "name": "WILSON JUNIOR"}]
-
-    def test_queryset_aggregation_with_sort_with_skip_with_limit(self):
-        class Person(Document):
-            name = StringField()
-            age = IntField()
-
-        Person.drop_collection()
-
-        p1 = Person(name="Isabella Luanna", age=16)
-        p2 = Person(name="Wilson Junior", age=21)
-        p3 = Person(name="Sandra Mara", age=37)
-        Person.objects.insert([p1, p2, p3])
-
-        data = (
-            Person.objects.order_by("name")
-            .skip(1)
-            .limit(1)
-            .aggregate({"$project": {"name": {"$toUpper": "$name"}}})
-        )
-
-        assert list(data) == [{"_id": p3.pk, "name": "SANDRA MARA"}]
-
     def test_delete_count(self):
         [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
         assert (
diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
new file mode 100644
index 000000000..00e04a36a
--- /dev/null
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -0,0 +1,255 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+import warnings
+
+from pymongo.read_preferences import ReadPreference
+
+from mongoengine import *
+from tests.utils import MongoDBTestCase
+
+
+class TestQuerysetAggregate(MongoDBTestCase):
+    def test_read_preference_aggregation_framework(self):
+        class Bar(Document):
+            txt = StringField()
+
+            meta = {"indexes": ["txt"]}
+
+        # Aggregates with read_preference
+        pipeline = []
+        bars = Bar.objects.read_preference(
+            ReadPreference.SECONDARY_PREFERRED
+        ).aggregate(pipeline)
+        assert (
+            bars._CommandCursor__collection.read_preference
+            == ReadPreference.SECONDARY_PREFERRED
+        )
+
+    def test_queryset_aggregation_framework(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p2 = Person(name="Wilson Junior", age=21)
+        p3 = Person(name="Sandra Mara", age=37)
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects(age__lte=22).aggregate(pipeline)
+
+        assert list(data) == [
+            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+            {"_id": p2.pk, "name": "WILSON JUNIOR"},
+        ]
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects(age__lte=22).order_by("-name").aggregate(pipeline)
+
+        assert list(data) == [
+            {"_id": p2.pk, "name": "WILSON JUNIOR"},
+            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+        ]
+
+        pipeline = [
+            {"$group": {"_id": None, "total": {"$sum": 1}, "avg": {"$avg": "$age"}}}
+        ]
+        data = (
+            Person.objects(age__gte=17, age__lte=40)
+            .order_by("-age")
+            .aggregate(pipeline)
+        )
+        assert list(data) == [{"_id": None, "avg": 29, "total": 2}]
+
+        pipeline = [{"$match": {"name": "Isabella Luanna"}}]
+        data = Person.objects().aggregate(pipeline)
+        assert list(data) == [{u"_id": p1.pk, u"age": 16, u"name": u"Isabella Luanna"}]
+
+    def test_queryset_aggregation_with_skip(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p2 = Person(name="Wilson Junior", age=21)
+        p3 = Person(name="Sandra Mara", age=37)
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects.skip(1).aggregate(pipeline)
+
+        assert list(data) == [
+            {"_id": p2.pk, "name": "WILSON JUNIOR"},
+            {"_id": p3.pk, "name": "SANDRA MARA"},
+        ]
+
+    def test_queryset_aggregation_with_limit(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p2 = Person(name="Wilson Junior", age=21)
+        p3 = Person(name="Sandra Mara", age=37)
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects.limit(1).aggregate(pipeline)
+
+        assert list(data) == [{"_id": p1.pk, "name": "ISABELLA LUANNA"}]
+
+    def test_queryset_aggregation_with_sort(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p2 = Person(name="Wilson Junior", age=21)
+        p3 = Person(name="Sandra Mara", age=37)
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects.order_by("name").aggregate(pipeline)
+
+        assert list(data) == [
+            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+            {"_id": p3.pk, "name": "SANDRA MARA"},
+            {"_id": p2.pk, "name": "WILSON JUNIOR"},
+        ]
+
+    def test_queryset_aggregation_with_skip_with_limit(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p2 = Person(name="Wilson Junior", age=21)
+        p3 = Person(name="Sandra Mara", age=37)
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = list(Person.objects.skip(1).limit(1).aggregate(pipeline))
+
+        assert list(data) == [{"_id": p2.pk, "name": "WILSON JUNIOR"}]
+
+        # Make sure limit/skip chaining order has no impact
+        data2 = Person.objects.limit(1).skip(1).aggregate(pipeline)
+
+        assert data == list(data2)
+
+    def test_queryset_aggregation_with_sort_with_limit(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p2 = Person(name="Wilson Junior", age=21)
+        p3 = Person(name="Sandra Mara", age=37)
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects.order_by("name").limit(2).aggregate(pipeline)
+
+        assert list(data) == [
+            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+            {"_id": p3.pk, "name": "SANDRA MARA"},
+        ]
+
+        # Verify adding limit/skip steps works as expected
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}, {"$limit": 1}]
+        data = Person.objects.order_by("name").limit(2).aggregate(pipeline)
+
+        assert list(data) == [{"_id": p1.pk, "name": "ISABELLA LUANNA"}]
+
+        pipeline = [
+            {"$project": {"name": {"$toUpper": "$name"}}},
+            {"$skip": 1},
+            {"$limit": 1},
+        ]
+        data = Person.objects.order_by("name").limit(2).aggregate(pipeline)
+
+        assert list(data) == [{"_id": p3.pk, "name": "SANDRA MARA"}]
+
+    def test_queryset_aggregation_with_sort_with_skip(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p2 = Person(name="Wilson Junior", age=21)
+        p3 = Person(name="Sandra Mara", age=37)
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects.order_by("name").skip(2).aggregate(pipeline)
+
+        assert list(data) == [{"_id": p2.pk, "name": "WILSON JUNIOR"}]
+
+    def test_queryset_aggregation_with_sort_with_skip_with_limit(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p2 = Person(name="Wilson Junior", age=21)
+        p3 = Person(name="Sandra Mara", age=37)
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects.order_by("name").skip(1).limit(1).aggregate(pipeline)
+
+        assert list(data) == [{"_id": p3.pk, "name": "SANDRA MARA"}]
+
+    def test_queryset_aggregation_deprecated_interface(self):
+        class Person(Document):
+            name = StringField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna")
+        p2 = Person(name="Wilson Junior")
+        p3 = Person(name="Sandra Mara")
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+
+        # Make sure a warning is emitted
+        with warnings.catch_warnings():
+            warnings.simplefilter("error", DeprecationWarning)
+            with self.assertRaises(DeprecationWarning):
+                Person.objects.order_by("name").limit(2).aggregate(*pipeline)
+
+        # Make sure old interface works as expected with a 1-step pipeline
+        data = Person.objects.order_by("name").limit(2).aggregate(*pipeline)
+
+        assert list(data) == [
+            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
+            {"_id": p3.pk, "name": "SANDRA MARA"},
+        ]
+
+        # Make sure old interface works as expected with a 2-steps pipeline
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}, {"$limit": 1}]
+        data = Person.objects.order_by("name").limit(2).aggregate(*pipeline)
+
+        assert list(data) == [{"_id": p1.pk, "name": "ISABELLA LUANNA"}]
+
+
+if __name__ == "__main__":
+    unittest.main()

From 99e660c66d85620b427f2ab48eba557a6faa5a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 27 Dec 2019 09:32:05 +0100
Subject: [PATCH 1005/1519] update changelog

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 06eb8d0ce..5fe7d6b4a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,8 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- DEPRECATION: The interface of ``QuerySet.aggregate`` method was changed, it no longer takes an unpacked list of
+    pipeline steps (*pipeline) but simply takes the pipeline list just like ``pymongo.Collection.aggregate`` does. #2079
 
 Changes in 0.19.0
 =================

From b3dbb87c3c394cab5708bd321f58932d0c6b1063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 27 Dec 2019 10:06:27 +0100
Subject: [PATCH 1006/1519] improve doc of aggregate kwargs

---
 mongoengine/queryset/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index aa5f2584d..50cb37acc 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -302,7 +302,7 @@ def insert(
                 ``insert(..., {w: 2, fsync: True})`` will wait until at least
                 two servers have recorded the write and will force an fsync on
                 each server being written to.
-        :parm signal_kwargs: (optional) kwargs dictionary to be passed to
+        :param signal_kwargs: (optional) kwargs dictionary to be passed to
             the signal calls.
 
         By default returns document instances, set ``load_bulk`` to False to
@@ -1262,6 +1262,8 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
             see: http://docs.mongodb.org/manual/core/aggregation-pipeline/
         :param suppl_pipeline: unpacked list of pipeline (added to support deprecation of the old interface)
             parameter will be removed shortly
+        :param kwargs: (optional) kwargs dictionary to be passed to pymongo's aggregate call
+            See https://api.mongodb.com/python/current/api/pymongo/collection.html#pymongo.collection.Collection.aggregate
         .. versionadded:: 0.9
         """
         using_deprecated_interface = isinstance(pipeline, dict) or bool(suppl_pipeline)

From e7c7a66cd1d32fb1aa4595e3d8935c57de4beab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 27 Dec 2019 10:38:03 +0100
Subject: [PATCH 1007/1519] improve doc of GridFS, emphasize that subsequent
 call to read() requires to rewind the file with seek(0)

---
 docs/guide/gridfs.rst | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/docs/guide/gridfs.rst b/docs/guide/gridfs.rst
index f7380e89f..6e4a75a56 100644
--- a/docs/guide/gridfs.rst
+++ b/docs/guide/gridfs.rst
@@ -10,8 +10,9 @@ Writing
 GridFS support comes in the form of the :class:`~mongoengine.fields.FileField` field
 object. This field acts as a file-like object and provides a couple of
 different ways of inserting and retrieving data. Arbitrary metadata such as
-content type can also be stored alongside the files. In the following example,
-a document is created to store details about animals, including a photo::
+content type can also be stored alongside the files. The object returned when accessing a
+FileField is a proxy to `Pymongo's GridFS <https://api.mongodb.com/python/current/examples/gridfs.html#gridfs-example>`_
+In the following example, a document is created to store details about animals, including a photo::
 
     class Animal(Document):
         genus = StringField()
@@ -34,6 +35,20 @@ field. The file can also be retrieved just as easily::
     photo = marmot.photo.read()
     content_type = marmot.photo.content_type
 
+.. note:: If you need to read() the content of a file multiple times, you'll need to "rewind"
+    the file-like object using `seek`::
+
+        marmot = Animal.objects(genus='Marmota').first()
+        content1 = marmot.photo.read()
+        assert content1 != ""
+
+        content2 = marmot.photo.read()    # will be empty
+        assert content2 == ""
+
+        marmot.photo.seek(0)              # rewind the file by setting the current position of the cursor in the file to 0
+        content3 = marmot.photo.read()
+        assert content3 == content1
+
 Streaming
 ---------
 

From 152b51fd339a1bb9db254555461b5e6651bc3a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 29 Dec 2019 14:36:50 +0100
Subject: [PATCH 1008/1519] improve gridfs example (properly opening file)

---
 docs/guide/gridfs.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/gridfs.rst b/docs/guide/gridfs.rst
index 6e4a75a56..0baf88e04 100644
--- a/docs/guide/gridfs.rst
+++ b/docs/guide/gridfs.rst
@@ -21,8 +21,8 @@ In the following example, a document is created to store details about animals,
 
     marmot = Animal(genus='Marmota', family='Sciuridae')
 
-    marmot_photo = open('marmot.jpg', 'rb')
-    marmot.photo.put(marmot_photo, content_type = 'image/jpeg')
+    with open('marmot.jpg', 'rb') as fd:
+        marmot.photo.put(fd, content_type = 'image/jpeg')
     marmot.save()
 
 Retrieval

From 4edad4601c7ccf30120cb8e45df7e1fb700a9347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 3 Jan 2020 14:03:17 +0100
Subject: [PATCH 1009/1519] Bump version to 0.19.1 + force pillow to be < 7.0.0

---
 docs/changelog.rst      | 4 ++++
 mongoengine/__init__.py | 2 +-
 setup.py                | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5fe7d6b4a..b8e6ae564 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,10 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.19.1
+=================
+- Requires Pillow < 7.0.0 as it dropped Python2 support
 - DEPRECATION: The interface of ``QuerySet.aggregate`` method was changed, it no longer takes an unpacked list of
     pipeline steps (*pipeline) but simply takes the pipeline list just like ``pymongo.Collection.aggregate`` does. #2079
 
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index c41b5e705..e45dfc2b7 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -28,7 +28,7 @@
 )
 
 
-VERSION = (0, 19, 0)
+VERSION = (0, 19, 1)
 
 
 def get_version():
diff --git a/setup.py b/setup.py
index ceb5afad8..2d69e44a3 100644
--- a/setup.py
+++ b/setup.py
@@ -115,7 +115,7 @@ def run_tests(self):
         "pytest-cov",
         "coverage<5.0",  # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
         "blinker",
-        "Pillow>=2.0.0",
+        "Pillow>=2.0.0, <7.0.0",    # 7.0.0 dropped Python2 support
     ],
 }
 if sys.version_info[0] == 3:

From 75ee282a3dfc90ab2c6a4194e8f2851ce7f4543d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 3 Jan 2020 14:15:24 +0100
Subject: [PATCH 1010/1519] black setup.py to please CI

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2d69e44a3..6c3ef8dba 100644
--- a/setup.py
+++ b/setup.py
@@ -115,7 +115,7 @@ def run_tests(self):
         "pytest-cov",
         "coverage<5.0",  # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
         "blinker",
-        "Pillow>=2.0.0, <7.0.0",    # 7.0.0 dropped Python2 support
+        "Pillow>=2.0.0, <7.0.0",  # 7.0.0 dropped Python2 support
     ],
 }
 if sys.version_info[0] == 3:

From f8f267a880bcb9b17a51df61b006e7d9b92644b3 Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Sun, 5 Jan 2020 20:48:16 +1100
Subject: [PATCH 1011/1519] Fix simple typo: thorougly -> thoroughly

Closes #2236
---
 docs/upgrade.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 082dbadcb..250347bfe 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -52,7 +52,7 @@ rename its occurrences.
 This release includes a major rehaul of MongoEngine's code quality and
 introduces a few breaking changes. It also touches many different parts of
 the package and although all the changes have been tested and scrutinized,
-you're encouraged to thorougly test the upgrade.
+you're encouraged to thoroughly test the upgrade.
 
 First breaking change involves renaming `ConnectionError` to `MongoEngineConnectionError`.
 If you import or catch this exception, you'll need to rename it in your code.

From 59fbd505a04dd8cf822a098b834fdd8829395fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 5 Jan 2020 20:20:13 +0100
Subject: [PATCH 1012/1519] include latest pymongo version in travis

---
 .travis.yml | 7 +++++--
 setup.py    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 809fbad81..a299eea9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,11 +33,12 @@ env:
   global:
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
+    - PYMONGO_3_10=3.10
     - PYMONGO_3_9=3.9
     - PYMONGO_3_6=3.6
     - PYMONGO_3_4=3.4
   matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_9}
+    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_10}
 
 matrix:
 
@@ -51,6 +52,8 @@ matrix:
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
   - python: 3.7
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
+  - python: 3.7
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_10}
 
 install:
   # Install Mongo
@@ -110,5 +113,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = ${PYMONGO_3_9}) && ($MONGODB = ${MONGODB_3_4})
+    condition: ($PYMONGO = ${PYMONGO_3_10}) && ($MONGODB = ${MONGODB_3_4})
     python: 2.7
diff --git a/setup.py b/setup.py
index 6c3ef8dba..5ba84e069 100644
--- a/setup.py
+++ b/setup.py
@@ -143,7 +143,7 @@ def run_tests(self):
     long_description=LONG_DESCRIPTION,
     platforms=["any"],
     classifiers=CLASSIFIERS,
-    install_requires=["pymongo>=3.4", "six>=1.10.0"],
+    install_requires=["pymongo>=3.4, <4.0", "six>=1.10.0"],
     cmdclass={"test": PyTest},
     **extra_opts
 )

From 928770c43a892e7e6a01e5a85f5d90a5b9a63c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 20 Dec 2019 21:50:00 +0100
Subject: [PATCH 1013/1519] switching  to count_documents

---
 mongoengine/pymongo_support.py   | 28 ++++++++++++++++++++++++----
 mongoengine/queryset/base.py     | 32 +++++++++++++++++++++++++++++++-
 mongoengine/queryset/queryset.py |  1 +
 tests/test_connection.py         |  2 +-
 4 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 80c0661b8..1fea95256 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -10,12 +10,32 @@
 IS_PYMONGO_GTE_37 = PYMONGO_VERSION >= _PYMONGO_37
 
 
-def count_documents(collection, filter):
-    """Pymongo>3.7 deprecates count in favour of count_documents"""
+def count_documents(collection, filter, skip=None, limit=None, hint=None, collation=None):
+    """Pymongo>3.7 deprecates count in favour of count_documents
+    """
+    if limit == 0:
+        return 0  # Pymongo raises an OperationFailure if called with limit=0
+
     if IS_PYMONGO_GTE_37:
-        return collection.count_documents(filter)
+        kwargs = {}
+        if skip is not None:
+            kwargs["skip"] = skip
+        if limit is not None:
+            kwargs["limit"] = limit
+        if collation is not None:
+            kwargs["collation"] = collation
+        if hint not in (-1, None):
+            kwargs["hint"] = hint
+        return collection.count_documents(filter=filter, **kwargs)
     else:
-        count = collection.find(filter).count()
+        cursor = collection.find(filter)
+        if limit:
+            cursor = cursor.limit(limit)
+        if skip:
+            cursor = cursor.skip(skip)
+        if hint != -1:
+            cursor = cursor.hint(hint)
+        count = cursor.count()
     return count
 
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 50cb37acc..d7b4007eb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -12,6 +12,7 @@
 from pymongo.collection import ReturnDocument
 from pymongo.common import validate_read_preference
 import six
+from pymongo.errors import OperationFailure
 from six import iteritems
 
 from mongoengine import signals
@@ -26,6 +27,7 @@
     NotUniqueError,
     OperationError,
 )
+from mongoengine.pymongo_support import count_documents
 from mongoengine.queryset import transform
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
@@ -392,9 +394,37 @@ def count(self, with_limit_and_skip=False):
             :meth:`skip` that has been applied to this cursor into account when
             getting the count
         """
+        # mimic the fact that setting .limit(0) in pymongo sets no limit
+        # https://docs.mongodb.com/manual/reference/method/cursor.limit/#zero-value
         if self._limit == 0 and with_limit_and_skip is False or self._none:
             return 0
-        count = self._cursor.count(with_limit_and_skip=with_limit_and_skip)
+
+        kwargs = (
+            {"limit": self._limit, "skip": self._skip} if with_limit_and_skip else {}
+        )
+
+        if self._limit == 0:
+            # mimic the fact that historically .limit(0) sets no limit
+            kwargs.pop('limit', None)
+
+        if self._hint not in (-1, None):
+            kwargs["hint"] = self._hint
+
+        if self._collation:
+            kwargs["collation"] = self._collation
+
+        try:
+            count = count_documents(
+                collection=self._cursor.collection,
+                filter=self._cursor._Cursor__spec,
+                **kwargs
+            )
+        except OperationFailure:
+            # Accounts for some operators that used to work with .count but are no longer working
+            # with count_documents (i.e $geoNear, $near, and $nearSphere)
+            # fallback to deprecated Cursor.count
+            count = self._cursor.count(with_limit_and_skip=with_limit_and_skip)
+
         self._cursor_obj = None
         return count
 
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 4ba62d468..cc1891f66 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -146,6 +146,7 @@ def count(self, with_limit_and_skip=False):
             return super(QuerySet, self).count(with_limit_and_skip)
 
         if self._len is None:
+            # cache the length
             self._len = super(QuerySet, self).count(with_limit_and_skip)
 
         return self._len
diff --git a/tests/test_connection.py b/tests/test_connection.py
index e40a69940..542da4f0a 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -282,7 +282,7 @@ class SomeDocument(Document):
         # database won't exist until we save a document
         some_document.save()
         assert conn.get_default_database().name == "mongoenginetest"
-        assert conn.database_names()[0] == "mongoenginetest"
+        assert conn.list_database_names()[0] == "mongoenginetest"
 
     @require_mongomock
     def test_connect_with_host_list(self):

From 705c55ce24c006dd2bd06437f3d7fb945ed1de17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 5 Jan 2020 20:30:56 +0100
Subject: [PATCH 1014/1519] update  tox file to account for mg310

---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 349b55774..a3d2df606 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ commands =
 deps =
     mg34: pymongo>=3.4,<3.5
     mg36: pymongo>=3.6,<3.7
-    mg39: pymongo>=3.9,<4.0
+    mg39: pymongo>=3.9,<3.10
+    mg310: pymongo>=3.10,<3.11
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From f93f9406ee3646eb3bac8fbeed6aa502ffd83a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 5 Jan 2020 21:08:20 +0100
Subject: [PATCH 1015/1519] improve doc next to code

---
 mongoengine/queryset/base.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index d7b4007eb..125480a77 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -423,6 +423,7 @@ def count(self, with_limit_and_skip=False):
             # Accounts for some operators that used to work with .count but are no longer working
             # with count_documents (i.e $geoNear, $near, and $nearSphere)
             # fallback to deprecated Cursor.count
+            # Keeping this should be reevaluated the day pymongo removes .count entirely
             count = self._cursor.count(with_limit_and_skip=with_limit_and_skip)
 
         self._cursor_obj = None

From 60c42dddd5a44623b696d8ce6eff7be7f955e796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 5 Jan 2020 22:29:13 +0100
Subject: [PATCH 1016/1519] finalize code related to count_documents migration

---
 docs/changelog.rst             |  3 +++
 mongoengine/pymongo_support.py | 38 +++++++++++++++++++---------------
 mongoengine/queryset/base.py   | 17 +++++----------
 tests/document/test_indexes.py |  3 ++-
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b8e6ae564..d11fd347c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- When using pymongo >= 3.7, make use of Collection.count_documents instead of Collection.count
+    and Cursor.count that got deprecated in pymongo >= 3.7.
+    This should have a negative impact on performance of count see Issue #2219
 
 Changes in 0.19.1
 =================
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 1fea95256..38332c13b 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -2,6 +2,7 @@
 Helper functions, constants, and types to aid with PyMongo v2.7 - v3.x support.
 """
 import pymongo
+from pymongo.errors import OperationFailure
 
 _PYMONGO_37 = (3, 7)
 
@@ -16,25 +17,28 @@ def count_documents(collection, filter, skip=None, limit=None, hint=None, collat
     if limit == 0:
         return 0  # Pymongo raises an OperationFailure if called with limit=0
 
-    if IS_PYMONGO_GTE_37:
-        kwargs = {}
-        if skip is not None:
-            kwargs["skip"] = skip
-        if limit is not None:
-            kwargs["limit"] = limit
-        if collation is not None:
-            kwargs["collation"] = collation
-        if hint not in (-1, None):
-            kwargs["hint"] = hint
+    kwargs = {}
+    if skip is not None:
+        kwargs["skip"] = skip
+    if limit is not None:
+        kwargs["limit"] = limit
+    if hint not in (-1, None):
+        kwargs["hint"] = hint
+    if collation is not None:
+        kwargs["collation"] = collation
+
+    try:
         return collection.count_documents(filter=filter, **kwargs)
-    else:
+    except (AttributeError, OperationFailure) as ex:
+        # AttributeError - count_documents appeared in pymongo 3.7
+        # OperationFailure - accounts for some operators that used to work
+        # with .count but are no longer working with count_documents (i.e $geoNear, $near, and $nearSphere)
+        # fallback to deprecated Cursor.count
+        # Keeping this should be reevaluated the day pymongo removes .count entirely
         cursor = collection.find(filter)
-        if limit:
-            cursor = cursor.limit(limit)
-        if skip:
-            cursor = cursor.skip(skip)
-        if hint != -1:
-            cursor = cursor.hint(hint)
+        for option, option_value in kwargs.items():
+            cursor_method = getattr(cursor, option)
+            cursor = cursor_method(option_value)
         count = cursor.count()
     return count
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 125480a77..41b394b46 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -413,18 +413,11 @@ def count(self, with_limit_and_skip=False):
         if self._collation:
             kwargs["collation"] = self._collation
 
-        try:
-            count = count_documents(
-                collection=self._cursor.collection,
-                filter=self._cursor._Cursor__spec,
-                **kwargs
-            )
-        except OperationFailure:
-            # Accounts for some operators that used to work with .count but are no longer working
-            # with count_documents (i.e $geoNear, $near, and $nearSphere)
-            # fallback to deprecated Cursor.count
-            # Keeping this should be reevaluated the day pymongo removes .count entirely
-            count = self._cursor.count(with_limit_and_skip=with_limit_and_skip)
+        count = count_documents(
+            collection=self._cursor.collection,
+            filter=self._cursor._Cursor__spec,
+            **kwargs
+        )
 
         self._cursor_obj = None
         return count
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index be857b590..801473b14 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -552,8 +552,9 @@ class BlogPost(Document):
         assert 5 == query_result.count()
 
         incorrect_collation = {"arndom": "wrdo"}
-        with pytest.raises(OperationFailure):
+        with pytest.raises(OperationFailure) as exc_info:
             BlogPost.objects.collation(incorrect_collation).count()
+        assert 'Missing expected field' in str(exc_info.value)
 
         query_result = BlogPost.objects.collation({}).order_by("name")
         assert [x.name for x in query_result] == sorted(names)

From 84f3dce4920e4e212a485dcbe9f1fa4cda4f7daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 5 Jan 2020 22:50:19 +0100
Subject: [PATCH 1017/1519] fix flake8 findings

---
 mongoengine/pymongo_support.py | 2 +-
 mongoengine/queryset/base.py   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 38332c13b..d9c5ee273 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -29,7 +29,7 @@ def count_documents(collection, filter, skip=None, limit=None, hint=None, collat
 
     try:
         return collection.count_documents(filter=filter, **kwargs)
-    except (AttributeError, OperationFailure) as ex:
+    except (AttributeError, OperationFailure):
         # AttributeError - count_documents appeared in pymongo 3.7
         # OperationFailure - accounts for some operators that used to work
         # with .count but are no longer working with count_documents (i.e $geoNear, $near, and $nearSphere)
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 41b394b46..303271f50 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -12,7 +12,6 @@
 from pymongo.collection import ReturnDocument
 from pymongo.common import validate_read_preference
 import six
-from pymongo.errors import OperationFailure
 from six import iteritems
 
 from mongoengine import signals

From e64a7a94481f02764b16ff9ce448489fad2fc321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 7 Jan 2020 21:44:04 +0100
Subject: [PATCH 1018/1519] reformat with latest black

---
 mongoengine/pymongo_support.py | 4 +++-
 mongoengine/queryset/base.py   | 2 +-
 tests/document/test_indexes.py | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index d9c5ee273..3aef4e09c 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -11,7 +11,9 @@
 IS_PYMONGO_GTE_37 = PYMONGO_VERSION >= _PYMONGO_37
 
 
-def count_documents(collection, filter, skip=None, limit=None, hint=None, collation=None):
+def count_documents(
+    collection, filter, skip=None, limit=None, hint=None, collation=None
+):
     """Pymongo>3.7 deprecates count in favour of count_documents
     """
     if limit == 0:
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 303271f50..ae45297d8 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -404,7 +404,7 @@ def count(self, with_limit_and_skip=False):
 
         if self._limit == 0:
             # mimic the fact that historically .limit(0) sets no limit
-            kwargs.pop('limit', None)
+            kwargs.pop("limit", None)
 
         if self._hint not in (-1, None):
             kwargs["hint"] = self._hint
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 801473b14..5133b007d 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -554,7 +554,7 @@ class BlogPost(Document):
         incorrect_collation = {"arndom": "wrdo"}
         with pytest.raises(OperationFailure) as exc_info:
             BlogPost.objects.collation(incorrect_collation).count()
-        assert 'Missing expected field' in str(exc_info.value)
+        assert "Missing expected field" in str(exc_info.value)
 
         query_result = BlogPost.objects.collation({}).order_by("name")
         assert [x.name for x in query_result] == sorted(names)

From 2fa48cd9e5207ad753419ace20dc0c615c7481cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 7 Jan 2020 22:24:55 +0100
Subject: [PATCH 1019/1519] fix for pymongo < 3.7

---
 mongoengine/pymongo_support.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 3aef4e09c..284efc2f2 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -29,20 +29,22 @@ def count_documents(
     if collation is not None:
         kwargs["collation"] = collation
 
-    try:
-        return collection.count_documents(filter=filter, **kwargs)
-    except (AttributeError, OperationFailure):
-        # AttributeError - count_documents appeared in pymongo 3.7
-        # OperationFailure - accounts for some operators that used to work
-        # with .count but are no longer working with count_documents (i.e $geoNear, $near, and $nearSphere)
-        # fallback to deprecated Cursor.count
-        # Keeping this should be reevaluated the day pymongo removes .count entirely
-        cursor = collection.find(filter)
-        for option, option_value in kwargs.items():
-            cursor_method = getattr(cursor, option)
-            cursor = cursor_method(option_value)
-        count = cursor.count()
-    return count
+    # count_documents appeared in pymongo 3.7
+    if IS_PYMONGO_GTE_37:
+        try:
+            return collection.count_documents(filter=filter, **kwargs)
+        except OperationFailure:
+            # OperationFailure - accounts for some operators that used to work
+            # with .count but are no longer working with count_documents (i.e $geoNear, $near, and $nearSphere)
+            # fallback to deprecated Cursor.count
+            # Keeping this should be reevaluated the day pymongo removes .count entirely
+            pass
+
+    cursor = collection.find(filter)
+    for option, option_value in kwargs.items():
+        cursor_method = getattr(cursor, option)
+        cursor = cursor_method(option_value)
+    return cursor.count()
 
 
 def list_collection_names(db, include_system_collections=False):

From d73846213977b2fb1e382b38d86406bdf9a7e81f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 11 Jan 2020 23:15:30 +0100
Subject: [PATCH 1020/1519] Fix bug introduced in -1.19 related to DictField
 validate failing without default connection

---
 docs/changelog.rst              |  5 ++++
 mongoengine/fields.py           | 14 +++++-----
 mongoengine/mongodb_support.py  |  2 +-
 tests/fields/test_dict_field.py | 48 ++++++++++++++++++++-------------
 4 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b8e6ae564..2b532da91 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,11 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.19.2
+=================
+- DictField validate failed without default connection (bug introduced in 0.19.0) #2239
+
+
 Changes in 0.19.1
 =================
 - Requires Pillow < 7.0.0 as it dropped Python2 support
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 7ec8c0f3c..d502dba31 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1088,14 +1088,12 @@ def validate(self, value):
             msg = "Invalid dictionary key - documents must have only string keys"
             self.error(msg)
 
-        curr_mongo_ver = get_mongodb_version()
-
-        if curr_mongo_ver < MONGODB_36 and key_has_dot_or_dollar(value):
-            self.error(
-                'Invalid dictionary key name - keys may not contain "."'
-                ' or startswith "$" characters'
-            )
-        elif curr_mongo_ver >= MONGODB_36 and key_starts_with_dollar(value):
+        # Following condition applies to MongoDB >= 3.6
+        # older Mongo has stricter constraints but
+        # it will be rejected upon insertion anyway
+        # Having a validation that depends on the MongoDB version
+        # is not straightforward as the field isn't aware of the connected Mongo
+        if key_starts_with_dollar(value):
             self.error(
                 'Invalid dictionary key name - keys may not startswith "$" characters'
             )
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index 5d437fef8..522f064e6 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -11,7 +11,7 @@
 
 
 def get_mongodb_version():
-    """Return the version of the connected mongoDB (first 2 digits)
+    """Return the version of the default connected mongoDB (first 2 digits)
 
     :return: tuple(int, int)
     """
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 44e628f6c..6850cd584 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import pytest
+from bson import InvalidDocument
 
 from mongoengine import *
 from mongoengine.base import BaseDict
@@ -19,22 +20,24 @@ class BlogPost(Document):
         post = BlogPost(info=info).save()
         assert get_as_pymongo(post) == {"_id": post.id, "info": info}
 
-    def test_general_things(self):
-        """Ensure that dict types work as expected."""
+    def test_validate_invalid_type(self):
+        class BlogPost(Document):
+            info = DictField()
+
+        BlogPost.drop_collection()
+
+        invalid_infos = ["my post", ["test", "test"], {1: "test"}]
+        for invalid_info in invalid_infos:
+            with pytest.raises(ValidationError):
+                BlogPost(info=invalid_info).validate()
 
+    def test_keys_with_dots_or_dollars(self):
         class BlogPost(Document):
             info = DictField()
 
         BlogPost.drop_collection()
 
         post = BlogPost()
-        post.info = "my post"
-        with pytest.raises(ValidationError):
-            post.validate()
-
-        post.info = ["test", "test"]
-        with pytest.raises(ValidationError):
-            post.validate()
 
         post.info = {"$title": "test"}
         with pytest.raises(ValidationError):
@@ -48,25 +51,34 @@ class BlogPost(Document):
         with pytest.raises(ValidationError):
             post.validate()
 
-        post.info = {1: "test"}
-        with pytest.raises(ValidationError):
-            post.validate()
-
         post.info = {"nested": {"the.title": "test"}}
         if get_mongodb_version() < MONGODB_36:
-            with pytest.raises(ValidationError):
-                post.validate()
+            # MongoDB < 3.6 rejects dots
+            # To avoid checking the mongodb version from the DictField class
+            # we rely on MongoDB to reject the data during the save
+            post.validate()
+            with pytest.raises(InvalidDocument):
+                post.save()
         else:
             post.validate()
 
         post.info = {"dollar_and_dot": {"te$st.test": "test"}}
         if get_mongodb_version() < MONGODB_36:
-            with pytest.raises(ValidationError):
-                post.validate()
+            post.validate()
+            with pytest.raises(InvalidDocument):
+                post.save()
         else:
             post.validate()
 
-        post.info = {"title": "test"}
+    def test_general_things(self):
+        """Ensure that dict types work as expected."""
+
+        class BlogPost(Document):
+            info = DictField()
+
+        BlogPost.drop_collection()
+
+        post = BlogPost(info={"title": "test"})
         post.save()
 
         post = BlogPost()

From 412bed0f6d7aa42a5fa855217b0d2a3b1721ef27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 12 Jan 2020 11:04:05 +0100
Subject: [PATCH 1021/1519] fix bug in legacy .count due to with_limit_and_skip
 that was missing

---
 mongoengine/pymongo_support.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 284efc2f2..9cf9e2aef 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -44,7 +44,8 @@ def count_documents(
     for option, option_value in kwargs.items():
         cursor_method = getattr(cursor, option)
         cursor = cursor_method(option_value)
-    return cursor.count()
+    with_limit_and_skip = "skip" in kwargs or "limit" in kwargs
+    return cursor.count(with_limit_and_skip=with_limit_and_skip)
 
 
 def list_collection_names(db, include_system_collections=False):

From 18b68f1b8034457384daa5bdbd7d780055e21690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 12 Jan 2020 21:29:18 +0100
Subject: [PATCH 1022/1519] update travis mongo 4.0 to latest 4.0.13

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f78806490..a7d6da1a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ dist: xenial
 
 env:
   global:
-    - MONGODB_4_0=4.0.12
+    - MONGODB_4_0=4.0.13
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
     - PYMONGO_3_10=3.10

From e0565ddac5cd62f9fd05c69187b49a20bb644035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 12 Jan 2020 21:31:28 +0100
Subject: [PATCH 1023/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b8e6ae564..d924a2c18 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Add Mongo 4.0 to Travis
 
 Changes in 0.19.1
 =================

From 605de59bd08d9d4f54f695c7f73a1458975d479f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 12 Jan 2020 21:37:32 +0100
Subject: [PATCH 1024/1519] improve travis + fix tox mg310

---
 .travis.yml | 9 +++++----
 tox.ini     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7d6da1a5..62bbacb14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,13 +31,14 @@ dist: xenial
 
 env:
   global:
-    - MONGODB_4_0=4.0.13
     - MONGODB_3_4=3.4.17
     - MONGODB_3_6=3.6.12
-    - PYMONGO_3_10=3.10
-    - PYMONGO_3_9=3.9
-    - PYMONGO_3_6=3.6
+    - MONGODB_4_0=4.0.13
+
     - PYMONGO_3_4=3.4
+    - PYMONGO_3_6=3.6
+    - PYMONGO_3_9=3.9
+    - PYMONGO_3_10=3.10
   matrix:
     - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_10}
 
diff --git a/tox.ini b/tox.ini
index c3789b7d6..396817ca5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,pypy,pypy3}-{mg34,mg36, mg39}
+envlist = {py27,py35,pypy,pypy3}-{mg34,mg36,mg39,mg310}
 
 [testenv]
 commands =

From 72de6d67c7f91d9e1278d1503e87766c4e4708c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 3 Jan 2020 09:40:00 +0100
Subject: [PATCH 1025/1519] Bump dev status classifier

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 5ba84e069..5c6451aa6 100644
--- a/setup.py
+++ b/setup.py
@@ -92,7 +92,7 @@ def run_tests(self):
 VERSION = get_version(eval(version_line.split("=")[-1]))
 
 CLASSIFIERS = [
-    "Development Status :: 4 - Beta",
+    "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",

From 57db68dc040acae8070667a2840f945d3c40669a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 13 Jan 2020 23:34:43 +0100
Subject: [PATCH 1026/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d924a2c18..add371206 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Add Mongo 4.0 to Travis
+- Bump development Status classifier to Production/Stable #2232
 
 Changes in 0.19.1
 =================

From 86e965f854763863de2d12e54b4416b4761df55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 30 Dec 2019 21:58:57 +0100
Subject: [PATCH 1027/1519] remove very old deprecated method

---
 docs/changelog.rst           |  3 ++-
 mongoengine/queryset/base.py | 20 --------------------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d924a2c18..b96a85ed0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,7 +13,8 @@ Changes in 0.19.1
 - Requires Pillow < 7.0.0 as it dropped Python2 support
 - DEPRECATION: The interface of ``QuerySet.aggregate`` method was changed, it no longer takes an unpacked list of
     pipeline steps (*pipeline) but simply takes the pipeline list just like ``pymongo.Collection.aggregate`` does. #2079
-
+- BREAKING CHANGE: Removed Queryset._ensure_indexes and Queryset.ensure_indexes that were deprecated in 2013.
+    Document.ensure_indexes still exists
 Changes in 0.19.0
 =================
 - BREAKING CHANGE: ``class_check`` and ``read_preference`` keyword arguments are no longer available when filtering a ``QuerySet``. #2112
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 50cb37acc..805a3d0a9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1958,23 +1958,3 @@ def _chainable_method(self, method_name, val):
         setattr(queryset, "_" + method_name, val)
 
         return queryset
-
-    # Deprecated
-    def ensure_index(self, **kwargs):
-        """Deprecated use :func:`Document.ensure_index`"""
-        msg = (
-            "Doc.objects()._ensure_index() is deprecated. "
-            "Use Doc.ensure_index() instead."
-        )
-        warnings.warn(msg, DeprecationWarning)
-        self._document.__class__.ensure_index(**kwargs)
-        return self
-
-    def _ensure_indexes(self):
-        """Deprecated use :func:`~Document.ensure_indexes`"""
-        msg = (
-            "Doc.objects()._ensure_indexes() is deprecated. "
-            "Use Doc.ensure_indexes() instead."
-        )
-        warnings.warn(msg, DeprecationWarning)
-        self._document.__class__.ensure_indexes()

From 095217e7977b933c53697e9736a6a8bcb37830cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 13 Jan 2020 23:53:24 +0100
Subject: [PATCH 1028/1519] remove methods that were derecated in 2013...

---
 docs/changelog.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b96a85ed0..5fe34f91e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,14 +7,15 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Add Mongo 4.0 to Travis
+- BREAKING CHANGE: Removed ``Queryset._ensure_indexes`` and ``Queryset.ensure_indexes`` that were deprecated in 2013.
+    ``Document.ensure_indexes`` still exists and is the right method to use
 
 Changes in 0.19.1
 =================
 - Requires Pillow < 7.0.0 as it dropped Python2 support
 - DEPRECATION: The interface of ``QuerySet.aggregate`` method was changed, it no longer takes an unpacked list of
     pipeline steps (*pipeline) but simply takes the pipeline list just like ``pymongo.Collection.aggregate`` does. #2079
-- BREAKING CHANGE: Removed Queryset._ensure_indexes and Queryset.ensure_indexes that were deprecated in 2013.
-    Document.ensure_indexes still exists
+
 Changes in 0.19.0
 =================
 - BREAKING CHANGE: ``class_check`` and ``read_preference`` keyword arguments are no longer available when filtering a ``QuerySet``. #2112

From 38703acc299740ea52a73cca3e222bc050754223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 23 Jan 2020 23:33:23 +0100
Subject: [PATCH 1029/1519] fix complex datetime field invalid string set

---
 mongoengine/fields.py                       |  5 ++++-
 tests/fields/test_complex_datetime_field.py | 17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 7ec8c0f3c..3eff0325f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -684,7 +684,10 @@ def __set__(self, instance, value):
         super(ComplexDateTimeField, self).__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)
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index f0a6b96e3..699032cc1 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -4,6 +4,8 @@
 import math
 import re
 
+import pytest
+
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
@@ -191,3 +193,18 @@ class Log(Document):
 
         fetched_log = Log.objects.with_id(log.id)
         assert fetched_log.timestamp >= NOW
+
+    def test_setting_bad_value_does_not_raise_unless_validate_is_called(self):
+        # test regression of #2253
+
+        class Log(Document):
+            timestamp = ComplexDateTimeField()
+
+        Log.drop_collection()
+
+        log = Log(timestamp="garbage")
+        with pytest.raises(ValidationError):
+            log.validate()
+
+        with pytest.raises(ValidationError):
+            log.save()

From 2d6a4c4b9043d5cf4fe029870fceb9ecd47ce9af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 23 Jan 2020 23:36:03 +0100
Subject: [PATCH 1030/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d924a2c18..11e6c0637 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Add Mongo 4.0 to Travis
+- Fix error when setting a string as a ComplexDateTimeField #2253
 
 Changes in 0.19.1
 =================

From 8e17e42e26d944d90bdd16bfacb8d07879768055 Mon Sep 17 00:00:00 2001
From: Agustin <abarto@gmail.com>
Date: Fri, 24 Jan 2020 13:11:07 -0300
Subject: [PATCH 1031/1519] Allow setting read_concern

---
 mongoengine/context_managers.py |  8 ++++++
 mongoengine/queryset/base.py    | 31 +++++++++++++++++----
 tests/queryset/test_queryset.py | 49 +++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 1592ceef4..0f6c8698c 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -257,3 +257,11 @@ def set_write_concern(collection, write_concerns):
     combined_concerns = dict(collection.write_concern.document.items())
     combined_concerns.update(write_concerns)
     yield collection.with_options(write_concern=WriteConcern(**combined_concerns))
+
+
+@contextmanager
+def set_read_write_concern(collection, write_concerns, read_concern):
+    combined_write_concerns = dict(collection.write_concern.document.items())
+    combined_write_concerns.update(write_concerns)
+
+    yield collection.with_options(write_concern=WriteConcern(**combined_write_concerns), read_concern=read_concern)
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 50cb37acc..0b76235cc 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -11,6 +11,7 @@
 import pymongo.errors
 from pymongo.collection import ReturnDocument
 from pymongo.common import validate_read_preference
+from pymongo.read_concern import ReadConcern
 import six
 from six import iteritems
 
@@ -18,7 +19,7 @@
 from mongoengine.base import get_document
 from mongoengine.common import _import_class
 from mongoengine.connection import get_db
-from mongoengine.context_managers import set_write_concern, switch_db
+from mongoengine.context_managers import set_write_concern, set_read_write_concern, switch_db
 from mongoengine.errors import (
     BulkWriteError,
     InvalidQueryError,
@@ -62,6 +63,7 @@ def __init__(self, document, collection):
         self._timeout = True
         self._slave_okay = False
         self._read_preference = None
+        self._read_concern = None
         self._iter = False
         self._scalar = []
         self._none = False
@@ -490,7 +492,7 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                 return result.deleted_count
 
     def update(
-        self, upsert=False, multi=True, write_concern=None, full_result=False, **update
+        self, upsert=False, multi=True, write_concern=None, read_concern=None, full_result=False, **update
     ):
         """Perform an atomic update on the fields matched by the query.
 
@@ -502,6 +504,7 @@ def update(
             ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
             wait until at least two servers have recorded the write and
             will force an fsync on the primary server.
+        :param read_concern: Override the read concern for the operation
         :param full_result: Return the associated ``pymongo.UpdateResult`` rather than just the number
             updated items
         :param update: Django-style update keyword arguments
@@ -528,7 +531,7 @@ def update(
             else:
                 update["$set"] = {"_cls": queryset._document._class_name}
         try:
-            with set_write_concern(queryset._collection, write_concern) as collection:
+            with set_read_write_concern(queryset._collection, write_concern, read_concern) as collection:
                 update_func = collection.update_one
                 if multi:
                     update_func = collection.update_many
@@ -545,7 +548,7 @@ def update(
                 raise OperationError(message)
             raise OperationError(u"Update failed (%s)" % six.text_type(err))
 
-    def upsert_one(self, write_concern=None, **update):
+    def upsert_one(self, write_concern=None, read_concern=None, **update):
         """Overwrite or add the first document matched by the query.
 
         :param write_concern: Extra keyword arguments are passed down which
@@ -554,6 +557,7 @@ def upsert_one(self, write_concern=None, **update):
             ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
             wait until at least two servers have recorded the write and
             will force an fsync on the primary server.
+        :param read_concern: Override the read concern for the operation
         :param update: Django-style update keyword arguments
 
         :returns the new or overwritten document
@@ -565,6 +569,7 @@ def upsert_one(self, write_concern=None, **update):
             multi=False,
             upsert=True,
             write_concern=write_concern,
+            read_concern=read_concern,
             full_result=True,
             **update
         )
@@ -1196,6 +1201,20 @@ def read_preference(self, read_preference):
         queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_preference
         return queryset
 
+    def read_concern(self, read_concern):
+        """Change the read_concern when querying.
+
+        :param read_concern: override ReplicaSetConnection-level
+            preference.
+        """
+        if read_concern is not None and not isinstance(read_concern, ReadConcern):
+            raise TypeError("%r is not a read concern." % (read_concern,))
+
+        queryset = self.clone()
+        queryset._read_concern = read_concern
+        queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_concern
+        return queryset
+    
     def scalar(self, *fields):
         """Instead of returning Document instances, return either a specific
         value or a tuple of values in order.
@@ -1642,9 +1661,9 @@ def _cursor(self):
         # XXX In PyMongo 3+, we define the read preference on a collection
         # level, not a cursor level. Thus, we need to get a cloned collection
         # object using `with_options` first.
-        if self._read_preference is not None:
+        if self._read_preference is not None or self._read_concern is not None:
             self._cursor_obj = self._collection.with_options(
-                read_preference=self._read_preference
+                read_preference=self._read_preference, read_concern=self._read_concern
             ).find(self._query, **self._cursor_args)
         else:
             self._cursor_obj = self._collection.find(self._query, **self._cursor_args)
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index b30350e67..c238752d0 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -7,6 +7,7 @@
 
 from bson import DBRef, ObjectId
 import pymongo
+from pymongo.read_concern import ReadConcern
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import UpdateResult
 import pytest
@@ -4658,6 +4659,54 @@ def assert_read_pref(qs, expected_read_pref):
         )
         assert_read_pref(bars, ReadPreference.SECONDARY_PREFERRED)
 
+    def test_read_concern(self):
+        class Bar(Document):
+            txt = StringField()
+
+            meta = {"indexes": ["txt"]}
+
+        Bar.drop_collection()
+        bar = Bar.objects.create(txt="xyz")
+
+        bars = list(Bar.objects.read_concern(None))
+        assert bars == [bar]
+
+        bars = Bar.objects.read_concern(ReadConcern(level='local'))
+        assert bars._read_concern == ReadConcern(level='local')
+        assert (
+            bars._cursor.collection.read_concern
+            == ReadConcern(level='local')
+        )
+
+        # Make sure that `.read_concern(...)` does accept string values.
+        with pytest.raises(TypeError):
+            Bar.objects.read_concern('local')
+
+        def assert_read_concern(qs, expected_read_concern):
+            assert qs._read_concern == expected_read_concern
+            assert qs._cursor.collection.read_concern == expected_read_concern
+
+        # Make sure read concern is respected after a `.skip(...)`.
+        bars = Bar.objects.skip(1).read_concern(ReadConcern('majority'))
+        assert_read_concern(bars, ReadConcern('majority'))
+
+        # Make sure read concern is respected after a `.limit(...)`.
+        bars = Bar.objects.limit(1).read_concern(ReadConcern('majority'))
+        assert_read_concern(bars, ReadConcern('majority'))
+
+        # Make sure read concern is respected after an `.order_by(...)`.
+        bars = Bar.objects.order_by("txt").read_concern(
+            ReadConcern('majority')
+        )
+        assert_read_concern(bars, ReadConcern('majority'))
+
+        # Make sure read concern is respected after a `.hint(...)`.
+        bars = Bar.objects.hint([("txt", 1)]).read_concern(
+            ReadConcern('majority')
+        )
+        assert_read_concern(bars, ReadConcern('majority'))
+
+
     def test_json_simple(self):
         class Embedded(EmbeddedDocument):
             string = StringField()

From 450658d7ac2b26be7849f8f0599fff06bb7e6ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 4 Feb 2020 22:51:02 +0100
Subject: [PATCH 1032/1519] fix indirect library version that dropped python2
 support recently

---
 setup.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 5ba84e069..5cba5d9e0 100644
--- a/setup.py
+++ b/setup.py
@@ -108,6 +108,10 @@ def run_tests(self):
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
+PYTHON_VERSION = sys.version_info[0]
+PY3 = PYTHON_VERSION == 3
+PY2 = PYTHON_VERSION == 2
+
 extra_opts = {
     "packages": find_packages(exclude=["tests", "tests.*"]),
     "tests_require": [
@@ -116,9 +120,10 @@ def run_tests(self):
         "coverage<5.0",  # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
         "blinker",
         "Pillow>=2.0.0, <7.0.0",  # 7.0.0 dropped Python2 support
+        "zipp<2.0.0",  # (dependency of pytest) dropped python2 support
     ],
 }
-if sys.version_info[0] == 3:
+if PY3:
     extra_opts["use_2to3"] = True
     if "test" in sys.argv:
         extra_opts["packages"] = find_packages()

From 4bca3de42f08a5ca4fdd0b4021d6a54f25e24003 Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Fri, 14 Feb 2020 16:43:07 -0300
Subject: [PATCH 1033/1519] Add support for the elemMatch projection operator.
 Add basic tests to the fields queryset method.

---
 mongoengine/queryset/base.py    |  2 +-
 tests/queryset/test_queryset.py | 51 +++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 50cb37acc..710259df0 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1037,7 +1037,7 @@ def fields(self, _only_called=False, **kwargs):
         """
 
         # Check for an operator and transform to mongo-style if there is
-        operators = ["slice"]
+        operators = ["slice", "elemMatch"]
         cleaned_fields = []
         for key, value in kwargs.items():
             parts = key.split("__")
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index b30350e67..5ebd545f8 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4476,6 +4476,57 @@ def test_scalar_cursor_behaviour(self):
             expected = "[u'A1', u'A2']"
         assert expected == "%s" % sorted(names)
 
+    def test_fields(self):
+        class Bar(EmbeddedDocument):
+            v = StringField()
+            z = StringField()
+
+
+        class Foo(Document):
+            x = StringField()
+            y = IntField()
+            items = EmbeddedDocumentListField(Bar)
+
+
+        Foo.drop_collection()
+
+        Foo(x='foo1', y=1).save()
+        Foo(x='foo2', y=2, items=[]).save()
+        Foo(x='foo3', y=3, items=[Bar(z='a', v='V')]).save()
+        Foo(x='foo4', y=4, items=[Bar(z='a', v='V'), Bar(z='b', v='W'), Bar(z='b', v='X'), Bar(z='c', v='V')]).save()
+        Foo(x='foo5', y=5, items=[Bar(z='b', v='X'), Bar(z='c', v='V'), Bar(z='d', v='V'), Bar(z='e', v='V')]).save()
+
+        foos_with_x = list(Foo.objects.order_by('y').fields(x=1))
+
+        assert all(o.x is not None for o in foos_with_x)
+
+        foos_without_y = list(Foo.objects.order_by('y').fields(y=0))
+
+        assert all(o.y is None for o in foos_with_x)
+
+        foos_with_sliced_items = list(Foo.objects.order_by('y').fields(slice__items=1))
+
+        assert foos_with_sliced_items[0].items == []
+        assert foos_with_sliced_items[1].items == []
+        assert len(foos_with_sliced_items[2].items) == 1
+        assert foos_with_sliced_items[2].items[0].z == 'a'
+        assert len(foos_with_sliced_items[3].items) == 1
+        assert foos_with_sliced_items[3].items[0].z == 'a'
+        assert len(foos_with_sliced_items[4].items) == 1
+        assert foos_with_sliced_items[4].items[0].z == 'b'
+
+        foos_with_elem_match_items = list(Foo.objects.order_by('y').fields(elemMatch__items={'z': 'b'}))
+
+        assert foos_with_elem_match_items[0].items == []
+        assert foos_with_elem_match_items[1].items == []
+        assert foos_with_elem_match_items[2].items == []
+        assert len(foos_with_elem_match_items[3].items) == 1
+        assert foos_with_elem_match_items[3].items[0].z == 'b'
+        assert foos_with_elem_match_items[3].items[0].v == 'W'
+        assert len(foos_with_elem_match_items[4].items) == 1
+        assert foos_with_elem_match_items[4].items[0].z == 'b'
+
+
     def test_elem_match(self):
         class Foo(EmbeddedDocument):
             shape = StringField()

From 81f9b351b3838fe27924937e706300805e9eb82b Mon Sep 17 00:00:00 2001
From: Leonardo Domingues <leodmgs@gmail.com>
Date: Fri, 21 Feb 2020 19:14:34 -0300
Subject: [PATCH 1034/1519] Add return info in the save function docstring

---
 AUTHORS                 | 1 +
 mongoengine/document.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index b9a81c63f..7d3000ce5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -255,3 +255,4 @@ that much better:
  * Filip Kucharczyk (https://github.com/Pacu2)
  * Eric Timmons (https://github.com/daewok)
  * Matthew Simpson (https://github.com/mcsimps2)
+ * Leonardo Domingues (https://github.com/leodmgs)
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 23968f17d..5e8125100 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -332,7 +332,7 @@ def save(
     ):
         """Save the :class:`~mongoengine.Document` to the database. If the
         document already exists, it will be updated, otherwise it will be
-        created.
+        created. Returns the saved object instance.
 
         :param force_insert: only try to create a new document, don't allow
             updates of existing documents.

From cfb4943986189a22ae75fd4f378f38f7ec0a77bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 2 Mar 2020 22:49:21 +0100
Subject: [PATCH 1035/1519] reformat with black

---
 tests/queryset/test_queryset.py | 53 ++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 5ebd545f8..f6d1a916e 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4481,51 +4481,68 @@ class Bar(EmbeddedDocument):
             v = StringField()
             z = StringField()
 
-
         class Foo(Document):
             x = StringField()
             y = IntField()
             items = EmbeddedDocumentListField(Bar)
 
-
         Foo.drop_collection()
 
-        Foo(x='foo1', y=1).save()
-        Foo(x='foo2', y=2, items=[]).save()
-        Foo(x='foo3', y=3, items=[Bar(z='a', v='V')]).save()
-        Foo(x='foo4', y=4, items=[Bar(z='a', v='V'), Bar(z='b', v='W'), Bar(z='b', v='X'), Bar(z='c', v='V')]).save()
-        Foo(x='foo5', y=5, items=[Bar(z='b', v='X'), Bar(z='c', v='V'), Bar(z='d', v='V'), Bar(z='e', v='V')]).save()
+        Foo(x="foo1", y=1).save()
+        Foo(x="foo2", y=2, items=[]).save()
+        Foo(x="foo3", y=3, items=[Bar(z="a", v="V")]).save()
+        Foo(
+            x="foo4",
+            y=4,
+            items=[
+                Bar(z="a", v="V"),
+                Bar(z="b", v="W"),
+                Bar(z="b", v="X"),
+                Bar(z="c", v="V"),
+            ],
+        ).save()
+        Foo(
+            x="foo5",
+            y=5,
+            items=[
+                Bar(z="b", v="X"),
+                Bar(z="c", v="V"),
+                Bar(z="d", v="V"),
+                Bar(z="e", v="V"),
+            ],
+        ).save()
 
-        foos_with_x = list(Foo.objects.order_by('y').fields(x=1))
+        foos_with_x = list(Foo.objects.order_by("y").fields(x=1))
 
         assert all(o.x is not None for o in foos_with_x)
 
-        foos_without_y = list(Foo.objects.order_by('y').fields(y=0))
+        foos_without_y = list(Foo.objects.order_by("y").fields(y=0))
 
         assert all(o.y is None for o in foos_with_x)
 
-        foos_with_sliced_items = list(Foo.objects.order_by('y').fields(slice__items=1))
+        foos_with_sliced_items = list(Foo.objects.order_by("y").fields(slice__items=1))
 
         assert foos_with_sliced_items[0].items == []
         assert foos_with_sliced_items[1].items == []
         assert len(foos_with_sliced_items[2].items) == 1
-        assert foos_with_sliced_items[2].items[0].z == 'a'
+        assert foos_with_sliced_items[2].items[0].z == "a"
         assert len(foos_with_sliced_items[3].items) == 1
-        assert foos_with_sliced_items[3].items[0].z == 'a'
+        assert foos_with_sliced_items[3].items[0].z == "a"
         assert len(foos_with_sliced_items[4].items) == 1
-        assert foos_with_sliced_items[4].items[0].z == 'b'
+        assert foos_with_sliced_items[4].items[0].z == "b"
 
-        foos_with_elem_match_items = list(Foo.objects.order_by('y').fields(elemMatch__items={'z': 'b'}))
+        foos_with_elem_match_items = list(
+            Foo.objects.order_by("y").fields(elemMatch__items={"z": "b"})
+        )
 
         assert foos_with_elem_match_items[0].items == []
         assert foos_with_elem_match_items[1].items == []
         assert foos_with_elem_match_items[2].items == []
         assert len(foos_with_elem_match_items[3].items) == 1
-        assert foos_with_elem_match_items[3].items[0].z == 'b'
-        assert foos_with_elem_match_items[3].items[0].v == 'W'
+        assert foos_with_elem_match_items[3].items[0].z == "b"
+        assert foos_with_elem_match_items[3].items[0].v == "W"
         assert len(foos_with_elem_match_items[4].items) == 1
-        assert foos_with_elem_match_items[4].items[0].z == 'b'
-
+        assert foos_with_elem_match_items[4].items[0].z == "b"
 
     def test_elem_match(self):
         class Foo(EmbeddedDocument):

From d287f480e5016090384650515c9342c767c4bbb7 Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Tue, 4 Feb 2020 12:35:03 +0100
Subject: [PATCH 1036/1519] Fix for combining raw and regular filters

---
 mongoengine/queryset/transform.py | 4 ++--
 tests/queryset/test_transform.py  | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 0b73e99b1..659a97e25 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -169,9 +169,9 @@ def query(_doc_cls=None, **kwargs):
 
         key = ".".join(parts)
 
-        if op is None or key not in mongo_query:
+        if key not in mongo_query:
             mongo_query[key] = value
-        elif key in mongo_query:
+        else:
             if isinstance(mongo_query[key], dict) and isinstance(value, dict):
                 mongo_query[key].update(value)
                 # $max/minDistance needs to come last - convert to SON
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index 3898809e6..8d6c2d06b 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -24,6 +24,12 @@ def test_transform_query(self):
         }
         assert transform.query(friend__age__gte=30) == {"friend.age": {"$gte": 30}}
         assert transform.query(name__exists=True) == {"name": {"$exists": True}}
+        assert transform.query(name=["Mark"], __raw__={"name": {"$in": "Tom"}}) == {
+            "$and": [{"name": ["Mark"]}, {"name": {"$in": "Tom"}}]
+        }
+        assert transform.query(name__in=["Tom"], __raw__={"name": "Mark"}) == {
+            "$and": [{"name": {"$in": ["Tom"]}}, {"name": "Mark"}]
+        }
 
     def test_transform_update(self):
         class LisDoc(Document):

From fda2e2b47ab5085b6ff5b6e27b40794a3fa9e77f Mon Sep 17 00:00:00 2001
From: Filip Kucharczyk <filip.m.kucharczyk@gmail.com>
Date: Tue, 4 Feb 2020 12:58:25 +0100
Subject: [PATCH 1037/1519] Update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d924a2c18..8dcea62a2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Add Mongo 4.0 to Travis
+- Fixed a bug causing inaccurate query results, while combining ``__raw__`` and regular filters for the same field #2264
 
 Changes in 0.19.1
 =================

From ff4d57032ad366fb766b9625ead6df66bd989675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 3 Mar 2020 23:51:11 +0100
Subject: [PATCH 1038/1519] reformat w black

---
 mongoengine/context_managers.py |  4 +++-
 mongoengine/queryset/base.py    | 20 ++++++++++++++++----
 tests/queryset/test_queryset.py | 32 ++++++++++++--------------------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 0f6c8698c..0c58b57c6 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -264,4 +264,6 @@ def set_read_write_concern(collection, write_concerns, read_concern):
     combined_write_concerns = dict(collection.write_concern.document.items())
     combined_write_concerns.update(write_concerns)
 
-    yield collection.with_options(write_concern=WriteConcern(**combined_write_concerns), read_concern=read_concern)
+    yield collection.with_options(
+        write_concern=WriteConcern(**combined_write_concerns), read_concern=read_concern
+    )
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 0b76235cc..0743429c6 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -19,7 +19,11 @@
 from mongoengine.base import get_document
 from mongoengine.common import _import_class
 from mongoengine.connection import get_db
-from mongoengine.context_managers import set_write_concern, set_read_write_concern, switch_db
+from mongoengine.context_managers import (
+    set_write_concern,
+    set_read_write_concern,
+    switch_db,
+)
 from mongoengine.errors import (
     BulkWriteError,
     InvalidQueryError,
@@ -492,7 +496,13 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                 return result.deleted_count
 
     def update(
-        self, upsert=False, multi=True, write_concern=None, read_concern=None, full_result=False, **update
+        self,
+        upsert=False,
+        multi=True,
+        write_concern=None,
+        read_concern=None,
+        full_result=False,
+        **update
     ):
         """Perform an atomic update on the fields matched by the query.
 
@@ -531,7 +541,9 @@ def update(
             else:
                 update["$set"] = {"_cls": queryset._document._class_name}
         try:
-            with set_read_write_concern(queryset._collection, write_concern, read_concern) as collection:
+            with set_read_write_concern(
+                queryset._collection, write_concern, read_concern
+            ) as collection:
                 update_func = collection.update_one
                 if multi:
                     update_func = collection.update_many
@@ -1214,7 +1226,7 @@ def read_concern(self, read_concern):
         queryset._read_concern = read_concern
         queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_concern
         return queryset
-    
+
     def scalar(self, *fields):
         """Instead of returning Document instances, return either a specific
         value or a tuple of values in order.
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index c238752d0..708033f49 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4671,41 +4671,33 @@ class Bar(Document):
         bars = list(Bar.objects.read_concern(None))
         assert bars == [bar]
 
-        bars = Bar.objects.read_concern(ReadConcern(level='local'))
-        assert bars._read_concern == ReadConcern(level='local')
-        assert (
-            bars._cursor.collection.read_concern
-            == ReadConcern(level='local')
-        )
+        bars = Bar.objects.read_concern(ReadConcern(level="local"))
+        assert bars._read_concern == ReadConcern(level="local")
+        assert bars._cursor.collection.read_concern == ReadConcern(level="local")
 
         # Make sure that `.read_concern(...)` does accept string values.
         with pytest.raises(TypeError):
-            Bar.objects.read_concern('local')
+            Bar.objects.read_concern("local")
 
         def assert_read_concern(qs, expected_read_concern):
             assert qs._read_concern == expected_read_concern
             assert qs._cursor.collection.read_concern == expected_read_concern
 
         # Make sure read concern is respected after a `.skip(...)`.
-        bars = Bar.objects.skip(1).read_concern(ReadConcern('majority'))
-        assert_read_concern(bars, ReadConcern('majority'))
+        bars = Bar.objects.skip(1).read_concern(ReadConcern("majority"))
+        assert_read_concern(bars, ReadConcern("majority"))
 
         # Make sure read concern is respected after a `.limit(...)`.
-        bars = Bar.objects.limit(1).read_concern(ReadConcern('majority'))
-        assert_read_concern(bars, ReadConcern('majority'))
+        bars = Bar.objects.limit(1).read_concern(ReadConcern("majority"))
+        assert_read_concern(bars, ReadConcern("majority"))
 
         # Make sure read concern is respected after an `.order_by(...)`.
-        bars = Bar.objects.order_by("txt").read_concern(
-            ReadConcern('majority')
-        )
-        assert_read_concern(bars, ReadConcern('majority'))
+        bars = Bar.objects.order_by("txt").read_concern(ReadConcern("majority"))
+        assert_read_concern(bars, ReadConcern("majority"))
 
         # Make sure read concern is respected after a `.hint(...)`.
-        bars = Bar.objects.hint([("txt", 1)]).read_concern(
-            ReadConcern('majority')
-        )
-        assert_read_concern(bars, ReadConcern('majority'))
-
+        bars = Bar.objects.hint([("txt", 1)]).read_concern(ReadConcern("majority"))
+        assert_read_concern(bars, ReadConcern("majority"))
 
     def test_json_simple(self):
         class Embedded(EmbeddedDocument):

From 421e3f324fbb8a260eba817717f8391d2c9ecdd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 8 Mar 2020 14:58:21 +0100
Subject: [PATCH 1039/1519] Drop python2 support

---
 .travis.yml                                  | 35 ++++++++------------
 CONTRIBUTING.rst                             | 18 +++++-----
 benchmarks/test_inserts.py                   |  4 ---
 mongoengine/base/datastructures.py           | 16 +--------
 mongoengine/base/document.py                 | 10 ++----
 mongoengine/fields.py                        | 17 ++++------
 mongoengine/python_support.py                | 23 -------------
 mongoengine/queryset/base.py                 |  4 ---
 mongoengine/queryset/field_list.py           |  2 --
 mongoengine/queryset/transform.py            |  2 +-
 mongoengine/queryset/visitor.py              |  4 ---
 setup.py                                     | 17 ++++------
 tests/fields/test_binary_field.py            | 10 ++----
 tests/fields/test_embedded_document_field.py |  2 --
 tests/fields/test_file_field.py              |  6 ++--
 tests/fields/test_url_field.py               |  2 --
 tests/queryset/test_queryset.py              |  5 +--
 tests/test_datastructures.py                 |  6 ++--
 tox.ini                                      |  2 +-
 19 files changed, 51 insertions(+), 134 deletions(-)
 delete mode 100644 mongoengine/python_support.py

diff --git a/.travis.yml b/.travis.yml
index ad659fca5..d34f8a36a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,10 @@
 # For full coverage, we'd have to test all supported Python, MongoDB, and
 # PyMongo combinations. However, that would result in an overly long build
 # with a very large number of jobs, hence we only test a subset of all the
-# combinations:
-# * MongoDB v3.4 & the latest PyMongo v3.x is currently the "main" setup,
-#   tested against Python v2.7, v3.5, v3.6, v3.7, v3.8, PyPy and PyPy3.
-# * Besides that, we test the lowest actively supported Python/MongoDB/PyMongo
-#   combination: MongoDB v3.4, PyMongo v3.4, Python v2.7.
-# * MongoDB v3.6 is tested against Python v3.6, and PyMongo v3.6, v3.7, v3.8.
-#
+# combinations.
+# * Python3.7, MongoDB v3.4 & the latest PyMongo v3.x is currently the "main" setup,
+# Other combinations are tested. See below for the details or check the travis jobs
+
 # We should periodically check MongoDB Server versions supported by MongoDB
 # Inc., add newly released versions to the test matrix, and remove versions
 # which have reached their End of Life. See:
@@ -16,21 +13,15 @@
 #
 # Reminder: Update README.rst if you change MongoDB versions we test.
 
-
 language: python
+dist: xenial
 python:
-- 2.7
 - 3.5
 - 3.6
 - 3.7
 - 3.8
-- pypy
 - pypy3
 
-dist: xenial
-
-dist: xenial
-
 env:
   global:
     - MONGODB_3_4=3.4.17
@@ -41,6 +32,8 @@ env:
     - PYMONGO_3_6=3.6
     - PYMONGO_3_9=3.9
     - PYMONGO_3_10=3.10
+
+    - MAIN_PYTHON_VERSION = "3.7"
   matrix:
     - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_10}
 
@@ -49,8 +42,6 @@ matrix:
   fast_finish: true
 
   include:
-  - python: 2.7
-    env: MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_4}
   - python: 3.7
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
   - python: 3.7
@@ -74,20 +65,20 @@ install:
   # tox dryrun to setup the tox venv (we run a mock test).
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
   # Install black for Python v3.7 only.
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then pip install black; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then pip install black; fi
 
 before_script:
   - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
   - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then flake8 .; else echo "flake8 only runs on py37"; fi         # Run flake8 for Python 3.7 only
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then black --check .; else echo "black only runs on py37"; fi   # Run black for Python 3.7 only
+  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then flake8 .; else echo "flake8 only runs on py37"; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then black --check .; else echo "black only runs on py37"; fi
   - mongo --eval 'db.version();'    # Make sure mongo is awake
 
 script:
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
 
 after_success:
-- coveralls --verbose
+- - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then coveralls --verbose; else echo "coveralls only sent for py37"; fi
 
 notifications:
   irc: irc.freenode.org#mongoengine
@@ -109,11 +100,11 @@ deploy:
   distributions: "sdist bdist_wheel"
 
   # Only deploy on tagged commits (aka GitHub releases) and only for the parent
-  # repo's builds running Python v2.7 along with PyMongo v3.x and MongoDB v3.4.
+  # repo's builds running Python v3.7 along with PyMongo v3.x and MongoDB v3.4.
   # We run Travis against many different Python, PyMongo, and MongoDB versions
   # and we don't want the deploy to occur multiple times).
   on:
     tags: true
     repo: MongoEngine/mongoengine
     condition: ($PYMONGO = ${PYMONGO_3_10}) && ($MONGODB = ${MONGODB_3_4})
-    python: 2.7
+    python: 3.7
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b04ae9688..0deda0fcc 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -20,23 +20,23 @@ post to the `user group <http://groups.google.com/group/mongoengine-users>`
 Supported Interpreters
 ----------------------
 
-MongoEngine supports CPython 2.7 and newer. Language
-features not supported by all interpreters can not be used.
+MongoEngine supports CPython 3.7 and newer as well as Pypy3.
+Language features not supported by all interpreters can not be used.
 
-Python 2/3 compatibility
+Python3 codebase
 ----------------------
 
-The codebase is written in a compatible manner for python 2 & 3 so it
-is important that this is taken into account when it comes to discrepencies
-between the two versions (see https://python-future.org/compatible_idioms.html).
-Travis runs the tests against different Python versions as a safety net.
+Since 0.20, the codebase is exclusively Python 3.
+
+Earlier versions were exclusively Python2, and was relying on 2to3 to support Python3 installs.
+Travis runs the tests against the main Python 3.x versions.
 
 
 Style Guide
 -----------
 
-MongoEngine uses `black <https://github.com/python/black>`_ for code
-formatting.
+MongoEngine uses `black <https://github.com/python/black>`_ for code formatting.
+Black runs as part of the CI so it will fail in case the code is not formatted properly.
 
 Testing
 -------
diff --git a/benchmarks/test_inserts.py b/benchmarks/test_inserts.py
index af6399f79..4ecd48de7 100644
--- a/benchmarks/test_inserts.py
+++ b/benchmarks/test_inserts.py
@@ -3,8 +3,6 @@
 
 def main():
     setup = """
-from builtins import range
-
 from pymongo import MongoClient
 
 connection = MongoClient()
@@ -59,8 +57,6 @@ def main():
     print("{}s".format(t.timeit(1)))
 
     setup = """
-from builtins import range
-
 from pymongo import MongoClient
 
 connection = MongoClient()
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 9f78fec0c..f2d64c33d 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,7 +1,6 @@
 import weakref
 
 from bson import DBRef
-from future.utils import listitems
 import six
 from six import iteritems
 
@@ -181,19 +180,6 @@ def __setitem__(self, key, value):
     __iadd__ = mark_as_changed_wrapper(list.__iadd__)
     __imul__ = mark_as_changed_wrapper(list.__imul__)
 
-    if six.PY2:
-        # Under py3 __setslice__, __delslice__ and __getslice__
-        # are replaced by __setitem__, __delitem__ and __getitem__ with a slice as parameter
-        # so we mimic this under python 2
-        def __setslice__(self, i, j, sequence):
-            return self.__setitem__(slice(i, j), sequence)
-
-        def __delslice__(self, i, j):
-            return self.__delitem__(slice(i, j))
-
-        def __getslice__(self, i, j):
-            return self.__getitem__(slice(i, j))
-
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, "_mark_as_changed"):
             if key:
@@ -426,7 +412,7 @@ def __len__(self):
         return len(list(iteritems(self)))
 
     def __eq__(self, other):
-        return listitems(self) == listitems(other)
+        return list(self.items()) == list(other.items())
 
     def __ne__(self, other):
         return not (self == other)
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 4e4df92f9..73c887748 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1,9 +1,9 @@
 import copy
+
 import numbers
 from functools import partial
 
 from bson import DBRef, ObjectId, SON, json_util
-from future.utils import listitems
 import pymongo
 import six
 from six import iteritems
@@ -26,7 +26,6 @@
     OperationError,
     ValidationError,
 )
-from mongoengine.python_support import Hashable
 
 __all__ = ("BaseDocument", "NON_FIELD_ERRORS")
 
@@ -294,10 +293,7 @@ def __repr__(self):
     def __str__(self):
         # TODO this could be simpler?
         if hasattr(self, "__unicode__"):
-            if six.PY3:
-                return self.__unicode__()
-            else:
-                return six.text_type(self).encode("utf-8")
+            return self.__unicode__()
         return six.text_type("%s object" % self.__class__.__name__)
 
     def __eq__(self, other):
@@ -671,7 +667,7 @@ def _delta(self):
                 del set_data["_id"]
 
         # Determine if any changed items were actually unset.
-        for path, value in listitems(set_data):
+        for path, value in list(set_data.items()):
             if value or isinstance(
                 value, (numbers.Number, bool)
             ):  # Account for 0 and True that are truthy
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 9d7d1d04d..5cbf3ae05 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -5,12 +5,12 @@
 import socket
 import time
 import uuid
+from io import BytesIO
 from operator import itemgetter
 
 from bson import Binary, DBRef, ObjectId, SON
 from bson.int64 import Int64
 import gridfs
-from past.builtins import long
 import pymongo
 from pymongo import ReturnDocument
 import six
@@ -39,7 +39,6 @@
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
 from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
-from mongoengine.python_support import StringIO
 from mongoengine.queryset import DO_NOTHING
 from mongoengine.queryset.base import BaseQuerySet
 from mongoengine.queryset.transform import STRING_OPERATORS
@@ -338,7 +337,7 @@ def prepare_query_value(self, op, value):
 
 
 class LongField(BaseField):
-    """64-bit integer field."""
+    """64-bit integer field. (Equivalent to IntField since the support to Python2 was dropped)"""
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
         self.min_value, self.max_value = min_value, max_value
@@ -346,7 +345,7 @@ def __init__(self, min_value=None, max_value=None, **kwargs):
 
     def to_python(self, value):
         try:
-            value = long(value)
+            value = int(value)
         except (TypeError, ValueError):
             pass
         return value
@@ -356,7 +355,7 @@ def to_mongo(self, value):
 
     def validate(self, value):
         try:
-            value = long(value)
+            value = int(value)
         except (TypeError, ValueError):
             self.error("%s could not be converted to long" % value)
 
@@ -370,7 +369,7 @@ def prepare_query_value(self, op, value):
         if value is None:
             return value
 
-        return super(LongField, self).prepare_query_value(op, long(value))
+        return super(LongField, self).prepare_query_value(op, int(value))
 
 
 class FloatField(BaseField):
@@ -1679,8 +1678,6 @@ def __get__(self, instance, value):
     def __bool__(self):
         return bool(self.grid_id)
 
-    __nonzero__ = __bool__  # For Py2 support
-
     def __getstate__(self):
         self_dict = self.__dict__
         self_dict["_fs"] = None
@@ -1952,7 +1949,7 @@ def put(self, file_obj, **kwargs):
 
         w, h = img.size
 
-        io = StringIO()
+        io = BytesIO()
         img.save(io, img_format, progressive=progressive)
         io.seek(0)
 
@@ -1971,7 +1968,7 @@ def delete(self, *args, **kwargs):
     def _put_thumbnail(self, thumbnail, format, progressive, **kwargs):
         w, h = thumbnail.size
 
-        io = StringIO()
+        io = BytesIO()
         thumbnail.save(io, format, progressive=progressive)
         io.seek(0)
 
diff --git a/mongoengine/python_support.py b/mongoengine/python_support.py
deleted file mode 100644
index 57e467dbc..000000000
--- a/mongoengine/python_support.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-Helper functions, constants, and types to aid with Python v2.7 - v3.x support
-"""
-import six
-
-# six.BytesIO resolves to StringIO.StringIO in Py2 and io.BytesIO in Py3.
-StringIO = six.BytesIO
-
-# Additionally for Py2, try to use the faster cStringIO, if available
-if not six.PY3:
-    try:
-        import cStringIO
-    except ImportError:
-        pass
-    else:
-        StringIO = cStringIO.StringIO
-
-
-if six.PY3:
-    from collections.abc import Hashable
-else:
-    # raises DeprecationWarnings in Python >=3.7
-    from collections import Hashable
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 9f76d92d0..b7d0e0ab9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import copy
 import itertools
 import re
@@ -204,8 +202,6 @@ def __bool__(self):
         """Avoid to open all records in an if stmt in Py3."""
         return self._has_data()
 
-    __nonzero__ = __bool__  # For Py2 support
-
     # Core functions
 
     def all(self):
diff --git a/mongoengine/queryset/field_list.py b/mongoengine/queryset/field_list.py
index 5c3ff2227..c2618ebdb 100644
--- a/mongoengine/queryset/field_list.py
+++ b/mongoengine/queryset/field_list.py
@@ -69,8 +69,6 @@ def __add__(self, f):
     def __bool__(self):
         return bool(self.fields)
 
-    __nonzero__ = __bool__  # For Py2 support
-
     def as_dict(self):
         field_list = {field: self.value for field in self.fields}
         if self.slice:
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 659a97e25..c179f541f 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -10,7 +10,7 @@
 from mongoengine.common import _import_class
 from mongoengine.errors import InvalidQueryError
 
-__all__ = ("query", "update")
+__all__ = ("query", "update", "STRING_OPERATORS")
 
 COMPARISON_OPERATORS = (
     "ne",
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index 470839c14..72e36ac01 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -143,8 +143,6 @@ def __repr__(self):
     def __bool__(self):
         return bool(self.children)
 
-    __nonzero__ = __bool__  # For Py2 support
-
     def accept(self, visitor):
         for i in range(len(self.children)):
             if isinstance(self.children[i], QNode):
@@ -180,8 +178,6 @@ def __repr__(self):
     def __bool__(self):
         return bool(self.query)
 
-    __nonzero__ = __bool__  # For Py2 support
-
     def __eq__(self, other):
         return self.__class__ == other.__class__ and self.query == other.query
 
diff --git a/setup.py b/setup.py
index 418ff7adc..6873284a9 100644
--- a/setup.py
+++ b/setup.py
@@ -110,7 +110,6 @@ def run_tests(self):
 
 PYTHON_VERSION = sys.version_info[0]
 PY3 = PYTHON_VERSION == 3
-PY2 = PYTHON_VERSION == 2
 
 extra_opts = {
     "packages": find_packages(exclude=["tests", "tests.*"]),
@@ -124,14 +123,11 @@ def run_tests(self):
     ],
 }
 
-if PY3:
-    if "test" in sys.argv:
-        extra_opts["packages"] = find_packages()
-        extra_opts["package_data"] = {
-            "tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]
-        }
-else:
-    extra_opts["tests_require"] += ["python-dateutil"]
+if "test" in sys.argv:
+    extra_opts["packages"] = find_packages()
+    extra_opts["package_data"] = {
+        "tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]
+    }
 
 setup(
     name="mongoengine",
@@ -148,7 +144,8 @@ def run_tests(self):
     long_description=LONG_DESCRIPTION,
     platforms=["any"],
     classifiers=CLASSIFIERS,
-    install_requires=["pymongo>=3.4, <4.0", "six>=1.10.0", "future"],
+    python_requires=">=3.5",
+    install_requires=["pymongo>=3.4, <4.0", "six>=1.10.0"],
     cmdclass={"test": PyTest},
     **extra_opts
 )
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index e2a1b8d62..a653b9611 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -123,10 +123,7 @@ class MyDocument(Document):
             upsert=True, new=True, set__bin_field=BIN_VALUE
         )
         assert doc.some_field == "test"
-        if six.PY3:
-            assert doc.bin_field == BIN_VALUE
-        else:
-            assert doc.bin_field == Binary(BIN_VALUE)
+        assert doc.bin_field == BIN_VALUE
 
     def test_update_one(self):
         """Ensures no regression of bug #1127"""
@@ -144,7 +141,4 @@ class MyDocument(Document):
         )
         assert n_updated == 1
         fetched = MyDocument.objects.with_id(doc.id)
-        if six.PY3:
-            assert fetched.bin_field == BIN_VALUE
-        else:
-            assert fetched.bin_field == Binary(BIN_VALUE)
+        assert fetched.bin_field == BIN_VALUE
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index b80f4d8ca..13ca9c0ba 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from builtins import str
-
 import pytest
 
 from mongoengine import (
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index b8ece1a9b..5ab6c93f7 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -3,6 +3,7 @@
 import os
 import tempfile
 import unittest
+from io import BytesIO
 
 import gridfs
 import pytest
@@ -10,7 +11,6 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from mongoengine.python_support import StringIO
 
 try:
     from PIL import Image
@@ -30,7 +30,7 @@
 def get_file(path):
     """Use a BytesIO instead of a file to allow
     to have a one-liner and avoid that the file remains opened"""
-    bytes_io = StringIO()
+    bytes_io = BytesIO()
     with open(path, "rb") as f:
         bytes_io.write(f.read())
     bytes_io.seek(0)
@@ -80,7 +80,7 @@ class PutFile(Document):
         PutFile.drop_collection()
 
         putfile = PutFile()
-        putstring = StringIO()
+        putstring = BytesIO()
         putstring.write(text)
         putstring.seek(0)
         putfile.the_file.put(putstring, content_type=content_type)
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index 477bced72..c449e4677 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from builtins import str
-
 import pytest
 
 from mongoengine import *
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 17bf74057..7dea6dd57 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4470,10 +4470,7 @@ def test_scalar_cursor_behaviour(self):
 
         pks = self.Person.objects.order_by("age").scalar("pk")[1:3]
         names = self.Person.objects.scalar("name").in_bulk(list(pks)).values()
-        if six.PY3:
-            expected = "['A1', 'A2']"
-        else:
-            expected = "[u'A1', u'A2']"
+        expected = "['A1', 'A2']"
         assert expected == "%s" % sorted(names)
 
     def test_elem_match(self):
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 7b5d7d113..734061eda 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -287,7 +287,7 @@ def test___setitem___calls_with_full_slice_mark_as_changed(self):
         base_list[:] = [
             0,
             1,
-        ]  # Will use __setslice__ under py2 and __setitem__ under py3
+        ]
         assert base_list._instance._changed_fields == ["my_name"]
         assert base_list == [0, 1]
 
@@ -296,13 +296,13 @@ def test___setitem___calls_with_partial_slice_mark_as_changed(self):
         base_list[0:2] = [
             1,
             0,
-        ]  # Will use __setslice__ under py2 and __setitem__ under py3
+        ]
         assert base_list._instance._changed_fields == ["my_name"]
         assert base_list == [1, 0, 2]
 
     def test___setitem___calls_with_step_slice_mark_as_changed(self):
         base_list = self._get_baselist([0, 1, 2])
-        base_list[0:3:2] = [-1, -2]  # uses __setitem__ in both py2 & 3
+        base_list[0:3:2] = [-1, -2]  # uses __setitem__
         assert base_list._instance._changed_fields == ["my_name"]
         assert base_list == [-1, 1, -2]
 
diff --git a/tox.ini b/tox.ini
index 396817ca5..675b6d9af 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,pypy,pypy3}-{mg34,mg36,mg39,mg310}
+envlist = {py35,pypy3}-{mg34,mg36,mg39,mg310}
 
 [testenv]
 commands =

From 03e34299f0d760834386b0b68dc71672b27649bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 11 Mar 2020 21:50:50 +0100
Subject: [PATCH 1040/1519] clean code related to Py2 + six.text_type &
 six.string_types

---
 CONTRIBUTING.rst                    |  2 +-
 README.rst                          |  6 +++
 mongoengine/base/datastructures.py  |  3 +-
 mongoengine/base/document.py        | 11 ++---
 mongoengine/base/fields.py          | 26 +++++------
 mongoengine/base/metaclasses.py     | 18 ++++----
 mongoengine/connection.py           |  9 ++--
 mongoengine/dereference.py          |  6 +--
 mongoengine/document.py             | 10 ++---
 mongoengine/errors.py               |  5 +--
 mongoengine/fields.py               | 69 +++++++++++++----------------
 mongoengine/queryset/base.py        | 30 ++++++-------
 mongoengine/queryset/transform.py   |  4 +-
 tests/fields/test_date_field.py     | 11 -----
 tests/fields/test_datetime_field.py | 13 +-----
 tests/queryset/test_queryset.py     | 26 ++++-------
 16 files changed, 101 insertions(+), 148 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 0deda0fcc..d939e2ee3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -28,7 +28,7 @@ Python3 codebase
 
 Since 0.20, the codebase is exclusively Python 3.
 
-Earlier versions were exclusively Python2, and was relying on 2to3 to support Python3 installs.
+Earlier versions were exclusively Python2, and were relying on 2to3 to support Python3 installs.
 Travis runs the tests against the main Python 3.x versions.
 
 
diff --git a/README.rst b/README.rst
index b5c958888..1ef1363f7 100644
--- a/README.rst
+++ b/README.rst
@@ -42,6 +42,8 @@ to both create the virtual environment and install the package. Otherwise, you c
 download the source from `GitHub <http://github.com/MongoEngine/mongoengine>`_ and
 run ``python setup.py install``.
 
+The support for Python2 was dropped with MongoEngine 0.20.0
+
 Dependencies
 ============
 All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`_.
@@ -58,6 +60,10 @@ If you need to use an ``ImageField`` or ``ImageGridFsProxy``:
 
 - Pillow>=2.0.0
 
+If you need to use signals:
+
+- blinker>=1.3
+
 Examples
 ========
 Some simple examples of what MongoEngine code looks like:
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index f2d64c33d..2a2c7e7d0 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,7 +1,6 @@
 import weakref
 
 from bson import DBRef
-import six
 from six import iteritems
 
 from mongoengine.common import _import_class
@@ -200,7 +199,7 @@ def __match_all(cls, embedded_doc, kwargs):
         """
         for key, expected_value in kwargs.items():
             doc_val = getattr(embedded_doc, key)
-            if doc_val != expected_value and six.text_type(doc_val) != expected_value:
+            if doc_val != expected_value and str(doc_val) != expected_value:
                 return False
         return True
 
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 73c887748..1254d0425 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -294,7 +294,7 @@ def __str__(self):
         # TODO this could be simpler?
         if hasattr(self, "__unicode__"):
             return self.__unicode__()
-        return six.text_type("%s object" % self.__class__.__name__)
+        return "%s object" % self.__class__.__name__
 
     def __eq__(self, other):
         if (
@@ -828,7 +828,7 @@ def merge_index_specs(index_specs, indices):
     @classmethod
     def _build_index_spec(cls, spec):
         """Build a PyMongo index spec from a MongoEngine index spec."""
-        if isinstance(spec, six.string_types):
+        if isinstance(spec, str):
             spec = {"fields": [spec]}
         elif isinstance(spec, (list, tuple)):
             spec = {"fields": list(spec)}
@@ -925,7 +925,7 @@ def _unique_with_indexes(cls, namespace=""):
 
                 # Add any unique_with fields to the back of the index spec
                 if field.unique_with:
-                    if isinstance(field.unique_with, six.string_types):
+                    if isinstance(field.unique_with, str):
                         field.unique_with = [field.unique_with]
 
                     # Convert unique_with field names to real field names
@@ -1172,9 +1172,6 @@ def __get_field_display(self, field):
                 else [value]
             )
             return sep.join(
-                [
-                    six.text_type(dict(field.choices).get(val, val))
-                    for val in values or []
-                ]
+                [str(dict(field.choices).get(val, val)) for val in values or []]
             )
         return value
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index cd1039cbb..3c88149b5 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -4,7 +4,6 @@
 
 from bson import DBRef, ObjectId, SON
 import pymongo
-import six
 from six import iteritems
 
 from mongoengine.base.common import UPDATE_OPERATORS
@@ -92,13 +91,11 @@ def __init__(
         self._owner_document = None
 
         # Make sure db_field is a string (if it's explicitly defined).
-        if self.db_field is not None and not isinstance(
-            self.db_field, six.string_types
-        ):
+        if self.db_field is not None and not isinstance(self.db_field, str):
             raise TypeError("db_field should be a string.")
 
         # Make sure db_field doesn't contain any forbidden characters.
-        if isinstance(self.db_field, six.string_types) and (
+        if isinstance(self.db_field, str) and (
             "." in self.db_field
             or "\0" in self.db_field
             or self.db_field.startswith("$")
@@ -221,14 +218,12 @@ def _validate_choices(self, value):
         # Choices which are other types of Documents
         if isinstance(value, (Document, EmbeddedDocument)):
             if not any(isinstance(value, c) for c in choice_list):
-                self.error(
-                    "Value must be an instance of %s" % (six.text_type(choice_list))
-                )
+                self.error("Value must be an instance of %s" % (choice_list))
         # Choices which are types other than Documents
         else:
             values = value if isinstance(value, (list, tuple)) else [value]
             if len(set(values) - set(choice_list)):
-                self.error("Value must be one of %s" % six.text_type(choice_list))
+                self.error("Value must be one of %s" % str(choice_list))
 
     def _validate(self, value, **kwargs):
         # Check the Choices Constraint
@@ -345,7 +340,7 @@ def __get__(self, instance, owner):
 
     def to_python(self, value):
         """Convert a MongoDB-compatible type to a Python type."""
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             return value
 
         if hasattr(value, "to_python"):
@@ -399,7 +394,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         EmbeddedDocument = _import_class("EmbeddedDocument")
         GenericReferenceField = _import_class("GenericReferenceField")
 
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             return value
 
         if hasattr(value, "to_mongo"):
@@ -513,10 +508,9 @@ def to_python(self, value):
     def to_mongo(self, value):
         if not isinstance(value, ObjectId):
             try:
-                return ObjectId(six.text_type(value))
+                return ObjectId(str(value))
             except Exception as e:
-                # e.message attribute has been deprecated since Python 2.6
-                self.error(six.text_type(e))
+                self.error(str(e))
         return value
 
     def prepare_query_value(self, op, value):
@@ -524,9 +518,9 @@ def prepare_query_value(self, op, value):
 
     def validate(self, value):
         try:
-            ObjectId(six.text_type(value))
+            ObjectId(str(value))
         except Exception:
-            self.error("Invalid Object ID")
+            self.error("Invalid ObjectID")
 
 
 class GeoJsonBaseField(BaseField):
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index e4d26811a..0d6e08be9 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -1,7 +1,6 @@
 import itertools
 import warnings
 
-import six
 from six import iteritems, itervalues
 
 from mongoengine.base.common import _document_registry
@@ -180,14 +179,15 @@ def __new__(mcs, name, bases, attrs):
         # module continues to use im_func and im_self, so the code below
         # copies __func__ into im_func and __self__ into im_self for
         # classmethod objects in Document derived classes.
-        if six.PY3:
-            for val in new_class.__dict__.values():
-                if isinstance(val, classmethod):
-                    f = val.__get__(new_class)
-                    if hasattr(f, "__func__") and not hasattr(f, "im_func"):
-                        f.__dict__.update({"im_func": getattr(f, "__func__")})
-                    if hasattr(f, "__self__") and not hasattr(f, "im_self"):
-                        f.__dict__.update({"im_self": getattr(f, "__self__")})
+        #
+        # Relates to https://github.com/MongoEngine/mongoengine/issues/1107
+        # for val in new_class.__dict__.values():
+        #     if isinstance(val, classmethod):
+        #         f = val.__get__(new_class)
+        #         if hasattr(f, "__func__") and not hasattr(f, "im_func"):
+        #             f.__dict__.update({"im_func": getattr(f, "__func__")})
+        #         if hasattr(f, "__self__") and not hasattr(f, "im_self"):
+        #             f.__dict__.update({"im_self": getattr(f, "__self__")})
 
         # Handle delete rules
         for field in itervalues(new_class._fields):
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 4e0c60b0e..3f7546192 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,6 +1,5 @@
 from pymongo import MongoClient, ReadPreference, uri_parser
 from pymongo.database import _check_name
-import six
 
 __all__ = [
     "DEFAULT_CONNECTION_NAME",
@@ -39,8 +38,8 @@ def _check_db_name(name):
     """Check if a database name is valid.
     This functionality is copied from pymongo Database class constructor.
     """
-    if not isinstance(name, six.string_types):
-        raise TypeError("name must be an instance of %s" % six.string_types)
+    if not isinstance(name, str):
+        raise TypeError("name must be an instance of %s" % str)
     elif name != "$external":
         _check_name(name)
 
@@ -93,7 +92,7 @@ def _get_connection_settings(
     conn_host = conn_settings["host"]
 
     # Host can be a list or a string, so if string, force to a list.
-    if isinstance(conn_host, six.string_types):
+    if isinstance(conn_host, str):
         conn_host = [conn_host]
 
     resolved_hosts = []
@@ -148,7 +147,7 @@ def _get_connection_settings(
                 # TODO simplify the code below once we drop support for
                 # PyMongo v3.4.
                 read_pf_mode = uri_options["readpreference"]
-                if isinstance(read_pf_mode, six.string_types):
+                if isinstance(read_pf_mode, str):
                     read_pf_mode = read_pf_mode.lower()
                 for preference in read_preferences:
                     if (
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 9e75f3535..01cd5f367 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -30,7 +30,7 @@ def __call__(self, items, max_depth=1, instance=None, name=None):
             :class:`~mongoengine.base.ComplexBaseField`
         :param get: A boolean determining if being called by __get__
         """
-        if items is None or isinstance(items, six.string_types):
+        if items is None or isinstance(items, str):
             return items
 
         # cheapest way to convert a queryset to a list
@@ -274,9 +274,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                             (v["_ref"].collection, v["_ref"].id), v
                         )
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                        item_name = six.text_type("{0}.{1}.{2}").format(
-                            name, k, field_name
-                        )
+                        item_name = "{0}.{1}.{2}".format(name, k, field_name)
                         data[k]._data[field_name] = self._attach_objects(
                             v, depth, instance=instance, name=item_name
                         )
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 6a7ced464..13541da8a 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -44,7 +44,7 @@ def includes_cls(fields):
     """Helper function used for ensuring and comparing indexes."""
     first_field = None
     if len(fields):
-        if isinstance(fields[0], six.string_types):
+        if isinstance(fields[0], str):
             first_field = fields[0]
         elif isinstance(fields[0], (list, tuple)) and len(fields[0]):
             first_field = fields[0][0]
@@ -430,15 +430,15 @@ def save(
 
         except pymongo.errors.DuplicateKeyError as err:
             message = u"Tried to save duplicate unique keys (%s)"
-            raise NotUniqueError(message % six.text_type(err))
+            raise NotUniqueError(message % err)
         except pymongo.errors.OperationFailure as err:
             message = "Could not save document (%s)"
-            if re.match("^E1100[01] duplicate key", six.text_type(err)):
+            if re.match("^E1100[01] duplicate key", str(err)):
                 # E11000 - duplicate key error index
                 # E11001 - duplicate key on update
                 message = u"Tried to save duplicate unique keys (%s)"
-                raise NotUniqueError(message % six.text_type(err))
-            raise OperationError(message % six.text_type(err))
+                raise NotUniqueError(message % err)
+            raise OperationError(message % err)
 
         # Make sure we store the PK on this document now that it's saved
         id_field = self._meta["id_field"]
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index b76243d38..1ac01257f 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -1,6 +1,5 @@
 from collections import defaultdict
 
-import six
 from six import iteritems
 
 __all__ = (
@@ -93,7 +92,7 @@ def __init__(self, message="", **kwargs):
         self.message = message
 
     def __str__(self):
-        return six.text_type(self.message)
+        return str(self.message)
 
     def __repr__(self):
         return "%s(%s,)" % (self.__class__.__name__, self.message)
@@ -131,7 +130,7 @@ def build_dict(source):
             elif isinstance(source, ValidationError) and source.errors:
                 return build_dict(source.errors)
             else:
-                return six.text_type(source)
+                return str(source)
 
             return errors_dict
 
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 5cbf3ae05..b6ddd5662 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -108,7 +108,7 @@ def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):
         super(StringField, self).__init__(**kwargs)
 
     def to_python(self, value):
-        if isinstance(value, six.text_type):
+        if isinstance(value, str):
             return value
         try:
             value = value.decode("utf-8")
@@ -117,7 +117,7 @@ def to_python(self, value):
         return value
 
     def validate(self, value):
-        if not isinstance(value, six.string_types):
+        if not isinstance(value, str):
             self.error("StringField only accepts string values")
 
         if self.max_length is not None and len(value) > self.max_length:
@@ -133,7 +133,7 @@ def lookup_member(self, member_name):
         return None
 
     def prepare_query_value(self, op, value):
-        if not isinstance(op, six.string_types):
+        if not isinstance(op, str):
             return value
 
         if op in STRING_OPERATORS:
@@ -472,13 +472,13 @@ def to_mongo(self, value):
         if value is None:
             return value
         if self.force_string:
-            return six.text_type(self.to_python(value))
+            return str(self.to_python(value))
         return float(self.to_python(value))
 
     def validate(self, value):
         if not isinstance(value, decimal.Decimal):
-            if not isinstance(value, six.string_types):
-                value = six.text_type(value)
+            if not isinstance(value, str):
+                value = str(value)
             try:
                 value = decimal.Decimal(value)
             except (TypeError, ValueError, decimal.InvalidOperation) as exc:
@@ -543,7 +543,7 @@ def to_mongo(self, value):
         if callable(value):
             return value()
 
-        if not isinstance(value, six.string_types):
+        if not isinstance(value, str):
             return None
 
         return self._parse_datetime(value)
@@ -707,7 +707,7 @@ class EmbeddedDocumentField(BaseField):
     def __init__(self, document_type, **kwargs):
         # XXX ValidationError raised outside of the "validate" method.
         if not (
-            isinstance(document_type, six.string_types)
+            isinstance(document_type, str)
             or issubclass(document_type, EmbeddedDocument)
         ):
             self.error(
@@ -720,7 +720,7 @@ def __init__(self, document_type, **kwargs):
 
     @property
     def document_type(self):
-        if isinstance(self.document_type_obj, six.string_types):
+        if isinstance(self.document_type_obj, str):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 resolved_document_type = self.owner_document
             else:
@@ -846,7 +846,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         """Convert a Python type to a MongoDB compatible type.
         """
 
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             return value
 
         if hasattr(value, "to_mongo"):
@@ -889,7 +889,7 @@ def lookup_member(self, member_name):
         return member_name
 
     def prepare_query_value(self, op, value):
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             return StringField().prepare_query_value(op, value)
         return super(DynamicField, self).prepare_query_value(op, self.to_mongo(value))
 
@@ -954,7 +954,7 @@ def prepare_query_value(self, op, value):
             if (
                 op in ("set", "unset", None)
                 and hasattr(value, "__iter__")
-                and not isinstance(value, six.string_types)
+                and not isinstance(value, str)
                 and not isinstance(value, BaseDocument)
             ):
                 return [self.field.prepare_query_value(op, v) for v in value]
@@ -1026,9 +1026,7 @@ def key_not_string(d):
     dictionary is not a string.
     """
     for k, v in d.items():
-        if not isinstance(k, six.string_types) or (
-            isinstance(v, dict) and key_not_string(v)
-        ):
+        if not isinstance(k, str) or (isinstance(v, dict) and key_not_string(v)):
             return True
 
 
@@ -1107,7 +1105,7 @@ def prepare_query_value(self, op, value):
             "iexact",
         ]
 
-        if op in match_operators and isinstance(value, six.string_types):
+        if op in match_operators and isinstance(value, str):
             return StringField().prepare_query_value(op, value)
 
         if hasattr(
@@ -1194,7 +1192,7 @@ def __init__(
             :class:`~pymongo.dbref.DBRef`, regardless of the value of `dbref`.
         """
         # XXX ValidationError raised outside of the "validate" method.
-        if not isinstance(document_type, six.string_types) and not issubclass(
+        if not isinstance(document_type, str) and not issubclass(
             document_type, Document
         ):
             self.error(
@@ -1209,7 +1207,7 @@ def __init__(
 
     @property
     def document_type(self):
-        if isinstance(self.document_type_obj, six.string_types):
+        if isinstance(self.document_type_obj, str):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 self.document_type_obj = self.owner_document
             else:
@@ -1325,7 +1323,7 @@ def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
             fields = []
 
         # XXX ValidationError raised outside of the "validate" method.
-        if not isinstance(document_type, six.string_types) and not issubclass(
+        if not isinstance(document_type, str) and not issubclass(
             document_type, Document
         ):
             self.error(
@@ -1370,7 +1368,7 @@ def to_python(self, value):
 
     @property
     def document_type(self):
-        if isinstance(self.document_type_obj, six.string_types):
+        if isinstance(self.document_type_obj, str):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 self.document_type_obj = self.owner_document
             else:
@@ -1498,7 +1496,7 @@ def __init__(self, *args, **kwargs):
         # Keep the choices as a list of allowed Document class names
         if choices:
             for choice in choices:
-                if isinstance(choice, six.string_types):
+                if isinstance(choice, str):
                     self.choices.append(choice)
                 elif isinstance(choice, type) and issubclass(choice, Document):
                     self.choices.append(choice._class_name)
@@ -1507,7 +1505,7 @@ def __init__(self, *args, **kwargs):
                     # method.
                     self.error(
                         "Invalid choices provided: must be a list of"
-                        "Document subclasses and/or six.string_typess"
+                        "Document subclasses and/or str"
                     )
 
     def _validate_choices(self, value):
@@ -1601,8 +1599,8 @@ def __init__(self, max_bytes=None, **kwargs):
 
     def __set__(self, instance, value):
         """Handle bytearrays in python 3.1"""
-        if six.PY3 and isinstance(value, bytearray):
-            value = six.binary_type(value)
+        if isinstance(value, bytearray):
+            value = bytes(value)
         return super(BinaryField, self).__set__(instance, value)
 
     def to_mongo(self, value):
@@ -1831,7 +1829,7 @@ def __set__(self, instance, value):
         key = self.name
         if (
             hasattr(value, "read") and not isinstance(value, GridFSProxy)
-        ) or isinstance(value, (six.binary_type, six.string_types)):
+        ) or isinstance(value, (six.binary_type, str)):
             # using "FileField() = file/string" notation
             grid_file = instance._data.get(self.name)
             # If a file already exists, delete it
@@ -2038,12 +2036,7 @@ def __init__(
         for att_name, att in extra_args.items():
             value = None
             if isinstance(att, (tuple, list)):
-                if six.PY3:
-                    value = dict(
-                        itertools.zip_longest(params_size, att, fillvalue=None)
-                    )
-                else:
-                    value = dict(map(None, params_size, att))
+                value = dict(itertools.zip_longest(params_size, att, fillvalue=None))
 
             setattr(self, att_name, value)
 
@@ -2213,8 +2206,8 @@ def to_python(self, value):
         if not self._binary:
             original_value = value
             try:
-                if not isinstance(value, six.string_types):
-                    value = six.text_type(value)
+                if not isinstance(value, str):
+                    value = str(value)
                 return uuid.UUID(value)
             except (ValueError, TypeError, AttributeError):
                 return original_value
@@ -2222,8 +2215,8 @@ def to_python(self, value):
 
     def to_mongo(self, value):
         if not self._binary:
-            return six.text_type(value)
-        elif isinstance(value, six.string_types):
+            return str(value)
+        elif isinstance(value, str):
             return uuid.UUID(value)
         return value
 
@@ -2234,7 +2227,7 @@ def prepare_query_value(self, op, value):
 
     def validate(self, value):
         if not isinstance(value, uuid.UUID):
-            if not isinstance(value, six.string_types):
+            if not isinstance(value, str):
                 value = str(value)
             try:
                 uuid.UUID(value)
@@ -2433,7 +2426,7 @@ def __init__(
           document. Note this only work getting field (not setting or deleting).
         """
         # XXX ValidationError raised outside of the "validate" method.
-        if not isinstance(document_type, six.string_types) and not issubclass(
+        if not isinstance(document_type, str) and not issubclass(
             document_type, Document
         ):
             self.error(
@@ -2449,7 +2442,7 @@ def __init__(
 
     @property
     def document_type(self):
-        if isinstance(self.document_type_obj, six.string_types):
+        if isinstance(self.document_type_obj, str):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 self.document_type_obj = self.owner_document
             else:
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index b7d0e0ab9..8a068e2eb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -349,20 +349,20 @@ def insert(
             )
         except pymongo.errors.DuplicateKeyError as err:
             message = "Could not save document (%s)"
-            raise NotUniqueError(message % six.text_type(err))
+            raise NotUniqueError(message % err)
         except pymongo.errors.BulkWriteError as err:
             # inserting documents that already have an _id field will
             # give huge performance debt or raise
             message = u"Bulk write error: (%s)"
-            raise BulkWriteError(message % six.text_type(err.details))
+            raise BulkWriteError(message % err.details)
         except pymongo.errors.OperationFailure as err:
             message = "Could not save document (%s)"
-            if re.match("^E1100[01] duplicate key", six.text_type(err)):
+            if re.match("^E1100[01] duplicate key", str(err)):
                 # E11000 - duplicate key error index
                 # E11001 - duplicate key on update
                 message = u"Tried to save duplicate unique keys (%s)"
-                raise NotUniqueError(message % six.text_type(err))
-            raise OperationError(message % six.text_type(err))
+                raise NotUniqueError(message % err)
+            raise OperationError(message % err)
 
         # Apply inserted_ids to documents
         for doc, doc_id in zip(docs, ids):
@@ -534,12 +534,12 @@ def update(
             elif result.raw_result:
                 return result.raw_result["n"]
         except pymongo.errors.DuplicateKeyError as err:
-            raise NotUniqueError(u"Update failed (%s)" % six.text_type(err))
+            raise NotUniqueError("Update failed (%s)" % err)
         except pymongo.errors.OperationFailure as err:
-            if six.text_type(err) == u"multi not coded yet":
-                message = u"update() method requires MongoDB 1.1.3+"
+            if str(err) == "multi not coded yet":
+                message = "update() method requires MongoDB 1.1.3+"
                 raise OperationError(message)
-            raise OperationError(u"Update failed (%s)" % six.text_type(err))
+            raise OperationError("Update failed (%s)" % err)
 
     def upsert_one(self, write_concern=None, **update):
         """Overwrite or add the first document matched by the query.
@@ -1348,13 +1348,13 @@ def map_reduce(
         map_f_scope = {}
         if isinstance(map_f, Code):
             map_f_scope = map_f.scope
-            map_f = six.text_type(map_f)
+            map_f = str(map_f)
         map_f = Code(queryset._sub_js_fields(map_f), map_f_scope)
 
         reduce_f_scope = {}
         if isinstance(reduce_f, Code):
             reduce_f_scope = reduce_f.scope
-            reduce_f = six.text_type(reduce_f)
+            reduce_f = str(reduce_f)
         reduce_f_code = queryset._sub_js_fields(reduce_f)
         reduce_f = Code(reduce_f_code, reduce_f_scope)
 
@@ -1364,7 +1364,7 @@ def map_reduce(
             finalize_f_scope = {}
             if isinstance(finalize_f, Code):
                 finalize_f_scope = finalize_f.scope
-                finalize_f = six.text_type(finalize_f)
+                finalize_f = str(finalize_f)
             finalize_f_code = queryset._sub_js_fields(finalize_f)
             finalize_f = Code(finalize_f_code, finalize_f_scope)
             mr_args["finalize"] = finalize_f
@@ -1380,7 +1380,7 @@ def map_reduce(
         else:
             map_reduce_function = "map_reduce"
 
-            if isinstance(output, six.string_types):
+            if isinstance(output, str):
                 mr_args["out"] = output
 
             elif isinstance(output, dict):
@@ -1838,7 +1838,7 @@ def _fields_to_dbfields(self, fields):
             field_parts = field.split(".")
             try:
                 field = ".".join(
-                    f if isinstance(f, six.string_types) else f.db_field
+                    f if isinstance(f, str) else f.db_field
                     for f in self._document._lookup_field(field_parts)
                 )
                 db_field_paths.append(field)
@@ -1850,7 +1850,7 @@ def _fields_to_dbfields(self, fields):
                 for subdoc in subclasses:
                     try:
                         subfield = ".".join(
-                            f if isinstance(f, six.string_types) else f.db_field
+                            f if isinstance(f, str) else f.db_field
                             for f in subdoc._lookup_field(field_parts)
                         )
                         db_field_paths.append(subfield)
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index c179f541f..efbdae4ee 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -101,7 +101,7 @@ def query(_doc_cls=None, **kwargs):
             cleaned_fields = []
             for field in fields:
                 append_field = True
-                if isinstance(field, six.string_types):
+                if isinstance(field, str):
                     parts.append(field)
                     append_field = False
                 # is last and CachedReferenceField
@@ -281,7 +281,7 @@ def update(_doc_cls=None, **update):
             appended_sub_field = False
             for field in fields:
                 append_field = True
-                if isinstance(field, six.string_types):
+                if isinstance(field, str):
                     # Convert the S operator to $
                     if field == "S":
                         field = "$"
diff --git a/tests/fields/test_date_field.py b/tests/fields/test_date_field.py
index e94ed0ceb..5e1bfaa4f 100644
--- a/tests/fields/test_date_field.py
+++ b/tests/fields/test_date_field.py
@@ -89,17 +89,6 @@ class LogEntry(Document):
         assert log.date == d1.date()
         assert log.date == d2.date()
 
-        if not six.PY3:
-            # Pre UTC dates microseconds below 1000 are dropped
-            # This does not seem to be true in PY3
-            d1 = datetime.datetime(1969, 12, 31, 23, 59, 59, 999)
-            d2 = datetime.datetime(1969, 12, 31, 23, 59, 59)
-            log.date = d1
-            log.save()
-            log.reload()
-            assert log.date == d1.date()
-            assert log.date == d2.date()
-
     def test_regular_usage(self):
         """Tests for regular datetime fields"""
 
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 70debac58..21ab523bb 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -98,17 +98,6 @@ class LogEntry(Document):
         assert log.date != d1
         assert log.date == d2
 
-        if not six.PY3:
-            # Pre UTC dates microseconds below 1000 are dropped
-            # This does not seem to be true in PY3
-            d1 = dt.datetime(1969, 12, 31, 23, 59, 59, 999)
-            d2 = dt.datetime(1969, 12, 31, 23, 59, 59)
-            log.date = d1
-            log.save()
-            log.reload()
-            assert log.date != d1
-            assert log.date == d2
-
     def test_regular_usage(self):
         """Tests for regular datetime fields"""
 
@@ -213,7 +202,7 @@ class DTDoc(Document):
         # make sure that passing a parsable datetime works
         dtd = DTDoc()
         dtd.date = date_str
-        assert isinstance(dtd.date, six.string_types)
+        assert isinstance(dtd.date, str)
         dtd.save()
         dtd.reload()
 
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 7dea6dd57..cf4cd0dcb 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4445,24 +4445,14 @@ def test_scalar_cursor_behaviour(self):
             "A0" == "%s" % self.Person.objects.order_by("name").scalar("name").first()
         )
         assert "A0" == "%s" % self.Person.objects.scalar("name").order_by("name")[0]
-        if six.PY3:
-            assert (
-                "['A1', 'A2']"
-                == "%s" % self.Person.objects.order_by("age").scalar("name")[1:3]
-            )
-            assert (
-                "['A51', 'A52']"
-                == "%s" % self.Person.objects.order_by("age").scalar("name")[51:53]
-            )
-        else:
-            assert (
-                "[u'A1', u'A2']"
-                == "%s" % self.Person.objects.order_by("age").scalar("name")[1:3]
-            )
-            assert (
-                "[u'A51', u'A52']"
-                == "%s" % self.Person.objects.order_by("age").scalar("name")[51:53]
-            )
+        assert (
+            "['A1', 'A2']"
+            == "%s" % self.Person.objects.order_by("age").scalar("name")[1:3]
+        )
+        assert (
+            "['A51', 'A52']"
+            == "%s" % self.Person.objects.order_by("age").scalar("name")[51:53]
+        )
 
         # with_id and in_bulk
         person = self.Person.objects.order_by("name").first()

From 8086576677d21bb1508bcf1c4c78efb0091d8f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 11 Mar 2020 23:07:03 +0100
Subject: [PATCH 1041/1519] get rid of six

---
 README.rst                          |  1 -
 docs/upgrade.rst                    |  2 +-
 mongoengine/base/datastructures.py  |  5 ++--
 mongoengine/base/document.py        | 18 ++++++-------
 mongoengine/base/fields.py          |  9 +++----
 mongoengine/base/metaclasses.py     | 16 +++++------
 mongoengine/context_managers.py     |  3 +--
 mongoengine/dereference.py          | 16 +++++------
 mongoengine/document.py             | 12 ++++-----
 mongoengine/errors.py               |  9 +++----
 mongoengine/fields.py               | 16 +++++------
 mongoengine/queryset/base.py        | 12 ++++-----
 mongoengine/queryset/queryset.py    | 10 +++----
 mongoengine/queryset/transform.py   |  4 +--
 requirements.txt                    |  1 -
 setup.py                            |  2 +-
 tests/document/test_indexes.py      | 25 +++++++++---------
 tests/document/test_inheritance.py  |  3 +--
 tests/document/test_instance.py     |  5 ++--
 tests/fields/test_binary_field.py   | 17 ++++++------
 tests/fields/test_date_field.py     |  1 -
 tests/fields/test_datetime_field.py |  1 -
 tests/fields/test_file_field.py     | 41 +++++++++++++++--------------
 tests/fields/test_float_field.py    |  6 ++---
 tests/fields/test_long_field.py     |  6 ++---
 tests/queryset/test_queryset.py     |  4 +--
 tests/test_datastructures.py        |  3 +--
 tests/test_dereference.py           | 26 +++++++++---------
 28 files changed, 118 insertions(+), 156 deletions(-)

diff --git a/README.rst b/README.rst
index 1ef1363f7..619970af1 100644
--- a/README.rst
+++ b/README.rst
@@ -50,7 +50,6 @@ All of the dependencies can easily be installed via `pip <https://pip.pypa.io/>`
 At the very least, you'll need these two packages to use MongoEngine:
 
 - pymongo>=3.4
-- six>=1.10.0
 
 If you utilize a ``DateTimeField``, you might also use a more flexible date parser:
 
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 250347bfe..f25bab8f1 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -153,7 +153,7 @@ inherited classes like so: ::
 
     # 4. Remove indexes
     info = collection.index_information()
-    indexes_to_drop = [key for key, value in info.iteritems()
+    indexes_to_drop = [key for key, value in info.items()
                        if '_types' in dict(value['key'])]
     for index in indexes_to_drop:
         collection.drop_index(index)
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 2a2c7e7d0..bb70089ed 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -1,7 +1,6 @@
 import weakref
 
 from bson import DBRef
-from six import iteritems
 
 from mongoengine.common import _import_class
 from mongoengine.errors import DoesNotExist, MultipleObjectsReturned
@@ -360,7 +359,7 @@ class StrictDict(object):
     _classes = {}
 
     def __init__(self, **kwargs):
-        for k, v in iteritems(kwargs):
+        for k, v in kwargs.items():
             setattr(self, k, v)
 
     def __getitem__(self, key):
@@ -408,7 +407,7 @@ def __iter__(self):
         return (key for key in self.__slots__ if hasattr(self, key))
 
     def __len__(self):
-        return len(list(iteritems(self)))
+        return len(list(self.items()))
 
     def __eq__(self, other):
         return list(self.items()) == list(other.items())
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 1254d0425..dff759a76 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -5,8 +5,6 @@
 
 from bson import DBRef, ObjectId, SON, json_util
 import pymongo
-import six
-from six import iteritems
 
 from mongoengine import signals
 from mongoengine.base.common import get_document
@@ -110,7 +108,7 @@ def __init__(self, *args, **values):
         # Assign default values to the instance.
         # We set default values only for fields loaded from DB. See
         # https://github.com/mongoengine/mongoengine/issues/399 for more info.
-        for key, field in iteritems(self._fields):
+        for key, field in self._fields.items():
             if self._db_field_map.get(key, key) in __only_fields:
                 continue
             value = getattr(self, key, None)
@@ -122,14 +120,14 @@ def __init__(self, *args, **values):
         # Set passed values after initialisation
         if self._dynamic:
             dynamic_data = {}
-            for key, value in iteritems(values):
+            for key, value in values.items():
                 if key in self._fields or key == "_id":
                     setattr(self, key, value)
                 else:
                     dynamic_data[key] = value
         else:
             FileField = _import_class("FileField")
-            for key, value in iteritems(values):
+            for key, value in values.items():
                 key = self._reverse_db_field_map.get(key, key)
                 if key in self._fields or key in ("id", "pk", "_cls"):
                     if __auto_convert and value is not None:
@@ -145,7 +143,7 @@ def __init__(self, *args, **values):
 
         if self._dynamic:
             self._dynamic_lock = False
-            for key, value in iteritems(dynamic_data):
+            for key, value in dynamic_data.items():
                 setattr(self, key, value)
 
         # Flag initialised
@@ -575,7 +573,7 @@ def _nestable_types_changed_fields(self, changed_fields, base_key, data):
         if not hasattr(data, "items"):
             iterator = enumerate(data)
         else:
-            iterator = iteritems(data)
+            iterator = data.items()
 
         for index_or_key, value in iterator:
             item_key = "%s%s." % (base_key, index_or_key)
@@ -741,7 +739,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
         # Convert SON to a data dict, making sure each key is a string and
         # corresponds to the right db field.
         data = {}
-        for key, value in iteritems(son):
+        for key, value in son.items():
             key = str(key)
             key = cls._db_field_map.get(key, key)
             data[key] = value
@@ -756,7 +754,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
         if not _auto_dereference:
             fields = copy.deepcopy(fields)
 
-        for field_name, field in iteritems(fields):
+        for field_name, field in fields.items():
             field._auto_dereference = _auto_dereference
             if field.db_field in data:
                 value = data[field.db_field]
@@ -781,7 +779,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
 
         # In STRICT documents, remove any keys that aren't in cls._fields
         if cls.STRICT:
-            data = {k: v for k, v in iteritems(data) if k in cls._fields}
+            data = {k: v for k, v in data.items() if k in cls._fields}
 
         obj = cls(
             __auto_convert=False, _created=created, __only_fields=only_fields, **data
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 3c88149b5..ac894d916 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -4,7 +4,6 @@
 
 from bson import DBRef, ObjectId, SON
 import pymongo
-from six import iteritems
 
 from mongoengine.base.common import UPDATE_OPERATORS
 from mongoengine.base.datastructures import BaseDict, BaseList, EmbeddedDocumentList
@@ -418,11 +417,11 @@ def to_mongo(self, value, use_db_field=True, fields=None):
         if self.field:
             value_dict = {
                 key: self.field._to_mongo_safe_call(item, use_db_field, fields)
-                for key, item in iteritems(value)
+                for key, item in value.items()
             }
         else:
             value_dict = {}
-            for k, v in iteritems(value):
+            for k, v in value.items():
                 if isinstance(v, Document):
                     # We need the id from the saved object to create the DBRef
                     if v.pk is None:
@@ -461,8 +460,8 @@ def validate(self, value):
         """If field is provided ensure the value is valid."""
         errors = {}
         if self.field:
-            if hasattr(value, "iteritems") or hasattr(value, "items"):
-                sequence = iteritems(value)
+            if hasattr(value, "items"):
+                sequence = value.items()
             else:
                 sequence = enumerate(value)
             for k, v in sequence:
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 0d6e08be9..30a6fbab0 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -1,8 +1,6 @@
 import itertools
 import warnings
 
-from six import iteritems, itervalues
-
 from mongoengine.base.common import _document_registry
 from mongoengine.base.fields import BaseField, ComplexBaseField, ObjectIdField
 from mongoengine.common import _import_class
@@ -68,7 +66,7 @@ def __new__(mcs, name, bases, attrs):
             # Standard object mixin - merge in any Fields
             if not hasattr(base, "_meta"):
                 base_fields = {}
-                for attr_name, attr_value in iteritems(base.__dict__):
+                for attr_name, attr_value in base.__dict__.items():
                     if not isinstance(attr_value, BaseField):
                         continue
                     attr_value.name = attr_name
@@ -80,7 +78,7 @@ def __new__(mcs, name, bases, attrs):
 
         # Discover any document fields
         field_names = {}
-        for attr_name, attr_value in iteritems(attrs):
+        for attr_name, attr_value in attrs.items():
             if not isinstance(attr_value, BaseField):
                 continue
             attr_value.name = attr_name
@@ -110,9 +108,7 @@ def __new__(mcs, name, bases, attrs):
 
         attrs["_fields_ordered"] = tuple(
             i[1]
-            for i in sorted(
-                (v.creation_counter, v.name) for v in itervalues(doc_fields)
-            )
+            for i in sorted((v.creation_counter, v.name) for v in doc_fields.values())
         )
 
         #
@@ -190,7 +186,7 @@ def __new__(mcs, name, bases, attrs):
         #             f.__dict__.update({"im_self": getattr(f, "__self__")})
 
         # Handle delete rules
-        for field in itervalues(new_class._fields):
+        for field in new_class._fields.values():
             f = field
             if f.owner_document is None:
                 f.owner_document = new_class
@@ -399,7 +395,7 @@ def __new__(mcs, name, bases, attrs):
             new_class.objects = QuerySetManager()
 
         # Validate the fields and set primary key if needed
-        for field_name, field in iteritems(new_class._fields):
+        for field_name, field in new_class._fields.items():
             if field.primary_key:
                 # Ensure only one primary key is set
                 current_pk = new_class._meta.get("id_field")
@@ -476,7 +472,7 @@ class MetaDict(dict):
     _merge_options = ("indexes",)
 
     def merge(self, new_options):
-        for k, v in iteritems(new_options):
+        for k, v in new_options.items():
             if k in self._merge_options:
                 self[k] = self.get(k, []) + v
             else:
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 1592ceef4..5e9a6e8bf 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,7 +1,6 @@
 from contextlib import contextmanager
 
 from pymongo.write_concern import WriteConcern
-from six import iteritems
 
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
@@ -123,7 +122,7 @@ def __init__(self, cls):
 
         self.deref_fields = [
             k
-            for k, v in iteritems(self.cls._fields)
+            for k, v in self.cls._fields.items()
             if isinstance(v, (ReferenceField, GenericReferenceField, ComplexBaseField))
         ]
 
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 01cd5f367..d0e6c527d 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -1,6 +1,4 @@
 from bson import DBRef, SON
-import six
-from six import iteritems
 
 from mongoengine.base import (
     BaseDict,
@@ -79,7 +77,7 @@ def _get_items_from_list(items):
 
                     def _get_items_from_dict(items):
                         new_items = {}
-                        for k, v in iteritems(items):
+                        for k, v in items.items():
                             value = v
                             if isinstance(v, list):
                                 value = _get_items_from_list(v)
@@ -120,7 +118,7 @@ def _find_references(self, items, depth=0):
         depth += 1
         for item in iterator:
             if isinstance(item, (Document, EmbeddedDocument)):
-                for field_name, field in iteritems(item._fields):
+                for field_name, field in item._fields.items():
                     v = item._data.get(field_name, None)
                     if isinstance(v, LazyReference):
                         # LazyReference inherits DBRef but should not be dereferenced here !
@@ -136,7 +134,7 @@ def _find_references(self, items, depth=0):
                             getattr(field, "field", None), "document_type", None
                         )
                         references = self._find_references(v, depth)
-                        for key, refs in iteritems(references):
+                        for key, refs in references.items():
                             if isinstance(
                                 field_cls, (Document, TopLevelDocumentMetaclass)
                             ):
@@ -153,7 +151,7 @@ def _find_references(self, items, depth=0):
                 )
             elif isinstance(item, (dict, list, tuple)) and depth - 1 <= self.max_depth:
                 references = self._find_references(item, depth - 1)
-                for key, refs in iteritems(references):
+                for key, refs in references.items():
                     reference_map.setdefault(key, set()).update(refs)
 
         return reference_map
@@ -162,7 +160,7 @@ def _fetch_objects(self, doc_type=None):
         """Fetch all references and convert to their document objects
         """
         object_map = {}
-        for collection, dbrefs in iteritems(self.reference_map):
+        for collection, dbrefs in self.reference_map.items():
 
             # we use getattr instead of hasattr because hasattr swallows any exception under python2
             # so it could hide nasty things without raising exceptions (cfr bug #1688))
@@ -174,7 +172,7 @@ def _fetch_objects(self, doc_type=None):
                     dbref for dbref in dbrefs if (col_name, dbref) not in object_map
                 ]
                 references = collection.objects.in_bulk(refs)
-                for key, doc in iteritems(references):
+                for key, doc in references.items():
                     object_map[(col_name, key)] = doc
             else:  # Generic reference: use the refs data to convert to document
                 if isinstance(doc_type, (ListField, DictField, MapField)):
@@ -250,7 +248,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
             data = []
         else:
             is_list = False
-            iterator = iteritems(items)
+            iterator = items.items()
             data = {}
 
         depth += 1
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 13541da8a..4ac979d15 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -4,8 +4,6 @@
 from bson.dbref import DBRef
 import pymongo
 from pymongo.read_preferences import ReadPreference
-import six
-from six import iteritems
 
 from mongoengine import signals
 from mongoengine.base import (
@@ -55,7 +53,7 @@ class InvalidCollectionError(Exception):
     pass
 
 
-class EmbeddedDocument(six.with_metaclass(DocumentMetaclass, BaseDocument)):
+class EmbeddedDocument(BaseDocument, metaclass=DocumentMetaclass):
     """A :class:`~mongoengine.Document` that isn't stored in its own
     collection.  :class:`~mongoengine.EmbeddedDocument`\ s should be used as
     fields on :class:`~mongoengine.Document`\ s through the
@@ -103,7 +101,7 @@ def to_mongo(self, *args, **kwargs):
         return data
 
 
-class Document(six.with_metaclass(TopLevelDocumentMetaclass, BaseDocument)):
+class Document(BaseDocument, metaclass=TopLevelDocumentMetaclass):
     """The base class used for defining the structure and properties of
     collections of documents stored in MongoDB. Inherit from this class, and
     add fields as class attributes to define a document's structure.
@@ -632,7 +630,7 @@ def delete(self, signal_kwargs=None, **write_concern):
 
         # Delete FileFields separately
         FileField = _import_class("FileField")
-        for name, field in iteritems(self._fields):
+        for name, field in self._fields.items():
             if isinstance(field, FileField):
                 getattr(self, name).delete()
 
@@ -1029,7 +1027,7 @@ def compare_indexes(cls):
         return {"missing": missing, "extra": extra}
 
 
-class DynamicDocument(six.with_metaclass(TopLevelDocumentMetaclass, Document)):
+class DynamicDocument(Document, metaclass=TopLevelDocumentMetaclass):
     """A Dynamic Document class allowing flexible, expandable and uncontrolled
     schemas.  As a :class:`~mongoengine.Document` subclass, acts in the same
     way as an ordinary document but has expanded style properties.  Any data
@@ -1060,7 +1058,7 @@ def __delattr__(self, *args, **kwargs):
             super(DynamicDocument, self).__delattr__(*args, **kwargs)
 
 
-class DynamicEmbeddedDocument(six.with_metaclass(DocumentMetaclass, EmbeddedDocument)):
+class DynamicEmbeddedDocument(EmbeddedDocument, metaclass=DocumentMetaclass):
     """A Dynamic Embedded Document class allowing flexible, expandable and
     uncontrolled schemas. See :class:`~mongoengine.DynamicDocument` for more
     information about dynamic documents.
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 1ac01257f..7045145c3 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -1,6 +1,5 @@
 from collections import defaultdict
 
-from six import iteritems
 
 __all__ = (
     "NotRegistered",
@@ -125,7 +124,7 @@ def to_dict(self):
         def build_dict(source):
             errors_dict = {}
             if isinstance(source, dict):
-                for field_name, error in iteritems(source):
+                for field_name, error in source.items():
                     errors_dict[field_name] = build_dict(error)
             elif isinstance(source, ValidationError) and source.errors:
                 return build_dict(source.errors)
@@ -146,15 +145,15 @@ def generate_key(value, prefix=""):
             if isinstance(value, list):
                 value = " ".join([generate_key(k) for k in value])
             elif isinstance(value, dict):
-                value = " ".join([generate_key(v, k) for k, v in iteritems(value)])
+                value = " ".join([generate_key(v, k) for k, v in value.items()])
 
             results = "%s.%s" % (prefix, value) if prefix else value
             return results
 
         error_dict = defaultdict(list)
-        for k, v in iteritems(self.to_dict()):
+        for k, v in self.to_dict().items():
             error_dict[generate_key(v)].append(k)
-        return " ".join(["%s: %s" % (k, v) for k, v in iteritems(error_dict)])
+        return " ".join(["%s: %s" % (k, v) for k, v in error_dict.items()])
 
 
 class DeprecatedError(Exception):
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index b6ddd5662..391ad37b3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -13,8 +13,6 @@
 import gridfs
 import pymongo
 from pymongo import ReturnDocument
-import six
-from six import iteritems
 
 try:
     import dateutil
@@ -205,7 +203,7 @@ class EmailField(StringField):
     )
 
     UTF8_USER_REGEX = LazyRegexCompiler(
-        six.u(
+        (
             # RFC 6531 Section 3.3 extends `atext` (used by dot-atom) to
             # include `UTF8-non-ascii`.
             r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z\u0080-\U0010FFFF]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z\u0080-\U0010FFFF]+)*\Z"
@@ -387,7 +385,7 @@ def to_python(self, value):
         return value
 
     def validate(self, value):
-        if isinstance(value, six.integer_types):
+        if isinstance(value, int):
             try:
                 value = float(value)
             except OverflowError:
@@ -868,12 +866,12 @@ def to_mongo(self, value, use_db_field=True, fields=None):
             value = {k: v for k, v in enumerate(value)}
 
         data = {}
-        for k, v in iteritems(value):
+        for k, v in value.items():
             data[k] = self.to_mongo(v, use_db_field, fields)
 
         value = data
         if is_list:  # Convert back to a list
-            value = [v for k, v in sorted(iteritems(data), key=itemgetter(0))]
+            value = [v for k, v in sorted(data.items(), key=itemgetter(0))]
         return value
 
     def to_python(self, value):
@@ -1607,10 +1605,10 @@ def to_mongo(self, value):
         return Binary(value)
 
     def validate(self, value):
-        if not isinstance(value, (six.binary_type, Binary)):
+        if not isinstance(value, (bytes, Binary)):
             self.error(
                 "BinaryField only accepts instances of "
-                "(%s, %s, Binary)" % (six.binary_type.__name__, Binary.__name__)
+                "(%s, %s, Binary)" % (bytes.__name__, Binary.__name__)
             )
 
         if self.max_bytes is not None and len(value) > self.max_bytes:
@@ -1829,7 +1827,7 @@ def __set__(self, instance, value):
         key = self.name
         if (
             hasattr(value, "read") and not isinstance(value, GridFSProxy)
-        ) or isinstance(value, (six.binary_type, str)):
+        ) or isinstance(value, (bytes, str)):
             # using "FileField() = file/string" notation
             grid_file = instance._data.get(self.name)
             # If a file already exists, delete it
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 8a068e2eb..e69011008 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -9,8 +9,6 @@
 import pymongo.errors
 from pymongo.collection import ReturnDocument
 from pymongo.common import validate_read_preference
-import six
-from six import iteritems
 
 from mongoengine import signals
 from mongoengine.base import get_document
@@ -252,12 +250,12 @@ def get(self, *q_objs, **query):
         queryset = queryset.filter(*q_objs, **query)
 
         try:
-            result = six.next(queryset)
+            result = next(queryset)
         except StopIteration:
             msg = "%s matching query does not exist." % queryset._document._class_name
             raise queryset._document.DoesNotExist(msg)
         try:
-            six.next(queryset)
+            next(queryset)
         except StopIteration:
             return result
 
@@ -1567,7 +1565,7 @@ def __next__(self):
         if self._limit == 0 or self._none:
             raise StopIteration
 
-        raw_doc = six.next(self._cursor)
+        raw_doc = next(self._cursor)
 
         if self._as_pymongo:
             return raw_doc
@@ -1812,13 +1810,13 @@ def _item_frequencies_exec_js(self, field, normalize=False):
             }
         """
         total, data, types = self.exec_js(freq_func, field)
-        values = {types.get(k): int(v) for k, v in iteritems(data)}
+        values = {types.get(k): int(v) for k, v in data.items()}
 
         if normalize:
             values = {k: float(v) / total for k, v in values.items()}
 
         frequencies = {}
-        for k, v in iteritems(values):
+        for k, v in values.items():
             if isinstance(k, float):
                 if int(k) == k:
                     k = int(k)
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 4ba62d468..39b09c9dd 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -1,5 +1,3 @@
-import six
-
 from mongoengine.errors import OperationError
 from mongoengine.queryset.base import (
     BaseQuerySet,
@@ -127,8 +125,8 @@ def _populate_cache(self):
         # Pull in ITER_CHUNK_SIZE docs from the database and store them in
         # the result cache.
         try:
-            for _ in six.moves.range(ITER_CHUNK_SIZE):
-                self._result_cache.append(six.next(self))
+            for _ in range(ITER_CHUNK_SIZE):
+                self._result_cache.append(next(self))
         except StopIteration:
             # Getting this exception means there are no more docs in the
             # db cursor. Set _has_more to False so that we can use that
@@ -180,9 +178,9 @@ def __repr__(self):
             return ".. queryset mid-iteration .."
 
         data = []
-        for _ in six.moves.range(REPR_OUTPUT_SIZE + 1):
+        for _ in range(REPR_OUTPUT_SIZE + 1):
             try:
-                data.append(six.next(self))
+                data.append(next(self))
             except StopIteration:
                 break
 
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index efbdae4ee..1202ec451 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -3,8 +3,6 @@
 from bson import ObjectId, SON
 from bson.dbref import DBRef
 import pymongo
-import six
-from six import iteritems
 
 from mongoengine.base import UPDATE_OPERATORS
 from mongoengine.common import _import_class
@@ -180,7 +178,7 @@ def query(_doc_cls=None, **kwargs):
                     "$near" in value_dict or "$nearSphere" in value_dict
                 ):
                     value_son = SON()
-                    for k, v in iteritems(value_dict):
+                    for k, v in value_dict.items():
                         if k == "$maxDistance" or k == "$minDistance":
                             continue
                         value_son[k] = v
diff --git a/requirements.txt b/requirements.txt
index 43e5261bd..0ce39f74f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
 pymongo>=3.4
-six==1.10.0
 Sphinx==1.5.5
 sphinx-rtd-theme==0.2.4
diff --git a/setup.py b/setup.py
index 6873284a9..b60188c7e 100644
--- a/setup.py
+++ b/setup.py
@@ -145,7 +145,7 @@ def run_tests(self):
     platforms=["any"],
     classifiers=CLASSIFIERS,
     python_requires=">=3.5",
-    install_requires=["pymongo>=3.4, <4.0", "six>=1.10.0"],
+    install_requires=["pymongo>=3.4, <4.0"],
     cmdclass={"test": PyTest},
     **extra_opts
 )
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index be857b590..4179a0267 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -5,7 +5,6 @@
 from pymongo.collation import Collation
 from pymongo.errors import OperationFailure
 import pytest
-from six import iteritems
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -59,7 +58,7 @@ class BlogPost(InheritFrom):
         info = BlogPost.objects._collection.index_information()
         # _id, '-date', 'tags', ('cat', 'date')
         assert len(info) == 4
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         for expected in expected_specs:
             assert expected["fields"] in info
 
@@ -87,7 +86,7 @@ class BlogPost(InheritFrom):
         # the indices on -date and tags will both contain
         # _cls as first element in the key
         assert len(info) == 4
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         for expected in expected_specs:
             assert expected["fields"] in info
 
@@ -102,7 +101,7 @@ class ExtendedBlogPost(BlogPost):
 
         ExtendedBlogPost.ensure_indexes()
         info = ExtendedBlogPost.objects._collection.index_information()
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         for expected in expected_specs:
             assert expected["fields"] in info
 
@@ -192,7 +191,7 @@ class Person(Document):
         # Indexes are lazy so use list() to perform query
         list(Person.objects)
         info = Person.objects._collection.index_information()
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         assert [("rank.title", 1)] in info
 
     def test_explicit_geo2d_index(self):
@@ -207,7 +206,7 @@ class Place(Document):
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         assert [("location.point", "2d")] in info
 
     def test_explicit_geo2d_index_embedded(self):
@@ -227,7 +226,7 @@ class Place(Document):
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         assert [("current.location.point", "2d")] in info
 
     def test_explicit_geosphere_index(self):
@@ -244,7 +243,7 @@ class Place(Document):
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         assert [("location.point", "2dsphere")] in info
 
     def test_explicit_geohaystack_index(self):
@@ -266,7 +265,7 @@ class Place(Document):
 
         Place.ensure_indexes()
         info = Place._get_collection().index_information()
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         assert [("location.point", "geoHaystack")] in info
 
     def test_create_geohaystack_index(self):
@@ -279,7 +278,7 @@ class Place(Document):
 
         Place.create_index({"fields": (")location.point", "name")}, bucketSize=10)
         info = Place._get_collection().index_information()
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         assert [("location.point", "geoHaystack"), ("name", 1)] in info
 
     def test_dictionary_indexes(self):
@@ -308,7 +307,7 @@ class BlogPost(Document):
         info = BlogPost.objects._collection.index_information()
         info = [
             (value["key"], value.get("unique", False), value.get("sparse", False))
-            for key, value in iteritems(info)
+            for key, value in info.items()
         ]
         assert ([("addDate", -1)], True, True) in info
 
@@ -901,7 +900,7 @@ class BlogPost(Document):
             self.fail("Unbound local error at index + pk definition")
 
         info = BlogPost.objects._collection.index_information()
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         index_item = [("_id", 1), ("comments.comment_id", 1)]
         assert index_item in info
 
@@ -942,7 +941,7 @@ class MyDoc(Document):
             meta = {"indexes": ["provider_ids.foo", "provider_ids.bar"]}
 
         info = MyDoc.objects._collection.index_information()
-        info = [value["key"] for key, value in iteritems(info)]
+        info = [value["key"] for key, value in info.items()]
         assert [("provider_ids.foo", 1)] in info
         assert [("provider_ids.bar", 1)] in info
 
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index 5072f8419..0107c0a63 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -3,7 +3,6 @@
 import warnings
 
 import pytest
-from six import iteritems
 
 from mongoengine import (
     BooleanField,
@@ -550,7 +549,7 @@ class Mammal(Animal):
         class Human(Mammal):
             pass
 
-        for k, v in iteritems(defaults):
+        for k, v in defaults.items():
             for cls in [Animal, Fish, Guppy]:
                 assert cls._meta[k] == v
 
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index a5c21323e..920bf3928 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -10,7 +10,6 @@
 from bson import DBRef, ObjectId
 from pymongo.errors import DuplicateKeyError
 import pytest
-from six import iteritems
 
 from mongoengine import *
 from mongoengine import signals
@@ -3274,7 +3273,7 @@ class Node(Document):
 
             def expand(self):
                 self.flattened_parameter = {}
-                for parameter_name, parameter in iteritems(self.parameters):
+                for parameter_name, parameter in self.parameters.items():
                     parameter.expand()
 
         class NodesSystem(Document):
@@ -3282,7 +3281,7 @@ class NodesSystem(Document):
             nodes = MapField(ReferenceField(Node, dbref=False))
 
             def save(self, *args, **kwargs):
-                for node_name, node in iteritems(self.nodes):
+                for node_name, node in self.nodes.items():
                     node.expand()
                     node.save(*args, **kwargs)
                 super(NodesSystem, self).save(*args, **kwargs)
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index a653b9611..a9c0c7e58 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -3,13 +3,12 @@
 
 from bson import Binary
 import pytest
-import six
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase
 
-BIN_VALUE = six.b(
-    "\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5"
+BIN_VALUE = "\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5".encode(
+    "latin-1"
 )
 
 
@@ -22,7 +21,7 @@ class Attachment(Document):
             content_type = StringField()
             blob = BinaryField()
 
-        BLOB = six.b("\xe6\x00\xc4\xff\x07")
+        BLOB = "\xe6\x00\xc4\xff\x07".encode("latin-1")
         MIME_TYPE = "application/octet-stream"
 
         Attachment.drop_collection()
@@ -32,7 +31,7 @@ class Attachment(Document):
 
         attachment_1 = Attachment.objects().first()
         assert MIME_TYPE == attachment_1.content_type
-        assert BLOB == six.binary_type(attachment_1.blob)
+        assert BLOB == bytes(attachment_1.blob)
 
     def test_validation_succeeds(self):
         """Ensure that valid values can be assigned to binary fields.
@@ -47,11 +46,11 @@ class AttachmentSizeLimit(Document):
         attachment_required = AttachmentRequired()
         with pytest.raises(ValidationError):
             attachment_required.validate()
-        attachment_required.blob = Binary(six.b("\xe6\x00\xc4\xff\x07"))
+        attachment_required.blob = Binary("\xe6\x00\xc4\xff\x07".encode("latin-1"))
         attachment_required.validate()
 
-        _5_BYTES = six.b("\xe6\x00\xc4\xff\x07")
-        _4_BYTES = six.b("\xe6\x00\xc4\xff")
+        _5_BYTES = "\xe6\x00\xc4\xff\x07".encode("latin-1")
+        _4_BYTES = "\xe6\x00\xc4\xff".encode("latin-1")
         with pytest.raises(ValidationError):
             AttachmentSizeLimit(blob=_5_BYTES).validate()
         AttachmentSizeLimit(blob=_4_BYTES).validate()
@@ -133,7 +132,7 @@ class MyDocument(Document):
 
         MyDocument.drop_collection()
 
-        bin_data = six.b("\xe6\x00\xc4\xff\x07")
+        bin_data = "\xe6\x00\xc4\xff\x07".encode("latin-1")
         doc = MyDocument(bin_field=bin_data).save()
 
         n_updated = MyDocument.objects(bin_field=bin_data).update_one(
diff --git a/tests/fields/test_date_field.py b/tests/fields/test_date_field.py
index 5e1bfaa4f..42a4b7f1f 100644
--- a/tests/fields/test_date_field.py
+++ b/tests/fields/test_date_field.py
@@ -2,7 +2,6 @@
 import datetime
 
 import pytest
-import six
 
 try:
     import dateutil
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 21ab523bb..48936af7a 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -2,7 +2,6 @@
 import datetime as dt
 
 import pytest
-import six
 
 try:
     import dateutil
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index 5ab6c93f7..cbac9b691 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -7,7 +7,6 @@
 
 import gridfs
 import pytest
-import six
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -58,7 +57,7 @@ class PutFile(Document):
 
         PutFile.drop_collection()
 
-        text = six.b("Hello, World!")
+        text = "Hello, World!".encode("latin-1")
         content_type = "text/plain"
 
         putfile = PutFile()
@@ -101,8 +100,8 @@ class StreamFile(Document):
 
         StreamFile.drop_collection()
 
-        text = six.b("Hello, World!")
-        more_text = six.b("Foo Bar")
+        text = "Hello, World!".encode("latin-1")
+        more_text = "Foo Bar".encode("latin-1")
         content_type = "text/plain"
 
         streamfile = StreamFile()
@@ -137,8 +136,8 @@ class StreamFile(Document):
 
         StreamFile.drop_collection()
 
-        text = six.b("Hello, World!")
-        more_text = six.b("Foo Bar")
+        text = "Hello, World!".encode("latin-1")
+        more_text = "Foo Bar".encode("latin-1")
 
         streamfile = StreamFile()
         streamfile.save()
@@ -167,8 +166,8 @@ def test_file_fields_set(self):
         class SetFile(Document):
             the_file = FileField()
 
-        text = six.b("Hello, World!")
-        more_text = six.b("Foo Bar")
+        text = "Hello, World!".encode("latin-1")
+        more_text = "Foo Bar".encode("latin-1")
 
         SetFile.drop_collection()
 
@@ -196,7 +195,7 @@ class GridDocument(Document):
         GridDocument.drop_collection()
 
         with tempfile.TemporaryFile() as f:
-            f.write(six.b("Hello World!"))
+            f.write("Hello World!".encode("latin-1"))
             f.flush()
 
             # Test without default
@@ -213,7 +212,7 @@ class GridDocument(Document):
             assert doc_b.the_file.grid_id == doc_c.the_file.grid_id
 
             # Test with default
-            doc_d = GridDocument(the_file=six.b(""))
+            doc_d = GridDocument(the_file="".encode("latin-1"))
             doc_d.save()
 
             doc_e = GridDocument.objects.with_id(doc_d.id)
@@ -240,7 +239,7 @@ class TestFile(Document):
         # First instance
         test_file = TestFile()
         test_file.name = "Hello, World!"
-        test_file.the_file.put(six.b("Hello, World!"))
+        test_file.the_file.put("Hello, World!".encode("latin-1"))
         test_file.save()
 
         # Second instance
@@ -297,7 +296,9 @@ class TestFile(Document):
 
         test_file = TestFile()
         assert not bool(test_file.the_file)
-        test_file.the_file.put(six.b("Hello, World!"), content_type="text/plain")
+        test_file.the_file.put(
+            "Hello, World!".encode("latin-1"), content_type="text/plain"
+        )
         test_file.save()
         assert bool(test_file.the_file)
 
@@ -319,7 +320,7 @@ def test_file_disk_space(self):
         class TestFile(Document):
             the_file = FileField()
 
-        text = six.b("Hello, World!")
+        text = "Hello, World!".encode("latin-1")
         content_type = "text/plain"
 
         testfile = TestFile()
@@ -363,7 +364,7 @@ class TestFile(Document):
         testfile.the_file.put(text, content_type=content_type, filename="hello")
         testfile.save()
 
-        text = six.b("Bonjour, World!")
+        text = "Bonjour, World!".encode("latin-1")
         testfile.the_file.replace(text, content_type=content_type, filename="hello")
         testfile.save()
 
@@ -387,7 +388,7 @@ class TestImage(Document):
         TestImage.drop_collection()
 
         with tempfile.TemporaryFile() as f:
-            f.write(six.b("Hello World!"))
+            f.write("Hello World!".encode("latin-1"))
             f.flush()
 
             t = TestImage()
@@ -503,21 +504,21 @@ class TestFile(Document):
         # First instance
         test_file = TestFile()
         test_file.name = "Hello, World!"
-        test_file.the_file.put(six.b("Hello, World!"), name="hello.txt")
+        test_file.the_file.put("Hello, World!".encode("latin-1"), name="hello.txt")
         test_file.save()
 
         data = get_db("test_files").macumba.files.find_one()
         assert data.get("name") == "hello.txt"
 
         test_file = TestFile.objects.first()
-        assert test_file.the_file.read() == six.b("Hello, World!")
+        assert test_file.the_file.read() == "Hello, World!".encode("latin-1")
 
         test_file = TestFile.objects.first()
-        test_file.the_file = six.b("HELLO, WORLD!")
+        test_file.the_file = "Hello, World!".encode("latin-1")
         test_file.save()
 
         test_file = TestFile.objects.first()
-        assert test_file.the_file.read() == six.b("HELLO, WORLD!")
+        assert test_file.the_file.read() == "Hello, World!".encode("latin-1")
 
     def test_copyable(self):
         class PutFile(Document):
@@ -525,7 +526,7 @@ class PutFile(Document):
 
         PutFile.drop_collection()
 
-        text = six.b("Hello, World!")
+        text = "Hello, World!".encode("latin-1")
         content_type = "text/plain"
 
         putfile = PutFile()
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
index a1cd7a0a3..839494a9a 100644
--- a/tests/fields/test_float_field.py
+++ b/tests/fields/test_float_field.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import pytest
-import six
 
 from mongoengine import *
 
@@ -52,9 +51,8 @@ class BigPerson(Document):
 
         big_person = BigPerson()
 
-        for value, value_type in enumerate(six.integer_types):
-            big_person.height = value_type(value)
-            big_person.validate()
+        big_person.height = int(0)
+        big_person.validate()
 
         big_person.height = 2 ** 500
         big_person.validate()
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index b39a714c1..330051c37 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-import pytest
 from bson.int64 import Int64
-import six
+import pytest
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -24,7 +22,7 @@ class TestLongFieldConsideredAsInt64(Document):
         assert isinstance(
             db.test_long_field_considered_as_int64.find()[0]["some_long"], Int64
         )
-        assert isinstance(doc.some_long, six.integer_types)
+        assert isinstance(doc.some_long, int)
 
     def test_long_validation(self):
         """Ensure that invalid values cannot be assigned to long fields.
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index cf4cd0dcb..fac6dfeb8 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -10,8 +10,6 @@
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import UpdateResult
 import pytest
-import six
-from six import iteritems
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -4093,7 +4091,7 @@ class Comment(Document):
         info = Comment.objects._collection.index_information()
         info = [
             (value["key"], value.get("unique", False), value.get("sparse", False))
-            for key, value in iteritems(info)
+            for key, value in info.items()
         ]
         assert ([("_cls", 1), ("message", 1)], False, False) in info
 
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 734061eda..6d432e328 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,7 +1,6 @@
 import unittest
 
 import pytest
-from six import iterkeys
 
 from mongoengine import Document
 from mongoengine.base.datastructures import BaseDict, BaseList, StrictDict
@@ -372,7 +371,7 @@ def test_init(self):
 
     def test_iterkeys(self):
         d = self.dtype(a=1)
-        assert list(iterkeys(d)) == ["a"]
+        assert list(d.keys()) == ["a"]
 
     def test_len(self):
         d = self.dtype(a=1)
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index b9d928833..0f9f412c3 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -2,10 +2,8 @@
 import unittest
 
 from bson import DBRef, ObjectId
-from six import iteritems
 
 from mongoengine import *
-from mongoengine.connection import get_db
 from mongoengine.context_managers import query_counter
 
 
@@ -739,7 +737,7 @@ class Group(Document):
             [m for m in group_obj.members]
             assert q == 2
 
-            for k, m in iteritems(group_obj.members):
+            for k, m in group_obj.members.items():
                 assert isinstance(m, User)
 
         # Document select_related
@@ -752,7 +750,7 @@ class Group(Document):
             [m for m in group_obj.members]
             assert q == 2
 
-            for k, m in iteritems(group_obj.members):
+            for k, m in group_obj.members.items():
                 assert isinstance(m, User)
 
         # Queryset select_related
@@ -766,7 +764,7 @@ class Group(Document):
                 [m for m in group_obj.members]
                 assert q == 2
 
-                for k, m in iteritems(group_obj.members):
+                for k, m in group_obj.members.items():
                     assert isinstance(m, User)
 
         User.drop_collection()
@@ -820,7 +818,7 @@ class Group(Document):
             [m for m in group_obj.members]
             assert q == 4
 
-            for k, m in iteritems(group_obj.members):
+            for k, m in group_obj.members.items():
                 assert "User" in m.__class__.__name__
 
         # Document select_related
@@ -836,7 +834,7 @@ class Group(Document):
             [m for m in group_obj.members]
             assert q == 4
 
-            for k, m in iteritems(group_obj.members):
+            for k, m in group_obj.members.items():
                 assert "User" in m.__class__.__name__
 
         # Queryset select_related
@@ -853,7 +851,7 @@ class Group(Document):
                 [m for m in group_obj.members]
                 assert q == 4
 
-                for k, m in iteritems(group_obj.members):
+                for k, m in group_obj.members.items():
                     assert "User" in m.__class__.__name__
 
         Group.objects.delete()
@@ -910,7 +908,7 @@ class Group(Document):
             [m for m in group_obj.members]
             assert q == 2
 
-            for k, m in iteritems(group_obj.members):
+            for k, m in group_obj.members.items():
                 assert isinstance(m, UserA)
 
         # Document select_related
@@ -926,7 +924,7 @@ class Group(Document):
             [m for m in group_obj.members]
             assert q == 2
 
-            for k, m in iteritems(group_obj.members):
+            for k, m in group_obj.members.items():
                 assert isinstance(m, UserA)
 
         # Queryset select_related
@@ -943,7 +941,7 @@ class Group(Document):
                 [m for m in group_obj.members]
                 assert q == 2
 
-                for k, m in iteritems(group_obj.members):
+                for k, m in group_obj.members.items():
                     assert isinstance(m, UserA)
 
         UserA.drop_collection()
@@ -997,7 +995,7 @@ class Group(Document):
             [m for m in group_obj.members]
             assert q == 4
 
-            for k, m in iteritems(group_obj.members):
+            for k, m in group_obj.members.items():
                 assert "User" in m.__class__.__name__
 
         # Document select_related
@@ -1013,7 +1011,7 @@ class Group(Document):
             [m for m in group_obj.members]
             assert q == 4
 
-            for k, m in iteritems(group_obj.members):
+            for k, m in group_obj.members.items():
                 assert "User" in m.__class__.__name__
 
         # Queryset select_related
@@ -1030,7 +1028,7 @@ class Group(Document):
                 [m for m in group_obj.members]
                 assert q == 4
 
-                for k, m in iteritems(group_obj.members):
+                for k, m in group_obj.members.items():
                     assert "User" in m.__class__.__name__
 
         Group.objects.delete()

From b234aa48e4c17ac056afde75e43f06ef8f8200a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 11 Mar 2020 23:21:38 +0100
Subject: [PATCH 1042/1519] run pyupgrade

---
 mongoengine/base/datastructures.py | 18 ++++++++++--------
 mongoengine/base/document.py       | 26 +++++++++++++-------------
 mongoengine/base/fields.py         |  6 ++++--
 mongoengine/base/metaclasses.py    | 21 ++-------------------
 mongoengine/connection.py          |  2 +-
 mongoengine/dereference.py         |  4 ++--
 mongoengine/document.py            |  2 +-
 mongoengine/errors.py              |  8 ++++----
 mongoengine/fields.py              | 20 ++++++++++++--------
 mongoengine/queryset/field_list.py |  2 +-
 mongoengine/queryset/transform.py  |  4 +++-
 setup.py                           |  6 +-----
 12 files changed, 54 insertions(+), 65 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index bb70089ed..86fde15e3 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -67,11 +67,11 @@ def __getitem__(self, key):
         if isinstance(value, EmbeddedDocument) and value._instance is None:
             value._instance = self._instance
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
-            value = BaseDict(value, None, "%s.%s" % (self._name, key))
+            value = BaseDict(value, None, "{}.{}".format(self._name, key))
             super(BaseDict, self).__setitem__(key, value)
             value._instance = self._instance
         elif isinstance(value, list) and not isinstance(value, BaseList):
-            value = BaseList(value, None, "%s.%s" % (self._name, key))
+            value = BaseList(value, None, "{}.{}".format(self._name, key))
             super(BaseDict, self).__setitem__(key, value)
             value._instance = self._instance
         return value
@@ -97,7 +97,7 @@ def __setstate__(self, state):
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, "_mark_as_changed"):
             if key:
-                self._instance._mark_as_changed("%s.%s" % (self._name, key))
+                self._instance._mark_as_changed("{}.{}".format(self._name, key))
             else:
                 self._instance._mark_as_changed(self._name)
 
@@ -133,12 +133,12 @@ def __getitem__(self, key):
             value._instance = self._instance
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
             # Replace dict by BaseDict
-            value = BaseDict(value, None, "%s.%s" % (self._name, key))
+            value = BaseDict(value, None, "{}.{}".format(self._name, key))
             super(BaseList, self).__setitem__(key, value)
             value._instance = self._instance
         elif isinstance(value, list) and not isinstance(value, BaseList):
             # Replace list by BaseList
-            value = BaseList(value, None, "%s.%s" % (self._name, key))
+            value = BaseList(value, None, "{}.{}".format(self._name, key))
             super(BaseList, self).__setitem__(key, value)
             value._instance = self._instance
         return value
@@ -181,7 +181,9 @@ def __setitem__(self, key, value):
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, "_mark_as_changed"):
             if key:
-                self._instance._mark_as_changed("%s.%s" % (self._name, key % len(self)))
+                self._instance._mark_as_changed(
+                    "{}.{}".format(self._name, key % len(self))
+                )
             else:
                 self._instance._mark_as_changed(self._name)
 
@@ -428,7 +430,7 @@ class SpecificStrictDict(cls):
 
                 def __repr__(self):
                     return "{%s}" % ", ".join(
-                        '"{0!s}": {1!r}'.format(k, v) for k, v in self.items()
+                        '"{!s}": {!r}'.format(k, v) for k, v in self.items()
                     )
 
             cls._classes[allowed_keys] = SpecificStrictDict
@@ -473,4 +475,4 @@ def __getattr__(self, name):
             raise AttributeError()
 
     def __repr__(self):
-        return "<LazyReference(%s, %r)>" % (self.document_type, self.pk)
+        return "<LazyReference({}, {!r})>".format(self.document_type, self.pk)
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index dff759a76..83c12a969 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -93,7 +93,7 @@ def __init__(self, *args, **values):
                 list(self._fields.keys()) + ["id", "pk", "_cls", "_text_score"]
             )
             if _undefined_fields:
-                msg = ('The fields "{0}" do not exist on the document "{1}"').format(
+                msg = ('The fields "{}" do not exist on the document "{}"').format(
                     _undefined_fields, self._class_name
                 )
                 raise FieldDoesNotExist(msg)
@@ -286,7 +286,7 @@ def __repr__(self):
         except (UnicodeEncodeError, UnicodeDecodeError):
             u = "[Bad Unicode data]"
         repr_type = str if u is None else type(u)
-        return repr_type("<%s: %s>" % (self.__class__.__name__, u))
+        return repr_type("<{}: {}>".format(self.__class__.__name__, u))
 
     def __str__(self):
         # TODO this could be simpler?
@@ -441,7 +441,7 @@ def validate(self, clean=True):
                 pk = self.pk
             elif self._instance and hasattr(self._instance, "pk"):
                 pk = self._instance.pk
-            message = "ValidationError (%s:%s) " % (self._class_name, pk)
+            message = "ValidationError ({}:{}) ".format(self._class_name, pk)
             raise ValidationError(message, errors=errors)
 
     def to_json(self, *args, **kwargs):
@@ -514,7 +514,7 @@ def _mark_as_changed(self, key):
         if "." in key:
             key, rest = key.split(".", 1)
             key = self._db_field_map.get(key, key)
-            key = "%s.%s" % (key, rest)
+            key = "{}.{}".format(key, rest)
         else:
             key = self._db_field_map.get(key, key)
 
@@ -576,7 +576,7 @@ def _nestable_types_changed_fields(self, changed_fields, base_key, data):
             iterator = data.items()
 
         for index_or_key, value in iterator:
-            item_key = "%s%s." % (base_key, index_or_key)
+            item_key = "{}{}.".format(base_key, index_or_key)
             # don't check anything lower if this key is already marked
             # as changed.
             if item_key[:-1] in changed_fields:
@@ -584,7 +584,7 @@ def _nestable_types_changed_fields(self, changed_fields, base_key, data):
 
             if hasattr(value, "_get_changed_fields"):
                 changed = value._get_changed_fields()
-                changed_fields += ["%s%s" % (item_key, k) for k in changed if k]
+                changed_fields += ["{}{}".format(item_key, k) for k in changed if k]
             elif isinstance(value, (list, tuple, dict)):
                 self._nestable_types_changed_fields(changed_fields, item_key, value)
 
@@ -615,7 +615,7 @@ def _get_changed_fields(self):
             if isinstance(data, EmbeddedDocument):
                 # Find all embedded fields that have been changed
                 changed = data._get_changed_fields()
-                changed_fields += ["%s%s" % (key, k) for k in changed if k]
+                changed_fields += ["{}{}".format(key, k) for k in changed if k]
             elif isinstance(data, (list, tuple, dict)):
                 if hasattr(field, "field") and isinstance(
                     field.field, (ReferenceField, GenericReferenceField)
@@ -769,11 +769,10 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
 
         if errors_dict:
             errors = "\n".join(
-                ["Field '%s' - %s" % (k, v) for k, v in errors_dict.items()]
+                ["Field '{}' - {}".format(k, v) for k, v in errors_dict.items()]
             )
-            msg = "Invalid data to create a `%s` instance.\n%s" % (
-                cls._class_name,
-                errors,
+            msg = "Invalid data to create a `{}` instance.\n{}".format(
+                cls._class_name, errors,
             )
             raise InvalidDocumentError(msg)
 
@@ -944,7 +943,8 @@ def _unique_with_indexes(cls, namespace=""):
 
                 # Add the new index to the list
                 fields = [
-                    ("%s%s" % (namespace, f), pymongo.ASCENDING) for f in unique_fields
+                    ("{}{}".format(namespace, f), pymongo.ASCENDING)
+                    for f in unique_fields
                 ]
                 index = {"fields": fields, "unique": True, "sparse": sparse}
                 unique_indexes.append(index)
@@ -1001,7 +1001,7 @@ def _geo_indices(cls, inspected=None, parent_field=None):
             elif field._geo_index:
                 field_name = field.db_field
                 if parent_field:
-                    field_name = "%s.%s" % (parent_field, field_name)
+                    field_name = "{}.{}".format(parent_field, field_name)
                 geo_indices.append({"fields": [(field_name, field._geo_index)]})
 
         return geo_indices
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index ac894d916..2fadcfe11 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -474,7 +474,9 @@ def validate(self, value):
 
             if errors:
                 field_class = self.field.__class__.__name__
-                self.error("Invalid %s item (%s)" % (field_class, value), errors=errors)
+                self.error(
+                    "Invalid {} item ({})".format(field_class, value), errors=errors
+                )
         # Don't allow empty values if required
         if self.required and not value:
             self.error("Field is required and cannot be empty")
@@ -546,7 +548,7 @@ def validate(self, value):
         if isinstance(value, dict):
             if set(value.keys()) == {"type", "coordinates"}:
                 if value["type"] != self._type:
-                    self.error('%s type must be "%s"' % (self._name, self._type))
+                    self.error('{} type must be "{}"'.format(self._name, self._type))
                 return self.validate(value["coordinates"])
             else:
                 self.error(
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 30a6fbab0..473e6b181 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -168,23 +168,6 @@ def __new__(mcs, name, bases, attrs):
         # Add class to the _document_registry
         _document_registry[new_class._class_name] = new_class
 
-        # In Python 2, User-defined methods objects have special read-only
-        # attributes 'im_func' and 'im_self' which contain the function obj
-        # and class instance object respectively.  With Python 3 these special
-        # attributes have been replaced by __func__ and __self__.  The Blinker
-        # module continues to use im_func and im_self, so the code below
-        # copies __func__ into im_func and __self__ into im_self for
-        # classmethod objects in Document derived classes.
-        #
-        # Relates to https://github.com/MongoEngine/mongoengine/issues/1107
-        # for val in new_class.__dict__.values():
-        #     if isinstance(val, classmethod):
-        #         f = val.__get__(new_class)
-        #         if hasattr(f, "__func__") and not hasattr(f, "im_func"):
-        #             f.__dict__.update({"im_func": getattr(f, "__func__")})
-        #         if hasattr(f, "__self__") and not hasattr(f, "im_self"):
-        #             f.__dict__.update({"im_self": getattr(f, "__self__")})
-
         # Handle delete rules
         for field in new_class._fields.values():
             f = field
@@ -458,8 +441,8 @@ def get_auto_id_names(mcs, new_class):
 
         id_basename, id_db_basename, i = ("auto_id", "_auto_id", 0)
         for i in itertools.count():
-            id_name = "{0}_{1}".format(id_basename, i)
-            id_db_name = "{0}_{1}".format(id_db_basename, i)
+            id_name = "{}_{}".format(id_basename, i)
+            id_db_name = "{}_{}".format(id_db_basename, i)
             if id_name not in existing_fields and id_db_name not in existing_db_fields:
                 return id_name, id_db_name
 
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 3f7546192..b03e0b1de 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -317,7 +317,7 @@ def _create_connection(alias, connection_class, **connection_settings):
     try:
         return connection_class(**connection_settings)
     except Exception as e:
-        raise ConnectionFailure("Cannot connect to database %s :\n%s" % (alias, e))
+        raise ConnectionFailure("Cannot connect to database {} :\n{}".format(alias, e))
 
 
 def _find_existing_connection(connection_settings):
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index d0e6c527d..3756d84a0 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -272,12 +272,12 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                             (v["_ref"].collection, v["_ref"].id), v
                         )
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                        item_name = "{0}.{1}.{2}".format(name, k, field_name)
+                        item_name = "{}.{}.{}".format(name, k, field_name)
                         data[k]._data[field_name] = self._attach_objects(
                             v, depth, instance=instance, name=item_name
                         )
             elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                item_name = "%s.%s" % (name, k) if name else name
+                item_name = "{}.{}".format(name, k) if name else name
                 data[k] = self._attach_objects(
                     v, depth - 1, instance=instance, name=item_name
                 )
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 4ac979d15..e13918c29 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -555,7 +555,7 @@ def cascade_save(self, **kwargs):
             if not getattr(ref, "_changed_fields", True):
                 continue
 
-            ref_id = "%s,%s" % (ref.__class__.__name__, str(ref._data))
+            ref_id = "{},{}".format(ref.__class__.__name__, str(ref._data))
             if ref and ref_id not in _refs:
                 _refs.append(ref_id)
                 kwargs["_refs"] = _refs
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 7045145c3..76c25773b 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -94,7 +94,7 @@ def __str__(self):
         return str(self.message)
 
     def __repr__(self):
-        return "%s(%s,)" % (self.__class__.__name__, self.message)
+        return "{}({},)".format(self.__class__.__name__, self.message)
 
     def __getattribute__(self, name):
         message = super(ValidationError, self).__getattribute__(name)
@@ -102,7 +102,7 @@ def __getattribute__(self, name):
             if self.field_name:
                 message = "%s" % message
             if self.errors:
-                message = "%s(%s)" % (message, self._format_errors())
+                message = "{}({})".format(message, self._format_errors())
         return message
 
     def _get_message(self):
@@ -147,13 +147,13 @@ def generate_key(value, prefix=""):
             elif isinstance(value, dict):
                 value = " ".join([generate_key(v, k) for k, v in value.items()])
 
-            results = "%s.%s" % (prefix, value) if prefix else value
+            results = "{}.{}".format(prefix, value) if prefix else value
             return results
 
         error_dict = defaultdict(list)
         for k, v in self.to_dict().items():
             error_dict[generate_key(v)].append(k)
-        return " ".join(["%s: %s" % (k, v) for k, v in error_dict.items()])
+        return " ".join(["{}: {}".format(k, v) for k, v in error_dict.items()])
 
 
 class DeprecatedError(Exception):
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 391ad37b3..91f85d269 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -292,12 +292,16 @@ def validate(self, value):
                 domain_part = domain_part.encode("idna").decode("ascii")
             except UnicodeError:
                 self.error(
-                    "%s %s" % (self.error_msg % value, "(domain failed IDN encoding)")
+                    "{} {}".format(
+                        self.error_msg % value, "(domain failed IDN encoding)"
+                    )
                 )
             else:
                 if not self.validate_domain_part(domain_part):
                     self.error(
-                        "%s %s" % (self.error_msg % value, "(domain validation failed)")
+                        "{} {}".format(
+                            self.error_msg % value, "(domain validation failed)"
+                        )
                     )
 
 
@@ -1344,7 +1348,7 @@ def on_document_pre_save(self, sender, document, created, **kwargs):
             return None
 
         update_kwargs = {
-            "set__%s__%s" % (self.name, key): val
+            "set__{}__{}".format(self.name, key): val
             for key, val in document._delta()[0].items()
             if key in self.fields
         }
@@ -1688,12 +1692,12 @@ def __deepcopy__(self, memo):
         return self.__copy__()
 
     def __repr__(self):
-        return "<%s: %s>" % (self.__class__.__name__, self.grid_id)
+        return "<{}: {}>".format(self.__class__.__name__, self.grid_id)
 
     def __str__(self):
         gridout = self.get()
         filename = getattr(gridout, "filename") if gridout else "<no file>"
-        return "<%s: %s (%s)>" % (self.__class__.__name__, filename, self.grid_id)
+        return "<{}: {} ({})>".format(self.__class__.__name__, filename, self.grid_id)
 
     def __eq__(self, other):
         if isinstance(other, GridFSProxy):
@@ -2097,7 +2101,7 @@ def generate(self):
         Generate and Increment the counter
         """
         sequence_name = self.get_sequence_name()
-        sequence_id = "%s.%s" % (sequence_name, self.name)
+        sequence_id = "{}.{}".format(sequence_name, self.name)
         collection = get_db(alias=self.db_alias)[self.collection_name]
 
         counter = collection.find_one_and_update(
@@ -2111,7 +2115,7 @@ def generate(self):
     def set_next_value(self, value):
         """Helper method to set the next sequence value"""
         sequence_name = self.get_sequence_name()
-        sequence_id = "%s.%s" % (sequence_name, self.name)
+        sequence_id = "{}.{}".format(sequence_name, self.name)
         collection = get_db(alias=self.db_alias)[self.collection_name]
         counter = collection.find_one_and_update(
             filter={"_id": sequence_id},
@@ -2128,7 +2132,7 @@ def get_next_value(self):
         as it is only fixed on set.
         """
         sequence_name = self.get_sequence_name()
-        sequence_id = "%s.%s" % (sequence_name, self.name)
+        sequence_id = "{}.{}".format(sequence_name, self.name)
         collection = get_db(alias=self.db_alias)[self.collection_name]
         data = collection.find_one({"_id": sequence_id})
 
diff --git a/mongoengine/queryset/field_list.py b/mongoengine/queryset/field_list.py
index c2618ebdb..e0d8e3224 100644
--- a/mongoengine/queryset/field_list.py
+++ b/mongoengine/queryset/field_list.py
@@ -78,7 +78,7 @@ def as_dict(self):
         return field_list
 
     def reset(self):
-        self.fields = set([])
+        self.fields = set()
         self.slice = {}
         self.value = self.ONLY
 
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 1202ec451..3f1db8fa6 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -433,7 +433,9 @@ def _geo_operator(field, op, value):
             value = {"$near": _infer_geometry(value)}
         else:
             raise NotImplementedError(
-                'Geo method "%s" has not been implemented for a %s ' % (op, field._name)
+                'Geo method "{}" has not been implemented for a {} '.format(
+                    op, field._name
+                )
             )
     return value
 
diff --git a/setup.py b/setup.py
index b60188c7e..fe3253ae7 100644
--- a/setup.py
+++ b/setup.py
@@ -108,9 +108,6 @@ def run_tests(self):
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
-PYTHON_VERSION = sys.version_info[0]
-PY3 = PYTHON_VERSION == 3
-
 extra_opts = {
     "packages": find_packages(exclude=["tests", "tests.*"]),
     "tests_require": [
@@ -118,8 +115,7 @@ def run_tests(self):
         "pytest-cov",
         "coverage<5.0",  # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
         "blinker",
-        "Pillow>=2.0.0, <7.0.0",  # 7.0.0 dropped Python2 support
-        "zipp<2.0.0",  # (dependency of pytest) dropped python2 support
+        "Pillow>=2.0.0",
     ],
 }
 

From 1e110a2c41d2e4675d0195fafa00e49dcd331675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 11 Mar 2020 23:26:37 +0100
Subject: [PATCH 1043/1519] run pyupgrade --py3-plus

---
 mongoengine/base/datastructures.py |  29 +++---
 mongoengine/base/document.py       |   8 +-
 mongoengine/base/fields.py         |   6 +-
 mongoengine/base/metaclasses.py    |   7 +-
 mongoengine/base/utils.py          |   2 +-
 mongoengine/connection.py          |   4 +-
 mongoengine/context_managers.py    |  12 +--
 mongoengine/dereference.py         |   2 +-
 mongoengine/document.py            |  26 +++---
 mongoengine/errors.py              |   4 +-
 mongoengine/fields.py              | 144 ++++++++++++++---------------
 mongoengine/queryset/base.py       |  16 ++--
 mongoengine/queryset/field_list.py |   2 +-
 mongoengine/queryset/manager.py    |   2 +-
 mongoengine/queryset/queryset.py   |   4 +-
 mongoengine/queryset/visitor.py    |   4 +-
 mongoengine/signals.py             |   4 +-
 setup.py                           |   2 +-
 18 files changed, 134 insertions(+), 144 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 86fde15e3..d3bff2b3d 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -51,7 +51,7 @@ def __init__(self, dict_items, instance, name):
         if isinstance(instance, BaseDocument):
             self._instance = weakref.proxy(instance)
         self._name = name
-        super(BaseDict, self).__init__(dict_items)
+        super().__init__(dict_items)
 
     def get(self, key, default=None):
         # get does not use __getitem__ by default so we must override it as well
@@ -61,18 +61,18 @@ def get(self, key, default=None):
             return default
 
     def __getitem__(self, key):
-        value = super(BaseDict, self).__getitem__(key)
+        value = super().__getitem__(key)
 
         EmbeddedDocument = _import_class("EmbeddedDocument")
         if isinstance(value, EmbeddedDocument) and value._instance is None:
             value._instance = self._instance
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
             value = BaseDict(value, None, "{}.{}".format(self._name, key))
-            super(BaseDict, self).__setitem__(key, value)
+            super().__setitem__(key, value)
             value._instance = self._instance
         elif isinstance(value, list) and not isinstance(value, BaseList):
             value = BaseList(value, None, "{}.{}".format(self._name, key))
-            super(BaseDict, self).__setitem__(key, value)
+            super().__setitem__(key, value)
             value._instance = self._instance
         return value
 
@@ -115,13 +115,13 @@ def __init__(self, list_items, instance, name):
         if isinstance(instance, BaseDocument):
             self._instance = weakref.proxy(instance)
         self._name = name
-        super(BaseList, self).__init__(list_items)
+        super().__init__(list_items)
 
     def __getitem__(self, key):
         # change index to positive value because MongoDB does not support negative one
         if isinstance(key, int) and key < 0:
             key = len(self) + key
-        value = super(BaseList, self).__getitem__(key)
+        value = super().__getitem__(key)
 
         if isinstance(key, slice):
             # When receiving a slice operator, we don't convert the structure and bind
@@ -134,18 +134,17 @@ def __getitem__(self, key):
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
             # Replace dict by BaseDict
             value = BaseDict(value, None, "{}.{}".format(self._name, key))
-            super(BaseList, self).__setitem__(key, value)
+            super().__setitem__(key, value)
             value._instance = self._instance
         elif isinstance(value, list) and not isinstance(value, BaseList):
             # Replace list by BaseList
             value = BaseList(value, None, "{}.{}".format(self._name, key))
-            super(BaseList, self).__setitem__(key, value)
+            super().__setitem__(key, value)
             value._instance = self._instance
         return value
 
     def __iter__(self):
-        for v in super(BaseList, self).__iter__():
-            yield v
+        yield from super().__iter__()
 
     def __getstate__(self):
         self.instance = None
@@ -163,7 +162,7 @@ def __setitem__(self, key, value):
             # instead, we simply marks the whole list as changed
             changed_key = None
 
-        result = super(BaseList, self).__setitem__(key, value)
+        result = super().__setitem__(key, value)
         self._mark_as_changed(changed_key)
         return result
 
@@ -190,7 +189,7 @@ def _mark_as_changed(self, key=None):
 
 class EmbeddedDocumentList(BaseList):
     def __init__(self, list_items, instance, name):
-        super(EmbeddedDocumentList, self).__init__(list_items, instance, name)
+        super().__init__(list_items, instance, name)
         self._instance = instance
 
     @classmethod
@@ -355,7 +354,7 @@ def update(self, **update):
         return len(values)
 
 
-class StrictDict(object):
+class StrictDict:
     __slots__ = ()
     _special_fields = {"get", "pop", "iteritems", "items", "keys", "create"}
     _classes = {}
@@ -455,9 +454,7 @@ def __init__(self, document_type, pk, cached_doc=None, passthrough=False):
         self.document_type = document_type
         self._cached_doc = cached_doc
         self.passthrough = passthrough
-        super(LazyReference, self).__init__(
-            self.document_type._get_collection_name(), pk
-        )
+        super().__init__(self.document_type._get_collection_name(), pk)
 
     def __getitem__(self, name):
         if not self.passthrough:
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 83c12a969..e697fe403 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -30,7 +30,7 @@
 NON_FIELD_ERRORS = "__all__"
 
 
-class BaseDocument(object):
+class BaseDocument:
     # TODO simplify how `_changed_fields` is used.
     # Currently, handling of `_changed_fields` seems unnecessarily convoluted:
     # 1. `BaseDocument` defines `_changed_fields` in its `__slots__`, yet it's
@@ -161,7 +161,7 @@ def __delattr__(self, *args, **kwargs):
                 default = default()
             setattr(self, field_name, default)
         else:
-            super(BaseDocument, self).__delattr__(*args, **kwargs)
+            super().__delattr__(*args, **kwargs)
 
     def __setattr__(self, name, value):
         # Handle dynamic data only if an initialised dynamic document
@@ -208,9 +208,9 @@ def __setattr__(self, name, value):
             and self__created
             and name == self._meta.get("id_field")
         ):
-            super(BaseDocument, self).__setattr__("_created", False)
+            super().__setattr__("_created", False)
 
-        super(BaseDocument, self).__setattr__(name, value)
+        super().__setattr__(name, value)
 
     def __getstate__(self):
         data = {}
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 2fadcfe11..e44b57445 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -13,7 +13,7 @@
 __all__ = ("BaseField", "ComplexBaseField", "ObjectIdField", "GeoJsonBaseField")
 
 
-class BaseField(object):
+class BaseField:
     """A base class for fields in a MongoDB document. Instances of this class
     may be added to subclasses of `Document` to define a document's schema.
 
@@ -310,7 +310,7 @@ def __get__(self, instance, owner):
             if hasattr(instance._data[self.name], "_dereferenced"):
                 instance._data[self.name]._dereferenced = True
 
-        value = super(ComplexBaseField, self).__get__(instance, owner)
+        value = super().__get__(instance, owner)
 
         # Convert lists / values so we can watch for any changes on them
         if isinstance(value, (list, tuple)):
@@ -541,7 +541,7 @@ def __init__(self, auto_index=True, *args, **kwargs):
         self._name = "%sField" % self._type
         if not auto_index:
             self._geo_index = False
-        super(GeoJsonBaseField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def validate(self, value):
         """Validate the GeoJson object based on its type."""
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 473e6b181..ce24ff586 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -22,7 +22,7 @@ class DocumentMetaclass(type):
     # TODO lower complexity of this method
     def __new__(mcs, name, bases, attrs):
         flattened_bases = mcs._get_bases(bases)
-        super_new = super(DocumentMetaclass, mcs).__new__
+        super_new = super().__new__
 
         # If a base class just call super
         metaclass = attrs.get("my_metaclass")
@@ -231,8 +231,7 @@ def __get_bases(mcs, bases):
             if base is object:
                 continue
             yield base
-            for child_base in mcs.__get_bases(base.__bases__):
-                yield child_base
+            yield from mcs.__get_bases(base.__bases__)
 
     @classmethod
     def _import_classes(mcs):
@@ -250,7 +249,7 @@ class TopLevelDocumentMetaclass(DocumentMetaclass):
 
     def __new__(mcs, name, bases, attrs):
         flattened_bases = mcs._get_bases(bases)
-        super_new = super(TopLevelDocumentMetaclass, mcs).__new__
+        super_new = super().__new__
 
         # Set default _meta data if base class, otherwise get user defined meta
         if attrs.get("my_metaclass") == TopLevelDocumentMetaclass:
diff --git a/mongoengine/base/utils.py b/mongoengine/base/utils.py
index 8f27ee14d..7753ad50c 100644
--- a/mongoengine/base/utils.py
+++ b/mongoengine/base/utils.py
@@ -1,7 +1,7 @@
 import re
 
 
-class LazyRegexCompiler(object):
+class LazyRegexCompiler:
     """Descriptor to allow lazy compilation of regex"""
 
     def __init__(self, pattern, flags=0):
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index b03e0b1de..13d170ec5 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -395,8 +395,8 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
 
         if new_conn_settings != prev_conn_setting:
             err_msg = (
-                u"A different connection with alias `{}` was already "
-                u"registered. Use disconnect() first"
+                "A different connection with alias `{}` was already "
+                "registered. Use disconnect() first"
             ).format(alias)
             raise ConnectionFailure(err_msg)
     else:
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 5e9a6e8bf..8bfb902b8 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -16,7 +16,7 @@
 )
 
 
-class switch_db(object):
+class switch_db:
     """switch_db alias context manager.
 
     Example ::
@@ -57,7 +57,7 @@ def __exit__(self, t, value, traceback):
         self.cls._collection = self.collection
 
 
-class switch_collection(object):
+class switch_collection:
     """switch_collection alias context manager.
 
     Example ::
@@ -99,7 +99,7 @@ def __exit__(self, t, value, traceback):
         self.cls._get_collection_name = self.ori_get_collection_name
 
 
-class no_dereference(object):
+class no_dereference:
     """no_dereference context manager.
 
     Turns off all dereferencing in Documents for the duration of the context
@@ -139,7 +139,7 @@ def __exit__(self, t, value, traceback):
         return self.cls
 
 
-class no_sub_classes(object):
+class no_sub_classes:
     """no_sub_classes context manager.
 
     Only returns instances of this class and no sub (inherited) classes::
@@ -167,7 +167,7 @@ def __exit__(self, t, value, traceback):
         self.cls._subclasses = self.cls_initial_subclasses
 
 
-class query_counter(object):
+class query_counter:
     """Query_counter context manager to get the number of queries.
     This works by updating the `profiling_level` of the database so that all queries get logged,
     resetting the db.system.profile collection at the beginning of the context and counting the new entries.
@@ -234,7 +234,7 @@ def __int__(self):
 
     def __repr__(self):
         """repr query_counter as the number of queries."""
-        return u"%s" % self._get_count()
+        return "%s" % self._get_count()
 
     def _get_count(self):
         """Get the number of queries by counting the current number of entries in db.system.profile
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 3756d84a0..ff608a3b3 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -14,7 +14,7 @@
 from mongoengine.queryset import QuerySet
 
 
-class DeReference(object):
+class DeReference:
     def __call__(self, items, max_depth=1, instance=None, name=None):
         """
         Cheaply dereferences the items to a set depth.
diff --git a/mongoengine/document.py b/mongoengine/document.py
index e13918c29..9166a9596 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -79,7 +79,7 @@ class EmbeddedDocument(BaseDocument, metaclass=DocumentMetaclass):
     __hash__ = None
 
     def __init__(self, *args, **kwargs):
-        super(EmbeddedDocument, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._instance = None
         self._changed_fields = []
 
@@ -92,7 +92,7 @@ def __ne__(self, other):
         return not self.__eq__(other)
 
     def to_mongo(self, *args, **kwargs):
-        data = super(EmbeddedDocument, self).to_mongo(*args, **kwargs)
+        data = super().to_mongo(*args, **kwargs)
 
         # remove _id from the SON if it's in it and it's None
         if "_id" in data and data["_id"] is None:
@@ -256,7 +256,7 @@ def _get_capped_collection(cls):
         return db.create_collection(collection_name, **opts)
 
     def to_mongo(self, *args, **kwargs):
-        data = super(Document, self).to_mongo(*args, **kwargs)
+        data = super().to_mongo(*args, **kwargs)
 
         # If '_id' is None, try and set it from self._data. If that
         # doesn't exist either, remove '_id' from the SON completely.
@@ -427,14 +427,14 @@ def save(
                 self.cascade_save(**kwargs)
 
         except pymongo.errors.DuplicateKeyError as err:
-            message = u"Tried to save duplicate unique keys (%s)"
+            message = "Tried to save duplicate unique keys (%s)"
             raise NotUniqueError(message % err)
         except pymongo.errors.OperationFailure as err:
             message = "Could not save document (%s)"
             if re.match("^E1100[01] duplicate key", str(err)):
                 # E11000 - duplicate key error index
                 # E11001 - duplicate key on update
-                message = u"Tried to save duplicate unique keys (%s)"
+                message = "Tried to save duplicate unique keys (%s)"
                 raise NotUniqueError(message % err)
             raise OperationError(message % err)
 
@@ -639,7 +639,7 @@ def delete(self, signal_kwargs=None, **write_concern):
                 write_concern=write_concern, _from_doc_delete=True
             )
         except pymongo.errors.OperationFailure as err:
-            message = u"Could not delete document (%s)" % err.message
+            message = "Could not delete document (%s)" % err.message
             raise OperationError(message)
         signals.post_delete.send(self.__class__, document=self, **signal_kwargs)
 
@@ -988,10 +988,10 @@ def get_indexes_spec(cls):
                     indexes.append(index)
 
         # finish up by appending { '_id': 1 } and { '_cls': 1 }, if needed
-        if [(u"_id", 1)] not in indexes:
-            indexes.append([(u"_id", 1)])
+        if [("_id", 1)] not in indexes:
+            indexes.append([("_id", 1)])
         if cls._meta.get("index_cls", True) and cls._meta.get("allow_inheritance"):
-            indexes.append([(u"_cls", 1)])
+            indexes.append([("_cls", 1)])
 
         return indexes
 
@@ -1015,14 +1015,14 @@ def compare_indexes(cls):
         extra = [index for index in existing if index not in required]
 
         # if { _cls: 1 } is missing, make sure it's *really* necessary
-        if [(u"_cls", 1)] in missing:
+        if [("_cls", 1)] in missing:
             cls_obsolete = False
             for index in existing:
                 if includes_cls(index) and index not in extra:
                     cls_obsolete = True
                     break
             if cls_obsolete:
-                missing.remove([(u"_cls", 1)])
+                missing.remove([("_cls", 1)])
 
         return {"missing": missing, "extra": extra}
 
@@ -1055,7 +1055,7 @@ def __delattr__(self, *args, **kwargs):
             setattr(self, field_name, None)
             self._dynamic_fields[field_name].null = False
         else:
-            super(DynamicDocument, self).__delattr__(*args, **kwargs)
+            super().__delattr__(*args, **kwargs)
 
 
 class DynamicEmbeddedDocument(EmbeddedDocument, metaclass=DocumentMetaclass):
@@ -1083,7 +1083,7 @@ def __delattr__(self, *args, **kwargs):
             setattr(self, field_name, None)
 
 
-class MapReduceDocument(object):
+class MapReduceDocument:
     """A document returned from a map/reduce query.
 
     :param collection: An instance of :class:`~pymongo.Collection`
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 76c25773b..95564ff9d 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -85,7 +85,7 @@ class ValidationError(AssertionError):
     _message = None
 
     def __init__(self, message="", **kwargs):
-        super(ValidationError, self).__init__(message)
+        super().__init__(message)
         self.errors = kwargs.get("errors", {})
         self.field_name = kwargs.get("field_name")
         self.message = message
@@ -97,7 +97,7 @@ def __repr__(self):
         return "{}({},)".format(self.__class__.__name__, self.message)
 
     def __getattribute__(self, name):
-        message = super(ValidationError, self).__getattribute__(name)
+        message = super().__getattribute__(name)
         if name == "message":
             if self.field_name:
                 message = "%s" % message
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 91f85d269..b4cf4d258 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -103,7 +103,7 @@ def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):
         self.regex = re.compile(regex) if regex else None
         self.max_length = max_length
         self.min_length = min_length
-        super(StringField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def to_python(self, value):
         if isinstance(value, str):
@@ -151,7 +151,7 @@ def prepare_query_value(self, op, value):
             # escape unsafe characters which could lead to a re.error
             value = re.escape(value)
             value = re.compile(regex % value, flags)
-        return super(StringField, self).prepare_query_value(op, value)
+        return super().prepare_query_value(op, value)
 
 
 class URLField(StringField):
@@ -175,17 +175,17 @@ class URLField(StringField):
     def __init__(self, url_regex=None, schemes=None, **kwargs):
         self.url_regex = url_regex or self._URL_REGEX
         self.schemes = schemes or self._URL_SCHEMES
-        super(URLField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def validate(self, value):
         # Check first if the scheme is valid
         scheme = value.split("://")[0].lower()
         if scheme not in self.schemes:
-            self.error(u"Invalid scheme {} in URL: {}".format(scheme, value))
+            self.error("Invalid scheme {} in URL: {}".format(scheme, value))
 
         # Then check full URL
         if not self.url_regex.match(value):
-            self.error(u"Invalid URL: {}".format(value))
+            self.error("Invalid URL: {}".format(value))
 
 
 class EmailField(StringField):
@@ -218,7 +218,7 @@ class EmailField(StringField):
         re.IGNORECASE,
     )
 
-    error_msg = u"Invalid email address: %s"
+    error_msg = "Invalid email address: %s"
 
     def __init__(
         self,
@@ -242,7 +242,7 @@ def __init__(
         self.domain_whitelist = domain_whitelist or []
         self.allow_utf8_user = allow_utf8_user
         self.allow_ip_domain = allow_ip_domain
-        super(EmailField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def validate_user_part(self, user_part):
         """Validate the user part of the email address. Return True if
@@ -269,13 +269,13 @@ def validate_domain_part(self, domain_part):
                 try:
                     socket.inet_pton(addr_family, domain_part[1:-1])
                     return True
-                except (socket.error, UnicodeEncodeError):
+                except (OSError, UnicodeEncodeError):
                     pass
 
         return False
 
     def validate(self, value):
-        super(EmailField, self).validate(value)
+        super().validate(value)
 
         if "@" not in value:
             self.error(self.error_msg % value)
@@ -310,7 +310,7 @@ class IntField(BaseField):
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
         self.min_value, self.max_value = min_value, max_value
-        super(IntField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def to_python(self, value):
         try:
@@ -335,7 +335,7 @@ def prepare_query_value(self, op, value):
         if value is None:
             return value
 
-        return super(IntField, self).prepare_query_value(op, int(value))
+        return super().prepare_query_value(op, int(value))
 
 
 class LongField(BaseField):
@@ -343,7 +343,7 @@ class LongField(BaseField):
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
         self.min_value, self.max_value = min_value, max_value
-        super(LongField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def to_python(self, value):
         try:
@@ -371,7 +371,7 @@ def prepare_query_value(self, op, value):
         if value is None:
             return value
 
-        return super(LongField, self).prepare_query_value(op, int(value))
+        return super().prepare_query_value(op, int(value))
 
 
 class FloatField(BaseField):
@@ -379,7 +379,7 @@ class FloatField(BaseField):
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
         self.min_value, self.max_value = min_value, max_value
-        super(FloatField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def to_python(self, value):
         try:
@@ -408,7 +408,7 @@ def prepare_query_value(self, op, value):
         if value is None:
             return value
 
-        return super(FloatField, self).prepare_query_value(op, float(value))
+        return super().prepare_query_value(op, float(value))
 
 
 class DecimalField(BaseField):
@@ -455,7 +455,7 @@ def __init__(
         self.precision = precision
         self.rounding = rounding
 
-        super(DecimalField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def to_python(self, value):
         if value is None:
@@ -493,7 +493,7 @@ def validate(self, value):
             self.error("Decimal value is too large")
 
     def prepare_query_value(self, op, value):
-        return super(DecimalField, self).prepare_query_value(op, self.to_mongo(value))
+        return super().prepare_query_value(op, self.to_mongo(value))
 
 
 class BooleanField(BaseField):
@@ -533,7 +533,7 @@ class DateTimeField(BaseField):
     def validate(self, value):
         new_value = self.to_mongo(value)
         if not isinstance(new_value, (datetime.datetime, datetime.date)):
-            self.error(u'cannot parse date "%s"' % value)
+            self.error('cannot parse date "%s"' % value)
 
     def to_mongo(self, value):
         if value is None:
@@ -590,19 +590,19 @@ def _parse_datetime(self, value):
                     return None
 
     def prepare_query_value(self, op, value):
-        return super(DateTimeField, self).prepare_query_value(op, self.to_mongo(value))
+        return super().prepare_query_value(op, self.to_mongo(value))
 
 
 class DateField(DateTimeField):
     def to_mongo(self, value):
-        value = super(DateField, self).to_mongo(value)
+        value = super().to_mongo(value)
         # drop hours, minutes, seconds
         if isinstance(value, datetime.datetime):
             value = datetime.datetime(value.year, value.month, value.day)
         return value
 
     def to_python(self, value):
-        value = super(DateField, self).to_python(value)
+        value = super().to_python(value)
         # convert datetime to date
         if isinstance(value, datetime.datetime):
             value = datetime.date(value.year, value.month, value.day)
@@ -636,7 +636,7 @@ def __init__(self, separator=",", **kwargs):
         """
         self.separator = separator
         self.format = separator.join(["%Y", "%m", "%d", "%H", "%M", "%S", "%f"])
-        super(ComplexDateTimeField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def _convert_from_datetime(self, val):
         """
@@ -667,14 +667,14 @@ def __get__(self, instance, owner):
         if instance is None:
             return self
 
-        data = super(ComplexDateTimeField, self).__get__(instance, owner)
+        data = super().__get__(instance, owner)
 
         if isinstance(data, datetime.datetime) or data is None:
             return data
         return self._convert_from_string(data)
 
     def __set__(self, instance, value):
-        super(ComplexDateTimeField, self).__set__(instance, value)
+        super().__set__(instance, value)
         value = instance._data[self.name]
         if value is not None:
             instance._data[self.name] = self._convert_from_datetime(value)
@@ -696,9 +696,7 @@ def to_mongo(self, value):
         return self._convert_from_datetime(value)
 
     def prepare_query_value(self, op, value):
-        return super(ComplexDateTimeField, self).prepare_query_value(
-            op, self._convert_from_datetime(value)
-        )
+        return super().prepare_query_value(op, self._convert_from_datetime(value))
 
 
 class EmbeddedDocumentField(BaseField):
@@ -718,7 +716,7 @@ def __init__(self, document_type, **kwargs):
             )
 
         self.document_type_obj = document_type
-        super(EmbeddedDocumentField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     @property
     def document_type(self):
@@ -779,7 +777,7 @@ def prepare_query_value(self, op, value):
                     "Querying the embedded document '%s' failed, due to an invalid query value"
                     % (self.document_type._class_name,)
                 )
-        super(EmbeddedDocumentField, self).prepare_query_value(op, value)
+        super().prepare_query_value(op, value)
         return self.to_mongo(value)
 
 
@@ -795,9 +793,7 @@ class GenericEmbeddedDocumentField(BaseField):
     """
 
     def prepare_query_value(self, op, value):
-        return super(GenericEmbeddedDocumentField, self).prepare_query_value(
-            op, self.to_mongo(value)
-        )
+        return super().prepare_query_value(op, self.to_mongo(value))
 
     def to_python(self, value):
         if isinstance(value, dict):
@@ -885,7 +881,7 @@ def to_python(self, value):
                 value = doc_cls._get_db().dereference(value["_ref"])
             return doc_cls._from_son(value)
 
-        return super(DynamicField, self).to_python(value)
+        return super().to_python(value)
 
     def lookup_member(self, member_name):
         return member_name
@@ -893,7 +889,7 @@ def lookup_member(self, member_name):
     def prepare_query_value(self, op, value):
         if isinstance(value, str):
             return StringField().prepare_query_value(op, value)
-        return super(DynamicField, self).prepare_query_value(op, self.to_mongo(value))
+        return super().prepare_query_value(op, self.to_mongo(value))
 
     def validate(self, value, clean=True):
         if hasattr(value, "validate"):
@@ -914,7 +910,7 @@ def __init__(self, field=None, max_length=None, **kwargs):
         self.field = field
         self.max_length = max_length
         kwargs.setdefault("default", lambda: [])
-        super(ListField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def __get__(self, instance, owner):
         if instance is None:
@@ -928,7 +924,7 @@ def __get__(self, instance, owner):
             and value
         ):
             instance._data[self.name] = [self.field.build_lazyref(x) for x in value]
-        return super(ListField, self).__get__(instance, owner)
+        return super().__get__(instance, owner)
 
     def validate(self, value):
         """Make sure that a list of valid fields is being used."""
@@ -942,7 +938,7 @@ def validate(self, value):
         if self.max_length is not None and len(value) > self.max_length:
             self.error("List is too long")
 
-        super(ListField, self).validate(value)
+        super().validate(value)
 
     def prepare_query_value(self, op, value):
         # Validate that the `set` operator doesn't contain more items than `max_length`.
@@ -963,7 +959,7 @@ def prepare_query_value(self, op, value):
 
             return self.field.prepare_query_value(op, value)
 
-        return super(ListField, self).prepare_query_value(op, value)
+        return super().prepare_query_value(op, value)
 
 
 class EmbeddedDocumentListField(ListField):
@@ -984,9 +980,7 @@ def __init__(self, document_type, **kwargs):
         :param kwargs: Keyword arguments passed directly into the parent
          :class:`~mongoengine.ListField`.
         """
-        super(EmbeddedDocumentListField, self).__init__(
-            field=EmbeddedDocumentField(document_type), **kwargs
-        )
+        super().__init__(field=EmbeddedDocumentField(document_type), **kwargs)
 
 
 class SortedListField(ListField):
@@ -1012,10 +1006,10 @@ def __init__(self, field, **kwargs):
             self._ordering = kwargs.pop("ordering")
         if "reverse" in kwargs.keys():
             self._order_reverse = kwargs.pop("reverse")
-        super(SortedListField, self).__init__(field, **kwargs)
+        super().__init__(field, **kwargs)
 
     def to_mongo(self, value, use_db_field=True, fields=None):
-        value = super(SortedListField, self).to_mongo(value, use_db_field, fields)
+        value = super().to_mongo(value, use_db_field, fields)
         if self._ordering is not None:
             return sorted(
                 value, key=itemgetter(self._ordering), reverse=self._order_reverse
@@ -1068,7 +1062,7 @@ def __init__(self, field=None, *args, **kwargs):
         self._auto_dereference = False
 
         kwargs.setdefault("default", lambda: {})
-        super(DictField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def validate(self, value):
         """Make sure that a list of valid fields is being used."""
@@ -1090,7 +1084,7 @@ def validate(self, value):
             self.error(
                 'Invalid dictionary key name - keys may not startswith "$" characters'
             )
-        super(DictField, self).validate(value)
+        super().validate(value)
 
     def lookup_member(self, member_name):
         return DictField(db_field=member_name)
@@ -1119,7 +1113,7 @@ def prepare_query_value(self, op, value):
                 }
             return self.field.prepare_query_value(op, value)
 
-        return super(DictField, self).prepare_query_value(op, value)
+        return super().prepare_query_value(op, value)
 
 
 class MapField(DictField):
@@ -1134,7 +1128,7 @@ def __init__(self, field=None, *args, **kwargs):
         # XXX ValidationError raised outside of the "validate" method.
         if not isinstance(field, BaseField):
             self.error("Argument to MapField constructor must be a valid field")
-        super(MapField, self).__init__(field=field, *args, **kwargs)
+        super().__init__(field=field, *args, **kwargs)
 
 
 class ReferenceField(BaseField):
@@ -1205,7 +1199,7 @@ def __init__(
         self.dbref = dbref
         self.document_type_obj = document_type
         self.reverse_delete_rule = reverse_delete_rule
-        super(ReferenceField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     @property
     def document_type(self):
@@ -1238,7 +1232,7 @@ def __get__(self, instance, owner):
             else:
                 instance._data[self.name] = cls._from_son(dereferenced)
 
-        return super(ReferenceField, self).__get__(instance, owner)
+        return super().__get__(instance, owner)
 
     def to_mongo(self, document):
         if isinstance(document, DBRef):
@@ -1289,7 +1283,7 @@ def to_python(self, value):
     def prepare_query_value(self, op, value):
         if value is None:
             return None
-        super(ReferenceField, self).prepare_query_value(op, value)
+        super().prepare_query_value(op, value)
         return self.to_mongo(value)
 
     def validate(self, value):
@@ -1336,7 +1330,7 @@ def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
         self.auto_sync = auto_sync
         self.document_type_obj = document_type
         self.fields = fields
-        super(CachedReferenceField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def start_listener(self):
         from mongoengine import signals
@@ -1394,7 +1388,7 @@ def __get__(self, instance, owner):
             else:
                 instance._data[self.name] = self.document_type._from_son(dereferenced)
 
-        return super(CachedReferenceField, self).__get__(instance, owner)
+        return super().__get__(instance, owner)
 
     def to_mongo(self, document, use_db_field=True, fields=None):
         id_field_name = self.document_type._meta["id_field"]
@@ -1493,7 +1487,7 @@ class GenericReferenceField(BaseField):
 
     def __init__(self, *args, **kwargs):
         choices = kwargs.pop("choices", None)
-        super(GenericReferenceField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.choices = []
         # Keep the choices as a list of allowed Document class names
         if choices:
@@ -1517,7 +1511,7 @@ def _validate_choices(self, value):
             value = value.get("_cls")
         elif isinstance(value, Document):
             value = value._class_name
-        super(GenericReferenceField, self)._validate_choices(value)
+        super()._validate_choices(value)
 
     def __get__(self, instance, owner):
         if instance is None:
@@ -1533,7 +1527,7 @@ def __get__(self, instance, owner):
             else:
                 instance._data[self.name] = dereferenced
 
-        return super(GenericReferenceField, self).__get__(instance, owner)
+        return super().__get__(instance, owner)
 
     def validate(self, value):
         if not isinstance(value, (Document, DBRef, dict, SON)):
@@ -1597,13 +1591,13 @@ class BinaryField(BaseField):
 
     def __init__(self, max_bytes=None, **kwargs):
         self.max_bytes = max_bytes
-        super(BinaryField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def __set__(self, instance, value):
         """Handle bytearrays in python 3.1"""
         if isinstance(value, bytearray):
             value = bytes(value)
-        return super(BinaryField, self).__set__(instance, value)
+        return super().__set__(instance, value)
 
     def to_mongo(self, value):
         return Binary(value)
@@ -1621,14 +1615,14 @@ def validate(self, value):
     def prepare_query_value(self, op, value):
         if value is None:
             return value
-        return super(BinaryField, self).prepare_query_value(op, self.to_mongo(value))
+        return super().prepare_query_value(op, self.to_mongo(value))
 
 
 class GridFSError(Exception):
     pass
 
 
-class GridFSProxy(object):
+class GridFSProxy:
     """Proxy object to handle writing and reading of files to and from GridFS
 
     .. versionadded:: 0.4
@@ -1808,7 +1802,7 @@ class FileField(BaseField):
     def __init__(
         self, db_alias=DEFAULT_CONNECTION_NAME, collection_name="fs", **kwargs
     ):
-        super(FileField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.collection_name = collection_name
         self.db_alias = db_alias
 
@@ -1953,7 +1947,7 @@ def put(self, file_obj, **kwargs):
         img.save(io, img_format, progressive=progressive)
         io.seek(0)
 
-        return super(ImageGridFsProxy, self).put(
+        return super().put(
             io, width=w, height=h, format=img_format, thumbnail_id=thumb_id, **kwargs
         )
 
@@ -1963,7 +1957,7 @@ def delete(self, *args, **kwargs):
         if out and out.thumbnail_id:
             self.fs.delete(out.thumbnail_id)
 
-        return super(ImageGridFsProxy, self).delete()
+        return super().delete()
 
     def _put_thumbnail(self, thumbnail, format, progressive, **kwargs):
         w, h = thumbnail.size
@@ -2042,7 +2036,7 @@ def __init__(
 
             setattr(self, att_name, value)
 
-        super(ImageField, self).__init__(collection_name=collection_name, **kwargs)
+        super().__init__(collection_name=collection_name, **kwargs)
 
 
 class SequenceField(BaseField):
@@ -2094,7 +2088,7 @@ def __init__(
         self.value_decorator = (
             value_decorator if callable(value_decorator) else self.VALUE_DECORATOR
         )
-        super(SequenceField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def generate(self):
         """
@@ -2155,7 +2149,7 @@ def get_sequence_name(self):
             )
 
     def __get__(self, instance, owner):
-        value = super(SequenceField, self).__get__(instance, owner)
+        value = super().__get__(instance, owner)
         if value is None and instance._initialised:
             value = self.generate()
             instance._data[self.name] = value
@@ -2168,7 +2162,7 @@ def __set__(self, instance, value):
         if value is None and instance._initialised:
             value = self.generate()
 
-        return super(SequenceField, self).__set__(instance, value)
+        return super().__set__(instance, value)
 
     def prepare_query_value(self, op, value):
         """
@@ -2202,7 +2196,7 @@ def __init__(self, binary=True, **kwargs):
         .. versionchanged:: 0.6.19
         """
         self._binary = binary
-        super(UUIDField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     def to_python(self, value):
         if not self._binary:
@@ -2440,7 +2434,7 @@ def __init__(
         self.passthrough = passthrough
         self.document_type_obj = document_type
         self.reverse_delete_rule = reverse_delete_rule
-        super(LazyReferenceField, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     @property
     def document_type(self):
@@ -2483,7 +2477,7 @@ def __get__(self, instance, owner):
         if value:
             instance._data[self.name] = value
 
-        return super(LazyReferenceField, self).__get__(instance, owner)
+        return super().__get__(instance, owner)
 
     def to_mongo(self, value):
         if isinstance(value, LazyReference):
@@ -2547,7 +2541,7 @@ def validate(self, value):
     def prepare_query_value(self, op, value):
         if value is None:
             return None
-        super(LazyReferenceField, self).prepare_query_value(op, value)
+        super().prepare_query_value(op, value)
         return self.to_mongo(value)
 
     def lookup_member(self, member_name):
@@ -2574,12 +2568,12 @@ class GenericLazyReferenceField(GenericReferenceField):
 
     def __init__(self, *args, **kwargs):
         self.passthrough = kwargs.pop("passthrough", False)
-        super(GenericLazyReferenceField, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def _validate_choices(self, value):
         if isinstance(value, LazyReference):
             value = value.document_type._class_name
-        super(GenericLazyReferenceField, self)._validate_choices(value)
+        super()._validate_choices(value)
 
     def build_lazyref(self, value):
         if isinstance(value, LazyReference):
@@ -2608,7 +2602,7 @@ def __get__(self, instance, owner):
         if value:
             instance._data[self.name] = value
 
-        return super(GenericLazyReferenceField, self).__get__(instance, owner)
+        return super().__get__(instance, owner)
 
     def validate(self, value):
         if isinstance(value, LazyReference) and value.pk is None:
@@ -2616,7 +2610,7 @@ def validate(self, value):
                 "You can only reference documents once they have been"
                 " saved to the database"
             )
-        return super(GenericLazyReferenceField, self).validate(value)
+        return super().validate(value)
 
     def to_mongo(self, document):
         if document is None:
@@ -2635,4 +2629,4 @@ def to_mongo(self, document):
                 )
             )
         else:
-            return super(GenericLazyReferenceField, self).to_mongo(document)
+            return super().to_mongo(document)
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index e69011008..4dbf7d470 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -37,7 +37,7 @@
 PULL = 4
 
 
-class BaseQuerySet(object):
+class BaseQuerySet:
     """A set of results returned from a query. Wraps a MongoDB cursor,
     providing :class:`~mongoengine.Document` objects as the results.
     """
@@ -262,7 +262,7 @@ def get(self, *q_objs, **query):
         # If we were able to retrieve the 2nd doc, rewind the cursor and
         # raise the MultipleObjectsReturned exception.
         queryset.rewind()
-        message = u"%d items returned, instead of 1" % queryset.count()
+        message = "%d items returned, instead of 1" % queryset.count()
         raise queryset._document.MultipleObjectsReturned(message)
 
     def create(self, **kwargs):
@@ -351,14 +351,14 @@ def insert(
         except pymongo.errors.BulkWriteError as err:
             # inserting documents that already have an _id field will
             # give huge performance debt or raise
-            message = u"Bulk write error: (%s)"
+            message = "Bulk write error: (%s)"
             raise BulkWriteError(message % err.details)
         except pymongo.errors.OperationFailure as err:
             message = "Could not save document (%s)"
             if re.match("^E1100[01] duplicate key", str(err)):
                 # E11000 - duplicate key error index
                 # E11001 - duplicate key on update
-                message = u"Tried to save duplicate unique keys (%s)"
+                message = "Tried to save duplicate unique keys (%s)"
                 raise NotUniqueError(message % err)
             raise OperationError(message % err)
 
@@ -655,9 +655,9 @@ def modify(
                     **self._cursor_args
                 )
         except pymongo.errors.DuplicateKeyError as err:
-            raise NotUniqueError(u"Update failed (%s)" % err)
+            raise NotUniqueError("Update failed (%s)" % err)
         except pymongo.errors.OperationFailure as err:
-            raise OperationError(u"Update failed (%s)" % err)
+            raise OperationError("Update failed (%s)" % err)
 
         if full_response:
             if result["value"] is not None:
@@ -686,7 +686,7 @@ def with_id(self, object_id):
         return queryset.filter(pk=object_id).first()
 
     def in_bulk(self, object_ids):
-        """Retrieve a set of documents by their ids.
+        """"Retrieve a set of documents by their ids.
 
         :param object_ids: a list or tuple of ``ObjectId``\ s
         :rtype: dict of ObjectIds as keys and collection-specific
@@ -1922,7 +1922,7 @@ def field_sub(match):
             field_name = match.group(1).split(".")
             fields = self._document._lookup_field(field_name)
             # Substitute the correct name for the field into the javascript
-            return u'["%s"]' % fields[-1].db_field
+            return '["%s"]' % fields[-1].db_field
 
         def field_path_sub(match):
             # Extract just the field name, and look up the field objects
diff --git a/mongoengine/queryset/field_list.py b/mongoengine/queryset/field_list.py
index e0d8e3224..443c895cf 100644
--- a/mongoengine/queryset/field_list.py
+++ b/mongoengine/queryset/field_list.py
@@ -1,7 +1,7 @@
 __all__ = ("QueryFieldList",)
 
 
-class QueryFieldList(object):
+class QueryFieldList:
     """Object that handles combinations of .only() and .exclude() calls"""
 
     ONLY = 1
diff --git a/mongoengine/queryset/manager.py b/mongoengine/queryset/manager.py
index 5067ffbf2..699526fdf 100644
--- a/mongoengine/queryset/manager.py
+++ b/mongoengine/queryset/manager.py
@@ -4,7 +4,7 @@
 __all__ = ("queryset_manager", "QuerySetManager")
 
 
-class QuerySetManager(object):
+class QuerySetManager:
     """
     The default QuerySet Manager.
 
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 39b09c9dd..8b5872f8e 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -141,10 +141,10 @@ def count(self, with_limit_and_skip=False):
             getting the count
         """
         if with_limit_and_skip is False:
-            return super(QuerySet, self).count(with_limit_and_skip)
+            return super().count(with_limit_and_skip)
 
         if self._len is None:
-            self._len = super(QuerySet, self).count(with_limit_and_skip)
+            self._len = super().count(with_limit_and_skip)
 
         return self._len
 
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index 72e36ac01..0eacc2ef8 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -7,7 +7,7 @@
 __all__ = ("Q", "QNode")
 
 
-class QNodeVisitor(object):
+class QNodeVisitor:
     """Base visitor class for visiting Q-object nodes in a query tree.
     """
 
@@ -79,7 +79,7 @@ def visit_query(self, query):
         return transform.query(self.document, **query.query)
 
 
-class QNode(object):
+class QNode:
     """Base class for nodes in query trees."""
 
     AND = 0
diff --git a/mongoengine/signals.py b/mongoengine/signals.py
index 0db636045..582b533dc 100644
--- a/mongoengine/signals.py
+++ b/mongoengine/signals.py
@@ -15,11 +15,11 @@
     signals_available = True
 except ImportError:
 
-    class Namespace(object):
+    class Namespace:
         def signal(self, name, doc=None):
             return _FakeSignal(name, doc)
 
-    class _FakeSignal(object):
+    class _FakeSignal:
         """If blinker is unavailable, create a fake class with the same
         interface that allows sending of signals but will fail with an
         error on anything else.  Instead of doing anything on send, it
diff --git a/setup.py b/setup.py
index fe3253ae7..b6c8ea646 100644
--- a/setup.py
+++ b/setup.py
@@ -115,7 +115,7 @@ def run_tests(self):
         "pytest-cov",
         "coverage<5.0",  # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
         "blinker",
-        "Pillow>=2.0.0",
+        "Pillow>=2.0.0, <7.0.0",  # 7.0.0 dropped Python2 support
     ],
 }
 

From b57946ec989defa457b70a2b18bc0543a54bae40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 14 Mar 2020 21:39:47 +0100
Subject: [PATCH 1044/1519] remove virtualenv installation in travis

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d34f8a36a..5d04571a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,8 +60,7 @@ install:
   - pip install --upgrade pip
   - pip install coveralls
   - pip install flake8 flake8-import-order
-  - pip install tox         # tox 3.11.0 has requirement virtualenv>=14.0.0
-  - pip install virtualenv  # virtualenv>=14.0.0 has dropped Python 3.2 support (and pypy3 is based on py32)
+  - pip install tox
   # tox dryrun to setup the tox venv (we run a mock test).
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
   # Install black for Python v3.7 only.

From aa4a6ae0234be23f237f68c3061f9db28c274741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 15 Mar 2020 21:02:44 +0100
Subject: [PATCH 1045/1519] Fix invalid escape seq in codebase

---
 mongoengine/document.py                     | 2 +-
 mongoengine/queryset/base.py                | 6 +++---
 tests/fields/test_complex_datetime_field.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 5e8125100..3cc0046e9 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -56,7 +56,7 @@ class InvalidCollectionError(Exception):
 
 
 class EmbeddedDocument(six.with_metaclass(DocumentMetaclass, BaseDocument)):
-    """A :class:`~mongoengine.Document` that isn't stored in its own
+    r"""A :class:`~mongoengine.Document` that isn't stored in its own
     collection.  :class:`~mongoengine.EmbeddedDocument`\ s should be used as
     fields on :class:`~mongoengine.Document`\ s through the
     :class:`~mongoengine.EmbeddedDocumentField` field type.
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 50cb37acc..7941e9703 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -694,8 +694,8 @@ def with_id(self, object_id):
     def in_bulk(self, object_ids):
         """Retrieve a set of documents by their ids.
 
-        :param object_ids: a list or tuple of ``ObjectId``\ s
-        :rtype: dict of ObjectIds as keys and collection-specific
+        :param object_ids: a list or tuple of ObjectId's
+        :rtype: dict of ObjectId's as keys and collection-specific
                 Document subclasses as values.
 
         .. versionadded:: 0.3
@@ -1140,7 +1140,7 @@ def comment(self, text):
 
     def explain(self):
         """Return an explain plan record for the
-        :class:`~mongoengine.queryset.QuerySet`\ 's cursor.
+        :class:`~mongoengine.queryset.QuerySet` cursor.
         """
         return self._cursor.explain()
 
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index f0a6b96e3..5bd6c56b0 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -65,7 +65,7 @@ class LogEntry(Document):
         for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
             stored = LogEntry(date=datetime.datetime(*values)).to_mongo()["date"]
             assert (
-                re.match("^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$", stored)
+                re.match(r"^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$", stored)
                 is not None
             )
 
@@ -74,7 +74,7 @@ class LogEntry(Document):
             "date_with_dots"
         ]
         assert (
-            re.match("^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$", stored) is not None
+            re.match(r"^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$", stored) is not None
         )
 
     def test_complexdatetime_usage(self):

From c0c0efce188b32f4e59da89ead845a17b824b236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 15 Mar 2020 22:14:26 +0100
Subject: [PATCH 1046/1519] improve docstring related to #2267 and document the
 change in the changelog

---
 docs/changelog.rst           | 1 +
 mongoengine/queryset/base.py | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8dcea62a2..41ff8c85a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Development
 - (Fill this out as you fix issues and develop your features).
 - Add Mongo 4.0 to Travis
 - Fixed a bug causing inaccurate query results, while combining ``__raw__`` and regular filters for the same field #2264
+- Add support for the `elemMatch` projection operator in .fields (e.g BlogPost.objects.fields(elemMatch__comments="test")) #2267
 
 Changes in 0.19.1
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 9671a3dc4..fbf0a1ba4 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1026,9 +1026,11 @@ def fields(self, _only_called=False, **kwargs):
 
             posts = BlogPost.objects(...).fields(comments=0)
 
-        To retrieve a subrange of array elements:
+        To retrieve a subrange or sublist of array elements,
+        support exist for both the `slice` and `elemMatch` projection operator:
 
             posts = BlogPost.objects(...).fields(slice__comments=5)
+            posts = BlogPost.objects(...).fields(elemMatch__comments="test")
 
         :param kwargs: A set of keyword arguments identifying what to
             include, exclude, or slice.

From a3f9016ae938a91871657373ade2970a0fc157d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 15 Mar 2020 22:27:19 +0100
Subject: [PATCH 1047/1519] reformat import for flake8

---
 mongoengine/context_managers.py | 1 +
 mongoengine/queryset/base.py    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 0c58b57c6..6891e21da 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -14,6 +14,7 @@
     "no_sub_classes",
     "query_counter",
     "set_write_concern",
+    "set_read_write_concern",
 )
 
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 0788f5638..d8a4b96f9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -20,8 +20,8 @@
 from mongoengine.common import _import_class
 from mongoengine.connection import get_db
 from mongoengine.context_managers import (
-    set_write_concern,
     set_read_write_concern,
+    set_write_concern,
     switch_db,
 )
 from mongoengine.errors import (

From ad0669a32605bb7d9984b1830349d82c208b3c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 16 Mar 2020 22:39:31 +0100
Subject: [PATCH 1048/1519] update changelog

---
 docs/changelog.rst | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7f68bbe58..1bfb190d8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,13 +8,9 @@ Development
 - (Fill this out as you fix issues and develop your features).
 - Add Mongo 4.0 to Travis
 - Fixed a bug causing inaccurate query results, while combining ``__raw__`` and regular filters for the same field #2264
-- Add support for the `elemMatch` projection operator in .fields (e.g BlogPost.objects.fields(elemMatch__comments="test")) #2267
-
-Changes in 0.19.2
-=================
+- Add support for the `elemMatch` projection operator in .fields() (e.g BlogPost.objects.fields(elemMatch__comments="test")) #2267
 - DictField validate failed without default connection (bug introduced in 0.19.0) #2239
 
-
 Changes in 0.19.1
 =================
 - Requires Pillow < 7.0.0 as it dropped Python2 support

From aadc6262edc5627bafbef41a7c814fedbe66fdb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 17 Mar 2020 21:10:52 +0100
Subject: [PATCH 1049/1519] remove qs.slave_okay() that is deprecated since
 pymongo3

---
 docs/changelog.rst           |  1 +
 mongoengine/queryset/base.py | 16 ----------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1bfb190d8..b20906455 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Development
 - Fixed a bug causing inaccurate query results, while combining ``__raw__`` and regular filters for the same field #2264
 - Add support for the `elemMatch` projection operator in .fields() (e.g BlogPost.objects.fields(elemMatch__comments="test")) #2267
 - DictField validate failed without default connection (bug introduced in 0.19.0) #2239
+- Remove method queryset.slave_okay() that was deprecated a while ago and disappeared since pymongo3
 
 Changes in 0.19.1
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index fbf0a1ba4..95606f2af 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -60,7 +60,6 @@ def __init__(self, document, collection):
         self._ordering = None
         self._snapshot = False
         self._timeout = True
-        self._slave_okay = False
         self._read_preference = None
         self._iter = False
         self._scalar = []
@@ -775,7 +774,6 @@ def _clone_into(self, new_qs):
             "_ordering",
             "_snapshot",
             "_timeout",
-            "_slave_okay",
             "_read_preference",
             "_iter",
             "_scalar",
@@ -1172,20 +1170,6 @@ def timeout(self, enabled):
         queryset._timeout = enabled
         return queryset
 
-    # DEPRECATED. Has no more impact on PyMongo 3+
-    def slave_okay(self, enabled):
-        """Enable or disable the slave_okay when querying.
-
-        :param enabled: whether or not the slave_okay is enabled
-
-        .. deprecated:: Ignored with PyMongo 3+
-        """
-        msg = "slave_okay is deprecated as it has no impact when using PyMongo 3+."
-        warnings.warn(msg, DeprecationWarning)
-        queryset = self.clone()
-        queryset._slave_okay = enabled
-        return queryset
-
     def read_preference(self, read_preference):
         """Change the read_preference when querying.
 

From 8eb51790b50858d351068c3f37316d16143d3b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 17 Mar 2020 21:26:41 +0100
Subject: [PATCH 1050/1519] Remove Field(name='...') which was deprecated when
 db_field was introduced a while ago

---
 docs/changelog.rst         | 1 +
 mongoengine/base/fields.py | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1bfb190d8..32cfe6476 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Development
 - Fixed a bug causing inaccurate query results, while combining ``__raw__`` and regular filters for the same field #2264
 - Add support for the `elemMatch` projection operator in .fields() (e.g BlogPost.objects.fields(elemMatch__comments="test")) #2267
 - DictField validate failed without default connection (bug introduced in 0.19.0) #2239
+- Remove name parameter in Field constructor e.g `StringField(name="...")`, it was deprecated a while ago in favor of db_field
 
 Changes in 0.19.1
 =================
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index cd1039cbb..379098e5b 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -36,7 +36,6 @@ class BaseField(object):
     def __init__(
         self,
         db_field=None,
-        name=None,
         required=False,
         default=None,
         unique=False,
@@ -51,7 +50,6 @@ def __init__(
         """
         :param db_field: The database field to store this field in
             (defaults to the name of the field)
-        :param name: Deprecated - use db_field
         :param required: If the field is required. Whether it has to have a
             value or not. Defaults to False.
         :param default: (optional) The default value for this field if no value
@@ -75,11 +73,8 @@ def __init__(
             existing attributes. Common metadata includes `verbose_name` and
             `help_text`.
         """
-        self.db_field = (db_field or name) if not primary_key else "_id"
+        self.db_field = db_field if not primary_key else "_id"
 
-        if name:
-            msg = 'Field\'s "name" attribute deprecated in favour of "db_field"'
-            warnings.warn(msg, DeprecationWarning)
         self.required = required or primary_key
         self.default = default
         self.unique = bool(unique or unique_with)

From ee2d50b2d1b3549887512bfaefdb1abff3b831fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 17 Mar 2020 21:38:50 +0100
Subject: [PATCH 1051/1519] remove drop_dups index option, deprecated with
 MongoDB3

---
 docs/changelog.rst                 |  6 ++++--
 docs/guide/defining-documents.rst  |  6 ------
 mongoengine/base/metaclasses.py    |  1 -
 mongoengine/document.py            | 15 +--------------
 tests/document/test_indexes.py     | 16 ----------------
 tests/document/test_inheritance.py |  1 -
 6 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a07840505..1037ca134 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,8 +10,10 @@ Development
 - Fixed a bug causing inaccurate query results, while combining ``__raw__`` and regular filters for the same field #2264
 - Add support for the `elemMatch` projection operator in .fields() (e.g BlogPost.objects.fields(elemMatch__comments="test")) #2267
 - DictField validate failed without default connection (bug introduced in 0.19.0) #2239
-- Remove name parameter in Field constructor e.g `StringField(name="...")`, it was deprecated a while ago in favor of db_field
-- Remove method queryset.slave_okay() that was deprecated a while ago and disappeared since pymongo3
+- Remove methods deprecated years ago:
+    - name parameter in Field constructor e.g `StringField(name="...")`, was replaced by db_field
+    - Queryset.slave_okay() was deprecated since pymongo3
+    - dropDups was dropped with MongoDB3
 
 Changes in 0.19.1
 =================
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index bd2b43e25..6dc35c308 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -555,7 +555,6 @@ There are a few top level defaults for all indexes that can be set::
             'index_background': True,
             'index_cls': False,
             'auto_create_index': True,
-            'index_drop_dups': True,
         }
 
 
@@ -574,11 +573,6 @@ There are a few top level defaults for all indexes that can be set::
     in systems where indexes are managed separately. Disabling this will improve
     performance.
 
-:attr:`index_drop_dups` (Optional)
-    Set the default value for if an index should drop duplicates
-    Since MongoDB 3.0 drop_dups is not supported anymore. Raises a Warning
-    and has no effect
-
 
 Compound Indexes and Indexing sub documents
 -------------------------------------------
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index e4d26811a..3bba796b2 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -284,7 +284,6 @@ def __new__(mcs, name, bases, attrs):
                 "indexes": [],  # indexes to be ensured at runtime
                 "id_field": None,
                 "index_background": False,
-                "index_drop_dups": False,
                 "index_opts": None,
                 "delete_rules": None,
                 # allow_inheritance can be True, False, and None. True means
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 3cc0046e9..c8710fb5d 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -851,17 +851,13 @@ def create_index(cls, keys, background=False, **kwargs):
         index_spec = cls._build_index_spec(keys)
         index_spec = index_spec.copy()
         fields = index_spec.pop("fields")
-        drop_dups = kwargs.get("drop_dups", False)
-        if drop_dups:
-            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
-            warnings.warn(msg, DeprecationWarning)
         index_spec["background"] = background
         index_spec.update(kwargs)
 
         return cls._get_collection().create_index(fields, **index_spec)
 
     @classmethod
-    def ensure_index(cls, key_or_list, drop_dups=False, background=False, **kwargs):
+    def ensure_index(cls, key_or_list, background=False, **kwargs):
         """Ensure that the given indexes are in place. Deprecated in favour
         of create_index.
 
@@ -869,12 +865,7 @@ def ensure_index(cls, key_or_list, drop_dups=False, background=False, **kwargs):
             construct a multi-field index); keys may be prefixed with a **+**
             or a **-** to determine the index ordering
         :param background: Allows index creation in the background
-        :param drop_dups: Was removed/ignored with MongoDB >2.7.5. The value
-            will be removed if PyMongo3+ is used
         """
-        if drop_dups:
-            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
-            warnings.warn(msg, DeprecationWarning)
         return cls.create_index(key_or_list, background=background, **kwargs)
 
     @classmethod
@@ -887,12 +878,8 @@ def ensure_indexes(cls):
                   `auto_create_index` to False in the documents meta data
         """
         background = cls._meta.get("index_background", False)
-        drop_dups = cls._meta.get("index_drop_dups", False)
         index_opts = cls._meta.get("index_opts") or {}
         index_cls = cls._meta.get("index_cls", True)
-        if drop_dups:
-            msg = "drop_dups is deprecated and is removed when using PyMongo 3+."
-            warnings.warn(msg, DeprecationWarning)
 
         collection = cls._get_collection()
         # 746: when connection is via mongos, the read preference is not necessarily an indication that
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index be857b590..b08306a09 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -806,18 +806,6 @@ class Log(Document):
         info = Log.objects._collection.index_information()
         assert 3600 == info["created_1"]["expireAfterSeconds"]
 
-    def test_index_drop_dups_silently_ignored(self):
-        class Customer(Document):
-            cust_id = IntField(unique=True, required=True)
-            meta = {
-                "indexes": ["cust_id"],
-                "index_drop_dups": True,
-                "allow_inheritance": False,
-            }
-
-        Customer.drop_collection()
-        Customer.objects.first()
-
     def test_unique_and_indexes(self):
         """Ensure that 'unique' constraints aren't overridden by
         meta.indexes.
@@ -1058,10 +1046,6 @@ class TestChildDoc(TestDoc):
                 del index_info[key][
                     "ns"
                 ]  # drop the index namespace - we don't care about that here, MongoDB 3+
-            if "dropDups" in index_info[key]:
-                del index_info[key][
-                    "dropDups"
-                ]  # drop the index dropDups - it is deprecated in MongoDB 3+
 
         assert index_info == {
             "txt_1": {"key": [("txt", 1)], "background": False},
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index 5072f8419..d7bd0632b 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -523,7 +523,6 @@ def test_abstract_documents(self):
 
         defaults = {
             "index_background": True,
-            "index_drop_dups": True,
             "index_opts": {"hello": "world"},
             "allow_inheritance": True,
             "queryset_class": "QuerySet",

From 3d80637fa414354b2d05b0ca6ac3afb71222d8f1 Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Tue, 17 Mar 2020 19:08:43 -0300
Subject: [PATCH 1052/1519] Refactor set_read_write_concern so read_conern is
 consistent with the write_concerns argument.

---
 mongoengine/context_managers.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 6891e21da..a87c9bb3f 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -261,10 +261,14 @@ def set_write_concern(collection, write_concerns):
 
 
 @contextmanager
-def set_read_write_concern(collection, write_concerns, read_concern):
+def set_read_write_concern(collection, write_concerns, read_concerns):
     combined_write_concerns = dict(collection.write_concern.document.items())
     combined_write_concerns.update(write_concerns)
 
+    combined_read_concerns = dict(collection.read_concern.document.items())
+    combined_read_concerns.update(read_concerns)
+
     yield collection.with_options(
-        write_concern=WriteConcern(**combined_write_concerns), read_concern=read_concern
+        write_concern=WriteConcern(**combined_write_concerns),
+        read_concern=ReadConcern(**combined_read_concerns)
     )

From 4c62a060f0c460b1d68ebba861eb7a3fd9f9e14c Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Tue, 17 Mar 2020 19:37:21 -0300
Subject: [PATCH 1053/1519] Add tests for set_write_conern and
 set_read_write_concern

---
 tests/test_context_managers.py | 48 ++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index fa3f59608..f445cf577 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -10,11 +10,59 @@
     query_counter,
     switch_collection,
     switch_db,
+    set_write_concern,
+    set_read_write_concern,
 )
 from mongoengine.pymongo_support import count_documents
 
 
 class TestContextManagers:
+    def test_set_write_concern(self):
+        connect("mongoenginetest")
+
+        class User(Document):
+            name = StringField()
+
+        collection = User._get_collection()
+        original_write_concern = collection.write_concern
+
+        with set_write_concern(
+            collection, {"w": "majority", "j": True, "wtimeout": 1234}
+        ) as updated_collection:
+            assert updated_collection.write_concern.document == {
+                "w": "majority",
+                "j": True,
+                "wtimeout": 1234,
+            }
+
+        assert original_write_concern.document == collection.write_concern.document
+
+    def test_set_read_write_concern(self):
+        connect("mongoenginetest")
+
+        class User(Document):
+            name = StringField()
+
+        collection = User._get_collection()
+
+        original_read_concern = collection.read_concern
+        original_write_concern = collection.write_concern
+
+        with set_read_write_concern(
+            collection,
+            {"w": "majority", "j": True, "wtimeout": 1234},
+            {"level": "local"},
+        ) as update_collection:
+            assert update_collection.read_concern.document == {"level": "local"}
+            assert update_collection.write_concern.document == {
+                "w": "majority",
+                "j": True,
+                "wtimeout": 1234,
+            }
+
+        assert original_read_concern.document == collection.read_concern.document
+        assert original_write_concern.document == collection.write_concern.document
+
     def test_switch_db_context_manager(self):
         connect("mongoenginetest")
         register_connection("testdb-1", "mongoenginetest2")

From 476b07af6ebe26e0418d1ab8da9e8179794ddc4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 17 Mar 2020 23:59:54 +0100
Subject: [PATCH 1054/1519] reformat changelog

---
 docs/changelog.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9a8447611..9b864b02b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,8 +7,6 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Add Mongo 4.0 to Travis
-- BREAKING CHANGE: Removed ``Queryset._ensure_indexes`` and ``Queryset.ensure_indexes`` that were deprecated in 2013.
-    ``Document.ensure_indexes`` still exists and is the right method to use
 - Fixed a bug causing inaccurate query results, while combining ``__raw__`` and regular filters for the same field #2264
 - Add support for the `elemMatch` projection operator in .fields() (e.g BlogPost.objects.fields(elemMatch__comments="test")) #2267
 - DictField validate failed without default connection (bug introduced in 0.19.0) #2239
@@ -16,6 +14,7 @@ Development
     - name parameter in Field constructor e.g `StringField(name="...")`, was replaced by db_field
     - Queryset.slave_okay() was deprecated since pymongo3
     - dropDups was dropped with MongoDB3
+    - ``Queryset._ensure_indexes`` and ``Queryset.ensure_indexes``, the right method to use is ``Document.ensure_indexes``
 
 Changes in 0.19.1
 =================

From af35b25d155e050cba3e4925bf76529f7ae52137 Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Tue, 17 Mar 2020 21:28:08 -0300
Subject: [PATCH 1055/1519] Refactor read_preference to accept a dictionary
 instead of a ReadPreference instance.

---
 mongoengine/queryset/base.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index d8a4b96f9..f8671f8fb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -5,6 +5,8 @@
 import re
 import warnings
 
+from collections.abc import Mapping
+
 from bson import SON, json_util
 from bson.code import Code
 import pymongo
@@ -1221,11 +1223,11 @@ def read_concern(self, read_concern):
         :param read_concern: override ReplicaSetConnection-level
             preference.
         """
-        if read_concern is not None and not isinstance(read_concern, ReadConcern):
-            raise TypeError("%r is not a read concern." % (read_concern,))
+        if read_concern is not None and not isinstance(read_concern, Mapping):
+            raise TypeError("%r is not a valid read concern." % (read_concern,))
 
         queryset = self.clone()
-        queryset._read_concern = read_concern
+        queryset._read_concern = ReadConcern(**read_concern)
         queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_concern
         return queryset
 

From 8913a74a86e01c3a96aaebf3372b1898c4efe060 Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Tue, 17 Mar 2020 21:31:05 -0300
Subject: [PATCH 1056/1519] Allow setting the read concern to None

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index f8671f8fb..76427c895 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1227,7 +1227,7 @@ def read_concern(self, read_concern):
             raise TypeError("%r is not a valid read concern." % (read_concern,))
 
         queryset = self.clone()
-        queryset._read_concern = ReadConcern(**read_concern)
+        queryset._read_concern = ReadConcern(**read_concern) if read_concern is not None else None
         queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_concern
         return queryset
 

From bc77322c2f166e28390e1492a5a67440f90af021 Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Tue, 17 Mar 2020 21:49:17 -0300
Subject: [PATCH 1057/1519] Update unit tests

---
 tests/queryset/test_queryset.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 8098b137e..a8954526e 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4739,33 +4739,33 @@ class Bar(Document):
         bars = list(Bar.objects.read_concern(None))
         assert bars == [bar]
 
-        bars = Bar.objects.read_concern(ReadConcern(level="local"))
-        assert bars._read_concern == ReadConcern(level="local")
-        assert bars._cursor.collection.read_concern == ReadConcern(level="local")
+        bars = Bar.objects.read_concern({"level": "local"})
+        assert bars._read_concern.document == {"level": "local"}
+        assert bars._cursor.collection.read_concern.document == {"level": "local"}
 
-        # Make sure that `.read_concern(...)` does accept string values.
+        # Make sure that `.read_concern(...)` does not accept string values.
         with pytest.raises(TypeError):
             Bar.objects.read_concern("local")
 
         def assert_read_concern(qs, expected_read_concern):
-            assert qs._read_concern == expected_read_concern
-            assert qs._cursor.collection.read_concern == expected_read_concern
+            assert qs._read_concern.document == expected_read_concern
+            assert qs._cursor.collection.read_concern.document == expected_read_concern
 
         # Make sure read concern is respected after a `.skip(...)`.
-        bars = Bar.objects.skip(1).read_concern(ReadConcern("majority"))
-        assert_read_concern(bars, ReadConcern("majority"))
+        bars = Bar.objects.skip(1).read_concern({"level": "local"})
+        assert_read_concern(bars, {"level": "local"})
 
         # Make sure read concern is respected after a `.limit(...)`.
-        bars = Bar.objects.limit(1).read_concern(ReadConcern("majority"))
-        assert_read_concern(bars, ReadConcern("majority"))
+        bars = Bar.objects.limit(1).read_concern({"level": "local"})
+        assert_read_concern(bars, {"level": "local"})
 
         # Make sure read concern is respected after an `.order_by(...)`.
-        bars = Bar.objects.order_by("txt").read_concern(ReadConcern("majority"))
-        assert_read_concern(bars, ReadConcern("majority"))
+        bars = Bar.objects.order_by("txt").read_concern({"level": "local"})
+        assert_read_concern(bars, {"level": "local"})
 
         # Make sure read concern is respected after a `.hint(...)`.
-        bars = Bar.objects.hint([("txt", 1)]).read_concern(ReadConcern("majority"))
-        assert_read_concern(bars, ReadConcern("majority"))
+        bars = Bar.objects.hint([("txt", 1)]).read_concern({"level": "majority"})
+        assert_read_concern(bars, {"level": "majority"})
 
     def test_json_simple(self):
         class Embedded(EmbeddedDocument):

From 7cc964c7d86d9e6dccf4f819ad291a4150b1d1ee Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Tue, 17 Mar 2020 21:58:36 -0300
Subject: [PATCH 1058/1519] Add missing import

---
 mongoengine/context_managers.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index a87c9bb3f..9319abae6 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,6 +1,7 @@
 from contextlib import contextmanager
 
 from pymongo.write_concern import WriteConcern
+from pymongo.read_concern import ReadConcern
 from six import iteritems
 
 from mongoengine.common import _import_class
@@ -263,10 +264,14 @@ def set_write_concern(collection, write_concerns):
 @contextmanager
 def set_read_write_concern(collection, write_concerns, read_concerns):
     combined_write_concerns = dict(collection.write_concern.document.items())
-    combined_write_concerns.update(write_concerns)
+
+    if write_concerns is not None:
+        combined_write_concerns.update(write_concerns)
 
     combined_read_concerns = dict(collection.read_concern.document.items())
-    combined_read_concerns.update(read_concerns)
+    
+    if read_concerns is not None:
+        combined_read_concerns.update(read_concerns)
 
     yield collection.with_options(
         write_concern=WriteConcern(**combined_write_concerns),

From 2b0157aecddb4a77d25a7fbb724578be3c1e097c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 22 Mar 2020 14:05:04 +0100
Subject: [PATCH 1059/1519] Improve Queryset.get to avoid confusing message in
 case multiple match are found

---
 docs/changelog.rst              |  1 +
 mongoengine/queryset/base.py    |  8 +++++---
 tests/queryset/test_queryset.py | 33 ++++++++++++++++++++++++---------
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9b864b02b..ec0209f2c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Add Mongo 4.0 to Travis
+- Improve Queryset.get to avoid confusing MultipleObjectsReturned message in case multiple match are found #630
 - Fixed a bug causing inaccurate query results, while combining ``__raw__`` and regular filters for the same field #2264
 - Add support for the `elemMatch` projection operator in .fields() (e.g BlogPost.objects.fields(elemMatch__comments="test")) #2267
 - DictField validate failed without default connection (bug introduced in 0.19.0) #2239
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index eed304136..15c584810 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -259,16 +259,18 @@ def get(self, *q_objs, **query):
         except StopIteration:
             msg = "%s matching query does not exist." % queryset._document._class_name
             raise queryset._document.DoesNotExist(msg)
+
         try:
+            # Check if there is another match
             six.next(queryset)
         except StopIteration:
             return result
 
         # If we were able to retrieve the 2nd doc, rewind the cursor and
         # raise the MultipleObjectsReturned exception.
-        queryset.rewind()
-        message = u"%d items returned, instead of 1" % queryset.count()
-        raise queryset._document.MultipleObjectsReturned(message)
+        raise queryset._document.MultipleObjectsReturned(
+            u"2 or more items returned, instead of 1"
+        )
 
     def create(self, **kwargs):
         """Create new object. Returns the saved object instance.
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index f6d1a916e..f15b97482 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -274,32 +274,47 @@ def test_find_one(self):
         with pytest.raises(InvalidQueryError):
             self.Person.objects(name="User A").with_id(person1.id)
 
-    def test_find_only_one(self):
-        """Ensure that a query using ``get`` returns at most one result.
-        """
+    def test_get_no_document_exists_raises_doesnotexist(self):
+        assert self.Person.objects.count() == 0
         # Try retrieving when no objects exists
         with pytest.raises(DoesNotExist):
             self.Person.objects.get()
         with pytest.raises(self.Person.DoesNotExist):
             self.Person.objects.get()
 
+    def test_get_multiple_match_raises_multipleobjectsreturned(self):
+        """Ensure that a query using ``get`` returns at most one result.
+        """
+        assert self.Person.objects().count() == 0
+
         person1 = self.Person(name="User A", age=20)
         person1.save()
-        person2 = self.Person(name="User B", age=30)
+
+        p = self.Person.objects.get()
+        assert p == person1
+
+        person2 = self.Person(name="User B", age=20)
         person2.save()
 
-        # Retrieve the first person from the database
+        person3 = self.Person(name="User C", age=30)
+        person3.save()
+
+        # .get called without argument
         with pytest.raises(MultipleObjectsReturned):
             self.Person.objects.get()
         with pytest.raises(self.Person.MultipleObjectsReturned):
             self.Person.objects.get()
 
+        # check filtering
+        with pytest.raises(MultipleObjectsReturned):
+            self.Person.objects.get(age__lt=30)
+        with pytest.raises(MultipleObjectsReturned) as exc_info:
+            self.Person.objects(age__lt=30).get()
+        assert "2 or more items returned, instead of 1" == str(exc_info.value)
+
         # Use a query to filter the people found to just person2
         person = self.Person.objects.get(age=30)
-        assert person.name == "User B"
-
-        person = self.Person.objects.get(age__lt=30)
-        assert person.name == "User A"
+        assert person == person3
 
     def test_find_array_position(self):
         """Ensure that query by array position works.

From ce74978b1ece68710b33295524b7563271cd44d4 Mon Sep 17 00:00:00 2001
From: Kes <kg.v.ekeren@gmail.com>
Date: Thu, 26 Mar 2020 17:23:16 +0100
Subject: [PATCH 1060/1519] Correct and improve docstring on
 EmbeddedDocumentList.create()

---
 mongoengine/base/datastructures.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index dcc1f092c..0572e22e3 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -303,11 +303,11 @@ def first(self):
 
     def create(self, **values):
         """
-        Creates a new embedded document and saves it to the database.
+        Creates a new instance of the EmbeddedDocument and appends it to this EmbeddedDocumentList.
 
         .. note::
-            The embedded document changes are not automatically saved
-            to the database after calling this method.
+            the instance of the EmbeddedDocument is not automatically saved to the database.
+            You still need to call save() o this EmbeddedDocumentList.
 
         :param values: A dictionary of values for the embedded document.
         :return: The new embedded document instance.

From d73f0bb1af7fa63424137174da76f89dca762010 Mon Sep 17 00:00:00 2001
From: Kes <kg.v.ekeren@gmail.com>
Date: Thu, 26 Mar 2020 17:25:25 +0100
Subject: [PATCH 1061/1519] fix typo

---
 mongoengine/base/datastructures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 0572e22e3..fd93c1db2 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -307,7 +307,7 @@ def create(self, **values):
 
         .. note::
             the instance of the EmbeddedDocument is not automatically saved to the database.
-            You still need to call save() o this EmbeddedDocumentList.
+            You still need to call save() on this EmbeddedDocumentList.
 
         :param values: A dictionary of values for the embedded document.
         :return: The new embedded document instance.

From 707923e3f5d7682df58652a598edf2127a4ff95a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 8 Apr 2020 21:43:50 +0200
Subject: [PATCH 1062/1519] fix subdependencies that dropped Py2 support

---
 setup.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/setup.py b/setup.py
index 5cba5d9e0..11185fd20 100644
--- a/setup.py
+++ b/setup.py
@@ -121,6 +121,8 @@ def run_tests(self):
         "blinker",
         "Pillow>=2.0.0, <7.0.0",  # 7.0.0 dropped Python2 support
         "zipp<2.0.0",  # (dependency of pytest) dropped python2 support
+        "pyparsing<3",  # sub-dependency that dropped py2 support
+        "configparser<5",  # sub-dependency that dropped py2 support
     ],
 }
 if PY3:

From 43724e40b2871d8ca97b437a97ff6d2db01d8001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 25 Apr 2020 14:16:56 +0200
Subject: [PATCH 1063/1519] improve doc related to dropping Py2 support

---
 CONTRIBUTING.rst | 2 +-
 setup.py         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index d939e2ee3..4afcd69e0 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -20,7 +20,7 @@ post to the `user group <http://groups.google.com/group/mongoengine-users>`
 Supported Interpreters
 ----------------------
 
-MongoEngine supports CPython 3.7 and newer as well as Pypy3.
+MongoEngine supports CPython 3.5 and newer as well as Pypy3.
 Language features not supported by all interpreters can not be used.
 
 Python3 codebase
diff --git a/setup.py b/setup.py
index b6c8ea646..4d63b5b28 100644
--- a/setup.py
+++ b/setup.py
@@ -97,11 +97,11 @@ def run_tests(self):
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 2",
-    "Programming Language :: Python :: 2.7",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Database",

From f4d7e72426f7fe26c913bc5872c6a12711d85123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 25 Apr 2020 20:43:55 +0200
Subject: [PATCH 1064/1519] improve .gitignore

---
 .gitignore | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 048a2d192..16633baef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,15 @@
-.*
 !.gitignore
 *~
 *.py[co]
 .*.sw[po]
+.cache/
+.coverage
+.coveragerc
+.env
+.idea/
+.pytest_cache/
+.tox/
+.eggs/
 *.egg
 docs/.build
 docs/_build
@@ -13,8 +20,6 @@ env/
 .settings
 .project
 .pydevproject
-tests/test_bugfix.py
 htmlcov/
 venv
 venv3
-scratchpad

From ef7da36ac681e572461971c87549e3d5f7e108b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 25 Apr 2020 21:36:07 +0200
Subject: [PATCH 1065/1519] Update pre-commit and fix existing flake8 warnings
 once for all

---
 .pre-commit-config.yaml                   | 14 +++++++-------
 .travis.yml                               |  8 +++-----
 tests/document/test_instance.py           | 18 +++++++++---------
 tests/fields/test_dict_field.py           |  2 +-
 tests/fields/test_lazy_reference_field.py |  6 +++---
 tests/queryset/test_queryset.py           | 20 ++++++++++----------
 tests/test_connection.py                  |  6 +++---
 tests/test_context_managers.py            | 12 ++++++------
 tests/test_signals.py                     |  2 +-
 9 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index cac25e41f..8b7941031 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,13 +1,13 @@
+fail_fast: false
 repos:
     - repo: https://github.com/ambv/black
-      rev: 19.3b0
+      rev: 19.10b0
       hooks:
         - id: black
-          language_version: python3
-
-    - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v2.2.3
+#          language_version: python3
+    - repo: https://gitlab.com/pycqa/flake8
+      rev: 3.8.0a2
       hooks:
-        - id: trailing-whitespace
-        - id: end-of-file-fixer
         - id: flake8
+          additional_dependencies:
+            - flake8-import-order
diff --git a/.travis.yml b/.travis.yml
index 5d04571a3..a99f11178 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,18 +59,16 @@ install:
   # Install Python dependencies.
   - pip install --upgrade pip
   - pip install coveralls
-  - pip install flake8 flake8-import-order
+  - pip install pre-commit
   - pip install tox
   # tox dryrun to setup the tox venv (we run a mock test).
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
-  # Install black for Python v3.7 only.
-  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then pip install black; fi
 
 before_script:
   - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
   - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
-  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then flake8 .; else echo "flake8 only runs on py37"; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then black --check .; else echo "black only runs on py37"; fi
+  # Run pre-commit hooks (black, flake8, etc) on entire codebase
+  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then pre-commit run -a; else echo "pre-commit checks only runs on py37"; fi
   - mongo --eval 'db.version();'    # Make sure mongo is awake
 
 script:
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 920bf3928..993cc1616 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -1414,7 +1414,7 @@ def test_update_rename_operator(self):
         assert raw_doc["first_name"] == "John"
 
     def test_inserts_if_you_set_the_pk(self):
-        p1 = self.Person(name="p1", id=bson.ObjectId()).save()
+        _ = self.Person(name="p1", id=bson.ObjectId()).save()
         p2 = self.Person(name="p2")
         p2.id = bson.ObjectId()
         p2.save()
@@ -2195,7 +2195,7 @@ class Book(Document):
 
         user = User(name="Mike").save()
         reviewer = User(name="John").save()
-        book = Book(author=user, reviewer=reviewer).save()
+        _ = Book(author=user, reviewer=reviewer).save()
 
         reviewer.delete()
         assert Book.objects.count() == 1
@@ -2221,7 +2221,7 @@ class Book(Document):
 
         user_1 = User(id=1).save()
         user_2 = User(id=2).save()
-        book_1 = Book(id=1, author=user_2).save()
+        _ = Book(id=1, author=user_2).save()
         book_2 = Book(id=2, author=user_1).save()
 
         user_2.delete()
@@ -2230,7 +2230,7 @@ class Book(Document):
         assert Book.objects.get() == book_2
 
         user_3 = User(id=3).save()
-        book_3 = Book(id=3, author=user_3).save()
+        _ = Book(id=3, author=user_3).save()
 
         user_3.delete()
         # Deleting user_3 should also delete book_3
@@ -3204,7 +3204,7 @@ def __eq__(self, other):
     def test_positional_creation(self):
         """Document cannot be instantiated using positional arguments."""
         with pytest.raises(TypeError) as exc_info:
-            person = self.Person("Test User", 42)
+            self.Person("Test User", 42)
 
         expected_msg = (
             "Instantiating a document with positional arguments is not "
@@ -3606,13 +3606,13 @@ class B(EmbeddedDocument):
             v = StringField()
 
         class A(Document):
-            l = ListField(EmbeddedDocumentField(B))
+            array = ListField(EmbeddedDocumentField(B))
 
         A.objects.delete()
-        A(l=[B(v="1"), B(v="2"), B(v="3")]).save()
+        A(array=[B(v="1"), B(v="2"), B(v="3")]).save()
         a = A.objects.get()
-        assert a.l._instance == a
-        for idx, b in enumerate(a.l):
+        assert a.array._instance == a
+        for idx, b in enumerate(a.array):
             assert b._instance == a
         assert idx == 2
 
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 6850cd584..f423bf8bc 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-import pytest
 from bson import InvalidDocument
+import pytest
 
 from mongoengine import *
 from mongoengine.base import BaseDict
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index b5b8690e3..50e60262a 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -152,7 +152,7 @@ class BadDoc(Document):
             LazyReference(BadDoc, animal.pk),
         ):
             with pytest.raises(ValidationError):
-                p = Ocurrence(person="test", animal=bad).save()
+                Ocurrence(person="test", animal=bad).save()
 
     def test_lazy_reference_query_conversion(self):
         """Ensure that LazyReferenceFields can be queried using objects and values
@@ -386,7 +386,7 @@ class Ocurrence(Document):
         mineral = Mineral(name="Granite").save()
 
         occ_animal = Ocurrence(living_thing=animal, thing=animal).save()
-        occ_vegetal = Ocurrence(living_thing=vegetal, thing=vegetal).save()
+        _ = Ocurrence(living_thing=vegetal, thing=vegetal).save()
         with pytest.raises(ValidationError):
             Ocurrence(living_thing=mineral).save()
 
@@ -458,7 +458,7 @@ class BadDoc(Document):
         baddoc = BadDoc().save()
         for bad in (42, "foo", baddoc, LazyReference(BadDoc, animal.pk)):
             with pytest.raises(ValidationError):
-                p = Ocurrence(person="test", animal=bad).save()
+                Ocurrence(person="test", animal=bad).save()
 
     def test_generic_lazy_reference_query_conversion(self):
         class Member(Document):
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 984e2bd19..cb8e7bbab 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -116,7 +116,7 @@ def test_find(self):
     def test_limit(self):
         """Ensure that QuerySet.limit works as expected."""
         user_a = self.Person.objects.create(name="User A", age=20)
-        user_b = self.Person.objects.create(name="User B", age=30)
+        _ = self.Person.objects.create(name="User B", age=30)
 
         # Test limit on a new queryset
         people = list(self.Person.objects.limit(1))
@@ -148,6 +148,11 @@ def test_skip(self):
         user_b = self.Person.objects.create(name="User B", age=30)
 
         # Test skip on a new queryset
+        people = list(self.Person.objects.skip(0))
+        assert len(people) == 2
+        assert people[0] == user_a
+        assert people[1] == user_b
+
         people = list(self.Person.objects.skip(1))
         assert len(people) == 1
         assert people[0] == user_b
@@ -2586,13 +2591,8 @@ class User(Document):
             age = IntField()
 
         with db_ops_tracker() as q:
-            adult1 = (
-                User.objects.filter(age__gte=18).comment("looking for an adult").first()
-            )
-
-            adult2 = (
-                User.objects.comment("looking for an adult").filter(age__gte=18).first()
-            )
+            User.objects.filter(age__gte=18).comment("looking for an adult").first()
+            User.objects.comment("looking for an adult").filter(age__gte=18).first()
 
             ops = q.get_ops()
             assert len(ops) == 2
@@ -4518,7 +4518,7 @@ class Foo(Document):
 
         foos_without_y = list(Foo.objects.order_by("y").fields(y=0))
 
-        assert all(o.y is None for o in foos_with_x)
+        assert all(o.y is None for o in foos_without_y)
 
         foos_with_sliced_items = list(Foo.objects.order_by("y").fields(slice__items=1))
 
@@ -5595,7 +5595,7 @@ def test_create_count(self):
         self.Person.objects.create(name="Baz")
         assert self.Person.objects.count(with_limit_and_skip=True) == 3
 
-        newPerson = self.Person.objects.create(name="Foo_1")
+        self.Person.objects.create(name="Foo_1")
         assert self.Person.objects.count(with_limit_and_skip=True) == 4
 
     def test_no_cursor_timeout(self):
diff --git a/tests/test_connection.py b/tests/test_connection.py
index e40a69940..56bc22cd4 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -348,7 +348,7 @@ class TestDoc(Document):
 
     def test_disconnect_cleans_cached_collection_attribute_in_document(self):
         """Ensure that the disconnect() method works properly"""
-        conn1 = connect("mongoenginetest")
+        connect("mongoenginetest")
 
         class History(Document):
             pass
@@ -518,7 +518,7 @@ def test_uri_without_credentials_doesnt_override_conn_settings(self):
         """Ensure connect() uses the username & password params if the URI
         doesn't explicitly specify them.
         """
-        c = connect(
+        connect(
             host="mongodb://localhost/mongoenginetest", username="user", password="pass"
         )
 
@@ -632,7 +632,7 @@ def test_connect_with_replicaset_via_uri(self):
         """Ensure connect() works when specifying a replicaSet via the
         MongoDB URI.
         """
-        c = connect(host="mongodb://localhost/test?replicaSet=local-rs")
+        connect(host="mongodb://localhost/test?replicaSet=local-rs")
         db = get_db()
         assert isinstance(db, pymongo.database.Database)
         assert db.name == "test"
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index fa3f59608..4410fa90d 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -216,7 +216,7 @@ class User(Document):
 
     def test_query_counter_does_not_swallow_exception(self):
         with pytest.raises(TypeError):
-            with query_counter() as q:
+            with query_counter():
                 raise TypeError()
 
     def test_query_counter_temporarily_modifies_profiling_level(self):
@@ -226,12 +226,12 @@ def test_query_counter_temporarily_modifies_profiling_level(self):
         initial_profiling_level = db.profiling_level()
 
         try:
-            NEW_LEVEL = 1
-            db.set_profiling_level(NEW_LEVEL)
-            assert db.profiling_level() == NEW_LEVEL
-            with query_counter() as q:
+            new_level = 1
+            db.set_profiling_level(new_level)
+            assert db.profiling_level() == new_level
+            with query_counter():
                 assert db.profiling_level() == 2
-            assert db.profiling_level() == NEW_LEVEL
+            assert db.profiling_level() == new_level
         except Exception:
             db.set_profiling_level(
                 initial_profiling_level
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 451e01ffd..64976e256 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -267,7 +267,7 @@ def load_existing_author():
             a = self.Author(name="Bill Shakespeare")
             a.save()
             self.get_signal_output(lambda: None)  # eliminate signal output
-            a1 = self.Author.objects(name="Bill Shakespeare")[0]
+            _ = self.Author.objects(name="Bill Shakespeare")[0]
 
         assert self.get_signal_output(create_author) == [
             "pre_init signal, Author",

From 394da67cf12f2339452e3730cce36bec6b60f7e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 25 Apr 2020 21:47:37 +0200
Subject: [PATCH 1066/1519] fix travis env var

---
 .pre-commit-config.yaml | 1 -
 .travis.yml             | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8b7941031..e11640b8f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,6 @@ repos:
       rev: 19.10b0
       hooks:
         - id: black
-#          language_version: python3
     - repo: https://gitlab.com/pycqa/flake8
       rev: 3.8.0a2
       hooks:
diff --git a/.travis.yml b/.travis.yml
index a99f11178..2316124a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ env:
     - PYMONGO_3_9=3.9
     - PYMONGO_3_10=3.10
 
-    - MAIN_PYTHON_VERSION = "3.7"
+    - MAIN_PYTHON_VERSION=3.7
   matrix:
     - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_10}
 

From fd0095b73f9130bd537a07dc5b13c329ef16a871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 26 Apr 2020 22:28:14 +0200
Subject: [PATCH 1067/1519] improve recent docstring of
 EmbeddedDocumentList.create

---
 mongoengine/base/datastructures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 85f05c9bc..d08d4930d 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -293,7 +293,7 @@ def create(self, **values):
 
         .. note::
             the instance of the EmbeddedDocument is not automatically saved to the database.
-            You still need to call save() on this EmbeddedDocumentList.
+            You still need to call .save() on the parent Document.
 
         :param values: A dictionary of values for the embedded document.
         :return: The new embedded document instance.

From 78c9e9745d82dff40c0c4e0c5931c4ae557f6374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 26 Apr 2020 22:51:56 +0200
Subject: [PATCH 1068/1519] fix linting + update changelog & contributors

---
 AUTHORS                         | 1 +
 docs/changelog.rst              | 1 +
 mongoengine/context_managers.py | 6 +++---
 mongoengine/queryset/base.py    | 4 +++-
 tests/test_context_managers.py  | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7d3000ce5..02e439554 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -256,3 +256,4 @@ that much better:
  * Eric Timmons (https://github.com/daewok)
  * Matthew Simpson (https://github.com/mcsimps2)
  * Leonardo Domingues (https://github.com/leodmgs)
+ * Agustin Barto (https://github.com/abarto)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 765455598..625526a3f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -21,6 +21,7 @@ Development
     - ``Queryset._ensure_indexes`` and ``Queryset.ensure_indexes``, the right method to use is ``Document.ensure_indexes``
 - Added pre-commit #2212
 - Renamed requirements-lint.txt to requirements-dev.txt #2212
+- Support for setting ReadConcern #2255
 
 Changes in 0.19.1
 =================
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 77e6b55c6..5f2b5229a 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,7 +1,7 @@
 from contextlib import contextmanager
 
-from pymongo.write_concern import WriteConcern
 from pymongo.read_concern import ReadConcern
+from pymongo.write_concern import WriteConcern
 
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
@@ -268,11 +268,11 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
         combined_write_concerns.update(write_concerns)
 
     combined_read_concerns = dict(collection.read_concern.document.items())
-    
+
     if read_concerns is not None:
         combined_read_concerns.update(read_concerns)
 
     yield collection.with_options(
         write_concern=WriteConcern(**combined_write_concerns),
-        read_concern=ReadConcern(**combined_read_concerns)
+        read_concern=ReadConcern(**combined_read_concerns),
     )
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 317ec6982..39c44b29b 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1206,7 +1206,9 @@ def read_concern(self, read_concern):
             raise TypeError("%r is not a valid read concern." % (read_concern,))
 
         queryset = self.clone()
-        queryset._read_concern = ReadConcern(**read_concern) if read_concern is not None else None
+        queryset._read_concern = (
+            ReadConcern(**read_concern) if read_concern is not None else None
+        )
         queryset._cursor_obj = None  # we need to re-create the cursor object whenever we apply read_concern
         return queryset
 
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 8f3dd5559..a4864c403 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -8,10 +8,10 @@
     no_dereference,
     no_sub_classes,
     query_counter,
+    set_read_write_concern,
+    set_write_concern,
     switch_collection,
     switch_db,
-    set_write_concern,
-    set_read_write_concern,
 )
 from mongoengine.pymongo_support import count_documents
 

From 3fbe9c3cdda00fc7307dfc971df25e4573344d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 1 May 2020 13:13:30 +0200
Subject: [PATCH 1069/1519] Bump version to 0.20.0 and update CHANGELOG
 accordingly

---
 docs/changelog.rst      | 7 +++++--
 mongoengine/__init__.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 765455598..73f27efee 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.20.0
+=================
 - ATTENTION: Drop support for Python2
 - Add Mongo 4.0 to Travis
 - Fix error when setting a string as a ComplexDateTimeField #2253
@@ -14,12 +17,12 @@ Development
 - Fixed a bug causing inaccurate query results, while combining ``__raw__`` and regular filters for the same field #2264
 - Add support for the `elemMatch` projection operator in .fields() (e.g BlogPost.objects.fields(elemMatch__comments="test")) #2267
 - DictField validate failed without default connection (bug introduced in 0.19.0) #2239
-- Remove methods deprecated years ago:
+- Remove methods that were deprecated years ago:
     - name parameter in Field constructor e.g `StringField(name="...")`, was replaced by db_field
     - Queryset.slave_okay() was deprecated since pymongo3
     - dropDups was dropped with MongoDB3
     - ``Queryset._ensure_indexes`` and ``Queryset.ensure_indexes``, the right method to use is ``Document.ensure_indexes``
-- Added pre-commit #2212
+- Added pre-commit for development/CI #2212
 - Renamed requirements-lint.txt to requirements-dev.txt #2212
 
 Changes in 0.19.1
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index e45dfc2b7..dbd88a683 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -28,7 +28,7 @@
 )
 
 
-VERSION = (0, 19, 1)
+VERSION = (0, 20, 0)
 
 
 def get_version():

From d8657be320ca5fdebb1257b70c201d97f7ba8d14 Mon Sep 17 00:00:00 2001
From: Terence Honles <terence@honles.com>
Date: Tue, 19 May 2020 10:23:07 -0700
Subject: [PATCH 1070/1519] Fix requirement Pillow < 7 to mention it is for
 tests only

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2dd5bcd58..71f9ac5d2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -28,7 +28,7 @@ Changes in 0.20.0
 
 Changes in 0.19.1
 =================
-- Requires Pillow < 7.0.0 as it dropped Python2 support
+- Tests require Pillow < 7.0.0 as it dropped Python2 support
 - DEPRECATION: The interface of ``QuerySet.aggregate`` method was changed, it no longer takes an unpacked list of
     pipeline steps (*pipeline) but simply takes the pipeline list just like ``pymongo.Collection.aggregate`` does. #2079
 

From 22bff8566d35dc0c0d598f0ca391b0ac5f6ed50e Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Tue, 19 May 2020 11:00:30 -0700
Subject: [PATCH 1071/1519] fix self inflicted deprecation warnings in QNode

---
 mongoengine/queryset/visitor.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index 0eacc2ef8..a2448f287 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -7,6 +7,11 @@
 __all__ = ("Q", "QNode")
 
 
+def warn_empty_is_deprecated():
+    msg = "'empty' property is deprecated in favour of using 'not bool(filter)'"
+    warnings.warn(msg, DeprecationWarning, stacklevel=2)
+
+
 class QNodeVisitor:
     """Base visitor class for visiting Q-object nodes in a query tree.
     """
@@ -98,19 +103,18 @@ def _combine(self, other, operation):
         object.
         """
         # If the other Q() is empty, ignore it and just use `self`.
-        if getattr(other, "empty", True):
+        if not bool(other):
             return self
 
         # Or if this Q is empty, ignore it and just use `other`.
-        if self.empty:
+        if not bool(self):
             return other
 
         return QCombination(operation, [self, other])
 
     @property
     def empty(self):
-        msg = "'empty' property is deprecated in favour of using 'not bool(filter)'"
-        warnings.warn(msg, DeprecationWarning)
+        warn_empty_is_deprecated()
         return False
 
     def __or__(self, other):
@@ -152,8 +156,7 @@ def accept(self, visitor):
 
     @property
     def empty(self):
-        msg = "'empty' property is deprecated in favour of using 'not bool(filter)'"
-        warnings.warn(msg, DeprecationWarning)
+        warn_empty_is_deprecated()
         return not bool(self.children)
 
     def __eq__(self, other):
@@ -186,4 +189,5 @@ def accept(self, visitor):
 
     @property
     def empty(self):
+        warn_empty_is_deprecated()
         return not bool(self.query)

From 1698f398eb11a85633a1aa3def93386322d648f3 Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Wed, 20 May 2020 18:56:13 -0300
Subject: [PATCH 1072/1519] Add _read_concern to copied properties. Add
 read_concern to aggregate. Add test to check the read_concern and
 read_preference values are kept after cloning.

---
 mongoengine/queryset/base.py    |  6 ++++--
 tests/queryset/test_queryset.py | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 39c44b29b..b70fae643 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -789,6 +789,7 @@ def _clone_into(self, new_qs):
             "_snapshot",
             "_timeout",
             "_read_preference",
+            "_read_concern",
             "_iter",
             "_scalar",
             "_as_pymongo",
@@ -1311,10 +1312,11 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
         final_pipeline = initial_pipeline + user_pipeline
 
         collection = self._collection
-        if self._read_preference is not None:
+        if self._read_preference is not None or self._read_concern is not None:
             collection = self._collection.with_options(
-                read_preference=self._read_preference
+                read_preference=self._read_preference, read_concern=self._read_concern
             )
+
         return collection.aggregate(final_pipeline, cursor={}, **kwargs)
 
     # JS functionality
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 6b6000c9b..88f511048 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4021,6 +4021,32 @@ class Number(Document):
 
         Number.drop_collection()
 
+    def test_clone_retains_settings(self):
+        """Ensure that cloning retains the read_preference and read_concern
+        """
+
+        class Number(Document):
+            n = IntField()
+
+        Number.drop_collection()
+
+        qs = Number.objects
+        qs_clone = qs.clone()
+        assert qs._read_preference == qs_clone._read_preference
+        assert qs._read_concern == qs_clone._read_concern
+
+        qs = Number.objects.read_preference(ReadPreference.PRIMARY_PREFERRED)
+        qs_clone = qs.clone()
+        assert qs._read_preference == ReadPreference.PRIMARY_PREFERRED
+        assert qs._read_preference == qs_clone._read_preference
+
+        qs = Number.objects.read_concern({'level': 'majority'})
+        qs_clone = qs.clone()
+        assert qs._read_concern.document == {'level': 'majority'}
+        assert qs._read_concern == qs_clone._read_concern
+
+        Number.drop_collection()
+
     def test_using(self):
         """Ensure that switching databases for a queryset is possible
         """

From 31498bd7dd1f7316a766aae7f511cd5e4ac4accd Mon Sep 17 00:00:00 2001
From: Agustin Barto <abarto@gmail.com>
Date: Wed, 20 May 2020 18:58:18 -0300
Subject: [PATCH 1073/1519] Update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2dd5bcd58..acf20195c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Fixed a bug that made the queryset drop the read_preference after clone(). 
 
 Changes in 0.20.0
 =================

From 49f9bca23b081c69ba6a8e0c26102f8cd677d778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 23 May 2020 23:08:56 +0200
Subject: [PATCH 1074/1519] fix black formatting

---
 tests/queryset/test_queryset.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 88f511048..4900f3a3c 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4040,9 +4040,9 @@ class Number(Document):
         assert qs._read_preference == ReadPreference.PRIMARY_PREFERRED
         assert qs._read_preference == qs_clone._read_preference
 
-        qs = Number.objects.read_concern({'level': 'majority'})
+        qs = Number.objects.read_concern({"level": "majority"})
         qs_clone = qs.clone()
-        assert qs._read_concern.document == {'level': 'majority'}
+        assert qs._read_concern.document == {"level": "majority"}
         assert qs._read_concern == qs_clone._read_concern
 
         Number.drop_collection()

From adb5f74ddbad4478444af24431bf6b4cc8206670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 26 May 2020 23:37:55 +0200
Subject: [PATCH 1075/1519] Fix a bug in limit0 #2311

---
 mongoengine/queryset/base.py    | 21 ++++++++++++++-----
 tests/queryset/test_queryset.py | 36 ++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 39c44b29b..f755a05c9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -83,6 +83,7 @@ def __init__(self, document, collection):
         self._cursor_obj = None
         self._limit = None
         self._skip = None
+        self._empty = False
         self._hint = -1  # Using -1 as None is a valid value for hint
         self._collation = None
         self._batch_size = None
@@ -162,6 +163,7 @@ def __getitem__(self, key):
         [<User: User object>, <User: User object>]
         """
         queryset = self.clone()
+        queryset._empty = False
 
         # Handle a slice
         if isinstance(key, slice):
@@ -169,6 +171,8 @@ def __getitem__(self, key):
             queryset._skip, queryset._limit = key.start, key.stop
             if key.start and key.stop:
                 queryset._limit = key.stop - key.start
+            if queryset._limit == 0:
+                queryset._empty = True
 
             # Allow further QuerySet modifications to be performed
             return queryset
@@ -394,7 +398,12 @@ def count(self, with_limit_and_skip=False):
             :meth:`skip` that has been applied to this cursor into account when
             getting the count
         """
-        if self._limit == 0 and with_limit_and_skip is False or self._none:
+        if (
+            self._limit == 0
+            and with_limit_and_skip is False
+            or self._none
+            or self._empty
+        ):
             return 0
         count = self._cursor.count(with_limit_and_skip=with_limit_and_skip)
         self._cursor_obj = None
@@ -735,7 +744,9 @@ def in_bulk(self, object_ids):
         return doc_map
 
     def none(self):
-        """Helper that just returns a list"""
+        """Returns a queryset that never returns any objects and no query will be executed when accessing the results
+        inspired by django none() https://docs.djangoproject.com/en/dev/ref/models/querysets/#none
+        """
         queryset = self.clone()
         queryset._none = True
         return queryset
@@ -794,6 +805,7 @@ def _clone_into(self, new_qs):
             "_as_pymongo",
             "_limit",
             "_skip",
+            "_empty",
             "_hint",
             "_collation",
             "_auto_dereference",
@@ -834,6 +846,7 @@ def limit(self, n):
         """
         queryset = self.clone()
         queryset._limit = n
+        queryset._empty = False  # cancels the effect of empty
 
         # If a cursor object has already been created, apply the limit to it.
         if queryset._cursor_obj:
@@ -1584,7 +1597,7 @@ def item_frequencies(self, field, normalize=False, map_reduce=True):
     def __next__(self):
         """Wrap the result in a :class:`~mongoengine.Document` object.
         """
-        if self._limit == 0 or self._none:
+        if self._none or self._empty:
             raise StopIteration
 
         raw_doc = next(self._cursor)
@@ -1603,8 +1616,6 @@ def __next__(self):
 
         return doc
 
-    next = __next__  # For Python2 support
-
     def rewind(self):
         """Rewind the cursor to its unevaluated state.
 
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 6b6000c9b..aece69bfc 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -114,6 +114,38 @@ def test_find(self):
         assert person.name == "User A"
         assert person.age == 20
 
+    def test_slicing_sets_empty_limit_skip(self):
+        self.Person.objects.insert(
+            [self.Person(name="User {}".format(i), age=i) for i in range(5)],
+            load_bulk=False,
+        )
+
+        self.Person.objects.create(name="User B", age=30)
+        self.Person.objects.create(name="User C", age=40)
+
+        qs = self.Person.objects()[1:2]
+        assert (qs._empty, qs._skip, qs._limit) == (False, 1, 1)
+        assert len(list(qs)) == 1
+
+        # Test edge case of [1:1] which should return nothing
+        # and require a hack so that it doesn't clash with limit(0)
+        qs = self.Person.objects()[1:1]
+        assert (qs._empty, qs._skip, qs._limit) == (True, 1, 0)
+        assert len(list(qs)) == 0
+
+        qs2 = qs[1:5]  # Make sure that further slicing resets _empty
+        assert (qs2._empty, qs2._skip, qs2._limit) == (False, 1, 4)
+        assert len(list(qs2)) == 4
+
+    def test_limit_0_returns_all_documents(self):
+        self.Person.objects.create(name="User A", age=20)
+        self.Person.objects.create(name="User B", age=30)
+
+        n_docs = self.Person.objects().count()
+
+        persons = list(self.Person.objects().limit(0))
+        assert len(persons) == 2 == n_docs
+
     def test_limit(self):
         """Ensure that QuerySet.limit works as expected."""
         user_a = self.Person.objects.create(name="User A", age=20)
@@ -4442,7 +4474,9 @@ def test_scalar_cursor_behaviour(self):
         assert len(people) == 1
         assert people[0] == "User B"
 
-        people = list(self.Person.objects[1:1].scalar("name"))
+        # people = list(self.Person.objects[1:1].scalar("name"))
+        people = self.Person.objects[1:1]
+        people = people.scalar("name")
         assert len(people) == 0
 
         # Test slice out of range

From 194b0cac88073a4118a9827b4fbd5ecf9b28dccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 26 May 2020 23:45:35 +0200
Subject: [PATCH 1076/1519] improve doc + changelog

---
 docs/changelog.rst              | 3 ++-
 mongoengine/queryset/base.py    | 9 ++++++++-
 tests/queryset/test_queryset.py | 3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d543b1697..819f4e0bb 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,7 +6,8 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- Fixed a bug that made the queryset drop the read_preference after clone(). 
+- Fix a bug that made the queryset drop the read_preference after clone().
+- Fix the behavior of Doc.objects.limit(0) which should return all documents (similar to mongodb) #2311
 
 Changes in 0.20.0
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 875cbfdae..6ad086176 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -83,7 +83,7 @@ def __init__(self, document, collection):
         self._cursor_obj = None
         self._limit = None
         self._skip = None
-        self._empty = False
+
         self._hint = -1  # Using -1 as None is a valid value for hint
         self._collation = None
         self._batch_size = None
@@ -91,6 +91,13 @@ def __init__(self, document, collection):
         self._max_time_ms = None
         self._comment = None
 
+        # Hack - As people expect cursor[5:5] to return
+        # an empty result set. It's hard to do that right, though, because the
+        # server uses limit(0) to mean 'no limit'. So we set _empty
+        # in that case and check for it when iterating. We also unset
+        # it anytime we change _limit. Inspired by how it is done in pymongo.Cursor
+        self._empty = False
+
     def __call__(self, q_obj=None, **query):
         """Filter the selected documents by calling the
         :class:`~mongoengine.queryset.QuerySet` with a query.
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 36da5d74a..73c419b31 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -409,6 +409,9 @@ class A(Document):
 
         assert list(A.objects.none()) == []
         assert list(A.objects.none().all()) == []
+        assert list(A.objects.none().limit(1)) == []
+        assert list(A.objects.none().skip(1)) == []
+        assert list(A.objects.none()[:5]) == []
 
     def test_chaining(self):
         class A(Document):

From e431e27cb27d06290e451b7fbc62e811b264eeac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 1 Aug 2020 15:09:10 +0200
Subject: [PATCH 1077/1519] #2360 fix py3 incompatible code

---
 mongoengine/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index db64054a1..4a57d511d 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -639,7 +639,7 @@ def delete(self, signal_kwargs=None, **write_concern):
                 write_concern=write_concern, _from_doc_delete=True
             )
         except pymongo.errors.OperationFailure as err:
-            message = "Could not delete document (%s)" % err.message
+            message = "Could not delete document (%s)" % err.args
             raise OperationError(message)
         signals.post_delete.send(self.__class__, document=self, **signal_kwargs)
 

From 3e1c83f8fab28c37ab2e25eab2d7dcc6121f50cc Mon Sep 17 00:00:00 2001
From: Johnny Chang <hiimdoublej@gmail.com>
Date: Tue, 4 Aug 2020 00:30:15 +0800
Subject: [PATCH 1078/1519] Fix query transformation regarding special
 operators

---
 mongoengine/fields.py            |  3 +++
 tests/queryset/test_transform.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index b05e726af..f50e60459 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -773,6 +773,9 @@ def lookup_member(self, member_name):
 
     def prepare_query_value(self, op, value):
         if value is not None and not isinstance(value, self.document_type):
+            # Short circuit for special operators, returning them as is
+            if isinstance(value, dict) and all(k.startswith('$') for k in value.keys()):
+                return value
             try:
                 value = self.document_type._from_son(value)
             except ValueError:
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index 8d6c2d06b..0fba39752 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -344,6 +344,36 @@ class MainDoc(Document):
         )
         assert update == {"$pull": {"content.text": {"word": {"$nin": ["foo", "bar"]}}}}
 
+    def test_transform_embedded_document_list_fields(self):
+        """
+        Test added to check filtering
+        EmbeddedDocumentListField which is inside a EmbeddedDocumentField
+        """
+
+        class Drink(EmbeddedDocument):
+            id = StringField()
+            meta = {
+                'strict': False
+            }
+
+        class Shop(Document):
+            drinks = EmbeddedDocumentListField(Drink)
+
+        Shop.drop_collection()
+        drinks = [Drink(id='drink_1'), Drink(id='drink_2')]
+        Shop.objects.create(drinks=drinks)
+        q_obj = transform.query(
+            Shop,
+            drinks__all=[{'$elemMatch': {'_id': x.id}} for x in drinks]
+        )
+        assert q_obj == {
+            'drinks': {
+                '$all': [{'$elemMatch': {'_id': x.id}} for x in drinks]
+            }
+        }
+
+        Shop.drop_collection()
+
 
 if __name__ == "__main__":
     unittest.main()

From 7116dec74a394900d2ffd9bcca5b3318d03598aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Tue, 11 Aug 2020 21:55:22 +0200
Subject: [PATCH 1079/1519] run black to please ci

---
 mongoengine/fields.py            |  2 +-
 tests/queryset/test_transform.py | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f50e60459..8fdeae154 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -774,7 +774,7 @@ def lookup_member(self, member_name):
     def prepare_query_value(self, op, value):
         if value is not None and not isinstance(value, self.document_type):
             # Short circuit for special operators, returning them as is
-            if isinstance(value, dict) and all(k.startswith('$') for k in value.keys()):
+            if isinstance(value, dict) and all(k.startswith("$") for k in value.keys()):
                 return value
             try:
                 value = self.document_type._from_son(value)
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index 0fba39752..f5d248af3 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -352,24 +352,19 @@ def test_transform_embedded_document_list_fields(self):
 
         class Drink(EmbeddedDocument):
             id = StringField()
-            meta = {
-                'strict': False
-            }
+            meta = {"strict": False}
 
         class Shop(Document):
             drinks = EmbeddedDocumentListField(Drink)
 
         Shop.drop_collection()
-        drinks = [Drink(id='drink_1'), Drink(id='drink_2')]
+        drinks = [Drink(id="drink_1"), Drink(id="drink_2")]
         Shop.objects.create(drinks=drinks)
         q_obj = transform.query(
-            Shop,
-            drinks__all=[{'$elemMatch': {'_id': x.id}} for x in drinks]
+            Shop, drinks__all=[{"$elemMatch": {"_id": x.id}} for x in drinks]
         )
         assert q_obj == {
-            'drinks': {
-                '$all': [{'$elemMatch': {'_id': x.id}} for x in drinks]
-            }
+            "drinks": {"$all": [{"$elemMatch": {"_id": x.id}} for x in drinks]}
         }
 
         Shop.drop_collection()

From 7f77084e0ec12f1a3f299138e8369474f2c26b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 12 Aug 2020 21:56:38 +0200
Subject: [PATCH 1080/1519] minor fixes in doc links

---
 docs/changelog.rst      | 3 ---
 docs/guide/querying.rst | 2 +-
 mongoengine/fields.py   | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 819f4e0bb..1556266b7 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -458,9 +458,6 @@ Changes in 0.8.3
 - Document.select_related() now respects ``db_alias`` (#377)
 - Reload uses shard_key if applicable (#384)
 - Dynamic fields are ordered based on creation and stored in _fields_ordered (#396)
-
-  **Potential breaking change:** http://docs.mongoengine.org/en/latest/upgrade.html#to-0-8-3
-
 - Fixed pickling dynamic documents ``_dynamic_fields`` (#387)
 - Fixed ListField setslice and delslice dirty tracking (#390)
 - Added Django 1.5 PY3 support (#392)
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 07de03788..7307b003e 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -609,7 +609,7 @@ to push values with index::
 .. note::
     Currently only top level lists are handled, future versions of mongodb /
     pymongo plan to support nested positional operators.  See `The $ positional
-    operator <http://www.mongodb.org/display/DOCS/Updating#Updating-The%24positionaloperator>`_.
+    operator <https://docs.mongodb.com/manual/tutorial/update-documents/#Updating-The%24positionaloperator>`_.
 
 Server-side javascript execution
 ================================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 8fdeae154..bba05ea70 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2045,7 +2045,7 @@ def __init__(
 
 class SequenceField(BaseField):
     """Provides a sequential counter see:
-     http://www.mongodb.org/display/DOCS/Object+IDs#ObjectIDs-SequenceNumbers
+     https://docs.mongodb.com/manual/reference/method/ObjectId/#ObjectIDs-SequenceNumbers
 
     .. note::
 

From 1f2a5db016a8c3b42de91baf76696482415238ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 12 Aug 2020 22:30:52 +0200
Subject: [PATCH 1081/1519] fix deprecated use of .update in test suite

---
 tests/fields/test_fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 652f69033..25ecb2e7a 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -336,7 +336,7 @@ class HandleNoneFields(Document):
         doc.save()
 
         # Unset all the fields
-        HandleNoneFields._get_collection().update(
+        HandleNoneFields._get_collection().update_one(
             {"_id": doc.id},
             {"$unset": {"str_fld": 1, "int_fld": 1, "flt_fld": 1, "comp_dt_fld": 1}},
         )

From aabc18755c591fac355d9966bce5758de594c4bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 7 Oct 2020 00:01:09 +0200
Subject: [PATCH 1082/1519] fix inconsistencies in ._changed_fields computation

---
 mongoengine/base/document.py | 42 +++++++++++++++++++++++++++++++++---
 tests/document/test_delta.py | 34 ++++++++++++++++++++++++++---
 tests/test_dereference.py    |  4 ++--
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index e697fe403..55b402286 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -537,6 +537,9 @@ def _clear_changed_fields(self):
         """Using _get_changed_fields iterate and remove any fields that
         are marked as changed.
         """
+        ReferenceField = _import_class("ReferenceField")
+        GenericReferenceField = _import_class("GenericReferenceField")
+
         for changed in self._get_changed_fields():
             parts = changed.split(".")
             data = self
@@ -549,7 +552,8 @@ def _clear_changed_fields(self):
                 elif isinstance(data, dict):
                     data = data.get(part, None)
                 else:
-                    data = getattr(data, part, None)
+                    field_name = data._reverse_db_field_map.get(part, part)
+                    data = getattr(data, field_name, None)
 
                 if not isinstance(data, LazyReference) and hasattr(
                     data, "_changed_fields"
@@ -558,10 +562,40 @@ def _clear_changed_fields(self):
                         continue
 
                     data._changed_fields = []
+                elif isinstance(data, (list, tuple, dict)):
+                    if hasattr(data, "field") and isinstance(
+                        data.field, (ReferenceField, GenericReferenceField)
+                    ):
+                        continue
+                    BaseDocument._nestable_types_clear_changed_fields(data)
 
         self._changed_fields = []
 
-    def _nestable_types_changed_fields(self, changed_fields, base_key, data):
+    @staticmethod
+    def _nestable_types_clear_changed_fields(data):
+        """Inspect nested data for changed fields
+
+        :param data: data to inspect for changes
+        """
+        Document = _import_class("Document")
+
+        # Loop list / dict fields as they contain documents
+        # Determine the iterator to use
+        if not hasattr(data, "items"):
+            iterator = enumerate(data)
+        else:
+            iterator = data.items()
+
+        for index_or_key, value in iterator:
+            if hasattr(value, "_get_changed_fields") and not isinstance(
+                value, Document
+            ):  # don't follow references
+                value._clear_changed_fields()
+            elif isinstance(value, (list, tuple, dict)):
+                BaseDocument._nestable_types_clear_changed_fields(value)
+
+    @staticmethod
+    def _nestable_types_changed_fields(changed_fields, base_key, data):
         """Inspect nested data for changed fields
 
         :param changed_fields: Previously collected changed fields
@@ -586,7 +620,9 @@ def _nestable_types_changed_fields(self, changed_fields, base_key, data):
                 changed = value._get_changed_fields()
                 changed_fields += ["{}{}".format(item_key, k) for k in changed if k]
             elif isinstance(value, (list, tuple, dict)):
-                self._nestable_types_changed_fields(changed_fields, item_key, value)
+                BaseDocument._nestable_types_changed_fields(
+                    changed_fields, item_key, value
+                )
 
     def _get_changed_fields(self):
         """Return a list of all fields that have explicitly been changed.
diff --git a/tests/document/test_delta.py b/tests/document/test_delta.py
index 2324211b1..27439bc26 100644
--- a/tests/document/test_delta.py
+++ b/tests/document/test_delta.py
@@ -537,6 +537,7 @@ class Doc(DocClass):
             {},
         )
         doc.save()
+        assert doc._get_changed_fields() == []
         doc = doc.reload(10)
 
         assert doc.embedded_field.list_field[0] == "1"
@@ -767,9 +768,7 @@ class MyDoc(Document):
 
         MyDoc.drop_collection()
 
-        mydoc = MyDoc(
-            name="testcase1", subs={"a": {"b": EmbeddedDoc(name="foo")}}
-        ).save()
+        MyDoc(name="testcase1", subs={"a": {"b": EmbeddedDoc(name="foo")}}).save()
 
         mydoc = MyDoc.objects.first()
         subdoc = mydoc.subs["a"]["b"]
@@ -781,6 +780,35 @@ class MyDoc(Document):
         mydoc._clear_changed_fields()
         assert [] == mydoc._get_changed_fields()
 
+    def test_nested_nested_fields_db_field_set__gets_mark_as_changed_and_cleaned(self):
+        class EmbeddedDoc(EmbeddedDocument):
+            name = StringField(db_field="db_name")
+
+        class MyDoc(Document):
+            embed = EmbeddedDocumentField(EmbeddedDoc, db_field="db_embed")
+            name = StringField(db_field="db_name")
+
+        MyDoc.drop_collection()
+
+        MyDoc(name="testcase1", embed=EmbeddedDoc(name="foo")).save()
+
+        mydoc = MyDoc.objects.first()
+        mydoc.embed.name = "foo1"
+
+        assert mydoc.embed._get_changed_fields() == ["db_name"]
+        assert mydoc._get_changed_fields() == ["db_embed.db_name"]
+
+        mydoc = MyDoc.objects.first()
+        embed = EmbeddedDoc(name="foo2")
+        embed.name = "bar"
+        mydoc.embed = embed
+
+        assert embed._get_changed_fields() == ["db_name"]
+        assert mydoc._get_changed_fields() == ["db_embed"]
+
+        mydoc._clear_changed_fields()
+        assert mydoc._get_changed_fields() == []
+
     def test_lower_level_mark_as_changed(self):
         class EmbeddedDoc(EmbeddedDocument):
             name = StringField()
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 0f9f412c3..8ba429f46 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -370,8 +370,7 @@ class SimpleList(Document):
         assert Post.objects.all()[0].user_lists == [[u1, u2], [u3]]
 
     def test_circular_reference(self):
-        """Ensure you can handle circular references
-        """
+        """Ensure you can handle circular references"""
 
         class Relation(EmbeddedDocument):
             name = StringField()
@@ -426,6 +425,7 @@ def __repr__(self):
 
         daughter.relations.append(mother)
         daughter.relations.append(daughter)
+        assert daughter._get_changed_fields() == ["relations"]
         daughter.save()
 
         assert "[<Person: Mother>, <Person: Daughter>]" == "%s" % Person.objects()

From 0d289fd5a139d96a1b23966dd4df0053a077424f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 7 Oct 2020 20:36:50 +0200
Subject: [PATCH 1083/1519] upgrade pymongo and mongodb versions used in CI

---
 .travis.yml | 16 ++++++++--------
 tox.ini     |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2316124a8..c5b37b6f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,18 +24,18 @@ python:
 
 env:
   global:
-    - MONGODB_3_4=3.4.17
-    - MONGODB_3_6=3.6.12
+    - MONGODB_3_4=3.4.19
+    - MONGODB_3_6=3.6.13
     - MONGODB_4_0=4.0.13
 
     - PYMONGO_3_4=3.4
     - PYMONGO_3_6=3.6
     - PYMONGO_3_9=3.9
-    - PYMONGO_3_10=3.10
+    - PYMONGO_3_11=3.11
 
     - MAIN_PYTHON_VERSION=3.7
   matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_10}
+    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_11}
 
 matrix:
   # Finish the build as soon as one job fails
@@ -47,9 +47,9 @@ matrix:
   - python: 3.7
     env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
   - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_10}
+    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_11}
   - python: 3.8
-    env: MONGODB=${MONGODB_4_0} PYMONGO=${PYMONGO_3_10}
+    env: MONGODB=${MONGODB_4_0} PYMONGO=${PYMONGO_3_11}
 
 install:
   # Install Mongo
@@ -75,7 +75,7 @@ script:
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
 
 after_success:
-- - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then coveralls --verbose; else echo "coveralls only sent for py37"; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then coveralls --verbose; else echo "coveralls only sent for py37"; fi
 
 notifications:
   irc: irc.freenode.org#mongoengine
@@ -103,5 +103,5 @@ deploy:
   on:
     tags: true
     repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = ${PYMONGO_3_10}) && ($MONGODB = ${MONGODB_3_4})
+    condition: ($PYMONGO = ${PYMONGO_3_11}) && ($MONGODB = ${MONGODB_3_4})
     python: 3.7
diff --git a/tox.ini b/tox.ini
index 675b6d9af..6f33772cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py35,pypy3}-{mg34,mg36,mg39,mg310}
+envlist = {py35,pypy3}-{mg34,mg36,mg39,mg311}
 
 [testenv]
 commands =
@@ -8,6 +8,6 @@ deps =
     mg34: pymongo>=3.4,<3.5
     mg36: pymongo>=3.6,<3.7
     mg39: pymongo>=3.9,<3.10
-    mg310: pymongo>=3.10,<3.11
+    mg311: pymongo>=3.11,<3.12
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From d4350e7da425ea98a9122f2aa812730a0e4c704a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 10 Oct 2020 23:32:22 +0200
Subject: [PATCH 1084/1519] Fix for ListField that isnt detecting properly that
 item 0 is changed

---
 mongoengine/base/datastructures.py |  2 +-
 tests/document/test_delta.py       | 50 ++++++++++++++++++------------
 tests/document/test_instance.py    |  7 +++--
 tests/fields/test_dict_field.py    |  2 +-
 tests/fields/test_fields.py        |  4 +--
 tests/fields/test_geo_fields.py    |  4 +--
 tests/test_datastructures.py       |  6 +++-
 7 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index d08d4930d..8c69cc73b 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -179,7 +179,7 @@ def __setitem__(self, key, value):
 
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, "_mark_as_changed"):
-            if key:
+            if key is not None:
                 self._instance._mark_as_changed(
                     "{}.{}".format(self._name, key % len(self))
                 )
diff --git a/tests/document/test_delta.py b/tests/document/test_delta.py
index 2324211b1..e7baaa23e 100644
--- a/tests/document/test_delta.py
+++ b/tests/document/test_delta.py
@@ -29,7 +29,8 @@ def test_delta(self):
         self.delta(Document)
         self.delta(DynamicDocument)
 
-    def delta(self, DocClass):
+    @staticmethod
+    def delta(DocClass):
         class Doc(DocClass):
             string_field = StringField()
             int_field = IntField()
@@ -428,13 +429,20 @@ class Doc(DocClass):
         assert doc.dict_field == {"hello": "world"}
         assert doc.list_field == ["1", 2, {"hello": "world"}]
 
-    def test_delta_recursive_db_field(self):
+    def test_delta_recursive_db_field_on_doc_and_embeddeddoc(self):
         self.delta_recursive_db_field(Document, EmbeddedDocument)
+
+    def test_delta_recursive_db_field_on_doc_and_dynamicembeddeddoc(self):
         self.delta_recursive_db_field(Document, DynamicEmbeddedDocument)
+
+    def test_delta_recursive_db_field_on_dynamicdoc_and_embeddeddoc(self):
         self.delta_recursive_db_field(DynamicDocument, EmbeddedDocument)
+
+    def test_delta_recursive_db_field_on_dynamicdoc_and_dynamicembeddeddoc(self):
         self.delta_recursive_db_field(DynamicDocument, DynamicEmbeddedDocument)
 
-    def delta_recursive_db_field(self, DocClass, EmbeddedClass):
+    @staticmethod
+    def delta_recursive_db_field(DocClass, EmbeddedClass):
         class Embedded(EmbeddedClass):
             string_field = StringField(db_field="db_string_field")
             int_field = IntField(db_field="db_int_field")
@@ -487,6 +495,7 @@ class Doc(DocClass):
         doc = doc.reload(10)
         assert doc.embedded_field.dict_field == {}
 
+        assert doc._get_changed_fields() == []
         doc.embedded_field.list_field = []
         assert doc._get_changed_fields() == ["db_embedded_field.db_list_field"]
         assert doc.embedded_field._delta() == ({}, {"db_list_field": 1})
@@ -634,6 +643,7 @@ class Doc(DocClass):
         doc.save()
         doc = doc.reload(10)
 
+        assert doc._delta() == ({}, {},)
         del doc.embedded_field.list_field[2].list_field
         assert doc._delta() == (
             {},
@@ -732,12 +742,12 @@ def test_delta_with_dbref_true(self):
         assert organization._get_changed_fields() == []
 
         updates, removals = organization._delta()
-        assert {} == removals
-        assert {} == updates
+        assert removals == {}
+        assert updates == {}
 
         organization.employees.append(person)
         updates, removals = organization._delta()
-        assert {} == removals
+        assert removals == {}
         assert "employees" in updates
 
     def test_delta_with_dbref_false(self):
@@ -749,12 +759,12 @@ def test_delta_with_dbref_false(self):
         assert organization._get_changed_fields() == []
 
         updates, removals = organization._delta()
-        assert {} == removals
-        assert {} == updates
+        assert removals == {}
+        assert updates == {}
 
         organization.employees.append(person)
         updates, removals = organization._delta()
-        assert {} == removals
+        assert removals == {}
         assert "employees" in updates
 
     def test_nested_nested_fields_mark_as_changed(self):
@@ -775,11 +785,11 @@ class MyDoc(Document):
         subdoc = mydoc.subs["a"]["b"]
         subdoc.name = "bar"
 
-        assert ["name"] == subdoc._get_changed_fields()
-        assert ["subs.a.b.name"] == mydoc._get_changed_fields()
+        assert subdoc._get_changed_fields() == ["name"]
+        assert mydoc._get_changed_fields() == ["subs.a.b.name"]
 
         mydoc._clear_changed_fields()
-        assert [] == mydoc._get_changed_fields()
+        assert mydoc._get_changed_fields() == []
 
     def test_lower_level_mark_as_changed(self):
         class EmbeddedDoc(EmbeddedDocument):
@@ -794,17 +804,17 @@ class MyDoc(Document):
 
         mydoc = MyDoc.objects.first()
         mydoc.subs["a"] = EmbeddedDoc()
-        assert ["subs.a"] == mydoc._get_changed_fields()
+        assert mydoc._get_changed_fields() == ["subs.a"]
 
         subdoc = mydoc.subs["a"]
         subdoc.name = "bar"
 
-        assert ["name"] == subdoc._get_changed_fields()
-        assert ["subs.a"] == mydoc._get_changed_fields()
+        assert subdoc._get_changed_fields() == ["name"]
+        assert mydoc._get_changed_fields() == ["subs.a"]
         mydoc.save()
 
         mydoc._clear_changed_fields()
-        assert [] == mydoc._get_changed_fields()
+        assert mydoc._get_changed_fields() == []
 
     def test_upper_level_mark_as_changed(self):
         class EmbeddedDoc(EmbeddedDocument):
@@ -821,15 +831,15 @@ class MyDoc(Document):
         subdoc = mydoc.subs["a"]
         subdoc.name = "bar"
 
-        assert ["name"] == subdoc._get_changed_fields()
-        assert ["subs.a.name"] == mydoc._get_changed_fields()
+        assert subdoc._get_changed_fields() == ["name"]
+        assert mydoc._get_changed_fields() == ["subs.a.name"]
 
         mydoc.subs["a"] = EmbeddedDoc()
-        assert ["subs.a"] == mydoc._get_changed_fields()
+        assert mydoc._get_changed_fields() == ["subs.a"]
         mydoc.save()
 
         mydoc._clear_changed_fields()
-        assert [] == mydoc._get_changed_fields()
+        assert mydoc._get_changed_fields() == []
 
     def test_referenced_object_changed_attributes(self):
         """Ensures that when you save a new reference to a field, the referenced object isn't altered"""
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 993cc1616..8d42d15b7 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -188,7 +188,7 @@ def __str__(self):
 
     def test_queryset_resurrects_dropped_collection(self):
         self.Person.drop_collection()
-        assert [] == list(self.Person.objects())
+        assert list(self.Person.objects()) == []
 
         # Ensure works correctly with inhertited classes
         class Actor(self.Person):
@@ -196,7 +196,7 @@ class Actor(self.Person):
 
         Actor.objects()
         self.Person.drop_collection()
-        assert [] == list(Actor.objects())
+        assert list(Actor.objects()) == []
 
     def test_polymorphic_references(self):
         """Ensure that the correct subclasses are returned from a query
@@ -578,7 +578,8 @@ class Doc(Document):
         doc.embedded_field.list_field.append(1)
         doc.embedded_field.dict_field["woot"] = "woot"
 
-        assert doc._get_changed_fields() == [
+        changed = doc._get_changed_fields()
+        assert changed == [
             "list_field",
             "dict_field.woot",
             "embedded_field.list_field",
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index f423bf8bc..12140916a 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -113,7 +113,7 @@ class BlogPost(Document):
         post.info.setdefault("authors", [])
         post.save()
         post.reload()
-        assert [] == post.info["authors"]
+        assert post.info["authors"] == []
 
     def test_dictfield_dump_document(self):
         """Ensure a DictField can handle another document's dump."""
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 25ecb2e7a..fe349d1e1 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -1084,7 +1084,7 @@ class Simple(Document):
 
         e = Simple().save()
         e.mapping = []
-        assert [] == e._changed_fields
+        assert e._changed_fields == []
 
         class Simple(Document):
             mapping = DictField()
@@ -1093,7 +1093,7 @@ class Simple(Document):
 
         e = Simple().save()
         e.mapping = {}
-        assert [] == e._changed_fields
+        assert e._changed_fields == []
 
     def test_slice_marks_field_as_changed(self):
         class Simple(Document):
diff --git a/tests/fields/test_geo_fields.py b/tests/fields/test_geo_fields.py
index 1b912a4b8..7618b3a09 100644
--- a/tests/fields/test_geo_fields.py
+++ b/tests/fields/test_geo_fields.py
@@ -381,7 +381,7 @@ class Log(Document):
 
             meta = {"indexes": [[("location", "2dsphere"), ("datetime", 1)]]}
 
-        assert [] == Log._geo_indices()
+        assert Log._geo_indices() == []
 
         Log.drop_collection()
         Log.ensure_indexes()
@@ -401,7 +401,7 @@ class Log(Document):
                 "indexes": [{"fields": [("location", "2dsphere"), ("datetime", 1)]}]
             }
 
-        assert [] == Log._geo_indices()
+        assert Log._geo_indices() == []
 
         Log.drop_collection()
         Log.ensure_indexes()
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 6d432e328..f4b63f052 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -9,10 +9,14 @@
 class DocumentStub(object):
     def __init__(self):
         self._changed_fields = []
+        self._unset_fields = []
 
     def _mark_as_changed(self, key):
         self._changed_fields.append(key)
 
+    def _mark_as_unset(self, key):
+        self._unset_fields.append(key)
+
 
 class TestBaseDict:
     @staticmethod
@@ -314,7 +318,7 @@ def test___setitem___with_slice(self):
     def test___setitem___item_0_calls_mark_as_changed(self):
         base_list = self._get_baselist([True])
         base_list[0] = False
-        assert base_list._instance._changed_fields == ["my_name"]
+        assert base_list._instance._changed_fields == ["my_name.0"]
         assert base_list == [False]
 
     def test___setitem___item_1_calls_mark_as_changed(self):

From 3adb67901b64e1e87668247cfd8183b4090a922b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 11 Oct 2020 00:53:46 +0200
Subject: [PATCH 1085/1519] update changelog for #2392

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 14dfb8d08..f616f4a64 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,8 @@ Development
     This should have a negative impact on performance of count see Issue #2219
 - Fix a bug that made the queryset drop the read_preference after clone().
 - Fix the behavior of Doc.objects.limit(0) which should return all documents (similar to mongodb) #2311
+- Bug fix in ListField when updating the first item, it was saving the whole list, instead of
+    just replacing the first item (as it's usually done) #2392
 
 Changes in 0.20.0
 =================

From 3fca3739de906772cb2090ec0c465576fe550953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 18 Oct 2020 21:11:16 +0200
Subject: [PATCH 1086/1519] rework validation documentation based on review

---
 docs/guide/defining-documents.rst | 13 --------
 docs/guide/document-instances.rst | 29 ------------------
 docs/guide/validation.rst         | 49 ++++++++++++++++++-------------
 mongoengine/base/document.py      |  3 +-
 4 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 6dc35c308..f5c707281 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -426,19 +426,6 @@ either a single field name, or a list or tuple of field names::
         first_name = StringField()
         last_name = StringField(unique_with='first_name')
 
-Skipping Document validation on save
-------------------------------------
-You can also skip the whole document validation process by setting
-``validate=False`` when calling the :meth:`~mongoengine.document.Document.save`
-method::
-
-    class Recipient(Document):
-        name = StringField()
-        email = EmailField()
-
-    recipient = Recipient(name='admin', email='root@localhost')
-    recipient.save()               # will raise a ValidationError while
-    recipient.save(validate=False) # won't
 
 Document collections
 ====================
diff --git a/docs/guide/document-instances.rst b/docs/guide/document-instances.rst
index 64f17c08a..5dacc0dd2 100644
--- a/docs/guide/document-instances.rst
+++ b/docs/guide/document-instances.rst
@@ -41,35 +41,6 @@ already exist, then any changes will be updated atomically.  For example::
 .. seealso::
     :ref:`guide-atomic-updates`
 
-Pre save data validation and cleaning
--------------------------------------
-MongoEngine allows you to create custom cleaning rules for your documents when
-calling :meth:`~mongoengine.Document.save`.  By providing a custom
-:meth:`~mongoengine.Document.clean` method you can do any pre validation / data
-cleaning.
-
-This might be useful if you want to ensure a default value based on other
-document values for example::
-
-    class Essay(Document):
-        status = StringField(choices=('Published', 'Draft'), required=True)
-        pub_date = DateTimeField()
-
-        def clean(self):
-            """Ensures that only published essays have a `pub_date` and
-            automatically sets `pub_date` if essay is published and `pub_date`
-            is not set"""
-            if self.status == 'Draft' and self.pub_date is not None:
-                msg = 'Draft entries should not have a publication date.'
-                raise ValidationError(msg)
-            # Set the pub_date for published items if not set.
-            if self.status == 'Published' and self.pub_date is None:
-                self.pub_date = datetime.now()
-
-.. note::
-    Cleaning is only called if validation is turned on and when calling
-    :meth:`~mongoengine.Document.save`.
-
 Cascading Saves
 ---------------
 If your document contains :class:`~mongoengine.fields.ReferenceField` or
diff --git a/docs/guide/validation.rst b/docs/guide/validation.rst
index 5f0346bd0..e5a70d347 100644
--- a/docs/guide/validation.rst
+++ b/docs/guide/validation.rst
@@ -3,10 +3,11 @@ Document Validation
 ====================
 
 By design, MongoEngine strictly validates the documents right before they are inserted in MongoDB
-and make sure they are consistent with the fields defined in your models.
+and makes sure they are consistent with the fields defined in your models.
 
-Mongoengine will not validate a document when an object is loaded from the DB into an instance
-of your model but this operation will fail under some circumstances (e.g. if there is a field in
+MongoEngine makes the assumption that the documents that exists in the DB are compliant with the schema.
+This means that Mongoengine will not validate a document when an object is loaded from the DB into an instance
+of your model but this operation may fail under some circumstances (e.g. if there is a field in
 the document fetched from the database that is not defined in your model).
 
 
@@ -53,23 +54,28 @@ The following feature can be used to customize the validation:
 
 * Document `clean` method
 
-Although not its primary use case, `clean` may be use to do validation that involves multiple fields.
-Note that `clean` runs before the validation when you save a Document.
+This method is called as part of :meth:`~mongoengine.document.Document.save` and should be used to provide
+custom model validation and/or to modify some of the field values prior to validation.
+For instance, you could use it to automatically provide a value for a field, or to do validation
+that requires access to more than a single field.
 
 .. code-block:: python
 
-    class Person(Document):
-        first_name = StringField()
-        last_name = StringField()
+    class Essay(Document):
+        status = StringField(choices=('Published', 'Draft'), required=True)
+        pub_date = DateTimeField()
 
         def clean(self):
-            if self.first_name == 'John' and self.last_name == 'Doe':
-                raise ValidationError('John Doe is not a valid name')
-
-    Person(first_name='Billy', last_name='Doe').save()
-    Person(first_name='John', last_name='Doe').save()      # raises ValidationError (John Doe is not a valid name)
-
+            # Validate that only published essays have a `pub_date`
+            if self.status == 'Draft' and self.pub_date is not None:
+                raise ValidationError('Draft entries should not have a publication date.')
+            # Set the pub_date for published items if not set.
+            if self.status == 'Published' and self.pub_date is None:
+                self.pub_date = datetime.now()
 
+.. note::
+    Cleaning is only called if validation is turned on and when calling
+    :meth:`~mongoengine.Document.save`.
 
 * Adding custom Field classes
 
@@ -98,19 +104,20 @@ to subclass a Field and encapsulate some validation by overriding the `validate`
    When overriding `validate`, use `self.error("your-custom-error")` instead of raising ValidationError explicitly,
    it will provide a better context with the error message
 
-Disabling validation
+Skipping validation
 ====================
 
-We do not recommend to do this but if for some reason you need to disable the validation of a document
-when you call `.save()`, you can use `.save(validate=False)`.
+Although discouraged as it allows to violate fields constraints, if for some reason you need to disable
+the validation and cleaning of a document when you call `.save()`, you can use `.save(validate=False)`.
 
 .. code-block:: python
 
     class Person(Document):
-        age = IntField()
+        age = IntField(max_value=100)
 
-    Person(age='garbage').save()    # raises ValidationError (garbage could not be converted to int: ['age'])
+    Person(age=1000).save()    # raises ValidationError (Integer value is too large)
 
-    Person(age='garbage').save(validate=False)
+    Person(age=1000).save(validate=False)
     person = Person.objects.first()
-    assert person.age == 'garbage'
+    assert person.age == 1000
+
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index e697fe403..0bab28862 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -314,7 +314,8 @@ def __ne__(self, other):
 
     def clean(self):
         """
-        Hook for doing document level data cleaning before validation is run.
+        Hook for doing document level data cleaning (usually validation or assignment)
+        before validation is run.
 
         Any ValidationError raised by this method will not be associated with
         a particular field; it will have a special-case association with the

From c801e79d4b78fce44a40f4bebc3fc411088fc615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 18 Oct 2020 21:33:30 +0200
Subject: [PATCH 1087/1519] Fix readthedocs build that failed by making it use
 python3 instead of default python2.7

---
 .readthedocs.yml | 20 ++++++++++++++++++++
 requirements.txt |  6 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 .readthedocs.yml

diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 000000000..f4ada8bba
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,20 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Optionally build your docs in additional formats such as PDF
+formats:
+  - pdf
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.7
+  install:
+    - requirements: docs/requirements.txt
diff --git a/requirements.txt b/requirements.txt
index 0ce39f74f..abd126299 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-pymongo>=3.4
-Sphinx==1.5.5
-sphinx-rtd-theme==0.2.4
+pymongo>=3.11
+Sphinx==3.2.1
+sphinx-rtd-theme==0.5.0

From eb1694514713c7e45ded4b0cbf4fa20c0a855fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 18 Oct 2020 22:06:15 +0200
Subject: [PATCH 1088/1519] fix requirements.txt location for readthedocs

---
 .readthedocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index f4ada8bba..60b4ae4d3 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -17,4 +17,4 @@ formats:
 python:
   version: 3.7
   install:
-    - requirements: docs/requirements.txt
+    - requirements: requirements.txt

From 6b657886a5341a4cd3866701631b2843449706d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 18 Oct 2020 22:21:45 +0200
Subject: [PATCH 1089/1519] remove explicit install from .readthedocs.yml to
 rely on default instead

---
 .readthedocs.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 60b4ae4d3..324d7e565 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -16,5 +16,3 @@ formats:
 # Optionally set the version of Python and requirements required to build your docs
 python:
   version: 3.7
-  install:
-    - requirements: requirements.txt

From e362d089e137501b40b9dad7001a7bc202ddde8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 18 Oct 2020 22:44:06 +0200
Subject: [PATCH 1090/1519] install mongoengine for readthedocs build to work

---
 .readthedocs.yml                          | 8 ++++----
 requirements.txt => docs/requirements.txt | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename requirements.txt => docs/requirements.txt (100%)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 324d7e565..f1d0c0686 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -9,10 +9,10 @@ version: 2
 sphinx:
   configuration: docs/conf.py
 
-# Optionally build your docs in additional formats such as PDF
-formats:
-  - pdf
-
 # Optionally set the version of Python and requirements required to build your docs
 python:
   version: 3.7
+  install:
+    - requirements: docs/requirements.txt
+    - method: setuptools
+      path: mongoengine
diff --git a/requirements.txt b/docs/requirements.txt
similarity index 100%
rename from requirements.txt
rename to docs/requirements.txt

From 4286708e2e61608cb815d9aa829365cc48636a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 18 Oct 2020 22:47:00 +0200
Subject: [PATCH 1091/1519] fix mongoengine setup.py path in .readthedocs.yml

---
 .readthedocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index f1d0c0686..add282fa2 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -15,4 +15,4 @@ python:
   install:
     - requirements: docs/requirements.txt
     - method: setuptools
-      path: mongoengine
+      path: .

From d8a52d68c51396313fe4e62aff13245d939aa4f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 19 Oct 2020 23:34:24 +0200
Subject: [PATCH 1092/1519] improve doc in .readthedocs.yml

---
 .readthedocs.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index add282fa2..08a36676a 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -14,5 +14,7 @@ python:
   version: 3.7
   install:
     - requirements: docs/requirements.txt
+    # docs/conf.py is importing mongoengine
+    # so mongoengine needs to be installed as well
     - method: setuptools
       path: .

From 015a36c85fa4d7457a97972428474278e68dd956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 19 Oct 2020 23:45:13 +0200
Subject: [PATCH 1093/1519] minor styling fix in .rst

---
 docs/guide/validation.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/validation.rst b/docs/guide/validation.rst
index e5a70d347..971f6eb55 100644
--- a/docs/guide/validation.rst
+++ b/docs/guide/validation.rst
@@ -12,7 +12,7 @@ the document fetched from the database that is not defined in your model).
 
 
 Built-in validation
-=================
+===================
 
 Mongoengine provides different fields that encapsulate the corresponding validation
 out of the box. Validation runs when calling `.validate()` or `.save()`
@@ -108,7 +108,7 @@ Skipping validation
 ====================
 
 Although discouraged as it allows to violate fields constraints, if for some reason you need to disable
-the validation and cleaning of a document when you call `.save()`, you can use `.save(validate=False)`.
+the validation and cleaning of a document when you call :meth:`~mongoengine.document.Document.save`, you can use `.save(validate=False)`.
 
 .. code-block:: python
 

From f3919dd839390e3a989de73c9c5d418a1f872685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schulthei=C3=9F?= <felix.schultheiss@smashdocs.net>
Date: Tue, 27 Oct 2020 12:55:35 +0100
Subject: [PATCH 1094/1519] stripped out integrating shard key from
 _save_update, use it also in _save_create

---
 mongoengine/document.py | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 4a57d511d..a3a30bc14 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -464,8 +464,10 @@ def _save_create(self, doc, force_insert, write_concern):
             # insert_one will provoke UniqueError alongside save does not
             # therefore, it need to catch and call replace_one.
             if "_id" in doc:
+                select_dict = {"_id": doc["_id"]}
+                select_dict = self._integrate_shard_key(doc, select_dict)
                 raw_object = wc_collection.find_one_and_replace(
-                    {"_id": doc["_id"]}, doc
+                    select_dict, doc
                 )
                 if raw_object:
                     return doc["_id"]
@@ -489,6 +491,21 @@ def _get_update_doc(self):
 
         return update_doc
 
+    def _integrate_shard_key(self, doc, select_dict):
+
+        # Need to add shard key to query, or you get an error
+        shard_key = self._meta.get("shard_key", tuple())
+        for k in shard_key:
+            path = self._lookup_field(k.split("."))
+            actual_key = [p.db_field for p in path]
+            val = doc
+            for ak in actual_key:
+                val = val[ak]
+            select_dict[".".join(actual_key)] = val
+
+        return select_dict
+
+
     def _save_update(self, doc, save_condition, write_concern):
         """Update an existing document.
 
@@ -504,15 +521,7 @@ def _save_update(self, doc, save_condition, write_concern):
 
         select_dict["_id"] = object_id
 
-        # Need to add shard key to query, or you get an error
-        shard_key = self._meta.get("shard_key", tuple())
-        for k in shard_key:
-            path = self._lookup_field(k.split("."))
-            actual_key = [p.db_field for p in path]
-            val = doc
-            for ak in actual_key:
-                val = val[ak]
-            select_dict[".".join(actual_key)] = val
+        select_dict = self._integrate_shard_key(doc, select_dict)
 
         update_doc = self._get_update_doc()
         if update_doc:

From 5a8e5e5a40c2453f99fc9882b8bdae61eefefc45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schulthei=C3=9F?= <felix.schultheiss@smashdocs.net>
Date: Tue, 27 Oct 2020 16:34:57 +0100
Subject: [PATCH 1095/1519] updated docstring

---
 mongoengine/document.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index a3a30bc14..2dcd31163 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -492,6 +492,9 @@ def _get_update_doc(self):
         return update_doc
 
     def _integrate_shard_key(self, doc, select_dict):
+        """Integrates the collection's shard key to the `select_dict`, which will be used for the query.
+        The value from the shard key is taken from the `doc` and finally the select_dict is returned.
+        """
 
         # Need to add shard key to query, or you get an error
         shard_key = self._meta.get("shard_key", tuple())
@@ -505,7 +508,6 @@ def _integrate_shard_key(self, doc, select_dict):
 
         return select_dict
 
-
     def _save_update(self, doc, save_condition, write_concern):
         """Update an existing document.
 

From bf1d04e399062a77580385ea452cb19b2a5f4e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schulthei=C3=9F?= <felix.schultheiss@smashdocs.net>
Date: Thu, 29 Oct 2020 14:56:08 +0100
Subject: [PATCH 1096/1519] black reformatting

---
 mongoengine/document.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 2dcd31163..801c8df80 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -466,9 +466,7 @@ def _save_create(self, doc, force_insert, write_concern):
             if "_id" in doc:
                 select_dict = {"_id": doc["_id"]}
                 select_dict = self._integrate_shard_key(doc, select_dict)
-                raw_object = wc_collection.find_one_and_replace(
-                    select_dict, doc
-                )
+                raw_object = wc_collection.find_one_and_replace(select_dict, doc)
                 if raw_object:
                     return doc["_id"]
 
@@ -930,7 +928,7 @@ def ensure_indexes(cls):
 
     @classmethod
     def list_indexes(cls):
-        """ Lists all of the indexes that should be created for given
+        """Lists all of the indexes that should be created for given
         collection. It includes all the indexes from super- and sub-classes.
         """
         if cls._meta.get("abstract"):
@@ -995,7 +993,7 @@ def get_indexes_spec(cls):
 
     @classmethod
     def compare_indexes(cls):
-        """ Compares the indexes defined in MongoEngine with the ones
+        """Compares the indexes defined in MongoEngine with the ones
         existing in the database. Returns any missing/extra indexes.
         """
 

From c9d53ca5d50e79bf1e8fb7afd012984b91ff5824 Mon Sep 17 00:00:00 2001
From: Mateusz Stankiewicz <stanek.94@o2.pl>
Date: Fri, 30 Oct 2020 13:06:37 +0100
Subject: [PATCH 1097/1519] Add EnumField

---
 AUTHORS                           |   1 +
 docs/changelog.rst                |   1 +
 docs/guide/defining-documents.rst |   1 +
 mongoengine/fields.py             |  52 +++++++++++++++
 tests/fields/test_enum_field.py   | 103 ++++++++++++++++++++++++++++++
 5 files changed, 158 insertions(+)
 create mode 100644 tests/fields/test_enum_field.py

diff --git a/AUTHORS b/AUTHORS
index 02e439554..10d04c68c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -257,3 +257,4 @@ that much better:
  * Matthew Simpson (https://github.com/mcsimps2)
  * Leonardo Domingues (https://github.com/leodmgs)
  * Agustin Barto (https://github.com/abarto)
+ * Stankiewicz Mateusz (https://github.com/mas15)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index f616f4a64..f63edc61b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,7 @@ Development
 - Fix the behavior of Doc.objects.limit(0) which should return all documents (similar to mongodb) #2311
 - Bug fix in ListField when updating the first item, it was saving the whole list, instead of
     just replacing the first item (as it's usually done) #2392
+- Add EnumField: ``mongoengine.fields.EnumField``
 
 Changes in 0.20.0
 =================
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index f5c707281..7fc20ba89 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -76,6 +76,7 @@ are as follows:
 * :class:`~mongoengine.fields.EmailField`
 * :class:`~mongoengine.fields.EmbeddedDocumentField`
 * :class:`~mongoengine.fields.EmbeddedDocumentListField`
+* :class:`~mongoengine.fields.EnumField`
 * :class:`~mongoengine.fields.FileField`
 * :class:`~mongoengine.fields.FloatField`
 * :class:`~mongoengine.fields.GenericEmbeddedDocumentField`
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index c5926cbd4..1ce660558 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -87,6 +87,7 @@
     "PolygonField",
     "SequenceField",
     "UUIDField",
+    "EnumField",
     "MultiPointField",
     "MultiLineStringField",
     "MultiPolygonField",
@@ -1622,6 +1623,57 @@ def prepare_query_value(self, op, value):
         return super().prepare_query_value(op, self.to_mongo(value))
 
 
+class EnumField(BaseField):
+    """ Enumeration Field. Values are stored underneath as strings.
+     Example usage:
+    .. code-block:: python
+
+        class Status(Enum):
+            NEW = 'new'
+            DONE = 'done'
+
+        class ModelWithEnum(Document):
+            status = EnumField(Status, default=Status.NEW)
+
+        ModelWithEnum(status='done')
+        ModelWithEnum(status=Status.DONE)
+
+    Enum fields can be searched using enum or its value:
+    .. code-block:: python
+
+        ModelWithEnum.objects(status='new').count()
+        ModelWithEnum.objects(status=Status.NEW).count()
+    """
+    def __init__(self, enum, **kwargs):
+        self._enum_cls = enum
+        kwargs["choices"] = list(self._enum_cls)
+        super().__init__(**kwargs)
+
+    def __set__(self, instance, value):
+        if value is None or isinstance(value, self._enum_cls):
+            value = value  # if it is proper enum or none then fine
+        else:  # if it not, then try to create enum of it
+            value = self._enum_cls(value)
+        return super().__set__(instance, value)
+
+    def to_mongo(self, value):
+        if isinstance(value, self._enum_cls):
+            return str(value.value)
+        return str(value)
+
+    def validate(self, value):
+        if not isinstance(value, self._enum_cls):
+            self.error(
+                "EnumField only accepts instances of "
+                "(%s)" % self._enum_cls
+            )
+
+    def prepare_query_value(self, op, value):
+        if value is None:
+            return value
+        return super().prepare_query_value(op, self.to_mongo(value))
+
+
 class GridFSError(Exception):
     pass
 
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
new file mode 100644
index 000000000..00404aa5e
--- /dev/null
+++ b/tests/fields/test_enum_field.py
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+from enum import Enum
+
+import pytest
+
+from mongoengine import *
+from tests.utils import MongoDBTestCase, get_as_pymongo
+
+
+class Status(Enum):
+    NEW = 'new'
+    DONE = 'done'
+    
+    
+class ModelWithEnum(Document):
+    status = EnumField(Status)
+
+
+class Color(Enum):
+    RED = 1
+    BLUE = 2
+
+
+class ModelWithColor(Document):
+    color = EnumField(Color, default=Color.RED)
+
+
+class TestEnumField(MongoDBTestCase):
+    def test_storage(self):
+        model = ModelWithEnum(status=Status.NEW).save()
+        assert get_as_pymongo(model) == {"_id": model.id, "status": 'new'}
+
+    def test_set_enum(self):
+        ModelWithEnum.drop_collection()
+        m = ModelWithEnum(status=Status.NEW).save()
+        assert ModelWithEnum.objects(status=Status.NEW).count() == 1
+        assert ModelWithEnum.objects.first().status == Status.NEW
+        m.validate()
+
+    def test_set_by_value(self):
+        ModelWithEnum.drop_collection()
+        ModelWithEnum(status='new').save()
+        assert ModelWithEnum.objects.first().status == Status.NEW
+
+    def test_filter(self):
+        ModelWithEnum.drop_collection()
+        ModelWithEnum(status='new').save()
+        assert ModelWithEnum.objects(status='new').count() == 1
+        assert ModelWithEnum.objects(status=Status.NEW).count() == 1
+        assert ModelWithEnum.objects(status=Status.DONE).count() == 0
+
+    def test_change_value(self):
+        m = ModelWithEnum(status='new')
+        m.status = Status.DONE
+        m.validate()
+        assert m.status == Status.DONE
+
+    def test_set_default(self):
+        class ModelWithDefault(Document):
+            status = EnumField(Status, default=Status.DONE)
+
+        m = ModelWithDefault()
+        m.validate()
+        m.save()
+        assert m.status == Status.DONE
+
+    def test_enum_with_int(self):
+        m = ModelWithColor()
+        m.validate()
+        m.save()
+        assert m.color == Color.RED
+        assert ModelWithColor.objects(color=Color.RED).count() == 1
+        assert ModelWithColor.objects(color=1).count() == 1
+        assert ModelWithColor.objects(color=2).count() == 0
+
+    def test_storage_enum_with_int(self):
+        model = ModelWithColor(color=Color.BLUE).save()
+        assert get_as_pymongo(model) == {"_id": model.id, "color": "2"}
+
+    def test_enum_field_can_be_empty(self):
+        m = ModelWithEnum()
+        m.validate()
+        m.save()
+        assert m.status is None
+        assert ModelWithEnum.objects()[0].status is None
+        assert ModelWithEnum.objects(status=None).count() == 1
+
+    def test_cannot_create_model_with_wrong_enum_value(self):
+        with pytest.raises(ValueError):
+            ModelWithEnum(status='wrong_one')
+
+    def test_cannot_create_model_with_wrong_enum_type(self):
+        with pytest.raises(ValueError):
+            ModelWithColor(color='wrong_type')
+
+    def test_cannot_create_model_with_wrong_enum_value_int(self):
+        with pytest.raises(ValueError):
+            ModelWithColor(color=3)
+
+    def test_cannot_set_wrong_enum_value(self):
+        m = ModelWithEnum(status='new')
+        with pytest.raises(ValueError):
+            m.status = 'wrong'

From f4962fbc40060ba205cd2aae6cc1acd53295f4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 30 Oct 2020 21:10:21 +0100
Subject: [PATCH 1098/1519] remove utf8 encoding declaration in test files as
 it's not needed/recommended

---
 docs/conf.py                                 | 1 -
 tests/document/test_class_methods.py         | 1 -
 tests/document/test_delta.py                 | 1 -
 tests/document/test_indexes.py               | 1 -
 tests/document/test_inheritance.py           | 1 -
 tests/document/test_instance.py              | 1 -
 tests/document/test_validation.py            | 1 -
 tests/fields/test_binary_field.py            | 1 -
 tests/fields/test_boolean_field.py           | 1 -
 tests/fields/test_cached_reference_field.py  | 1 -
 tests/fields/test_complex_datetime_field.py  | 1 -
 tests/fields/test_date_field.py              | 1 -
 tests/fields/test_datetime_field.py          | 1 -
 tests/fields/test_decimal_field.py           | 1 -
 tests/fields/test_dict_field.py              | 1 -
 tests/fields/test_email_field.py             | 1 -
 tests/fields/test_embedded_document_field.py | 1 -
 tests/fields/test_fields.py                  | 1 -
 tests/fields/test_file_field.py              | 1 -
 tests/fields/test_float_field.py             | 1 -
 tests/fields/test_geo_fields.py              | 1 -
 tests/fields/test_int_field.py               | 1 -
 tests/fields/test_lazy_reference_field.py    | 1 -
 tests/fields/test_map_field.py               | 1 -
 tests/fields/test_reference_field.py         | 1 -
 tests/fields/test_sequence_field.py          | 2 --
 tests/fields/test_url_field.py               | 1 -
 tests/fields/test_uuid_field.py              | 1 -
 tests/queryset/test_queryset.py              | 2 --
 tests/queryset/test_queryset_aggregation.py  | 2 --
 tests/test_dereference.py                    | 1 -
 tests/test_signals.py                        | 1 -
 32 files changed, 35 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 48c8e859c..fdb5b61d8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # MongoEngine documentation build configuration file, created by
 # sphinx-quickstart on Sun Nov 22 18:14:13 2009.
diff --git a/tests/document/test_class_methods.py b/tests/document/test_class_methods.py
index be883b2a2..0276457c3 100644
--- a/tests/document/test_class_methods.py
+++ b/tests/document/test_class_methods.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 
 from mongoengine import *
diff --git a/tests/document/test_delta.py b/tests/document/test_delta.py
index 94f89f994..ed3bb67b2 100644
--- a/tests/document/test_delta.py
+++ b/tests/document/test_delta.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 
 from bson import SON
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 45d1cd230..726eebe5f 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 from datetime import datetime
 
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index 53a1489bd..e7901f05e 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 import warnings
 
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 8d42d15b7..9554659cf 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import os
 import pickle
 import unittest
diff --git a/tests/document/test_validation.py b/tests/document/test_validation.py
index 2439f2831..c4228a96d 100644
--- a/tests/document/test_validation.py
+++ b/tests/document/test_validation.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 from datetime import datetime
 
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index a9c0c7e58..4f7af3252 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import uuid
 
 from bson import Binary
diff --git a/tests/fields/test_boolean_field.py b/tests/fields/test_boolean_field.py
index 041f9f56b..737e0dbfd 100644
--- a/tests/fields/test_boolean_field.py
+++ b/tests/fields/test_boolean_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pytest
 
 from mongoengine import *
diff --git a/tests/fields/test_cached_reference_field.py b/tests/fields/test_cached_reference_field.py
index bb4c57d27..dd804b389 100644
--- a/tests/fields/test_cached_reference_field.py
+++ b/tests/fields/test_cached_reference_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from decimal import Decimal
 
 import pytest
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index d118ad23a..d8ae91755 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime
 import itertools
 import math
diff --git a/tests/fields/test_date_field.py b/tests/fields/test_date_field.py
index 42a4b7f1f..a98f222ad 100644
--- a/tests/fields/test_date_field.py
+++ b/tests/fields/test_date_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime
 
 import pytest
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 48936af7a..0858548c5 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime as dt
 
 import pytest
diff --git a/tests/fields/test_decimal_field.py b/tests/fields/test_decimal_field.py
index c531166f5..a7cd09a21 100644
--- a/tests/fields/test_decimal_field.py
+++ b/tests/fields/test_decimal_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from decimal import Decimal
 
 import pytest
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 12140916a..05482107e 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from bson import InvalidDocument
 import pytest
 
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
index 5a58ede42..893180a41 100644
--- a/tests/fields/test_email_field.py
+++ b/tests/fields/test_email_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import sys
 
 import pytest
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 13ca9c0ba..e116dc0df 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pytest
 
 from mongoengine import (
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index fe349d1e1..aa530ced4 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime
 import unittest
 
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index cbac9b691..de10c9870 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import copy
 import os
 import tempfile
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
index 839494a9a..817dcfeb0 100644
--- a/tests/fields/test_float_field.py
+++ b/tests/fields/test_float_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pytest
 
 from mongoengine import *
diff --git a/tests/fields/test_geo_fields.py b/tests/fields/test_geo_fields.py
index 7618b3a09..7960178e2 100644
--- a/tests/fields/test_geo_fields.py
+++ b/tests/fields/test_geo_fields.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 
 from mongoengine import *
diff --git a/tests/fields/test_int_field.py b/tests/fields/test_int_field.py
index 1f9c5a773..529ae4db5 100644
--- a/tests/fields/test_int_field.py
+++ b/tests/fields/test_int_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pytest
 
 from mongoengine import *
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index 50e60262a..07d4d3a9b 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from bson import DBRef, ObjectId
 import pytest
 
diff --git a/tests/fields/test_map_field.py b/tests/fields/test_map_field.py
index 8b8b1c469..ea60e34d1 100644
--- a/tests/fields/test_map_field.py
+++ b/tests/fields/test_map_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime
 
 import pytest
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index 949eac671..24401ce0b 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from bson import DBRef, SON
 import pytest
 
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
index 81d648fda..b6b2917f9 100644
--- a/tests/fields/test_sequence_field.py
+++ b/tests/fields/test_sequence_field.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from mongoengine import *
 
 from tests.utils import MongoDBTestCase
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index c449e4677..50845b902 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import pytest
 
 from mongoengine import *
diff --git a/tests/fields/test_uuid_field.py b/tests/fields/test_uuid_field.py
index 21b7a0907..0f3d2d84e 100644
--- a/tests/fields/test_uuid_field.py
+++ b/tests/fields/test_uuid_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import uuid
 
 import pytest
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 73c419b31..a2440302a 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import datetime
 import unittest
 import uuid
diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index 00e04a36a..146501d0f 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import unittest
 import warnings
 
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 8ba429f46..c40cc0bd4 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 
 from bson import DBRef, ObjectId
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 64976e256..197071651 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 
 from mongoengine import *

From 9e40f3ae8328e2f755a8c681c5ff892d4e462d90 Mon Sep 17 00:00:00 2001
From: Mateusz Stankiewicz <stanek.94@o2.pl>
Date: Sat, 31 Oct 2020 10:47:20 +0100
Subject: [PATCH 1099/1519] PR ammends

---
 mongoengine/fields.py           |  38 +++++++----
 tests/fields/test_enum_field.py | 110 +++++++++++++++++---------------
 2 files changed, 81 insertions(+), 67 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 1ce660558..69277d06b 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -848,8 +848,7 @@ class DynamicField(BaseField):
     Used by :class:`~mongoengine.DynamicDocument` to handle dynamic data"""
 
     def to_mongo(self, value, use_db_field=True, fields=None):
-        """Convert a Python type to a MongoDB compatible type.
-        """
+        """Convert a Python type to a MongoDB compatible type."""
 
         if isinstance(value, str):
             return value
@@ -1624,7 +1623,7 @@ def prepare_query_value(self, op, value):
 
 
 class EnumField(BaseField):
-    """ Enumeration Field. Values are stored underneath as strings.
+    """Enumeration Field. Values are stored underneath as strings.
      Example usage:
     .. code-block:: python
 
@@ -1643,30 +1642,41 @@ class ModelWithEnum(Document):
 
         ModelWithEnum.objects(status='new').count()
         ModelWithEnum.objects(status=Status.NEW).count()
+
+    Note that choices cannot be set explicitly, they are derived
+    from the provided enum class.
     """
+
     def __init__(self, enum, **kwargs):
         self._enum_cls = enum
+        if "choices" in kwargs:
+            raise ValueError(
+                "'choices' can't be set on EnumField, "
+                "it is implicitly set as the enum class"
+            )
         kwargs["choices"] = list(self._enum_cls)
         super().__init__(**kwargs)
 
     def __set__(self, instance, value):
-        if value is None or isinstance(value, self._enum_cls):
-            value = value  # if it is proper enum or none then fine
-        else:  # if it not, then try to create enum of it
-            value = self._enum_cls(value)
+        is_legal_value = value is None or isinstance(value, self._enum_cls)
+        if not is_legal_value:
+            try:
+                value = self._enum_cls(value)
+            except Exception:
+                pass
         return super().__set__(instance, value)
 
     def to_mongo(self, value):
         if isinstance(value, self._enum_cls):
-            return str(value.value)
-        return str(value)
+            return value.value
+        return value
 
     def validate(self, value):
-        if not isinstance(value, self._enum_cls):
-            self.error(
-                "EnumField only accepts instances of "
-                "(%s)" % self._enum_cls
-            )
+        if value and not isinstance(value, self._enum_cls):
+            try:
+                self._enum_cls(value)
+            except Exception as e:
+                self.error(str(e))
 
     def prepare_query_value(self, op, value):
         if value is None:
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index 00404aa5e..1f89b9bf3 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from enum import Enum
 
 import pytest
@@ -8,96 +7,101 @@
 
 
 class Status(Enum):
-    NEW = 'new'
-    DONE = 'done'
-    
-    
-class ModelWithEnum(Document):
-    status = EnumField(Status)
-
-
-class Color(Enum):
-    RED = 1
-    BLUE = 2
+    NEW = "new"
+    DONE = "done"
 
 
-class ModelWithColor(Document):
-    color = EnumField(Color, default=Color.RED)
+class ModelWithEnum(Document):
+    status = EnumField(Status)
 
 
-class TestEnumField(MongoDBTestCase):
+class TestStringEnumField(MongoDBTestCase):
     def test_storage(self):
         model = ModelWithEnum(status=Status.NEW).save()
-        assert get_as_pymongo(model) == {"_id": model.id, "status": 'new'}
+        assert get_as_pymongo(model) == {"_id": model.id, "status": "new"}
 
     def test_set_enum(self):
         ModelWithEnum.drop_collection()
-        m = ModelWithEnum(status=Status.NEW).save()
+        ModelWithEnum(status=Status.NEW).save()
         assert ModelWithEnum.objects(status=Status.NEW).count() == 1
         assert ModelWithEnum.objects.first().status == Status.NEW
-        m.validate()
 
     def test_set_by_value(self):
         ModelWithEnum.drop_collection()
-        ModelWithEnum(status='new').save()
+        ModelWithEnum(status="new").save()
         assert ModelWithEnum.objects.first().status == Status.NEW
 
     def test_filter(self):
         ModelWithEnum.drop_collection()
-        ModelWithEnum(status='new').save()
-        assert ModelWithEnum.objects(status='new').count() == 1
+        ModelWithEnum(status="new").save()
+        assert ModelWithEnum.objects(status="new").count() == 1
         assert ModelWithEnum.objects(status=Status.NEW).count() == 1
         assert ModelWithEnum.objects(status=Status.DONE).count() == 0
 
     def test_change_value(self):
-        m = ModelWithEnum(status='new')
+        m = ModelWithEnum(status="new")
         m.status = Status.DONE
-        m.validate()
+        m.save()
         assert m.status == Status.DONE
 
     def test_set_default(self):
         class ModelWithDefault(Document):
             status = EnumField(Status, default=Status.DONE)
 
-        m = ModelWithDefault()
-        m.validate()
-        m.save()
+        m = ModelWithDefault().save()
         assert m.status == Status.DONE
 
+    def test_enum_field_can_be_empty(self):
+        ModelWithEnum.drop_collection()
+        m = ModelWithEnum().save()
+        assert m.status is None
+        assert ModelWithEnum.objects()[0].status is None
+        assert ModelWithEnum.objects(status=None).count() == 1
+
+    def test_set_none_explicitly(self):
+        ModelWithEnum.drop_collection()
+        ModelWithEnum(status=None).save()
+        assert ModelWithEnum.objects.first().status is None
+
+    def test_cannot_create_model_with_wrong_enum_value(self):
+        m = ModelWithEnum(status="wrong_one")
+        with pytest.raises(ValidationError):
+            m.validate()
+
+    def test_user_is_informed_when_tries_to_set_choices(self):
+        with pytest.raises(ValueError, match="'choices' can't be set on EnumField"):
+            EnumField(Status, choices=["my", "custom", "options"])
+
+
+class Color(Enum):
+    RED = 1
+    BLUE = 2
+
+
+class ModelWithColor(Document):
+    color = EnumField(Color, default=Color.RED)
+
+
+class TestIntEnumField(MongoDBTestCase):
     def test_enum_with_int(self):
-        m = ModelWithColor()
-        m.validate()
-        m.save()
+        ModelWithColor.drop_collection()
+        m = ModelWithColor().save()
         assert m.color == Color.RED
         assert ModelWithColor.objects(color=Color.RED).count() == 1
         assert ModelWithColor.objects(color=1).count() == 1
         assert ModelWithColor.objects(color=2).count() == 0
 
+    def test_create_int_enum_by_value(self):
+        model = ModelWithColor(color=2).save()
+        assert model.color == Color.BLUE
+
     def test_storage_enum_with_int(self):
         model = ModelWithColor(color=Color.BLUE).save()
-        assert get_as_pymongo(model) == {"_id": model.id, "color": "2"}
-
-    def test_enum_field_can_be_empty(self):
-        m = ModelWithEnum()
-        m.validate()
-        m.save()
-        assert m.status is None
-        assert ModelWithEnum.objects()[0].status is None
-        assert ModelWithEnum.objects(status=None).count() == 1
-
-    def test_cannot_create_model_with_wrong_enum_value(self):
-        with pytest.raises(ValueError):
-            ModelWithEnum(status='wrong_one')
-
-    def test_cannot_create_model_with_wrong_enum_type(self):
-        with pytest.raises(ValueError):
-            ModelWithColor(color='wrong_type')
+        assert get_as_pymongo(model) == {"_id": model.id, "color": 2}
 
-    def test_cannot_create_model_with_wrong_enum_value_int(self):
-        with pytest.raises(ValueError):
-            ModelWithColor(color=3)
+    def test_validate_model(self):
+        with pytest.raises(ValidationError, match="Value must be one of"):
+            ModelWithColor(color=3).validate()
 
-    def test_cannot_set_wrong_enum_value(self):
-        m = ModelWithEnum(status='new')
-        with pytest.raises(ValueError):
-            m.status = 'wrong'
+        with pytest.raises(ValidationError, match="Value must be one of"):
+            ModelWithColor(color="wrong_type").validate()

From 8ef721342683bf8c4622b22fa31f231f9dae9706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 1 Nov 2020 14:05:58 +0100
Subject: [PATCH 1100/1519] improve EnumField Doc and add quick test

---
 mongoengine/fields.py           |  4 +++-
 tests/fields/test_enum_field.py | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 69277d06b..8915d801d 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1623,7 +1623,9 @@ def prepare_query_value(self, op, value):
 
 
 class EnumField(BaseField):
-    """Enumeration Field. Values are stored underneath as strings.
+    """Enumeration Field. Values are stored underneath as is,
+    so it will only work with simple types (str, int, etc) that
+    are bson encodable
      Example usage:
     .. code-block:: python
 
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index 1f89b9bf3..384e9afd4 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -1,5 +1,6 @@
 from enum import Enum
 
+from bson import InvalidDocument
 import pytest
 
 from mongoengine import *
@@ -105,3 +106,17 @@ def test_validate_model(self):
 
         with pytest.raises(ValidationError, match="Value must be one of"):
             ModelWithColor(color="wrong_type").validate()
+
+
+class TestFunkyEnumField(MongoDBTestCase):
+    def test_enum_incompatible_bson_type_fails_during_save(self):
+        class FunkyColor(Enum):
+            YELLOW = object()
+
+        class ModelWithFunkyColor(Document):
+            color = EnumField(FunkyColor)
+
+        m = ModelWithFunkyColor(color=FunkyColor.YELLOW)
+
+        with pytest.raises(InvalidDocument, match="cannot encode object"):
+            m.save()

From 94a7e813b1de820531603113e38fa95746010f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 1 Nov 2020 19:37:13 +0100
Subject: [PATCH 1101/1519] fix difference in test for certain version of
 pymongo

---
 tests/fields/test_enum_field.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index 384e9afd4..fc42487bf 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -118,5 +118,5 @@ class ModelWithFunkyColor(Document):
 
         m = ModelWithFunkyColor(color=FunkyColor.YELLOW)
 
-        with pytest.raises(InvalidDocument, match="cannot encode object"):
+        with pytest.raises(InvalidDocument, match="[cC]annot encode object"):
             m.save()

From f8d371229e72b97f696fe782c2cb441f8359ef5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 16 Jun 2019 23:05:06 +0200
Subject: [PATCH 1102/1519] tmp work on migration doc

---
 docs/guide/index.rst     |  1 +
 docs/guide/migration.rst | 70 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 docs/guide/migration.rst

diff --git a/docs/guide/index.rst b/docs/guide/index.rst
index 95a9b92ba..62de0ecfa 100644
--- a/docs/guide/index.rst
+++ b/docs/guide/index.rst
@@ -16,3 +16,4 @@ User Guide
    text-indexes
    logging-monitoring
    mongomock
+   migration
diff --git a/docs/guide/migration.rst b/docs/guide/migration.rst
new file mode 100644
index 000000000..c0c69d086
--- /dev/null
+++ b/docs/guide/migration.rst
@@ -0,0 +1,70 @@
+==============================
+Handling migration
+==============================
+
+The structure of your documents and their associated mongoengine schemas are likely
+to change over the lifetime of an application. This section provides guidance and
+recommendations on how to deal with migrations.
+
+Due to the very flexible nature of mongodb, migrations of models aren't trivial and
+for people that know about `alembic` for `sqlalchemy`, there is unfortunately no equivalent
+library that will manage the migration in an automatic fashion for mongoengine.
+
+First of all, let's take a simple example of model change and review the different option you
+have to deal with the migration.
+
+Let's assume we start with the following schema and save an instance:
+
+.. code-block:: python
+
+    class User(Document):
+        name = StringField()
+
+    User(name=username).save()
+
+    # print the objects as they exist in mongodb
+    print(User.objects().as_pymongo())    # [{u'_id': ObjectId('5d06b9c3d7c1f18db3e7c874'), u'name': u'John'}]
+
+On the next version of your application, let's now assume that a new field `enabled` gets added to the
+existing User model with a `default=True`. Thus you simply update the `User` class to the following:
+
+.. code-block:: python
+
+    class User(Document):
+        name = StringField(required=True)
+        enabled = BooleaField(default=True)
+
+Without migration, we now reload an object from the database into the `User` class and checks its `enabled`
+attribute:
+
+.. code-block:: python
+
+    assert User.objects.count() == 1
+    user = User.objects().first()
+    assert user.enabled is True
+    print(User.objects(enabled=True).count())    # 0 ! uh?
+    print(User.objects(enabled=False).count())   # 0 ! uh?
+
+    # but this is consistent with what we have in database
+    print(User.objects().as_pymongo().first())    # {u'_id': ObjectId('5d06b9c3d7c1f18db3e7c874'), u'name': u'John'}
+    assert User.objects(enabled=None).count() == 1
+
+As you can see, even if the document wasn't updated, mongoengine applies the default value seemlessly when it
+loads the pymongo dict into a `User` instance. At first sight it looks like you don't need to migrate the
+existing documents when adding new fields but this actually leads to inconsistencies when it comes to querying.
+
+In fact, when querying, mongoengine isn't trying to account for the default value of the new field and so
+if you don't actually migrate the existing documents, you are taking a risk that querying/updating
+will be missing relevant record.
+
+When adding fields/modifying default values, you can use any of the following to do the migration
+as a standalone script:
+
+.. code-block:: python
+
+    User.objects().update(enabled=True)
+    # or
+    user_coll = User._get_collection()
+    user_coll.update_many({}, {'$set': {'enabled': True}})
+
+

From d8b8ff68517c851bdedcd584a0511a47087f4755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 2 Nov 2020 14:52:02 +0100
Subject: [PATCH 1103/1519] Removed code related to Document.__only_fields and
 Queryset.only_fields which appear to have no effect

---
 docs/changelog.rst              |  1 +
 mongoengine/base/document.py    | 15 +++------------
 mongoengine/queryset/base.py    | 34 ++++++++-------------------------
 tests/document/test_instance.py |  2 +-
 4 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f63edc61b..3a9cbd5f6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,6 +14,7 @@ Development
 - Bug fix in ListField when updating the first item, it was saving the whole list, instead of
     just replacing the first item (as it's usually done) #2392
 - Add EnumField: ``mongoengine.fields.EnumField``
+- Refactoring - Remove useless code related to Document.__only_fields and Queryset.only_fields
 
 Changes in 0.20.0
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 8b0ab91f8..0fd880354 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -64,8 +64,6 @@ def __init__(self, *args, **values):
             It may contain additional reserved keywords, e.g. "__auto_convert".
         :param __auto_convert: If True, supplied values will be converted
             to Python-type values via each field's `to_python` method.
-        :param __only_fields: A set of fields that have been loaded for
-            this document. Empty if all fields have been loaded.
         :param _created: Indicates whether this is a brand new document
             or whether it's already been persisted before. Defaults to true.
         """
@@ -80,8 +78,6 @@ def __init__(self, *args, **values):
 
         __auto_convert = values.pop("__auto_convert", True)
 
-        __only_fields = set(values.pop("__only_fields", values))
-
         _created = values.pop("_created", True)
 
         signals.pre_init.send(self.__class__, document=self, values=values)
@@ -109,7 +105,7 @@ def __init__(self, *args, **values):
         # We set default values only for fields loaded from DB. See
         # https://github.com/mongoengine/mongoengine/issues/399 for more info.
         for key, field in self._fields.items():
-            if self._db_field_map.get(key, key) in __only_fields:
+            if self._db_field_map.get(key, key) in values:
                 continue
             value = getattr(self, key, None)
             setattr(self, key, value)
@@ -758,11 +754,8 @@ def _get_collection_name(cls):
         return cls._meta.get("collection", None)
 
     @classmethod
-    def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False):
+    def _from_son(cls, son, _auto_dereference=True, created=False):
         """Create an instance of a Document (subclass) from a PyMongo SON."""
-        if not only_fields:
-            only_fields = []
-
         if son and not isinstance(son, dict):
             raise ValueError(
                 "The source SON object needs to be of type 'dict' but a '%s' was found"
@@ -817,9 +810,7 @@ def _from_son(cls, son, _auto_dereference=True, only_fields=None, created=False)
         if cls.STRICT:
             data = {k: v for k, v in data.items() if k in cls._fields}
 
-        obj = cls(
-            __auto_convert=False, _created=created, __only_fields=only_fields, **data
-        )
+        obj = cls(__auto_convert=False, _created=created, **data)
         obj._changed_fields = []
         if not _auto_dereference:
             obj._fields = fields
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 33ab6e2a5..1021bf5eb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -88,7 +88,6 @@ def __init__(self, document, collection):
         self._hint = -1  # Using -1 as None is a valid value for hint
         self._collation = None
         self._batch_size = None
-        self.only_fields = []
         self._max_time_ms = None
         self._comment = None
 
@@ -190,9 +189,7 @@ def __getitem__(self, key):
             if queryset._scalar:
                 return queryset._get_scalar(
                     queryset._document._from_son(
-                        queryset._cursor[key],
-                        _auto_dereference=self._auto_dereference,
-                        only_fields=self.only_fields,
+                        queryset._cursor[key], _auto_dereference=self._auto_dereference,
                     )
                 )
 
@@ -200,9 +197,7 @@ def __getitem__(self, key):
                 return queryset._cursor[key]
 
             return queryset._document._from_son(
-                queryset._cursor[key],
-                _auto_dereference=self._auto_dereference,
-                only_fields=self.only_fields,
+                queryset._cursor[key], _auto_dereference=self._auto_dereference,
             )
 
         raise TypeError("Provide a slice or an integer index")
@@ -719,12 +714,10 @@ def modify(
 
         if full_response:
             if result["value"] is not None:
-                result["value"] = self._document._from_son(
-                    result["value"], only_fields=self.only_fields
-                )
+                result["value"] = self._document._from_son(result["value"])
         else:
             if result is not None:
-                result = self._document._from_son(result, only_fields=self.only_fields)
+                result = self._document._from_son(result)
 
         return result
 
@@ -757,18 +750,14 @@ def in_bulk(self, object_ids):
         docs = self._collection.find({"_id": {"$in": object_ids}}, **self._cursor_args)
         if self._scalar:
             for doc in docs:
-                doc_map[doc["_id"]] = self._get_scalar(
-                    self._document._from_son(doc, only_fields=self.only_fields)
-                )
+                doc_map[doc["_id"]] = self._get_scalar(self._document._from_son(doc))
         elif self._as_pymongo:
             for doc in docs:
                 doc_map[doc["_id"]] = doc
         else:
             for doc in docs:
                 doc_map[doc["_id"]] = self._document._from_son(
-                    doc,
-                    only_fields=self.only_fields,
-                    _auto_dereference=self._auto_dereference,
+                    doc, _auto_dereference=self._auto_dereference,
                 )
 
         return doc_map
@@ -841,7 +830,6 @@ def _clone_into(self, new_qs):
             "_collation",
             "_auto_dereference",
             "_search_text",
-            "only_fields",
             "_max_time_ms",
             "_comment",
             "_batch_size",
@@ -1045,7 +1033,6 @@ def only(self, *fields):
         .. versionchanged:: 0.5 - Added subfield support
         """
         fields = {f: QueryFieldList.ONLY for f in fields}
-        self.only_fields = list(fields.keys())
         return self.fields(True, **fields)
 
     def exclude(self, *fields):
@@ -1310,10 +1297,7 @@ def to_json(self, *args, **kwargs):
     def from_json(self, json_data):
         """Converts json data to unsaved objects"""
         son_data = json_util.loads(json_data)
-        return [
-            self._document._from_son(data, only_fields=self.only_fields)
-            for data in son_data
-        ]
+        return [self._document._from_son(data) for data in son_data]
 
     def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
         """Perform a aggregate function based in your queryset params
@@ -1638,9 +1622,7 @@ def __next__(self):
             return raw_doc
 
         doc = self._document._from_son(
-            raw_doc,
-            _auto_dereference=self._auto_dereference,
-            only_fields=self.only_fields,
+            raw_doc, _auto_dereference=self._auto_dereference,
         )
 
         if self._scalar:
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 9554659cf..960de9243 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3411,7 +3411,7 @@ class Test(Document):
         assert obj3 != dbref2
         assert dbref2 != obj3
 
-    def test_default_values(self):
+    def test_default_values_dont_get_override_upon_save_when_only_is_used(self):
         class Person(Document):
             created_on = DateTimeField(default=lambda: datetime.utcnow())
             name = StringField()

From 90c5d83f8432d97050c21163349d80b1f9b3892b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 2 Nov 2020 15:02:11 +0100
Subject: [PATCH 1104/1519] remove deprecated comment

---
 mongoengine/base/document.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 0fd880354..5b727437a 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -102,8 +102,6 @@ def __init__(self, *args, **values):
         self._dynamic_fields = SON()
 
         # Assign default values to the instance.
-        # We set default values only for fields loaded from DB. See
-        # https://github.com/mongoengine/mongoengine/issues/399 for more info.
         for key, field in self._fields.items():
             if self._db_field_map.get(key, key) in values:
                 continue

From 30a3c6a5b76eb5f350859be3d926351bf060f363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schulthei=C3=9F?= <felix.schultheiss@smashdocs.net>
Date: Mon, 2 Nov 2020 17:30:24 +0100
Subject: [PATCH 1105/1519] added testcase for save create with shard key

---
 tests/document/test_instance.py | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 8d42d15b7..e5ac27562 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -501,7 +501,7 @@ class Animal(Document):
         doc.reload()
         Animal.drop_collection()
 
-    def test_update_shard_key_routing(self):
+    def test_save_update_shard_key_routing(self):
         """Ensures updating a doc with a specified shard_key includes it in
         the query.
         """
@@ -529,6 +529,36 @@ class Animal(Document):
 
         Animal.drop_collection()
 
+    def test_save_create_shard_key_routing(self):
+        """Ensures inserting a doc with a specified shard_key includes it in
+        the query.
+        """
+
+        class Animal(Document):
+            _id = UUIDField(binary=False, primary_key=True, default=uuid.uuid4)
+            is_mammal = BooleanField()
+            name = StringField()
+            meta = {"shard_key": ("is_mammal",)}
+
+        Animal.drop_collection()
+        doc = Animal(is_mammal=True, name="Dog")
+
+        mongo_db = get_mongodb_version()
+
+        with query_counter() as q:
+            doc.save()
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
+            assert query_op["op"] == "command"
+            assert query_op["command"]["findAndModify"] == "animal"
+            if mongo_db <= MONGODB_34:
+                assert set(query_op["query"].keys()) == set(["_id", "is_mammal"])
+            else:
+                assert set(query_op["command"]["query"].keys()) == set(
+                    ["_id", "is_mammal"]
+                )
+
+        Animal.drop_collection()
+
     def test_reload_with_changed_fields(self):
         """Ensures reloading will not affect changed fields"""
 

From 0bc18cd6e100747ed5139d1e0774dc0502fb7d06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schulthei=C3=9F?= <felix.schultheiss@smashdocs.net>
Date: Tue, 3 Nov 2020 10:00:02 +0100
Subject: [PATCH 1106/1519] fixed shard test case for old mongodb version

---
 tests/document/test_instance.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index e5ac27562..3a077735b 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -543,19 +543,12 @@ class Animal(Document):
         Animal.drop_collection()
         doc = Animal(is_mammal=True, name="Dog")
 
-        mongo_db = get_mongodb_version()
-
         with query_counter() as q:
             doc.save()
             query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
             assert query_op["op"] == "command"
             assert query_op["command"]["findAndModify"] == "animal"
-            if mongo_db <= MONGODB_34:
-                assert set(query_op["query"].keys()) == set(["_id", "is_mammal"])
-            else:
-                assert set(query_op["command"]["query"].keys()) == set(
-                    ["_id", "is_mammal"]
-                )
+            assert set(query_op["command"]["query"].keys()) == set(["_id", "is_mammal"])
 
         Animal.drop_collection()
 

From 79f9f223d018dea27bea49807094a5df6703aafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schulthei=C3=9F?= <felix.schultheiss@smashdocs.net>
Date: Tue, 3 Nov 2020 10:00:15 +0100
Subject: [PATCH 1107/1519] added to authors

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 02e439554..80fbd99a4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -257,3 +257,4 @@ that much better:
  * Matthew Simpson (https://github.com/mcsimps2)
  * Leonardo Domingues (https://github.com/leodmgs)
  * Agustin Barto (https://github.com/abarto)
+ * Felix Schultheiß (https://github.com/felix-smashdocs)

From 03af784ebe569d57a71317f867717fc68a9053e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 7 Nov 2020 21:09:47 +0100
Subject: [PATCH 1108/1519] Bug fix in DynamicDocument which isn not parsing
 known fields in constructor like Document do #2412

---
 docs/changelog.rst             |  1 +
 mongoengine/base/document.py   | 31 ++++++++++++++-----------------
 tests/document/test_dynamic.py | 13 +++++++++++++
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f63edc61b..b211def17 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Bug fix in DynamicDocument which isn not parsing known fields in constructor like Document do #2412
 - When using pymongo >= 3.7, make use of Collection.count_documents instead of Collection.count
     and Cursor.count that got deprecated in pymongo >= 3.7.
     This should have a negative impact on performance of count see Issue #2219
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 8b0ab91f8..e549aba77 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -117,25 +117,22 @@ def __init__(self, *args, **values):
         if "_cls" not in values:
             self._cls = self._class_name
 
-        # Set passed values after initialisation
-        if self._dynamic:
-            dynamic_data = {}
-            for key, value in values.items():
-                if key in self._fields or key == "_id":
-                    setattr(self, key, value)
-                else:
+        # Set actual values
+        dynamic_data = {}
+        FileField = _import_class("FileField")
+        for key, value in values.items():
+            key = self._reverse_db_field_map.get(key, key)
+            field = self._fields.get(key)
+            if field or key in ("id", "pk", "_cls"):
+                if __auto_convert and value is not None:
+                    if field and not isinstance(field, FileField):
+                        value = field.to_python(value)
+                setattr(self, key, value)
+            else:
+                if self._dynamic:
                     dynamic_data[key] = value
-        else:
-            FileField = _import_class("FileField")
-            for key, value in values.items():
-                key = self._reverse_db_field_map.get(key, key)
-                if key in self._fields or key in ("id", "pk", "_cls"):
-                    if __auto_convert and value is not None:
-                        field = self._fields.get(key)
-                        if field and not isinstance(field, FileField):
-                            value = field.to_python(value)
-                    setattr(self, key, value)
                 else:
+                    # For strict Document
                     self._data[key] = value
 
         # Set any get_<field>_display methods
diff --git a/tests/document/test_dynamic.py b/tests/document/test_dynamic.py
index 0032dfd93..dc7ecb8b6 100644
--- a/tests/document/test_dynamic.py
+++ b/tests/document/test_dynamic.py
@@ -37,6 +37,19 @@ def test_simple_dynamic_document(self):
         # Confirm no changes to self.Person
         assert not hasattr(self.Person, "age")
 
+    def test_dynamic_document_parse_values_in_constructor_like_document_do(self):
+        class ProductDynamicDocument(DynamicDocument):
+            title = StringField()
+            price = FloatField()
+
+        class ProductDocument(Document):
+            title = StringField()
+            price = FloatField()
+
+        product = ProductDocument(title="Blabla", price="12.5")
+        dyn_product = ProductDynamicDocument(title="Blabla", price="12.5")
+        assert product.price == dyn_product.price == 12.5
+
     def test_change_scope_of_variable(self):
         """Test changing the scope of a dynamic field has no adverse effects"""
         p = self.Person()

From 8c3058d99b362fc34838becd16feaad683a22778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 8 Nov 2020 22:36:58 +0100
Subject: [PATCH 1109/1519] Fix some issues related with db_field in
 constructor by removing field/db_field translation that shouldn't occur in
 constructor

---
 mongoengine/base/document.py    | 17 +++---
 tests/document/test_instance.py | 92 +++++++++++++++++++++++++++++++++
 tests/fields/test_fields.py     |  7 +++
 3 files changed, 109 insertions(+), 7 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index ee88e894a..019d62d05 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -101,12 +101,13 @@ def __init__(self, *args, **values):
 
         self._dynamic_fields = SON()
 
-        # Assign default values to the instance.
-        for key, field in self._fields.items():
-            if self._db_field_map.get(key, key) in values:
+        # Assign default values for fields
+        # not set in the constructor
+        for field_name in self._fields:
+            if field_name in values:
                 continue
-            value = getattr(self, key, None)
-            setattr(self, key, value)
+            value = getattr(self, field_name, None)
+            setattr(self, field_name, value)
 
         if "_cls" not in values:
             self._cls = self._class_name
@@ -115,7 +116,6 @@ def __init__(self, *args, **values):
         dynamic_data = {}
         FileField = _import_class("FileField")
         for key, value in values.items():
-            key = self._reverse_db_field_map.get(key, key)
             field = self._fields.get(key)
             if field or key in ("id", "pk", "_cls"):
                 if __auto_convert and value is not None:
@@ -750,7 +750,8 @@ def _get_collection_name(cls):
 
     @classmethod
     def _from_son(cls, son, _auto_dereference=True, created=False):
-        """Create an instance of a Document (subclass) from a PyMongo SON."""
+        """Create an instance of a Document (subclass) from a PyMongo SON (dict)
+        """
         if son and not isinstance(son, dict):
             raise ValueError(
                 "The source SON object needs to be of type 'dict' but a '%s' was found"
@@ -763,6 +764,8 @@ def _from_son(cls, son, _auto_dereference=True, created=False):
 
         # Convert SON to a data dict, making sure each key is a string and
         # corresponds to the right db field.
+        # This is needed as _from_son is currently called both from BaseDocument.__init__
+        # and from EmbeddedDocumentField.to_python
         data = {}
         for key, value in son.items():
             key = str(key)
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 20828dd7b..f00c66559 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3822,5 +3822,97 @@ class Book(Document):
         assert book._object_key == {"pk": book.pk, "author__name": "Author"}
 
 
+class DBFieldMappingTest(MongoDBTestCase):
+    def setUp(self):
+        class Fields(object):
+            w1 = BooleanField(db_field="w2")
+
+            x1 = BooleanField(db_field="x2")
+            x2 = BooleanField(db_field="x3")
+
+            y1 = BooleanField(db_field="y0")
+            y2 = BooleanField(db_field="y1")
+
+            z1 = BooleanField(db_field="z2")
+            z2 = BooleanField(db_field="z1")
+
+        class Doc(Fields, Document):
+            pass
+
+        class DynDoc(Fields, DynamicDocument):
+            pass
+
+        self.Doc = Doc
+        self.DynDoc = DynDoc
+
+    def tearDown(self):
+        for collection in self.db.collection_names():
+            if "system." in collection:
+                continue
+            self.db.drop_collection(collection)
+
+    def test_setting_fields_in_constructor_of_strict_doc_uses_model_names(self):
+        doc = self.Doc(z1=True, z2=False)
+        assert doc.z1 is True
+        assert doc.z2 is False
+
+    def test_setting_fields_in_constructor_of_dyn_doc_uses_model_names(self):
+        doc = self.DynDoc(z1=True, z2=False)
+        assert doc.z1 is True
+        assert doc.z2 is False
+
+    def test_setting_unknown_field_in_constructor_of_dyn_doc_does_not_overwrite_model_fields(
+        self,
+    ):
+        doc = self.DynDoc(w2=True)
+        assert doc.w1 is None
+        assert doc.w2 is True
+
+    def test_unknown_fields_of_strict_doc_do_not_overwrite_dbfields_1(self):
+        doc = self.Doc()
+        doc.w2 = True
+        doc.x3 = True
+        doc.y0 = True
+        doc.save()
+        reloaded = self.Doc.objects.get(id=doc.id)
+        assert reloaded.w1 is None
+        assert reloaded.x1 is None
+        assert reloaded.x2 is None
+        assert reloaded.y1 is None
+        assert reloaded.y2 is None
+
+    def test_dbfields_are_loaded_to_the_right_modelfield_for_strict_doc_2(self):
+        doc = self.Doc()
+        doc.x2 = True
+        doc.y2 = True
+        doc.z2 = True
+        doc.save()
+        reloaded = self.Doc.objects.get(id=doc.id)
+        assert (
+            reloaded.x1,
+            reloaded.x2,
+            reloaded.y1,
+            reloaded.y2,
+            reloaded.z1,
+            reloaded.z2,
+        ) == (doc.x1, doc.x2, doc.y1, doc.y2, doc.z1, doc.z2)
+
+    def test_dbfields_are_loaded_to_the_right_modelfield_for_dyn_doc_2(self):
+        doc = self.DynDoc()
+        doc.x2 = True
+        doc.y2 = True
+        doc.z2 = True
+        doc.save()
+        reloaded = self.DynDoc.objects.get(id=doc.id)
+        assert (
+            reloaded.x1,
+            reloaded.x2,
+            reloaded.y1,
+            reloaded.y2,
+            reloaded.z1,
+            reloaded.z2,
+        ) == (doc.x1, doc.x2, doc.y1, doc.y2, doc.z1, doc.z2)
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index aa530ced4..344656c14 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -2272,6 +2272,13 @@ class Doc(Document):
         with pytest.raises(FieldDoesNotExist):
             Doc(bar="test")
 
+    def test_undefined_field_works_no_confusion_with_db_field(self):
+        class Doc(Document):
+            foo = StringField(db_field="bar")
+
+        with pytest.raises(FieldDoesNotExist):
+            Doc(bar="test")
+
 
 class TestEmbeddedDocumentListField(MongoDBTestCase):
     def setUp(self):

From 746faceb5c14ca1fdcd327949066fb02eba2c5f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 8 Nov 2020 22:55:24 +0100
Subject: [PATCH 1110/1519] Document fact that srv URI can be used with host
 #1956

---
 docs/guide/connecting.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index ac2146a67..03d6ed5c3 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -31,6 +31,8 @@ the :attr:`host` to
 
     connect('project1', host='mongodb://localhost/database_name')
 
+.. note:: URI containing SRV records (e.g mongodb+srv://server.example.com/) can be used as well as the :attr:`host`
+
 .. note:: Database, username and password from URI string overrides
     corresponding parameters in :func:`~mongoengine.connect`: ::
 

From 338c40b5d5a578a1311889f94ea6178ddc23aa5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 11 Nov 2020 21:14:54 +0100
Subject: [PATCH 1111/1519] Remove Py3.5 as it is EOL and added 3.9 to CI

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c5b37b6f5..05ce782d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,10 @@
 language: python
 dist: xenial
 python:
-- 3.5
 - 3.6
 - 3.7
 - 3.8
+- 3.9
 - pypy3
 
 env:

From 91493a1e7960f1ac3fc675bf61502dc9f4f48364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 12 Nov 2020 00:40:52 +0100
Subject: [PATCH 1112/1519] improve migration doc

---
 docs/Makefile            |   2 +-
 docs/guide/index.rst     |   2 +-
 docs/guide/migration.rst | 227 ++++++++++++++++++++++++++++++++++++---
 3 files changed, 214 insertions(+), 17 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index 76eb910cf..cdc77c362 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -33,7 +33,7 @@ clean:
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+	@echo "Build finished. Check $(BUILDDIR)/html/index.html"
 
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
diff --git a/docs/guide/index.rst b/docs/guide/index.rst
index 62de0ecfa..018b25307 100644
--- a/docs/guide/index.rst
+++ b/docs/guide/index.rst
@@ -14,6 +14,6 @@ User Guide
    gridfs
    signals
    text-indexes
+   migration
    logging-monitoring
    mongomock
-   migration
diff --git a/docs/guide/migration.rst b/docs/guide/migration.rst
index c0c69d086..2b8982ec6 100644
--- a/docs/guide/migration.rst
+++ b/docs/guide/migration.rst
@@ -1,6 +1,6 @@
-==============================
-Handling migration
-==============================
+===================
+Documents migration
+===================
 
 The structure of your documents and their associated mongoengine schemas are likely
 to change over the lifetime of an application. This section provides guidance and
@@ -10,7 +10,10 @@ Due to the very flexible nature of mongodb, migrations of models aren't trivial
 for people that know about `alembic` for `sqlalchemy`, there is unfortunately no equivalent
 library that will manage the migration in an automatic fashion for mongoengine.
 
-First of all, let's take a simple example of model change and review the different option you
+Example 1: Addition of a field
+==============================
+
+Let's start by taking a simple example of a model change and review the different option you
 have to deal with the migration.
 
 Let's assume we start with the following schema and save an instance:
@@ -20,13 +23,13 @@ Let's assume we start with the following schema and save an instance:
     class User(Document):
         name = StringField()
 
-    User(name=username).save()
+    User(name="John Doe").save()
 
     # print the objects as they exist in mongodb
-    print(User.objects().as_pymongo())    # [{u'_id': ObjectId('5d06b9c3d7c1f18db3e7c874'), u'name': u'John'}]
+    print(User.objects().as_pymongo())    # [{u'_id': ObjectId('5d06b9c3d7c1f18db3e7c874'), u'name': u'John Doe'}]
 
 On the next version of your application, let's now assume that a new field `enabled` gets added to the
-existing User model with a `default=True`. Thus you simply update the `User` class to the following:
+existing ``User`` model with a `default=True`. Thus you simply update the ``User`` class to the following:
 
 .. code-block:: python
 
@@ -34,23 +37,24 @@ existing User model with a `default=True`. Thus you simply update the `User` cla
         name = StringField(required=True)
         enabled = BooleaField(default=True)
 
-Without migration, we now reload an object from the database into the `User` class and checks its `enabled`
-attribute:
+Without applying any migration, we now reload an object from the database into the ``User`` class
+and checks its `enabled` attribute:
 
 .. code-block:: python
 
     assert User.objects.count() == 1
     user = User.objects().first()
     assert user.enabled is True
-    print(User.objects(enabled=True).count())    # 0 ! uh?
-    print(User.objects(enabled=False).count())   # 0 ! uh?
+    assert User.objects(enabled=True).count() == 0    # uh?
+    assert User.objects(enabled=False).count() == 0   # uh?
 
-    # but this is consistent with what we have in database
+    # this is consistent with what we have in the database
+    # in fact, 'enabled' does not exist
     print(User.objects().as_pymongo().first())    # {u'_id': ObjectId('5d06b9c3d7c1f18db3e7c874'), u'name': u'John'}
     assert User.objects(enabled=None).count() == 1
 
-As you can see, even if the document wasn't updated, mongoengine applies the default value seemlessly when it
-loads the pymongo dict into a `User` instance. At first sight it looks like you don't need to migrate the
+As you can see, even if the document wasn't updated, mongoengine applies the default value seamlessly when it
+loads the pymongo dict into a ``User`` instance. At first sight it looks like you don't need to migrate the
 existing documents when adding new fields but this actually leads to inconsistencies when it comes to querying.
 
 In fact, when querying, mongoengine isn't trying to account for the default value of the new field and so
@@ -62,9 +66,202 @@ as a standalone script:
 
 .. code-block:: python
 
+    # Use mongoengine to set a default value for a given field
     User.objects().update(enabled=True)
-    # or
+    # or use pymongo
     user_coll = User._get_collection()
     user_coll.update_many({}, {'$set': {'enabled': True}})
 
 
+Example 2: Inheritance change
+=============================
+
+Let's consider the following example:
+
+.. code-block:: python
+
+    class Human(Document):
+        name = StringField()
+        meta = {"allow_inheritance": True}
+
+    class Jedi(Human):
+        dark_side = BooleanField()
+        light_saber_color = StringField()
+
+    Jedi(name="Darth Vader", dark_side=True, light_saber_color="red").save()
+    Jedi(name="Obi Wan Kenobi", dark_side=False, light_saber_color="blue").save()
+
+    assert Human.objects.count() == 2
+    assert Jedi.objects.count() == 2
+
+    # Let's check how these documents got stored in mongodb
+    print(Jedi.objects.as_pymongo())
+    # [
+    #   {'_id': ObjectId('5fac4aaaf61d7fb06046e0f9'), '_cls': 'Human.Jedi', 'name': 'Darth Vader', 'dark_side': True, 'light_saber_color': 'red'},
+    #   {'_id': ObjectId('5fac4ac4f61d7fb06046e0fa'), '_cls': 'Human.Jedi', 'name': 'Obi Wan Kenobi', 'dark_side': False, 'light_saber_color': 'blue'}
+    # ]
+
+As you can observe, when you use inheritance, MongoEngine stores a field named '_cls' behind the scene to keep
+track of the Document class.
+
+Let's now take the scenario that you want to refactor the inheritance schema and:
+- Have the Jedi's with dark_side=True/False become GoodJedi's/DarkSith
+- get rid of the 'dark_side' field
+
+move to the following schemas:
+
+.. code-block:: python
+
+    # unchanged
+    class Human(Document):
+        name = StringField()
+        meta = {"allow_inheritance": True}
+
+    # attribute 'dark_side' removed
+    class GoodJedi(Human):
+        light_saber_color = StringField()
+
+    # new class
+    class BadSith(Human):
+        light_saber_color = StringField()
+
+MongoEngine doesn't know about the change or how to map them with the existing data
+so if you don't apply any migration, you will observe a strange behavior, as if the collection was suddenly
+empty.
+
+.. code-block:: python
+
+    # As a reminder, the documents that we inserted
+    # have the _cls field = 'Human.Jedi'
+
+    # Following has no match
+    # because the query that is used behind the scene is
+    # filtering on {'_cls': 'Human.GoodJedi'}
+    assert GoodJedi.objects().count() == 0
+
+    # Following has also no match
+    # because it is filtering on {'_cls': {'$in': ('Human', 'Human.GoodJedi', 'Human.BadSith')}}
+    # which has no match
+    assert Human.objects.count() == 0
+    assert Human.objects.first() is None
+
+    # If we bypass MongoEngine and make use of underlying driver (PyMongo)
+    # we can see that the documents are there
+    humans_coll = Human._get_collection()
+    assert humans_coll.count_documents({}) == 2
+    # print first document
+    print(humans_coll.find_one())
+    # {'_id': ObjectId('5fac4aaaf61d7fb06046e0f9'), '_cls': 'Human.Jedi', 'name': 'Darth Vader', 'dark_side': True, 'light_saber_color': 'red'}
+
+As you can see, first obvious problem is that we need to modify '_cls' values based on existing values of
+'dark_side' documents.
+
+.. code-block:: python
+
+    humans_coll = Human._get_collection()
+    old_class = 'Human.Jedi'
+    good_jedi_class = 'Human.GoodJedi'
+    bad_sith_class = 'Human.BadSith'
+    humans_coll.update_many({'_cls': old_class, 'dark_side': False}, {'$set': {'_cls': good_jedi_class}})
+    humans_coll.update_many({'_cls': old_class, 'dark_side': True}, {'$set': {'_cls': bad_sith_class}})
+
+Let's now check if querying improved in MongoEngine:
+
+.. code-block:: python
+
+    assert GoodJedi.objects().count() == 1  # Hoorah!
+    assert BadSith.objects().count() == 1   # Hoorah!
+    assert Human.objects.count() == 2       # Hoorah!
+
+    # let's now check that documents load correctly
+    jedi = GoodJedi.objects().first()
+    # raises FieldDoesNotExist: The fields "{'dark_side'}" do not exist on the document "Human.GoodJedi"
+
+In fact we only took care of renaming the _cls values but we havn't removed the 'dark_side' fields
+which does not exist anymore on the GoodJedi's and BadSith's models.
+Let's remove the field from the collections:
+
+.. code-block:: python
+
+    humans_coll = Human._get_collection()
+    humans_coll.update_many({}, {'$unset': {'dark_side': 1}})
+
+.. note:: We did this migration in 2 different steps for the sake of example but it could have been combined
+    with the migration of the _cls fields: ::
+
+        humans_coll.update_many(
+            {'_cls': old_class, 'dark_side': False},
+            {
+                '$set': {'_cls': good_jedi_class},
+                '$unset': {'dark_side': 1}
+            }
+        )
+
+
+And verify that the documents now load correctly:
+
+.. code-block:: python
+
+    jedi = GoodJedi.objects().first()
+    assert jedi.name == "Obi Wan Kenobi"
+
+    sith = BadSith.objects().first()
+    assert sith.name == "Darth Vader"
+
+
+An other way of dealing with this migration is to iterate over
+the documents and update/replace them one by one. This is way slower but
+it is often useful for complex migrations of Document models.
+
+.. code-block:: python
+
+    for doc in humans_coll.find():
+        if doc['_cls'] == 'Human.Jedi':
+            doc['_cls'] =  'Human.BadSith' if doc['dark_side'] else 'Human.GoodJedi'
+            doc.pop('dark_side')
+            humans_coll.replace_one({'_id': doc['_id']}, doc)
+
+.. warning:: Be aware of this `flaw <https://groups.google.com/g/mongodb-user/c/AFC1ia7MHzk>`_ if you modify documents while iterating
+
+Recommendations
+===============
+
+- Write migration scripts whenever you do changes to the model schemas
+- Using :class:`~mongoengine.DynamicDocument` or ``meta = {"strict": False}`` may help to avoid some migrations or to have the 2 versions of your application to co-exist.
+- Write post-processing checks to verify that migrations script worked. See below
+
+Post-processing checks
+======================
+
+The following recipe can be used to sanity check a Document collection after you applied migration.
+It does not make any assumption on what was migrated, it will fetch 1000 objects randomly and
+run some quick checks on the documents to make sure the document looks OK. As it is, it will fail
+on the first occurrence of an error but this is something that can be adapted based on your needs.
+
+.. code-block:: python
+
+    def get_random_oids(collection, sample_size):
+        pipeline = [{"$project": {'_id': 1}}, {"$sample": {"size": sample_size}}]
+        return [s['_id'] for s in collection.aggregate(pipeline)]
+
+    def get_random_documents(DocCls, sample_size):
+        doc_collection = DocCls._get_collection()
+        random_oids = get_random_oids(doc_collection, sample_size)
+        return DocCls.objects(id__in=random_oids)
+
+    def check_documents(DocCls, sample_size):
+        for doc in get_random_documents(DocCls, sample_size):
+            # general validation (types and values)
+            doc.validate()
+
+            # load all subfields,
+            # this may trigger additional queries if you have ReferenceFields
+            # so it may be slow
+            for field in doc._fields:
+                try:
+                    getattr(doc, field)
+                except Exception:
+                    LOG.warning(f"Could not load field {field} in Document {doc.id}")
+                    raise
+
+    check_documents(Human, sample_size=1000)

From 3f5a15d2367259d0b75bf16e291d762717a3834c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 11 Nov 2020 21:16:40 +0100
Subject: [PATCH 1113/1519] improve  changelog

---
 docs/changelog.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 088aeba8d..f8c59e742 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,11 +6,12 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- Bug fix in DynamicDocument which isn not parsing known fields in constructor like Document do #2412
+- Bug fix in DynamicDocument which is not parsing known fields in constructor like Document do #2412
 - When using pymongo >= 3.7, make use of Collection.count_documents instead of Collection.count
     and Cursor.count that got deprecated in pymongo >= 3.7.
     This should have a negative impact on performance of count see Issue #2219
 - Fix a bug that made the queryset drop the read_preference after clone().
+- Remove Py3.5 from CI as it reached EOL and add Python 3.9
 - Fix the behavior of Doc.objects.limit(0) which should return all documents (similar to mongodb) #2311
 - Bug fix in ListField when updating the first item, it was saving the whole list, instead of
     just replacing the first item (as it's usually done) #2392

From 1d17dc46633588032fd3dae4f04a8f451db2fa35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Thu, 12 Nov 2020 17:44:13 +0100
Subject: [PATCH 1114/1519] Add black badge to readme to emphasize that repo is
 using autoformatter black as it is often forgotten in PR and makes CI failing

---
 README.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.rst b/README.rst
index aca8edc05..7b15c4e3d 100644
--- a/README.rst
+++ b/README.rst
@@ -16,6 +16,9 @@ MongoEngine
   :target: https://landscape.io/github/MongoEngine/mongoengine/master
   :alt: Code Health
 
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+  :target: https://github.com/ambv/black
+
 About
 =====
 MongoEngine is a Python Object-Document Mapper for working with MongoDB.

From 48357640c69a893e889ff023dd0836fa183969f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 14 Nov 2020 14:41:59 +0100
Subject: [PATCH 1115/1519] improve deprecated pymongo call

---
 tests/document/test_instance.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index f00c66559..42df3c48e 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3846,9 +3846,7 @@ class DynDoc(Fields, DynamicDocument):
         self.DynDoc = DynDoc
 
     def tearDown(self):
-        for collection in self.db.collection_names():
-            if "system." in collection:
-                continue
+        for collection in list_collection_names(self.db):
             self.db.drop_collection(collection)
 
     def test_setting_fields_in_constructor_of_strict_doc_uses_model_names(self):

From f2638ecd025209fce02d97045a1627d037ae40fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 14 Nov 2020 15:31:39 +0100
Subject: [PATCH 1116/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f8c59e742..1ef42232a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,7 @@ Development
     This should have a negative impact on performance of count see Issue #2219
 - Fix a bug that made the queryset drop the read_preference after clone().
 - Remove Py3.5 from CI as it reached EOL and add Python 3.9
+- Fix some issues related with db_field conflict in constructor #2414
 - Fix the behavior of Doc.objects.limit(0) which should return all documents (similar to mongodb) #2311
 - Bug fix in ListField when updating the first item, it was saving the whole list, instead of
     just replacing the first item (as it's usually done) #2392

From 2ec454447fdf251523dd0e38a9943c6bf94930a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 18 Nov 2020 22:28:06 +0100
Subject: [PATCH 1117/1519] Bump version to 0.21.0 and update changelog

---
 docs/changelog.rst      | 11 ++++++++---
 mongoengine/__init__.py |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1ef42232a..247bd8ef2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,18 +6,23 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.21.0
+=================
 - Bug fix in DynamicDocument which is not parsing known fields in constructor like Document do #2412
 - When using pymongo >= 3.7, make use of Collection.count_documents instead of Collection.count
     and Cursor.count that got deprecated in pymongo >= 3.7.
     This should have a negative impact on performance of count see Issue #2219
 - Fix a bug that made the queryset drop the read_preference after clone().
 - Remove Py3.5 from CI as it reached EOL and add Python 3.9
-- Fix some issues related with db_field conflict in constructor #2414
-- Fix the behavior of Doc.objects.limit(0) which should return all documents (similar to mongodb) #2311
+- Fix some issues related with db_field/field conflict in constructor #2414
+- BREAKING CHANGE: Fix the behavior of Doc.objects.limit(0) which should return all documents (similar to mongodb) #2311
 - Bug fix in ListField when updating the first item, it was saving the whole list, instead of
-    just replacing the first item (as it's usually done) #2392
+    just replacing the first item (as usually done when updating 1 item of the list) #2392
 - Add EnumField: ``mongoengine.fields.EnumField``
 - Refactoring - Remove useless code related to Document.__only_fields and Queryset.only_fields
+- Fix query transformation regarding special operators #2365
+- Bug Fix: Document.save() fails when shard_key is not _id #2154
 
 Changes in 0.20.0
 =================
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index dbd88a683..d0a0f1f4a 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -28,7 +28,7 @@
 )
 
 
-VERSION = (0, 20, 0)
+VERSION = (0, 21, 0)
 
 
 def get_version():

From cc5e2ba0549c2ba23a13f78136b3236ebd8e2d98 Mon Sep 17 00:00:00 2001
From: Peter Volf <do.volfp@gmail.com>
Date: Wed, 25 Nov 2020 11:05:37 +0100
Subject: [PATCH 1118/1519] fix LazyReferenceField dereferencing bug in
 embedded documents, refs #2375

---
 mongoengine/fields.py                     |  1 +
 tests/fields/test_lazy_reference_field.py | 45 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 8915d801d..db292ba9f 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2570,6 +2570,7 @@ def to_python(self, value):
         if not isinstance(value, (DBRef, Document, EmbeddedDocument)):
             collection = self.document_type._get_collection_name()
             value = DBRef(collection, self.document_type.id.to_python(value))
+            value = self.build_lazyref(value)
         return value
 
     def validate(self, value):
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index 07d4d3a9b..004f5272e 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -3,6 +3,7 @@
 
 from mongoengine import *
 from mongoengine.base import LazyReference
+from mongoengine.context_managers import query_counter
 
 from tests.utils import MongoDBTestCase
 
@@ -330,6 +331,50 @@ def check_fields_type(occ):
         occ.in_embedded.in_list = [animal1.id, animal2.id]
         check_fields_type(occ)
 
+    def test_lazy_reference_embedded_dereferencing(self):
+        # Test case for #2375
+
+        # -- Test documents
+
+        class Author(Document):
+            name = StringField()
+
+        class AuthorReference(EmbeddedDocument):
+            author = LazyReferenceField(Author)
+
+        class Book(Document):
+            authors = EmbeddedDocumentListField(AuthorReference)
+
+        # -- Cleanup
+
+        Author.drop_collection()
+        Book.drop_collection()
+
+        # -- Create test data
+
+        author_1 = Author(name="A1").save()
+        author_2 = Author(name="A2").save()
+        author_3 = Author(name="A3").save()
+        book = Book(
+            authors=[
+                AuthorReference(author=author_1),
+                AuthorReference(author=author_2),
+                AuthorReference(author=author_3),
+            ]
+        ).save()
+
+        with query_counter() as qc:
+            book = Book.objects.first()
+            # Accessing the list must not trigger dereferencing.
+            book.authors
+            assert qc == 1
+
+        for ref in book.authors:
+            with pytest.raises(AttributeError):
+                x = ref["author"].name
+            assert isinstance(ref.author, LazyReference)
+            assert isinstance(ref.author.id, ObjectId)
+
 
 class TestGenericLazyReferenceField(MongoDBTestCase):
     def test_generic_lazy_reference_simple(self):

From e0bec881bc05f5edc51119e81298f9279706aa5d Mon Sep 17 00:00:00 2001
From: Peter Volf <do.volfp@gmail.com>
Date: Wed, 25 Nov 2020 15:17:52 +0100
Subject: [PATCH 1119/1519] removed unused variable to fix a warning

---
 tests/fields/test_lazy_reference_field.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index 004f5272e..fd623bfcc 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -371,7 +371,7 @@ class Book(Document):
 
         for ref in book.authors:
             with pytest.raises(AttributeError):
-                x = ref["author"].name
+                ref["author"].name
             assert isinstance(ref.author, LazyReference)
             assert isinstance(ref.author.id, ObjectId)
 

From bf411ab2ca3ae0e0d385df56892af15700cf3c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 28 Nov 2020 22:21:51 +0100
Subject: [PATCH 1120/1519] Update changelog with recent changes that were
 merged

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 247bd8ef2..899d45f85 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Fix LazyReferenceField dereferencing in embedded documents #2426
 
 Changes in 0.21.0
 =================

From 7dbc21776895924dff153f54f91d329a43a44fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 28 Nov 2020 22:16:13 +0100
Subject: [PATCH 1121/1519] Remove  restriction on Pillow version as it was
 there due to Py2 support

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 393de9c72..0353407a3 100644
--- a/setup.py
+++ b/setup.py
@@ -115,7 +115,7 @@ def run_tests(self):
         "pytest-cov",
         "coverage<5.0",  # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
         "blinker",
-        "Pillow>=2.0.0, <7.0.0",  # 7.0.0 dropped Python2 support
+        "Pillow>=2.0.0",
     ],
 }
 

From 0a05c1f5907543df4e3c5499349682ba66b13ff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 29 Nov 2020 10:08:58 +0100
Subject: [PATCH 1122/1519] Fix image size that needs to be forced in test

---
 tests/fields/test_file_field.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index de10c9870..4f3f1d45d 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -429,7 +429,7 @@ class TestFile(Document):
     @require_pil
     def test_image_field_resize(self):
         class TestImage(Document):
-            image = ImageField(size=(185, 37))
+            image = ImageField(size=(185, 37, True))
 
         TestImage.drop_collection()
 
@@ -471,7 +471,7 @@ class TestImage(Document):
     @require_pil
     def test_image_field_thumbnail(self):
         class TestImage(Document):
-            image = ImageField(thumbnail_size=(92, 18))
+            image = ImageField(thumbnail_size=(92, 18, True))
 
         TestImage.drop_collection()
 

From b1a2cf061d60fbc1199b556469c9c0cceb8b0b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 29 Nov 2020 10:22:41 +0100
Subject: [PATCH 1123/1519] update test requirement for pillow > 7.0

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0353407a3..80819b130 100644
--- a/setup.py
+++ b/setup.py
@@ -115,7 +115,7 @@ def run_tests(self):
         "pytest-cov",
         "coverage<5.0",  # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
         "blinker",
-        "Pillow>=2.0.0",
+        "Pillow>=7.0.0",
     ],
 }
 

From 4fa31342949a302de326cea09e8d69ff33617c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 29 Nov 2020 21:15:02 +0100
Subject: [PATCH 1124/1519] remove landscape integration as it is dead

---
 .landscape.yml | 17 -----------------
 README.rst     |  4 ----
 2 files changed, 21 deletions(-)
 delete mode 100644 .landscape.yml

diff --git a/.landscape.yml b/.landscape.yml
deleted file mode 100644
index 4f13a5eb0..000000000
--- a/.landscape.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-pylint:
-    disable:
-        # We use this a lot (e.g. via document._meta)
-        - protected-access
-
-    options:
-        additional-builtins:
-            # add long as valid built-ins.
-            - long
-
-pyflakes:
-    disable:
-        # undefined variables are already covered by pylint (and exclude long)
-        - F821
-
-ignore-paths:
-    - benchmark.py
diff --git a/README.rst b/README.rst
index 7b15c4e3d..a74c26aa8 100644
--- a/README.rst
+++ b/README.rst
@@ -12,10 +12,6 @@ MongoEngine
 .. image:: https://coveralls.io/repos/github/MongoEngine/mongoengine/badge.svg?branch=master
   :target: https://coveralls.io/github/MongoEngine/mongoengine?branch=master
 
-.. image:: https://landscape.io/github/MongoEngine/mongoengine/master/landscape.svg?style=flat
-  :target: https://landscape.io/github/MongoEngine/mongoengine/master
-  :alt: Code Health
-
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
   :target: https://github.com/ambv/black
 

From 3926473917e3e23c84316f4efceee06c0fc55b4d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Sun, 6 Dec 2020 22:25:12 +0100
Subject: [PATCH 1125/1519] Improve Fields documentation + remove
 versionadded/changed as it's not maintained

---
 docs/guide/gridfs.rst            |   2 -
 mongoengine/base/fields.py       |   4 --
 mongoengine/connection.py        |   6 --
 mongoengine/document.py          |  18 -----
 mongoengine/fields.py            | 112 +++++++++----------------------
 mongoengine/queryset/base.py     |  57 ----------------
 mongoengine/queryset/queryset.py |   6 --
 7 files changed, 31 insertions(+), 174 deletions(-)

diff --git a/docs/guide/gridfs.rst b/docs/guide/gridfs.rst
index 0baf88e04..e6c097ff0 100644
--- a/docs/guide/gridfs.rst
+++ b/docs/guide/gridfs.rst
@@ -2,8 +2,6 @@
 GridFS
 ======
 
-.. versionadded:: 0.4
-
 Writing
 -------
 
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 7bab813c0..1997d0fcc 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -265,8 +265,6 @@ class ComplexBaseField(BaseField):
     Allows for nesting of embedded documents inside complex types.
     Handles the lazy dereferencing of a queryset by lazily dereferencing all
     items in a list / dict rather than one at a time.
-
-    .. versionadded:: 0.5
     """
 
     field = None
@@ -521,8 +519,6 @@ def validate(self, value):
 
 class GeoJsonBaseField(BaseField):
     """A geo json field storing a geojson style object.
-
-    .. versionadded:: 0.8
     """
 
     _geo_index = pymongo.GEOSPHERE
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 13d170ec5..9253d5564 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -74,8 +74,6 @@ def _get_connection_settings(
     : param kwargs: ad-hoc parameters to be passed into the pymongo driver,
         for example maxpoolsize, tz_aware, etc. See the documentation
         for pymongo's `MongoClient` for a full list.
-
-    .. versionchanged:: 0.10.6 - added mongomock support
     """
     conn_settings = {
         "name": name or db or DEFAULT_DATABASE_NAME,
@@ -201,8 +199,6 @@ def register_connection(
     : param kwargs: ad-hoc parameters to be passed into the pymongo driver,
         for example maxpoolsize, tz_aware, etc. See the documentation
         for pymongo's `MongoClient` for a full list.
-
-    .. versionchanged:: 0.10.6 - added mongomock support
     """
     conn_settings = _get_connection_settings(
         db=db,
@@ -386,8 +382,6 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
 
     See the docstring for `register_connection` for more details about all
     supported kwargs.
-
-    .. versionchanged:: 0.6 - added multiple database support.
     """
     if alias in _connections:
         prev_conn_setting = _connection_settings[alias]
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 801c8df80..1c175ac3f 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1,5 +1,4 @@
 import re
-import warnings
 
 from bson.dbref import DBRef
 import pymongo
@@ -367,15 +366,6 @@ def save(
             meta['cascade'] = True.  Also you can pass different kwargs to
             the cascade save using cascade_kwargs which overwrites the
             existing kwargs with custom values.
-        .. versionchanged:: 0.8.5
-            Optional save_condition that only overwrites existing documents
-            if the condition is satisfied in the current db record.
-        .. versionchanged:: 0.10
-            :class:`OperationError` exception raised if save_condition fails.
-        .. versionchanged:: 0.10.1
-            :class: save_condition failure now raises a `SaveConditionError`
-        .. versionchanged:: 0.10.7
-            Add signal_kwargs argument
         """
         signal_kwargs = signal_kwargs or {}
 
@@ -714,8 +704,6 @@ def switch_collection(self, collection_name, keep_created=True):
     def select_related(self, max_depth=1):
         """Handles dereferencing of :class:`~bson.dbref.DBRef` objects to
         a maximum depth in order to cut down the number queries to mongodb.
-
-        .. versionadded:: 0.5
         """
         DeReference = _import_class("DeReference")
         DeReference()([self], max_depth + 1)
@@ -726,10 +714,6 @@ def reload(self, *fields, **kwargs):
 
         :param fields: (optional) args list of fields to reload
         :param max_depth: (optional) depth of dereferencing to follow
-
-        .. versionadded:: 0.1.2
-        .. versionchanged:: 0.6  Now chainable
-        .. versionchanged:: 0.9  Can provide specific fields to reload
         """
         max_depth = 1
         if fields and isinstance(fields[0], int):
@@ -1088,8 +1072,6 @@ class MapReduceDocument:
                 an ``ObjectId`` found in the given ``collection``,
                 the object can be accessed via the ``object`` property.
     :param value: The result(s) for this key.
-
-    .. versionadded:: 0.3
     """
 
     def __init__(self, document, collection, key, value):
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 8915d801d..296fe9be7 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -36,7 +36,6 @@
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
-from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
 from mongoengine.queryset import DO_NOTHING
 from mongoengine.queryset.base import BaseQuerySet
 from mongoengine.queryset.transform import STRING_OPERATORS
@@ -101,6 +100,11 @@ class StringField(BaseField):
     """A unicode string field."""
 
     def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):
+        """
+        :param regex: (optional) A string pattern that will be applied during validation
+        :param max_length: (optional) A max length that will be applied during validation
+        :param min_length: (optional) A min length that will be applied during validation
+        """
         self.regex = re.compile(regex) if regex else None
         self.max_length = max_length
         self.min_length = min_length
@@ -158,7 +162,6 @@ def prepare_query_value(self, op, value):
 class URLField(StringField):
     """A field that validates input as an URL.
 
-    .. versionadded:: 0.3
     """
 
     _URL_REGEX = LazyRegexCompiler(
@@ -174,6 +177,10 @@ class URLField(StringField):
     _URL_SCHEMES = ["http", "https", "ftp", "ftps"]
 
     def __init__(self, url_regex=None, schemes=None, **kwargs):
+        """
+        :param url_regex: (optional) Overwrite the default regex used for validation
+        :param schemes: (optional) Overwrite the default URL schemes that are allowed
+        """
         self.url_regex = url_regex or self._URL_REGEX
         self.schemes = schemes or self._URL_SCHEMES
         super().__init__(**kwargs)
@@ -192,7 +199,6 @@ def validate(self, value):
 class EmailField(StringField):
     """A field that validates input as an email address.
 
-    .. versionadded:: 0.4
     """
 
     USER_REGEX = LazyRegexCompiler(
@@ -229,16 +235,10 @@ def __init__(
         *args,
         **kwargs
     ):
-        """Initialize the EmailField.
-
-        Args:
-            domain_whitelist (list) - list of otherwise invalid domain
-                                      names which you'd like to support.
-            allow_utf8_user (bool) - if True, the user part of the email
-                                     address can contain UTF8 characters.
-                                     False by default.
-            allow_ip_domain (bool) - if True, the domain part of the email
-                                     can be a valid IPv4 or IPv6 address.
+        """
+        :param domain_whitelist: (optional) list of valid domain names applied during validation
+        :param allow_utf8_user: Allow user part of the email to contain utf8 char
+        :param allow_ip_domain: Allow domain part of the email to be an IPv4 or IPv6 address
         """
         self.domain_whitelist = domain_whitelist or []
         self.allow_utf8_user = allow_utf8_user
@@ -310,6 +310,10 @@ class IntField(BaseField):
     """32-bit integer field."""
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
+        """
+        :param min_value: (optional) A min value that will be applied during validation
+        :param max_value: (optional) A max value that will be applied during validation
+        """
         self.min_value, self.max_value = min_value, max_value
         super().__init__(**kwargs)
 
@@ -343,6 +347,10 @@ class LongField(BaseField):
     """64-bit integer field. (Equivalent to IntField since the support to Python2 was dropped)"""
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
+        """
+        :param min_value: (optional) A min value that will be applied during validation
+        :param max_value: (optional) A max value that will be applied during validation
+        """
         self.min_value, self.max_value = min_value, max_value
         super().__init__(**kwargs)
 
@@ -379,6 +387,10 @@ class FloatField(BaseField):
     """Floating point number field."""
 
     def __init__(self, min_value=None, max_value=None, **kwargs):
+        """
+        :param min_value: (optional) A min value that will be applied during validation
+        :param max_value: (optional) A max value that will be applied during validation
+        """
         self.min_value, self.max_value = min_value, max_value
         super().__init__(**kwargs)
 
@@ -416,8 +428,6 @@ class DecimalField(BaseField):
     """Fixed-point decimal number field. Stores the value as a float by default unless `force_string` is used.
     If using floats, beware of Decimal to float conversion (potential precision loss)
 
-    .. versionchanged:: 0.8
-    .. versionadded:: 0.3
     """
 
     def __init__(
@@ -430,8 +440,8 @@ def __init__(
         **kwargs
     ):
         """
-        :param min_value: Validation rule for the minimum acceptable value.
-        :param max_value: Validation rule for the maximum acceptable value.
+        :param min_value: (optional) A min value that will be applied during validation
+        :param max_value: (optional) A max value that will be applied during validation
         :param force_string: Store the value as a string (instead of a float).
          Be aware that this affects query sorting and operation like lte, gte (as string comparison is applied)
          and some query operator won't work (e.g. inc, dec)
@@ -498,10 +508,7 @@ def prepare_query_value(self, op, value):
 
 
 class BooleanField(BaseField):
-    """Boolean field type.
-
-    .. versionadded:: 0.1.2
-    """
+    """Boolean field type."""
 
     def to_python(self, value):
         try:
@@ -551,7 +558,8 @@ def to_mongo(self, value):
 
         return self._parse_datetime(value)
 
-    def _parse_datetime(self, value):
+    @staticmethod
+    def _parse_datetime(value):
         # Attempt to parse a datetime from a string
         value = value.strip()
         if not value:
@@ -627,8 +635,6 @@ class ComplexDateTimeField(StringField):
     keyword when initializing the field.
 
     Note: To default the field to the current datetime, use: DateTimeField(default=datetime.utcnow)
-
-    .. versionadded:: 0.5
     """
 
     def __init__(self, separator=",", **kwargs):
@@ -975,8 +981,6 @@ class EmbeddedDocumentListField(ListField):
     .. note::
         The only valid list values are subclasses of
         :class:`~mongoengine.EmbeddedDocument`.
-
-    .. versionadded:: 0.9
     """
 
     def __init__(self, document_type, **kwargs):
@@ -999,9 +1003,6 @@ class SortedListField(ListField):
         save the whole list then other processes trying to save the whole list
         as well could overwrite changes.  The safest way to append to a list is
         to perform a push operation.
-
-    .. versionadded:: 0.4
-    .. versionchanged:: 0.6 - added reverse keyword
     """
 
     _ordering = None
@@ -1058,9 +1059,6 @@ class DictField(ComplexBaseField):
 
     .. note::
         Required means it cannot be empty - as the default for DictFields is {}
-
-    .. versionadded:: 0.3
-    .. versionchanged:: 0.5 - Can now handle complex / varying types of data
     """
 
     def __init__(self, field=None, *args, **kwargs):
@@ -1124,8 +1122,6 @@ class MapField(DictField):
     """A field that maps a name to a specified field type. Similar to
     a DictField, except the 'value' of each item must match the specified
     field type.
-
-    .. versionadded:: 0.5
     """
 
     def __init__(self, field=None, *args, **kwargs):
@@ -1173,8 +1169,6 @@ class User(Document):
             org = ReferenceField('Org', reverse_delete_rule=CASCADE)
 
         User.register_delete_rule(Org, 'owner', DENY)
-
-    .. versionchanged:: 0.5 added `reverse_delete_rule`
     """
 
     def __init__(
@@ -1309,8 +1303,6 @@ def lookup_member(self, member_name):
 class CachedReferenceField(BaseField):
     """
     A referencefield with cache fields to purpose pseudo-joins
-
-    .. versionadded:: 0.9
     """
 
     def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
@@ -1485,8 +1477,6 @@ class GenericReferenceField(BaseField):
           it.
 
         * You can use the choices param to limit the acceptable Document types
-
-    .. versionadded:: 0.3
     """
 
     def __init__(self, *args, **kwargs):
@@ -1692,10 +1682,6 @@ class GridFSError(Exception):
 
 class GridFSProxy:
     """Proxy object to handle writing and reading of files to and from GridFS
-
-    .. versionadded:: 0.4
-    .. versionchanged:: 0.5 - added optional size param to read
-    .. versionchanged:: 0.6 - added collection name param
     """
 
     _fs = None
@@ -1859,10 +1845,6 @@ def _mark_as_changed(self):
 
 class FileField(BaseField):
     """A GridFS storage field.
-
-    .. versionadded:: 0.4
-    .. versionchanged:: 0.5 added optional size param for read
-    .. versionchanged:: 0.6 added db_alias for multidb support
     """
 
     proxy_class = GridFSProxy
@@ -1945,11 +1927,7 @@ def validate(self, value):
 
 
 class ImageGridFsProxy(GridFSProxy):
-    """
-    Proxy for ImageField
-
-    versionadded: 0.6
-    """
+    """Proxy for ImageField"""
 
     def put(self, file_obj, **kwargs):
         """
@@ -2083,8 +2061,6 @@ class ImageField(FileField):
     :param size: max size to store images, provided as (width, height, force)
         if larger, it will be automatically resized (ex: size=(800, 600, True))
     :param thumbnail_size: size to generate a thumbnail, provided as (width, height, force)
-
-    .. versionadded:: 0.6
     """
 
     proxy_class = ImageGridFsProxy
@@ -2132,9 +2108,6 @@ class SequenceField(BaseField):
         In case the counter is defined in the abstract document, it will be
         common to all inherited documents and the default sequence name will
         be the class name of the abstract document.
-
-    .. versionadded:: 0.5
-    .. versionchanged:: 0.8 added `value_decorator`
     """
 
     _auto_gen = True
@@ -2248,8 +2221,6 @@ def to_python(self, value):
 
 class UUIDField(BaseField):
     """A UUID field.
-
-    .. versionadded:: 0.6
     """
 
     _binary = None
@@ -2259,9 +2230,6 @@ def __init__(self, binary=True, **kwargs):
         Store UUID data in the database
 
         :param binary: if False store as a string.
-
-        .. versionchanged:: 0.8.0
-        .. versionchanged:: 0.6.19
         """
         self._binary = binary
         super().__init__(**kwargs)
@@ -2306,8 +2274,6 @@ class GeoPointField(BaseField):
         representing a geo point. It admits 2d indexes but not "2dsphere" indexes
         in MongoDB > 2.4 which are more natural for modeling geospatial points.
         See :ref:`geospatial-indexes`
-
-    .. versionadded:: 0.4
     """
 
     _geo_index = pymongo.GEO2D
@@ -2339,8 +2305,6 @@ class PointField(GeoJsonBaseField):
     to set the value.
 
     Requires mongodb >= 2.4
-
-    .. versionadded:: 0.8
     """
 
     _type = "Point"
@@ -2359,8 +2323,6 @@ class LineStringField(GeoJsonBaseField):
     You can either pass a dict with the full information or a list of points.
 
     Requires mongodb >= 2.4
-
-    .. versionadded:: 0.8
     """
 
     _type = "LineString"
@@ -2382,8 +2344,6 @@ class PolygonField(GeoJsonBaseField):
     holes.
 
     Requires mongodb >= 2.4
-
-    .. versionadded:: 0.8
     """
 
     _type = "Polygon"
@@ -2403,8 +2363,6 @@ class MultiPointField(GeoJsonBaseField):
     to set the value.
 
     Requires mongodb >= 2.6
-
-    .. versionadded:: 0.9
     """
 
     _type = "MultiPoint"
@@ -2424,8 +2382,6 @@ class MultiLineStringField(GeoJsonBaseField):
     You can either pass a dict with the full information or a list of points.
 
     Requires mongodb >= 2.6
-
-    .. versionadded:: 0.9
     """
 
     _type = "MultiLineString"
@@ -2452,8 +2408,6 @@ class MultiPolygonField(GeoJsonBaseField):
     of Polygons.
 
     Requires mongodb >= 2.6
-
-    .. versionadded:: 0.9
     """
 
     _type = "MultiPolygon"
@@ -2466,8 +2420,6 @@ class LazyReferenceField(BaseField):
     Instead, access will return a :class:`~mongoengine.base.LazyReference` class
     instance, allowing access to `pk` or manual dereference by using
     ``fetch()`` method.
-
-    .. versionadded:: 0.15
     """
 
     def __init__(
@@ -2630,8 +2582,6 @@ class GenericLazyReferenceField(GenericReferenceField):
           it.
 
         * You can use the choices param to limit the acceptable Document types
-
-    .. versionadded:: 0.15
     """
 
     def __init__(self, *args, **kwargs):
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 1021bf5eb..f41cb81b1 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -256,8 +256,6 @@ def get(self, *q_objs, **query):
         `DocumentName.MultipleObjectsReturned` exception if multiple results
         and :class:`~mongoengine.queryset.DoesNotExist` or
         `DocumentName.DoesNotExist` if no results are found.
-
-        .. versionadded:: 0.3
         """
         queryset = self.clone()
         queryset = queryset.order_by().limit(2)
@@ -282,8 +280,6 @@ def get(self, *q_objs, **query):
 
     def create(self, **kwargs):
         """Create new object. Returns the saved object instance.
-
-        .. versionadded:: 0.4
         """
         return self._document(**kwargs).save(force_insert=True)
 
@@ -316,10 +312,6 @@ def insert(
 
         By default returns document instances, set ``load_bulk`` to False to
         return just ``ObjectIds``
-
-        .. versionadded:: 0.5
-        .. versionchanged:: 0.10.7
-            Add signal_kwargs argument
         """
         Document = _import_class("Document")
 
@@ -550,8 +542,6 @@ def update(
         :param update: Django-style update keyword arguments
 
         :returns the number of updated documents (unless ``full_result`` is True)
-
-        .. versionadded:: 0.2
         """
         if not update and not upsert:
             raise OperationError("No update parameters, would remove data")
@@ -603,8 +593,6 @@ def upsert_one(self, write_concern=None, read_concern=None, **update):
         :param update: Django-style update keyword arguments
 
         :returns the new or overwritten document
-
-        .. versionadded:: 0.10.2
         """
 
         atomic_update = self.update(
@@ -638,7 +626,6 @@ def update_one(self, upsert=False, write_concern=None, full_result=False, **upda
         :param update: Django-style update keyword arguments
             full_result
         :returns the number of updated documents (unless ``full_result`` is True)
-        .. versionadded:: 0.2
         """
         return self.update(
             upsert=upsert,
@@ -670,8 +657,6 @@ def modify(
         :param new: return updated rather than original document
             (default ``False``)
         :param update: Django-style update keyword arguments
-
-        .. versionadded:: 0.9
         """
 
         if remove and new:
@@ -727,8 +712,6 @@ def with_id(self, object_id):
         `None` if no document exists with that id.
 
         :param object_id: the value for the id of the document to look up
-
-        .. versionchanged:: 0.6 Raises InvalidQueryError if filter has been set
         """
         queryset = self.clone()
         if not queryset._query_obj.empty:
@@ -742,8 +725,6 @@ def in_bulk(self, object_ids):
         :param object_ids: a list or tuple of ObjectId's
         :rtype: dict of ObjectId's as keys and collection-specific
                 Document subclasses as values.
-
-        .. versionadded:: 0.3
         """
         doc_map = {}
 
@@ -785,8 +766,6 @@ def using(self, alias):
         evaluated against if you are using more than one database.
 
         :param alias: The database alias
-
-        .. versionadded:: 0.9
         """
 
         with switch_db(self._document, alias) as cls:
@@ -848,8 +827,6 @@ def select_related(self, max_depth=1):
         """Handles dereferencing of :class:`~bson.dbref.DBRef` objects or
         :class:`~bson.object_id.ObjectId` a maximum depth in order to cut down
         the number queries to mongodb.
-
-        .. versionadded:: 0.5
         """
         # Make select related work the same for querysets
         max_depth += 1
@@ -898,8 +875,6 @@ def hint(self, index=None):
 
         Hinting will not do anything if the corresponding index does not exist.
         The last hint applied to this cursor takes precedence over all others.
-
-        .. versionadded:: 0.5
         """
         queryset = self.clone()
         queryset._hint = index
@@ -961,10 +936,6 @@ def distinct(self, field):
 
         .. note:: This is a command and won't take ordering or limit into
            account.
-
-        .. versionadded:: 0.4
-        .. versionchanged:: 0.5 - Fixed handling references
-        .. versionchanged:: 0.6 - Improved db_field refrence handling
         """
         queryset = self.clone()
 
@@ -1028,9 +999,6 @@ def only(self, *fields):
         field filters.
 
         :param fields: fields to include
-
-        .. versionadded:: 0.3
-        .. versionchanged:: 0.5 - Added subfield support
         """
         fields = {f: QueryFieldList.ONLY for f in fields}
         return self.fields(True, **fields)
@@ -1049,8 +1017,6 @@ def exclude(self, *fields):
         field filters.
 
         :param fields: fields to exclude
-
-        .. versionadded:: 0.5
         """
         fields = {f: QueryFieldList.EXCLUDE for f in fields}
         return self.fields(**fields)
@@ -1077,8 +1043,6 @@ def fields(self, _only_called=False, **kwargs):
 
         :param kwargs: A set of keyword arguments identifying what to
             include, exclude, or slice.
-
-        .. versionadded:: 0.5
         """
 
         # Check for an operator and transform to mongo-style if there is
@@ -1120,8 +1084,6 @@ def all_fields(self):
         .exclude(). ::
 
             post = BlogPost.objects.exclude('comments').all_fields()
-
-        .. versionadded:: 0.5
         """
         queryset = self.clone()
         queryset._loaded_fields = QueryFieldList(
@@ -1194,9 +1156,6 @@ def snapshot(self, enabled):
         """Enable or disable snapshot mode when querying.
 
         :param enabled: whether or not snapshot mode is enabled
-
-        ..versionchanged:: 0.5 - made chainable
-        .. deprecated:: Ignored with PyMongo 3+
         """
         msg = "snapshot is deprecated as it has no impact when using PyMongo 3+."
         warnings.warn(msg, DeprecationWarning)
@@ -1208,8 +1167,6 @@ def timeout(self, enabled):
         """Enable or disable the default mongod timeout when querying. (no_cursor_timeout option)
 
         :param enabled: whether or not the timeout is used
-
-        ..versionchanged:: 0.5 - made chainable
         """
         queryset = self.clone()
         queryset._timeout = enabled
@@ -1308,7 +1265,6 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
             parameter will be removed shortly
         :param kwargs: (optional) kwargs dictionary to be passed to pymongo's aggregate call
             See https://api.mongodb.com/python/current/api/pymongo/collection.html#pymongo.collection.Collection.aggregate
-        .. versionadded:: 0.9
         """
         using_deprecated_interface = isinstance(pipeline, dict) or bool(suppl_pipeline)
         user_pipeline = [pipeline] if isinstance(pipeline, dict) else list(pipeline)
@@ -1380,12 +1336,6 @@ def map_reduce(
             Map/Reduce changed in server version **>= 1.7.4**. The PyMongo
             :meth:`~pymongo.collection.Collection.map_reduce` helper requires
             PyMongo version **>= 1.11**.
-
-        .. versionchanged:: 0.5
-           - removed ``keep_temp`` keyword argument, which was only relevant
-             for MongoDB server versions older than 1.7.4
-
-        .. versionadded:: 0.3
         """
         queryset = self.clone()
 
@@ -1522,8 +1472,6 @@ def where(self, where_clause):
         .. note:: When using this mode of query, the database will call your
                   function, or evaluate your predicate clause, for each object
                   in the collection.
-
-        .. versionadded:: 0.5
         """
         queryset = self.clone()
         where_clause = queryset._sub_js_fields(where_clause)
@@ -1600,9 +1548,6 @@ def item_frequencies(self, field, normalize=False, map_reduce=True):
         :param field: the field to use
         :param normalize: normalize the results so they add to 1.0
         :param map_reduce: Use map_reduce over exec_js
-
-        .. versionchanged:: 0.5 defaults to map_reduce and can handle embedded
-                            document lookups
         """
         if map_reduce:
             return self._item_frequencies_map_reduce(field, normalize=normalize)
@@ -1632,8 +1577,6 @@ def __next__(self):
 
     def rewind(self):
         """Rewind the cursor to its unevaluated state.
-
-        .. versionadded:: 0.3
         """
         self._iter = False
         self._cursor.rewind()
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index e2db8f0dd..397fe464f 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -151,8 +151,6 @@ def count(self, with_limit_and_skip=False):
 
     def no_cache(self):
         """Convert to a non-caching queryset
-
-        .. versionadded:: 0.8.3 Convert to non caching queryset
         """
         if self._result_cache is not None:
             raise OperationError("QuerySet already cached")
@@ -165,15 +163,11 @@ class QuerySetNoCache(BaseQuerySet):
 
     def cache(self):
         """Convert to a caching queryset
-
-        .. versionadded:: 0.8.3 Convert to caching queryset
         """
         return self._clone_into(QuerySet(self._document, self._collection))
 
     def __repr__(self):
         """Provides the string representation of the QuerySet
-
-        .. versionchanged:: 0.6.13 Now doesnt modify the cursor
         """
         if self._iter:
             return ".. queryset mid-iteration .."

From a190dfe2c4718954afb4c223886aacd579f6e604 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Tue, 8 Dec 2020 21:48:54 +0100
Subject: [PATCH 1126/1519] additional improvements to fields constructor

---
 mongoengine/base/fields.py |  2 --
 mongoengine/document.py    |  6 ------
 mongoengine/fields.py      | 26 ++++++++++++++++----------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 1997d0fcc..ae86bc8d3 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -16,8 +16,6 @@
 class BaseField:
     """A base class for fields in a MongoDB document. Instances of this class
     may be added to subclasses of `Document` to define a document's schema.
-
-    .. versionchanged:: 0.5 - added verbose and help text
     """
 
     name = None
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 1c175ac3f..de00740b4 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -620,9 +620,6 @@ def delete(self, signal_kwargs=None, **write_concern):
             For example, ``save(..., w: 2, fsync: True)`` will
             wait until at least two servers have recorded the write and
             will force an fsync on the primary server.
-
-        .. versionchanged:: 0.10.7
-            Add signal_kwargs argument
         """
         signal_kwargs = signal_kwargs or {}
         signals.pre_delete.send(self.__class__, document=self, **signal_kwargs)
@@ -815,9 +812,6 @@ def drop_collection(cls):
 
         Raises :class:`OperationError` if the document has no collection set
         (i.g. if it is `abstract`)
-
-        .. versionchanged:: 0.10.7
-            :class:`OperationError` exception raised if no collection available
         """
         coll_name = cls._get_collection_name()
         if not coll_name:
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 296fe9be7..e9b556d19 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -104,6 +104,7 @@ def __init__(self, regex=None, max_length=None, min_length=None, **kwargs):
         :param regex: (optional) A string pattern that will be applied during validation
         :param max_length: (optional) A max length that will be applied during validation
         :param min_length: (optional) A min length that will be applied during validation
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.BaseField`
         """
         self.regex = re.compile(regex) if regex else None
         self.max_length = max_length
@@ -160,9 +161,7 @@ def prepare_query_value(self, op, value):
 
 
 class URLField(StringField):
-    """A field that validates input as an URL.
-
-    """
+    """A field that validates input as an URL."""
 
     _URL_REGEX = LazyRegexCompiler(
         r"^(?:[a-z0-9\.\-]*)://"  # scheme is validated separately
@@ -180,6 +179,7 @@ def __init__(self, url_regex=None, schemes=None, **kwargs):
         """
         :param url_regex: (optional) Overwrite the default regex used for validation
         :param schemes: (optional) Overwrite the default URL schemes that are allowed
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.StringField`
         """
         self.url_regex = url_regex or self._URL_REGEX
         self.schemes = schemes or self._URL_SCHEMES
@@ -239,6 +239,7 @@ def __init__(
         :param domain_whitelist: (optional) list of valid domain names applied during validation
         :param allow_utf8_user: Allow user part of the email to contain utf8 char
         :param allow_ip_domain: Allow domain part of the email to be an IPv4 or IPv6 address
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.StringField`
         """
         self.domain_whitelist = domain_whitelist or []
         self.allow_utf8_user = allow_utf8_user
@@ -313,6 +314,7 @@ def __init__(self, min_value=None, max_value=None, **kwargs):
         """
         :param min_value: (optional) A min value that will be applied during validation
         :param max_value: (optional) A max value that will be applied during validation
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.BaseField`
         """
         self.min_value, self.max_value = min_value, max_value
         super().__init__(**kwargs)
@@ -350,6 +352,7 @@ def __init__(self, min_value=None, max_value=None, **kwargs):
         """
         :param min_value: (optional) A min value that will be applied during validation
         :param max_value: (optional) A max value that will be applied during validation
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.BaseField`
         """
         self.min_value, self.max_value = min_value, max_value
         super().__init__(**kwargs)
@@ -390,6 +393,7 @@ def __init__(self, min_value=None, max_value=None, **kwargs):
         """
         :param min_value: (optional) A min value that will be applied during validation
         :param max_value: (optional) A max value that will be applied during validation
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.BaseField`
         """
         self.min_value, self.max_value = min_value, max_value
         super().__init__(**kwargs)
@@ -427,7 +431,6 @@ def prepare_query_value(self, op, value):
 class DecimalField(BaseField):
     """Fixed-point decimal number field. Stores the value as a float by default unless `force_string` is used.
     If using floats, beware of Decimal to float conversion (potential precision loss)
-
     """
 
     def __init__(
@@ -458,7 +461,7 @@ def __init__(
             - decimal.ROUND_05UP (away from zero if last digit after rounding towards zero would have been 0 or 5; otherwise towards zero)
 
             Defaults to: ``decimal.ROUND_HALF_UP``
-
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.BaseField`
         """
         self.min_value = min_value
         self.max_value = max_value
@@ -640,6 +643,7 @@ class ComplexDateTimeField(StringField):
     def __init__(self, separator=",", **kwargs):
         """
         :param separator: Allows to customize the separator used for storage (default ``,``)
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.StringField`
         """
         self.separator = separator
         self.format = separator.join(["%Y", "%m", "%d", "%H", "%M", "%S", "%f"])
@@ -987,8 +991,7 @@ def __init__(self, document_type, **kwargs):
         """
         :param document_type: The type of
          :class:`~mongoengine.EmbeddedDocument` the list will hold.
-        :param kwargs: Keyword arguments passed directly into the parent
-         :class:`~mongoengine.ListField`.
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.ListField`
         """
         super().__init__(field=EmbeddedDocumentField(document_type), **kwargs)
 
@@ -1176,10 +1179,12 @@ def __init__(
     ):
         """Initialises the Reference Field.
 
+        :param document_type: The type of Document that will be referenced
         :param dbref:  Store the reference as :class:`~pymongo.dbref.DBRef`
           or as the :class:`~pymongo.objectid.ObjectId`.id .
         :param reverse_delete_rule: Determines what to do when the referring
           object is deleted
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.BaseField`
 
         .. note ::
             A reference to an abstract document type is always stored as a
@@ -1301,15 +1306,16 @@ def lookup_member(self, member_name):
 
 
 class CachedReferenceField(BaseField):
-    """
-    A referencefield with cache fields to purpose pseudo-joins
+    """A referencefield with cache fields to purpose pseudo-joins
     """
 
     def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
         """Initialises the Cached Reference Field.
 
+        :param document_type: The type of Document that will be referenced
         :param fields:  A list of fields to be cached in document
-        :param auto_sync: if True documents are auto updated.
+        :param auto_sync: if True documents are auto updated
+        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.BaseField`
         """
         if fields is None:
             fields = []

From a4fff1549160641a668148da37a3fa28dc3519b6 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Tue, 8 Dec 2020 22:41:27 +0100
Subject: [PATCH 1127/1519] minor improvement in code

---
 mongoengine/base/fields.py |  7 ++++---
 mongoengine/document.py    |  1 -
 mongoengine/fields.py      | 22 +++++++---------------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 7bab813c0..e6208fb6e 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -1,5 +1,4 @@
 import operator
-import warnings
 import weakref
 
 from bson import DBRef, ObjectId, SON
@@ -20,7 +19,7 @@ class BaseField:
     .. versionchanged:: 0.5 - added verbose and help text
     """
 
-    name = None
+    name = None  # set in TopLevelDocumentMetaclass
     _geo_index = False
     _auto_gen = False  # Call `generate` to generate a value
     _auto_dereference = True
@@ -269,7 +268,9 @@ class ComplexBaseField(BaseField):
     .. versionadded:: 0.5
     """
 
-    field = None
+    def __init__(self, field=None, **kwargs):
+        self.field = field
+        super().__init__(**kwargs)
 
     def __get__(self, instance, owner):
         """Descriptor to automatically dereference references."""
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 801c8df80..972fa7578 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1,5 +1,4 @@
 import re
-import warnings
 
 from bson.dbref import DBRef
 import pymongo
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index db292ba9f..3a1c28b96 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -36,7 +36,6 @@
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
-from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
 from mongoengine.queryset import DO_NOTHING
 from mongoengine.queryset.base import BaseQuerySet
 from mongoengine.queryset.transform import STRING_OPERATORS
@@ -546,11 +545,11 @@ def to_mongo(self, value):
         if callable(value):
             return value()
 
-        if not isinstance(value, str):
+        if isinstance(value, str):
+            return self._parse_datetime(value)
+        else:
             return None
 
-        return self._parse_datetime(value)
-
     def _parse_datetime(self, value):
         # Attempt to parse a datetime from a string
         value = value.strip()
@@ -913,10 +912,9 @@ class ListField(ComplexBaseField):
     """
 
     def __init__(self, field=None, max_length=None, **kwargs):
-        self.field = field
         self.max_length = max_length
         kwargs.setdefault("default", lambda: [])
-        super().__init__(**kwargs)
+        super().__init__(field=field, **kwargs)
 
     def __get__(self, instance, owner):
         if instance is None:
@@ -1004,14 +1002,9 @@ class SortedListField(ListField):
     .. versionchanged:: 0.6 - added reverse keyword
     """
 
-    _ordering = None
-    _order_reverse = False
-
     def __init__(self, field, **kwargs):
-        if "ordering" in kwargs.keys():
-            self._ordering = kwargs.pop("ordering")
-        if "reverse" in kwargs.keys():
-            self._order_reverse = kwargs.pop("reverse")
+        self._ordering = kwargs.pop("ordering", None)
+        self._order_reverse = kwargs.pop("reverse", False)
         super().__init__(field, **kwargs)
 
     def to_mongo(self, value, use_db_field=True, fields=None):
@@ -1064,11 +1057,10 @@ class DictField(ComplexBaseField):
     """
 
     def __init__(self, field=None, *args, **kwargs):
-        self.field = field
         self._auto_dereference = False
 
         kwargs.setdefault("default", lambda: {})
-        super().__init__(*args, **kwargs)
+        super().__init__(*args, field=field, **kwargs)
 
     def validate(self, value):
         """Make sure that a list of valid fields is being used."""

From ee6ef1ff4b6efefdb3d12b271c24c6adc466b12a Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Tue, 8 Dec 2020 23:08:21 +0100
Subject: [PATCH 1128/1519] autoformat w prettier

---
 .travis.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 05ce782d7..b29dab33c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,11 @@
 language: python
 dist: xenial
 python:
-- 3.6
-- 3.7
-- 3.8
-- 3.9
-- pypy3
+  - 3.6
+  - 3.7
+  - 3.8
+  - 3.9
+  - pypy3
 
 env:
   global:
@@ -42,14 +42,14 @@ matrix:
   fast_finish: true
 
   include:
-  - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
-  - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
-  - python: 3.7
-    env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_11}
-  - python: 3.8
-    env: MONGODB=${MONGODB_4_0} PYMONGO=${PYMONGO_3_11}
+    - python: 3.7
+      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
+    - python: 3.7
+      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
+    - python: 3.7
+      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_11}
+    - python: 3.8
+      env: MONGODB=${MONGODB_4_0} PYMONGO=${PYMONGO_3_11}
 
 install:
   # Install Mongo
@@ -69,7 +69,7 @@ before_script:
   - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
   # Run pre-commit hooks (black, flake8, etc) on entire codebase
   - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then pre-commit run -a; else echo "pre-commit checks only runs on py37"; fi
-  - mongo --eval 'db.version();'    # Make sure mongo is awake
+  - mongo --eval 'db.version();' # Make sure mongo is awake
 
 script:
   - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
@@ -83,8 +83,8 @@ notifications:
 # Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
 branches:
   only:
-  - master
-  - /^v.*$/
+    - master
+    - /^v.*$/
 
 # Whenever a new release is created via GitHub, publish it on PyPI.
 deploy:

From c00a378776b654beac3358ae6af230e13257e1bf Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Tue, 8 Dec 2020 23:10:07 +0100
Subject: [PATCH 1129/1519] autoformat with updated black

---
 .pre-commit-config.yaml              |   2 +-
 mongoengine/base/document.py         |  18 ++-
 mongoengine/base/fields.py           |   3 +-
 mongoengine/context_managers.py      |   3 +-
 mongoengine/dereference.py           |   3 +-
 mongoengine/pymongo_support.py       |   3 +-
 mongoengine/queryset/base.py         |  17 +--
 mongoengine/queryset/visitor.py      |  12 +-
 tests/document/test_class_methods.py |  29 ++---
 tests/document/test_delta.py         |   5 +-
 tests/document/test_indexes.py       |  36 ++----
 tests/document/test_inheritance.py   |  20 ++--
 tests/document/test_instance.py      |  15 +--
 tests/document/test_validation.py    |   6 +-
 tests/fields/test_binary_field.py    |   6 +-
 tests/fields/test_decimal_field.py   |   3 +-
 tests/fields/test_fields.py          |  45 +++-----
 tests/fields/test_file_field.py      |  12 +-
 tests/fields/test_float_field.py     |   3 +-
 tests/fields/test_geo_fields.py      |   9 +-
 tests/fields/test_int_field.py       |   3 +-
 tests/fields/test_long_field.py      |   3 +-
 tests/fields/test_reference_field.py |   3 +-
 tests/fields/test_url_field.py       |   3 +-
 tests/fields/test_uuid_field.py      |   3 +-
 tests/queryset/test_field_list.py    |   9 +-
 tests/queryset/test_queryset.py      | 162 +++++++++------------------
 tests/queryset/test_transform.py     |   6 +-
 tests/queryset/test_visitor.py       |  24 ++--
 tests/test_connection.py             |  24 ++--
 tests/test_context_managers.py       |   6 +-
 tests/test_dereference.py            |  39 +++----
 tests/test_replicaset_connection.py  |   3 +-
 33 files changed, 189 insertions(+), 349 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e11640b8f..cb68249a6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 fail_fast: false
 repos:
     - repo: https://github.com/ambv/black
-      rev: 19.10b0
+      rev: 20.8b1
       hooks:
         - id: black
     - repo: https://gitlab.com/pycqa/flake8
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 019d62d05..32ad0adc0 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -244,8 +244,7 @@ def __iter__(self):
         return iter(self._fields_ordered)
 
     def __getitem__(self, name):
-        """Dictionary-style field access, return a field's value if present.
-        """
+        """Dictionary-style field access, return a field's value if present."""
         try:
             if name in self._fields_ordered:
                 return getattr(self, name)
@@ -254,8 +253,7 @@ def __getitem__(self, name):
         raise KeyError(name)
 
     def __setitem__(self, name, value):
-        """Dictionary-style field access, set a field's value.
-        """
+        """Dictionary-style field access, set a field's value."""
         # Ensure that the field exists before settings its value
         if not self._dynamic and name not in self._fields:
             raise KeyError(name)
@@ -617,8 +615,7 @@ def _nestable_types_changed_fields(changed_fields, base_key, data):
                 )
 
     def _get_changed_fields(self):
-        """Return a list of all fields that have explicitly been changed.
-        """
+        """Return a list of all fields that have explicitly been changed."""
         EmbeddedDocument = _import_class("EmbeddedDocument")
         ReferenceField = _import_class("ReferenceField")
         GenericReferenceField = _import_class("GenericReferenceField")
@@ -750,8 +747,7 @@ def _get_collection_name(cls):
 
     @classmethod
     def _from_son(cls, son, _auto_dereference=True, created=False):
-        """Create an instance of a Document (subclass) from a PyMongo SON (dict)
-        """
+        """Create an instance of a Document (subclass) from a PyMongo SON (dict)"""
         if son and not isinstance(son, dict):
             raise ValueError(
                 "The source SON object needs to be of type 'dict' but a '%s' was found"
@@ -800,7 +796,8 @@ def _from_son(cls, son, _auto_dereference=True, created=False):
                 ["Field '{}' - {}".format(k, v) for k, v in errors_dict.items()]
             )
             msg = "Invalid data to create a `{}` instance.\n{}".format(
-                cls._class_name, errors,
+                cls._class_name,
+                errors,
             )
             raise InvalidDocumentError(msg)
 
@@ -1165,8 +1162,7 @@ def _lookup_field(cls, parts):
 
     @classmethod
     def _translate_field_name(cls, field, sep="."):
-        """Translate a field attribute name to a database field name.
-        """
+        """Translate a field attribute name to a database field name."""
         parts = field.split(sep)
         parts = [f.db_field for f in cls._lookup_field(parts)]
         return ".".join(parts)
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 347940f58..8df3d089a 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -117,8 +117,7 @@ def __init__(
             BaseField.creation_counter += 1
 
     def __get__(self, instance, owner):
-        """Descriptor for retrieving a value from a field in a document.
-        """
+        """Descriptor for retrieving a value from a field in a document."""
         if instance is None:
             # Document class being used rather than a document object
             return self
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 5f2b5229a..257d27f82 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -184,8 +184,7 @@ class query_counter:
     """
 
     def __init__(self, alias=DEFAULT_CONNECTION_NAME):
-        """Construct the query_counter
-        """
+        """Construct the query_counter"""
         self.db = get_db(alias=alias)
         self.initial_profiling_level = None
         self._ctx_query_counter = 0  # number of queries issued by the context
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index ff608a3b3..a89bc15aa 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -157,8 +157,7 @@ def _find_references(self, items, depth=0):
         return reference_map
 
     def _fetch_objects(self, doc_type=None):
-        """Fetch all references and convert to their document objects
-        """
+        """Fetch all references and convert to their document objects"""
         object_map = {}
         for collection, dbrefs in self.reference_map.items():
 
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 9cf9e2aef..dc7aaa6bc 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -14,8 +14,7 @@
 def count_documents(
     collection, filter, skip=None, limit=None, hint=None, collation=None
 ):
-    """Pymongo>3.7 deprecates count in favour of count_documents
-    """
+    """Pymongo>3.7 deprecates count in favour of count_documents"""
     if limit == 0:
         return 0  # Pymongo raises an OperationFailure if called with limit=0
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index f41cb81b1..43e03ef85 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -189,7 +189,8 @@ def __getitem__(self, key):
             if queryset._scalar:
                 return queryset._get_scalar(
                     queryset._document._from_son(
-                        queryset._cursor[key], _auto_dereference=self._auto_dereference,
+                        queryset._cursor[key],
+                        _auto_dereference=self._auto_dereference,
                     )
                 )
 
@@ -197,7 +198,8 @@ def __getitem__(self, key):
                 return queryset._cursor[key]
 
             return queryset._document._from_son(
-                queryset._cursor[key], _auto_dereference=self._auto_dereference,
+                queryset._cursor[key],
+                _auto_dereference=self._auto_dereference,
             )
 
         raise TypeError("Provide a slice or an integer index")
@@ -720,7 +722,7 @@ def with_id(self, object_id):
         return queryset.filter(pk=object_id).first()
 
     def in_bulk(self, object_ids):
-        """"Retrieve a set of documents by their ids.
+        """ "Retrieve a set of documents by their ids.
 
         :param object_ids: a list or tuple of ObjectId's
         :rtype: dict of ObjectId's as keys and collection-specific
@@ -738,7 +740,8 @@ def in_bulk(self, object_ids):
         else:
             for doc in docs:
                 doc_map[doc["_id"]] = self._document._from_son(
-                    doc, _auto_dereference=self._auto_dereference,
+                    doc,
+                    _auto_dereference=self._auto_dereference,
                 )
 
         return doc_map
@@ -1556,8 +1559,7 @@ def item_frequencies(self, field, normalize=False, map_reduce=True):
     # Iterator helpers
 
     def __next__(self):
-        """Wrap the result in a :class:`~mongoengine.Document` object.
-        """
+        """Wrap the result in a :class:`~mongoengine.Document` object."""
         if self._none or self._empty:
             raise StopIteration
 
@@ -1567,7 +1569,8 @@ def __next__(self):
             return raw_doc
 
         doc = self._document._from_son(
-            raw_doc, _auto_dereference=self._auto_dereference,
+            raw_doc,
+            _auto_dereference=self._auto_dereference,
         )
 
         if self._scalar:
diff --git a/mongoengine/queryset/visitor.py b/mongoengine/queryset/visitor.py
index a2448f287..9e26d4e83 100644
--- a/mongoengine/queryset/visitor.py
+++ b/mongoengine/queryset/visitor.py
@@ -13,17 +13,14 @@ def warn_empty_is_deprecated():
 
 
 class QNodeVisitor:
-    """Base visitor class for visiting Q-object nodes in a query tree.
-    """
+    """Base visitor class for visiting Q-object nodes in a query tree."""
 
     def visit_combination(self, combination):
-        """Called by QCombination objects.
-        """
+        """Called by QCombination objects."""
         return combination
 
     def visit_query(self, query):
-        """Called by (New)Q objects.
-        """
+        """Called by (New)Q objects."""
         return query
 
 
@@ -49,8 +46,7 @@ def visit_combination(self, combination):
         return combination
 
     def _query_conjunction(self, queries):
-        """Merges query dicts - effectively &ing them together.
-        """
+        """Merges query dicts - effectively &ing them together."""
         query_ops = set()
         combined_query = {}
         for query in queries:
diff --git a/tests/document/test_class_methods.py b/tests/document/test_class_methods.py
index 0276457c3..7a9428dff 100644
--- a/tests/document/test_class_methods.py
+++ b/tests/document/test_class_methods.py
@@ -26,16 +26,14 @@ def tearDown(self):
             self.db.drop_collection(collection)
 
     def test_definition(self):
-        """Ensure that document may be defined using fields.
-        """
+        """Ensure that document may be defined using fields."""
         assert ["_cls", "age", "id", "name"] == sorted(self.Person._fields.keys())
         assert ["IntField", "ObjectIdField", "StringField", "StringField"] == sorted(
             [x.__class__.__name__ for x in self.Person._fields.values()]
         )
 
     def test_get_db(self):
-        """Ensure that get_db returns the expected db.
-        """
+        """Ensure that get_db returns the expected db."""
         db = self.Person._get_db()
         assert self.db == db
 
@@ -47,15 +45,13 @@ def test_get_collection_name(self):
         assert collection_name == self.Person._get_collection_name()
 
     def test_get_collection(self):
-        """Ensure that get_collection returns the expected collection.
-        """
+        """Ensure that get_collection returns the expected collection."""
         collection_name = "person"
         collection = self.Person._get_collection()
         assert self.db[collection_name] == collection
 
     def test_drop_collection(self):
-        """Ensure that the collection may be dropped from the database.
-        """
+        """Ensure that the collection may be dropped from the database."""
         collection_name = "person"
         self.Person(name="Test").save()
         assert collection_name in list_collection_names(self.db)
@@ -77,7 +73,7 @@ class Job(Document):
         assert self.Person._meta["delete_rules"] == {(Job, "employee"): NULLIFY}
 
     def test_compare_indexes(self):
-        """ Ensure that the indexes are properly created and that
+        """Ensure that the indexes are properly created and that
         compare_indexes identifies the missing/extra indexes
         """
 
@@ -110,7 +106,7 @@ class BlogPost(Document):
         }
 
     def test_compare_indexes_inheritance(self):
-        """ Ensure that the indexes are properly created and that
+        """Ensure that the indexes are properly created and that
         compare_indexes identifies the missing/extra indexes for subclassed
         documents (_cls included)
         """
@@ -150,7 +146,7 @@ class BlogPostWithTags(BlogPost):
         }
 
     def test_compare_indexes_multiple_subclasses(self):
-        """ Ensure that compare_indexes behaves correctly if called from a
+        """Ensure that compare_indexes behaves correctly if called from a
         class, which base class has multiple subclasses
         """
 
@@ -203,7 +199,7 @@ class Doc(Document):
         assert actual == expected
 
     def test_list_indexes_inheritance(self):
-        """ ensure that all of the indexes are listed regardless of the super-
+        """ensure that all of the indexes are listed regardless of the super-
         or sub-class that we call it from
         """
 
@@ -260,8 +256,7 @@ class Cat(Animal):
         assert Vaccine._meta["delete_rules"][(Cat, "vaccine_made")] == PULL
 
     def test_collection_naming(self):
-        """Ensure that a collection with a specified name may be used.
-        """
+        """Ensure that a collection with a specified name may be used."""
 
         class DefaultNamingTest(Document):
             pass
@@ -316,8 +311,7 @@ class MyDocument(BaseDocument):
         assert "basedocument" == MyDocument._get_collection_name()
 
     def test_custom_collection_name_operations(self):
-        """Ensure that a collection with a specified name is used as expected.
-        """
+        """Ensure that a collection with a specified name is used as expected."""
         collection_name = "personCollTest"
 
         class Person(Document):
@@ -337,8 +331,7 @@ class Person(Document):
         assert collection_name not in list_collection_names(self.db)
 
     def test_collection_name_and_primary(self):
-        """Ensure that a collection with a specified name may be used.
-        """
+        """Ensure that a collection with a specified name may be used."""
 
         class Person(Document):
             name = StringField(primary_key=True)
diff --git a/tests/document/test_delta.py b/tests/document/test_delta.py
index ed3bb67b2..2aae0af68 100644
--- a/tests/document/test_delta.py
+++ b/tests/document/test_delta.py
@@ -643,7 +643,10 @@ class Doc(DocClass):
         doc.save()
         doc = doc.reload(10)
 
-        assert doc._delta() == ({}, {},)
+        assert doc._delta() == (
+            {},
+            {},
+        )
         del doc.embedded_field.list_field[2].list_field
         assert doc._delta() == (
             {},
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 726eebe5f..55a569317 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -171,8 +171,7 @@ class MyDoc(Document):
         assert MyDoc._meta["index_specs"] == [{"fields": [("keywords", 1)]}]
 
     def test_embedded_document_index_meta(self):
-        """Ensure that embedded document indexes are created explicitly
-        """
+        """Ensure that embedded document indexes are created explicitly"""
 
         class Rank(EmbeddedDocument):
             title = StringField(required=True)
@@ -194,8 +193,7 @@ class Person(Document):
         assert [("rank.title", 1)] in info
 
     def test_explicit_geo2d_index(self):
-        """Ensure that geo2d indexes work when created via meta[indexes]
-        """
+        """Ensure that geo2d indexes work when created via meta[indexes]"""
 
         class Place(Document):
             location = DictField()
@@ -209,8 +207,7 @@ class Place(Document):
         assert [("location.point", "2d")] in info
 
     def test_explicit_geo2d_index_embedded(self):
-        """Ensure that geo2d indexes work when created via meta[indexes]
-        """
+        """Ensure that geo2d indexes work when created via meta[indexes]"""
 
         class EmbeddedLocation(EmbeddedDocument):
             location = DictField()
@@ -229,8 +226,7 @@ class Place(Document):
         assert [("current.location.point", "2d")] in info
 
     def test_explicit_geosphere_index(self):
-        """Ensure that geosphere indexes work when created via meta[indexes]
-        """
+        """Ensure that geosphere indexes work when created via meta[indexes]"""
 
         class Place(Document):
             location = DictField()
@@ -246,8 +242,7 @@ class Place(Document):
         assert [("location.point", "2dsphere")] in info
 
     def test_explicit_geohaystack_index(self):
-        """Ensure that geohaystack indexes work when created via meta[indexes]
-        """
+        """Ensure that geohaystack indexes work when created via meta[indexes]"""
         pytest.skip(
             "GeoHaystack index creation is not supported for now"
             "from meta, as it requires a bucketSize parameter."
@@ -268,8 +263,7 @@ class Place(Document):
         assert [("location.point", "geoHaystack")] in info
 
     def test_create_geohaystack_index(self):
-        """Ensure that geohaystack indexes can be created
-        """
+        """Ensure that geohaystack indexes can be created"""
 
         class Place(Document):
             location = DictField()
@@ -364,8 +358,7 @@ class MongoUser(User):
         assert sorted(info.keys()) == ["_cls_1_user_guid_1", "_id_"]
 
     def test_embedded_document_index(self):
-        """Tests settings an index on an embedded document
-        """
+        """Tests settings an index on an embedded document"""
 
         class Date(EmbeddedDocument):
             year = IntField(db_field="yr")
@@ -382,8 +375,7 @@ class BlogPost(Document):
         assert sorted(info.keys()) == ["_id_", "date.yr_-1"]
 
     def test_list_embedded_document_index(self):
-        """Ensure list embedded documents can be indexed
-        """
+        """Ensure list embedded documents can be indexed"""
 
         class Tag(EmbeddedDocument):
             name = StringField(db_field="tag")
@@ -419,8 +411,7 @@ class RecursiveDocument(Document):
         assert sorted(info.keys()) == ["_cls_1", "_id_"]
 
     def test_covered_index(self):
-        """Ensure that covered indexes can be used
-        """
+        """Ensure that covered indexes can be used"""
 
         class Test(Document):
             a = IntField()
@@ -558,8 +549,7 @@ class BlogPost(Document):
         assert [x.name for x in query_result] == sorted(names)
 
     def test_unique(self):
-        """Ensure that uniqueness constraints are applied to fields.
-        """
+        """Ensure that uniqueness constraints are applied to fields."""
 
         class BlogPost(Document):
             title = StringField()
@@ -607,8 +597,7 @@ class Blog(Document):
         )
 
     def test_unique_with(self):
-        """Ensure that unique_with constraints are applied to fields.
-        """
+        """Ensure that unique_with constraints are applied to fields."""
 
         class Date(EmbeddedDocument):
             year = IntField(db_field="yr")
@@ -633,8 +622,7 @@ class BlogPost(Document):
             post3.save()
 
     def test_unique_embedded_document(self):
-        """Ensure that uniqueness constraints are applied to fields on embedded documents.
-        """
+        """Ensure that uniqueness constraints are applied to fields on embedded documents."""
 
         class SubDocument(EmbeddedDocument):
             year = IntField(db_field="yr")
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index e7901f05e..bd694a1c5 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -45,8 +45,7 @@ class DataDoc(Document):
         test_doc.delete()
 
     def test_superclasses(self):
-        """Ensure that the correct list of superclasses is assembled.
-        """
+        """Ensure that the correct list of superclasses is assembled."""
 
         class Animal(Document):
             meta = {"allow_inheritance": True}
@@ -216,8 +215,7 @@ class Pike(Fish):
         assert Pike._subclasses == ("Animal.Fish.Pike",)
 
     def test_inheritance_meta_data(self):
-        """Ensure that document may inherit fields from a superclass document.
-        """
+        """Ensure that document may inherit fields from a superclass document."""
 
         class Person(Document):
             name = StringField()
@@ -234,8 +232,7 @@ class Employee(Person):
         assert Employee._get_collection_name() == Person._get_collection_name()
 
     def test_inheritance_to_mongo_keys(self):
-        """Ensure that document may inherit fields from a superclass document.
-        """
+        """Ensure that document may inherit fields from a superclass document."""
 
         class Person(Document):
             name = StringField()
@@ -259,7 +256,7 @@ class Employee(Person):
         assert Employee._get_collection_name() == Person._get_collection_name()
 
     def test_indexes_and_multiple_inheritance(self):
-        """ Ensure that all of the indexes are created for a document with
+        """Ensure that all of the indexes are created for a document with
         multiple inheritance.
         """
 
@@ -289,8 +286,7 @@ class C(A, B):
         )
 
     def test_polymorphic_queries(self):
-        """Ensure that the correct subclasses are returned from a query
-        """
+        """Ensure that the correct subclasses are returned from a query"""
 
         class Animal(Document):
             meta = {"allow_inheritance": True}
@@ -347,8 +343,7 @@ class Dog(Animal):
         assert "_cls" not in obj
 
     def test_cant_turn_off_inheritance_on_subclass(self):
-        """Ensure if inheritance is on in a subclass you cant turn it off.
-        """
+        """Ensure if inheritance is on in a subclass you cant turn it off."""
 
         class Animal(Document):
             name = StringField()
@@ -498,8 +493,7 @@ class Comment(EmbeddedDocument):
         assert "_cls" in doc.to_mongo()
 
     def test_document_inheritance(self):
-        """Ensure mutliple inheritance of abstract documents
-        """
+        """Ensure mutliple inheritance of abstract documents"""
 
         class DateCreatedDocument(Document):
             meta = {"allow_inheritance": True, "abstract": True}
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 42df3c48e..a28cd472d 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -160,8 +160,7 @@ class Log(Document):
         Log.objects
 
     def test_repr(self):
-        """Ensure that unicode representation works
-        """
+        """Ensure that unicode representation works"""
 
         class Article(Document):
             title = StringField()
@@ -1553,8 +1552,7 @@ class Site(Document):
         assert site.page.log_message == "Error: Dummy message"
 
     def test_update_list_field(self):
-        """Test update on `ListField` with $pull + $in.
-        """
+        """Test update on `ListField` with $pull + $in."""
 
         class Doc(Document):
             foo = ListField(StringField())
@@ -2816,15 +2814,13 @@ def test_db_alias_overrides(self):
         register_connection("testdb-2", "mongoenginetest2")
 
         class A(Document):
-            """Uses default db_alias
-            """
+            """Uses default db_alias"""
 
             name = StringField()
             meta = {"allow_inheritance": True}
 
         class B(A):
-            """Uses testdb-2 db_alias
-            """
+            """Uses testdb-2 db_alias"""
 
             meta = {"db_alias": "testdb-2"}
 
@@ -3612,8 +3608,7 @@ class User(Document):
         assert u_from_db.height is None
 
     def test_not_saved_eq(self):
-        """Ensure we can compare documents not saved.
-        """
+        """Ensure we can compare documents not saved."""
 
         class Person(Document):
             pass
diff --git a/tests/document/test_validation.py b/tests/document/test_validation.py
index c4228a96d..104eb6931 100644
--- a/tests/document/test_validation.py
+++ b/tests/document/test_validation.py
@@ -9,8 +9,7 @@
 
 class TestValidatorError(MongoDBTestCase):
     def test_to_dict(self):
-        """Ensure a ValidationError handles error to_dict correctly.
-        """
+        """Ensure a ValidationError handles error to_dict correctly."""
         error = ValidationError("root")
         assert error.to_dict() == {}
 
@@ -90,8 +89,7 @@ class Person(BasePerson):
             p.validate()
 
     def test_embedded_document_validation(self):
-        """Ensure that embedded documents may be validated.
-        """
+        """Ensure that embedded documents may be validated."""
 
         class Comment(EmbeddedDocument):
             date = DateTimeField()
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index 4f7af3252..0f92d53b6 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -13,8 +13,7 @@
 
 class TestBinaryField(MongoDBTestCase):
     def test_binary_fields(self):
-        """Ensure that binary fields can be stored and retrieved.
-        """
+        """Ensure that binary fields can be stored and retrieved."""
 
         class Attachment(Document):
             content_type = StringField()
@@ -33,8 +32,7 @@ class Attachment(Document):
         assert BLOB == bytes(attachment_1.blob)
 
     def test_validation_succeeds(self):
-        """Ensure that valid values can be assigned to binary fields.
-        """
+        """Ensure that valid values can be assigned to binary fields."""
 
         class AttachmentRequired(Document):
             blob = BinaryField(required=True)
diff --git a/tests/fields/test_decimal_field.py b/tests/fields/test_decimal_field.py
index a7cd09a21..519356e9e 100644
--- a/tests/fields/test_decimal_field.py
+++ b/tests/fields/test_decimal_field.py
@@ -8,8 +8,7 @@
 
 class TestDecimalField(MongoDBTestCase):
     def test_validation(self):
-        """Ensure that invalid values cannot be assigned to decimal fields.
-        """
+        """Ensure that invalid values cannot be assigned to decimal fields."""
 
         class Person(Document):
             height = DecimalField(min_value=Decimal("0.1"), max_value=Decimal("3.5"))
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 344656c14..ff1fde987 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -544,8 +544,7 @@ class BlogPost(Document):
         post.validate()
 
     def test_sorted_list_sorting(self):
-        """Ensure that a sorted list field properly sorts values.
-        """
+        """Ensure that a sorted list field properly sorts values."""
 
         class Comment(EmbeddedDocument):
             order = IntField()
@@ -661,8 +660,7 @@ class BlogPost(Document):
         )
 
     def test_list_field_manipulative_operators(self):
-        """Ensure that ListField works with standard list operators that manipulate the list.
-        """
+        """Ensure that ListField works with standard list operators that manipulate the list."""
 
         class BlogPost(Document):
             ref = StringField()
@@ -1372,8 +1370,7 @@ class Bar(Document):
         assert bar.generic_ref == {"_ref": expected, "_cls": "Foo"}
 
     def test_list_item_dereference(self):
-        """Ensure that DBRef items in ListFields are dereferenced.
-        """
+        """Ensure that DBRef items in ListFields are dereferenced."""
 
         class User(Document):
             name = StringField()
@@ -1398,8 +1395,7 @@ class Group(Document):
         assert group_obj.members[1].name == user2.name
 
     def test_recursive_reference(self):
-        """Ensure that ReferenceFields can reference their own documents.
-        """
+        """Ensure that ReferenceFields can reference their own documents."""
 
         class Employee(Document):
             name = StringField()
@@ -1426,8 +1422,7 @@ class Employee(Document):
         assert peter.friends == friends
 
     def test_recursive_embedding(self):
-        """Ensure that EmbeddedDocumentFields can contain their own documents.
-        """
+        """Ensure that EmbeddedDocumentFields can contain their own documents."""
 
         class TreeNode(EmbeddedDocument):
             name = StringField()
@@ -1503,8 +1498,7 @@ class AbstractDoc(Document):
             AbstractDoc.drop_collection()
 
     def test_reference_class_with_abstract_parent(self):
-        """Ensure that a class with an abstract parent can be referenced.
-        """
+        """Ensure that a class with an abstract parent can be referenced."""
 
         class Sibling(Document):
             name = StringField()
@@ -1574,8 +1568,7 @@ class Mother(Document):
             brother.save()
 
     def test_generic_reference(self):
-        """Ensure that a GenericReferenceField properly dereferences items.
-        """
+        """Ensure that a GenericReferenceField properly dereferences items."""
 
         class Link(Document):
             title = StringField()
@@ -1614,8 +1607,7 @@ class Bookmark(Document):
         assert isinstance(bm.bookmark_object, Link)
 
     def test_generic_reference_list(self):
-        """Ensure that a ListField properly dereferences generic references.
-        """
+        """Ensure that a ListField properly dereferences generic references."""
 
         class Link(Document):
             title = StringField()
@@ -1718,8 +1710,7 @@ class Bookmark(Document):
         assert bm.bookmark_object == post_1
 
     def test_generic_reference_string_choices(self):
-        """Ensure that a GenericReferenceField can handle choices as strings
-        """
+        """Ensure that a GenericReferenceField can handle choices as strings"""
 
         class Link(Document):
             title = StringField()
@@ -1811,8 +1802,7 @@ class User(Document):
         assert user.bookmarks == [post_1]
 
     def test_generic_reference_list_item_modification(self):
-        """Ensure that modifications of related documents (through generic reference) don't influence on querying
-        """
+        """Ensure that modifications of related documents (through generic reference) don't influence on querying"""
 
         class Post(Document):
             title = StringField()
@@ -1900,8 +1890,7 @@ class Doc(Document):
         assert doc == doc2
 
     def test_choices_allow_using_sets_as_choices(self):
-        """Ensure that sets can be used when setting choices
-        """
+        """Ensure that sets can be used when setting choices"""
 
         class Shirt(Document):
             size = StringField(choices={"M", "L"})
@@ -1920,8 +1909,7 @@ class Shirt(Document):
         shirt.validate()
 
     def test_choices_validation_accept_possible_value(self):
-        """Ensure that value is in a container of allowed values.
-        """
+        """Ensure that value is in a container of allowed values."""
 
         class Shirt(Document):
             size = StringField(choices=("S", "M"))
@@ -1930,8 +1918,7 @@ class Shirt(Document):
         shirt.validate()
 
     def test_choices_validation_reject_unknown_value(self):
-        """Ensure that unallowed value are rejected upon validation
-        """
+        """Ensure that unallowed value are rejected upon validation"""
 
         class Shirt(Document):
             size = StringField(choices=("S", "M"))
@@ -1989,8 +1976,7 @@ class Shirt(Document):
             shirt1.validate()
 
     def test_simple_choices_validation(self):
-        """Ensure that value is in a container of allowed values.
-        """
+        """Ensure that value is in a container of allowed values."""
 
         class Shirt(Document):
             size = StringField(max_length=3, choices=("S", "M", "L", "XL", "XXL"))
@@ -2039,8 +2025,7 @@ class Shirt(Document):
             shirt.validate()
 
     def test_simple_choices_validation_invalid_value(self):
-        """Ensure that error messages are correct.
-        """
+        """Ensure that error messages are correct."""
         SIZES = ("S", "M", "L", "XL", "XXL")
         COLORS = (("R", "Red"), ("B", "Blue"))
         SIZE_MESSAGE = u"Value must be one of ('S', 'M', 'L', 'XL', 'XXL')"
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index 4f3f1d45d..dc9354f0e 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -48,8 +48,7 @@ class DemoFile(Document):
         DemoFile.objects.create()
 
     def test_file_fields(self):
-        """Ensure that file fields can be written to and their data retrieved
-        """
+        """Ensure that file fields can be written to and their data retrieved"""
 
         class PutFile(Document):
             the_file = FileField()
@@ -91,8 +90,7 @@ class PutFile(Document):
         result.the_file.delete()
 
     def test_file_fields_stream(self):
-        """Ensure that file fields can be written to and their data retrieved
-        """
+        """Ensure that file fields can be written to and their data retrieved"""
 
         class StreamFile(Document):
             the_file = FileField()
@@ -228,8 +226,7 @@ class GridDocument(Document):
         assert ["doc_b", "doc_e"] == grid_fs.list()
 
     def test_file_uniqueness(self):
-        """Ensure that each instance of a FileField is unique
-        """
+        """Ensure that each instance of a FileField is unique"""
 
         class TestFile(Document):
             name = StringField()
@@ -285,8 +282,7 @@ class TestFile(Document):
         assert test_file.the_file.get().length == 4971
 
     def test_file_boolean(self):
-        """Ensure that a boolean test of a FileField indicates its presence
-        """
+        """Ensure that a boolean test of a FileField indicates its presence"""
 
         class TestFile(Document):
             the_file = FileField()
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
index 817dcfeb0..913f009d3 100644
--- a/tests/fields/test_float_field.py
+++ b/tests/fields/test_float_field.py
@@ -19,8 +19,7 @@ class TestDocument(Document):
         assert 1 == TestDocument.objects(float_fld__ne=1).count()
 
     def test_validation(self):
-        """Ensure that invalid values cannot be assigned to float fields.
-        """
+        """Ensure that invalid values cannot be assigned to float fields."""
 
         class Person(Document):
             height = FloatField(min_value=0.1, max_value=3.5)
diff --git a/tests/fields/test_geo_fields.py b/tests/fields/test_geo_fields.py
index 7960178e2..a611be857 100644
--- a/tests/fields/test_geo_fields.py
+++ b/tests/fields/test_geo_fields.py
@@ -290,8 +290,7 @@ class Location(Document):
         Location(loc=[[[[1, 2], [3, 4], [5, 6], [1, 2]]]]).validate()
 
     def test_indexes_geopoint(self):
-        """Ensure that indexes are created automatically for GeoPointFields.
-        """
+        """Ensure that indexes are created automatically for GeoPointFields."""
 
         class Event(Document):
             title = StringField()
@@ -317,8 +316,7 @@ class Event(Document):
         assert geo_indicies == [{"fields": [("venue.location", "2d")]}]
 
     def test_indexes_2dsphere(self):
-        """Ensure that indexes are created automatically for GeoPointFields.
-        """
+        """Ensure that indexes are created automatically for GeoPointFields."""
 
         class Event(Document):
             title = StringField()
@@ -332,8 +330,7 @@ class Event(Document):
         assert {"fields": [("point", "2dsphere")]} in geo_indicies
 
     def test_indexes_2dsphere_embedded(self):
-        """Ensure that indexes are created automatically for GeoPointFields.
-        """
+        """Ensure that indexes are created automatically for GeoPointFields."""
 
         class Venue(EmbeddedDocument):
             name = StringField()
diff --git a/tests/fields/test_int_field.py b/tests/fields/test_int_field.py
index 529ae4db5..1f50b8328 100644
--- a/tests/fields/test_int_field.py
+++ b/tests/fields/test_int_field.py
@@ -7,8 +7,7 @@
 
 class TestIntField(MongoDBTestCase):
     def test_int_validation(self):
-        """Ensure that invalid values cannot be assigned to int fields.
-        """
+        """Ensure that invalid values cannot be assigned to int fields."""
 
         class Person(Document):
             age = IntField(min_value=0, max_value=110)
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index 330051c37..67fd0bce5 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -25,8 +25,7 @@ class TestLongFieldConsideredAsInt64(Document):
         assert isinstance(doc.some_long, int)
 
     def test_long_validation(self):
-        """Ensure that invalid values cannot be assigned to long fields.
-        """
+        """Ensure that invalid values cannot be assigned to long fields."""
 
         class TestDocument(Document):
             value = LongField(min_value=0, max_value=110)
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index 24401ce0b..e2c92034b 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -107,8 +107,7 @@ class Person(Document):
         assert p.parent == p1
 
     def test_undefined_reference(self):
-        """Ensure that ReferenceFields may reference undefined Documents.
-        """
+        """Ensure that ReferenceFields may reference undefined Documents."""
 
         class Product(Document):
             name = StringField()
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index 50845b902..eb639bfe4 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -38,8 +38,7 @@ class Link(Document):
         )
 
     def test_url_scheme_validation(self):
-        """Ensure that URLFields validate urls with specific schemes properly.
-        """
+        """Ensure that URLFields validate urls with specific schemes properly."""
 
         class Link(Document):
             url = URLField()
diff --git a/tests/fields/test_uuid_field.py b/tests/fields/test_uuid_field.py
index 0f3d2d84e..ec81033b0 100644
--- a/tests/fields/test_uuid_field.py
+++ b/tests/fields/test_uuid_field.py
@@ -17,8 +17,7 @@ def test_storage(self):
         assert get_as_pymongo(person) == {"_id": person.id, "api_key": str(uid)}
 
     def test_field_string(self):
-        """Test UUID fields storing as String
-        """
+        """Test UUID fields storing as String"""
         Person.drop_collection()
 
         uu = uuid.uuid4()
diff --git a/tests/queryset/test_field_list.py b/tests/queryset/test_field_list.py
index be7903fd3..96bd804d9 100644
--- a/tests/queryset/test_field_list.py
+++ b/tests/queryset/test_field_list.py
@@ -148,8 +148,7 @@ class MyDoc(Document):
         assert qs._loaded_fields.as_dict() == {"c": {"$slice": 2}, "a": 1}
 
     def test_only(self):
-        """Ensure that QuerySet.only only returns the requested fields.
-        """
+        """Ensure that QuerySet.only only returns the requested fields."""
         person = self.Person(name="test", age=25)
         person.save()
 
@@ -365,8 +364,7 @@ class Email(Document):
         Email.drop_collection()
 
     def test_slicing_fields(self):
-        """Ensure that query slicing an array works.
-        """
+        """Ensure that query slicing an array works."""
 
         class Numbers(Document):
             n = ListField(IntField())
@@ -401,8 +399,7 @@ class Numbers(Document):
         assert numbers.n == [-5, -4, -3, -2, -1]
 
     def test_slicing_nested_fields(self):
-        """Ensure that query slicing an embedded array works.
-        """
+        """Ensure that query slicing an embedded array works."""
 
         class EmbeddedNumber(EmbeddedDocument):
             n = ListField(IntField())
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index a2440302a..3f1b85d75 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -60,8 +60,7 @@ class Person(Document):
         self.mongodb_version = get_mongodb_version()
 
     def test_initialisation(self):
-        """Ensure that a QuerySet is correctly initialised by QuerySetManager.
-        """
+        """Ensure that a QuerySet is correctly initialised by QuerySetManager."""
         assert isinstance(self.Person.objects, QuerySet)
         assert (
             self.Person.objects._collection.name == self.Person._get_collection_name()
@@ -271,8 +270,7 @@ def test_slice(self):
         )
 
     def test_find_one(self):
-        """Ensure that a query using find_one returns a valid result.
-        """
+        """Ensure that a query using find_one returns a valid result."""
         person1 = self.Person(name="User A", age=20)
         person1.save()
         person2 = self.Person(name="User B", age=30)
@@ -317,8 +315,7 @@ def test_get_no_document_exists_raises_doesnotexist(self):
             self.Person.objects.get()
 
     def test_get_multiple_match_raises_multipleobjectsreturned(self):
-        """Ensure that a query using ``get`` returns at most one result.
-        """
+        """Ensure that a query using ``get`` returns at most one result."""
         assert self.Person.objects().count() == 0
 
         person1 = self.Person(name="User A", age=20)
@@ -351,8 +348,7 @@ def test_get_multiple_match_raises_multipleobjectsreturned(self):
         assert person == person3
 
     def test_find_array_position(self):
-        """Ensure that query by array position works.
-        """
+        """Ensure that query by array position works."""
 
         class Comment(EmbeddedDocument):
             name = StringField()
@@ -1141,8 +1137,7 @@ class Project(Document):
             assert q == 2
 
     def test_repeated_iteration(self):
-        """Ensure that QuerySet rewinds itself one iteration finishes.
-        """
+        """Ensure that QuerySet rewinds itself one iteration finishes."""
         self.Person(name="Person 1").save()
         self.Person(name="Person 2").save()
 
@@ -1191,8 +1186,7 @@ def __repr__(self):
             assert ".. queryset mid-iteration .." == repr(docs)
 
     def test_regex_query_shortcuts(self):
-        """Ensure that contains, startswith, endswith, etc work.
-        """
+        """Ensure that contains, startswith, endswith, etc work."""
         person = self.Person(name="Guido van Rossum")
         person.save()
 
@@ -1248,8 +1242,7 @@ def test_regex_query_shortcuts(self):
         assert obj == person
 
     def test_not(self):
-        """Ensure that the __not operator works as expected.
-        """
+        """Ensure that the __not operator works as expected."""
         alice = self.Person(name="Alice", age=25)
         alice.save()
 
@@ -1260,8 +1253,7 @@ def test_not(self):
         assert obj is None
 
     def test_filter_chaining(self):
-        """Ensure filters can be chained together.
-        """
+        """Ensure filters can be chained together."""
 
         class Blog(Document):
             id = StringField(primary_key=True)
@@ -1337,8 +1329,7 @@ def assertSequence(self, qs, expected):
             assert qs[i] == expected[i]
 
     def test_ordering(self):
-        """Ensure default ordering is applied and can be overridden.
-        """
+        """Ensure default ordering is applied and can be overridden."""
 
         class BlogPost(Document):
             title = StringField()
@@ -1408,8 +1399,7 @@ class BlogPost(Document):
             assert ORDER_BY_KEY not in q.get_ops()[0][CMD_QUERY_KEY]
 
     def test_no_ordering_for_get(self):
-        """ Ensure that Doc.objects.get doesn't use any ordering.
-        """
+        """Ensure that Doc.objects.get doesn't use any ordering."""
         ORDER_BY_KEY, CMD_QUERY_KEY = get_key_compat(self.mongodb_version)
 
         class BlogPost(Document):
@@ -1485,8 +1475,7 @@ class BlogPost(Document):
         assert result.author is None
 
     def test_find_dict_item(self):
-        """Ensure that DictField items may be found.
-        """
+        """Ensure that DictField items may be found."""
 
         class BlogPost(Document):
             info = DictField()
@@ -1502,8 +1491,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
     def test_exec_js_query(self):
-        """Ensure that queries are properly formed for use in exec_js.
-        """
+        """Ensure that queries are properly formed for use in exec_js."""
 
         class BlogPost(Document):
             hits = IntField()
@@ -1540,8 +1528,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
     def test_exec_js_field_sub(self):
-        """Ensure that field substitutions occur properly in exec_js functions.
-        """
+        """Ensure that field substitutions occur properly in exec_js functions."""
 
         class Comment(EmbeddedDocument):
             content = StringField(db_field="body")
@@ -1597,8 +1584,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
     def test_delete(self):
-        """Ensure that documents are properly deleted from the database.
-        """
+        """Ensure that documents are properly deleted from the database."""
         self.Person(name="User A", age=20).save()
         self.Person(name="User B", age=30).save()
         self.Person(name="User C", age=40).save()
@@ -1612,8 +1598,7 @@ def test_delete(self):
         assert self.Person.objects.count() == 0
 
     def test_reverse_delete_rule_cascade(self):
-        """Ensure cascading deletion of referring documents from the database.
-        """
+        """Ensure cascading deletion of referring documents from the database."""
 
         class BlogPost(Document):
             content = StringField()
@@ -1745,8 +1730,7 @@ class Category(Document):
         assert 0 == Category.objects.count()
 
     def test_reverse_delete_rule_nullify(self):
-        """Ensure nullification of references to deleted documents.
-        """
+        """Ensure nullification of references to deleted documents."""
 
         class Category(Document):
             name = StringField()
@@ -1842,8 +1826,7 @@ class BlogPost(AbstractBlogPost):
             self.Person.objects.delete()
 
     def test_reverse_delete_rule_pull(self):
-        """Ensure pulling of references to deleted documents.
-        """
+        """Ensure pulling of references to deleted documents."""
 
         class BlogPost(Document):
             content = StringField()
@@ -1918,8 +1901,7 @@ class Log(Document):
         assert 8 == Log.objects.count()
 
     def test_delete_with_limit_handles_delete_rules(self):
-        """Ensure cascading deletion of referring documents from the database.
-        """
+        """Ensure cascading deletion of referring documents from the database."""
 
         class BlogPost(Document):
             content = StringField()
@@ -1951,8 +1933,7 @@ def test_delete_edge_case_with_write_concern_0_return_None(self):
         assert del_result is None
 
     def test_reference_field_find(self):
-        """Ensure cascading deletion of referring documents from the database.
-        """
+        """Ensure cascading deletion of referring documents from the database."""
 
         class BlogPost(Document):
             content = StringField()
@@ -1973,8 +1954,7 @@ class BlogPost(Document):
         assert 1 == BlogPost.objects(author__in=["%s" % me.pk]).count()
 
     def test_reference_field_find_dbref(self):
-        """Ensure cascading deletion of referring documents from the database.
-        """
+        """Ensure cascading deletion of referring documents from the database."""
 
         class BlogPost(Document):
             content = StringField()
@@ -2058,8 +2038,7 @@ class BlogPost(Document):
             BlogPost.objects.update_one(inc__review=0.1)  # test with floats
 
     def test_update_listfield_operator(self):
-        """Ensure that atomic updates work properly.
-        """
+        """Ensure that atomic updates work properly."""
 
         class BlogPost(Document):
             tags = ListField(StringField())
@@ -2107,8 +2086,7 @@ class BlogPost(Document):
         assert "title" not in pymongo_doc
 
     def test_update_push_with_position(self):
-        """Ensure that the 'push' update with position works properly.
-        """
+        """Ensure that the 'push' update with position works properly."""
 
         class BlogPost(Document):
             slug = StringField()
@@ -2133,8 +2111,7 @@ class BlogPost(Document):
         assert post.tags == ["scala", "mongodb", "python", "java"]
 
     def test_update_push_list_of_list(self):
-        """Ensure that the 'push' update operation works in the list of list
-        """
+        """Ensure that the 'push' update operation works in the list of list"""
 
         class BlogPost(Document):
             slug = StringField()
@@ -2149,8 +2126,7 @@ class BlogPost(Document):
         assert post.tags == [["value1", 123]]
 
     def test_update_push_and_pull_add_to_set(self):
-        """Ensure that the 'pull' update operation works correctly.
-        """
+        """Ensure that the 'pull' update operation works correctly."""
 
         class BlogPost(Document):
             slug = StringField()
@@ -2259,8 +2235,7 @@ class Site(Document):
             )
 
     def test_pull_from_nested_embedded_using_in_nin(self):
-        """Ensure that the 'pull' update operation works on embedded documents using 'in' and 'nin' operators.
-        """
+        """Ensure that the 'pull' update operation works on embedded documents using 'in' and 'nin' operators."""
 
         class User(EmbeddedDocument):
             name = StringField()
@@ -2491,8 +2466,7 @@ class Doc(Document):
         assert doc.pk == doc.embedded[0]._instance.pk
 
     def test_order_by(self):
-        """Ensure that QuerySets may be ordered.
-        """
+        """Ensure that QuerySets may be ordered."""
         self.Person(name="User B", age=40).save()
         self.Person(name="User A", age=20).save()
         self.Person(name="User C", age=30).save()
@@ -2560,8 +2534,7 @@ class BlogPost(Document):
         self.assertSequence(qs, expected)
 
     def test_order_by_chaining(self):
-        """Ensure that an order_by query chains properly and allows .only()
-        """
+        """Ensure that an order_by query chains properly and allows .only()"""
         self.Person(name="User B", age=40).save()
         self.Person(name="User A", age=20).save()
         self.Person(name="User C", age=30).save()
@@ -2635,8 +2608,7 @@ class User(Document):
                 assert op[CMD_QUERY_KEY][COMMENT_KEY] == "looking for an adult"
 
     def test_map_reduce(self):
-        """Ensure map/reduce is both mapping and reducing.
-        """
+        """Ensure map/reduce is both mapping and reducing."""
 
         class BlogPost(Document):
             title = StringField()
@@ -2988,8 +2960,7 @@ class Link(Document):
         Link.drop_collection()
 
     def test_item_frequencies(self):
-        """Ensure that item frequencies are properly generated from lists.
-        """
+        """Ensure that item frequencies are properly generated from lists."""
 
         class BlogPost(Document):
             hits = IntField()
@@ -3057,8 +3028,7 @@ def test_assertions(f):
         BlogPost.drop_collection()
 
     def test_item_frequencies_on_embedded(self):
-        """Ensure that item frequencies are properly generated from lists.
-        """
+        """Ensure that item frequencies are properly generated from lists."""
 
         class Phone(EmbeddedDocument):
             number = StringField()
@@ -3214,8 +3184,7 @@ class Test(Document):
         assert freqs == {1: 50.0 / 70, 2: 20.0 / 70}
 
     def test_average(self):
-        """Ensure that field can be averaged correctly.
-        """
+        """Ensure that field can be averaged correctly."""
         self.Person(name="person", age=0).save()
         assert int(self.Person.objects.average("age")) == 0
 
@@ -3255,8 +3224,7 @@ def test_average(self):
         assert self.Person.objects.filter(age__gte=50).average("age") == avg
 
     def test_sum(self):
-        """Ensure that field can be summed over correctly.
-        """
+        """Ensure that field can be summed over correctly."""
         ages = [23, 54, 12, 94, 27]
         for i, age in enumerate(ages):
             self.Person(name="test%s" % i, age=age).save()
@@ -3406,8 +3374,7 @@ class Doc(Document):
         assert Doc.objects.sum("values") == 1360
 
     def test_distinct(self):
-        """Ensure that the QuerySet.distinct method works.
-        """
+        """Ensure that the QuerySet.distinct method works."""
         self.Person(name="Mr Orange", age=20).save()
         self.Person(name="Mr White", age=20).save()
         self.Person(name="Mr Orange", age=30).save()
@@ -3547,8 +3514,7 @@ class Bar(Document):
         assert Foo.objects.distinct("bar") == [bar]
 
     def test_distinct_handles_db_field(self):
-        """Ensure that distinct resolves field name to db_field as expected.
-        """
+        """Ensure that distinct resolves field name to db_field as expected."""
 
         class Product(Document):
             product_id = IntField(db_field="pid")
@@ -3644,8 +3610,7 @@ class Foo(Document):
         assert Foo.objects.distinct("bar_lst") == [bar_1, bar_2]
 
     def test_custom_manager(self):
-        """Ensure that custom QuerySetManager instances work as expected.
-        """
+        """Ensure that custom QuerySetManager instances work as expected."""
 
         class BlogPost(Document):
             tags = ListField(StringField())
@@ -3746,8 +3711,7 @@ def objects(klass, queryset):
         assert 1 == Bar.objects.count()
 
     def test_query_value_conversion(self):
-        """Ensure that query values are properly converted when necessary.
-        """
+        """Ensure that query values are properly converted when necessary."""
 
         class BlogPost(Document):
             author = ReferenceField(self.Person)
@@ -3773,8 +3737,7 @@ class BlogPost(Document):
         BlogPost.drop_collection()
 
     def test_update_value_conversion(self):
-        """Ensure that values used in updates are converted before use.
-        """
+        """Ensure that values used in updates are converted before use."""
 
         class Group(Document):
             members = ListField(ReferenceField(self.Person))
@@ -3799,8 +3762,7 @@ class Group(Document):
         Group.drop_collection()
 
     def test_bulk(self):
-        """Ensure bulk querying by object id returns a proper dict.
-        """
+        """Ensure bulk querying by object id returns a proper dict."""
 
         class BlogPost(Document):
             title = StringField()
@@ -3838,8 +3800,7 @@ def tearDown(self):
         self.Person.drop_collection()
 
     def test_custom_querysets(self):
-        """Ensure that custom QuerySet classes may be used.
-        """
+        """Ensure that custom QuerySet classes may be used."""
 
         class CustomQuerySet(QuerySet):
             def not_empty(self):
@@ -3859,8 +3820,7 @@ class Post(Document):
         Post.drop_collection()
 
     def test_custom_querysets_set_manager_directly(self):
-        """Ensure that custom QuerySet classes may be used.
-        """
+        """Ensure that custom QuerySet classes may be used."""
 
         class CustomQuerySet(QuerySet):
             def not_empty(self):
@@ -3883,8 +3843,7 @@ class Post(Document):
         Post.drop_collection()
 
     def test_custom_querysets_managers_directly(self):
-        """Ensure that custom QuerySet classes may be used.
-        """
+        """Ensure that custom QuerySet classes may be used."""
 
         class CustomQuerySetManager(QuerySetManager):
             @staticmethod
@@ -3905,8 +3864,7 @@ class Post(Document):
         Post.drop_collection()
 
     def test_custom_querysets_inherited(self):
-        """Ensure that custom QuerySet classes may be used.
-        """
+        """Ensure that custom QuerySet classes may be used."""
 
         class CustomQuerySet(QuerySet):
             def not_empty(self):
@@ -3928,8 +3886,7 @@ class Post(Base):
         Post.drop_collection()
 
     def test_custom_querysets_inherited_direct(self):
-        """Ensure that custom QuerySet classes may be used.
-        """
+        """Ensure that custom QuerySet classes may be used."""
 
         class CustomQuerySet(QuerySet):
             def not_empty(self):
@@ -3990,8 +3947,7 @@ class A(Document):
         assert A.objects(b=[{"c": "c"}]).count() == 0
 
     def test_call_after_limits_set(self):
-        """Ensure that re-filtering after slicing works
-        """
+        """Ensure that re-filtering after slicing works"""
 
         class Post(Document):
             title = StringField()
@@ -4007,8 +3963,7 @@ class Post(Document):
         Post.drop_collection()
 
     def test_order_then_filter(self):
-        """Ensure that ordering still works after filtering.
-        """
+        """Ensure that ordering still works after filtering."""
 
         class Number(Document):
             n = IntField()
@@ -4025,8 +3980,7 @@ class Number(Document):
         Number.drop_collection()
 
     def test_clone(self):
-        """Ensure that cloning clones complex querysets
-        """
+        """Ensure that cloning clones complex querysets"""
 
         class Number(Document):
             n = IntField()
@@ -4055,8 +4009,7 @@ class Number(Document):
         Number.drop_collection()
 
     def test_clone_retains_settings(self):
-        """Ensure that cloning retains the read_preference and read_concern
-        """
+        """Ensure that cloning retains the read_preference and read_concern"""
 
         class Number(Document):
             n = IntField()
@@ -4081,8 +4034,7 @@ class Number(Document):
         Number.drop_collection()
 
     def test_using(self):
-        """Ensure that switching databases for a queryset is possible
-        """
+        """Ensure that switching databases for a queryset is possible"""
 
         class Number2(Document):
             n = IntField()
@@ -4134,8 +4086,7 @@ class Number(Document):
         Number.drop_collection()
 
     def test_order_works_with_primary(self):
-        """Ensure that order_by and primary work.
-        """
+        """Ensure that order_by and primary work."""
 
         class Number(Document):
             n = IntField(primary_key=True)
@@ -4154,8 +4105,7 @@ class Number(Document):
         Number.drop_collection()
 
     def test_ensure_index(self):
-        """Ensure that manual creation of indexes works.
-        """
+        """Ensure that manual creation of indexes works."""
 
         class Comment(Document):
             message = StringField()
@@ -4171,8 +4121,7 @@ class Comment(Document):
         assert ([("_cls", 1), ("message", 1)], False, False) in info
 
     def test_where(self):
-        """Ensure that where clauses work.
-        """
+        """Ensure that where clauses work."""
 
         class IntPair(Document):
             fielda = IntField()
@@ -4451,8 +4400,7 @@ class SettingValue(Document):
         assert list(val) == [("test", "test value")]
 
     def test_scalar_cursor_behaviour(self):
-        """Ensure that a query returns a valid set of results.
-        """
+        """Ensure that a query returns a valid set of results."""
         person1 = self.Person(name="User A", age=20)
         person1.save()
         person2 = self.Person(name="User B", age=30)
@@ -4669,8 +4617,7 @@ class Bar(Document):
         assert [b3] == ak
 
     def test_upsert_includes_cls(self):
-        """Upserts should include _cls information for inheritable classes
-        """
+        """Upserts should include _cls information for inheritable classes"""
 
         class Test(Document):
             test = StringField()
@@ -5366,8 +5313,7 @@ class C(B):
             assert obj.__class__ == C
 
     def test_query_generic_embedded_document(self):
-        """Ensure that querying sub field on generic_embedded_field works
-        """
+        """Ensure that querying sub field on generic_embedded_field works"""
 
         class A(EmbeddedDocument):
             a_name = StringField()
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index f5d248af3..872a9a5d5 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -12,8 +12,7 @@ def setUp(self):
         connect(db="mongoenginetest")
 
     def test_transform_query(self):
-        """Ensure that the _transform_query function operates correctly.
-        """
+        """Ensure that the _transform_query function operates correctly."""
         assert transform.query(name="test", age=30) == {"name": "test", "age": 30}
         assert transform.query(age__lt=30) == {"age": {"$lt": 30}}
         assert transform.query(age__gt=20, age__lt=50) == {
@@ -88,8 +87,7 @@ class BlogPost(Document):
         assert update == {"$set": {"tags": ["mongo", "db"]}}
 
     def test_query_field_name(self):
-        """Ensure that the correct field name is used when querying.
-        """
+        """Ensure that the correct field name is used when querying."""
 
         class Comment(EmbeddedDocument):
             content = StringField(db_field="commentContent")
diff --git a/tests/queryset/test_visitor.py b/tests/queryset/test_visitor.py
index 81e0f253f..5fb94901f 100644
--- a/tests/queryset/test_visitor.py
+++ b/tests/queryset/test_visitor.py
@@ -23,8 +23,7 @@ class Person(Document):
         self.Person = Person
 
     def test_empty_q(self):
-        """Ensure that empty Q objects won't hurt.
-        """
+        """Ensure that empty Q objects won't hurt."""
         q1 = Q()
         q2 = Q(age__gte=18)
         q3 = Q()
@@ -58,8 +57,7 @@ class Post(Document):
         assert Post.objects.filter(Q(created_user=user)).count() == 1
 
     def test_and_combination(self):
-        """Ensure that Q-objects correctly AND together.
-        """
+        """Ensure that Q-objects correctly AND together."""
 
         class TestDoc(Document):
             x = IntField()
@@ -89,8 +87,7 @@ class TestDoc(Document):
         assert query.to_query(TestDoc) == mongo_query
 
     def test_or_combination(self):
-        """Ensure that Q-objects correctly OR together.
-        """
+        """Ensure that Q-objects correctly OR together."""
 
         class TestDoc(Document):
             x = IntField()
@@ -101,8 +98,7 @@ class TestDoc(Document):
         assert query == {"$or": [{"x": {"$lt": 3}}, {"x": {"$gt": 7}}]}
 
     def test_and_or_combination(self):
-        """Ensure that Q-objects handle ANDing ORed components.
-        """
+        """Ensure that Q-objects handle ANDing ORed components."""
 
         class TestDoc(Document):
             x = IntField()
@@ -136,8 +132,7 @@ class TestDoc(Document):
         assert 2 == TestDoc.objects(q1 & q2).count()
 
     def test_or_and_or_combination(self):
-        """Ensure that Q-objects handle ORing ANDed ORed components. :)
-        """
+        """Ensure that Q-objects handle ORing ANDed ORed components. :)"""
 
         class TestDoc(Document):
             x = IntField()
@@ -208,8 +203,7 @@ class TestDoc(Document):
         assert test.count() == 3
 
     def test_q(self):
-        """Ensure that Q objects may be used to query for documents.
-        """
+        """Ensure that Q objects may be used to query for documents."""
 
         class BlogPost(Document):
             title = StringField()
@@ -286,8 +280,7 @@ class BlogPost(Document):
             self.Person.objects.filter("user1")
 
     def test_q_regex(self):
-        """Ensure that Q objects can be queried using regexes.
-        """
+        """Ensure that Q objects can be queried using regexes."""
         person = self.Person(name="Guido van Rossum")
         person.save()
 
@@ -320,8 +313,7 @@ def test_q_repr(self):
         )
 
     def test_q_lists(self):
-        """Ensure that Q objects query ListFields correctly.
-        """
+        """Ensure that Q objects query ListFields correctly."""
 
         class BlogPost(Document):
             tags = ListField(StringField())
diff --git a/tests/test_connection.py b/tests/test_connection.py
index b57d45978..ab88ce0c3 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -194,14 +194,12 @@ def test_connect_passes_silently_connect_multiple_times_with_same_config(self):
         assert len(mongoengine.connection._connections) == 3
 
     def test_connect_with_invalid_db_name(self):
-        """Ensure that connect() method fails fast if db name is invalid
-        """
+        """Ensure that connect() method fails fast if db name is invalid"""
         with pytest.raises(InvalidName):
             connect("mongomock://localhost")
 
     def test_connect_with_db_name_external(self):
-        """Ensure that connect() works if db name is $external
-        """
+        """Ensure that connect() works if db name is $external"""
         """Ensure that the connect() method works properly."""
         connect("$external")
 
@@ -217,16 +215,14 @@ def test_connect_with_db_name_external(self):
         assert isinstance(conn, pymongo.mongo_client.MongoClient)
 
     def test_connect_with_invalid_db_name_type(self):
-        """Ensure that connect() method fails fast if db name has invalid type
-        """
+        """Ensure that connect() method fails fast if db name has invalid type"""
         with pytest.raises(TypeError):
             non_string_db_name = ["e. g. list instead of a string"]
             connect(non_string_db_name)
 
     @require_mongomock
     def test_connect_in_mocking(self):
-        """Ensure that the connect() method works properly in mocking.
-        """
+        """Ensure that the connect() method works properly in mocking."""
         connect("mongoenginetest", host="mongomock://localhost")
         conn = get_connection()
         assert isinstance(conn, mongomock.MongoClient)
@@ -270,8 +266,7 @@ def test_connect_in_mocking(self):
 
     @require_mongomock
     def test_default_database_with_mocking(self):
-        """Ensure that the default database is correctly set when using mongomock.
-        """
+        """Ensure that the default database is correctly set when using mongomock."""
         disconnect_all()
 
         class SomeDocument(Document):
@@ -452,8 +447,7 @@ def test_disconnect_all_silently_pass_if_no_connection_exist(self):
         disconnect_all()
 
     def test_sharing_connections(self):
-        """Ensure that connections are shared when the connection settings are exactly the same
-        """
+        """Ensure that connections are shared when the connection settings are exactly the same"""
         connect("mongoenginetests", alias="testdb1")
         expected_connection = get_connection("testdb1")
 
@@ -564,8 +558,7 @@ def test_connect_uri_with_authsource(self):
         authd_conn.admin.system.users.delete_many({})
 
     def test_register_connection(self):
-        """Ensure that connections with different aliases may be registered.
-        """
+        """Ensure that connections with different aliases may be registered."""
         register_connection("testdb", "mongoenginetest2")
 
         with pytest.raises(ConnectionFailure):
@@ -578,8 +571,7 @@ def test_register_connection(self):
         assert db.name == "mongoenginetest2"
 
     def test_register_connection_defaults(self):
-        """Ensure that defaults are used when the host and port are None.
-        """
+        """Ensure that defaults are used when the host and port are None."""
         register_connection("testdb", "mongoenginetest", host=None, port=None)
 
         conn = get_connection("testdb")
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index a4864c403..6599c7f2c 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -117,8 +117,7 @@ class Group(Document):
         assert 1 == Group.objects.count()
 
     def test_no_dereference_context_manager_object_id(self):
-        """Ensure that DBRef items in ListFields aren't dereferenced.
-        """
+        """Ensure that DBRef items in ListFields aren't dereferenced."""
         connect("mongoenginetest")
 
         class User(Document):
@@ -155,8 +154,7 @@ class Group(Document):
         assert isinstance(group.generic, User)
 
     def test_no_dereference_context_manager_dbref(self):
-        """Ensure that DBRef items in ListFields aren't dereferenced.
-        """
+        """Ensure that DBRef items in ListFields aren't dereferenced."""
         connect("mongoenginetest")
 
         class User(Document):
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index c40cc0bd4..88ea00330 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -16,8 +16,7 @@ def tearDownClass(cls):
         cls.db.drop_database("mongoenginetest")
 
     def test_list_item_dereference(self):
-        """Ensure that DBRef items in ListFields are dereferenced.
-        """
+        """Ensure that DBRef items in ListFields are dereferenced."""
 
         class User(Document):
             name = StringField()
@@ -75,8 +74,7 @@ class Group(Document):
         Group.drop_collection()
 
     def test_list_item_dereference_dref_false(self):
-        """Ensure that DBRef items in ListFields are dereferenced.
-        """
+        """Ensure that DBRef items in ListFields are dereferenced."""
 
         class User(Document):
             name = StringField()
@@ -132,8 +130,7 @@ class Group(Document):
                 assert q == 2
 
     def test_list_item_dereference_orphan_dbref(self):
-        """Ensure that orphan DBRef items in ListFields are dereferenced.
-        """
+        """Ensure that orphan DBRef items in ListFields are dereferenced."""
 
         class User(Document):
             name = StringField()
@@ -176,8 +173,7 @@ class Group(Document):
         Group.drop_collection()
 
     def test_list_item_dereference_dref_false_stores_as_type(self):
-        """Ensure that DBRef items are stored as their type
-        """
+        """Ensure that DBRef items are stored as their type"""
 
         class User(Document):
             my_id = IntField(primary_key=True)
@@ -198,8 +194,7 @@ class Group(Document):
         assert group.members == [user]
 
     def test_handle_old_style_references(self):
-        """Ensure that DBRef items in ListFields are dereferenced.
-        """
+        """Ensure that DBRef items in ListFields are dereferenced."""
 
         class User(Document):
             name = StringField()
@@ -232,8 +227,7 @@ class Group(Document):
         assert group.members[-1].name == "String!"
 
     def test_migrate_references(self):
-        """Example of migrating ReferenceField storage
-        """
+        """Example of migrating ReferenceField storage"""
 
         # Create some sample data
         class User(Document):
@@ -278,8 +272,7 @@ class Group(Document):
         assert isinstance(raw_data["members"][0], ObjectId)
 
     def test_recursive_reference(self):
-        """Ensure that ReferenceFields can reference their own documents.
-        """
+        """Ensure that ReferenceFields can reference their own documents."""
 
         class Employee(Document):
             name = StringField()
@@ -402,8 +395,7 @@ def __repr__(self):
         assert "[<Person: Mother>, <Person: Daughter>]" == "%s" % Person.objects()
 
     def test_circular_reference_on_self(self):
-        """Ensure you can handle circular references
-        """
+        """Ensure you can handle circular references"""
 
         class Person(Document):
             name = StringField()
@@ -430,8 +422,7 @@ def __repr__(self):
         assert "[<Person: Mother>, <Person: Daughter>]" == "%s" % Person.objects()
 
     def test_circular_tree_reference(self):
-        """Ensure you can handle circular references with more than one level
-        """
+        """Ensure you can handle circular references with more than one level"""
 
         class Other(EmbeddedDocument):
             name = StringField()
@@ -557,8 +548,7 @@ class Group(Document):
                     assert "User" in m.__class__.__name__
 
     def test_generic_reference_orphan_dbref(self):
-        """Ensure that generic orphan DBRef items in ListFields are dereferenced.
-        """
+        """Ensure that generic orphan DBRef items in ListFields are dereferenced."""
 
         class UserA(Document):
             name = StringField()
@@ -1168,8 +1158,7 @@ class Message(Document):
         assert msg.author.name == "new-name"
 
     def test_list_lookup_not_checked_in_map(self):
-        """Ensure we dereference list data correctly
-        """
+        """Ensure we dereference list data correctly"""
 
         class Comment(Document):
             id = IntField(primary_key=True)
@@ -1191,8 +1180,7 @@ class Message(Document):
         assert 1 == msg.comments[1].id
 
     def test_list_item_dereference_dref_false_save_doesnt_cause_extra_queries(self):
-        """Ensure that DBRef items in ListFields are dereferenced.
-        """
+        """Ensure that DBRef items in ListFields are dereferenced."""
 
         class User(Document):
             name = StringField()
@@ -1221,8 +1209,7 @@ class Group(Document):
             assert q == 2
 
     def test_list_item_dereference_dref_true_save_doesnt_cause_extra_queries(self):
-        """Ensure that DBRef items in ListFields are dereferenced.
-        """
+        """Ensure that DBRef items in ListFields are dereferenced."""
 
         class User(Document):
             name = StringField()
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index 5d83da002..1fdfcb205 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -22,8 +22,7 @@ def tearDown(self):
         mongoengine.connection._dbs = {}
 
     def test_replicaset_uri_passes_read_preference(self):
-        """Requires a replica set called "rs" on port 27017
-        """
+        """Requires a replica set called "rs" on port 27017"""
         try:
             conn = mongoengine.connect(
                 db="mongoenginetest",

From eabb8f60f55f2fd48afdae0bfe2764cde0ec921a Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Tue, 8 Dec 2020 23:14:33 +0100
Subject: [PATCH 1130/1519] autoformat with pyupgrade

---
 .pre-commit-config.yaml                      |   5 +
 docs/conf.py                                 |   4 +-
 mongoengine/base/datastructures.py           |  14 +--
 mongoengine/base/document.py                 |  23 ++--
 mongoengine/base/fields.py                   |   8 +-
 mongoengine/base/metaclasses.py              |   4 +-
 mongoengine/connection.py                    |   8 +-
 mongoengine/dereference.py                   |   4 +-
 mongoengine/errors.py                        |   8 +-
 mongoengine/fields.py                        |  24 ++--
 mongoengine/queryset/base.py                 |  12 +-
 tests/document/test_class_methods.py         |   6 +-
 tests/document/test_delta.py                 |   2 +-
 tests/document/test_dynamic.py               |  12 +-
 tests/document/test_inheritance.py           |   4 +-
 tests/document/test_instance.py              |  26 ++---
 tests/fields/test_binary_field.py            |  12 +-
 tests/fields/test_cached_reference_field.py  |  12 +-
 tests/fields/test_email_field.py             |   8 +-
 tests/fields/test_embedded_document_field.py |   8 +-
 tests/fields/test_fields.py                  |  26 ++---
 tests/fields/test_file_field.py              |  40 ++++---
 tests/fields/test_geo_fields.py              |   2 +-
 tests/fields/test_map_field.py               |   6 +-
 tests/fields/test_reference_field.py         |   2 +-
 tests/fields/test_url_field.py               |   4 +-
 tests/fixtures.py                            |   2 +-
 tests/queryset/test_geo.py                   |   4 +-
 tests/queryset/test_pickable.py              |   2 +-
 tests/queryset/test_queryset.py              | 111 ++++++++++---------
 tests/queryset/test_queryset_aggregation.py  |   2 +-
 tests/queryset/test_transform.py             |   2 +-
 tests/test_datastructures.py                 |   2 +-
 tests/test_dereference.py                    |   2 +-
 tests/test_utils.py                          |   6 +-
 tests/utils.py                               |   2 +-
 36 files changed, 207 insertions(+), 212 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index cb68249a6..025e3b9ea 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,3 +10,8 @@ repos:
         - id: flake8
           additional_dependencies:
             - flake8-import-order
+    - repo: https://github.com/asottile/pyupgrade
+      rev: v2.7.4
+      hooks:
+        - id: pyupgrade
+          args: [--py36-plus]
\ No newline at end of file
diff --git a/docs/conf.py b/docs/conf.py
index fdb5b61d8..299959ee3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -41,8 +41,8 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"MongoEngine"
-copyright = u"2009, MongoEngine Authors"
+project = "MongoEngine"
+copyright = "2009, MongoEngine Authors"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 2a8fde6dd..0f2f8a494 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -67,11 +67,11 @@ def __getitem__(self, key):
         if isinstance(value, EmbeddedDocument) and value._instance is None:
             value._instance = self._instance
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
-            value = BaseDict(value, None, "{}.{}".format(self._name, key))
+            value = BaseDict(value, None, f"{self._name}.{key}")
             super().__setitem__(key, value)
             value._instance = self._instance
         elif isinstance(value, list) and not isinstance(value, BaseList):
-            value = BaseList(value, None, "{}.{}".format(self._name, key))
+            value = BaseList(value, None, f"{self._name}.{key}")
             super().__setitem__(key, value)
             value._instance = self._instance
         return value
@@ -97,7 +97,7 @@ def __setstate__(self, state):
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, "_mark_as_changed"):
             if key:
-                self._instance._mark_as_changed("{}.{}".format(self._name, key))
+                self._instance._mark_as_changed(f"{self._name}.{key}")
             else:
                 self._instance._mark_as_changed(self._name)
 
@@ -133,12 +133,12 @@ def __getitem__(self, key):
             value._instance = self._instance
         elif isinstance(value, dict) and not isinstance(value, BaseDict):
             # Replace dict by BaseDict
-            value = BaseDict(value, None, "{}.{}".format(self._name, key))
+            value = BaseDict(value, None, f"{self._name}.{key}")
             super().__setitem__(key, value)
             value._instance = self._instance
         elif isinstance(value, list) and not isinstance(value, BaseList):
             # Replace list by BaseList
-            value = BaseList(value, None, "{}.{}".format(self._name, key))
+            value = BaseList(value, None, f"{self._name}.{key}")
             super().__setitem__(key, value)
             value._instance = self._instance
         return value
@@ -429,7 +429,7 @@ class SpecificStrictDict(cls):
 
                 def __repr__(self):
                     return "{%s}" % ", ".join(
-                        '"{!s}": {!r}'.format(k, v) for k, v in self.items()
+                        f'"{k!s}": {v!r}' for k, v in self.items()
                     )
 
             cls._classes[allowed_keys] = SpecificStrictDict
@@ -472,4 +472,4 @@ def __getattr__(self, name):
             raise AttributeError()
 
     def __repr__(self):
-        return "<LazyReference({}, {!r})>".format(self.document_type, self.pk)
+        return f"<LazyReference({self.document_type}, {self.pk!r})>"
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 32ad0adc0..45acfa3d3 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -275,7 +275,7 @@ def __repr__(self):
         except (UnicodeEncodeError, UnicodeDecodeError):
             u = "[Bad Unicode data]"
         repr_type = str if u is None else type(u)
-        return repr_type("<{}: {}>".format(self.__class__.__name__, u))
+        return repr_type(f"<{self.__class__.__name__}: {u}>")
 
     def __str__(self):
         # TODO this could be simpler?
@@ -431,7 +431,7 @@ def validate(self, clean=True):
                 pk = self.pk
             elif self._instance and hasattr(self._instance, "pk"):
                 pk = self._instance.pk
-            message = "ValidationError ({}:{}) ".format(self._class_name, pk)
+            message = f"ValidationError ({self._class_name}:{pk}) "
             raise ValidationError(message, errors=errors)
 
     def to_json(self, *args, **kwargs):
@@ -504,7 +504,7 @@ def _mark_as_changed(self, key):
         if "." in key:
             key, rest = key.split(".", 1)
             key = self._db_field_map.get(key, key)
-            key = "{}.{}".format(key, rest)
+            key = f"{key}.{rest}"
         else:
             key = self._db_field_map.get(key, key)
 
@@ -600,7 +600,7 @@ def _nestable_types_changed_fields(changed_fields, base_key, data):
             iterator = data.items()
 
         for index_or_key, value in iterator:
-            item_key = "{}{}.".format(base_key, index_or_key)
+            item_key = f"{base_key}{index_or_key}."
             # don't check anything lower if this key is already marked
             # as changed.
             if item_key[:-1] in changed_fields:
@@ -608,7 +608,7 @@ def _nestable_types_changed_fields(changed_fields, base_key, data):
 
             if hasattr(value, "_get_changed_fields"):
                 changed = value._get_changed_fields()
-                changed_fields += ["{}{}".format(item_key, k) for k in changed if k]
+                changed_fields += [f"{item_key}{k}" for k in changed if k]
             elif isinstance(value, (list, tuple, dict)):
                 BaseDocument._nestable_types_changed_fields(
                     changed_fields, item_key, value
@@ -640,7 +640,7 @@ def _get_changed_fields(self):
             if isinstance(data, EmbeddedDocument):
                 # Find all embedded fields that have been changed
                 changed = data._get_changed_fields()
-                changed_fields += ["{}{}".format(key, k) for k in changed if k]
+                changed_fields += [f"{key}{k}" for k in changed if k]
             elif isinstance(data, (list, tuple, dict)):
                 if hasattr(field, "field") and isinstance(
                     field.field, (ReferenceField, GenericReferenceField)
@@ -792,9 +792,7 @@ def _from_son(cls, son, _auto_dereference=True, created=False):
                     errors_dict[field_name] = e
 
         if errors_dict:
-            errors = "\n".join(
-                ["Field '{}' - {}".format(k, v) for k, v in errors_dict.items()]
-            )
+            errors = "\n".join([f"Field '{k}' - {v}" for k, v in errors_dict.items()])
             msg = "Invalid data to create a `{}` instance.\n{}".format(
                 cls._class_name,
                 errors,
@@ -965,10 +963,7 @@ def _unique_with_indexes(cls, namespace=""):
                     unique_fields += unique_with
 
                 # Add the new index to the list
-                fields = [
-                    ("{}{}".format(namespace, f), pymongo.ASCENDING)
-                    for f in unique_fields
-                ]
+                fields = [(f"{namespace}{f}", pymongo.ASCENDING) for f in unique_fields]
                 index = {"fields": fields, "unique": True, "sparse": sparse}
                 unique_indexes.append(index)
 
@@ -1024,7 +1019,7 @@ def _geo_indices(cls, inspected=None, parent_field=None):
             elif field._geo_index:
                 field_name = field.db_field
                 if parent_field:
-                    field_name = "{}.{}".format(parent_field, field_name)
+                    field_name = f"{parent_field}.{field_name}"
                 geo_indices.append({"fields": [(field_name, field._geo_index)]})
 
         return geo_indices
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 8df3d089a..61dde5d2f 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -40,7 +40,7 @@ def __init__(
         choices=None,
         null=False,
         sparse=False,
-        **kwargs
+        **kwargs,
     ):
         """
         :param db_field: The database field to store this field in
@@ -465,9 +465,7 @@ def validate(self, value):
 
             if errors:
                 field_class = self.field.__class__.__name__
-                self.error(
-                    "Invalid {} item ({})".format(field_class, value), errors=errors
-                )
+                self.error(f"Invalid {field_class} item ({value})", errors=errors)
         # Don't allow empty values if required
         if self.required and not value:
             self.error("Field is required and cannot be empty")
@@ -537,7 +535,7 @@ def validate(self, value):
         if isinstance(value, dict):
             if set(value.keys()) == {"type", "coordinates"}:
                 if value["type"] != self._type:
-                    self.error('{} type must be "{}"'.format(self._name, self._type))
+                    self.error(f'{self._name} type must be "{self._type}"')
                 return self.validate(value["coordinates"])
             else:
                 self.error(
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index b4479b976..67a5f112e 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -439,8 +439,8 @@ def get_auto_id_names(mcs, new_class):
 
         id_basename, id_db_basename, i = ("auto_id", "_auto_id", 0)
         for i in itertools.count():
-            id_name = "{}_{}".format(id_basename, i)
-            id_db_name = "{}_{}".format(id_db_basename, i)
+            id_name = f"{id_basename}_{i}"
+            id_db_name = f"{id_db_basename}_{i}"
             if id_name not in existing_fields and id_db_name not in existing_db_fields:
                 return id_name, id_db_name
 
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 9253d5564..f181cf612 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -54,7 +54,7 @@ def _get_connection_settings(
     password=None,
     authentication_source=None,
     authentication_mechanism=None,
-    **kwargs
+    **kwargs,
 ):
     """Get the connection settings as a dict
 
@@ -177,7 +177,7 @@ def register_connection(
     password=None,
     authentication_source=None,
     authentication_mechanism=None,
-    **kwargs
+    **kwargs,
 ):
     """Register the connection settings.
 
@@ -210,7 +210,7 @@ def register_connection(
         password=password,
         authentication_source=authentication_source,
         authentication_mechanism=authentication_mechanism,
-        **kwargs
+        **kwargs,
     )
     _connection_settings[alias] = conn_settings
 
@@ -313,7 +313,7 @@ def _create_connection(alias, connection_class, **connection_settings):
     try:
         return connection_class(**connection_settings)
     except Exception as e:
-        raise ConnectionFailure("Cannot connect to database {} :\n{}".format(alias, e))
+        raise ConnectionFailure(f"Cannot connect to database {alias} :\n{e}")
 
 
 def _find_existing_connection(connection_settings):
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index a89bc15aa..3cd200ea5 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -271,12 +271,12 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                             (v["_ref"].collection, v["_ref"].id), v
                         )
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                        item_name = "{}.{}.{}".format(name, k, field_name)
+                        item_name = f"{name}.{k}.{field_name}"
                         data[k]._data[field_name] = self._attach_objects(
                             v, depth, instance=instance, name=item_name
                         )
             elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
-                item_name = "{}.{}".format(name, k) if name else name
+                item_name = f"{name}.{k}" if name else name
                 data[k] = self._attach_objects(
                     v, depth - 1, instance=instance, name=item_name
                 )
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 95564ff9d..2b3d2014f 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -94,7 +94,7 @@ def __str__(self):
         return str(self.message)
 
     def __repr__(self):
-        return "{}({},)".format(self.__class__.__name__, self.message)
+        return f"{self.__class__.__name__}({self.message},)"
 
     def __getattribute__(self, name):
         message = super().__getattribute__(name)
@@ -102,7 +102,7 @@ def __getattribute__(self, name):
             if self.field_name:
                 message = "%s" % message
             if self.errors:
-                message = "{}({})".format(message, self._format_errors())
+                message = f"{message}({self._format_errors()})"
         return message
 
     def _get_message(self):
@@ -147,13 +147,13 @@ def generate_key(value, prefix=""):
             elif isinstance(value, dict):
                 value = " ".join([generate_key(v, k) for k, v in value.items()])
 
-            results = "{}.{}".format(prefix, value) if prefix else value
+            results = f"{prefix}.{value}" if prefix else value
             return results
 
         error_dict = defaultdict(list)
         for k, v in self.to_dict().items():
             error_dict[generate_key(v)].append(k)
-        return " ".join(["{}: {}".format(k, v) for k, v in error_dict.items()])
+        return " ".join([f"{k}: {v}" for k, v in error_dict.items()])
 
 
 class DeprecatedError(Exception):
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 4ef5dafc4..f1d854af0 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -189,11 +189,11 @@ def validate(self, value):
         # Check first if the scheme is valid
         scheme = value.split("://")[0].lower()
         if scheme not in self.schemes:
-            self.error("Invalid scheme {} in URL: {}".format(scheme, value))
+            self.error(f"Invalid scheme {scheme} in URL: {value}")
 
         # Then check full URL
         if not self.url_regex.match(value):
-            self.error("Invalid URL: {}".format(value))
+            self.error(f"Invalid URL: {value}")
 
 
 class EmailField(StringField):
@@ -233,7 +233,7 @@ def __init__(
         allow_utf8_user=False,
         allow_ip_domain=False,
         *args,
-        **kwargs
+        **kwargs,
     ):
         """
         :param domain_whitelist: (optional) list of valid domain names applied during validation
@@ -440,7 +440,7 @@ def __init__(
         force_string=False,
         precision=2,
         rounding=decimal.ROUND_HALF_UP,
-        **kwargs
+        **kwargs,
     ):
         """
         :param min_value: (optional) A min value that will be applied during validation
@@ -1337,7 +1337,7 @@ def on_document_pre_save(self, sender, document, created, **kwargs):
             return None
 
         update_kwargs = {
-            "set__{}__{}".format(self.name, key): val
+            f"set__{self.name}__{key}": val
             for key, val in document._delta()[0].items()
             if key in self.fields
         }
@@ -1739,12 +1739,12 @@ def __deepcopy__(self, memo):
         return self.__copy__()
 
     def __repr__(self):
-        return "<{}: {}>".format(self.__class__.__name__, self.grid_id)
+        return f"<{self.__class__.__name__}: {self.grid_id}>"
 
     def __str__(self):
         gridout = self.get()
         filename = getattr(gridout, "filename") if gridout else "<no file>"
-        return "<{}: {} ({})>".format(self.__class__.__name__, filename, self.grid_id)
+        return f"<{self.__class__.__name__}: {filename} ({self.grid_id})>"
 
     def __eq__(self, other):
         if isinstance(other, GridFSProxy):
@@ -2120,7 +2120,7 @@ def __init__(
         sequence_name=None,
         value_decorator=None,
         *args,
-        **kwargs
+        **kwargs,
     ):
         self.collection_name = collection_name or self.COLLECTION_NAME
         self.db_alias = db_alias or DEFAULT_CONNECTION_NAME
@@ -2135,7 +2135,7 @@ def generate(self):
         Generate and Increment the counter
         """
         sequence_name = self.get_sequence_name()
-        sequence_id = "{}.{}".format(sequence_name, self.name)
+        sequence_id = f"{sequence_name}.{self.name}"
         collection = get_db(alias=self.db_alias)[self.collection_name]
 
         counter = collection.find_one_and_update(
@@ -2149,7 +2149,7 @@ def generate(self):
     def set_next_value(self, value):
         """Helper method to set the next sequence value"""
         sequence_name = self.get_sequence_name()
-        sequence_id = "{}.{}".format(sequence_name, self.name)
+        sequence_id = f"{sequence_name}.{self.name}"
         collection = get_db(alias=self.db_alias)[self.collection_name]
         counter = collection.find_one_and_update(
             filter={"_id": sequence_id},
@@ -2166,7 +2166,7 @@ def get_next_value(self):
         as it is only fixed on set.
         """
         sequence_name = self.get_sequence_name()
-        sequence_id = "{}.{}".format(sequence_name, self.name)
+        sequence_id = f"{sequence_name}.{self.name}"
         collection = get_db(alias=self.db_alias)[self.collection_name]
         data = collection.find_one({"_id": sequence_id})
 
@@ -2427,7 +2427,7 @@ def __init__(
         passthrough=False,
         dbref=False,
         reverse_delete_rule=DO_NOTHING,
-        **kwargs
+        **kwargs,
     ):
         """Initialises the Reference Field.
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 43e03ef85..1f29cdf7c 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -422,7 +422,7 @@ def count(self, with_limit_and_skip=False):
         count = count_documents(
             collection=self._cursor.collection,
             filter=self._cursor._Cursor__spec,
-            **kwargs
+            **kwargs,
         )
 
         self._cursor_obj = None
@@ -526,7 +526,7 @@ def update(
         write_concern=None,
         read_concern=None,
         full_result=False,
-        **update
+        **update,
     ):
         """Perform an atomic update on the fields matched by the query.
 
@@ -603,7 +603,7 @@ def upsert_one(self, write_concern=None, read_concern=None, **update):
             write_concern=write_concern,
             read_concern=read_concern,
             full_result=True,
-            **update
+            **update,
         )
 
         if atomic_update.raw_result["updatedExisting"]:
@@ -634,7 +634,7 @@ def update_one(self, upsert=False, write_concern=None, full_result=False, **upda
             multi=False,
             write_concern=write_concern,
             full_result=full_result,
-            **update
+            **update,
         )
 
     def modify(
@@ -692,7 +692,7 @@ def modify(
                     upsert=upsert,
                     sort=sort,
                     return_document=return_doc,
-                    **self._cursor_args
+                    **self._cursor_args,
                 )
         except pymongo.errors.DuplicateKeyError as err:
             raise NotUniqueError("Update failed (%s)" % err)
@@ -1194,7 +1194,7 @@ def read_concern(self, read_concern):
             preference.
         """
         if read_concern is not None and not isinstance(read_concern, Mapping):
-            raise TypeError("%r is not a valid read concern." % (read_concern,))
+            raise TypeError(f"{read_concern!r} is not a valid read concern.")
 
         queryset = self.clone()
         queryset._read_concern = (
diff --git a/tests/document/test_class_methods.py b/tests/document/test_class_methods.py
index 7a9428dff..e20a58028 100644
--- a/tests/document/test_class_methods.py
+++ b/tests/document/test_class_methods.py
@@ -231,7 +231,7 @@ class BlogPostWithTagsAndExtraText(BlogPostWithTags):
         assert BlogPost.list_indexes() == [
             [("_cls", 1), ("author", 1), ("tags", 1)],
             [("_cls", 1), ("author", 1), ("tags", 1), ("extra_text", 1)],
-            [(u"_id", 1)],
+            [("_id", 1)],
             [("_cls", 1)],
         ]
 
@@ -288,7 +288,7 @@ class InheritedAbstractNamingTest(BaseDocument):
         assert "wibble" == InheritedAbstractNamingTest._get_collection_name()
 
         # Mixin tests
-        class BaseMixin(object):
+        class BaseMixin:
             meta = {"collection": lambda c: c.__name__.lower()}
 
         class OldMixinNamingConvention(Document, BaseMixin):
@@ -299,7 +299,7 @@ class OldMixinNamingConvention(Document, BaseMixin):
             == OldMixinNamingConvention._get_collection_name()
         )
 
-        class BaseMixin(object):
+        class BaseMixin:
             meta = {"collection": lambda c: c.__name__.lower()}
 
         class BaseDocument(Document, BaseMixin):
diff --git a/tests/document/test_delta.py b/tests/document/test_delta.py
index 2aae0af68..817bc40e1 100644
--- a/tests/document/test_delta.py
+++ b/tests/document/test_delta.py
@@ -8,7 +8,7 @@
 
 class TestDelta(MongoDBTestCase):
     def setUp(self):
-        super(TestDelta, self).setUp()
+        super().setUp()
 
         class Person(Document):
             name = StringField()
diff --git a/tests/document/test_dynamic.py b/tests/document/test_dynamic.py
index dc7ecb8b6..909c6f796 100644
--- a/tests/document/test_dynamic.py
+++ b/tests/document/test_dynamic.py
@@ -10,7 +10,7 @@
 
 class TestDynamicDocument(MongoDBTestCase):
     def setUp(self):
-        super(TestDynamicDocument, self).setUp()
+        super().setUp()
 
         class Person(DynamicDocument):
             name = StringField()
@@ -118,17 +118,17 @@ def test_fields_without_underscore(self):
         p.save()
 
         raw_p = Person.objects.as_pymongo().get(id=p.id)
-        assert raw_p == {"_cls": u"Person", "_id": p.id, "name": u"Dean"}
+        assert raw_p == {"_cls": "Person", "_id": p.id, "name": "Dean"}
 
         p.name = "OldDean"
         p.newattr = "garbage"
         p.save()
         raw_p = Person.objects.as_pymongo().get(id=p.id)
         assert raw_p == {
-            "_cls": u"Person",
+            "_cls": "Person",
             "_id": p.id,
             "name": "OldDean",
-            "newattr": u"garbage",
+            "newattr": "garbage",
         }
 
     def test_fields_containing_underscore(self):
@@ -144,14 +144,14 @@ class WeirdPerson(DynamicDocument):
         p.save()
 
         raw_p = WeirdPerson.objects.as_pymongo().get(id=p.id)
-        assert raw_p == {"_id": p.id, "_name": u"Dean", "name": u"Dean"}
+        assert raw_p == {"_id": p.id, "_name": "Dean", "name": "Dean"}
 
         p.name = "OldDean"
         p._name = "NewDean"
         p._newattr1 = "garbage"  # Unknown fields won't be added
         p.save()
         raw_p = WeirdPerson.objects.as_pymongo().get(id=p.id)
-        assert raw_p == {"_id": p.id, "_name": u"NewDean", "name": u"OldDean"}
+        assert raw_p == {"_id": p.id, "_name": "NewDean", "name": "OldDean"}
 
     def test_dynamic_document_queries(self):
         """Ensure we can query dynamic fields"""
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index bd694a1c5..fdeb4052c 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -281,9 +281,7 @@ class C(A, B):
 
         assert sorted(
             [idx["key"] for idx in C._get_collection().index_information().values()]
-        ) == sorted(
-            [[(u"_cls", 1), (u"b", 1)], [(u"_id", 1)], [(u"_cls", 1), (u"a", 1)]]
-        )
+        ) == sorted([[("_cls", 1), ("b", 1)], [("_id", 1)], [("_cls", 1), ("a", 1)]])
 
     def test_polymorphic_queries(self):
         """Ensure that the correct subclasses are returned from a query"""
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index a28cd472d..17b99983b 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -168,7 +168,7 @@ class Article(Document):
             def __unicode__(self):
                 return self.title
 
-        doc = Article(title=u"привет мир")
+        doc = Article(title="привет мир")
 
         assert "<Article: привет мир>" == repr(doc)
 
@@ -181,7 +181,7 @@ class Article(Document):
             def __str__(self):
                 return None
 
-        doc = Article(title=u"привет мир")
+        doc = Article(title="привет мир")
         assert "<Article: None>" == repr(doc)
 
     def test_queryset_resurrects_dropped_collection(self):
@@ -521,9 +521,9 @@ class Animal(Document):
             query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
             assert query_op["op"] == "update"
             if mongo_db <= MONGODB_34:
-                assert set(query_op["query"].keys()) == set(["_id", "is_mammal"])
+                assert set(query_op["query"].keys()) == {"_id", "is_mammal"}
             else:
-                assert set(query_op["command"]["q"].keys()) == set(["_id", "is_mammal"])
+                assert set(query_op["command"]["q"].keys()) == {"_id", "is_mammal"}
 
         Animal.drop_collection()
 
@@ -546,7 +546,7 @@ class Animal(Document):
             query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
             assert query_op["op"] == "command"
             assert query_op["command"]["findAndModify"] == "animal"
-            assert set(query_op["command"]["query"].keys()) == set(["_id", "is_mammal"])
+            assert set(query_op["command"]["query"].keys()) == {"_id", "is_mammal"}
 
         Animal.drop_collection()
 
@@ -1428,11 +1428,11 @@ def test_update_rename_operator(self):
         coll = self.Person._get_collection()
         doc = self.Person(name="John").save()
         raw_doc = coll.find_one({"_id": doc.pk})
-        assert set(raw_doc.keys()) == set(["_id", "_cls", "name"])
+        assert set(raw_doc.keys()) == {"_id", "_cls", "name"}
 
         doc.update(rename__name="first_name")
         raw_doc = coll.find_one({"_id": doc.pk})
-        assert set(raw_doc.keys()) == set(["_id", "_cls", "first_name"])
+        assert set(raw_doc.keys()) == {"_id", "_cls", "first_name"}
         assert raw_doc["first_name"] == "John"
 
     def test_inserts_if_you_set_the_pk(self):
@@ -2041,7 +2041,7 @@ class Employee(self.Person):
         assert promoted_employee.details is None
 
     def test_object_mixins(self):
-        class NameMixin(object):
+        class NameMixin:
             name = StringField()
 
         class Foo(EmbeddedDocument, NameMixin):
@@ -2055,7 +2055,7 @@ class Bar(Document, NameMixin):
         assert ["id", "name", "widgets"] == sorted(Bar._fields.keys())
 
     def test_mixin_inheritance(self):
-        class BaseMixIn(object):
+        class BaseMixIn:
             count = IntField()
             data = StringField()
 
@@ -2929,7 +2929,7 @@ def __str__(self):
 
         # $Where
         assert (
-            u",".join(
+            ",".join(
                 [
                     str(b)
                     for b in Book.objects.filter(
@@ -3303,7 +3303,7 @@ def save(self, *args, **kwargs):
                 for node_name, node in self.nodes.items():
                     node.expand()
                     node.save(*args, **kwargs)
-                super(NodesSystem, self).save(*args, **kwargs)
+                super().save(*args, **kwargs)
 
         NodesSystem.drop_collection()
         Node.drop_collection()
@@ -3752,7 +3752,7 @@ class Jedi(Document):
         _ = list(Jedi.objects)  # Ensure a proper document loads without errors
 
         # Forces a document with a wrong shape (may occur in case of migration)
-        value = u"I_should_be_a_dict"
+        value = "I_should_be_a_dict"
         coll.insert_one({"light_saber": value})
 
         with pytest.raises(InvalidDocumentError) as exc_info:
@@ -3819,7 +3819,7 @@ class Book(Document):
 
 class DBFieldMappingTest(MongoDBTestCase):
     def setUp(self):
-        class Fields(object):
+        class Fields:
             w1 = BooleanField(db_field="w2")
 
             x1 = BooleanField(db_field="x2")
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index 0f92d53b6..8dfcdb54f 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -19,7 +19,7 @@ class Attachment(Document):
             content_type = StringField()
             blob = BinaryField()
 
-        BLOB = "\xe6\x00\xc4\xff\x07".encode("latin-1")
+        BLOB = b"\xe6\x00\xc4\xff\x07"
         MIME_TYPE = "application/octet-stream"
 
         Attachment.drop_collection()
@@ -43,11 +43,11 @@ class AttachmentSizeLimit(Document):
         attachment_required = AttachmentRequired()
         with pytest.raises(ValidationError):
             attachment_required.validate()
-        attachment_required.blob = Binary("\xe6\x00\xc4\xff\x07".encode("latin-1"))
+        attachment_required.blob = Binary(b"\xe6\x00\xc4\xff\x07")
         attachment_required.validate()
 
-        _5_BYTES = "\xe6\x00\xc4\xff\x07".encode("latin-1")
-        _4_BYTES = "\xe6\x00\xc4\xff".encode("latin-1")
+        _5_BYTES = b"\xe6\x00\xc4\xff\x07"
+        _4_BYTES = b"\xe6\x00\xc4\xff"
         with pytest.raises(ValidationError):
             AttachmentSizeLimit(blob=_5_BYTES).validate()
         AttachmentSizeLimit(blob=_4_BYTES).validate()
@@ -58,7 +58,7 @@ def test_validation_fails(self):
         class Attachment(Document):
             blob = BinaryField()
 
-        for invalid_data in (2, u"Im_a_unicode", ["some_str"]):
+        for invalid_data in (2, "Im_a_unicode", ["some_str"]):
             with pytest.raises(ValidationError):
                 Attachment(blob=invalid_data).validate()
 
@@ -129,7 +129,7 @@ class MyDocument(Document):
 
         MyDocument.drop_collection()
 
-        bin_data = "\xe6\x00\xc4\xff\x07".encode("latin-1")
+        bin_data = b"\xe6\x00\xc4\xff\x07"
         doc = MyDocument(bin_field=bin_data).save()
 
         n_updated = MyDocument.objects(bin_field=bin_data).update_one(
diff --git a/tests/fields/test_cached_reference_field.py b/tests/fields/test_cached_reference_field.py
index dd804b389..7a96bc06b 100644
--- a/tests/fields/test_cached_reference_field.py
+++ b/tests/fields/test_cached_reference_field.py
@@ -190,9 +190,9 @@ class Person(Document):
 
         assert dict(a2.to_mongo()) == {
             "_id": a2.pk,
-            "name": u"Wilson Junior",
-            "tp": u"pf",
-            "father": {"_id": a1.pk, "tp": u"pj"},
+            "name": "Wilson Junior",
+            "tp": "pf",
+            "father": {"_id": a1.pk, "tp": "pj"},
         }
 
         assert Person.objects(father=a1)._query == {"father._id": a1.pk}
@@ -204,9 +204,9 @@ class Person(Document):
         a2.reload()
         assert dict(a2.to_mongo()) == {
             "_id": a2.pk,
-            "name": u"Wilson Junior",
-            "tp": u"pf",
-            "father": {"_id": a1.pk, "tp": u"pf"},
+            "name": "Wilson Junior",
+            "tp": "pf",
+            "father": {"_id": a1.pk, "tp": "pf"},
         }
 
     def test_cached_reference_fields_on_embedded_documents(self):
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
index 893180a41..974360ef6 100644
--- a/tests/fields/test_email_field.py
+++ b/tests/fields/test_email_field.py
@@ -30,11 +30,11 @@ class User(Document):
             user.validate()
 
         # unicode domain
-        user = User(email=u"user@пример.рф")
+        user = User(email="user@пример.рф")
         user.validate()
 
         # invalid unicode domain
-        user = User(email=u"user@пример")
+        user = User(email="user@пример")
         with pytest.raises(ValidationError):
             user.validate()
 
@@ -48,7 +48,7 @@ class User(Document):
             email = EmailField()
 
         # unicode user shouldn't validate by default...
-        user = User(email=u"Dörte@Sörensen.example.com")
+        user = User(email="Dörte@Sörensen.example.com")
         with pytest.raises(ValidationError):
             user.validate()
 
@@ -56,7 +56,7 @@ class User(Document):
         class User(Document):
             email = EmailField(allow_utf8_user=True)
 
-        user = User(email=u"Dörte@Sörensen.example.com")
+        user = User(email="Dörte@Sörensen.example.com")
         user.validate()
 
     def test_email_field_domain_whitelist(self):
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index e116dc0df..480bec20d 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -74,7 +74,7 @@ class Person(Document):
         # Test non exiting attribute
         with pytest.raises(InvalidQueryError) as exc_info:
             Person.objects(settings__notexist="bar").first()
-        assert str(exc_info.value) == u'Cannot resolve field "notexist"'
+        assert str(exc_info.value) == 'Cannot resolve field "notexist"'
 
         with pytest.raises(LookUpError):
             Person.objects.only("settings.notexist")
@@ -110,7 +110,7 @@ class Person(Document):
         # Test non exiting attribute
         with pytest.raises(InvalidQueryError) as exc_info:
             assert Person.objects(settings__notexist="bar").first().id == p.id
-        assert str(exc_info.value) == u'Cannot resolve field "notexist"'
+        assert str(exc_info.value) == 'Cannot resolve field "notexist"'
 
         # Test existing attribute
         assert Person.objects(settings__base_foo="basefoo").first().id == p.id
@@ -318,7 +318,7 @@ class Person(Document):
         # Test non exiting attribute
         with pytest.raises(InvalidQueryError) as exc_info:
             Person.objects(settings__notexist="bar").first()
-        assert str(exc_info.value) == u'Cannot resolve field "notexist"'
+        assert str(exc_info.value) == 'Cannot resolve field "notexist"'
 
         with pytest.raises(LookUpError):
             Person.objects.only("settings.notexist")
@@ -346,7 +346,7 @@ class Person(Document):
         # Test non exiting attribute
         with pytest.raises(InvalidQueryError) as exc_info:
             assert Person.objects(settings__notexist="bar").first().id == p.id
-        assert str(exc_info.value) == u'Cannot resolve field "notexist"'
+        assert str(exc_info.value) == 'Cannot resolve field "notexist"'
 
         # Test existing attribute
         assert Person.objects(settings__base_foo="basefoo").first().id == p.id
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index ff1fde987..ce16a9042 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -292,7 +292,7 @@ class HandleNoneFields(Document):
         HandleNoneFields.drop_collection()
 
         doc = HandleNoneFields()
-        doc.str_fld = u"spam ham egg"
+        doc.str_fld = "spam ham egg"
         doc.int_fld = 42
         doc.flt_fld = 4.2
         doc.com_dt_fld = datetime.datetime.utcnow()
@@ -328,7 +328,7 @@ class HandleNoneFields(Document):
         HandleNoneFields.drop_collection()
 
         doc = HandleNoneFields()
-        doc.str_fld = u"spam ham egg"
+        doc.str_fld = "spam ham egg"
         doc.int_fld = 42
         doc.flt_fld = 4.2
         doc.comp_dt_fld = datetime.datetime.utcnow()
@@ -426,9 +426,9 @@ class UserX2(Document):
     def test_list_validation(self):
         """Ensure that a list field only accepts lists with valid elements."""
         access_level_choices = (
-            ("a", u"Administration"),
-            ("b", u"Manager"),
-            ("c", u"Staff"),
+            ("a", "Administration"),
+            ("b", "Manager"),
+            ("c", "Staff"),
         )
 
         class User(Document):
@@ -476,7 +476,7 @@ class BlogPost(Document):
         post.access_list = ["a", "b"]
         post.validate()
 
-        assert post.get_access_list_display() == u"Administration, Manager"
+        assert post.get_access_list_display() == "Administration, Manager"
 
         post.comments = ["a"]
         with pytest.raises(ValidationError):
@@ -2028,8 +2028,8 @@ def test_simple_choices_validation_invalid_value(self):
         """Ensure that error messages are correct."""
         SIZES = ("S", "M", "L", "XL", "XXL")
         COLORS = (("R", "Red"), ("B", "Blue"))
-        SIZE_MESSAGE = u"Value must be one of ('S', 'M', 'L', 'XL', 'XXL')"
-        COLOR_MESSAGE = u"Value must be one of ['R', 'B']"
+        SIZE_MESSAGE = "Value must be one of ('S', 'M', 'L', 'XL', 'XXL')"
+        COLOR_MESSAGE = "Value must be one of ['R', 'B']"
 
         class Shirt(Document):
             size = StringField(max_length=3, choices=SIZES)
@@ -2092,7 +2092,7 @@ class Post(Document):
             assert "comments" in error_dict
             assert 1 in error_dict["comments"]
             assert "content" in error_dict["comments"][1]
-            assert error_dict["comments"][1]["content"] == u"Field is required"
+            assert error_dict["comments"][1]["content"] == "Field is required"
 
         post.comments[1].content = "here we go"
         post.validate()
@@ -2104,7 +2104,7 @@ def test_tuples_as_tuples(self):
 
         class EnumField(BaseField):
             def __init__(self, **kwargs):
-                super(EnumField, self).__init__(**kwargs)
+                super().__init__(**kwargs)
 
             def to_mongo(self, value):
                 return value
@@ -2606,11 +2606,11 @@ def test_unicode(self):
         """
         post = self.BlogPost(
             comments=[
-                self.Comments(author="user1", message=u"сообщение"),
-                self.Comments(author="user2", message=u"хабарлама"),
+                self.Comments(author="user1", message="сообщение"),
+                self.Comments(author="user2", message="хабарлама"),
             ]
         ).save()
-        assert post.comments.get(message=u"сообщение").author == "user1"
+        assert post.comments.get(message="сообщение").author == "user1"
 
     def test_save(self):
         """
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index dc9354f0e..9a20c9174 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -55,7 +55,7 @@ class PutFile(Document):
 
         PutFile.drop_collection()
 
-        text = "Hello, World!".encode("latin-1")
+        text = b"Hello, World!"
         content_type = "text/plain"
 
         putfile = PutFile()
@@ -97,8 +97,8 @@ class StreamFile(Document):
 
         StreamFile.drop_collection()
 
-        text = "Hello, World!".encode("latin-1")
-        more_text = "Foo Bar".encode("latin-1")
+        text = b"Hello, World!"
+        more_text = b"Foo Bar"
         content_type = "text/plain"
 
         streamfile = StreamFile()
@@ -133,8 +133,8 @@ class StreamFile(Document):
 
         StreamFile.drop_collection()
 
-        text = "Hello, World!".encode("latin-1")
-        more_text = "Foo Bar".encode("latin-1")
+        text = b"Hello, World!"
+        more_text = b"Foo Bar"
 
         streamfile = StreamFile()
         streamfile.save()
@@ -163,8 +163,8 @@ def test_file_fields_set(self):
         class SetFile(Document):
             the_file = FileField()
 
-        text = "Hello, World!".encode("latin-1")
-        more_text = "Foo Bar".encode("latin-1")
+        text = b"Hello, World!"
+        more_text = b"Foo Bar"
 
         SetFile.drop_collection()
 
@@ -192,7 +192,7 @@ class GridDocument(Document):
         GridDocument.drop_collection()
 
         with tempfile.TemporaryFile() as f:
-            f.write("Hello World!".encode("latin-1"))
+            f.write(b"Hello World!")
             f.flush()
 
             # Test without default
@@ -209,7 +209,7 @@ class GridDocument(Document):
             assert doc_b.the_file.grid_id == doc_c.the_file.grid_id
 
             # Test with default
-            doc_d = GridDocument(the_file="".encode("latin-1"))
+            doc_d = GridDocument(the_file=b"")
             doc_d.save()
 
             doc_e = GridDocument.objects.with_id(doc_d.id)
@@ -235,7 +235,7 @@ class TestFile(Document):
         # First instance
         test_file = TestFile()
         test_file.name = "Hello, World!"
-        test_file.the_file.put("Hello, World!".encode("latin-1"))
+        test_file.the_file.put(b"Hello, World!")
         test_file.save()
 
         # Second instance
@@ -291,9 +291,7 @@ class TestFile(Document):
 
         test_file = TestFile()
         assert not bool(test_file.the_file)
-        test_file.the_file.put(
-            "Hello, World!".encode("latin-1"), content_type="text/plain"
-        )
+        test_file.the_file.put(b"Hello, World!", content_type="text/plain")
         test_file.save()
         assert bool(test_file.the_file)
 
@@ -315,7 +313,7 @@ def test_file_disk_space(self):
         class TestFile(Document):
             the_file = FileField()
 
-        text = "Hello, World!".encode("latin-1")
+        text = b"Hello, World!"
         content_type = "text/plain"
 
         testfile = TestFile()
@@ -359,7 +357,7 @@ class TestFile(Document):
         testfile.the_file.put(text, content_type=content_type, filename="hello")
         testfile.save()
 
-        text = "Bonjour, World!".encode("latin-1")
+        text = b"Bonjour, World!"
         testfile.the_file.replace(text, content_type=content_type, filename="hello")
         testfile.save()
 
@@ -383,7 +381,7 @@ class TestImage(Document):
         TestImage.drop_collection()
 
         with tempfile.TemporaryFile() as f:
-            f.write("Hello World!".encode("latin-1"))
+            f.write(b"Hello World!")
             f.flush()
 
             t = TestImage()
@@ -499,21 +497,21 @@ class TestFile(Document):
         # First instance
         test_file = TestFile()
         test_file.name = "Hello, World!"
-        test_file.the_file.put("Hello, World!".encode("latin-1"), name="hello.txt")
+        test_file.the_file.put(b"Hello, World!", name="hello.txt")
         test_file.save()
 
         data = get_db("test_files").macumba.files.find_one()
         assert data.get("name") == "hello.txt"
 
         test_file = TestFile.objects.first()
-        assert test_file.the_file.read() == "Hello, World!".encode("latin-1")
+        assert test_file.the_file.read() == b"Hello, World!"
 
         test_file = TestFile.objects.first()
-        test_file.the_file = "Hello, World!".encode("latin-1")
+        test_file.the_file = b"Hello, World!"
         test_file.save()
 
         test_file = TestFile.objects.first()
-        assert test_file.the_file.read() == "Hello, World!".encode("latin-1")
+        assert test_file.the_file.read() == b"Hello, World!"
 
     def test_copyable(self):
         class PutFile(Document):
@@ -521,7 +519,7 @@ class PutFile(Document):
 
         PutFile.drop_collection()
 
-        text = "Hello, World!".encode("latin-1")
+        text = b"Hello, World!"
         content_type = "text/plain"
 
         putfile = PutFile()
diff --git a/tests/fields/test_geo_fields.py b/tests/fields/test_geo_fields.py
index a611be857..3c63b1686 100644
--- a/tests/fields/test_geo_fields.py
+++ b/tests/fields/test_geo_fields.py
@@ -8,7 +8,7 @@ class TestGeoField(MongoDBTestCase):
     def _test_for_expected_error(self, Cls, loc, expected):
         try:
             Cls(loc=loc).validate()
-            self.fail("Should not validate the location {0}".format(loc))
+            self.fail(f"Should not validate the location {loc}")
         except ValidationError as e:
             assert expected == e.to_dict()["loc"]
 
diff --git a/tests/fields/test_map_field.py b/tests/fields/test_map_field.py
index ea60e34d1..eb747ef20 100644
--- a/tests/fields/test_map_field.py
+++ b/tests/fields/test_map_field.py
@@ -135,11 +135,11 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
-        tree = BlogPost(info_dict={u"éééé": {"description": u"VALUE: éééé"}})
+        tree = BlogPost(info_dict={"éééé": {"description": "VALUE: éééé"}})
 
         tree.save()
 
         assert (
-            BlogPost.objects.get(id=tree.id).info_dict[u"éééé"].description
-            == u"VALUE: éééé"
+            BlogPost.objects.get(id=tree.id).info_dict["éééé"].description
+            == "VALUE: éééé"
         )
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index e2c92034b..275e3fe15 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -87,7 +87,7 @@ class Person(Document):
             parent = ReferenceField("self", dbref=False)
 
         p = Person(name="Steve", parent=DBRef("person", "abcdefghijklmnop"))
-        assert p.to_mongo() == SON([("name", u"Steve"), ("parent", "abcdefghijklmnop")])
+        assert p.to_mongo() == SON([("name", "Steve"), ("parent", "abcdefghijklmnop")])
 
     def test_objectid_reference_fields(self):
         class Person(Document):
diff --git a/tests/fields/test_url_field.py b/tests/fields/test_url_field.py
index eb639bfe4..7639eb6e7 100644
--- a/tests/fields/test_url_field.py
+++ b/tests/fields/test_url_field.py
@@ -26,7 +26,7 @@ class Link(Document):
             url = URLField()
 
         link = Link()
-        link.url = u"http://xn--b1agh1afp.com/"
+        link.url = "http://xn--b1agh1afp.com/"
 
         # TODO fix URL validation - this *IS* a valid URL
         # For now we just want to make sure that the error message is correct
@@ -34,7 +34,7 @@ class Link(Document):
             link.validate()
         assert (
             str(exc_info.value)
-            == u"ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])"
+            == "ValidationError (Link:None) (Invalid URL: http://\u043f\u0440\u0438\u0432\u0435\u0442.com: ['url'])"
         )
 
     def test_url_scheme_validation(self):
diff --git a/tests/fixtures.py b/tests/fixtures.py
index 59fc3bf3e..ef82c22af 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -53,7 +53,7 @@ def post_delete(self, sender, document, **kwargs):
 signals.post_delete.connect(PickleSignalsTest.post_delete, sender=PickleSignalsTest)
 
 
-class Mixin(object):
+class Mixin:
     name = StringField()
 
 
diff --git a/tests/queryset/test_geo.py b/tests/queryset/test_geo.py
index a546fdb64..81ade0929 100644
--- a/tests/queryset/test_geo.py
+++ b/tests/queryset/test_geo.py
@@ -496,8 +496,8 @@ class Place(Document):
         p.save()
         qs = Place.objects().only("location")
         assert qs.as_pymongo()[0]["location"] == {
-            u"type": u"Point",
-            u"coordinates": [24.946861267089844, 60.16311983618494],
+            "type": "Point",
+            "coordinates": [24.946861267089844, 60.16311983618494],
         }
 
     def test_2dsphere_point_sets_correctly(self):
diff --git a/tests/queryset/test_pickable.py b/tests/queryset/test_pickable.py
index d41f56df4..d20db32ee 100644
--- a/tests/queryset/test_pickable.py
+++ b/tests/queryset/test_pickable.py
@@ -18,7 +18,7 @@ class TestQuerysetPickable(MongoDBTestCase):
     """
 
     def setUp(self):
-        super(TestQuerysetPickable, self).setUp()
+        super().setUp()
         self.john = Person.objects.create(name="John", age=21)
 
     def test_picke_simple_qs(self):
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 3f1b85d75..c75f2f10e 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -113,7 +113,7 @@ def test_find(self):
 
     def test_slicing_sets_empty_limit_skip(self):
         self.Person.objects.insert(
-            [self.Person(name="User {}".format(i), age=i) for i in range(5)],
+            [self.Person(name=f"User {i}", age=i) for i in range(5)],
             load_bulk=False,
         )
 
@@ -1570,9 +1570,9 @@ class BlogPost(Document):
 
         results = BlogPost.objects.exec_js(code)
         expected_results = [
-            {u"comment": u"cool", u"document": u"post1"},
-            {u"comment": u"yay", u"document": u"post1"},
-            {u"comment": u"nice stuff", u"document": u"post2"},
+            {"comment": "cool", "document": "post1"},
+            {"comment": "yay", "document": "post1"},
+            {"comment": "nice stuff", "document": "post2"},
         ]
         assert results == expected_results
 
@@ -2721,10 +2721,10 @@ class Person(Document):
         f1.save()
 
         # persons of first family
-        Person(id=1, family=f1, name=u"Wilson Jr", age=21).save()
-        Person(id=2, family=f1, name=u"Wilson Father", age=45).save()
-        Person(id=3, family=f1, name=u"Eliana Costa", age=40).save()
-        Person(id=4, family=f1, name=u"Tayza Mariana", age=17).save()
+        Person(id=1, family=f1, name="Wilson Jr", age=21).save()
+        Person(id=2, family=f1, name="Wilson Father", age=45).save()
+        Person(id=3, family=f1, name="Eliana Costa", age=40).save()
+        Person(id=4, family=f1, name="Tayza Mariana", age=17).save()
 
         # creating second family
         f2 = Family(id=2, log="Av prof frasc brunno")
@@ -2802,10 +2802,10 @@ class Person(Document):
             "_id": 1,
             "value": {
                 "persons": [
-                    {"age": 21, "name": u"Wilson Jr"},
-                    {"age": 45, "name": u"Wilson Father"},
-                    {"age": 40, "name": u"Eliana Costa"},
-                    {"age": 17, "name": u"Tayza Mariana"},
+                    {"age": 21, "name": "Wilson Jr"},
+                    {"age": 45, "name": "Wilson Father"},
+                    {"age": 40, "name": "Eliana Costa"},
+                    {"age": 17, "name": "Tayza Mariana"},
                 ],
                 "totalAge": 123,
             },
@@ -2815,9 +2815,9 @@ class Person(Document):
             "_id": 2,
             "value": {
                 "persons": [
-                    {"age": 16, "name": u"Isabella Luanna"},
-                    {"age": 36, "name": u"Sandra Mara"},
-                    {"age": 10, "name": u"Igor Gabriel"},
+                    {"age": 16, "name": "Isabella Luanna"},
+                    {"age": 36, "name": "Sandra Mara"},
+                    {"age": 10, "name": "Igor Gabriel"},
                 ],
                 "totalAge": 62,
             },
@@ -2827,8 +2827,8 @@ class Person(Document):
             "_id": 3,
             "value": {
                 "persons": [
-                    {"age": 30, "name": u"Arthur WA"},
-                    {"age": 25, "name": u"Paula Leonel"},
+                    {"age": 30, "name": "Arthur WA"},
+                    {"age": 25, "name": "Paula Leonel"},
                 ],
                 "totalAge": 55,
             },
@@ -2974,7 +2974,7 @@ class BlogPost(Document):
 
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            assert set(["music", "film", "actors", "watch"]) == set(f.keys())
+            assert {"music", "film", "actors", "watch"} == set(f.keys())
             assert f["music"] == 3
             assert f["actors"] == 2
             assert f["watch"] == 2
@@ -2988,7 +2988,7 @@ def test_assertions(f):
         # Ensure query is taken into account
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            assert set(["music", "actors", "watch"]) == set(f.keys())
+            assert {"music", "actors", "watch"} == set(f.keys())
             assert f["music"] == 2
             assert f["actors"] == 1
             assert f["watch"] == 1
@@ -3016,7 +3016,7 @@ def test_assertions(f):
 
         # Check item_frequencies works for non-list fields
         def test_assertions(f):
-            assert set([1, 2]) == set(f.keys())
+            assert {1, 2} == set(f.keys())
             assert f[1] == 1
             assert f[2] == 2
 
@@ -3053,7 +3053,7 @@ class Person(Document):
 
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            assert set(["62-3331-1656", "62-3332-1656"]) == set(f.keys())
+            assert {"62-3331-1656", "62-3332-1656"} == set(f.keys())
             assert f["62-3331-1656"] == 2
             assert f["62-3332-1656"] == 1
 
@@ -3065,7 +3065,7 @@ def test_assertions(f):
         # Ensure query is taken into account
         def test_assertions(f):
             f = {key: int(val) for key, val in f.items()}
-            assert set(["62-3331-1656"]) == set(f.keys())
+            assert {"62-3331-1656"} == set(f.keys())
             assert f["62-3331-1656"] == 2
 
         exec_js = Person.objects(phone__number="62-3331-1656").item_frequencies(
@@ -3132,10 +3132,10 @@ class Person(Document):
         p.save()
 
         ot = Person.objects.item_frequencies("extra.tag", map_reduce=False)
-        assert ot == {None: 1.0, u"friend": 1.0}
+        assert ot == {None: 1.0, "friend": 1.0}
 
         ot = Person.objects.item_frequencies("extra.tag", map_reduce=True)
-        assert ot == {None: 1.0, u"friend": 1.0}
+        assert ot == {None: 1.0, "friend": 1.0}
 
     def test_item_frequencies_with_0_values(self):
         class Test(Document):
@@ -3379,13 +3379,16 @@ def test_distinct(self):
         self.Person(name="Mr White", age=20).save()
         self.Person(name="Mr Orange", age=30).save()
         self.Person(name="Mr Pink", age=30).save()
-        assert set(self.Person.objects.distinct("name")) == set(
-            ["Mr Orange", "Mr White", "Mr Pink"]
-        )
-        assert set(self.Person.objects.distinct("age")) == set([20, 30])
-        assert set(self.Person.objects(age=30).distinct("name")) == set(
-            ["Mr Orange", "Mr Pink"]
-        )
+        assert set(self.Person.objects.distinct("name")) == {
+            "Mr Orange",
+            "Mr White",
+            "Mr Pink",
+        }
+        assert set(self.Person.objects.distinct("age")) == {20, 30}
+        assert set(self.Person.objects(age=30).distinct("name")) == {
+            "Mr Orange",
+            "Mr Pink",
+        }
 
     def test_distinct_handles_references(self):
         class Foo(Document):
@@ -3446,8 +3449,8 @@ class News(Document):
         assert count == 1
 
         News(
-            title=u"As eleições no Brasil já estão em planejamento",
-            content=u"A candidata dilma roussef já começa o teu planejamento",
+            title="As eleições no Brasil já estão em planejamento",
+            content="A candidata dilma roussef já começa o teu planejamento",
             is_active=False,
         ).save()
 
@@ -3525,8 +3528,8 @@ class Product(Document):
         Product(product_id=2).save()
         Product(product_id=1).save()
 
-        assert set(Product.objects.distinct("product_id")) == set([1, 2])
-        assert set(Product.objects.distinct("pid")) == set([1, 2])
+        assert set(Product.objects.distinct("product_id")) == {1, 2}
+        assert set(Product.objects.distinct("pid")) == {1, 2}
 
         Product.drop_collection()
 
@@ -4222,15 +4225,15 @@ class UserDoc(Document):
         ulist = list(UserDoc.objects.scalar("name", "age"))
 
         assert ulist == [
-            (u"Wilson Jr", 19),
-            (u"Wilson", 43),
-            (u"Eliana", 37),
-            (u"Tayza", 15),
+            ("Wilson Jr", 19),
+            ("Wilson", 43),
+            ("Eliana", 37),
+            ("Tayza", 15),
         ]
 
         ulist = list(UserDoc.objects.scalar("name").order_by("age"))
 
-        assert ulist == [(u"Tayza"), (u"Wilson Jr"), (u"Eliana"), (u"Wilson")]
+        assert ulist == [("Tayza"), ("Wilson Jr"), ("Eliana"), ("Wilson")]
 
     def test_scalar_embedded(self):
         class Profile(EmbeddedDocument):
@@ -4269,7 +4272,7 @@ class Person(Document):
 
         assert list(
             Person.objects.order_by("profile__age").scalar("profile__name")
-        ) == [u"Wilson Jr", u"Gabriel Falcao", u"Lincoln de souza", u"Walter cruz"]
+        ) == ["Wilson Jr", "Gabriel Falcao", "Lincoln de souza", "Walter cruz"]
 
         ulist = list(
             Person.objects.order_by("locale.city").scalar(
@@ -4277,10 +4280,10 @@ class Person(Document):
             )
         )
         assert ulist == [
-            (u"Lincoln de souza", 28, u"Belo Horizonte"),
-            (u"Walter cruz", 30, u"Brasilia"),
-            (u"Wilson Jr", 19, u"Corumba-GO"),
-            (u"Gabriel Falcao", 23, u"New York"),
+            ("Lincoln de souza", 28, "Belo Horizonte"),
+            ("Walter cruz", 30, "Brasilia"),
+            ("Wilson Jr", 19, "Corumba-GO"),
+            ("Gabriel Falcao", 23, "New York"),
         ]
 
     def test_scalar_decimal(self):
@@ -4294,7 +4297,7 @@ class Person(Document):
         Person(name="Wilson Jr", rating=Decimal("1.0")).save()
 
         ulist = list(Person.objects.scalar("name", "rating"))
-        assert ulist == [(u"Wilson Jr", Decimal("1.0"))]
+        assert ulist == [("Wilson Jr", Decimal("1.0"))]
 
     def test_scalar_reference_field(self):
         class State(Document):
@@ -4313,7 +4316,7 @@ class Person(Document):
         Person(name="Wilson JR", state=s1).save()
 
         plist = list(Person.objects.scalar("name", "state"))
-        assert plist == [(u"Wilson JR", s1)]
+        assert plist == [("Wilson JR", s1)]
 
     def test_scalar_generic_reference_field(self):
         class State(Document):
@@ -4332,7 +4335,7 @@ class Person(Document):
         Person(name="Wilson JR", state=s1).save()
 
         plist = list(Person.objects.scalar("name", "state"))
-        assert plist == [(u"Wilson JR", s1)]
+        assert plist == [("Wilson JR", s1)]
 
     def test_generic_reference_field_with_only_and_as_pymongo(self):
         class TestPerson(Document):
@@ -4863,13 +4866,11 @@ class User(Document):
         )
 
         results = User.objects.as_pymongo()
-        assert set(results[0].keys()) == set(["_id", "name", "age", "price"])
-        assert set(results[1].keys()) == set(
-            ["_id", "name", "age", "price", "last_login"]
-        )
+        assert set(results[0].keys()) == {"_id", "name", "age", "price"}
+        assert set(results[1].keys()) == {"_id", "name", "age", "price", "last_login"}
 
         results = User.objects.only("id", "name").as_pymongo()
-        assert set(results[0].keys()) == set(["_id", "name"])
+        assert set(results[0].keys()) == {"_id", "name"}
 
         users = User.objects.only("name", "price").as_pymongo()
         results = list(users)
@@ -5501,12 +5502,12 @@ class Person(Document):
             assert Person.objects._has_data(), "Cursor has data and returned False"
 
     def test_delete_count(self):
-        [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
+        [self.Person(name=f"User {i}", age=i * 10).save() for i in range(1, 4)]
         assert (
             self.Person.objects().delete() == 3
         )  # test ordinary QuerySey delete count
 
-        [self.Person(name="User {0}".format(i), age=i * 10).save() for i in range(1, 4)]
+        [self.Person(name=f"User {i}", age=i * 10).save() for i in range(1, 4)]
 
         assert (
             self.Person.objects().skip(1).delete() == 2
diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index 146501d0f..a9c042de9 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -64,7 +64,7 @@ class Person(Document):
 
         pipeline = [{"$match": {"name": "Isabella Luanna"}}]
         data = Person.objects().aggregate(pipeline)
-        assert list(data) == [{u"_id": p1.pk, u"age": 16, u"name": u"Isabella Luanna"}]
+        assert list(data) == [{"_id": p1.pk, "age": 16, "name": "Isabella Luanna"}]
 
     def test_queryset_aggregation_with_skip(self):
         class Person(Document):
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index 872a9a5d5..e51683aef 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -328,7 +328,7 @@ class MainDoc(Document):
         word = Word(word="abc", index=1)
         update = transform.update(MainDoc, pull__content__text=word)
         assert update == {
-            "$pull": {"content.text": SON([("word", u"abc"), ("index", 1)])}
+            "$pull": {"content.text": SON([("word", "abc"), ("index", 1)])}
         }
 
         update = transform.update(MainDoc, pull__content__heading="xyz")
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index f4b63f052..1db5975d3 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -6,7 +6,7 @@
 from mongoengine.base.datastructures import BaseDict, BaseList, StrictDict
 
 
-class DocumentStub(object):
+class DocumentStub:
     def __init__(self):
         self._changed_fields = []
         self._unset_fields = []
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 88ea00330..640aed36e 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -1321,7 +1321,7 @@ class BrandGroup(Document):
         BrandGroup.drop_collection()
 
         brand1 = Brand(title="Moschino").save()
-        brand2 = Brand(title=u"Денис Симачёв").save()
+        brand2 = Brand(title="Денис Симачёв").save()
 
         BrandGroup(title="top_brands", brands=[brand1, brand2]).save()
         brand_groups = BrandGroup.objects().all()
diff --git a/tests/test_utils.py b/tests/test_utils.py
index dd1782734..ca7defad0 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -10,7 +10,7 @@
 
 class TestLazyRegexCompiler:
     def test_lazy_regex_compiler_verify_laziness_of_descriptor(self):
-        class UserEmail(object):
+        class UserEmail:
             EMAIL_REGEX = LazyRegexCompiler("@", flags=32)
 
         descriptor = UserEmail.__dict__["EMAIL_REGEX"]
@@ -24,7 +24,7 @@ class UserEmail(object):
         assert user_email.EMAIL_REGEX is UserEmail.EMAIL_REGEX
 
     def test_lazy_regex_compiler_verify_cannot_set_descriptor_on_instance(self):
-        class UserEmail(object):
+        class UserEmail:
             EMAIL_REGEX = LazyRegexCompiler("@")
 
         user_email = UserEmail()
@@ -32,7 +32,7 @@ class UserEmail(object):
             user_email.EMAIL_REGEX = re.compile("@")
 
     def test_lazy_regex_compiler_verify_can_override_class_attr(self):
-        class UserEmail(object):
+        class UserEmail:
             EMAIL_REGEX = LazyRegexCompiler("@")
 
         UserEmail.EMAIL_REGEX = re.compile("cookies")
diff --git a/tests/utils.py b/tests/utils.py
index 195b9dbad..0899c208a 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -59,7 +59,7 @@ def _inner(*args, **kwargs):
             return func(*args, **kwargs)
 
         pretty_version = ".".join(str(n) for n in mongo_version_req)
-        pytest.skip("Needs MongoDB v{}+".format(pretty_version))
+        pytest.skip(f"Needs MongoDB v{pretty_version}+")
 
     _inner.__name__ = func.__name__
     _inner.__doc__ = func.__doc__

From 8a1a68ea7c8e37aa225212f569ddd97fe51936c6 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Tue, 8 Dec 2020 23:52:47 +0100
Subject: [PATCH 1131/1519] fix flake8 warnings

---
 .pre-commit-config.yaml                     |  30 +++---
 benchmarks/test_basic_doc_ops.py            |   2 +-
 docs/conf.py                                |   2 +-
 mongoengine/__init__.py                     |  12 +--
 mongoengine/base/datastructures.py          |   4 +-
 mongoengine/base/document.py                |  14 +--
 mongoengine/base/metaclasses.py             |   2 +-
 mongoengine/dereference.py                  |   4 +-
 mongoengine/fields.py                       |   2 +-
 setup.cfg                                   |   2 +-
 setup.py                                    |   2 +-
 tests/document/test_class_methods.py        |   2 +-
 tests/document/test_inheritance.py          |  13 +--
 tests/document/test_validation.py           |   5 +-
 tests/fields/test_complex_datetime_field.py |   2 +-
 tests/fields/test_email_field.py            |   4 +-
 tests/fields/test_fields.py                 |   4 +-
 tests/fields/test_file_field.py             |   2 +-
 tests/fields/test_sequence_field.py         |   4 +-
 tests/queryset/test_pickable.py             |   5 -
 tests/queryset/test_queryset.py             |  17 ++--
 tests/test_common.py                        |   2 -
 tests/test_context_managers.py              |   4 +-
 tests/test_datastructures.py                |   2 +-
 tests/test_dereference.py                   | 102 ++++++++++----------
 tests/test_utils.py                         |   1 -
 26 files changed, 110 insertions(+), 135 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 025e3b9ea..730fcb2b9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,17 +1,17 @@
 fail_fast: false
 repos:
-    - repo: https://github.com/ambv/black
-      rev: 20.8b1
-      hooks:
-        - id: black
-    - repo: https://gitlab.com/pycqa/flake8
-      rev: 3.8.0a2
-      hooks:
-        - id: flake8
-          additional_dependencies:
-            - flake8-import-order
-    - repo: https://github.com/asottile/pyupgrade
-      rev: v2.7.4
-      hooks:
-        - id: pyupgrade
-          args: [--py36-plus]
\ No newline at end of file
+  - repo: https://github.com/ambv/black
+    rev: 20.8b1
+    hooks:
+      - id: black
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.8.0a2
+    hooks:
+      - id: flake8
+        additional_dependencies:
+          - flake8-import-order
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.7.4
+    hooks:
+      - id: pyupgrade
+        args: [--py36-plus]
diff --git a/benchmarks/test_basic_doc_ops.py b/benchmarks/test_basic_doc_ops.py
index e840f97ad..91efc7e32 100644
--- a/benchmarks/test_basic_doc_ops.py
+++ b/benchmarks/test_basic_doc_ops.py
@@ -45,7 +45,7 @@ def init_book():
 
     print(
         "Doc setattr: %.3fus"
-        % (timeit(lambda: setattr(b, "name", "New name"), 10000) * 10 ** 6)
+        % (timeit(lambda: setattr(b, "name", "New name"), 10000) * 10 ** 6)  # noqa B010
     )
 
     print("Doc to mongo: %.3fus" % (timeit(b.to_mongo, 1000) * 10 ** 6))
diff --git a/docs/conf.py b/docs/conf.py
index 299959ee3..f8a4999a9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -42,7 +42,7 @@
 
 # General information about the project.
 project = "MongoEngine"
-copyright = "2009, MongoEngine Authors"
+copyright = "2009, MongoEngine Authors"  # noqa: A001
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index d0a0f1f4a..93b0edd07 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -10,12 +10,12 @@
 # mongoengine, e.g. instead of `from mongoengine.connection import connect`,
 # users can simply use `from mongoengine import connect`, or even
 # `from mongoengine import *` and then `connect('testdb')`.
-from mongoengine.connection import *
-from mongoengine.document import *
-from mongoengine.errors import *
-from mongoengine.fields import *
-from mongoengine.queryset import *
-from mongoengine.signals import *
+from mongoengine.connection import *  # noqa: F401
+from mongoengine.document import *  # noqa: F401
+from mongoengine.errors import *  # noqa: F401
+from mongoengine.fields import *  # noqa: F401
+from mongoengine.queryset import *  # noqa: F401
+from mongoengine.signals import *  # noqa: F401
 
 
 __all__ = (
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 0f2f8a494..a32f6040a 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -180,9 +180,7 @@ def __setitem__(self, key, value):
     def _mark_as_changed(self, key=None):
         if hasattr(self._instance, "_mark_as_changed"):
             if key is not None:
-                self._instance._mark_as_changed(
-                    "{}.{}".format(self._name, key % len(self))
-                )
+                self._instance._mark_as_changed(f"{self._name}.{key % len(self)}")
             else:
                 self._instance._mark_as_changed(self._name)
 
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 45acfa3d3..f64b578be 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -89,9 +89,7 @@ def __init__(self, *args, **values):
                 list(self._fields.keys()) + ["id", "pk", "_cls", "_text_score"]
             )
             if _undefined_fields:
-                msg = ('The fields "{}" do not exist on the document "{}"').format(
-                    _undefined_fields, self._class_name
-                )
+                msg = f'The fields "{_undefined_fields}" do not exist on the document "{self._class_name}"'
                 raise FieldDoesNotExist(msg)
 
         if self.STRICT and not self._dynamic:
@@ -231,10 +229,10 @@ def __setstate__(self, data):
                 setattr(self, k, data[k])
         if "_fields_ordered" in data:
             if self._dynamic:
-                setattr(self, "_fields_ordered", data["_fields_ordered"])
+                self._fields_ordered = data["_fields_ordered"]
             else:
                 _super_fields_ordered = type(self)._fields_ordered
-                setattr(self, "_fields_ordered", _super_fields_ordered)
+                self._fields_ordered = _super_fields_ordered
 
         dynamic_fields = data.get("_dynamic_fields") or SON()
         for k in dynamic_fields.keys():
@@ -576,7 +574,7 @@ def _nestable_types_clear_changed_fields(data):
         else:
             iterator = data.items()
 
-        for index_or_key, value in iterator:
+        for _index_or_key, value in iterator:
             if hasattr(value, "_get_changed_fields") and not isinstance(
                 value, Document
             ):  # don't follow references
@@ -999,9 +997,7 @@ def _geo_indices(cls, inspected=None, parent_field=None):
             "PolygonField",
         )
 
-        geo_field_types = tuple(
-            [_import_class(field) for field in geo_field_type_names]
-        )
+        geo_field_types = tuple(_import_class(field) for field in geo_field_type_names)
 
         for field in cls._fields.values():
             if not isinstance(field, geo_field_types):
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 67a5f112e..f3a6903d6 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -337,7 +337,7 @@ def __new__(mcs, name, bases, attrs):
         # allow_inheritance to False. If the base Document allows inheritance,
         # none of its subclasses can override allow_inheritance to False.
         simple_class = all(
-            [b._meta.get("abstract") for b in flattened_bases if hasattr(b, "_meta")]
+            b._meta.get("abstract") for b in flattened_bases if hasattr(b, "_meta")
         )
         if (
             not simple_class
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 3cd200ea5..d63e24fde 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -51,10 +51,10 @@ def __call__(self, items, max_depth=1, instance=None, name=None):
                 doc_type = doc_type.document_type
                 is_list = not hasattr(items, "items")
 
-                if is_list and all([i.__class__ == doc_type for i in items]):
+                if is_list and all(i.__class__ == doc_type for i in items):
                     return items
                 elif not is_list and all(
-                    [i.__class__ == doc_type for i in items.values()]
+                    i.__class__ == doc_type for i in items.values()
                 ):
                     return items
                 elif not field.dbref:
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f1d854af0..abfe262c8 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1743,7 +1743,7 @@ def __repr__(self):
 
     def __str__(self):
         gridout = self.get()
-        filename = getattr(gridout, "filename") if gridout else "<no file>"
+        filename = gridout.filename if gridout else "<no file>"
         return f"<{self.__class__.__name__}: {filename} ({self.grid_id})>"
 
     def __eq__(self, other):
diff --git a/setup.cfg b/setup.cfg
index ae1b4f7ec..216e3dfec 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [flake8]
-ignore=E501,F401,F403,F405,I201,I202,W504, W605, W503
+ignore=E501,F403,F405,I201,I202,W504,W605,W503,B007
 exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
 max-complexity=47
 application-import-names=mongoengine,tests
diff --git a/setup.py b/setup.py
index 80819b130..a07e0e588 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 
 # Hack to silence atexit traceback in newer python versions
 try:
-    import multiprocessing
+    import multiprocessing  # noqa: F401
 except ImportError:
     pass
 
diff --git a/tests/document/test_class_methods.py b/tests/document/test_class_methods.py
index e20a58028..4c35b7966 100644
--- a/tests/document/test_class_methods.py
+++ b/tests/document/test_class_methods.py
@@ -29,7 +29,7 @@ def test_definition(self):
         """Ensure that document may be defined using fields."""
         assert ["_cls", "age", "id", "name"] == sorted(self.Person._fields.keys())
         assert ["IntField", "ObjectIdField", "StringField", "StringField"] == sorted(
-            [x.__class__.__name__ for x in self.Person._fields.values()]
+            x.__class__.__name__ for x in self.Person._fields.values()
         )
 
     def test_get_db(self):
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index fdeb4052c..550a4bdf3 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -280,7 +280,7 @@ class C(A, B):
         C.ensure_indexes()
 
         assert sorted(
-            [idx["key"] for idx in C._get_collection().index_information().values()]
+            idx["key"] for idx in C._get_collection().index_information().values()
         ) == sorted([[("_cls", 1), ("b", 1)], [("_id", 1)], [("_cls", 1), ("a", 1)]])
 
     def test_polymorphic_queries(self):
@@ -467,7 +467,7 @@ class City(Document):
         assert city.pk is None
         # TODO: expected error? Shouldn't we create a new error type?
         with pytest.raises(KeyError):
-            setattr(city, "pk", 1)
+            city.pk = 1
 
     def test_allow_inheritance_embedded_document(self):
         """Ensure embedded documents respect inheritance."""
@@ -499,13 +499,8 @@ class DateCreatedDocument(Document):
         class DateUpdatedDocument(Document):
             meta = {"allow_inheritance": True, "abstract": True}
 
-        try:
-
-            class MyDocument(DateCreatedDocument, DateUpdatedDocument):
-                pass
-
-        except Exception:
-            assert False, "Couldn't create MyDocument class"
+        class MyDocument(DateCreatedDocument, DateUpdatedDocument):
+            pass
 
     def test_abstract_documents(self):
         """Ensure that a document superclass can be marked as abstract
diff --git a/tests/document/test_validation.py b/tests/document/test_validation.py
index 104eb6931..40134348f 100644
--- a/tests/document/test_validation.py
+++ b/tests/document/test_validation.py
@@ -210,10 +210,7 @@ class Child(Parent):
         child.reference = parent
 
         # Saving the child should not raise a ValidationError
-        try:
-            child.save()
-        except ValidationError as e:
-            self.fail("ValidationError raised: %s" % e.message)
+        child.save()
 
 
 if __name__ == "__main__":
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index d8ae91755..aa1624d10 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -60,7 +60,7 @@ class LogEntry(Document):
             assert log == log1
 
         # Test string padding
-        microsecond = map(int, [math.pow(10, x) for x in range(6)])
+        microsecond = map(int, (math.pow(10, x) for x in range(6)))
         mm = dd = hh = ii = ss = [1, 10]
 
         for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond):
diff --git a/tests/fields/test_email_field.py b/tests/fields/test_email_field.py
index 974360ef6..762e06d6f 100644
--- a/tests/fields/test_email_field.py
+++ b/tests/fields/test_email_field.py
@@ -1,8 +1,6 @@
-import sys
-
 import pytest
 
-from mongoengine import *
+from mongoengine import Document, EmailField, ValidationError
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index ce16a9042..266d0e9dd 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -1357,9 +1357,9 @@ class Bar(Document):
         foo.delete()
         bar = Bar.objects.get()
         with pytest.raises(DoesNotExist):
-            getattr(bar, "ref")
+            bar.ref
         with pytest.raises(DoesNotExist):
-            getattr(bar, "generic_ref")
+            bar.generic_ref
 
         # When auto_dereference is disabled, there is no trouble returning DBRef
         bar = Bar.objects.get()
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index 9a20c9174..b45db3f9e 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -11,7 +11,7 @@
 from mongoengine.connection import get_db
 
 try:
-    from PIL import Image
+    from PIL import Image  # noqa: F401
 
     HAS_PIL = True
 except ImportError:
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
index b6b2917f9..53e69f7b3 100644
--- a/tests/fields/test_sequence_field.py
+++ b/tests/fields/test_sequence_field.py
@@ -166,8 +166,8 @@ class Person(Document):
         ids = [i.id for i in Person.objects]
         assert ids == list(range(1, 11))
 
-        id = [i.id for i in Animal.objects]
-        assert id == list(range(1, 11))
+        _id = [i.id for i in Animal.objects]
+        assert _id == list(range(1, 11))
 
         c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
         assert c["next"] == 10
diff --git a/tests/queryset/test_pickable.py b/tests/queryset/test_pickable.py
index d20db32ee..7aa244e5f 100644
--- a/tests/queryset/test_pickable.py
+++ b/tests/queryset/test_pickable.py
@@ -1,8 +1,6 @@
 import pickle
-import unittest
 
 from mongoengine import Document, IntField, StringField
-from mongoengine.connection import connect
 from tests.utils import MongoDBTestCase
 
 
@@ -22,14 +20,11 @@ def setUp(self):
         self.john = Person.objects.create(name="John", age=21)
 
     def test_picke_simple_qs(self):
-
         qs = Person.objects.all()
-
         pickle.dumps(qs)
 
     def _get_loaded(self, qs):
         s = pickle.dumps(qs)
-
         return pickle.loads(s)
 
     def test_unpickle(self):
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index c75f2f10e..079447bc6 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -5,7 +5,6 @@
 
 from bson import DBRef, ObjectId
 import pymongo
-from pymongo.read_concern import ReadConcern
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import UpdateResult
 import pytest
@@ -449,7 +448,7 @@ class A(Document):
 
         # test iterating over the result set
         cnt = 0
-        for a in A.objects.batch_size(10):
+        for _ in A.objects.batch_size(10):
             cnt += 1
         assert cnt == 100
 
@@ -457,7 +456,7 @@ class A(Document):
         qs = A.objects.all()
         qs = qs.limit(10).batch_size(20).skip(91)
         cnt = 0
-        for a in qs:
+        for _ in qs:
             cnt += 1
         assert cnt == 9
 
@@ -1146,7 +1145,7 @@ def test_repeated_iteration(self):
         people2 = [person for person in queryset]
 
         # Check that it still works even if iteration is interrupted.
-        for person in queryset:
+        for _person in queryset:
             break
         people3 = [person for person in queryset]
 
@@ -1182,7 +1181,7 @@ def __repr__(self):
         assert "[<Doc: 1>, <Doc: 2>, <Doc: 3>]" == "%s" % docs
 
         assert docs.count(with_limit_and_skip=True) == 3
-        for doc in docs:
+        for _ in docs:
             assert ".. queryset mid-iteration .." == repr(docs)
 
     def test_regex_query_shortcuts(self):
@@ -3171,10 +3170,10 @@ class Test(Document):
 
         Test.drop_collection()
 
-        for i in range(50):
+        for _ in range(50):
             Test(val=1).save()
 
-        for i in range(20):
+        for _ in range(20):
             Test(val=2).save()
 
         freqs = Test.objects.item_frequencies("val", map_reduce=False, normalize=True)
@@ -3207,7 +3206,7 @@ def test_average(self):
 
         for i, weight in enumerate(ages):
             self.Person(
-                name="test meta%i", person_meta=self.PersonMeta(weight=weight)
+                name=f"test meta{i}", person_meta=self.PersonMeta(weight=weight)
             ).save()
 
         assert (
@@ -3246,7 +3245,7 @@ def test_sum(self):
 
         # test summing over a filtered queryset
         assert self.Person.objects.filter(age__gte=50).sum("age") == sum(
-            [a for a in ages if a >= 50]
+            a for a in ages if a >= 50
         )
 
     def test_sum_over_db_field(self):
diff --git a/tests/test_common.py b/tests/test_common.py
index 1779a91bb..d4122863c 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1,5 +1,3 @@
-import unittest
-
 import pytest
 
 from mongoengine import Document
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 6599c7f2c..4ea7fa5ab 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -180,11 +180,11 @@ class Group(Document):
 
         with no_dereference(Group) as Group:
             group = Group.objects.first()
-            assert all([not isinstance(m, User) for m in group.members])
+            assert all(not isinstance(m, User) for m in group.members)
             assert not isinstance(group.ref, User)
             assert not isinstance(group.generic, User)
 
-        assert all([isinstance(m, User) for m in group.members])
+        assert all(isinstance(m, User) for m in group.members)
         assert isinstance(group.ref, User)
         assert isinstance(group.generic, User)
 
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 1db5975d3..931a1f6e0 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -421,7 +421,7 @@ def test_setattr_getattr(self):
         d.a = 1
         assert d.a == 1
         with pytest.raises(AttributeError):
-            getattr(d, "b")
+            d.b
 
     def test_setattr_raises_on_nonexisting_attr(self):
         d = self.dtype()
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index 640aed36e..bddcc5432 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -49,7 +49,7 @@ class Group(Document):
             len(group_obj.members)
             assert q == 2
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
 
         # Document select_related
@@ -58,7 +58,7 @@ class Group(Document):
 
             group_obj = Group.objects.first().select_related()
             assert q == 2
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
 
         # Queryset select_related
@@ -67,7 +67,7 @@ class Group(Document):
             group_objs = Group.objects.select_related()
             assert q == 2
             for group_obj in group_objs:
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 2
 
         User.drop_collection()
@@ -99,14 +99,14 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
             assert group_obj._data["members"]._dereferenced
 
             # verifies that no additional queries gets executed
             # if we re-iterate over the ListField once it is
             # dereferenced
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
             assert group_obj._data["members"]._dereferenced
 
@@ -117,7 +117,7 @@ class Group(Document):
             group_obj = Group.objects.first().select_related()
 
             assert q == 2
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
 
         # Queryset select_related
@@ -126,7 +126,7 @@ class Group(Document):
             group_objs = Group.objects.select_related()
             assert q == 2
             for group_obj in group_objs:
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 2
 
     def test_list_item_dereference_orphan_dbref(self):
@@ -158,14 +158,14 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
             assert group_obj._data["members"]._dereferenced
 
             # verifies that no additional queries gets executed
             # if we re-iterate over the ListField once it is
             # dereferenced
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
             assert group_obj._data["members"]._dereferenced
 
@@ -505,10 +505,10 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
             for m in group_obj.members:
@@ -521,10 +521,10 @@ class Group(Document):
             group_obj = Group.objects.first().select_related()
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
             for m in group_obj.members:
@@ -538,10 +538,10 @@ class Group(Document):
             assert q == 4
 
             for group_obj in group_objs:
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 4
 
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 4
 
                 for m in group_obj.members:
@@ -592,11 +592,11 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
             assert group_obj._data["members"]._dereferenced
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
             assert group_obj._data["members"]._dereferenced
 
@@ -648,10 +648,10 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
             for m in group_obj.members:
@@ -664,10 +664,10 @@ class Group(Document):
             group_obj = Group.objects.first().select_related()
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
             for m in group_obj.members:
@@ -681,10 +681,10 @@ class Group(Document):
             assert q == 4
 
             for group_obj in group_objs:
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 4
 
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 4
 
                 for m in group_obj.members:
@@ -723,10 +723,10 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
 
-            for k, m in group_obj.members.items():
+            for _, m in group_obj.members.items():
                 assert isinstance(m, User)
 
         # Document select_related
@@ -736,7 +736,7 @@ class Group(Document):
             group_obj = Group.objects.first().select_related()
             assert q == 2
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
 
             for k, m in group_obj.members.items():
@@ -750,7 +750,7 @@ class Group(Document):
             assert q == 2
 
             for group_obj in group_objs:
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 2
 
                 for k, m in group_obj.members.items():
@@ -801,10 +801,10 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
             for k, m in group_obj.members.items():
@@ -817,10 +817,10 @@ class Group(Document):
             group_obj = Group.objects.first().select_related()
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
             for k, m in group_obj.members.items():
@@ -834,10 +834,10 @@ class Group(Document):
             assert q == 4
 
             for group_obj in group_objs:
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 4
 
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 4
 
                 for k, m in group_obj.members.items():
@@ -852,7 +852,7 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 1
             assert group_obj.members == {}
 
@@ -891,10 +891,10 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
 
             for k, m in group_obj.members.items():
@@ -907,10 +907,10 @@ class Group(Document):
             group_obj = Group.objects.first().select_related()
             assert q == 2
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 2
 
             for k, m in group_obj.members.items():
@@ -924,13 +924,13 @@ class Group(Document):
             assert q == 2
 
             for group_obj in group_objs:
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 2
 
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 2
 
-                for k, m in group_obj.members.items():
+                for _, m in group_obj.members.items():
                     assert isinstance(m, UserA)
 
         UserA.drop_collection()
@@ -978,13 +978,13 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            for k, m in group_obj.members.items():
+            for _, m in group_obj.members.items():
                 assert "User" in m.__class__.__name__
 
         # Document select_related
@@ -994,13 +994,13 @@ class Group(Document):
             group_obj = Group.objects.first().select_related()
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 4
 
-            for k, m in group_obj.members.items():
+            for _, m in group_obj.members.items():
                 assert "User" in m.__class__.__name__
 
         # Queryset select_related
@@ -1011,13 +1011,13 @@ class Group(Document):
             assert q == 4
 
             for group_obj in group_objs:
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 4
 
-                [m for m in group_obj.members]
+                _ = [m for m in group_obj.members]
                 assert q == 4
 
-                for k, m in group_obj.members.items():
+                for _, m in group_obj.members.items():
                     assert "User" in m.__class__.__name__
 
         Group.objects.delete()
@@ -1029,7 +1029,7 @@ class Group(Document):
             group_obj = Group.objects.first()
             assert q == 1
 
-            [m for m in group_obj.members]
+            _ = [m for m in group_obj.members]
             assert q == 1
 
         UserA.drop_collection()
diff --git a/tests/test_utils.py b/tests/test_utils.py
index ca7defad0..a97645aec 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,5 +1,4 @@
 import re
-import unittest
 
 import pytest
 

From bf12621ce9ee0006a7d3a2d5d18cac8a26dbc88b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Sat, 12 Dec 2020 22:33:48 +0100
Subject: [PATCH 1132/1519] update flake8 version in pre-commit

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 730fcb2b9..066385a2e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ repos:
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.0a2
+    rev: 3.8.4
     hooks:
       - id: flake8
         additional_dependencies:

From 149fb953e70808602a0235c1039691f8ff09755f Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Sun, 13 Dec 2020 00:16:10 +0100
Subject: [PATCH 1133/1519] fix recent update not aligned with latest black

---
 mongoengine/base/fields.py       |  3 +--
 mongoengine/fields.py            | 16 +++++-----------
 mongoengine/queryset/base.py     |  6 ++----
 mongoengine/queryset/queryset.py |  9 +++------
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 61dde5d2f..ca01d00d3 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -514,8 +514,7 @@ def validate(self, value):
 
 
 class GeoJsonBaseField(BaseField):
-    """A geo json field storing a geojson style object.
-    """
+    """A geo json field storing a geojson style object."""
 
     _geo_index = pymongo.GEOSPHERE
     _type = "GeoBase"
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index abfe262c8..e29f55ab1 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -197,9 +197,7 @@ def validate(self, value):
 
 
 class EmailField(StringField):
-    """A field that validates input as an email address.
-
-    """
+    """A field that validates input as an email address."""
 
     USER_REGEX = LazyRegexCompiler(
         # `dot-atom` defined in RFC 5322 Section 3.2.3.
@@ -1299,8 +1297,7 @@ def lookup_member(self, member_name):
 
 
 class CachedReferenceField(BaseField):
-    """A referencefield with cache fields to purpose pseudo-joins
-    """
+    """A referencefield with cache fields to purpose pseudo-joins"""
 
     def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
         """Initialises the Cached Reference Field.
@@ -1680,8 +1677,7 @@ class GridFSError(Exception):
 
 
 class GridFSProxy:
-    """Proxy object to handle writing and reading of files to and from GridFS
-    """
+    """Proxy object to handle writing and reading of files to and from GridFS"""
 
     _fs = None
 
@@ -1843,8 +1839,7 @@ def _mark_as_changed(self):
 
 
 class FileField(BaseField):
-    """A GridFS storage field.
-    """
+    """A GridFS storage field."""
 
     proxy_class = GridFSProxy
 
@@ -2219,8 +2214,7 @@ def to_python(self, value):
 
 
 class UUIDField(BaseField):
-    """A UUID field.
-    """
+    """A UUID field."""
 
     _binary = None
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 1f29cdf7c..66a4c37a1 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -281,8 +281,7 @@ def get(self, *q_objs, **query):
         )
 
     def create(self, **kwargs):
-        """Create new object. Returns the saved object instance.
-        """
+        """Create new object. Returns the saved object instance."""
         return self._document(**kwargs).save(force_insert=True)
 
     def first(self):
@@ -1579,8 +1578,7 @@ def __next__(self):
         return doc
 
     def rewind(self):
-        """Rewind the cursor to its unevaluated state.
-        """
+        """Rewind the cursor to its unevaluated state."""
         self._iter = False
         self._cursor.rewind()
 
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 397fe464f..49f2724c1 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -150,8 +150,7 @@ def count(self, with_limit_and_skip=False):
         return self._len
 
     def no_cache(self):
-        """Convert to a non-caching queryset
-        """
+        """Convert to a non-caching queryset"""
         if self._result_cache is not None:
             raise OperationError("QuerySet already cached")
 
@@ -162,13 +161,11 @@ class QuerySetNoCache(BaseQuerySet):
     """A non caching QuerySet"""
 
     def cache(self):
-        """Convert to a caching queryset
-        """
+        """Convert to a caching queryset"""
         return self._clone_into(QuerySet(self._document, self._collection))
 
     def __repr__(self):
-        """Provides the string representation of the QuerySet
-        """
+        """Provides the string representation of the QuerySet"""
         if self._iter:
             return ".. queryset mid-iteration .."
 

From c28bb517cb3186543ec59afebe092e69198dc59c Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Sun, 13 Dec 2020 10:43:26 +0100
Subject: [PATCH 1134/1519] Use Queryset._query instead of Cursor.__spec for
 count()

---
 docs/changelog.rst               |  1 +
 mongoengine/queryset/base.py     |  2 +-
 tests/document/test_instance.py  | 50 ++++++++++----------------------
 tests/queryset/test_transform.py | 19 ++++++------
 4 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 899d45f85..7b52efd31 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Fix LazyReferenceField dereferencing in embedded documents #2426
+- Fix regarding the recent use of Cursor.__spec in .count() that was interfering with mongomock #2425
 
 Changes in 0.21.0
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 66a4c37a1..c4a7e7710 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -420,7 +420,7 @@ def count(self, with_limit_and_skip=False):
 
         count = count_documents(
             collection=self._cursor.collection,
-            filter=self._cursor._Cursor__spec,
+            filter=self._query,
             **kwargs,
         )
 
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 17b99983b..78a550ce2 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -2900,50 +2900,32 @@ def __str__(self):
         # Checks
         assert ",".join([str(b) for b in Book.objects.all()]) == "1,2,3,4,5,6,7,8,9"
         # bob related books
-        assert (
-            ",".join(
-                [
-                    str(b)
-                    for b in Book.objects.filter(
-                        Q(extra__a=bob) | Q(author=bob) | Q(extra__b=bob)
-                    )
-                ]
-            )
-            == "1,2,3,4"
+        bob_books_qs = Book.objects.filter(
+            Q(extra__a=bob) | Q(author=bob) | Q(extra__b=bob)
         )
+        assert [str(b) for b in bob_books_qs] == ["1", "2", "3", "4"]
+        assert bob_books_qs.count() == 4
 
         # Susan & Karl related books
-        assert (
-            ",".join(
-                [
-                    str(b)
-                    for b in Book.objects.filter(
-                        Q(extra__a__all=[karl, susan])
-                        | Q(author__all=[karl, susan])
-                        | Q(extra__b__all=[karl.to_dbref(), susan.to_dbref()])
-                    )
-                ]
-            )
-            == "1"
+        susan_karl_books_qs = Book.objects.filter(
+            Q(extra__a__all=[karl, susan])
+            | Q(author__all=[karl, susan])
+            | Q(extra__b__all=[karl.to_dbref(), susan.to_dbref()])
         )
+        assert [str(b) for b in susan_karl_books_qs] == ["1"]
+        assert susan_karl_books_qs.count() == 1
 
         # $Where
-        assert (
-            ",".join(
-                [
-                    str(b)
-                    for b in Book.objects.filter(
-                        __raw__={
-                            "$where": """
+        custom_qs = Book.objects.filter(
+            __raw__={
+                "$where": """
                                             function(){
                                                 return this.name == '1' ||
                                                        this.name == '2';}"""
-                        }
-                    )
-                ]
-            )
-            == "1,2"
+            }
         )
+        assert [str(b) for b in custom_qs] == ["1", "2"]
+        assert custom_qs.count() == 2
 
     def test_switch_db_instance(self):
         register_connection("testdb-1", "mongoenginetest2")
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index e51683aef..62e95dd67 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -104,18 +104,17 @@ class BlogPost(Document):
         post = BlogPost(**data)
         post.save()
 
-        assert "postTitle" in BlogPost.objects(title=data["title"])._query
-        assert not ("title" in BlogPost.objects(title=data["title"])._query)
-        assert BlogPost.objects(title=data["title"]).count() == 1
+        qs = BlogPost.objects(title=data["title"])
+        assert qs._query == {"postTitle": data["title"]}
+        assert qs.count() == 1
 
-        assert "_id" in BlogPost.objects(pk=post.id)._query
-        assert BlogPost.objects(pk=post.id).count() == 1
+        qs = BlogPost.objects(pk=post.id)
+        assert qs._query == {"_id": post.id}
+        assert qs.count() == 1
 
-        assert (
-            "postComments.commentContent"
-            in BlogPost.objects(comments__content="test")._query
-        )
-        assert BlogPost.objects(comments__content="test").count() == 1
+        qs = BlogPost.objects(comments__content="test")
+        assert qs._query == {"postComments.commentContent": "test"}
+        assert qs.count() == 1
 
         BlogPost.drop_collection()
 

From 65b8cfc96a7ca30aec654d6cc4d4bdf7cfcc8621 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bastien.gerard@cluepoints.com>
Date: Mon, 14 Dec 2020 00:03:39 +0100
Subject: [PATCH 1135/1519] Improve mongomock tests to avoid regression

---
 tests/test_connection.py           | 119 +-------------------
 tests/test_connection_mongomock.py | 173 +++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+), 117 deletions(-)
 create mode 100644 tests/test_connection_mongomock.py

diff --git a/tests/test_connection.py b/tests/test_connection.py
index ab88ce0c3..7ffa98f3c 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,17 +1,12 @@
 import datetime
+import unittest
 
 from bson.tz_util import utc
 import pymongo
-
 from pymongo import MongoClient, ReadPreference
 from pymongo.errors import InvalidName, OperationFailure
 import pytest
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 import mongoengine.connection
 from mongoengine import (
     DateTimeField,
@@ -34,18 +29,6 @@ def get_tz_awareness(connection):
     return connection.codec_options.tz_aware
 
 
-try:
-    import mongomock
-
-    MONGOMOCK_INSTALLED = True
-except ImportError:
-    MONGOMOCK_INSTALLED = False
-
-require_mongomock = pytest.mark.skipif(
-    not MONGOMOCK_INSTALLED, reason="you need mongomock installed to run this testcase"
-)
-
-
 class ConnectionTest(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -196,7 +179,7 @@ def test_connect_passes_silently_connect_multiple_times_with_same_config(self):
     def test_connect_with_invalid_db_name(self):
         """Ensure that connect() method fails fast if db name is invalid"""
         with pytest.raises(InvalidName):
-            connect("mongomock://localhost")
+            connect("mongodb://localhost")
 
     def test_connect_with_db_name_external(self):
         """Ensure that connect() works if db name is $external"""
@@ -220,104 +203,6 @@ def test_connect_with_invalid_db_name_type(self):
             non_string_db_name = ["e. g. list instead of a string"]
             connect(non_string_db_name)
 
-    @require_mongomock
-    def test_connect_in_mocking(self):
-        """Ensure that the connect() method works properly in mocking."""
-        connect("mongoenginetest", host="mongomock://localhost")
-        conn = get_connection()
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect("mongoenginetest2", host="mongomock://localhost", alias="testdb2")
-        conn = get_connection("testdb2")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(
-            "mongoenginetest3",
-            host="mongodb://localhost",
-            is_mock=True,
-            alias="testdb3",
-        )
-        conn = get_connection("testdb3")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect("mongoenginetest4", is_mock=True, alias="testdb4")
-        conn = get_connection("testdb4")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(
-            host="mongodb://localhost:27017/mongoenginetest5",
-            is_mock=True,
-            alias="testdb5",
-        )
-        conn = get_connection("testdb5")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(host="mongomock://localhost:27017/mongoenginetest6", alias="testdb6")
-        conn = get_connection("testdb6")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(
-            host="mongomock://localhost:27017/mongoenginetest7",
-            is_mock=True,
-            alias="testdb7",
-        )
-        conn = get_connection("testdb7")
-        assert isinstance(conn, mongomock.MongoClient)
-
-    @require_mongomock
-    def test_default_database_with_mocking(self):
-        """Ensure that the default database is correctly set when using mongomock."""
-        disconnect_all()
-
-        class SomeDocument(Document):
-            pass
-
-        conn = connect(host="mongomock://localhost:27017/mongoenginetest")
-        some_document = SomeDocument()
-        # database won't exist until we save a document
-        some_document.save()
-        assert conn.get_default_database().name == "mongoenginetest"
-        assert conn.list_database_names()[0] == "mongoenginetest"
-
-    @require_mongomock
-    def test_connect_with_host_list(self):
-        """Ensure that the connect() method works when host is a list
-
-        Uses mongomock to test w/o needing multiple mongod/mongos processes
-        """
-        connect(host=["mongomock://localhost"])
-        conn = get_connection()
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(host=["mongodb://localhost"], is_mock=True, alias="testdb2")
-        conn = get_connection("testdb2")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(host=["localhost"], is_mock=True, alias="testdb3")
-        conn = get_connection("testdb3")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(
-            host=["mongomock://localhost:27017", "mongomock://localhost:27018"],
-            alias="testdb4",
-        )
-        conn = get_connection("testdb4")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(
-            host=["mongodb://localhost:27017", "mongodb://localhost:27018"],
-            is_mock=True,
-            alias="testdb5",
-        )
-        conn = get_connection("testdb5")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(
-            host=["localhost:27017", "localhost:27018"], is_mock=True, alias="testdb6"
-        )
-        conn = get_connection("testdb6")
-        assert isinstance(conn, mongomock.MongoClient)
-
     def test_disconnect_cleans_globals(self):
         """Ensure that the disconnect() method cleans the globals objects"""
         connections = mongoengine.connection._connections
diff --git a/tests/test_connection_mongomock.py b/tests/test_connection_mongomock.py
new file mode 100644
index 000000000..a35dc5512
--- /dev/null
+++ b/tests/test_connection_mongomock.py
@@ -0,0 +1,173 @@
+import unittest
+
+import pytest
+
+import mongoengine.connection
+from mongoengine import (
+    Document,
+    StringField,
+    connect,
+    disconnect_all,
+)
+from mongoengine.connection import get_connection
+
+
+try:
+    import mongomock
+
+    MONGOMOCK_INSTALLED = True
+except ImportError:
+    MONGOMOCK_INSTALLED = False
+
+require_mongomock = pytest.mark.skipif(
+    not MONGOMOCK_INSTALLED, reason="you need mongomock installed to run this testcase"
+)
+
+
+class MongoMockConnectionTest(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        disconnect_all()
+
+    @classmethod
+    def tearDownClass(cls):
+        disconnect_all()
+
+    def tearDown(self):
+        mongoengine.connection._connection_settings = {}
+        mongoengine.connection._connections = {}
+        mongoengine.connection._dbs = {}
+
+    @require_mongomock
+    def test_connect_in_mocking(self):
+        """Ensure that the connect() method works properly in mocking."""
+        connect("mongoenginetest", host="mongomock://localhost")
+        conn = get_connection()
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect("mongoenginetest2", host="mongomock://localhost", alias="testdb2")
+        conn = get_connection("testdb2")
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect(
+            "mongoenginetest3",
+            host="mongodb://localhost",
+            is_mock=True,
+            alias="testdb3",
+        )
+        conn = get_connection("testdb3")
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect("mongoenginetest4", is_mock=True, alias="testdb4")
+        conn = get_connection("testdb4")
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect(
+            host="mongodb://localhost:27017/mongoenginetest5",
+            is_mock=True,
+            alias="testdb5",
+        )
+        conn = get_connection("testdb5")
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect(host="mongomock://localhost:27017/mongoenginetest6", alias="testdb6")
+        conn = get_connection("testdb6")
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect(
+            host="mongomock://localhost:27017/mongoenginetest7",
+            is_mock=True,
+            alias="testdb7",
+        )
+        conn = get_connection("testdb7")
+        assert isinstance(conn, mongomock.MongoClient)
+
+    @require_mongomock
+    def test_default_database_with_mocking(self):
+        """Ensure that the default database is correctly set when using mongomock."""
+        disconnect_all()
+
+        class SomeDocument(Document):
+            pass
+
+        conn = connect(host="mongomock://localhost:27017/mongoenginetest")
+        some_document = SomeDocument()
+        # database won't exist until we save a document
+        some_document.save()
+        assert SomeDocument.objects.count() == 1
+        assert conn.get_default_database().name == "mongoenginetest"
+        assert conn.list_database_names()[0] == "mongoenginetest"
+
+    @require_mongomock
+    def test_basic_queries_against_mongomock(self):
+        disconnect_all()
+
+        connect(host="mongomock://localhost:27017/mongoenginetest")
+
+        class Person(Document):
+            name = StringField()
+
+        Person.drop_collection()
+        assert Person.objects.count() == 0
+
+        bob = Person(name="Bob").save()
+        john = Person(name="John").save()
+        assert Person.objects.count() == 2
+
+        qs = Person.objects(name="Bob")
+        assert qs.count() == 1
+        assert qs.first() == bob
+        assert list(qs.as_pymongo()) == [{"_id": bob.id, "name": "Bob"}]
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects.order_by("name").aggregate(pipeline)
+        assert list(data) == [
+            {"_id": bob.id, "name": "BOB"},
+            {"_id": john.id, "name": "JOHN"},
+        ]
+
+        Person.drop_collection()
+        assert Person.objects.count() == 0
+
+    @require_mongomock
+    def test_connect_with_host_list(self):
+        """Ensure that the connect() method works when host is a list
+
+        Uses mongomock to test w/o needing multiple mongod/mongos processes
+        """
+        connect(host=["mongomock://localhost"])
+        conn = get_connection()
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect(host=["mongodb://localhost"], is_mock=True, alias="testdb2")
+        conn = get_connection("testdb2")
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect(host=["localhost"], is_mock=True, alias="testdb3")
+        conn = get_connection("testdb3")
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect(
+            host=["mongomock://localhost:27017", "mongomock://localhost:27018"],
+            alias="testdb4",
+        )
+        conn = get_connection("testdb4")
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect(
+            host=["mongodb://localhost:27017", "mongodb://localhost:27018"],
+            is_mock=True,
+            alias="testdb5",
+        )
+        conn = get_connection("testdb5")
+        assert isinstance(conn, mongomock.MongoClient)
+
+        connect(
+            host=["localhost:27017", "localhost:27018"], is_mock=True, alias="testdb6"
+        )
+        conn = get_connection("testdb6")
+        assert isinstance(conn, mongomock.MongoClient)
+
+
+if __name__ == "__main__":
+    unittest.main()

From dd11911ed7014677f0fcce49438504207567bb4e Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 14 Dec 2020 22:39:48 +0100
Subject: [PATCH 1136/1519] update changelog and bump version to 0.22.0

---
 docs/changelog.rst      | 4 ++++
 mongoengine/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7b52efd31..424481840 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,8 +6,12 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.22.0
+=================
 - Fix LazyReferenceField dereferencing in embedded documents #2426
 - Fix regarding the recent use of Cursor.__spec in .count() that was interfering with mongomock #2425
+- Drop support for Python 3.5 by introducing f-strings in the codebase
 
 Changes in 0.21.0
 =================
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 93b0edd07..82add8ceb 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -28,7 +28,7 @@
 )
 
 
-VERSION = (0, 21, 0)
+VERSION = (0, 22, 0)
 
 
 def get_version():

From 0014346de1216ec0b1422bd42ff422bd52f95106 Mon Sep 17 00:00:00 2001
From: kyle-verhoog <kyle@verhoog.ca>
Date: Tue, 15 Dec 2020 02:31:23 -0500
Subject: [PATCH 1137/1519] Drop Python 3.5 support

---
 setup.py | 3 +--
 tox.ini  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index a07e0e588..ffc35743a 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,6 @@ def run_tests(self):
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.5",
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
@@ -140,7 +139,7 @@ def run_tests(self):
     long_description=LONG_DESCRIPTION,
     platforms=["any"],
     classifiers=CLASSIFIERS,
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     install_requires=["pymongo>=3.4, <4.0"],
     cmdclass={"test": PyTest},
     **extra_opts
diff --git a/tox.ini b/tox.ini
index 6f33772cb..937544d27 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py35,pypy3}-{mg34,mg36,mg39,mg311}
+envlist = pypy3-{mg34,mg36,mg39,mg311}
 
 [testenv]
 commands =

From fe9f7f1f808ce7532779ea69eeac87c378c2a7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Mon, 2 Nov 2020 20:31:23 +0100
Subject: [PATCH 1138/1519] test github actions

---
 .github/workflows/github-actions.yml       | 54 ++++++++++++++++++++++
 .github/workflows/install_ci_python_dep.sh |  5 ++
 .github/workflows/install_mongo.sh         |  8 ++++
 .github/workflows/start_mongo.sh           |  8 ++++
 4 files changed, 75 insertions(+)
 create mode 100644 .github/workflows/github-actions.yml
 create mode 100644 .github/workflows/install_ci_python_dep.sh
 create mode 100644 .github/workflows/install_mongo.sh
 create mode 100644 .github/workflows/start_mongo.sh

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
new file mode 100644
index 000000000..678b39ae6
--- /dev/null
+++ b/.github/workflows/github-actions.yml
@@ -0,0 +1,54 @@
+name: MongoengineCI
+on: [push]
+env:
+  MONGODB_3_4: 3.4.19
+  MONGODB_3_6: 3.6.13
+  MONGODB_4_0: 4.0.13
+
+  PYMONGO_3_4: 3.4
+  PYMONGO_3_6: 3.6
+  PYMONGO_3_9: 3.9
+  PYMONGO_3_11: 3.11
+
+  MAIN_PYTHON_VERSION: 3.7
+jobs:
+  linting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+    - run: bash .github/workflows/install_ci_python_dep.sh
+    - run: pre-commit run -a
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        MONGODB: [$MONGODB_4_0]
+        PYMONGO: [$PYMONGO_3_11]
+        include:
+          - python-version: 3.7
+            MONGODB: $MONGODB_3_4
+            PYMONGO: $PYMONGO_3_6
+          - python-version: 3.7
+            MONGODB: $MONGODB_3_6
+            PYMONGO: $PYMONGO_3_9
+          - python-version: 3.7
+            MONGODB: $MONGODB_3_6
+            PYMONGO: $PYMONGO_3_11
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - run: bash .github/workflows/install_mongo.sh ${{ matrix.MONGODB }}
+    - run: bash .github/workflows/install_ci_python_dep.sh
+    - run: bash .github/workflows/start_mongo.sh ${{ matrix.MONGODB }}
+    - name: tox dry-run (to pre-install venv)
+      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
+    - name: Run test suite
+      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
diff --git a/.github/workflows/install_ci_python_dep.sh b/.github/workflows/install_ci_python_dep.sh
new file mode 100644
index 000000000..48b04e9d0
--- /dev/null
+++ b/.github/workflows/install_ci_python_dep.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+pip install --upgrade pip
+pip install coveralls
+pip install pre-commit
+pip install tox
diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
new file mode 100644
index 000000000..a98440a8f
--- /dev/null
+++ b/.github/workflows/install_mongo.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+MONGODB=$1
+
+mongo_build=mongodb-linux-x86_64-${MONGODB}
+wget http://fastdl.mongodb.org/linux/$mongo_build.tgz
+tar xzf $mongo_build.tgz
+${PWD}/$mongo_build/bin/mongod --version
diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
new file mode 100644
index 000000000..dc844dbd5
--- /dev/null
+++ b/.github/workflows/start_mongo.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+MONGODB=$1
+
+mongodb_dir=${PWD}/mongodb-linux-x86_64-${MONGODB}
+mkdir $mongodb_dir/data
+$mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork
+mongo --eval 'db.version();'    # Make sure mongo is awake

From 59438a476825fbfff51e0407e95b8b2d1ff235d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 4 Nov 2020 14:58:42 +0100
Subject: [PATCH 1139/1519] add IRC notif to github actions

---
 .github/workflows/github-actions.yml | 37 +++++++++++++++++++++++++---
 .travis.yml                          |  1 +
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 678b39ae6..b4df9fc05 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -1,5 +1,10 @@
 name: MongoengineCI
-on: [push]
+on:
+  push:
+    branches:
+      - master
+      - /^v.*$/
+  pull_request:
 env:
   MONGODB_3_4: 3.4.19
   MONGODB_3_6: 3.6.13
@@ -22,11 +27,14 @@ jobs:
         python-version: 3.7
     - run: bash .github/workflows/install_ci_python_dep.sh
     - run: pre-commit run -a
-  tests:
+
+  test:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        python-version: [3.6]
+        #, 3.7, 3.8, 3.9, pypy3]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
@@ -52,3 +60,26 @@ jobs:
       run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
     - name: Run test suite
       run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
+
+  irc_notification:
+    runs-on: ubuntu-latest
+    needs: [linting, test]
+    steps:
+      - uses: rectalogic/notify-irc@v1
+        if: success()
+        with:
+          channel: "irc.freenode.org#mongoengine"
+          nickname: github-notifier
+          message: |
+            Build ${{ job.status }} - ${{ github.actor }} ${{ github.event_name }} ${{ github.event.ref }}
+  build-wheel:
+    runs-on: ubuntu-latest
+    needs: [linting, test]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.7
+    - run: pip install wheel
+    - run: python setup.py sdist bdist_wheel
diff --git a/.travis.yml b/.travis.yml
index b29dab33c..4f566dcb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,6 +82,7 @@ notifications:
 
 # Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
 branches:
+  # Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
   only:
     - master
     - /^v.*$/

From 7b772e3a4ad44106ba5880be3b84174be506da35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 4 Nov 2020 20:58:52 +0100
Subject: [PATCH 1140/1519] publish to test-pypi

---
 .github/workflows/github-actions.yml | 36 +++++++++++++++++++---------
 .travis.yml                          | 36 ++++++++++++++--------------
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index b4df9fc05..0959d3801 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -1,10 +1,15 @@
 name: MongoengineCI
 on:
+  # All PR
+  pull_request:
+  # master branch merge
   push:
     branches:
       - master
-      - /^v.*$/
-  pull_request:
+  # release tags
+  create:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+*'
 env:
   MONGODB_3_4: 3.4.19
   MONGODB_3_6: 3.6.13
@@ -15,7 +20,7 @@ env:
   PYMONGO_3_9: 3.9
   PYMONGO_3_11: 3.11
 
-  MAIN_PYTHON_VERSION: 3.7
+#  MAIN_PYTHON_VERSION: 3.7
 jobs:
   linting:
     runs-on: ubuntu-latest
@@ -33,8 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6]
-        #, 3.7, 3.8, 3.9, pypy3]
+        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
@@ -53,9 +57,10 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - run: bash .github/workflows/install_mongo.sh ${{ matrix.MONGODB }}
-    - run: bash .github/workflows/install_ci_python_dep.sh
-    - run: bash .github/workflows/start_mongo.sh ${{ matrix.MONGODB }}
+    - run: |
+        bash .github/workflows/install_mongo.sh ${{ matrix.MONGODB }}
+        bash .github/workflows/install_ci_python_dep.sh
+        bash .github/workflows/start_mongo.sh ${{ matrix.MONGODB }}
     - name: tox dry-run (to pre-install venv)
       run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
     - name: Run test suite
@@ -72,7 +77,8 @@ jobs:
           nickname: github-notifier
           message: |
             Build ${{ job.status }} - ${{ github.actor }} ${{ github.event_name }} ${{ github.event.ref }}
-  build-wheel:
+
+  build-n-publish:
     runs-on: ubuntu-latest
     needs: [linting, test]
     steps:
@@ -81,5 +87,13 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: 3.7
-    - run: pip install wheel
-    - run: python setup.py sdist bdist_wheel
+    # todo separate build from publish
+    # https://stackoverflow.com/questions/59349905/which-properties-does-github-event-in-a-github-workflow-have
+    - run: |
+        pip install wheel
+        python setup.py sdist bdist_wheel
+    - uses: pypa/gh-action-pypi-publish@master
+      if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
+      with:
+        password: ${{ secrets.pypi_password }}
+        repository_url: https://test.pypi.org/legacy/
diff --git a/.travis.yml b/.travis.yml
index 4f566dcb3..c67d1c89d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,21 +88,21 @@ branches:
     - /^v.*$/
 
 # Whenever a new release is created via GitHub, publish it on PyPI.
-deploy:
-  provider: pypi
-  user: the_drow
-  password:
-    secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
-
-  # Create a source distribution and a pure python wheel for faster installs.
-  distributions: "sdist bdist_wheel"
-
-  # Only deploy on tagged commits (aka GitHub releases) and only for the parent
-  # repo's builds running Python v3.7 along with PyMongo v3.x and MongoDB v3.4.
-  # We run Travis against many different Python, PyMongo, and MongoDB versions
-  # and we don't want the deploy to occur multiple times).
-  on:
-    tags: true
-    repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = ${PYMONGO_3_11}) && ($MONGODB = ${MONGODB_3_4})
-    python: 3.7
+#deploy:
+#  provider: pypi
+#  user: the_drow
+#  password:
+#    secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
+#
+#  # Create a source distribution and a pure python wheel for faster installs.
+#  distributions: "sdist bdist_wheel"
+#
+#  # Only deploy on tagged commits (aka GitHub releases) and only for the parent
+#  # repo's builds running Python v3.7 along with PyMongo v3.x and MongoDB v3.4.
+#  # We run Travis against many different Python, PyMongo, and MongoDB versions
+#  # and we don't want the deploy to occur multiple times).
+#  on:
+#    tags: true
+#    repo: MongoEngine/mongoengine
+#    condition: ($PYMONGO = ${PYMONGO_3_11}) && ($MONGODB = ${MONGODB_3_4})
+#    python: 3.7

From 8f3d21c312badbe2441521eff610bae69313aa51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 4 Nov 2020 23:14:28 +0100
Subject: [PATCH 1141/1519] improve tag format match

---
 .github/workflows/github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 0959d3801..46bdf3d3d 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -9,7 +9,7 @@ on:
   # release tags
   create:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+*'
+      - 'v[0-9]+\.[0-9]+\.[0-9]+*'
 env:
   MONGODB_3_4: 3.4.19
   MONGODB_3_6: 3.6.13

From fd35df07c40a9f3d39286c7cce32ebc1064f636d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Wed, 4 Nov 2020 23:22:38 +0100
Subject: [PATCH 1142/1519] add regular pypi deploy to github actions

---
 .github/workflows/github-actions.yml |  5 +++-
 .travis.yml                          | 36 ++++++++++++++--------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 46bdf3d3d..52a93f970 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -92,8 +92,11 @@ jobs:
     - run: |
         pip install wheel
         python setup.py sdist bdist_wheel
+    - uses: pypa/gh-action-pypi-publish@master
+      with:
+        password: ${{ secrets.test_pypi_password }}
+        repository_url: https://test.pypi.org/legacy/
     - uses: pypa/gh-action-pypi-publish@master
       if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
       with:
         password: ${{ secrets.pypi_password }}
-        repository_url: https://test.pypi.org/legacy/
diff --git a/.travis.yml b/.travis.yml
index c67d1c89d..4f566dcb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,21 +88,21 @@ branches:
     - /^v.*$/
 
 # Whenever a new release is created via GitHub, publish it on PyPI.
-#deploy:
-#  provider: pypi
-#  user: the_drow
-#  password:
-#    secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
-#
-#  # Create a source distribution and a pure python wheel for faster installs.
-#  distributions: "sdist bdist_wheel"
-#
-#  # Only deploy on tagged commits (aka GitHub releases) and only for the parent
-#  # repo's builds running Python v3.7 along with PyMongo v3.x and MongoDB v3.4.
-#  # We run Travis against many different Python, PyMongo, and MongoDB versions
-#  # and we don't want the deploy to occur multiple times).
-#  on:
-#    tags: true
-#    repo: MongoEngine/mongoengine
-#    condition: ($PYMONGO = ${PYMONGO_3_11}) && ($MONGODB = ${MONGODB_3_4})
-#    python: 3.7
+deploy:
+  provider: pypi
+  user: the_drow
+  password:
+    secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
+
+  # Create a source distribution and a pure python wheel for faster installs.
+  distributions: "sdist bdist_wheel"
+
+  # Only deploy on tagged commits (aka GitHub releases) and only for the parent
+  # repo's builds running Python v3.7 along with PyMongo v3.x and MongoDB v3.4.
+  # We run Travis against many different Python, PyMongo, and MongoDB versions
+  # and we don't want the deploy to occur multiple times).
+  on:
+    tags: true
+    repo: MongoEngine/mongoengine
+    condition: ($PYMONGO = ${PYMONGO_3_11}) && ($MONGODB = ${MONGODB_3_4})
+    python: 3.7

From 0e9920b19029c5e73030ace21a7bb52ffbc389aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Fri, 6 Nov 2020 21:42:12 +0100
Subject: [PATCH 1143/1519] Build sphinx doc as part of ci

---
 .github/workflows/github-actions.yml | 34 ++++++++++++++++++++++------
 docs/Makefile                        |  6 +++++
 docs/conf.py                         |  2 +-
 docs/requirements.txt                |  4 ++--
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 52a93f970..d56e4c3ab 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -66,6 +66,22 @@ jobs:
     - name: Run test suite
       run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
 
+  build_doc_dryrun:
+    # ensures that readthedocs can be built continuously
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+    - run: |
+        pip install -e .
+        pip install -r docs/requirements.txt
+    - run: |
+        cd docs
+        make html-readthedocs
+
   irc_notification:
     runs-on: ubuntu-latest
     needs: [linting, test]
@@ -89,14 +105,18 @@ jobs:
         python-version: 3.7
     # todo separate build from publish
     # https://stackoverflow.com/questions/59349905/which-properties-does-github-event-in-a-github-workflow-have
-    - run: |
+    - name: build dummy wheel for test-pypi
+      run: |
         pip install wheel
-        python setup.py sdist bdist_wheel
-    - uses: pypa/gh-action-pypi-publish@master
+        python setup.py egg_info -b ".dev`date '+%Y%m%d%H%M%S'`" build sdist bdist_wheel
+#        python setup.py sdist bdist_wheel
+    - name: publish test-pypi
+      uses: pypa/gh-action-pypi-publish@master
       with:
         password: ${{ secrets.test_pypi_password }}
         repository_url: https://test.pypi.org/legacy/
-    - uses: pypa/gh-action-pypi-publish@master
-      if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
-      with:
-        password: ${{ secrets.pypi_password }}
+#    - name: publish pypi
+#      uses: pypa/gh-action-pypi-publish@master
+#      if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
+#      with:
+#        password: ${{ secrets.pypi_password }}
diff --git a/docs/Makefile b/docs/Makefile
index cdc77c362..0bf353561 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -35,6 +35,12 @@ html:
 	@echo
 	@echo "Build finished. Check $(BUILDDIR)/html/index.html"
 
+html-readthedocs:
+	$(SPHINXBUILD) -T -E -b readthedocs $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
diff --git a/docs/conf.py b/docs/conf.py
index f8a4999a9..808deaa8b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ["sphinx.ext.autodoc", "sphinx.ext.todo"]
+extensions = ["sphinx.ext.autodoc", "sphinx.ext.todo", "readthedocs_ext.readthedocs"]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
diff --git a/docs/requirements.txt b/docs/requirements.txt
index abd126299..dfda6a70b 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
-pymongo>=3.11
-Sphinx==3.2.1
+Sphinx==3.3.0
 sphinx-rtd-theme==0.5.0
+readthedocs-sphinx-ext==2.1.1

From 6e332e782b7d9c6745ccb5510acee439b3e1ca2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sat, 7 Nov 2020 15:30:51 +0100
Subject: [PATCH 1144/1519] minor improvement to github actions

---
 .github/workflows/github-actions.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index d56e4c3ab..a1a3c4031 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -57,7 +57,8 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - run: |
+    - name: install mongo and ci dependencies
+      run: |
         bash .github/workflows/install_mongo.sh ${{ matrix.MONGODB }}
         bash .github/workflows/install_ci_python_dep.sh
         bash .github/workflows/start_mongo.sh ${{ matrix.MONGODB }}
@@ -75,10 +76,12 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
-    - run: |
+    - name: install python dep
+      run: |
         pip install -e .
         pip install -r docs/requirements.txt
-    - run: |
+    - name: build doc
+      run: |
         cd docs
         make html-readthedocs
 

From cc591a634a3fbd7b24726fbef2dd8059d056e006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bastien.gerard@cluepoints.com>
Date: Sun, 15 Nov 2020 14:02:03 +0100
Subject: [PATCH 1145/1519] add coveralls to actions

---
 .github/workflows/github-actions.yml | 14 +++++++++++---
 setup.py                             |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index a1a3c4031..43a70a854 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -20,7 +20,8 @@ env:
   PYMONGO_3_9: 3.9
   PYMONGO_3_11: 3.11
 
-#  MAIN_PYTHON_VERSION: 3.7
+  MAIN_PYTHON_VERSION: 3.7
+
 jobs:
   linting:
     runs-on: ubuntu-latest
@@ -66,6 +67,11 @@ jobs:
       run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
     - name: Run test suite
       run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
+    - name: Send coverage to Coveralls
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      if: ${{ matrix.python-version == env.MAIN_PYTHON_VERSION }}
+      run: coveralls
 
   build_doc_dryrun:
     # ensures that readthedocs can be built continuously
@@ -114,12 +120,14 @@ jobs:
         python setup.py egg_info -b ".dev`date '+%Y%m%d%H%M%S'`" build sdist bdist_wheel
 #        python setup.py sdist bdist_wheel
     - name: publish test-pypi
+      if: github.event_name != 'pull_request'
       uses: pypa/gh-action-pypi-publish@master
       with:
-        password: ${{ secrets.test_pypi_password }}
+        password: ${{ secrets.test_pypi_token }}
         repository_url: https://test.pypi.org/legacy/
+    ## Must clean prev files and rebuild here
 #    - name: publish pypi
 #      uses: pypa/gh-action-pypi-publish@master
 #      if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
 #      with:
-#        password: ${{ secrets.pypi_password }}
+#        password: ${{ secrets.pypi_token }}
diff --git a/setup.py b/setup.py
index ffc35743a..37b95e374 100644
--- a/setup.py
+++ b/setup.py
@@ -112,7 +112,7 @@ def run_tests(self):
     "tests_require": [
         "pytest<5.0",
         "pytest-cov",
-        "coverage<5.0",  # recent coverage switched to sqlite format for the .coverage file which isn't handled properly by coveralls
+        "coverage",
         "blinker",
         "Pillow>=7.0.0",
     ],

From 0f1fce4a7b2d08a72d8705c86cffc8fdc1e2d0af Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 16 Dec 2020 21:52:49 +0100
Subject: [PATCH 1146/1519] Add separate jobs for test-pypi and pypi in github
 actions

---
 .github/workflows/github-actions.yml | 35 ++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 43a70a854..1205e7c57 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -35,6 +35,8 @@ jobs:
     - run: pre-commit run -a
 
   test:
+    # Test suite run against recent python versions
+    # and against a few combination of MongoDB and pymongo
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -75,6 +77,7 @@ jobs:
 
   build_doc_dryrun:
     # ensures that readthedocs can be built continuously
+    # to avoid that it breaks when new releases are being created
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -103,7 +106,7 @@ jobs:
           message: |
             Build ${{ job.status }} - ${{ github.actor }} ${{ github.event_name }} ${{ github.event.ref }}
 
-  build-n-publish:
+  build-n-publish-dummy:
     runs-on: ubuntu-latest
     needs: [linting, test]
     steps:
@@ -112,22 +115,34 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: 3.7
-    # todo separate build from publish
-    # https://stackoverflow.com/questions/59349905/which-properties-does-github-event-in-a-github-workflow-have
     - name: build dummy wheel for test-pypi
       run: |
         pip install wheel
         python setup.py egg_info -b ".dev`date '+%Y%m%d%H%M%S'`" build sdist bdist_wheel
-#        python setup.py sdist bdist_wheel
     - name: publish test-pypi
       if: github.event_name != 'pull_request'
       uses: pypa/gh-action-pypi-publish@master
       with:
         password: ${{ secrets.test_pypi_token }}
         repository_url: https://test.pypi.org/legacy/
-    ## Must clean prev files and rebuild here
-#    - name: publish pypi
-#      uses: pypa/gh-action-pypi-publish@master
-#      if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
-#      with:
-#        password: ${{ secrets.pypi_token }}
+
+  build-n-publish:
+    runs-on: ubuntu-latest
+    needs: [linting, test]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.7
+    # todo separate build from publish
+    # https://stackoverflow.com/questions/59349905/which-properties-does-github-event-in-a-github-workflow-have
+    - name: build dummy wheel for test-pypi
+      run: |
+        pip install wheel
+        python setup.py sdist bdist_wheel
+    - name: publish pypi
+      uses: pypa/gh-action-pypi-publish@master
+      if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
+      with:
+        password: ${{ secrets.pypi_token }}
\ No newline at end of file

From aa368be4d39a602d93f8ca458df3524ade6b74fb Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 16 Dec 2020 21:54:55 +0100
Subject: [PATCH 1147/1519] minor comment improvement

---
 .github/workflows/github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 1205e7c57..6bb673baf 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -115,7 +115,7 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: 3.7
-    - name: build dummy wheel for test-pypi
+    - name: build dummy wheel for test-pypi (hacking versioning to make it unique)
       run: |
         pip install wheel
         python setup.py egg_info -b ".dev`date '+%Y%m%d%H%M%S'`" build sdist bdist_wheel

From 81197d60610622cac5bddc11f50a8bf19ebaa9de Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 16 Dec 2020 22:05:25 +0100
Subject: [PATCH 1148/1519] comment out travis file, until next release is
 fully operational from github actions

---
 .travis.yml  | 108 ---------------------------------------------------
 .travis_.yml | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+), 108 deletions(-)
 delete mode 100644 .travis.yml
 create mode 100644 .travis_.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 4f566dcb3..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-# For full coverage, we'd have to test all supported Python, MongoDB, and
-# PyMongo combinations. However, that would result in an overly long build
-# with a very large number of jobs, hence we only test a subset of all the
-# combinations.
-# * Python3.7, MongoDB v3.4 & the latest PyMongo v3.x is currently the "main" setup,
-# Other combinations are tested. See below for the details or check the travis jobs
-
-# We should periodically check MongoDB Server versions supported by MongoDB
-# Inc., add newly released versions to the test matrix, and remove versions
-# which have reached their End of Life. See:
-# 1. https://www.mongodb.com/support-policy.
-# 2. https://docs.mongodb.com/ecosystem/drivers/driver-compatibility-reference/#python-driver-compatibility
-#
-# Reminder: Update README.rst if you change MongoDB versions we test.
-
-language: python
-dist: xenial
-python:
-  - 3.6
-  - 3.7
-  - 3.8
-  - 3.9
-  - pypy3
-
-env:
-  global:
-    - MONGODB_3_4=3.4.19
-    - MONGODB_3_6=3.6.13
-    - MONGODB_4_0=4.0.13
-
-    - PYMONGO_3_4=3.4
-    - PYMONGO_3_6=3.6
-    - PYMONGO_3_9=3.9
-    - PYMONGO_3_11=3.11
-
-    - MAIN_PYTHON_VERSION=3.7
-  matrix:
-    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_11}
-
-matrix:
-  # Finish the build as soon as one job fails
-  fast_finish: true
-
-  include:
-    - python: 3.7
-      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
-    - python: 3.7
-      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
-    - python: 3.7
-      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_11}
-    - python: 3.8
-      env: MONGODB=${MONGODB_4_0} PYMONGO=${PYMONGO_3_11}
-
-install:
-  # Install Mongo
-  - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
-  - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
-  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
-  # Install Python dependencies.
-  - pip install --upgrade pip
-  - pip install coveralls
-  - pip install pre-commit
-  - pip install tox
-  # tox dryrun to setup the tox venv (we run a mock test).
-  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
-
-before_script:
-  - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
-  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
-  # Run pre-commit hooks (black, flake8, etc) on entire codebase
-  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then pre-commit run -a; else echo "pre-commit checks only runs on py37"; fi
-  - mongo --eval 'db.version();' # Make sure mongo is awake
-
-script:
-  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
-
-after_success:
-  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then coveralls --verbose; else echo "coveralls only sent for py37"; fi
-
-notifications:
-  irc: irc.freenode.org#mongoengine
-
-# Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
-branches:
-  # Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
-  only:
-    - master
-    - /^v.*$/
-
-# Whenever a new release is created via GitHub, publish it on PyPI.
-deploy:
-  provider: pypi
-  user: the_drow
-  password:
-    secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
-
-  # Create a source distribution and a pure python wheel for faster installs.
-  distributions: "sdist bdist_wheel"
-
-  # Only deploy on tagged commits (aka GitHub releases) and only for the parent
-  # repo's builds running Python v3.7 along with PyMongo v3.x and MongoDB v3.4.
-  # We run Travis against many different Python, PyMongo, and MongoDB versions
-  # and we don't want the deploy to occur multiple times).
-  on:
-    tags: true
-    repo: MongoEngine/mongoengine
-    condition: ($PYMONGO = ${PYMONGO_3_11}) && ($MONGODB = ${MONGODB_3_4})
-    python: 3.7
diff --git a/.travis_.yml b/.travis_.yml
new file mode 100644
index 000000000..114fd76f1
--- /dev/null
+++ b/.travis_.yml
@@ -0,0 +1,108 @@
+## For full coverage, we'd have to test all supported Python, MongoDB, and
+## PyMongo combinations. However, that would result in an overly long build
+## with a very large number of jobs, hence we only test a subset of all the
+## combinations.
+## * Python3.7, MongoDB v3.4 & the latest PyMongo v3.x is currently the "main" setup,
+## Other combinations are tested. See below for the details or check the travis jobs
+#
+## We should periodically check MongoDB Server versions supported by MongoDB
+## Inc., add newly released versions to the test matrix, and remove versions
+## which have reached their End of Life. See:
+## 1. https://www.mongodb.com/support-policy.
+## 2. https://docs.mongodb.com/ecosystem/drivers/driver-compatibility-reference/#python-driver-compatibility
+##
+## Reminder: Update README.rst if you change MongoDB versions we test.
+#
+#language: python
+#dist: xenial
+#python:
+#  - 3.6
+#  - 3.7
+#  - 3.8
+#  - 3.9
+#  - pypy3
+#
+#env:
+#  global:
+#    - MONGODB_3_4=3.4.19
+#    - MONGODB_3_6=3.6.13
+#    - MONGODB_4_0=4.0.13
+#
+#    - PYMONGO_3_4=3.4
+#    - PYMONGO_3_6=3.6
+#    - PYMONGO_3_9=3.9
+#    - PYMONGO_3_11=3.11
+#
+#    - MAIN_PYTHON_VERSION=3.7
+#  matrix:
+#    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_11}
+#
+#matrix:
+#  # Finish the build as soon as one job fails
+#  fast_finish: true
+#
+#  include:
+#    - python: 3.7
+#      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
+#    - python: 3.7
+#      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
+#    - python: 3.7
+#      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_11}
+#    - python: 3.8
+#      env: MONGODB=${MONGODB_4_0} PYMONGO=${PYMONGO_3_11}
+#
+#install:
+#  # Install Mongo
+#  - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
+#  - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
+#  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
+#  # Install Python dependencies.
+#  - pip install --upgrade pip
+#  - pip install coveralls
+#  - pip install pre-commit
+#  - pip install tox
+#  # tox dryrun to setup the tox venv (we run a mock test).
+#  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
+#
+#before_script:
+#  - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
+#  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
+#  # Run pre-commit hooks (black, flake8, etc) on entire codebase
+#  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then pre-commit run -a; else echo "pre-commit checks only runs on py37"; fi
+#  - mongo --eval 'db.version();' # Make sure mongo is awake
+#
+#script:
+#  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
+#
+#after_success:
+#  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then coveralls --verbose; else echo "coveralls only sent for py37"; fi
+#
+#notifications:
+#  irc: irc.freenode.org#mongoengine
+#
+## Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
+#branches:
+#  # Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
+#  only:
+#    - master
+#    - /^v.*$/
+#
+## Whenever a new release is created via GitHub, publish it on PyPI.
+#deploy:
+#  provider: pypi
+#  user: the_drow
+#  password:
+#    secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
+#
+#  # Create a source distribution and a pure python wheel for faster installs.
+#  distributions: "sdist bdist_wheel"
+#
+#  # Only deploy on tagged commits (aka GitHub releases) and only for the parent
+#  # repo's builds running Python v3.7 along with PyMongo v3.x and MongoDB v3.4.
+#  # We run Travis against many different Python, PyMongo, and MongoDB versions
+#  # and we don't want the deploy to occur multiple times).
+#  on:
+#    tags: true
+#    repo: MongoEngine/mongoengine
+#    condition: ($PYMONGO = ${PYMONGO_3_11}) && ($MONGODB = ${MONGODB_3_4})
+#    python: 3.7

From 49e33b978dc1c206b8522e2b2a0af986a43c6b0f Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 16 Dec 2020 22:21:51 +0100
Subject: [PATCH 1149/1519] move condition of build-n-publish to job level +
 disable test-pypi releasing as there is some limitation on the size

---
 .github/workflows/github-actions.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 6bb673baf..2c2166a5a 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -115,20 +115,24 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: 3.7
-    - name: build dummy wheel for test-pypi (hacking versioning to make it unique)
+    - name: build dummy wheel for test-pypi
       run: |
         pip install wheel
         python setup.py egg_info -b ".dev`date '+%Y%m%d%H%M%S'`" build sdist bdist_wheel
-    - name: publish test-pypi
-      if: github.event_name != 'pull_request'
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        password: ${{ secrets.test_pypi_token }}
-        repository_url: https://test.pypi.org/legacy/
+#    - name: publish test-pypi
+#      # Although working and recommended, test-pypi has a limit
+#      # in the size of projects so it's better to avoid publishing
+#      # until there is a way to garbage collect these dummy releases
+#      if: github.event_name != 'pull_request'
+#      uses: pypa/gh-action-pypi-publish@master
+#      with:
+#        password: ${{ secrets.test_pypi_token }}
+#        repository_url: https://test.pypi.org/legacy/
 
   build-n-publish:
     runs-on: ubuntu-latest
     needs: [linting, test]
+    if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
     steps:
     - uses: actions/checkout@master
     - name: Set up Python 3.7
@@ -143,6 +147,5 @@ jobs:
         python setup.py sdist bdist_wheel
     - name: publish pypi
       uses: pypa/gh-action-pypi-publish@master
-      if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
       with:
         password: ${{ secrets.pypi_token }}
\ No newline at end of file

From de3888a48bb05fc199479bd57ffacc234a32fadf Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 16 Dec 2020 22:45:45 +0100
Subject: [PATCH 1150/1519] improve github actions

---
 .github/workflows/github-actions.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 2c2166a5a..2441c6c1a 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -24,6 +24,8 @@ env:
 
 jobs:
   linting:
+    # Run pre-commit (https://pre-commit.com/)
+    # which runs pre-configured linter & autoformatter
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -108,7 +110,8 @@ jobs:
 
   build-n-publish-dummy:
     runs-on: ubuntu-latest
-    needs: [linting, test]
+    needs: [linting, test, build_doc_dryrun]
+    if: github.event_name != 'pull_request'
     steps:
     - uses: actions/checkout@master
     - name: Set up Python 3.7
@@ -123,7 +126,6 @@ jobs:
 #      # Although working and recommended, test-pypi has a limit
 #      # in the size of projects so it's better to avoid publishing
 #      # until there is a way to garbage collect these dummy releases
-#      if: github.event_name != 'pull_request'
 #      uses: pypa/gh-action-pypi-publish@master
 #      with:
 #        password: ${{ secrets.test_pypi_token }}
@@ -131,7 +133,7 @@ jobs:
 
   build-n-publish:
     runs-on: ubuntu-latest
-    needs: [linting, test]
+    needs: [linting, test, build_doc_dryrun, build-n-publish-dummy]
     if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
     steps:
     - uses: actions/checkout@master

From 4f6a24411d25de47f015aea911a9eee1b8ab4edd Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 16 Dec 2020 22:47:43 +0100
Subject: [PATCH 1151/1519] remove IRC notif from CI as it doesn't seem to be
 still valuable these days

---
 .github/workflows/github-actions.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 2441c6c1a..2b5d321e3 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -96,18 +96,6 @@ jobs:
         cd docs
         make html-readthedocs
 
-  irc_notification:
-    runs-on: ubuntu-latest
-    needs: [linting, test]
-    steps:
-      - uses: rectalogic/notify-irc@v1
-        if: success()
-        with:
-          channel: "irc.freenode.org#mongoengine"
-          nickname: github-notifier
-          message: |
-            Build ${{ job.status }} - ${{ github.actor }} ${{ github.event_name }} ${{ github.event.ref }}
-
   build-n-publish-dummy:
     runs-on: ubuntu-latest
     needs: [linting, test, build_doc_dryrun]

From 5781753cc81131e824155cb607e74d9049252332 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 16 Dec 2020 23:03:39 +0100
Subject: [PATCH 1152/1519] Update changelog for 0.22.1

---
 docs/changelog.rst      | 5 +++++
 mongoengine/__init__.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 424481840..b904a2b88 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,11 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.22.1
+=================
+- Declare that Py3.5 is not supported in package metadata #2449
+- Moved CI from Travis to Github-Actions
+
 Changes in 0.22.0
 =================
 - Fix LazyReferenceField dereferencing in embedded documents #2426
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 82add8ceb..683463999 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -28,7 +28,7 @@
 )
 
 
-VERSION = (0, 22, 0)
+VERSION = (0, 22, 1)
 
 
 def get_version():

From 98d64f41c63e8cbfca1532fb7ce4c498c4b5c647 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 18 Dec 2020 00:05:28 +0100
Subject: [PATCH 1153/1519] improvements of test coverage in fields

---
 mongoengine/fields.py                       |  27 +----
 tests/fields/test_boolean_field.py          |  11 ++
 tests/fields/test_cached_reference_field.py |  19 +++-
 tests/fields/test_decimal_field.py          | 110 +++++++++++---------
 tests/fields/test_enum_field.py             |   7 +-
 tests/fields/test_fields.py                 |  28 -----
 tests/fields/test_long_field.py             |  36 +++++--
 tests/fields/test_string_field.py           |  43 ++++++++
 8 files changed, 169 insertions(+), 112 deletions(-)
 create mode 100644 tests/fields/test_string_field.py

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e29f55ab1..c20333a86 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1,5 +1,6 @@
 import datetime
 import decimal
+import inspect
 import itertools
 import re
 import socket
@@ -514,7 +515,7 @@ class BooleanField(BaseField):
     def to_python(self, value):
         try:
             value = bool(value)
-        except ValueError:
+        except (ValueError, TypeError):
             pass
         return value
 
@@ -1028,17 +1029,6 @@ def key_not_string(d):
             return True
 
 
-def key_has_dot_or_dollar(d):
-    """Helper function to recursively determine if any key in a
-    dictionary contains a dot or a dollar sign.
-    """
-    for k, v in d.items():
-        if ("." in k or k.startswith("$")) or (
-            isinstance(v, dict) and key_has_dot_or_dollar(v)
-        ):
-            return True
-
-
 def key_starts_with_dollar(d):
     """Helper function to recursively determine if any key in a
     dictionary starts with a dollar
@@ -1311,8 +1301,8 @@ def __init__(self, document_type, fields=None, auto_sync=True, **kwargs):
             fields = []
 
         # XXX ValidationError raised outside of the "validate" method.
-        if not isinstance(document_type, str) and not issubclass(
-            document_type, Document
+        if not isinstance(document_type, str) and not (
+            inspect.isclass(document_type) and issubclass(document_type, Document)
         ):
             self.error(
                 "Argument to CachedReferenceField constructor must be a"
@@ -1642,7 +1632,7 @@ def __init__(self, enum, **kwargs):
                 "'choices' can't be set on EnumField, "
                 "it is implicitly set as the enum class"
             )
-        kwargs["choices"] = list(self._enum_cls)
+        kwargs["choices"] = list(self._enum_cls)  # Implicit validator
         super().__init__(**kwargs)
 
     def __set__(self, instance, value):
@@ -1659,13 +1649,6 @@ def to_mongo(self, value):
             return value.value
         return value
 
-    def validate(self, value):
-        if value and not isinstance(value, self._enum_cls):
-            try:
-                self._enum_cls(value)
-            except Exception as e:
-                self.error(str(e))
-
     def prepare_query_value(self, op, value):
         if value is None:
             return value
diff --git a/tests/fields/test_boolean_field.py b/tests/fields/test_boolean_field.py
index 737e0dbfd..d82d149f8 100644
--- a/tests/fields/test_boolean_field.py
+++ b/tests/fields/test_boolean_field.py
@@ -13,6 +13,17 @@ class Person(Document):
         person.save()
         assert get_as_pymongo(person) == {"_id": person.id, "admin": True}
 
+    def test_construction_does_not_fail_uncastable_value(self):
+        class BoolFail:
+            def __bool__(self):
+                return "bogus"
+
+        class Person(Document):
+            admin = BooleanField()
+
+        person = Person(admin=BoolFail())
+        person.admin == "bogus"
+
     def test_validation(self):
         """Ensure that invalid values cannot be assigned to boolean
         fields.
diff --git a/tests/fields/test_cached_reference_field.py b/tests/fields/test_cached_reference_field.py
index 7a96bc06b..9d0b387ba 100644
--- a/tests/fields/test_cached_reference_field.py
+++ b/tests/fields/test_cached_reference_field.py
@@ -2,11 +2,28 @@
 
 import pytest
 
-from mongoengine import *
+from mongoengine import (
+    CachedReferenceField,
+    DecimalField,
+    Document,
+    EmbeddedDocument,
+    EmbeddedDocumentField,
+    InvalidDocumentError,
+    ListField,
+    ReferenceField,
+    StringField,
+    ValidationError,
+)
 from tests.utils import MongoDBTestCase
 
 
 class TestCachedReferenceField(MongoDBTestCase):
+    def test_constructor_fail_bad_document_type(self):
+        with pytest.raises(
+            ValidationError, match="must be a document class or a string"
+        ):
+            CachedReferenceField(document_type=0)
+
     def test_get_and_save(self):
         """
         Tests #1047: CachedReferenceField creates DBRefs on to_python,
diff --git a/tests/fields/test_decimal_field.py b/tests/fields/test_decimal_field.py
index 519356e9e..89a725a9e 100644
--- a/tests/fields/test_decimal_field.py
+++ b/tests/fields/test_decimal_field.py
@@ -2,59 +2,11 @@
 
 import pytest
 
-from mongoengine import *
+from mongoengine import DecimalField, Document, ValidationError
 from tests.utils import MongoDBTestCase
 
 
 class TestDecimalField(MongoDBTestCase):
-    def test_validation(self):
-        """Ensure that invalid values cannot be assigned to decimal fields."""
-
-        class Person(Document):
-            height = DecimalField(min_value=Decimal("0.1"), max_value=Decimal("3.5"))
-
-        Person.drop_collection()
-
-        Person(height=Decimal("1.89")).save()
-        person = Person.objects.first()
-        assert person.height == Decimal("1.89")
-
-        person.height = "2.0"
-        person.save()
-        person.height = 0.01
-        with pytest.raises(ValidationError):
-            person.validate()
-        person.height = Decimal("0.01")
-        with pytest.raises(ValidationError):
-            person.validate()
-        person.height = Decimal("4.0")
-        with pytest.raises(ValidationError):
-            person.validate()
-        person.height = "something invalid"
-        with pytest.raises(ValidationError):
-            person.validate()
-
-        person_2 = Person(height="something invalid")
-        with pytest.raises(ValidationError):
-            person_2.validate()
-
-    def test_comparison(self):
-        class Person(Document):
-            money = DecimalField()
-
-        Person.drop_collection()
-
-        Person(money=6).save()
-        Person(money=7).save()
-        Person(money=8).save()
-        Person(money=10).save()
-
-        assert 2 == Person.objects(money__gt=Decimal("7")).count()
-        assert 2 == Person.objects(money__gt=7).count()
-        assert 2 == Person.objects(money__gt="7").count()
-
-        assert 3 == Person.objects(money__gte="7").count()
-
     def test_storage(self):
         class Person(Document):
             float_value = DecimalField(precision=4)
@@ -106,3 +58,63 @@ class Person(Document):
         for field_name in ["float_value", "string_value"]:
             actual = list(Person.objects().scalar(field_name))
             assert expected == actual
+
+    def test_save_none(self):
+        class Person(Document):
+            value = DecimalField()
+
+        Person.drop_collection()
+
+        person = Person(value=None)
+        assert person.value is None
+        person.save()
+        fetched_person = Person.objects.first()
+        fetched_person.value is None
+
+    def test_validation(self):
+        """Ensure that invalid values cannot be assigned to decimal fields."""
+
+        class Person(Document):
+            height = DecimalField(min_value=Decimal("0.1"), max_value=Decimal("3.5"))
+
+        Person.drop_collection()
+
+        Person(height=Decimal("1.89")).save()
+        person = Person.objects.first()
+        assert person.height == Decimal("1.89")
+
+        person.height = "2.0"
+        person.save()
+        person.height = 0.01
+        with pytest.raises(ValidationError):
+            person.validate()
+        person.height = Decimal("0.01")
+        with pytest.raises(ValidationError):
+            person.validate()
+        person.height = Decimal("4.0")
+        with pytest.raises(ValidationError):
+            person.validate()
+        person.height = "something invalid"
+        with pytest.raises(ValidationError):
+            person.validate()
+
+        person_2 = Person(height="something invalid")
+        with pytest.raises(ValidationError):
+            person_2.validate()
+
+    def test_comparison(self):
+        class Person(Document):
+            money = DecimalField()
+
+        Person.drop_collection()
+
+        Person(money=6).save()
+        Person(money=7).save()
+        Person(money=8).save()
+        Person(money=10).save()
+
+        assert 2 == Person.objects(money__gt=Decimal("7")).count()
+        assert 2 == Person.objects(money__gt=7).count()
+        assert 2 == Person.objects(money__gt="7").count()
+
+        assert 3 == Person.objects(money__gte="7").count()
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index fc42487bf..c101996ce 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -3,7 +3,7 @@
 from bson import InvalidDocument
 import pytest
 
-from mongoengine import *
+from mongoengine import Document, EnumField, ValidationError
 from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
@@ -45,6 +45,11 @@ def test_change_value(self):
         m.save()
         assert m.status == Status.DONE
 
+        m.status = "wrong"
+        assert m.status == "wrong"
+        with pytest.raises(ValidationError):
+            m.validate()
+
     def test_set_default(self):
         class ModelWithDefault(Document):
             status = EnumField(Status, default=Status.DONE)
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 266d0e9dd..f72726193 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -374,34 +374,6 @@ class Person(Document):
         person.id = str(ObjectId())
         person.validate()
 
-    def test_string_validation(self):
-        """Ensure that invalid values cannot be assigned to string fields."""
-
-        class Person(Document):
-            name = StringField(max_length=20)
-            userid = StringField(r"[0-9a-z_]+$")
-
-        person = Person(name=34)
-        with pytest.raises(ValidationError):
-            person.validate()
-
-        # Test regex validation on userid
-        person = Person(userid="test.User")
-        with pytest.raises(ValidationError):
-            person.validate()
-
-        person.userid = "test_user"
-        assert person.userid == "test_user"
-        person.validate()
-
-        # Test max length validation on name
-        person = Person(name="Name that is more than twenty characters")
-        with pytest.raises(ValidationError):
-            person.validate()
-
-        person.name = "Shorter name"
-        person.validate()
-
     def test_db_field_validation(self):
         """Ensure that db_field doesn't accept invalid values."""
 
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index 67fd0bce5..4a3041f22 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -4,10 +4,26 @@
 from mongoengine import *
 from mongoengine.connection import get_db
 
-from tests.utils import MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestLongField(MongoDBTestCase):
+    def test_storage(self):
+        class Person(Document):
+            value = LongField()
+
+        Person.drop_collection()
+        person = Person(value=5000)
+        person.save()
+        assert get_as_pymongo(person) == {"_id": person.id, "value": 5000}
+
+    def test_construction_does_not_fail_with_invalid_value(self):
+        class Person(Document):
+            value = LongField()
+
+        person = Person(value="not_an_int")
+        assert person.value == "not_an_int"
+
     def test_long_field_is_considered_as_int64(self):
         """
         Tests that long fields are stored as long in mongo, even if long
@@ -30,19 +46,16 @@ def test_long_validation(self):
         class TestDocument(Document):
             value = LongField(min_value=0, max_value=110)
 
-        doc = TestDocument()
-        doc.value = 50
-        doc.validate()
+        TestDocument(value=50).validate()
 
-        doc.value = -1
         with pytest.raises(ValidationError):
-            doc.validate()
-        doc.value = 120
+            TestDocument(value=-1).validate()
+
         with pytest.raises(ValidationError):
-            doc.validate()
-        doc.value = "ten"
+            TestDocument(value=120).validate()
+
         with pytest.raises(ValidationError):
-            doc.validate()
+            TestDocument(value="ten").validate()
 
     def test_long_ne_operator(self):
         class TestDocument(Document):
@@ -53,4 +66,5 @@ class TestDocument(Document):
         TestDocument(long_fld=None).save()
         TestDocument(long_fld=1).save()
 
-        assert 1 == TestDocument.objects(long_fld__ne=None).count()
+        assert TestDocument.objects(long_fld__ne=None).count() == 1
+        assert TestDocument.objects(long_fld__ne=1).count() == 1
diff --git a/tests/fields/test_string_field.py b/tests/fields/test_string_field.py
new file mode 100644
index 000000000..6e1d77f21
--- /dev/null
+++ b/tests/fields/test_string_field.py
@@ -0,0 +1,43 @@
+import pytest
+
+from mongoengine import *
+from tests.utils import MongoDBTestCase, get_as_pymongo
+
+
+class TestStringField(MongoDBTestCase):
+    def test_storage(self):
+        class Person(Document):
+            name = StringField()
+
+        Person.drop_collection()
+        person = Person(name="test123")
+        person.save()
+        assert get_as_pymongo(person) == {"_id": person.id, "name": "test123"}
+
+    def test_validation(self):
+        class Person(Document):
+            name = StringField(max_length=20, min_length=2)
+            userid = StringField(r"[0-9a-z_]+$")
+
+        with pytest.raises(ValidationError, match="only accepts string values"):
+            Person(name=34).validate()
+
+        with pytest.raises(ValidationError, match="value is too short"):
+            Person(name="s").validate()
+
+        # Test regex validation on userid
+        person = Person(userid="test.User")
+        with pytest.raises(ValidationError):
+            person.validate()
+
+        person.userid = "test_user"
+        assert person.userid == "test_user"
+        person.validate()
+
+        # Test max length validation on name
+        person = Person(name="Name that is more than twenty characters")
+        with pytest.raises(ValidationError):
+            person.validate()
+
+        person = Person(name="a friendl name", userid="7a757668sqjdkqlsdkq")
+        person.validate()

From 460df112f435a9fe5ef35337984c33e84e57c45e Mon Sep 17 00:00:00 2001
From: Peter Nerlich <PeterNerlich@users.noreply.github.com>
Date: Sun, 10 Jan 2021 23:43:46 +0100
Subject: [PATCH 1154/1519] Fix inconsistency with example

connection example shows a password of 12345, but text spoke of qwerty
---
 docs/guide/connecting.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index 03d6ed5c3..fea5e97b4 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -44,7 +44,7 @@ the :attr:`host` to
         )
 
     will establish connection to ``production`` database using
-    ``admin`` username and ``qwerty`` password.
+    ``admin`` username and ``12345`` password.
 
 .. note:: Calling :func:`~mongoengine.connect` without argument will establish
     a connection to the "test" database by default

From 04905d4b3781fc3172e1dbb558815670e0d15263 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 12 Jan 2021 23:07:11 +0100
Subject: [PATCH 1155/1519] Add env var to please python-coveralls 3.0.0

---
 .github/workflows/github-actions.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 2b5d321e3..70393ebc2 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -74,6 +74,7 @@ jobs:
     - name: Send coverage to Coveralls
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        COVERALLS_SERVICE_NAME: github
       if: ${{ matrix.python-version == env.MAIN_PYTHON_VERSION }}
       run: coveralls
 

From 48b979599f89e97905029bb0e00f727e9febd562 Mon Sep 17 00:00:00 2001
From: Jussi Kauppila <jussi@vainu.io>
Date: Tue, 16 Feb 2021 12:23:29 +0200
Subject: [PATCH 1156/1519] Check that manually setting Sequence Field in
 DynamicDocument doesn't increment the counter

Fixes #2471
---
 mongoengine/base/document.py        |  2 +-
 tests/fields/test_sequence_field.py | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index f64b578be..344095625 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -156,7 +156,7 @@ def __setattr__(self, name, value):
         # Handle dynamic data only if an initialised dynamic document
         if self._dynamic and not self._dynamic_lock:
 
-            if not hasattr(self, name) and not name.startswith("_"):
+            if name not in self._fields_ordered and not name.startswith("_"):
                 DynamicField = _import_class("DynamicField")
                 field = DynamicField(db_field=name, null=True)
                 field.name = name
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
index 53e69f7b3..c3ecbeecf 100644
--- a/tests/fields/test_sequence_field.py
+++ b/tests/fields/test_sequence_field.py
@@ -274,3 +274,25 @@ class Bar(Base):
         assert foo.counter == bar.counter
         assert foo._fields["counter"].owner_document == Foo
         assert bar._fields["counter"].owner_document == Bar
+
+    def test_sequence_setattr_not_incrementing_counter(self):
+        class Person(DynamicDocument):
+            id = SequenceField(primary_key=True)
+            name = StringField()
+
+        self.db["mongoengine.counters"].drop()
+        Person.drop_collection()
+
+        for x in range(10):
+            Person(name="Person %s" % x).save()
+
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        assert c["next"] == 10
+
+        # Setting SequenceField field value should not increment counter:
+        new_person = Person()
+        new_person.id = 1100
+
+        # Counter should still be at 10
+        c = self.db["mongoengine.counters"].find_one({"_id": "person.id"})
+        assert c["next"] == 10

From 1b7c2085c91430d6c8f8df9529948c8f76326cd8 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 21 Feb 2021 21:13:32 +0100
Subject: [PATCH 1157/1519] Fix for imprecise doc on collection name (CamelCase
 -> snake_case)

---
 docs/guide/defining-documents.rst | 8 ++++----
 mongoengine/document.py           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 7fc20ba89..ed0929077 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -432,10 +432,10 @@ Document collections
 ====================
 Document classes that inherit **directly** from :class:`~mongoengine.Document`
 will have their own **collection** in the database. The name of the collection
-is by default the name of the class, converted to lowercase (so in the example
-above, the collection would be called `page`). If you need to change the name
-of the collection (e.g. to use MongoEngine with an existing database), then
-create a class dictionary attribute called :attr:`meta` on your document, and
+is by default the name of the class converted to snake_case (e.g if your Document class
+is named `CompanyUser`, the corresponding collection would be `company_user`). If you need
+to change the name of the collection (e.g. to use MongoEngine with an existing database),
+then create a class dictionary attribute called :attr:`meta` on your document, and
 set :attr:`collection` to the name of the collection that you want your
 document class to use::
 
diff --git a/mongoengine/document.py b/mongoengine/document.py
index de00740b4..8cdce1d0d 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -109,7 +109,7 @@ class Document(BaseDocument, metaclass=TopLevelDocumentMetaclass):
 
     By default, the MongoDB collection used to store documents created using a
     :class:`~mongoengine.Document` subclass will be the name of the subclass
-    converted to lowercase. A different collection may be specified by
+    converted to snake_case. A different collection may be specified by
     providing :attr:`collection` to the :attr:`meta` dictionary in the class
     definition.
 

From aeb4f8f4dae778a79c65b7a0de1b209695d0d18a Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 21 Feb 2021 22:03:49 +0100
Subject: [PATCH 1158/1519] fix_minor_typo

---
 mongoengine/fields.py       | 2 +-
 tests/fields/test_fields.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index c20333a86..477138a14 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2414,7 +2414,7 @@ def __init__(
           object is deleted
         :param passthrough: When trying to access unknown fields, the
           :class:`~mongoengine.base.datastructure.LazyReference` instance will
-          automatically call `fetch()` and try to retrive the field on the fetched
+          automatically call `fetch()` and try to retrieve the field on the fetched
           document. Note this only work getting field (not setting or deleting).
         """
         # XXX ValidationError raised outside of the "validate" method.
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index f72726193..ab3ee0c83 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -306,7 +306,7 @@ class HandleNoneFields(Document):
         )
         assert res == 1
 
-        # Retrive data from db and verify it.
+        # Retrieve data from db and verify it.
         ret = HandleNoneFields.objects.all()[0]
         assert ret.str_fld is None
         assert ret.int_fld is None
@@ -340,7 +340,7 @@ class HandleNoneFields(Document):
             {"$unset": {"str_fld": 1, "int_fld": 1, "flt_fld": 1, "comp_dt_fld": 1}},
         )
 
-        # Retrive data from db and verify it.
+        # Retrieve data from db and verify it.
         ret = HandleNoneFields.objects.first()
         assert ret.str_fld is None
         assert ret.int_fld is None

From 68447af1277b72ed9338abd0949d8716b9b135e3 Mon Sep 17 00:00:00 2001
From: lukasloetkolben <lukas@htzmedia.de>
Date: Mon, 22 Feb 2021 21:42:02 +0100
Subject: [PATCH 1159/1519] - feature: allow_disk_use

---
 mongoengine/queryset/base.py | 64 ++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c4a7e7710..2c2f5f744 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -34,7 +34,6 @@
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
 
-
 __all__ = ("BaseQuerySet", "DO_NOTHING", "NULLIFY", "CASCADE", "DENY", "PULL")
 
 # Delete rules
@@ -63,6 +62,7 @@ def __init__(self, document, collection):
         self._loaded_fields = QueryFieldList()
         self._ordering = None
         self._snapshot = False
+        self._allow_disk_use = False
         self._timeout = True
         self._read_preference = None
         self._read_concern = None
@@ -113,8 +113,8 @@ def __call__(self, q_obj=None, **query):
             # Make sure proper query object is passed.
             if not isinstance(q_obj, QNode):
                 msg = (
-                    "Not a query object: %s. "
-                    "Did you intend to use key=value?" % q_obj
+                        "Not a query object: %s. "
+                        "Did you intend to use key=value?" % q_obj
                 )
                 raise InvalidQueryError(msg)
             query &= q_obj
@@ -294,7 +294,7 @@ def first(self):
         return result
 
     def insert(
-        self, doc_or_docs, load_bulk=True, write_concern=None, signal_kwargs=None
+            self, doc_or_docs, load_bulk=True, write_concern=None, signal_kwargs=None
     ):
         """bulk insert documents
 
@@ -397,10 +397,10 @@ def count(self, with_limit_and_skip=False):
         # mimic the fact that setting .limit(0) in pymongo sets no limit
         # https://docs.mongodb.com/manual/reference/method/cursor.limit/#zero-value
         if (
-            self._limit == 0
-            and with_limit_and_skip is False
-            or self._none
-            or self._empty
+                self._limit == 0
+                and with_limit_and_skip is False
+                or self._none
+                or self._empty
         ):
             return 0
 
@@ -450,13 +450,13 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
         # Handle deletes where skips or limits have been applied or
         # there is an untriggered delete signal
         has_delete_signal = signals.signals_available and (
-            signals.pre_delete.has_receivers_for(doc)
-            or signals.post_delete.has_receivers_for(doc)
+                signals.pre_delete.has_receivers_for(doc)
+                or signals.post_delete.has_receivers_for(doc)
         )
 
         call_document_delete = (
-            queryset._skip or queryset._limit or has_delete_signal
-        ) and not _from_doc_delete
+                                       queryset._skip or queryset._limit or has_delete_signal
+                               ) and not _from_doc_delete
 
         if call_document_delete:
             cnt = 0
@@ -519,13 +519,13 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                 return result.deleted_count
 
     def update(
-        self,
-        upsert=False,
-        multi=True,
-        write_concern=None,
-        read_concern=None,
-        full_result=False,
-        **update,
+            self,
+            upsert=False,
+            multi=True,
+            write_concern=None,
+            read_concern=None,
+            full_result=False,
+            **update,
     ):
         """Perform an atomic update on the fields matched by the query.
 
@@ -563,7 +563,7 @@ def update(
                 update["$set"] = {"_cls": queryset._document._class_name}
         try:
             with set_read_write_concern(
-                queryset._collection, write_concern, read_concern
+                    queryset._collection, write_concern, read_concern
             ) as collection:
                 update_func = collection.update_one
                 if multi:
@@ -637,7 +637,7 @@ def update_one(self, upsert=False, write_concern=None, full_result=False, **upda
         )
 
     def modify(
-        self, upsert=False, full_response=False, remove=False, new=False, **update
+            self, upsert=False, full_response=False, remove=False, new=False, **update
     ):
         """Update and return the updated document.
 
@@ -798,6 +798,7 @@ def _clone_into(self, new_qs):
             "_loaded_fields",
             "_ordering",
             "_snapshot",
+            "_allow_disk_use",
             "_timeout",
             "_read_preference",
             "_read_concern",
@@ -967,7 +968,7 @@ def distinct(self, field):
             for field_part in field.split(".")[1:]:
                 # if looping on embedded document, get the document type instance
                 if instance and isinstance(
-                    doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+                        doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
                 ):
                     doc_field = instance
                 # now get the subdocument
@@ -976,12 +977,12 @@ def distinct(self, field):
                 if isinstance(doc_field, ListField):
                     doc_field = getattr(doc_field, "field", doc_field)
                 if isinstance(
-                    doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+                        doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
                 ):
                     instance = getattr(doc_field, "document_type", None)
 
         if instance and isinstance(
-            doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+                doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
         ):
             distinct = [instance(**doc) for doc in distinct]
 
@@ -1165,6 +1166,16 @@ def snapshot(self, enabled):
         queryset._snapshot = enabled
         return queryset
 
+    def allow_disk_use(self, enabled):
+        """Enable or disable the use of temporary files on disk while processing a blocking sort operation.
+         (To store data exceeding the 100 megabyte system memory limit)
+
+        :param enabled: wether or not temporary files on disk are used
+        """
+        queryset = self.clone()
+        queryset._allow_disk_use = enabled
+        return queryset
+
     def timeout(self, enabled):
         """Enable or disable the default mongod timeout when querying. (no_cursor_timeout option)
 
@@ -1306,7 +1317,7 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
 
     # JS functionality
     def map_reduce(
-        self, map_f, reduce_f, output, finalize_f=None, limit=None, scope=None
+            self, map_f, reduce_f, output, finalize_f=None, limit=None, scope=None
     ):
         """Perform a map/reduce query using the current query spec
         and ordering. While ``map_reduce`` respects ``QuerySet`` chaining,
@@ -1604,6 +1615,9 @@ def _cursor_args(self):
         if not self._timeout:
             cursor_args["no_cursor_timeout"] = True
 
+        if self._allow_disk_use:
+            cursor_args["allow_disk_use"] = True
+
         if self._loaded_fields:
             cursor_args[fields_name] = self._loaded_fields.as_dict()
 

From 80a3b1c88cd8747b7fe4cd7203a3f2d654b7df0e Mon Sep 17 00:00:00 2001
From: lukasloetkolben <lukas@htzmedia.de>
Date: Mon, 22 Feb 2021 22:06:10 +0100
Subject: [PATCH 1160/1519] - feature: allow_disk_use

---
 mongoengine/queryset/base.py | 53 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 2c2f5f744..c5193ed9d 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -34,6 +34,7 @@
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
 
+
 __all__ = ("BaseQuerySet", "DO_NOTHING", "NULLIFY", "CASCADE", "DENY", "PULL")
 
 # Delete rules
@@ -62,8 +63,8 @@ def __init__(self, document, collection):
         self._loaded_fields = QueryFieldList()
         self._ordering = None
         self._snapshot = False
-        self._allow_disk_use = False
         self._timeout = True
+        self._allow_disk_use = False
         self._read_preference = None
         self._read_concern = None
         self._iter = False
@@ -113,8 +114,8 @@ def __call__(self, q_obj=None, **query):
             # Make sure proper query object is passed.
             if not isinstance(q_obj, QNode):
                 msg = (
-                        "Not a query object: %s. "
-                        "Did you intend to use key=value?" % q_obj
+                    "Not a query object: %s. "
+                    "Did you intend to use key=value?" % q_obj
                 )
                 raise InvalidQueryError(msg)
             query &= q_obj
@@ -294,7 +295,7 @@ def first(self):
         return result
 
     def insert(
-            self, doc_or_docs, load_bulk=True, write_concern=None, signal_kwargs=None
+        self, doc_or_docs, load_bulk=True, write_concern=None, signal_kwargs=None
     ):
         """bulk insert documents
 
@@ -397,10 +398,10 @@ def count(self, with_limit_and_skip=False):
         # mimic the fact that setting .limit(0) in pymongo sets no limit
         # https://docs.mongodb.com/manual/reference/method/cursor.limit/#zero-value
         if (
-                self._limit == 0
-                and with_limit_and_skip is False
-                or self._none
-                or self._empty
+            self._limit == 0
+            and with_limit_and_skip is False
+            or self._none
+            or self._empty
         ):
             return 0
 
@@ -450,13 +451,13 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
         # Handle deletes where skips or limits have been applied or
         # there is an untriggered delete signal
         has_delete_signal = signals.signals_available and (
-                signals.pre_delete.has_receivers_for(doc)
-                or signals.post_delete.has_receivers_for(doc)
+            signals.pre_delete.has_receivers_for(doc)
+            or signals.post_delete.has_receivers_for(doc)
         )
 
         call_document_delete = (
-                                       queryset._skip or queryset._limit or has_delete_signal
-                               ) and not _from_doc_delete
+            queryset._skip or queryset._limit or has_delete_signal
+        ) and not _from_doc_delete
 
         if call_document_delete:
             cnt = 0
@@ -519,13 +520,13 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                 return result.deleted_count
 
     def update(
-            self,
-            upsert=False,
-            multi=True,
-            write_concern=None,
-            read_concern=None,
-            full_result=False,
-            **update,
+        self,
+        upsert=False,
+        multi=True,
+        write_concern=None,
+        read_concern=None,
+        full_result=False,
+        **update,
     ):
         """Perform an atomic update on the fields matched by the query.
 
@@ -563,7 +564,7 @@ def update(
                 update["$set"] = {"_cls": queryset._document._class_name}
         try:
             with set_read_write_concern(
-                    queryset._collection, write_concern, read_concern
+                queryset._collection, write_concern, read_concern
             ) as collection:
                 update_func = collection.update_one
                 if multi:
@@ -637,7 +638,7 @@ def update_one(self, upsert=False, write_concern=None, full_result=False, **upda
         )
 
     def modify(
-            self, upsert=False, full_response=False, remove=False, new=False, **update
+        self, upsert=False, full_response=False, remove=False, new=False, **update
     ):
         """Update and return the updated document.
 
@@ -798,8 +799,8 @@ def _clone_into(self, new_qs):
             "_loaded_fields",
             "_ordering",
             "_snapshot",
-            "_allow_disk_use",
             "_timeout",
+            "_allow_disk_use",
             "_read_preference",
             "_read_concern",
             "_iter",
@@ -968,7 +969,7 @@ def distinct(self, field):
             for field_part in field.split(".")[1:]:
                 # if looping on embedded document, get the document type instance
                 if instance and isinstance(
-                        doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+                    doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
                 ):
                     doc_field = instance
                 # now get the subdocument
@@ -977,12 +978,12 @@ def distinct(self, field):
                 if isinstance(doc_field, ListField):
                     doc_field = getattr(doc_field, "field", doc_field)
                 if isinstance(
-                        doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+                    doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
                 ):
                     instance = getattr(doc_field, "document_type", None)
 
         if instance and isinstance(
-                doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+            doc_field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
         ):
             distinct = [instance(**doc) for doc in distinct]
 
@@ -1317,7 +1318,7 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
 
     # JS functionality
     def map_reduce(
-            self, map_f, reduce_f, output, finalize_f=None, limit=None, scope=None
+        self, map_f, reduce_f, output, finalize_f=None, limit=None, scope=None
     ):
         """Perform a map/reduce query using the current query spec
         and ordering. While ``map_reduce`` respects ``QuerySet`` chaining,

From 97c99ca40daf4fb4225d008c8b01fa3bfc002459 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 23 Feb 2021 21:49:45 +0100
Subject: [PATCH 1161/1519] Add test case for #2473

---
 tests/queryset/test_queryset_aggregation.py | 28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index a9c042de9..ecc0db6e0 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -248,6 +248,34 @@ class Person(Document):
 
         assert list(data) == [{"_id": p1.pk, "name": "ISABELLA LUANNA"}]
 
+    def test_queryset_aggregation_geonear_aggregation_on_pointfield(self):
+        """test ensures that $geonear can be used as a 1-stage pipeline and that
+        MongoEngine does not interfer with such pipeline (#2473)
+        """
+
+        class Aggr(Document):
+            name = StringField()
+            c = PointField()
+
+        Aggr.drop_collection()
+
+        agg1 = Aggr(name="X", c=[10.634584, 35.8245029]).save()
+        agg2 = Aggr(name="Y", c=[10.634584, 35.8245029]).save()
+
+        pipeline = [
+            {
+                "$geoNear": {
+                    "near": {"type": "Point", "coordinates": [10.634584, 35.8245029]},
+                    "distanceField": "c",
+                    "spherical": True,
+                }
+            }
+        ]
+        assert list(Aggr.objects.aggregate(*pipeline)) == [
+            {"_id": agg1.id, "c": 0.0, "name": "X"},
+            {"_id": agg2.id, "c": 0.0, "name": "Y"},
+        ]
+
 
 if __name__ == "__main__":
     unittest.main()

From 1f220b4eaf8bc2e834a3c7e1fbfa4909d237e7cf Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 23 Feb 2021 21:51:41 +0100
Subject: [PATCH 1162/1519] update changelog and fix minor typo in docstring

---
 docs/changelog.rst    | 1 +
 mongoengine/fields.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b904a2b88..5898eb1f4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Bugfix: manually setting SequenceField in DynamicDocument doesn't increment the counter #2471
 
 Changes in 0.22.1
 =================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index c20333a86..10bba54b1 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1162,7 +1162,7 @@ def __init__(
 
         :param document_type: The type of Document that will be referenced
         :param dbref:  Store the reference as :class:`~pymongo.dbref.DBRef`
-          or as the :class:`~pymongo.objectid.ObjectId`.id .
+          or as the :class:`~pymongo.objectid.ObjectId`.
         :param reverse_delete_rule: Determines what to do when the referring
           object is deleted
         :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.BaseField`

From 0d5e028c55f3f78c896f1881be3a942717cf6cc2 Mon Sep 17 00:00:00 2001
From: lukasloetkolben <lukas@htzmedia.de>
Date: Fri, 26 Feb 2021 18:11:32 +0100
Subject: [PATCH 1163/1519] - tests for feature allow_disk_use

---
 tests/queryset/test_queryset.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 079447bc6..6310b9cdc 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -5656,6 +5656,31 @@ def test_no_cursor_timeout(self):
         qs = self.Person.objects().timeout(False)
         assert qs._cursor_args == {"no_cursor_timeout": True}
 
+    def test_allow_disk_use(self):
+        qs = self.Person.objects()
+        assert qs._cursor_args == {}
+
+        qs = self.Person.objects().allow_disk_use(False)
+        assert qs._cursor_args == {}
+
+        qs = self.Person.objects().allow_disk_use(True)
+        assert qs._cursor_args == {"allow_disk_use": True}
+
+        # Test if allow_disk_use changes the results
+        self.Person.drop_collection()
+        self.Person.objects.create(name="Foo", age=12)
+        self.Person.objects.create(name="Baz", age=17)
+        self.Person.objects.create(name="Bar", age=13)
+
+        qs_disk = self.Person.objects().order_by("age").allow_disk_use(True)
+        qs = self.Person.objects().order_by("age")
+
+        assert qs_disk.count() == qs.count()
+
+        for index in range(qs_disk.count()):
+            assert qs_disk[index] == qs[index]
+
+
 
 if __name__ == "__main__":
     unittest.main()

From 467e9c3ddf80b15ea93e61b2dc96e1d0e67074e3 Mon Sep 17 00:00:00 2001
From: lukasloetkolben <lukas@htzmedia.de>
Date: Fri, 26 Feb 2021 18:12:58 +0100
Subject: [PATCH 1164/1519]  typo wether --> whether

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c5193ed9d..ae8cd4070 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1171,7 +1171,7 @@ def allow_disk_use(self, enabled):
         """Enable or disable the use of temporary files on disk while processing a blocking sort operation.
          (To store data exceeding the 100 megabyte system memory limit)
 
-        :param enabled: wether or not temporary files on disk are used
+        :param enabled: whether or not temporary files on disk are used
         """
         queryset = self.clone()
         queryset._allow_disk_use = enabled

From 9ff5d8426c3d156001048f23e67709174a0329af Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 27 Feb 2021 21:30:07 +0100
Subject: [PATCH 1165/1519] restrict test on allowDiskUse to mongoDB >= 4.4 in
 CI + ran black

---
 tests/queryset/test_queryset.py | 3 ++-
 tests/utils.py                  | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 6310b9cdc..4d281c60c 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -21,6 +21,7 @@
     QuerySetManager,
     queryset_manager,
 )
+from tests.utils import requires_mongodb_gte_44
 
 
 class db_ops_tracker(query_counter):
@@ -5656,6 +5657,7 @@ def test_no_cursor_timeout(self):
         qs = self.Person.objects().timeout(False)
         assert qs._cursor_args == {"no_cursor_timeout": True}
 
+    @requires_mongodb_gte_44
     def test_allow_disk_use(self):
         qs = self.Person.objects()
         assert qs._cursor_args == {}
@@ -5681,6 +5683,5 @@ def test_allow_disk_use(self):
             assert qs_disk[index] == qs[index]
 
 
-
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/utils.py b/tests/utils.py
index 0899c208a..adb0bdb4f 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,3 +1,4 @@
+import operator
 import unittest
 
 import pytest
@@ -33,6 +34,10 @@ def get_as_pymongo(doc):
     return doc.__class__.objects.as_pymongo().get(id=doc.id)
 
 
+def requires_mongodb_gte_44(func):
+    return _decorated_with_ver_requirement(func, (4, 4), oper=operator.ge)
+
+
 def _decorated_with_ver_requirement(func, mongo_version_req, oper):
     """Return a MongoDB version requirement decorator.
 

From 8ef771912dbcd0cc56cfb7a1b5fefb6172518139 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 28 Feb 2021 14:07:15 +0100
Subject: [PATCH 1166/1519] fixing incompatibility with mongoengine aggregation
 to support mongo 4.4

---
 mongoengine/mongodb_support.py  |  1 +
 mongoengine/queryset/base.py    |  9 +++------
 tests/document/test_indexes.py  |  5 ++++-
 tests/queryset/test_queryset.py | 18 +++++++++++++++---
 tests/utils.py                  |  8 ++++++++
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index 522f064e6..df51100d2 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -8,6 +8,7 @@
 # get_mongodb_version()
 MONGODB_34 = (3, 4)
 MONGODB_36 = (3, 6)
+MONGODB_44 = (4, 4)
 
 
 def get_mongodb_version():
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ae8cd4070..47a5f733c 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1355,21 +1355,18 @@ def map_reduce(
 
         MapReduceDocument = _import_class("MapReduceDocument")
 
-        if not hasattr(self._collection, "map_reduce"):
-            raise NotImplementedError("Requires MongoDB >= 1.7.1")
-
         map_f_scope = {}
         if isinstance(map_f, Code):
             map_f_scope = map_f.scope
             map_f = str(map_f)
-        map_f = Code(queryset._sub_js_fields(map_f), map_f_scope)
+        map_f = Code(queryset._sub_js_fields(map_f), map_f_scope or None)
 
         reduce_f_scope = {}
         if isinstance(reduce_f, Code):
             reduce_f_scope = reduce_f.scope
             reduce_f = str(reduce_f)
         reduce_f_code = queryset._sub_js_fields(reduce_f)
-        reduce_f = Code(reduce_f_code, reduce_f_scope)
+        reduce_f = Code(reduce_f_code, reduce_f_scope or None)
 
         mr_args = {"query": queryset._query}
 
@@ -1379,7 +1376,7 @@ def map_reduce(
                 finalize_f_scope = finalize_f.scope
                 finalize_f = str(finalize_f)
             finalize_f_code = queryset._sub_js_fields(finalize_f)
-            finalize_f = Code(finalize_f_code, finalize_f_scope)
+            finalize_f = Code(finalize_f_code, finalize_f_scope or None)
             mr_args["finalize"] = finalize_f
 
         if scope:
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 55a569317..17643dd89 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -7,6 +7,7 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
+from mongoengine.mongodb_support import MONGODB_44, get_mongodb_version
 
 
 class TestIndexes(unittest.TestCase):
@@ -452,9 +453,11 @@ class Test(Document):
             .get("stage")
             == "IXSCAN"
         )
+        mongo_db = get_mongodb_version()
+        PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_44 else "PROJECTION_COVERED"
         assert (
             query_plan.get("queryPlanner").get("winningPlan").get("stage")
-            == "PROJECTION"
+            == PROJECTION_STR
         )
 
         query_plan = Test.objects(a=1).explain()
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 4d281c60c..c346abde2 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -21,7 +21,11 @@
     QuerySetManager,
     queryset_manager,
 )
-from tests.utils import requires_mongodb_gte_44
+from tests.utils import (
+    requires_mongodb_gte_44,
+    requires_mongodb_lt_42,
+    requires_mongodb_lte_42,
+)
 
 
 class db_ops_tracker(query_counter):
@@ -1490,6 +1494,7 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
+    @requires_mongodb_lt_42
     def test_exec_js_query(self):
         """Ensure that queries are properly formed for use in exec_js."""
 
@@ -1527,6 +1532,7 @@ class BlogPost(Document):
 
         BlogPost.drop_collection()
 
+    @requires_mongodb_lt_42
     def test_exec_js_field_sub(self):
         """Ensure that field substitutions occur properly in exec_js functions."""
 
@@ -3109,6 +3115,7 @@ class Person(Document):
         freq = Person.objects.item_frequencies("city", normalize=True, map_reduce=True)
         assert freq == {"CRB": 0.5, None: 0.5}
 
+    @requires_mongodb_lte_42
     def test_item_frequencies_with_null_embedded(self):
         class Data(EmbeddedDocument):
             name = StringField()
@@ -3137,6 +3144,7 @@ class Person(Document):
         ot = Person.objects.item_frequencies("extra.tag", map_reduce=True)
         assert ot == {None: 1.0, "friend": 1.0}
 
+    @requires_mongodb_lte_42
     def test_item_frequencies_with_0_values(self):
         class Test(Document):
             val = IntField()
@@ -3151,6 +3159,7 @@ class Test(Document):
         ot = Test.objects.item_frequencies("val", map_reduce=False)
         assert ot == {0: 1}
 
+    @requires_mongodb_lte_42
     def test_item_frequencies_with_False_values(self):
         class Test(Document):
             val = BooleanField()
@@ -3165,6 +3174,7 @@ class Test(Document):
         ot = Test.objects.item_frequencies("val", map_reduce=False)
         assert ot == {False: 1}
 
+    @requires_mongodb_lte_42
     def test_item_frequencies_normalize(self):
         class Test(Document):
             val = IntField()
@@ -3551,7 +3561,8 @@ class Book(Document):
         Book.objects.create(title="The Stories", authors=[mark_twain, john_tolkien])
 
         authors = Book.objects.distinct("authors")
-        assert authors == [mark_twain, john_tolkien]
+        authors_names = {author.name for author in authors}
+        assert authors_names == {mark_twain.name, john_tolkien.name}
 
     def test_distinct_ListField_EmbeddedDocumentField_EmbeddedDocumentField(self):
         class Continent(EmbeddedDocument):
@@ -3588,7 +3599,8 @@ class Book(Document):
         assert country_list == [scotland, tibet]
 
         continent_list = Book.objects.distinct("authors.country.continent")
-        assert continent_list == [europe, asia]
+        continent_list_names = {c.continent_name for c in continent_list}
+        assert continent_list_names == {europe.continent_name, asia.continent_name}
 
     def test_distinct_ListField_ReferenceField(self):
         class Bar(Document):
diff --git a/tests/utils.py b/tests/utils.py
index adb0bdb4f..19596afab 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -34,6 +34,14 @@ def get_as_pymongo(doc):
     return doc.__class__.objects.as_pymongo().get(id=doc.id)
 
 
+def requires_mongodb_lt_42(func):
+    return _decorated_with_ver_requirement(func, (4, 2), oper=operator.lt)
+
+
+def requires_mongodb_lte_42(func):
+    return _decorated_with_ver_requirement(func, (4, 2), oper=operator.le)
+
+
 def requires_mongodb_gte_44(func):
     return _decorated_with_ver_requirement(func, (4, 4), oper=operator.ge)
 

From b479bb7c6bdf4c8853555dad3f24a67d407db484 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 3 Mar 2021 10:52:46 +0100
Subject: [PATCH 1167/1519] Fix tests for supporting Mongo4.4 for some reason
 results comes sorted differently in map reduce when no sort is specified

---
 tests/queryset/test_queryset.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index c346abde2..a4dbabd5f 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -2666,6 +2666,8 @@ class BlogPost(Document):
             title = StringField(primary_key=True)
             tags = ListField(StringField())
 
+        BlogPost.drop_collection()
+
         post1 = BlogPost(title="Post #1", tags=["mongodb", "mongoengine"])
         post2 = BlogPost(title="Post #2", tags=["django", "mongodb"])
         post3 = BlogPost(title="Post #3", tags=["hitchcock films"])
@@ -2694,12 +2696,15 @@ class BlogPost(Document):
             }
         """
 
-        results = BlogPost.objects.map_reduce(map_f, reduce_f, "myresults")
+        results = BlogPost.objects.order_by("_id").map_reduce(
+            map_f, reduce_f, "myresults2"
+        )
         results = list(results)
 
-        assert results[0].object == post1
-        assert results[1].object == post2
-        assert results[2].object == post3
+        assert len(results) == 3
+        assert results[0].object.id == post1.id
+        assert results[1].object.id == post2.id
+        assert results[2].object.id == post3.id
 
         BlogPost.drop_collection()
 
@@ -2707,7 +2712,6 @@ def test_map_reduce_custom_output(self):
         """
         Test map/reduce custom output
         """
-        register_connection("test2", "mongoenginetest2")
 
         class Family(Document):
             id = IntField(primary_key=True)
@@ -2780,6 +2784,7 @@ class Person(Document):
                             family.persons.push(person);
                             family.totalAge += person.age;
                         });
+                        family.persons.sort((a, b) => (a.age > b.age))
                     }
                 });
 
@@ -2808,10 +2813,10 @@ class Person(Document):
             "_id": 1,
             "value": {
                 "persons": [
+                    {"age": 17, "name": "Tayza Mariana"},
                     {"age": 21, "name": "Wilson Jr"},
-                    {"age": 45, "name": "Wilson Father"},
                     {"age": 40, "name": "Eliana Costa"},
-                    {"age": 17, "name": "Tayza Mariana"},
+                    {"age": 45, "name": "Wilson Father"},
                 ],
                 "totalAge": 123,
             },
@@ -2821,9 +2826,9 @@ class Person(Document):
             "_id": 2,
             "value": {
                 "persons": [
+                    {"age": 10, "name": "Igor Gabriel"},
                     {"age": 16, "name": "Isabella Luanna"},
                     {"age": 36, "name": "Sandra Mara"},
-                    {"age": 10, "name": "Igor Gabriel"},
                 ],
                 "totalAge": 62,
             },
@@ -2833,8 +2838,8 @@ class Person(Document):
             "_id": 3,
             "value": {
                 "persons": [
-                    {"age": 30, "name": "Arthur WA"},
                     {"age": 25, "name": "Paula Leonel"},
+                    {"age": 30, "name": "Arthur WA"},
                 ],
                 "totalAge": 55,
             },

From 3b9a167022f73ae0bf9e21e3e1a2c5901e7564bd Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 3 Mar 2021 10:57:18 +0100
Subject: [PATCH 1168/1519] Add Mongo 4.4 to ci

---
 .github/workflows/github-actions.yml | 11 ++++++-----
 docs/changelog.rst                   |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 70393ebc2..02eeccd43 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -11,9 +11,10 @@ on:
     tags:
       - 'v[0-9]+\.[0-9]+\.[0-9]+*'
 env:
-  MONGODB_3_4: 3.4.19
   MONGODB_3_6: 3.6.13
   MONGODB_4_0: 4.0.13
+  MONGODB_4_2: 4.2.12
+  MONGODB_4_4: 4.4.4
 
   PYMONGO_3_4: 3.4
   PYMONGO_3_6: 3.6
@@ -47,14 +48,14 @@ jobs:
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
-          - python-version: 3.7
-            MONGODB: $MONGODB_3_4
-            PYMONGO: $PYMONGO_3_6
           - python-version: 3.7
             MONGODB: $MONGODB_3_6
             PYMONGO: $PYMONGO_3_9
           - python-version: 3.7
-            MONGODB: $MONGODB_3_6
+            MONGODB: MONGODB_4_2
+            PYMONGO: $PYMONGO_3_6
+          - python-version: 3.7
+            MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_11
     steps:
     - uses: actions/checkout@v2
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5898eb1f4..aaf8f3cce 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Bugfix: manually setting SequenceField in DynamicDocument doesn't increment the counter #2471
+- Add MongoDB 4.4 to CI
 
 Changes in 0.22.1
 =================

From 0620ac5641b721e2205647d67718a1ae329d1bac Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 3 Mar 2021 11:30:03 +0100
Subject: [PATCH 1169/1519] Fix mongo download link as convention changed in
 official repo with > 4.0

---
 .github/workflows/github-actions.yml | 4 ++--
 .github/workflows/install_mongo.sh   | 7 +++++++
 docs/changelog.rst                   | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 02eeccd43..4ee0fd377 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -11,8 +11,8 @@ on:
     tags:
       - 'v[0-9]+\.[0-9]+\.[0-9]+*'
 env:
-  MONGODB_3_6: 3.6.13
-  MONGODB_4_0: 4.0.13
+  MONGODB_3_6: 3.6.14
+  MONGODB_4_0: 4.0.23
   MONGODB_4_2: 4.2.12
   MONGODB_4_4: 4.4.4
 
diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
index a98440a8f..5f4866669 100644
--- a/.github/workflows/install_mongo.sh
+++ b/.github/workflows/install_mongo.sh
@@ -2,7 +2,14 @@
 
 MONGODB=$1
 
+# Mongo > 4.0 follows different name convention for download links
 mongo_build=mongodb-linux-x86_64-${MONGODB}
+
+if [[ "$MONGODB" == *"4."* ]] && [[ ! "$MONGODB" == *"4.0"* ]]; then
+  echo "It's there."
+  mongo_build=mongodb-linux-x86_64-ubuntu2004-v${MONGODB}-latest
+fi
+
 wget http://fastdl.mongodb.org/linux/$mongo_build.tgz
 tar xzf $mongo_build.tgz
 ${PWD}/$mongo_build/bin/mongod --version
diff --git a/docs/changelog.rst b/docs/changelog.rst
index aaf8f3cce..d8f7dde72 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,7 +7,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Bugfix: manually setting SequenceField in DynamicDocument doesn't increment the counter #2471
-- Add MongoDB 4.4 to CI
+- Add MongoDB 4.2 and 4.4 to CI
 
 Changes in 0.22.1
 =================

From f2442071681bc29957682348a3e01e83741c4f97 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 3 Mar 2021 11:40:39 +0100
Subject: [PATCH 1170/1519] fix mongo download link for 4.2 4.4 explicitly

---
 .github/workflows/github-actions.yml |  6 +++---
 .github/workflows/install_mongo.sh   | 11 +++++++----
 .github/workflows/start_mongo.sh     |  3 ++-
 mongoengine/mongodb_support.py       |  1 +
 tests/document/test_indexes.py       |  4 ++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 4ee0fd377..bfdfa3a47 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -13,8 +13,8 @@ on:
 env:
   MONGODB_3_6: 3.6.14
   MONGODB_4_0: 4.0.23
-  MONGODB_4_2: 4.2.12
-  MONGODB_4_4: 4.4.4
+  MONGODB_4_2: 4.2
+  MONGODB_4_4: 4.4
 
   PYMONGO_3_4: 3.4
   PYMONGO_3_6: 3.6
@@ -52,7 +52,7 @@ jobs:
             MONGODB: $MONGODB_3_6
             PYMONGO: $PYMONGO_3_9
           - python-version: 3.7
-            MONGODB: MONGODB_4_2
+            MONGODB: $MONGODB_4_2
             PYMONGO: $PYMONGO_3_6
           - python-version: 3.7
             MONGODB: $MONGODB_4_4
diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
index 5f4866669..136f5c203 100644
--- a/.github/workflows/install_mongo.sh
+++ b/.github/workflows/install_mongo.sh
@@ -5,11 +5,14 @@ MONGODB=$1
 # Mongo > 4.0 follows different name convention for download links
 mongo_build=mongodb-linux-x86_64-${MONGODB}
 
-if [[ "$MONGODB" == *"4."* ]] && [[ ! "$MONGODB" == *"4.0"* ]]; then
-  echo "It's there."
-  mongo_build=mongodb-linux-x86_64-ubuntu2004-v${MONGODB}-latest
+if [[ "$MONGODB" == *"4.2"* ]]; then
+  mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
+elif [[ "$MONGODB" == *"4.4"* ]]; then
+  mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
 fi
 
 wget http://fastdl.mongodb.org/linux/$mongo_build.tgz
 tar xzf $mongo_build.tgz
-${PWD}/$mongo_build/bin/mongod --version
+
+mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
+$mongodb_dir/bin/mongod --version
diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
index dc844dbd5..800004c87 100644
--- a/.github/workflows/start_mongo.sh
+++ b/.github/workflows/start_mongo.sh
@@ -2,7 +2,8 @@
 
 MONGODB=$1
 
-mongodb_dir=${PWD}/mongodb-linux-x86_64-${MONGODB}
+mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
+
 mkdir $mongodb_dir/data
 $mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork
 mongo --eval 'db.version();'    # Make sure mongo is awake
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index df51100d2..8c5b3e5d0 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -8,6 +8,7 @@
 # get_mongodb_version()
 MONGODB_34 = (3, 4)
 MONGODB_36 = (3, 6)
+MONGODB_42 = (4, 2)
 MONGODB_44 = (4, 4)
 
 
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 17643dd89..2de9307df 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -7,7 +7,7 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from mongoengine.mongodb_support import MONGODB_44, get_mongodb_version
+from mongoengine.mongodb_support import MONGODB_42, get_mongodb_version
 
 
 class TestIndexes(unittest.TestCase):
@@ -454,7 +454,7 @@ class Test(Document):
             == "IXSCAN"
         )
         mongo_db = get_mongodb_version()
-        PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_44 else "PROJECTION_COVERED"
+        PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
         assert (
             query_plan.get("queryPlanner").get("winningPlan").get("stage")
             == PROJECTION_STR

From 8fd969aba912520900f0c0df807dc31a44233df0 Mon Sep 17 00:00:00 2001
From: Jan Stein <jan@makewave.com>
Date: Wed, 3 Mar 2021 14:58:03 +0100
Subject: [PATCH 1171/1519] Test case and proposed solution for #2484

---
 AUTHORS                                   |  1 +
 docs/changelog.rst                        |  1 +
 mongoengine/base/document.py              | 10 +++++++++-
 tests/fields/test_lazy_reference_field.py | 20 ++++++++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 1cf7d78a6..0c7f6b46d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -259,3 +259,4 @@ that much better:
  * Agustin Barto (https://github.com/abarto)
  * Stankiewicz Mateusz (https://github.com/mas15)
  * Felix Schultheiß (https://github.com/felix-smashdocs)
+ * Jan Stein (https://github.com/janste63)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5898eb1f4..e647081e6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Bugfix: manually setting SequenceField in DynamicDocument doesn't increment the counter #2471
+- Bug fix: ignore LazyReferenceFields when clearing _changed_fields #2484
 
 Changes in 0.22.1
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 344095625..b76671ceb 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -615,7 +615,9 @@ def _nestable_types_changed_fields(changed_fields, base_key, data):
     def _get_changed_fields(self):
         """Return a list of all fields that have explicitly been changed."""
         EmbeddedDocument = _import_class("EmbeddedDocument")
+        LazyReferenceField = _import_class("LazyReferenceField")
         ReferenceField = _import_class("ReferenceField")
+        GenericLazyReferenceField = _import_class("GenericLazyReferenceField")
         GenericReferenceField = _import_class("GenericReferenceField")
         SortedListField = _import_class("SortedListField")
 
@@ -641,7 +643,13 @@ def _get_changed_fields(self):
                 changed_fields += [f"{key}{k}" for k in changed if k]
             elif isinstance(data, (list, tuple, dict)):
                 if hasattr(field, "field") and isinstance(
-                    field.field, (ReferenceField, GenericReferenceField)
+                    field.field,
+                    (
+                        LazyReferenceField,
+                        ReferenceField,
+                        GenericLazyReferenceField,
+                        GenericReferenceField,
+                    ),
                 ):
                     continue
                 elif isinstance(field, SortedListField) and field._ordering:
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index fd623bfcc..2b02668c5 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -375,6 +375,26 @@ class Book(Document):
             assert isinstance(ref.author, LazyReference)
             assert isinstance(ref.author.id, ObjectId)
 
+    def test_lazy_reference_in_list_with_changed_element(self):
+        class Animal(Document):
+            name = StringField()
+            tag = StringField()
+
+        class Ocurrence(Document):
+            in_list = ListField(LazyReferenceField(Animal))
+
+        Animal.drop_collection()
+        Ocurrence.drop_collection()
+
+        animal1 = Animal(name="doggo").save()
+
+        animal1.tag = "blue"
+
+        occ = Ocurrence(in_list=[animal1]).save()
+        animal1.save()
+        assert isinstance(occ.in_list[0], LazyReference)
+        assert occ.in_list[0].pk == animal1.pk
+
 
 class TestGenericLazyReferenceField(MongoDBTestCase):
     def test_generic_lazy_reference_simple(self):

From b9b536133de9f777b6643527b2b5fbaa366d4efc Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 4 Mar 2021 00:10:08 +0100
Subject: [PATCH 1172/1519] fix test incompat for 4.2

---
 tests/queryset/test_queryset.py | 9 ++++-----
 tests/utils.py                  | 4 ----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index a4dbabd5f..01e6b568e 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -24,7 +24,6 @@
 from tests.utils import (
     requires_mongodb_gte_44,
     requires_mongodb_lt_42,
-    requires_mongodb_lte_42,
 )
 
 
@@ -3120,7 +3119,7 @@ class Person(Document):
         freq = Person.objects.item_frequencies("city", normalize=True, map_reduce=True)
         assert freq == {"CRB": 0.5, None: 0.5}
 
-    @requires_mongodb_lte_42
+    @requires_mongodb_lt_42
     def test_item_frequencies_with_null_embedded(self):
         class Data(EmbeddedDocument):
             name = StringField()
@@ -3149,7 +3148,7 @@ class Person(Document):
         ot = Person.objects.item_frequencies("extra.tag", map_reduce=True)
         assert ot == {None: 1.0, "friend": 1.0}
 
-    @requires_mongodb_lte_42
+    @requires_mongodb_lt_42
     def test_item_frequencies_with_0_values(self):
         class Test(Document):
             val = IntField()
@@ -3164,7 +3163,7 @@ class Test(Document):
         ot = Test.objects.item_frequencies("val", map_reduce=False)
         assert ot == {0: 1}
 
-    @requires_mongodb_lte_42
+    @requires_mongodb_lt_42
     def test_item_frequencies_with_False_values(self):
         class Test(Document):
             val = BooleanField()
@@ -3179,7 +3178,7 @@ class Test(Document):
         ot = Test.objects.item_frequencies("val", map_reduce=False)
         assert ot == {False: 1}
 
-    @requires_mongodb_lte_42
+    @requires_mongodb_lt_42
     def test_item_frequencies_normalize(self):
         class Test(Document):
             val = IntField()
diff --git a/tests/utils.py b/tests/utils.py
index 19596afab..52f569802 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -38,10 +38,6 @@ def requires_mongodb_lt_42(func):
     return _decorated_with_ver_requirement(func, (4, 2), oper=operator.lt)
 
 
-def requires_mongodb_lte_42(func):
-    return _decorated_with_ver_requirement(func, (4, 2), oper=operator.le)
-
-
 def requires_mongodb_gte_44(func):
     return _decorated_with_ver_requirement(func, (4, 4), oper=operator.ge)
 

From 34d273015c98967a6cfd9f65bea5ef48a65f6a68 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 4 Mar 2021 22:46:29 +0100
Subject: [PATCH 1173/1519] update changelog for 0.23.0 release

---
 docs/changelog.rst      | 5 +++++
 mongoengine/__init__.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d8f7dde72..64bf27757 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,4 +1,5 @@
 
+
 =========
 Changelog
 =========
@@ -6,8 +7,12 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.23.0
+===========
 - Bugfix: manually setting SequenceField in DynamicDocument doesn't increment the counter #2471
 - Add MongoDB 4.2 and 4.4 to CI
+- Add support for allowDiskUse on querysets #2468
 
 Changes in 0.22.1
 =================
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 683463999..bf38d8b0c 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -28,7 +28,7 @@
 )
 
 
-VERSION = (0, 22, 1)
+VERSION = (0, 23, 0)
 
 
 def get_version():

From 58a3c6de03954686595e5e58aa2d1dd00c8f4ddc Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 8 Mar 2021 00:08:10 +0100
Subject: [PATCH 1174/1519] Add _lazy_load_ref methods so that the impact of
 lazy loading surfaces when profiling

---
 mongoengine/base/fields.py | 25 ++++++++++-----
 mongoengine/fields.py      | 62 +++++++++++++++++++++-----------------
 2 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index ca01d00d3..f1bc020c1 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -267,6 +267,17 @@ def __init__(self, field=None, **kwargs):
         self.field = field
         super().__init__(**kwargs)
 
+    @staticmethod
+    def _lazy_load_refs(instance, name, ref_values, *, max_depth):
+        _dereference = _import_class("DeReference")()
+        documents = _dereference(
+            ref_values,
+            max_depth=max_depth,
+            instance=instance,
+            name=name,
+        )
+        return documents
+
     def __get__(self, instance, owner):
         """Descriptor to automatically dereference references."""
         if instance is None:
@@ -284,19 +295,15 @@ def __get__(self, instance, owner):
             or isinstance(self.field, (GenericReferenceField, ReferenceField))
         )
 
-        _dereference = _import_class("DeReference")()
-
         if (
             instance._initialised
             and dereference
             and instance._data.get(self.name)
             and not getattr(instance._data[self.name], "_dereferenced", False)
         ):
-            instance._data[self.name] = _dereference(
-                instance._data.get(self.name),
-                max_depth=1,
-                instance=instance,
-                name=self.name,
+            ref_values = instance._data.get(self.name)
+            instance._data[self.name] = self._lazy_load_refs(
+                ref_values=ref_values, instance=instance, name=self.name, max_depth=1
             )
             if hasattr(instance._data[self.name], "_dereferenced"):
                 instance._data[self.name]._dereferenced = True
@@ -322,7 +329,9 @@ def __get__(self, instance, owner):
             and isinstance(value, (BaseList, BaseDict))
             and not value._dereferenced
         ):
-            value = _dereference(value, max_depth=1, instance=instance, name=self.name)
+            value = self._lazy_load_refs(
+                ref_values=value, instance=instance, name=self.name, max_depth=1
+            )
             value._dereferenced = True
             instance._data[self.name] = value
 
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index cfff2b472..e714dde9e 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1194,6 +1194,14 @@ def document_type(self):
                 self.document_type_obj = get_document(self.document_type_obj)
         return self.document_type_obj
 
+    @staticmethod
+    def _lazy_load_ref(ref_cls, dbref):
+        dereferenced_son = ref_cls._get_db().dereference(dbref)
+        if dereferenced_son is None:
+            raise DoesNotExist(f"Trying to dereference unknown document {dbref}")
+
+        return ref_cls._from_son(dereferenced_son)
+
     def __get__(self, instance, owner):
         """Descriptor to allow lazy dereferencing."""
         if instance is None:
@@ -1201,20 +1209,17 @@ def __get__(self, instance, owner):
             return self
 
         # Get value from document instance if available
-        value = instance._data.get(self.name)
+        ref_value = instance._data.get(self.name)
         auto_dereference = instance._fields[self.name]._auto_dereference
         # Dereference DBRefs
-        if auto_dereference and isinstance(value, DBRef):
-            if hasattr(value, "cls"):
+        if auto_dereference and isinstance(ref_value, DBRef):
+            if hasattr(ref_value, "cls"):
                 # Dereference using the class type specified in the reference
-                cls = get_document(value.cls)
+                cls = get_document(ref_value.cls)
             else:
                 cls = self.document_type
-            dereferenced = cls._get_db().dereference(value)
-            if dereferenced is None:
-                raise DoesNotExist("Trying to dereference unknown document %s" % value)
-            else:
-                instance._data[self.name] = cls._from_son(dereferenced)
+
+            instance._data[self.name] = self._lazy_load_ref(cls, ref_value)
 
         return super().__get__(instance, owner)
 
@@ -1353,6 +1358,14 @@ def document_type(self):
                 self.document_type_obj = get_document(self.document_type_obj)
         return self.document_type_obj
 
+    @staticmethod
+    def _lazy_load_ref(ref_cls, dbref):
+        dereferenced_son = ref_cls._get_db().dereference(dbref)
+        if dereferenced_son is None:
+            raise DoesNotExist(f"Trying to dereference unknown document {dbref}")
+
+        return ref_cls._from_son(dereferenced_son)
+
     def __get__(self, instance, owner):
         if instance is None:
             # Document class being used rather than a document object
@@ -1364,11 +1377,7 @@ def __get__(self, instance, owner):
 
         # Dereference DBRefs
         if auto_dereference and isinstance(value, DBRef):
-            dereferenced = self.document_type._get_db().dereference(value)
-            if dereferenced is None:
-                raise DoesNotExist("Trying to dereference unknown document %s" % value)
-            else:
-                instance._data[self.name] = self.document_type._from_son(dereferenced)
+            instance._data[self.name] = self._lazy_load_ref(self.document_type, value)
 
         return super().__get__(instance, owner)
 
@@ -1493,6 +1502,14 @@ def _validate_choices(self, value):
             value = value._class_name
         super()._validate_choices(value)
 
+    @staticmethod
+    def _lazy_load_ref(ref_cls, dbref):
+        dereferenced_son = ref_cls._get_db().dereference(dbref)
+        if dereferenced_son is None:
+            raise DoesNotExist(f"Trying to dereference unknown document {dbref}")
+
+        return ref_cls._from_son(dereferenced_son)
+
     def __get__(self, instance, owner):
         if instance is None:
             return self
@@ -1500,12 +1517,9 @@ def __get__(self, instance, owner):
         value = instance._data.get(self.name)
 
         auto_dereference = instance._fields[self.name]._auto_dereference
-        if auto_dereference and isinstance(value, (dict, SON)):
-            dereferenced = self.dereference(value)
-            if dereferenced is None:
-                raise DoesNotExist("Trying to dereference unknown document %s" % value)
-            else:
-                instance._data[self.name] = dereferenced
+        if auto_dereference and isinstance(value, dict):
+            doc_cls = get_document(value["_cls"])
+            instance._data[self.name] = self._lazy_load_ref(doc_cls, value["_ref"])
 
         return super().__get__(instance, owner)
 
@@ -1524,14 +1538,6 @@ def validate(self, value):
                 " saved to the database"
             )
 
-    def dereference(self, value):
-        doc_cls = get_document(value["_cls"])
-        reference = value["_ref"]
-        doc = doc_cls._get_db().dereference(reference)
-        if doc is not None:
-            doc = doc_cls._from_son(doc)
-        return doc
-
     def to_mongo(self, document):
         if document is None:
             return None

From e31f9150d26f2ea7c7ecb09445a0cb39c2a2fd4d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 28 Feb 2021 14:32:46 +0100
Subject: [PATCH 1175/1519] improve connect() doc and put more emphasis on URI
 string

---
 docs/guide/connecting.rst | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index fea5e97b4..d9b8bdbfb 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -25,30 +25,35 @@ and :attr:`authentication_source` arguments should be provided::
 
     connect('project1', username='webapp', password='pwd123', authentication_source='admin')
 
-URI style connections are also supported -- just supply the URI as
-the :attr:`host` to
-:func:`~mongoengine.connect`::
+URI string connection is also supported and **is the recommended way to connect**. The URI string is
+forwarded to the driver as is, so it follows the same scheme as the `MongoDB URI <https://docs.mongodb.com/manual/reference/connection-string/#connection-string-uri-format>`_.
+Just supply the URI as the :attr:`host` to :func:`~mongoengine.connect`::
+
+    connect(host="mongodb://user:password@hostname:port/db_name")
+
+URI string can be used to configure advanced parameters like ssl, replicaSet, etc::
+
+    connect(host="mongodb://user:password@hostname:port/db_name?ssl=true&replicaSet=globaldb")
 
-    connect('project1', host='mongodb://localhost/database_name')
 
 .. note:: URI containing SRV records (e.g mongodb+srv://server.example.com/) can be used as well as the :attr:`host`
 
-.. note:: Database, username and password from URI string overrides
-    corresponding parameters in :func:`~mongoengine.connect`: ::
+.. note:: The URI string has precedence over keyword args so if you accidentally call ::
 
         connect(
             db='test',
             username='user',
             password='12345',
-            host='mongodb://admin:qwerty@localhost/production'
+            host='mongodb://admin:qwerty@localhost/my_db'
         )
 
-    will establish connection to ``production`` database using
-    ``admin`` username and ``12345`` password.
+    it will ignore the db, username and password argument and establish the connection to ``my_db`` database using
+    ``admin`` username and ``qwerty`` password.
 
 .. note:: Calling :func:`~mongoengine.connect` without argument will establish
     a connection to the "test" database by default
 
+
 Replica Sets
 ============
 

From 50d891cb7bfa22f335a2e8a2279cf5e57fd4a596 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 8 Mar 2021 21:51:25 +0100
Subject: [PATCH 1176/1519] more improvement to connect doc

---
 docs/changelog.rst        |  3 +-
 docs/guide/connecting.rst | 91 +++++++++++++++++++++++++--------------
 2 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 64bf27757..036ad1d1a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,9 +7,10 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Improve connection doc #2481
 
 Changes in 0.23.0
-===========
+=================
 - Bugfix: manually setting SequenceField in DynamicDocument doesn't increment the counter #2471
 - Add MongoDB 4.2 and 4.4 to CI
 - Add support for allowDiskUse on querysets #2468
diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index d9b8bdbfb..387151dfe 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -5,7 +5,7 @@ Connecting to MongoDB
 =====================
 
 Connections in MongoEngine are registered globally and are identified with aliases.
-If no `alias` is provided during the connection, it will use "default" as alias.
+If no ``alias`` is provided during the connection, it will use "default" as alias.
 
 To connect to a running instance of :program:`mongod`, use the :func:`~mongoengine.connect`
 function. The first argument is the name of the database to connect to::
@@ -14,62 +14,87 @@ function. The first argument is the name of the database to connect to::
     connect('project1')
 
 By default, MongoEngine assumes that the :program:`mongod` instance is running
-on **localhost** on port **27017**. If MongoDB is running elsewhere, you should
-provide the :attr:`host` and :attr:`port` arguments to
-:func:`~mongoengine.connect`::
+on **localhost** on port **27017**.
 
-    connect('project1', host='192.168.1.35', port=12345)
+If MongoDB is running elsewhere, you need to provide details on how to connect. There are two ways of
+doing this. Using a connection string in URI format (**this is the preferred method**) or individual attributes
+provided as keyword arguments.
 
-If the database requires authentication, :attr:`username`, :attr:`password`
-and :attr:`authentication_source` arguments should be provided::
+Connect with URI string
+=======================
+
+When using a connection string in URI format you should specify the connection details
+as the :attr:`host` to :func:`~mongoengine.connect`. In a web application context for instance, the URI
+is typically read from the config file::
+
+        connect(host="mongodb://127.0.0.1:27017/my_db")
+
+If the database requires authentication, you can specify it in the
+URI. As each database can have its own users configured, you need to tell MongoDB
+where to look for the user you are working with, that's what the ``?authSource=admin`` bit
+of the MongoDB connection string is for::
+
+    # Connects to 'my_db' database by authenticating
+    # with given credentials against the 'admin' database (by default as authSource isn't provided)
+    connect(host="mongodb://my_user:my_password@127.0.0.1:27017/my_db")
+
+    # Equivalent to previous connection but explicitly states that
+    # it should use admin as the authentication source database
+    connect(host="mongodb://my_user:my_password@hostname:port/my_db?authSource=admin")
+
+    # Connects to 'my_db' database by authenticating
+    # with given credentials against that same database
+    connect(host="mongodb://my_user:my_password@127.0.0.1:27017/my_db?authSource=my_db")
+
+The URI string can also be used to configure advanced parameters like ssl, replicaSet, etc. For more
+information or example about URI string, you can refer to the `official doc <https://docs.mongodb.com/manual/reference/connection-string/>`_::
+
+    connect(host="mongodb://my_user:my_password@127.0.0.1:27017/my_db?authSource=admin&ssl=true&replicaSet=globaldb")
 
-    connect('project1', username='webapp', password='pwd123', authentication_source='admin')
+.. note:: URI containing SRV records (e.g "mongodb+srv://server.example.com/") can be used as well
 
-URI string connection is also supported and **is the recommended way to connect**. The URI string is
-forwarded to the driver as is, so it follows the same scheme as the `MongoDB URI <https://docs.mongodb.com/manual/reference/connection-string/#connection-string-uri-format>`_.
-Just supply the URI as the :attr:`host` to :func:`~mongoengine.connect`::
+Connect with keyword attributes
+===============================
 
-    connect(host="mongodb://user:password@hostname:port/db_name")
+The second option for specifying the connection details is to provide the information as keyword
+attributes to :func:`~mongoengine.connect`::
 
-URI string can be used to configure advanced parameters like ssl, replicaSet, etc::
+    connect('my_db', host='127.0.0.1', port=27017)
 
-    connect(host="mongodb://user:password@hostname:port/db_name?ssl=true&replicaSet=globaldb")
+If the database requires authentication, :attr:`username`, :attr:`password`
+and :attr:`authentication_source` arguments should be provided::
 
+    connect('my_db', username='my_user', password='my_password', authentication_source='admin')
 
-.. note:: URI containing SRV records (e.g mongodb+srv://server.example.com/) can be used as well as the :attr:`host`
+The set of attributes that :func:`~mongoengine.connect` recognizes includes but is not limited to:
+:attr:`host`, :attr:`port`, :attr:`read_preference`, :attr:`username`, :attr:`password`, :attr:`authentication_source`, :attr:`authentication_mechanism`,
+:attr:`replicaset`, :attr:`tls`, etc. Most of the parameters accepted by `pymongo.MongoClient <https://pymongo.readthedocs.io/en/stable/api/pymongo/mongo_client.html#pymongo.mongo_client.MongoClient>`_
+can be used with :func:`~mongoengine.connect` and will simply be forwarded when instantiating the `pymongo.MongoClient`.
 
-.. note:: The URI string has precedence over keyword args so if you accidentally call ::
+.. note:: Database, username and password from URI string overrides
+    corresponding parameters in :func:`~mongoengine.connect`, this should
+    obviously be avoided: ::
 
         connect(
             db='test',
             username='user',
             password='12345',
-            host='mongodb://admin:qwerty@localhost/my_db'
+            host='mongodb://admin:qwerty@localhost/production'
         )
 
-    it will ignore the db, username and password argument and establish the connection to ``my_db`` database using
-    ``admin`` username and ``qwerty`` password.
+    will establish connection to ``production`` database using ``admin`` username and ``qwerty`` password.
 
 .. note:: Calling :func:`~mongoengine.connect` without argument will establish
     a connection to the "test" database by default
 
+Read Preferences
+================
 
-Replica Sets
-============
-
-MongoEngine supports connecting to replica sets::
-
-    from mongoengine import connect
-
-    # Regular connect
-    connect('dbname', replicaset='rs-name')
-
-    # MongoDB URI-style connect
-    connect(host='mongodb://localhost/dbname?replicaSet=rs-name')
-
-Read preferences are supported through the connection or via individual
+As stated above, Read preferences are supported through the connection but also via individual
 queries by passing the read_preference ::
 
+    from pymongo import ReadPreference
+
     Bar.objects().read_preference(ReadPreference.PRIMARY)
     Bar.objects(read_preference=ReadPreference.PRIMARY)
 

From b3ce65453aef5e63668ec62a57b37f9ef3b340c3 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 8 Mar 2021 22:21:48 +0100
Subject: [PATCH 1177/1519] Fix one-to-many example that is actually a many to
 many

---
 docs/guide/defining-documents.rst | 6 +++---
 mongoengine/fields.py             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index ed0929077..a457de1f0 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -290,12 +290,12 @@ as the constructor's argument::
         content = StringField()
 
 
-.. _one-to-many-with-listfields:
+.. _many-to-many-with-listfields:
 
-One to Many with ListFields
+Many to Many with ListFields
 '''''''''''''''''''''''''''
 
-If you are implementing a one to many relationship via a list of references,
+If you are implementing a many to many relationship via a list of references,
 then the references are stored as DBRefs and to query you need to pass an
 instance of the object to the query::
 
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e714dde9e..276b02ce3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -915,7 +915,7 @@ class ListField(ComplexBaseField):
     """A list field that wraps a standard field, allowing multiple instances
     of the field to be used as a list in the database.
 
-    If using with ReferenceFields see: :ref:`one-to-many-with-listfields`
+    If using with ReferenceFields see: :ref:`many-to-many-with-listfields`
 
     .. note::
         Required means it cannot be empty - as the default for ListFields is []

From ff596fcb7ec7206c7cae7dbddf4a8cb168a2256d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 29 Mar 2021 21:47:42 +0200
Subject: [PATCH 1178/1519] replace flake8-import-order by isort

---
 .pre-commit-config.yaml                      |  8 ++++++--
 mongoengine/__init__.py                      | 15 ++++++++-------
 mongoengine/base/document.py                 |  3 +--
 mongoengine/base/fields.py                   |  8 ++++++--
 mongoengine/base/metaclasses.py              |  7 +++++--
 mongoengine/connection.py                    |  2 +-
 mongoengine/dereference.py                   |  9 +++++++--
 mongoengine/document.py                      | 17 +++++++++++++----
 mongoengine/errors.py                        |  1 -
 mongoengine/fields.py                        | 13 ++++++++-----
 mongoengine/mongodb_support.py               |  1 -
 mongoengine/queryset/base.py                 |  6 ++----
 mongoengine/queryset/manager.py              |  1 +
 mongoengine/queryset/transform.py            |  2 +-
 setup.cfg                                    | 10 ++++++++++
 setup.py                                     |  2 +-
 tests/document/test_delta.py                 |  1 +
 tests/document/test_indexes.py               |  7 +++++--
 tests/document/test_instance.py              | 10 +++++++---
 tests/document/test_json_serialisation.py    |  2 +-
 tests/fields/test_binary_field.py            |  2 +-
 tests/fields/test_boolean_field.py           |  2 +-
 tests/fields/test_complex_datetime_field.py  |  1 -
 tests/fields/test_datetime_field.py          |  1 -
 tests/fields/test_dict_field.py              | 10 ++++++----
 tests/fields/test_embedded_document_field.py |  1 -
 tests/fields/test_enum_field.py              |  4 ++--
 tests/fields/test_fields.py                  |  9 ++++++---
 tests/fields/test_float_field.py             |  1 -
 tests/fields/test_int_field.py               |  1 -
 tests/fields/test_lazy_reference_field.py    |  3 +--
 tests/fields/test_long_field.py              |  5 ++---
 tests/fields/test_reference_field.py         |  2 +-
 tests/fields/test_sequence_field.py          |  1 -
 tests/fields/test_string_field.py            |  2 +-
 tests/fields/test_uuid_field.py              |  2 +-
 tests/queryset/test_geo.py                   |  1 -
 tests/queryset/test_modify.py                |  8 +++++++-
 tests/queryset/test_queryset.py              | 11 +++++++----
 tests/queryset/test_transform.py             |  2 +-
 tests/queryset/test_visitor.py               |  2 +-
 tests/test_connection.py                     | 10 +++++-----
 tests/test_connection_mongomock.py           |  8 +-------
 tests/test_datastructures.py                 |  6 +++++-
 tests/test_replicaset_connection.py          |  1 -
 tests/utils.py                               |  1 -
 46 files changed, 133 insertions(+), 89 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 066385a2e..87c5e2f59 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,10 +8,14 @@ repos:
     rev: 3.8.4
     hooks:
       - id: flake8
-        additional_dependencies:
-          - flake8-import-order
+#        additional_dependencies:
+#          - flake8-import-order
   - repo: https://github.com/asottile/pyupgrade
     rev: v2.7.4
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
+  - repo: https://github.com/pycqa/isort
+    rev: 5.6.3
+    hooks:
+      - id: isort
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index bf38d8b0c..075c8858a 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -1,10 +1,12 @@
 # Import submodules so that we can expose their __all__
-from mongoengine import connection
-from mongoengine import document
-from mongoengine import errors
-from mongoengine import fields
-from mongoengine import queryset
-from mongoengine import signals
+from mongoengine import (
+    connection,
+    document,
+    errors,
+    fields,
+    queryset,
+    signals,
+)
 
 # Import everything from each submodule so that it can be accessed via
 # mongoengine, e.g. instead of `from mongoengine.connection import connect`,
@@ -17,7 +19,6 @@
 from mongoengine.queryset import *  # noqa: F401
 from mongoengine.signals import *  # noqa: F401
 
-
 __all__ = (
     list(document.__all__)
     + list(fields.__all__)
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index b76671ceb..683f107f1 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1,10 +1,9 @@
 import copy
-
 import numbers
 from functools import partial
 
-from bson import DBRef, ObjectId, SON, json_util
 import pymongo
+from bson import DBRef, json_util, ObjectId, SON
 
 from mongoengine import signals
 from mongoengine.base.common import get_document
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index f1bc020c1..c1dc486d5 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -1,11 +1,15 @@
 import operator
 import weakref
 
-from bson import DBRef, ObjectId, SON
 import pymongo
+from bson import DBRef, ObjectId, SON
 
 from mongoengine.base.common import UPDATE_OPERATORS
-from mongoengine.base.datastructures import BaseDict, BaseList, EmbeddedDocumentList
+from mongoengine.base.datastructures import (
+    BaseDict,
+    BaseList,
+    EmbeddedDocumentList,
+)
 from mongoengine.common import _import_class
 from mongoengine.errors import DeprecatedError, ValidationError
 
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index f3a6903d6..072b3aada 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -2,7 +2,11 @@
 import warnings
 
 from mongoengine.base.common import _document_registry
-from mongoengine.base.fields import BaseField, ComplexBaseField, ObjectIdField
+from mongoengine.base.fields import (
+    BaseField,
+    ComplexBaseField,
+    ObjectIdField,
+)
 from mongoengine.common import _import_class
 from mongoengine.errors import InvalidDocumentError
 from mongoengine.queryset import (
@@ -12,7 +16,6 @@
     QuerySetManager,
 )
 
-
 __all__ = ("DocumentMetaclass", "TopLevelDocumentMetaclass")
 
 
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index f181cf612..11cd93083 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -217,8 +217,8 @@ def register_connection(
 
 def disconnect(alias=DEFAULT_CONNECTION_NAME):
     """Close the connection with a given alias."""
-    from mongoengine.base.common import _get_documents_by_db
     from mongoengine import Document
+    from mongoengine.base.common import _get_documents_by_db
 
     if alias in _connections:
         get_connection(alias=alias).close()
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index d63e24fde..1f0ce3780 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -4,13 +4,18 @@
     BaseDict,
     BaseList,
     EmbeddedDocumentList,
-    TopLevelDocumentMetaclass,
     get_document,
+    TopLevelDocumentMetaclass,
 )
 from mongoengine.base.datastructures import LazyReference
 from mongoengine.connection import get_db
 from mongoengine.document import Document, EmbeddedDocument
-from mongoengine.fields import DictField, ListField, MapField, ReferenceField
+from mongoengine.fields import (
+    DictField,
+    ListField,
+    MapField,
+    ReferenceField,
+)
 from mongoengine.queryset import QuerySet
 
 
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 8cdce1d0d..327cf2916 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -1,7 +1,7 @@
 import re
 
-from bson.dbref import DBRef
 import pymongo
+from bson.dbref import DBRef
 from pymongo.read_preferences import ReadPreference
 
 from mongoengine import signals
@@ -11,19 +11,28 @@
     BaseList,
     DocumentMetaclass,
     EmbeddedDocumentList,
-    TopLevelDocumentMetaclass,
     get_document,
+    TopLevelDocumentMetaclass,
 )
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
-from mongoengine.context_managers import set_write_concern, switch_collection, switch_db
+from mongoengine.context_managers import (
+    set_write_concern,
+    switch_collection,
+    switch_db,
+)
 from mongoengine.errors import (
     InvalidDocumentError,
     InvalidQueryError,
     SaveConditionError,
 )
 from mongoengine.pymongo_support import list_collection_names
-from mongoengine.queryset import NotUniqueError, OperationError, QuerySet, transform
+from mongoengine.queryset import (
+    NotUniqueError,
+    OperationError,
+    QuerySet,
+    transform,
+)
 
 __all__ = (
     "Document",
diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 2b3d2014f..f6b426d1c 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -1,6 +1,5 @@
 from collections import defaultdict
 
-
 __all__ = (
     "NotRegistered",
     "InvalidDocumentError",
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 276b02ce3..db252c9e4 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -9,10 +9,10 @@
 from io import BytesIO
 from operator import itemgetter
 
-from bson import Binary, DBRef, ObjectId, SON
-from bson.int64 import Int64
 import gridfs
 import pymongo
+from bson import Binary, DBRef, ObjectId, SON
+from bson.int64 import Int64
 from pymongo import ReturnDocument
 
 try:
@@ -22,21 +22,24 @@
 else:
     import dateutil.parser
 
-
 from mongoengine.base import (
     BaseDocument,
     BaseField,
     ComplexBaseField,
     GeoJsonBaseField,
+    get_document,
     LazyReference,
     ObjectIdField,
-    get_document,
 )
 from mongoengine.base.utils import LazyRegexCompiler
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.document import Document, EmbeddedDocument
-from mongoengine.errors import DoesNotExist, InvalidQueryError, ValidationError
+from mongoengine.errors import (
+    DoesNotExist,
+    InvalidQueryError,
+    ValidationError,
+)
 from mongoengine.queryset import DO_NOTHING
 from mongoengine.queryset.base import BaseQuerySet
 from mongoengine.queryset.transform import STRING_OPERATORS
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index 8c5b3e5d0..00b87f419 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -3,7 +3,6 @@
 """
 from mongoengine.connection import get_connection
 
-
 # Constant that can be used to compare the version retrieved with
 # get_mongodb_version()
 MONGODB_34 = (3, 4)
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 47a5f733c..6d86f1ed9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -2,13 +2,12 @@
 import itertools
 import re
 import warnings
-
 from collections.abc import Mapping
 
-from bson import SON, json_util
-from bson.code import Code
 import pymongo
 import pymongo.errors
+from bson import json_util, SON
+from bson.code import Code
 from pymongo.collection import ReturnDocument
 from pymongo.common import validate_read_preference
 from pymongo.read_concern import ReadConcern
@@ -34,7 +33,6 @@
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
 
-
 __all__ = ("BaseQuerySet", "DO_NOTHING", "NULLIFY", "CASCADE", "DENY", "PULL")
 
 # Delete rules
diff --git a/mongoengine/queryset/manager.py b/mongoengine/queryset/manager.py
index 699526fdf..46f137a27 100644
--- a/mongoengine/queryset/manager.py
+++ b/mongoengine/queryset/manager.py
@@ -1,4 +1,5 @@
 from functools import partial
+
 from mongoengine.queryset.queryset import QuerySet
 
 __all__ = ("queryset_manager", "QuerySetManager")
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 3f1db8fa6..9dd535e3f 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -1,8 +1,8 @@
 from collections import defaultdict
 
+import pymongo
 from bson import ObjectId, SON
 from bson.dbref import DBRef
-import pymongo
 
 from mongoengine.base import UPDATE_OPERATORS
 from mongoengine.common import _import_class
diff --git a/setup.cfg b/setup.cfg
index 216e3dfec..ab993d76a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,3 +8,13 @@ application-import-names=mongoengine,tests
 # Limits the discovery to tests directory
 # avoids that it runs for instance the benchmark
 testpaths = tests
+
+[isort]
+known_first_party = mongoengine,tests
+default_section = THIRDPARTY
+multi_line_output = 3
+include_trailing_comma = True
+combine_as_imports = True
+line_length = 70
+ensure_newline_before_comments = 1
+order_by_type = 0
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 37b95e374..27ed987ef 100644
--- a/setup.py
+++ b/setup.py
@@ -53,8 +53,8 @@ def finalize_options(self):
 
     def run_tests(self):
         # import here, cause outside the eggs aren't loaded
-        from pkg_resources import _namespace_packages
         import pytest
+        from pkg_resources import _namespace_packages
 
         # Purge modules under test from sys.modules. The test loader will
         # re-import them from the build location. Required when 2to3 is used
diff --git a/tests/document/test_delta.py b/tests/document/test_delta.py
index 817bc40e1..68c698b64 100644
--- a/tests/document/test_delta.py
+++ b/tests/document/test_delta.py
@@ -1,6 +1,7 @@
 import unittest
 
 from bson import SON
+
 from mongoengine import *
 from mongoengine.pymongo_support import list_collection_names
 from tests.utils import MongoDBTestCase
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 2de9307df..949231453 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -1,13 +1,16 @@
 import unittest
 from datetime import datetime
 
+import pytest
 from pymongo.collation import Collation
 from pymongo.errors import OperationFailure
-import pytest
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from mongoengine.mongodb_support import MONGODB_42, get_mongodb_version
+from mongoengine.mongodb_support import (
+    get_mongodb_version,
+    MONGODB_42,
+)
 
 
 class TestIndexes(unittest.TestCase):
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 78a550ce2..42eb3330b 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -6,9 +6,9 @@
 from datetime import datetime
 
 import bson
+import pytest
 from bson import DBRef, ObjectId
 from pymongo.errors import DuplicateKeyError
-import pytest
 
 from mongoengine import *
 from mongoengine import signals
@@ -23,7 +23,11 @@
     NotUniqueError,
     SaveConditionError,
 )
-from mongoengine.mongodb_support import MONGODB_34, MONGODB_36, get_mongodb_version
+from mongoengine.mongodb_support import (
+    get_mongodb_version,
+    MONGODB_34,
+    MONGODB_36,
+)
 from mongoengine.pymongo_support import list_collection_names
 from mongoengine.queryset import NULLIFY, Q
 from tests import fixtures
@@ -34,7 +38,7 @@
     PickleSignalsTest,
     PickleTest,
 )
-from tests.utils import MongoDBTestCase, get_as_pymongo
+from tests.utils import get_as_pymongo, MongoDBTestCase
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
 
diff --git a/tests/document/test_json_serialisation.py b/tests/document/test_json_serialisation.py
index 593d34f8d..61298ab17 100644
--- a/tests/document/test_json_serialisation.py
+++ b/tests/document/test_json_serialisation.py
@@ -1,7 +1,7 @@
 import unittest
 import uuid
-
 from datetime import datetime
+
 from bson import ObjectId
 
 from mongoengine import *
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index 8dfcdb54f..e7bdfa2c1 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -1,7 +1,7 @@
 import uuid
 
-from bson import Binary
 import pytest
+from bson import Binary
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase
diff --git a/tests/fields/test_boolean_field.py b/tests/fields/test_boolean_field.py
index d82d149f8..b2c876955 100644
--- a/tests/fields/test_boolean_field.py
+++ b/tests/fields/test_boolean_field.py
@@ -1,7 +1,7 @@
 import pytest
 
 from mongoengine import *
-from tests.utils import MongoDBTestCase, get_as_pymongo
+from tests.utils import get_as_pymongo, MongoDBTestCase
 
 
 class TestBooleanField(MongoDBTestCase):
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index aa1624d10..82f332f68 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -6,7 +6,6 @@
 import pytest
 
 from mongoengine import *
-
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 0858548c5..088e54a42 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -9,7 +9,6 @@
 
 from mongoengine import *
 from mongoengine import connection
-
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 05482107e..5a6544c2e 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -1,11 +1,13 @@
-from bson import InvalidDocument
 import pytest
+from bson import InvalidDocument
 
 from mongoengine import *
 from mongoengine.base import BaseDict
-from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
-
-from tests.utils import MongoDBTestCase, get_as_pymongo
+from mongoengine.mongodb_support import (
+    get_mongodb_version,
+    MONGODB_36,
+)
+from tests.utils import get_as_pymongo, MongoDBTestCase
 
 
 class TestDictField(MongoDBTestCase):
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 480bec20d..0e9784ffe 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -12,7 +12,6 @@
     StringField,
     ValidationError,
 )
-
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index c101996ce..0a95f934a 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -1,10 +1,10 @@
 from enum import Enum
 
-from bson import InvalidDocument
 import pytest
+from bson import InvalidDocument
 
 from mongoengine import Document, EnumField, ValidationError
-from tests.utils import MongoDBTestCase, get_as_pymongo
+from tests.utils import get_as_pymongo, MongoDBTestCase
 
 
 class Status(Enum):
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index ab3ee0c83..a4d94afa3 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -1,8 +1,8 @@
 import datetime
 import unittest
 
-from bson import DBRef, ObjectId, SON
 import pytest
+from bson import DBRef, ObjectId, SON
 
 from mongoengine import (
     BooleanField,
@@ -34,9 +34,12 @@
     StringField,
     ValidationError,
 )
-from mongoengine.base import BaseField, EmbeddedDocumentList, _document_registry
+from mongoengine.base import (
+    _document_registry,
+    BaseField,
+    EmbeddedDocumentList,
+)
 from mongoengine.errors import DeprecatedError
-
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
index 913f009d3..30f829ae8 100644
--- a/tests/fields/test_float_field.py
+++ b/tests/fields/test_float_field.py
@@ -1,7 +1,6 @@
 import pytest
 
 from mongoengine import *
-
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/fields/test_int_field.py b/tests/fields/test_int_field.py
index 1f50b8328..549356c0d 100644
--- a/tests/fields/test_int_field.py
+++ b/tests/fields/test_int_field.py
@@ -1,7 +1,6 @@
 import pytest
 
 from mongoengine import *
-
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/fields/test_lazy_reference_field.py b/tests/fields/test_lazy_reference_field.py
index 2b02668c5..958e32424 100644
--- a/tests/fields/test_lazy_reference_field.py
+++ b/tests/fields/test_lazy_reference_field.py
@@ -1,10 +1,9 @@
-from bson import DBRef, ObjectId
 import pytest
+from bson import DBRef, ObjectId
 
 from mongoengine import *
 from mongoengine.base import LazyReference
 from mongoengine.context_managers import query_counter
-
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index 4a3041f22..efc0a3ca0 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -1,10 +1,9 @@
-from bson.int64 import Int64
 import pytest
+from bson.int64 import Int64
 
 from mongoengine import *
 from mongoengine.connection import get_db
-
-from tests.utils import MongoDBTestCase, get_as_pymongo
+from tests.utils import get_as_pymongo, MongoDBTestCase
 
 
 class TestLongField(MongoDBTestCase):
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index 275e3fe15..08a56979d 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -1,5 +1,5 @@
-from bson import DBRef, SON
 import pytest
+from bson import DBRef, SON
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase
diff --git a/tests/fields/test_sequence_field.py b/tests/fields/test_sequence_field.py
index c3ecbeecf..6883b2a75 100644
--- a/tests/fields/test_sequence_field.py
+++ b/tests/fields/test_sequence_field.py
@@ -1,5 +1,4 @@
 from mongoengine import *
-
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/fields/test_string_field.py b/tests/fields/test_string_field.py
index 6e1d77f21..289b049c8 100644
--- a/tests/fields/test_string_field.py
+++ b/tests/fields/test_string_field.py
@@ -1,7 +1,7 @@
 import pytest
 
 from mongoengine import *
-from tests.utils import MongoDBTestCase, get_as_pymongo
+from tests.utils import get_as_pymongo, MongoDBTestCase
 
 
 class TestStringField(MongoDBTestCase):
diff --git a/tests/fields/test_uuid_field.py b/tests/fields/test_uuid_field.py
index ec81033b0..e26e14f79 100644
--- a/tests/fields/test_uuid_field.py
+++ b/tests/fields/test_uuid_field.py
@@ -3,7 +3,7 @@
 import pytest
 
 from mongoengine import *
-from tests.utils import MongoDBTestCase, get_as_pymongo
+from tests.utils import get_as_pymongo, MongoDBTestCase
 
 
 class Person(Document):
diff --git a/tests/queryset/test_geo.py b/tests/queryset/test_geo.py
index 81ade0929..0fe3af97a 100644
--- a/tests/queryset/test_geo.py
+++ b/tests/queryset/test_geo.py
@@ -2,7 +2,6 @@
 import unittest
 
 from mongoengine import *
-
 from tests.utils import MongoDBTestCase
 
 
diff --git a/tests/queryset/test_modify.py b/tests/queryset/test_modify.py
index 556e6d9ee..304322afb 100644
--- a/tests/queryset/test_modify.py
+++ b/tests/queryset/test_modify.py
@@ -1,6 +1,12 @@
 import unittest
 
-from mongoengine import Document, IntField, ListField, StringField, connect
+from mongoengine import (
+    connect,
+    Document,
+    IntField,
+    ListField,
+    StringField,
+)
 
 
 class Doc(Document):
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 01e6b568e..95b8e03c2 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -3,23 +3,26 @@
 import uuid
 from decimal import Decimal
 
-from bson import DBRef, ObjectId
 import pymongo
+import pytest
+from bson import DBRef, ObjectId
 from pymongo.read_preferences import ReadPreference
 from pymongo.results import UpdateResult
-import pytest
 
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
-from mongoengine.mongodb_support import MONGODB_36, get_mongodb_version
+from mongoengine.mongodb_support import (
+    get_mongodb_version,
+    MONGODB_36,
+)
 from mongoengine.queryset import (
     DoesNotExist,
     MultipleObjectsReturned,
     QuerySet,
-    QuerySetManager,
     queryset_manager,
+    QuerySetManager,
 )
 from tests.utils import (
     requires_mongodb_gte_44,
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index 62e95dd67..9a7d6365e 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -1,7 +1,7 @@
 import unittest
 
-from bson.son import SON
 import pytest
+from bson.son import SON
 
 from mongoengine import *
 from mongoengine.queryset import Q, transform
diff --git a/tests/queryset/test_visitor.py b/tests/queryset/test_visitor.py
index 5fb94901f..04c7140a4 100644
--- a/tests/queryset/test_visitor.py
+++ b/tests/queryset/test_visitor.py
@@ -2,8 +2,8 @@
 import re
 import unittest
 
-from bson import ObjectId
 import pytest
+from bson import ObjectId
 
 from mongoengine import *
 from mongoengine.errors import InvalidQueryError
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 7ffa98f3c..e036953b0 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,20 +1,20 @@
 import datetime
 import unittest
 
-from bson.tz_util import utc
 import pymongo
+import pytest
+from bson.tz_util import utc
 from pymongo import MongoClient, ReadPreference
 from pymongo.errors import InvalidName, OperationFailure
-import pytest
 
 import mongoengine.connection
 from mongoengine import (
-    DateTimeField,
-    Document,
-    StringField,
     connect,
+    DateTimeField,
     disconnect_all,
+    Document,
     register_connection,
+    StringField,
 )
 from mongoengine.connection import (
     ConnectionFailure,
diff --git a/tests/test_connection_mongomock.py b/tests/test_connection_mongomock.py
index a35dc5512..4b76fe0c8 100644
--- a/tests/test_connection_mongomock.py
+++ b/tests/test_connection_mongomock.py
@@ -3,15 +3,9 @@
 import pytest
 
 import mongoengine.connection
-from mongoengine import (
-    Document,
-    StringField,
-    connect,
-    disconnect_all,
-)
+from mongoengine import connect, disconnect_all, Document, StringField
 from mongoengine.connection import get_connection
 
-
 try:
     import mongomock
 
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 931a1f6e0..42ce42a1d 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -3,7 +3,11 @@
 import pytest
 
 from mongoengine import Document
-from mongoengine.base.datastructures import BaseDict, BaseList, StrictDict
+from mongoengine.base.datastructures import (
+    BaseDict,
+    BaseList,
+    StrictDict,
+)
 
 
 class DocumentStub:
diff --git a/tests/test_replicaset_connection.py b/tests/test_replicaset_connection.py
index 1fdfcb205..3863a198a 100644
--- a/tests/test_replicaset_connection.py
+++ b/tests/test_replicaset_connection.py
@@ -5,7 +5,6 @@
 import mongoengine
 from mongoengine.connection import ConnectionFailure
 
-
 CONN_CLASS = MongoClient
 READ_PREF = ReadPreference.SECONDARY
 
diff --git a/tests/utils.py b/tests/utils.py
index 52f569802..a05b9c14b 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -7,7 +7,6 @@
 from mongoengine.connection import disconnect_all, get_db
 from mongoengine.mongodb_support import get_mongodb_version
 
-
 MONGO_TEST_DB = "mongoenginetest"  # standard name for the test database
 
 

From e5a2714baf3e9eea200b909923efecdbdc22800d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 29 Mar 2021 21:55:34 +0200
Subject: [PATCH 1179/1519] update doc for isort

---
 .pre-commit-config.yaml | 2 --
 CONTRIBUTING.rst        | 8 ++++++--
 requirements-dev.txt    | 1 -
 setup.cfg               | 1 -
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 87c5e2f59..c34aaafe0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,8 +8,6 @@ repos:
     rev: 3.8.4
     hooks:
       - id: flake8
-#        additional_dependencies:
-#          - flake8-import-order
   - repo: https://github.com/asottile/pyupgrade
     rev: v2.7.4
     hooks:
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 035ae07af..fb1838871 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -35,8 +35,8 @@ Travis runs the tests against the main Python 3.x versions.
 Style Guide
 -----------
 
-MongoEngine's codebase is formatted with `black <https://github.com/python/black>`_, other tools like
-flake8 are also used. Those tools will run as part of the CI and will fail in case the code is not formatted properly.
+MongoEngine's codebase is auto-formatted with `black <https://github.com/python/black>`_, imports are ordered with `isort <https://pycqa.github.io/isort/>`_
+and other tools like flake8 are also used. Those tools will run as part of the CI and will fail in case the code is not formatted properly.
 
 To install all development tools, simply run the following commands:
 
@@ -58,6 +58,10 @@ To enable ``pre-commit`` simply run:
 See the ``.pre-commit-config.yaml`` configuration file for more information
 on how it works.
 
+pre-commit will now run upon every commit and will reject anything that doesn't comply.
+
+You can also run all the checks with ``pre-commit run -a``, this is what is used in the CI.
+
 Testing
 -------
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
index ee788e7aa..f9d0595f1 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,5 @@
 black
 flake8
-flake8-import-order
 pre-commit
 pytest
 ipdb
diff --git a/setup.cfg b/setup.cfg
index ab993d76a..04c965f7c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,6 @@
 ignore=E501,F403,F405,I201,I202,W504,W605,W503,B007
 exclude=build,dist,docs,venv,venv3,.tox,.eggs,tests
 max-complexity=47
-application-import-names=mongoengine,tests
 
 [tool:pytest]
 # Limits the discovery to tests directory

From b9d370c885c3fff6029ae30728f5eea4bdd3949a Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 29 Mar 2021 22:02:57 +0200
Subject: [PATCH 1180/1519] add standard hooks

---
 .github/workflows/github-actions.yml | 2 +-
 .pre-commit-config.yaml              | 7 +++++++
 docs/guide/validation.rst            | 1 -
 mongoengine/base/document.py         | 2 +-
 mongoengine/base/fields.py           | 2 +-
 mongoengine/dereference.py           | 4 ++--
 mongoengine/document.py              | 2 +-
 mongoengine/fields.py                | 4 ++--
 mongoengine/queryset/base.py         | 2 +-
 mongoengine/queryset/queryset.py     | 2 +-
 mongoengine/queryset/transform.py    | 2 +-
 setup.cfg                            | 1 -
 tests/document/test_indexes.py       | 2 +-
 tests/document/test_instance.py      | 4 ++--
 tests/fields/test_boolean_field.py   | 2 +-
 tests/fields/test_dict_field.py      | 4 ++--
 tests/fields/test_enum_field.py      | 2 +-
 tests/fields/test_fields.py          | 4 ++--
 tests/fields/test_long_field.py      | 2 +-
 tests/fields/test_reference_field.py | 2 +-
 tests/fields/test_string_field.py    | 2 +-
 tests/fields/test_uuid_field.py      | 2 +-
 tests/queryset/test_modify.py        | 2 +-
 tests/queryset/test_queryset.py      | 4 ++--
 tests/test_connection.py             | 8 ++++----
 tests/test_connection_mongomock.py   | 2 +-
 26 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index bfdfa3a47..b6820a33e 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -140,4 +140,4 @@ jobs:
     - name: publish pypi
       uses: pypa/gh-action-pypi-publish@master
       with:
-        password: ${{ secrets.pypi_token }}
\ No newline at end of file
+        password: ${{ secrets.pypi_token }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c34aaafe0..f66db93b7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,12 @@
 fail_fast: false
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.3.0
+    hooks:
+      - id: check-merge-conflict
+      - id: debug-statements
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
     rev: 20.8b1
     hooks:
diff --git a/docs/guide/validation.rst b/docs/guide/validation.rst
index 971f6eb55..e5b9ed662 100644
--- a/docs/guide/validation.rst
+++ b/docs/guide/validation.rst
@@ -120,4 +120,3 @@ the validation and cleaning of a document when you call :meth:`~mongoengine.docu
     Person(age=1000).save(validate=False)
     person = Person.objects.first()
     assert person.age == 1000
-
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 683f107f1..46935c1b8 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -3,7 +3,7 @@
 from functools import partial
 
 import pymongo
-from bson import DBRef, json_util, ObjectId, SON
+from bson import SON, DBRef, ObjectId, json_util
 
 from mongoengine import signals
 from mongoengine.base.common import get_document
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index c1dc486d5..a68035274 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -2,7 +2,7 @@
 import weakref
 
 import pymongo
-from bson import DBRef, ObjectId, SON
+from bson import SON, DBRef, ObjectId
 
 from mongoengine.base.common import UPDATE_OPERATORS
 from mongoengine.base.datastructures import (
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 1f0ce3780..f388fe069 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -1,11 +1,11 @@
-from bson import DBRef, SON
+from bson import SON, DBRef
 
 from mongoengine.base import (
     BaseDict,
     BaseList,
     EmbeddedDocumentList,
-    get_document,
     TopLevelDocumentMetaclass,
+    get_document,
 )
 from mongoengine.base.datastructures import LazyReference
 from mongoengine.connection import get_db
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 327cf2916..a7b4cf953 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -11,8 +11,8 @@
     BaseList,
     DocumentMetaclass,
     EmbeddedDocumentList,
-    get_document,
     TopLevelDocumentMetaclass,
+    get_document,
 )
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index db252c9e4..a3e483a4b 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -11,7 +11,7 @@
 
 import gridfs
 import pymongo
-from bson import Binary, DBRef, ObjectId, SON
+from bson import SON, Binary, DBRef, ObjectId
 from bson.int64 import Int64
 from pymongo import ReturnDocument
 
@@ -27,9 +27,9 @@
     BaseField,
     ComplexBaseField,
     GeoJsonBaseField,
-    get_document,
     LazyReference,
     ObjectIdField,
+    get_document,
 )
 from mongoengine.base.utils import LazyRegexCompiler
 from mongoengine.common import _import_class
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 6d86f1ed9..5dc47e001 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -6,7 +6,7 @@
 
 import pymongo
 import pymongo.errors
-from bson import json_util, SON
+from bson import SON, json_util
 from bson.code import Code
 from pymongo.collection import ReturnDocument
 from pymongo.common import validate_read_preference
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index 49f2724c1..b7c70bc0f 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -1,11 +1,11 @@
 from mongoengine.errors import OperationError
 from mongoengine.queryset.base import (
-    BaseQuerySet,
     CASCADE,
     DENY,
     DO_NOTHING,
     NULLIFY,
     PULL,
+    BaseQuerySet,
 )
 
 __all__ = (
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 9dd535e3f..4c3d051bf 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -1,7 +1,7 @@
 from collections import defaultdict
 
 import pymongo
-from bson import ObjectId, SON
+from bson import SON, ObjectId
 from bson.dbref import DBRef
 
 from mongoengine.base import UPDATE_OPERATORS
diff --git a/setup.cfg b/setup.cfg
index 04c965f7c..aa965c8f8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,4 +16,3 @@ include_trailing_comma = True
 combine_as_imports = True
 line_length = 70
 ensure_newline_before_comments = 1
-order_by_type = 0
\ No newline at end of file
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 949231453..e308d12a9 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -8,8 +8,8 @@
 from mongoengine import *
 from mongoengine.connection import get_db
 from mongoengine.mongodb_support import (
-    get_mongodb_version,
     MONGODB_42,
+    get_mongodb_version,
 )
 
 
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 42eb3330b..21f2c82ef 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -24,9 +24,9 @@
     SaveConditionError,
 )
 from mongoengine.mongodb_support import (
-    get_mongodb_version,
     MONGODB_34,
     MONGODB_36,
+    get_mongodb_version,
 )
 from mongoengine.pymongo_support import list_collection_names
 from mongoengine.queryset import NULLIFY, Q
@@ -38,7 +38,7 @@
     PickleSignalsTest,
     PickleTest,
 )
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
 
diff --git a/tests/fields/test_boolean_field.py b/tests/fields/test_boolean_field.py
index b2c876955..d82d149f8 100644
--- a/tests/fields/test_boolean_field.py
+++ b/tests/fields/test_boolean_field.py
@@ -1,7 +1,7 @@
 import pytest
 
 from mongoengine import *
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestBooleanField(MongoDBTestCase):
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 5a6544c2e..63d5c5279 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -4,10 +4,10 @@
 from mongoengine import *
 from mongoengine.base import BaseDict
 from mongoengine.mongodb_support import (
-    get_mongodb_version,
     MONGODB_36,
+    get_mongodb_version,
 )
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestDictField(MongoDBTestCase):
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index 0a95f934a..7dfcffefa 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -4,7 +4,7 @@
 from bson import InvalidDocument
 
 from mongoengine import Document, EnumField, ValidationError
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class Status(Enum):
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index a4d94afa3..69fe14712 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -2,7 +2,7 @@
 import unittest
 
 import pytest
-from bson import DBRef, ObjectId, SON
+from bson import SON, DBRef, ObjectId
 
 from mongoengine import (
     BooleanField,
@@ -35,9 +35,9 @@
     ValidationError,
 )
 from mongoengine.base import (
-    _document_registry,
     BaseField,
     EmbeddedDocumentList,
+    _document_registry,
 )
 from mongoengine.errors import DeprecatedError
 from tests.utils import MongoDBTestCase
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
index efc0a3ca0..5b73102fe 100644
--- a/tests/fields/test_long_field.py
+++ b/tests/fields/test_long_field.py
@@ -3,7 +3,7 @@
 
 from mongoengine import *
 from mongoengine.connection import get_db
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestLongField(MongoDBTestCase):
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index 08a56979d..afbf50045 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -1,5 +1,5 @@
 import pytest
-from bson import DBRef, SON
+from bson import SON, DBRef
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase
diff --git a/tests/fields/test_string_field.py b/tests/fields/test_string_field.py
index 289b049c8..6e1d77f21 100644
--- a/tests/fields/test_string_field.py
+++ b/tests/fields/test_string_field.py
@@ -1,7 +1,7 @@
 import pytest
 
 from mongoengine import *
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestStringField(MongoDBTestCase):
diff --git a/tests/fields/test_uuid_field.py b/tests/fields/test_uuid_field.py
index e26e14f79..ec81033b0 100644
--- a/tests/fields/test_uuid_field.py
+++ b/tests/fields/test_uuid_field.py
@@ -3,7 +3,7 @@
 import pytest
 
 from mongoengine import *
-from tests.utils import get_as_pymongo, MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class Person(Document):
diff --git a/tests/queryset/test_modify.py b/tests/queryset/test_modify.py
index 304322afb..15e3af349 100644
--- a/tests/queryset/test_modify.py
+++ b/tests/queryset/test_modify.py
@@ -1,11 +1,11 @@
 import unittest
 
 from mongoengine import (
-    connect,
     Document,
     IntField,
     ListField,
     StringField,
+    connect,
 )
 
 
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 95b8e03c2..1aa4f32a3 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -14,15 +14,15 @@
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import InvalidQueryError
 from mongoengine.mongodb_support import (
-    get_mongodb_version,
     MONGODB_36,
+    get_mongodb_version,
 )
 from mongoengine.queryset import (
     DoesNotExist,
     MultipleObjectsReturned,
     QuerySet,
-    queryset_manager,
     QuerySetManager,
+    queryset_manager,
 )
 from tests.utils import (
     requires_mongodb_gte_44,
diff --git a/tests/test_connection.py b/tests/test_connection.py
index e036953b0..2b7d46a78 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -9,16 +9,16 @@
 
 import mongoengine.connection
 from mongoengine import (
-    connect,
     DateTimeField,
-    disconnect_all,
     Document,
-    register_connection,
     StringField,
+    connect,
+    disconnect_all,
+    register_connection,
 )
 from mongoengine.connection import (
-    ConnectionFailure,
     DEFAULT_DATABASE_NAME,
+    ConnectionFailure,
     disconnect,
     get_connection,
     get_db,
diff --git a/tests/test_connection_mongomock.py b/tests/test_connection_mongomock.py
index 4b76fe0c8..6f9e2d269 100644
--- a/tests/test_connection_mongomock.py
+++ b/tests/test_connection_mongomock.py
@@ -3,7 +3,7 @@
 import pytest
 
 import mongoengine.connection
-from mongoengine import connect, disconnect_all, Document, StringField
+from mongoengine import Document, StringField, connect, disconnect_all
 from mongoengine.connection import get_connection
 
 try:

From 49a4d23371a64c1a250a846d2750d4f885df6ffe Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 29 Mar 2021 22:04:07 +0200
Subject: [PATCH 1181/1519] update hooks version

---
 .pre-commit-config.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f66db93b7..69d801a65 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.3.0
+    rev: v3.4.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
@@ -12,15 +12,15 @@ repos:
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+    rev: 3.9.0
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.4
+    rev: v2.11.0
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
   - repo: https://github.com/pycqa/isort
-    rev: 5.6.3
+    rev: 5.8.0
     hooks:
       - id: isort

From ef57a58155dd5da354d11609fc91e4c157eaafd8 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 22 Apr 2021 10:18:15 +0200
Subject: [PATCH 1182/1519] housekeeping - pre-commit autoupdate

---
 .pre-commit-config.yaml    |  4 ++--
 benchmarks/test_inserts.py | 14 +++++++-------
 mongoengine/document.py    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 69d801a65..9e50053ec 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,11 +12,11 @@ repos:
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.0
+    rev: 3.9.1
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.11.0
+    rev: v2.13.0
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
diff --git a/benchmarks/test_inserts.py b/benchmarks/test_inserts.py
index 4ecd48de7..dcd18ff88 100644
--- a/benchmarks/test_inserts.py
+++ b/benchmarks/test_inserts.py
@@ -31,7 +31,7 @@ def main():
     print("-" * 100)
     print("PyMongo: Creating 10000 dictionaries.")
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print("{}s".format(t.timeit(1)))
+    print(f"{t.timeit(1)}s")
 
     stmt = """
 from pymongo import MongoClient, WriteConcern
@@ -54,7 +54,7 @@ def main():
     print("-" * 100)
     print('PyMongo: Creating 10000 dictionaries (write_concern={"w": 0}).')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print("{}s".format(t.timeit(1)))
+    print(f"{t.timeit(1)}s")
 
     setup = """
 from pymongo import MongoClient
@@ -84,7 +84,7 @@ class Noddy(Document):
     print("-" * 100)
     print("MongoEngine: Creating 10000 dictionaries.")
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print("{}s".format(t.timeit(1)))
+    print(f"{t.timeit(1)}s")
 
     stmt = """
 for i in range(10000):
@@ -102,7 +102,7 @@ class Noddy(Document):
     print("-" * 100)
     print("MongoEngine: Creating 10000 dictionaries (using a single field assignment).")
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print("{}s".format(t.timeit(1)))
+    print(f"{t.timeit(1)}s")
 
     stmt = """
 for i in range(10000):
@@ -118,7 +118,7 @@ class Noddy(Document):
     print("-" * 100)
     print('MongoEngine: Creating 10000 dictionaries (write_concern={"w": 0}).')
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print("{}s".format(t.timeit(1)))
+    print(f"{t.timeit(1)}s")
 
     stmt = """
 for i in range(10000):
@@ -136,7 +136,7 @@ class Noddy(Document):
         'MongoEngine: Creating 10000 dictionaries (write_concern={"w": 0}, validate=False).'
     )
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print("{}s".format(t.timeit(1)))
+    print(f"{t.timeit(1)}s")
 
     stmt = """
 for i in range(10000):
@@ -154,7 +154,7 @@ class Noddy(Document):
         'MongoEngine: Creating 10000 dictionaries (force_insert=True, write_concern={"w": 0}, validate=False).'
     )
     t = timeit.Timer(stmt=stmt, setup=setup)
-    print("{}s".format(t.timeit(1)))
+    print(f"{t.timeit(1)}s")
 
 
 if __name__ == "__main__":
diff --git a/mongoengine/document.py b/mongoengine/document.py
index a7b4cf953..fa8960fa6 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -332,7 +332,7 @@ def save(
         _refs=None,
         save_condition=None,
         signal_kwargs=None,
-        **kwargs
+        **kwargs,
     ):
         """Save the :class:`~mongoengine.Document` to the database. If the
         document already exists, it will be updated, otherwise it will be
@@ -563,7 +563,7 @@ def cascade_save(self, **kwargs):
             if not getattr(ref, "_changed_fields", True):
                 continue
 
-            ref_id = "{},{}".format(ref.__class__.__name__, str(ref._data))
+            ref_id = f"{ref.__class__.__name__},{str(ref._data)}"
             if ref and ref_id not in _refs:
                 _refs.append(ref_id)
                 kwargs["_refs"] = _refs

From 1bd8cd803e52d3f1b3902748908d20634e030547 Mon Sep 17 00:00:00 2001
From: deveil <jimmy.deveil+github@gmail.com>
Date: Fri, 23 Apr 2021 16:08:57 +0200
Subject: [PATCH 1183/1519] Typo correction

---
 docs/guide/migration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/migration.rst b/docs/guide/migration.rst
index 2b8982ec6..ae4bb7c8b 100644
--- a/docs/guide/migration.rst
+++ b/docs/guide/migration.rst
@@ -35,7 +35,7 @@ existing ``User`` model with a `default=True`. Thus you simply update the ``User
 
     class User(Document):
         name = StringField(required=True)
-        enabled = BooleaField(default=True)
+        enabled = BooleanField(default=True)
 
 Without applying any migration, we now reload an object from the database into the ``User`` class
 and checks its `enabled` attribute:

From ecf84cbd5d709bfb001020c96e959b4e21a43b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Schmidts?= <francois@schmidts.fr>
Date: Tue, 27 Apr 2021 15:55:30 +0200
Subject: [PATCH 1184/1519] Fixing EnumField choices validation

---
 docs/changelog.rst              |  1 +
 mongoengine/fields.py           | 15 +++++++++------
 tests/fields/test_enum_field.py | 22 +++++++++++++++-------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0e56baef7..5e3107cf4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,7 @@ Development
 - (Fill this out as you fix issues and develop your features).
 - Bug fix: ignore LazyReferenceFields when clearing _changed_fields #2484
 - Improve connection doc #2481
+- EnumField improvements: now `choices` limits the values of an enum to allow
 
 Changes in 0.23.0
 =================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index a3e483a4b..7b2fe47ff 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1636,12 +1636,15 @@ class ModelWithEnum(Document):
 
     def __init__(self, enum, **kwargs):
         self._enum_cls = enum
-        if "choices" in kwargs:
-            raise ValueError(
-                "'choices' can't be set on EnumField, "
-                "it is implicitly set as the enum class"
-            )
-        kwargs["choices"] = list(self._enum_cls)  # Implicit validator
+        if kwargs.get("choices"):
+            invalid_choices = []
+            for choice in kwargs["choices"]:
+                if not isinstance(choice, enum):
+                    invalid_choices.append(choice)
+            if invalid_choices:
+                raise ValueError("Invalid choices: %r" % invalid_choices)
+        else:
+            kwargs["choices"] = list(self._enum_cls)  # Implicit validator
         super().__init__(**kwargs)
 
     def __set__(self, instance, value):
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index 7dfcffefa..6dffb9053 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -12,6 +12,11 @@ class Status(Enum):
     DONE = "done"
 
 
+class Color(Enum):
+    RED = 1
+    BLUE = 2
+
+
 class ModelWithEnum(Document):
     status = EnumField(Status)
 
@@ -74,14 +79,17 @@ def test_cannot_create_model_with_wrong_enum_value(self):
         with pytest.raises(ValidationError):
             m.validate()
 
-    def test_user_is_informed_when_tries_to_set_choices(self):
-        with pytest.raises(ValueError, match="'choices' can't be set on EnumField"):
-            EnumField(Status, choices=["my", "custom", "options"])
+    def test_partial_choices(self):
+        partial = [Status.DONE]
+        assert EnumField(Status, choices=partial).choices == partial
 
-
-class Color(Enum):
-    RED = 1
-    BLUE = 2
+    def test_wrong_choices(self):
+        with pytest.raises(ValueError, match="Invalid choices"):
+            EnumField(Status, choices=["my", "custom", "options"])
+        with pytest.raises(ValueError, match="Invalid choices"):
+            EnumField(Status, choices=[Color.RED])
+        with pytest.raises(ValueError, match="Invalid choices"):
+            EnumField(Status, choices=[Status.DONE, Color.RED])
 
 
 class ModelWithColor(Document):

From 0e6bcbc0304be1cb9e49b62cbcb1c083a6178164 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 4 May 2021 10:43:48 +0200
Subject: [PATCH 1185/1519] update precommit

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9e50053ec..5131c8c78 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 20.8b1
+    rev: 21.4b2
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
@@ -16,7 +16,7 @@ repos:
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.13.0
+    rev: v2.14.0
     hooks:
       - id: pyupgrade
         args: [--py36-plus]

From 2215e2746b190b570f86ac98ca0cab339b113b79 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 4 May 2021 10:49:42 +0200
Subject: [PATCH 1186/1519] run latest autoformatter

---
 tests/document/test_class_methods.py | 2 +-
 tests/fields/test_file_field.py      | 2 +-
 tests/test_signals.py                | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/document/test_class_methods.py b/tests/document/test_class_methods.py
index 4c35b7966..f82808ba0 100644
--- a/tests/document/test_class_methods.py
+++ b/tests/document/test_class_methods.py
@@ -177,7 +177,7 @@ class BlogPostWithCustomField(BlogPost):
         assert BlogPostWithCustomField.compare_indexes() == {"missing": [], "extra": []}
 
     def test_compare_indexes_for_text_indexes(self):
-        """ Ensure that compare_indexes behaves correctly for text indexes """
+        """Ensure that compare_indexes behaves correctly for text indexes"""
 
         class Doc(Document):
             a = StringField()
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index b45db3f9e..8c0db044a 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -308,7 +308,7 @@ class TestFile(Document):
         assert test_file.the_file not in [{"test": 1}]
 
     def test_file_disk_space(self):
-        """ Test disk space usage when we delete/replace a file """
+        """Test disk space usage when we delete/replace a file"""
 
         class TestFile(Document):
             the_file = FileField()
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 197071651..1d84347d7 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -249,7 +249,7 @@ def tearDown(self):
         assert self.pre_signals == post_signals
 
     def test_model_signals(self):
-        """ Model saves should throw some signals. """
+        """Model saves should throw some signals."""
 
         def create_author():
             self.Author(name="Bill Shakespeare")
@@ -340,7 +340,7 @@ def load_existing_author():
         ]
 
     def test_signal_kwargs(self):
-        """ Make sure signal_kwargs is passed to signals calls. """
+        """Make sure signal_kwargs is passed to signals calls."""
 
         def live_and_let_die():
             a = self.Author(name="Bill Shakespeare")
@@ -385,7 +385,7 @@ def bulk_create_author():
         ]
 
     def test_queryset_delete_signals(self):
-        """ Queryset delete should throw some signals. """
+        """Queryset delete should throw some signals."""
 
         self.Another(name="Bill Shakespeare").save()
         assert self.get_signal_output(self.Another.objects.delete) == [
@@ -396,7 +396,7 @@ def test_queryset_delete_signals(self):
         ]
 
     def test_signals_with_explicit_doc_ids(self):
-        """ Model saves must have a created flag the first time."""
+        """Model saves must have a created flag the first time."""
         ei = self.ExplicitId(id=123)
         # post save must received the created flag, even if there's already
         # an object id present

From d0a15a8924555715ea2f670df25938faf42e4258 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 4 May 2021 10:49:57 +0200
Subject: [PATCH 1187/1519] prepare changelog

---
 docs/changelog.rst      | 3 +++
 mongoengine/__init__.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0e56baef7..055815e61 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.23.1
+===========
 - Bug fix: ignore LazyReferenceFields when clearing _changed_fields #2484
 - Improve connection doc #2481
 
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 075c8858a..d316b0f14 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 23, 0)
+VERSION = (0, 23, 1)
 
 
 def get_version():

From ecb5dda2811356757f2773bb59ad27b7dc6be3a8 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 4 May 2021 20:43:33 +0200
Subject: [PATCH 1188/1519] improvement to recent updates

---
 docs/changelog.rst              |  2 +-
 tests/fields/test_enum_field.py | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 00ca9c21b..3f4252a55 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,12 +7,12 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- EnumField improvements: now `choices` limits the values of an enum to allow
 
 Changes in 0.23.1
 ===========
 - Bug fix: ignore LazyReferenceFields when clearing _changed_fields #2484
 - Improve connection doc #2481
-- EnumField improvements: now `choices` limits the values of an enum to allow
 
 Changes in 0.23.0
 =================
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index 6dffb9053..d2730d334 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -81,7 +81,17 @@ def test_cannot_create_model_with_wrong_enum_value(self):
 
     def test_partial_choices(self):
         partial = [Status.DONE]
-        assert EnumField(Status, choices=partial).choices == partial
+        enum_field = EnumField(Status, choices=partial)
+        assert enum_field.choices == partial
+
+        class FancyDoc(Document):
+            z = enum_field
+
+        FancyDoc(z=Status.DONE).validate()
+        with pytest.raises(
+            ValidationError, match=r"Value must be one of .*Status.DONE"
+        ):
+            FancyDoc(z=Status.NEW).validate()
 
     def test_wrong_choices(self):
         with pytest.raises(ValueError, match="Invalid choices"):

From 756bffe868ae48318a1240bd2569d5acc9f06d00 Mon Sep 17 00:00:00 2001
From: Daniele Marcocci <daniele.marcocci@outlook.com>
Date: Wed, 5 May 2021 14:59:38 +0200
Subject: [PATCH 1189/1519] define a base exception for engine

---
 mongoengine/errors.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index f6b426d1c..52144594b 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -16,12 +16,14 @@
     "DeprecatedError",
 )
 
+class MongoEngineException(Exception):
+    pass
 
-class NotRegistered(Exception):
+class NotRegistered(MongoEngineException):
     pass
 
 
-class InvalidDocumentError(Exception):
+class InvalidDocumentError(MongoEngineException):
     pass
 
 
@@ -29,19 +31,19 @@ class LookUpError(AttributeError):
     pass
 
 
-class DoesNotExist(Exception):
+class DoesNotExist(MongoEngineException):
     pass
 
 
-class MultipleObjectsReturned(Exception):
+class MultipleObjectsReturned(MongoEngineException):
     pass
 
 
-class InvalidQueryError(Exception):
+class InvalidQueryError(MongoEngineException):
     pass
 
 
-class OperationError(Exception):
+class OperationError(MongoEngineException):
     pass
 
 
@@ -57,7 +59,7 @@ class SaveConditionError(OperationError):
     pass
 
 
-class FieldDoesNotExist(Exception):
+class FieldDoesNotExist(MongoEngineException):
     """Raised when trying to set a field
     not declared in a :class:`~mongoengine.Document`
     or an :class:`~mongoengine.EmbeddedDocument`.
@@ -155,7 +157,7 @@ def generate_key(value, prefix=""):
         return " ".join([f"{k}: {v}" for k, v in error_dict.items()])
 
 
-class DeprecatedError(Exception):
+class DeprecatedError(MongoEngineException):
     """Raise when a user uses a feature that has been Deprecated"""
 
     pass

From 5897b1d042aa90abe60a98af21d5817d82c9cbbf Mon Sep 17 00:00:00 2001
From: Daniele Marcocci <daniele.marcocci@outlook.com>
Date: Wed, 5 May 2021 18:31:15 +0200
Subject: [PATCH 1190/1519] blacked

---
 mongoengine/errors.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mongoengine/errors.py b/mongoengine/errors.py
index 52144594b..d789b2a10 100644
--- a/mongoengine/errors.py
+++ b/mongoengine/errors.py
@@ -16,9 +16,11 @@
     "DeprecatedError",
 )
 
+
 class MongoEngineException(Exception):
     pass
 
+
 class NotRegistered(MongoEngineException):
     pass
 

From 2fd416965651331e56e56791b6032906b3a26285 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 17 May 2021 22:37:35 +0200
Subject: [PATCH 1191/1519] Fix instance._qs that was failing due to bad
 parametrization that went unnoticed

---
 mongoengine/document.py         |  2 +-
 tests/document/test_instance.py | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index fa8960fa6..0ba5db126 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -574,7 +574,7 @@ def cascade_save(self, **kwargs):
     def _qs(self):
         """Return the default queryset corresponding to this document."""
         if not hasattr(self, "__objects"):
-            self.__objects = QuerySet(self, self._get_collection())
+            self.__objects = QuerySet(self.__class__, self._get_collection())
         return self.__objects
 
     @property
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 21f2c82ef..1469c9bb6 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -407,6 +407,16 @@ def test_creation(self):
         assert person.name == "Test User"
         assert person.age == 30
 
+    def test__qs_property_does_not_raise(self):
+        # ensures no regression of #2500
+        class MyDocument(Document):
+            pass
+
+        MyDocument.drop_collection()
+        object = MyDocument()
+        object._qs().insert([MyDocument()])
+        assert MyDocument.objects.count() == 1
+
     def test_to_dbref(self):
         """Ensure that you can get a dbref of a document."""
         person = self.Person(name="Test User", age=30)

From 51dc48ee8f8c0cd02f87c5b6a6565f0c56dd36bf Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Tue, 25 May 2021 10:55:38 +0200
Subject: [PATCH 1192/1519] implement Decimal128Field updates #1981

---
 mongoengine/fields.py | 46 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 7b2fe47ff..e6267445b 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -12,6 +12,7 @@
 import gridfs
 import pymongo
 from bson import SON, Binary, DBRef, ObjectId
+from bson.decimal128 import Decimal128
 from bson.int64 import Int64
 from pymongo import ReturnDocument
 
@@ -95,6 +96,7 @@
     "MultiLineStringField",
     "MultiPolygonField",
     "GeoJsonBaseField",
+    "Decimal128Field",
 )
 
 RECURSIVE_REFERENCE_CONSTANT = "self"
@@ -2637,3 +2639,47 @@ def to_mongo(self, document):
             )
         else:
             return super().to_mongo(document)
+
+
+class Decimal128Field(BaseField):
+    def __init__(self, min_value=None, max_value=None, **kwargs):
+        self.min_value = min_value
+        self.max_value = max_value
+        super().__init__(**kwargs)
+
+    """
+        128-bit decimal-based floating-point field capable of emulating decimal
+        rounding with exact precision. Stores the value as a `Decimal128`
+        intended for monetary data, such as financial, tax, and scientific
+        computations.
+    """
+
+    def to_mongo(self, value):
+        if value is None:
+            return None
+        if isinstance(value, Decimal128):
+            return value
+        if isinstance(value, int):
+            return Decimal128(str(value))
+        if isinstance(value, float):
+            return Decimal128(str(value))
+        return Decimal128(value)
+
+    def to_python(self, value):
+        return self.to_mongo(value)
+
+    def validate(self, value):
+        if not isinstance(value, Decimal128):
+            try:
+                value = Decimal128(value)
+            except (TypeError, ValueError, decimal.InvalidOperation) as exc:
+                self.error("Could not convert value to Decimal128: %s" % exc)
+
+        if self.min_value is not None and value.to_decimal() < self.min_value:
+            self.error("Decimal value is too small")
+
+        if self.max_value is not None and value.to_decimal() > self.max_value:
+            self.error("Decimal value is too large")
+
+    def prepare_query_value(self, op, value):
+        return super().prepare_query_value(op, self.to_mongo(value))

From 6ae722d04bc4eb00f2ac908f049f93d53b8d0882 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 5 Jun 2021 21:17:31 +0200
Subject: [PATCH 1193/1519] precommit update

---
 .pre-commit-config.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5131c8c78..328a8cbc8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,22 +1,22 @@
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.0.1
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 21.4b2
+    rev: 21.5b2
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.1
+    rev: 3.9.2
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.14.0
+    rev: v2.19.1
     hooks:
       - id: pyupgrade
         args: [--py36-plus]

From 5b53314d6e13b893ce1ca2ffec592a5fec888f52 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 6 Jun 2021 15:13:39 +0200
Subject: [PATCH 1194/1519] Use estimated_documents_count OR documents_count
 based on query

---
 .travis_.yml                   | 108 ---------------------------------
 mongoengine/pymongo_support.py |  16 ++++-
 tests/test_context_managers.py |   3 +-
 3 files changed, 15 insertions(+), 112 deletions(-)
 delete mode 100644 .travis_.yml

diff --git a/.travis_.yml b/.travis_.yml
deleted file mode 100644
index 114fd76f1..000000000
--- a/.travis_.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-## For full coverage, we'd have to test all supported Python, MongoDB, and
-## PyMongo combinations. However, that would result in an overly long build
-## with a very large number of jobs, hence we only test a subset of all the
-## combinations.
-## * Python3.7, MongoDB v3.4 & the latest PyMongo v3.x is currently the "main" setup,
-## Other combinations are tested. See below for the details or check the travis jobs
-#
-## We should periodically check MongoDB Server versions supported by MongoDB
-## Inc., add newly released versions to the test matrix, and remove versions
-## which have reached their End of Life. See:
-## 1. https://www.mongodb.com/support-policy.
-## 2. https://docs.mongodb.com/ecosystem/drivers/driver-compatibility-reference/#python-driver-compatibility
-##
-## Reminder: Update README.rst if you change MongoDB versions we test.
-#
-#language: python
-#dist: xenial
-#python:
-#  - 3.6
-#  - 3.7
-#  - 3.8
-#  - 3.9
-#  - pypy3
-#
-#env:
-#  global:
-#    - MONGODB_3_4=3.4.19
-#    - MONGODB_3_6=3.6.13
-#    - MONGODB_4_0=4.0.13
-#
-#    - PYMONGO_3_4=3.4
-#    - PYMONGO_3_6=3.6
-#    - PYMONGO_3_9=3.9
-#    - PYMONGO_3_11=3.11
-#
-#    - MAIN_PYTHON_VERSION=3.7
-#  matrix:
-#    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_11}
-#
-#matrix:
-#  # Finish the build as soon as one job fails
-#  fast_finish: true
-#
-#  include:
-#    - python: 3.7
-#      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
-#    - python: 3.7
-#      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
-#    - python: 3.7
-#      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_11}
-#    - python: 3.8
-#      env: MONGODB=${MONGODB_4_0} PYMONGO=${PYMONGO_3_11}
-#
-#install:
-#  # Install Mongo
-#  - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
-#  - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
-#  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
-#  # Install Python dependencies.
-#  - pip install --upgrade pip
-#  - pip install coveralls
-#  - pip install pre-commit
-#  - pip install tox
-#  # tox dryrun to setup the tox venv (we run a mock test).
-#  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
-#
-#before_script:
-#  - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
-#  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
-#  # Run pre-commit hooks (black, flake8, etc) on entire codebase
-#  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then pre-commit run -a; else echo "pre-commit checks only runs on py37"; fi
-#  - mongo --eval 'db.version();' # Make sure mongo is awake
-#
-#script:
-#  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
-#
-#after_success:
-#  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then coveralls --verbose; else echo "coveralls only sent for py37"; fi
-#
-#notifications:
-#  irc: irc.freenode.org#mongoengine
-#
-## Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
-#branches:
-#  # Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
-#  only:
-#    - master
-#    - /^v.*$/
-#
-## Whenever a new release is created via GitHub, publish it on PyPI.
-#deploy:
-#  provider: pypi
-#  user: the_drow
-#  password:
-#    secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
-#
-#  # Create a source distribution and a pure python wheel for faster installs.
-#  distributions: "sdist bdist_wheel"
-#
-#  # Only deploy on tagged commits (aka GitHub releases) and only for the parent
-#  # repo's builds running Python v3.7 along with PyMongo v3.x and MongoDB v3.4.
-#  # We run Travis against many different Python, PyMongo, and MongoDB versions
-#  # and we don't want the deploy to occur multiple times).
-#  on:
-#    tags: true
-#    repo: MongoEngine/mongoengine
-#    condition: ($PYMONGO = ${PYMONGO_3_11}) && ($MONGODB = ${MONGODB_3_4})
-#    python: 3.7
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index dc7aaa6bc..837f683ee 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -31,13 +31,23 @@ def count_documents(
     # count_documents appeared in pymongo 3.7
     if IS_PYMONGO_GTE_37:
         try:
-            return collection.count_documents(filter=filter, **kwargs)
-        except OperationFailure:
+            if not filter and set(kwargs) <= {"max_time_ms"}:
+                # when no filter is provided, estimated_document_count
+                # is a lot faster as it uses the collection metadata
+                return collection.estimated_document_count(**kwargs)
+            else:
+                return collection.count_documents(filter=filter, **kwargs)
+        except OperationFailure as exc:
             # OperationFailure - accounts for some operators that used to work
             # with .count but are no longer working with count_documents (i.e $geoNear, $near, and $nearSphere)
             # fallback to deprecated Cursor.count
             # Keeping this should be reevaluated the day pymongo removes .count entirely
-            pass
+            if (
+                "$geoNear, $near, and $nearSphere are not allowed in this context"
+                not in str(exc)
+                and "$where is not allowed in this context" not in str(exc)
+            ):
+                raise
 
     cursor = collection.find(filter)
     for option, option_value in kwargs.items():
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 4ea7fa5ab..a23cca394 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -14,9 +14,10 @@
     switch_db,
 )
 from mongoengine.pymongo_support import count_documents
+from tests.utils import MongoDBTestCase
 
 
-class TestContextManagers:
+class TestContextManagers(MongoDBTestCase):
     def test_set_write_concern(self):
         connect("mongoenginetest")
 

From 512062c49d8594bee860d7c440ae304f0770309e Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Mon, 7 Jun 2021 10:33:43 +0200
Subject: [PATCH 1195/1519] combine

---
 mongoengine/fields.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e6267445b..809b9b7e4 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2659,9 +2659,7 @@ def to_mongo(self, value):
             return None
         if isinstance(value, Decimal128):
             return value
-        if isinstance(value, int):
-            return Decimal128(str(value))
-        if isinstance(value, float):
+        if isinstance(value, (int, float)):
             return Decimal128(str(value))
         return Decimal128(value)
 

From cfdb5d35e5397bc6e5f0d5b9e4e52be3ad854c90 Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Mon, 7 Jun 2021 10:35:00 +0200
Subject: [PATCH 1196/1519] init

---
 tests/fields/test_decimal128_field.py | 50 +++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 tests/fields/test_decimal128_field.py

diff --git a/tests/fields/test_decimal128_field.py b/tests/fields/test_decimal128_field.py
new file mode 100644
index 000000000..72c926e89
--- /dev/null
+++ b/tests/fields/test_decimal128_field.py
@@ -0,0 +1,50 @@
+import pytest
+from bson.decimal128 import Decimal128
+
+from mongoengine import *
+from tests.utils import MongoDBTestCase
+
+
+class TestDecimal128Field(MongoDBTestCase):
+    def test_decimal128_validation(self):
+        """Ensure that invalid values cannot be assigned to int fields."""
+
+        class Person(Document):
+            age = Decimal128Field(min_value=0, max_value=110)
+
+        person = Person()
+        person.age = Decimal128("0")
+        person.validate()
+
+        person.age = Decimal128("50")
+        person.validate()
+
+        person.age = Decimal128("110")
+        person.validate()
+
+        person.age = Decimal128("-1")
+        with pytest.raises(ValidationError):
+            person.validate()
+        person.age = Decimal128("120")
+        with pytest.raises(ValidationError):
+            person.validate()
+        person.age = "ten"
+        with pytest.raises(ValidationError):
+            person.validate()
+
+    def test_ne_operator(self):
+        class TestDocument(Document):
+            dec128_fld = Decimal128Field()
+
+        TestDocument.drop_collection()
+
+        TestDocument(dec128_fld=None).save()
+        TestDocument(dec128_fld=Decimal128("1")).save()
+
+        assert 1 == TestDocument.objects(dec128_fld__ne=None).count()
+        assert 1 == TestDocument.objects(dec128_fld__ne=1).count()
+        assert 1 == TestDocument.objects(dec128_fld__ne=1.0).count()
+        assert 1 == TestDocument.objects(dec128_fld__gt=0.5).count()
+        assert 1 == TestDocument.objects(dec128_fld__lt=1.5).count()
+        assert 1 == TestDocument.objects(dec128_fld=1.0).count()
+        assert 0 == TestDocument.objects(dec128_fld=2.0).count()

From 107af56c83c4ccad33f1b6617565c5f261d06ced Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Mon, 7 Jun 2021 17:14:09 +0200
Subject: [PATCH 1197/1519] split operator tests

---
 tests/fields/test_decimal128_field.py | 42 +++++++++++++++++----------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/tests/fields/test_decimal128_field.py b/tests/fields/test_decimal128_field.py
index 72c926e89..7a737ac3a 100644
--- a/tests/fields/test_decimal128_field.py
+++ b/tests/fields/test_decimal128_field.py
@@ -5,6 +5,16 @@
 from tests.utils import MongoDBTestCase
 
 
+def generate_test_cls() -> Document:
+    class TestDocument(Document):
+        dec128_fld = Decimal128Field()
+
+    TestDocument.drop_collection()
+    TestDocument(dec128_fld=None).save()
+    TestDocument(dec128_fld=Decimal128("1")).save()
+    return TestDocument
+
+
 class TestDecimal128Field(MongoDBTestCase):
     def test_decimal128_validation(self):
         """Ensure that invalid values cannot be assigned to int fields."""
@@ -32,19 +42,21 @@ class Person(Document):
         with pytest.raises(ValidationError):
             person.validate()
 
-    def test_ne_operator(self):
-        class TestDocument(Document):
-            dec128_fld = Decimal128Field()
+    def test_eq_operator(self):
+        cls = generate_test_cls()
+        assert 1 == cls.objects(dec128_fld=1.0).count()
+        assert 0 == cls.objects(dec128_fld=2.0).count()
 
-        TestDocument.drop_collection()
-
-        TestDocument(dec128_fld=None).save()
-        TestDocument(dec128_fld=Decimal128("1")).save()
-
-        assert 1 == TestDocument.objects(dec128_fld__ne=None).count()
-        assert 1 == TestDocument.objects(dec128_fld__ne=1).count()
-        assert 1 == TestDocument.objects(dec128_fld__ne=1.0).count()
-        assert 1 == TestDocument.objects(dec128_fld__gt=0.5).count()
-        assert 1 == TestDocument.objects(dec128_fld__lt=1.5).count()
-        assert 1 == TestDocument.objects(dec128_fld=1.0).count()
-        assert 0 == TestDocument.objects(dec128_fld=2.0).count()
+    def test_ne_operator(self):
+        cls = generate_test_cls()
+        assert 1 == cls.objects(dec128_fld__ne=None).count()
+        assert 1 == cls.objects(dec128_fld__ne=1).count()
+        assert 1 == cls.objects(dec128_fld__ne=1.0).count()
+
+    def test_gt_operator(self):
+        cls = generate_test_cls()
+        assert 1 == cls.objects(dec128_fld__gt=0.5).count()
+
+    def test_lt_operator(self):
+        cls = generate_test_cls()
+        assert 1 == cls.objects(dec128_fld__lt=1.5).count()

From e31189061d89412242549324e2ec59c5845fe64b Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Mon, 7 Jun 2021 17:22:57 +0200
Subject: [PATCH 1198/1519] split tests

---
 tests/fields/test_decimal128_field.py | 73 ++++++++++++++++++---------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/tests/fields/test_decimal128_field.py b/tests/fields/test_decimal128_field.py
index 7a737ac3a..d8acdb48c 100644
--- a/tests/fields/test_decimal128_field.py
+++ b/tests/fields/test_decimal128_field.py
@@ -5,42 +5,67 @@
 from tests.utils import MongoDBTestCase
 
 
-def generate_test_cls() -> Document:
-    class TestDocument(Document):
-        dec128_fld = Decimal128Field()
+class Decimal128Document(Document):
+    dec128_fld = Decimal128Field()
+    dec128_min_0 = Decimal128Field(min_value=0)
+    dec128_max_100 = Decimal128Field(max_value=100)
+
 
-    TestDocument.drop_collection()
-    TestDocument(dec128_fld=None).save()
-    TestDocument(dec128_fld=Decimal128("1")).save()
-    return TestDocument
+def generate_test_cls() -> Document:
+    Decimal128Document.drop_collection()
+    Decimal128Document(dec128_fld=None).save()
+    Decimal128Document(dec128_fld=Decimal128("1")).save()
+    return Decimal128Document
 
 
 class TestDecimal128Field(MongoDBTestCase):
-    def test_decimal128_validation(self):
-        """Ensure that invalid values cannot be assigned to int fields."""
+    def test_decimal128_validation_good(self):
+        """Ensure that invalid values cannot be assigned."""
+
+        doc = Decimal128Document()
 
-        class Person(Document):
-            age = Decimal128Field(min_value=0, max_value=110)
+        doc.dec128_fld = Decimal128("0")
+        doc.validate()
 
-        person = Person()
-        person.age = Decimal128("0")
-        person.validate()
+        doc.dec128_fld = Decimal128("50")
+        doc.validate()
 
-        person.age = Decimal128("50")
-        person.validate()
+        doc.dec128_fld = Decimal128("110")
+        doc.validate()
 
-        person.age = Decimal128("110")
-        person.validate()
+    def test_decimal128_validation_invalid(self):
+        """Ensure that invalid values cannot be assigned."""
+
+        doc = Decimal128Document()
+
+        doc.dec128_fld = "ten"
 
-        person.age = Decimal128("-1")
         with pytest.raises(ValidationError):
-            person.validate()
-        person.age = Decimal128("120")
+            doc.validate()
+
+    def test_decimal128_validation_min(self):
+        """Ensure that out of bounds values cannot be assigned."""
+
+        doc = Decimal128Document()
+
+        doc.dec128_min_0 = Decimal128("50")
+        doc.validate()
+
+        doc.dec128_min_0 = Decimal128("-1")
         with pytest.raises(ValidationError):
-            person.validate()
-        person.age = "ten"
+            doc.validate()
+
+    def test_decimal128_validation_max(self):
+        """Ensure that out of bounds values cannot be assigned."""
+
+        doc = Decimal128Document()
+
+        doc.dec128_max_100 = Decimal128("50")
+        doc.validate()
+
+        doc.dec128_max_100 = Decimal128("101")
         with pytest.raises(ValidationError):
-            person.validate()
+            doc.validate()
 
     def test_eq_operator(self):
         cls = generate_test_cls()

From 739cccf212b14ffa09c46f1e9def1bc883b2c8b4 Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Mon, 7 Jun 2021 17:24:52 +0200
Subject: [PATCH 1199/1519] add test_storage()

---
 tests/fields/test_decimal128_field.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/fields/test_decimal128_field.py b/tests/fields/test_decimal128_field.py
index d8acdb48c..2ba84006a 100644
--- a/tests/fields/test_decimal128_field.py
+++ b/tests/fields/test_decimal128_field.py
@@ -2,7 +2,7 @@
 from bson.decimal128 import Decimal128
 
 from mongoengine import *
-from tests.utils import MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class Decimal128Document(Document):
@@ -85,3 +85,10 @@ def test_gt_operator(self):
     def test_lt_operator(self):
         cls = generate_test_cls()
         assert 1 == cls.objects(dec128_fld__lt=1.5).count()
+
+    def test_storage(self):
+        model = Decimal128Document(dec128_fld=100).save()
+        assert get_as_pymongo(model) == {
+            "_id": model.id,
+            "dec128_fld": Decimal128("100"),
+        }

From 82d45f14bc193f7f230a6cc333f29a07a4173a48 Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Mon, 7 Jun 2021 17:26:48 +0200
Subject: [PATCH 1200/1519] add tests with Decimal

---
 tests/fields/test_decimal128_field.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/fields/test_decimal128_field.py b/tests/fields/test_decimal128_field.py
index 2ba84006a..05b4d1f2c 100644
--- a/tests/fields/test_decimal128_field.py
+++ b/tests/fields/test_decimal128_field.py
@@ -1,3 +1,5 @@
+from decimal import Decimal
+
 import pytest
 from bson.decimal128 import Decimal128
 
@@ -33,6 +35,9 @@ def test_decimal128_validation_good(self):
         doc.dec128_fld = Decimal128("110")
         doc.validate()
 
+        doc.dec128_fld = Decimal("110")
+        doc.validate()
+
     def test_decimal128_validation_invalid(self):
         """Ensure that invalid values cannot be assigned."""
 
@@ -92,3 +97,15 @@ def test_storage(self):
             "_id": model.id,
             "dec128_fld": Decimal128("100"),
         }
+
+        model = Decimal128Document(dec128_fld=Decimal128("100")).save()
+        assert get_as_pymongo(model) == {
+            "_id": model.id,
+            "dec128_fld": Decimal128("100"),
+        }
+
+        model = Decimal128Document(dec128_fld=Decimal("100")).save()
+        assert get_as_pymongo(model) == {
+            "_id": model.id,
+            "dec128_fld": Decimal128("100"),
+        }

From 95d130a3cb18e2c9675d809d2547aa5064263b71 Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Mon, 7 Jun 2021 17:32:12 +0200
Subject: [PATCH 1201/1519] test json

---
 tests/fields/test_decimal128_field.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/fields/test_decimal128_field.py b/tests/fields/test_decimal128_field.py
index 05b4d1f2c..2bff976cb 100644
--- a/tests/fields/test_decimal128_field.py
+++ b/tests/fields/test_decimal128_field.py
@@ -1,3 +1,5 @@
+import json
+import random
 from decimal import Decimal
 
 import pytest
@@ -109,3 +111,11 @@ def test_storage(self):
             "_id": model.id,
             "dec128_fld": Decimal128("100"),
         }
+
+    def test_json(self):
+        Decimal128Document.drop_collection()
+        f = random.random()
+        Decimal128Document(dec128_fld=f).save()
+        json_str = Decimal128Document.objects.to_json()
+        array = json.loads(json_str)
+        assert array[0]["dec128_fld"] == {"$numberDecimal": str(f)}

From 0e6ca30a81e745d826aabc31be4affb108fa6a6e Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Wed, 9 Jun 2021 13:23:37 +0200
Subject: [PATCH 1202/1519] use Decimal as native type

---
 mongoengine/fields.py                 |  4 +++-
 tests/fields/test_decimal128_field.py | 32 ++++++++++++++++++---------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 809b9b7e4..594ffa9ab 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2664,7 +2664,9 @@ def to_mongo(self, value):
         return Decimal128(value)
 
     def to_python(self, value):
-        return self.to_mongo(value)
+        if value is None:
+            return None
+        return self.to_mongo(value).to_decimal()
 
     def validate(self, value):
         if not isinstance(value, Decimal128):
diff --git a/tests/fields/test_decimal128_field.py b/tests/fields/test_decimal128_field.py
index 2bff976cb..e0bcab650 100644
--- a/tests/fields/test_decimal128_field.py
+++ b/tests/fields/test_decimal128_field.py
@@ -18,7 +18,7 @@ class Decimal128Document(Document):
 def generate_test_cls() -> Document:
     Decimal128Document.drop_collection()
     Decimal128Document(dec128_fld=None).save()
-    Decimal128Document(dec128_fld=Decimal128("1")).save()
+    Decimal128Document(dec128_fld=Decimal(1)).save()
     return Decimal128Document
 
 
@@ -28,16 +28,16 @@ def test_decimal128_validation_good(self):
 
         doc = Decimal128Document()
 
-        doc.dec128_fld = Decimal128("0")
+        doc.dec128_fld = Decimal(0)
         doc.validate()
 
-        doc.dec128_fld = Decimal128("50")
+        doc.dec128_fld = Decimal(50)
         doc.validate()
 
-        doc.dec128_fld = Decimal128("110")
+        doc.dec128_fld = Decimal(110)
         doc.validate()
 
-        doc.dec128_fld = Decimal("110")
+        doc.dec128_fld = Decimal(110)
         doc.validate()
 
     def test_decimal128_validation_invalid(self):
@@ -55,10 +55,10 @@ def test_decimal128_validation_min(self):
 
         doc = Decimal128Document()
 
-        doc.dec128_min_0 = Decimal128("50")
+        doc.dec128_min_0 = Decimal(50)
         doc.validate()
 
-        doc.dec128_min_0 = Decimal128("-1")
+        doc.dec128_min_0 = Decimal(-1)
         with pytest.raises(ValidationError):
             doc.validate()
 
@@ -67,10 +67,10 @@ def test_decimal128_validation_max(self):
 
         doc = Decimal128Document()
 
-        doc.dec128_max_100 = Decimal128("50")
+        doc.dec128_max_100 = Decimal(50)
         doc.validate()
 
-        doc.dec128_max_100 = Decimal128("101")
+        doc.dec128_max_100 = Decimal(101)
         with pytest.raises(ValidationError):
             doc.validate()
 
@@ -94,19 +94,29 @@ def test_lt_operator(self):
         assert 1 == cls.objects(dec128_fld__lt=1.5).count()
 
     def test_storage(self):
+        # from int
         model = Decimal128Document(dec128_fld=100).save()
         assert get_as_pymongo(model) == {
             "_id": model.id,
             "dec128_fld": Decimal128("100"),
         }
 
-        model = Decimal128Document(dec128_fld=Decimal128("100")).save()
+        # from float
+        model = Decimal128Document(dec128_fld=100.0).save()
+        assert get_as_pymongo(model) == {
+            "_id": model.id,
+            "dec128_fld": Decimal128("100.0"),
+        }
+
+        # from Decimal
+        model = Decimal128Document(dec128_fld=Decimal(100)).save()
         assert get_as_pymongo(model) == {
             "_id": model.id,
             "dec128_fld": Decimal128("100"),
         }
 
-        model = Decimal128Document(dec128_fld=Decimal("100")).save()
+        # from Decimal128
+        model = Decimal128Document(dec128_fld=Decimal128("100")).save()
         assert get_as_pymongo(model) == {
             "_id": model.id,
             "dec128_fld": Decimal128("100"),

From 98b2a9100eec67bf389de309000fe1d30b08ee7a Mon Sep 17 00:00:00 2001
From: Jakob Schlyter <jakob@kirei.se>
Date: Wed, 9 Jun 2021 13:32:57 +0200
Subject: [PATCH 1203/1519] use create_decimal128_context

---
 mongoengine/fields.py                 | 10 +++++++---
 tests/fields/test_decimal128_field.py |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 594ffa9ab..b5295769c 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -12,7 +12,7 @@
 import gridfs
 import pymongo
 from bson import SON, Binary, DBRef, ObjectId
-from bson.decimal128 import Decimal128
+from bson.decimal128 import Decimal128, create_decimal128_context
 from bson.int64 import Int64
 from pymongo import ReturnDocument
 
@@ -2642,6 +2642,9 @@ def to_mongo(self, document):
 
 
 class Decimal128Field(BaseField):
+
+    DECIMAL_CONTEXT = create_decimal128_context()
+
     def __init__(self, min_value=None, max_value=None, **kwargs):
         self.min_value = min_value
         self.max_value = max_value
@@ -2659,8 +2662,9 @@ def to_mongo(self, value):
             return None
         if isinstance(value, Decimal128):
             return value
-        if isinstance(value, (int, float)):
-            return Decimal128(str(value))
+        if not isinstance(value, decimal.Decimal):
+            with decimal.localcontext(self.DECIMAL_CONTEXT) as ctx:
+                value = ctx.create_decimal(value)
         return Decimal128(value)
 
     def to_python(self, value):
diff --git a/tests/fields/test_decimal128_field.py b/tests/fields/test_decimal128_field.py
index e0bcab650..4863caa41 100644
--- a/tests/fields/test_decimal128_field.py
+++ b/tests/fields/test_decimal128_field.py
@@ -105,7 +105,7 @@ def test_storage(self):
         model = Decimal128Document(dec128_fld=100.0).save()
         assert get_as_pymongo(model) == {
             "_id": model.id,
-            "dec128_fld": Decimal128("100.0"),
+            "dec128_fld": Decimal128("100"),
         }
 
         # from Decimal
@@ -124,7 +124,7 @@ def test_storage(self):
 
     def test_json(self):
         Decimal128Document.drop_collection()
-        f = random.random()
+        f = str(random.random())
         Decimal128Document(dec128_fld=f).save()
         json_str = Decimal128Document.objects.to_json()
         array = json.loads(json_str)

From e7f2d77a75d3caf6a04398551d090503f999a3c2 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 13 Jun 2021 23:01:20 +0200
Subject: [PATCH 1204/1519] fix doc formatting (enumfield, etc)

---
 docs/apireference.rst             |  1 +
 docs/guide/defining-documents.rst |  1 -
 mongoengine/connection.py         | 47 +++++++++++++++----------------
 mongoengine/context_managers.py   | 20 +++++++++++--
 mongoengine/fields.py             | 14 +++++++--
 tests/fields/test_fields.py       |  4 +--
 6 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/docs/apireference.rst b/docs/apireference.rst
index 218946115..dbcb3b84e 100644
--- a/docs/apireference.rst
+++ b/docs/apireference.rst
@@ -75,6 +75,7 @@ Fields
 .. autoclass:: mongoengine.fields.StringField
 .. autoclass:: mongoengine.fields.URLField
 .. autoclass:: mongoengine.fields.EmailField
+.. autoclass:: mongoengine.fields.EnumField
 .. autoclass:: mongoengine.fields.IntField
 .. autoclass:: mongoengine.fields.LongField
 .. autoclass:: mongoengine.fields.FloatField
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index a457de1f0..e16c5bc43 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -336,7 +336,6 @@ supplying the :attr:`reverse_delete_rule` attributes on the
 :class:`ReferenceField` definition, like this::
 
     class ProfilePage(Document):
-        ...
         employee = ReferenceField('Employee', reverse_delete_rule=mongoengine.CASCADE)
 
 The declaration in this example means that when an :class:`Employee` object is
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 11cd93083..e9078a2e7 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -58,20 +58,20 @@ def _get_connection_settings(
 ):
     """Get the connection settings as a dict
 
-    : param db: the name of the database to use, for compatibility with connect
-    : param name: the name of the specific database to use
-    : param host: the host name of the: program: `mongod` instance to connect to
-    : param port: the port that the: program: `mongod` instance is running on
-    : param read_preference: The read preference for the collection
-    : param username: username to authenticate with
-    : param password: password to authenticate with
-    : param authentication_source: database to authenticate against
-    : param authentication_mechanism: database authentication mechanisms.
+    :param db: the name of the database to use, for compatibility with connect
+    :param name: the name of the specific database to use
+    :param host: the host name of the: program: `mongod` instance to connect to
+    :param port: the port that the: program: `mongod` instance is running on
+    :param read_preference: The read preference for the collection
+    :param username: username to authenticate with
+    :param password: password to authenticate with
+    :param authentication_source: database to authenticate against
+    :param authentication_mechanism: database authentication mechanisms.
         By default, use SCRAM-SHA-1 with MongoDB 3.0 and later,
         MONGODB-CR (MongoDB Challenge Response protocol) for older servers.
-    : param is_mock: explicitly use mongomock for this connection
+    :param is_mock: explicitly use mongomock for this connection
         (can also be done by using `mongomock: // ` as db host prefix)
-    : param kwargs: ad-hoc parameters to be passed into the pymongo driver,
+    :param kwargs: ad-hoc parameters to be passed into the pymongo driver,
         for example maxpoolsize, tz_aware, etc. See the documentation
         for pymongo's `MongoClient` for a full list.
     """
@@ -181,22 +181,21 @@ def register_connection(
 ):
     """Register the connection settings.
 
-    : param alias: the name that will be used to refer to this connection
-        throughout MongoEngine
-    : param db: the name of the database to use, for compatibility with connect
-    : param name: the name of the specific database to use
-    : param host: the host name of the: program: `mongod` instance to connect to
-    : param port: the port that the: program: `mongod` instance is running on
-    : param read_preference: The read preference for the collection
-    : param username: username to authenticate with
-    : param password: password to authenticate with
-    : param authentication_source: database to authenticate against
-    : param authentication_mechanism: database authentication mechanisms.
+    :param alias: the name that will be used to refer to this connection throughout MongoEngine
+    :param db: the name of the database to use, for compatibility with connect
+    :param name: the name of the specific database to use
+    :param host: the host name of the: program: `mongod` instance to connect to
+    :param port: the port that the: program: `mongod` instance is running on
+    :param read_preference: The read preference for the collection
+    :param username: username to authenticate with
+    :param password: password to authenticate with
+    :param authentication_source: database to authenticate against
+    :param authentication_mechanism: database authentication mechanisms.
         By default, use SCRAM-SHA-1 with MongoDB 3.0 and later,
         MONGODB-CR (MongoDB Challenge Response protocol) for older servers.
-    : param is_mock: explicitly use mongomock for this connection
+    :param is_mock: explicitly use mongomock for this connection
         (can also be done by using `mongomock: // ` as db host prefix)
-    : param kwargs: ad-hoc parameters to be passed into the pymongo driver,
+    :param kwargs: ad-hoc parameters to be passed into the pymongo driver,
         for example maxpoolsize, tz_aware, etc. See the documentation
         for pymongo's `MongoClient` for a full list.
     """
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 257d27f82..0ca2622c5 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -177,14 +177,28 @@ class query_counter:
     This was designed for debugging purpose. In fact it is a global counter so queries issued by other threads/processes
     can interfere with it
 
+    Usage:
+
+    .. code-block:: python
+
+        class User(Document):
+            name = StringField()
+
+        with query_counter() as q:
+            user = User(name='Bob')
+            assert q == 0       # no query fired yet
+            user.save()
+            assert q == 1       # 1 query was fired, an 'insert'
+            user_bis = User.objects().first()
+            assert q == 2       # a 2nd query was fired, a 'find_one'
+
     Be aware that:
-    - Iterating over large amount of documents (>101) makes pymongo issue `getmore` queries to fetch the next batch of
-        documents (https://docs.mongodb.com/manual/tutorial/iterate-a-cursor/#cursor-batches)
+
+    - Iterating over large amount of documents (>101) makes pymongo issue `getmore` queries to fetch the next batch of documents (https://docs.mongodb.com/manual/tutorial/iterate-a-cursor/#cursor-batches)
     - Some queries are ignored by default by the counter (killcursors, db.system.indexes)
     """
 
     def __init__(self, alias=DEFAULT_CONNECTION_NAME):
-        """Construct the query_counter"""
         self.db = get_db(alias=alias)
         self.initial_profiling_level = None
         self._ctx_query_counter = 0  # number of queries issued by the context
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 7b2fe47ff..8973ac960 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1611,11 +1611,14 @@ class EnumField(BaseField):
     """Enumeration Field. Values are stored underneath as is,
     so it will only work with simple types (str, int, etc) that
     are bson encodable
-     Example usage:
+
+    Example usage:
+
     .. code-block:: python
 
         class Status(Enum):
             NEW = 'new'
+            ONGOING = 'ongoing'
             DONE = 'done'
 
         class ModelWithEnum(Document):
@@ -1625,13 +1628,18 @@ class ModelWithEnum(Document):
         ModelWithEnum(status=Status.DONE)
 
     Enum fields can be searched using enum or its value:
+
     .. code-block:: python
 
         ModelWithEnum.objects(status='new').count()
         ModelWithEnum.objects(status=Status.NEW).count()
 
-    Note that choices cannot be set explicitly, they are derived
-    from the provided enum class.
+    The values can be restricted to a subset of the enum by using the ``choices`` parameter:
+
+    .. code-block:: python
+
+        class ModelWithEnum(Document):
+            status = EnumField(Status, choices=[Status.NEW, Status.DONE])
     """
 
     def __init__(self, enum, **kwargs):
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 69fe14712..5fbb78d85 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -2077,7 +2077,7 @@ def test_tuples_as_tuples(self):
         a ComplexBaseField.
         """
 
-        class EnumField(BaseField):
+        class SomeField(BaseField):
             def __init__(self, **kwargs):
                 super().__init__(**kwargs)
 
@@ -2088,7 +2088,7 @@ def to_python(self, value):
                 return tuple(value)
 
         class TestDoc(Document):
-            items = ListField(EnumField())
+            items = ListField(SomeField())
 
         TestDoc.drop_collection()
 

From 09c415a4162027ba213a6e47174b954b6fea45a5 Mon Sep 17 00:00:00 2001
From: Oleksandr <loboda.alexandr@gmail.com>
Date: Tue, 29 Jun 2021 17:32:51 +0300
Subject: [PATCH 1205/1519] fix DecimalField precision

fix decimal.InvalidOperation: [<class 'decimal.ConversionSyntax'>] error if DecimalField param precision is zero or less
---
 mongoengine/fields.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 8973ac960..be07ec888 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -482,10 +482,11 @@ def to_python(self, value):
             value = decimal.Decimal("%s" % value)
         except (TypeError, ValueError, decimal.InvalidOperation):
             return value
-        return value.quantize(
-            decimal.Decimal(".%s" % ("0" * self.precision)), rounding=self.rounding
-        )
-
+        if self.precision > 0:
+            return value.quantize(decimal.Decimal(".%s" % ("0" * self.precision)), rounding=self.rounding)
+        else:
+            return value.quantize(decimal.Decimal(), rounding=self.rounding)
+        
     def to_mongo(self, value):
         if value is None:
             return value

From bffe0587264e0f3897427be95d10642e530e9fbe Mon Sep 17 00:00:00 2001
From: Jan-Lucas Ott <ottj3@tcnj.edu>
Date: Wed, 30 Jun 2021 17:16:07 -0400
Subject: [PATCH 1206/1519] Mention DynamicEmbeddedDocument in embedded
 section.

---
 docs/guide/defining-documents.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index e16c5bc43..eff59845c 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -27,6 +27,8 @@ objects** as class attributes to the document class::
 As BSON (the binary format for storing data in mongodb) is order dependent,
 documents are serialized based on their field order.
 
+.. _dynamic-document-schemas:
+
 Dynamic document schemas
 ========================
 One of the benefits of MongoDB is dynamic schemas for a collection, whilst data
@@ -231,6 +233,9 @@ document class as the first argument::
     comment2 = Comment(content='Nice article!')
     page = Page(comments=[comment1, comment2])
 
+Embedded documents can also leverage the flexibility of :ref:`dynamic-document-schemas:`
+by inheriting :class:`~mongoengine.DynamicEmbeddedDocument`.
+
 Dictionary Fields
 -----------------
 Often, an embedded document may be used instead of a dictionary – generally

From 88642eb0212d276eaa4efe0d605fc3af743158a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9=20Perez?= <timothe@contract.fit>
Date: Tue, 23 Mar 2021 22:11:41 +0100
Subject: [PATCH 1207/1519] Fix deepcopy on EmbeddedDocument

---
 AUTHORS                         | 1 +
 docs/changelog.rst              | 1 +
 mongoengine/document.py         | 9 +++++++++
 tests/document/test_instance.py | 9 +++++++++
 4 files changed, 20 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 0c7f6b46d..64069d33a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -260,3 +260,4 @@ that much better:
  * Stankiewicz Mateusz (https://github.com/mas15)
  * Felix Schultheiß (https://github.com/felix-smashdocs)
  * Jan Stein (https://github.com/janste63)
+ * Timothé Perez (https://github.com/AchilleAsh)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3f4252a55..737ec043b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,7 @@ Changes in 0.23.1
 ===========
 - Bug fix: ignore LazyReferenceFields when clearing _changed_fields #2484
 - Improve connection doc #2481
+- Fix deepcopy on EmbeddedDocument
 
 Changes in 0.23.0
 =================
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 0ba5db126..9be493688 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -99,6 +99,15 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not self.__eq__(other)
 
+    def __getstate__(self):
+        data = super().__getstate__()
+        data["_instance"] = self._instance
+        return data
+
+    def __setstate__(self, state):
+        super().__setstate__(state)
+        self._instance = state["_instance"]
+
     def to_mongo(self, *args, **kwargs):
         data = super().to_mongo(*args, **kwargs)
 
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 1469c9bb6..77d51a46d 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3,6 +3,7 @@
 import unittest
 import uuid
 import weakref
+from copy import deepcopy
 from datetime import datetime
 
 import bson
@@ -78,6 +79,14 @@ def assertHasInstance(self, field, instance):
         else:
             assert field._instance == instance
 
+    def test_deepcopy(self):
+        """Ensure that the _instance attribute on EmbeddedDocument exists after a deepcopy"""
+
+        doc = self.Job()
+        assert doc._instance is None
+        copied = deepcopy(doc)
+        assert copied._instance is None
+
     def test_capped_collection(self):
         """Ensure that capped collections work properly."""
 

From c32b30873049192ca03f8b7993e069497e11b264 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 1 Aug 2021 14:12:27 +0200
Subject: [PATCH 1208/1519] minor renaming in test classes

---
 tests/document/test_instance.py | 30 +++++++++++++++---------------
 tests/queryset/test_modify.py   | 22 +++++++++++-----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 77d51a46d..5d27a6cf3 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -66,12 +66,12 @@ def tearDown(self):
         for collection in list_collection_names(self.db):
             self.db.drop_collection(collection)
 
-    def assertDbEqual(self, docs):
+    def _assert_db_equal(self, docs):
         assert list(self.Person._get_collection().find().sort("id")) == sorted(
             docs, key=lambda doc: doc["_id"]
         )
 
-    def assertHasInstance(self, field, instance):
+    def _assert_has_instance(self, field, instance):
         assert hasattr(field, "_instance")
         assert field._instance is not None
         if isinstance(field._instance, weakref.ProxyType):
@@ -749,11 +749,11 @@ class Doc(Document):
         Doc.drop_collection()
 
         doc = Doc(embedded_field=Embedded(string="Hi"))
-        self.assertHasInstance(doc.embedded_field, doc)
+        self._assert_has_instance(doc.embedded_field, doc)
 
         doc.save()
         doc = Doc.objects.get()
-        self.assertHasInstance(doc.embedded_field, doc)
+        self._assert_has_instance(doc.embedded_field, doc)
 
     def test_embedded_document_complex_instance(self):
         """Ensure that embedded documents in complex fields can reference
@@ -768,11 +768,11 @@ class Doc(Document):
 
         Doc.drop_collection()
         doc = Doc(embedded_field=[Embedded(string="Hi")])
-        self.assertHasInstance(doc.embedded_field[0], doc)
+        self._assert_has_instance(doc.embedded_field[0], doc)
 
         doc.save()
         doc = Doc.objects.get()
-        self.assertHasInstance(doc.embedded_field[0], doc)
+        self._assert_has_instance(doc.embedded_field[0], doc)
 
     def test_embedded_document_complex_instance_no_use_db_field(self):
         """Ensure that use_db_field is propagated to list of Emb Docs."""
@@ -801,11 +801,11 @@ class Account(Document):
 
         acc = Account()
         acc.email = Email(email="test@example.com")
-        self.assertHasInstance(acc._data["email"], acc)
+        self._assert_has_instance(acc._data["email"], acc)
         acc.save()
 
         acc1 = Account.objects.first()
-        self.assertHasInstance(acc1._data["email"], acc1)
+        self._assert_has_instance(acc1._data["email"], acc1)
 
     def test_instance_is_set_on_setattr_on_embedded_document_list(self):
         class Email(EmbeddedDocument):
@@ -817,11 +817,11 @@ class Account(Document):
         Account.drop_collection()
         acc = Account()
         acc.emails = [Email(email="test@example.com")]
-        self.assertHasInstance(acc._data["emails"][0], acc)
+        self._assert_has_instance(acc._data["emails"][0], acc)
         acc.save()
 
         acc1 = Account.objects.first()
-        self.assertHasInstance(acc1._data["emails"][0], acc1)
+        self._assert_has_instance(acc1._data["emails"][0], acc1)
 
     def test_save_checks_that_clean_is_called(self):
         class CustomError(Exception):
@@ -930,7 +930,7 @@ def test_modify_empty(self):
         with pytest.raises(InvalidDocumentError):
             self.Person().modify(set__age=10)
 
-        self.assertDbEqual([dict(doc.to_mongo())])
+        self._assert_db_equal([dict(doc.to_mongo())])
 
     def test_modify_invalid_query(self):
         doc1 = self.Person(name="bob", age=10).save()
@@ -940,7 +940,7 @@ def test_modify_invalid_query(self):
         with pytest.raises(InvalidQueryError):
             doc1.modify({"id": doc2.id}, set__value=20)
 
-        self.assertDbEqual(docs)
+        self._assert_db_equal(docs)
 
     def test_modify_match_another_document(self):
         doc1 = self.Person(name="bob", age=10).save()
@@ -950,7 +950,7 @@ def test_modify_match_another_document(self):
         n_modified = doc1.modify({"name": doc2.name}, set__age=100)
         assert n_modified == 0
 
-        self.assertDbEqual(docs)
+        self._assert_db_equal(docs)
 
     def test_modify_not_exists(self):
         doc1 = self.Person(name="bob", age=10).save()
@@ -960,7 +960,7 @@ def test_modify_not_exists(self):
         n_modified = doc2.modify({"name": doc2.name}, set__age=100)
         assert n_modified == 0
 
-        self.assertDbEqual(docs)
+        self._assert_db_equal(docs)
 
     def test_modify_update(self):
         other_doc = self.Person(name="bob", age=10).save()
@@ -986,7 +986,7 @@ def test_modify_update(self):
         assert doc.to_json() == doc_copy.to_json()
         assert doc._get_changed_fields() == []
 
-        self.assertDbEqual([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
+        self._assert_db_equal([dict(other_doc.to_mongo()), dict(doc.to_mongo())])
 
     def test_modify_with_positional_push(self):
         class Content(EmbeddedDocument):
diff --git a/tests/queryset/test_modify.py b/tests/queryset/test_modify.py
index 15e3af349..b96e05e63 100644
--- a/tests/queryset/test_modify.py
+++ b/tests/queryset/test_modify.py
@@ -19,7 +19,7 @@ def setUp(self):
         connect(db="mongoenginetest")
         Doc.drop_collection()
 
-    def assertDbEqual(self, docs):
+    def _assert_db_equal(self, docs):
         assert list(Doc._collection.find().sort("id")) == docs
 
     def test_modify(self):
@@ -28,7 +28,7 @@ def test_modify(self):
 
         old_doc = Doc.objects(id=1).modify(set__value=-1)
         assert old_doc.to_json() == doc.to_json()
-        self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
+        self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
     def test_modify_with_new(self):
         Doc(id=0, value=0).save()
@@ -37,18 +37,18 @@ def test_modify_with_new(self):
         new_doc = Doc.objects(id=1).modify(set__value=-1, new=True)
         doc.value = -1
         assert new_doc.to_json() == doc.to_json()
-        self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
+        self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
     def test_modify_not_existing(self):
         Doc(id=0, value=0).save()
         assert Doc.objects(id=1).modify(set__value=-1) is None
-        self.assertDbEqual([{"_id": 0, "value": 0}])
+        self._assert_db_equal([{"_id": 0, "value": 0}])
 
     def test_modify_with_upsert(self):
         Doc(id=0, value=0).save()
         old_doc = Doc.objects(id=1).modify(set__value=1, upsert=True)
         assert old_doc is None
-        self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}])
+        self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}])
 
     def test_modify_with_upsert_existing(self):
         Doc(id=0, value=0).save()
@@ -56,13 +56,13 @@ def test_modify_with_upsert_existing(self):
 
         old_doc = Doc.objects(id=1).modify(set__value=-1, upsert=True)
         assert old_doc.to_json() == doc.to_json()
-        self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
+        self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
     def test_modify_with_upsert_with_new(self):
         Doc(id=0, value=0).save()
         new_doc = Doc.objects(id=1).modify(upsert=True, new=True, set__value=1)
         assert new_doc.to_mongo() == {"_id": 1, "value": 1}
-        self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}])
+        self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": 1}])
 
     def test_modify_with_remove(self):
         Doc(id=0, value=0).save()
@@ -70,12 +70,12 @@ def test_modify_with_remove(self):
 
         old_doc = Doc.objects(id=1).modify(remove=True)
         assert old_doc.to_json() == doc.to_json()
-        self.assertDbEqual([{"_id": 0, "value": 0}])
+        self._assert_db_equal([{"_id": 0, "value": 0}])
 
     def test_find_and_modify_with_remove_not_existing(self):
         Doc(id=0, value=0).save()
         assert Doc.objects(id=1).modify(remove=True) is None
-        self.assertDbEqual([{"_id": 0, "value": 0}])
+        self._assert_db_equal([{"_id": 0, "value": 0}])
 
     def test_modify_with_order_by(self):
         Doc(id=0, value=3).save()
@@ -85,7 +85,7 @@ def test_modify_with_order_by(self):
 
         old_doc = Doc.objects().order_by("-id").modify(set__value=-1)
         assert old_doc.to_json() == doc.to_json()
-        self.assertDbEqual(
+        self._assert_db_equal(
             [
                 {"_id": 0, "value": 3},
                 {"_id": 1, "value": 2},
@@ -100,7 +100,7 @@ def test_modify_with_fields(self):
 
         old_doc = Doc.objects(id=1).only("id").modify(set__value=-1)
         assert old_doc.to_mongo() == {"_id": 1}
-        self.assertDbEqual([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
+        self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
     def test_modify_with_push(self):
         class BlogPost(Document):

From 5a41998edaaa0e9c9bb216739fae2efbfe632a6e Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 2 Aug 2021 21:51:15 +0200
Subject: [PATCH 1209/1519] Updated recent bugfix with embedded DOc deepcopy so
 that it set _instance to None

---
 docs/changelog.rst                           |  1 +
 mongoengine/document.py                      |  4 +--
 tests/document/test_instance.py              |  9 ------
 tests/fields/test_embedded_document_field.py | 31 ++++++++++++++++++++
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 737ec043b..6d5f4a55f 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - EnumField improvements: now `choices` limits the values of an enum to allow
+- Missing `._instance` field after deepcopy of EmbeddedField (#2202
 
 Changes in 0.23.1
 ===========
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 9be493688..5f05b4853 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -101,7 +101,7 @@ def __ne__(self, other):
 
     def __getstate__(self):
         data = super().__getstate__()
-        data["_instance"] = self._instance
+        data["_instance"] = None
         return data
 
     def __setstate__(self, state):
@@ -135,7 +135,7 @@ class Document(BaseDocument, metaclass=TopLevelDocumentMetaclass):
     create a specialised version of the document that will be stored in the
     same collection. To facilitate this behaviour a `_cls`
     field is added to documents (hidden though the MongoEngine interface).
-    To enable this behaviourset :attr:`allow_inheritance` to ``True`` in the
+    To enable this behaviour set :attr:`allow_inheritance` to ``True`` in the
     :attr:`meta` dictionary.
 
     A :class:`~mongoengine.Document` may use a **Capped Collection** by
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 5d27a6cf3..cd8e9b1b0 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -3,7 +3,6 @@
 import unittest
 import uuid
 import weakref
-from copy import deepcopy
 from datetime import datetime
 
 import bson
@@ -79,14 +78,6 @@ def _assert_has_instance(self, field, instance):
         else:
             assert field._instance == instance
 
-    def test_deepcopy(self):
-        """Ensure that the _instance attribute on EmbeddedDocument exists after a deepcopy"""
-
-        doc = self.Job()
-        assert doc._instance is None
-        copied = deepcopy(doc)
-        assert copied._instance is None
-
     def test_capped_collection(self):
         """Ensure that capped collections work properly."""
 
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 0e9784ffe..8aec85152 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,4 +1,7 @@
+from copy import deepcopy
+
 import pytest
+from bson import ObjectId
 
 from mongoengine import (
     Document,
@@ -9,6 +12,7 @@
     InvalidQueryError,
     ListField,
     LookUpError,
+    MapField,
     StringField,
     ValidationError,
 )
@@ -350,3 +354,30 @@ class Person(Document):
         # Test existing attribute
         assert Person.objects(settings__base_foo="basefoo").first().id == p.id
         assert Person.objects(settings__sub_foo="subfoo").first().id == p.id
+
+    def test_deepcopy_set__instance(self):
+        """Ensure that the _instance attribute on EmbeddedDocument exists after a deepcopy"""
+
+        class Wallet(EmbeddedDocument):
+            money = IntField()
+
+        class Person(Document):
+            wallet = EmbeddedDocumentField(Wallet)
+            wallet_map = MapField(EmbeddedDocumentField(Wallet))
+
+        # Test on fresh EmbeddedDoc
+        emb_doc = Wallet(money=1)
+        assert emb_doc._instance is None
+        copied_emb_doc = deepcopy(emb_doc)
+        assert copied_emb_doc._instance is None
+
+        # Test on attached EmbeddedDoc
+        doc = Person(
+            id=ObjectId(), wallet=Wallet(money=2), wallet_map={"test": Wallet(money=2)}
+        )
+        assert doc.wallet._instance == doc
+        copied_emb_doc = deepcopy(doc.wallet)
+        assert copied_emb_doc._instance == doc
+
+        copied_map_emb_doc = deepcopy(doc.wallet_map)
+        assert copied_map_emb_doc["test"]._instance == doc

From 66978aea672f7813d32a644f271f032c2b56cf42 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 2 Aug 2021 21:56:50 +0200
Subject: [PATCH 1210/1519] fix test and changelog

---
 docs/changelog.rst                           | 3 +--
 tests/fields/test_embedded_document_field.py | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6d5f4a55f..be2c38c3d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,13 +8,12 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - EnumField improvements: now `choices` limits the values of an enum to allow
-- Missing `._instance` field after deepcopy of EmbeddedField (#2202
+- Fix deepcopy of EmbeddedDocument #2202
 
 Changes in 0.23.1
 ===========
 - Bug fix: ignore LazyReferenceFields when clearing _changed_fields #2484
 - Improve connection doc #2481
-- Fix deepcopy on EmbeddedDocument
 
 Changes in 0.23.0
 =================
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 8aec85152..3b555cc69 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -377,7 +377,7 @@ class Person(Document):
         )
         assert doc.wallet._instance == doc
         copied_emb_doc = deepcopy(doc.wallet)
-        assert copied_emb_doc._instance == doc
+        assert copied_emb_doc._instance is None
 
         copied_map_emb_doc = deepcopy(doc.wallet_map)
-        assert copied_map_emb_doc["test"]._instance == doc
+        assert copied_map_emb_doc["test"]._instance is None

From 0af96b1323b9110890ea85755c1e7fdd1ec30934 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 7 Aug 2021 22:38:27 +0200
Subject: [PATCH 1211/1519] Add test for DecimalField(precision=0) and raise
 exception if negative/invalid values are provided

---
 AUTHORS                            |  1 +
 docs/changelog.rst                 |  1 +
 mongoengine/fields.py              | 10 ++++++++--
 tests/fields/test_decimal_field.py | 20 ++++++++++++++++++++
 4 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 64069d33a..a35fc5f18 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -261,3 +261,4 @@ that much better:
  * Felix Schultheiß (https://github.com/felix-smashdocs)
  * Jan Stein (https://github.com/janste63)
  * Timothé Perez (https://github.com/AchilleAsh)
+ * oleksandr-l5 (https://github.com/oleksandr-l5)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index be2c38c3d..5c3786034 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,7 @@ Development
 - (Fill this out as you fix issues and develop your features).
 - EnumField improvements: now `choices` limits the values of an enum to allow
 - Fix deepcopy of EmbeddedDocument #2202
+- Fix error when using precision=0 with DecimalField #2535
 
 Changes in 0.23.1
 ===========
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index be07ec888..25bf37efc 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -468,6 +468,10 @@ def __init__(
         self.min_value = min_value
         self.max_value = max_value
         self.force_string = force_string
+
+        if precision < 0 or not isinstance(precision, int):
+            self.error("precision must be a positive integer")
+
         self.precision = precision
         self.rounding = rounding
 
@@ -483,10 +487,12 @@ def to_python(self, value):
         except (TypeError, ValueError, decimal.InvalidOperation):
             return value
         if self.precision > 0:
-            return value.quantize(decimal.Decimal(".%s" % ("0" * self.precision)), rounding=self.rounding)
+            return value.quantize(
+                decimal.Decimal(".%s" % ("0" * self.precision)), rounding=self.rounding
+            )
         else:
             return value.quantize(decimal.Decimal(), rounding=self.rounding)
-        
+
     def to_mongo(self, value):
         if value is None:
             return value
diff --git a/tests/fields/test_decimal_field.py b/tests/fields/test_decimal_field.py
index 89a725a9e..6c2919712 100644
--- a/tests/fields/test_decimal_field.py
+++ b/tests/fields/test_decimal_field.py
@@ -118,3 +118,23 @@ class Person(Document):
         assert 2 == Person.objects(money__gt="7").count()
 
         assert 3 == Person.objects(money__gte="7").count()
+
+    def test_precision_0(self):
+        """prevent regression of a bug that was raising an exception when using precision=0"""
+
+        class TestDoc(Document):
+            d = DecimalField(precision=0)
+
+        TestDoc.drop_collection()
+
+        td = TestDoc(d=Decimal("12.00032678131263"))
+        assert td.d == Decimal("12")
+
+    def test_precision_negative_raise(self):
+        """prevent regression of a bug that was raising an exception when using precision=0"""
+        with pytest.raises(
+            ValidationError, match="precision must be a positive integer"
+        ):
+
+            class TestDoc(Document):
+                dneg = DecimalField(precision=-1)

From 17c68d7d05f206928b0b567d410b47feac127c21 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Fri, 13 Aug 2021 13:19:01 -0400
Subject: [PATCH 1212/1519] Add basic Docker setup

After cloning, simply:
```sh
docker-compose build
docker-compose run --rm mongoengine python setup.py test
```
---
 Dockerfile         |  9 +++++++++
 docker-compose.yml | 17 +++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..f15866d6c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM python:3.8-slim-buster AS build
+
+COPY requirements-dev.txt .
+RUN pip install --upgrade pip
+RUN pip install -r requirements-dev.txt
+RUN pip install "pymongo>=3.4,<4.0"
+
+WORKDIR /app
+COPY . ./
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..1a6fff298
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,17 @@
+version: '3.4'
+services:
+  mongoengine:
+    build:
+      context: .
+    image: mongoengine:latest
+    network_mode: host
+    depends_on:
+      - mongo
+    working_dir: /app
+    volumes:
+      - .:/app
+  mongo:
+    image: mongo:4
+    restart: always
+    ports:
+      - 27017:27017

From 639124c311ec92bdef534d4be4feb1cddbb45992 Mon Sep 17 00:00:00 2001
From: Yugesh kc <uges.kk@gmail.com>
Date: Mon, 16 Aug 2021 11:52:33 +0900
Subject: [PATCH 1213/1519] Minor typo error

Remove unwanted and
---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 7307b003e..cf2024a0f 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -239,7 +239,7 @@ Limiting and skipping results
 Just as with traditional ORMs, you may limit the number of results returned or
 skip a number or results in you query.
 :meth:`~mongoengine.queryset.QuerySet.limit` and
-:meth:`~mongoengine.queryset.QuerySet.skip` and methods are available on
+:meth:`~mongoengine.queryset.QuerySet.skip` methods are available on
 :class:`~mongoengine.queryset.QuerySet` objects, but the `array-slicing` syntax
 is preferred for achieving this::
 

From 1b249e336eb60a028b108595df83e01080d621ba Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 22 Aug 2021 22:01:05 +0200
Subject: [PATCH 1214/1519] improve list_indexes, ensure_indexes docstring and
 add index migration example

---
 docs/guide/defining-documents.rst |  4 +--
 docs/guide/migration.rst          | 41 +++++++++++++++++++++++++++++++
 mongoengine/document.py           | 10 ++++++--
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index eff59845c..186dd4a5d 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -628,8 +628,8 @@ point. To create a geospatial index you must prefix the field with the
             ],
         }
 
-Time To Live indexes
---------------------
+Time To Live (TTL) indexes
+--------------------------
 
 A special index type that allows you to automatically expire data from a
 collection after a given period. See the official
diff --git a/docs/guide/migration.rst b/docs/guide/migration.rst
index ae4bb7c8b..ed982efc3 100644
--- a/docs/guide/migration.rst
+++ b/docs/guide/migration.rst
@@ -223,6 +223,47 @@ it is often useful for complex migrations of Document models.
 
 .. warning:: Be aware of this `flaw <https://groups.google.com/g/mongodb-user/c/AFC1ia7MHzk>`_ if you modify documents while iterating
 
+Example 4: Index removal
+========================
+
+If you remove an index from your Document class, or remove an indexed Field from your Document class,
+you'll need to manually drop the corresponding index. MongoEngine will not do that for you.
+
+The way to deal with this case is to identify the name of the index to drop with `index_information()`, and then drop
+it with `drop_index()`
+
+Let's for instance assume that you start with the following Document class
+
+.. code-block:: python
+
+    class User(Document):
+        name = StringField(index=True)
+
+        meta = {"indexes": ["name"]}
+
+    User(name="John Doe").save()
+
+As soon as you start interacting with the Document collection (when `.save()` is called in this case),
+it would create the following indexes:
+
+.. code-block:: python
+
+    print(User._get_collection().index_information())
+    # {
+    #  '_id_': {'key': [('_id', 1)], 'v': 2},
+    #  'name_1': {'background': False, 'key': [('name', 1)], 'v': 2},
+    # }
+
+Thus: '_id' which is the default index and 'name_1' which is our custom index.
+If you would remove the 'name' field or its index, you would have to call:
+
+.. code-block:: python
+
+    User._get_collection().drop_index('name_1')
+
+.. note:: When adding new fields or new indexes, MongoEngine will take care of creating them
+    (unless `auto_create_index` is disabled) ::
+
 Recommendations
 ===============
 
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 5f05b4853..72e2818a5 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -875,6 +875,10 @@ def ensure_indexes(cls):
 
         Global defaults can be set in the meta - see :doc:`guide/defining-documents`
 
+        By default, this will get called automatically upon first interaction with the
+        Document collection (query, save, etc) so unless you disabled `auto_create_index`, you
+        shouldn't have to call this manually.
+
         .. note:: You can disable automatic index creation by setting
                   `auto_create_index` to False in the documents meta data
         """
@@ -924,8 +928,10 @@ def ensure_indexes(cls):
 
     @classmethod
     def list_indexes(cls):
-        """Lists all of the indexes that should be created for given
-        collection. It includes all the indexes from super- and sub-classes.
+        """Lists all indexes that should be created for the Document collection.
+        It includes all the indexes from super- and sub-classes.
+
+        Note that it will only return the indexes' fields, not the indexes' options
         """
         if cls._meta.get("abstract"):
             return []

From 019251d62abd437a24495cc21851ce1f7684e124 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 25 Aug 2021 14:37:54 -0400
Subject: [PATCH 1215/1519] Dockerize a mongo instance with a replSet of 1

---
 Dockerfile         | 12 ++++--------
 docker-compose.yml |  9 ---------
 entrypoint.sh      |  6 ++++++
 3 files changed, 10 insertions(+), 17 deletions(-)
 create mode 100644 entrypoint.sh

diff --git a/Dockerfile b/Dockerfile
index f15866d6c..529f8cb9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,5 @@
-FROM python:3.8-slim-buster AS build
+FROM mongo:4
 
-COPY requirements-dev.txt .
-RUN pip install --upgrade pip
-RUN pip install -r requirements-dev.txt
-RUN pip install "pymongo>=3.4,<4.0"
-
-WORKDIR /app
-COPY . ./
\ No newline at end of file
+COPY ./entrypoint.sh entrypoint.sh
+RUN chmod u+x entrypoint.sh
+ENTRYPOINT ./entrypoint.sh
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 1a6fff298..bb3a1e43f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,14 +4,5 @@ services:
     build:
       context: .
     image: mongoengine:latest
-    network_mode: host
-    depends_on:
-      - mongo
-    working_dir: /app
-    volumes:
-      - .:/app
-  mongo:
-    image: mongo:4
-    restart: always
     ports:
       - 27017:27017
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100644
index 000000000..1cb3698f5
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/bash
+
+mongod --replSet mongoengine --fork --logpath=/var/log/mongodb.log
+mongo db --eval "rs.initiate()"
+mongod --shutdown
+mongod --replSet mongoengine --bind_ip 0.0.0.0

From 3a597c4418089107192ea958621ae57d1d7a3416 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Mon, 30 Aug 2021 10:15:21 -0400
Subject: [PATCH 1216/1519] Pre-commit hooks

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 529f8cb9e..ca635498d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,4 +2,4 @@ FROM mongo:4
 
 COPY ./entrypoint.sh entrypoint.sh
 RUN chmod u+x entrypoint.sh
-ENTRYPOINT ./entrypoint.sh
\ No newline at end of file
+ENTRYPOINT ./entrypoint.sh

From 8428da368d87bdf23fba15775f0145a65dfa966f Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Tue, 31 Aug 2021 16:49:33 +0300
Subject: [PATCH 1217/1519] add update operator to documentation

---
 docs/guide/querying.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index cf2024a0f..e9e1de248 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -543,7 +543,10 @@ Documents may be updated atomically by using the
 There are several different "modifiers" that you may use with these methods:
 
 * ``set`` -- set a particular value
+* ``set_on_insert`` -- set only if this is new document  `need to add upsert=True`_
 * ``unset`` -- delete a particular value (since MongoDB v1.3)
+* ``max`` -- update only if value is bigger
+* ``min`` -- update only if value is smaller
 * ``inc`` -- increment a value by a given amount
 * ``dec`` -- decrement a value by a given amount
 * ``push`` -- append a value to a list
@@ -552,6 +555,7 @@ There are several different "modifiers" that you may use with these methods:
 * ``pull`` -- remove a value from a list
 * ``pull_all`` -- remove several values from a list
 * ``add_to_set`` -- add value to a list only if its not in the list already
+* ``rename`` -- rename the key name
 
 .. _depending on the value: http://docs.mongodb.org/manual/reference/operator/update/pop/
 

From 7e10bb2894787341f7d028b12cee1f004ecdbc51 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Wed, 1 Sep 2021 10:24:26 +0300
Subject: [PATCH 1218/1519] rename tester

---
 tests/queryset/test_queryset.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 1aa4f32a3..1a15a114f 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -867,6 +867,23 @@ def test_set_on_insert(self):
         assert "Bob" == bob.name
         assert 30 == bob.age
 
+    def test_rename(self):
+        self.Person.drop_collection()
+        self.Person.objects.create(name="Foo", age=11)
+
+        bob = self.Person.objects.as_pymongo().first()
+        assert 'age' in bob
+        assert bob['age'] == 11
+
+        self.Person.objects(name="Foo").update(
+            rename__age='person_age'
+        )
+
+        bob = self.Person.objects.as_pymongo().first()
+        assert 'age' not in bob
+        assert 'person_age' in bob
+        assert bob['person_age'] == 11
+
     def test_save_and_only_on_fields_with_default(self):
         class Embed(EmbeddedDocument):
             field = IntField()

From 6bc1b8369522123b7386dd1262fcbbfb474a633e Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Fri, 10 Sep 2021 16:28:06 +0300
Subject: [PATCH 1219/1519] add option to filter by free regex and option to
 search by whole word

---
 mongoengine/fields.py             | 11 ++++++++--
 mongoengine/queryset/transform.py |  4 ++++
 tests/queryset/test_queryset.py   | 36 ++++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 25bf37efc..fd8236a64 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -157,10 +157,17 @@ def prepare_query_value(self, op, value):
                 regex = r"%s$"
             elif op == "exact":
                 regex = r"^%s$"
+            elif op == "has_word":
+                regex = r"\b%s\b"
+            elif op == "regex":
+                regex = value
 
             # escape unsafe characters which could lead to a re.error
-            value = re.escape(value)
-            value = re.compile(regex % value, flags)
+            if op == 'regex':
+                value = re.compile(regex, flags)
+            else:
+                value = re.escape(value)
+                value = re.compile(regex % value, flags)
         return super().prepare_query_value(op, value)
 
 
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 4c3d051bf..375cceb42 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -51,6 +51,10 @@
     "iendswith",
     "exact",
     "iexact",
+    "regex",
+    "iregex",
+    "has_word",
+    "ihas_word",
 )
 CUSTOM_OPERATORS = ("match",)
 MATCH_OPERATORS = (
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 1a15a114f..cde7dc107 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -1257,6 +1257,35 @@ def test_regex_query_shortcuts(self):
         obj = self.Person.objects(name__iexact="gUIDO VAN rOSSU").first()
         assert obj is None
 
+
+        # Test has_word
+        obj = self.Person.objects(name__has_word="Guido").first()
+        assert obj == person
+        obj = self.Person.objects(name__has_word="rossum").first()
+        assert obj is None
+        obj = self.Person.objects(name__has_word="Rossu").first()
+        assert obj is None
+
+        # Test ihas_word
+        obj = self.Person.objects(name__ihas_word="rOSSUM").first()
+        assert obj == person
+        obj = self.Person.objects(name__ihas_word="rOSSU").first()
+        assert obj is None
+
+        # Test regex
+        obj = self.Person.objects(name__regex="^[Guido].*[Rossum]$").first()
+        assert obj == person
+        obj = self.Person.objects(name__regex="^[guido].*[rossum]$").first()
+        assert obj is None
+        obj = self.Person.objects(name__regex="^[uido].*[Rossum]$").first()
+        assert obj is None
+
+        # Test iregex
+        obj = self.Person.objects(name__iregex="^[guido].*[rossum]$").first()
+        assert obj == person
+        obj = self.Person.objects(name__iregex="^[Uido].*[Rossum]$").first()
+        assert obj is None
+
         # Test unsafe expressions
         person = self.Person(name="Guido van Rossum [.'Geek']")
         person.save()
@@ -1341,7 +1370,12 @@ def test_filter_chaining_with_regex(self):
         person.save()
 
         people = self.Person.objects
-        people = people.filter(name__startswith="Gui").filter(name__not__endswith="tum")
+        people = people.filter(name__startswith="Gui")\
+            .filter(name__not__endswith="tum")\
+            .filter(name__icontains="VAN")\
+            .filter(name__regex="^Guido")\
+            .filter(name__has_word="Guido")\
+            .filter(name__has_word="van")
         assert people.count() == 1
 
     def assertSequence(self, qs, expected):

From 3d6b6505928e87fd351facdba2622235e1093a95 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Sun, 12 Sep 2021 18:21:01 +0300
Subject: [PATCH 1220/1519] add doc change has_word ==> wholeword

---
 docs/guide/querying.rst           |  4 ++++
 mongoengine/fields.py             | 11 ++---------
 mongoengine/queryset/transform.py |  4 ++--
 tests/queryset/test_queryset.py   | 18 +++++++++---------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index e9e1de248..1cf5ec3c6 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -86,6 +86,10 @@ expressions:
 * ``istartswith`` -- string field starts with value (case insensitive)
 * ``endswith`` -- string field ends with value
 * ``iendswith`` -- string field ends with value (case insensitive)
+* ``wholeword`` -- string field contains whole word
+* ``iwholeword`` -- string field contains whole word (case insensitive)
+* ``regex`` -- string field match by regex
+* ``iregex`` -- string field match by regex (case insensitive)
 * ``match``  -- performs an $elemMatch so you can match an entire document within an array
 
 
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index fd8236a64..11c32f84c 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -157,7 +157,7 @@ def prepare_query_value(self, op, value):
                 regex = r"%s$"
             elif op == "exact":
                 regex = r"^%s$"
-            elif op == "has_word":
+            elif op == "wholeword":
                 regex = r"\b%s\b"
             elif op == "regex":
                 regex = value
@@ -1094,14 +1094,7 @@ def lookup_member(self, member_name):
 
     def prepare_query_value(self, op, value):
         match_operators = [
-            "contains",
-            "icontains",
-            "startswith",
-            "istartswith",
-            "endswith",
-            "iendswith",
-            "exact",
-            "iexact",
+            *STRING_OPERATORS
         ]
 
         if op in match_operators and isinstance(value, str):
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 375cceb42..cea2ef4c5 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -53,8 +53,8 @@
     "iexact",
     "regex",
     "iregex",
-    "has_word",
-    "ihas_word",
+    "wholeword",
+    "iwholeword",
 )
 CUSTOM_OPERATORS = ("match",)
 MATCH_OPERATORS = (
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index cde7dc107..859c4cb56 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -1258,18 +1258,18 @@ def test_regex_query_shortcuts(self):
         assert obj is None
 
 
-        # Test has_word
-        obj = self.Person.objects(name__has_word="Guido").first()
+        # Test wholeword
+        obj = self.Person.objects(name__wholeword="Guido").first()
         assert obj == person
-        obj = self.Person.objects(name__has_word="rossum").first()
+        obj = self.Person.objects(name__wholeword="rossum").first()
         assert obj is None
-        obj = self.Person.objects(name__has_word="Rossu").first()
+        obj = self.Person.objects(name__wholeword="Rossu").first()
         assert obj is None
 
-        # Test ihas_word
-        obj = self.Person.objects(name__ihas_word="rOSSUM").first()
+        # Test iwholeword
+        obj = self.Person.objects(name__iwholeword="rOSSUM").first()
         assert obj == person
-        obj = self.Person.objects(name__ihas_word="rOSSU").first()
+        obj = self.Person.objects(name__iwholeword="rOSSU").first()
         assert obj is None
 
         # Test regex
@@ -1374,8 +1374,8 @@ def test_filter_chaining_with_regex(self):
             .filter(name__not__endswith="tum")\
             .filter(name__icontains="VAN")\
             .filter(name__regex="^Guido")\
-            .filter(name__has_word="Guido")\
-            .filter(name__has_word="van")
+            .filter(name__wholeword="Guido")\
+            .filter(name__wholeword="van")
         assert people.count() == 1
 
     def assertSequence(self, qs, expected):

From 85b0c1c945be672eac9dd84de9acffe8af5a783a Mon Sep 17 00:00:00 2001
From: idoshr <35264146+idoshr@users.noreply.github.com>
Date: Mon, 20 Sep 2021 22:36:13 +0300
Subject: [PATCH 1221/1519] Update AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index a35fc5f18..60663940a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -262,3 +262,4 @@ that much better:
  * Jan Stein (https://github.com/janste63)
  * Timothé Perez (https://github.com/AchilleAsh)
  * oleksandr-l5 (https://github.com/oleksandr-l5)
+ * Ido Shraga (https://github.com/idoshr)

From 7001f1a66b9664b553d42a53630eb22803d4f948 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Mon, 30 Aug 2021 11:29:08 -0400
Subject: [PATCH 1222/1519] Sketch of transaction context manager

Still lots of questions...
---
 mongoengine/connection.py       | 14 ++++++++++++++
 mongoengine/context_managers.py | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index e9078a2e7..9d34a3a8d 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -22,6 +22,7 @@
 _connection_settings = {}
 _connections = {}
 _dbs = {}
+_sessions = {}
 
 READ_PREFERENCE = ReadPreference.PRIMARY
 
@@ -234,6 +235,9 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
     if alias in _connection_settings:
         del _connection_settings[alias]
 
+    if alias in _sessions:
+        del _sessions[alias]
+
 
 def disconnect_all():
     """Close all registered database."""
@@ -398,6 +402,16 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
     return get_connection(alias)
 
 
+def _set_session(session, alias=DEFAULT_CONNECTION_NAME):
+    global _sessions
+    _sessions[alias] = session
+
+
+def _get_session(alias=DEFAULT_CONNECTION_NAME):
+    global _sessions
+    return _sessions.get(alias)
+
+
 # Support old naming convention
 _get_connection = get_connection
 _get_db = get_db
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 0ca2622c5..80584a258 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -4,7 +4,12 @@
 from pymongo.write_concern import WriteConcern
 
 from mongoengine.common import _import_class
-from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
+from mongoengine.connection import (
+    DEFAULT_CONNECTION_NAME,
+    _set_session,
+    get_connection,
+    get_db,
+)
 from mongoengine.pymongo_support import count_documents
 
 __all__ = (
@@ -289,3 +294,29 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
         write_concern=WriteConcern(**combined_write_concerns),
         read_concern=ReadConcern(**combined_read_concerns),
     )
+
+
+@contextmanager
+def run_in_transaction(alias=DEFAULT_CONNECTION_NAME):
+    """
+    TODO: A session for a transaction begins with a client connection and can span DBs within that connection.
+
+    What should be done if a session/transaction uses a  document bound to a different connection? Should we do
+    anything?
+
+    When I say "connection" I don't just mean a different alias - I mean a completely different host. The way
+    I understand mongoengine's code to function is that I could have multiple aliases binding to the same host.
+
+    pymongo ClientSession provides access to the pymongo Client, which could be used to compare against the
+    mongoengine connection aka pymongo Client instance.
+
+    Might require some hoops to jump through, but would provide users of this a "fail fast" option to prevent
+    themselves from assuming cross connection transactions are a thing. That said, the docs are pretty clear
+    about "a session  may only be used with the MongoClient that started it."
+    """
+
+    conn = get_connection(alias)
+    with conn.start_session() as session:
+        _set_session(session, alias)
+        yield
+        _set_session(None, alias)

From 04e2f1aadd763d7766208481dba299455441a19d Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Tue, 31 Aug 2021 12:49:35 -0400
Subject: [PATCH 1223/1519] Scaffold session management for transactions

---
 mongoengine/connection.py       | 22 +++++++++++++---------
 mongoengine/context_managers.py | 25 +++++--------------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 9d34a3a8d..83b560efc 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -22,7 +22,7 @@
 _connection_settings = {}
 _connections = {}
 _dbs = {}
-_sessions = {}
+_session = None
 
 READ_PREFERENCE = ReadPreference.PRIMARY
 
@@ -235,8 +235,7 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
     if alias in _connection_settings:
         del _connection_settings[alias]
 
-    if alias in _sessions:
-        del _sessions[alias]
+    _clear_session()
 
 
 def disconnect_all():
@@ -402,14 +401,19 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
     return get_connection(alias)
 
 
-def _set_session(session, alias=DEFAULT_CONNECTION_NAME):
-    global _sessions
-    _sessions[alias] = session
+def _set_session(session):
+    global _session
+    _session = session
 
 
-def _get_session(alias=DEFAULT_CONNECTION_NAME):
-    global _sessions
-    return _sessions.get(alias)
+def _get_session():
+    global _session
+    return _session
+
+
+def _clear_session():
+    global _session
+    _session = None
 
 
 # Support old naming convention
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 80584a258..f3cacab35 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -6,6 +6,7 @@
 from mongoengine.common import _import_class
 from mongoengine.connection import (
     DEFAULT_CONNECTION_NAME,
+    _clear_session,
     _set_session,
     get_connection,
     get_db,
@@ -298,25 +299,9 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
 
 @contextmanager
 def run_in_transaction(alias=DEFAULT_CONNECTION_NAME):
-    """
-    TODO: A session for a transaction begins with a client connection and can span DBs within that connection.
-
-    What should be done if a session/transaction uses a  document bound to a different connection? Should we do
-    anything?
-
-    When I say "connection" I don't just mean a different alias - I mean a completely different host. The way
-    I understand mongoengine's code to function is that I could have multiple aliases binding to the same host.
-
-    pymongo ClientSession provides access to the pymongo Client, which could be used to compare against the
-    mongoengine connection aka pymongo Client instance.
-
-    Might require some hoops to jump through, but would provide users of this a "fail fast" option to prevent
-    themselves from assuming cross connection transactions are a thing. That said, the docs are pretty clear
-    about "a session  may only be used with the MongoClient that started it."
-    """
-
     conn = get_connection(alias)
     with conn.start_session() as session:
-        _set_session(session, alias)
-        yield
-        _set_session(None, alias)
+        with session.start_transaction():
+            _set_session(session)
+            yield
+            _clear_session()

From 5ccd144b5107611cfbb2d6ab827c826c4ab842b0 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 1 Sep 2021 16:12:10 -0400
Subject: [PATCH 1224/1519] Using a global session var within mongoengine for
 transactions

* Maintain state of session when entering and exiting transaction
* Update any collection methods used in mongoengine that accept session
* Update any database methods used in mongoengine that accept session
* Cascades should be accounted for as those methods are wrappers which call the
  same low-level pymongo colletion APIs updated above
* Any signals that try to read or write should also be wrapped in the
  transaction
---
 mongoengine/context_managers.py |  9 +++--
 mongoengine/dereference.py      |  8 ++--
 mongoengine/document.py         | 38 +++++++++++++------
 mongoengine/fields.py           | 30 +++++++++------
 mongoengine/pymongo_support.py  |  8 +++-
 mongoengine/queryset/base.py    | 65 ++++++++++++++++++++-------------
 6 files changed, 101 insertions(+), 57 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index f3cacab35..e98c0420a 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -7,6 +7,7 @@
 from mongoengine.connection import (
     DEFAULT_CONNECTION_NAME,
     _clear_session,
+    _get_session,
     _set_session,
     get_connection,
     get_db,
@@ -216,10 +217,10 @@ def __init__(self, alias=DEFAULT_CONNECTION_NAME):
         }
 
     def _turn_on_profiling(self):
-        self.initial_profiling_level = self.db.profiling_level()
-        self.db.set_profiling_level(0)
-        self.db.system.profile.drop()
-        self.db.set_profiling_level(2)
+        self.initial_profiling_level = self.db.profiling_level(session=_get_session())
+        self.db.set_profiling_level(0, session=_get_session())
+        self.db.system.profile.drop(session=_get_session())
+        self.db.set_profiling_level(2, session=_get_session())
 
     def _resets_profiling(self):
         self.db.set_profiling_level(self.initial_profiling_level)
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index f388fe069..ed059c8d6 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -8,7 +8,7 @@
     get_document,
 )
 from mongoengine.base.datastructures import LazyReference
-from mongoengine.connection import get_db
+from mongoengine.connection import _get_session, get_db
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.fields import (
     DictField,
@@ -188,13 +188,15 @@ def _fetch_objects(self, doc_type=None):
 
                 if doc_type:
                     references = doc_type._get_db()[collection].find(
-                        {"_id": {"$in": refs}}
+                        {"_id": {"$in": refs}}, session=_get_session()
                     )
                     for ref in references:
                         doc = doc_type._from_son(ref)
                         object_map[(collection, doc.id)] = doc
                 else:
-                    references = get_db()[collection].find({"_id": {"$in": refs}})
+                    references = get_db()[collection].find(
+                        {"_id": {"$in": refs}}, session=_get_session()
+                    )
                     for ref in references:
                         if "_cls" in ref:
                             doc = get_document(ref["_cls"])._from_son(ref)
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 72e2818a5..70a474590 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -15,7 +15,11 @@
     get_document,
 )
 from mongoengine.common import _import_class
-from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
+from mongoengine.connection import (
+    DEFAULT_CONNECTION_NAME,
+    _get_session,
+    get_db,
+)
 from mongoengine.context_managers import (
     set_write_concern,
     switch_collection,
@@ -270,7 +274,7 @@ def _get_capped_collection(cls):
         if max_documents:
             opts["max"] = max_documents
 
-        return db.create_collection(collection_name, **opts)
+        return db.create_collection(collection_name, session=_get_session(), **opts)
 
     def to_mongo(self, *args, **kwargs):
         data = super().to_mongo(*args, **kwargs)
@@ -468,17 +472,21 @@ def _save_create(self, doc, force_insert, write_concern):
         collection = self._get_collection()
         with set_write_concern(collection, write_concern) as wc_collection:
             if force_insert:
-                return wc_collection.insert_one(doc).inserted_id
+                return wc_collection.insert_one(doc, session=_get_session()).inserted_id
             # insert_one will provoke UniqueError alongside save does not
             # therefore, it need to catch and call replace_one.
             if "_id" in doc:
                 select_dict = {"_id": doc["_id"]}
                 select_dict = self._integrate_shard_key(doc, select_dict)
-                raw_object = wc_collection.find_one_and_replace(select_dict, doc)
+                raw_object = wc_collection.find_one_and_replace(
+                    select_dict, doc, session=_get_session()
+                )
                 if raw_object:
                     return doc["_id"]
 
-            object_id = wc_collection.insert_one(doc).inserted_id
+            object_id = wc_collection.insert_one(
+                doc, session=_get_session()
+            ).inserted_id
 
         return object_id
 
@@ -536,7 +544,7 @@ def _save_update(self, doc, save_condition, write_concern):
             upsert = save_condition is None
             with set_write_concern(collection, write_concern) as wc_collection:
                 last_error = wc_collection.update_one(
-                    select_dict, update_doc, upsert=upsert
+                    select_dict, update_doc, upsert=upsert, session=_get_session()
                 ).raw_result
             if not upsert and last_error["n"] == 0:
                 raise SaveConditionError(
@@ -838,7 +846,7 @@ def drop_collection(cls):
             )
         cls._collection = None
         db = cls._get_db()
-        db.drop_collection(coll_name)
+        db.drop_collection(coll_name, session=_get_session())
 
     @classmethod
     def create_index(cls, keys, background=False, **kwargs):
@@ -855,7 +863,9 @@ def create_index(cls, keys, background=False, **kwargs):
         index_spec["background"] = background
         index_spec.update(kwargs)
 
-        return cls._get_collection().create_index(fields, **index_spec)
+        return cls._get_collection().create_index(
+            fields, session=_get_session(), **index_spec
+        )
 
     @classmethod
     def ensure_index(cls, key_or_list, background=False, **kwargs):
@@ -913,7 +923,9 @@ def ensure_indexes(cls):
                 if "cls" in opts:
                     del opts["cls"]
 
-                collection.create_index(fields, background=background, **opts)
+                collection.create_index(
+                    fields, background=background, session=_get_session(), **opts
+                )
 
         # If _cls is being used (for polymorphism), it needs an index,
         # only if another index doesn't begin with _cls
@@ -924,7 +936,9 @@ def ensure_indexes(cls):
             if "cls" in index_opts:
                 del index_opts["cls"]
 
-            collection.create_index("_cls", background=background, **index_opts)
+            collection.create_index(
+                "_cls", background=background, session=_get_session(), **index_opts
+            )
 
     @classmethod
     def list_indexes(cls):
@@ -1002,7 +1016,9 @@ def compare_indexes(cls):
         required = cls.list_indexes()
 
         existing = []
-        for info in cls._get_collection().index_information().values():
+        for info in (
+            cls._get_collection().index_information(session=_get_session()).values()
+        ):
             if "_fts" in info["key"][0]:
                 index_type = info["key"][0][1]
                 text_index_fields = info.get("weights").keys()
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 25bf37efc..392f2cecf 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -33,7 +33,11 @@
 )
 from mongoengine.base.utils import LazyRegexCompiler
 from mongoengine.common import _import_class
-from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
+from mongoengine.connection import (
+    DEFAULT_CONNECTION_NAME,
+    _get_session,
+    get_db,
+)
 from mongoengine.document import Document, EmbeddedDocument
 from mongoengine.errors import (
     DoesNotExist,
@@ -903,7 +907,9 @@ def to_python(self, value):
         if isinstance(value, dict) and "_cls" in value:
             doc_cls = get_document(value["_cls"])
             if "_ref" in value:
-                value = doc_cls._get_db().dereference(value["_ref"])
+                value = doc_cls._get_db().dereference(
+                    value["_ref"], session=_get_session()
+                )
             return doc_cls._from_son(value)
 
         return super().to_python(value)
@@ -1206,7 +1212,7 @@ def document_type(self):
 
     @staticmethod
     def _lazy_load_ref(ref_cls, dbref):
-        dereferenced_son = ref_cls._get_db().dereference(dbref)
+        dereferenced_son = ref_cls._get_db().dereference(dbref, session=_get_session())
         if dereferenced_son is None:
             raise DoesNotExist(f"Trying to dereference unknown document {dbref}")
 
@@ -1354,7 +1360,7 @@ def to_python(self, value):
             collection = self.document_type._get_collection_name()
             value = DBRef(collection, self.document_type.id.to_python(value["_id"]))
             return self.document_type._from_son(
-                self.document_type._get_db().dereference(value)
+                self.document_type._get_db().dereference(value, session=_get_session())
             )
 
         return value
@@ -1370,7 +1376,7 @@ def document_type(self):
 
     @staticmethod
     def _lazy_load_ref(ref_cls, dbref):
-        dereferenced_son = ref_cls._get_db().dereference(dbref)
+        dereferenced_son = ref_cls._get_db().dereference(dbref, session=_get_session())
         if dereferenced_son is None:
             raise DoesNotExist(f"Trying to dereference unknown document {dbref}")
 
@@ -1514,7 +1520,7 @@ def _validate_choices(self, value):
 
     @staticmethod
     def _lazy_load_ref(ref_cls, dbref):
-        dereferenced_son = ref_cls._get_db().dereference(dbref)
+        dereferenced_son = ref_cls._get_db().dereference(dbref, session=_get_session())
         if dereferenced_son is None:
             raise DoesNotExist(f"Trying to dereference unknown document {dbref}")
 
@@ -1780,7 +1786,7 @@ def get(self, grid_id=None):
 
         try:
             if self.gridout is None:
-                self.gridout = self.fs.get(self.grid_id)
+                self.gridout = self.fs.get(self.grid_id, session=_get_session())
             return self.gridout
         except Exception:
             # File has been deleted
@@ -1829,7 +1835,7 @@ def read(self, size=-1):
 
     def delete(self):
         # Delete file from GridFS, FileField still remains
-        self.fs.delete(self.grid_id)
+        self.fs.delete(self.grid_id, session=_get_session())
         self.grid_id = None
         self.gridout = None
         self._mark_as_changed()
@@ -2005,7 +2011,7 @@ def delete(self, *args, **kwargs):
         # deletes thumbnail
         out = self.get()
         if out and out.thumbnail_id:
-            self.fs.delete(out.thumbnail_id)
+            self.fs.delete(out.thumbnail_id, session=_get_session())
 
         return super().delete()
 
@@ -2045,7 +2051,7 @@ def thumbnail(self):
         """
         out = self.get()
         if out and out.thumbnail_id:
-            return self.fs.get(out.thumbnail_id)
+            return self.fs.get(out.thumbnail_id, session=_get_session())
 
     def write(self, *args, **kwargs):
         raise RuntimeError('Please use "put" method instead')
@@ -2148,6 +2154,7 @@ def generate(self):
             update={"$inc": {"next": 1}},
             return_document=ReturnDocument.AFTER,
             upsert=True,
+            session=_get_session(),
         )
         return self.value_decorator(counter["next"])
 
@@ -2161,6 +2168,7 @@ def set_next_value(self, value):
             update={"$set": {"next": value}},
             return_document=ReturnDocument.AFTER,
             upsert=True,
+            session=_get_session(),
         )
         return self.value_decorator(counter["next"])
 
@@ -2173,7 +2181,7 @@ def get_next_value(self):
         sequence_name = self.get_sequence_name()
         sequence_id = f"{sequence_name}.{self.name}"
         collection = get_db(alias=self.db_alias)[self.collection_name]
-        data = collection.find_one({"_id": sequence_id})
+        data = collection.find_one({"_id": sequence_id}, session=_get_session())
 
         if data:
             return self.value_decorator(data["next"] + 1)
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index dc7aaa6bc..fd215813d 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -4,6 +4,8 @@
 import pymongo
 from pymongo.errors import OperationFailure
 
+from mongoengine.connection import _get_session
+
 _PYMONGO_37 = (3, 7)
 
 PYMONGO_VERSION = tuple(pymongo.version_tuple[:2])
@@ -31,7 +33,9 @@ def count_documents(
     # count_documents appeared in pymongo 3.7
     if IS_PYMONGO_GTE_37:
         try:
-            return collection.count_documents(filter=filter, **kwargs)
+            return collection.count_documents(
+                filter=filter, session=_get_session(), **kwargs
+            )
         except OperationFailure:
             # OperationFailure - accounts for some operators that used to work
             # with .count but are no longer working with count_documents (i.e $geoNear, $near, and $nearSphere)
@@ -50,7 +54,7 @@ def count_documents(
 def list_collection_names(db, include_system_collections=False):
     """Pymongo>3.7 deprecates collection_names in favour of list_collection_names"""
     if IS_PYMONGO_GTE_37:
-        collections = db.list_collection_names()
+        collections = db.list_collection_names(session=_get_session())
     else:
         collections = db.collection_names()
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5dc47e001..5eabf7851 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -15,7 +15,7 @@
 from mongoengine import signals
 from mongoengine.base import get_document
 from mongoengine.common import _import_class
-from mongoengine.connection import get_db
+from mongoengine.connection import _get_session, get_db
 from mongoengine.context_managers import (
     set_read_write_concern,
     set_write_concern,
@@ -346,7 +346,7 @@ def insert(
                 insert_func = collection.insert_one
 
         try:
-            inserted_result = insert_func(raw)
+            inserted_result = insert_func(raw, session=_get_session())
             ids = (
                 [inserted_result.inserted_id]
                 if return_one
@@ -509,7 +509,7 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                 )
 
         with set_write_concern(queryset._collection, write_concern) as collection:
-            result = collection.delete_many(queryset._query)
+            result = collection.delete_many(queryset._query, session=_get_session())
 
             # If we're using an unack'd write concern, we don't really know how
             # many items have been deleted at this point, hence we only return
@@ -567,7 +567,9 @@ def update(
                 update_func = collection.update_one
                 if multi:
                     update_func = collection.update_many
-                result = update_func(query, update, upsert=upsert)
+                result = update_func(
+                    query, update, upsert=upsert, session=_get_session()
+                )
             if full_result:
                 return result
             elif result.raw_result:
@@ -677,7 +679,7 @@ def modify(
                 warnings.warn(msg, DeprecationWarning)
             if remove:
                 result = queryset._collection.find_one_and_delete(
-                    query, sort=sort, **self._cursor_args
+                    query, sort=sort, session=_get_session(), **self._cursor_args
                 )
             else:
                 if new:
@@ -690,6 +692,7 @@ def modify(
                     upsert=upsert,
                     sort=sort,
                     return_document=return_doc,
+                    session=_get_session(),
                     **self._cursor_args,
                 )
         except pymongo.errors.DuplicateKeyError as err:
@@ -728,7 +731,9 @@ def in_bulk(self, object_ids):
         """
         doc_map = {}
 
-        docs = self._collection.find({"_id": {"$in": object_ids}}, **self._cursor_args)
+        docs = self._collection.find(
+            {"_id": {"$in": object_ids}}, session=_get_session(), **self._cursor_args
+        )
         if self._scalar:
             for doc in docs:
                 doc_map[doc["_id"]] = self._get_scalar(self._document._from_son(doc))
@@ -1312,7 +1317,9 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
                 read_preference=self._read_preference, read_concern=self._read_concern
             )
 
-        return collection.aggregate(final_pipeline, cursor={}, **kwargs)
+        return collection.aggregate(
+            final_pipeline, cursor={}, session=_get_session(), **kwargs
+        )
 
     # JS functionality
     def map_reduce(
@@ -1418,7 +1425,7 @@ def map_reduce(
                 mr_args["out"] = SON(ordered_output)
 
         results = getattr(queryset._collection, map_reduce_function)(
-            map_f, reduce_f, **mr_args
+            map_f, reduce_f, session=_get_session(), **mr_args
         )
 
         if map_reduce_function == "map_reduce":
@@ -1507,7 +1514,9 @@ def sum(self, field):
         if isinstance(field_instances[-1], ListField):
             pipeline.insert(1, {"$unwind": "$" + field})
 
-        result = tuple(self._document._get_collection().aggregate(pipeline))
+        result = tuple(
+            self._document._get_collection().aggregate(pipeline, session=_get_session())
+        )
 
         if result:
             return result[0]["total"]
@@ -1534,7 +1543,9 @@ def average(self, field):
         if isinstance(field_instances[-1], ListField):
             pipeline.insert(1, {"$unwind": "$" + field})
 
-        result = tuple(self._document._get_collection().aggregate(pipeline))
+        result = tuple(
+            self._document._get_collection().aggregate(pipeline, session=_get_session())
+        )
         if result:
             return result[0]["total"]
         return 0
@@ -1640,9 +1651,11 @@ def _cursor(self):
         if self._read_preference is not None or self._read_concern is not None:
             self._cursor_obj = self._collection.with_options(
                 read_preference=self._read_preference, read_concern=self._read_concern
-            ).find(self._query, **self._cursor_args)
+            ).find(self._query, session=_get_session(), **self._cursor_args)
         else:
-            self._cursor_obj = self._collection.find(self._query, **self._cursor_args)
+            self._cursor_obj = self._collection.find(
+                self._query, session=_get_session(), **self._cursor_args
+            )
 
         # Apply "where" clauses to cursor
         if self._where_clause:
@@ -1715,29 +1728,29 @@ def no_dereference(self):
 
     def _item_frequencies_map_reduce(self, field, normalize=False):
         map_func = """
-            function() {
-                var path = '{{~%(field)s}}'.split('.');
+            function() {{
+                var path = '{{{{~{field}}}}}'.split('.');
                 var field = this;
 
-                for (p in path) {
+                for (p in path) {{
                     if (typeof field != 'undefined')
                        field = field[path[p]];
                     else
                        break;
-                }
-                if (field && field.constructor == Array) {
-                    field.forEach(function(item) {
+                }}
+                if (field && field.constructor == Array) {{
+                    field.forEach(function(item) {{
                         emit(item, 1);
-                    });
-                } else if (typeof field != 'undefined') {
+                    }});
+                }} else if (typeof field != 'undefined') {{
                     emit(field, 1);
-                } else {
+                }} else {{
                     emit(null, 1);
-                }
-            }
-        """ % {
-            "field": field
-        }
+                }}
+            }}
+        """.format(
+            field=field
+        )
         reduce_func = """
             function(key, values) {
                 var total = 0;

From a77c88c71280bc5d2d0d487eab846b98653e75f5 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 1 Sep 2021 16:49:10 -0400
Subject: [PATCH 1225/1519] Add unit tests for transaction context manager

---
 mongoengine/context_managers.py |  9 ++++++---
 tests/test_context_managers.py  | 29 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index e98c0420a..42c4ab543 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -20,6 +20,7 @@
     "no_dereference",
     "no_sub_classes",
     "query_counter",
+    "run_in_transaction",
     "set_write_concern",
     "set_read_write_concern",
 )
@@ -303,6 +304,8 @@ def run_in_transaction(alias=DEFAULT_CONNECTION_NAME):
     conn = get_connection(alias)
     with conn.start_session() as session:
         with session.start_transaction():
-            _set_session(session)
-            yield
-            _clear_session()
+            try:
+                _set_session(session)
+                yield
+            finally:
+                _clear_session()
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 4ea7fa5ab..07f4a04e0 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -8,6 +8,7 @@
     no_dereference,
     no_sub_classes,
     query_counter,
+    run_in_transaction,
     set_read_write_concern,
     set_write_concern,
     switch_collection,
@@ -412,6 +413,34 @@ def test_query_counter_ignores_particular_queries(self):
             )  # queries on db.system.indexes are ignored as well
             assert q == 1
 
+    def test_updating_a_document_within_a_transaction_succeeds(self):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        a_doc = A.objects.create(name="a")
+
+        with run_in_transaction():
+            a_doc.update(name="b")
+        assert "b" == A.objects.get(id=a_doc.id).name
+
+    def test_an_exception_raised_in_a_transaction_rolls_back_updates(self):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        a_doc = A.objects.create(name="a")
+
+        try:
+            with run_in_transaction():
+                a_doc.update(name="b")
+                raise Exception("Exception")
+        except Exception:
+            pass
+        assert "a" == A.objects.get(id=a_doc.id).name
+
 
 if __name__ == "__main__":
     unittest.main()

From bc8f4094a1a5af689dfa47a7fa5d5c8aac182443 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Sun, 5 Sep 2021 11:48:33 -0400
Subject: [PATCH 1226/1519] Add test cases for cross database transactions

---
 tests/test_context_managers.py | 69 ++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 3 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 07f4a04e0..a9f1f113f 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -419,27 +419,90 @@ def test_updating_a_document_within_a_transaction_succeeds(self):
         class A(Document):
             name = StringField()
 
+        A.drop_collection()
+
         a_doc = A.objects.create(name="a")
 
         with run_in_transaction():
             a_doc.update(name="b")
         assert "b" == A.objects.get(id=a_doc.id).name
 
-    def test_an_exception_raised_in_a_transaction_rolls_back_updates(self):
+    def test_transaction_updates_across_databases_succeeds(self):
+        connect("mongoenginetest")
+        connect("test2", "test2")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            meta = {"db_alias": "test2"}
+            name = StringField()
+
+        B.drop_collection()
+
+        b_doc = B.objects.create(name="b")
+
+        with run_in_transaction():
+            a_doc.update(name="a2")
+            b_doc.update(name="b2")
+
+        assert "a2" == A.objects.get(id=a_doc.id).name
+        assert "b2" == B.objects.get(id=b_doc.id).name
+
+        with run_in_transaction():
+            a_doc.update(name="a3")
+            with switch_db(A, "test2"):
+                a_doc.update(name="a4", upsert=True)
+                b_doc.update(name="b3")
+            b_doc.update(name="b4")
+
+        assert "a3" == A.objects.get(id=a_doc.id).name
+        assert "b4" == B.objects.get(id=b_doc.id).name
+        with switch_db(A, "test2"):
+            assert "a4" == A.objects.get(id=a_doc.id).name
+
+    def test_an_exception_raised_in_transactions_across_databases_rolls_back_updates(
+        self,
+    ):
         connect("mongoenginetest")
+        connect("test2", "test2")
 
         class A(Document):
             name = StringField()
 
+        A.drop_collection()
+        with switch_db(A, "test2"):
+            A.drop_collection()
+
         a_doc = A.objects.create(name="a")
 
+        class B(Document):
+            meta = {"db_alias": "test2"}
+            name = StringField()
+
+        B.drop_collection()
+
+        b_doc = B.objects.create(name="b")
+
         try:
             with run_in_transaction():
-                a_doc.update(name="b")
-                raise Exception("Exception")
+                a_doc.update(name="a3")
+                with switch_db(A, "test2"):
+                    a_doc.update(name="a4", upsert=True)
+                    b_doc.update(name="b3")
+                    b_doc.update(name="b4")
+                raise Exception
         except Exception:
             pass
+
         assert "a" == A.objects.get(id=a_doc.id).name
+        assert "b" == B.objects.get(id=b_doc.id).name
+        with switch_db(A, "test2"):
+            assert 0 == A.objects.all().count()
 
 
 if __name__ == "__main__":

From 09f09da9a730460d179d049fc3896e5418e78ed4 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Thu, 30 Sep 2021 08:22:09 -0400
Subject: [PATCH 1227/1519] Initialize mongo replica set in github workflow

---
 .github/workflows/start_mongo.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
index 800004c87..8bf8ca8fb 100644
--- a/.github/workflows/start_mongo.sh
+++ b/.github/workflows/start_mongo.sh
@@ -5,5 +5,6 @@ MONGODB=$1
 mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
 
 mkdir $mongodb_dir/data
-$mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork
+$mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork --replSet mongoengine
 mongo --eval 'db.version();'    # Make sure mongo is awake
+mongo --eval "rs.initiate()"

From cb0035f87a7b0e609a127e28622084053f576828 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 30 Sep 2021 20:25:26 +0200
Subject: [PATCH 1228/1519] minor typo fix in docstring

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5dc47e001..254e0fbfc 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -720,7 +720,7 @@ def with_id(self, object_id):
         return queryset.filter(pk=object_id).first()
 
     def in_bulk(self, object_ids):
-        """ "Retrieve a set of documents by their ids.
+        """Retrieve a set of documents by their ids.
 
         :param object_ids: a list or tuple of ObjectId's
         :rtype: dict of ObjectId's as keys and collection-specific

From 28226f81a850966f270827016e8ab77fe9fe2112 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 30 Sep 2021 20:39:44 +0200
Subject: [PATCH 1229/1519] black it

---
 tests/queryset/test_queryset.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 1a15a114f..5add07506 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -872,17 +872,15 @@ def test_rename(self):
         self.Person.objects.create(name="Foo", age=11)
 
         bob = self.Person.objects.as_pymongo().first()
-        assert 'age' in bob
-        assert bob['age'] == 11
+        assert "age" in bob
+        assert bob["age"] == 11
 
-        self.Person.objects(name="Foo").update(
-            rename__age='person_age'
-        )
+        self.Person.objects(name="Foo").update(rename__age="person_age")
 
         bob = self.Person.objects.as_pymongo().first()
-        assert 'age' not in bob
-        assert 'person_age' in bob
-        assert bob['person_age'] == 11
+        assert "age" not in bob
+        assert "person_age" in bob
+        assert bob["person_age"] == 11
 
     def test_save_and_only_on_fields_with_default(self):
         class Embed(EmbeddedDocument):

From defd58e5852655548a56dfa820822feccbeaf766 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Thu, 30 Sep 2021 20:10:50 -0400
Subject: [PATCH 1230/1519] Use /bin/sh for entrypoint - compatabile with
 mongo3x images

---
 entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 1cb3698f5..7f826ad00 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/sh
 
 mongod --replSet mongoengine --fork --logpath=/var/log/mongodb.log
 mongo db --eval "rs.initiate()"

From 21ef0927f396c447e4b1683802ed40b555dcd8f6 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Thu, 30 Sep 2021 20:58:32 -0400
Subject: [PATCH 1231/1519] Add checks for versions of Mongo

* Mongo 3 doesn't support transactions
* Mongo 4 does, but 4.4 specifically started allowing colleciton creation in a transaction
---
 tests/test_context_managers.py | 50 ++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index a9f1f113f..8a3a526a9 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -14,6 +14,10 @@
     switch_collection,
     switch_db,
 )
+from mongoengine.mongodb_support import (
+    MONGODB_42,
+    get_mongodb_version,
+)
 from mongoengine.pymongo_support import count_documents
 
 
@@ -413,8 +417,9 @@ def test_query_counter_ignores_particular_queries(self):
             )  # queries on db.system.indexes are ignored as well
             assert q == 1
 
-    def test_updating_a_document_within_a_transaction_succeeds(self):
+    def test_updating_a_document_within_a_transaction(self):
         connect("mongoenginetest")
+        mongodb_version = get_mongodb_version()
 
         class A(Document):
             name = StringField()
@@ -423,13 +428,15 @@ class A(Document):
 
         a_doc = A.objects.create(name="a")
 
-        with run_in_transaction():
-            a_doc.update(name="b")
-        assert "b" == A.objects.get(id=a_doc.id).name
+        if mongodb_version >= MONGODB_42:
+            with run_in_transaction():
+                a_doc.update(name="b")
+                assert "b" == A.objects.get(id=a_doc.id).name
 
-    def test_transaction_updates_across_databases_succeeds(self):
+    def test_transaction_updates_across_databases(self):
         connect("mongoenginetest")
         connect("test2", "test2")
+        mongodb_version = get_mongodb_version()
 
         class A(Document):
             name = StringField()
@@ -446,24 +453,27 @@ class B(Document):
 
         b_doc = B.objects.create(name="b")
 
-        with run_in_transaction():
-            a_doc.update(name="a2")
-            b_doc.update(name="b2")
+        if mongodb_version >= MONGODB_42:
+            with run_in_transaction():
+                a_doc.update(name="a2")
+                b_doc.update(name="b2")
 
-        assert "a2" == A.objects.get(id=a_doc.id).name
-        assert "b2" == B.objects.get(id=b_doc.id).name
+            assert "a2" == A.objects.get(id=a_doc.id).name
+            assert "b2" == B.objects.get(id=b_doc.id).name
 
-        with run_in_transaction():
-            a_doc.update(name="a3")
-            with switch_db(A, "test2"):
-                a_doc.update(name="a4", upsert=True)
-                b_doc.update(name="b3")
-            b_doc.update(name="b4")
+        # Creating collections via upserts in a transaction started in 4.4
+        if mongodb_version > MONGODB_42:
+            with run_in_transaction():
+                a_doc.update(name="a3")
+                with switch_db(A, "test2"):
+                    a_doc.update(name="a4", upsert=True)
+                    b_doc.update(name="b3")
+                b_doc.update(name="b4")
 
-        assert "a3" == A.objects.get(id=a_doc.id).name
-        assert "b4" == B.objects.get(id=b_doc.id).name
-        with switch_db(A, "test2"):
-            assert "a4" == A.objects.get(id=a_doc.id).name
+            assert "a3" == A.objects.get(id=a_doc.id).name
+            assert "b4" == B.objects.get(id=b_doc.id).name
+            with switch_db(A, "test2"):
+                assert "a4" == A.objects.get(id=a_doc.id).name
 
     def test_an_exception_raised_in_transactions_across_databases_rolls_back_updates(
         self,

From 7a0a58c163449f658389b512824ff68d647ffb6c Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Fri, 1 Oct 2021 07:48:01 +0300
Subject: [PATCH 1232/1519] black reformat

---
 mongoengine/fields.py           |  6 ++----
 tests/queryset/test_queryset.py | 27 +++++++++++++--------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 11c32f84c..b9c495532 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -163,7 +163,7 @@ def prepare_query_value(self, op, value):
                 regex = value
 
             # escape unsafe characters which could lead to a re.error
-            if op == 'regex':
+            if op == "regex":
                 value = re.compile(regex, flags)
             else:
                 value = re.escape(value)
@@ -1093,9 +1093,7 @@ def lookup_member(self, member_name):
         return DictField(db_field=member_name)
 
     def prepare_query_value(self, op, value):
-        match_operators = [
-            *STRING_OPERATORS
-        ]
+        match_operators = [*STRING_OPERATORS]
 
         if op in match_operators and isinstance(value, str):
             return StringField().prepare_query_value(op, value)
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 859c4cb56..9a2f2862c 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -872,17 +872,15 @@ def test_rename(self):
         self.Person.objects.create(name="Foo", age=11)
 
         bob = self.Person.objects.as_pymongo().first()
-        assert 'age' in bob
-        assert bob['age'] == 11
+        assert "age" in bob
+        assert bob["age"] == 11
 
-        self.Person.objects(name="Foo").update(
-            rename__age='person_age'
-        )
+        self.Person.objects(name="Foo").update(rename__age="person_age")
 
         bob = self.Person.objects.as_pymongo().first()
-        assert 'age' not in bob
-        assert 'person_age' in bob
-        assert bob['person_age'] == 11
+        assert "age" not in bob
+        assert "person_age" in bob
+        assert bob["person_age"] == 11
 
     def test_save_and_only_on_fields_with_default(self):
         class Embed(EmbeddedDocument):
@@ -1257,7 +1255,6 @@ def test_regex_query_shortcuts(self):
         obj = self.Person.objects(name__iexact="gUIDO VAN rOSSU").first()
         assert obj is None
 
-
         # Test wholeword
         obj = self.Person.objects(name__wholeword="Guido").first()
         assert obj == person
@@ -1370,12 +1367,14 @@ def test_filter_chaining_with_regex(self):
         person.save()
 
         people = self.Person.objects
-        people = people.filter(name__startswith="Gui")\
-            .filter(name__not__endswith="tum")\
-            .filter(name__icontains="VAN")\
-            .filter(name__regex="^Guido")\
-            .filter(name__wholeword="Guido")\
+        people = (
+            people.filter(name__startswith="Gui")
+            .filter(name__not__endswith="tum")
+            .filter(name__icontains="VAN")
+            .filter(name__regex="^Guido")
+            .filter(name__wholeword="Guido")
             .filter(name__wholeword="van")
+        )
         assert people.count() == 1
 
     def assertSequence(self, qs, expected):

From 447648a51c981115c4b6e338d9c9127743ba6564 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Fri, 1 Oct 2021 09:29:01 -0400
Subject: [PATCH 1233/1519] Explicitly check if mongo major version is >=4

This update accounts for the fact that at least one workflow
runs against Mongo 4.0.23
---
 tests/test_context_managers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 8a3a526a9..c6f2abc5d 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -15,7 +15,7 @@
     switch_db,
 )
 from mongoengine.mongodb_support import (
-    MONGODB_42,
+    MONGODB_44,
     get_mongodb_version,
 )
 from mongoengine.pymongo_support import count_documents
@@ -428,7 +428,7 @@ class A(Document):
 
         a_doc = A.objects.create(name="a")
 
-        if mongodb_version >= MONGODB_42:
+        if mongodb_version[0] >= 4:
             with run_in_transaction():
                 a_doc.update(name="b")
                 assert "b" == A.objects.get(id=a_doc.id).name
@@ -453,7 +453,7 @@ class B(Document):
 
         b_doc = B.objects.create(name="b")
 
-        if mongodb_version >= MONGODB_42:
+        if mongodb_version[0] >= 4:
             with run_in_transaction():
                 a_doc.update(name="a2")
                 b_doc.update(name="b2")
@@ -462,7 +462,7 @@ class B(Document):
             assert "b2" == B.objects.get(id=b_doc.id).name
 
         # Creating collections via upserts in a transaction started in 4.4
-        if mongodb_version > MONGODB_42:
+        if mongodb_version >= MONGODB_44:
             with run_in_transaction():
                 a_doc.update(name="a3")
                 with switch_db(A, "test2"):

From 4210ea06c361bd60c2b3466c1a86ee0db73d5efc Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 12 Oct 2021 21:02:12 +0200
Subject: [PATCH 1234/1519] Improve compound indexes in rst

---
 docs/guide/defining-documents.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 186dd4a5d..d86d6b9de 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -477,7 +477,7 @@ dictionary containing a full index definition.
 
 A direction may be specified on fields by prefixing the field name with a
 **+** (for ascending) or a **-** sign (for descending). Note that direction
-only matters on multi-field indexes. Text indexes may be specified by prefixing
+only matters on compound indexes. Text indexes may be specified by prefixing
 the field name with a **$**. Hashed indexes may be specified by prefixing
 the field name with a **#**::
 
@@ -488,14 +488,14 @@ the field name with a **#**::
         created = DateTimeField()
         meta = {
             'indexes': [
-                'title',
+                'title',   # single-field index
                 '$title',  # text index
                 '#title',  # hashed index
-                ('title', '-rating'),
-                ('category', '_cls'),
+                ('title', '-rating'),  # compound index
+                ('category', '_cls'),  # compound index
                 {
                     'fields': ['created'],
-                    'expireAfterSeconds': 3600
+                    'expireAfterSeconds': 3600  # ttl index
                 }
             ]
         }

From 686b42c29b3caf9f455cdbad24d13ea265dc6ebe Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 12 Oct 2021 21:06:11 +0200
Subject: [PATCH 1235/1519] update changelog with recent changes that were
 merged

---
 docs/changelog.rst    | 1 +
 mongoengine/fields.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5c3786034..5c96e4f15 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Development
 - EnumField improvements: now `choices` limits the values of an enum to allow
 - Fix deepcopy of EmbeddedDocument #2202
 - Fix error when using precision=0 with DecimalField #2535
+- Add support for regex and whole word text search query #2568
 
 Changes in 0.23.1
 ===========
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index b9c495532..a2ccc7aea 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -162,10 +162,10 @@ def prepare_query_value(self, op, value):
             elif op == "regex":
                 regex = value
 
-            # escape unsafe characters which could lead to a re.error
             if op == "regex":
                 value = re.compile(regex, flags)
             else:
+                # escape unsafe characters which could lead to a re.error
                 value = re.escape(value)
                 value = re.compile(regex % value, flags)
         return super().prepare_query_value(op, value)

From 9bc8e7b3b78c5f8415771633a13444f0aef9f2d2 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Tue, 12 Oct 2021 15:21:22 -0400
Subject: [PATCH 1236/1519] Update tests to account for pymongo support

pymongo added support for transactions in 3.7
---
 tests/test_context_managers.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index c6f2abc5d..ebbce3c60 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -18,7 +18,10 @@
     MONGODB_44,
     get_mongodb_version,
 )
-from mongoengine.pymongo_support import count_documents
+from mongoengine.pymongo_support import (
+    IS_PYMONGO_GTE_37,
+    count_documents,
+)
 
 
 class TestContextManagers:
@@ -428,7 +431,7 @@ class A(Document):
 
         a_doc = A.objects.create(name="a")
 
-        if mongodb_version[0] >= 4:
+        if mongodb_version[0] >= 4 and IS_PYMONGO_GTE_37:
             with run_in_transaction():
                 a_doc.update(name="b")
                 assert "b" == A.objects.get(id=a_doc.id).name
@@ -453,7 +456,7 @@ class B(Document):
 
         b_doc = B.objects.create(name="b")
 
-        if mongodb_version[0] >= 4:
+        if mongodb_version[0] >= 4 and IS_PYMONGO_GTE_37:
             with run_in_transaction():
                 a_doc.update(name="a2")
                 b_doc.update(name="b2")
@@ -462,7 +465,7 @@ class B(Document):
             assert "b2" == B.objects.get(id=b_doc.id).name
 
         # Creating collections via upserts in a transaction started in 4.4
-        if mongodb_version >= MONGODB_44:
+        if mongodb_version >= MONGODB_44 and IS_PYMONGO_GTE_37:
             with run_in_transaction():
                 a_doc.update(name="a3")
                 with switch_db(A, "test2"):

From 10d3c510ea7b383463635092b95c99cac7236db8 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Sat, 16 Oct 2021 12:30:49 +0300
Subject: [PATCH 1237/1519] Update with Aggregation Pipeline

---
 mongoengine/queryset/base.py    | 11 +++++++++--
 tests/queryset/test_queryset.py | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5dc47e001..f5d868b83 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -524,6 +524,7 @@ def update(
         write_concern=None,
         read_concern=None,
         full_result=False,
+        aggregation_update=False,
         **update,
     ):
         """Perform an atomic update on the fields matched by the query.
@@ -539,6 +540,7 @@ def update(
         :param read_concern: Override the read concern for the operation
         :param full_result: Return the associated ``pymongo.UpdateResult`` rather than just the number
             updated items
+        :param aggregation_update: Update with Aggregation Pipeline https://docs.mongodb.com/manual/reference/method/db.collection.updateMany/#update-with-aggregation-pipeline
         :param update: Django-style update keyword arguments
 
         :returns the number of updated documents (unless ``full_result`` is True)
@@ -551,8 +553,13 @@ def update(
 
         queryset = self.clone()
         query = queryset._query
-        update = transform.update(queryset._document, **update)
-
+        if aggregation_update:
+            update = [
+                transform.update(queryset._document, **{"__raw__": u})
+                for u in update["__raw__"]
+            ]
+        else:
+            update = transform.update(queryset._document, **update)
         # If doing an atomic upsert on an inheritable class
         # then ensure we add _cls to the update operation
         if upsert and "_cls" in query:
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 9a2f2862c..d7fe10a28 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -2217,6 +2217,25 @@ class BlogPost(Document):
         post.reload()
         assert post.tags == ["code", "mongodb"]
 
+        BlogPost.objects(slug="test").update(
+            __raw__=[{"$set": {"slug": {"$concat": ["$slug", " ", "$slug"]}}}],
+            aggregation_update=True,
+        )
+        post.reload()
+        assert post.slug == "test test"
+
+        BlogPost.objects(slug="test test").update(
+            __raw__=[
+                {"$set": {"slug": {"$concat": ["$slug", " ", "it"]}}},  # test test it
+                {
+                    "$set": {"slug": {"$concat": ["When", " ", "$slug"]}}
+                },  # When test test it
+            ],
+            aggregation_update=True,
+        )
+        post.reload()
+        assert post.slug == "When test test it"
+
     def test_add_to_set_each(self):
         class Item(Document):
             name = StringField(required=True)

From e35dab56bac4e7d7e0c9fb48cbcce0f85eb4a198 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Sat, 16 Oct 2021 18:07:56 +0300
Subject: [PATCH 1238/1519] Update with Aggregation Pipeline doc

---
 docs/guide/querying.rst      | 27 +++++++++++++++++++++++++--
 mongoengine/queryset/base.py |  4 ++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 1cf5ec3c6..1b608608c 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -218,12 +218,35 @@ However, this doesn't map well to the syntax so you can also use a capital S ins
 
 Raw queries
 -----------
-It is possible to provide a raw :mod:`PyMongo` query as a query parameter, which will
-be integrated directly into the query. This is done using the ``__raw__``
+It is possible to provide a raw :mod:`PyMongo` query as a query parameter or update as a update parameter , which will
+be integrated directly into the query or update. This is done using the ``__raw__``
 keyword argument::
 
     Page.objects(__raw__={'tags': 'coding'})
 
+    # or for update
+
+    Page.objects(__raw__={'tags': 'coding'}).update(__raw__={'$set': {'tags': 'coding'}})
+
+    Page.objects(tags='coding').update(__raw__={'$set': {'tags': 'coding'}})
+
+.. versionadded:: 0.4
+
+
+Update with Aggregation Pipeline
+-----------
+It is possible to provide a raw :mod:`PyMongo` aggregation update parameter, which will
+be integrated directly into the update. This is done using the ``aggregation_update=True`` and ``__raw__``
+keyword argument::
+
+
+    # 'tags' field is set to 'coding is fun'
+    Page.objects(tags='coding').update(__raw__=[
+        {"$set": {"tags": {"$concat": ["$tags", "is fun"]}}}
+        ],
+        aggregation_update=True,
+    )
+
 .. versionadded:: 0.4
 
 Sorting/Ordering results
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5261949a5..62f5658e8 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -554,6 +554,10 @@ def update(
         queryset = self.clone()
         query = queryset._query
         if aggregation_update:
+            if "__raw__" not in update:
+                raise OperationError(
+                    "Currently aggregation_update works only with __raw__ value"
+                )
             update = [
                 transform.update(queryset._document, **{"__raw__": u})
                 for u in update["__raw__"]

From b8cf4c202044f7b0d533e1cd0cf8728e67c0c787 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Sat, 16 Oct 2021 18:12:35 +0300
Subject: [PATCH 1239/1519] Update with Aggregation Pipeline doc

---
 docs/guide/querying.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 1b608608c..7471aa158 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -237,9 +237,10 @@ Update with Aggregation Pipeline
 -----------
 It is possible to provide a raw :mod:`PyMongo` aggregation update parameter, which will
 be integrated directly into the update. This is done using the ``aggregation_update=True`` and ``__raw__``
+pipeline
+`Update with Aggregation Pipeline <https://docs.mongodb.com/manual/reference/method/db.collection.updateMany/#update-with-aggregation->`_
 keyword argument::
 
-
     # 'tags' field is set to 'coding is fun'
     Page.objects(tags='coding').update(__raw__=[
         {"$set": {"tags": {"$concat": ["$tags", "is fun"]}}}

From 04a049f4ce2c8538d21f8a8c754e84d50ba91478 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Sun, 17 Oct 2021 13:14:04 +0300
Subject: [PATCH 1240/1519] fix tester

---
 tests/queryset/test_queryset.py | 14 ++++++++++++++
 tests/utils.py                  |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index d7fe10a28..79f510805 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -25,6 +25,7 @@
     queryset_manager,
 )
 from tests.utils import (
+    requires_mongodb_gte_42,
     requires_mongodb_gte_44,
     requires_mongodb_lt_42,
 )
@@ -2217,6 +2218,19 @@ class BlogPost(Document):
         post.reload()
         assert post.tags == ["code", "mongodb"]
 
+    @requires_mongodb_gte_42
+    def test_aggregation_update(self):
+        """Ensure that the 'aggregation_update' update works correctly."""
+
+        class BlogPost(Document):
+            slug = StringField()
+            tags = ListField(StringField())
+
+        BlogPost.drop_collection()
+
+        post = BlogPost(slug="test")
+        post.save()
+
         BlogPost.objects(slug="test").update(
             __raw__=[{"$set": {"slug": {"$concat": ["$slug", " ", "$slug"]}}}],
             aggregation_update=True,
diff --git a/tests/utils.py b/tests/utils.py
index a05b9c14b..0dcdb2dbf 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -37,6 +37,10 @@ def requires_mongodb_lt_42(func):
     return _decorated_with_ver_requirement(func, (4, 2), oper=operator.lt)
 
 
+def requires_mongodb_gte_42(func):
+    return _decorated_with_ver_requirement(func, (4, 2), oper=operator.ge)
+
+
 def requires_mongodb_gte_44(func):
     return _decorated_with_ver_requirement(func, (4, 4), oper=operator.ge)
 

From 4b643ad01fb53c16939776b5998fa7a137f950b9 Mon Sep 17 00:00:00 2001
From: Maciej Urbanski <rooter@kyberian.net>
Date: Sun, 24 Oct 2021 18:11:29 +0200
Subject: [PATCH 1241/1519] test against python 3.10

---
 .github/workflows/github-actions.yml | 2 +-
 setup.py                             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index b6820a33e..66c4ecc9f 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
diff --git a/setup.py b/setup.py
index 27ed987ef..48ca2e4fb 100644
--- a/setup.py
+++ b/setup.py
@@ -101,6 +101,8 @@ def run_tests(self):
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Database",

From 9a414edb25122702fc6b363d6b5b6b76ce528a6d Mon Sep 17 00:00:00 2001
From: Maciej Urbanski <rooter@kyberian.net>
Date: Sun, 24 Oct 2021 18:26:56 +0200
Subject: [PATCH 1242/1519] unfreeze pytest (pytest>=6.2.5 is required for
 py3.10)

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 48ca2e4fb..bb777da0e 100644
--- a/setup.py
+++ b/setup.py
@@ -112,7 +112,7 @@ def run_tests(self):
 extra_opts = {
     "packages": find_packages(exclude=["tests", "tests.*"]),
     "tests_require": [
-        "pytest<5.0",
+        "pytest",
         "pytest-cov",
         "coverage",
         "blinker",

From 3a32c195d5ff89d93d23a425f0fdca62f1123947 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 25 Oct 2021 10:22:27 +0200
Subject: [PATCH 1243/1519] remove useless quotes in yaml

---
 .github/workflows/github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 66c4ecc9f..daa9cdd1c 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
+        python-version: [3.6, 3.7, 3.8, 3.9, 3.10, pypy3]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:

From f4a87bff1dc5d3256ff3480f6f9ea3289bac9ad1 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 25 Oct 2021 10:23:33 +0200
Subject: [PATCH 1244/1519] remove travis deprecated config

---
 .travis_.yml | 108 ---------------------------------------------------
 1 file changed, 108 deletions(-)
 delete mode 100644 .travis_.yml

diff --git a/.travis_.yml b/.travis_.yml
deleted file mode 100644
index 114fd76f1..000000000
--- a/.travis_.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-## For full coverage, we'd have to test all supported Python, MongoDB, and
-## PyMongo combinations. However, that would result in an overly long build
-## with a very large number of jobs, hence we only test a subset of all the
-## combinations.
-## * Python3.7, MongoDB v3.4 & the latest PyMongo v3.x is currently the "main" setup,
-## Other combinations are tested. See below for the details or check the travis jobs
-#
-## We should periodically check MongoDB Server versions supported by MongoDB
-## Inc., add newly released versions to the test matrix, and remove versions
-## which have reached their End of Life. See:
-## 1. https://www.mongodb.com/support-policy.
-## 2. https://docs.mongodb.com/ecosystem/drivers/driver-compatibility-reference/#python-driver-compatibility
-##
-## Reminder: Update README.rst if you change MongoDB versions we test.
-#
-#language: python
-#dist: xenial
-#python:
-#  - 3.6
-#  - 3.7
-#  - 3.8
-#  - 3.9
-#  - pypy3
-#
-#env:
-#  global:
-#    - MONGODB_3_4=3.4.19
-#    - MONGODB_3_6=3.6.13
-#    - MONGODB_4_0=4.0.13
-#
-#    - PYMONGO_3_4=3.4
-#    - PYMONGO_3_6=3.6
-#    - PYMONGO_3_9=3.9
-#    - PYMONGO_3_11=3.11
-#
-#    - MAIN_PYTHON_VERSION=3.7
-#  matrix:
-#    - MONGODB=${MONGODB_3_4} PYMONGO=${PYMONGO_3_11}
-#
-#matrix:
-#  # Finish the build as soon as one job fails
-#  fast_finish: true
-#
-#  include:
-#    - python: 3.7
-#      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_6}
-#    - python: 3.7
-#      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_9}
-#    - python: 3.7
-#      env: MONGODB=${MONGODB_3_6} PYMONGO=${PYMONGO_3_11}
-#    - python: 3.8
-#      env: MONGODB=${MONGODB_4_0} PYMONGO=${PYMONGO_3_11}
-#
-#install:
-#  # Install Mongo
-#  - wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-${MONGODB}.tgz
-#  - tar xzf mongodb-linux-x86_64-${MONGODB}.tgz
-#  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
-#  # Install Python dependencies.
-#  - pip install --upgrade pip
-#  - pip install coveralls
-#  - pip install pre-commit
-#  - pip install tox
-#  # tox dryrun to setup the tox venv (we run a mock test).
-#  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
-#
-#before_script:
-#  - mkdir ${PWD}/mongodb-linux-x86_64-${MONGODB}/data
-#  - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --dbpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/data --logpath ${PWD}/mongodb-linux-x86_64-${MONGODB}/mongodb.log --fork
-#  # Run pre-commit hooks (black, flake8, etc) on entire codebase
-#  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then pre-commit run -a; else echo "pre-commit checks only runs on py37"; fi
-#  - mongo --eval 'db.version();' # Make sure mongo is awake
-#
-#script:
-#  - tox -e $(echo py$TRAVIS_PYTHON_VERSION-mg$PYMONGO | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
-#
-#after_success:
-#  - if [[ $TRAVIS_PYTHON_VERSION == $MAIN_PYTHON_VERSION ]]; then coveralls --verbose; else echo "coveralls only sent for py37"; fi
-#
-#notifications:
-#  irc: irc.freenode.org#mongoengine
-#
-## Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
-#branches:
-#  # Only run builds on the master branch and GitHub releases (tagged as vX.Y.Z)
-#  only:
-#    - master
-#    - /^v.*$/
-#
-## Whenever a new release is created via GitHub, publish it on PyPI.
-#deploy:
-#  provider: pypi
-#  user: the_drow
-#  password:
-#    secure: QMyatmWBnC6ZN3XLW2+fTBDU4LQcp1m/LjR2/0uamyeUzWKdlOoh/Wx5elOgLwt/8N9ppdPeG83ose1jOz69l5G0MUMjv8n/RIcMFSpCT59tGYqn3kh55b0cIZXFT9ar+5cxlif6a5rS72IHm5li7QQyxexJIII6Uxp0kpvUmek=
-#
-#  # Create a source distribution and a pure python wheel for faster installs.
-#  distributions: "sdist bdist_wheel"
-#
-#  # Only deploy on tagged commits (aka GitHub releases) and only for the parent
-#  # repo's builds running Python v3.7 along with PyMongo v3.x and MongoDB v3.4.
-#  # We run Travis against many different Python, PyMongo, and MongoDB versions
-#  # and we don't want the deploy to occur multiple times).
-#  on:
-#    tags: true
-#    repo: MongoEngine/mongoengine
-#    condition: ($PYMONGO = ${PYMONGO_3_11}) && ($MONGODB = ${MONGODB_3_4})
-#    python: 3.7

From 2f4b2aadb451eb0fa217c24161833473a4ea20c5 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 25 Oct 2021 14:45:07 +0200
Subject: [PATCH 1245/1519] fix yaml float - string conversion

---
 .github/workflows/github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index daa9cdd1c..66c4ecc9f 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, 3.10, pypy3]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:

From 88fe83765db82cd6d8ebc2bf77fe18d1207cb649 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 6 Nov 2021 10:32:17 +0100
Subject: [PATCH 1246/1519] fix compatibility issue in CI

---
 .github/workflows/github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 66c4ecc9f..f5216ee73 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -53,7 +53,7 @@ jobs:
             PYMONGO: $PYMONGO_3_9
           - python-version: 3.7
             MONGODB: $MONGODB_4_2
-            PYMONGO: $PYMONGO_3_6
+            PYMONGO: $PYMONGO_3_9
           - python-version: 3.7
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_11

From 322a4164d502fa5d5733af8c7fed0439ed67eb86 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 6 Nov 2021 10:55:50 +0100
Subject: [PATCH 1247/1519] pin docutils

---
 docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index dfda6a70b..3621a13b2 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,4 @@
 Sphinx==3.3.0
 sphinx-rtd-theme==0.5.0
 readthedocs-sphinx-ext==2.1.1
+docutils==0.17.1

From 6be253fc6691c4ebca4ce8fd6fefb18ede6c5833 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Sat, 6 Nov 2021 17:15:43 +0200
Subject: [PATCH 1248/1519] following @bagerard point and remove the extra
 aggregation_update parameter

---
 docs/guide/querying.rst         | 3 +--
 mongoengine/queryset/base.py    | 8 +-------
 tests/queryset/test_queryset.py | 2 --
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 7471aa158..1d7617b40 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -236,7 +236,7 @@ keyword argument::
 Update with Aggregation Pipeline
 -----------
 It is possible to provide a raw :mod:`PyMongo` aggregation update parameter, which will
-be integrated directly into the update. This is done using the ``aggregation_update=True`` and ``__raw__``
+be integrated directly into the update. This is done by using ``__raw__`` field and value of array
 pipeline
 `Update with Aggregation Pipeline <https://docs.mongodb.com/manual/reference/method/db.collection.updateMany/#update-with-aggregation->`_
 keyword argument::
@@ -245,7 +245,6 @@ keyword argument::
     Page.objects(tags='coding').update(__raw__=[
         {"$set": {"tags": {"$concat": ["$tags", "is fun"]}}}
         ],
-        aggregation_update=True,
     )
 
 .. versionadded:: 0.4
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 62f5658e8..98b4b66e4 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -524,7 +524,6 @@ def update(
         write_concern=None,
         read_concern=None,
         full_result=False,
-        aggregation_update=False,
         **update,
     ):
         """Perform an atomic update on the fields matched by the query.
@@ -540,7 +539,6 @@ def update(
         :param read_concern: Override the read concern for the operation
         :param full_result: Return the associated ``pymongo.UpdateResult`` rather than just the number
             updated items
-        :param aggregation_update: Update with Aggregation Pipeline https://docs.mongodb.com/manual/reference/method/db.collection.updateMany/#update-with-aggregation-pipeline
         :param update: Django-style update keyword arguments
 
         :returns the number of updated documents (unless ``full_result`` is True)
@@ -553,11 +551,7 @@ def update(
 
         queryset = self.clone()
         query = queryset._query
-        if aggregation_update:
-            if "__raw__" not in update:
-                raise OperationError(
-                    "Currently aggregation_update works only with __raw__ value"
-                )
+        if "__raw__" in update and isinstance(update["__raw__"], list):
             update = [
                 transform.update(queryset._document, **{"__raw__": u})
                 for u in update["__raw__"]
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 79f510805..942db6255 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -2233,7 +2233,6 @@ class BlogPost(Document):
 
         BlogPost.objects(slug="test").update(
             __raw__=[{"$set": {"slug": {"$concat": ["$slug", " ", "$slug"]}}}],
-            aggregation_update=True,
         )
         post.reload()
         assert post.slug == "test test"
@@ -2245,7 +2244,6 @@ class BlogPost(Document):
                     "$set": {"slug": {"$concat": ["When", " ", "$slug"]}}
                 },  # When test test it
             ],
-            aggregation_update=True,
         )
         post.reload()
         assert post.slug == "When test test it"

From 237d0078163464af3b7f2fb97cacc7ce59570386 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Mon, 8 Nov 2021 20:36:41 -0500
Subject: [PATCH 1249/1519] Update tests to use recommended requirement
 decorators

---
 tests/test_context_managers.py | 73 +++++++++++++++++++---------------
 tests/utils.py                 |  4 ++
 2 files changed, 46 insertions(+), 31 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index ebbce3c60..65f8af16b 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -14,14 +14,9 @@
     switch_collection,
     switch_db,
 )
-from mongoengine.mongodb_support import (
-    MONGODB_44,
-    get_mongodb_version,
-)
-from mongoengine.pymongo_support import (
-    IS_PYMONGO_GTE_37,
-    count_documents,
-)
+from mongoengine.pymongo_support import count_documents
+
+from .utils import requires_mongodb_gte_40, requires_mongodb_gte_44
 
 
 class TestContextManagers:
@@ -420,9 +415,9 @@ def test_query_counter_ignores_particular_queries(self):
             )  # queries on db.system.indexes are ignored as well
             assert q == 1
 
+    @requires_mongodb_gte_40
     def test_updating_a_document_within_a_transaction(self):
         connect("mongoenginetest")
-        mongodb_version = get_mongodb_version()
 
         class A(Document):
             name = StringField()
@@ -431,15 +426,14 @@ class A(Document):
 
         a_doc = A.objects.create(name="a")
 
-        if mongodb_version[0] >= 4 and IS_PYMONGO_GTE_37:
-            with run_in_transaction():
-                a_doc.update(name="b")
-                assert "b" == A.objects.get(id=a_doc.id).name
+        with run_in_transaction():
+            a_doc.update(name="b")
+            assert "b" == A.objects.get(id=a_doc.id).name
 
+    @requires_mongodb_gte_40
     def test_transaction_updates_across_databases(self):
         connect("mongoenginetest")
         connect("test2", "test2")
-        mongodb_version = get_mongodb_version()
 
         class A(Document):
             name = StringField()
@@ -456,27 +450,44 @@ class B(Document):
 
         b_doc = B.objects.create(name="b")
 
-        if mongodb_version[0] >= 4 and IS_PYMONGO_GTE_37:
-            with run_in_transaction():
-                a_doc.update(name="a2")
-                b_doc.update(name="b2")
+        with run_in_transaction():
+            a_doc.update(name="a2")
+            b_doc.update(name="b2")
 
-            assert "a2" == A.objects.get(id=a_doc.id).name
-            assert "b2" == B.objects.get(id=b_doc.id).name
+        assert "a2" == A.objects.get(id=a_doc.id).name
+        assert "b2" == B.objects.get(id=b_doc.id).name
 
-        # Creating collections via upserts in a transaction started in 4.4
-        if mongodb_version >= MONGODB_44 and IS_PYMONGO_GTE_37:
-            with run_in_transaction():
-                a_doc.update(name="a3")
-                with switch_db(A, "test2"):
-                    a_doc.update(name="a4", upsert=True)
-                    b_doc.update(name="b3")
-                b_doc.update(name="b4")
+    @requires_mongodb_gte_44
+    def test_collection_creation_via_upsersts_across_databases_in_transaction(self):
+        connect("mongoenginetest")
+        connect("test2", "test2")
+
+        class A(Document):
+            name = StringField()
 
-            assert "a3" == A.objects.get(id=a_doc.id).name
-            assert "b4" == B.objects.get(id=b_doc.id).name
+        A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            meta = {"db_alias": "test2"}
+            name = StringField()
+
+        B.drop_collection()
+
+        b_doc = B.objects.create(name="b")
+
+        with run_in_transaction():
+            a_doc.update(name="a3")
             with switch_db(A, "test2"):
-                assert "a4" == A.objects.get(id=a_doc.id).name
+                a_doc.update(name="a4", upsert=True)
+                b_doc.update(name="b3")
+            b_doc.update(name="b4")
+
+        assert "a3" == A.objects.get(id=a_doc.id).name
+        assert "b4" == B.objects.get(id=b_doc.id).name
+        with switch_db(A, "test2"):
+            assert "a4" == A.objects.get(id=a_doc.id).name
 
     def test_an_exception_raised_in_transactions_across_databases_rolls_back_updates(
         self,
diff --git a/tests/utils.py b/tests/utils.py
index a05b9c14b..63bfa5597 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -41,6 +41,10 @@ def requires_mongodb_gte_44(func):
     return _decorated_with_ver_requirement(func, (4, 4), oper=operator.ge)
 
 
+def requires_mongodb_gte_40(func):
+    return _decorated_with_ver_requirement(func, (4, 0), oper=operator.ge)
+
+
 def _decorated_with_ver_requirement(func, mongo_version_req, oper):
     """Return a MongoDB version requirement decorator.
 

From ccd8a0f34ccc014bbde399f80a5dc2e9149e2676 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Mon, 8 Nov 2021 20:50:32 -0500
Subject: [PATCH 1250/1519] Revert item frequenices map reduce formatting
 structure to original

---
 mongoengine/queryset/base.py | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index aab93db24..18a2b35e2 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1728,29 +1728,28 @@ def no_dereference(self):
 
     def _item_frequencies_map_reduce(self, field, normalize=False):
         map_func = """
-            function() {{
-                var path = '{{{{~{field}}}}}'.split('.');
+            function() {
+                var path = '{{~%(field)s}}'.split('.');
                 var field = this;
-
-                for (p in path) {{
+                for (p in path) {
                     if (typeof field != 'undefined')
                        field = field[path[p]];
                     else
                        break;
-                }}
-                if (field && field.constructor == Array) {{
-                    field.forEach(function(item) {{
+                }
+                if (field && field.constructor == Array) {
+                    field.forEach(function(item) {
                         emit(item, 1);
-                    }});
-                }} else if (typeof field != 'undefined') {{
+                    });
+                } else if (typeof field != 'undefined') {
                     emit(field, 1);
-                }} else {{
+                } else {
                     emit(null, 1);
-                }}
-            }}
-        """.format(
-            field=field
-        )
+                }
+            }
+        """ % {
+            "field": field
+        }
         reduce_func = """
             function(key, values) {
                 var total = 0;

From 7fbd52cee3217adde18a29cd0022896b1882c6ca Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Tue, 9 Nov 2021 15:14:37 -0500
Subject: [PATCH 1251/1519] Add test cases to depict nested transaction
 behavior

---
 tests/test_context_managers.py | 56 ++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 65f8af16b..a3ccc58e4 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -528,6 +528,62 @@ class B(Document):
         with switch_db(A, "test2"):
             assert 0 == A.objects.all().count()
 
+    def test_exception_in_child_of_a_nested_transaction_rolls_parent_back(self):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            name = StringField()
+
+        B.drop_collection()
+        b_doc = B.objects.create(name="b")
+
+        try:
+            with run_in_transaction():
+                a_doc.update(name="trx-parent")
+                with run_in_transaction():
+                    b_doc.update(name="trx-child")
+                    raise Exception
+        except Exception:
+            pass
+
+        assert "a" == A.objects.get(id=a_doc.id).name
+        assert "b" == B.objects.get(id=b_doc.id).name
+
+    def test_exception_in_parent_of_nested_of_transaction_after_child_completed_only_rolls_parent_back(
+        self,
+    ):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            name = StringField()
+
+        B.drop_collection()
+        b_doc = B.objects.create(name="b")
+
+        try:
+            with run_in_transaction():
+                a_doc.update(name="trx-parent")
+                with run_in_transaction():
+                    b_doc.update(name="trx-child")
+                raise Exception
+        except Exception:
+            pass
+
+        assert "a" == A.objects.get(id=a_doc.id).name
+        assert "trx-child" == B.objects.get(id=b_doc.id).name
+
 
 if __name__ == "__main__":
     unittest.main()

From 471a700435806a26c7252b09a963d796cb40b3d9 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 10 Nov 2021 18:29:11 -0500
Subject: [PATCH 1252/1519] Provide thread safety for sessions

Use an extension of `threading.locals` to handle initialized sessions within a
thread to ensure session isolation from other threads.

Also, given that pymongo supports nested sessions + nested transactions, I added
a deque to track the "current" session state and mimic this behavior.
---
 mongoengine/connection.py      | 43 ++++++++++++++------
 tests/test_context_managers.py | 72 ++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 12 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 83b560efc..6dcef01d8 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,3 +1,6 @@
+import collections
+import threading
+
 from pymongo import MongoClient, ReadPreference, uri_parser
 from pymongo.database import _check_name
 
@@ -22,7 +25,7 @@
 _connection_settings = {}
 _connections = {}
 _dbs = {}
-_session = None
+
 
 READ_PREFERENCE = ReadPreference.PRIMARY
 
@@ -401,21 +404,37 @@ def connect(db=None, alias=DEFAULT_CONNECTION_NAME, **kwargs):
     return get_connection(alias)
 
 
+# Support old naming convention
+_get_connection = get_connection
+_get_db = get_db
+
+
+class _LocalSessions(threading.local):
+    def __init__(self):
+        self.sessions = collections.deque()
+
+    def append(self, session):
+        self.sessions.append(session)
+
+    def get_current(self):
+        if len(self.sessions):
+            return self.sessions[len(self.sessions) - 1]
+
+    def clear_current(self):
+        if len(self.sessions):
+            self.sessions.pop()
+
+
+_local_sessions = _LocalSessions()
+
+
 def _set_session(session):
-    global _session
-    _session = session
+    _local_sessions.append(session)
 
 
 def _get_session():
-    global _session
-    return _session
+    return _local_sessions.get_current()
 
 
 def _clear_session():
-    global _session
-    _session = None
-
-
-# Support old naming convention
-_get_connection = get_connection
-_get_db = get_db
+    return _local_sessions.clear_current()
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index a3ccc58e4..e3fe29656 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -1,3 +1,6 @@
+import random
+import threading
+import time
 import unittest
 
 import pytest
@@ -489,6 +492,7 @@ class B(Document):
         with switch_db(A, "test2"):
             assert "a4" == A.objects.get(id=a_doc.id).name
 
+    @requires_mongodb_gte_40
     def test_an_exception_raised_in_transactions_across_databases_rolls_back_updates(
         self,
     ):
@@ -528,6 +532,7 @@ class B(Document):
         with switch_db(A, "test2"):
             assert 0 == A.objects.all().count()
 
+    @requires_mongodb_gte_40
     def test_exception_in_child_of_a_nested_transaction_rolls_parent_back(self):
         connect("mongoenginetest")
 
@@ -555,6 +560,7 @@ class B(Document):
         assert "a" == A.objects.get(id=a_doc.id).name
         assert "b" == B.objects.get(id=b_doc.id).name
 
+    @requires_mongodb_gte_40
     def test_exception_in_parent_of_nested_of_transaction_after_child_completed_only_rolls_parent_back(
         self,
     ):
@@ -584,6 +590,72 @@ class B(Document):
         assert "a" == A.objects.get(id=a_doc.id).name
         assert "trx-child" == B.objects.get(id=b_doc.id).name
 
+    @requires_mongodb_gte_40
+    def test_thread_safety_of_transactions(self):
+        """
+        Make sure transactions don't step over each other. Each
+        session should be isolated to each thread. If this is the
+        case, then no amount of runtime variability should have
+        an effect on the output.
+
+        This test sets up 10 records, each with an integer field
+        of value 0 - 9.
+
+        We then spin up 10 threads and attempt to update a target
+        record by multiplying it's integer value by 10. Then, if
+        the target record is even, throw an exception, which
+        should then roll the transaction back. The odd rows always
+        succeed.
+
+        If the sessions are properly thread safe, we should ALWAYS
+        net out with the following sum across the integer fields
+        of the 10 records:
+
+        0 + 10 + 2 + 30 + 4 + 50 + 6 + 70 + 8 + 90 = 270
+        """
+        connect("mongoenginetest")
+
+        class A(Document):
+            i = IntField()
+
+        A.drop_collection()
+
+        def thread_fn(idx):
+            # Open the transaction at some unknown interval
+            time.sleep(random.uniform(0.01, 0.1))
+            with run_in_transaction():
+
+                a = A.objects.get(i=idx)
+                a.i = idx * 10
+                # Save at some unknown interval
+                time.sleep(random.uniform(0.01, 0.1))
+                a.save()
+
+                # Force roll backs for the even runs...
+                if idx % 2 == 0:
+                    raise Exception
+
+        thread_count = 10
+        for i in range(thread_count):
+            A.objects.create(i=i)
+
+        threads = [
+            threading.Thread(target=thread_fn, args=(i,)) for i in range(thread_count)
+        ]
+        for t in threads:
+            t.start()
+        for t in threads:
+            t.join()
+
+        expected_sum = 0
+        for i in range(thread_count):
+            if i % 2 == 0:
+                expected_sum += i
+            else:
+                expected_sum += i * 10
+        assert expected_sum == 270
+        assert expected_sum == sum(a.i for a in A.objects.all())
+
 
 if __name__ == "__main__":
     unittest.main()

From 97652783a40c163d21356c7a022aff0222bd326d Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 10 Nov 2021 18:35:09 -0500
Subject: [PATCH 1253/1519] Add tests showing behavior of session management in
 nested txs

---
 tests/test_context_managers.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index e3fe29656..72f071355 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -6,7 +6,7 @@
 import pytest
 
 from mongoengine import *
-from mongoengine.connection import get_db
+from mongoengine.connection import _get_session, get_db
 from mongoengine.context_managers import (
     no_dereference,
     no_sub_classes,
@@ -590,6 +590,20 @@ class B(Document):
         assert "a" == A.objects.get(id=a_doc.id).name
         assert "trx-child" == B.objects.get(id=b_doc.id).name
 
+    @requires_mongodb_gte_40
+    def test_nested_transactions_create_and_release_sessions_accordingly(self):
+        connect("mongoenginetest")
+        with run_in_transaction():
+            s1 = _get_session()
+            with run_in_transaction():
+                s2 = _get_session()
+                assert s1 != s2
+                with run_in_transaction():
+                    pass
+                assert s2 == _get_session()
+            assert s1 == _get_session()
+        assert _get_session() is None
+
     @requires_mongodb_gte_40
     def test_thread_safety_of_transactions(self):
         """

From ce0a0742a6b45414eb0f88bf0f5a5e612cdadac5 Mon Sep 17 00:00:00 2001
From: Spoksss <310029+spoksss@users.noreply.github.com>
Date: Fri, 12 Nov 2021 20:15:04 +0100
Subject: [PATCH 1254/1519] Prevent override custom manager

---
 mongoengine/document.py         |  6 +++++-
 tests/queryset/test_queryset.py | 27 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index 72e2818a5..a3825d5d2 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -583,7 +583,11 @@ def cascade_save(self, **kwargs):
     def _qs(self):
         """Return the default queryset corresponding to this document."""
         if not hasattr(self, "__objects"):
-            self.__objects = QuerySet(self.__class__, self._get_collection())
+            queryset_class = self._meta.get("queryset_class")
+            if queryset_class is not None:
+                self.__objects = queryset_class(self.__class__, self._get_collection())
+            else:
+                self.__objects = QuerySet(self.__class__, self._get_collection())
         return self.__objects
 
     @property
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 9a2f2862c..427e13d10 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -3914,6 +3914,33 @@ class Post(Document):
 
         Post.drop_collection()
 
+    def test_custom_querysets_set_manager_methods(self):
+        """Ensure that custom QuerySet classes methods may be used."""
+
+        class CustomQuerySet(QuerySet):
+            def delete(self, *args, **kwargs):
+                """Example of method when one want to change default behaviour of it"""
+                return 0
+
+        class CustomQuerySetManager(QuerySetManager):
+            queryset_class = CustomQuerySet
+
+        class Post(Document):
+            objects = CustomQuerySetManager()
+
+        Post.drop_collection()
+
+        assert isinstance(Post.objects, CustomQuerySet)
+        assert not Post.objects.delete()
+
+        post = Post()
+        post.save()
+        assert Post.objects.count() == 1
+        post.delete()
+        assert Post.objects.count() == 1
+
+        Post.drop_collection()
+
     def test_custom_querysets_managers_directly(self):
         """Ensure that custom QuerySet classes may be used."""
 

From 9f7e5f8b4f920325c2addf365b461e478ce16705 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 12 Nov 2021 20:17:41 +0100
Subject: [PATCH 1255/1519] Update README so that it s up to date regarding
 MongoDB supported versions (tested in CI)

---
 README.rst    | 4 ++--
 docs/Makefile | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index a74c26aa8..7c3b2ba0d 100644
--- a/README.rst
+++ b/README.rst
@@ -25,10 +25,10 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v3.4, v3.6 and v4.0. Future versions
+MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.2 and v4.4. Future versions
 should be supported as well, but aren't actively tested at the moment. Make
 sure to open an issue or submit a pull request if you experience any problems
-with MongoDB version > 4.0.
+with a more recent MongoDB versions.
 
 Installation
 ============
diff --git a/docs/Makefile b/docs/Makefile
index 0bf353561..301b44fa8 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -27,6 +27,9 @@ help:
 	@echo "  linkcheck to check all external links for integrity"
 	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
 
+install-deps:
+	-pip install -r requirements.txt
+
 clean:
 	-rm -rf $(BUILDDIR)/*
 

From 8ec0c2a8afd436e51e5a4b2686e7574386018646 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 12 Nov 2021 20:30:34 +0100
Subject: [PATCH 1256/1519] Add download badge and latest pypi version badge

---
 README.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.rst b/README.rst
index a74c26aa8..b678e8bea 100644
--- a/README.rst
+++ b/README.rst
@@ -15,6 +15,12 @@ MongoEngine
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
   :target: https://github.com/ambv/black
 
+.. image:: https://pepy.tech/badge/mongoengine/month
+  :target: https://pepy.tech/project/mongoengine
+
+.. image:: https://img.shields.io/pypi/v/mongoengine.svg
+  :target: https://pypi.python.org/pypi/mongoengine
+
 About
 =====
 MongoEngine is a Python Object-Document Mapper for working with MongoDB.

From dee8d47a7e8a16f01aac504f92564c5a2e14023d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 12 Nov 2021 21:06:18 +0100
Subject: [PATCH 1257/1519] Minor fixes related with recent merge for
 queryset_class

---
 docs/changelog.rst              | 1 +
 mongoengine/document.py         | 7 ++-----
 tests/queryset/test_queryset.py | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5c96e4f15..c49de79ff 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - EnumField improvements: now `choices` limits the values of an enum to allow
+- Fix bug that prevented instance queryset from using custom queryset_class #2589
 - Fix deepcopy of EmbeddedDocument #2202
 - Fix error when using precision=0 with DecimalField #2535
 - Add support for regex and whole word text search query #2568
diff --git a/mongoengine/document.py b/mongoengine/document.py
index a3825d5d2..e56a9e7c2 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -583,11 +583,8 @@ def cascade_save(self, **kwargs):
     def _qs(self):
         """Return the default queryset corresponding to this document."""
         if not hasattr(self, "__objects"):
-            queryset_class = self._meta.get("queryset_class")
-            if queryset_class is not None:
-                self.__objects = queryset_class(self.__class__, self._get_collection())
-            else:
-                self.__objects = QuerySet(self.__class__, self._get_collection())
+            queryset_class = self._meta.get("queryset_class", QuerySet)
+            self.__objects = queryset_class(self.__class__, self._get_collection())
         return self.__objects
 
     @property
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 427e13d10..aafa27711 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -3931,7 +3931,7 @@ class Post(Document):
         Post.drop_collection()
 
         assert isinstance(Post.objects, CustomQuerySet)
-        assert not Post.objects.delete()
+        assert Post.objects.delete() == 0
 
         post = Post()
         post.save()

From 8009c6af097f8e4e1f5d4496e1d1b690b154888c Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Mon, 29 Nov 2021 21:10:50 -0500
Subject: [PATCH 1258/1519] Upon disconnect, clear any and all outstanding
 sessions

---
 mongoengine/connection.py | 5 ++++-
 tests/test_connection.py  | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 6dcef01d8..10a85193b 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -238,7 +238,7 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
     if alias in _connection_settings:
         del _connection_settings[alias]
 
-    _clear_session()
+    _local_sessions.clear_all()
 
 
 def disconnect_all():
@@ -424,6 +424,9 @@ def clear_current(self):
         if len(self.sessions):
             self.sessions.pop()
 
+    def clear_all(self):
+        self.sessions.clear()
+
 
 _local_sessions = _LocalSessions()
 
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 2b7d46a78..f001386c3 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -19,6 +19,7 @@
 from mongoengine.connection import (
     DEFAULT_DATABASE_NAME,
     ConnectionFailure,
+    _local_sessions,
     disconnect,
     get_connection,
     get_db,
@@ -286,6 +287,13 @@ def test_disconnect_silently_pass_if_alias_does_not_exist(self):
         assert len(connections) == 0
         disconnect(alias="not_exist")
 
+    def test_disconnect_clears_out_any_outstanding_sessions(self):
+        _local_sessions.append("session1")
+        _local_sessions.append("session2")
+        assert len(_local_sessions.sessions) == 2
+        disconnect()
+        assert len(_local_sessions.sessions) == 0
+
     def test_disconnect_all(self):
         connections = mongoengine.connection._connections
         dbs = mongoengine.connection._dbs

From 99fb79e1e5f5edce054b1f7c7f62478a89b7b365 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 30 Nov 2021 19:24:49 +0100
Subject: [PATCH 1259/1519] test_against_pymongo312

---
 .github/workflows/github-actions.yml | 4 ++++
 tox.ini                              | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index f5216ee73..66533c13d 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -20,6 +20,7 @@ env:
   PYMONGO_3_6: 3.6
   PYMONGO_3_9: 3.9
   PYMONGO_3_11: 3.11
+  PYMONGO_3_12: 3.12
 
   MAIN_PYTHON_VERSION: 3.7
 
@@ -57,6 +58,9 @@ jobs:
           - python-version: 3.7
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_11
+          - python-version: 3.7
+            MONGODB: $MONGODB_4_4
+            PYMONGO: $PYMONGO_3_12
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/tox.ini b/tox.ini
index 937544d27..9925787b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg34,mg36,mg39,mg311}
+envlist = pypy3-{mg34,mg36,mg39,mg311,mg312}
 
 [testenv]
 commands =
@@ -9,5 +9,6 @@ deps =
     mg36: pymongo>=3.6,<3.7
     mg39: pymongo>=3.9,<3.10
     mg311: pymongo>=3.11,<3.12
+    mg312: pymongo>=3.12,<3.13
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 9711df0d4b601981bf639e53a2c893557b7c0db7 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 1 Dec 2021 22:53:29 +0100
Subject: [PATCH 1260/1519] initial work for supporting recent pymongo 4.0

---
 mongoengine/document.py | 4 ----
 setup.py                | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index e56a9e7c2..5d6a47a0e 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -888,10 +888,6 @@ def ensure_indexes(cls):
         index_cls = cls._meta.get("index_cls", True)
 
         collection = cls._get_collection()
-        # 746: when connection is via mongos, the read preference is not necessarily an indication that
-        # this code runs on a secondary
-        if not collection.is_mongos and collection.read_preference > 1:
-            return
 
         # determine if an index which we are creating includes
         # _cls as its first field; if so, we can avoid creating
diff --git a/setup.py b/setup.py
index bb777da0e..78e20331b 100644
--- a/setup.py
+++ b/setup.py
@@ -142,7 +142,7 @@ def run_tests(self):
     platforms=["any"],
     classifiers=CLASSIFIERS,
     python_requires=">=3.6",
-    install_requires=["pymongo>=3.4, <4.0"],
+    install_requires=["pymongo>=3.4,<=4.0"],
     cmdclass={"test": PyTest},
     **extra_opts
 )

From 6067dde61d6104ec602966acae745a7854388be3 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 1 Dec 2021 22:56:58 +0100
Subject: [PATCH 1261/1519] update ci

---
 .github/workflows/github-actions.yml | 4 ++++
 tox.ini                              | 1 +
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 66533c13d..d75bdb1a0 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -21,6 +21,7 @@ env:
   PYMONGO_3_9: 3.9
   PYMONGO_3_11: 3.11
   PYMONGO_3_12: 3.12
+  PYMONGO_4_0: 4.0
 
   MAIN_PYTHON_VERSION: 3.7
 
@@ -61,6 +62,9 @@ jobs:
           - python-version: 3.7
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_12
+          - python-version: 3.9
+            MONGODB: $MONGODB_4_4
+            PYMONGO: $PYMONGO_4_0
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/tox.ini b/tox.ini
index 9925787b2..98c367b44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,5 +10,6 @@ deps =
     mg39: pymongo>=3.9,<3.10
     mg311: pymongo>=3.11,<3.12
     mg312: pymongo>=3.12,<3.13
+    mg4: pymongo>=4.0,<4.1
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 1f5d2f3a9f88e397808fac560b6c69fe92ff9613 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 1 Dec 2021 23:24:55 +0100
Subject: [PATCH 1262/1519] fix set_profiling_level with db.command()

---
 mongoengine/context_managers.py |  9 +++++----
 tests/test_context_managers.py  | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 0ca2622c5..eb9c99622 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -210,13 +210,14 @@ def __init__(self, alias=DEFAULT_CONNECTION_NAME):
         }
 
     def _turn_on_profiling(self):
-        self.initial_profiling_level = self.db.profiling_level()
-        self.db.set_profiling_level(0)
+        profile_update_res = self.db.command({"profile": 0})
+        self.initial_profiling_level = profile_update_res["was"]
+
         self.db.system.profile.drop()
-        self.db.set_profiling_level(2)
+        self.db.command({"profile": 2})
 
     def _resets_profiling(self):
-        self.db.set_profiling_level(self.initial_profiling_level)
+        self.db.command({"profile": self.initial_profiling_level})
 
     def __enter__(self):
         self._turn_on_profiling()
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 4ea7fa5ab..68dc8f4be 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -269,17 +269,23 @@ def test_query_counter_temporarily_modifies_profiling_level(self):
         connect("mongoenginetest")
         db = get_db()
 
-        initial_profiling_level = db.profiling_level()
+        def _current_profiling_level():
+            return db.command({"profile": -1})["was"]
+
+        def _set_profiling_level(lvl):
+            db.command({"profile": lvl})
+
+        initial_profiling_level = _current_profiling_level()
 
         try:
             new_level = 1
-            db.set_profiling_level(new_level)
-            assert db.profiling_level() == new_level
+            _set_profiling_level(new_level)
+            assert _current_profiling_level() == new_level
             with query_counter():
-                assert db.profiling_level() == 2
-            assert db.profiling_level() == new_level
+                assert _current_profiling_level() == 2
+            assert _current_profiling_level() == new_level
         except Exception:
-            db.set_profiling_level(
+            _set_profiling_level(
                 initial_profiling_level
             )  # Ensures it gets reseted no matter the outcome of the test
             raise

From 8da51bb44635bbaaeee82402bf7cbcad31b84dc0 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 28 Dec 2021 14:51:49 +0100
Subject: [PATCH 1263/1519] improve doc related with recent change

---
 docs/changelog.rst      |  1 +
 docs/guide/querying.rst | 23 +++++++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index c49de79ff..d7b2672f4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,7 @@ Development
 - Fix deepcopy of EmbeddedDocument #2202
 - Fix error when using precision=0 with DecimalField #2535
 - Add support for regex and whole word text search query #2568
+- Add support for update aggregation pipeline #2578
 
 Changes in 0.23.1
 ===========
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 1d7617b40..ba1b1210a 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -218,28 +218,27 @@ However, this doesn't map well to the syntax so you can also use a capital S ins
 
 Raw queries
 -----------
-It is possible to provide a raw :mod:`PyMongo` query as a query parameter or update as a update parameter , which will
-be integrated directly into the query or update. This is done using the ``__raw__``
-keyword argument::
+It is possible to provide a raw :mod:`PyMongo` query as a query parameter, which will
+be integrated directly into the query. This is done using the ``__raw__`` keyword argument::
 
     Page.objects(__raw__={'tags': 'coding'})
 
-    # or for update
-
-    Page.objects(__raw__={'tags': 'coding'}).update(__raw__={'$set': {'tags': 'coding'}})
+Similarly, a raw update can be provided to the :meth:`~mongoengine.queryset.QuerySet.update` method::
 
     Page.objects(tags='coding').update(__raw__={'$set': {'tags': 'coding'}})
 
-.. versionadded:: 0.4
+And the two can also be combined::
+
+    Page.objects(__raw__={'tags': 'coding'}).update(__raw__={'$set': {'tags': 'coding'}})
 
 
 Update with Aggregation Pipeline
------------
+--------------------------------
 It is possible to provide a raw :mod:`PyMongo` aggregation update parameter, which will
-be integrated directly into the update. This is done by using ``__raw__`` field and value of array
-pipeline
+be integrated directly into the update. This is done by using ``__raw__`` keyword argument to the update method
+and provide the pipeline as a list
 `Update with Aggregation Pipeline <https://docs.mongodb.com/manual/reference/method/db.collection.updateMany/#update-with-aggregation->`_
-keyword argument::
+::
 
     # 'tags' field is set to 'coding is fun'
     Page.objects(tags='coding').update(__raw__=[
@@ -247,7 +246,7 @@ keyword argument::
         ],
     )
 
-.. versionadded:: 0.4
+.. versionadded:: 0.23.2
 
 Sorting/Ordering results
 ========================

From eddaf51fde8b2f85fb58c1f7da16b05bbbe768a4 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Wed, 5 Jan 2022 16:55:56 -0800
Subject: [PATCH 1264/1519] feat: handle geohaystack removal

---
 mongoengine/base/document.py   | 18 ++++++++++++-----
 mongoengine/pymongo_support.py |  8 ++------
 tests/document/test_indexes.py | 37 +++++++++++++++++++++-------------
 tox.ini                        |  2 +-
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 46935c1b8..88386510c 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -28,6 +28,11 @@
 
 NON_FIELD_ERRORS = "__all__"
 
+try:
+    GEOHAYSTACK = pymongo.GEOHAYSTACK
+except AttributeError:
+    GEOHAYSTACK = None
+
 
 class BaseDocument:
     # TODO simplify how `_changed_fields` is used.
@@ -898,7 +903,10 @@ def _build_index_spec(cls, spec):
             elif key.startswith("("):
                 direction = pymongo.GEOSPHERE
             elif key.startswith(")"):
-                direction = pymongo.GEOHAYSTACK
+                try:
+                    direction = pymongo.GEOHAYSTACK
+                except AttributeError:
+                    raise NotImplementedError
             elif key.startswith("*"):
                 direction = pymongo.GEO2D
             if key.startswith(("+", "-", "*", "$", "#", "(", ")")):
@@ -923,10 +931,10 @@ def _build_index_spec(cls, spec):
             index_list.append((key, direction))
 
         # Don't add cls to a geo index
-        if include_cls and direction not in (
-            pymongo.GEO2D,
-            pymongo.GEOHAYSTACK,
-            pymongo.GEOSPHERE,
+        if (
+            include_cls
+            and direction not in (pymongo.GEO2D, pymongo.GEOSPHERE)
+            and (GEOHAYSTACK is None or direction != GEOHAYSTACK)
         ):
             index_list.insert(0, ("_cls", 1))
 
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index dc7aaa6bc..05c9e094d 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -4,12 +4,8 @@
 import pymongo
 from pymongo.errors import OperationFailure
 
-_PYMONGO_37 = (3, 7)
-
 PYMONGO_VERSION = tuple(pymongo.version_tuple[:2])
 
-IS_PYMONGO_GTE_37 = PYMONGO_VERSION >= _PYMONGO_37
-
 
 def count_documents(
     collection, filter, skip=None, limit=None, hint=None, collation=None
@@ -29,7 +25,7 @@ def count_documents(
         kwargs["collation"] = collation
 
     # count_documents appeared in pymongo 3.7
-    if IS_PYMONGO_GTE_37:
+    if PYMONGO_VERSION >= (3, 7):
         try:
             return collection.count_documents(filter=filter, **kwargs)
         except OperationFailure:
@@ -49,7 +45,7 @@ def count_documents(
 
 def list_collection_names(db, include_system_collections=False):
     """Pymongo>3.7 deprecates collection_names in favour of list_collection_names"""
-    if IS_PYMONGO_GTE_37:
+    if PYMONGO_VERSION >= (3, 7):
         collections = db.list_collection_names()
     else:
         collections = db.collection_names()
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index e308d12a9..452aa9a4a 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -11,6 +11,7 @@
     MONGODB_42,
     get_mongodb_version,
 )
+from mongoengine.pymongo_support import PYMONGO_VERSION
 
 
 class TestIndexes(unittest.TestCase):
@@ -247,11 +248,9 @@ class Place(Document):
 
     def test_explicit_geohaystack_index(self):
         """Ensure that geohaystack indexes work when created via meta[indexes]"""
-        pytest.skip(
-            "GeoHaystack index creation is not supported for now"
-            "from meta, as it requires a bucketSize parameter."
-        )
-
+        # This test can be removed when pymongo 3.x is no longer supported
+        if PYMONGO_VERSION >= (4,):
+            pytest.skip('GEOHAYSTACK has been removed in pymongo 4.0')
         class Place(Document):
             location = DictField()
             name = StringField()
@@ -261,22 +260,32 @@ class Place(Document):
             {"fields": [("location.point", "geoHaystack"), ("name", 1)]}
         ] == Place._meta["index_specs"]
 
-        Place.ensure_indexes()
-        info = Place._get_collection().index_information()
-        info = [value["key"] for key, value in info.items()]
-        assert [("location.point", "geoHaystack")] in info
+        # GeoHaystack index creation is not supported for now from meta, as it
+        # requires a bucketSize parameter.
+        if False:
+            Place.ensure_indexes()
+            info = Place._get_collection().index_information()
+            info = [value["key"] for key, value in info.items()]
+            assert [("location.point", "geoHaystack")] in info
 
     def test_create_geohaystack_index(self):
         """Ensure that geohaystack indexes can be created"""
-
         class Place(Document):
             location = DictField()
             name = StringField()
 
-        Place.create_index({"fields": (")location.point", "name")}, bucketSize=10)
-        info = Place._get_collection().index_information()
-        info = [value["key"] for key, value in info.items()]
-        assert [("location.point", "geoHaystack"), ("name", 1)] in info
+        # This test can be removed when pymongo 3.x is no longer supported
+        if PYMONGO_VERSION >= (4,):
+            with pytest.raises(NotImplementedError):
+                Place.create_index(
+                    {"fields": (")location.point", "name")},
+                    bucketSize=10,
+                )
+        else:
+            Place.create_index({"fields": (")location.point", "name")}, bucketSize=10)
+            info = Place._get_collection().index_information()
+            info = [value["key"] for key, value in info.items()]
+            assert [("location.point", "geoHaystack"), ("name", 1)] in info
 
     def test_dictionary_indexes(self):
         """Ensure that indexes are used when meta[indexes] contains
diff --git a/tox.ini b/tox.ini
index 98c367b44..783e9f9ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg34,mg36,mg39,mg311,mg312}
+envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4}
 
 [testenv]
 commands =

From da4488eb008bb81b96d62a10307aa2426f6bd4b3 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Wed, 5 Jan 2022 17:28:46 -0800
Subject: [PATCH 1265/1519] feat: handle testing test_indexes failures with
 MongoDB > 4.4

---
 tests/document/test_indexes.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 452aa9a4a..4d56f8553 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -250,7 +250,8 @@ def test_explicit_geohaystack_index(self):
         """Ensure that geohaystack indexes work when created via meta[indexes]"""
         # This test can be removed when pymongo 3.x is no longer supported
         if PYMONGO_VERSION >= (4,):
-            pytest.skip('GEOHAYSTACK has been removed in pymongo 4.0')
+            pytest.skip("GEOHAYSTACK has been removed in pymongo 4.0")
+
         class Place(Document):
             location = DictField()
             name = StringField()
@@ -270,13 +271,21 @@ class Place(Document):
 
     def test_create_geohaystack_index(self):
         """Ensure that geohaystack indexes can be created"""
+
         class Place(Document):
             location = DictField()
             name = StringField()
 
-        # This test can be removed when pymongo 3.x is no longer supported
         if PYMONGO_VERSION >= (4,):
-            with pytest.raises(NotImplementedError):
+            expected_error = NotImplementedError
+        elif get_mongodb_version() >= (4, 9):
+            expected_error = OperationFailure
+        else:
+            expected_error = None
+
+        # This test can be removed when pymongo 3.x is no longer supported
+        if expected_error:
+            with pytest.raises(expected_error):
                 Place.create_index(
                     {"fields": (")location.point", "name")},
                     bucketSize=10,
@@ -558,7 +567,9 @@ class BlogPost(Document):
         incorrect_collation = {"arndom": "wrdo"}
         with pytest.raises(OperationFailure) as exc_info:
             BlogPost.objects.collation(incorrect_collation).count()
-        assert "Missing expected field" in str(exc_info.value)
+        assert "Missing expected field" in str(
+            exc_info.value
+        ) or "unknown field" in str(exc_info.value)
 
         query_result = BlogPost.objects.collation({}).order_by("name")
         assert [x.name for x in query_result] == sorted(names)

From 8790fd885d3efd3af1cd3ed632c89ec92e2f7e0b Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Wed, 5 Jan 2022 17:52:03 -0800
Subject: [PATCH 1266/1519] tests: update max_pool_size moving to
 options.pool_options

---
 tests/test_connection.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 2b7d46a78..c2034518a 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -23,6 +23,7 @@
     get_connection,
     get_db,
 )
+from mongoengine.pymongo_support import PYMONGO_VERSION
 
 
 def get_tz_awareness(connection):
@@ -482,7 +483,10 @@ def test_connection_pool_via_kwarg(self):
         conn = connect(
             "mongoenginetest", alias="max_pool_size_via_kwarg", **pool_size_kwargs
         )
-        assert conn.max_pool_size == 100
+        if PYMONGO_VERSION >= (4,):
+            assert conn.options.pool_options.max_pool_size == 100
+        else:
+            assert conn.max_pool_size == 100
 
     def test_connection_pool_via_uri(self):
         """Ensure we can specify a max connection pool size using
@@ -492,7 +496,10 @@ def test_connection_pool_via_uri(self):
             host="mongodb://localhost/test?maxpoolsize=100",
             alias="max_pool_size_via_uri",
         )
-        assert conn.max_pool_size == 100
+        if PYMONGO_VERSION >= (4,):
+            assert conn.options.pool_options.max_pool_size == 100
+        else:
+            assert conn.max_pool_size == 100
 
     def test_write_concern(self):
         """Ensure write concern can be specified in connect() via

From db51d8a03ee48fa27f026e9b1f96008485461979 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 6 Jan 2022 01:19:22 -0800
Subject: [PATCH 1267/1519] feat: update map_reduce to use db.command

---
 mongoengine/queryset/base.py | 41 ++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 98b4b66e4..bf05ea6c7 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1335,9 +1335,8 @@ def map_reduce(
         :param map_f: map function, as :class:`~bson.code.Code` or string
         :param reduce_f: reduce function, as
                          :class:`~bson.code.Code` or string
-        :param output: output collection name, if set to 'inline' will try to
-           use :class:`~pymongo.collection.Collection.inline_map_reduce`
-           This can also be a dictionary containing output options
+        :param output: output collection name, if set to 'inline' will return
+           the results inline. This can also be a dictionary containing output options
            see: http://docs.mongodb.org/manual/reference/command/mapReduce/#dbcmd.mapReduce
         :param finalize_f: finalize function, an optional function that
                            performs any post-reduction processing.
@@ -1347,12 +1346,6 @@ def map_reduce(
 
         Returns an iterator yielding
         :class:`~mongoengine.document.MapReduceDocument`.
-
-        .. note::
-
-            Map/Reduce changed in server version **>= 1.7.4**. The PyMongo
-            :meth:`~pymongo.collection.Collection.map_reduce` helper requires
-            PyMongo version **>= 1.11**.
         """
         queryset = self.clone()
 
@@ -1389,10 +1382,10 @@ def map_reduce(
             mr_args["limit"] = limit
 
         if output == "inline" and not queryset._ordering:
-            map_reduce_function = "inline_map_reduce"
+            inline = True
+            mr_args["out"] = {"inline": 1}
         else:
-            map_reduce_function = "map_reduce"
-
+            inline = False
             if isinstance(output, str):
                 mr_args["out"] = output
 
@@ -1422,17 +1415,29 @@ def map_reduce(
 
                 mr_args["out"] = SON(ordered_output)
 
-        results = getattr(queryset._collection, map_reduce_function)(
-            map_f, reduce_f, **mr_args
+        db = queryset._document._get_db()
+        result = db.command(
+            {
+                "mapReduce": queryset._document._get_collection_name(),
+                "map": map_f,
+                "reduce": reduce_f,
+                **mr_args,
+            }
         )
 
-        if map_reduce_function == "map_reduce":
-            results = results.find()
+        if inline:
+            docs = result["results"]
+        else:
+            if isinstance(result["result"], str):
+                docs = db[result["result"]].find()
+            else:
+                info = result["result"]
+                docs = db.client[info["db"]][info["collection"]].find()
 
         if queryset._ordering:
-            results = results.sort(queryset._ordering)
+            docs = docs.sort(queryset._ordering)
 
-        for doc in results:
+        for doc in docs:
             yield MapReduceDocument(
                 queryset._document, queryset._collection, doc["_id"], doc["value"]
             )

From 56bba1afc6b7ac39277c23019e3edf99123d4117 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 6 Jan 2022 10:29:56 -0800
Subject: [PATCH 1268/1519] feat: handle eval removal

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index bf05ea6c7..1b1dba8f0 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1481,7 +1481,7 @@ def exec_js(self, code, *fields, **options):
         code = Code(code, scope=scope)
 
         db = queryset._document._get_db()
-        return db.eval(code, *fields)
+        return db.command("eval", code, args=fields).get("retval")
 
     def where(self, where_clause):
         """Filter ``QuerySet`` results with a ``$where`` clause (a Javascript

From f930aabe223b6d794956ee32ff70a98e1e15ed48 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 6 Jan 2022 11:34:45 -0800
Subject: [PATCH 1269/1519] feat: use legacy python UUID encoding by default if
 unspecified

---
 mongoengine/base/document.py   | 24 ++++++++++++++++++++++--
 mongoengine/connection.py      | 14 ++++++++++++++
 mongoengine/pymongo_support.py |  7 ++++++-
 mongoengine/queryset/base.py   | 14 +++++++++++++-
 4 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 88386510c..7a1de50e3 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1,5 +1,6 @@
 import copy
 import numbers
+import warnings
 from functools import partial
 
 import pymongo
@@ -23,6 +24,7 @@
     OperationError,
     ValidationError,
 )
+from mongoengine.pymongo_support import LEGACY_JSON_OPTIONS
 
 __all__ = ("BaseDocument", "NON_FIELD_ERRORS")
 
@@ -444,10 +446,19 @@ def to_json(self, *args, **kwargs):
             Defaults to True.
         """
         use_db_field = kwargs.pop("use_db_field", True)
+        if "json_options" not in kwargs:
+            warnings.warn(
+                "No 'json_options' are specified! Falling back to "
+                "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
+                "For use with other MongoDB drivers specify the UUID "
+                "representation to use.",
+                DeprecationWarning,
+            )
+            kwargs["json_options"] = LEGACY_JSON_OPTIONS
         return json_util.dumps(self.to_mongo(use_db_field), *args, **kwargs)
 
     @classmethod
-    def from_json(cls, json_data, created=False):
+    def from_json(cls, json_data, created=False, **kwargs):
         """Converts json data to a Document instance
 
         :param str json_data: The json data to load into the Document
@@ -465,7 +476,16 @@ def from_json(cls, json_data, created=False):
         # TODO should `created` default to False? If the object already exists
         # in the DB, you would likely retrieve it from MongoDB itself through
         # a query, not load it from JSON data.
-        return cls._from_son(json_util.loads(json_data), created=created)
+        if "json_options" not in kwargs:
+            warnings.warn(
+                "No 'json_options' are specified! Falling back to "
+                "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
+                "For use with other MongoDB drivers specify the UUID "
+                "representation to use.",
+                DeprecationWarning,
+            )
+            kwargs["json_options"] = LEGACY_JSON_OPTIONS
+        return cls._from_son(json_util.loads(json_data, **kwargs), created=created)
 
     def __expand_dynamic_values(self, name, value):
         """Expand any dynamic values to their correct types / values."""
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index e9078a2e7..522826165 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,3 +1,5 @@
+import warnings
+
 from pymongo import MongoClient, ReadPreference, uri_parser
 from pymongo.database import _check_name
 
@@ -162,6 +164,18 @@ def _get_connection_settings(
     kwargs.pop("slaves", None)
     kwargs.pop("is_slave", None)
 
+    if "uuidRepresentation" not in kwargs:
+        warnings.warn(
+            "No uuidRepresentation is specified! Falling back to "
+            "'pythonLegacy' which is the default for pymongo 3.x. "
+            "For compatibility with other MongoDB drivers this should be "
+            "specified as 'standard' or '{java,csharp}Legacy' to work with "
+            "older drivers in those languages. This will be changed to "
+            "'standard' in a future release.",
+            DeprecationWarning,
+        )
+        kwargs["uuidRepresentation"] = "pythonLegacy"
+
     conn_settings.update(kwargs)
     return conn_settings
 
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 05c9e094d..f3f9dea79 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -1,11 +1,16 @@
 """
-Helper functions, constants, and types to aid with PyMongo v2.7 - v3.x support.
+Helper functions, constants, and types to aid with PyMongo support.
 """
 import pymongo
+from bson import binary, json_util
 from pymongo.errors import OperationFailure
 
 PYMONGO_VERSION = tuple(pymongo.version_tuple[:2])
 
+LEGACY_JSON_OPTIONS = json_util.LEGACY_JSON_OPTIONS.with_options(
+    uuid_representation=binary.UuidRepresentation.PYTHON_LEGACY,
+)
+
 
 def count_documents(
     collection, filter, skip=None, limit=None, hint=None, collation=None
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 1b1dba8f0..d3efe3f74 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -28,7 +28,10 @@
     NotUniqueError,
     OperationError,
 )
-from mongoengine.pymongo_support import count_documents
+from mongoengine.pymongo_support import (
+    LEGACY_JSON_OPTIONS,
+    count_documents,
+)
 from mongoengine.queryset import transform
 from mongoengine.queryset.field_list import QueryFieldList
 from mongoengine.queryset.visitor import Q, QNode
@@ -1266,6 +1269,15 @@ def max_time_ms(self, ms):
 
     def to_json(self, *args, **kwargs):
         """Converts a queryset to JSON"""
+        if "json_options" not in kwargs:
+            warnings.warn(
+                "No 'json_options' are specified! Falling back to "
+                "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
+                "For use with other MongoDB drivers specify the UUID "
+                "representation to use.",
+                DeprecationWarning,
+            )
+            kwargs["json_options"] = LEGACY_JSON_OPTIONS
         return json_util.dumps(self.as_pymongo(), *args, **kwargs)
 
     def from_json(self, json_data):

From e071bd19fefebafc5f60769124120d4c3426c6d8 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 6 Jan 2022 12:22:32 -0800
Subject: [PATCH 1270/1519] tests: update for SON.keys() no longer returning
 lists

---
 tests/document/test_dynamic.py     |  4 ++--
 tests/document/test_inheritance.py | 10 +++++++---
 tests/document/test_instance.py    | 10 +++++++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/tests/document/test_dynamic.py b/tests/document/test_dynamic.py
index 909c6f796..170b2ea3d 100644
--- a/tests/document/test_dynamic.py
+++ b/tests/document/test_dynamic.py
@@ -28,9 +28,9 @@ def test_simple_dynamic_document(self):
         p.age = 34
 
         assert p.to_mongo() == {"_cls": "Person", "name": "James", "age": 34}
-        assert p.to_mongo().keys() == ["_cls", "name", "age"]
+        assert sorted(p.to_mongo().keys()) == ["_cls", "age", "name"]
         p.save()
-        assert p.to_mongo().keys() == ["_id", "_cls", "name", "age"]
+        assert sorted(p.to_mongo().keys()) == ["_cls", "_id", "age", "name"]
 
         assert self.Person.objects.first().age == 34
 
diff --git a/tests/document/test_inheritance.py b/tests/document/test_inheritance.py
index 550a4bdf3..09a207d5a 100644
--- a/tests/document/test_inheritance.py
+++ b/tests/document/test_inheritance.py
@@ -246,11 +246,15 @@ class Employee(Person):
         assert ["_cls", "age", "id", "name", "salary"] == sorted(
             Employee._fields.keys()
         )
-        assert Person(name="Bob", age=35).to_mongo().keys() == ["_cls", "name", "age"]
-        assert Employee(name="Bob", age=35, salary=0).to_mongo().keys() == [
+        assert sorted(Person(name="Bob", age=35).to_mongo().keys()) == [
             "_cls",
+            "age",
             "name",
+        ]
+        assert sorted(Employee(name="Bob", age=35, salary=0).to_mongo().keys()) == [
+            "_cls",
             "age",
+            "name",
             "salary",
         ]
         assert Employee._get_collection_name() == Person._get_collection_name()
@@ -334,7 +338,7 @@ class Dog(Animal):
 
         # Check that _cls etc aren't present on simple documents
         dog = Animal(name="dog").save()
-        assert dog.to_mongo().keys() == ["_id", "name"]
+        assert sorted(dog.to_mongo().keys()) == ["_id", "name"]
 
         collection = self.db[Animal._get_collection_name()]
         obj = collection.find_one()
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index cd8e9b1b0..3dabaabca 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -704,11 +704,15 @@ class Person(EmbeddedDocument):
         class Employee(Person):
             salary = IntField()
 
-        assert Person(name="Bob", age=35).to_mongo().keys() == ["_cls", "name", "age"]
-        assert Employee(name="Bob", age=35, salary=0).to_mongo().keys() == [
+        assert sorted(Person(name="Bob", age=35).to_mongo().keys()) == [
             "_cls",
+            "age",
             "name",
+        ]
+        assert sorted(Employee(name="Bob", age=35, salary=0).to_mongo().keys()) == [
+            "_cls",
             "age",
+            "name",
             "salary",
         ]
 
@@ -717,7 +721,7 @@ class SubDoc(EmbeddedDocument):
             id = StringField(required=True)
 
         sub_doc = SubDoc(id="abc")
-        assert sub_doc.to_mongo().keys() == ["id"]
+        assert list(sub_doc.to_mongo().keys()) == ["id"]
 
     def test_embedded_document(self):
         """Ensure that embedded documents are set up correctly."""

From f31199a773ba549d0ca7e68aad035356f5c163ba Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 6 Jan 2022 12:37:28 -0800
Subject: [PATCH 1271/1519] tests: fix monkeypatching removed collection.update

---
 tests/document/test_instance.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 3dabaabca..84a507461 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -2755,17 +2755,17 @@ class Person(Document):
 
         from pymongo.collection import Collection
 
-        orig_update = Collection.update
+        orig_update_one = Collection.update_one
         try:
 
-            def fake_update(*args, **kwargs):
+            def fake_update_one(*args, **kwargs):
                 self.fail("Unexpected update for %s" % args[0].name)
-                return orig_update(*args, **kwargs)
+                return orig_update_one(*args, **kwargs)
 
-            Collection.update = fake_update
+            Collection.update_one = fake_update_one
             person.save()
         finally:
-            Collection.update = orig_update
+            Collection.update_one = orig_update_one
 
     def test_db_alias_tests(self):
         """DB Alias tests."""

From 316e0bfbe06587ef8f2801574d1913440ab10119 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 6 Jan 2022 12:53:44 -0800
Subject: [PATCH 1272/1519] feat: narrow count_documents fall back to
 deprecated count

---
 mongoengine/pymongo_support.py  | 17 +++++++++++++++--
 tests/document/test_instance.py | 11 +++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index f3f9dea79..44c2bb5d3 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -33,12 +33,25 @@ def count_documents(
     if PYMONGO_VERSION >= (3, 7):
         try:
             return collection.count_documents(filter=filter, **kwargs)
-        except OperationFailure:
+        except OperationFailure as err:
+            if PYMONGO_VERSION >= (4,):
+                raise
+
             # OperationFailure - accounts for some operators that used to work
             # with .count but are no longer working with count_documents (i.e $geoNear, $near, and $nearSphere)
             # fallback to deprecated Cursor.count
             # Keeping this should be reevaluated the day pymongo removes .count entirely
-            pass
+            message = str(err)
+            if not (
+                "not allowed in this context" in message
+                and (
+                    "$where" in message
+                    or "$geoNear" in message
+                    or "$near" in message
+                    or "$nearSphere" in message
+                )
+            ):
+                raise
 
     cursor = collection.find(filter)
     for option, option_value in kwargs.items():
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 84a507461..1f9a76b47 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -28,7 +28,10 @@
     MONGODB_36,
     get_mongodb_version,
 )
-from mongoengine.pymongo_support import list_collection_names
+from mongoengine.pymongo_support import (
+    PYMONGO_VERSION,
+    list_collection_names,
+)
 from mongoengine.queryset import NULLIFY, Q
 from tests import fixtures
 from tests.fixtures import (
@@ -2943,7 +2946,11 @@ def __str__(self):
             }
         )
         assert [str(b) for b in custom_qs] == ["1", "2"]
-        assert custom_qs.count() == 2
+
+        # count only will work with this raw query before pymongo 4.x, but
+        # the length is also implicitly checked above
+        if PYMONGO_VERSION < (4,):
+            assert custom_qs.count() == 2
 
     def test_switch_db_instance(self):
         register_connection("testdb-1", "mongoenginetest2")

From 3e84beec8467834cc8129f72634c6a3ab055ec20 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 6 Jan 2022 16:18:57 -0800
Subject: [PATCH 1273/1519] tests: update geo tests to not use .count() on
 queries that cannot use count_documents

---
 tests/queryset/test_geo.py | 209 +++++++++++++++++++++++--------------
 1 file changed, 132 insertions(+), 77 deletions(-)

diff --git a/tests/queryset/test_geo.py b/tests/queryset/test_geo.py
index 0fe3af97a..670cf38db 100644
--- a/tests/queryset/test_geo.py
+++ b/tests/queryset/test_geo.py
@@ -2,6 +2,7 @@
 import unittest
 
 from mongoengine import *
+from mongoengine.pymongo_support import PYMONGO_VERSION
 from tests.utils import MongoDBTestCase
 
 
@@ -47,13 +48,15 @@ def test_near(self):
         # note that "near" will show the san francisco event, too,
         # although it sorts to last.
         events = self.Event.objects(location__near=[-87.67892, 41.9120459])
-        assert events.count() == 3
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 3
         assert list(events) == [event1, event3, event2]
 
         # ensure ordering is respected by "near"
         events = self.Event.objects(location__near=[-87.67892, 41.9120459])
         events = events.order_by("-date")
-        assert events.count() == 3
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 3
         assert list(events) == [event3, event1, event2]
 
     def test_near_and_max_distance(self):
@@ -65,8 +68,9 @@ def test_near_and_max_distance(self):
         # find events within 10 degrees of san francisco
         point = [-122.415579, 37.7566023]
         events = self.Event.objects(location__near=point, location__max_distance=10)
-        assert events.count() == 1
-        assert events[0] == event2
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 1
+        assert list(events) == [event2]
 
     def test_near_and_min_distance(self):
         """Ensure the "min_distance" operator works alongside the "near"
@@ -77,7 +81,9 @@ def test_near_and_min_distance(self):
         # find events at least 10 degrees away of san francisco
         point = [-122.415579, 37.7566023]
         events = self.Event.objects(location__near=point, location__min_distance=10)
-        assert events.count() == 2
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 2
+        assert list(events) == [event3, event1]
 
     def test_within_distance(self):
         """Make sure the "within_distance" operator works."""
@@ -153,13 +159,15 @@ def test_2dsphere_near(self):
         # note that "near" will show the san francisco event, too,
         # although it sorts to last.
         events = self.Event.objects(location__near=[-87.67892, 41.9120459])
-        assert events.count() == 3
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 3
         assert list(events) == [event1, event3, event2]
 
         # ensure ordering is respected by "near"
         events = self.Event.objects(location__near=[-87.67892, 41.9120459])
         events = events.order_by("-date")
-        assert events.count() == 3
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 3
         assert list(events) == [event3, event1, event2]
 
     def test_2dsphere_near_and_max_distance(self):
@@ -171,21 +179,25 @@ def test_2dsphere_near_and_max_distance(self):
         # find events within 10km of san francisco
         point = [-122.415579, 37.7566023]
         events = self.Event.objects(location__near=point, location__max_distance=10000)
-        assert events.count() == 1
-        assert events[0] == event2
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 1
+        assert list(events) == [event2]
 
         # find events within 1km of greenpoint, broolyn, nyc, ny
         events = self.Event.objects(
             location__near=[-73.9509714, 40.7237134], location__max_distance=1000
         )
-        assert events.count() == 0
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 0
+        assert list(events) == []
 
         # ensure ordering is respected by "near"
         events = self.Event.objects(
             location__near=[-87.67892, 41.9120459], location__max_distance=10000
         ).order_by("-date")
-        assert events.count() == 2
-        assert events[0] == event3
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 2
+        assert list(events) == [event3, event1]
 
     def test_2dsphere_geo_within_box(self):
         """Ensure the "geo_within_box" operator works with a 2dsphere
@@ -236,15 +248,17 @@ def test_2dsphere_near_and_min_max_distance(self):
             location__min_distance=1000,
             location__max_distance=10000,
         ).order_by("-date")
-        assert events.count() == 1
-        assert events[0] == event3
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 1
+        assert list(events) == [event3]
 
         # ensure ordering is respected by "near" with "min_distance"
         events = self.Event.objects(
             location__near=[-87.67892, 41.9120459], location__min_distance=10000
         ).order_by("-date")
-        assert events.count() == 1
-        assert events[0] == event2
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 1
+        assert list(events) == [event2]
 
     def test_2dsphere_geo_within_center(self):
         """Make sure the "geo_within_center" operator works with a
@@ -289,7 +303,8 @@ class Event(Document):
         # note that "near" will show the san francisco event, too,
         # although it sorts to last.
         events = Event.objects(venue__location__near=[-87.67892, 41.9120459])
-        assert events.count() == 3
+        if PYMONGO_VERSION < (4,):
+            assert events.count() == 3
         assert list(events) == [event1, event3, event2]
 
     def test_geo_spatial_embedded(self):
@@ -318,7 +333,9 @@ class Point(Document):
         # Finds both points because they are within 60 km of the reference
         # point equidistant between them.
         points = Point.objects(location__near_sphere=[-122, 37.5])
-        assert points.count() == 2
+        if PYMONGO_VERSION < (4,):
+            assert points.count() == 2
+        assert list(points) == [north_point, south_point]
 
         # Same behavior for _within_spherical_distance
         points = Point.objects(
@@ -329,36 +346,42 @@ class Point(Document):
         points = Point.objects(
             location__near_sphere=[-122, 37.5], location__max_distance=60 / earth_radius
         )
-        assert points.count() == 2
+        if PYMONGO_VERSION < (4,):
+            assert points.count() == 2
+        assert list(points) == [north_point, south_point]
 
         # Test query works with max_distance, being farer from one point
         points = Point.objects(
             location__near_sphere=[-122, 37.8], location__max_distance=60 / earth_radius
         )
         close_point = points.first()
-        assert points.count() == 1
+        if PYMONGO_VERSION < (4,):
+            assert points.count() == 1
+        assert list(points) == [north_point]
 
         # Test query works with min_distance, being farer from one point
         points = Point.objects(
             location__near_sphere=[-122, 37.8], location__min_distance=60 / earth_radius
         )
-        assert points.count() == 1
+        if PYMONGO_VERSION < (4,):
+            assert points.count() == 1
         far_point = points.first()
+        assert list(points) == [south_point]
         assert close_point != far_point
 
         # Finds both points, but orders the north point first because it's
         # closer to the reference point to the north.
         points = Point.objects(location__near_sphere=[-122, 38.5])
-        assert points.count() == 2
-        assert points[0].id == north_point.id
-        assert points[1].id == south_point.id
+        if PYMONGO_VERSION < (4,):
+            assert points.count() == 2
+        assert list(points) == [north_point, south_point]
 
         # Finds both points, but orders the south point first because it's
         # closer to the reference point to the south.
         points = Point.objects(location__near_sphere=[-122, 36.5])
-        assert points.count() == 2
-        assert points[0].id == south_point.id
-        assert points[1].id == north_point.id
+        if PYMONGO_VERSION < (4,):
+            assert points.count() == 2
+        assert list(points) == [south_point, north_point]
 
         # Finds only one point because only the first point is within 60km of
         # the reference point to the south.
@@ -375,56 +398,72 @@ class Road(Document):
 
         Road.drop_collection()
 
-        Road(name="66", line=[[40, 5], [41, 6]]).save()
+        road = Road(name="66", line=[[40, 5], [41, 6]])
+        road.save()
 
         # near
         point = {"type": "Point", "coordinates": [40, 5]}
-        roads = Road.objects.filter(line__near=point["coordinates"]).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__near=point["coordinates"])
+        if PYMONGO_VERSION < (4,):
+            assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(line__near=point).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__near=point)
+        if PYMONGO_VERSION < (4,):
+            assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(line__near={"$geometry": point}).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__near={"$geometry": point})
+        if PYMONGO_VERSION < (4,):
+            assert roads.count() == 1
+        assert list(roads) == [road]
 
         # Within
         polygon = {
             "type": "Polygon",
             "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
         }
-        roads = Road.objects.filter(line__geo_within=polygon["coordinates"]).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__geo_within=polygon["coordinates"])
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(line__geo_within=polygon).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__geo_within=polygon)
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(line__geo_within={"$geometry": polygon}).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__geo_within={"$geometry": polygon})
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
         # Intersects
         line = {"type": "LineString", "coordinates": [[40, 5], [40, 6]]}
-        roads = Road.objects.filter(line__geo_intersects=line["coordinates"]).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__geo_intersects=line["coordinates"])
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(line__geo_intersects=line).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__geo_intersects=line)
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(line__geo_intersects={"$geometry": line}).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__geo_intersects={"$geometry": line})
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
         polygon = {
             "type": "Polygon",
             "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
         }
-        roads = Road.objects.filter(line__geo_intersects=polygon["coordinates"]).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__geo_intersects=polygon["coordinates"])
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(line__geo_intersects=polygon).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__geo_intersects=polygon)
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(line__geo_intersects={"$geometry": polygon}).count()
-        assert 1 == roads
+        roads = Road.objects.filter(line__geo_intersects={"$geometry": polygon})
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
     def test_polygon(self):
         class Road(Document):
@@ -433,56 +472,72 @@ class Road(Document):
 
         Road.drop_collection()
 
-        Road(name="66", poly=[[[40, 5], [40, 6], [41, 6], [40, 5]]]).save()
+        road = Road(name="66", poly=[[[40, 5], [40, 6], [41, 6], [40, 5]]])
+        road.save()
 
         # near
         point = {"type": "Point", "coordinates": [40, 5]}
-        roads = Road.objects.filter(poly__near=point["coordinates"]).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__near=point["coordinates"])
+        if PYMONGO_VERSION < (4,):
+            assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(poly__near=point).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__near=point)
+        if PYMONGO_VERSION < (4,):
+            assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(poly__near={"$geometry": point}).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__near={"$geometry": point})
+        if PYMONGO_VERSION < (4,):
+            assert roads.count() == 1
+        assert list(roads) == [road]
 
         # Within
         polygon = {
             "type": "Polygon",
             "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
         }
-        roads = Road.objects.filter(poly__geo_within=polygon["coordinates"]).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__geo_within=polygon["coordinates"])
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(poly__geo_within=polygon).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__geo_within=polygon)
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(poly__geo_within={"$geometry": polygon}).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__geo_within={"$geometry": polygon})
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
         # Intersects
         line = {"type": "LineString", "coordinates": [[40, 5], [41, 6]]}
-        roads = Road.objects.filter(poly__geo_intersects=line["coordinates"]).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__geo_intersects=line["coordinates"])
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(poly__geo_intersects=line).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__geo_intersects=line)
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(poly__geo_intersects={"$geometry": line}).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__geo_intersects={"$geometry": line})
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
         polygon = {
             "type": "Polygon",
             "coordinates": [[[40, 5], [40, 6], [41, 6], [41, 5], [40, 5]]],
         }
-        roads = Road.objects.filter(poly__geo_intersects=polygon["coordinates"]).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__geo_intersects=polygon["coordinates"])
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(poly__geo_intersects=polygon).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__geo_intersects=polygon)
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
-        roads = Road.objects.filter(poly__geo_intersects={"$geometry": polygon}).count()
-        assert 1 == roads
+        roads = Road.objects.filter(poly__geo_intersects={"$geometry": polygon})
+        assert roads.count() == 1
+        assert list(roads) == [road]
 
     def test_aspymongo_with_only(self):
         """Ensure as_pymongo works with only"""

From 389fe1ef62efb1edfd03aa393b10aa05797a7e72 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 6 Jan 2022 17:05:03 -0800
Subject: [PATCH 1274/1519] feat: handle db.authenticate removal

---
 mongoengine/connection.py | 44 ++++++++++++++++++++++++++-------------
 tests/test_connection.py  | 19 ++++++++++++-----
 2 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 522826165..bbc98f17d 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -3,6 +3,8 @@
 from pymongo import MongoClient, ReadPreference, uri_parser
 from pymongo.database import _check_name
 
+from mongoengine.pymongo_support import PYMONGO_VERSION
+
 __all__ = [
     "DEFAULT_CONNECTION_NAME",
     "DEFAULT_DATABASE_NAME",
@@ -277,15 +279,25 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
         raise ConnectionFailure(msg)
 
     def _clean_settings(settings_dict):
-        irrelevant_fields_set = {
-            "name",
-            "username",
-            "password",
-            "authentication_source",
-            "authentication_mechanism",
-        }
+        if PYMONGO_VERSION < (4,):
+            irrelevant_fields_set = {
+                "name",
+                "username",
+                "password",
+                "authentication_source",
+                "authentication_mechanism",
+            }
+            rename_fields = {}
+        else:
+            irrelevant_fields_set = {"name"}
+            rename_fields = {
+                "authentication_source": "authSource",
+                "authentication_mechanism": "authMechanism",
+            }
         return {
-            k: v for k, v in settings_dict.items() if k not in irrelevant_fields_set
+            rename_fields.get(k, k): v
+            for k, v in settings_dict.items()
+            if k not in irrelevant_fields_set and v is not None
         }
 
     raw_conn_settings = _connection_settings[alias].copy()
@@ -365,14 +377,18 @@ def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
         conn = get_connection(alias)
         conn_settings = _connection_settings[alias]
         db = conn[conn_settings["name"]]
-        auth_kwargs = {"source": conn_settings["authentication_source"]}
-        if conn_settings["authentication_mechanism"] is not None:
-            auth_kwargs["mechanism"] = conn_settings["authentication_mechanism"]
         # Authenticate if necessary
-        if conn_settings["username"] and (
-            conn_settings["password"]
-            or conn_settings["authentication_mechanism"] == "MONGODB-X509"
+        if (
+            PYMONGO_VERSION < (4,)
+            and conn_settings["username"]
+            and (
+                conn_settings["password"]
+                or conn_settings["authentication_mechanism"] == "MONGODB-X509"
+            )
         ):
+            auth_kwargs = {"source": conn_settings["authentication_source"]}
+            if conn_settings["authentication_mechanism"] is not None:
+                auth_kwargs["mechanism"] = conn_settings["authentication_mechanism"]
             db.authenticate(
                 conn_settings["username"], conn_settings["password"], **auth_kwargs
             )
diff --git a/tests/test_connection.py b/tests/test_connection.py
index c2034518a..4fb147561 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -351,8 +351,14 @@ def test_connect_uri(self):
         c.mongoenginetest.system.users.delete_many({})
 
         c.admin.command("createUser", "admin", pwd="password", roles=["root"])
-        c.admin.authenticate("admin", "password")
-        c.admin.command("createUser", "username", pwd="password", roles=["dbOwner"])
+
+        adminadmin_settings = mongoengine.connection._connection_settings[
+            "adminadmin"
+        ] = mongoengine.connection._connection_settings["admin"].copy()
+        adminadmin_settings["username"] = "admin"
+        adminadmin_settings["password"] = "password"
+        ca = connect(db="mongoenginetest", alias="adminadmin")
+        ca.admin.command("createUser", "username", pwd="password", roles=["dbOwner"])
 
         connect(
             "testdb_uri", host="mongodb://username:password@localhost/mongoenginetest"
@@ -406,7 +412,10 @@ def test_uri_without_credentials_doesnt_override_conn_settings(self):
         # w/ the provided username/password and failed - that's the desired
         # behavior. If the MongoDB URI would override the credentials
         with pytest.raises(OperationFailure):
-            get_db()
+            db = get_db()
+            # pymongo 4.x does not call db.authenticate and needs to perform an operation to trigger the failure
+            if PYMONGO_VERSION >= (4,):
+                db.list_collection_names()
 
     def test_connect_uri_with_authsource(self):
         """Ensure that the connect() method works well with `authSource`
@@ -574,8 +583,8 @@ def test_connect_2_databases_uses_same_client_if_only_dbname_differs(self):
         assert c1 is c2
 
     def test_connect_2_databases_uses_different_client_if_different_parameters(self):
-        c1 = connect(alias="testdb1", db="testdb1", username="u1")
-        c2 = connect(alias="testdb2", db="testdb2", username="u2")
+        c1 = connect(alias="testdb1", db="testdb1", username="u1", password="pass")
+        c2 = connect(alias="testdb2", db="testdb2", username="u2", password="pass")
         assert c1 is not c2
 
 

From 1e231a3317dbff8a369f743e6e470b01839ec1ef Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 6 Jan 2022 17:13:13 -0800
Subject: [PATCH 1275/1519] fix: fix json_options for pymongo 3.9

---
 mongoengine/pymongo_support.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 44c2bb5d3..fcddbf7b2 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -7,9 +7,12 @@
 
 PYMONGO_VERSION = tuple(pymongo.version_tuple[:2])
 
-LEGACY_JSON_OPTIONS = json_util.LEGACY_JSON_OPTIONS.with_options(
-    uuid_representation=binary.UuidRepresentation.PYTHON_LEGACY,
-)
+if PYMONGO_VERSION >= (4,):
+    LEGACY_JSON_OPTIONS = json_util.LEGACY_JSON_OPTIONS.with_options(
+        uuid_representation=binary.UuidRepresentation.PYTHON_LEGACY,
+    )
+else:
+    LEGACY_JSON_OPTIONS = json_util.DEFAULT_JSON_OPTIONS
 
 
 def count_documents(

From d86dabaa60bf82c762e407ec42930e932a036e78 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Mon, 24 Jan 2022 09:49:39 -0800
Subject: [PATCH 1276/1519] tests: update connection test to be more specific
 based on PR review

---
 tests/test_connection.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 4fb147561..a9c56d63b 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -411,11 +411,14 @@ def test_uri_without_credentials_doesnt_override_conn_settings(self):
         # OperationFailure means that mongoengine attempted authentication
         # w/ the provided username/password and failed - that's the desired
         # behavior. If the MongoDB URI would override the credentials
-        with pytest.raises(OperationFailure):
-            db = get_db()
-            # pymongo 4.x does not call db.authenticate and needs to perform an operation to trigger the failure
-            if PYMONGO_VERSION >= (4,):
+        if PYMONGO_VERSION >= (4,):
+            with pytest.raises(OperationFailure):
+                db = get_db()
+                # pymongo 4.x does not call db.authenticate and needs to perform an operation to trigger the failure
                 db.list_collection_names()
+        else:
+            with pytest.raises(OperationFailure):
+                db = get_db()
 
     def test_connect_uri_with_authsource(self):
         """Ensure that the connect() method works well with `authSource`

From 2f29d6912fcf80cc5f3707062969311473311f36 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Mon, 24 Jan 2022 13:09:53 -0800
Subject: [PATCH 1277/1519] docs: update documentation based on changes

---
 AUTHORS            |  1 +
 docs/changelog.rst | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 60663940a..40508b532 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -263,3 +263,4 @@ that much better:
  * Timothé Perez (https://github.com/AchilleAsh)
  * oleksandr-l5 (https://github.com/oleksandr-l5)
  * Ido Shraga (https://github.com/idoshr)
+ * Terence Honles (https://github.com/terencehonles)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c49de79ff..32cfdfdb9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,11 +7,41 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- EnumField improvements: now `choices` limits the values of an enum to allow
+- EnumField improvements: now ``choices`` limits the values of an enum to allow
 - Fix bug that prevented instance queryset from using custom queryset_class #2589
 - Fix deepcopy of EmbeddedDocument #2202
 - Fix error when using precision=0 with DecimalField #2535
 - Add support for regex and whole word text search query #2568
+- BREAKING CHANGE: Updates to support pymongo 4.0. Where possible deprecated
+  functionality has been migrated, but additional care should be taken when
+  migrating to pymongo 4.0 as existing code may have been using deprecated
+  features which have now been removed #2614.
+
+  For the pymongo migration guide see:
+  https://pymongo.readthedocs.io/en/stable/migrate-to-pymongo4.html.
+
+  In addition to the changes in the migration guide, the following is a high
+  level overview of the changes made to MongoEngine when using pymongo 4.0:
+
+  - limited support of geohaystack indexes has been removed
+  - ``QuerySet.map_reduce`` has been migrated from ``Collection.map_reduce``
+    and ``Collection.inline_map_reduce`` to use
+    ``db.command({mapReduce: ..., ...})`` and support between the two may need
+    additional verification.
+  - UUIDs are encoded with the ``pythonLegacy`` encoding by default instead of
+    the newer and cross platform ``standard`` encoding. Existing UUIDs will
+    need to be migrated before changing the encoding, and this should be done
+    explicitly by the user rather than switching to a new default by
+    MongoEngine. This default will change at a later date, but to allow
+    specifying and then migrating to the new format a default ``json_options``
+    has been provided.
+  - ``Queryset.count`` has been using ``Collection.count_documents`` and
+    transparently falling back to ``Collection.count`` when using features that
+    are not supported by ``Collection.count_documents``. ``Collection.count``
+    has been removed and no automatic fallback is possible. The migration guide
+    documents the extended functionality which is no longer supported. Rewrite
+    the unsupported queries or fetch the whole result set and perform the count
+    locally.
 
 Changes in 0.23.1
 ===========

From d7a6b02dd211ca93152c0dd13610bedfa6926de7 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Thu, 27 Jan 2022 16:45:37 -0500
Subject: [PATCH 1278/1519] Reset map reduce function definition

---
 mongoengine/queryset/base.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index c75d3c8d8..ebf41fbac 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1751,28 +1751,28 @@ def no_dereference(self):
 
     def _item_frequencies_map_reduce(self, field, normalize=False):
         map_func = """
-            function() {{
-                var path = '{{{{~{field}}}}}'.split('.');
+            function() {
+                var path = '{{~%(field)s}}'.split('.');
                 var field = this;
-                for (p in path) {{
+                for (p in path) {
                     if (typeof field != 'undefined')
                        field = field[path[p]];
                     else
                        break;
-                }}
-                if (field && field.constructor == Array) {{
-                    field.forEach(function(item) {{
+                }
+                if (field && field.constructor == Array) {
+                    field.forEach(function(item) {
                         emit(item, 1);
-                    }});
-                }} else if (typeof field != 'undefined') {{
+                    });
+                } else if (typeof field != 'undefined') {
                     emit(field, 1);
-                }} else {{
+                } else {
                     emit(null, 1);
-                }}
-            }}
-        """.format(
-            field=field
-        )
+                }
+            }
+        """ % {
+            "field": field
+        }
         reduce_func = """
             function(key, values) {
                 var total = 0;

From 0a032bf6959e48b00913dd60f16e809a3a0683ed Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 20 Feb 2022 23:56:18 +0100
Subject: [PATCH 1279/1519] Update changelog for release

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 77155f25c..620dc641e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,8 @@ Development
 - EnumField improvements: now ``choices`` limits the values of an enum to allow
 - Fix bug that prevented instance queryset from using custom queryset_class #2589
 - Fix deepcopy of EmbeddedDocument #2202
+- Introduce a base exception class for MongoEngine exceptions (MongoEngineException).
+  Note that this doesn't concern the pymongo errors #2515
 - Fix error when using precision=0 with DecimalField #2535
 - Add support for regex and whole word text search query #2568
 - Add support for update aggregation pipeline #2578

From 26e81cc58cd34cf75d146eab31bd9849353d74b3 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 20 Feb 2022 23:57:56 +0100
Subject: [PATCH 1280/1519] prepare release

---
 docs/changelog.rst      | 5 ++++-
 mongoengine/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 620dc641e..096ace65b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.24.0
+=================
 - EnumField improvements: now ``choices`` limits the values of an enum to allow
 - Fix bug that prevented instance queryset from using custom queryset_class #2589
 - Fix deepcopy of EmbeddedDocument #2202
@@ -47,7 +50,7 @@ Development
     locally.
 
 Changes in 0.23.1
-===========
+=================
 - Bug fix: ignore LazyReferenceFields when clearing _changed_fields #2484
 - Improve connection doc #2481
 
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index d316b0f14..ef75e7529 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 23, 1)
+VERSION = (0, 24, 0)
 
 
 def get_version():

From cd7b828e429b8d22269e3425cbea5570a9f29369 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Fri, 4 Mar 2022 15:10:00 -0800
Subject: [PATCH 1281/1519] update dependency specifier to allow pymongo 4.x

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 78e20331b..78f618a3c 100644
--- a/setup.py
+++ b/setup.py
@@ -142,7 +142,7 @@ def run_tests(self):
     platforms=["any"],
     classifiers=CLASSIFIERS,
     python_requires=">=3.6",
-    install_requires=["pymongo>=3.4,<=4.0"],
+    install_requires=["pymongo>=3.4,<5.0"],
     cmdclass={"test": PyTest},
     **extra_opts
 )

From bc981bdae697736cfbc682f060f480e78de04dd8 Mon Sep 17 00:00:00 2001
From: Arthur Rio <arthur.rio44@gmail.com>
Date: Mon, 7 Mar 2022 18:41:30 -0700
Subject: [PATCH 1282/1519] Don't use deprecated property for emptiness check

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index d3efe3f74..441cc0749 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -722,7 +722,7 @@ def with_id(self, object_id):
         :param object_id: the value for the id of the document to look up
         """
         queryset = self.clone()
-        if not queryset._query_obj.empty:
+        if bool(queryset._query_obj):
             msg = "Cannot use a filter whilst using `with_id`"
             raise InvalidQueryError(msg)
         return queryset.filter(pk=object_id).first()

From be0c2ff8d724834cbdd4099fddc19d8eac31c67b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 10 Mar 2022 00:12:42 +0100
Subject: [PATCH 1283/1519] elaborate_authentication_breaking_change_authsource

---
 docs/changelog.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 096ace65b..fc80342e8 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -48,6 +48,12 @@ Changes in 0.24.0
     documents the extended functionality which is no longer supported. Rewrite
     the unsupported queries or fetch the whole result set and perform the count
     locally.
+  - Pymongo 4 removed db.authenticate(), on which we were relying for authenticating
+    with username/password. The migration involved switching to providing credentials to
+    MongoClient BUT in case the authSource isn't provided, db.authenticate used to default to
+    authSource=current-database and MongoClient defaults to authSource="admin". Long story short,
+    if you observe authentication issue after migrating, make sure you provide the authSource
+    explicitly. (see #2626)
 
 Changes in 0.23.1
 =================

From 669f3ba3d4ba5d258e746df1814d87b57c5ae414 Mon Sep 17 00:00:00 2001
From: Arthur Rio <arthur.rio44@gmail.com>
Date: Wed, 9 Mar 2022 16:45:12 -0700
Subject: [PATCH 1284/1519] Remove cast to bool

---
 mongoengine/queryset/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 441cc0749..4ea6b10e1 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -722,7 +722,7 @@ def with_id(self, object_id):
         :param object_id: the value for the id of the document to look up
         """
         queryset = self.clone()
-        if bool(queryset._query_obj):
+        if queryset._query_obj:
             msg = "Cannot use a filter whilst using `with_id`"
             raise InvalidQueryError(msg)
         return queryset.filter(pk=object_id).first()

From 356f5075da8609e7091483c5bd7b20b019f6c271 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 21 Mar 2022 21:34:25 +0100
Subject: [PATCH 1285/1519] prepare release 0.24.1

---
 docs/changelog.rst      | 6 ++++++
 mongoengine/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index fc80342e8..b3da43920 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,12 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.24.1
+=================
+- Allow pymongo<5.0 to be pulled
+- Don't use deprecated property for emptiness check in queryset base #2633
+
+
 Changes in 0.24.0
 =================
 - EnumField improvements: now ``choices`` limits the values of an enum to allow
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index ef75e7529..14519da25 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 24, 0)
+VERSION = (0, 24, 1)
 
 
 def get_version():

From 968625cf49b39aa02f9b517eb4f71162228e09fe Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 21 Mar 2022 21:44:59 +0100
Subject: [PATCH 1286/1519] update pc hooks

---
 .pre-commit-config.yaml          |  8 ++++----
 benchmarks/test_basic_doc_ops.py | 30 +++++++++++++++---------------
 mongoengine/document.py          |  2 +-
 tests/document/test_instance.py  |  2 +-
 tests/fields/test_float_field.py |  4 ++--
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 328a8cbc8..97a5cd336 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,14 +1,14 @@
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 21.5b2
+    rev: 22.1.0
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
@@ -16,11 +16,11 @@ repos:
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.19.1
+    rev: v2.31.1
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
   - repo: https://github.com/pycqa/isort
-    rev: 5.8.0
+    rev: 5.10.1
     hooks:
       - id: isort
diff --git a/benchmarks/test_basic_doc_ops.py b/benchmarks/test_basic_doc_ops.py
index 91efc7e32..66b6a17f9 100644
--- a/benchmarks/test_basic_doc_ops.py
+++ b/benchmarks/test_basic_doc_ops.py
@@ -38,34 +38,34 @@ def init_book():
             author_email="alec@example.com",
         )
 
-    print("Doc initialization: %.3fus" % (timeit(init_book, 1000) * 10 ** 6))
+    print("Doc initialization: %.3fus" % (timeit(init_book, 1000) * 10**6))
 
     b = init_book()
-    print("Doc getattr: %.3fus" % (timeit(lambda: b.name, 10000) * 10 ** 6))
+    print("Doc getattr: %.3fus" % (timeit(lambda: b.name, 10000) * 10**6))
 
     print(
         "Doc setattr: %.3fus"
-        % (timeit(lambda: setattr(b, "name", "New name"), 10000) * 10 ** 6)  # noqa B010
+        % (timeit(lambda: setattr(b, "name", "New name"), 10000) * 10**6)  # noqa B010
     )
 
-    print("Doc to mongo: %.3fus" % (timeit(b.to_mongo, 1000) * 10 ** 6))
+    print("Doc to mongo: %.3fus" % (timeit(b.to_mongo, 1000) * 10**6))
 
-    print("Doc validation: %.3fus" % (timeit(b.validate, 1000) * 10 ** 6))
+    print("Doc validation: %.3fus" % (timeit(b.validate, 1000) * 10**6))
 
     def save_book():
         b._mark_as_changed("name")
         b._mark_as_changed("tags")
         b.save()
 
-    print("Save to database: %.3fus" % (timeit(save_book, 100) * 10 ** 6))
+    print("Save to database: %.3fus" % (timeit(save_book, 100) * 10**6))
 
     son = b.to_mongo()
     print(
-        "Load from SON: %.3fus" % (timeit(lambda: Book._from_son(son), 1000) * 10 ** 6)
+        "Load from SON: %.3fus" % (timeit(lambda: Book._from_son(son), 1000) * 10**6)
     )
 
     print(
-        "Load from database: %.3fus" % (timeit(lambda: Book.objects[0], 100) * 10 ** 6)
+        "Load from database: %.3fus" % (timeit(lambda: Book.objects[0], 100) * 10**6)
     )
 
     def create_and_delete_book():
@@ -75,7 +75,7 @@ def create_and_delete_book():
 
     print(
         "Init + save to database + delete: %.3fms"
-        % (timeit(create_and_delete_book, 10) * 10 ** 3)
+        % (timeit(create_and_delete_book, 10) * 10**3)
     )
 
 
@@ -101,9 +101,9 @@ def init_company():
         )
 
     company = init_company()
-    print("Big doc to mongo: %.3fms" % (timeit(company.to_mongo, 100) * 10 ** 3))
+    print("Big doc to mongo: %.3fms" % (timeit(company.to_mongo, 100) * 10**3))
 
-    print("Big doc validation: %.3fms" % (timeit(company.validate, 1000) * 10 ** 3))
+    print("Big doc validation: %.3fms" % (timeit(company.validate, 1000) * 10**3))
 
     company.save()
 
@@ -112,17 +112,17 @@ def save_company():
         company._mark_as_changed("contacts")
         company.save()
 
-    print("Save to database: %.3fms" % (timeit(save_company, 100) * 10 ** 3))
+    print("Save to database: %.3fms" % (timeit(save_company, 100) * 10**3))
 
     son = company.to_mongo()
     print(
         "Load from SON: %.3fms"
-        % (timeit(lambda: Company._from_son(son), 100) * 10 ** 3)
+        % (timeit(lambda: Company._from_son(son), 100) * 10**3)
     )
 
     print(
         "Load from database: %.3fms"
-        % (timeit(lambda: Company.objects[0], 100) * 10 ** 3)
+        % (timeit(lambda: Company.objects[0], 100) * 10**3)
     )
 
     def create_and_delete_company():
@@ -132,7 +132,7 @@ def create_and_delete_company():
 
     print(
         "Init + save to database + delete: %.3fms"
-        % (timeit(create_and_delete_company, 10) * 10 ** 3)
+        % (timeit(create_and_delete_company, 10) * 10**3)
     )
 
 
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 5d6a47a0e..e7a1938f2 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -241,7 +241,7 @@ def _get_capped_collection(cls):
         collection_name = cls._get_collection_name()
 
         # Get max document limit and max byte size from meta.
-        max_size = cls._meta.get("max_size") or 10 * 2 ** 20  # 10MB default
+        max_size = cls._meta.get("max_size") or 10 * 2**20  # 10MB default
         max_documents = cls._meta.get("max_documents")
 
         # MongoDB will automatically raise the size to make it a multiple of
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 1f9a76b47..db72e580e 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -129,7 +129,7 @@ class Log(Document):
         options = Log.objects._collection.options()
         assert options["capped"] is True
         assert options["max"] == 10
-        assert options["size"] == 10 * 2 ** 20
+        assert options["size"] == 10 * 2**20
 
         # Check that the document with default value can be recreated
         class Log(Document):
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
index 30f829ae8..41c063f64 100644
--- a/tests/fields/test_float_field.py
+++ b/tests/fields/test_float_field.py
@@ -51,9 +51,9 @@ class BigPerson(Document):
         big_person.height = int(0)
         big_person.validate()
 
-        big_person.height = 2 ** 500
+        big_person.height = 2**500
         big_person.validate()
 
-        big_person.height = 2 ** 100000  # Too big for a float value
+        big_person.height = 2**100000  # Too big for a float value
         with pytest.raises(ValidationError):
             big_person.validate()

From 16ba0b94c9eed8ef1f3b4db6a32d450894152336 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Tue, 29 Mar 2022 16:58:46 -0400
Subject: [PATCH 1287/1519] Add minimal placeholders for pymongo session and
 transaction kwargs to be passed in

---
 mongoengine/context_managers.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index bd7838bae..32ff2c39d 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -301,10 +301,12 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
 
 
 @contextmanager
-def run_in_transaction(alias=DEFAULT_CONNECTION_NAME):
+def run_in_transaction(alias=DEFAULT_CONNECTION_NAME, session_kwargs=None, transaction_kwargs=None):
     conn = get_connection(alias)
-    with conn.start_session() as session:
-        with session.start_transaction():
+    session_kwargs = session_kwargs or {}
+    with conn.start_session(**session_kwargs) as session:
+        transaction_kwargs = transaction_kwargs or {}
+        with session.start_transaction(**transaction_kwargs):
             try:
                 _set_session(session)
                 yield

From 7032387dd12171742dcf59c1395b55ae5a8fef81 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Tue, 29 Mar 2022 17:11:48 -0400
Subject: [PATCH 1288/1519] Add myself to AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 40508b532..0ad8db80f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -264,3 +264,4 @@ that much better:
  * oleksandr-l5 (https://github.com/oleksandr-l5)
  * Ido Shraga (https://github.com/idoshr)
  * Terence Honles (https://github.com/terencehonles)
+ * Juan Gutierrez (https://github.com/juannyg)

From 4ed7614e639440e1da14ede975a269799c742be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Schmidts?= <francois@schmidts.fr>
Date: Thu, 31 Mar 2022 11:59:22 +0200
Subject: [PATCH 1289/1519] Fixing doc building by pinning Jinja version

---
 docs/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 3621a13b2..4ecb0127d 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -2,3 +2,4 @@ Sphinx==3.3.0
 sphinx-rtd-theme==0.5.0
 readthedocs-sphinx-ext==2.1.1
 docutils==0.17.1
+Jinja2<3.1

From 6fd59d8f3f5e81f2e1abd769658e5aaa8c37f5d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Schmidts?= <francois@schmidts.fr>
Date: Thu, 31 Mar 2022 14:43:43 +0200
Subject: [PATCH 1290/1519] Bumping black version for failing pre-commit hook

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 97a5cd336..a6c0a70d3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8

From eddce8e6ddebe0bde8f8a89b1a47e5ca347a092d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Schmidts?= <francois@schmidts.fr>
Date: Wed, 16 Jun 2021 21:35:21 +0200
Subject: [PATCH 1291/1519] Fixing loading of EnumField inside ListField

Under certain condition, inside value of ListField(EnumField) don't get casted to the proper Enum. This patches fixes that.
---
 mongoengine/base/fields.py      | 19 +++++++++---
 mongoengine/fields.py           | 25 +++++++++++-----
 tests/fields/test_enum_field.py | 51 +++++++++++++++++++++++++++++----
 3 files changed, 79 insertions(+), 16 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index a68035274..9ba2ca139 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -134,9 +134,7 @@ def __set__(self, instance, value):
         # If setting to None and there is a default value provided for this
         # field, then set the value to the default value.
         if value is None:
-            if self.null:
-                value = None
-            elif self.default is not None:
+            if not self.null and self.default is not None:
                 value = self.default
                 if callable(value):
                     value = value()
@@ -282,6 +280,19 @@ def _lazy_load_refs(instance, name, ref_values, *, max_depth):
         )
         return documents
 
+    def __set__(self, instance, value):
+        unprocessable_fields = (
+            ComplexBaseField,
+            _import_class("EmbeddedDocumentField"),
+            _import_class("FileField"),
+        )
+        if self.field and not isinstance(self.field, unprocessable_fields):
+            if isinstance(value, (list, tuple)):
+                value = [self.field.to_python(sub_val) for sub_val in value]
+            elif isinstance(value, dict):
+                value = {key: self.field.to_python(sub) for key, sub in value.items()}
+        return super().__set__(instance, value)
+
     def __get__(self, instance, owner):
         """Descriptor to automatically dereference references."""
         if instance is None:
@@ -439,7 +450,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
                     # us to dereference
                     meta = getattr(v, "_meta", {})
                     allow_inheritance = meta.get("allow_inheritance")
-                    if not allow_inheritance and not self.field:
+                    if not allow_inheritance:
                         value_dict[k] = GenericReferenceField().to_mongo(v)
                     else:
                         collection = v._get_collection_name()
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index a2ccc7aea..dbfc138ab 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1660,14 +1660,25 @@ def __init__(self, enum, **kwargs):
             kwargs["choices"] = list(self._enum_cls)  # Implicit validator
         super().__init__(**kwargs)
 
-    def __set__(self, instance, value):
-        is_legal_value = value is None or isinstance(value, self._enum_cls)
-        if not is_legal_value:
+    def validate(self, value):
+        if isinstance(value, self._enum_cls):
+            return super().validate(value)
+        try:
+            self._enum_cls(value)
+        except ValueError:
+            self.error(f"{value} is not a valid {self._enum_cls}")
+
+    def to_python(self, value):
+        value = super().to_python(value)
+        if not isinstance(value, self._enum_cls):
             try:
-                value = self._enum_cls(value)
-            except Exception:
-                pass
-        return super().__set__(instance, value)
+                return self._enum_cls(value)
+            except ValueError:
+                return value
+        return value
+
+    def __set__(self, instance, value):
+        return super().__set__(instance, self.to_python(value))
 
     def to_mongo(self, value):
         if isinstance(value, self._enum_cls):
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index d2730d334..d7596de76 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -3,7 +3,13 @@
 import pytest
 from bson import InvalidDocument
 
-from mongoengine import Document, EnumField, ValidationError
+from mongoengine import (
+    DictField,
+    Document,
+    EnumField,
+    ListField,
+    ValidationError,
+)
 from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
@@ -21,6 +27,12 @@ class ModelWithEnum(Document):
     status = EnumField(Status)
 
 
+class ModelComplexEnum(Document):
+    status = EnumField(Status)
+    statuses = ListField(EnumField(Status))
+    color_mapping = DictField(EnumField(Color))
+
+
 class TestStringEnumField(MongoDBTestCase):
     def test_storage(self):
         model = ModelWithEnum(status=Status.NEW).save()
@@ -101,6 +113,38 @@ def test_wrong_choices(self):
         with pytest.raises(ValueError, match="Invalid choices"):
             EnumField(Status, choices=[Status.DONE, Color.RED])
 
+    def test_embedding_in_complex_field(self):
+        ModelComplexEnum.drop_collection()
+        model = ModelComplexEnum(
+            status="new", statuses=["new"], color_mapping={"red": 1}
+        ).save()
+        assert model.status == Status.NEW
+        assert model.statuses == [Status.NEW]
+        assert model.color_mapping == {"red": Color.RED}
+        model.reload()
+        assert model.status == Status.NEW
+        assert model.statuses == [Status.NEW]
+        assert model.color_mapping == {"red": Color.RED}
+        model.status = "done"
+        model.color_mapping = {"blue": 2}
+        model.statuses = ["new", "done"]
+        assert model.status == Status.DONE
+        assert model.color_mapping == {"blue": Color.BLUE}, model.color_mapping
+        assert model.statuses == [Status.NEW, Status.DONE], model.statuses
+        model = model.save().reload()
+        assert model.status == Status.DONE
+        assert model.color_mapping == {"blue": Color.BLUE}, model.color_mapping
+        assert model.statuses == [Status.NEW, Status.DONE], model.statuses
+
+        with pytest.raises(ValidationError, match="must be one of ..Status"):
+            model.statuses = [1]
+            model.save()
+
+        model.statuses = ["done"]
+        model.color_mapping = {"blue": "done"}
+        with pytest.raises(ValidationError, match="must be one of ..Color"):
+            model.save()
+
 
 class ModelWithColor(Document):
     color = EnumField(Color, default=Color.RED)
@@ -124,10 +168,7 @@ def test_storage_enum_with_int(self):
         assert get_as_pymongo(model) == {"_id": model.id, "color": 2}
 
     def test_validate_model(self):
-        with pytest.raises(ValidationError, match="Value must be one of"):
-            ModelWithColor(color=3).validate()
-
-        with pytest.raises(ValidationError, match="Value must be one of"):
+        with pytest.raises(ValidationError, match="must be one of ..Color"):
             ModelWithColor(color="wrong_type").validate()
 
 

From 28924fa9faf75359763cf3b1331a77c5b679ee31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Schmidts?= <francois@schmidts.fr>
Date: Wed, 15 Dec 2021 18:24:32 +0100
Subject: [PATCH 1292/1519] Fix: DictField are always marked as changed

Only triggering `_mark_as_changed` on DictField if the value is actually
changed.
---
 mongoengine/base/datastructures.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index a32f6040a..8f670e640 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -31,9 +31,9 @@ def mark_key_as_changed_wrapper(parent_method):
 
     def wrapper(self, key, *args, **kwargs):
         # Can't use super() in the decorator.
-        result = parent_method(self, key, *args, **kwargs)
-        self._mark_as_changed(key)
-        return result
+        if not args or not key or key not in self or self[key] != args[0]:
+            self._mark_as_changed(key)
+        return parent_method(self, key, *args, **kwargs)
 
     return wrapper
 

From 29693bceebfd5c4fce14d3e1e9adf49da3056a4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Schmidts?= <francois@schmidts.fr>
Date: Wed, 15 Dec 2021 20:45:26 +0100
Subject: [PATCH 1293/1519] Adding test case for the bug

---
 tests/document/test_delta.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/document/test_delta.py b/tests/document/test_delta.py
index 68c698b64..537c86bfd 100644
--- a/tests/document/test_delta.py
+++ b/tests/document/test_delta.py
@@ -952,6 +952,31 @@ class Doc(Document):
         assert "oops" == delta[0]["users.007.rolist"][0]["type"]
         assert uinfo.id == delta[0]["users.007.info"]
 
+    def test_delta_on_dict(self):
+        class MyDoc(Document):
+            dico = DictField()
+
+        MyDoc.drop_collection()
+
+        MyDoc(dico={"a": {"b": 0}}).save()
+
+        mydoc = MyDoc.objects.first()
+        assert mydoc._get_changed_fields() == []
+        mydoc.dico["a"]["b"] = 0
+        assert mydoc._get_changed_fields() == []
+        mydoc.dico["a"] = {"b": 0}
+        assert mydoc._get_changed_fields() == []
+        mydoc.dico = {"a": {"b": 0}}
+        assert mydoc._get_changed_fields() == []
+        mydoc.dico["a"]["c"] = 1
+        assert mydoc._get_changed_fields() == ["dico.a.c"]
+        mydoc.dico["a"]["b"] = 2
+        mydoc.dico["d"] = 3
+        assert mydoc._get_changed_fields() == ["dico.a.c", "dico.a.b", "dico.d"]
+
+        mydoc._clear_changed_fields()
+        assert mydoc._get_changed_fields() == []
+
 
 if __name__ == "__main__":
     unittest.main()

From 4ceb94c2e254f1bc9a1c45e73f28a50b91d1098f Mon Sep 17 00:00:00 2001
From: Mark Sheehan <mark.sheehan.uk@gmail.com>
Date: Mon, 16 May 2022 18:00:13 +0100
Subject: [PATCH 1294/1519] Added aws authentication to mongo engine

---
 mongoengine/connection.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index bbc98f17d..e1abf9257 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -58,6 +58,7 @@ def _get_connection_settings(
     password=None,
     authentication_source=None,
     authentication_mechanism=None,
+    authmechanismproperties=None,
     **kwargs,
 ):
     """Get the connection settings as a dict
@@ -88,6 +89,7 @@ def _get_connection_settings(
         "password": password,
         "authentication_source": authentication_source,
         "authentication_mechanism": authentication_mechanism,
+        "authmechanismproperties": authmechanismproperties
     }
 
     _check_db_name(conn_settings["name"])
@@ -158,6 +160,8 @@ def _get_connection_settings(
                     ):
                         conn_settings["read_preference"] = preference
                         break
+            if "authmechanismproperties" in uri_options:
+                conn_settings["authmechanismproperties"] = uri_options["authmechanismproperties"]
         else:
             resolved_hosts.append(entity)
     conn_settings["host"] = resolved_hosts
@@ -193,6 +197,7 @@ def register_connection(
     password=None,
     authentication_source=None,
     authentication_mechanism=None,
+    authmechanismproperties=None,
     **kwargs,
 ):
     """Register the connection settings.
@@ -225,6 +230,7 @@ def register_connection(
         password=password,
         authentication_source=authentication_source,
         authentication_mechanism=authentication_mechanism,
+        authmechanismproperties=authmechanismproperties,
         **kwargs,
     )
     _connection_settings[alias] = conn_settings
@@ -286,6 +292,7 @@ def _clean_settings(settings_dict):
                 "password",
                 "authentication_source",
                 "authentication_mechanism",
+                "authmechanismproperties"
             }
             rename_fields = {}
         else:
@@ -385,6 +392,7 @@ def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
                 conn_settings["password"]
                 or conn_settings["authentication_mechanism"] == "MONGODB-X509"
             )
+            and ("authmechanismproperties" not in conn_settings.keys())
         ):
             auth_kwargs = {"source": conn_settings["authentication_source"]}
             if conn_settings["authentication_mechanism"] is not None:

From e74abf717a7768004313c36d7940fa30e72ab018 Mon Sep 17 00:00:00 2001
From: Mark Abdel Malak <mark.abdelmalak@complyadvantage.com>
Date: Wed, 8 Jun 2022 21:22:39 +0100
Subject: [PATCH 1295/1519] Add an example on how to use the db_field to the
 docs in 2.3.3.1

`db_field` allows you to use an alternative field for MongoDB operations

This allows you to use a different attribute than the name of the field
used in MongoDB.

resolves #2655
---
 docs/guide/defining-documents.rst | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index d86d6b9de..53758672a 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -113,6 +113,33 @@ arguments can be set on all fields:
 :attr:`db_field` (Default: None)
     The MongoDB field name.
 
+    If set, operations in MongoDB will be performed with this value instead of the class attribute.
+
+    This allows you to use a different attribute than the name of the field used in MongoDB. ::
+
+            from mongoengine import *
+
+            class Page(Document):
+                page_number = IntField(db_field="pageNumber")
+
+            # Create a Page and save it
+            Page(page_number=1).save()
+
+            # How 'pageNumber' is stored in MongoDB
+            Page.objects.as_pymongo() # [{'_id': ObjectId('629dfc45ee4cc407b1586b1f'), 'pageNumber': 1}]
+
+            # Retrieve the object
+            page: Page = Page.objects.first()
+
+            print(page.page_number)  # prints 1
+
+            print(page.pageNumber) # raises AttributeError
+
+    .. note:: If set, use the name of the attribute when defining indexes in the :attr:`meta`
+        dictionary rather than the :attr:`db_field` otherwise, :class:`~mongoengine.LookUpError`
+        will be raised.
+
+
 :attr:`required` (Default: False)
     If set to True and the field is not set on the document instance, a
     :class:`~mongoengine.ValidationError` will be raised when the document is

From 1707630cbc797a39acb6bf3588b4f07af772d6b4 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Tue, 21 Jun 2022 09:37:16 -0400
Subject: [PATCH 1296/1519] Update context_managers.py based on black

---
 mongoengine/context_managers.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 32ff2c39d..dd65882e3 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -301,7 +301,9 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
 
 
 @contextmanager
-def run_in_transaction(alias=DEFAULT_CONNECTION_NAME, session_kwargs=None, transaction_kwargs=None):
+def run_in_transaction(
+    alias=DEFAULT_CONNECTION_NAME, session_kwargs=None, transaction_kwargs=None
+):
     conn = get_connection(alias)
     session_kwargs = session_kwargs or {}
     with conn.start_session(**session_kwargs) as session:

From 7d3db87282a946d66a78ddca050410073c04d214 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Tue, 21 Jun 2022 12:48:06 -0400
Subject: [PATCH 1297/1519] Experiment to deal with max lock request timeout

---
 tests/test_context_managers.py | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 117a9d825..aa4e8eea8 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -643,17 +643,24 @@ class A(Document):
         def thread_fn(idx):
             # Open the transaction at some unknown interval
             time.sleep(random.uniform(0.01, 0.1))
-            with run_in_transaction():
-
-                a = A.objects.get(i=idx)
-                a.i = idx * 10
-                # Save at some unknown interval
-                time.sleep(random.uniform(0.01, 0.1))
-                a.save()
 
-                # Force roll backs for the even runs...
-                if idx % 2 == 0:
-                    raise Exception
+            def run_tx():
+                with run_in_transaction():
+                    a = A.objects.get(i=idx)
+                    a.i = idx * 10
+                    # Save at some unknown interval
+                    time.sleep(random.uniform(0.01, 0.1))
+                    a.save()
+
+                    # Force roll backs for the even runs...
+                    if idx % 2 == 0:
+                        raise Exception
+
+            try:
+                run_tx()
+            except pymongo.errors.OperationFailure:
+                # Try one more time...
+                run_tx()
 
         thread_count = 10
         for i in range(thread_count):

From df87f82a4b7a1fd7230643a7877ae78fef058ba2 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Tue, 21 Jun 2022 12:51:12 -0400
Subject: [PATCH 1298/1519] Add missing pymongo import

---
 tests/test_context_managers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index aa4e8eea8..4130fec8c 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -3,6 +3,7 @@
 import time
 import unittest
 
+import pymongo
 import pytest
 
 from mongoengine import *

From aa6036a52dfb48f10a4a90b756cf7097939f5c44 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 22 Jun 2022 09:20:35 -0400
Subject: [PATCH 1299/1519] Setup retry mechanism to account for lock request
 timeout exception

---
 tests/test_context_managers.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 4130fec8c..496d2ac4c 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -657,11 +657,16 @@ def run_tx():
                     if idx % 2 == 0:
                         raise Exception
 
-            try:
-                run_tx()
-            except pymongo.errors.OperationFailure:
-                # Try one more time...
-                run_tx()
+            attempts = 0
+            max_attempts = 10
+            while attempts < max_attempts:
+                try:
+                    run_tx()
+                    break
+                except pymongo.errors.OperationFailure:
+                    # TODO: Note about max lock request timeout
+                    attempts += 1
+                    continue
 
         thread_count = 10
         for i in range(thread_count):

From db279dfdc215f52fd1dc8bc7cb089f16ec00f75b Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Thu, 23 Jun 2022 09:30:02 -0400
Subject: [PATCH 1300/1519] Strengthen the stability of thread test

---
 tests/test_context_managers.py | 93 ++++++++++++++++++++++------------
 1 file changed, 60 insertions(+), 33 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 117a9d825..64c65b939 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -638,43 +638,70 @@ def test_thread_safety_of_transactions(self):
         class A(Document):
             i = IntField()
 
-        A.drop_collection()
+        # Ensure the collection is created
+        A.objects.create(i=0)
+
+        class TestExc(Exception):
+            pass
 
         def thread_fn(idx):
+            """
+            Method thread should execute:
+            * Pretend to work for random interval
+            * Start a transaction
+            * Do a read
+            * Pretend to work for random interval
+            * Do a write
+            * In some instances, force tx rollback by raising Exception
+            """
             # Open the transaction at some unknown interval
             time.sleep(random.uniform(0.01, 0.1))
-            with run_in_transaction():
-
-                a = A.objects.get(i=idx)
-                a.i = idx * 10
-                # Save at some unknown interval
-                time.sleep(random.uniform(0.01, 0.1))
-                a.save()
-
-                # Force roll backs for the even runs...
-                if idx % 2 == 0:
-                    raise Exception
-
-        thread_count = 10
-        for i in range(thread_count):
-            A.objects.create(i=i)
-
-        threads = [
-            threading.Thread(target=thread_fn, args=(i,)) for i in range(thread_count)
-        ]
-        for t in threads:
-            t.start()
-        for t in threads:
-            t.join()
-
-        expected_sum = 0
-        for i in range(thread_count):
-            if i % 2 == 0:
-                expected_sum += i
-            else:
-                expected_sum += i * 10
-        assert expected_sum == 270
-        assert expected_sum == sum(a.i for a in A.objects.all())
+            try:
+                with run_in_transaction():
+                    a = A.objects.get(i=idx)
+                    a.i = idx * 10
+                    # Save at some unknown interval
+                    time.sleep(random.uniform(0.01, 0.1))
+                    a.save()
+
+                    # Force roll backs for the even runs...
+                    if idx % 2 == 0:
+                        raise TestExc
+            except TestExc:
+                pass
+
+        for r in range(50):
+            """
+            Threads & randomization are tricky - run it 50 times.
+            """
+
+            # Clear out the collection for a fresh run
+            A.objects.all().delete()
+
+            # Prepopulate the data for reads
+            thread_count = 10
+            for i in range(thread_count):
+                A.objects.create(i=i)
+
+            # Prime the threads
+            threads = [
+                threading.Thread(target=thread_fn, args=(i,))
+                for i in range(thread_count)
+            ]
+            for t in threads:
+                t.start()
+            for t in threads:
+                t.join()
+
+            # Check the sum
+            expected_sum = 0
+            for i in range(thread_count):
+                if i % 2 == 0:
+                    expected_sum += i
+                else:
+                    expected_sum += i * 10
+            assert expected_sum == 270
+            assert expected_sum == sum(a.i for a in A.objects.all())
 
 
 if __name__ == "__main__":

From 3fd1867ab2af239220f5d037bc9d91e402f34a0d Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Thu, 23 Jun 2022 11:56:18 -0400
Subject: [PATCH 1301/1519] Explicitly handle retry of
 TransientTransactionError, per docs

---
 tests/test_context_managers.py | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 64c65b939..8343b8b0a 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -3,6 +3,7 @@
 import time
 import unittest
 
+import pymongo
 import pytest
 
 from mongoengine import *
@@ -447,16 +448,14 @@ def test_transaction_updates_across_databases(self):
         class A(Document):
             name = StringField()
 
-        A.drop_collection()
-
+        A.objects.all().delete()
         a_doc = A.objects.create(name="a")
 
         class B(Document):
             meta = {"db_alias": "test2"}
             name = StringField()
 
-        B.drop_collection()
-
+        B.objects.all().delete()
         b_doc = B.objects.create(name="b")
 
         with run_in_transaction():
@@ -645,15 +644,6 @@ class TestExc(Exception):
             pass
 
         def thread_fn(idx):
-            """
-            Method thread should execute:
-            * Pretend to work for random interval
-            * Start a transaction
-            * Do a read
-            * Pretend to work for random interval
-            * Do a write
-            * In some instances, force tx rollback by raising Exception
-            """
             # Open the transaction at some unknown interval
             time.sleep(random.uniform(0.01, 0.1))
             try:
@@ -669,10 +659,24 @@ def thread_fn(idx):
                         raise TestExc
             except TestExc:
                 pass
+            except pymongo.errors.OperationFailure as op_failure:
+                """
+                If there's a TransientTransactionError, retry - the lock could not be acquired.
+
+                Per MongoDB docs: The core transaction API does not incorporate retry logic for
+                "TransientTransactionError". To handle "TransientTransactionError", applications
+                should explicitly incorporate retry logic for the error.
+
+                See: https://www.mongodb.com/docs/manual/core/transactions-in-applications/#-transienttransactionerror-
+                """
+                if "TransientTransactionError" in op_failure.details.errorLabels:
+                    thread_fn(idx)
+                else:
+                    raise op_failure
 
-        for r in range(50):
+        for r in range(10):
             """
-            Threads & randomization are tricky - run it 50 times.
+            Threads & randomization are tricky - run it multiple times
             """
 
             # Clear out the collection for a fresh run

From e02d294a9b8f05e723ada6bcf123a67cac99eae5 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Thu, 23 Jun 2022 12:00:55 -0400
Subject: [PATCH 1302/1519] Fix bug: errorLabels is a key, not a property

---
 tests/test_context_managers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 8343b8b0a..f3c6fefb9 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -669,7 +669,8 @@ def thread_fn(idx):
 
                 See: https://www.mongodb.com/docs/manual/core/transactions-in-applications/#-transienttransactionerror-
                 """
-                if "TransientTransactionError" in op_failure.details.errorLabels:
+                error_labels = op_failure.details.get("errorLabels", [])
+                if "TransientTransactionError" in error_labels:
                     thread_fn(idx)
                 else:
                     raise op_failure

From bb2efb008cb7fea52eed42bc5310ae8e7a36a6f9 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Thu, 23 Jun 2022 12:23:52 -0400
Subject: [PATCH 1303/1519] Handle TransientTransactionError in nested tx test
 case

---
 tests/test_context_managers.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index f3c6fefb9..0d92a17be 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -566,7 +566,7 @@ class B(Document):
         assert "b" == B.objects.get(id=b_doc.id).name
 
     @requires_mongodb_gte_40
-    def test_exception_in_parent_of_nested_of_transaction_after_child_completed_only_rolls_parent_back(
+    def test_exception_in_parent_of_nested_transaction_after_child_completed_only_rolls_parent_back(
         self,
     ):
         connect("mongoenginetest")
@@ -583,15 +583,28 @@ class B(Document):
         B.drop_collection()
         b_doc = B.objects.create(name="b")
 
-        try:
-            with run_in_transaction():
-                a_doc.update(name="trx-parent")
-                with run_in_transaction():
-                    b_doc.update(name="trx-child")
-                raise Exception
-        except Exception:
+        class TestExc(Exception):
             pass
 
+        def run_tx():
+            try:
+                with run_in_transaction():
+                    a_doc.update(name="trx-parent")
+                    with run_in_transaction():
+                        b_doc.update(name="trx-child")
+                    raise TestExc
+            except TestExc:
+                pass
+            except OperationError as op_failure:
+                """
+                See thread safety test below for more details about TransientTransctionError handling
+                """
+                if "TransientTransactionError" in str(op_failure):
+                    run_tx()
+                else:
+                    raise op_failure
+
+        run_tx()
         assert "a" == A.objects.get(id=a_doc.id).name
         assert "trx-child" == B.objects.get(id=b_doc.id).name
 

From 44c9c30da4655f25b257aaca29fa72bd3091f767 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Thu, 23 Jun 2022 12:43:03 -0400
Subject: [PATCH 1304/1519] Account for pymongo>=4 host name management in
 replSet connections

---
 tests/test_connection.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 13d1d096c..1a93f1bcc 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -573,7 +573,16 @@ def test_read_preference_from_parse(self):
     def test_multiple_connection_settings(self):
         connect("mongoenginetest", alias="t1", host="localhost")
 
-        connect("mongoenginetest2", alias="t2", host="127.0.0.1")
+        if PYMONGO_VERSION >= (4,):
+            """
+            pymongo>=4 changed how it handles connection addresses wrt replicaSets, which
+            is now how mongod is run for the test suites for transactions.
+            """
+            connect(
+                "mongoenginetest2", alias="t2", host="127.0.0.1", directConnection=True
+            )
+        else:
+            connect("mongoenginetest2", alias="t2", host="127.0.0.1")
 
         mongo_connections = mongoengine.connection._connections
         assert len(mongo_connections.items()) == 2

From 7866e0fc8793895a9a5d57d6b336d470839e4bef Mon Sep 17 00:00:00 2001
From: kottamakhil <kottamakhileshwar@gmail.com>
Date: Wed, 29 Jun 2022 09:18:24 +0530
Subject: [PATCH 1305/1519] Turning off dereferencing for the results of
 distinct query.

distinct automatically dereferences the results, however it should obey the  `_auto_dereference`, set by `no_dereference()`. This change makes distinct query not to dereference the values when `no_dereference()` is called on the queryset
---
 mongoengine/queryset/base.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 4ea6b10e1..ee298ce25 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -953,9 +953,13 @@ def distinct(self, field):
             field = self._fields_to_dbfields([field]).pop()
         except LookUpError:
             pass
+        
+        raw_values = queryset._cursor.distinct(field)
+        if not self._auto_dereference:
+            return raw_values
 
         distinct = self._dereference(
-            queryset._cursor.distinct(field), 1, name=field, instance=self._document
+            raw_values, 1, name=field, instance=self._document
         )
 
         doc_field = self._document._fields.get(field.split(".", 1)[0])

From f81e88e9220ef75fa46b1baca5d38820acdafbb3 Mon Sep 17 00:00:00 2001
From: pawciobiel <1190054+pawciobiel@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:04:22 +0200
Subject: [PATCH 1306/1519] Update connecting.rst

Add a note about inheritance and switch_db
---
 docs/guide/connecting.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index 387151dfe..d147eab5b 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -186,6 +186,10 @@ access to the same User document across databases::
     with switch_db(User, 'archive-user-db') as User:
         User(name='Ross').save()  # Saves the 'archive-user-db'
 
+.. note:: :func:`~mongoengine.context_managers.switch_db` when used on 
+    a class that allow inheritance will change the database alias 
+    for instances of a given class only - instances of subclasses will still use 
+    the default database.
 
 Switch Collection
 -----------------

From d14818315ba1c39a1125db3e03bed7490292eba9 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Wed, 6 Jul 2022 11:47:32 +0300
Subject: [PATCH 1307/1519] fix no_dereference not worked with distinct

---
 mongoengine/queryset/base.py    |  3 ++-
 tests/queryset/test_queryset.py | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 5dc47e001..5d297beb9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -945,7 +945,8 @@ def distinct(self, field):
             field = self._fields_to_dbfields([field]).pop()
         except LookUpError:
             pass
-
+        if not self._auto_dereference:
+            return queryset._cursor.distinct(field)
         distinct = self._dereference(
             queryset._cursor.distinct(field), 1, name=field, instance=self._document
         )
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 1a15a114f..84fd9abe9 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -872,17 +872,15 @@ def test_rename(self):
         self.Person.objects.create(name="Foo", age=11)
 
         bob = self.Person.objects.as_pymongo().first()
-        assert 'age' in bob
-        assert bob['age'] == 11
+        assert "age" in bob
+        assert bob["age"] == 11
 
-        self.Person.objects(name="Foo").update(
-            rename__age='person_age'
-        )
+        self.Person.objects(name="Foo").update(rename__age="person_age")
 
         bob = self.Person.objects.as_pymongo().first()
-        assert 'age' not in bob
-        assert 'person_age' in bob
-        assert bob['person_age'] == 11
+        assert "age" not in bob
+        assert "person_age" in bob
+        assert bob["person_age"] == 11
 
     def test_save_and_only_on_fields_with_default(self):
         class Embed(EmbeddedDocument):
@@ -3441,6 +3439,7 @@ class Bar(Document):
         foo.save()
 
         assert Foo.objects.distinct("bar") == [bar]
+        assert Foo.objects.no_dereference().distinct("bar") == [bar.pk]
 
     def test_text_indexes(self):
         class News(Document):
@@ -3647,6 +3646,7 @@ class Foo(Document):
         foo.save()
 
         assert Foo.objects.distinct("bar_lst") == [bar_1, bar_2]
+        assert Foo.objects.no_dereference().distinct("bar_lst") == [bar_1.pk, bar_2.pk]
 
     def test_custom_manager(self):
         """Ensure that custom QuerySetManager instances work as expected."""

From 28d7d6567633164a91459253df6a2981156703cd Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Wed, 6 Jul 2022 15:35:34 +0300
Subject: [PATCH 1308/1519] fix none has no effact in update/aggregate / first
 and cause query on all collection

---
 mongoengine/queryset/base.py                | 12 ++++++++++++
 tests/queryset/test_queryset.py             | 13 +++++++++++++
 tests/queryset/test_queryset_aggregation.py | 17 +++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 4ea6b10e1..30bf6a4a3 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -289,6 +289,9 @@ def create(self, **kwargs):
     def first(self):
         """Retrieve the first object matching the query."""
         queryset = self.clone()
+        if self._none or self._empty:
+            return None
+
         try:
             result = queryset[0]
         except IndexError:
@@ -551,6 +554,8 @@ def update(
 
         if write_concern is None:
             write_concern = {}
+        if self._none or self._empty:
+            return 0
 
         queryset = self.clone()
         query = queryset._query
@@ -673,6 +678,9 @@ def modify(
         if not update and not upsert and not remove:
             raise OperationError("No update parameters, must either update or remove")
 
+        if self._none or self._empty:
+            return None
+
         queryset = self.clone()
         query = queryset._query
         if not remove:
@@ -1305,6 +1313,10 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
         user_pipeline += suppl_pipeline
 
         initial_pipeline = []
+        if self._none or self._empty:
+            initial_pipeline.append({"$limit": 1})
+            initial_pipeline.append({"$match": {"fldksjhkjhafds": "lasdjfhlasdhfk"}})
+
         if self._query:
             initial_pipeline.append({"$match": self._query})
 
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 2fd170bb0..a659ca1dd 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -408,6 +408,19 @@ class A(Document):
         A.drop_collection()
         A().save()
 
+        # validate collection not empty
+        assert A.objects.count() == 1
+
+        # update operations
+        assert A.objects.none().update(s="1") == 0
+        assert A.objects.none().update_one(s="1") == 0
+        assert A.objects.none().modify(s="1") is None
+
+        # validate noting change by update operations
+        assert A.objects(s="1").count() == 0
+
+        # fetch queries
+        assert A.objects.none().first() is None
         assert list(A.objects.none()) == []
         assert list(A.objects.none().all()) == []
         assert list(A.objects.none().limit(1)) == []
diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index ecc0db6e0..f1d504c0b 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -276,6 +276,23 @@ class Aggr(Document):
             {"_id": agg2.id, "c": 0.0, "name": "Y"},
         ]
 
+    def test_queryset_aggregation_none(self):
+        class Person(Document):
+            name = StringField()
+            age = IntField()
+
+        Person.drop_collection()
+
+        p1 = Person(name="Isabella Luanna", age=16)
+        p2 = Person(name="Wilson Junior", age=21)
+        p3 = Person(name="Sandra Mara", age=37)
+        Person.objects.insert([p1, p2, p3])
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        data = Person.objects().none().order_by("name").aggregate(pipeline)
+
+        assert list(data) == []
+
 
 if __name__ == "__main__":
     unittest.main()

From c08ec7132d68adc6897c4d9bb0254a94008eec91 Mon Sep 17 00:00:00 2001
From: bunnyxt <bunnyxt@outlook.com>
Date: Wed, 6 Jul 2022 17:32:21 -0700
Subject: [PATCH 1309/1519] fix: check parts length before get match

fix bugs which cause cannot modify field `type` etc.
---
 mongoengine/queryset/transform.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index cea2ef4c5..749cf1f61 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -264,7 +264,7 @@ def update(_doc_cls=None, **update):
             op = operator_map.get(op, op)
 
         match = None
-        if parts[-1] in COMPARISON_OPERATORS:
+        if len(parts) > 1 and parts[-1] in COMPARISON_OPERATORS:
             match = parts.pop()
 
         # Allow to escape operator-like field name by __

From 32a80b2adb92eabf84988eafb2577c37e80af280 Mon Sep 17 00:00:00 2001
From: Rob Zak <robertjzak@gmail.com>
Date: Fri, 8 Jul 2022 05:12:47 -0400
Subject: [PATCH 1310/1519] Make uuidRepresentation case insensitive

---
 mongoengine/connection.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index bbc98f17d..7d833a737 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -166,7 +166,8 @@ def _get_connection_settings(
     kwargs.pop("slaves", None)
     kwargs.pop("is_slave", None)
 
-    if "uuidRepresentation" not in kwargs:
+    keys = set(key.lower for key in kwargs.keys())
+    if "uuidrepresentation" not in keys:
         warnings.warn(
             "No uuidRepresentation is specified! Falling back to "
             "'pythonLegacy' which is the default for pymongo 3.x. "

From 0c2fd0d2738bbbcd8fb5397c375f88ab4c315179 Mon Sep 17 00:00:00 2001
From: Rob Zak <robertjzak@gmail.com>
Date: Fri, 8 Jul 2022 05:30:12 -0400
Subject: [PATCH 1311/1519] fix typo

---
 mongoengine/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 7d833a737..6efd0b843 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -166,7 +166,7 @@ def _get_connection_settings(
     kwargs.pop("slaves", None)
     kwargs.pop("is_slave", None)
 
-    keys = set(key.lower for key in kwargs.keys())
+    keys = set(key.lower() for key in kwargs.keys())
     if "uuidrepresentation" not in keys:
         warnings.warn(
             "No uuidRepresentation is specified! Falling back to "

From 19a09d30d23aa3c433d9ea0ba9c6bd0d5adaf20c Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Sun, 17 Jul 2022 14:56:48 +1000
Subject: [PATCH 1312/1519] docs: Fix a few typos

There are small typos in:
- docs/upgrade.rst
- tests/document/test_instance.py
- tests/fields/test_fields.py
- tests/fields/test_file_field.py
- tests/queryset/test_geo.py

Fixes:
- Should read `explicitly` rather than `explcitly`.
- Should read `document` rather than `docoument`.
- Should read `distance` rather than `distace`.
- Should read `dereferenced` rather than `derefenced`.
- Should read `aggregation` rather than `aggreation`.

Signed-off-by: Tim Gates <tim.gates@iress.com>
---
 docs/upgrade.rst                | 2 +-
 tests/document/test_instance.py | 2 +-
 tests/fields/test_fields.py     | 2 +-
 tests/fields/test_file_field.py | 2 +-
 tests/queryset/test_geo.py      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 4e798dd4b..4c02fb74a 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -77,7 +77,7 @@ MongoDB connection before shipping v0.10.8 in production.
 ******
 
 `QuerySet.aggregate_sum` and `QuerySet.aggregate_average` are dropped. Use
-`QuerySet.sum` and `QuerySet.average` instead which use the aggreation framework
+`QuerySet.sum` and `QuerySet.average` instead which use the aggregation framework
 by default from now on.
 
 0.9.0
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index db72e580e..394aa9cec 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -1735,7 +1735,7 @@ class UserSubscription(Document):
 
         user = User.objects.first()
         # Even if stored as ObjectId's internally mongoengine uses DBRefs
-        # As ObjectId's aren't automatically derefenced
+        # As ObjectId's aren't automatically dereferenced
         assert isinstance(user._data["orgs"][0], DBRef)
         assert isinstance(user.orgs[0], Organization)
         assert isinstance(user._data["orgs"][0], Organization)
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 5fbb78d85..36e08aa0c 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -126,7 +126,7 @@ class Person(Document):
 
     def test_default_values_set_to_None(self):
         """Ensure that default field values are used even when
-        we explcitly initialize the doc with None values.
+        we explicitly initialize the doc with None values.
         """
 
         class Person(Document):
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index 8c0db044a..4f584b4c8 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -328,7 +328,7 @@ class TestFile(Document):
         assert len(list(files)) == 1
         assert len(list(chunks)) == 1
 
-        # Deleting the docoument should delete the files
+        # Deleting the document should delete the files
         testfile.delete()
 
         files = db.fs.files.find()
diff --git a/tests/queryset/test_geo.py b/tests/queryset/test_geo.py
index 670cf38db..e87d27aea 100644
--- a/tests/queryset/test_geo.py
+++ b/tests/queryset/test_geo.py
@@ -237,7 +237,7 @@ def test_2dsphere_geo_within_polygon(self):
         assert events.count() == 0
 
     def test_2dsphere_near_and_min_max_distance(self):
-        """Ensure "min_distace" and "max_distance" operators work well
+        """Ensure "min_distance" and "max_distance" operators work well
         together with the "near" operator in a 2dsphere index.
         """
         event1, event2, event3 = self._create_event_data(point_field_class=PointField)

From 80db724ef249f1e4004a36009513dbca6866a790 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 17 Jul 2022 21:11:32 +0200
Subject: [PATCH 1313/1519] add comment on latest change

---
 mongoengine/connection.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 6efd0b843..49b665f5b 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -166,7 +166,9 @@ def _get_connection_settings(
     kwargs.pop("slaves", None)
     kwargs.pop("is_slave", None)
 
-    keys = set(key.lower() for key in kwargs.keys())
+    keys = {
+        key.lower() for key in kwargs.keys()
+    }  # pymongo options are case insensitive
     if "uuidrepresentation" not in keys:
         warnings.warn(
             "No uuidRepresentation is specified! Falling back to "

From d1c665b70a02c47851d1d0446d3f945a8df3daac Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 17 Jul 2022 21:59:08 +0200
Subject: [PATCH 1314/1519] prepare_0_24_2

---
 docs/changelog.rst      | 5 ++++-
 mongoengine/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b3da43920..df362af07 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,12 +8,15 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.24.2
+=================
+- Bug fix regarding uuidRepresentation that was case sensitive #2650
+
 Changes in 0.24.1
 =================
 - Allow pymongo<5.0 to be pulled
 - Don't use deprecated property for emptiness check in queryset base #2633
 
-
 Changes in 0.24.0
 =================
 - EnumField improvements: now ``choices`` limits the values of an enum to allow
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 14519da25..aa38f5b8b 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 24, 1)
+VERSION = (0, 24, 2)
 
 
 def get_version():

From 73c5cd3a893c4bb7efea0b08ccd99c241c419cad Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 18 Jul 2022 00:18:18 +0200
Subject: [PATCH 1315/1519] minor edit

---
 mongoengine/queryset/base.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 193b808b3..305ca65bf 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -953,8 +953,10 @@ def distinct(self, field):
             field = self._fields_to_dbfields([field]).pop()
         except LookUpError:
             pass
+
         if not self._auto_dereference:
             return queryset._cursor.distinct(field)
+
         distinct = self._dereference(
             queryset._cursor.distinct(field), 1, name=field, instance=self._document
         )

From 9b811c6f3e9570e254f0e8b665f40ede166f018d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 18 Jul 2022 00:19:40 +0200
Subject: [PATCH 1316/1519] remove dup check

---
 mongoengine/queryset/base.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 79c92f78b..703ae2def 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -953,17 +953,12 @@ def distinct(self, field):
             field = self._fields_to_dbfields([field]).pop()
         except LookUpError:
             pass
-        
+
         raw_values = queryset._cursor.distinct(field)
         if not self._auto_dereference:
             return raw_values
 
-        if not self._auto_dereference:
-            return queryset._cursor.distinct(field)
-
-        distinct = self._dereference(
-            raw_values, 1, name=field, instance=self._document
-        )
+        distinct = self._dereference(raw_values, 1, name=field, instance=self._document)
 
         doc_field = self._document._fields.get(field.split(".", 1)[0])
         instance = None

From 6479b24dbf40ef9e7f1e00532fd4eb9c6105fbc6 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 18 Jul 2022 00:21:21 +0200
Subject: [PATCH 1317/1519] update doc

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index df362af07..22bf2d9a4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Turning off dereferencing for the results of distinct query. #2663
 
 Changes in 0.24.2
 =================

From 5998fc7a8e4ecd67b4d1998940d66b426e74cc64 Mon Sep 17 00:00:00 2001
From: Prabhupad Pradhan <prabhupad26@gmail.com>
Date: Thu, 4 Aug 2022 17:04:04 +0200
Subject: [PATCH 1318/1519] Added null check for Issue # 2681

---
 mongoengine/base/fields.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index a68035274..8f1595900 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -511,7 +511,8 @@ def to_python(self, value):
     def to_mongo(self, value):
         if not isinstance(value, ObjectId):
             try:
-                return ObjectId(str(value))
+                if value:
+                    return ObjectId(str(value))
             except Exception as e:
                 self.error(str(e))
         return value

From 4b5dbc7a52f95ae5525c08cee8ff9f743e8e677d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 6 Sep 2022 21:13:59 +0200
Subject: [PATCH 1319/1519] fix failing tests in get_db

---
 .pre-commit-config.yaml   |  6 +++---
 mongoengine/connection.py | 10 ++++++----
 tests/test_connection.py  |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a6c0a70d3..e11495845 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,14 +1,14 @@
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.3.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 22.3.0
+    rev: 22.8.0
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
@@ -16,7 +16,7 @@ repos:
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
+    rev: v2.37.3
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index bb2885958..799c98d96 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -89,7 +89,7 @@ def _get_connection_settings(
         "password": password,
         "authentication_source": authentication_source,
         "authentication_mechanism": authentication_mechanism,
-        "authmechanismproperties": authmechanismproperties
+        "authmechanismproperties": authmechanismproperties,
     }
 
     _check_db_name(conn_settings["name"])
@@ -161,7 +161,9 @@ def _get_connection_settings(
                         conn_settings["read_preference"] = preference
                         break
             if "authmechanismproperties" in uri_options:
-                conn_settings["authmechanismproperties"] = uri_options["authmechanismproperties"]
+                conn_settings["authmechanismproperties"] = uri_options[
+                    "authmechanismproperties"
+                ]
         else:
             resolved_hosts.append(entity)
     conn_settings["host"] = resolved_hosts
@@ -295,7 +297,7 @@ def _clean_settings(settings_dict):
                 "password",
                 "authentication_source",
                 "authentication_mechanism",
-                "authmechanismproperties"
+                "authmechanismproperties",
             }
             rename_fields = {}
         else:
@@ -395,7 +397,7 @@ def get_db(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
                 conn_settings["password"]
                 or conn_settings["authentication_mechanism"] == "MONGODB-X509"
             )
-            and ("authmechanismproperties" not in conn_settings.keys())
+            and conn_settings["authmechanismproperties"] is None
         ):
             auth_kwargs = {"source": conn_settings["authentication_source"]}
             if conn_settings["authentication_mechanism"] is not None:
diff --git a/tests/test_connection.py b/tests/test_connection.py
index a9c56d63b..c736baf91 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -418,7 +418,7 @@ def test_uri_without_credentials_doesnt_override_conn_settings(self):
                 db.list_collection_names()
         else:
             with pytest.raises(OperationFailure):
-                db = get_db()
+                get_db()
 
     def test_connect_uri_with_authsource(self):
         """Ensure that the connect() method works well with `authSource`

From f88dff216c62f54f7a15d457582259fbc5fac319 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 6 Sep 2022 21:21:18 +0200
Subject: [PATCH 1320/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index df362af07..8b6c1cf13 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Support MONGODB-AWS authentication mechanism (with `authmechanismproperties`) #2507
 
 Changes in 0.24.2
 =================

From 83146ecfa03d694ded36d1a1b6f3df2541f5bfcf Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 23 Oct 2022 22:37:55 +0200
Subject: [PATCH 1321/1519] Fix issue with flake8 and importlib_metadata 5.0
 that introduced breaking changes (breaks on py 3.7)

---
 .pre-commit-config.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e11495845..10912549c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,15 +8,17 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.9.2
     hooks:
       - id: flake8
+        additional_dependencies:
+          - importlib_metadata<5
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v3.1.0
     hooks:
       - id: pyupgrade
         args: [--py36-plus]

From cba6bc991a4483d07479520f13da1fbcdadae3cb Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 23 Oct 2022 23:07:08 +0200
Subject: [PATCH 1322/1519] Add mongo5 to pipeline

---
 .github/workflows/github-actions.yml | 13 +++++++------
 .github/workflows/install_mongo.sh   |  4 +++-
 README.rst                           |  2 +-
 docs/changelog.rst                   |  1 +
 tox.ini                              |  1 +
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index d75bdb1a0..6dee44ab8 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -11,10 +11,10 @@ on:
     tags:
       - 'v[0-9]+\.[0-9]+\.[0-9]+*'
 env:
-  MONGODB_3_6: 3.6.14
-  MONGODB_4_0: 4.0.23
-  MONGODB_4_2: 4.2
+  MONGODB_3_6: 3.6.23
+  MONGODB_4_0: 4.0.28
   MONGODB_4_4: 4.4
+  MONGODB_5_0: 5.0
 
   PYMONGO_3_4: 3.4
   PYMONGO_3_6: 3.6
@@ -22,6 +22,7 @@ env:
   PYMONGO_3_11: 3.11
   PYMONGO_3_12: 3.12
   PYMONGO_4_0: 4.0
+  PYMONGO_4_3: 4.3.2
 
   MAIN_PYTHON_VERSION: 3.7
 
@@ -53,9 +54,6 @@ jobs:
           - python-version: 3.7
             MONGODB: $MONGODB_3_6
             PYMONGO: $PYMONGO_3_9
-          - python-version: 3.7
-            MONGODB: $MONGODB_4_2
-            PYMONGO: $PYMONGO_3_9
           - python-version: 3.7
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_11
@@ -65,6 +63,9 @@ jobs:
           - python-version: 3.9
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_4_0
+          - python-version: "3.10"
+            MONGODB: $MONGODB_5_0
+            PYMONGO: $PYMONGO_4_3
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
index 136f5c203..3b99f56d7 100644
--- a/.github/workflows/install_mongo.sh
+++ b/.github/workflows/install_mongo.sh
@@ -9,9 +9,11 @@ if [[ "$MONGODB" == *"4.2"* ]]; then
   mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
 elif [[ "$MONGODB" == *"4.4"* ]]; then
   mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
+elif [[ "$MONGODB" == *"5.0"* ]]; then
+  mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
 fi
 
-wget http://fastdl.mongodb.org/linux/$mongo_build.tgz
+wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
 tar xzf $mongo_build.tgz
 
 mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
diff --git a/README.rst b/README.rst
index 53a0bfd08..39497fb37 100644
--- a/README.rst
+++ b/README.rst
@@ -31,7 +31,7 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.2 and v4.4. Future versions
+MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.4 and v5.0. Future versions
 should be supported as well, but aren't actively tested at the moment. Make
 sure to open an issue or submit a pull request if you experience any problems
 with a more recent MongoDB versions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0116e5609..282934168 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,7 @@ Development
 - (Fill this out as you fix issues and develop your features).
 - Support MONGODB-AWS authentication mechanism (with `authmechanismproperties`) #2507
 - Turning off dereferencing for the results of distinct query. #2663
+- Add tests against Mongo 5.0 in pipeline
 
 Changes in 0.24.2
 =================
diff --git a/tox.ini b/tox.ini
index 783e9f9ec..aa30430d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,5 +11,6 @@ deps =
     mg311: pymongo>=3.11,<3.12
     mg312: pymongo>=3.12,<3.13
     mg4: pymongo>=4.0,<4.1
+    mg43: pymongo>=4.3,<4.4
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 9946d1ebbdedddfeb0e3b2002d3c242fa400a413 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 23 Oct 2022 23:25:19 +0200
Subject: [PATCH 1323/1519] fix mongo download url

---
 .github/workflows/github-actions.yml | 2 +-
 .github/workflows/install_mongo.sh   | 2 +-
 tox.ini                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 6dee44ab8..d0cec9f50 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -14,7 +14,7 @@ env:
   MONGODB_3_6: 3.6.23
   MONGODB_4_0: 4.0.28
   MONGODB_4_4: 4.4
-  MONGODB_5_0: 5.0
+  MONGODB_5_0: "5.0"
 
   PYMONGO_3_4: 3.4
   PYMONGO_3_6: 3.6
diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
index 3b99f56d7..bb7b58525 100644
--- a/.github/workflows/install_mongo.sh
+++ b/.github/workflows/install_mongo.sh
@@ -13,7 +13,7 @@ elif [[ "$MONGODB" == *"5.0"* ]]; then
   mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
 fi
 
-wget http://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
+wget http://fastdl.mongodb.org/linux/$mongo_build.tgz
 tar xzf $mongo_build.tgz
 
 mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
diff --git a/tox.ini b/tox.ini
index aa30430d3..553c49763 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,6 @@ deps =
     mg311: pymongo>=3.11,<3.12
     mg312: pymongo>=3.12,<3.13
     mg4: pymongo>=4.0,<4.1
-    mg43: pymongo>=4.3,<4.4
+    mg432: pymongo>=4.3,<4.4
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 4bb86783d48fe1d762115c78e0c9053f74195e3c Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 24 Oct 2022 21:14:26 +0200
Subject: [PATCH 1324/1519] minor fix in formatting

---
 docs/guide/connecting.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index d147eab5b..2cbdb4453 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -186,9 +186,9 @@ access to the same User document across databases::
     with switch_db(User, 'archive-user-db') as User:
         User(name='Ross').save()  # Saves the 'archive-user-db'
 
-.. note:: :func:`~mongoengine.context_managers.switch_db` when used on 
-    a class that allow inheritance will change the database alias 
-    for instances of a given class only - instances of subclasses will still use 
+.. note:: :func:`~mongoengine.context_managers.switch_db` when used on
+    a class that allow inheritance will change the database alias
+    for instances of a given class only - instances of subclasses will still use
     the default database.
 
 Switch Collection

From 4f21c359d8b52cd5033a746fc827ddb3acd86918 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 24 Oct 2022 20:56:42 +0200
Subject: [PATCH 1325/1519] allow_workflow_dispatch_as_trigger

---
 .github/workflows/github-actions.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index d0cec9f50..212aa414b 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -6,6 +6,8 @@ on:
   push:
     branches:
       - master
+  # Manual trigger from Action page
+  workflow_dispatch:
   # release tags
   create:
     tags:

From caa7c365e7ff91d787aea0bb697cf3dd6647fceb Mon Sep 17 00:00:00 2001
From: Shane Harvey <shnhrv@gmail.com>
Date: Wed, 26 Oct 2022 13:57:41 -0700
Subject: [PATCH 1326/1519] Improve save() performance by skipping index
 creation

Indexes are now only created when a Model is first used, eg the first
call to save() or on the first call to _get_collection(), or when the new
meta["auto_create_index_on_save"] option is set to True. This is a minor
breaking change for some applications. As a workaround apps can explicitly
call ensure_indexes() or set meta["auto_create_index_on_save"] to True.
---
 benchmarks/test_basic_doc_ops.py     |  2 +-
 benchmarks/test_inserts.py           | 15 ++---
 benchmarks/test_save_with_indexes.py | 87 ++++++++++++++++++++++++++++
 docs/changelog.rst                   |  5 ++
 docs/guide/defining-documents.rst    |  8 ++-
 mongoengine/document.py              | 10 +++-
 tests/document/test_indexes.py       | 66 +++++++++++----------
 7 files changed, 151 insertions(+), 42 deletions(-)
 create mode 100644 benchmarks/test_save_with_indexes.py

diff --git a/benchmarks/test_basic_doc_ops.py b/benchmarks/test_basic_doc_ops.py
index 66b6a17f9..8b8bf4aaf 100644
--- a/benchmarks/test_basic_doc_ops.py
+++ b/benchmarks/test_basic_doc_ops.py
@@ -12,7 +12,7 @@
     StringField,
 )
 
-mongoengine.connect(db="mongoengine_benchmark_test")
+mongoengine.connect(db="mongoengine_benchmark_test", w=1)
 
 
 def timeit(f, n=10000):
diff --git a/benchmarks/test_inserts.py b/benchmarks/test_inserts.py
index dcd18ff88..8e8419933 100644
--- a/benchmarks/test_inserts.py
+++ b/benchmarks/test_inserts.py
@@ -5,15 +5,11 @@ def main():
     setup = """
 from pymongo import MongoClient
 
-connection = MongoClient()
+connection = MongoClient(w=1)
 connection.drop_database('mongoengine_benchmark_test')
 """
 
     stmt = """
-from pymongo import MongoClient
-
-connection = MongoClient()
-
 db = connection.mongoengine_benchmark_test
 noddy = db.noddy
 
@@ -29,13 +25,12 @@ def main():
 """
 
     print("-" * 100)
-    print("PyMongo: Creating 10000 dictionaries.")
+    print('PyMongo: Creating 10000 dictionaries (write_concern={"w": 1}).')
     t = timeit.Timer(stmt=stmt, setup=setup)
     print(f"{t.timeit(1)}s")
 
     stmt = """
-from pymongo import MongoClient, WriteConcern
-connection = MongoClient()
+from pymongo import WriteConcern
 
 db = connection.mongoengine_benchmark_test
 noddy = db.noddy.with_options(write_concern=WriteConcern(w=0))
@@ -64,7 +59,7 @@ def main():
 connection.close()
 
 from mongoengine import Document, DictField, connect
-connect("mongoengine_benchmark_test")
+connect("mongoengine_benchmark_test", w=1)
 
 class Noddy(Document):
     fields = DictField()
@@ -82,7 +77,7 @@ class Noddy(Document):
 """
 
     print("-" * 100)
-    print("MongoEngine: Creating 10000 dictionaries.")
+    print('MongoEngine: Creating 10000 dictionaries (write_concern={"w": 1}).')
     t = timeit.Timer(stmt=stmt, setup=setup)
     print(f"{t.timeit(1)}s")
 
diff --git a/benchmarks/test_save_with_indexes.py b/benchmarks/test_save_with_indexes.py
new file mode 100644
index 000000000..86e281cb3
--- /dev/null
+++ b/benchmarks/test_save_with_indexes.py
@@ -0,0 +1,87 @@
+import timeit
+
+
+def main():
+    setup = """
+from pymongo import MongoClient
+
+connection = MongoClient()
+connection.drop_database("mongoengine_benchmark_test")
+connection.close()
+
+from mongoengine import connect, Document, IntField, StringField
+connect("mongoengine_benchmark_test", w=1)
+
+class User0(Document):
+    name = StringField()
+    age = IntField()
+
+class User1(Document):
+    name = StringField()
+    age = IntField()
+    meta = {"indexes": [["name"]]}
+
+class User2(Document):
+    name = StringField()
+    age = IntField()
+    meta = {"indexes": [["name", "age"]]}
+
+class User3(Document):
+    name = StringField()
+    age = IntField()
+    meta = {"indexes": [["name"]], "auto_create_index_on_save": True}
+
+class User4(Document):
+    name = StringField()
+    age = IntField()
+    meta = {"indexes": [["name", "age"]], "auto_create_index_on_save": True}
+"""
+
+    stmt = """
+for i in range(10000):
+    User0(name="Nunu", age=9).save()
+"""
+    print("-" * 80)
+    print("Save 10000 documents with 0 indexes.")
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print(f"{min(t.repeat(repeat=3, number=1))}s")
+
+    stmt = """
+for i in range(10000):
+    User1(name="Nunu", age=9).save()
+"""
+    print("-" * 80)
+    print("Save 10000 documents with 1 index.")
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print(f"{min(t.repeat(repeat=3, number=1))}s")
+
+    stmt = """
+for i in range(10000):
+    User2(name="Nunu", age=9).save()
+"""
+    print("-" * 80)
+    print("Save 10000 documents with 2 indexes.")
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print(f"{min(t.repeat(repeat=3, number=1))}s")
+
+    stmt = """
+for i in range(10000):
+    User3(name="Nunu", age=9).save()
+"""
+    print("-" * 80)
+    print("Save 10000 documents with 1 index (auto_create_index_on_save=True).")
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print(f"{min(t.repeat(repeat=3, number=1))}s")
+
+    stmt = """
+for i in range(10000):
+    User4(name="Nunu", age=9).save()
+"""
+    print("-" * 80)
+    print("Save 10000 documents with 2 indexes (auto_create_index_on_save=True).")
+    t = timeit.Timer(stmt=stmt, setup=setup)
+    print(f"{min(t.repeat(repeat=3, number=1))}s")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 282934168..82772d9e3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,11 @@ Development
 - Support MONGODB-AWS authentication mechanism (with `authmechanismproperties`) #2507
 - Turning off dereferencing for the results of distinct query. #2663
 - Add tests against Mongo 5.0 in pipeline
+- BREAKING CHANGE: Improved the performance of :meth:`~mongoengine.Document.save()`
+  by removing the call to :meth:`~mongoengine.Document.ensure_indexes` unless
+  ``meta['auto_create_index_on_save']`` is set to True.
+- Added meta ``auto_create_index_on_save`` so you can enable index creation
+  on :meth:`~mongoengine.Document.save()`.
 
 Changes in 0.24.2
 =================
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 53758672a..df749ee1e 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -574,6 +574,7 @@ There are a few top level defaults for all indexes that can be set::
             'index_background': True,
             'index_cls': False,
             'auto_create_index': True,
+            'auto_create_index_on_save': False,
         }
 
 
@@ -588,10 +589,15 @@ There are a few top level defaults for all indexes that can be set::
 
 :attr:`auto_create_index` (Optional)
     When this is True (default), MongoEngine will ensure that the correct
-    indexes exist in MongoDB each time a command is run. This can be disabled
+    indexes exist in MongoDB when the Document is first used. This can be disabled
     in systems where indexes are managed separately. Disabling this will improve
     performance.
 
+:attr:`auto_create_index_on_save` (Optional)
+    When this is True, MongoEngine will ensure that the correct
+    indexes exist in MongoDB each time :meth:`~mongoengine.document.Document.save`
+    is run. Enabling this will degrade performance. The default is False. This
+    option was added in version 0.25.
 
 Compound Indexes and Indexing sub documents
 -------------------------------------------
diff --git a/mongoengine/document.py b/mongoengine/document.py
index e7a1938f2..b8b05402f 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -384,6 +384,10 @@ def save(
             meta['cascade'] = True.  Also you can pass different kwargs to
             the cascade save using cascade_kwargs which overwrites the
             existing kwargs with custom values.
+        .. versionchanged:: 0.25
+           save() no longer calls :meth:`~mongoengine.Document.ensure_indexes`
+           unless ``meta['auto_create_index_on_save']`` is set to True.
+
         """
         signal_kwargs = signal_kwargs or {}
 
@@ -407,8 +411,12 @@ def save(
         # it might be refreshed by the pre_save_post_validation hook, e.g., for etag generation
         doc = self.to_mongo()
 
-        if self._meta.get("auto_create_index", True):
+        if self._meta.get("auto_create_index_on_save", False):
             self.ensure_indexes()
+        else:
+            # Call _get_collection so that errors from ensure_indexes are not
+            # wrapped in OperationError, see test_primary_key_unique_not_working.
+            self._get_collection()
 
         try:
             # Save a new document or update an existing one
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 4d56f8553..f367cd0f9 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -983,44 +983,52 @@ class Book(Document):
 
     def test_indexes_after_database_drop(self):
         """
-        Test to ensure that indexes are re-created on a collection even
-        after the database has been dropped.
+        Test to ensure that indexes are not re-created on a collection
+        after the database has been dropped unless auto_create_index_on_save
+        is enabled.
 
-        Issue #812
+        Issue #812 and #1446.
         """
         # Use a new connection and database since dropping the database could
         # cause concurrent tests to fail.
-        connection = connect(
-            db="tempdatabase", alias="test_indexes_after_database_drop"
-        )
+        tmp_alias = "test_indexes_after_database_drop"
+        connection = connect(db="tempdatabase", alias=tmp_alias)
+        self.addCleanup(connection.drop_database, "tempdatabase")
 
         class BlogPost(Document):
-            title = StringField()
             slug = StringField(unique=True)
+            meta = {"db_alias": tmp_alias}
 
-            meta = {"db_alias": "test_indexes_after_database_drop"}
+        BlogPost.drop_collection()
+        BlogPost(slug="test").save()
+        with pytest.raises(NotUniqueError):
+            BlogPost(slug="test").save()
 
-        try:
-            BlogPost.drop_collection()
-
-            # Create Post #1
-            post1 = BlogPost(title="test1", slug="test")
-            post1.save()
-
-            # Drop the Database
-            connection.drop_database("tempdatabase")
-
-            # Re-create Post #1
-            post1 = BlogPost(title="test1", slug="test")
-            post1.save()
-
-            # Create Post #2
-            post2 = BlogPost(title="test2", slug="test")
-            with pytest.raises(NotUniqueError):
-                post2.save()
-        finally:
-            # Drop the temporary database at the end
-            connection.drop_database("tempdatabase")
+        # Drop the Database
+        connection.drop_database("tempdatabase")
+        BlogPost(slug="test").save()
+        # No error because the index was not recreated after dropping the database.
+        BlogPost(slug="test").save()
+
+        # Repeat with auto_create_index_on_save: True.
+        class BlogPost2(Document):
+            slug = StringField(unique=True)
+            meta = {
+                "db_alias": tmp_alias,
+                "auto_create_index_on_save": True,
+            }
+
+        BlogPost2.drop_collection()
+        BlogPost2(slug="test").save()
+        with pytest.raises(NotUniqueError):
+            BlogPost2(slug="test").save()
+
+        # Drop the Database
+        connection.drop_database("tempdatabase")
+        BlogPost2(slug="test").save()
+        # Error because ensure_indexes is run on every save().
+        with pytest.raises(NotUniqueError):
+            BlogPost2(slug="test").save()
 
     def test_index_dont_send_cls_option(self):
         """

From abac9ef3e5c44a82c7ccb8cf5d49241dda517e90 Mon Sep 17 00:00:00 2001
From: Shane Harvey <shnhrv@gmail.com>
Date: Thu, 27 Oct 2022 16:26:26 -0400
Subject: [PATCH 1327/1519] PyMongo 4 bug fix: don't preemptively close in use
 client

Fixes #2627.
---
 docs/changelog.rst        |  2 ++
 mongoengine/connection.py |  8 +++++---
 tests/test_connection.py  | 20 +++++++++++++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 282934168..b4fe920d2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,8 @@ Development
 - Support MONGODB-AWS authentication mechanism (with `authmechanismproperties`) #2507
 - Turning off dereferencing for the results of distinct query. #2663
 - Add tests against Mongo 5.0 in pipeline
+- Bug fix support for PyMongo>=4 to fix "InvalidOperation: Cannot use MongoClient after close"
+  errors.
 
 Changes in 0.24.2
 =================
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 799c98d96..ef285f424 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -246,9 +246,11 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
     from mongoengine import Document
     from mongoengine.base.common import _get_documents_by_db
 
-    if alias in _connections:
-        get_connection(alias=alias).close()
-        del _connections[alias]
+    connection = _connections.pop(alias, None)
+    if connection:
+        # Only close the client if we're removing the final reference.
+        if connection not in _connections.values():
+            connection.close()
 
     if alias in _dbs:
         # Detach all cached collections in Documents
diff --git a/tests/test_connection.py b/tests/test_connection.py
index c736baf91..b62cec96e 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -5,7 +5,11 @@
 import pytest
 from bson.tz_util import utc
 from pymongo import MongoClient, ReadPreference
-from pymongo.errors import InvalidName, OperationFailure
+from pymongo.errors import (
+    InvalidName,
+    InvalidOperation,
+    OperationFailure,
+)
 
 import mongoengine.connection
 from mongoengine import (
@@ -287,6 +291,20 @@ def test_disconnect_silently_pass_if_alias_does_not_exist(self):
         assert len(connections) == 0
         disconnect(alias="not_exist")
 
+    def test_disconnect_does_not_close_client_used_by_another_alias(self):
+        client1 = connect(alias="disconnect_reused_client_test_1")
+        client2 = connect(alias="disconnect_reused_client_test_2")
+        assert client1 is client2
+        client1.admin.command("ping")
+        disconnect("disconnect_reused_client_test_1")
+        # The client is not closed because the second alias still exists.
+        client2.admin.command("ping")
+        disconnect("disconnect_reused_client_test_2")
+        # The client is now closed:
+        if PYMONGO_VERSION >= (4,):
+            with pytest.raises(InvalidOperation):
+                client2.admin.command("ping")
+
     def test_disconnect_all(self):
         connections = mongoengine.connection._connections
         dbs = mongoengine.connection._dbs

From f1ae62440abea0d141c6518964fda613343f7a5c Mon Sep 17 00:00:00 2001
From: Shane Harvey <shnhrv@gmail.com>
Date: Fri, 28 Oct 2022 09:28:58 -0400
Subject: [PATCH 1328/1519] Fix client comparison to use is, not == to
 correctly close clients and update test to cover this case

---
 mongoengine/connection.py |  4 +++-
 tests/test_connection.py  | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index ef285f424..e9968c7f2 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -249,7 +249,9 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
     connection = _connections.pop(alias, None)
     if connection:
         # Only close the client if we're removing the final reference.
-        if connection not in _connections.values():
+        # Use 'is' instead of 'in' or '==' to ensure the clients are
+        # the same instance.
+        if all(connection is not c for c in _connections.values()):
             connection.close()
 
     if alias in _dbs:
diff --git a/tests/test_connection.py b/tests/test_connection.py
index b62cec96e..27be9dd99 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -294,7 +294,9 @@ def test_disconnect_silently_pass_if_alias_does_not_exist(self):
     def test_disconnect_does_not_close_client_used_by_another_alias(self):
         client1 = connect(alias="disconnect_reused_client_test_1")
         client2 = connect(alias="disconnect_reused_client_test_2")
+        client3 = connect(alias="disconnect_reused_client_test_3", maxPoolSize=10)
         assert client1 is client2
+        assert client1 is not client3
         client1.admin.command("ping")
         disconnect("disconnect_reused_client_test_1")
         # The client is not closed because the second alias still exists.
@@ -304,6 +306,14 @@ def test_disconnect_does_not_close_client_used_by_another_alias(self):
         if PYMONGO_VERSION >= (4,):
             with pytest.raises(InvalidOperation):
                 client2.admin.command("ping")
+        # 3rd client connected to the same cluster with different options
+        # is not closed either.
+        client3.admin.command("ping")
+        disconnect("disconnect_reused_client_test_3")
+        # 3rd client is now closed:
+        if PYMONGO_VERSION >= (4,):
+            with pytest.raises(InvalidOperation):
+                client3.admin.command("ping")
 
     def test_disconnect_all(self):
         connections = mongoengine.connection._connections

From a39a24abe15a0c8a746f2da9d05e08692e0e5f62 Mon Sep 17 00:00:00 2001
From: mike <ke265379ke@gmail.com>
Date: Fri, 2 Dec 2022 17:44:13 +0800
Subject: [PATCH 1329/1519] fix eaxmple

---
 docs/guide/validation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/validation.rst b/docs/guide/validation.rst
index e5b9ed662..866adc95f 100644
--- a/docs/guide/validation.rst
+++ b/docs/guide/validation.rst
@@ -19,7 +19,7 @@ out of the box. Validation runs when calling `.validate()` or `.save()`
 
 .. code-block:: python
 
-    from mongoengine import Document, EmailField
+    from mongoengine import Document, EmailField, IntField
 
     class User(Document):
         email = EmailField()

From ab77bc338683e87daafb4f9ad1b1bfd19fc34dee Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 27 Dec 2022 21:30:29 +0100
Subject: [PATCH 1330/1519] Fix outdated pre-commit hook + flake8 fix

---
 .pre-commit-config.yaml      | 12 ++++++------
 mongoengine/queryset/base.py | 28 ++++++++++++++--------------
 setup.py                     |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 10912549c..a0acf1c43 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,28 +1,28 @@
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
       - id: black
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies:
           - importlib_metadata<5
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
   - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.11.4
     hooks:
       - id: isort
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 703ae2def..7da9c2e63 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1739,29 +1739,29 @@ def no_dereference(self):
 
     def _item_frequencies_map_reduce(self, field, normalize=False):
         map_func = """
-            function() {
-                var path = '{{~%(field)s}}'.split('.');
+            function() {{
+                var path = '{{{{~{field}}}}}'.split('.');
                 var field = this;
 
-                for (p in path) {
+                for (p in path) {{
                     if (typeof field != 'undefined')
                        field = field[path[p]];
                     else
                        break;
-                }
-                if (field && field.constructor == Array) {
-                    field.forEach(function(item) {
+                }}
+                if (field && field.constructor == Array) {{
+                    field.forEach(function(item) {{
                         emit(item, 1);
-                    });
-                } else if (typeof field != 'undefined') {
+                    }});
+                }} else if (typeof field != 'undefined') {{
                     emit(field, 1);
-                } else {
+                }} else {{
                     emit(null, 1);
-                }
-            }
-        """ % {
-            "field": field
-        }
+                }}
+            }}
+        """.format(
+            field=field
+        )
         reduce_func = """
             function(key, values) {
                 var total = 0;
diff --git a/setup.py b/setup.py
index 78f618a3c..f88f782be 100644
--- a/setup.py
+++ b/setup.py
@@ -87,7 +87,7 @@ def run_tests(self):
 # import it as it depends on PyMongo and PyMongo isn't installed until this
 # file is read
 init = os.path.join(os.path.dirname(__file__), "mongoengine", "__init__.py")
-version_line = list(filter(lambda l: l.startswith("VERSION"), open(init)))[0]
+version_line = list(filter(lambda line: line.startswith("VERSION"), open(init)))[0]
 
 VERSION = get_version(eval(version_line.split("=")[-1]))
 

From 2097cc4958a6a742eeb259ba2ce9daebe70fe52b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 27 Dec 2022 21:33:38 +0100
Subject: [PATCH 1331/1519] fix github action for python install

---
 .github/workflows/github-actions.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index d0cec9f50..4479e6126 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -33,10 +33,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: '3.9'
+        check-latest: true
     - run: bash .github/workflows/install_ci_python_dep.sh
     - run: pre-commit run -a
 
@@ -69,9 +69,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+        check-latest: true
     - name: install mongo and ci dependencies
       run: |
         bash .github/workflows/install_mongo.sh ${{ matrix.MONGODB }}
@@ -95,9 +96,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.7
+        check-latest: true
     - name: install python dep
       run: |
         pip install -e .
@@ -113,10 +115,10 @@ jobs:
     if: github.event_name != 'pull_request'
     steps:
     - uses: actions/checkout@master
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.9
+        check-latest: true
     - name: build dummy wheel for test-pypi
       run: |
         pip install wheel
@@ -136,10 +138,11 @@ jobs:
     if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
     steps:
     - uses: actions/checkout@master
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.9
+        check-latest: true
     # todo separate build from publish
     # https://stackoverflow.com/questions/59349905/which-properties-does-github-event-in-a-github-workflow-have
     - name: build dummy wheel for test-pypi

From e80bf741b8a6a3110c1fc4b748d2744b09b1fadc Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 27 Dec 2022 22:31:12 +0100
Subject: [PATCH 1332/1519] use ubuntu20 as mongo installation broke with
 ubuntu-latest (now 22)

---
 .github/workflows/github-actions.yml | 12 ++++++------
 setup.py                             |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 4479e6126..a507e25dd 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -43,27 +43,27 @@ jobs:
   test:
     # Test suite run against recent python versions
     # and against a few combination of MongoDB and pymongo
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", pypy3]
+        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, 3.12, pypy3]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
           - python-version: 3.7
             MONGODB: $MONGODB_3_6
             PYMONGO: $PYMONGO_3_9
-          - python-version: 3.7
+          - python-version: 3.8
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_11
-          - python-version: 3.7
+          - python-version: 3.9
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_12
-          - python-version: 3.9
+          - python-version: "3.10"
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_4_0
-          - python-version: "3.10"
+          - python-version: "3.11"
             MONGODB: $MONGODB_5_0
             PYMONGO: $PYMONGO_4_3
     steps:
diff --git a/setup.py b/setup.py
index f88f782be..b1f175233 100644
--- a/setup.py
+++ b/setup.py
@@ -141,7 +141,7 @@ def run_tests(self):
     long_description=LONG_DESCRIPTION,
     platforms=["any"],
     classifiers=CLASSIFIERS,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     install_requires=["pymongo>=3.4,<5.0"],
     cmdclass={"test": PyTest},
     **extra_opts

From b3939a15fb28649fdab4a1ae5d2d6f5a99063b53 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 27 Dec 2022 22:38:25 +0100
Subject: [PATCH 1333/1519] fix actions setup-python for pypy

---
 .github/workflows/github-actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index a507e25dd..6ccfee40d 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -47,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, 3.12, pypy3]
+        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:

From 85ff449dd095b05078564585963b08b52a390705 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 27 Dec 2022 23:04:58 +0100
Subject: [PATCH 1334/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 282934168..b5eddc31e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Development
 - Support MONGODB-AWS authentication mechanism (with `authmechanismproperties`) #2507
 - Turning off dereferencing for the results of distinct query. #2663
 - Add tests against Mongo 5.0 in pipeline
+- Drop support for Python 3.6 (EOL)
 
 Changes in 0.24.2
 =================

From f9b6218dd59c561b600ef15a484699ffdcfbf1be Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 28 Dec 2022 10:55:05 +0100
Subject: [PATCH 1335/1519] improve doc

---
 mongoengine/connection.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index e9968c7f2..b804cc3d8 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -248,9 +248,11 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
 
     connection = _connections.pop(alias, None)
     if connection:
-        # Only close the client if we're removing the final reference.
-        # Use 'is' instead of 'in' or '==' to ensure the clients are
-        # the same instance.
+        # MongoEngine may share the same MongoClient across multiple aliases
+        # if connection settings are the same so we only close
+        # the client if we're removing the final reference.
+        # Important to use 'is' instead of '==' because clients connected to the same cluster
+        # will compare equal even with different options
         if all(connection is not c for c in _connections.values()):
             connection.close()
 

From 450e0f2832b3ef09174571b9005ecb5f309334b2 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 28 Dec 2022 11:42:52 +0100
Subject: [PATCH 1336/1519] improvements for 0 25 0

---
 .github/workflows/github-actions.yml | 15 +++------------
 docs/changelog.rst                   |  7 +++++--
 mongoengine/__init__.py              |  2 +-
 tests/__init__.py                    |  7 +++++++
 tests/test_changelog_consistency.py  | 26 ++++++++++++++++++++++++++
 5 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 tests/test_changelog_consistency.py

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 202b2b190..d89b25946 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -111,10 +111,9 @@ jobs:
         cd docs
         make html-readthedocs
 
-  build-n-publish-dummy:
+  build-dryrun:
     runs-on: ubuntu-latest
     needs: [linting, test, build_doc_dryrun]
-    if: github.event_name != 'pull_request'
     steps:
     - uses: actions/checkout@master
     - uses: actions/setup-python@v4
@@ -124,19 +123,11 @@ jobs:
     - name: build dummy wheel for test-pypi
       run: |
         pip install wheel
-        python setup.py egg_info -b ".dev`date '+%Y%m%d%H%M%S'`" build sdist bdist_wheel
-#    - name: publish test-pypi
-#      # Although working and recommended, test-pypi has a limit
-#      # in the size of projects so it's better to avoid publishing
-#      # until there is a way to garbage collect these dummy releases
-#      uses: pypa/gh-action-pypi-publish@master
-#      with:
-#        password: ${{ secrets.test_pypi_token }}
-#        repository_url: https://test.pypi.org/legacy/
+        python setup.py sdist bdist_wheel
 
   build-n-publish:
     runs-on: ubuntu-latest
-    needs: [linting, test, build_doc_dryrun, build-n-publish-dummy]
+    needs: [linting, test, build_doc_dryrun, build-dryrun]
     if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
     steps:
     - uses: actions/checkout@master
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a768ab345..fd39f96e5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,12 +7,15 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.25.0
+=================
 - Support MONGODB-AWS authentication mechanism (with `authmechanismproperties`) #2507
 - Turning off dereferencing for the results of distinct query. #2663
 - Add tests against Mongo 5.0 in pipeline
 - Drop support for Python 3.6 (EOL)
-- Bug fix support for PyMongo>=4 to fix "InvalidOperation: Cannot use MongoClient after close"
-  errors.
+- Bug fix support for PyMongo>=4 to fix "pymongo.errors.InvalidOperation: Cannot use MongoClient after close"
+  errors. #2627
 
 Changes in 0.24.2
 =================
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index aa38f5b8b..08192b80a 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 24, 2)
+VERSION = (0, 25, 0)
 
 
 def get_version():
diff --git a/tests/__init__.py b/tests/__init__.py
index e69de29bb..29a312ae0 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -0,0 +1,7 @@
+import os
+
+_THIS_MODULE = os.path.abspath(__file__)
+TESTS_DIR = os.path.dirname(_THIS_MODULE)
+
+ROOT_DIR = os.path.dirname(TESTS_DIR)
+DOCS_DIR = os.path.join(ROOT_DIR, "docs")
diff --git a/tests/test_changelog_consistency.py b/tests/test_changelog_consistency.py
new file mode 100644
index 000000000..c612aa0f2
--- /dev/null
+++ b/tests/test_changelog_consistency.py
@@ -0,0 +1,26 @@
+import os
+from pathlib import Path
+
+from mongoengine import get_version
+from tests import DOCS_DIR
+
+
+def test_package_version_described_in_changelog():
+    """Ensures that changelog is updated when version is incremented"""
+    version_str = get_version()
+    changelog_content = Path(os.path.join(DOCS_DIR, "changelog.rst")).read_text()
+    assert (
+        version_str in changelog_content
+    ), "Version in __init__.py not present in changelog"
+
+
+def test_package_version_incremented_when_new_version_added_to_changelog():
+    """Ensures that changelog is updated when version is incremented"""
+    version_str = get_version()
+    changelog_content = Path(os.path.join(DOCS_DIR, "changelog.rst")).read_text()
+
+    def find_between(s, start, end):
+        return (s.split(start))[1].split(end)[0]
+
+    most_recent_version = find_between(changelog_content, start="Changes in ", end="\n")
+    assert most_recent_version == version_str

From 5add868a1166f724fa814110042072d3a3b44073 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 30 Dec 2022 12:45:54 +0100
Subject: [PATCH 1337/1519] minor improvements to clarify index creation during
 save

---
 mongoengine/document.py | 19 ++++++++++++-------
 tests/utils.py          |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index b8b05402f..2b8036c58 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -226,8 +226,7 @@ def _get_collection(cls):
                 cls._collection = db[collection_name]
 
             # Ensure indexes on the collection unless auto_create_index was
-            # set to False.
-            # Also there is no need to ensure indexes on slave.
+            # set to False. Plus, there is no need to ensure indexes on slave.
             db = cls._get_db()
             if cls._meta.get("auto_create_index", True) and db.client.is_primary:
                 cls.ensure_indexes()
@@ -411,12 +410,14 @@ def save(
         # it might be refreshed by the pre_save_post_validation hook, e.g., for etag generation
         doc = self.to_mongo()
 
-        if self._meta.get("auto_create_index_on_save", False):
+        # Initialize the Document underlying pymongo.Collection (+create indexes) if not already initialized
+        # Important to do this here to avoid that the index creation gets wrapped in the try/except block below
+        # and turned into mongoengine.OperationError
+        if self._collection is None:
+            _ = self._get_collection()
+        elif self._meta.get("auto_create_index_on_save", False):
+            # ensure_indexes is called as part of _get_collection so no need to re-call it again here
             self.ensure_indexes()
-        else:
-            # Call _get_collection so that errors from ensure_indexes are not
-            # wrapped in OperationError, see test_primary_key_unique_not_working.
-            self._get_collection()
 
         try:
             # Save a new document or update an existing one
@@ -888,6 +889,10 @@ def ensure_indexes(cls):
         Document collection (query, save, etc) so unless you disabled `auto_create_index`, you
         shouldn't have to call this manually.
 
+        This also gets called upon every call to Document.save if `auto_create_index_on_save` is set to True
+
+        If called multiple times, MongoDB will not re-recreate indexes if they exist already
+
         .. note:: You can disable automatic index creation by setting
                   `auto_create_index` to False in the documents meta data
         """
diff --git a/tests/utils.py b/tests/utils.py
index 0dcdb2dbf..7d0eb33f2 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -71,7 +71,7 @@ def _inner(*args, **kwargs):
             return func(*args, **kwargs)
 
         pretty_version = ".".join(str(n) for n in mongo_version_req)
-        pytest.skip(f"Needs MongoDB v{pretty_version}+")
+        pytest.skip(f"Needs MongoDB {oper.__name__} v{pretty_version}")
 
     _inner.__name__ = func.__name__
     _inner.__doc__ = func.__doc__

From 7094025c14ff2b630861eeac0efdbe521c07c5c9 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 30 Dec 2022 20:43:16 +0100
Subject: [PATCH 1338/1519] improve changelog

---
 docs/changelog.rst      | 8 +++++---
 mongoengine/document.py | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5874f070b..3182cabf6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,14 +9,16 @@ Development
 - (Fill this out as you fix issues and develop your features).
 - BREAKING CHANGE: Improved the performance of :meth:`~mongoengine.Document.save()`
   by removing the call to :meth:`~mongoengine.Document.ensure_indexes` unless
-  ``meta['auto_create_index_on_save']`` is set to True.
+  ``meta['auto_create_index_on_save']`` is set to True. With the default settings, Document indexes
+  will still be created on the fly, during the first usage of the collection (query, insert, etc),
+  they will just not be re-created whenever .save() is called.
 - Added meta ``auto_create_index_on_save`` so you can enable index creation
-  on :meth:`~mongoengine.Document.save()`.
+  on :meth:`~mongoengine.Document.save()` (as it was < 0.26.0).
 
 Changes in 0.25.0
 =================
 - Support MONGODB-AWS authentication mechanism (with `authmechanismproperties`) #2507
-- Turning off dereferencing for the results of distinct query. #2663
+- Bug Fix - distinct query doesn't obey the ``no_dereference()``. #2663
 - Add tests against Mongo 5.0 in pipeline
 - Drop support for Python 3.6 (EOL)
 - Bug fix support for PyMongo>=4 to fix "pymongo.errors.InvalidOperation: Cannot use MongoClient after close"
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 2b8036c58..7e61af5a1 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -383,7 +383,7 @@ def save(
             meta['cascade'] = True.  Also you can pass different kwargs to
             the cascade save using cascade_kwargs which overwrites the
             existing kwargs with custom values.
-        .. versionchanged:: 0.25
+        .. versionchanged:: 0.26
            save() no longer calls :meth:`~mongoengine.Document.ensure_indexes`
            unless ``meta['auto_create_index_on_save']`` is set to True.
 
@@ -410,7 +410,7 @@ def save(
         # it might be refreshed by the pre_save_post_validation hook, e.g., for etag generation
         doc = self.to_mongo()
 
-        # Initialize the Document underlying pymongo.Collection (+create indexes) if not already initialized
+        # Initialize the Document's underlying pymongo.Collection (+create indexes) if not already initialized
         # Important to do this here to avoid that the index creation gets wrapped in the try/except block below
         # and turned into mongoengine.OperationError
         if self._collection is None:

From b7848658ac921258793fdd947163f39e4f1af1ef Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 31 Dec 2022 16:02:33 +0100
Subject: [PATCH 1339/1519] remove deprecated method ensure_index (replaced by
 create_index)

---
 docs/changelog.rst                   |   2 +
 docs/upgrade.rst                     | 628 ---------------------------
 mongoengine/document.py              |  12 -
 tests/document/test_class_methods.py |   4 +-
 tests/queryset/test_queryset.py      |   4 +-
 5 files changed, 6 insertions(+), 644 deletions(-)
 delete mode 100644 docs/upgrade.rst

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3182cabf6..e8c98fc19 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -14,6 +14,8 @@ Development
   they will just not be re-created whenever .save() is called.
 - Added meta ``auto_create_index_on_save`` so you can enable index creation
   on :meth:`~mongoengine.Document.save()` (as it was < 0.26.0).
+- BREAKING CHANGE: remove deprecated method ``ensure_index`` (replaced by ``create_index`` long time ago).
+
 
 Changes in 0.25.0
 =================
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
deleted file mode 100644
index 4c02fb74a..000000000
--- a/docs/upgrade.rst
+++ /dev/null
@@ -1,628 +0,0 @@
-#########
-Upgrading
-#########
-
-Development
-***********
-(Fill this out whenever you introduce breaking changes to MongoEngine)
-
-URLField's constructor no longer takes `verify_exists`
-
-0.15.0
-******
-
-0.14.0
-******
-This release includes a few bug fixes and a significant code cleanup. The most
-important change is that `QuerySet.as_pymongo` no longer supports a
-`coerce_types` mode. If you used it in the past, a) please let us know of your
-use case, b) you'll need to override `as_pymongo` to get the desired outcome.
-
-This release also makes the EmbeddedDocument not hashable by default. If you
-use embedded documents in sets or dictionaries, you might have to override
-`__hash__` and implement a hashing logic specific to your use case. See #1528
-for the reason behind this change.
-
-0.13.0
-******
-This release adds Unicode support to the `EmailField` and changes its
-structure significantly. Previously, email addresses containing Unicode
-characters didn't work at all. Starting with v0.13.0, domains with Unicode
-characters are supported out of the box, meaning some emails that previously
-didn't pass validation now do. Make sure the rest of your application can
-accept such email addresses. Additionally, if you subclassed the `EmailField`
-in your application and overrode `EmailField.EMAIL_REGEX`, you will have to
-adjust your code to override `EmailField.USER_REGEX`, `EmailField.DOMAIN_REGEX`,
-and potentially `EmailField.UTF8_USER_REGEX`.
-
-0.12.0
-******
-This release includes various fixes for the `BaseQuerySet` methods and how they
-are chained together. Since version 0.10.1 applying limit/skip/hint/batch_size
-to an already-existing queryset wouldn't modify the underlying PyMongo cursor.
-This has been fixed now, so you'll need to make sure that your code didn't rely
-on the broken implementation.
-
-Additionally, a public `BaseQuerySet.clone_into` has been renamed to a private
-`_clone_into`. If you directly used that method in your code, you'll need to
-rename its occurrences.
-
-0.11.0
-******
-This release includes a major rehaul of MongoEngine's code quality and
-introduces a few breaking changes. It also touches many different parts of
-the package and although all the changes have been tested and scrutinized,
-you're encouraged to thoroughly test the upgrade.
-
-First breaking change involves renaming `ConnectionError` to `MongoEngineConnectionError`.
-If you import or catch this exception, you'll need to rename it in your code.
-
-Second breaking change drops Python v2.6 support. If you run MongoEngine on
-that Python version, you'll need to upgrade it first.
-
-Third breaking change drops an old backward compatibility measure where
-`from mongoengine.base import ErrorClass` would work on top of
-`from mongoengine.errors import ErrorClass` (where `ErrorClass` is e.g.
-`ValidationError`). If you import any exceptions from `mongoengine.base`,
-change it to `mongoengine.errors`.
-
-0.10.8
-******
-This version fixed an issue where specifying a MongoDB URI host would override
-more information than it should. These changes are minor, but they still
-subtly modify the connection logic and thus you're encouraged to test your
-MongoDB connection before shipping v0.10.8 in production.
-
-0.10.7
-******
-
-`QuerySet.aggregate_sum` and `QuerySet.aggregate_average` are dropped. Use
-`QuerySet.sum` and `QuerySet.average` instead which use the aggregation framework
-by default from now on.
-
-0.9.0
-*****
-
-The 0.8.7 package on pypi was corrupted.  If upgrading from 0.8.7 to 0.9.0 please follow: ::
-
-    python -m pip uninstall pymongo
-    python -m pip uninstall mongoengine
-    python -m pip install pymongo==2.8
-    python -m pip install mongoengine
-
-0.8.7
-*****
-
-Calling reload on deleted / nonexistent documents now raises a DoesNotExist
-exception.
-
-
-0.8.2 to 0.8.3
-**************
-
-Minor change that may impact users:
-
-DynamicDocument fields are now stored in creation order after any declared
-fields.  Previously they were stored alphabetically.
-
-
-0.7 to 0.8
-**********
-
-There have been numerous backwards breaking changes in 0.8.  The reasons for
-these are to ensure that MongoEngine has sane defaults going forward and that it
-performs the best it can out of the box.  Where possible there have been
-FutureWarnings to help get you ready for the change, but that hasn't been
-possible for the whole of the release.
-
-.. warning:: Breaking changes - test upgrading on a test system before putting
-    live. There maybe multiple manual steps in migrating and these are best honed
-    on a staging / test system.
-
-Python and PyMongo
-==================
-
-MongoEngine requires python 2.6 (or above) and pymongo 2.5 (or above)
-
-Data Model
-==========
-
-Inheritance
------------
-
-The inheritance model has changed, we no longer need to store an array of
-:attr:`types` with the model we can just use the classname in :attr:`_cls`.
-This means that you will have to update your indexes for each of your
-inherited classes like so: ::
-
-    # 1. Declaration of the class
-    class Animal(Document):
-        name = StringField()
-        meta = {
-            'allow_inheritance': True,
-            'indexes': ['name']
-        }
-
-    # 2. Remove _types
-    collection = Animal._get_collection()
-    collection.update({}, {"$unset": {"_types": 1}}, multi=True)
-
-    # 3. Confirm extra data is removed
-    count = collection.find({'_types': {"$exists": True}}).count()
-    assert count == 0
-
-    # 4. Remove indexes
-    info = collection.index_information()
-    indexes_to_drop = [key for key, value in info.items()
-                       if '_types' in dict(value['key'])]
-    for index in indexes_to_drop:
-        collection.drop_index(index)
-
-    # 5. Recreate indexes
-    Animal.ensure_indexes()
-
-
-Document Definition
--------------------
-
-The default for inheritance has changed - it is now off by default and
-:attr:`_cls` will not be stored automatically with the class.  So if you extend
-your :class:`~mongoengine.Document` or :class:`~mongoengine.EmbeddedDocuments`
-you will need to declare :attr:`allow_inheritance` in the meta data like so: ::
-
-    class Animal(Document):
-        name = StringField()
-
-        meta = {'allow_inheritance': True}
-
-Previously, if you had data in the database that wasn't defined in the Document
-definition, it would set it as an attribute on the document.  This is no longer
-the case and the data is set only in the ``document._data`` dictionary: ::
-
-    >>> from mongoengine import *
-    >>> class Animal(Document):
-    ...    name = StringField()
-    ...
-    >>> cat = Animal(name="kit", size="small")
-
-    # 0.7
-    >>> cat.size
-    u'small'
-
-    # 0.8
-    >>> cat.size
-    Traceback (most recent call last):
-      File "<stdin>", line 1, in <module>
-    AttributeError: 'Animal' object has no attribute 'size'
-
-The Document class has introduced a reserved function `clean()`, which will be
-called before saving the document. If your document class happens to have a method
-with the same name, please try to rename it.
-
-    def clean(self):
-        pass
-
-ReferenceField
---------------
-
-ReferenceFields now store ObjectIds by default - this is more efficient than
-DBRefs as we already know what Document types they reference::
-
-    # Old code
-    class Animal(Document):
-        name = ReferenceField('self')
-
-    # New code to keep dbrefs
-    class Animal(Document):
-        name = ReferenceField('self', dbref=True)
-
-To migrate all the references you need to touch each object and mark it as dirty
-eg::
-
-    # Doc definition
-    class Person(Document):
-        name = StringField()
-        parent = ReferenceField('self')
-        friends = ListField(ReferenceField('self'))
-
-    # Mark all ReferenceFields as dirty and save
-    for p in Person.objects:
-        p._mark_as_changed('parent')
-        p._mark_as_changed('friends')
-        p.save()
-
-`An example test migration for ReferenceFields is available on github
-<https://github.com/MongoEngine/mongoengine/blob/master/tests/migration/refrencefield_dbref_to_object_id.py>`_.
-
-.. Note:: Internally mongoengine handles ReferenceFields the same, so they are
-   converted to DBRef on loading and ObjectIds or DBRefs depending on settings
-   on storage.
-
-UUIDField
----------
-
-UUIDFields now default to storing binary values::
-
-    # Old code
-    class Animal(Document):
-        uuid = UUIDField()
-
-    # New code
-    class Animal(Document):
-        uuid = UUIDField(binary=False)
-
-To migrate all the uuids you need to touch each object and mark it as dirty
-eg::
-
-    # Doc definition
-    class Animal(Document):
-        uuid = UUIDField()
-
-    # Mark all UUIDFields as dirty and save
-    for a in Animal.objects:
-        a._mark_as_changed('uuid')
-        a.save()
-
-`An example test migration for UUIDFields is available on github
-<https://github.com/MongoEngine/mongoengine/blob/master/tests/migration/uuidfield_to_binary.py>`_.
-
-DecimalField
-------------
-
-DecimalFields now store floats - previously it was storing strings and that
-made it impossible to do comparisons when querying correctly.::
-
-    # Old code
-    class Person(Document):
-        balance = DecimalField()
-
-    # New code
-    class Person(Document):
-        balance = DecimalField(force_string=True)
-
-To migrate all the DecimalFields you need to touch each object and mark it as dirty
-eg::
-
-    # Doc definition
-    class Person(Document):
-        balance = DecimalField()
-
-    # Mark all DecimalField's as dirty and save
-    for p in Person.objects:
-        p._mark_as_changed('balance')
-        p.save()
-
-.. note:: DecimalFields have also been improved with the addition of precision
-    and rounding.  See :class:`~mongoengine.fields.DecimalField` for more information.
-
-`An example test migration for DecimalFields is available on github
-<https://github.com/MongoEngine/mongoengine/blob/master/tests/migration/decimalfield_as_float.py>`_.
-
-Cascading Saves
----------------
-To improve performance document saves will no longer automatically cascade.
-Any changes to a Document's references will either have to be saved manually or
-you will have to explicitly tell it to cascade on save::
-
-    # At the class level:
-    class Person(Document):
-        meta = {'cascade': True}
-
-    # Or on save:
-    my_document.save(cascade=True)
-
-Storage
--------
-
-Document and Embedded Documents are now serialized based on declared field order.
-Previously, the data was passed to mongodb as a dictionary and which meant that
-order wasn't guaranteed - so things like ``$addToSet`` operations on
-:class:`~mongoengine.EmbeddedDocument` could potentially fail in unexpected
-ways.
-
-If this impacts you, you may want to rewrite the objects using the
-``doc.mark_as_dirty('field')`` pattern described above.  If you are using a
-compound primary key then you will need to ensure the order is fixed and match
-your EmbeddedDocument to that order.
-
-Querysets
-=========
-
-Attack of the clones
---------------------
-
-Querysets now return clones and should no longer be considered editable in
-place.  This brings us in line with how Django's querysets work and removes a
-long running gotcha.  If you edit your querysets inplace you will have to
-update your code like so: ::
-
-    # Old code:
-    mammals = Animal.objects(type="mammal")
-    mammals.filter(order="Carnivora")       # Returns a cloned queryset that isn't assigned to anything - so this will break in 0.8
-    [m for m in mammals]                    # This will return all mammals in 0.8 as the 2nd filter returned a new queryset
-
-    # Update example a) assign queryset after a change:
-    mammals = Animal.objects(type="mammal")
-    carnivores = mammals.filter(order="Carnivora") # Reassign the new queryset so filter can be applied
-    [m for m in carnivores]                        # This will return all carnivores
-
-    # Update example b) chain the queryset:
-    mammals = Animal.objects(type="mammal").filter(order="Carnivora")  # The final queryset is assgined to mammals
-    [m for m in mammals]                                               # This will return all carnivores
-
-Len iterates the queryset
--------------------------
-
-If you ever did `len(queryset)` it previously did a `count()` under the covers,
-this caused some unusual issues.  As `len(queryset)` is most often used by
-`list(queryset)` we now cache the queryset results and use that for the length.
-
-This isn't as performant as a `count()` and if you aren't iterating the
-queryset you should upgrade to use count::
-
-    # Old code
-    len(Animal.objects(type="mammal"))
-
-    # New code
-    Animal.objects(type="mammal").count()
-
-
-.only() now inline with .exclude()
-----------------------------------
-
-The behaviour of `.only()` was highly ambiguous, now it works in mirror fashion
-to `.exclude()`.  Chaining `.only()` calls will increase the fields required::
-
-    # Old code
-    Animal.objects().only(['type', 'name']).only('name', 'order')  # Would have returned just `name`
-
-    # New code
-    Animal.objects().only('name')
-
-    # Note:
-    Animal.objects().only(['name']).only('order')  # Now returns `name` *and* `order`
-
-
-Client
-======
-PyMongo 2.4 came with a new connection client; MongoClient_ and started the
-depreciation of the old :class:`~pymongo.connection.Connection`. MongoEngine
-now uses the latest `MongoClient` for connections.  By default operations were
-`safe` but if you turned them off or used the connection directly this will
-impact your queries.
-
-Querysets
----------
-
-Safe
-^^^^
-
-`safe` has been depreciated in the new MongoClient connection.  Please use
-`write_concern` instead.  As `safe` always defaulted as `True` normally no code
-change is required. To disable confirmation of the write just pass `{"w": 0}`
-eg: ::
-
-   # Old
-   Animal(name="Dinasour").save(safe=False)
-
-   # new code:
-   Animal(name="Dinasour").save(write_concern={"w": 0})
-
-Write Concern
-^^^^^^^^^^^^^
-
-`write_options` has been replaced with `write_concern` to bring it inline with
-pymongo. To upgrade simply rename any instances where you used the `write_option`
-keyword  to `write_concern` like so::
-
-   # Old code:
-   Animal(name="Dinasour").save(write_options={"w": 2})
-
-   # new code:
-   Animal(name="Dinasour").save(write_concern={"w": 2})
-
-
-Indexes
-=======
-
-Index methods are no longer tied to querysets but rather to the document class.
-Although `QuerySet._ensure_indexes` and `QuerySet.ensure_index` still exist.
-They should be replaced with :func:`~mongoengine.Document.ensure_indexes` /
-:func:`~mongoengine.Document.ensure_index`.
-
-SequenceFields
-==============
-
-:class:`~mongoengine.fields.SequenceField` now inherits from `BaseField` to
-allow flexible storage of the calculated value.  As such MIN and MAX settings
-are no longer handled.
-
-.. _MongoClient: http://blog.mongodb.org/post/36666163412/introducing-mongoclient
-
-0.6 to 0.7
-**********
-
-Cascade saves
-=============
-
-Saves will raise a `FutureWarning` if they cascade and cascade hasn't been set
-to True.  This is because in 0.8 it will default to False.  If you require
-cascading saves then either set it in the `meta` or pass
-via `save` eg ::
-
-    # At the class level:
-    class Person(Document):
-        meta = {'cascade': True}
-
-    # Or in code:
-    my_document.save(cascade=True)
-
-.. note::
-    Remember: cascading saves **do not** cascade through lists.
-
-ReferenceFields
-===============
-
-ReferenceFields now can store references as ObjectId strings instead of DBRefs.
-This will become the default in 0.8 and if `dbref` is not set a `FutureWarning`
-will be raised.
-
-
-To explicitly continue to use DBRefs change the `dbref` flag
-to True ::
-
-   class Person(Document):
-       groups = ListField(ReferenceField(Group, dbref=True))
-
-To migrate to using strings instead of DBRefs you will have to manually
-migrate ::
-
-        # Step 1 - Migrate the model definition
-        class Group(Document):
-            author = ReferenceField(User, dbref=False)
-            members = ListField(ReferenceField(User, dbref=False))
-
-        # Step 2 - Migrate the data
-        for g in Group.objects():
-            g.author = g.author
-            g.members = g.members
-            g.save()
-
-
-item_frequencies
-================
-
-In the 0.6 series we added support for null / zero / false values in
-item_frequencies.  A side effect was to return keys in the value they are
-stored in rather than as string representations.  Your code may need to be
-updated to handle native types rather than strings keys for the results of
-item frequency queries.
-
-BinaryFields
-============
-
-Binary fields have been updated so that they are native binary types.  If you
-previously were doing `str` comparisons with binary field values you will have
-to update and wrap the value in a `str`.
-
-0.5 to 0.6
-**********
-
-Embedded Documents - if you had a `pk` field you will have to rename it from
-`_id` to `pk` as pk is no longer a property of Embedded Documents.
-
-Reverse Delete Rules in Embedded Documents, MapFields and DictFields now throw
-an InvalidDocument error as they aren't currently supported.
-
-Document._get_subclasses - Is no longer used and the class method has been
-removed.
-
-Document.objects.with_id - now raises an InvalidQueryError if used with a
-filter.
-
-FutureWarning - A future warning has been added to all inherited classes that
-don't define :attr:`allow_inheritance` in their meta.
-
-You may need to update pyMongo to 2.0 for use with Sharding.
-
-0.4 to 0.5
-**********
-
-There have been the following backwards incompatibilities from 0.4 to 0.5.  The
-main areas of changed are: choices in fields, map_reduce and collection names.
-
-Choice options:
-===============
-
-Are now expected to be an iterable of tuples, with the first element in each
-tuple being the actual value to be stored. The second element is the
-human-readable name for the option.
-
-
-PyMongo / MongoDB
-=================
-
-map reduce now requires pymongo 1.11+- The pymongo `merge_output` and
-`reduce_output` parameters, have been depreciated.
-
-More methods now use map_reduce as db.eval is not supported for sharding as
-such the following have been changed:
-
-    * :meth:`~mongoengine.queryset.QuerySet.sum`
-    * :meth:`~mongoengine.queryset.QuerySet.average`
-    * :meth:`~mongoengine.queryset.QuerySet.item_frequencies`
-
-
-Default collection naming
-=========================
-
-Previously it was just lowercase, it's now much more pythonic and readable as
-it's lowercase and underscores, previously ::
-
-    class MyAceDocument(Document):
-        pass
-
-    MyAceDocument._meta['collection'] == myacedocument
-
-In 0.5 this will change to ::
-
-    class MyAceDocument(Document):
-        pass
-
-    MyAceDocument._get_collection_name() == my_ace_document
-
-To upgrade use a Mixin class to set meta like so ::
-
-    class BaseMixin(object):
-        meta = {
-            'collection': lambda c: c.__name__.lower()
-        }
-
-    class MyAceDocument(Document, BaseMixin):
-        pass
-
-    MyAceDocument._get_collection_name() == "myacedocument"
-
-Alternatively, you can rename your collections eg ::
-
-    from mongoengine.connection import _get_db
-    from mongoengine.base import _document_registry
-
-    def rename_collections():
-        db = _get_db()
-
-        failure = False
-
-        collection_names = [d._get_collection_name()
-                            for d in _document_registry.values()]
-
-        for new_style_name in collection_names:
-            if not new_style_name:  # embedded documents don't have collections
-                continue
-            old_style_name = new_style_name.replace('_', '')
-
-            if old_style_name == new_style_name:
-                continue  # Nothing to do
-
-            existing = db.collection_names()
-            if old_style_name in existing:
-                if new_style_name in existing:
-                    failure = True
-                    print "FAILED to rename: %s to %s (already exists)" % (
-                        old_style_name, new_style_name)
-                else:
-                    db[old_style_name].rename(new_style_name)
-                    print "Renamed:  %s to %s" % (old_style_name,
-                                                  new_style_name)
-
-        if failure:
-            print "Upgrading  collection names failed"
-        else:
-            print "Upgraded collection names"
-
-
-mongodb 1.8 > 2.0 +
-===================
-
-It's been reported that indexes may need to be recreated to the newer version of indexes.
-To do this drop indexes and call ``ensure_indexes`` on each model.
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 7e61af5a1..f0adf9826 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -867,18 +867,6 @@ def create_index(cls, keys, background=False, **kwargs):
 
         return cls._get_collection().create_index(fields, **index_spec)
 
-    @classmethod
-    def ensure_index(cls, key_or_list, background=False, **kwargs):
-        """Ensure that the given indexes are in place. Deprecated in favour
-        of create_index.
-
-        :param key_or_list: a single index key or a list of index keys (to
-            construct a multi-field index); keys may be prefixed with a **+**
-            or a **-** to determine the index ordering
-        :param background: Allows index creation in the background
-        """
-        return cls.create_index(key_or_list, background=background, **kwargs)
-
     @classmethod
     def ensure_indexes(cls):
         """Checks the document meta data and ensures all the indexes exist.
diff --git a/tests/document/test_class_methods.py b/tests/document/test_class_methods.py
index f82808ba0..0ab9aa7cd 100644
--- a/tests/document/test_class_methods.py
+++ b/tests/document/test_class_methods.py
@@ -90,7 +90,7 @@ class BlogPost(Document):
         BlogPost.ensure_indexes()
         assert BlogPost.compare_indexes() == {"missing": [], "extra": []}
 
-        BlogPost.ensure_index(["author", "description"])
+        BlogPost.create_index(["author", "description"])
         assert BlogPost.compare_indexes() == {
             "missing": [],
             "extra": [[("author", 1), ("description", 1)]],
@@ -130,7 +130,7 @@ class BlogPostWithTags(BlogPost):
         BlogPostWithTags.ensure_indexes()
         assert BlogPost.compare_indexes() == {"missing": [], "extra": []}
 
-        BlogPostWithTags.ensure_index(["author", "tag_list"])
+        BlogPostWithTags.create_index(["author", "tag_list"])
         assert BlogPost.compare_indexes() == {
             "missing": [],
             "extra": [[("_cls", 1), ("author", 1), ("tag_list", 1)]],
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 546c348bf..bf2ed1b1c 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -4236,14 +4236,14 @@ class Number(Document):
         assert [1, 2, 3] == numbers
         Number.drop_collection()
 
-    def test_ensure_index(self):
+    def test_create_index(self):
         """Ensure that manual creation of indexes works."""
 
         class Comment(Document):
             message = StringField()
             meta = {"allow_inheritance": True}
 
-        Comment.ensure_index("message")
+        Comment.create_index("message")
 
         info = Comment.objects._collection.index_information()
         info = [

From 80b7c1678c1b04dd45a204e0afdad2c689957e5b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 1 Jan 2023 14:12:39 +0100
Subject: [PATCH 1340/1519] minor edit in comment

---
 mongoengine/document.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mongoengine/document.py b/mongoengine/document.py
index f0adf9826..6c236cc82 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -938,7 +938,6 @@ def list_indexes(cls):
         classes = []
 
         def get_classes(cls):
-
             if cls not in classes and isinstance(cls, TopLevelDocumentMetaclass):
                 classes.append(cls)
 
@@ -965,7 +964,7 @@ def get_classes(cls):
 
         get_classes(cls)
 
-        # get the indexes spec for all of the gathered classes
+        # get the indexes spec for all the gathered classes
         def get_indexes_spec(cls):
             indexes = []
 
@@ -1000,8 +999,10 @@ def compare_indexes(cls):
         required = cls.list_indexes()
 
         existing = []
-        for info in cls._get_collection().index_information().values():
+        collection = cls._get_collection()
+        for info in collection.index_information().values():
             if "_fts" in info["key"][0]:
+                # Useful for text indexes (but not only)
                 index_type = info["key"][0][1]
                 text_index_fields = info.get("weights").keys()
                 existing.append([(key, index_type) for key in text_index_fields])

From 1d09a26c7829cd87ec85b3d516af5cf820a832c5 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 1 Jan 2023 15:00:05 +0100
Subject: [PATCH 1341/1519] Improve doc and tests for Decimal128Field

---
 docs/changelog.rst                    |  4 ++-
 mongoengine/fields.py                 | 17 ++++++------
 tests/fields/test_decimal128_field.py | 40 +++++++++++++++++++--------
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index e8c98fc19..d184fd4cf 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,7 +15,9 @@ Development
 - Added meta ``auto_create_index_on_save`` so you can enable index creation
   on :meth:`~mongoengine.Document.save()` (as it was < 0.26.0).
 - BREAKING CHANGE: remove deprecated method ``ensure_index`` (replaced by ``create_index`` long time ago).
-
+- Addition of Decimal128Field: :class:`~mongoengine.fields.Decimal128Field` for accurate representation of Decimals (much better than the legacy field DecimalField).
+  Although it could work to switch an existing DecimalField to Decimal128Field without applying a migration script,
+  it is not recommended to do so (DecimalField uses float/str to store the value, Decimal128Field uses Decimal128).
 
 Changes in 0.25.0
 =================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 430fccf67..9b62bef76 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -440,7 +440,10 @@ def prepare_query_value(self, op, value):
 
 
 class DecimalField(BaseField):
-    """Fixed-point decimal number field. Stores the value as a float by default unless `force_string` is used.
+    """Disclaimer: This field is kept for historical reason but since it converts the values to float, it
+    is not suitable for true decimal storage. Consider using :class:`~mongoengine.fields.Decimal128Field`.
+
+    Fixed-point decimal number field. Stores the value as a float by default unless `force_string` is used.
     If using floats, beware of Decimal to float conversion (potential precision loss)
     """
 
@@ -2655,6 +2658,11 @@ def to_mongo(self, document):
 
 
 class Decimal128Field(BaseField):
+    """
+    128-bit decimal-based floating-point field capable of emulating decimal
+    rounding with exact precision. This field will expose decimal.Decimal but stores the value as a
+    `bson.Decimal128` behind the scene, this field is intended for monetary data, scientific computations, etc.
+    """
 
     DECIMAL_CONTEXT = create_decimal128_context()
 
@@ -2663,13 +2671,6 @@ def __init__(self, min_value=None, max_value=None, **kwargs):
         self.max_value = max_value
         super().__init__(**kwargs)
 
-    """
-        128-bit decimal-based floating-point field capable of emulating decimal
-        rounding with exact precision. Stores the value as a `Decimal128`
-        intended for monetary data, such as financial, tax, and scientific
-        computations.
-    """
-
     def to_mongo(self, value):
         if value is None:
             return None
diff --git a/tests/fields/test_decimal128_field.py b/tests/fields/test_decimal128_field.py
index 4863caa41..6aa2ec23e 100644
--- a/tests/fields/test_decimal128_field.py
+++ b/tests/fields/test_decimal128_field.py
@@ -5,7 +5,7 @@
 import pytest
 from bson.decimal128 import Decimal128
 
-from mongoengine import *
+from mongoengine import Decimal128Field, Document, ValidationError
 from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
@@ -24,8 +24,6 @@ def generate_test_cls() -> Document:
 
 class TestDecimal128Field(MongoDBTestCase):
     def test_decimal128_validation_good(self):
-        """Ensure that invalid values cannot be assigned."""
-
         doc = Decimal128Document()
 
         doc.dec128_fld = Decimal(0)
@@ -37,7 +35,7 @@ def test_decimal128_validation_good(self):
         doc.dec128_fld = Decimal(110)
         doc.validate()
 
-        doc.dec128_fld = Decimal(110)
+        doc.dec128_fld = Decimal("110")
         doc.validate()
 
     def test_decimal128_validation_invalid(self):
@@ -76,22 +74,30 @@ def test_decimal128_validation_max(self):
 
     def test_eq_operator(self):
         cls = generate_test_cls()
-        assert 1 == cls.objects(dec128_fld=1.0).count()
-        assert 0 == cls.objects(dec128_fld=2.0).count()
+        assert cls.objects(dec128_fld=1.0).count() == 1
+        assert cls.objects(dec128_fld=2.0).count() == 0
 
     def test_ne_operator(self):
         cls = generate_test_cls()
-        assert 1 == cls.objects(dec128_fld__ne=None).count()
-        assert 1 == cls.objects(dec128_fld__ne=1).count()
-        assert 1 == cls.objects(dec128_fld__ne=1.0).count()
+        assert cls.objects(dec128_fld__ne=None).count() == 1
+        assert cls.objects(dec128_fld__ne=1).count() == 1
+        assert cls.objects(dec128_fld__ne=1.0).count() == 1
 
     def test_gt_operator(self):
         cls = generate_test_cls()
-        assert 1 == cls.objects(dec128_fld__gt=0.5).count()
+        assert cls.objects(dec128_fld__gt=0.5).count() == 1
 
     def test_lt_operator(self):
         cls = generate_test_cls()
-        assert 1 == cls.objects(dec128_fld__lt=1.5).count()
+        assert cls.objects(dec128_fld__lt=1.5).count() == 1
+
+    def test_field_exposed_as_python_Decimal(self):
+        # from int
+        model = Decimal128Document(dec128_fld=100).save()
+        assert isinstance(model.dec128_fld, Decimal)
+        model = Decimal128Document.objects.get(id=model.id)
+        assert isinstance(model.dec128_fld, Decimal)
+        assert model.dec128_fld == Decimal("100")
 
     def test_storage(self):
         # from int
@@ -101,6 +107,13 @@ def test_storage(self):
             "dec128_fld": Decimal128("100"),
         }
 
+        # from str
+        model = Decimal128Document(dec128_fld="100.0").save()
+        assert get_as_pymongo(model) == {
+            "_id": model.id,
+            "dec128_fld": Decimal128("100.0"),
+        }
+
         # from float
         model = Decimal128Document(dec128_fld=100.0).save()
         assert get_as_pymongo(model) == {
@@ -114,6 +127,11 @@ def test_storage(self):
             "_id": model.id,
             "dec128_fld": Decimal128("100"),
         }
+        model = Decimal128Document(dec128_fld=Decimal("100.0")).save()
+        assert get_as_pymongo(model) == {
+            "_id": model.id,
+            "dec128_fld": Decimal128("100.0"),
+        }
 
         # from Decimal128
         model = Decimal128Document(dec128_fld=Decimal128("100")).save()

From bae02756b08ca7b17670a07bc2f20a725be6ce2f Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 1 Jan 2023 21:08:38 +0100
Subject: [PATCH 1342/1519] reduce the scope of the change to only affect
 EnumField + add test to ensure historical behavior is kept (at least until it
 is consciously decided to be changed)

---
 docs/changelog.rst                   |  1 +
 mongoengine/base/fields.py           | 17 ++++++------
 mongoengine/fields.py                |  2 +-
 tests/fields/test_binary_field.py    |  8 ++++++
 tests/fields/test_enum_field.py      | 14 ++++++----
 tests/fields/test_fields.py          | 40 ++++++++++++++++++++++++++++
 tests/fields/test_object_id_field.py | 30 +++++++++++++++++++++
 7 files changed, 98 insertions(+), 14 deletions(-)
 create mode 100644 tests/fields/test_object_id_field.py

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d184fd4cf..2a8f0663e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -18,6 +18,7 @@ Development
 - Addition of Decimal128Field: :class:`~mongoengine.fields.Decimal128Field` for accurate representation of Decimals (much better than the legacy field DecimalField).
   Although it could work to switch an existing DecimalField to Decimal128Field without applying a migration script,
   it is not recommended to do so (DecimalField uses float/str to store the value, Decimal128Field uses Decimal128).
+- BREAKING CHANGE: When using ListField(EnumField) or DictField(EnumField), the values weren't always cast into the Enum (#2531)
 
 Changes in 0.25.0
 =================
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 9ba2ca139..4786c1d24 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -134,7 +134,9 @@ def __set__(self, instance, value):
         # If setting to None and there is a default value provided for this
         # field, then set the value to the default value.
         if value is None:
-            if not self.null and self.default is not None:
+            if self.null:
+                value = None
+            elif self.default is not None:
                 value = self.default
                 if callable(value):
                     value = value()
@@ -281,16 +283,15 @@ def _lazy_load_refs(instance, name, ref_values, *, max_depth):
         return documents
 
     def __set__(self, instance, value):
-        unprocessable_fields = (
-            ComplexBaseField,
-            _import_class("EmbeddedDocumentField"),
-            _import_class("FileField"),
-        )
-        if self.field and not isinstance(self.field, unprocessable_fields):
+        # Some fields e.g EnumField are converted upon __set__
+        # So it is fair to mimic the same behavior when using e.g ListField(EnumField)
+        EnumField = _import_class("EnumField")
+        if self.field and isinstance(self.field, EnumField):
             if isinstance(value, (list, tuple)):
                 value = [self.field.to_python(sub_val) for sub_val in value]
             elif isinstance(value, dict):
                 value = {key: self.field.to_python(sub) for key, sub in value.items()}
+
         return super().__set__(instance, value)
 
     def __get__(self, instance, owner):
@@ -445,7 +446,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
                             " have been saved to the database"
                         )
 
-                    # If its a document that is not inheritable it won't have
+                    # If it's a document that is not inheritable it won't have
                     # any _cls data so make it a generic reference allows
                     # us to dereference
                     meta = getattr(v, "_meta", {})
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 204b8c3fc..33a8889d5 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -1122,7 +1122,7 @@ class MapField(DictField):
     """
 
     def __init__(self, field=None, *args, **kwargs):
-        # XXX ValidationError raised outside of the "validate" method.
+        # XXX ValidationError raised outside the "validate" method.
         if not isinstance(field, BaseField):
             self.error("Argument to MapField constructor must be a valid field")
         super().__init__(field=field, *args, **kwargs)
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index e7bdfa2c1..f81777b5d 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -31,6 +31,14 @@ class Attachment(Document):
         assert MIME_TYPE == attachment_1.content_type
         assert BLOB == bytes(attachment_1.blob)
 
+    def test_bytearray_conversion_to_bytes(self):
+        class Dummy(Document):
+            blob = BinaryField()
+
+        byte_arr = bytearray(b"\x00\x00\x00\x00\x00")
+        dummy = Dummy(blob=byte_arr)
+        assert isinstance(dummy.blob, bytes)
+
     def test_validation_succeeds(self):
         """Ensure that valid values can be assigned to binary fields."""
 
diff --git a/tests/fields/test_enum_field.py b/tests/fields/test_enum_field.py
index d7596de76..86befabba 100644
--- a/tests/fields/test_enum_field.py
+++ b/tests/fields/test_enum_field.py
@@ -121,20 +121,24 @@ def test_embedding_in_complex_field(self):
         assert model.status == Status.NEW
         assert model.statuses == [Status.NEW]
         assert model.color_mapping == {"red": Color.RED}
+
         model.reload()
         assert model.status == Status.NEW
         assert model.statuses == [Status.NEW]
         assert model.color_mapping == {"red": Color.RED}
+
         model.status = "done"
         model.color_mapping = {"blue": 2}
         model.statuses = ["new", "done"]
+        model.save()
         assert model.status == Status.DONE
-        assert model.color_mapping == {"blue": Color.BLUE}, model.color_mapping
-        assert model.statuses == [Status.NEW, Status.DONE], model.statuses
-        model = model.save().reload()
+        assert model.statuses == [Status.NEW, Status.DONE]
+        assert model.color_mapping == {"blue": Color.BLUE}
+
+        model.reload()
         assert model.status == Status.DONE
-        assert model.color_mapping == {"blue": Color.BLUE}, model.color_mapping
-        assert model.statuses == [Status.NEW, Status.DONE], model.statuses
+        assert model.color_mapping == {"blue": Color.BLUE}
+        assert model.statuses == [Status.NEW, Status.DONE]
 
         with pytest.raises(ValidationError, match="must be one of ..Status"):
             model.statuses = [1]
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 36e08aa0c..8d21fed5f 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -44,6 +44,46 @@
 
 
 class TestField(MongoDBTestCase):
+    def test_constructor_set_historical_behavior_is_kept(self):
+        class MyDoc(Document):
+            oid = ObjectIdField()
+
+        doc = MyDoc()
+        doc.oid = str(ObjectId())
+        assert isinstance(doc.oid, str)
+
+        # not modified on save (historical behavior)
+        doc.save()
+        assert isinstance(doc.oid, str)
+
+        # reloading goes through constructor so it is expected to go through to_python
+        doc.reload()
+        assert isinstance(doc.oid, ObjectId)
+
+    def test_constructor_set_list_field_historical_behavior_is_kept(self):
+        # Although the behavior is not consistent between regular field and a ListField
+        # This is the historical behavior so we must make sure we don't modify it (unless consciously done of course)
+
+        class MyOIDSDoc(Document):
+            oids = ListField(ObjectIdField())
+
+        # constructor goes through to_python so casting occurs
+        doc = MyOIDSDoc(oids=[str(ObjectId())])
+        assert isinstance(doc.oids[0], ObjectId)
+
+        # constructor goes through to_python so casting occurs
+        doc = MyOIDSDoc()
+        doc.oids = [str(ObjectId())]
+        assert isinstance(doc.oids[0], str)
+
+        doc.save()
+        assert isinstance(doc.oids[0], str)
+
+        # reloading goes through constructor so it is expected to go through to_python
+        # and cast
+        doc.reload()
+        assert isinstance(doc.oids[0], ObjectId)
+
     def test_default_values_nothing_set(self):
         """Ensure that default field values are used when creating
         a document.
diff --git a/tests/fields/test_object_id_field.py b/tests/fields/test_object_id_field.py
new file mode 100644
index 000000000..6eefab26d
--- /dev/null
+++ b/tests/fields/test_object_id_field.py
@@ -0,0 +1,30 @@
+import pytest
+from bson import ObjectId
+
+from mongoengine import Document, ObjectIdField, ValidationError
+from tests.utils import MongoDBTestCase, get_as_pymongo
+
+
+class TestObjectIdField(MongoDBTestCase):
+    def test_storage(self):
+        class MyDoc(Document):
+            oid = ObjectIdField()
+
+        doc = MyDoc(oid=ObjectId())
+        doc.save()
+        assert get_as_pymongo(doc) == {"_id": doc.id, "oid": doc.oid}
+
+    def test_constructor_converts_str_to_ObjectId(self):
+        class MyDoc(Document):
+            oid = ObjectIdField()
+
+        doc = MyDoc(oid=str(ObjectId()))
+        assert isinstance(doc.oid, ObjectId)
+
+    def test_validation_works(self):
+        class MyDoc(Document):
+            oid = ObjectIdField()
+
+        doc = MyDoc(oid="not-an-oid!")
+        with pytest.raises(ValidationError, match="Invalid ObjectID"):
+            doc.save()

From e81a106a434571fbab9111cf9797e3f0d4b5662a Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 7 Jan 2023 21:55:27 +0100
Subject: [PATCH 1343/1519] improve tests

---
 docs/changelog.rst                          |  1 +
 mongoengine/base/document.py                |  2 +-
 mongoengine/base/fields.py                  | 30 ++++++++++---------
 mongoengine/document.py                     |  4 ++-
 mongoengine/fields.py                       |  9 +++---
 tests/document/test_instance.py             | 15 ++++++++--
 tests/fields/test_complex_datetime_field.py |  6 ++++
 tests/fields/test_decimal_field.py          |  2 ++
 tests/fields/test_float_field.py            |  6 ++++
 tests/fields/test_object_id_field.py        |  7 +++++
 tests/queryset/test_modify.py               |  9 ++++++
 tests/queryset/test_queryset.py             | 33 +++++++++++++++++++++
 tests/test_connection_mongomock.py          |  2 +-
 tests/test_pymongo_support.py               | 16 ++++++++++
 14 files changed, 118 insertions(+), 24 deletions(-)
 create mode 100644 tests/test_pymongo_support.py

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2a8f0663e..1ac334e5a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -19,6 +19,7 @@ Development
   Although it could work to switch an existing DecimalField to Decimal128Field without applying a migration script,
   it is not recommended to do so (DecimalField uses float/str to store the value, Decimal128Field uses Decimal128).
 - BREAKING CHANGE: When using ListField(EnumField) or DictField(EnumField), the values weren't always cast into the Enum (#2531)
+- BREAKING CHANGE (bugfix) Querying ObjectIdField or ComplexDateTimeField with None will no longer raise a ValidationError (#2681)
 
 Changes in 0.25.0
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 7a1de50e3..fd90d3f82 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -372,7 +372,7 @@ def to_mongo(self, use_db_field=True, fields=None):
                 value = field.generate()
                 self._data[field_name] = value
 
-            if (value is not None) or (field.null):
+            if value is not None or field.null:
                 if use_db_field:
                     data[field.db_field] = value
                 else:
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index d368417fe..85a10ff23 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -52,20 +52,20 @@ def __init__(
         :param required: If the field is required. Whether it has to have a
             value or not. Defaults to False.
         :param default: (optional) The default value for this field if no value
-            has been set (or if the value has been unset).  It can be a
+            has been set, if the value is set to None or has been unset. It can be a
             callable.
-        :param unique: Is the field value unique or not.  Defaults to False.
+        :param unique: Is the field value unique or not (Creates an index).  Defaults to False.
         :param unique_with: (optional) The other field this field should be
-            unique with.
-        :param primary_key: Mark this field as the primary key. Defaults to False.
+            unique with (Creates an index).
+        :param primary_key: Mark this field as the primary key ((Creates an index)). Defaults to False.
         :param validation: (optional) A callable to validate the value of the
             field.  The callable takes the value as parameter and should raise
             a ValidationError if validation fails
         :param choices: (optional) The valid choices
-        :param null: (optional) If the field value can be null. If no and there is a default value
-            then the default value is set
+        :param null: (optional) If the field value can be null when a default exist. If not set, the default value
+        will be used in case a field with a default value is set to None. Defaults to False.
         :param sparse: (optional) `sparse=True` combined with `unique=True` and `required=False`
-            means that uniqueness won't be enforced for `None` values
+            means that uniqueness won't be enforced for `None` values (Creates an index). Defaults to False.
         :param **kwargs: (optional) Arbitrary indirection-free metadata for
             this field can be supplied as additional keyword arguments and
             accessed as attributes of the field. Must not conflict with any
@@ -521,15 +521,17 @@ def to_python(self, value):
         return value
 
     def to_mongo(self, value):
-        if not isinstance(value, ObjectId):
-            try:
-                if value:
-                    return ObjectId(str(value))
-            except Exception as e:
-                self.error(str(e))
-        return value
+        if isinstance(value, ObjectId):
+            return value
+
+        try:
+            return ObjectId(str(value))
+        except Exception as e:
+            self.error(str(e))
 
     def prepare_query_value(self, op, value):
+        if value is None:
+            return value
         return self.to_mongo(value)
 
     def validate(self, value):
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 6c236cc82..edbaa8cb1 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -422,7 +422,9 @@ def save(
         try:
             # Save a new document or update an existing one
             if created:
-                object_id = self._save_create(doc, force_insert, write_concern)
+                object_id = self._save_create(
+                    doc=doc, force_insert=force_insert, write_concern=write_concern
+                )
             else:
                 object_id, created = self._save_update(
                     doc, save_condition, write_concern
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 33a8889d5..3f0850327 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -490,9 +490,6 @@ def __init__(
         super().__init__(**kwargs)
 
     def to_python(self, value):
-        if value is None:
-            return value
-
         # Convert to string for python 2.6 before casting to Decimal
         try:
             value = decimal.Decimal("%s" % value)
@@ -506,8 +503,6 @@ def to_python(self, value):
             return value.quantize(decimal.Decimal(), rounding=self.rounding)
 
     def to_mongo(self, value):
-        if value is None:
-            return value
         if self.force_string:
             return str(self.to_python(value))
         return float(self.to_python(value))
@@ -528,6 +523,8 @@ def validate(self, value):
             self.error("Decimal value is too large")
 
     def prepare_query_value(self, op, value):
+        if value is None:
+            return value
         return super().prepare_query_value(op, self.to_mongo(value))
 
 
@@ -731,6 +728,8 @@ def to_mongo(self, value):
         return self._convert_from_datetime(value)
 
     def prepare_query_value(self, op, value):
+        if value is None:
+            return value
         return super().prepare_query_value(op, self._convert_from_datetime(value))
 
 
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 394aa9cec..224fec8fc 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -4,6 +4,7 @@
 import uuid
 import weakref
 from datetime import datetime
+from unittest.mock import Mock
 
 import bson
 import pytest
@@ -1034,6 +1035,17 @@ def test_save(self):
             "_id": person.id,
         }
 
+    def test_save_write_concern(self):
+        class Recipient(Document):
+            email = EmailField(required=True)
+
+        rec = Recipient(email="garbage@garbage.com")
+
+        fn = Mock()
+        rec._save_create = fn
+        rec.save(write_concern={"w": 0})
+        assert fn.call_args[1]["write_concern"] == {"w": 0}
+
     def test_save_skip_validation(self):
         class Recipient(Document):
             email = EmailField(required=True)
@@ -3593,8 +3605,7 @@ class User(Document):
             cdt_fld = ComplexDateTimeField(null=True)
 
         User.objects.delete()
-        u = User(name="user")
-        u.save()
+        u = User(name="user").save()
         u_from_db = User.objects.get(name="user")
         u_from_db.height = None
         u_from_db.save()
diff --git a/tests/fields/test_complex_datetime_field.py b/tests/fields/test_complex_datetime_field.py
index 82f332f68..205fb22f6 100644
--- a/tests/fields/test_complex_datetime_field.py
+++ b/tests/fields/test_complex_datetime_field.py
@@ -206,3 +206,9 @@ class Log(Document):
 
         with pytest.raises(ValidationError):
             log.save()
+
+    def test_query_none_value_dont_raise(self):
+        class Log(Document):
+            timestamp = ComplexDateTimeField()
+
+        _ = list(Log.objects(timestamp=None))
diff --git a/tests/fields/test_decimal_field.py b/tests/fields/test_decimal_field.py
index 6c2919712..0952eb64f 100644
--- a/tests/fields/test_decimal_field.py
+++ b/tests/fields/test_decimal_field.py
@@ -71,6 +71,8 @@ class Person(Document):
         fetched_person = Person.objects.first()
         fetched_person.value is None
 
+        assert Person.objects(value=None).first() is not None
+
     def test_validation(self):
         """Ensure that invalid values cannot be assigned to decimal fields."""
 
diff --git a/tests/fields/test_float_field.py b/tests/fields/test_float_field.py
index 41c063f64..b09ddf95f 100644
--- a/tests/fields/test_float_field.py
+++ b/tests/fields/test_float_field.py
@@ -57,3 +57,9 @@ class BigPerson(Document):
         big_person.height = 2**100000  # Too big for a float value
         with pytest.raises(ValidationError):
             big_person.validate()
+
+    def test_query_none_value_dont_raise(self):
+        class BigPerson(Document):
+            height = FloatField()
+
+        _ = list(BigPerson.objects(height=None))
diff --git a/tests/fields/test_object_id_field.py b/tests/fields/test_object_id_field.py
index 6eefab26d..3503b82e9 100644
--- a/tests/fields/test_object_id_field.py
+++ b/tests/fields/test_object_id_field.py
@@ -28,3 +28,10 @@ class MyDoc(Document):
         doc = MyDoc(oid="not-an-oid!")
         with pytest.raises(ValidationError, match="Invalid ObjectID"):
             doc.save()
+
+    def test_query_none_value_dont_raise(self):
+        # cf issue #2681
+        class MyDoc(Document):
+            oid = ObjectIdField(null=True)
+
+        _ = list(MyDoc.objects(oid=None))
diff --git a/tests/queryset/test_modify.py b/tests/queryset/test_modify.py
index b96e05e63..d5cedb2c1 100644
--- a/tests/queryset/test_modify.py
+++ b/tests/queryset/test_modify.py
@@ -1,5 +1,7 @@
 import unittest
 
+import pytest
+
 from mongoengine import (
     Document,
     IntField,
@@ -30,6 +32,13 @@ def test_modify(self):
         assert old_doc.to_json() == doc.to_json()
         self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
+    def test_modify_full_response_raise_value_error_for_recent_mongo(self):
+        Doc(id=0, value=0).save()
+        Doc(id=1, value=1).save()
+
+        with pytest.raises(ValueError):
+            Doc.objects(id=1).modify(set__value=-1, full_response=True)
+
     def test_modify_with_new(self):
         Doc(id=0, value=0).save()
         doc = Doc(id=1, value=1).save()
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index bf2ed1b1c..590bed076 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -24,6 +24,7 @@
     QuerySetManager,
     queryset_manager,
 )
+from mongoengine.queryset.base import BaseQuerySet
 from tests.utils import (
     requires_mongodb_gte_42,
     requires_mongodb_gte_44,
@@ -150,6 +151,14 @@ def test_limit_0_returns_all_documents(self):
         persons = list(self.Person.objects().limit(0))
         assert len(persons) == 2 == n_docs
 
+    def test_limit_0(self):
+        """Ensure that QuerySet.limit works as expected."""
+        self.Person.objects.create(name="User A", age=20)
+
+        # Test limit with 0 as parameter
+        qs = self.Person.objects.limit(0)
+        assert qs.count() == 0
+
     def test_limit(self):
         """Ensure that QuerySet.limit works as expected."""
         user_a = self.Person.objects.create(name="User A", age=20)
@@ -3507,6 +3516,26 @@ class Bar(Document):
         assert Foo.objects.distinct("bar") == [bar]
         assert Foo.objects.no_dereference().distinct("bar") == [bar.pk]
 
+    def test_base_queryset_iter_raise_not_implemented(self):
+        class Tmp(Document):
+            pass
+
+        qs = BaseQuerySet(document=Tmp, collection=Tmp._get_collection())
+        with pytest.raises(NotImplementedError):
+            _ = list(qs)
+
+    def test_search_text_raise_if_called_2_times(self):
+        class News(Document):
+            title = StringField()
+            content = StringField()
+            is_active = BooleanField(default=True)
+
+        News.drop_collection()
+        with pytest.raises(OperationError):
+            News.objects.search_text("t1", language="portuguese").search_text(
+                "t2", language="french"
+            )
+
     def test_text_indexes(self):
         class News(Document):
             title = StringField()
@@ -3899,6 +3928,10 @@ class BlogPost(Document):
         assert objects[post_2.id].title == post_2.title
         assert objects[post_5.id].title == post_5.title
 
+        objects = BlogPost.objects.as_pymongo().in_bulk(ids)
+        assert len(objects) == 3
+        assert isinstance(objects[post_1.id], dict)
+
         BlogPost.drop_collection()
 
     def tearDown(self):
diff --git a/tests/test_connection_mongomock.py b/tests/test_connection_mongomock.py
index 6f9e2d269..b171fd13a 100644
--- a/tests/test_connection_mongomock.py
+++ b/tests/test_connection_mongomock.py
@@ -102,7 +102,7 @@ class Person(Document):
             name = StringField()
 
         Person.drop_collection()
-        assert Person.objects.count() == 0
+        assert Person.objects.limit(0).count(with_limit_and_skip=True) == 0
 
         bob = Person(name="Bob").save()
         john = Person(name="John").save()
diff --git a/tests/test_pymongo_support.py b/tests/test_pymongo_support.py
new file mode 100644
index 000000000..37bfc9755
--- /dev/null
+++ b/tests/test_pymongo_support.py
@@ -0,0 +1,16 @@
+from mongoengine import Document
+from mongoengine.pymongo_support import count_documents
+from tests.utils import MongoDBTestCase
+
+
+class TestPymongoSupport(MongoDBTestCase):
+    def test_count_documents(self):
+        class Test(Document):
+            pass
+
+        Test.drop_collection()
+        Test().save()
+        Test().save()
+        assert count_documents(Test._get_collection(), filter={}) == 2
+        assert count_documents(Test._get_collection(), filter={}, skip=1) == 1
+        assert count_documents(Test._get_collection(), filter={}, limit=0) == 0

From 6db25257339afa7dd929521b8ab1b5cbe2d99a01 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 7 Jan 2023 22:29:31 +0100
Subject: [PATCH 1344/1519] update actions/checkout action

---
 .github/workflows/github-actions.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index d89b25946..dff22a46f 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -34,7 +34,7 @@ jobs:
     # which runs pre-configured linter & autoformatter
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       with:
         python-version: '3.9'
@@ -69,7 +69,7 @@ jobs:
             MONGODB: $MONGODB_5_0
             PYMONGO: $PYMONGO_4_3
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
@@ -96,7 +96,7 @@ jobs:
     # to avoid that it breaks when new releases are being created
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:

From 53a6693a802840879b06ce767f63d281a044dee2 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 7 Jan 2023 22:29:31 +0100
Subject: [PATCH 1345/1519] update actions/checkout action

---
 .github/workflows/github-actions.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index d89b25946..dff22a46f 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -34,7 +34,7 @@ jobs:
     # which runs pre-configured linter & autoformatter
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       with:
         python-version: '3.9'
@@ -69,7 +69,7 @@ jobs:
             MONGODB: $MONGODB_5_0
             PYMONGO: $PYMONGO_4_3
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
@@ -96,7 +96,7 @@ jobs:
     # to avoid that it breaks when new releases are being created
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:

From 41689b8c563f961417b780f0cd475e6cd44683ab Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 9 Jan 2023 22:13:49 +0100
Subject: [PATCH 1346/1519] Allow .update(set__type='foo') to work without
 raising an error in case 'type' is one of the field. Avoids that it clash
 with the type operator

---
 docs/changelog.rst                |  1 +
 mongoengine/queryset/transform.py | 22 +++++++++++++++++-----
 tests/queryset/test_transform.py  | 26 +++++++++++++++++++++++++-
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1ac334e5a..d1c962216 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -20,6 +20,7 @@ Development
   it is not recommended to do so (DecimalField uses float/str to store the value, Decimal128Field uses Decimal128).
 - BREAKING CHANGE: When using ListField(EnumField) or DictField(EnumField), the values weren't always cast into the Enum (#2531)
 - BREAKING CHANGE (bugfix) Querying ObjectIdField or ComplexDateTimeField with None will no longer raise a ValidationError (#2681)
+- Allow updating a field that has an operator name e.g. "type" with .update(set__type="foo"). It was raising an error previously. #2595
 
 Changes in 0.25.0
 =================
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 749cf1f61..a95a84681 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -264,12 +264,24 @@ def update(_doc_cls=None, **update):
             op = operator_map.get(op, op)
 
         match = None
-        if len(parts) > 1 and parts[-1] in COMPARISON_OPERATORS:
-            match = parts.pop()
 
-        # Allow to escape operator-like field name by __
-        if len(parts) > 1 and parts[-1] == "":
-            parts.pop()
+        if len(parts) == 1:
+            # typical update like set__field
+            # but also allows to update a field named like a comparison operator
+            # like set__type = "something" (without clashing with the 'type' operator)
+            pass
+        elif len(parts) > 1:
+            # can be either an embedded field like set__foo__bar
+            # or a comparison operator as in pull__foo__in
+            if parts[-1] in COMPARISON_OPERATORS:
+                match = parts.pop()  # e.g. pop 'in' from pull__foo__in
+
+            # Allow to escape operator-like field name by __
+            # e.g. in the case of an embedded foo.type field
+            # Doc.objects().update(set__foo__type="bar")
+            # see https://github.com/MongoEngine/mongoengine/pull/1351
+            if parts[-1] == "":
+                match = parts.pop()  # e.g. pop last '__' from set__foo__type__
 
         if _doc_cls:
             # Switch field names to proper names [set in Field(name='foo')]
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index 9a7d6365e..5627597f8 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -275,7 +275,7 @@ class Doc(Document):
         assert Doc.objects(df__type=2).count() == 1  # str
         assert Doc.objects(df__type=16).count() == 1  # int
 
-    def test_last_field_name_like_operator(self):
+    def test_embedded_field_name_like_operator(self):
         class EmbeddedItem(EmbeddedDocument):
             type = StringField()
             name = StringField()
@@ -295,6 +295,30 @@ class Doc(Document):
         assert 1 == Doc.objects(item__type__="sword").count()
         assert 0 == Doc.objects(item__type__="axe").count()
 
+    def test_regular_field_named_like_operator(self):
+        class SimpleDoc(Document):
+            size = StringField()
+            type = StringField()
+
+        SimpleDoc.drop_collection()
+        SimpleDoc(type="ok", size="ok").save()
+
+        qry = transform.query(SimpleDoc, type="testtype")
+        assert qry == {"type": "testtype"}
+
+        assert SimpleDoc.objects(type="ok").count() == 1
+        assert SimpleDoc.objects(size="ok").count() == 1
+
+        update = transform.update(SimpleDoc, set__type="testtype")
+        assert update == {"$set": {"type": "testtype"}}
+
+        SimpleDoc.objects.update(set__type="testtype")
+        SimpleDoc.objects.update(set__size="testsize")
+
+        s = SimpleDoc.objects.first()
+        assert s.type == "testtype"
+        assert s.size == "testsize"
+
     def test_understandable_error_raised(self):
         class Event(Document):
             title = StringField()

From 4137ab6dd565a36d76047e48aba9cf0e8c801bff Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 20 Jan 2023 23:14:27 +0100
Subject: [PATCH 1347/1519] prepare_0_26_0_release

---
 docs/changelog.rst      | 5 ++++-
 mongoengine/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d1c962216..ad96f3e03 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.26.0
+=================
 - BREAKING CHANGE: Improved the performance of :meth:`~mongoengine.Document.save()`
   by removing the call to :meth:`~mongoengine.Document.ensure_indexes` unless
   ``meta['auto_create_index_on_save']`` is set to True. With the default settings, Document indexes
@@ -19,7 +22,7 @@ Development
   Although it could work to switch an existing DecimalField to Decimal128Field without applying a migration script,
   it is not recommended to do so (DecimalField uses float/str to store the value, Decimal128Field uses Decimal128).
 - BREAKING CHANGE: When using ListField(EnumField) or DictField(EnumField), the values weren't always cast into the Enum (#2531)
-- BREAKING CHANGE (bugfix) Querying ObjectIdField or ComplexDateTimeField with None will no longer raise a ValidationError (#2681)
+- BREAKING CHANGE (bugfix) Querying ObjectIdField or ComplexDateTimeField with None no longer raise a ValidationError (#2681)
 - Allow updating a field that has an operator name e.g. "type" with .update(set__type="foo"). It was raising an error previously. #2595
 
 Changes in 0.25.0
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 08192b80a..8d6cf7705 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 25, 0)
+VERSION = (0, 26, 0)
 
 
 def get_version():

From 0ae870457287fcfb0b57fc6fc911c1b64d0071ec Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 21 Jan 2023 15:31:06 +0100
Subject: [PATCH 1348/1519] update actions versions

---
 .github/workflows/github-actions.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index dff22a46f..ce7f8a4a6 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -115,7 +115,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [linting, test, build_doc_dryrun]
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       with:
         python-version: 3.9
@@ -130,7 +130,7 @@ jobs:
     needs: [linting, test, build_doc_dryrun, build-dryrun]
     if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: Set up Python 3.9
       uses: actions/setup-python@v4
       with:
@@ -143,6 +143,6 @@ jobs:
         pip install wheel
         python setup.py sdist bdist_wheel
     - name: publish pypi
-      uses: pypa/gh-action-pypi-publish@master
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.pypi_token }}

From ee5b1bb4d9e3d9f5b3f798ea2d3c58ebaa2b17ca Mon Sep 17 00:00:00 2001
From: davidlatwe <davidlatwe@gmail.com>
Date: Mon, 23 Jan 2023 04:30:29 +0800
Subject: [PATCH 1349/1519] Add alternative connection

---
 mongoengine/connection.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index b804cc3d8..abb6aeead 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -76,6 +76,9 @@ def _get_connection_settings(
         MONGODB-CR (MongoDB Challenge Response protocol) for older servers.
     :param is_mock: explicitly use mongomock for this connection
         (can also be done by using `mongomock: // ` as db host prefix)
+    :param connection_class: using alternative connection client other than
+        pymongo or mongomock, e.g. montydb, that provides pymongo alike
+        interface but not necessarily for connecting to a real mongo instance.
     :param kwargs: ad-hoc parameters to be passed into the pymongo driver,
         for example maxpoolsize, tz_aware, etc. See the documentation
         for pymongo's `MongoClient` for a full list.
@@ -221,6 +224,9 @@ def register_connection(
         MONGODB-CR (MongoDB Challenge Response protocol) for older servers.
     :param is_mock: explicitly use mongomock for this connection
         (can also be done by using `mongomock: // ` as db host prefix)
+    :param connection_class: using alternative connection client other than
+        pymongo or mongomock, e.g. montydb, that provides pymongo alike
+        interface but not necessarily for connecting to a real mongo instance.
     :param kwargs: ad-hoc parameters to be passed into the pymongo driver,
         for example maxpoolsize, tz_aware, etc. See the documentation
         for pymongo's `MongoClient` for a full list.
@@ -333,6 +339,10 @@ def _clean_settings(settings_dict):
         except ImportError:
             raise RuntimeError("You need mongomock installed to mock MongoEngine.")
         connection_class = mongomock.MongoClient
+
+    elif "connection_class" in conn_settings:
+        connection_class = conn_settings.pop("connection_class")
+
     else:
         connection_class = MongoClient
 

From 585532d268ac237771cba3a053be69d2cc61ec49 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 26 Jan 2023 22:04:56 +0100
Subject: [PATCH 1350/1519] Remove mongomock:// support, update tests and
 improve doc to support the new 'mongo_client_class' parameter of connect()

---
 docs/changelog.rst                 |  4 ++
 docs/guide/mongomock.rst           | 19 +++++---
 mongoengine/connection.py          | 54 +++++++--------------
 tests/test_connection.py           | 10 +++-
 tests/test_connection_mongomock.py | 78 ++++++++++++++++++++++--------
 5 files changed, 101 insertions(+), 64 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ad96f3e03..547d148e3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,10 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Added `mongo_client_class` optional parameter to connect() to allow to use an alternative mongo client than pymongo.MongoClient.
+  Typically to support mock mongo libraries like mongomock, montydb, mongita #2729
+- BREAKING CHANGE: connecting MongoEngine with mongomock should now use the new `mongo_client_class`
+  For more info, check https://docs.mongoengine.org/guide/mongomock.html
 
 Changes in 0.26.0
 =================
diff --git a/docs/guide/mongomock.rst b/docs/guide/mongomock.rst
index 141d7b69d..d9232055b 100644
--- a/docs/guide/mongomock.rst
+++ b/docs/guide/mongomock.rst
@@ -1,23 +1,28 @@
-==============================
+=========================
 Use mongomock for testing
-==============================
+=========================
 
-`mongomock <https://github.com/vmalloc/mongomock/>`_ is a package to do just
-what the name implies, mocking a mongo database.
+Although we recommend running your tests against a regular MongoDB server, it is sometimes useful to plug
+MongoEngine to alternative implementations (mongomock, montydb, mongita, etc).
+
+`mongomock <https://github.com/vmalloc/mongomock/>`_ is historically the one suggested for MongoEngine and is
+a package to do just what the name implies, mocking a mongo database.
 
 To use with mongoengine, simply specify mongomock when connecting with
 mongoengine:
 
 .. code-block:: python
 
-    connect('mongoenginetest', host='mongomock://localhost')
+    import mongomock
+
+    connect('mongoenginetest', host='mongodb://localhost', mongo_client_class=mongomock.MongoClient)
     conn = get_connection()
 
 or with an alias:
 
 .. code-block:: python
 
-    connect('mongoenginetest', host='mongomock://localhost', alias='testdb')
+    connect('mongoenginetest', host='mongodb://localhost', mongo_client_class=mongomock.MongoClient, alias='testdb')
     conn = get_connection('testdb')
 
 Example of test file:
@@ -34,7 +39,7 @@ Example of test file:
 
         @classmethod
         def setUpClass(cls):
-            connect('mongoenginetest', host='mongomock://localhost')
+            connect('mongoenginetest', host='mongodb://localhost', mongo_client_class=mongomock.MongoClient)
 
         @classmethod
         def tearDownClass(cls):
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index abb6aeead..22763042b 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -74,10 +74,8 @@ def _get_connection_settings(
     :param authentication_mechanism: database authentication mechanisms.
         By default, use SCRAM-SHA-1 with MongoDB 3.0 and later,
         MONGODB-CR (MongoDB Challenge Response protocol) for older servers.
-    :param is_mock: explicitly use mongomock for this connection
-        (can also be done by using `mongomock: // ` as db host prefix)
-    :param connection_class: using alternative connection client other than
-        pymongo or mongomock, e.g. montydb, that provides pymongo alike
+    :param mongo_client_class: using alternative connection client other than
+        pymongo.MongoClient, e.g. mongomock, montydb, that provides pymongo alike
         interface but not necessarily for connecting to a real mongo instance.
     :param kwargs: ad-hoc parameters to be passed into the pymongo driver,
         for example maxpoolsize, tz_aware, etc. See the documentation
@@ -105,22 +103,17 @@ def _get_connection_settings(
     resolved_hosts = []
     for entity in conn_host:
 
-        # Handle Mongomock
-        if entity.startswith("mongomock://"):
-            conn_settings["is_mock"] = True
-            # `mongomock://` is not a valid url prefix and must be replaced by `mongodb://`
-            new_entity = entity.replace("mongomock://", "mongodb://", 1)
-            resolved_hosts.append(new_entity)
-
-            uri_dict = uri_parser.parse_uri(new_entity)
-
-            database = uri_dict.get("database")
-            if database:
-                conn_settings["name"] = database
+        # Reject old mongomock integration
+        # To be removed in a few versions after 0.27.0
+        if entity.startswith("mongomock://") or kwargs.get("is_mock"):
+            raise Exception(
+                "Use of mongomock:// URI or 'is_mock' were removed in favor of 'mongo_client_class=mongomock.MongoClient'. "
+                "Check the CHANGELOG for more info"
+            )
 
         # Handle URI style connections, only updating connection params which
         # were explicitly specified in the URI.
-        elif "://" in entity:
+        if "://" in entity:
             uri_dict = uri_parser.parse_uri(entity)
             resolved_hosts.append(entity)
 
@@ -222,10 +215,8 @@ def register_connection(
     :param authentication_mechanism: database authentication mechanisms.
         By default, use SCRAM-SHA-1 with MongoDB 3.0 and later,
         MONGODB-CR (MongoDB Challenge Response protocol) for older servers.
-    :param is_mock: explicitly use mongomock for this connection
-        (can also be done by using `mongomock: // ` as db host prefix)
-    :param connection_class: using alternative connection client other than
-        pymongo or mongomock, e.g. montydb, that provides pymongo alike
+    :param mongo_client_class: using alternative connection client other than
+        pymongo.MongoClient, e.g. mongomock, montydb, that provides pymongo alike
         interface but not necessarily for connecting to a real mongo instance.
     :param kwargs: ad-hoc parameters to be passed into the pymongo driver,
         for example maxpoolsize, tz_aware, etc. See the documentation
@@ -332,19 +323,10 @@ def _clean_settings(settings_dict):
     conn_settings = _clean_settings(raw_conn_settings)
 
     # Determine if we should use PyMongo's or mongomock's MongoClient.
-    is_mock = conn_settings.pop("is_mock", False)
-    if is_mock:
-        try:
-            import mongomock
-        except ImportError:
-            raise RuntimeError("You need mongomock installed to mock MongoEngine.")
-        connection_class = mongomock.MongoClient
-
-    elif "connection_class" in conn_settings:
-        connection_class = conn_settings.pop("connection_class")
-
+    if "mongo_client_class" in conn_settings:
+        mongo_client_class = conn_settings.pop("mongo_client_class")
     else:
-        connection_class = MongoClient
+        mongo_client_class = MongoClient
 
     # Re-use existing connection if one is suitable.
     existing_connection = _find_existing_connection(raw_conn_settings)
@@ -352,19 +334,19 @@ def _clean_settings(settings_dict):
         connection = existing_connection
     else:
         connection = _create_connection(
-            alias=alias, connection_class=connection_class, **conn_settings
+            alias=alias, mongo_client_class=mongo_client_class, **conn_settings
         )
     _connections[alias] = connection
     return _connections[alias]
 
 
-def _create_connection(alias, connection_class, **connection_settings):
+def _create_connection(alias, mongo_client_class, **connection_settings):
     """
     Create the new connection for this alias. Raise
     ConnectionFailure if it can't be established.
     """
     try:
-        return connection_class(**connection_settings)
+        return mongo_client_class(**connection_settings)
     except Exception as e:
         raise ConnectionFailure(f"Cannot connect to database {alias} :\n{e}")
 
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 27be9dd99..6915f5b1e 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -53,7 +53,7 @@ def test_connect(self):
         connect("mongoenginetest")
 
         conn = get_connection()
-        assert isinstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.MongoClient)
 
         db = get_db()
         assert isinstance(db, pymongo.database.Database)
@@ -61,7 +61,13 @@ def test_connect(self):
 
         connect("mongoenginetest2", alias="testdb")
         conn = get_connection("testdb")
-        assert isinstance(conn, pymongo.mongo_client.MongoClient)
+        assert isinstance(conn, pymongo.MongoClient)
+
+        connect(
+            "mongoenginetest2", alias="testdb3", mongo_client_class=pymongo.MongoClient
+        )
+        conn = get_connection("testdb")
+        assert isinstance(conn, pymongo.MongoClient)
 
     def test_connect_disconnect_works_properly(self):
         class History1(Document):
diff --git a/tests/test_connection_mongomock.py b/tests/test_connection_mongomock.py
index b171fd13a..f8316501f 100644
--- a/tests/test_connection_mongomock.py
+++ b/tests/test_connection_mongomock.py
@@ -32,45 +32,76 @@ def tearDown(self):
         mongoengine.connection._connections = {}
         mongoengine.connection._dbs = {}
 
+    @require_mongomock
+    def test_connect_raise_if_mongomock_uri_provided(self):
+        with pytest.raises(
+            Exception, match="Use of mongomock:// URI or 'is_mock' were removed"
+        ):
+            connect("test", host="mongomock://localhost")
+
+    @require_mongomock
+    def test_connect_raise_if_is_mock_provided(self):
+        with pytest.raises(
+            Exception, match="Use of mongomock:// URI or 'is_mock' were removed"
+        ):
+            connect("test", host="mongodb://localhost", is_mock=True)
+
     @require_mongomock
     def test_connect_in_mocking(self):
         """Ensure that the connect() method works properly in mocking."""
-        connect("mongoenginetest", host="mongomock://localhost")
+        connect(
+            "mongoenginetest",
+            host="mongodb://localhost",
+            mongo_client_class=mongomock.MongoClient,
+        )
         conn = get_connection()
         assert isinstance(conn, mongomock.MongoClient)
 
-        connect("mongoenginetest2", host="mongomock://localhost", alias="testdb2")
+        connect(
+            "mongoenginetest2",
+            host="mongodb://localhost",
+            mongo_client_class=mongomock.MongoClient,
+            alias="testdb2",
+        )
         conn = get_connection("testdb2")
         assert isinstance(conn, mongomock.MongoClient)
 
         connect(
             "mongoenginetest3",
             host="mongodb://localhost",
-            is_mock=True,
+            mongo_client_class=mongomock.MongoClient,
             alias="testdb3",
         )
         conn = get_connection("testdb3")
         assert isinstance(conn, mongomock.MongoClient)
 
-        connect("mongoenginetest4", is_mock=True, alias="testdb4")
+        connect(
+            "mongoenginetest4",
+            mongo_client_class=mongomock.MongoClient,
+            alias="testdb4",
+        )
         conn = get_connection("testdb4")
         assert isinstance(conn, mongomock.MongoClient)
 
         connect(
             host="mongodb://localhost:27017/mongoenginetest5",
-            is_mock=True,
+            mongo_client_class=mongomock.MongoClient,
             alias="testdb5",
         )
         conn = get_connection("testdb5")
         assert isinstance(conn, mongomock.MongoClient)
 
-        connect(host="mongomock://localhost:27017/mongoenginetest6", alias="testdb6")
+        connect(
+            host="mongodb://localhost:27017/mongoenginetest6",
+            mongo_client_class=mongomock.MongoClient,
+            alias="testdb6",
+        )
         conn = get_connection("testdb6")
         assert isinstance(conn, mongomock.MongoClient)
 
         connect(
-            host="mongomock://localhost:27017/mongoenginetest7",
-            is_mock=True,
+            host="mongodb://localhost:27017/mongoenginetest7",
+            mongo_client_class=mongomock.MongoClient,
             alias="testdb7",
         )
         conn = get_connection("testdb7")
@@ -84,7 +115,10 @@ def test_default_database_with_mocking(self):
         class SomeDocument(Document):
             pass
 
-        conn = connect(host="mongomock://localhost:27017/mongoenginetest")
+        conn = connect(
+            host="mongodb://localhost:27017/mongoenginetest",
+            mongo_client_class=mongomock.MongoClient,
+        )
         some_document = SomeDocument()
         # database won't exist until we save a document
         some_document.save()
@@ -96,7 +130,10 @@ class SomeDocument(Document):
     def test_basic_queries_against_mongomock(self):
         disconnect_all()
 
-        connect(host="mongomock://localhost:27017/mongoenginetest")
+        connect(
+            host="mongodb://localhost:27017/mongoenginetest",
+            mongo_client_class=mongomock.MongoClient,
+        )
 
         class Person(Document):
             name = StringField()
@@ -129,35 +166,38 @@ def test_connect_with_host_list(self):
 
         Uses mongomock to test w/o needing multiple mongod/mongos processes
         """
-        connect(host=["mongomock://localhost"])
+        connect(host=["mongodb://localhost"], mongo_client_class=mongomock.MongoClient)
         conn = get_connection()
         assert isinstance(conn, mongomock.MongoClient)
 
-        connect(host=["mongodb://localhost"], is_mock=True, alias="testdb2")
-        conn = get_connection("testdb2")
-        assert isinstance(conn, mongomock.MongoClient)
-
-        connect(host=["localhost"], is_mock=True, alias="testdb3")
+        connect(
+            host=["localhost"],
+            mongo_client_class=mongomock.MongoClient,
+            alias="testdb3",
+        )
         conn = get_connection("testdb3")
         assert isinstance(conn, mongomock.MongoClient)
 
         connect(
-            host=["mongomock://localhost:27017", "mongomock://localhost:27018"],
+            host=["mongodb://localhost:27017", "mongodb://localhost:27018"],
             alias="testdb4",
+            mongo_client_class=mongomock.MongoClient,
         )
         conn = get_connection("testdb4")
         assert isinstance(conn, mongomock.MongoClient)
 
         connect(
             host=["mongodb://localhost:27017", "mongodb://localhost:27018"],
-            is_mock=True,
+            mongo_client_class=mongomock.MongoClient,
             alias="testdb5",
         )
         conn = get_connection("testdb5")
         assert isinstance(conn, mongomock.MongoClient)
 
         connect(
-            host=["localhost:27017", "localhost:27018"], is_mock=True, alias="testdb6"
+            host=["localhost:27017", "localhost:27018"],
+            mongo_client_class=mongomock.MongoClient,
+            alias="testdb6",
         )
         conn = get_connection("testdb6")
         assert isinstance(conn, mongomock.MongoClient)

From 4df0f8f12a462e08bee7b1a732ee525b9813f9e3 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 25 Feb 2023 18:30:09 +0100
Subject: [PATCH 1351/1519] update hooks and autoformat with newer black

---
 .pre-commit-config.yaml          | 4 ++--
 mongoengine/base/document.py     | 1 -
 mongoengine/base/metaclasses.py  | 1 -
 mongoengine/connection.py        | 1 -
 mongoengine/dereference.py       | 1 -
 mongoengine/document.py          | 1 -
 mongoengine/fields.py            | 2 --
 mongoengine/queryset/base.py     | 1 -
 mongoengine/queryset/queryset.py | 1 -
 tests/document/test_instance.py  | 1 -
 tests/fields/test_dict_field.py  | 1 +
 tests/fields/test_fields.py      | 2 ++
 tests/fields/test_file_field.py  | 1 -
 tests/fields/test_geo_fields.py  | 1 -
 tests/queryset/test_queryset.py  | 4 ----
 tests/test_context_managers.py   | 2 --
 tests/test_signals.py            | 1 -
 17 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a0acf1c43..98737e7c8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
@@ -23,6 +23,6 @@ repos:
       - id: pyupgrade
         args: [--py36-plus]
   - repo: https://github.com/pycqa/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
       - id: isort
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index fd90d3f82..145976304 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -161,7 +161,6 @@ def __delattr__(self, *args, **kwargs):
     def __setattr__(self, name, value):
         # Handle dynamic data only if an initialised dynamic document
         if self._dynamic and not self._dynamic_lock:
-
             if name not in self._fields_ordered and not name.startswith("_"):
                 DynamicField = _import_class("DynamicField")
                 field = DynamicField(db_field=name, null=True)
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 072b3aada..36ce47c3b 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -178,7 +178,6 @@ def __new__(mcs, name, bases, attrs):
                 f.owner_document = new_class
             delete_rule = getattr(f, "reverse_delete_rule", DO_NOTHING)
             if isinstance(f, CachedReferenceField):
-
                 if issubclass(new_class, EmbeddedDocument):
                     raise InvalidDocumentError(
                         "CachedReferenceFields is not allowed in EmbeddedDocuments"
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 22763042b..04864f38a 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -102,7 +102,6 @@ def _get_connection_settings(
 
     resolved_hosts = []
     for entity in conn_host:
-
         # Reject old mongomock integration
         # To be removed in a few versions after 0.27.0
         if entity.startswith("mongomock://") or kwargs.get("is_mock"):
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index f388fe069..af817902e 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -165,7 +165,6 @@ def _fetch_objects(self, doc_type=None):
         """Fetch all references and convert to their document objects"""
         object_map = {}
         for collection, dbrefs in self.reference_map.items():
-
             # we use getattr instead of hasattr because hasattr swallows any exception under python2
             # so it could hide nasty things without raising exceptions (cfr bug #1688))
             ref_document_cls_exists = getattr(collection, "objects", None) is not None
diff --git a/mongoengine/document.py b/mongoengine/document.py
index edbaa8cb1..3fddec36d 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -918,7 +918,6 @@ def ensure_indexes(cls):
         # If _cls is being used (for polymorphism), it needs an index,
         # only if another index doesn't begin with _cls
         if index_cls and not cls_indexed and cls._meta.get("allow_inheritance"):
-
             # we shouldn't pass 'cls' to the collection.ensureIndex options
             # because of https://jira.mongodb.org/browse/SERVER-769
             if "cls" in index_opts:
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 3f0850327..0b9688644 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -981,7 +981,6 @@ def prepare_query_value(self, op, value):
             self.error("List is too long")
 
         if self.field:
-
             # If the value is iterable and it's not a string nor a
             # BaseDocument, call prepare_query_value for each of its items.
             if (
@@ -2216,7 +2215,6 @@ def __get__(self, instance, owner):
         return value
 
     def __set__(self, instance, value):
-
         if value is None and instance._initialised:
             value = self.generate()
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 7da9c2e63..9e62f60ad 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1120,7 +1120,6 @@ def order_by(self, *keys):
         new_ordering = queryset._get_order_by(keys)
 
         if queryset._cursor_obj:
-
             # If a cursor object has already been created, apply the sort to it
             if new_ordering:
                 queryset._cursor_obj.sort(new_ordering)
diff --git a/mongoengine/queryset/queryset.py b/mongoengine/queryset/queryset.py
index b7c70bc0f..e0f7765b9 100644
--- a/mongoengine/queryset/queryset.py
+++ b/mongoengine/queryset/queryset.py
@@ -87,7 +87,6 @@ def _iter_results(self):
 
         pos = 0
         while True:
-
             # For all positions lower than the length of the current result
             # cache, serve the docs straight from the cache w/o hitting the
             # database.
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 224fec8fc..54c4bb37d 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -1526,7 +1526,6 @@ class Doc(Document):
         assert my_doc.int_field == 1
 
     def test_document_update(self):
-
         # try updating a non-saved document
         with pytest.raises(OperationError):
             person = self.Person(name="dcrosta")
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 63d5c5279..4da29d9a3 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -324,6 +324,7 @@ class Simple(Document):
 
     def test_dictfield_with_referencefield_complex_nesting_cases(self):
         """Ensure complex nesting inside DictField handles dereferencing of ReferenceField(dbref=True | False)"""
+
         # Relates to Issue #1453
         class Doc(Document):
             s = StringField()
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 8d21fed5f..d95e2fce0 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -239,6 +239,7 @@ def test_default_value_is_not_used_when_changing_value_to_empty_list_for_strict_
         self,
     ):
         """List field with default can be set to the empty list (strict)"""
+
         # Issue #1733
         class Doc(Document):
             x = ListField(IntField(), default=lambda: [42])
@@ -253,6 +254,7 @@ def test_default_value_is_not_used_when_changing_value_to_empty_list_for_dyn_doc
         self,
     ):
         """List field with default can be set to the empty list (dynamic)"""
+
         # Issue #1733
         class Doc(DynamicDocument):
             x = ListField(IntField(), default=lambda: [42])
diff --git a/tests/fields/test_file_field.py b/tests/fields/test_file_field.py
index 4f584b4c8..43bb0fdbf 100644
--- a/tests/fields/test_file_field.py
+++ b/tests/fields/test_file_field.py
@@ -535,7 +535,6 @@ class TestFile(Document):
     @require_pil
     def test_get_image_by_grid_id(self):
         class TestImage(Document):
-
             image1 = ImageField()
             image2 = ImageField()
 
diff --git a/tests/fields/test_geo_fields.py b/tests/fields/test_geo_fields.py
index 3c63b1686..75b066751 100644
--- a/tests/fields/test_geo_fields.py
+++ b/tests/fields/test_geo_fields.py
@@ -369,7 +369,6 @@ class Parent(Document):
         assert len(Location._geo_indices()) == 1
 
     def test_geo_indexes_auto_index(self):
-
         # Test just listing the fields
         class Log(Document):
             location = PointField(auto_index=False)
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 590bed076..b8cdea9a0 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -604,7 +604,6 @@ class BlogPost(Document):
         assert post.comments[1].votes == 8
 
     def test_update_using_positional_operator_matches_first(self):
-
         # Currently the $ operator only applies to the first matched item in
         # the query
 
@@ -5611,7 +5610,6 @@ class Person(Document):
         # Check that bool(queryset) does not uses the orderby
         qs = Person.objects.order_by("name")
         with query_counter() as q:
-
             if bool(qs):
                 pass
 
@@ -5624,7 +5622,6 @@ class Person(Document):
         # Check that normal query uses orderby
         qs2 = Person.objects.order_by("name")
         with query_counter() as q:
-
             for x in qs2:
                 pass
 
@@ -5648,7 +5645,6 @@ class Person(Document):
         Person(name="A").save()
 
         with query_counter() as q:
-
             if Person.objects:
                 pass
 
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 68dc8f4be..f3ed29e0e 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -76,7 +76,6 @@ class Group(Document):
         assert 1 == Group.objects.count()
 
         with switch_db(Group, "testdb-1") as Group:
-
             assert 0 == Group.objects.count()
 
             Group(name="hello").save()
@@ -104,7 +103,6 @@ class Group(Document):
         assert 1 == Group.objects.count()
 
         with switch_collection(Group, "group1") as Group:
-
             assert 0 == Group.objects.count()
 
             Group(name="hello - group1").save()
diff --git a/tests/test_signals.py b/tests/test_signals.py
index 1d84347d7..3ee9685dc 100644
--- a/tests/test_signals.py
+++ b/tests/test_signals.py
@@ -97,7 +97,6 @@ def post_bulk_insert(cls, sender, documents, **kwargs):
         Author.id.set_next_value(0)
 
         class Another(Document):
-
             name = StringField()
 
             def __unicode__(self):

From bcf024574780b2498119ef618bd966fb5d0dca16 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 25 Feb 2023 18:50:06 +0100
Subject: [PATCH 1352/1519] update changelog and add test for empty key

---
 docs/changelog.rst           |  1 +
 tests/document/test_delta.py | 20 +++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 547d148e3..9f59e1218 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,7 @@ Development
   Typically to support mock mongo libraries like mongomock, montydb, mongita #2729
 - BREAKING CHANGE: connecting MongoEngine with mongomock should now use the new `mongo_client_class`
   For more info, check https://docs.mongoengine.org/guide/mongomock.html
+- Fix DictField that always gets marked as changed #2606
 
 Changes in 0.26.0
 =================
diff --git a/tests/document/test_delta.py b/tests/document/test_delta.py
index 537c86bfd..e610290b6 100644
--- a/tests/document/test_delta.py
+++ b/tests/document/test_delta.py
@@ -4,7 +4,7 @@
 
 from mongoengine import *
 from mongoengine.pymongo_support import list_collection_names
-from tests.utils import MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestDelta(MongoDBTestCase):
@@ -977,6 +977,24 @@ class MyDoc(Document):
         mydoc._clear_changed_fields()
         assert mydoc._get_changed_fields() == []
 
+    def test_delta_on_dict_empty_key_triggers_full_change(self):
+        """more of a bug (harmless) but empty key changes aren't managed perfectly"""
+
+        class MyDoc(Document):
+            dico = DictField()
+
+        MyDoc.drop_collection()
+
+        MyDoc(dico={"a": {"b": 0}}).save()
+
+        mydoc = MyDoc.objects.first()
+        assert mydoc._get_changed_fields() == []
+        mydoc.dico[""] = 3
+        assert mydoc._get_changed_fields() == ["dico"]
+        mydoc.save()
+        raw_doc = get_as_pymongo(mydoc)
+        assert raw_doc == {"_id": mydoc.id, "dico": {"": 3, "a": {"b": 0}}}
+
 
 if __name__ == "__main__":
     unittest.main()

From 703cd49a65b69ed3601baaa0584e08222295f13f Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 25 Feb 2023 22:19:33 +0100
Subject: [PATCH 1353/1519] remove unnecessary conditions + improve test cov

---
 mongoengine/base/datastructures.py  |  2 +-
 mongoengine/base/document.py        |  3 ---
 tests/fields/test_datetime_field.py | 17 ++++++++++++++++-
 tests/queryset/test_queryset.py     |  6 ++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index 8f670e640..a3561b8b1 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -31,7 +31,7 @@ def mark_key_as_changed_wrapper(parent_method):
 
     def wrapper(self, key, *args, **kwargs):
         # Can't use super() in the decorator.
-        if not args or not key or key not in self or self[key] != args[0]:
+        if not args or key not in self or self[key] != args[0]:
             self._mark_as_changed(key)
         return parent_method(self, key, *args, **kwargs)
 
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 145976304..4792cf194 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -516,9 +516,6 @@ def __expand_dynamic_values(self, name, value):
 
     def _mark_as_changed(self, key):
         """Mark a key as explicitly changed by the user."""
-        if not key:
-            return
-
         if not hasattr(self, "_changed_fields"):
             return
 
diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index 088e54a42..ced10b1bc 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -9,7 +9,7 @@
 
 from mongoengine import *
 from mongoengine import connection
-from tests.utils import MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestDateTimeField(MongoDBTestCase):
@@ -55,6 +55,21 @@ class Person(Document):
         assert person_created_t0 == person.created  # make sure it does not change
         assert person._data["created"] == person.created
 
+    def test_set_using_callable(self):
+        # Weird feature but it's there for a while so let's make sure we don't break it
+        class Person(Document):
+            created = DateTimeField()
+
+        Person.drop_collection()
+
+        person = Person()
+        frozen_dt = dt.datetime(2020, 7, 25, 9, 56, 1)
+        person.created = lambda: frozen_dt
+        person.save()
+
+        assert callable(person.created)
+        assert get_as_pymongo(person) == {"_id": person.id, "created": frozen_dt}
+
     def test_handling_microseconds(self):
         """Tests showing pymongo datetime fields handling of microseconds.
         Microseconds are rounded to the nearest millisecond and pre UTC
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index b8cdea9a0..e9c031fa2 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -2580,6 +2580,12 @@ def test_order_by(self):
         ages = [p.age for p in self.Person.objects.order_by("-name")]
         assert ages == [30, 40, 20]
 
+        ages = [p.age for p in self.Person.objects.order_by()]
+        assert ages == [40, 20, 30]
+
+        ages = [p.age for p in self.Person.objects.order_by("")]
+        assert ages == [40, 20, 30]
+
     def test_order_by_optional(self):
         class BlogPost(Document):
             title = StringField()

From 0773c993198217b58d8983b636bfcae514a409f6 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 25 Feb 2023 22:46:27 +0100
Subject: [PATCH 1354/1519] Simplify LongField implementation

---
 mongoengine/fields.py | 36 +-----------------------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 0b9688644..df155e6a3 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -356,46 +356,12 @@ def prepare_query_value(self, op, value):
         return super().prepare_query_value(op, int(value))
 
 
-class LongField(BaseField):
+class LongField(IntField):
     """64-bit integer field. (Equivalent to IntField since the support to Python2 was dropped)"""
 
-    def __init__(self, min_value=None, max_value=None, **kwargs):
-        """
-        :param min_value: (optional) A min value that will be applied during validation
-        :param max_value: (optional) A max value that will be applied during validation
-        :param kwargs: Keyword arguments passed into the parent :class:`~mongoengine.BaseField`
-        """
-        self.min_value, self.max_value = min_value, max_value
-        super().__init__(**kwargs)
-
-    def to_python(self, value):
-        try:
-            value = int(value)
-        except (TypeError, ValueError):
-            pass
-        return value
-
     def to_mongo(self, value):
         return Int64(value)
 
-    def validate(self, value):
-        try:
-            value = int(value)
-        except (TypeError, ValueError):
-            self.error("%s could not be converted to long" % value)
-
-        if self.min_value is not None and value < self.min_value:
-            self.error("Long value is too small")
-
-        if self.max_value is not None and value > self.max_value:
-            self.error("Long value is too large")
-
-    def prepare_query_value(self, op, value):
-        if value is None:
-            return value
-
-        return super().prepare_query_value(op, int(value))
-
 
 class FloatField(BaseField):
     """Floating point number field."""

From 24136df370b553cbc7d63ae961a14c72041fb00b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 26 Feb 2023 15:22:47 +0100
Subject: [PATCH 1355/1519] Fix none() no-match condition for aggregation +
 update changelog

---
 docs/changelog.rst           | 1 +
 mongoengine/queryset/base.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9f59e1218..2f4f712ac 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,7 @@ Development
 - BREAKING CHANGE: connecting MongoEngine with mongomock should now use the new `mongo_client_class`
   For more info, check https://docs.mongoengine.org/guide/mongomock.html
 - Fix DictField that always gets marked as changed #2606
+- fix for Queryset.none() that has no effect on update/aggregate / first #2669
 
 Changes in 0.26.0
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index cb04e45b1..caefa0e0f 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1316,7 +1316,7 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
         initial_pipeline = []
         if self._none or self._empty:
             initial_pipeline.append({"$limit": 1})
-            initial_pipeline.append({"$match": {"fldksjhkjhafds": "lasdjfhlasdhfk"}})
+            initial_pipeline.append({"$match": {"$expr": False}})
 
         if self._query:
             initial_pipeline.append({"$match": self._query})

From 6a7a2799be0c149641e7498664e7f1057902404c Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 26 Feb 2023 22:05:58 +0100
Subject: [PATCH 1356/1519] Document_string_operator_on_ListField

---
 docs/guide/querying.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index ba1b1210a..b9afb60e1 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -196,6 +196,10 @@ you could use the following query::
 
     Page.objects(tags__0='db')
 
+The string queries operators can be used as well for querying a list field, e.g.::
+
+    Page.objects(tags__iexact='db')
+
 If you only want to fetch part of a list eg: you want to paginate a list, then
 the `slice` operator is required::
 

From 9b879d198999374669e256c382abd9f5b0ce858d Mon Sep 17 00:00:00 2001
From: Shane Harvey <shnhrv@gmail.com>
Date: Wed, 1 Mar 2023 14:28:14 -0800
Subject: [PATCH 1357/1519] Update uuidRepresentation warnings with
 "unspecified" as the future default

---
 mongoengine/base/document.py   | 6 ++++--
 mongoengine/connection.py      | 2 +-
 mongoengine/pymongo_support.py | 2 ++
 mongoengine/queryset/base.py   | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 4792cf194..e5311c5dd 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -450,7 +450,8 @@ def to_json(self, *args, **kwargs):
                 "No 'json_options' are specified! Falling back to "
                 "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
                 "For use with other MongoDB drivers specify the UUID "
-                "representation to use.",
+                "representation to use. This will be changed to "
+                "uuid_representation=UNSPECIFIED in a future release.",
                 DeprecationWarning,
             )
             kwargs["json_options"] = LEGACY_JSON_OPTIONS
@@ -480,7 +481,8 @@ def from_json(cls, json_data, created=False, **kwargs):
                 "No 'json_options' are specified! Falling back to "
                 "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
                 "For use with other MongoDB drivers specify the UUID "
-                "representation to use.",
+                "representation to use. This will be changed to "
+                "uuid_representation=UNSPECIFIED in a future release.",
                 DeprecationWarning,
             )
             kwargs["json_options"] = LEGACY_JSON_OPTIONS
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 04864f38a..7852c64f1 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -177,7 +177,7 @@ def _get_connection_settings(
             "For compatibility with other MongoDB drivers this should be "
             "specified as 'standard' or '{java,csharp}Legacy' to work with "
             "older drivers in those languages. This will be changed to "
-            "'standard' in a future release.",
+            "'unspecified' in a future release.",
             DeprecationWarning,
         )
         kwargs["uuidRepresentation"] = "pythonLegacy"
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index fcddbf7b2..5429fc90c 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -7,6 +7,8 @@
 
 PYMONGO_VERSION = tuple(pymongo.version_tuple[:2])
 
+# This will be changed to UuidRepresentation.UNSPECIFIED in a future
+# (breaking) release.
 if PYMONGO_VERSION >= (4,):
     LEGACY_JSON_OPTIONS = json_util.LEGACY_JSON_OPTIONS.with_options(
         uuid_representation=binary.UuidRepresentation.PYTHON_LEGACY,
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index caefa0e0f..75b2af6cb 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1283,7 +1283,8 @@ def to_json(self, *args, **kwargs):
                 "No 'json_options' are specified! Falling back to "
                 "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
                 "For use with other MongoDB drivers specify the UUID "
-                "representation to use.",
+                "representation to use. This will be changed to "
+                "uuid_representation=UNSPECIFIED in a future release.",
                 DeprecationWarning,
             )
             kwargs["json_options"] = LEGACY_JSON_OPTIONS

From ceb7415d41650b31b2b1821ee132d1345240dd6c Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 3 Mar 2023 10:38:19 +0100
Subject: [PATCH 1358/1519] update changelog for 0.27.0

---
 docs/changelog.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2f4f712ac..b0e54cd76 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,10 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.27.0
+=================
+- Update uuidRepresentation warnings with "unspecified" as the future default (instead of 'standard' previously advertised) #2739
 - Added `mongo_client_class` optional parameter to connect() to allow to use an alternative mongo client than pymongo.MongoClient.
   Typically to support mock mongo libraries like mongomock, montydb, mongita #2729
 - BREAKING CHANGE: connecting MongoEngine with mongomock should now use the new `mongo_client_class`

From aaf0a5330f78d6c5e26e8f11c4311e0f028be6ff Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 3 Mar 2023 10:39:32 +0100
Subject: [PATCH 1359/1519] update version

---
 mongoengine/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 8d6cf7705..a42755bb4 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 26, 0)
+VERSION = (0, 27, 0)
 
 
 def get_version():

From a7c0b1cad9dcb471a6d76d2daa8290333f711e41 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 3 Mar 2023 18:46:34 +0100
Subject: [PATCH 1360/1519] Accept uuidrepr in URI

---
 mongoengine/connection.py | 15 ++++++++++--
 tests/test_connection.py  | 49 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 7852c64f1..3748da8e3 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,6 +1,10 @@
 import warnings
 
 from pymongo import MongoClient, ReadPreference, uri_parser
+from pymongo.common import (
+    _UUID_REPRESENTATIONS,
+    _CaseInsensitiveDictionary,
+)
 from pymongo.database import _check_name
 
 from mongoengine.pymongo_support import PYMONGO_VERSION
@@ -124,7 +128,7 @@ def _get_connection_settings(
                 if uri_dict.get(param):
                     conn_settings[param] = uri_dict[param]
 
-            uri_options = uri_dict["options"]
+            uri_options: _CaseInsensitiveDictionary = uri_dict["options"]
             if "replicaset" in uri_options:
                 conn_settings["replicaSet"] = uri_options["replicaset"]
             if "authsource" in uri_options:
@@ -159,6 +163,13 @@ def _get_connection_settings(
                 conn_settings["authmechanismproperties"] = uri_options[
                     "authmechanismproperties"
                 ]
+            if "uuidrepresentation" in uri_options:
+                REV_UUID_REPRESENTATIONS = {
+                    v: k for k, v in _UUID_REPRESENTATIONS.items()
+                }
+                conn_settings["uuidrepresentation"] = REV_UUID_REPRESENTATIONS[
+                    uri_options["uuidrepresentation"]
+                ]
         else:
             resolved_hosts.append(entity)
     conn_settings["host"] = resolved_hosts
@@ -170,7 +181,7 @@ def _get_connection_settings(
     keys = {
         key.lower() for key in kwargs.keys()
     }  # pymongo options are case insensitive
-    if "uuidrepresentation" not in keys:
+    if "uuidrepresentation" not in keys and "uuidrepresentation" not in conn_settings:
         warnings.warn(
             "No uuidRepresentation is specified! Falling back to "
             "'pythonLegacy' which is the default for pymongo 3.x. "
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 6915f5b1e..310400164 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,5 +1,6 @@
 import datetime
 import unittest
+import uuid
 
 import pymongo
 import pytest
@@ -30,6 +31,10 @@
 from mongoengine.pymongo_support import PYMONGO_VERSION
 
 
+def random_str():
+    return str(uuid.uuid4())
+
+
 def get_tz_awareness(connection):
     return connection.codec_options.tz_aware
 
@@ -624,6 +629,50 @@ def test_connect_2_databases_uses_different_client_if_different_parameters(self)
         c2 = connect(alias="testdb2", db="testdb2", username="u2", password="pass")
         assert c1 is not c2
 
+    def test_connect_uri_uuidrepresentation_set_in_uri(self):
+        rand = random_str()
+        tmp_conn = connect(
+            alias=rand,
+            host=f"mongodb://localhost:27017/{rand}?uuidRepresentation=csharpLegacy",
+        )
+        assert (
+            tmp_conn.options.codec_options.uuid_representation
+            == pymongo.common.UuidRepresentation.CSHARP_LEGACY
+        )
+        disconnect(rand)
+
+    def test_connect_uri_uuidrepresentation_set_as_arg(self):
+        rand = random_str()
+        tmp_conn = connect(alias=rand, db=rand, uuidRepresentation="javaLegacy")
+        assert (
+            tmp_conn.options.codec_options.uuid_representation
+            == pymongo.common.UuidRepresentation.JAVA_LEGACY
+        )
+        disconnect(rand)
+
+    def test_connect_uri_uuidrepresentation_set_both_arg_and_uri_arg_prevail(self):
+        rand = random_str()
+        tmp_conn = connect(
+            alias=rand,
+            host=f"mongodb://localhost:27017/{rand}?uuidRepresentation=csharpLegacy",
+            uuidRepresentation="javaLegacy",
+        )
+        assert (
+            tmp_conn.options.codec_options.uuid_representation
+            == pymongo.common.UuidRepresentation.JAVA_LEGACY
+        )
+        disconnect(rand)
+
+    def test_connect_uri_uuidrepresentation_default_to_pythonlegacy(self):
+        # To be changed soon to unspecified
+        rand = random_str()
+        tmp_conn = connect(alias=rand, db=rand)
+        assert (
+            tmp_conn.options.codec_options.uuid_representation
+            == pymongo.common.UuidRepresentation.PYTHON_LEGACY
+        )
+        disconnect(rand)
+
 
 if __name__ == "__main__":
     unittest.main()

From c310e144dcd781a414e94df3a249b513970b7478 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 3 Mar 2023 18:50:00 +0100
Subject: [PATCH 1361/1519] update changelog for recent change

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b0e54cd76..6d9058c0b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Fix for uuidRepresentation when provided not read when provided in URI #2741
 
 Changes in 0.27.0
 =================

From a09b1f14ade48dcbb64b3fa2487f7f10e229254d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 3 Mar 2023 21:11:12 +0100
Subject: [PATCH 1362/1519] fix test for pymongo 3.9 import

---
 tests/test_connection.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 310400164..c6cc25317 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -637,7 +637,7 @@ def test_connect_uri_uuidrepresentation_set_in_uri(self):
         )
         assert (
             tmp_conn.options.codec_options.uuid_representation
-            == pymongo.common.UuidRepresentation.CSHARP_LEGACY
+            == pymongo.common._UUID_REPRESENTATIONS["csharpLegacy"]
         )
         disconnect(rand)
 
@@ -646,7 +646,7 @@ def test_connect_uri_uuidrepresentation_set_as_arg(self):
         tmp_conn = connect(alias=rand, db=rand, uuidRepresentation="javaLegacy")
         assert (
             tmp_conn.options.codec_options.uuid_representation
-            == pymongo.common.UuidRepresentation.JAVA_LEGACY
+            == pymongo.common._UUID_REPRESENTATIONS["javaLegacy"]
         )
         disconnect(rand)
 
@@ -659,7 +659,7 @@ def test_connect_uri_uuidrepresentation_set_both_arg_and_uri_arg_prevail(self):
         )
         assert (
             tmp_conn.options.codec_options.uuid_representation
-            == pymongo.common.UuidRepresentation.JAVA_LEGACY
+            == pymongo.common._UUID_REPRESENTATIONS["javaLegacy"]
         )
         disconnect(rand)
 
@@ -669,7 +669,7 @@ def test_connect_uri_uuidrepresentation_default_to_pythonlegacy(self):
         tmp_conn = connect(alias=rand, db=rand)
         assert (
             tmp_conn.options.codec_options.uuid_representation
-            == pymongo.common.UuidRepresentation.PYTHON_LEGACY
+            == pymongo.common._UUID_REPRESENTATIONS["pythonLegacy"]
         )
         disconnect(rand)
 

From c860098c8c59b0596ae2d71f54a39f79ffed6053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20G=C3=A9rard?= <bast.gerard@gmail.com>
Date: Fri, 3 Mar 2023 21:31:32 +0100
Subject: [PATCH 1363/1519] Update changelog.rst

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 6d9058c0b..a11745e5a 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,7 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- Fix for uuidRepresentation when provided not read when provided in URI #2741
+- Fix for uuidRepresentation not read when provided in URI #2741
 
 Changes in 0.27.0
 =================

From 00bcea818d7b63f576fc22565ab8d74685e1866d Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Thu, 13 Apr 2023 12:04:43 +0200
Subject: [PATCH 1364/1519] fix Pillow deprecation warning for Image.ANTIALIAS
 by using its new name

x-ref: https://pillow.readthedocs.io/en/stable/releasenotes/2.7.0.html#antialias-renamed-to-lanczos
---
 mongoengine/fields.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index df155e6a3..a3f5525cc 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -47,6 +47,8 @@
 
 try:
     from PIL import Image, ImageOps
+
+    LANCZOS = Image.LANCZOS if hasattr(Image, "LANCZOS") else Image.ANTIALIAS
 except ImportError:
     Image = None
     ImageOps = None
@@ -1946,23 +1948,19 @@ def put(self, file_obj, **kwargs):
             size = field.size
 
             if size["force"]:
-                img = ImageOps.fit(
-                    img, (size["width"], size["height"]), Image.ANTIALIAS
-                )
+                img = ImageOps.fit(img, (size["width"], size["height"]), LANCZOS)
             else:
-                img.thumbnail((size["width"], size["height"]), Image.ANTIALIAS)
+                img.thumbnail((size["width"], size["height"]), LANCZOS)
 
         thumbnail = None
         if field.thumbnail_size:
             size = field.thumbnail_size
 
             if size["force"]:
-                thumbnail = ImageOps.fit(
-                    img, (size["width"], size["height"]), Image.ANTIALIAS
-                )
+                thumbnail = ImageOps.fit(img, (size["width"], size["height"]), LANCZOS)
             else:
                 thumbnail = img.copy()
-                thumbnail.thumbnail((size["width"], size["height"]), Image.ANTIALIAS)
+                thumbnail.thumbnail((size["width"], size["height"]), LANCZOS)
 
         if thumbnail:
             thumb_id = self._put_thumbnail(thumbnail, img_format, progressive)

From d17a081f0195033e9e5bdef3931caa6ebd40a654 Mon Sep 17 00:00:00 2001
From: Shane Harvey <shnhrv@gmail.com>
Date: Thu, 13 Apr 2023 10:59:05 -0500
Subject: [PATCH 1365/1519] Log MongoEngine version when connecting to the
 server

Here's an example of the server log behavior after this change:
{"t":{"$date":"2023-04-13T10:56:07.619-05:00"},"s":"I",  "c":"NETWORK",  "id":22943,   "ctx":"listener","msg":"Connection accepted","attr":{"remote":"127.0.0.1:58812","uuid":"38175cc1-8c5c-44a2-8b05-afc38f35823e","connectionId":219,"connectionCount":8}}
{"t":{"$date":"2023-04-13T10:56:07.624-05:00"},"s":"I",  "c":"NETWORK",  "id":51800,   "ctx":"conn219","msg":"client metadata","attr":{"remote":"127.0.0.1:58812","client":"conn219","doc":{"driver":{"name":"PyMongo|MongoEngine","version":"4.2.0|0.27.0"}, ...}}}
---
 mongoengine/connection.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 7852c64f1..0e773ce2e 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -3,6 +3,13 @@
 from pymongo import MongoClient, ReadPreference, uri_parser
 from pymongo.database import _check_name
 
+# DriverInfo was added in PyMongo 3.7.
+try:
+    from pymongo.driver_info import DriverInfo
+except ImportError:
+    DriverInfo = None
+
+import mongoengine
 from mongoengine.pymongo_support import PYMONGO_VERSION
 
 __all__ = [
@@ -320,6 +327,10 @@ def _clean_settings(settings_dict):
     # alias and remove the database name and authentication info (we don't
     # care about them at this point).
     conn_settings = _clean_settings(raw_conn_settings)
+    if DriverInfo is not None:
+        conn_settings.setdefault(
+            "driver", DriverInfo("MongoEngine", mongoengine.__version__)
+        )
 
     # Determine if we should use PyMongo's or mongomock's MongoClient.
     if "mongo_client_class" in conn_settings:

From 090e6e1efb32272f3ada0b9a8c70c16c6683a0b8 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 18 Apr 2023 21:22:22 +0200
Subject: [PATCH 1366/1519] Fix read the docs issue #2751

---
 mongoengine/queryset/base.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 75b2af6cb..d33e7b1e3 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -237,7 +237,7 @@ def search_text(self, text, language=None):
             for the search and the rules for the stemmer and tokenizer.
             If not specified, the search uses the default language of the index.
             For supported languages, see
-            `Text Search Languages <http://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages>`.
+            `Text Search Languages <https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages>`.
         """
         queryset = self.clone()
         if queryset._search_text:
@@ -255,7 +255,7 @@ def search_text(self, text, language=None):
         return queryset
 
     def get(self, *q_objs, **query):
-        """Retrieve the the matching object raising
+        """Retrieve the matching object raising
         :class:`~mongoengine.queryset.MultipleObjectsReturned` or
         `DocumentName.MultipleObjectsReturned` exception if multiple results
         and :class:`~mongoengine.queryset.DoesNotExist` or
@@ -1296,10 +1296,10 @@ def from_json(self, json_data):
         return [self._document._from_son(data) for data in son_data]
 
     def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
-        """Perform a aggregate function based in your queryset params
+        """Perform an aggregate function based on your queryset params
 
-        :param pipeline: list of aggregation commands,\
-            see: http://docs.mongodb.org/manual/core/aggregation-pipeline/
+        :param pipeline: list of aggregation commands,
+            see: https://www.mongodb.com/docs/manual/core/aggregation-pipeline/
         :param suppl_pipeline: unpacked list of pipeline (added to support deprecation of the old interface)
             parameter will be removed shortly
         :param kwargs: (optional) kwargs dictionary to be passed to pymongo's aggregate call

From 3c0ae4f3c5d9f7cd01f84faae436b77ed7dc1120 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Sat, 26 Aug 2023 11:05:14 -0400
Subject: [PATCH 1367/1519] Address PR feedback

* Don't clear out all sessions when disconnecting one alias
* Add missing session kwargs
* Fix `upserts` typo
---
 mongoengine/connection.py      | 2 --
 mongoengine/pymongo_support.py | 2 +-
 tests/test_connection.py       | 8 --------
 tests/test_context_managers.py | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 378c6c853..292c41235 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -284,8 +284,6 @@ def disconnect(alias=DEFAULT_CONNECTION_NAME):
     if alias in _connection_settings:
         del _connection_settings[alias]
 
-    _local_sessions.clear_all()
-
 
 def disconnect_all():
     """Close all registered database."""
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index b19c6228b..807992a8e 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -75,7 +75,7 @@ def list_collection_names(db, include_system_collections=False):
     if PYMONGO_VERSION >= (3, 7):
         collections = db.list_collection_names(session=connection._get_session())
     else:
-        collections = db.collection_names()
+        collections = db.collection_names(session=connection._get_session())
 
     if not include_system_collections:
         collections = [c for c in collections if not c.startswith("system.")]
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 14189801f..49d5f553f 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -24,7 +24,6 @@
 from mongoengine.connection import (
     DEFAULT_DATABASE_NAME,
     ConnectionFailure,
-    _local_sessions,
     disconnect,
     get_connection,
     get_db,
@@ -303,13 +302,6 @@ def test_disconnect_silently_pass_if_alias_does_not_exist(self):
         assert len(connections) == 0
         disconnect(alias="not_exist")
 
-    def test_disconnect_clears_out_any_outstanding_sessions(self):
-        _local_sessions.append("session1")
-        _local_sessions.append("session2")
-        assert len(_local_sessions.sessions) == 2
-        disconnect()
-        assert len(_local_sessions.sessions) == 0
-
     def test_disconnect_does_not_close_client_used_by_another_alias(self):
         client1 = connect(alias="disconnect_reused_client_test_1")
         client2 = connect(alias="disconnect_reused_client_test_2")
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 34ae565ee..b6d55630c 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -464,7 +464,7 @@ class B(Document):
         assert "b2" == B.objects.get(id=b_doc.id).name
 
     @requires_mongodb_gte_44
-    def test_collection_creation_via_upsersts_across_databases_in_transaction(self):
+    def test_collection_creation_via_upserts_across_databases_in_transaction(self):
         connect("mongoenginetest")
         connect("test2", "test2")
 

From 4a7d24ab23fbcf08beeabec308211a6f029e918f Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Sat, 26 Aug 2023 11:28:43 -0400
Subject: [PATCH 1368/1519] Add doc string for run_in_transaction context
 manager

Include warning about trying to run a transaction across different connections
---
 mongoengine/context_managers.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index dd65882e3..ff65e1274 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -304,6 +304,28 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
 def run_in_transaction(
     alias=DEFAULT_CONNECTION_NAME, session_kwargs=None, transaction_kwargs=None
 ):
+    """run_in_transaction context manager
+    Execute queries within the context in a database transaction.
+
+    Usage:
+
+    .. code-block:: python
+
+        class A(Document):
+            name = StringField()
+
+        with run_in_transaction():
+            a_doc = A.objects.create(name="a")
+            a_doc.update(name="b")
+
+    Be aware that:
+    - Mongo transactions run inside a session which is bound to a connection. If you attempt to
+      execute a transaction across a different connection alias, pymongo will raise an exception. In
+      other words: you cannot create a transaction that crosses different database connections. That
+      said, multiple transaction can be nested within the same session for particular connection.
+
+    For more information regarding pymongo transactions: https://pymongo.readthedocs.io/en/stable/api/pymongo/client_session.html#transactions
+    """
     conn = get_connection(alias)
     session_kwargs = session_kwargs or {}
     with conn.start_session(**session_kwargs) as session:

From e42f36d2067e47eea596aa83839395696916bd30 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Thu, 21 Sep 2023 13:48:27 +0300
Subject: [PATCH 1369/1519] array_filters

---
 docs/changelog.rst              |  1 +
 docs/guide/querying.rst         | 18 ++++++++++
 mongoengine/queryset/base.py    |  6 +++-
 tests/queryset/test_queryset.py | 60 +++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a11745e5a..8b8a1b404 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Fix for uuidRepresentation not read when provided in URI #2741
+- Add option to user array_filters https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered/
 
 Changes in 0.27.0
 =================
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index b9afb60e1..194e2a676 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -252,6 +252,24 @@ and provide the pipeline as a list
 
 .. versionadded:: 0.23.2
 
+Update with Array Operator
+--------------------------------
+It is possible to update specific value in array by use array_filters (arrayFilters) operator.
+This is done by using ``__raw__`` keyword argument to the update method and provide the arrayFilters as a list.
+
+`Update with Array Operator <https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered->`_
+::
+
+    # 'tags' field == ['test1', 'test2', 'test3']
+    Page.objects().update(__raw__=
+                                  {'$set': {"tags.$[element]": 'test11111'}},
+                                  array_filters=[{"element": {'$eq': 'test2'}}],
+
+    # 'tags' field == ['test1', 'test11111', 'test3']
+
+    )
+
+
 Sorting/Ordering results
 ========================
 It is possible to order the results by 1 or more keys using :meth:`~mongoengine.queryset.QuerySet.order_by`.
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index d33e7b1e3..149c11b18 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -530,6 +530,7 @@ def update(
         write_concern=None,
         read_concern=None,
         full_result=False,
+        array_filters=None,
         **update,
     ):
         """Perform an atomic update on the fields matched by the query.
@@ -545,6 +546,7 @@ def update(
         :param read_concern: Override the read concern for the operation
         :param full_result: Return the associated ``pymongo.UpdateResult`` rather than just the number
             updated items
+        :param array_filters: A list of filters specifying which array elements an update should apply.
         :param update: Django-style update keyword arguments
 
         :returns the number of updated documents (unless ``full_result`` is True)
@@ -565,6 +567,8 @@ def update(
                 for u in update["__raw__"]
             ]
         else:
+            if 'array_filters' in update:
+                array_filters = update.pop('array_filters')
             update = transform.update(queryset._document, **update)
         # If doing an atomic upsert on an inheritable class
         # then ensure we add _cls to the update operation
@@ -580,7 +584,7 @@ def update(
                 update_func = collection.update_one
                 if multi:
                     update_func = collection.update_many
-                result = update_func(query, update, upsert=upsert)
+                result = update_func(query, update, upsert=upsert, array_filters=array_filters)
             if full_result:
                 return result
             elif result.raw_result:
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index d1cae3415..0854aacf5 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -591,6 +591,66 @@ class Blog(Document):
 
         Blog.drop_collection()
 
+    def test_update_array_filters(self):
+        """Ensure that updating by array_filters works.
+        """
+
+        class Comment(EmbeddedDocument):
+            comment_tags = ListField(StringField())
+
+        class Blog(Document):
+            tags = ListField(StringField())
+            comments = EmbeddedDocumentField(Comment)
+
+        Blog.drop_collection()
+
+        # update one
+        Blog.objects.create(tags=['test1', 'test2', 'test3'])
+
+        Blog.objects().update_one(__raw__=
+                                  {'$set': {"tags.$[element]": 'test11111'}},
+                                  array_filters=[{"element": {'$eq': 'test2'}}],
+                                  )
+        testc_blogs = Blog.objects(tags="test11111")
+
+        assert testc_blogs.count() == 1
+
+        Blog.drop_collection()
+
+        # update one inner list
+        comments = Comment(comment_tags=['test1', 'test2', 'test3'])
+        Blog.objects.create(comments=comments)
+
+        Blog.objects().update_one(__raw__=
+                                  {'$set': {"comments.comment_tags.$[element]": 'test11111'}},
+                                  array_filters=[{"element": {'$eq': 'test2'}}],
+                                  )
+        testc_blogs = Blog.objects(comments__comment_tags="test11111")
+
+        assert testc_blogs.count() == 1
+
+        # update many
+        Blog.drop_collection()
+
+        Blog.objects.create(tags=['test1', 'test2', 'test3', 'test_all'])
+        Blog.objects.create(tags=['test4', 'test5', 'test6', 'test_all'])
+
+        Blog.objects().update(__raw__=
+                              {'$set': {"tags.$[element]": 'test11111'}},
+                              array_filters=[{"element": {'$eq': 'test2'}}],
+                              )
+        testc_blogs = Blog.objects(tags="test11111")
+
+        assert testc_blogs.count() == 1
+
+        Blog.objects().update(__raw__=
+                              {'$set': {"tags.$[element]": 'test_all1234577'}},
+                              array_filters=[{"element": {'$eq': 'test_all'}}],
+                              )
+        testc_blogs = Blog.objects(tags="test_all1234577")
+
+        assert testc_blogs.count() == 2
+
     def test_update_using_positional_operator(self):
         """Ensure that the list fields can be updated using the positional
         operator."""

From a81bc51264987b37b37d8cfa35d23820e792c2e1 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Thu, 21 Sep 2023 13:50:56 +0300
Subject: [PATCH 1370/1519] pre commit

---
 mongoengine/queryset/base.py    |  8 +++---
 tests/queryset/test_queryset.py | 43 ++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 149c11b18..95bb2d6b9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -567,8 +567,8 @@ def update(
                 for u in update["__raw__"]
             ]
         else:
-            if 'array_filters' in update:
-                array_filters = update.pop('array_filters')
+            if "array_filters" in update:
+                array_filters = update.pop("array_filters")
             update = transform.update(queryset._document, **update)
         # If doing an atomic upsert on an inheritable class
         # then ensure we add _cls to the update operation
@@ -584,7 +584,9 @@ def update(
                 update_func = collection.update_one
                 if multi:
                     update_func = collection.update_many
-                result = update_func(query, update, upsert=upsert, array_filters=array_filters)
+                result = update_func(
+                    query, update, upsert=upsert, array_filters=array_filters
+                )
             if full_result:
                 return result
             elif result.raw_result:
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 0854aacf5..7a1649873 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -592,8 +592,7 @@ class Blog(Document):
         Blog.drop_collection()
 
     def test_update_array_filters(self):
-        """Ensure that updating by array_filters works.
-        """
+        """Ensure that updating by array_filters works."""
 
         class Comment(EmbeddedDocument):
             comment_tags = ListField(StringField())
@@ -605,12 +604,12 @@ class Blog(Document):
         Blog.drop_collection()
 
         # update one
-        Blog.objects.create(tags=['test1', 'test2', 'test3'])
+        Blog.objects.create(tags=["test1", "test2", "test3"])
 
-        Blog.objects().update_one(__raw__=
-                                  {'$set': {"tags.$[element]": 'test11111'}},
-                                  array_filters=[{"element": {'$eq': 'test2'}}],
-                                  )
+        Blog.objects().update_one(
+            __raw__={"$set": {"tags.$[element]": "test11111"}},
+            array_filters=[{"element": {"$eq": "test2"}}],
+        )
         testc_blogs = Blog.objects(tags="test11111")
 
         assert testc_blogs.count() == 1
@@ -618,13 +617,13 @@ class Blog(Document):
         Blog.drop_collection()
 
         # update one inner list
-        comments = Comment(comment_tags=['test1', 'test2', 'test3'])
+        comments = Comment(comment_tags=["test1", "test2", "test3"])
         Blog.objects.create(comments=comments)
 
-        Blog.objects().update_one(__raw__=
-                                  {'$set': {"comments.comment_tags.$[element]": 'test11111'}},
-                                  array_filters=[{"element": {'$eq': 'test2'}}],
-                                  )
+        Blog.objects().update_one(
+            __raw__={"$set": {"comments.comment_tags.$[element]": "test11111"}},
+            array_filters=[{"element": {"$eq": "test2"}}],
+        )
         testc_blogs = Blog.objects(comments__comment_tags="test11111")
 
         assert testc_blogs.count() == 1
@@ -632,21 +631,21 @@ class Blog(Document):
         # update many
         Blog.drop_collection()
 
-        Blog.objects.create(tags=['test1', 'test2', 'test3', 'test_all'])
-        Blog.objects.create(tags=['test4', 'test5', 'test6', 'test_all'])
+        Blog.objects.create(tags=["test1", "test2", "test3", "test_all"])
+        Blog.objects.create(tags=["test4", "test5", "test6", "test_all"])
 
-        Blog.objects().update(__raw__=
-                              {'$set': {"tags.$[element]": 'test11111'}},
-                              array_filters=[{"element": {'$eq': 'test2'}}],
-                              )
+        Blog.objects().update(
+            __raw__={"$set": {"tags.$[element]": "test11111"}},
+            array_filters=[{"element": {"$eq": "test2"}}],
+        )
         testc_blogs = Blog.objects(tags="test11111")
 
         assert testc_blogs.count() == 1
 
-        Blog.objects().update(__raw__=
-                              {'$set': {"tags.$[element]": 'test_all1234577'}},
-                              array_filters=[{"element": {'$eq': 'test_all'}}],
-                              )
+        Blog.objects().update(
+            __raw__={"$set": {"tags.$[element]": "test_all1234577"}},
+            array_filters=[{"element": {"$eq": "test_all"}}],
+        )
         testc_blogs = Blog.objects(tags="test_all1234577")
 
         assert testc_blogs.count() == 2

From ade16c6806c06129accbc8856419ac6d8c9a3a81 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 3 Oct 2023 13:43:36 +0200
Subject: [PATCH 1371/1519] upgrade pc hooks and fix new linters issue

---
 .pre-commit-config.yaml   | 6 +++---
 tests/test_dereference.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 98737e7c8..b5e342679 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,17 +8,17 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 23.1.0
+    rev: 23.9.1
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         additional_dependencies:
           - importlib_metadata<5
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.14.0
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
diff --git a/tests/test_dereference.py b/tests/test_dereference.py
index bddcc5432..224538312 100644
--- a/tests/test_dereference.py
+++ b/tests/test_dereference.py
@@ -1116,8 +1116,8 @@ class Baz(Document):
         foo.save()
         foo.reload()
 
-        assert type(foo.bar) == Bar
-        assert type(foo.baz) == Baz
+        assert isinstance(foo.bar, Bar)
+        assert isinstance(foo.baz, Baz)
 
     def test_document_reload_reference_integrity(self):
         """

From c8607d577d7534ce24a26f5a5836ef54186512bd Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Sat, 7 Oct 2023 18:24:48 +0300
Subject: [PATCH 1372/1519] Fix combination of __raw__ and mongoengine syntax

---
 docs/changelog.rst                |  1 +
 mongoengine/queryset/transform.py | 12 ++++++++--
 tests/queryset/test_queryset.py   | 40 +++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a11745e5a..76cc3fcb0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Fix for uuidRepresentation not read when provided in URI #2741
+- Fix combination of __raw__ and mongoengine syntax.
 
 Changes in 0.27.0
 =================
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index a95a84681..6a20e1e61 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -62,6 +62,14 @@
 )
 
 
+def handle_raw_query(value: dict, mongo_query: dict):
+    for op, v in value.items():
+        if op not in mongo_query:
+            mongo_query[op] = v
+        elif op in mongo_query and isinstance(mongo_query[op], dict):
+            mongo_query[op].update(v)
+
+
 # TODO make this less complex
 def query(_doc_cls=None, **kwargs):
     """Transform a query from Django-style format to Mongo format."""
@@ -69,7 +77,7 @@ def query(_doc_cls=None, **kwargs):
     merge_query = defaultdict(list)
     for key, value in sorted(kwargs.items()):
         if key == "__raw__":
-            mongo_query.update(value)
+            handle_raw_query(value, mongo_query)
             continue
 
         parts = key.rsplit("__")
@@ -234,7 +242,7 @@ def update(_doc_cls=None, **update):
 
     for key, value in update.items():
         if key == "__raw__":
-            mongo_update.update(value)
+            handle_raw_query(value, mongo_update)
             continue
 
         parts = key.split("__")
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index d1cae3415..711a52d58 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -2269,6 +2269,46 @@ class BlogPost(Document):
         post.reload()
         assert post.slug == "When test test it"
 
+    def test_combination_of_mongoengine_and__raw__(self):
+        """Ensure that the '__raw__' update/query works in combination with mongoengine syntax correctly."""
+
+        class BlogPost(Document):
+            slug = StringField()
+            foo = StringField()
+            tags = ListField(StringField())
+
+        BlogPost.drop_collection()
+
+        post = BlogPost(slug="test", foo="bar")
+        post.save()
+
+        BlogPost.objects(slug="test").update(
+            foo="baz",
+            __raw__={"$set": {"slug": "test test"}},
+        )
+        post.reload()
+        assert post.slug == "test test"
+        assert post.foo == "baz"
+
+        assert BlogPost.objects(foo="baz", __raw__={"slug": "test test"}).count() == 1
+        assert (
+            BlogPost.objects(foo__ne="bar", __raw__={"slug": {"$ne": "test"}}).count()
+            == 1
+        )
+        assert (
+            BlogPost.objects(foo="baz", __raw__={"slug": {"$ne": "test test"}}).count()
+            == 0
+        )
+        assert (
+            BlogPost.objects(foo__ne="baz", __raw__={"slug": "test test"}).count() == 0
+        )
+        assert (
+            BlogPost.objects(
+                foo__ne="baz", __raw__={"slug": {"$ne": "test test"}}
+            ).count()
+            == 0
+        )
+
     def test_add_to_set_each(self):
         class Item(Document):
             name = StringField(required=True)

From 882f1e342cbb27e041480c3d1dfae66872f349e3 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Sat, 4 Nov 2023 11:49:49 -0400
Subject: [PATCH 1373/1519] Abstract `with_transaction` as opposed to
 `start_transaction`

---
 mongoengine/context_managers.py |  56 +++++++++--
 tests/test_context_managers.py  | 173 +++++++++++++++++++++-----------
 2 files changed, 163 insertions(+), 66 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index dd65882e3..f6c539fba 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -12,7 +12,11 @@
     get_connection,
     get_db,
 )
-from mongoengine.pymongo_support import count_documents
+from mongoengine.errors import OperationError
+from mongoengine.pymongo_support import (
+    PYMONGO_VERSION,
+    count_documents,
+)
 
 __all__ = (
     "switch_db",
@@ -302,15 +306,51 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
 
 @contextmanager
 def run_in_transaction(
-    alias=DEFAULT_CONNECTION_NAME, session_kwargs=None, transaction_kwargs=None
+    callback,
+    alias=DEFAULT_CONNECTION_NAME,
+    session_kwargs=None,
+    transaction_kwargs=None,
 ):
+    """run_in_transaction context manager
+    Execute queries within a MongoDB transaction.
+
+    Usage:
+
+    .. code-block:: python
+
+        class A(Document):
+            name = StringField()
+
+        def callback(session):
+            a_doc = A.objects.create(name="a")
+            a_doc.update(name="b")
+        run_in_transaction(callback)
+
+        # With custom args/kwargs
+        def callback(session, custom_arg, customer_kwarg=None):
+            a_doc.update(name=f'{custom_arg}-{custom_kwarg}')
+        run_in_transaction(
+            lambda s: callback(s, 'arg', custom_kwarg='kwarg')
+        )
+
+    Be aware that:
+    - Mongo transactions run inside a session which is bound to a connection. If you attempt to
+      execute a transaction across a different connection alias, pymongo will raise an exception. In
+      other words: you cannot create a transaction that crosses different database connections.
+
+    For more information regarding pymongo transactions: https://pymongo.readthedocs.io/en/stable/api/pymongo/client_session.html#transactions
+    """
+
+    if PYMONGO_VERSION < (3, 9):
+        raise OperationError("pymongo>=3.9 is required to use transactions")
+
     conn = get_connection(alias)
     session_kwargs = session_kwargs or {}
     with conn.start_session(**session_kwargs) as session:
         transaction_kwargs = transaction_kwargs or {}
-        with session.start_transaction(**transaction_kwargs):
-            try:
-                _set_session(session)
-                yield
-            finally:
-                _clear_session()
+        transaction_kwargs["callback"] = callback
+        _set_session(session)
+        try:
+            session.with_transaction(**transaction_kwargs)
+        finally:
+            _clear_session()
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index b6d55630c..74a636406 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -3,7 +3,6 @@
 import time
 import unittest
 
-import pymongo
 import pytest
 
 from mongoengine import *
@@ -18,7 +17,10 @@
     switch_collection,
     switch_db,
 )
-from mongoengine.pymongo_support import count_documents
+from mongoengine.pymongo_support import (
+    PYMONGO_VERSION,
+    count_documents,
+)
 
 from .utils import requires_mongodb_gte_40, requires_mongodb_gte_44
 
@@ -423,8 +425,20 @@ def test_query_counter_ignores_particular_queries(self):
             )  # queries on db.system.indexes are ignored as well
             assert q == 1
 
+    def test_transaction_usage_raises_exception_when_using_pymong_lt_39(self):
+        if PYMONGO_VERSION < (3, 9):
+            with pytest.raises(errors.OperationError):
+
+                def cb(session):
+                    pass
+
+                run_in_transaction(cb)
+
     @requires_mongodb_gte_40
     def test_updating_a_document_within_a_transaction(self):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
         connect("mongoenginetest")
 
         class A(Document):
@@ -434,12 +448,36 @@ class A(Document):
 
         a_doc = A.objects.create(name="a")
 
-        with run_in_transaction():
+        def cb(session):
             a_doc.update(name="b")
-            assert "b" == A.objects.get(id=a_doc.id).name
+
+        run_in_transaction(cb)
+        assert "b" == A.objects.get(id=a_doc.id).name
+
+    def test_update_a_document_within_a_transaction_with_custom_args(self):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        def cb(session, custom_arg, custom_kwarg=""):
+            a_doc.update(name=f"{custom_arg}-{custom_kwarg}")
+
+        run_in_transaction(lambda s: cb(s, "a", custom_kwarg="b"))
+        assert "a-b" == A.objects.get(id=a_doc.id).name
 
     @requires_mongodb_gte_40
     def test_transaction_updates_across_databases(self):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
         connect("mongoenginetest")
         connect("test2", "test2")
 
@@ -456,15 +494,20 @@ class B(Document):
         B.objects.all().delete()
         b_doc = B.objects.create(name="b")
 
-        with run_in_transaction():
+        def cb(session):
             a_doc.update(name="a2")
             b_doc.update(name="b2")
 
+        run_in_transaction(cb)
+
         assert "a2" == A.objects.get(id=a_doc.id).name
         assert "b2" == B.objects.get(id=b_doc.id).name
 
     @requires_mongodb_gte_44
     def test_collection_creation_via_upserts_across_databases_in_transaction(self):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
         connect("mongoenginetest")
         connect("test2", "test2")
 
@@ -483,13 +526,15 @@ class B(Document):
 
         b_doc = B.objects.create(name="b")
 
-        with run_in_transaction():
+        def cb(session):
             a_doc.update(name="a3")
             with switch_db(A, "test2"):
                 a_doc.update(name="a4", upsert=True)
                 b_doc.update(name="b3")
             b_doc.update(name="b4")
 
+        run_in_transaction(cb)
+
         assert "a3" == A.objects.get(id=a_doc.id).name
         assert "b4" == B.objects.get(id=b_doc.id).name
         with switch_db(A, "test2"):
@@ -499,6 +544,9 @@ class B(Document):
     def test_an_exception_raised_in_transactions_across_databases_rolls_back_updates(
         self,
     ):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
         connect("mongoenginetest")
         connect("test2", "test2")
 
@@ -519,14 +567,16 @@ class B(Document):
 
         b_doc = B.objects.create(name="b")
 
+        def cb(session):
+            a_doc.update(name="a3")
+            with switch_db(A, "test2"):
+                a_doc.update(name="a4", upsert=True)
+                b_doc.update(name="b3")
+                b_doc.update(name="b4")
+            raise Exception
+
         try:
-            with run_in_transaction():
-                a_doc.update(name="a3")
-                with switch_db(A, "test2"):
-                    a_doc.update(name="a4", upsert=True)
-                    b_doc.update(name="b3")
-                    b_doc.update(name="b4")
-                raise Exception
+            run_in_transaction(cb)
         except Exception:
             pass
 
@@ -537,6 +587,11 @@ class B(Document):
 
     @requires_mongodb_gte_40
     def test_exception_in_child_of_a_nested_transaction_rolls_parent_back(self):
+        # NOTE: callbacks initiating new transactions goes against pymongo recommended usage!
+        # This is simply a sanity check and should not be considered suggested usage.
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
         connect("mongoenginetest")
 
         class A(Document):
@@ -551,12 +606,17 @@ class B(Document):
         B.drop_collection()
         b_doc = B.objects.create(name="b")
 
+        def cb1(s1):
+            a_doc.update(name="trx-parent")
+
+            def cb2(s2):
+                b_doc.update(name="trx-child")
+                raise Exception
+
+            run_in_transaction(cb2)
+
         try:
-            with run_in_transaction():
-                a_doc.update(name="trx-parent")
-                with run_in_transaction():
-                    b_doc.update(name="trx-child")
-                    raise Exception
+            run_in_transaction(cb1)
         except Exception:
             pass
 
@@ -567,6 +627,11 @@ class B(Document):
     def test_exception_in_parent_of_nested_transaction_after_child_completed_only_rolls_parent_back(
         self,
     ):
+        # NOTE: callbacks initiating new transactions goes against pymongo recommended usage!
+        # This is simply a sanity check and should not be considered suggested usage.
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
         connect("mongoenginetest")
 
         class A(Document):
@@ -584,40 +649,41 @@ class B(Document):
         class TestExc(Exception):
             pass
 
-        def run_tx():
-            try:
-                with run_in_transaction():
-                    a_doc.update(name="trx-parent")
-                    with run_in_transaction():
-                        b_doc.update(name="trx-child")
-                    raise TestExc
-            except TestExc:
-                pass
-            except OperationError as op_failure:
-                """
-                See thread safety test below for more details about TransientTransctionError handling
-                """
-                if "TransientTransactionError" in str(op_failure):
-                    run_tx()
-                else:
-                    raise op_failure
+        def cb1(s1):
+            a_doc.update(name="trx-parent")
+
+            def cb2(s2):
+                b_doc.update(name="trx-child")
+
+            run_in_transaction(cb2)
+            raise TestExc
+
+        try:
+            run_in_transaction(cb1)
+        except TestExc:
+            pass
 
-        run_tx()
         assert "a" == A.objects.get(id=a_doc.id).name
         assert "trx-child" == B.objects.get(id=b_doc.id).name
 
     @requires_mongodb_gte_40
     def test_nested_transactions_create_and_release_sessions_accordingly(self):
+        # NOTE: callbacks initiating new transactions goes against pymongo recommended usage!
+        # This is simply a sanity check and should not be considered suggested usage.
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
         connect("mongoenginetest")
-        with run_in_transaction():
-            s1 = _get_session()
-            with run_in_transaction():
-                s2 = _get_session()
+
+        def cb1(s1):
+            def cb2(s2):
                 assert s1 != s2
-                with run_in_transaction():
-                    pass
                 assert s2 == _get_session()
+
+            run_in_transaction(cb2)
             assert s1 == _get_session()
+
+        run_in_transaction(cb1)
         assert _get_session() is None
 
     @requires_mongodb_gte_40
@@ -643,6 +709,9 @@ def test_thread_safety_of_transactions(self):
 
         0 + 10 + 2 + 30 + 4 + 50 + 6 + 70 + 8 + 90 = 270
         """
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
         connect("mongoenginetest")
 
         class A(Document):
@@ -658,7 +727,8 @@ def thread_fn(idx):
             # Open the transaction at some unknown interval
             time.sleep(random.uniform(0.01, 0.1))
             try:
-                with run_in_transaction():
+
+                def cb(session):
                     a = A.objects.get(i=idx)
                     a.i = idx * 10
                     # Save at some unknown interval
@@ -668,23 +738,10 @@ def thread_fn(idx):
                     # Force roll backs for the even runs...
                     if idx % 2 == 0:
                         raise TestExc
+
+                run_in_transaction(cb)
             except TestExc:
                 pass
-            except pymongo.errors.OperationFailure as op_failure:
-                """
-                If there's a TransientTransactionError, retry - the lock could not be acquired.
-
-                Per MongoDB docs: The core transaction API does not incorporate retry logic for
-                "TransientTransactionError". To handle "TransientTransactionError", applications
-                should explicitly incorporate retry logic for the error.
-
-                See: https://www.mongodb.com/docs/manual/core/transactions-in-applications/#-transienttransactionerror-
-                """
-                error_labels = op_failure.details.get("errorLabels", [])
-                if "TransientTransactionError" in error_labels:
-                    thread_fn(idx)
-                else:
-                    raise op_failure
 
         for r in range(10):
             """

From 68e2d94d7d490a2eb569bbebb443896ae413f1b2 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Sat, 4 Nov 2023 11:54:09 -0400
Subject: [PATCH 1374/1519] Wrap transaction test wtih gte_40 decorator

---
 tests/test_context_managers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 74a636406..8b561db40 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -454,6 +454,7 @@ def cb(session):
         run_in_transaction(cb)
         assert "b" == A.objects.get(id=a_doc.id).name
 
+    @requires_mongodb_gte_40
     def test_update_a_document_within_a_transaction_with_custom_args(self):
         if PYMONGO_VERSION < (3, 9):
             pytest.skip("pymongo>=3.9 is required to use transactions")

From de951dc4fc7fab239c052096c5638605715b4cb3 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Sat, 4 Nov 2023 12:24:30 -0400
Subject: [PATCH 1375/1519] Remove tests related to nested transactions

pymongo documentation explicitly states the callback of `with_transaction`
should not start new transactions
---
 mongoengine/context_managers.py |  1 -
 tests/test_context_managers.py  | 81 ---------------------------------
 2 files changed, 82 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index f6c539fba..b619dc611 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -304,7 +304,6 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
     )
 
 
-@contextmanager
 def run_in_transaction(
     callback,
     alias=DEFAULT_CONNECTION_NAME,
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 8b561db40..35895f6df 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -586,87 +586,6 @@ def cb(session):
         with switch_db(A, "test2"):
             assert 0 == A.objects.all().count()
 
-    @requires_mongodb_gte_40
-    def test_exception_in_child_of_a_nested_transaction_rolls_parent_back(self):
-        # NOTE: callbacks initiating new transactions goes against pymongo recommended usage!
-        # This is simply a sanity check and should not be considered suggested usage.
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-        a_doc = A.objects.create(name="a")
-
-        class B(Document):
-            name = StringField()
-
-        B.drop_collection()
-        b_doc = B.objects.create(name="b")
-
-        def cb1(s1):
-            a_doc.update(name="trx-parent")
-
-            def cb2(s2):
-                b_doc.update(name="trx-child")
-                raise Exception
-
-            run_in_transaction(cb2)
-
-        try:
-            run_in_transaction(cb1)
-        except Exception:
-            pass
-
-        assert "a" == A.objects.get(id=a_doc.id).name
-        assert "b" == B.objects.get(id=b_doc.id).name
-
-    @requires_mongodb_gte_40
-    def test_exception_in_parent_of_nested_transaction_after_child_completed_only_rolls_parent_back(
-        self,
-    ):
-        # NOTE: callbacks initiating new transactions goes against pymongo recommended usage!
-        # This is simply a sanity check and should not be considered suggested usage.
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-        a_doc = A.objects.create(name="a")
-
-        class B(Document):
-            name = StringField()
-
-        B.drop_collection()
-        b_doc = B.objects.create(name="b")
-
-        class TestExc(Exception):
-            pass
-
-        def cb1(s1):
-            a_doc.update(name="trx-parent")
-
-            def cb2(s2):
-                b_doc.update(name="trx-child")
-
-            run_in_transaction(cb2)
-            raise TestExc
-
-        try:
-            run_in_transaction(cb1)
-        except TestExc:
-            pass
-
-        assert "a" == A.objects.get(id=a_doc.id).name
-        assert "trx-child" == B.objects.get(id=b_doc.id).name
-
     @requires_mongodb_gte_40
     def test_nested_transactions_create_and_release_sessions_accordingly(self):
         # NOTE: callbacks initiating new transactions goes against pymongo recommended usage!

From 13cc855066cddde2fb289224dd2e4e9f7270dc9b Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Sat, 4 Nov 2023 13:03:48 -0400
Subject: [PATCH 1376/1519] Move `run_in_transaction` and related tests

It's not a context manager anymore!
---
 mongoengine/connection.py       |  54 ++++++
 mongoengine/context_managers.py |  61 +------
 tests/test_connection.py        | 287 ++++++++++++++++++++++++++++++++
 tests/test_context_managers.py  | 284 +------------------------------
 4 files changed, 344 insertions(+), 342 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 292c41235..60591bcf7 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -28,6 +28,7 @@
     "get_connection",
     "get_db",
     "register_connection",
+    "run_in_transaction",
 ]
 
 
@@ -500,3 +501,56 @@ def _get_session():
 
 def _clear_session():
     return _local_sessions.clear_current()
+
+
+def run_in_transaction(
+    callback,
+    alias=DEFAULT_CONNECTION_NAME,
+    session_kwargs=None,
+    transaction_kwargs=None,
+):
+    """run_in_transaction context manager
+    Execute queries within a MongoDB transaction.
+
+    Usage:
+
+    .. code-block:: python
+
+        class A(Document):
+            name = StringField()
+
+        def callback(session):
+            a_doc = A.objects.create(name="a")
+            a_doc.update(name="b")
+        run_in_transaction(callback)
+
+        # With custom args/kwargs
+        def callback(session, custom_arg, customer_kwarg=None):
+            a_doc.update(name=f'{custom_arg}-{custom_kwarg}')
+        run_in_transaction(
+            lambda s: callback(s, 'arg', custom_kwarg='kwarg')
+        )
+
+    Be aware that:
+    - Mongo transactions run inside a session which is bound to a connection. If you attempt to
+      execute a transaction across a different connection alias, pymongo will raise an exception. In
+      other words: you cannot create a transaction that crosses different database connections.
+
+    For more information regarding pymongo transactions: https://pymongo.readthedocs.io/en/stable/api/pymongo/client_session.html#transactions
+    """
+
+    if PYMONGO_VERSION < (3, 9):
+        raise mongoengine.errors.OperationError(
+            "pymongo>=3.9 is required to use transactions"
+        )
+
+    conn = get_connection(alias)
+    session_kwargs = session_kwargs or {}
+    with conn.start_session(**session_kwargs) as session:
+        transaction_kwargs = transaction_kwargs or {}
+        transaction_kwargs["callback"] = callback
+        _set_session(session)
+        try:
+            session.with_transaction(**transaction_kwargs)
+        finally:
+            _clear_session()
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index b619dc611..a4aee66d7 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -6,17 +6,10 @@
 from mongoengine.common import _import_class
 from mongoengine.connection import (
     DEFAULT_CONNECTION_NAME,
-    _clear_session,
     _get_session,
-    _set_session,
-    get_connection,
     get_db,
 )
-from mongoengine.errors import OperationError
-from mongoengine.pymongo_support import (
-    PYMONGO_VERSION,
-    count_documents,
-)
+from mongoengine.pymongo_support import count_documents
 
 __all__ = (
     "switch_db",
@@ -24,7 +17,6 @@
     "no_dereference",
     "no_sub_classes",
     "query_counter",
-    "run_in_transaction",
     "set_write_concern",
     "set_read_write_concern",
 )
@@ -302,54 +294,3 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
         write_concern=WriteConcern(**combined_write_concerns),
         read_concern=ReadConcern(**combined_read_concerns),
     )
-
-
-def run_in_transaction(
-    callback,
-    alias=DEFAULT_CONNECTION_NAME,
-    session_kwargs=None,
-    transaction_kwargs=None,
-):
-    """run_in_transaction context manager
-    Execute queries within a MongoDB transaction.
-
-    Usage:
-
-    .. code-block:: python
-
-        class A(Document):
-            name = StringField()
-
-        def callback(session):
-            a_doc = A.objects.create(name="a")
-            a_doc.update(name="b")
-        run_in_transaction(callback)
-
-        # With custom args/kwargs
-        def callback(session, custom_arg, customer_kwarg=None):
-            a_doc.update(name=f'{custom_arg}-{custom_kwarg}')
-        run_in_transaction(
-            lambda s: callback(s, 'arg', custom_kwarg='kwarg')
-        )
-
-    Be aware that:
-    - Mongo transactions run inside a session which is bound to a connection. If you attempt to
-      execute a transaction across a different connection alias, pymongo will raise an exception. In
-      other words: you cannot create a transaction that crosses different database connections.
-
-    For more information regarding pymongo transactions: https://pymongo.readthedocs.io/en/stable/api/pymongo/client_session.html#transactions
-    """
-
-    if PYMONGO_VERSION < (3, 9):
-        raise OperationError("pymongo>=3.9 is required to use transactions")
-
-    conn = get_connection(alias)
-    session_kwargs = session_kwargs or {}
-    with conn.start_session(**session_kwargs) as session:
-        transaction_kwargs = transaction_kwargs or {}
-        transaction_kwargs["callback"] = callback
-        _set_session(session)
-        try:
-            session.with_transaction(**transaction_kwargs)
-        finally:
-            _clear_session()
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 49d5f553f..ef5f6e30b 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,4 +1,7 @@
 import datetime
+import random
+import threading
+import time
 import unittest
 import uuid
 
@@ -16,20 +19,31 @@
 from mongoengine import (
     DateTimeField,
     Document,
+    IntField,
     StringField,
     connect,
     disconnect_all,
     register_connection,
+    run_in_transaction,
 )
 from mongoengine.connection import (
     DEFAULT_DATABASE_NAME,
     ConnectionFailure,
+    _get_session,
     disconnect,
     get_connection,
     get_db,
 )
+from mongoengine.context_managers import switch_db
+from mongoengine.errors import OperationError
 from mongoengine.pymongo_support import PYMONGO_VERSION
 
+from .utils import (
+    MongoDBTestCase,
+    requires_mongodb_gte_40,
+    requires_mongodb_gte_44,
+)
+
 
 def random_str():
     return str(uuid.uuid4())
@@ -682,6 +696,279 @@ def test_connect_uri_uuidrepresentation_default_to_pythonlegacy(self):
         )
         disconnect(rand)
 
+    def test_transaction_usage_raises_exception_when_using_pymong_lt_39(self):
+        if PYMONGO_VERSION < (3, 9):
+            with pytest.raises(OperationError):
+
+                def cb(session):
+                    pass
+
+                run_in_transaction(cb)
+
+
+class TransactionTest(MongoDBTestCase):
+    @requires_mongodb_gte_40
+    def test_updating_a_document_within_a_transaction(self):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        def cb(session):
+            a_doc.update(name="b")
+
+        run_in_transaction(cb)
+        assert "b" == A.objects.get(id=a_doc.id).name
+
+    @requires_mongodb_gte_40
+    def test_update_a_document_within_a_transaction_with_custom_args(self):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        def cb(session, custom_arg, custom_kwarg=""):
+            a_doc.update(name=f"{custom_arg}-{custom_kwarg}")
+
+        run_in_transaction(lambda s: cb(s, "a", custom_kwarg="b"))
+        assert "a-b" == A.objects.get(id=a_doc.id).name
+
+    @requires_mongodb_gte_40
+    def test_transaction_updates_across_databases(self):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
+        connect("mongoenginetest")
+        connect("test2", "test2")
+
+        class A(Document):
+            name = StringField()
+
+        A.objects.all().delete()
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            meta = {"db_alias": "test2"}
+            name = StringField()
+
+        B.objects.all().delete()
+        b_doc = B.objects.create(name="b")
+
+        def cb(session):
+            a_doc.update(name="a2")
+            b_doc.update(name="b2")
+
+        run_in_transaction(cb)
+
+        assert "a2" == A.objects.get(id=a_doc.id).name
+        assert "b2" == B.objects.get(id=b_doc.id).name
+
+    @requires_mongodb_gte_44
+    def test_collection_creation_via_upserts_across_databases_in_transaction(self):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
+        connect("mongoenginetest")
+        connect("test2", "test2")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            meta = {"db_alias": "test2"}
+            name = StringField()
+
+        B.drop_collection()
+
+        b_doc = B.objects.create(name="b")
+
+        def cb(session):
+            a_doc.update(name="a3")
+            with switch_db(A, "test2"):
+                a_doc.update(name="a4", upsert=True)
+                b_doc.update(name="b3")
+            b_doc.update(name="b4")
+
+        run_in_transaction(cb)
+
+        assert "a3" == A.objects.get(id=a_doc.id).name
+        assert "b4" == B.objects.get(id=b_doc.id).name
+        with switch_db(A, "test2"):
+            assert "a4" == A.objects.get(id=a_doc.id).name
+
+    @requires_mongodb_gte_40
+    def test_an_exception_raised_in_transactions_across_databases_rolls_back_updates(
+        self,
+    ):
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
+        connect("mongoenginetest")
+        connect("test2", "test2")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+        with switch_db(A, "test2"):
+            A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            meta = {"db_alias": "test2"}
+            name = StringField()
+
+        B.drop_collection()
+
+        b_doc = B.objects.create(name="b")
+
+        def cb(session):
+            a_doc.update(name="a3")
+            with switch_db(A, "test2"):
+                a_doc.update(name="a4", upsert=True)
+                b_doc.update(name="b3")
+                b_doc.update(name="b4")
+            raise Exception
+
+        try:
+            run_in_transaction(cb)
+        except Exception:
+            pass
+
+        assert "a" == A.objects.get(id=a_doc.id).name
+        assert "b" == B.objects.get(id=b_doc.id).name
+        with switch_db(A, "test2"):
+            assert 0 == A.objects.all().count()
+
+    @requires_mongodb_gte_40
+    def test_nested_transactions_create_and_release_sessions_accordingly(self):
+        # NOTE: callbacks initiating new transactions goes against pymongo recommended usage!
+        # This is simply a sanity check and should not be considered suggested usage.
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
+        connect("mongoenginetest")
+
+        def cb1(s1):
+            def cb2(s2):
+                assert s1 != s2
+                assert s2 == _get_session()
+
+            run_in_transaction(cb2)
+            assert s1 == _get_session()
+
+        run_in_transaction(cb1)
+        assert _get_session() is None
+
+    @requires_mongodb_gte_40
+    def test_thread_safety_of_transactions(self):
+        """
+        Make sure transactions don't step over each other. Each
+        session should be isolated to each thread. If this is the
+        case, then no amount of runtime variability should have
+        an effect on the output.
+
+        This test sets up 10 records, each with an integer field
+        of value 0 - 9.
+
+        We then spin up 10 threads and attempt to update a target
+        record by multiplying it's integer value by 10. Then, if
+        the target record is even, throw an exception, which
+        should then roll the transaction back. The odd rows always
+        succeed.
+
+        If the sessions are properly thread safe, we should ALWAYS
+        net out with the following sum across the integer fields
+        of the 10 records:
+
+        0 + 10 + 2 + 30 + 4 + 50 + 6 + 70 + 8 + 90 = 270
+        """
+        if PYMONGO_VERSION < (3, 9):
+            pytest.skip("pymongo>=3.9 is required to use transactions")
+
+        connect("mongoenginetest")
+
+        class A(Document):
+            i = IntField()
+
+        # Ensure the collection is created
+        A.objects.create(i=0)
+
+        class TestExc(Exception):
+            pass
+
+        def thread_fn(idx):
+            # Open the transaction at some unknown interval
+            time.sleep(random.uniform(0.01, 0.1))
+            try:
+
+                def cb(session):
+                    a = A.objects.get(i=idx)
+                    a.i = idx * 10
+                    # Save at some unknown interval
+                    time.sleep(random.uniform(0.01, 0.1))
+                    a.save()
+
+                    # Force roll backs for the even runs...
+                    if idx % 2 == 0:
+                        raise TestExc
+
+                run_in_transaction(cb)
+            except TestExc:
+                pass
+
+        for r in range(10):
+            """
+            Threads & randomization are tricky - run it multiple times
+            """
+
+            # Clear out the collection for a fresh run
+            A.objects.all().delete()
+
+            # Prepopulate the data for reads
+            thread_count = 10
+            for i in range(thread_count):
+                A.objects.create(i=i)
+
+            # Prime the threads
+            threads = [
+                threading.Thread(target=thread_fn, args=(i,))
+                for i in range(thread_count)
+            ]
+            for t in threads:
+                t.start()
+            for t in threads:
+                t.join()
+
+            # Check the sum
+            expected_sum = 0
+            for i in range(thread_count):
+                if i % 2 == 0:
+                    expected_sum += i
+                else:
+                    expected_sum += i * 10
+            assert expected_sum == 270
+            assert expected_sum == sum(a.i for a in A.objects.all())
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 35895f6df..f3ed29e0e 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -1,28 +1,19 @@
-import random
-import threading
-import time
 import unittest
 
 import pytest
 
 from mongoengine import *
-from mongoengine.connection import _get_session, get_db
+from mongoengine.connection import get_db
 from mongoengine.context_managers import (
     no_dereference,
     no_sub_classes,
     query_counter,
-    run_in_transaction,
     set_read_write_concern,
     set_write_concern,
     switch_collection,
     switch_db,
 )
-from mongoengine.pymongo_support import (
-    PYMONGO_VERSION,
-    count_documents,
-)
-
-from .utils import requires_mongodb_gte_40, requires_mongodb_gte_44
+from mongoengine.pymongo_support import count_documents
 
 
 class TestContextManagers:
@@ -425,277 +416,6 @@ def test_query_counter_ignores_particular_queries(self):
             )  # queries on db.system.indexes are ignored as well
             assert q == 1
 
-    def test_transaction_usage_raises_exception_when_using_pymong_lt_39(self):
-        if PYMONGO_VERSION < (3, 9):
-            with pytest.raises(errors.OperationError):
-
-                def cb(session):
-                    pass
-
-                run_in_transaction(cb)
-
-    @requires_mongodb_gte_40
-    def test_updating_a_document_within_a_transaction(self):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-
-        a_doc = A.objects.create(name="a")
-
-        def cb(session):
-            a_doc.update(name="b")
-
-        run_in_transaction(cb)
-        assert "b" == A.objects.get(id=a_doc.id).name
-
-    @requires_mongodb_gte_40
-    def test_update_a_document_within_a_transaction_with_custom_args(self):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-
-        a_doc = A.objects.create(name="a")
-
-        def cb(session, custom_arg, custom_kwarg=""):
-            a_doc.update(name=f"{custom_arg}-{custom_kwarg}")
-
-        run_in_transaction(lambda s: cb(s, "a", custom_kwarg="b"))
-        assert "a-b" == A.objects.get(id=a_doc.id).name
-
-    @requires_mongodb_gte_40
-    def test_transaction_updates_across_databases(self):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-        connect("test2", "test2")
-
-        class A(Document):
-            name = StringField()
-
-        A.objects.all().delete()
-        a_doc = A.objects.create(name="a")
-
-        class B(Document):
-            meta = {"db_alias": "test2"}
-            name = StringField()
-
-        B.objects.all().delete()
-        b_doc = B.objects.create(name="b")
-
-        def cb(session):
-            a_doc.update(name="a2")
-            b_doc.update(name="b2")
-
-        run_in_transaction(cb)
-
-        assert "a2" == A.objects.get(id=a_doc.id).name
-        assert "b2" == B.objects.get(id=b_doc.id).name
-
-    @requires_mongodb_gte_44
-    def test_collection_creation_via_upserts_across_databases_in_transaction(self):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-        connect("test2", "test2")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-
-        a_doc = A.objects.create(name="a")
-
-        class B(Document):
-            meta = {"db_alias": "test2"}
-            name = StringField()
-
-        B.drop_collection()
-
-        b_doc = B.objects.create(name="b")
-
-        def cb(session):
-            a_doc.update(name="a3")
-            with switch_db(A, "test2"):
-                a_doc.update(name="a4", upsert=True)
-                b_doc.update(name="b3")
-            b_doc.update(name="b4")
-
-        run_in_transaction(cb)
-
-        assert "a3" == A.objects.get(id=a_doc.id).name
-        assert "b4" == B.objects.get(id=b_doc.id).name
-        with switch_db(A, "test2"):
-            assert "a4" == A.objects.get(id=a_doc.id).name
-
-    @requires_mongodb_gte_40
-    def test_an_exception_raised_in_transactions_across_databases_rolls_back_updates(
-        self,
-    ):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-        connect("test2", "test2")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-        with switch_db(A, "test2"):
-            A.drop_collection()
-
-        a_doc = A.objects.create(name="a")
-
-        class B(Document):
-            meta = {"db_alias": "test2"}
-            name = StringField()
-
-        B.drop_collection()
-
-        b_doc = B.objects.create(name="b")
-
-        def cb(session):
-            a_doc.update(name="a3")
-            with switch_db(A, "test2"):
-                a_doc.update(name="a4", upsert=True)
-                b_doc.update(name="b3")
-                b_doc.update(name="b4")
-            raise Exception
-
-        try:
-            run_in_transaction(cb)
-        except Exception:
-            pass
-
-        assert "a" == A.objects.get(id=a_doc.id).name
-        assert "b" == B.objects.get(id=b_doc.id).name
-        with switch_db(A, "test2"):
-            assert 0 == A.objects.all().count()
-
-    @requires_mongodb_gte_40
-    def test_nested_transactions_create_and_release_sessions_accordingly(self):
-        # NOTE: callbacks initiating new transactions goes against pymongo recommended usage!
-        # This is simply a sanity check and should not be considered suggested usage.
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        def cb1(s1):
-            def cb2(s2):
-                assert s1 != s2
-                assert s2 == _get_session()
-
-            run_in_transaction(cb2)
-            assert s1 == _get_session()
-
-        run_in_transaction(cb1)
-        assert _get_session() is None
-
-    @requires_mongodb_gte_40
-    def test_thread_safety_of_transactions(self):
-        """
-        Make sure transactions don't step over each other. Each
-        session should be isolated to each thread. If this is the
-        case, then no amount of runtime variability should have
-        an effect on the output.
-
-        This test sets up 10 records, each with an integer field
-        of value 0 - 9.
-
-        We then spin up 10 threads and attempt to update a target
-        record by multiplying it's integer value by 10. Then, if
-        the target record is even, throw an exception, which
-        should then roll the transaction back. The odd rows always
-        succeed.
-
-        If the sessions are properly thread safe, we should ALWAYS
-        net out with the following sum across the integer fields
-        of the 10 records:
-
-        0 + 10 + 2 + 30 + 4 + 50 + 6 + 70 + 8 + 90 = 270
-        """
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        class A(Document):
-            i = IntField()
-
-        # Ensure the collection is created
-        A.objects.create(i=0)
-
-        class TestExc(Exception):
-            pass
-
-        def thread_fn(idx):
-            # Open the transaction at some unknown interval
-            time.sleep(random.uniform(0.01, 0.1))
-            try:
-
-                def cb(session):
-                    a = A.objects.get(i=idx)
-                    a.i = idx * 10
-                    # Save at some unknown interval
-                    time.sleep(random.uniform(0.01, 0.1))
-                    a.save()
-
-                    # Force roll backs for the even runs...
-                    if idx % 2 == 0:
-                        raise TestExc
-
-                run_in_transaction(cb)
-            except TestExc:
-                pass
-
-        for r in range(10):
-            """
-            Threads & randomization are tricky - run it multiple times
-            """
-
-            # Clear out the collection for a fresh run
-            A.objects.all().delete()
-
-            # Prepopulate the data for reads
-            thread_count = 10
-            for i in range(thread_count):
-                A.objects.create(i=i)
-
-            # Prime the threads
-            threads = [
-                threading.Thread(target=thread_fn, args=(i,))
-                for i in range(thread_count)
-            ]
-            for t in threads:
-                t.start()
-            for t in threads:
-                t.join()
-
-            # Check the sum
-            expected_sum = 0
-            for i in range(thread_count):
-                if i % 2 == 0:
-                    expected_sum += i
-                else:
-                    expected_sum += i * 10
-            assert expected_sum == 270
-            assert expected_sum == sum(a.i for a in A.objects.all())
-
 
 if __name__ == "__main__":
     unittest.main()

From 07292239880ae0e5e812f425220f5790b19ffbe6 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 8 Nov 2023 15:36:24 -0500
Subject: [PATCH 1377/1519] Simplify test_multiple_connection_settings
 assertion

---
 tests/test_connection.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index ef5f6e30b..54e17a44d 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -618,16 +618,7 @@ def test_read_preference_from_parse(self):
     def test_multiple_connection_settings(self):
         connect("mongoenginetest", alias="t1", host="localhost")
 
-        if PYMONGO_VERSION >= (4,):
-            """
-            pymongo>=4 changed how it handles connection addresses wrt replicaSets, which
-            is now how mongod is run for the test suites for transactions.
-            """
-            connect(
-                "mongoenginetest2", alias="t2", host="127.0.0.1", directConnection=True
-            )
-        else:
-            connect("mongoenginetest2", alias="t2", host="127.0.0.1")
+        connect("mongoenginetest2", alias="t2", host="127.0.0.1")
 
         mongo_connections = mongoengine.connection._connections
         assert len(mongo_connections.items()) == 2
@@ -639,8 +630,7 @@ def test_multiple_connection_settings(self):
         # Purposely not catching exception to fail test if thrown.
         mongo_connections["t1"].server_info()
         mongo_connections["t2"].server_info()
-        assert mongo_connections["t1"].address[0] == "localhost"
-        assert mongo_connections["t2"].address[0] == "127.0.0.1"
+        assert mongo_connections["t1"] is not mongo_connections["t2"]
 
     def test_connect_2_databases_uses_same_client_if_only_dbname_differs(self):
         c1 = connect(alias="testdb1", db="testdb1")

From 9ca4cdd0404053f338df4d22fb8e5d658e0af5df Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 8 Nov 2023 17:28:42 -0500
Subject: [PATCH 1378/1519] Clean up run_in_transaction doc string

Not a context mgr anymore
---
 mongoengine/connection.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 60591bcf7..b1c9bccf2 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -509,8 +509,7 @@ def run_in_transaction(
     session_kwargs=None,
     transaction_kwargs=None,
 ):
-    """run_in_transaction context manager
-    Execute queries within a MongoDB transaction.
+    """Execute queries within a MongoDB transaction.
 
     Usage:
 

From 4ba8bf24aeb42c854ec85378805ae471a5d5fd24 Mon Sep 17 00:00:00 2001
From: Evgenii Zheltonozhskii <zheltonozhskiy@gmail.com>
Date: Tue, 21 Nov 2023 10:59:49 +0200
Subject: [PATCH 1379/1519] Fix docstring formatting

---
 mongoengine/base/fields.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 85a10ff23..037e916ff 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -59,11 +59,11 @@ def __init__(
             unique with (Creates an index).
         :param primary_key: Mark this field as the primary key ((Creates an index)). Defaults to False.
         :param validation: (optional) A callable to validate the value of the
-            field.  The callable takes the value as parameter and should raise
+            field. The callable takes the value as parameter and should raise
             a ValidationError if validation fails
         :param choices: (optional) The valid choices
-        :param null: (optional) If the field value can be null when a default exist. If not set, the default value
-        will be used in case a field with a default value is set to None. Defaults to False.
+        :param null: (optional) If the field value can be null when a default exists. If not set, the default value
+            will be used in case a field with a default value is set to None. Defaults to False.
         :param sparse: (optional) `sparse=True` combined with `unique=True` and `required=False`
             means that uniqueness won't be enforced for `None` values (Creates an index). Defaults to False.
         :param **kwargs: (optional) Arbitrary indirection-free metadata for

From 34e28abaec58cdd412fb0d8c4409ea75b414b610 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Fri, 24 Nov 2023 16:01:44 +0100
Subject: [PATCH 1380/1519] Add mongodb 6.0 and 7.0 to the CI pipeline

---
 .github/workflows/github-actions.yml | 10 ++++++++++
 .github/workflows/install_mongo.sh   |  4 ++++
 README.rst                           |  2 +-
 docs/changelog.rst                   |  1 +
 tox.ini                              |  4 +++-
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index ce7f8a4a6..bed3ea878 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -17,6 +17,8 @@ env:
   MONGODB_4_0: 4.0.28
   MONGODB_4_4: 4.4
   MONGODB_5_0: "5.0"
+  MONGODB_6_0: "6.0"
+  MONGODB_7_0: "7.0"
 
   PYMONGO_3_4: 3.4
   PYMONGO_3_6: 3.6
@@ -25,6 +27,8 @@ env:
   PYMONGO_3_12: 3.12
   PYMONGO_4_0: 4.0
   PYMONGO_4_3: 4.3.2
+  PYMONGO_4_4: 4.4.1
+  PYMONGO_4_6: 4.6.0
 
   MAIN_PYTHON_VERSION: 3.7
 
@@ -68,6 +72,12 @@ jobs:
           - python-version: "3.11"
             MONGODB: $MONGODB_5_0
             PYMONGO: $PYMONGO_4_3
+          - python-version: "3.11"
+            MONGODB: $MONGODB_6_0
+            PYMONGO: $PYMONGO_4_4
+          - python-version: "3.11"
+            MONGODB: $MONGODB_7_0
+            PYMONGO: $PYMONGO_4_6
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
index bb7b58525..aece5f1e2 100644
--- a/.github/workflows/install_mongo.sh
+++ b/.github/workflows/install_mongo.sh
@@ -11,6 +11,10 @@ elif [[ "$MONGODB" == *"4.4"* ]]; then
   mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
 elif [[ "$MONGODB" == *"5.0"* ]]; then
   mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
+elif [[ "$MONGODB" == *"6.0"* ]]; then
+  mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
+elif [[ "$MONGODB" == *"7.0"* ]]; then
+  mongo_build=mongodb-linux-x86_64-ubuntu2004-v${MONGODB}-latest
 fi
 
 wget http://fastdl.mongodb.org/linux/$mongo_build.tgz
diff --git a/README.rst b/README.rst
index 39497fb37..64e43b6bc 100644
--- a/README.rst
+++ b/README.rst
@@ -31,7 +31,7 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.4 and v5.0. Future versions
+MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.4, v5.0, v6.0 and v7.0. Future versions
 should be supported as well, but aren't actively tested at the moment. Make
 sure to open an issue or submit a pull request if you experience any problems
 with a more recent MongoDB versions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a11745e5a..a2ccb43ce 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Fix for uuidRepresentation not read when provided in URI #2741
+- Add tests against MongoDB 6.0 and MongoDB 7.0 in the pipeline
 
 Changes in 0.27.0
 =================
diff --git a/tox.ini b/tox.ini
index 553c49763..1608ebd17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4}
+envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4,mg432,mg441,mg460}
 
 [testenv]
 commands =
@@ -12,5 +12,7 @@ deps =
     mg312: pymongo>=3.12,<3.13
     mg4: pymongo>=4.0,<4.1
     mg432: pymongo>=4.3,<4.4
+    mg441: pymongo>=4.4,<4.5
+    mg460: pymongo>=4.6,<4.7
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From f93271b33886ab295feff26e7fbcad16ddeb8225 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Fri, 24 Nov 2023 16:44:33 +0100
Subject: [PATCH 1381/1519] Fix test indexes for MongoDB v6.0+

---
 mongoengine/mongodb_support.py |  3 +++
 tests/document/test_indexes.py | 36 ++++++++++++++++++++++++----------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index 00b87f419..23c538d02 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -9,6 +9,9 @@
 MONGODB_36 = (3, 6)
 MONGODB_42 = (4, 2)
 MONGODB_44 = (4, 4)
+MONGODB_50 = (5, 0)
+MONGODB_60 = (6, 0)
+MONGODB_70 = (7, 0)
 
 
 def get_mongodb_version():
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index f367cd0f9..ea7602514 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -9,6 +9,7 @@
 from mongoengine.connection import get_db
 from mongoengine.mongodb_support import (
     MONGODB_42,
+    MONGODB_70,
     get_mongodb_version,
 )
 from mongoengine.pymongo_support import PYMONGO_VERSION
@@ -466,15 +467,26 @@ class Test(Document):
             == "IDHACK"
         )
 
-        query_plan = Test.objects(a=1).only("a").exclude("id").explain()
-        assert (
-            query_plan.get("queryPlanner")
-            .get("winningPlan")
-            .get("inputStage")
-            .get("stage")
-            == "IXSCAN"
-        )
         mongo_db = get_mongodb_version()
+        query_plan = Test.objects(a=1).only("a").exclude("id").explain()
+        if mongo_db < MONGODB_70:
+            assert (
+                query_plan.get("queryPlanner")
+                .get("winningPlan")
+                .get("inputStage")
+                .get("stage")
+                == "IXSCAN"
+            )
+        elif:
+            assert (
+                query_plan.get("queryPlanner")
+                .get("winningPlan")
+                .get("queryPlan")
+                .get("inputStage")
+                .get("stage")
+                == "IXSCAN"
+            )
+
         PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
         assert (
             query_plan.get("queryPlanner").get("winningPlan").get("stage")
@@ -536,8 +548,12 @@ class BlogPost(Document):
             BlogPost.objects.hint("Bad Name").count()
 
         # Invalid shape argument (missing list brackets) should fail.
-        with pytest.raises(ValueError):
-            BlogPost.objects.hint(("tags", 1)).count()
+        if PYMONGO_VERSION <= (4, 3):
+            with pytest.raises(ValueError):
+                BlogPost.objects.hint(("tags", 1)).count()
+        else:
+            with pytest.raises(TypeError):
+                BlogPost.objects.hint(("tags", 1)).count()
 
     def test_collation(self):
         base = {"locale": "en", "strength": 2}

From 9e5e0d394c4c994e2f0143717f01e5e40fccb551 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Fri, 24 Nov 2023 16:46:00 +0100
Subject: [PATCH 1382/1519] fix typo

---
 tests/document/test_indexes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index ea7602514..67702d7b2 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -477,7 +477,7 @@ class Test(Document):
                 .get("stage")
                 == "IXSCAN"
             )
-        elif:
+        else:
             assert (
                 query_plan.get("queryPlanner")
                 .get("winningPlan")

From 9b41316d7a9088ea192ff20760684aea363fdaaf Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Fri, 24 Nov 2023 16:51:51 +0100
Subject: [PATCH 1383/1519] Fix projection in MongoDB 7.0

---
 tests/document/test_indexes.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 67702d7b2..78f3257ca 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -488,10 +488,16 @@ class Test(Document):
             )
 
         PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
-        assert (
-            query_plan.get("queryPlanner").get("winningPlan").get("stage")
-            == PROJECTION_STR
-        )
+        if mongo_db < MONGODB_70:
+            assert (
+                query_plan.get("queryPlanner").get("winningPlan").get("stage")
+                == PROJECTION_STR
+            )
+        else:
+            assert (
+                query_plan.get("queryPlanner").get("winningPlan").get("queryPlan").get("stage")
+                == PROJECTION_STR
+            )
 
         query_plan = Test.objects(a=1).explain()
         assert (

From f1a73029435c6a5603c255cebdbdf653f888245e Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Fri, 24 Nov 2023 17:01:48 +0100
Subject: [PATCH 1384/1519] Fix asserts for test_covered_index

---
 tests/document/test_indexes.py | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 78f3257ca..8b101ce0f 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -500,14 +500,28 @@ class Test(Document):
             )
 
         query_plan = Test.objects(a=1).explain()
-        assert (
-            query_plan.get("queryPlanner")
-            .get("winningPlan")
-            .get("inputStage")
-            .get("stage")
-            == "IXSCAN"
-        )
-        assert query_plan.get("queryPlanner").get("winningPlan").get("stage") == "FETCH"
+        if mongo_db < MONGODB_70:
+            assert (
+                query_plan.get("queryPlanner")
+                .get("winningPlan")
+                .get("queryPlan")
+                .get("inputStage")
+                .get("stage")
+                == "IXSCAN"
+            )
+        else:
+            assert (
+                query_plan.get("queryPlanner")
+                .get("winningPlan")
+                .get("inputStage")
+                .get("stage")
+                == "IXSCAN"
+            )
+
+        if mongo_db < MONGODB_70:
+            assert query_plan.get("queryPlanner").get("winningPlan").get("stage") == "FETCH"
+        else:
+            assert query_plan.get("queryPlanner").get("winningPlan").get("queryPlan").get("stage") == "FETCH"
 
     def test_index_on_id(self):
         class BlogPost(Document):

From e75b68a01741d1ef1db441efe30914ee6a0ea3e3 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Fri, 24 Nov 2023 17:02:34 +0100
Subject: [PATCH 1385/1519] fmt

---
 tests/document/test_indexes.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 8b101ce0f..812d4e1d4 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -495,7 +495,10 @@ class Test(Document):
             )
         else:
             assert (
-                query_plan.get("queryPlanner").get("winningPlan").get("queryPlan").get("stage")
+                query_plan.get("queryPlanner")
+                .get("winningPlan")
+                .get("queryPlan")
+                .get("stage")
                 == PROJECTION_STR
             )
 
@@ -519,9 +522,18 @@ class Test(Document):
             )
 
         if mongo_db < MONGODB_70:
-            assert query_plan.get("queryPlanner").get("winningPlan").get("stage") == "FETCH"
+            assert (
+                query_plan.get("queryPlanner").get("winningPlan").get("stage")
+                == "FETCH"
+            )
         else:
-            assert query_plan.get("queryPlanner").get("winningPlan").get("queryPlan").get("stage") == "FETCH"
+            assert (
+                query_plan.get("queryPlanner")
+                .get("winningPlan")
+                .get("queryPlan")
+                .get("stage")
+                == "FETCH"
+            )
 
     def test_index_on_id(self):
         class BlogPost(Document):

From bda4955145dfd4f706166029780a7850e69d9c1f Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Fri, 24 Nov 2023 17:04:51 +0100
Subject: [PATCH 1386/1519] fix assert

---
 tests/document/test_indexes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 812d4e1d4..8a0486412 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -507,7 +507,6 @@ class Test(Document):
             assert (
                 query_plan.get("queryPlanner")
                 .get("winningPlan")
-                .get("queryPlan")
                 .get("inputStage")
                 .get("stage")
                 == "IXSCAN"
@@ -516,6 +515,7 @@ class Test(Document):
             assert (
                 query_plan.get("queryPlanner")
                 .get("winningPlan")
+                .get("queryPlan")
                 .get("inputStage")
                 .get("stage")
                 == "IXSCAN"

From c80c25c15c99bff4b46f59c16c69f42558c70d3b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 15 Dec 2023 21:51:04 +0100
Subject: [PATCH 1387/1519] 2784_validate_override_embedded_doc

---
 docs/changelog.rst                           |  1 +
 mongoengine/fields.py                        |  2 +-
 tests/fields/test_embedded_document_field.py | 43 ++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index a11745e5a..71cf98a26 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Fix for uuidRepresentation not read when provided in URI #2741
+- Fix validate() not being called when inheritance is used in EmbeddedDocument and validate is overriden #2784
 
 Changes in 0.27.0
 =================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index a3f5525cc..40469bfce 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -761,7 +761,7 @@ def validate(self, value, clean=True):
                 "Invalid embedded document instance provided to an "
                 "EmbeddedDocumentField"
             )
-        self.document_type.validate(value, clean)
+        value.validate(clean=clean)
 
     def lookup_member(self, member_name):
         doc_and_subclasses = [self.document_type] + self.document_type.__subclasses__()
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 3b555cc69..fefee4efd 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -7,6 +7,7 @@
     Document,
     EmbeddedDocument,
     EmbeddedDocumentField,
+    EmbeddedDocumentListField,
     GenericEmbeddedDocumentField,
     IntField,
     InvalidQueryError,
@@ -61,6 +62,48 @@ class MyFailingDoc(Document):
             class MyFailingdoc2(Document):
                 emb = EmbeddedDocumentField("MyDoc")
 
+    def test_embedded_document_field_validate_subclass(self):
+        class BaseItem(EmbeddedDocument):
+            f = IntField()
+
+            meta = {"allow_inheritance": True}
+
+            def validate(self, clean=True):
+                if self.f == 0:
+                    raise Exception("can not be 0")
+                return super().validate(clean)
+
+        class RealItem(BaseItem):
+            a = IntField()
+
+            def validate(self, clean=True):
+                if self.f == 1:
+                    raise Exception("can not be 1")
+                return super().validate(clean)
+
+        class TopLevel(Document):
+            item = EmbeddedDocumentField(document_type=BaseItem)
+            items = EmbeddedDocumentListField(document_type=BaseItem)
+
+        passing_item = RealItem(f=2, a=0)
+        item = TopLevel(item=passing_item, items=[passing_item])
+        item.validate()
+
+        failing_item = RealItem(f=1, a=0)
+        item = TopLevel(item=failing_item)
+        with pytest.raises(Exception, match="can not be 1"):
+            item.validate()
+
+        item = TopLevel(items=[failing_item])
+        with pytest.raises(Exception, match="can not be 1"):
+            item.validate()
+
+        # verify that super calls the parent
+        failing_item_in_base = RealItem(f=0, a=0)
+        item = TopLevel(item=failing_item_in_base)
+        with pytest.raises(Exception, match="can not be 0"):
+            item.validate()
+
     def test_query_embedded_document_attribute(self):
         class AdminSettings(EmbeddedDocument):
             foo1 = StringField()

From 669aa234afc6162c40f23acc7b14e72c3012ff01 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 15 Dec 2023 22:38:56 +0100
Subject: [PATCH 1388/1519] Add support for readPreferenceTags in connection
 parameters #2644

---
 docs/changelog.rst        |  1 +
 mongoengine/connection.py | 10 +++++++++-
 tests/test_connection.py  | 23 +++++++++++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7514f006a..2a724094b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,7 @@ Development
 - Fix for uuidRepresentation not read when provided in URI #2741
 - Add tests against MongoDB 6.0 and MongoDB 7.0 in the pipeline
 - Fix validate() not being called when inheritance is used in EmbeddedDocument and validate is overriden #2784
+- Add support for readPreferenceTags in connection parameters #2644
 
 Changes in 0.27.0
 =================
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index ff3be8cd3..27a2970f7 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -164,8 +164,16 @@ def _get_connection_settings(
                         preference.name.lower() == read_pf_mode
                         or preference.mode == read_pf_mode
                     ):
-                        conn_settings["read_preference"] = preference
+                        ReadPrefClass = preference.__class__
                         break
+
+                if "readpreferencetags" in uri_options:
+                    conn_settings["read_preference"] = ReadPrefClass(
+                        tag_sets=uri_options["readpreferencetags"]
+                    )
+                else:
+                    conn_settings["read_preference"] = ReadPrefClass()
+
             if "authmechanismproperties" in uri_options:
                 conn_settings["authmechanismproperties"] = uri_options[
                     "authmechanismproperties"
diff --git a/tests/test_connection.py b/tests/test_connection.py
index c6cc25317..828854113 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -11,6 +11,7 @@
     InvalidOperation,
     OperationFailure,
 )
+from pymongo.read_preferences import Secondary
 
 import mongoengine.connection
 from mongoengine import (
@@ -24,6 +25,7 @@
 from mongoengine.connection import (
     DEFAULT_DATABASE_NAME,
     ConnectionFailure,
+    _get_connection_settings,
     disconnect,
     get_connection,
     get_db,
@@ -180,6 +182,27 @@ def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way
         with pytest.raises(ConnectionFailure):
             connect(host="mongodb://localhost:27017/%s" % db_name, alias=db_alias)
 
+    def test___get_connection_settings(self):
+        funky_host = "mongodb://root:12345678@1.1.1.1:27017,2.2.2.2:27017,3.3.3.3:27017/db_api?replicaSet=s0&readPreference=secondary&uuidRepresentation=javaLegacy&readPreferenceTags=region:us-west-2,usage:api"
+        settings = _get_connection_settings(host=funky_host)
+        assert settings == {
+            "authentication_mechanism": None,
+            "authentication_source": None,
+            "authmechanismproperties": None,
+            "host": [funky_host],
+            "name": "db_api",
+            "password": "12345678",
+            "port": 27017,
+            "read_preference": Secondary(
+                tag_sets=[{"region": "us-west-2", "usage": "api"}],
+                max_staleness=-1,
+                hedge=None,
+            ),
+            "replicaSet": "s0",
+            "username": "root",
+            "uuidrepresentation": "javaLegacy",
+        }
+
     def test_connect_passes_silently_connect_multiple_times_with_same_config(self):
         # test default connection to `test`
         connect()

From 9d8a3268e28d4c0d5fe58a4e8401d0ffdd5175f6 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 15 Dec 2023 22:46:43 +0100
Subject: [PATCH 1389/1519] Fix read pref hedge in pymongo<4

---
 tests/test_connection.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 828854113..c88f87c93 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -185,6 +185,18 @@ def test_connect_fails_if_similar_connection_settings_arent_defined_the_same_way
     def test___get_connection_settings(self):
         funky_host = "mongodb://root:12345678@1.1.1.1:27017,2.2.2.2:27017,3.3.3.3:27017/db_api?replicaSet=s0&readPreference=secondary&uuidRepresentation=javaLegacy&readPreferenceTags=region:us-west-2,usage:api"
         settings = _get_connection_settings(host=funky_host)
+
+        if PYMONGO_VERSION < (4,):
+            read_pref = Secondary(
+                tag_sets=[{"region": "us-west-2", "usage": "api"}],
+                max_staleness=-1,
+            )
+        else:
+            read_pref = Secondary(
+                tag_sets=[{"region": "us-west-2", "usage": "api"}],
+                max_staleness=-1,
+                hedge=None,
+            )
         assert settings == {
             "authentication_mechanism": None,
             "authentication_source": None,
@@ -193,11 +205,7 @@ def test___get_connection_settings(self):
             "name": "db_api",
             "password": "12345678",
             "port": 27017,
-            "read_preference": Secondary(
-                tag_sets=[{"region": "us-west-2", "usage": "api"}],
-                max_staleness=-1,
-                hedge=None,
-            ),
+            "read_preference": read_pref,
             "replicaSet": "s0",
             "username": "root",
             "uuidrepresentation": "javaLegacy",

From aacc333237bf338ecaa5a30d4de22ea077b55a82 Mon Sep 17 00:00:00 2001
From: Ido Shraga <35264146+idoshr@users.noreply.github.com>
Date: Sat, 16 Dec 2023 19:52:59 +0200
Subject: [PATCH 1390/1519] Update querying.rst
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastien Gérard <bast.gerard@gmail.com>
---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 194e2a676..7a524093c 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -263,7 +263,7 @@ This is done by using ``__raw__`` keyword argument to the update method and prov
     # 'tags' field == ['test1', 'test2', 'test3']
     Page.objects().update(__raw__=
                                   {'$set': {"tags.$[element]": 'test11111'}},
-                                  array_filters=[{"element": {'$eq': 'test2'}}],
+                                  'array_filters': [{"element": {'$eq': 'test2'}}],
 
     # 'tags' field == ['test1', 'test11111', 'test3']
 

From ee766bfdaabe4dfd8bc6f5cdccdfb8b57c02a079 Mon Sep 17 00:00:00 2001
From: Ido Shraga <35264146+idoshr@users.noreply.github.com>
Date: Sat, 16 Dec 2023 19:53:23 +0200
Subject: [PATCH 1391/1519] Update querying.rst
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastien Gérard <bast.gerard@gmail.com>
---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 7a524093c..b0333caf7 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -260,7 +260,7 @@ This is done by using ``__raw__`` keyword argument to the update method and prov
 `Update with Array Operator <https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered->`_
 ::
 
-    # 'tags' field == ['test1', 'test2', 'test3']
+    # assuming an initial 'tags' field == ['test1', 'test2', 'test3']
     Page.objects().update(__raw__=
                                   {'$set': {"tags.$[element]": 'test11111'}},
                                   'array_filters': [{"element": {'$eq': 'test2'}}],

From 71de2a796bc7d850b3bb3e8b375fc1fa7eb1a6af Mon Sep 17 00:00:00 2001
From: Ido Shraga <35264146+idoshr@users.noreply.github.com>
Date: Sat, 16 Dec 2023 19:53:30 +0200
Subject: [PATCH 1392/1519] Update querying.rst
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastien Gérard <bast.gerard@gmail.com>
---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index b0333caf7..cf9e41779 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -265,7 +265,7 @@ This is done by using ``__raw__`` keyword argument to the update method and prov
                                   {'$set': {"tags.$[element]": 'test11111'}},
                                   'array_filters': [{"element": {'$eq': 'test2'}}],
 
-    # 'tags' field == ['test1', 'test11111', 'test3']
+    # updated 'tags' field == ['test1', 'test11111', 'test3']
 
     )
 

From cd504a830f7808c92581e5ac14be1b1981b71725 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Thu, 21 Sep 2023 13:48:27 +0300
Subject: [PATCH 1393/1519] array_filters

---
 docs/changelog.rst              |  1 +
 docs/guide/querying.rst         | 18 ++++++++++
 mongoengine/queryset/base.py    |  6 +++-
 tests/queryset/test_queryset.py | 60 +++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2a724094b..1374229b2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,7 @@ Development
 - Add tests against MongoDB 6.0 and MongoDB 7.0 in the pipeline
 - Fix validate() not being called when inheritance is used in EmbeddedDocument and validate is overriden #2784
 - Add support for readPreferenceTags in connection parameters #2644
+- Add option to user array_filters https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered/
 
 Changes in 0.27.0
 =================
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index b9afb60e1..194e2a676 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -252,6 +252,24 @@ and provide the pipeline as a list
 
 .. versionadded:: 0.23.2
 
+Update with Array Operator
+--------------------------------
+It is possible to update specific value in array by use array_filters (arrayFilters) operator.
+This is done by using ``__raw__`` keyword argument to the update method and provide the arrayFilters as a list.
+
+`Update with Array Operator <https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered->`_
+::
+
+    # 'tags' field == ['test1', 'test2', 'test3']
+    Page.objects().update(__raw__=
+                                  {'$set': {"tags.$[element]": 'test11111'}},
+                                  array_filters=[{"element": {'$eq': 'test2'}}],
+
+    # 'tags' field == ['test1', 'test11111', 'test3']
+
+    )
+
+
 Sorting/Ordering results
 ========================
 It is possible to order the results by 1 or more keys using :meth:`~mongoengine.queryset.QuerySet.order_by`.
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index d33e7b1e3..149c11b18 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -530,6 +530,7 @@ def update(
         write_concern=None,
         read_concern=None,
         full_result=False,
+        array_filters=None,
         **update,
     ):
         """Perform an atomic update on the fields matched by the query.
@@ -545,6 +546,7 @@ def update(
         :param read_concern: Override the read concern for the operation
         :param full_result: Return the associated ``pymongo.UpdateResult`` rather than just the number
             updated items
+        :param array_filters: A list of filters specifying which array elements an update should apply.
         :param update: Django-style update keyword arguments
 
         :returns the number of updated documents (unless ``full_result`` is True)
@@ -565,6 +567,8 @@ def update(
                 for u in update["__raw__"]
             ]
         else:
+            if 'array_filters' in update:
+                array_filters = update.pop('array_filters')
             update = transform.update(queryset._document, **update)
         # If doing an atomic upsert on an inheritable class
         # then ensure we add _cls to the update operation
@@ -580,7 +584,7 @@ def update(
                 update_func = collection.update_one
                 if multi:
                     update_func = collection.update_many
-                result = update_func(query, update, upsert=upsert)
+                result = update_func(query, update, upsert=upsert, array_filters=array_filters)
             if full_result:
                 return result
             elif result.raw_result:
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index d1cae3415..0854aacf5 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -591,6 +591,66 @@ class Blog(Document):
 
         Blog.drop_collection()
 
+    def test_update_array_filters(self):
+        """Ensure that updating by array_filters works.
+        """
+
+        class Comment(EmbeddedDocument):
+            comment_tags = ListField(StringField())
+
+        class Blog(Document):
+            tags = ListField(StringField())
+            comments = EmbeddedDocumentField(Comment)
+
+        Blog.drop_collection()
+
+        # update one
+        Blog.objects.create(tags=['test1', 'test2', 'test3'])
+
+        Blog.objects().update_one(__raw__=
+                                  {'$set': {"tags.$[element]": 'test11111'}},
+                                  array_filters=[{"element": {'$eq': 'test2'}}],
+                                  )
+        testc_blogs = Blog.objects(tags="test11111")
+
+        assert testc_blogs.count() == 1
+
+        Blog.drop_collection()
+
+        # update one inner list
+        comments = Comment(comment_tags=['test1', 'test2', 'test3'])
+        Blog.objects.create(comments=comments)
+
+        Blog.objects().update_one(__raw__=
+                                  {'$set': {"comments.comment_tags.$[element]": 'test11111'}},
+                                  array_filters=[{"element": {'$eq': 'test2'}}],
+                                  )
+        testc_blogs = Blog.objects(comments__comment_tags="test11111")
+
+        assert testc_blogs.count() == 1
+
+        # update many
+        Blog.drop_collection()
+
+        Blog.objects.create(tags=['test1', 'test2', 'test3', 'test_all'])
+        Blog.objects.create(tags=['test4', 'test5', 'test6', 'test_all'])
+
+        Blog.objects().update(__raw__=
+                              {'$set': {"tags.$[element]": 'test11111'}},
+                              array_filters=[{"element": {'$eq': 'test2'}}],
+                              )
+        testc_blogs = Blog.objects(tags="test11111")
+
+        assert testc_blogs.count() == 1
+
+        Blog.objects().update(__raw__=
+                              {'$set': {"tags.$[element]": 'test_all1234577'}},
+                              array_filters=[{"element": {'$eq': 'test_all'}}],
+                              )
+        testc_blogs = Blog.objects(tags="test_all1234577")
+
+        assert testc_blogs.count() == 2
+
     def test_update_using_positional_operator(self):
         """Ensure that the list fields can be updated using the positional
         operator."""

From da15e8d3002684c8cf240b3d5a00cbc9d9d5b3ad Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Thu, 21 Sep 2023 13:50:56 +0300
Subject: [PATCH 1394/1519] pre commit

---
 mongoengine/queryset/base.py    |  8 +++---
 tests/queryset/test_queryset.py | 43 ++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 149c11b18..95bb2d6b9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -567,8 +567,8 @@ def update(
                 for u in update["__raw__"]
             ]
         else:
-            if 'array_filters' in update:
-                array_filters = update.pop('array_filters')
+            if "array_filters" in update:
+                array_filters = update.pop("array_filters")
             update = transform.update(queryset._document, **update)
         # If doing an atomic upsert on an inheritable class
         # then ensure we add _cls to the update operation
@@ -584,7 +584,9 @@ def update(
                 update_func = collection.update_one
                 if multi:
                     update_func = collection.update_many
-                result = update_func(query, update, upsert=upsert, array_filters=array_filters)
+                result = update_func(
+                    query, update, upsert=upsert, array_filters=array_filters
+                )
             if full_result:
                 return result
             elif result.raw_result:
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 0854aacf5..7a1649873 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -592,8 +592,7 @@ class Blog(Document):
         Blog.drop_collection()
 
     def test_update_array_filters(self):
-        """Ensure that updating by array_filters works.
-        """
+        """Ensure that updating by array_filters works."""
 
         class Comment(EmbeddedDocument):
             comment_tags = ListField(StringField())
@@ -605,12 +604,12 @@ class Blog(Document):
         Blog.drop_collection()
 
         # update one
-        Blog.objects.create(tags=['test1', 'test2', 'test3'])
+        Blog.objects.create(tags=["test1", "test2", "test3"])
 
-        Blog.objects().update_one(__raw__=
-                                  {'$set': {"tags.$[element]": 'test11111'}},
-                                  array_filters=[{"element": {'$eq': 'test2'}}],
-                                  )
+        Blog.objects().update_one(
+            __raw__={"$set": {"tags.$[element]": "test11111"}},
+            array_filters=[{"element": {"$eq": "test2"}}],
+        )
         testc_blogs = Blog.objects(tags="test11111")
 
         assert testc_blogs.count() == 1
@@ -618,13 +617,13 @@ class Blog(Document):
         Blog.drop_collection()
 
         # update one inner list
-        comments = Comment(comment_tags=['test1', 'test2', 'test3'])
+        comments = Comment(comment_tags=["test1", "test2", "test3"])
         Blog.objects.create(comments=comments)
 
-        Blog.objects().update_one(__raw__=
-                                  {'$set': {"comments.comment_tags.$[element]": 'test11111'}},
-                                  array_filters=[{"element": {'$eq': 'test2'}}],
-                                  )
+        Blog.objects().update_one(
+            __raw__={"$set": {"comments.comment_tags.$[element]": "test11111"}},
+            array_filters=[{"element": {"$eq": "test2"}}],
+        )
         testc_blogs = Blog.objects(comments__comment_tags="test11111")
 
         assert testc_blogs.count() == 1
@@ -632,21 +631,21 @@ class Blog(Document):
         # update many
         Blog.drop_collection()
 
-        Blog.objects.create(tags=['test1', 'test2', 'test3', 'test_all'])
-        Blog.objects.create(tags=['test4', 'test5', 'test6', 'test_all'])
+        Blog.objects.create(tags=["test1", "test2", "test3", "test_all"])
+        Blog.objects.create(tags=["test4", "test5", "test6", "test_all"])
 
-        Blog.objects().update(__raw__=
-                              {'$set': {"tags.$[element]": 'test11111'}},
-                              array_filters=[{"element": {'$eq': 'test2'}}],
-                              )
+        Blog.objects().update(
+            __raw__={"$set": {"tags.$[element]": "test11111"}},
+            array_filters=[{"element": {"$eq": "test2"}}],
+        )
         testc_blogs = Blog.objects(tags="test11111")
 
         assert testc_blogs.count() == 1
 
-        Blog.objects().update(__raw__=
-                              {'$set': {"tags.$[element]": 'test_all1234577'}},
-                              array_filters=[{"element": {'$eq': 'test_all'}}],
-                              )
+        Blog.objects().update(
+            __raw__={"$set": {"tags.$[element]": "test_all1234577"}},
+            array_filters=[{"element": {"$eq": "test_all"}}],
+        )
         testc_blogs = Blog.objects(tags="test_all1234577")
 
         assert testc_blogs.count() == 2

From d2bf8fe6077e46765a52cc06587a7f925c618c1a Mon Sep 17 00:00:00 2001
From: Ido Shraga <35264146+idoshr@users.noreply.github.com>
Date: Sat, 16 Dec 2023 19:52:59 +0200
Subject: [PATCH 1395/1519] Update querying.rst
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastien Gérard <bast.gerard@gmail.com>
---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 194e2a676..7a524093c 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -263,7 +263,7 @@ This is done by using ``__raw__`` keyword argument to the update method and prov
     # 'tags' field == ['test1', 'test2', 'test3']
     Page.objects().update(__raw__=
                                   {'$set': {"tags.$[element]": 'test11111'}},
-                                  array_filters=[{"element": {'$eq': 'test2'}}],
+                                  'array_filters': [{"element": {'$eq': 'test2'}}],
 
     # 'tags' field == ['test1', 'test11111', 'test3']
 

From 3d35419b776508acc77ef25f62c31d7fee88113b Mon Sep 17 00:00:00 2001
From: Ido Shraga <35264146+idoshr@users.noreply.github.com>
Date: Sat, 16 Dec 2023 19:53:23 +0200
Subject: [PATCH 1396/1519] Update querying.rst
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastien Gérard <bast.gerard@gmail.com>
---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 7a524093c..b0333caf7 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -260,7 +260,7 @@ This is done by using ``__raw__`` keyword argument to the update method and prov
 `Update with Array Operator <https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered->`_
 ::
 
-    # 'tags' field == ['test1', 'test2', 'test3']
+    # assuming an initial 'tags' field == ['test1', 'test2', 'test3']
     Page.objects().update(__raw__=
                                   {'$set': {"tags.$[element]": 'test11111'}},
                                   'array_filters': [{"element": {'$eq': 'test2'}}],

From d6cc0b94917722d0e5c7c474f04ae0e109719638 Mon Sep 17 00:00:00 2001
From: Ido Shraga <35264146+idoshr@users.noreply.github.com>
Date: Sat, 16 Dec 2023 19:53:30 +0200
Subject: [PATCH 1397/1519] Update querying.rst
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Bastien Gérard <bast.gerard@gmail.com>
---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index b0333caf7..cf9e41779 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -265,7 +265,7 @@ This is done by using ``__raw__`` keyword argument to the update method and prov
                                   {'$set': {"tags.$[element]": 'test11111'}},
                                   'array_filters': [{"element": {'$eq': 'test2'}}],
 
-    # 'tags' field == ['test1', 'test11111', 'test3']
+    # updated 'tags' field == ['test1', 'test11111', 'test3']
 
     )
 

From b5be012bd95eb30f7c411aef7fb1b280185a70d2 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 17 Dec 2023 00:30:24 +0100
Subject: [PATCH 1398/1519] #2529 update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2a724094b..835a85245 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -11,6 +11,7 @@ Development
 - Add tests against MongoDB 6.0 and MongoDB 7.0 in the pipeline
 - Fix validate() not being called when inheritance is used in EmbeddedDocument and validate is overriden #2784
 - Add support for readPreferenceTags in connection parameters #2644
+- Use estimated_documents_count OR documents_count when count is called, based on the query #2529
 
 Changes in 0.27.0
 =================

From 9b92cc715b90070d2d27a19aeef5f5a86a86b04b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 19 Dec 2023 23:25:22 +0100
Subject: [PATCH 1399/1519] Fix no_dereferencing context manager which wasn't
 turning off auto-dereferencing correctly in some cases + fix tests

---
 docs/changelog.rst              |  3 ++
 docs/guide/querying.rst         |  2 +-
 mongoengine/context_managers.py | 28 ++++++++++--
 mongoengine/queryset/base.py    | 19 ++++++---
 tests/test_context_managers.py  | 75 ++++++++++++++++++++++-----------
 5 files changed, 92 insertions(+), 35 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 835a85245..de6b1b923 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,9 @@ Development
 - Fix validate() not being called when inheritance is used in EmbeddedDocument and validate is overriden #2784
 - Add support for readPreferenceTags in connection parameters #2644
 - Use estimated_documents_count OR documents_count when count is called, based on the query #2529
+- Fix no_dereferencing context manager which wasn't turning off auto-dereferencing correctly in some cases
+- BREAKING CHANGE: no_dereferencing context manager no longer returns the class in __enter__
+    as it was useless and making it look like it was returning a different class
 
 Changes in 0.27.0
 =================
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index b9afb60e1..23beb5a30 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -522,7 +522,7 @@ data. To turn off dereferencing of the results of a query use
 You can also turn off all dereferencing for a fixed period by using the
 :class:`~mongoengine.context_managers.no_dereference` context manager::
 
-    with no_dereference(Post) as Post:
+    with no_dereference(Post):
         post = Post.objects.first()
         assert(isinstance(post.author, DBRef))
 
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index eb9c99622..c864f4539 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,3 +1,4 @@
+import threading
 from contextlib import contextmanager
 
 from pymongo.read_concern import ReadConcern
@@ -18,6 +19,25 @@
 )
 
 
+thread_locals = threading.local()
+thread_locals.no_dereferencing_class = {}
+
+
+def no_dereferencing_active_for_class(cls):
+    return cls in thread_locals.no_dereferencing_class
+
+
+def _register_no_dereferencing_for_class(cls):
+    thread_locals.no_dereferencing_class.setdefault(cls, 0)
+    thread_locals.no_dereferencing_class[cls] += 1
+
+
+def _unregister_no_dereferencing_for_class(cls):
+    thread_locals.no_dereferencing_class[cls] -= 1
+    if thread_locals.no_dereferencing_class[cls] == 0:
+        thread_locals.no_dereferencing_class.pop(cls)
+
+
 class switch_db:
     """switch_db alias context manager.
 
@@ -107,7 +127,7 @@ class no_dereference:
     Turns off all dereferencing in Documents for the duration of the context
     manager::
 
-        with no_dereference(Group) as Group:
+        with no_dereference(Group):
             Group.objects.find()
     """
 
@@ -130,15 +150,17 @@ def __init__(self, cls):
 
     def __enter__(self):
         """Change the objects default and _auto_dereference values."""
+        _register_no_dereferencing_for_class(self.cls)
+
         for field in self.deref_fields:
             self.cls._fields[field]._auto_dereference = False
-        return self.cls
 
     def __exit__(self, t, value, traceback):
         """Reset the default and _auto_dereference values."""
+        _unregister_no_dereferencing_for_class(self.cls)
+
         for field in self.deref_fields:
             self.cls._fields[field]._auto_dereference = True
-        return self.cls
 
 
 class no_sub_classes:
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index d33e7b1e3..ad018f468 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -17,6 +17,7 @@
 from mongoengine.common import _import_class
 from mongoengine.connection import get_db
 from mongoengine.context_managers import (
+    no_dereferencing_active_for_class,
     set_read_write_concern,
     set_write_concern,
     switch_db,
@@ -51,9 +52,6 @@ class BaseQuerySet:
     providing :class:`~mongoengine.Document` objects as the results.
     """
 
-    __dereference = False
-    _auto_dereference = True
-
     def __init__(self, document, collection):
         self._document = document
         self._collection_obj = collection
@@ -74,6 +72,9 @@ def __init__(self, document, collection):
         self._as_pymongo = False
         self._search_text = None
 
+        self.__dereference = False
+        self.__auto_dereference = True
+
         # If inheritance is allowed, only return instances and instances of
         # subclasses of the class being used
         if document._meta.get("allow_inheritance") is True:
@@ -795,7 +796,7 @@ def clone(self):
         return self._clone_into(self.__class__(self._document, self._collection_obj))
 
     def _clone_into(self, new_qs):
-        """Copy all of the relevant properties of this queryset to
+        """Copy all the relevant properties of this queryset to
         a new queryset (which has to be an instance of
         :class:`~mongoengine.queryset.base.BaseQuerySet`).
         """
@@ -825,7 +826,6 @@ def _clone_into(self, new_qs):
             "_empty",
             "_hint",
             "_collation",
-            "_auto_dereference",
             "_search_text",
             "_max_time_ms",
             "_comment",
@@ -836,6 +836,8 @@ def _clone_into(self, new_qs):
             val = getattr(self, prop)
             setattr(new_qs, prop, copy.copy(val))
 
+        new_qs.__auto_dereference = self._BaseQuerySet__auto_dereference
+
         if self._cursor_obj:
             new_qs._cursor_obj = self._cursor_obj.clone()
 
@@ -1741,10 +1743,15 @@ def _dereference(self):
             self.__dereference = _import_class("DeReference")()
         return self.__dereference
 
+    @property
+    def _auto_dereference(self):
+        should_deref = not no_dereferencing_active_for_class(self._document)
+        return should_deref and self.__auto_dereference
+
     def no_dereference(self):
         """Turn off any dereferencing for the results of this queryset."""
         queryset = self.clone()
-        queryset._auto_dereference = False
+        queryset.__auto_dereference = False
         return queryset
 
     # Helper Functions
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index daf9a2c18..ac9ded729 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -1,6 +1,7 @@
 import unittest
 
 import pytest
+from bson import DBRef
 
 from mongoengine import *
 from mongoengine.connection import get_db
@@ -19,8 +20,6 @@
 
 class TestContextManagers(MongoDBTestCase):
     def test_set_write_concern(self):
-        connect("mongoenginetest")
-
         class User(Document):
             name = StringField()
 
@@ -39,8 +38,6 @@ class User(Document):
         assert original_write_concern.document == collection.write_concern.document
 
     def test_set_read_write_concern(self):
-        connect("mongoenginetest")
-
         class User(Document):
             name = StringField()
 
@@ -65,7 +62,6 @@ class User(Document):
         assert original_write_concern.document == collection.write_concern.document
 
     def test_switch_db_context_manager(self):
-        connect("mongoenginetest")
         register_connection("testdb-1", "mongoenginetest2")
 
         class Group(Document):
@@ -89,7 +85,6 @@ class Group(Document):
         assert 1 == Group.objects.count()
 
     def test_switch_collection_context_manager(self):
-        connect("mongoenginetest")
         register_connection(alias="testdb-1", db="mongoenginetest2")
 
         class Group(Document):
@@ -117,7 +112,6 @@ class Group(Document):
 
     def test_no_dereference_context_manager_object_id(self):
         """Ensure that DBRef items in ListFields aren't dereferenced."""
-        connect("mongoenginetest")
 
         class User(Document):
             name = StringField()
@@ -136,25 +130,57 @@ class Group(Document):
         user = User.objects.first()
         Group(ref=user, members=User.objects, generic=user).save()
 
-        with no_dereference(Group) as NoDeRefGroup:
-            assert Group._fields["members"]._auto_dereference
-            assert not NoDeRefGroup._fields["members"]._auto_dereference
+        with no_dereference(Group):
+            assert not Group._fields["members"]._auto_dereference
 
-        with no_dereference(Group) as Group:
+        with no_dereference(Group):
             group = Group.objects.first()
             for m in group.members:
-                assert not isinstance(m, User)
-            assert not isinstance(group.ref, User)
-            assert not isinstance(group.generic, User)
+                assert isinstance(m, DBRef)
+            assert isinstance(group.ref, DBRef)
+            assert isinstance(group.generic, dict)
 
+        group = Group.objects.first()
         for m in group.members:
             assert isinstance(m, User)
         assert isinstance(group.ref, User)
         assert isinstance(group.generic, User)
 
-    def test_no_dereference_context_manager_dbref(self):
+    def test_no_dereference_context_manager_nested(self):
         """Ensure that DBRef items in ListFields aren't dereferenced."""
-        connect("mongoenginetest")
+
+        class User(Document):
+            name = StringField()
+
+        class Group(Document):
+            ref = ReferenceField(User, dbref=False)
+
+        User.drop_collection()
+        Group.drop_collection()
+
+        for i in range(1, 51):
+            User(name="user %s" % i).save()
+
+        user = User.objects.first()
+        Group(ref=user).save()
+
+        with no_dereference(Group):
+            group = Group.objects.first()
+            assert isinstance(group.ref, DBRef)
+
+            with no_dereference(Group):
+                group = Group.objects.first()
+                assert isinstance(group.ref, DBRef)
+
+            # make sure its still off here
+            group = Group.objects.first()
+            assert isinstance(group.ref, DBRef)
+
+        group = Group.objects.first()
+        assert isinstance(group.ref, User)
+
+    def test_no_dereference_context_manager_dbref(self):
+        """Ensure that DBRef items in ListFields aren't dereferenced"""
 
         class User(Document):
             name = StringField()
@@ -173,16 +199,19 @@ class Group(Document):
         user = User.objects.first()
         Group(ref=user, members=User.objects, generic=user).save()
 
-        with no_dereference(Group) as NoDeRefGroup:
-            assert Group._fields["members"]._auto_dereference
-            assert not NoDeRefGroup._fields["members"]._auto_dereference
+        with no_dereference(Group):
+            assert not Group._fields["members"]._auto_dereference
 
-        with no_dereference(Group) as Group:
-            group = Group.objects.first()
+        with no_dereference(Group):
+            qs = Group.objects
+            assert qs._auto_dereference is False
+            group = qs.first()
+            assert not group._fields["members"]._auto_dereference
             assert all(not isinstance(m, User) for m in group.members)
             assert not isinstance(group.ref, User)
             assert not isinstance(group.generic, User)
 
+        group = Group.objects.first()
         assert all(isinstance(m, User) for m in group.members)
         assert isinstance(group.ref, User)
         assert isinstance(group.generic, User)
@@ -265,7 +294,6 @@ def test_query_counter_does_not_swallow_exception(self):
                 raise TypeError()
 
     def test_query_counter_temporarily_modifies_profiling_level(self):
-        connect("mongoenginetest")
         db = get_db()
 
         def _current_profiling_level():
@@ -290,7 +318,6 @@ def _set_profiling_level(lvl):
             raise
 
     def test_query_counter(self):
-        connect("mongoenginetest")
         db = get_db()
 
         collection = db.query_counter
@@ -380,7 +407,6 @@ class B(Document):
             assert q == 3
 
     def test_query_counter_counts_getmore_queries(self):
-        connect("mongoenginetest")
         db = get_db()
 
         collection = db.query_counter
@@ -397,7 +423,6 @@ def test_query_counter_counts_getmore_queries(self):
             assert q == 2  # 1st select + 1 getmore
 
     def test_query_counter_ignores_particular_queries(self):
-        connect("mongoenginetest")
         db = get_db()
 
         collection = db.query_counter

From 40dde2987f7ddc7e21a8be831fc14f50d0df1f48 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 19 Dec 2023 23:43:47 +0100
Subject: [PATCH 1400/1519] Improve tests (to debug ci failure)

---
 docs/changelog.rst             |  7 +--
 tests/document/test_indexes.py | 83 +++++-----------------------------
 2 files changed, 15 insertions(+), 75 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index de6b1b923..f872d6fe0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,9 +12,10 @@ Development
 - Fix validate() not being called when inheritance is used in EmbeddedDocument and validate is overriden #2784
 - Add support for readPreferenceTags in connection parameters #2644
 - Use estimated_documents_count OR documents_count when count is called, based on the query #2529
-- Fix no_dereferencing context manager which wasn't turning off auto-dereferencing correctly in some cases
-- BREAKING CHANGE: no_dereferencing context manager no longer returns the class in __enter__
-    as it was useless and making it look like it was returning a different class
+- Fix no_dereferencing context manager which wasn't turning off auto-dereferencing correctly in some cases #2788
+- BREAKING CHANGE: no_dereferencing context manager no longer returns the class in __enter__ #2788
+    as it was useless and making it look like it was returning a different class.
+    Thus, must be called like `with no_dereferencing(User):` and no longer `with no_dereferencing(User) as OtherUserClass:`
 
 Changes in 0.27.0
 =================
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 8a0486412..7ba18d588 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -9,7 +9,6 @@
 from mongoengine.connection import get_db
 from mongoengine.mongodb_support import (
     MONGODB_42,
-    MONGODB_70,
     get_mongodb_version,
 )
 from mongoengine.pymongo_support import PYMONGO_VERSION
@@ -451,89 +450,29 @@ class Test(Document):
         # the documents returned might have more keys in that here.
         query_plan = Test.objects(id=obj.id).exclude("a").explain()
         assert (
-            query_plan.get("queryPlanner")
-            .get("winningPlan")
-            .get("inputStage")
-            .get("stage")
-            == "IDHACK"
+            query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IDHACK"
         )
 
         query_plan = Test.objects(id=obj.id).only("id").explain()
         assert (
-            query_plan.get("queryPlanner")
-            .get("winningPlan")
-            .get("inputStage")
-            .get("stage")
-            == "IDHACK"
+            query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IDHACK"
         )
 
         mongo_db = get_mongodb_version()
         query_plan = Test.objects(a=1).only("a").exclude("id").explain()
-        if mongo_db < MONGODB_70:
-            assert (
-                query_plan.get("queryPlanner")
-                .get("winningPlan")
-                .get("inputStage")
-                .get("stage")
-                == "IXSCAN"
-            )
-        else:
-            assert (
-                query_plan.get("queryPlanner")
-                .get("winningPlan")
-                .get("queryPlan")
-                .get("inputStage")
-                .get("stage")
-                == "IXSCAN"
-            )
+        assert (
+            query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IXSCAN"
+        )
 
         PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
-        if mongo_db < MONGODB_70:
-            assert (
-                query_plan.get("queryPlanner").get("winningPlan").get("stage")
-                == PROJECTION_STR
-            )
-        else:
-            assert (
-                query_plan.get("queryPlanner")
-                .get("winningPlan")
-                .get("queryPlan")
-                .get("stage")
-                == PROJECTION_STR
-            )
+        assert query_plan["queryPlanner"]["winningPlan"]["stage"] == PROJECTION_STR
 
         query_plan = Test.objects(a=1).explain()
-        if mongo_db < MONGODB_70:
-            assert (
-                query_plan.get("queryPlanner")
-                .get("winningPlan")
-                .get("inputStage")
-                .get("stage")
-                == "IXSCAN"
-            )
-        else:
-            assert (
-                query_plan.get("queryPlanner")
-                .get("winningPlan")
-                .get("queryPlan")
-                .get("inputStage")
-                .get("stage")
-                == "IXSCAN"
-            )
-
-        if mongo_db < MONGODB_70:
-            assert (
-                query_plan.get("queryPlanner").get("winningPlan").get("stage")
-                == "FETCH"
-            )
-        else:
-            assert (
-                query_plan.get("queryPlanner")
-                .get("winningPlan")
-                .get("queryPlan")
-                .get("stage")
-                == "FETCH"
-            )
+        assert (
+            query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IXSCAN"
+        )
+
+        assert query_plan.get("queryPlanner").get("winningPlan").get("stage") == "FETCH"
 
     def test_index_on_id(self):
         class BlogPost(Document):

From a2bb72b77ee6b4a366ff79033e7940246535e16b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 23 Dec 2023 23:18:46 +0100
Subject: [PATCH 1401/1519] fix typo in changelog for no_dereference

---
 docs/changelog.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f872d6fe0..76de9d6cf 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,10 +12,10 @@ Development
 - Fix validate() not being called when inheritance is used in EmbeddedDocument and validate is overriden #2784
 - Add support for readPreferenceTags in connection parameters #2644
 - Use estimated_documents_count OR documents_count when count is called, based on the query #2529
-- Fix no_dereferencing context manager which wasn't turning off auto-dereferencing correctly in some cases #2788
-- BREAKING CHANGE: no_dereferencing context manager no longer returns the class in __enter__ #2788
-    as it was useless and making it look like it was returning a different class.
-    Thus, must be called like `with no_dereferencing(User):` and no longer `with no_dereferencing(User) as OtherUserClass:`
+- Fix no_dereference context manager which wasn't turning off auto-dereferencing correctly in some cases #2788
+- BREAKING CHANGE: no_dereference context manager no longer returns the class in __enter__ #2788
+    as it was useless and making it look like it was returning a different class although it was the same.
+    Thus, it must be called like `with no_dereference(User):` and no longer `with no_dereference(User) as ...:`
 
 Changes in 0.27.0
 =================

From 34e7cd7a1c5b4783d4229e73700f3c2538403fd2 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 27 Dec 2023 22:51:44 +0100
Subject: [PATCH 1402/1519] add_raw__order_by

---
 docs/changelog.rst              |  1 +
 mongoengine/context_managers.py |  1 +
 mongoengine/queryset/base.py    | 14 +++++++++++---
 tests/queryset/test_queryset.py | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 76de9d6cf..e81fcf94b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -16,6 +16,7 @@ Development
 - BREAKING CHANGE: no_dereference context manager no longer returns the class in __enter__ #2788
     as it was useless and making it look like it was returning a different class although it was the same.
     Thus, it must be called like `with no_dereference(User):` and no longer `with no_dereference(User) as ...:`
+- Added __raw__ to :meth:`~mongoengine.Queryset.order_by()` to allow to provide raw pymongo 'sort' argument and get around some of the limitations #2783
 
 Changes in 0.27.0
 =================
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index c864f4539..a4c90d476 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -16,6 +16,7 @@
     "query_counter",
     "set_write_concern",
     "set_read_write_concern",
+    "no_dereferencing_active_for_class",
 )
 
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index ad018f468..d628ce16b 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1113,7 +1113,7 @@ def all_fields(self):
         )
         return queryset
 
-    def order_by(self, *keys):
+    def order_by(self, *keys, __raw__=None):
         """Order the :class:`~mongoengine.queryset.QuerySet` by the given keys.
 
         The order may be specified by prepending each of the keys by a "+" or
@@ -1123,11 +1123,19 @@ def order_by(self, *keys):
 
         :param keys: fields to order the query results by; keys may be
             prefixed with "+" or a "-" to determine the ordering direction.
+        :param __raw__: a raw pymongo "sort" argument (provided as a list of (key, direction))
+            see 'key_or_list' in `pymongo.cursor.Cursor.sort doc <https://pymongo.readthedocs.io/en/stable/api/pymongo/cursor.html#pymongo.cursor.Cursor.sort>`.
+            If both keys and __raw__ are provided, an exception is raised
         """
-        queryset = self.clone()
+        if __raw__ and keys:
+            raise OperationError("Can not use both keys and __raw__ with order_by() ")
 
+        queryset = self.clone()
         old_ordering = queryset._ordering
-        new_ordering = queryset._get_order_by(keys)
+        if __raw__:
+            new_ordering = __raw__
+        else:
+            new_ordering = queryset._get_order_by(keys)
 
         if queryset._cursor_obj:
             # If a cursor object has already been created, apply the sort to it
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index d1cae3415..35fa9617b 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -2680,6 +2680,39 @@ def test_order_by_chaining(self):
         ages = [p.age for p in qs]
         assert ages == [40, 30, 20]
 
+    def test_order_by_using_raw(self):
+        person_a = self.Person(name="User A", age=20)
+        person_a.save()
+        person_b = self.Person(name="User B", age=30)
+        person_b.save()
+        person_c = self.Person(name="User B", age=25)
+        person_c.save()
+        person_d = self.Person(name="User C", age=40)
+        person_d.save()
+
+        qs = self.Person.objects.order_by(__raw__=[("name", pymongo.DESCENDING)])
+        assert qs._ordering == [("name", pymongo.DESCENDING)]
+        names = [p.name for p in qs]
+        assert names == ["User C", "User B", "User B", "User A"]
+
+        names = [
+            (p.name, p.age)
+            for p in self.Person.objects.order_by(__raw__=[("name", pymongo.ASCENDING)])
+        ]
+        assert names == [("User A", 20), ("User B", 30), ("User B", 25), ("User C", 40)]
+
+        names = [
+            (p.name, p.age)
+            for p in self.Person.objects.order_by(
+                __raw__=["name", ("age", pymongo.ASCENDING)]
+            )
+        ]
+        assert names == [("User A", 20), ("User B", 25), ("User B", 30), ("User C", 40)]
+
+    def test_order_by_using_raw_and_keys_raises_exception(self):
+        with pytest.raises(OperationError):
+            self.Person.objects.order_by("-name", __raw__=[("age", pymongo.ASCENDING)])
+
     def test_confirm_order_by_reference_wont_work(self):
         """Ordering by reference is not possible.  Use map / reduce.. or
         denormalise"""

From 9068d1a4343fe5209797cd582964131570d9b0a5 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 27 Dec 2023 23:06:42 +0100
Subject: [PATCH 1403/1519] Fix tests for pymongo < 4.4

---
 tests/queryset/test_queryset.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 35fa9617b..cc5cc7354 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -17,6 +17,7 @@
     MONGODB_36,
     get_mongodb_version,
 )
+from mongoengine.pymongo_support import PYMONGO_VERSION
 from mongoengine.queryset import (
     DoesNotExist,
     MultipleObjectsReturned,
@@ -2701,13 +2702,18 @@ def test_order_by_using_raw(self):
         ]
         assert names == [("User A", 20), ("User B", 30), ("User B", 25), ("User C", 40)]
 
-        names = [
-            (p.name, p.age)
-            for p in self.Person.objects.order_by(
+        if PYMONGO_VERSION >= (4, 4):
+            # Pymongo >= 4.4 allow to mix single key with tuples inside the list
+            qs = self.Person.objects.order_by(
                 __raw__=["name", ("age", pymongo.ASCENDING)]
             )
-        ]
-        assert names == [("User A", 20), ("User B", 25), ("User B", 30), ("User C", 40)]
+            names = [(p.name, p.age) for p in qs]
+            assert names == [
+                ("User A", 20),
+                ("User B", 25),
+                ("User B", 30),
+                ("User C", 40),
+            ]
 
     def test_order_by_using_raw_and_keys_raises_exception(self):
         with pytest.raises(OperationError):

From 04d8c0f91808399ad19817a8fbc9c10de7ff2d3f Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 27 Dec 2023 23:17:51 +0100
Subject: [PATCH 1404/1519] minor addition on to of idoshr pr

---
 docs/changelog.rst                | 2 +-
 mongoengine/queryset/transform.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9061ea6ac..86386f273 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,7 +8,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Fix for uuidRepresentation not read when provided in URI #2741
-- Fix combination of __raw__ and mongoengine syntax.
+- Fix combination of __raw__ and mongoengine syntax #2773
 - Add tests against MongoDB 6.0 and MongoDB 7.0 in the pipeline
 - Fix validate() not being called when inheritance is used in EmbeddedDocument and validate is overriden #2784
 - Add support for readPreferenceTags in connection parameters #2644
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 6a20e1e61..195bc0b0b 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -62,7 +62,8 @@
 )
 
 
-def handle_raw_query(value: dict, mongo_query: dict):
+def handle_raw_query(value, mongo_query):
+    """Combine a raw query with an existing one"""
     for op, v in value.items():
         if op not in mongo_query:
             mongo_query[op] = v

From 03c612f7de2d708fafbb2226daae42e4e2de5512 Mon Sep 17 00:00:00 2001
From: Ananthu C V <weepingclown@disroot.org>
Date: Mon, 1 Jan 2024 20:08:39 +0530
Subject: [PATCH 1405/1519] add missing link for set_on_insert

---
 docs/guide/querying.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 23beb5a30..a11c7a9bd 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -587,6 +587,7 @@ There are several different "modifiers" that you may use with these methods:
 * ``add_to_set`` -- add value to a list only if its not in the list already
 * ``rename`` -- rename the key name
 
+.. _need to add upsert=True: http://docs.mongodb.org/manual/reference/operator/update/setOnInsert
 .. _depending on the value: http://docs.mongodb.org/manual/reference/operator/update/pop/
 
 The syntax for atomic updates is similar to the querying syntax, but the

From 0b69e8316170b0ef7d9d9aa88bd796e86d618837 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Sat, 6 Jan 2024 10:48:07 +0200
Subject: [PATCH 1406/1519] CR

---
 docs/changelog.rst           | 2 +-
 docs/guide/querying.rst      | 5 ++---
 mongoengine/queryset/base.py | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index f9fff416e..42e325285 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,7 +8,7 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Fix for uuidRepresentation not read when provided in URI #2741
-- Add option to user array_filters https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered/
+- Add option to user array_filters https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered/ #2769
 - Fix combination of __raw__ and mongoengine syntax #2773
 - Add tests against MongoDB 6.0 and MongoDB 7.0 in the pipeline
 - Fix validate() not being called when inheritance is used in EmbeddedDocument and validate is overriden #2784
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index 0d791e8f2..d5ac70b07 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -261,9 +261,8 @@ This is done by using ``__raw__`` keyword argument to the update method and prov
 ::
 
     # assuming an initial 'tags' field == ['test1', 'test2', 'test3']
-    Page.objects().update(__raw__=
-                                  {'$set': {"tags.$[element]": 'test11111'}},
-                                  'array_filters': [{"element": {'$eq': 'test2'}}],
+    Page.objects().update(__raw__={'$set': {"tags.$[element]": 'test11111'}},
+                                  array_filters=[{"element": {'$eq': 'test2'}}],
 
     # updated 'tags' field == ['test1', 'test11111', 'test3']
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 1ea189960..e91eef9b9 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -562,14 +562,12 @@ def update(
 
         queryset = self.clone()
         query = queryset._query
-        if "__raw__" in update and isinstance(update["__raw__"], list):
+        if "__raw__" in update and isinstance(update["__raw__"], list):     # Case of Update with Aggregation Pipeline
             update = [
                 transform.update(queryset._document, **{"__raw__": u})
                 for u in update["__raw__"]
             ]
         else:
-            if "array_filters" in update:
-                array_filters = update.pop("array_filters")
             update = transform.update(queryset._document, **update)
         # If doing an atomic upsert on an inheritable class
         # then ensure we add _cls to the update operation

From 70636a2b4eaf10b3b4e597ef8f9ddb90282554f3 Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Sat, 6 Jan 2024 14:49:26 +0200
Subject: [PATCH 1407/1519] pre commit

---
 mongoengine/queryset/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index e91eef9b9..e0fb9cb26 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -562,7 +562,9 @@ def update(
 
         queryset = self.clone()
         query = queryset._query
-        if "__raw__" in update and isinstance(update["__raw__"], list):     # Case of Update with Aggregation Pipeline
+        if "__raw__" in update and isinstance(
+            update["__raw__"], list
+        ):  # Case of Update with Aggregation Pipeline
             update = [
                 transform.update(queryset._document, **{"__raw__": u})
                 for u in update["__raw__"]

From a4051a5ac65501e4985d0fa3bd60971efbfa56dc Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 15 Jan 2024 23:34:33 +0100
Subject: [PATCH 1408/1519] 2759_add_text_score_to_search_text

---
 docs/changelog.rst              |  2 ++
 mongoengine/base/document.py    |  2 +-
 mongoengine/queryset/base.py    | 10 ++++++++--
 tests/queryset/test_queryset.py | 15 ++++++++++++---
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 42e325285..67be970ea 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -19,6 +19,8 @@ Development
     as it was useless and making it look like it was returning a different class although it was the same.
     Thus, it must be called like `with no_dereference(User):` and no longer `with no_dereference(User) as ...:`
 - Added __raw__ to :meth:`~mongoengine.Queryset.order_by()` to allow to provide raw pymongo 'sort' argument and get around some of the limitations #2783
+- Add `text_score` argument on :meth:`~mongoengine.Document.search_text()` to allow text_score computation to be turned off
+    as it interfer with natural returned documents order #2759
 
 Changes in 0.27.0
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index e5311c5dd..194b24e2f 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -322,7 +322,7 @@ def get_text_score(self):
 
         if "_text_score" not in self._data:
             raise InvalidDocumentError(
-                "This document is not originally built from a text query"
+                "This document is not originally built from a text query (or text_score was not set on search_text() call)"
             )
 
         return self._data["_text_score"]
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index e0fb9cb26..3ce3cb3f2 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -71,6 +71,7 @@ def __init__(self, document, collection):
         self._none = False
         self._as_pymongo = False
         self._search_text = None
+        self._search_text_score = None
 
         self.__dereference = False
         self.__auto_dereference = True
@@ -229,7 +230,7 @@ def filter(self, *q_objs, **query):
         """An alias of :meth:`~mongoengine.queryset.QuerySet.__call__`"""
         return self.__call__(*q_objs, **query)
 
-    def search_text(self, text, language=None):
+    def search_text(self, text, language=None, text_score=True):
         """
         Start a text search, using text indexes.
         Require: MongoDB server version 2.6+.
@@ -239,6 +240,8 @@ def search_text(self, text, language=None):
             If not specified, the search uses the default language of the index.
             For supported languages, see
             `Text Search Languages <https://docs.mongodb.org/manual/reference/text-search-languages/#text-search-languages>`.
+        :param text_score:  True to have it return the text_score (available through get_text_score()), False to disable that
+            Note that unless you order the results, leaving text_score=True may provide randomness in the returned documents
         """
         queryset = self.clone()
         if queryset._search_text:
@@ -252,6 +255,7 @@ def search_text(self, text, language=None):
         queryset._mongo_query = None
         queryset._cursor_obj = None
         queryset._search_text = text
+        queryset._search_text_score = text_score
 
         return queryset
 
@@ -833,6 +837,7 @@ def _clone_into(self, new_qs):
             "_hint",
             "_collation",
             "_search_text",
+            "_search_text_score",
             "_max_time_ms",
             "_comment",
             "_batch_size",
@@ -1673,7 +1678,8 @@ def _cursor_args(self):
             if fields_name not in cursor_args:
                 cursor_args[fields_name] = {}
 
-            cursor_args[fields_name]["_text_score"] = {"$meta": "textScore"}
+            if self._search_text_score:
+                cursor_args[fields_name]["_text_score"] = {"$meta": "textScore"}
 
         return cursor_args
 
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 59c6577e7..042931654 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -3692,7 +3692,7 @@ class News(Document):
                 "t2", language="french"
             )
 
-    def test_text_indexes(self):
+    def test_search_text(self):
         class News(Document):
             title = StringField()
             content = StringField()
@@ -3751,14 +3751,16 @@ class News(Document):
         assert "dilma" in new.content
         assert "planejamento" in new.title
 
-        query = News.objects.search_text("candidata")
+        query = News.objects.search_text("candidata", text_score=True)
         assert query._search_text == "candidata"
         new = query.first()
 
         assert isinstance(new.get_text_score(), float)
 
         # count
-        query = News.objects.search_text("brasil").order_by("$text_score")
+        query = News.objects.search_text("brasil", text_score=True).order_by(
+            "$text_score"
+        )
         assert query._search_text == "brasil"
 
         assert query.count() == 3
@@ -3778,6 +3780,13 @@ class News(Document):
         item = News.objects.search_text("brasil").order_by("$text_score").first()
         assert item.get_text_score() == max_text_score
 
+        # Verify query reproducibility when text_score is disabled
+        # Following wouldn't work for text_score=True  #2759
+        for i in range(10):
+            qs1 = News.objects.search_text("brasil", text_score=False)
+            qs2 = News.objects.search_text("brasil", text_score=False)
+            assert list(qs1) == list(qs2)
+
     def test_distinct_handles_references_to_alias(self):
         register_connection("testdb", "mongoenginetest2")
 

From 41aa2b34f6a87da33a63fab7f6c2d605a385d9ab Mon Sep 17 00:00:00 2001
From: Bruce Roberts <bruce@invertbio.com>
Date: Mon, 12 Feb 2024 16:20:11 -0800
Subject: [PATCH 1409/1519] Update logging-monitoring.rst

Fix broken link - the link at mongodb.com gives a 404.
---
 docs/guide/logging-monitoring.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/logging-monitoring.rst b/docs/guide/logging-monitoring.rst
index 9f523b79c..5aedd1516 100644
--- a/docs/guide/logging-monitoring.rst
+++ b/docs/guide/logging-monitoring.rst
@@ -2,7 +2,7 @@
 Logging/Monitoring
 ==================
 
-It is possible to use `pymongo.monitoring <https://api.mongodb.com/python/current/api/pymongo/monitoring.html>`_ to monitor
+It is possible to use `pymongo.monitoring <https://pymongo.readthedocs.io/en/stable/api/pymongo/monitoring.html>`_ to monitor
 the driver events (e.g: queries, connections, etc). This can be handy if you want to monitor the queries issued by
 MongoEngine to the driver.
 

From 5e0a678aa39b0f1a7d4c8db5cf04efb760f63e46 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 1 Mar 2024 15:16:59 +0100
Subject: [PATCH 1410/1519] Prepare for 0.28.0

---
 docs/changelog.rst      | 5 ++++-
 mongoengine/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 67be970ea..0c767b576 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.28.0
+=================
 - Fix for uuidRepresentation not read when provided in URI #2741
 - Add option to user array_filters https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered/ #2769
 - Fix combination of __raw__ and mongoengine syntax #2773
@@ -20,7 +23,7 @@ Development
     Thus, it must be called like `with no_dereference(User):` and no longer `with no_dereference(User) as ...:`
 - Added __raw__ to :meth:`~mongoengine.Queryset.order_by()` to allow to provide raw pymongo 'sort' argument and get around some of the limitations #2783
 - Add `text_score` argument on :meth:`~mongoengine.Document.search_text()` to allow text_score computation to be turned off
-    as it interfer with natural returned documents order #2759
+    as it interfere with natural returned documents order #2759
 
 Changes in 0.27.0
 =================
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index a42755bb4..e0bf7d76d 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 27, 0)
+VERSION = (0, 28, 0)
 
 
 def get_version():

From a96f142d2a32bb0ce2317dc40de8d2cbb9e64873 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 4 Mar 2024 14:35:12 +0100
Subject: [PATCH 1411/1519] Fix bug in mutable thread local related with
 no_dereference ctx manager added in 0.28.0

---
 mongoengine/context_managers.py |  8 ++++--
 tests/test_context_managers.py  | 44 ++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index a4c90d476..f16753eea 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -20,8 +20,12 @@
 )
 
 
-thread_locals = threading.local()
-thread_locals.no_dereferencing_class = {}
+class MyThreadLocals(threading.local):
+    def __init__(self):
+        self.no_dereferencing_class = {}
+
+
+thread_locals = MyThreadLocals()
 
 
 def no_dereferencing_active_for_class(cls):
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index ac9ded729..6d1b76120 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -1,4 +1,7 @@
+import random
+import time
 import unittest
+from threading import Thread
 
 import pytest
 from bson import DBRef
@@ -18,6 +21,31 @@
 from tests.utils import MongoDBTestCase
 
 
+class TestableThread(Thread):
+    """
+    Wrapper around `threading.Thread` that propagates exceptions.
+
+    REF: https://gist.github.com/sbrugman/59b3535ebcd5aa0e2598293cfa58b6ab
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.exc = None
+
+    def run(self):
+        try:
+            super().run()
+        except BaseException as e:
+            self.exc = e
+        # finally:
+        #     del self._target, self._args, self._kwargs
+
+    def join(self, timeout=None):
+        super().join(timeout)
+        if self.exc:
+            raise self.exc
+
+
 class TestContextManagers(MongoDBTestCase):
     def test_set_write_concern(self):
         class User(Document):
@@ -172,13 +200,27 @@ class Group(Document):
                 group = Group.objects.first()
                 assert isinstance(group.ref, DBRef)
 
-            # make sure its still off here
+            # make sure it's still off here
             group = Group.objects.first()
             assert isinstance(group.ref, DBRef)
 
         group = Group.objects.first()
         assert isinstance(group.ref, User)
 
+        def run_in_thread(id):
+            time.sleep(random.uniform(0.1, 0.5))  # Force desync of threads
+            if id % 2 == 0:
+                with no_dereference(Group):
+                    group = Group.objects.first()
+                    assert isinstance(group.ref, DBRef)
+            else:
+                group = Group.objects.first()
+                assert isinstance(group.ref, User)
+
+        threads = [TestableThread(target=run_in_thread, args=(id,)) for id in range(10)]
+        _ = [th.start() for th in threads]
+        _ = [th.join() for th in threads]
+
     def test_no_dereference_context_manager_dbref(self):
         """Ensure that DBRef items in ListFields aren't dereferenced"""
 

From b12372375f034efb88bbc315db4cfd94feeac48f Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 4 Mar 2024 14:38:08 +0100
Subject: [PATCH 1412/1519] bump version and update changelog for 0.28.1

---
 docs/changelog.rst      | 4 ++++
 mongoengine/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0c767b576..81e1cf59e 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,10 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.28.1
+=================
+- Fix bug related with recent updates to no_dereference context manager #2799
+
 Changes in 0.28.0
 =================
 - Fix for uuidRepresentation not read when provided in URI #2741
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index e0bf7d76d..334ad0d08 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 28, 0)
+VERSION = (0, 28, 1)
 
 
 def get_version():

From 7b230270b1d568363a0797c0f81c4075cc3280c6 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 4 Mar 2024 19:08:23 +0100
Subject: [PATCH 1413/1519] remove commented code

---
 tests/test_context_managers.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 6d1b76120..69c8931dd 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -37,8 +37,6 @@ def run(self):
             super().run()
         except BaseException as e:
             self.exc = e
-        # finally:
-        #     del self._target, self._args, self._kwargs
 
     def join(self, timeout=None):
         super().join(timeout)

From 2d59e547babbbe42c5d9d79d97ab4f39a2629f80 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 7 Mar 2024 13:20:25 +0100
Subject: [PATCH 1414/1519] Fix typing that was used and is incompatible with
 pymongo3.7

---
 mongoengine/connection.py | 9 ++++-----
 tox.ini                   | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 27a2970f7..42a79434e 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -1,10 +1,7 @@
 import warnings
 
 from pymongo import MongoClient, ReadPreference, uri_parser
-from pymongo.common import (
-    _UUID_REPRESENTATIONS,
-    _CaseInsensitiveDictionary,
-)
+from pymongo.common import _UUID_REPRESENTATIONS
 from pymongo.database import _check_name
 
 # DriverInfo was added in PyMongo 3.7.
@@ -135,7 +132,9 @@ def _get_connection_settings(
                 if uri_dict.get(param):
                     conn_settings[param] = uri_dict[param]
 
-            uri_options: _CaseInsensitiveDictionary = uri_dict["options"]
+            uri_options = uri_dict[
+                "options"
+            ]  # uri_options is a _CaseInsensitiveDictionary
             if "replicaset" in uri_options:
                 conn_settings["replicaSet"] = uri_options["replicaset"]
             if "authsource" in uri_options:
diff --git a/tox.ini b/tox.ini
index 1608ebd17..361b7b98c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,8 +5,6 @@ envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4,mg432,mg441,mg460}
 commands =
     python setup.py test {posargs}
 deps =
-    mg34: pymongo>=3.4,<3.5
-    mg36: pymongo>=3.6,<3.7
     mg39: pymongo>=3.9,<3.10
     mg311: pymongo>=3.11,<3.12
     mg312: pymongo>=3.12,<3.13

From 1652b5b6bf78ca661275b84afdf9282ecb77b1a6 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 7 Mar 2024 13:22:03 +0100
Subject: [PATCH 1415/1519] update changelog and prepare release

---
 .github/workflows/github-actions.yml | 2 +-
 docs/changelog.rst                   | 4 ++++
 mongoengine/__init__.py              | 2 +-
 setup.py                             | 2 --
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index bed3ea878..8446a1e84 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9]
+        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, "pypy3.9"]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 81e1cf59e..81a0ce6dc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,10 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+Changes in 0.28.2
+=================
+- Fix typing import incompatible with Pymongo 3.7 #2802
+
 Changes in 0.28.1
 =================
 - Fix bug related with recent updates to no_dereference context manager #2799
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 334ad0d08..799dad6f7 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 28, 1)
+VERSION = (0, 28, 2)
 
 
 def get_version():
diff --git a/setup.py b/setup.py
index b1f175233..aebabc42e 100644
--- a/setup.py
+++ b/setup.py
@@ -98,8 +98,6 @@ def run_tests(self):
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",

From 9e3b48e718a852d664c241e066f87d0c521e3b26 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 9 Mar 2024 18:20:20 +0100
Subject: [PATCH 1416/1519] Remove 'python setup.py test' usage in tox

---
 .github/workflows/github-actions.yml | 10 +--
 requirements-dev.txt                 |  4 +-
 setup.py                             | 97 ++++------------------------
 tox.ini                              |  4 +-
 4 files changed, 22 insertions(+), 93 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 8446a1e84..e5d765470 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -26,11 +26,11 @@ env:
   PYMONGO_3_11: 3.11
   PYMONGO_3_12: 3.12
   PYMONGO_4_0: 4.0
-  PYMONGO_4_3: 4.3.2
+  PYMONGO_4_3: 4.3.3
   PYMONGO_4_4: 4.4.1
-  PYMONGO_4_6: 4.6.0
+  PYMONGO_4_6: 4.6.2
 
-  MAIN_PYTHON_VERSION: 3.7
+  MAIN_PYTHON_VERSION: 3.9
 
 jobs:
   linting:
@@ -53,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, "pypy3.9"]
+        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9, pypy3.10]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
@@ -110,7 +110,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.9
         check-latest: true
     - name: install python dep
       run: |
diff --git a/requirements-dev.txt b/requirements-dev.txt
index f9d0595f1..aa3d3a1ec 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,5 @@
-black
-flake8
 pre-commit
-pytest
 ipdb
 ipython
 tox
+-e .[test]
diff --git a/setup.py b/setup.py
index aebabc42e..25d2a1a19 100644
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,6 @@
 import os
-import sys
 
-from pkg_resources import normalize_path
 from setuptools import find_packages, setup
-from setuptools.command.test import test as TestCommand
-
-# Hack to silence atexit traceback in newer python versions
-try:
-    import multiprocessing  # noqa: F401
-except ImportError:
-    pass
 
 DESCRIPTION = "MongoEngine is a Python Object-Document Mapper for working with MongoDB."
 
@@ -27,62 +18,6 @@ def get_version(version_tuple):
     return ".".join(map(str, version_tuple))
 
 
-class PyTest(TestCommand):
-    """Will force pytest to search for tests inside the build directory
-    for 2to3 converted code (used by tox), instead of the current directory.
-    Required as long as we need 2to3
-
-    Known Limitation: https://tox.readthedocs.io/en/latest/example/pytest.html#known-issues-and-limitations
-    Source: https://www.hackzine.org/python-testing-with-pytest-and-2to3-plus-tox-and-travis-ci.html
-    """
-
-    # https://pytest.readthedocs.io/en/2.7.3/goodpractises.html#integration-with-setuptools-test-commands
-    # Allows to provide pytest command argument through the test runner command `python setup.py test`
-    # e.g: `python setup.py test -a "-k=test"`
-    # This only works for 1 argument though
-    user_options = [("pytest-args=", "a", "Arguments to pass to py.test")]
-
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = ""
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = ["tests"]
-        self.test_suite = True
-
-    def run_tests(self):
-        # import here, cause outside the eggs aren't loaded
-        import pytest
-        from pkg_resources import _namespace_packages
-
-        # Purge modules under test from sys.modules. The test loader will
-        # re-import them from the build location. Required when 2to3 is used
-        # with namespace packages.
-        if sys.version_info >= (3,) and getattr(self.distribution, "use_2to3", False):
-            module = self.test_args[-1].split(".")[0]
-            if module in _namespace_packages:
-                del_modules = []
-                if module in sys.modules:
-                    del_modules.append(module)
-                module += "."
-                for name in sys.modules:
-                    if name.startswith(module):
-                        del_modules.append(name)
-                map(sys.modules.__delitem__, del_modules)
-
-            # Run on the build directory for 2to3-built code
-            # This will prevent the old 2.x code from being found
-            # by py.test discovery mechanism, that apparently
-            # ignores sys.path..
-            ei_cmd = self.get_finalized_command("egg_info")
-            self.test_args = [normalize_path(ei_cmd.egg_base)]
-
-        cmd_args = self.test_args + ([self.pytest_args] if self.pytest_args else [])
-        errno = pytest.main(cmd_args)
-        sys.exit(errno)
-
-
 # Dirty hack to get version number from monogengine/__init__.py - we can't
 # import it as it depends on PyMongo and PyMongo isn't installed until this
 # file is read
@@ -107,22 +42,14 @@ def run_tests(self):
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
-extra_opts = {
-    "packages": find_packages(exclude=["tests", "tests.*"]),
-    "tests_require": [
-        "pytest",
-        "pytest-cov",
-        "coverage",
-        "blinker",
-        "Pillow>=7.0.0",
-    ],
-}
-
-if "test" in sys.argv:
-    extra_opts["packages"] = find_packages()
-    extra_opts["package_data"] = {
-        "tests": ["fields/mongoengine.png", "fields/mongodb_leaf.png"]
-    }
+install_require = ["pymongo>=3.4,<5.0"]
+tests_require = [
+    "pytest",
+    "pytest-cov",
+    "coverage",
+    "blinker",
+    "Pillow>=7.0.0",
+]
 
 setup(
     name="mongoengine",
@@ -140,7 +67,9 @@ def run_tests(self):
     platforms=["any"],
     classifiers=CLASSIFIERS,
     python_requires=">=3.7",
-    install_requires=["pymongo>=3.4,<5.0"],
-    cmdclass={"test": PyTest},
-    **extra_opts
+    install_requires=install_require,
+    extras_require={
+        "test": tests_require,
+    },
+    packages=find_packages(exclude=["tests", "tests.*"]),
 )
diff --git a/tox.ini b/tox.ini
index 361b7b98c..daf97ad3e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,12 @@
 [tox]
 envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4,mg432,mg441,mg460}
+skipsdist = True
 
 [testenv]
 commands =
-    python setup.py test {posargs}
+    pytest tests/ {posargs}
 deps =
+    -rrequirements-dev.txt
     mg39: pymongo>=3.9,<3.10
     mg311: pymongo>=3.11,<3.12
     mg312: pymongo>=3.12,<3.13

From cc5a49134442275f768b0356f2f5f2ef26f1d73a Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 9 Mar 2024 18:23:37 +0100
Subject: [PATCH 1417/1519] rollback py in doc build + fix tox exec for pytest

---
 .github/workflows/github-actions.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index e5d765470..6913d5a54 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -91,9 +91,9 @@ jobs:
         bash .github/workflows/install_ci_python_dep.sh
         bash .github/workflows/start_mongo.sh ${{ matrix.MONGODB }}
     - name: tox dry-run (to pre-install venv)
-      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "-k=test_ci_placeholder"
+      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- "-k=test_ci_placeholder"
     - name: Run test suite
-      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- -a "--cov=mongoengine"
+      run: tox -e $(echo py${{ matrix.python-version }}-mg${{ matrix.PYMONGO }} | tr -d . | sed -e 's/pypypy/pypy/') -- "--cov=mongoengine"
     - name: Send coverage to Coveralls
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -110,7 +110,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: 3.7
         check-latest: true
     - name: install python dep
       run: |

From d4df743a5a46d40c6b2d45a738aa28d088ee8263 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 9 Mar 2024 18:32:50 +0100
Subject: [PATCH 1418/1519] fix tox vs pymongo version mapping

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index daf97ad3e..fb51d13b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,8 +11,8 @@ deps =
     mg311: pymongo>=3.11,<3.12
     mg312: pymongo>=3.12,<3.13
     mg4: pymongo>=4.0,<4.1
-    mg432: pymongo>=4.3,<4.4
+    mg433: pymongo>=4.3,<4.4
     mg441: pymongo>=4.4,<4.5
-    mg460: pymongo>=4.6,<4.7
+    mg462: pymongo>=4.6,<4.7
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 82cbd97e723ff8b2662cafc2b40f891b0598b1bb Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 10 Mar 2024 12:48:11 +0100
Subject: [PATCH 1419/1519] autoupdate pc hooks

---
 .pre-commit-config.yaml             | 10 +++++-----
 benchmarks/test_basic_doc_ops.py    | 14 ++++----------
 mongoengine/mongodb_support.py      |  1 +
 mongoengine/pymongo_support.py      |  1 +
 mongoengine/signals.py              |  6 +++---
 tests/all_warnings/test_warnings.py |  1 +
 6 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b5e342679..27d1ef1f5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,28 +1,28 @@
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 23.9.1
+    rev: 24.2.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         additional_dependencies:
           - importlib_metadata<5
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.14.0
+    rev: v3.15.1
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
diff --git a/benchmarks/test_basic_doc_ops.py b/benchmarks/test_basic_doc_ops.py
index 8b8bf4aaf..3f02ef24d 100644
--- a/benchmarks/test_basic_doc_ops.py
+++ b/benchmarks/test_basic_doc_ops.py
@@ -60,13 +60,9 @@ def save_book():
     print("Save to database: %.3fus" % (timeit(save_book, 100) * 10**6))
 
     son = b.to_mongo()
-    print(
-        "Load from SON: %.3fus" % (timeit(lambda: Book._from_son(son), 1000) * 10**6)
-    )
+    print("Load from SON: %.3fus" % (timeit(lambda: Book._from_son(son), 1000) * 10**6))
 
-    print(
-        "Load from database: %.3fus" % (timeit(lambda: Book.objects[0], 100) * 10**6)
-    )
+    print("Load from database: %.3fus" % (timeit(lambda: Book.objects[0], 100) * 10**6))
 
     def create_and_delete_book():
         b = init_book()
@@ -116,13 +112,11 @@ def save_company():
 
     son = company.to_mongo()
     print(
-        "Load from SON: %.3fms"
-        % (timeit(lambda: Company._from_son(son), 100) * 10**3)
+        "Load from SON: %.3fms" % (timeit(lambda: Company._from_son(son), 100) * 10**3)
     )
 
     print(
-        "Load from database: %.3fms"
-        % (timeit(lambda: Company.objects[0], 100) * 10**3)
+        "Load from database: %.3fms" % (timeit(lambda: Company.objects[0], 100) * 10**3)
     )
 
     def create_and_delete_company():
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index 23c538d02..f15a72c96 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -1,6 +1,7 @@
 """
 Helper functions, constants, and types to aid with MongoDB version support
 """
+
 from mongoengine.connection import get_connection
 
 # Constant that can be used to compare the version retrieved with
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 7aa55676b..674a9b662 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -1,6 +1,7 @@
 """
 Helper functions, constants, and types to aid with PyMongo support.
 """
+
 import pymongo
 from bson import binary, json_util
 from pymongo.errors import OperationFailure
diff --git a/mongoengine/signals.py b/mongoengine/signals.py
index 582b533dc..940209a57 100644
--- a/mongoengine/signals.py
+++ b/mongoengine/signals.py
@@ -38,9 +38,9 @@ def _fail(self, *args, **kwargs):
             )
 
         send = lambda *a, **kw: None  # noqa
-        connect = (
-            disconnect
-        ) = has_receivers_for = receivers_for = temporarily_connected_to = _fail
+        connect = disconnect = has_receivers_for = receivers_for = (
+            temporarily_connected_to
+        ) = _fail
         del _fail
 
 
diff --git a/tests/all_warnings/test_warnings.py b/tests/all_warnings/test_warnings.py
index a99101212..187964eb0 100644
--- a/tests/all_warnings/test_warnings.py
+++ b/tests/all_warnings/test_warnings.py
@@ -3,6 +3,7 @@
 only get triggered on first hit.  This way we can ensure its imported into the
 top level and called first by the test suite.
 """
+
 import unittest
 import warnings
 

From bd58f957d91c3d4f4396cacba2696e7e60858999 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 10 Mar 2024 12:52:21 +0100
Subject: [PATCH 1420/1519] update changelog and doc

---
 CONTRIBUTING.rst   |  2 +-
 README.rst         | 12 +-----------
 docs/changelog.rst |  1 +
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index fb1838871..5bda87613 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -82,7 +82,7 @@ General Guidelines
   should adapt to the breaking change in docs/upgrade.rst.
 - Write inline documentation for new classes and methods.
 - Write tests and make sure they pass (make sure you have a mongod
-  running on the default port, then execute ``python setup.py test``
+  running on the default port, then execute ``pytest tests/``
   from the cmd line to run the test suite).
 - Ensure tests pass on all supported Python, PyMongo, and MongoDB versions.
   You can test various Python and PyMongo versions locally by executing
diff --git a/README.rst b/README.rst
index 64e43b6bc..d992da2b3 100644
--- a/README.rst
+++ b/README.rst
@@ -125,8 +125,7 @@ Some simple examples of what MongoEngine code looks like:
 Tests
 =====
 To run the test suite, ensure you are running a local instance of MongoDB on
-the standard port and have ``pytest`` installed. Then, run ``python setup.py test``
-or simply ``pytest``.
+the standard port and have ``pytest`` installed. Then, run ``pytest tests/``.
 
 To run the test suite on every supported Python and PyMongo version, you can
 use ``tox``. You'll need to make sure you have each supported Python version
@@ -139,15 +138,6 @@ installed in your environment and then:
     # Run the test suites
     $ tox
 
-If you wish to run a subset of tests, use the pytest convention:
-
-.. code-block:: shell
-
-    # Run all the tests in a particular test file
-    $ pytest tests/fields/test_fields.py
-    # Run only particular test class in that file
-    $ pytest tests/fields/test_fields.py::TestField
-
 Community
 =========
 - `MongoEngine Users mailing list
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 81a0ce6dc..bcb465a87 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Switch tox to use pytest instead of legacy `python setup.py test` #2804
 
 Changes in 0.28.2
 =================

From c4149c53216f65014debe96e91c7e465b9608be9 Mon Sep 17 00:00:00 2001
From: Sean Bermejo <sean@Seans-MacBook-Pro.local>
Date: Mon, 1 Apr 2024 09:34:39 +0800
Subject: [PATCH 1421/1519] Add Decimal128Field to docs/apireference.rst

---
 AUTHORS               | 1 +
 docs/apireference.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 40508b532..0a50af7f3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -264,3 +264,4 @@ that much better:
  * oleksandr-l5 (https://github.com/oleksandr-l5)
  * Ido Shraga (https://github.com/idoshr)
  * Terence Honles (https://github.com/terencehonles)
+ * Sean Bermejo (https://github.com/seanbermejo)
diff --git a/docs/apireference.rst b/docs/apireference.rst
index dbcb3b84e..5cc8a2947 100644
--- a/docs/apireference.rst
+++ b/docs/apireference.rst
@@ -80,6 +80,7 @@ Fields
 .. autoclass:: mongoengine.fields.LongField
 .. autoclass:: mongoengine.fields.FloatField
 .. autoclass:: mongoengine.fields.DecimalField
+.. autoclass:: mongoengine.fields.Decimal128Field
 .. autoclass:: mongoengine.fields.BooleanField
 .. autoclass:: mongoengine.fields.DateTimeField
 .. autoclass:: mongoengine.fields.ComplexDateTimeField

From e31128093711cdd6134d67fce366059afd8088d3 Mon Sep 17 00:00:00 2001
From: neolooong <j31422210@gmail.com>
Date: Thu, 20 Jun 2024 21:38:52 +0800
Subject: [PATCH 1422/1519] Add missing weakref.proxy

---
 mongoengine/base/datastructures.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index a3561b8b1..a61dedf4b 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -113,7 +113,10 @@ def __init__(self, list_items, instance, name):
         BaseDocument = _import_class("BaseDocument")
 
         if isinstance(instance, BaseDocument):
-            self._instance = weakref.proxy(instance)
+            if isinstance(instance, weakref.ProxyTypes):
+                self._instance = instance
+            else:
+                self._instance = weakref.proxy(instance)
         self._name = name
         super().__init__(list_items)
 
@@ -188,7 +191,10 @@ def _mark_as_changed(self, key=None):
 class EmbeddedDocumentList(BaseList):
     def __init__(self, list_items, instance, name):
         super().__init__(list_items, instance, name)
-        self._instance = instance
+        if isinstance(instance, weakref.ProxyTypes):
+            self._instance = instance
+        else:
+            self._instance = weakref.proxy(instance)
 
     @classmethod
     def __match_all(cls, embedded_doc, kwargs):

From 58e5311e5b72cfe364fb12e39c0cdb23d210c50e Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Wed, 14 Aug 2024 16:28:18 +0200
Subject: [PATCH 1423/1519] add pymongo 4.7 and pymongo 4.8 to the CI

---
 .github/workflows/github-actions.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 6913d5a54..622941862 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -29,6 +29,8 @@ env:
   PYMONGO_4_3: 4.3.3
   PYMONGO_4_4: 4.4.1
   PYMONGO_4_6: 4.6.2
+  PYMONGO_4_7: 4.7.3
+  PYMONGO_4_8: 4.8.0
 
   MAIN_PYTHON_VERSION: 3.9
 
@@ -78,6 +80,12 @@ jobs:
           - python-version: "3.11"
             MONGODB: $MONGODB_7_0
             PYMONGO: $PYMONGO_4_6
+          - python-version: "3.11"
+            MONGODB: $MONGODB_7_0
+            PYMONGO: $PYMONGO_4_7
+          - python-version: "3.11"
+            MONGODB: $MONGODB_7_0
+            PYMONGO: $PYMONGO_4_8
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

From 04f7f88a4dd7195d4d827adbd9786d861d70adad Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Wed, 14 Aug 2024 17:05:12 +0200
Subject: [PATCH 1424/1519] Add support for installing mongosh when mongodb is
 greater than 6.0

---
 .github/workflows/github-actions.yml |  3 +++
 .github/workflows/install_mongosh.sh | 15 +++++++++++++++
 .github/workflows/start_mongo.sh     |  7 ++++++-
 tox.ini                              |  4 +++-
 4 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/install_mongosh.sh

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 622941862..3859bc929 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -34,6 +34,8 @@ env:
 
   MAIN_PYTHON_VERSION: 3.9
 
+  MONGOSH: 2.2.15 # Needed for MongoDB 6.0+
+
 jobs:
   linting:
     # Run pre-commit (https://pre-commit.com/)
@@ -96,6 +98,7 @@ jobs:
     - name: install mongo and ci dependencies
       run: |
         bash .github/workflows/install_mongo.sh ${{ matrix.MONGODB }}
+        bash .github/workflows/install_mongosh.sh ${{ matrix.MONGODB }} ${{ env.MONGOSH }}
         bash .github/workflows/install_ci_python_dep.sh
         bash .github/workflows/start_mongo.sh ${{ matrix.MONGODB }}
     - name: tox dry-run (to pre-install venv)
diff --git a/.github/workflows/install_mongosh.sh b/.github/workflows/install_mongosh.sh
new file mode 100644
index 000000000..aded1826f
--- /dev/null
+++ b/.github/workflows/install_mongosh.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+MONGODB=$1
+MONGOSH=$2
+
+if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
+  echo "mongosh is not needed for MongoDB versions less than 6.0"
+  exit 0
+fi
+
+wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH}-linux-x64.tgz
+tar xzf mongosh-${MONGOSH}-linux-x64.tgz
+
+mongosh_dir=$(find ${PWD}/ -type d -name "mongosh-${MONGOSH}-linux-x64")
+$mongosh_dir/bin/mongosh --version
diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
index 800004c87..f493f37a5 100644
--- a/.github/workflows/start_mongo.sh
+++ b/.github/workflows/start_mongo.sh
@@ -6,4 +6,9 @@ mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
 
 mkdir $mongodb_dir/data
 $mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork
-mongo --eval 'db.version();'    # Make sure mongo is awake
+
+if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
+mongo --quiet --eval 'db.runCommand("ping").ok'    # Make sure mongo is awake
+else
+mongosh --quiet  --eval 'db.runCommand("ping").ok'  # Make sure mongo is awake
+fi
diff --git a/tox.ini b/tox.ini
index fb51d13b3..f72861ba4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4,mg432,mg441,mg460}
+envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4,mg432,mg441,mg462,mg473,mg480}
 skipsdist = True
 
 [testenv]
@@ -14,5 +14,7 @@ deps =
     mg433: pymongo>=4.3,<4.4
     mg441: pymongo>=4.4,<4.5
     mg462: pymongo>=4.6,<4.7
+    mg473: pymongo>=4.7,<4.8
+    mg480: pymongo>=4.8,<4.9
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From e5ec6803a8b9d5fff1de506b099ec4248d9333fc Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Thu, 15 Aug 2024 16:15:58 +0200
Subject: [PATCH 1425/1519] document complex code related with _created
 management

---
 mongoengine/base/document.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 194b24e2f..053242234 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -202,6 +202,8 @@ def __setattr__(self, name, value):
             and self__created
             and name == self._meta.get("id_field")
         ):
+            # When setting the ID field of an instance already instantiated and that was user-created (i.e not saved in db yet)
+            # Typically this is when calling .save()
             super().__setattr__("_created", False)
 
         super().__setattr__(name, value)

From a9a9271d05ab2a1ac60c056a8ece938273592e9d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 16 Aug 2024 12:58:17 +0200
Subject: [PATCH 1426/1519] Improve weakref.proxy implementation for embedded
 documents

---
 mongoengine/base/datastructures.py           |  8 +-------
 tests/fields/test_embedded_document_field.py | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index a61dedf4b..a175cd119 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -117,6 +117,7 @@ def __init__(self, list_items, instance, name):
                 self._instance = instance
             else:
                 self._instance = weakref.proxy(instance)
+
         self._name = name
         super().__init__(list_items)
 
@@ -189,13 +190,6 @@ def _mark_as_changed(self, key=None):
 
 
 class EmbeddedDocumentList(BaseList):
-    def __init__(self, list_items, instance, name):
-        super().__init__(list_items, instance, name)
-        if isinstance(instance, weakref.ProxyTypes):
-            self._instance = instance
-        else:
-            self._instance = weakref.proxy(instance)
-
     @classmethod
     def __match_all(cls, embedded_doc, kwargs):
         """Return True if a given embedded doc matches all the filter
diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index fefee4efd..24518c50b 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -1,3 +1,4 @@
+import weakref
 from copy import deepcopy
 
 import pytest
@@ -62,6 +63,21 @@ class MyFailingDoc(Document):
             class MyFailingdoc2(Document):
                 emb = EmbeddedDocumentField("MyDoc")
 
+    def test_embedded_document_field_has_a_weakref__instance_reference(self):
+        class Wallet(EmbeddedDocument):
+            money = IntField()
+
+        class WalletOwner(Document):
+            name = StringField()
+            wallet = EmbeddedDocumentField(Wallet)
+
+        WalletOwner.drop_collection()
+
+        wallet = Wallet(money=100)
+        owner = WalletOwner(name="John", wallet=wallet)
+        assert wallet._instance is owner
+        assert isinstance(wallet._instance, weakref.ProxyTypes)
+
     def test_embedded_document_field_validate_subclass(self):
         class BaseItem(EmbeddedDocument):
             f = IntField()

From 1e56b1fb718cca0511ab1e79f194eb85495f792c Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 16 Aug 2024 16:25:03 +0200
Subject: [PATCH 1427/1519] Add test case for BaseList/EmbeddedDocListField
 weakref bugfix

---
 tests/fields/test_embedded_document_field.py | 41 +++++++++++++-------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/tests/fields/test_embedded_document_field.py b/tests/fields/test_embedded_document_field.py
index 24518c50b..a892c0dcd 100644
--- a/tests/fields/test_embedded_document_field.py
+++ b/tests/fields/test_embedded_document_field.py
@@ -63,20 +63,35 @@ class MyFailingDoc(Document):
             class MyFailingdoc2(Document):
                 emb = EmbeddedDocumentField("MyDoc")
 
-    def test_embedded_document_field_has_a_weakref__instance_reference(self):
-        class Wallet(EmbeddedDocument):
-            money = IntField()
-
-        class WalletOwner(Document):
-            name = StringField()
-            wallet = EmbeddedDocumentField(Wallet)
-
-        WalletOwner.drop_collection()
+    def test_embedded_document_list_field__has__instance_weakref(self):
+        class Comment(EmbeddedDocument):
+            content = StringField()
 
-        wallet = Wallet(money=100)
-        owner = WalletOwner(name="John", wallet=wallet)
-        assert wallet._instance is owner
-        assert isinstance(wallet._instance, weakref.ProxyTypes)
+        class Post(Document):
+            title = StringField()
+            comment = EmbeddedDocumentField(Comment)
+            comments = EmbeddedDocumentListField(Comment)
+            comments2 = ListField(EmbeddedDocumentField(Comment))
+
+        Post.drop_collection()
+
+        for i in range(5):
+            Post(
+                title=f"{i}",
+                comment=Comment(content=f"{i}"),
+                comments=[Comment(content=f"{i}")],
+                comments2=[Comment(content=f"{i}")],
+            ).save()
+
+        posts = list(Post.objects)
+        for post in posts:
+            assert isinstance(post.comments._instance, weakref.ProxyTypes)
+            assert isinstance(post.comments2._instance, weakref.ProxyTypes)
+            assert isinstance(post.comment._instance, weakref.ProxyTypes)
+            for comment in post.comments:
+                assert isinstance(comment._instance, weakref.ProxyTypes)
+            for comment2 in post.comments2:
+                assert isinstance(comment2._instance, weakref.ProxyTypes)
 
     def test_embedded_document_field_validate_subclass(self):
         class BaseItem(EmbeddedDocument):

From ea1c3eeb5d06d6f125e6282f9a10ae71f822284c Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 17 Aug 2024 14:14:33 +0200
Subject: [PATCH 1428/1519] #2814 allow_list_as_value_for_gte_lte_ne

---
 docs/changelog.rst                |  1 +
 mongoengine/fields.py             |  8 +++----
 tests/queryset/test_field_list.py | 39 +++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bcb465a87..af8f2f76c 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Allow gt/gte/lt/lte/ne operators to be used with a list as value on ListField #2813
 - Switch tox to use pytest instead of legacy `python setup.py test` #2804
 
 Changes in 0.28.2
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 40469bfce..27a0826a4 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -951,11 +951,11 @@ def prepare_query_value(self, op, value):
         if self.field:
             # If the value is iterable and it's not a string nor a
             # BaseDocument, call prepare_query_value for each of its items.
+            is_iter = hasattr(value, "__iter__")
+            eligible_iter = is_iter and not isinstance(value, (str, BaseDocument))
             if (
-                op in ("set", "unset", None)
-                and hasattr(value, "__iter__")
-                and not isinstance(value, str)
-                and not isinstance(value, BaseDocument)
+                op in ("set", "unset", "gt", "gte", "lt", "lte", "ne", None)
+                and eligible_iter
             ):
                 return [self.field.prepare_query_value(op, v) for v in value]
 
diff --git a/tests/queryset/test_field_list.py b/tests/queryset/test_field_list.py
index 96bd804d9..25a7c7619 100644
--- a/tests/queryset/test_field_list.py
+++ b/tests/queryset/test_field_list.py
@@ -459,6 +459,45 @@ class User(Base):
         with pytest.raises(LookUpError):
             Base.objects.exclude("made_up")
 
+    def test_gt_gte_lt_lte_ne_operator_with_list(self):
+        class Family(Document):
+            ages = ListField(field=FloatField())
+
+        Family.drop_collection()
+
+        Family(ages=[1.0, 2.0]).save()
+        Family(ages=[]).save()
+
+        qs = list(Family.objects(ages__gt=[1.0]))
+        assert len(qs) == 1
+        assert qs[0].ages == [1.0, 2.0]
+
+        qs = list(Family.objects(ages__gt=[1.0, 1.99]))
+        assert len(qs) == 1
+        assert qs[0].ages == [1.0, 2.0]
+
+        qs = list(Family.objects(ages__gt=[]))
+        assert len(qs) == 1
+        assert qs[0].ages == [1.0, 2.0]
+
+        qs = list(Family.objects(ages__gte=[1.0, 2.0]))
+        assert len(qs) == 1
+        assert qs[0].ages == [1.0, 2.0]
+
+        qs = list(Family.objects(ages__lt=[1.0]))
+        assert len(qs) == 1
+        assert qs[0].ages == []
+
+        qs = list(Family.objects(ages__lte=[5.0]))
+        assert len(qs) == 2
+
+        qs = list(Family.objects(ages__ne=[5.0]))
+        assert len(qs) == 2
+
+        qs = list(Family.objects(ages__ne=[]))
+        assert len(qs) == 1
+        assert qs[0].ages == [1.0, 2.0]
+
 
 if __name__ == "__main__":
     unittest.main()

From 5e0b48f8f3474b15a5b25ec3e4dcd25e5703e269 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 18 Aug 2024 00:03:28 +0200
Subject: [PATCH 1429/1519] #2818 fix RTD build error

---
 .readthedocs.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.readthedocs.yml b/.readthedocs.yml
index 08a36676a..8598e4813 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -11,10 +11,16 @@ sphinx:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.7
+  version: 3.9
   install:
     - requirements: docs/requirements.txt
     # docs/conf.py is importing mongoengine
     # so mongoengine needs to be installed as well
     - method: setuptools
       path: .
+
+# Specify the build environment
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.9"

From 4b56156c736115df36cecd3afef524b810038597 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 18 Aug 2024 00:12:59 +0200
Subject: [PATCH 1430/1519] more fixes for RTD

---
 .github/workflows/github-actions.yml | 2 ++
 .readthedocs.yml                     | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 3859bc929..17c204b69 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -115,6 +115,8 @@ jobs:
   build_doc_dryrun:
     # ensures that readthedocs can be built continuously
     # to avoid that it breaks when new releases are being created
+    # The way RTD works is that it builds the doc on its side
+    # builds are visible at https://readthedocs.org/projects/mongoengine-odm/builds/
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
diff --git a/.readthedocs.yml b/.readthedocs.yml
index 8598e4813..a913f8426 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -11,7 +11,6 @@ sphinx:
 
 # Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.9
   install:
     - requirements: docs/requirements.txt
     # docs/conf.py is importing mongoengine

From 6f7f7b79754eba2aa234061a9a9ef10cddb76527 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 18 Aug 2024 13:44:14 +0200
Subject: [PATCH 1431/1519] update maintainer + add readthedocs build status
 badge

---
 README.rst | 6 +++++-
 setup.py   | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index d992da2b3..92473f351 100644
--- a/README.rst
+++ b/README.rst
@@ -4,7 +4,7 @@ MongoEngine
 :Info: MongoEngine is an ORM-like layer on top of PyMongo.
 :Repository: https://github.com/MongoEngine/mongoengine
 :Author: Harry Marr (http://github.com/hmarr)
-:Maintainer: Stefan Wójcik (http://github.com/wojcikstefan)
+:Maintainer: Bastien Gerard (http://github.com/bagerard)
 
 .. image:: https://travis-ci.org/MongoEngine/mongoengine.svg?branch=master
   :target: https://travis-ci.org/MongoEngine/mongoengine
@@ -21,6 +21,10 @@ MongoEngine
 .. image:: https://img.shields.io/pypi/v/mongoengine.svg
   :target: https://pypi.python.org/pypi/mongoengine
 
+
+.. image:: https://readthedocs.org/projects/mongoengine-odm/badge/?version=latest
+  :target: https://readthedocs.org/projects/mongoengine-odm/builds/
+
 About
 =====
 MongoEngine is a Python Object-Document Mapper for working with MongoDB.
diff --git a/setup.py b/setup.py
index 25d2a1a19..a629d5b12 100644
--- a/setup.py
+++ b/setup.py
@@ -56,8 +56,8 @@ def get_version(version_tuple):
     version=VERSION,
     author="Harry Marr",
     author_email="harry.marr@gmail.com",
-    maintainer="Stefan Wojcik",
-    maintainer_email="wojcikstefan@gmail.com",
+    maintainer="Bastien Gerard",
+    maintainer_email="bast.gerard@gmail.com",
     url="http://mongoengine.org/",
     download_url="https://github.com/MongoEngine/mongoengine/tarball/master",
     license="MIT",

From afcd26ec032697b07141858498798e501f1ec617 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Mon, 19 Aug 2024 16:28:31 -0400
Subject: [PATCH 1432/1519] Get linters passing

---
 mongoengine/queryset/base.py | 6 +++++-
 tests/test_connection.py     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index e99f28374..598dbf0e1 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -590,7 +590,11 @@ def update(
                 if multi:
                     update_func = collection.update_many
                 result = update_func(
-                    query, update, upsert=upsert, array_filters=array_filters, session=_get_session()
+                    query,
+                    update,
+                    upsert=upsert,
+                    array_filters=array_filters,
+                    session=_get_session(),
                 )
             if full_result:
                 return result
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 95629c865..02050360d 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -30,8 +30,8 @@
 from mongoengine.connection import (
     DEFAULT_DATABASE_NAME,
     ConnectionFailure,
-    _get_session,
     _get_connection_settings,
+    _get_session,
     disconnect,
     get_connection,
     get_db,

From 0c58a62a999f4c55a0d6ebb0aff47a755816b6eb Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Mon, 19 Aug 2024 16:31:42 -0400
Subject: [PATCH 1433/1519] coundt_docs: Only pass session kwarg to methods
 that expect it

---
 mongoengine/pymongo_support.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 143ba38e0..11c454f1f 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -36,7 +36,6 @@ def count_documents(
         kwargs["hint"] = hint
     if collation is not None:
         kwargs["collation"] = collation
-    kwargs["session"] = connection._get_session()
 
     # count_documents appeared in pymongo 3.7
     if PYMONGO_VERSION >= (3, 7):
@@ -44,9 +43,13 @@ def count_documents(
             if not filter and set(kwargs) <= {"max_time_ms"}:
                 # when no filter is provided, estimated_document_count
                 # is a lot faster as it uses the collection metadata
-                return collection.estimated_document_count(**kwargs)
+                return collection.estimated_document_count(
+                    session=connection._get_session(), **kwargs
+                )
             else:
-                return collection.count_documents(filter=filter, **kwargs)
+                return collection.count_documents(
+                    filter=filter, session=connection._get_session(), **kwargs
+                )
         except OperationFailure as err:
             if PYMONGO_VERSION >= (4,):
                 raise

From 21a7b9f99ee4251bb44f51e5eee9ad2229a29a7c Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Mon, 19 Aug 2024 16:39:06 -0400
Subject: [PATCH 1434/1519] estimated_document_count doesn't take session as a
 kwarg

---
 mongoengine/pymongo_support.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index 11c454f1f..c4f0f8ab6 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -43,9 +43,7 @@ def count_documents(
             if not filter and set(kwargs) <= {"max_time_ms"}:
                 # when no filter is provided, estimated_document_count
                 # is a lot faster as it uses the collection metadata
-                return collection.estimated_document_count(
-                    session=connection._get_session(), **kwargs
-                )
+                return collection.estimated_document_count(**kwargs)
             else:
                 return collection.count_documents(
                     filter=filter, session=connection._get_session(), **kwargs

From 9653a80b4f31dcca229b08de86e8212e46b71a19 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Tue, 20 Aug 2024 08:51:13 -0400
Subject: [PATCH 1435/1519] Get repl set initiated in gh actions

W/out --verbose argument, mongo4 would throw errors. Could not reproduce
locally and this was the only thing that would consistently work in the github
action.
---
 .github/workflows/start_mongo.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
index 7f67cef3d..ce2eff8e6 100644
--- a/.github/workflows/start_mongo.sh
+++ b/.github/workflows/start_mongo.sh
@@ -8,9 +8,9 @@ mkdir $mongodb_dir/data
 
 $mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork --replSet mongoengine
 if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
-mongo --quiet --eval 'db.runCommand("ping").ok'    # Make sure mongo is awake
-mongo --quiet --eval "rs.initiate()"
+mongo --verbose --eval "rs.initiate()"
+mongo --quiet --eval "rs.status().ok"
 else
-mongosh --quiet --eval 'db.runCommand("ping").ok'  # Make sure mongo is awake
-mongosh --quiet --eval "rs.initiate()"
+mongosh --verbose --eval "rs.initiate()"
+mongosh --quiet --eval "rs.status().ok"
 fi

From 2e805d979d77fbfdadf21d808fd1ece684aa800f Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 21 Aug 2024 08:05:53 -0400
Subject: [PATCH 1436/1519] Return the callback result

---
 mongoengine/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 2a912dd24..051c9fe9b 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -557,6 +557,6 @@ def callback(session, custom_arg, customer_kwarg=None):
         transaction_kwargs["callback"] = callback
         _set_session(session)
         try:
-            session.with_transaction(**transaction_kwargs)
+            return session.with_transaction(**transaction_kwargs)
         finally:
             _clear_session()

From 3be04575c78a786d0fdecd5670fff59d5b59eb9b Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 21 Aug 2024 08:56:14 -0400
Subject: [PATCH 1437/1519] Roll back with_transaction abstraction back to
 context mgr

---
 mongoengine/connection.py       |  53 ------
 mongoengine/context_managers.py |  42 +++++
 tests/test_connection.py        | 287 -----------------------------
 tests/test_context_managers.py  | 307 +++++++++++++++++++++++++++++++-
 4 files changed, 347 insertions(+), 342 deletions(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 051c9fe9b..7ed723e54 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -25,7 +25,6 @@
     "get_connection",
     "get_db",
     "register_connection",
-    "run_in_transaction",
 ]
 
 
@@ -508,55 +507,3 @@ def _get_session():
 
 def _clear_session():
     return _local_sessions.clear_current()
-
-
-def run_in_transaction(
-    callback,
-    alias=DEFAULT_CONNECTION_NAME,
-    session_kwargs=None,
-    transaction_kwargs=None,
-):
-    """Execute queries within a MongoDB transaction.
-
-    Usage:
-
-    .. code-block:: python
-
-        class A(Document):
-            name = StringField()
-
-        def callback(session):
-            a_doc = A.objects.create(name="a")
-            a_doc.update(name="b")
-        run_in_transaction(callback)
-
-        # With custom args/kwargs
-        def callback(session, custom_arg, customer_kwarg=None):
-            a_doc.update(name=f'{custom_arg}-{custom_kwarg}')
-        run_in_transaction(
-            lambda s: callback(s, 'arg', custom_kwarg='kwarg')
-        )
-
-    Be aware that:
-    - Mongo transactions run inside a session which is bound to a connection. If you attempt to
-      execute a transaction across a different connection alias, pymongo will raise an exception. In
-      other words: you cannot create a transaction that crosses different database connections.
-
-    For more information regarding pymongo transactions: https://pymongo.readthedocs.io/en/stable/api/pymongo/client_session.html#transactions
-    """
-
-    if PYMONGO_VERSION < (3, 9):
-        raise mongoengine.errors.OperationError(
-            "pymongo>=3.9 is required to use transactions"
-        )
-
-    conn = get_connection(alias)
-    session_kwargs = session_kwargs or {}
-    with conn.start_session(**session_kwargs) as session:
-        transaction_kwargs = transaction_kwargs or {}
-        transaction_kwargs["callback"] = callback
-        _set_session(session)
-        try:
-            return session.with_transaction(**transaction_kwargs)
-        finally:
-            _clear_session()
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 6d97c9624..d58f2f84b 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -7,7 +7,10 @@
 from mongoengine.common import _import_class
 from mongoengine.connection import (
     DEFAULT_CONNECTION_NAME,
+    _clear_session,
     _get_session,
+    _set_session,
+    get_connection,
     get_db,
 )
 from mongoengine.pymongo_support import count_documents
@@ -21,6 +24,7 @@
     "set_write_concern",
     "set_read_write_concern",
     "no_dereferencing_active_for_class",
+    "run_in_transaction",
 )
 
 
@@ -321,3 +325,41 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
         write_concern=WriteConcern(**combined_write_concerns),
         read_concern=ReadConcern(**combined_read_concerns),
     )
+
+
+@contextmanager
+def run_in_transaction(
+    alias=DEFAULT_CONNECTION_NAME, session_kwargs=None, transaction_kwargs=None
+):
+    """run_in_transaction context manager
+    Execute queries within the context in a database transaction.
+
+    Usage:
+
+    .. code-block:: python
+
+        class A(Document):
+            name = StringField()
+
+        with run_in_transaction():
+            a_doc = A.objects.create(name="a")
+            a_doc.update(name="b")
+
+    Be aware that:
+    - Mongo transactions run inside a session which is bound to a connection. If you attempt to
+      execute a transaction across a different connection alias, pymongo will raise an exception. In
+      other words: you cannot create a transaction that crosses different database connections. That
+      said, multiple transaction can be nested within the same session for particular connection.
+
+    For more information regarding pymongo transactions: https://pymongo.readthedocs.io/en/stable/api/pymongo/client_session.html#transactions
+    """
+    conn = get_connection(alias)
+    session_kwargs = session_kwargs or {}
+    with conn.start_session(**session_kwargs) as session:
+        transaction_kwargs = transaction_kwargs or {}
+        with session.start_transaction(**transaction_kwargs):
+            try:
+                _set_session(session)
+                yield
+            finally:
+                _clear_session()
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 02050360d..2cf08cf96 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -1,7 +1,4 @@
 import datetime
-import random
-import threading
-import time
 import unittest
 import uuid
 
@@ -20,32 +17,21 @@
 from mongoengine import (
     DateTimeField,
     Document,
-    IntField,
     StringField,
     connect,
     disconnect_all,
     register_connection,
-    run_in_transaction,
 )
 from mongoengine.connection import (
     DEFAULT_DATABASE_NAME,
     ConnectionFailure,
     _get_connection_settings,
-    _get_session,
     disconnect,
     get_connection,
     get_db,
 )
-from mongoengine.context_managers import switch_db
-from mongoengine.errors import OperationError
 from mongoengine.pymongo_support import PYMONGO_VERSION
 
-from .utils import (
-    MongoDBTestCase,
-    requires_mongodb_gte_40,
-    requires_mongodb_gte_44,
-)
-
 
 def random_str():
     return str(uuid.uuid4())
@@ -717,279 +703,6 @@ def test_connect_uri_uuidrepresentation_default_to_pythonlegacy(self):
         )
         disconnect(rand)
 
-    def test_transaction_usage_raises_exception_when_using_pymong_lt_39(self):
-        if PYMONGO_VERSION < (3, 9):
-            with pytest.raises(OperationError):
-
-                def cb(session):
-                    pass
-
-                run_in_transaction(cb)
-
-
-class TransactionTest(MongoDBTestCase):
-    @requires_mongodb_gte_40
-    def test_updating_a_document_within_a_transaction(self):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-
-        a_doc = A.objects.create(name="a")
-
-        def cb(session):
-            a_doc.update(name="b")
-
-        run_in_transaction(cb)
-        assert "b" == A.objects.get(id=a_doc.id).name
-
-    @requires_mongodb_gte_40
-    def test_update_a_document_within_a_transaction_with_custom_args(self):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-
-        a_doc = A.objects.create(name="a")
-
-        def cb(session, custom_arg, custom_kwarg=""):
-            a_doc.update(name=f"{custom_arg}-{custom_kwarg}")
-
-        run_in_transaction(lambda s: cb(s, "a", custom_kwarg="b"))
-        assert "a-b" == A.objects.get(id=a_doc.id).name
-
-    @requires_mongodb_gte_40
-    def test_transaction_updates_across_databases(self):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-        connect("test2", "test2")
-
-        class A(Document):
-            name = StringField()
-
-        A.objects.all().delete()
-        a_doc = A.objects.create(name="a")
-
-        class B(Document):
-            meta = {"db_alias": "test2"}
-            name = StringField()
-
-        B.objects.all().delete()
-        b_doc = B.objects.create(name="b")
-
-        def cb(session):
-            a_doc.update(name="a2")
-            b_doc.update(name="b2")
-
-        run_in_transaction(cb)
-
-        assert "a2" == A.objects.get(id=a_doc.id).name
-        assert "b2" == B.objects.get(id=b_doc.id).name
-
-    @requires_mongodb_gte_44
-    def test_collection_creation_via_upserts_across_databases_in_transaction(self):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-        connect("test2", "test2")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-
-        a_doc = A.objects.create(name="a")
-
-        class B(Document):
-            meta = {"db_alias": "test2"}
-            name = StringField()
-
-        B.drop_collection()
-
-        b_doc = B.objects.create(name="b")
-
-        def cb(session):
-            a_doc.update(name="a3")
-            with switch_db(A, "test2"):
-                a_doc.update(name="a4", upsert=True)
-                b_doc.update(name="b3")
-            b_doc.update(name="b4")
-
-        run_in_transaction(cb)
-
-        assert "a3" == A.objects.get(id=a_doc.id).name
-        assert "b4" == B.objects.get(id=b_doc.id).name
-        with switch_db(A, "test2"):
-            assert "a4" == A.objects.get(id=a_doc.id).name
-
-    @requires_mongodb_gte_40
-    def test_an_exception_raised_in_transactions_across_databases_rolls_back_updates(
-        self,
-    ):
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-        connect("test2", "test2")
-
-        class A(Document):
-            name = StringField()
-
-        A.drop_collection()
-        with switch_db(A, "test2"):
-            A.drop_collection()
-
-        a_doc = A.objects.create(name="a")
-
-        class B(Document):
-            meta = {"db_alias": "test2"}
-            name = StringField()
-
-        B.drop_collection()
-
-        b_doc = B.objects.create(name="b")
-
-        def cb(session):
-            a_doc.update(name="a3")
-            with switch_db(A, "test2"):
-                a_doc.update(name="a4", upsert=True)
-                b_doc.update(name="b3")
-                b_doc.update(name="b4")
-            raise Exception
-
-        try:
-            run_in_transaction(cb)
-        except Exception:
-            pass
-
-        assert "a" == A.objects.get(id=a_doc.id).name
-        assert "b" == B.objects.get(id=b_doc.id).name
-        with switch_db(A, "test2"):
-            assert 0 == A.objects.all().count()
-
-    @requires_mongodb_gte_40
-    def test_nested_transactions_create_and_release_sessions_accordingly(self):
-        # NOTE: callbacks initiating new transactions goes against pymongo recommended usage!
-        # This is simply a sanity check and should not be considered suggested usage.
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        def cb1(s1):
-            def cb2(s2):
-                assert s1 != s2
-                assert s2 == _get_session()
-
-            run_in_transaction(cb2)
-            assert s1 == _get_session()
-
-        run_in_transaction(cb1)
-        assert _get_session() is None
-
-    @requires_mongodb_gte_40
-    def test_thread_safety_of_transactions(self):
-        """
-        Make sure transactions don't step over each other. Each
-        session should be isolated to each thread. If this is the
-        case, then no amount of runtime variability should have
-        an effect on the output.
-
-        This test sets up 10 records, each with an integer field
-        of value 0 - 9.
-
-        We then spin up 10 threads and attempt to update a target
-        record by multiplying it's integer value by 10. Then, if
-        the target record is even, throw an exception, which
-        should then roll the transaction back. The odd rows always
-        succeed.
-
-        If the sessions are properly thread safe, we should ALWAYS
-        net out with the following sum across the integer fields
-        of the 10 records:
-
-        0 + 10 + 2 + 30 + 4 + 50 + 6 + 70 + 8 + 90 = 270
-        """
-        if PYMONGO_VERSION < (3, 9):
-            pytest.skip("pymongo>=3.9 is required to use transactions")
-
-        connect("mongoenginetest")
-
-        class A(Document):
-            i = IntField()
-
-        # Ensure the collection is created
-        A.objects.create(i=0)
-
-        class TestExc(Exception):
-            pass
-
-        def thread_fn(idx):
-            # Open the transaction at some unknown interval
-            time.sleep(random.uniform(0.01, 0.1))
-            try:
-
-                def cb(session):
-                    a = A.objects.get(i=idx)
-                    a.i = idx * 10
-                    # Save at some unknown interval
-                    time.sleep(random.uniform(0.01, 0.1))
-                    a.save()
-
-                    # Force roll backs for the even runs...
-                    if idx % 2 == 0:
-                        raise TestExc
-
-                run_in_transaction(cb)
-            except TestExc:
-                pass
-
-        for r in range(10):
-            """
-            Threads & randomization are tricky - run it multiple times
-            """
-
-            # Clear out the collection for a fresh run
-            A.objects.all().delete()
-
-            # Prepopulate the data for reads
-            thread_count = 10
-            for i in range(thread_count):
-                A.objects.create(i=i)
-
-            # Prime the threads
-            threads = [
-                threading.Thread(target=thread_fn, args=(i,))
-                for i in range(thread_count)
-            ]
-            for t in threads:
-                t.start()
-            for t in threads:
-                t.join()
-
-            # Check the sum
-            expected_sum = 0
-            for i in range(thread_count):
-                if i % 2 == 0:
-                    expected_sum += i
-                else:
-                    expected_sum += i * 10
-            assert expected_sum == 270
-            assert expected_sum == sum(a.i for a in A.objects.all())
-
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 69c8931dd..74d838b9f 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -1,4 +1,5 @@
 import random
+import threading
 import time
 import unittest
 from threading import Thread
@@ -7,18 +8,24 @@
 from bson import DBRef
 
 from mongoengine import *
-from mongoengine.connection import get_db
+from mongoengine.connection import _get_session, get_db
 from mongoengine.context_managers import (
     no_dereference,
     no_sub_classes,
     query_counter,
+    run_in_transaction,
     set_read_write_concern,
     set_write_concern,
     switch_collection,
     switch_db,
 )
 from mongoengine.pymongo_support import count_documents
-from tests.utils import MongoDBTestCase
+
+from .utils import (
+    MongoDBTestCase,
+    requires_mongodb_gte_40,
+    requires_mongodb_gte_44,
+)
 
 
 class TestableThread(Thread):
@@ -482,6 +489,302 @@ def test_query_counter_ignores_particular_queries(self):
             )  # queries on db.system.indexes are ignored as well
             assert q == 1
 
+    @requires_mongodb_gte_40
+    def test_updating_a_document_within_a_transaction(self):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        with run_in_transaction():
+            a_doc.update(name="b")
+            assert "b" == A.objects.get(id=a_doc.id).name
+
+    @requires_mongodb_gte_40
+    def test_transaction_updates_across_databases(self):
+        connect("mongoenginetest")
+        connect("test2", "test2")
+
+        class A(Document):
+            name = StringField()
+
+        A.objects.all().delete()
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            meta = {"db_alias": "test2"}
+            name = StringField()
+
+        B.objects.all().delete()
+        b_doc = B.objects.create(name="b")
+
+        with run_in_transaction():
+            a_doc.update(name="a2")
+            b_doc.update(name="b2")
+
+        assert "a2" == A.objects.get(id=a_doc.id).name
+        assert "b2" == B.objects.get(id=b_doc.id).name
+
+    @requires_mongodb_gte_44
+    def test_collection_creation_via_upserts_across_databases_in_transaction(self):
+        connect("mongoenginetest")
+        connect("test2", "test2")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            meta = {"db_alias": "test2"}
+            name = StringField()
+
+        B.drop_collection()
+
+        b_doc = B.objects.create(name="b")
+
+        with run_in_transaction():
+            a_doc.update(name="a3")
+            with switch_db(A, "test2"):
+                a_doc.update(name="a4", upsert=True)
+                b_doc.update(name="b3")
+            b_doc.update(name="b4")
+
+        assert "a3" == A.objects.get(id=a_doc.id).name
+        assert "b4" == B.objects.get(id=b_doc.id).name
+        with switch_db(A, "test2"):
+            assert "a4" == A.objects.get(id=a_doc.id).name
+
+    @requires_mongodb_gte_40
+    def test_an_exception_raised_in_transactions_across_databases_rolls_back_updates(
+        self,
+    ):
+        connect("mongoenginetest")
+        connect("test2", "test2")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+        with switch_db(A, "test2"):
+            A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            meta = {"db_alias": "test2"}
+            name = StringField()
+
+        B.drop_collection()
+
+        b_doc = B.objects.create(name="b")
+
+        try:
+            with run_in_transaction():
+                a_doc.update(name="a3")
+                with switch_db(A, "test2"):
+                    a_doc.update(name="a4", upsert=True)
+                    b_doc.update(name="b3")
+                    b_doc.update(name="b4")
+                raise Exception
+        except Exception:
+            pass
+
+        assert "a" == A.objects.get(id=a_doc.id).name
+        assert "b" == B.objects.get(id=b_doc.id).name
+        with switch_db(A, "test2"):
+            assert 0 == A.objects.all().count()
+
+    @requires_mongodb_gte_40
+    def test_exception_in_child_of_a_nested_transaction_rolls_parent_back(self):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            name = StringField()
+
+        B.drop_collection()
+        b_doc = B.objects.create(name="b")
+
+        try:
+            with run_in_transaction():
+                a_doc.update(name="trx-parent")
+                with run_in_transaction():
+                    b_doc.update(name="trx-child")
+                    raise Exception
+        except Exception:
+            pass
+
+        assert "a" == A.objects.get(id=a_doc.id).name
+        assert "b" == B.objects.get(id=b_doc.id).name
+
+    @requires_mongodb_gte_40
+    def test_exception_in_parent_of_nested_transaction_after_child_completed_only_rolls_parent_back(
+        self,
+    ):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+        a_doc = A.objects.create(name="a")
+
+        class B(Document):
+            name = StringField()
+
+        B.drop_collection()
+        b_doc = B.objects.create(name="b")
+
+        class TestExc(Exception):
+            pass
+
+        def run_tx():
+            try:
+                with run_in_transaction():
+                    a_doc.update(name="trx-parent")
+                    with run_in_transaction():
+                        b_doc.update(name="trx-child")
+                    raise TestExc
+            except TestExc:
+                pass
+            except OperationError as op_failure:
+                """
+                See thread safety test below for more details about TransientTransctionError handling
+                """
+                if "TransientTransactionError" in str(op_failure):
+                    run_tx()
+                else:
+                    raise op_failure
+
+        run_tx()
+        assert "a" == A.objects.get(id=a_doc.id).name
+        assert "trx-child" == B.objects.get(id=b_doc.id).name
+
+    @requires_mongodb_gte_40
+    def test_nested_transactions_create_and_release_sessions_accordingly(self):
+        connect("mongoenginetest")
+        with run_in_transaction():
+            s1 = _get_session()
+            with run_in_transaction():
+                s2 = _get_session()
+                assert s1 != s2
+                with run_in_transaction():
+                    pass
+                assert s2 == _get_session()
+            assert s1 == _get_session()
+        assert _get_session() is None
+
+    @requires_mongodb_gte_40
+    def test_thread_safety_of_transactions(self):
+        """
+        Make sure transactions don't step over each other. Each
+        session should be isolated to each thread. If this is the
+        case, then no amount of runtime variability should have
+        an effect on the output.
+
+        This test sets up 10 records, each with an integer field
+        of value 0 - 9.
+
+        We then spin up 10 threads and attempt to update a target
+        record by multiplying it's integer value by 10. Then, if
+        the target record is even, throw an exception, which
+        should then roll the transaction back. The odd rows always
+        succeed.
+
+        If the sessions are properly thread safe, we should ALWAYS
+        net out with the following sum across the integer fields
+        of the 10 records:
+
+        0 + 10 + 2 + 30 + 4 + 50 + 6 + 70 + 8 + 90 = 270
+        """
+        connect("mongoenginetest")
+
+        class A(Document):
+            i = IntField()
+
+        # Ensure the collection is created
+        A.objects.create(i=0)
+
+        class TestExc(Exception):
+            pass
+
+        def thread_fn(idx):
+            # Open the transaction at some unknown interval
+            time.sleep(random.uniform(0.01, 0.1))
+            try:
+                with run_in_transaction():
+                    a = A.objects.get(i=idx)
+                    a.i = idx * 10
+                    # Save at some unknown interval
+                    time.sleep(random.uniform(0.01, 0.1))
+                    a.save()
+
+                    # Force roll backs for the even runs...
+                    if idx % 2 == 0:
+                        raise TestExc
+            except TestExc:
+                pass
+            except pymongo.errors.OperationFailure as op_failure:
+                """
+                If there's a TransientTransactionError, retry - the lock could not be acquired.
+
+                Per MongoDB docs: The core transaction API does not incorporate retry logic for
+                "TransientTransactionError". To handle "TransientTransactionError", applications
+                should explicitly incorporate retry logic for the error.
+
+                See: https://www.mongodb.com/docs/manual/core/transactions-in-applications/#-transienttransactionerror-
+                """
+                error_labels = op_failure.details.get("errorLabels", [])
+                if "TransientTransactionError" in error_labels:
+                    thread_fn(idx)
+                else:
+                    raise op_failure
+
+        for r in range(10):
+            """
+            Threads & randomization are tricky - run it multiple times
+            """
+
+            # Clear out the collection for a fresh run
+            A.objects.all().delete()
+
+            # Prepopulate the data for reads
+            thread_count = 10
+            for i in range(thread_count):
+                A.objects.create(i=i)
+
+            # Prime the threads
+            threads = [
+                threading.Thread(target=thread_fn, args=(i,))
+                for i in range(thread_count)
+            ]
+            for t in threads:
+                t.start()
+            for t in threads:
+                t.join()
+
+            # Check the sum
+            expected_sum = 0
+            for i in range(thread_count):
+                if i % 2 == 0:
+                    expected_sum += i
+                else:
+                    expected_sum += i * 10
+            assert expected_sum == 270
+            assert expected_sum == sum(a.i for a in A.objects.all())
+
 
 if __name__ == "__main__":
     unittest.main()

From 7eee132d7cfed3d0a5bfab6bb8ccbe522c445015 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 21 Aug 2024 09:00:32 -0400
Subject: [PATCH 1438/1519] Add missing pymongo import

---
 tests/test_context_managers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 74d838b9f..c56cd614b 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -4,6 +4,7 @@
 import unittest
 from threading import Thread
 
+import pymongo
 import pytest
 from bson import DBRef
 

From 94e4c900afed3a0dbb7ab2945ad4a506559a6c1e Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Thu, 18 Apr 2024 11:05:55 +0300
Subject: [PATCH 1439/1519] #2811 add array filter to modify

---
 mongoengine/queryset/base.py    | 10 ++++++++--
 tests/queryset/test_queryset.py | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 3ce3cb3f2..bdc4855f4 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -634,7 +634,7 @@ def upsert_one(self, write_concern=None, read_concern=None, **update):
             document = self._document.objects.with_id(atomic_update.upserted_id)
         return document
 
-    def update_one(self, upsert=False, write_concern=None, full_result=False, **update):
+    def update_one(self, upsert=False, write_concern=None, full_result=False, array_filters=None, **update):
         """Perform an atomic update on the fields of the first document
         matched by the query.
 
@@ -647,6 +647,7 @@ def update_one(self, upsert=False, write_concern=None, full_result=False, **upda
             will force an fsync on the primary server.
         :param full_result: Return the associated ``pymongo.UpdateResult`` rather than just the number
             updated items
+        :param array_filters: A list of filters specifying which array elements an update should apply.
         :param update: Django-style update keyword arguments
             full_result
         :returns the number of updated documents (unless ``full_result`` is True)
@@ -656,11 +657,14 @@ def update_one(self, upsert=False, write_concern=None, full_result=False, **upda
             multi=False,
             write_concern=write_concern,
             full_result=full_result,
+            array_filters=array_filters,
             **update,
         )
 
     def modify(
-        self, upsert=False, full_response=False, remove=False, new=False, **update
+        self, upsert=False, full_response=False, remove=False, new=False,
+            array_filters=None,
+            **update
     ):
         """Update and return the updated document.
 
@@ -680,6 +684,7 @@ def modify(
         :param remove: remove rather than updating (default ``False``)
         :param new: return updated rather than original document
             (default ``False``)
+        :param array_filters: A list of filters specifying which array elements an update should apply.
         :param update: Django-style update keyword arguments
         """
 
@@ -717,6 +722,7 @@ def modify(
                     upsert=upsert,
                     sort=sort,
                     return_document=return_doc,
+                    array_filters=array_filters,
                     **self._cursor_args,
                 )
         except pymongo.errors.DuplicateKeyError as err:
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 042931654..f5634d77a 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -615,6 +615,22 @@ class Blog(Document):
 
         assert testc_blogs.count() == 1
 
+        # modify
+        Blog.drop_collection()
+
+        # update one
+        Blog.objects.create(tags=["test1", "test2", "test3"])
+
+        new_blog = Blog.objects().modify(
+            __raw__={"$set": {"tags.$[element]": "test11111"}},
+            array_filters=[{"element": {"$eq": "test2"}}],
+            new=True,
+        )
+        testc_blogs = Blog.objects(tags="test11111")
+        assert new_blog == testc_blogs.first()
+
+        assert testc_blogs.count() == 1
+
         Blog.drop_collection()
 
         # update one inner list

From 5a8b05162389b8a452df764573a3514e6e3edc7c Mon Sep 17 00:00:00 2001
From: Ido Shraga <ido@cyabra.com>
Date: Thu, 18 Apr 2024 11:32:09 +0300
Subject: [PATCH 1440/1519] Pre-commit

---
 mongoengine/queryset/base.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index bdc4855f4..75fab34de 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -634,7 +634,14 @@ def upsert_one(self, write_concern=None, read_concern=None, **update):
             document = self._document.objects.with_id(atomic_update.upserted_id)
         return document
 
-    def update_one(self, upsert=False, write_concern=None, full_result=False, array_filters=None, **update):
+    def update_one(
+        self,
+        upsert=False,
+        write_concern=None,
+        full_result=False,
+        array_filters=None,
+        **update,
+    ):
         """Perform an atomic update on the fields of the first document
         matched by the query.
 
@@ -662,9 +669,13 @@ def update_one(self, upsert=False, write_concern=None, full_result=False, array_
         )
 
     def modify(
-        self, upsert=False, full_response=False, remove=False, new=False,
-            array_filters=None,
-            **update
+        self,
+        upsert=False,
+        full_response=False,
+        remove=False,
+        new=False,
+        array_filters=None,
+        **update,
     ):
         """Update and return the updated document.
 

From 549e0108cde781aec128c1f85376a426bcb10c74 Mon Sep 17 00:00:00 2001
From: Masoud <m.zaeim@abantether.com>
Date: Sun, 25 Aug 2024 14:12:59 +0330
Subject: [PATCH 1441/1519] feat: Add Timeseries Collection Support

---
 mongoengine/base/document.py | 2070 ++++++++++++++++------------------
 1 file changed, 995 insertions(+), 1075 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 194b24e2f..e7a37ab5d 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1,1221 +1,1141 @@
-import copy
-import numbers
-import warnings
-from functools import partial
+import re
 
 import pymongo
-from bson import SON, DBRef, ObjectId, json_util
+from bson.dbref import DBRef
+from pymongo.read_preferences import ReadPreference
 
 from mongoengine import signals
-from mongoengine.base.common import get_document
-from mongoengine.base.datastructures import (
+from mongoengine.base import (
     BaseDict,
+    BaseDocument,
     BaseList,
+    DocumentMetaclass,
     EmbeddedDocumentList,
-    LazyReference,
-    StrictDict,
+    TopLevelDocumentMetaclass,
+    get_document,
 )
-from mongoengine.base.fields import ComplexBaseField
 from mongoengine.common import _import_class
+from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
+from mongoengine.context_managers import (
+    set_write_concern,
+    switch_collection,
+    switch_db,
+)
 from mongoengine.errors import (
-    FieldDoesNotExist,
     InvalidDocumentError,
-    LookUpError,
+    InvalidQueryError,
+    SaveConditionError,
+)
+from mongoengine.pymongo_support import list_collection_names
+from mongoengine.queryset import (
+    NotUniqueError,
     OperationError,
-    ValidationError,
+    QuerySet,
+    transform,
 )
-from mongoengine.pymongo_support import LEGACY_JSON_OPTIONS
-
-__all__ = ("BaseDocument", "NON_FIELD_ERRORS")
-
-NON_FIELD_ERRORS = "__all__"
-
-try:
-    GEOHAYSTACK = pymongo.GEOHAYSTACK
-except AttributeError:
-    GEOHAYSTACK = None
-
-
-class BaseDocument:
-    # TODO simplify how `_changed_fields` is used.
-    # Currently, handling of `_changed_fields` seems unnecessarily convoluted:
-    # 1. `BaseDocument` defines `_changed_fields` in its `__slots__`, yet it's
-    #    not setting it to `[]` (or any other value) in `__init__`.
-    # 2. `EmbeddedDocument` sets `_changed_fields` to `[]` it its overloaded
-    #    `__init__`.
-    # 3. `Document` does NOT set `_changed_fields` upon initialization. The
-    #    field is primarily set via `_from_son` or `_clear_changed_fields`,
-    #    though there are also other methods that manipulate it.
-    # 4. The codebase is littered with `hasattr` calls for `_changed_fields`.
-    __slots__ = (
-        "_changed_fields",
-        "_initialised",
-        "_created",
-        "_data",
-        "_dynamic_fields",
-        "_auto_id_field",
-        "_db_field_map",
-        "__weakref__",
-    )
-
-    _dynamic = False
-    _dynamic_lock = True
-    STRICT = False
-
-    def __init__(self, *args, **values):
-        """
-        Initialise a document or an embedded document.
-
-        :param values: A dictionary of keys and values for the document.
-            It may contain additional reserved keywords, e.g. "__auto_convert".
-        :param __auto_convert: If True, supplied values will be converted
-            to Python-type values via each field's `to_python` method.
-        :param _created: Indicates whether this is a brand new document
-            or whether it's already been persisted before. Defaults to true.
-        """
-        self._initialised = False
-        self._created = True
-
-        if args:
-            raise TypeError(
-                "Instantiating a document with positional arguments is not "
-                "supported. Please use `field_name=value` keyword arguments."
-            )
-
-        __auto_convert = values.pop("__auto_convert", True)
 
-        _created = values.pop("_created", True)
+__all__ = (
+    "Document",
+    "EmbeddedDocument",
+    "DynamicDocument",
+    "DynamicEmbeddedDocument",
+    "OperationError",
+    "InvalidCollectionError",
+    "NotUniqueError",
+    "MapReduceDocument",
+)
 
-        signals.pre_init.send(self.__class__, document=self, values=values)
 
-        # Check if there are undefined fields supplied to the constructor,
-        # if so raise an Exception.
-        if not self._dynamic and (self._meta.get("strict", True) or _created):
-            _undefined_fields = set(values.keys()) - set(
-                list(self._fields.keys()) + ["id", "pk", "_cls", "_text_score"]
-            )
-            if _undefined_fields:
-                msg = f'The fields "{_undefined_fields}" do not exist on the document "{self._class_name}"'
-                raise FieldDoesNotExist(msg)
+def includes_cls(fields):
+    """Helper function used for ensuring and comparing indexes."""
+    first_field = None
+    if len(fields):
+        if isinstance(fields[0], str):
+            first_field = fields[0]
+        elif isinstance(fields[0], (list, tuple)) and len(fields[0]):
+            first_field = fields[0][0]
+    return first_field == "_cls"
 
-        if self.STRICT and not self._dynamic:
-            self._data = StrictDict.create(allowed_keys=self._fields_ordered)()
-        else:
-            self._data = {}
 
-        self._dynamic_fields = SON()
+class InvalidCollectionError(Exception):
+    pass
 
-        # Assign default values for fields
-        # not set in the constructor
-        for field_name in self._fields:
-            if field_name in values:
-                continue
-            value = getattr(self, field_name, None)
-            setattr(self, field_name, value)
 
-        if "_cls" not in values:
-            self._cls = self._class_name
+class EmbeddedDocument(BaseDocument, metaclass=DocumentMetaclass):
+    r"""A :class:`~mongoengine.Document` that isn't stored in its own
+    collection.  :class:`~mongoengine.EmbeddedDocument`\ s should be used as
+    fields on :class:`~mongoengine.Document`\ s through the
+    :class:`~mongoengine.EmbeddedDocumentField` field type.
 
-        # Set actual values
-        dynamic_data = {}
-        FileField = _import_class("FileField")
-        for key, value in values.items():
-            field = self._fields.get(key)
-            if field or key in ("id", "pk", "_cls"):
-                if __auto_convert and value is not None:
-                    if field and not isinstance(field, FileField):
-                        value = field.to_python(value)
-                setattr(self, key, value)
-            else:
-                if self._dynamic:
-                    dynamic_data[key] = value
-                else:
-                    # For strict Document
-                    self._data[key] = value
+    A :class:`~mongoengine.EmbeddedDocument` subclass may be itself subclassed,
+    to create a specialised version of the embedded document that will be
+    stored in the same collection. To facilitate this behaviour a `_cls`
+    field is added to documents (hidden though the MongoEngine interface).
+    To enable this behaviour set :attr:`allow_inheritance` to ``True`` in the
+    :attr:`meta` dictionary.
+    """
 
-        # Set any get_<field>_display methods
-        self.__set_field_display()
+    __slots__ = ("_instance",)
 
-        if self._dynamic:
-            self._dynamic_lock = False
-            for key, value in dynamic_data.items():
-                setattr(self, key, value)
+    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
+    my_metaclass = DocumentMetaclass
 
-        # Flag initialised
-        self._initialised = True
-        self._created = _created
+    # A generic embedded document doesn't have any immutable properties
+    # that describe it uniquely, hence it shouldn't be hashable. You can
+    # define your own __hash__ method on a subclass if you need your
+    # embedded documents to be hashable.
+    __hash__ = None
 
-        signals.post_init.send(self.__class__, document=self)
-
-    def __delattr__(self, *args, **kwargs):
-        """Handle deletions of fields"""
-        field_name = args[0]
-        if field_name in self._fields:
-            default = self._fields[field_name].default
-            if callable(default):
-                default = default()
-            setattr(self, field_name, default)
-        else:
-            super().__delattr__(*args, **kwargs)
-
-    def __setattr__(self, name, value):
-        # Handle dynamic data only if an initialised dynamic document
-        if self._dynamic and not self._dynamic_lock:
-            if name not in self._fields_ordered and not name.startswith("_"):
-                DynamicField = _import_class("DynamicField")
-                field = DynamicField(db_field=name, null=True)
-                field.name = name
-                self._dynamic_fields[name] = field
-                self._fields_ordered += (name,)
-
-            if not name.startswith("_"):
-                value = self.__expand_dynamic_values(name, value)
-
-            # Handle marking data as changed
-            if name in self._dynamic_fields:
-                self._data[name] = value
-                if hasattr(self, "_changed_fields"):
-                    self._mark_as_changed(name)
-        try:
-            self__created = self._created
-        except AttributeError:
-            self__created = True
-
-        if (
-            self._is_document
-            and not self__created
-            and name in self._meta.get("shard_key", tuple())
-            and self._data.get(name) != value
-        ):
-            msg = "Shard Keys are immutable. Tried to update %s" % name
-            raise OperationError(msg)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._instance = None
+        self._changed_fields = []
 
-        try:
-            self__initialised = self._initialised
-        except AttributeError:
-            self__initialised = False
-
-        # Check if the user has created a new instance of a class
-        if (
-            self._is_document
-            and self__initialised
-            and self__created
-            and name == self._meta.get("id_field")
-        ):
-            super().__setattr__("_created", False)
+    def __eq__(self, other):
+        if isinstance(other, self.__class__):
+            return self._data == other._data
+        return False
 
-        super().__setattr__(name, value)
+    def __ne__(self, other):
+        return not self.__eq__(other)
 
     def __getstate__(self):
-        data = {}
-        for k in (
-            "_changed_fields",
-            "_initialised",
-            "_created",
-            "_dynamic_fields",
-            "_fields_ordered",
-        ):
-            if hasattr(self, k):
-                data[k] = getattr(self, k)
-        data["_data"] = self.to_mongo()
+        data = super().__getstate__()
+        data["_instance"] = None
         return data
 
-    def __setstate__(self, data):
-        if isinstance(data["_data"], SON):
-            data["_data"] = self.__class__._from_son(data["_data"])._data
-        for k in (
-            "_changed_fields",
-            "_initialised",
-            "_created",
-            "_data",
-            "_dynamic_fields",
-        ):
-            if k in data:
-                setattr(self, k, data[k])
-        if "_fields_ordered" in data:
-            if self._dynamic:
-                self._fields_ordered = data["_fields_ordered"]
-            else:
-                _super_fields_ordered = type(self)._fields_ordered
-                self._fields_ordered = _super_fields_ordered
-
-        dynamic_fields = data.get("_dynamic_fields") or SON()
-        for k in dynamic_fields.keys():
-            setattr(self, k, data["_data"].get(k))
+    def __setstate__(self, state):
+        super().__setstate__(state)
+        self._instance = state["_instance"]
 
-    def __iter__(self):
-        return iter(self._fields_ordered)
+    def to_mongo(self, *args, **kwargs):
+        data = super().to_mongo(*args, **kwargs)
 
-    def __getitem__(self, name):
-        """Dictionary-style field access, return a field's value if present."""
-        try:
-            if name in self._fields_ordered:
-                return getattr(self, name)
-        except AttributeError:
-            pass
-        raise KeyError(name)
-
-    def __setitem__(self, name, value):
-        """Dictionary-style field access, set a field's value."""
-        # Ensure that the field exists before settings its value
-        if not self._dynamic and name not in self._fields:
-            raise KeyError(name)
-        return setattr(self, name, value)
-
-    def __contains__(self, name):
-        try:
-            val = getattr(self, name)
-            return val is not None
-        except AttributeError:
-            return False
+        # remove _id from the SON if it's in it and it's None
+        if "_id" in data and data["_id"] is None:
+            del data["_id"]
 
-    def __len__(self):
-        return len(self._data)
+        return data
 
-    def __repr__(self):
-        try:
-            u = self.__str__()
-        except (UnicodeEncodeError, UnicodeDecodeError):
-            u = "[Bad Unicode data]"
-        repr_type = str if u is None else type(u)
-        return repr_type(f"<{self.__class__.__name__}: {u}>")
-
-    def __str__(self):
-        # TODO this could be simpler?
-        if hasattr(self, "__unicode__"):
-            return self.__unicode__()
-        return "%s object" % self.__class__.__name__
 
-    def __eq__(self, other):
-        if (
-            isinstance(other, self.__class__)
-            and hasattr(other, "id")
-            and other.id is not None
-        ):
-            return self.id == other.id
-        if isinstance(other, DBRef):
-            return (
-                self._get_collection_name() == other.collection and self.id == other.id
-            )
-        if self.id is None:
-            return self is other
-        return False
+class Document(BaseDocument, metaclass=TopLevelDocumentMetaclass):
+    """The base class used for defining the structure and properties of
+    collections of documents stored in MongoDB. Inherit from this class, and
+    add fields as class attributes to define a document's structure.
+    Individual documents may then be created by making instances of the
+    :class:`~mongoengine.Document` subclass.
+
+    By default, the MongoDB collection used to store documents created using a
+    :class:`~mongoengine.Document` subclass will be the name of the subclass
+    converted to snake_case. A different collection may be specified by
+    providing :attr:`collection` to the :attr:`meta` dictionary in the class
+    definition.
+
+    A :class:`~mongoengine.Document` subclass may be itself subclassed, to
+    create a specialised version of the document that will be stored in the
+    same collection. To facilitate this behaviour a `_cls`
+    field is added to documents (hidden though the MongoEngine interface).
+    To enable this behaviour set :attr:`allow_inheritance` to ``True`` in the
+    :attr:`meta` dictionary.
+
+    A :class:`~mongoengine.Document` may use a **Capped Collection** by
+    specifying :attr:`max_documents` and :attr:`max_size` in the :attr:`meta`
+    dictionary. :attr:`max_documents` is the maximum number of documents that
+    is allowed to be stored in the collection, and :attr:`max_size` is the
+    maximum size of the collection in bytes. :attr:`max_size` is rounded up
+    to the next multiple of 256 by MongoDB internally and mongoengine before.
+    Use also a multiple of 256 to avoid confusions.  If :attr:`max_size` is not
+    specified and :attr:`max_documents` is, :attr:`max_size` defaults to
+    10485760 bytes (10MB).
+
+    Indexes may be created by specifying :attr:`indexes` in the :attr:`meta`
+    dictionary. The value should be a list of field names or tuples of field
+    names. Index direction may be specified by prefixing the field names with
+    a **+** or **-** sign.
+
+    Automatic index creation can be disabled by specifying
+    :attr:`auto_create_index` in the :attr:`meta` dictionary. If this is set to
+    False then indexes will not be created by MongoEngine.  This is useful in
+    production systems where index creation is performed as part of a
+    deployment system.
+
+    By default, _cls will be added to the start of every index (that
+    doesn't contain a list) if allow_inheritance is True. This can be
+    disabled by either setting cls to False on the specific index or
+    by setting index_cls to False on the meta dictionary for the document.
+
+    By default, any extra attribute existing in stored data but not declared
+    in your model will raise a :class:`~mongoengine.FieldDoesNotExist` error.
+    This can be disabled by setting :attr:`strict` to ``False``
+    in the :attr:`meta` dictionary.
+    """
+
+    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
+    my_metaclass = TopLevelDocumentMetaclass
+
+    __slots__ = ("__objects",)
+
+    @property
+    def pk(self):
+        """Get the primary key."""
+        if "id_field" not in self._meta:
+            return None
+        return getattr(self, self._meta["id_field"])
+
+    @pk.setter
+    def pk(self, value):
+        """Set the primary key."""
+        return setattr(self, self._meta["id_field"], value)
+
+    def __hash__(self):
+        """Return the hash based on the PK of this document. If it's new
+        and doesn't have a PK yet, return the default object hash instead.
+        """
+        if self.pk is None:
+            return super(BaseDocument, self).__hash__()
 
-    def __ne__(self, other):
-        return not self.__eq__(other)
+        return hash(self.pk)
 
-    def clean(self):
-        """
-        Hook for doing document level data cleaning (usually validation or assignment)
-        before validation is run.
+    @classmethod
+    def _get_db(cls):
+        """Some Model using other db_alias"""
+        return get_db(cls._meta.get("db_alias", DEFAULT_CONNECTION_NAME))
 
-        Any ValidationError raised by this method will not be associated with
-        a particular field; it will have a special-case association with the
-        field defined by NON_FIELD_ERRORS.
-        """
-        pass
+    @classmethod
+    def _disconnect(cls):
+        """Detach the Document class from the (cached) database collection"""
+        cls._collection = None
 
-    def get_text_score(self):
-        """
-        Get text score from text query
+    @classmethod
+    def _get_collection(cls):
+        """Return the PyMongo collection corresponding to this document.
+
+        Upon first call, this method:
+        1. Initializes a :class:`~pymongo.collection.Collection` corresponding
+           to this document.
+        2. Creates indexes defined in this document's :attr:`meta` dictionary.
+           This happens only if `auto_create_index` is True.
         """
+        if not hasattr(cls, "_collection") or cls._collection is None:
+            # Get the collection, either capped or regular.
+            if cls._meta.get("max_size") or cls._meta.get("max_documents"):
+                cls._collection = cls._get_capped_collection()
+            elif cls._meta.get("timeseries"):
+                cls._collection = cls._get_timeseries_collection()
+            else:
+                db = cls._get_db()
+                collection_name = cls._get_collection_name()
+                cls._collection = db[collection_name]
 
-        if "_text_score" not in self._data:
-            raise InvalidDocumentError(
-                "This document is not originally built from a text query (or text_score was not set on search_text() call)"
-            )
-
-        return self._data["_text_score"]
+            # Ensure indexes on the collection unless auto_create_index was
+            # set to False. Plus, there is no need to ensure indexes on slave.
+            db = cls._get_db()
+            if cls._meta.get("auto_create_index", True) and db.client.is_primary:
+                cls.ensure_indexes()
 
-    def to_mongo(self, use_db_field=True, fields=None):
-        """
-        Return as SON data ready for use with MongoDB.
-        """
-        fields = fields or []
+        return cls._collection
 
-        data = SON()
-        data["_id"] = None
-        data["_cls"] = self._class_name
+    @classmethod
+    def _get_timeseries_collection(cls):
+        """Create a new or get an existing timeseries PyMongo collection."""
+        db = cls._get_db()
+        collection_name = cls._get_collection_name()
+        timeseries_opts = cls._meta.get("timeseries")
+
+        if collection_name in list_collection_names(
+            db, include_system_collections=True
+        ):
+            collection = db[collection_name]
+            collection.options()
+            return collection
+
+        opts = {"expireAfterSeconds": timeseries_opts.pop("expireAfterSeconds", None)}
+        return db.create_collection(
+            name=collection_name,
+            timeseries=timeseries_opts,
+            **opts,
+        )
 
-        # only root fields ['test1.a', 'test2'] => ['test1', 'test2']
-        root_fields = {f.split(".")[0] for f in fields}
+    @classmethod
+    def _get_capped_collection(cls):
+        """Create a new or get an existing capped PyMongo collection."""
+        db = cls._get_db()
+        collection_name = cls._get_collection_name()
+
+        # Get max document limit and max byte size from meta.
+        max_size = cls._meta.get("max_size") or 10 * 2**20  # 10MB default
+        max_documents = cls._meta.get("max_documents")
+
+        # MongoDB will automatically raise the size to make it a multiple of
+        # 256 bytes. We raise it here ourselves to be able to reliably compare
+        # the options below.
+        if max_size % 256:
+            max_size = (max_size // 256 + 1) * 256
+
+        # If the collection already exists and has different options
+        # (i.e. isn't capped or has different max/size), raise an error.
+        if collection_name in list_collection_names(
+            db, include_system_collections=True
+        ):
+            collection = db[collection_name]
+            options = collection.options()
+            if options.get("max") != max_documents or options.get("size") != max_size:
+                raise InvalidCollectionError(
+                    'Cannot create collection "{}" as a capped '
+                    "collection as it already exists".format(cls._collection)
+                )
 
-        for field_name in self:
-            if root_fields and field_name not in root_fields:
-                continue
+            return collection
 
-            value = self._data.get(field_name, None)
-            field = self._fields.get(field_name)
+        # Create a new capped collection.
+        opts = {"capped": True, "size": max_size}
+        if max_documents:
+            opts["max"] = max_documents
 
-            if field is None and self._dynamic:
-                field = self._dynamic_fields.get(field_name)
+        return db.create_collection(collection_name, **opts)
 
-            if value is not None:
-                f_inputs = field.to_mongo.__code__.co_varnames
-                ex_vars = {}
-                if fields and "fields" in f_inputs:
-                    key = "%s." % field_name
-                    embedded_fields = [
-                        i.replace(key, "") for i in fields if i.startswith(key)
-                    ]
+    def to_mongo(self, *args, **kwargs):
+        data = super().to_mongo(*args, **kwargs)
 
-                    ex_vars["fields"] = embedded_fields
+        # If '_id' is None, try and set it from self._data. If that
+        # doesn't exist either, remove '_id' from the SON completely.
+        if data["_id"] is None:
+            if self._data.get("id") is None:
+                del data["_id"]
+            else:
+                data["_id"] = self._data["id"]
 
-                if "use_db_field" in f_inputs:
-                    ex_vars["use_db_field"] = use_db_field
+        return data
 
-                value = field.to_mongo(value, **ex_vars)
+    def modify(self, query=None, **update):
+        """Perform an atomic update of the document in the database and reload
+        the document object using updated version.
 
-            # Handle self generating fields
-            if value is None and field._auto_gen:
-                value = field.generate()
-                self._data[field_name] = value
+        Returns True if the document has been updated or False if the document
+        in the database doesn't match the query.
 
-            if value is not None or field.null:
-                if use_db_field:
-                    data[field.db_field] = value
-                else:
-                    data[field.name] = value
+        .. note:: All unsaved changes that have been made to the document are
+            rejected if the method returns True.
 
-        # Only add _cls if allow_inheritance is True
-        if not self._meta.get("allow_inheritance"):
-            data.pop("_cls")
+        :param query: the update will be performed only if the document in the
+            database matches the query
+        :param update: Django-style update keyword arguments
+        """
+        if query is None:
+            query = {}
 
-        return data
+        if self.pk is None:
+            raise InvalidDocumentError("The document does not have a primary key.")
 
-    def validate(self, clean=True):
-        """Ensure that all fields' values are valid and that required fields
-        are present.
+        id_field = self._meta["id_field"]
+        query = query.copy() if isinstance(query, dict) else query.to_query(self)
 
-        Raises :class:`ValidationError` if any of the fields' values are found
-        to be invalid.
-        """
-        # Ensure that each field is matched to a valid value
-        errors = {}
-        if clean:
-            try:
-                self.clean()
-            except ValidationError as error:
-                errors[NON_FIELD_ERRORS] = error
-
-        # Get a list of tuples of field names and their current values
-        fields = [
-            (
-                self._fields.get(name, self._dynamic_fields.get(name)),
-                self._data.get(name),
+        if id_field not in query:
+            query[id_field] = self.pk
+        elif query[id_field] != self.pk:
+            raise InvalidQueryError(
+                "Invalid document modify query: it must modify only this document."
             )
-            for name in self._fields_ordered
-        ]
 
-        EmbeddedDocumentField = _import_class("EmbeddedDocumentField")
-        GenericEmbeddedDocumentField = _import_class("GenericEmbeddedDocumentField")
+        # Need to add shard key to query, or you get an error
+        query.update(self._object_key)
 
-        for field, value in fields:
-            if value is not None:
-                try:
-                    if isinstance(
-                        field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
-                    ):
-                        field._validate(value, clean=clean)
-                    else:
-                        field._validate(value)
-                except ValidationError as error:
-                    errors[field.name] = error.errors or error
-                except (ValueError, AttributeError, AssertionError) as error:
-                    errors[field.name] = error
-            elif field.required and not getattr(field, "_auto_gen", False):
-                errors[field.name] = ValidationError(
-                    "Field is required", field_name=field.name
-                )
+        updated = self._qs(**query).modify(new=True, **update)
+        if updated is None:
+            return False
 
-        if errors:
-            pk = "None"
-            if hasattr(self, "pk"):
-                pk = self.pk
-            elif self._instance and hasattr(self._instance, "pk"):
-                pk = self._instance.pk
-            message = f"ValidationError ({self._class_name}:{pk}) "
-            raise ValidationError(message, errors=errors)
-
-    def to_json(self, *args, **kwargs):
-        """Convert this document to JSON.
-
-        :param use_db_field: Serialize field names as they appear in
-            MongoDB (as opposed to attribute names on this document).
-            Defaults to True.
-        """
-        use_db_field = kwargs.pop("use_db_field", True)
-        if "json_options" not in kwargs:
-            warnings.warn(
-                "No 'json_options' are specified! Falling back to "
-                "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
-                "For use with other MongoDB drivers specify the UUID "
-                "representation to use. This will be changed to "
-                "uuid_representation=UNSPECIFIED in a future release.",
-                DeprecationWarning,
-            )
-            kwargs["json_options"] = LEGACY_JSON_OPTIONS
-        return json_util.dumps(self.to_mongo(use_db_field), *args, **kwargs)
+        for field in self._fields_ordered:
+            setattr(self, field, self._reload(field, updated[field]))
+
+        self._changed_fields = updated._changed_fields
+        self._created = False
+
+        return True
+
+    def save(
+        self,
+        force_insert=False,
+        validate=True,
+        clean=True,
+        write_concern=None,
+        cascade=None,
+        cascade_kwargs=None,
+        _refs=None,
+        save_condition=None,
+        signal_kwargs=None,
+        **kwargs,
+    ):
+        """Save the :class:`~mongoengine.Document` to the database. If the
+        document already exists, it will be updated, otherwise it will be
+        created. Returns the saved object instance.
+
+        :param force_insert: only try to create a new document, don't allow
+            updates of existing documents.
+        :param validate: validates the document; set to ``False`` to skip.
+        :param clean: call the document clean method, requires `validate` to be
+            True.
+        :param write_concern: Extra keyword arguments are passed down to
+            :meth:`~pymongo.collection.Collection.save` OR
+            :meth:`~pymongo.collection.Collection.insert`
+            which will be used as options for the resultant
+            ``getLastError`` command.  For example,
+            ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
+            wait until at least two servers have recorded the write and
+            will force an fsync on the primary server.
+        :param cascade: Sets the flag for cascading saves.  You can set a
+            default by setting "cascade" in the document __meta__
+        :param cascade_kwargs: (optional) kwargs dictionary to be passed throw
+            to cascading saves.  Implies ``cascade=True``.
+        :param _refs: A list of processed references used in cascading saves
+        :param save_condition: only perform save if matching record in db
+            satisfies condition(s) (e.g. version number).
+            Raises :class:`OperationError` if the conditions are not satisfied
+        :param signal_kwargs: (optional) kwargs dictionary to be passed to
+            the signal calls.
+
+        .. versionchanged:: 0.5
+            In existing documents it only saves changed fields using
+            set / unset.  Saves are cascaded and any
+            :class:`~bson.dbref.DBRef` objects that have changes are
+            saved as well.
+        .. versionchanged:: 0.6
+            Added cascading saves
+        .. versionchanged:: 0.8
+            Cascade saves are optional and default to False.  If you want
+            fine grain control then you can turn off using document
+            meta['cascade'] = True.  Also you can pass different kwargs to
+            the cascade save using cascade_kwargs which overwrites the
+            existing kwargs with custom values.
+        .. versionchanged:: 0.26
+           save() no longer calls :meth:`~mongoengine.Document.ensure_indexes`
+           unless ``meta['auto_create_index_on_save']`` is set to True.
 
-    @classmethod
-    def from_json(cls, json_data, created=False, **kwargs):
-        """Converts json data to a Document instance
-
-        :param str json_data: The json data to load into the Document
-        :param bool created: Boolean defining whether to consider the newly
-            instantiated document as brand new or as persisted already:
-            * If True, consider the document as brand new, no matter what data
-              it's loaded with (i.e. even if an ID is loaded).
-            * If False and an ID is NOT provided, consider the document as
-              brand new.
-            * If False and an ID is provided, assume that the object has
-              already been persisted (this has an impact on the subsequent
-              call to .save()).
-            * Defaults to ``False``.
         """
-        # TODO should `created` default to False? If the object already exists
-        # in the DB, you would likely retrieve it from MongoDB itself through
-        # a query, not load it from JSON data.
-        if "json_options" not in kwargs:
-            warnings.warn(
-                "No 'json_options' are specified! Falling back to "
-                "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
-                "For use with other MongoDB drivers specify the UUID "
-                "representation to use. This will be changed to "
-                "uuid_representation=UNSPECIFIED in a future release.",
-                DeprecationWarning,
-            )
-            kwargs["json_options"] = LEGACY_JSON_OPTIONS
-        return cls._from_son(json_util.loads(json_data, **kwargs), created=created)
-
-    def __expand_dynamic_values(self, name, value):
-        """Expand any dynamic values to their correct types / values."""
-        if not isinstance(value, (dict, list, tuple)):
-            return value
-
-        # If the value is a dict with '_cls' in it, turn it into a document
-        is_dict = isinstance(value, dict)
-        if is_dict and "_cls" in value:
-            cls = get_document(value["_cls"])
-            return cls(**value)
-
-        if is_dict:
-            value = {k: self.__expand_dynamic_values(k, v) for k, v in value.items()}
-        else:
-            value = [self.__expand_dynamic_values(name, v) for v in value]
+        signal_kwargs = signal_kwargs or {}
 
-        # Convert lists / values so we can watch for any changes on them
-        EmbeddedDocumentListField = _import_class("EmbeddedDocumentListField")
-        if isinstance(value, (list, tuple)) and not isinstance(value, BaseList):
-            if issubclass(type(self), EmbeddedDocumentListField):
-                value = EmbeddedDocumentList(value, self, name)
-            else:
-                value = BaseList(value, self, name)
-        elif isinstance(value, dict) and not isinstance(value, BaseDict):
-            value = BaseDict(value, self, name)
+        if self._meta.get("abstract"):
+            raise InvalidDocumentError("Cannot save an abstract document.")
 
-        return value
+        signals.pre_save.send(self.__class__, document=self, **signal_kwargs)
 
-    def _mark_as_changed(self, key):
-        """Mark a key as explicitly changed by the user."""
-        if not hasattr(self, "_changed_fields"):
-            return
+        if validate:
+            self.validate(clean=clean)
 
-        if "." in key:
-            key, rest = key.split(".", 1)
-            key = self._db_field_map.get(key, key)
-            key = f"{key}.{rest}"
-        else:
-            key = self._db_field_map.get(key, key)
+        if write_concern is None:
+            write_concern = {}
 
-        if key not in self._changed_fields:
-            levels, idx = key.split("."), 1
-            while idx <= len(levels):
-                if ".".join(levels[:idx]) in self._changed_fields:
-                    break
-                idx += 1
+        doc_id = self.to_mongo(fields=[self._meta["id_field"]])
+        created = "_id" not in doc_id or self._created or force_insert
+
+        signals.pre_save_post_validation.send(
+            self.__class__, document=self, created=created, **signal_kwargs
+        )
+        # it might be refreshed by the pre_save_post_validation hook, e.g., for etag generation
+        doc = self.to_mongo()
+
+        # Initialize the Document's underlying pymongo.Collection (+create indexes) if not already initialized
+        # Important to do this here to avoid that the index creation gets wrapped in the try/except block below
+        # and turned into mongoengine.OperationError
+        if self._collection is None:
+            _ = self._get_collection()
+        elif self._meta.get("auto_create_index_on_save", False):
+            # ensure_indexes is called as part of _get_collection so no need to re-call it again here
+            self.ensure_indexes()
+
+        try:
+            # Save a new document or update an existing one
+            if created:
+                object_id = self._save_create(
+                    doc=doc, force_insert=force_insert, write_concern=write_concern
+                )
             else:
-                self._changed_fields.append(key)
-                # remove lower level changed fields
-                level = ".".join(levels[:idx]) + "."
-                remove = self._changed_fields.remove
-                for field in self._changed_fields[:]:
-                    if field.startswith(level):
-                        remove(field)
-
-    def _clear_changed_fields(self):
-        """Using _get_changed_fields iterate and remove any fields that
-        are marked as changed.
-        """
-        ReferenceField = _import_class("ReferenceField")
-        GenericReferenceField = _import_class("GenericReferenceField")
+                object_id, created = self._save_update(
+                    doc, save_condition, write_concern
+                )
 
-        for changed in self._get_changed_fields():
-            parts = changed.split(".")
-            data = self
-            for part in parts:
-                if isinstance(data, list):
-                    try:
-                        data = data[int(part)]
-                    except IndexError:
-                        data = None
-                elif isinstance(data, dict):
-                    data = data.get(part, None)
-                else:
-                    field_name = data._reverse_db_field_map.get(part, part)
-                    data = getattr(data, field_name, None)
-
-                if not isinstance(data, LazyReference) and hasattr(
-                    data, "_changed_fields"
-                ):
-                    if getattr(data, "_is_document", False):
-                        continue
+            if cascade is None:
+                cascade = self._meta.get("cascade", False) or cascade_kwargs is not None
+
+            if cascade:
+                kwargs = {
+                    "force_insert": force_insert,
+                    "validate": validate,
+                    "write_concern": write_concern,
+                    "cascade": cascade,
+                }
+                if cascade_kwargs:  # Allow granular control over cascades
+                    kwargs.update(cascade_kwargs)
+                kwargs["_refs"] = _refs
+                self.cascade_save(**kwargs)
+
+        except pymongo.errors.DuplicateKeyError as err:
+            message = "Tried to save duplicate unique keys (%s)"
+            raise NotUniqueError(message % err)
+        except pymongo.errors.OperationFailure as err:
+            message = "Could not save document (%s)"
+            if re.match("^E1100[01] duplicate key", str(err)):
+                # E11000 - duplicate key error index
+                # E11001 - duplicate key on update
+                message = "Tried to save duplicate unique keys (%s)"
+                raise NotUniqueError(message % err)
+            raise OperationError(message % err)
+
+        # Make sure we store the PK on this document now that it's saved
+        id_field = self._meta["id_field"]
+        if created or id_field not in self._meta.get("shard_key", []):
+            self[id_field] = self._fields[id_field].to_python(object_id)
+
+        signals.post_save.send(
+            self.__class__, document=self, created=created, **signal_kwargs
+        )
 
-                    data._changed_fields = []
-                elif isinstance(data, (list, tuple, dict)):
-                    if hasattr(data, "field") and isinstance(
-                        data.field, (ReferenceField, GenericReferenceField)
-                    ):
-                        continue
-                    BaseDocument._nestable_types_clear_changed_fields(data)
+        self._clear_changed_fields()
+        self._created = False
 
-        self._changed_fields = []
+        return self
 
-    @staticmethod
-    def _nestable_types_clear_changed_fields(data):
-        """Inspect nested data for changed fields
+    def _save_create(self, doc, force_insert, write_concern):
+        """Save a new document.
 
-        :param data: data to inspect for changes
+        Helper method, should only be used inside save().
+        """
+        collection = self._get_collection()
+        with set_write_concern(collection, write_concern) as wc_collection:
+            if force_insert:
+                return wc_collection.insert_one(doc).inserted_id
+            # insert_one will provoke UniqueError alongside save does not
+            # therefore, it need to catch and call replace_one.
+            if "_id" in doc:
+                select_dict = {"_id": doc["_id"]}
+                select_dict = self._integrate_shard_key(doc, select_dict)
+                raw_object = wc_collection.find_one_and_replace(select_dict, doc)
+                if raw_object:
+                    return doc["_id"]
+
+            object_id = wc_collection.insert_one(doc).inserted_id
+
+        return object_id
+
+    def _get_update_doc(self):
+        """Return a dict containing all the $set and $unset operations
+        that should be sent to MongoDB based on the changes made to this
+        Document.
         """
-        Document = _import_class("Document")
+        updates, removals = self._delta()
 
-        # Loop list / dict fields as they contain documents
-        # Determine the iterator to use
-        if not hasattr(data, "items"):
-            iterator = enumerate(data)
-        else:
-            iterator = data.items()
-
-        for _index_or_key, value in iterator:
-            if hasattr(value, "_get_changed_fields") and not isinstance(
-                value, Document
-            ):  # don't follow references
-                value._clear_changed_fields()
-            elif isinstance(value, (list, tuple, dict)):
-                BaseDocument._nestable_types_clear_changed_fields(value)
-
-    @staticmethod
-    def _nestable_types_changed_fields(changed_fields, base_key, data):
-        """Inspect nested data for changed fields
-
-        :param changed_fields: Previously collected changed fields
-        :param base_key: The base key that must be used to prepend changes to this data
-        :param data: data to inspect for changes
+        update_doc = {}
+        if updates:
+            update_doc["$set"] = updates
+        if removals:
+            update_doc["$unset"] = removals
+
+        return update_doc
+
+    def _integrate_shard_key(self, doc, select_dict):
+        """Integrates the collection's shard key to the `select_dict`, which will be used for the query.
+        The value from the shard key is taken from the `doc` and finally the select_dict is returned.
         """
-        # Loop list / dict fields as they contain documents
-        # Determine the iterator to use
-        if not hasattr(data, "items"):
-            iterator = enumerate(data)
-        else:
-            iterator = data.items()
 
-        for index_or_key, value in iterator:
-            item_key = f"{base_key}{index_or_key}."
-            # don't check anything lower if this key is already marked
-            # as changed.
-            if item_key[:-1] in changed_fields:
-                continue
+        # Need to add shard key to query, or you get an error
+        shard_key = self._meta.get("shard_key", tuple())
+        for k in shard_key:
+            path = self._lookup_field(k.split("."))
+            actual_key = [p.db_field for p in path]
+            val = doc
+            for ak in actual_key:
+                val = val[ak]
+            select_dict[".".join(actual_key)] = val
+
+        return select_dict
 
-            if hasattr(value, "_get_changed_fields"):
-                changed = value._get_changed_fields()
-                changed_fields += [f"{item_key}{k}" for k in changed if k]
-            elif isinstance(value, (list, tuple, dict)):
-                BaseDocument._nestable_types_changed_fields(
-                    changed_fields, item_key, value
+    def _save_update(self, doc, save_condition, write_concern):
+        """Update an existing document.
+
+        Helper method, should only be used inside save().
+        """
+        collection = self._get_collection()
+        object_id = doc["_id"]
+        created = False
+
+        select_dict = {}
+        if save_condition is not None:
+            select_dict = transform.query(self.__class__, **save_condition)
+
+        select_dict["_id"] = object_id
+
+        select_dict = self._integrate_shard_key(doc, select_dict)
+
+        update_doc = self._get_update_doc()
+        if update_doc:
+            upsert = save_condition is None
+            with set_write_concern(collection, write_concern) as wc_collection:
+                last_error = wc_collection.update_one(
+                    select_dict, update_doc, upsert=upsert
+                ).raw_result
+            if not upsert and last_error["n"] == 0:
+                raise SaveConditionError(
+                    "Race condition preventing document update detected"
                 )
+            if last_error is not None:
+                updated_existing = last_error.get("updatedExisting")
+                if updated_existing is False:
+                    created = True
+                    # !!! This is bad, means we accidentally created a new,
+                    # potentially corrupted document. See
+                    # https://github.com/MongoEngine/mongoengine/issues/564
+
+        return object_id, created
+
+    def cascade_save(self, **kwargs):
+        """Recursively save any references and generic references on the
+        document.
+        """
+        _refs = kwargs.get("_refs") or []
 
-    def _get_changed_fields(self):
-        """Return a list of all fields that have explicitly been changed."""
-        EmbeddedDocument = _import_class("EmbeddedDocument")
-        LazyReferenceField = _import_class("LazyReferenceField")
         ReferenceField = _import_class("ReferenceField")
-        GenericLazyReferenceField = _import_class("GenericLazyReferenceField")
         GenericReferenceField = _import_class("GenericReferenceField")
-        SortedListField = _import_class("SortedListField")
 
-        changed_fields = []
-        changed_fields += getattr(self, "_changed_fields", [])
-
-        for field_name in self._fields_ordered:
-            db_field_name = self._db_field_map.get(field_name, field_name)
-            key = "%s." % db_field_name
-            data = self._data.get(field_name, None)
-            field = self._fields.get(field_name)
+        for name, cls in self._fields.items():
+            if not isinstance(cls, (ReferenceField, GenericReferenceField)):
+                continue
 
-            if db_field_name in changed_fields:
-                # Whole field already marked as changed, no need to go further
+            ref = self._data.get(name)
+            if not ref or isinstance(ref, DBRef):
                 continue
 
-            if isinstance(field, ReferenceField):  # Don't follow referenced documents
+            if not getattr(ref, "_changed_fields", True):
                 continue
 
-            if isinstance(data, EmbeddedDocument):
-                # Find all embedded fields that have been changed
-                changed = data._get_changed_fields()
-                changed_fields += [f"{key}{k}" for k in changed if k]
-            elif isinstance(data, (list, tuple, dict)):
-                if hasattr(field, "field") and isinstance(
-                    field.field,
-                    (
-                        LazyReferenceField,
-                        ReferenceField,
-                        GenericLazyReferenceField,
-                        GenericReferenceField,
-                    ),
-                ):
-                    continue
-                elif isinstance(field, SortedListField) and field._ordering:
-                    # if ordering is affected whole list is changed
-                    if any(field._ordering in d._changed_fields for d in data):
-                        changed_fields.append(db_field_name)
-                        continue
-
-                self._nestable_types_changed_fields(changed_fields, key, data)
-        return changed_fields
-
-    def _delta(self):
-        """Returns the delta (set, unset) of the changes for a document.
-        Gets any values that have been explicitly changed.
+            ref_id = f"{ref.__class__.__name__},{str(ref._data)}"
+            if ref and ref_id not in _refs:
+                _refs.append(ref_id)
+                kwargs["_refs"] = _refs
+                ref.save(**kwargs)
+                ref._changed_fields = []
+
+    @property
+    def _qs(self):
+        """Return the default queryset corresponding to this document."""
+        if not hasattr(self, "__objects"):
+            queryset_class = self._meta.get("queryset_class", QuerySet)
+            self.__objects = queryset_class(self.__class__, self._get_collection())
+        return self.__objects
+
+    @property
+    def _object_key(self):
+        """Return a query dict that can be used to fetch this document.
+
+        Most of the time the dict is a simple PK lookup, but in case of
+        a sharded collection with a compound shard key, it can contain a more
+        complex query.
+
+        Note that the dict returned by this method uses MongoEngine field
+        names instead of PyMongo field names (e.g. "pk" instead of "_id",
+        "some__nested__field" instead of "some.nested.field", etc.).
         """
-        # Handles cases where not loaded from_son but has _id
-        doc = self.to_mongo()
+        select_dict = {"pk": self.pk}
+        shard_key = self.__class__._meta.get("shard_key", tuple())
+        for k in shard_key:
+            val = self
+            field_parts = k.split(".")
+            for part in field_parts:
+                val = getattr(val, part)
+            select_dict["__".join(field_parts)] = val
+        return select_dict
+
+    def update(self, **kwargs):
+        """Performs an update on the :class:`~mongoengine.Document`
+        A convenience wrapper to :meth:`~mongoengine.QuerySet.update`.
+
+        Raises :class:`OperationError` if called on an object that has not yet
+        been saved.
+        """
+        if self.pk is None:
+            if kwargs.get("upsert", False):
+                query = self.to_mongo()
+                if "_cls" in query:
+                    del query["_cls"]
+                return self._qs.filter(**query).update_one(**kwargs)
+            else:
+                raise OperationError("attempt to update a document not yet saved")
+
+        # Need to add shard key to query, or you get an error
+        return self._qs.filter(**self._object_key).update_one(**kwargs)
+
+    def delete(self, signal_kwargs=None, **write_concern):
+        """Delete the :class:`~mongoengine.Document` from the database. This
+        will only take effect if the document has been previously saved.
+
+        :param signal_kwargs: (optional) kwargs dictionary to be passed to
+            the signal calls.
+        :param write_concern: Extra keyword arguments are passed down which
+            will be used as options for the resultant ``getLastError`` command.
+            For example, ``save(..., w: 2, fsync: True)`` will
+            wait until at least two servers have recorded the write and
+            will force an fsync on the primary server.
+        """
+        signal_kwargs = signal_kwargs or {}
+        signals.pre_delete.send(self.__class__, document=self, **signal_kwargs)
 
-        set_fields = self._get_changed_fields()
-        unset_data = {}
-        if hasattr(self, "_changed_fields"):
-            set_data = {}
-            # Fetch each set item from its path
-            for path in set_fields:
-                parts = path.split(".")
-                d = doc
-                new_path = []
-                for p in parts:
-                    if isinstance(d, (ObjectId, DBRef)):
-                        # Don't dig in the references
-                        break
-                    elif isinstance(d, list) and p.isdigit():
-                        # An item of a list (identified by its index) is updated
-                        d = d[int(p)]
-                    elif hasattr(d, "get"):
-                        # dict-like (dict, embedded document)
-                        d = d.get(p)
-                    new_path.append(p)
-                path = ".".join(new_path)
-                set_data[path] = d
-        else:
-            set_data = doc
-            if "_id" in set_data:
-                del set_data["_id"]
-
-        # Determine if any changed items were actually unset.
-        for path, value in list(set_data.items()):
-            if value or isinstance(
-                value, (numbers.Number, bool)
-            ):  # Account for 0 and True that are truthy
-                continue
+        # Delete FileFields separately
+        FileField = _import_class("FileField")
+        for name, field in self._fields.items():
+            if isinstance(field, FileField):
+                getattr(self, name).delete()
 
-            parts = path.split(".")
+        try:
+            self._qs.filter(**self._object_key).delete(
+                write_concern=write_concern, _from_doc_delete=True
+            )
+        except pymongo.errors.OperationFailure as err:
+            message = "Could not delete document (%s)" % err.args
+            raise OperationError(message)
+        signals.post_delete.send(self.__class__, document=self, **signal_kwargs)
 
-            if self._dynamic and len(parts) and parts[0] in self._dynamic_fields:
-                del set_data[path]
-                unset_data[path] = 1
-                continue
+    def switch_db(self, db_alias, keep_created=True):
+        """
+        Temporarily switch the database for a document instance.
 
-            # If we've set a value that ain't the default value don't unset it.
-            default = None
-            if path in self._fields:
-                default = self._fields[path].default
-            else:  # Perform a full lookup for lists / embedded lookups
-                d = self
-                db_field_name = parts.pop()
-                for p in parts:
-                    if isinstance(d, list) and p.isdigit():
-                        d = d[int(p)]
-                    elif hasattr(d, "__getattribute__") and not isinstance(d, dict):
-                        real_path = d._reverse_db_field_map.get(p, p)
-                        d = getattr(d, real_path)
-                    else:
-                        d = d.get(p)
-
-                if hasattr(d, "_fields"):
-                    field_name = d._reverse_db_field_map.get(
-                        db_field_name, db_field_name
-                    )
-                    if field_name in d._fields:
-                        default = d._fields.get(field_name).default
-                    else:
-                        default = None
-
-            if default is not None:
-                default = default() if callable(default) else default
-
-            if value != default:
-                continue
+        Only really useful for archiving off data and calling `save()`::
 
-            del set_data[path]
-            unset_data[path] = 1
-        return set_data, unset_data
+            user = User.objects.get(id=user_id)
+            user.switch_db('archive-db')
+            user.save()
 
-    @classmethod
-    def _get_collection_name(cls):
-        """Return the collection name for this class. None for abstract
-        class.
+        :param str db_alias: The database alias to use for saving the document
+
+        :param bool keep_created: keep self._created value after switching db, else is reset to True
+
+
+        .. seealso::
+            Use :class:`~mongoengine.context_managers.switch_collection`
+            if you need to read from another collection
+        """
+        with switch_db(self.__class__, db_alias) as cls:
+            collection = cls._get_collection()
+            db = cls._get_db()
+        self._get_collection = lambda: collection
+        self._get_db = lambda: db
+        self._collection = collection
+        self._created = True if not keep_created else self._created
+        self.__objects = self._qs
+        self.__objects._collection_obj = collection
+        return self
+
+    def switch_collection(self, collection_name, keep_created=True):
         """
-        return cls._meta.get("collection", None)
+        Temporarily switch the collection for a document instance.
 
-    @classmethod
-    def _from_son(cls, son, _auto_dereference=True, created=False):
-        """Create an instance of a Document (subclass) from a PyMongo SON (dict)"""
-        if son and not isinstance(son, dict):
-            raise ValueError(
-                "The source SON object needs to be of type 'dict' but a '%s' was found"
-                % type(son)
-            )
+        Only really useful for archiving off data and calling `save()`::
 
-        # Get the class name from the document, falling back to the given
-        # class if unavailable
-        class_name = son.get("_cls", cls._class_name)
-
-        # Convert SON to a data dict, making sure each key is a string and
-        # corresponds to the right db field.
-        # This is needed as _from_son is currently called both from BaseDocument.__init__
-        # and from EmbeddedDocumentField.to_python
-        data = {}
-        for key, value in son.items():
-            key = str(key)
-            key = cls._db_field_map.get(key, key)
-            data[key] = value
-
-        # Return correct subclass for document type
-        if class_name != cls._class_name:
-            cls = get_document(class_name)
-
-        errors_dict = {}
-
-        fields = cls._fields
-        if not _auto_dereference:
-            fields = copy.deepcopy(fields)
-
-        for field_name, field in fields.items():
-            field._auto_dereference = _auto_dereference
-            if field.db_field in data:
-                value = data[field.db_field]
-                try:
-                    data[field_name] = (
-                        value if value is None else field.to_python(value)
-                    )
-                    if field_name != field.db_field:
-                        del data[field.db_field]
-                except (AttributeError, ValueError) as e:
-                    errors_dict[field_name] = e
-
-        if errors_dict:
-            errors = "\n".join([f"Field '{k}' - {v}" for k, v in errors_dict.items()])
-            msg = "Invalid data to create a `{}` instance.\n{}".format(
-                cls._class_name,
-                errors,
-            )
-            raise InvalidDocumentError(msg)
+            user = User.objects.get(id=user_id)
+            user.switch_collection('old-users')
+            user.save()
 
-        # In STRICT documents, remove any keys that aren't in cls._fields
-        if cls.STRICT:
-            data = {k: v for k, v in data.items() if k in cls._fields}
+        :param str collection_name: The database alias to use for saving the
+            document
 
-        obj = cls(__auto_convert=False, _created=created, **data)
-        obj._changed_fields = []
-        if not _auto_dereference:
-            obj._fields = fields
+        :param bool keep_created: keep self._created value after switching collection, else is reset to True
 
-        return obj
 
-    @classmethod
-    def _build_index_specs(cls, meta_indexes):
-        """Generate and merge the full index specs."""
-        geo_indices = cls._geo_indices()
-        unique_indices = cls._unique_with_indexes()
-        index_specs = [cls._build_index_spec(spec) for spec in meta_indexes]
-
-        def merge_index_specs(index_specs, indices):
-            """Helper method for merging index specs."""
-            if not indices:
-                return index_specs
-
-            # Create a map of index fields to index spec. We're converting
-            # the fields from a list to a tuple so that it's hashable.
-            spec_fields = {tuple(index["fields"]): index for index in index_specs}
-
-            # For each new index, if there's an existing index with the same
-            # fields list, update the existing spec with all data from the
-            # new spec.
-            for new_index in indices:
-                candidate = spec_fields.get(tuple(new_index["fields"]))
-                if candidate is None:
-                    index_specs.append(new_index)
-                else:
-                    candidate.update(new_index)
-
-            return index_specs
-
-        # Merge geo indexes and unique_with indexes into the meta index specs.
-        index_specs = merge_index_specs(index_specs, geo_indices)
-        index_specs = merge_index_specs(index_specs, unique_indices)
-        return index_specs
+        .. seealso::
+            Use :class:`~mongoengine.context_managers.switch_db`
+            if you need to read from another database
+        """
+        with switch_collection(self.__class__, collection_name) as cls:
+            collection = cls._get_collection()
+        self._get_collection = lambda: collection
+        self._collection = collection
+        self._created = True if not keep_created else self._created
+        self.__objects = self._qs
+        self.__objects._collection_obj = collection
+        return self
+
+    def select_related(self, max_depth=1):
+        """Handles dereferencing of :class:`~bson.dbref.DBRef` objects to
+        a maximum depth in order to cut down the number queries to mongodb.
+        """
+        DeReference = _import_class("DeReference")
+        DeReference()([self], max_depth + 1)
+        return self
 
-    @classmethod
-    def _build_index_spec(cls, spec):
-        """Build a PyMongo index spec from a MongoEngine index spec."""
-        if isinstance(spec, str):
-            spec = {"fields": [spec]}
-        elif isinstance(spec, (list, tuple)):
-            spec = {"fields": list(spec)}
-        elif isinstance(spec, dict):
-            spec = dict(spec)
-
-        index_list = []
-        direction = None
-
-        # Check to see if we need to include _cls
-        allow_inheritance = cls._meta.get("allow_inheritance")
-        include_cls = (
-            allow_inheritance
-            and not spec.get("sparse", False)
-            and spec.get("cls", True)
-            and "_cls" not in spec["fields"]
-        )
+    def reload(self, *fields, **kwargs):
+        """Reloads all attributes from the database.
 
-        # 733: don't include cls if index_cls is False unless there is an explicit cls with the index
-        include_cls = include_cls and (
-            spec.get("cls", False) or cls._meta.get("index_cls", True)
+        :param fields: (optional) args list of fields to reload
+        :param max_depth: (optional) depth of dereferencing to follow
+        """
+        max_depth = 1
+        if fields and isinstance(fields[0], int):
+            max_depth = fields[0]
+            fields = fields[1:]
+        elif "max_depth" in kwargs:
+            max_depth = kwargs["max_depth"]
+
+        if self.pk is None:
+            raise self.DoesNotExist("Document does not exist")
+
+        obj = (
+            self._qs.read_preference(ReadPreference.PRIMARY)
+            .filter(**self._object_key)
+            .only(*fields)
+            .limit(1)
+            .select_related(max_depth=max_depth)
         )
-        if "cls" in spec:
-            spec.pop("cls")
-        for key in spec["fields"]:
-            # If inherited spec continue
-            if isinstance(key, (list, tuple)):
-                continue
 
-            # ASCENDING from +
-            # DESCENDING from -
-            # TEXT from $
-            # HASHED from #
-            # GEOSPHERE from (
-            # GEOHAYSTACK from )
-            # GEO2D from *
-            direction = pymongo.ASCENDING
-            if key.startswith("-"):
-                direction = pymongo.DESCENDING
-            elif key.startswith("$"):
-                direction = pymongo.TEXT
-            elif key.startswith("#"):
-                direction = pymongo.HASHED
-            elif key.startswith("("):
-                direction = pymongo.GEOSPHERE
-            elif key.startswith(")"):
+        if obj:
+            obj = obj[0]
+        else:
+            raise self.DoesNotExist("Document does not exist")
+        for field in obj._data:
+            if not fields or field in fields:
                 try:
-                    direction = pymongo.GEOHAYSTACK
-                except AttributeError:
-                    raise NotImplementedError
-            elif key.startswith("*"):
-                direction = pymongo.GEO2D
-            if key.startswith(("+", "-", "*", "$", "#", "(", ")")):
-                key = key[1:]
-
-            # Use real field name, do it manually because we need field
-            # objects for the next part (list field checking)
-            parts = key.split(".")
-            if parts in (["pk"], ["id"], ["_id"]):
-                key = "_id"
-            else:
-                fields = cls._lookup_field(parts)
-                parts = []
-                for field in fields:
+                    setattr(self, field, self._reload(field, obj[field]))
+                except (KeyError, AttributeError):
                     try:
-                        if field != "_id":
-                            field = field.db_field
-                    except AttributeError:
-                        pass
-                    parts.append(field)
-                key = ".".join(parts)
-            index_list.append((key, direction))
-
-        # Don't add cls to a geo index
-        if (
-            include_cls
-            and direction not in (pymongo.GEO2D, pymongo.GEOSPHERE)
-            and (GEOHAYSTACK is None or direction != GEOHAYSTACK)
-        ):
-            index_list.insert(0, ("_cls", 1))
+                        # If field is a special field, e.g. items is stored as _reserved_items,
+                        # a KeyError is thrown. So try to retrieve the field from _data
+                        setattr(self, field, self._reload(field, obj._data.get(field)))
+                    except KeyError:
+                        # If field is removed from the database while the object
+                        # is in memory, a reload would cause a KeyError
+                        # i.e. obj.update(unset__field=1) followed by obj.reload()
+                        delattr(self, field)
+
+        self._changed_fields = (
+            list(set(self._changed_fields) - set(fields))
+            if fields
+            else obj._changed_fields
+        )
+        self._created = False
+        return self
+
+    def _reload(self, key, value):
+        """Used by :meth:`~mongoengine.Document.reload` to ensure the
+        correct instance is linked to self.
+        """
+        if isinstance(value, BaseDict):
+            value = [(k, self._reload(k, v)) for k, v in value.items()]
+            value = BaseDict(value, self, key)
+        elif isinstance(value, EmbeddedDocumentList):
+            value = [self._reload(key, v) for v in value]
+            value = EmbeddedDocumentList(value, self, key)
+        elif isinstance(value, BaseList):
+            value = [self._reload(key, v) for v in value]
+            value = BaseList(value, self, key)
+        elif isinstance(value, (EmbeddedDocument, DynamicEmbeddedDocument)):
+            value._instance = None
+            value._changed_fields = []
+        return value
 
-        if index_list:
-            spec["fields"] = index_list
+    def to_dbref(self):
+        """Returns an instance of :class:`~bson.dbref.DBRef` useful in
+        `__raw__` queries."""
+        if self.pk is None:
+            msg = "Only saved documents can have a valid dbref"
+            raise OperationError(msg)
+        return DBRef(self.__class__._get_collection_name(), self.pk)
 
-        return spec
+    @classmethod
+    def register_delete_rule(cls, document_cls, field_name, rule):
+        """This method registers the delete rules to apply when removing this
+        object.
+        """
+        classes = [
+            get_document(class_name)
+            for class_name in cls._subclasses
+            if class_name != cls.__name__
+        ] + [cls]
+        documents = [
+            get_document(class_name)
+            for class_name in document_cls._subclasses
+            if class_name != document_cls.__name__
+        ] + [document_cls]
+
+        for klass in classes:
+            for document_cls in documents:
+                delete_rules = klass._meta.get("delete_rules") or {}
+                delete_rules[(document_cls, field_name)] = rule
+                klass._meta["delete_rules"] = delete_rules
 
     @classmethod
-    def _unique_with_indexes(cls, namespace=""):
-        """Find unique indexes in the document schema and return them."""
-        unique_indexes = []
-        for field_name, field in cls._fields.items():
-            sparse = field.sparse
-
-            # Generate a list of indexes needed by uniqueness constraints
-            if field.unique:
-                unique_fields = [field.db_field]
-
-                # Add any unique_with fields to the back of the index spec
-                if field.unique_with:
-                    if isinstance(field.unique_with, str):
-                        field.unique_with = [field.unique_with]
-
-                    # Convert unique_with field names to real field names
-                    unique_with = []
-                    for other_name in field.unique_with:
-                        parts = other_name.split(".")
-
-                        # Lookup real name
-                        parts = cls._lookup_field(parts)
-                        name_parts = [part.db_field for part in parts]
-                        unique_with.append(".".join(name_parts))
-
-                        # Unique field should be required
-                        parts[-1].required = True
-                        sparse = not sparse and parts[-1].name not in cls.__dict__
-
-                    unique_fields += unique_with
-
-                # Add the new index to the list
-                fields = [(f"{namespace}{f}", pymongo.ASCENDING) for f in unique_fields]
-                index = {"fields": fields, "unique": True, "sparse": sparse}
-                unique_indexes.append(index)
-
-            if field.__class__.__name__ in {
-                "EmbeddedDocumentListField",
-                "ListField",
-                "SortedListField",
-            }:
-                field = field.field
-
-            # Grab any embedded document field unique indexes
-            if (
-                field.__class__.__name__ == "EmbeddedDocumentField"
-                and field.document_type != cls
-            ):
-                field_namespace = "%s." % field_name
-                doc_cls = field.document_type
-                unique_indexes += doc_cls._unique_with_indexes(field_namespace)
-
-        return unique_indexes
+    def drop_collection(cls):
+        """Drops the entire collection associated with this
+        :class:`~mongoengine.Document` type from the database.
+
+        Raises :class:`OperationError` if the document has no collection set
+        (i.g. if it is `abstract`)
+        """
+        coll_name = cls._get_collection_name()
+        if not coll_name:
+            raise OperationError(
+                "Document %s has no collection defined (is it abstract ?)" % cls
+            )
+        cls._collection = None
+        db = cls._get_db()
+        db.drop_collection(coll_name)
 
     @classmethod
-    def _geo_indices(cls, inspected=None, parent_field=None):
-        inspected = inspected or []
-        geo_indices = []
-        inspected.append(cls)
-
-        geo_field_type_names = (
-            "EmbeddedDocumentField",
-            "GeoPointField",
-            "PointField",
-            "LineStringField",
-            "PolygonField",
-        )
+    def create_index(cls, keys, background=False, **kwargs):
+        """Creates the given indexes if required.
+
+        :param keys: a single index key or a list of index keys (to
+            construct a multi-field index); keys may be prefixed with a **+**
+            or a **-** to determine the index ordering
+        :param background: Allows index creation in the background
+        """
+        index_spec = cls._build_index_spec(keys)
+        index_spec = index_spec.copy()
+        fields = index_spec.pop("fields")
+        index_spec["background"] = background
+        index_spec.update(kwargs)
 
-        geo_field_types = tuple(_import_class(field) for field in geo_field_type_names)
+        return cls._get_collection().create_index(fields, **index_spec)
 
-        for field in cls._fields.values():
-            if not isinstance(field, geo_field_types):
-                continue
+    @classmethod
+    def ensure_indexes(cls):
+        """Checks the document meta data and ensures all the indexes exist.
 
-            if hasattr(field, "document_type"):
-                field_cls = field.document_type
-                if field_cls in inspected:
-                    continue
+        Global defaults can be set in the meta - see :doc:`guide/defining-documents`
 
-                if hasattr(field_cls, "_geo_indices"):
-                    geo_indices += field_cls._geo_indices(
-                        inspected, parent_field=field.db_field
-                    )
-            elif field._geo_index:
-                field_name = field.db_field
-                if parent_field:
-                    field_name = f"{parent_field}.{field_name}"
-                geo_indices.append({"fields": [(field_name, field._geo_index)]})
+        By default, this will get called automatically upon first interaction with the
+        Document collection (query, save, etc) so unless you disabled `auto_create_index`, you
+        shouldn't have to call this manually.
 
-        return geo_indices
+        This also gets called upon every call to Document.save if `auto_create_index_on_save` is set to True
+
+        If called multiple times, MongoDB will not re-recreate indexes if they exist already
+
+        .. note:: You can disable automatic index creation by setting
+                  `auto_create_index` to False in the documents meta data
+        """
+        background = cls._meta.get("index_background", False)
+        index_opts = cls._meta.get("index_opts") or {}
+        index_cls = cls._meta.get("index_cls", True)
+
+        collection = cls._get_collection()
+
+        # determine if an index which we are creating includes
+        # _cls as its first field; if so, we can avoid creating
+        # an extra index on _cls, as mongodb will use the existing
+        # index to service queries against _cls
+        cls_indexed = False
+
+        # Ensure document-defined indexes are created
+        if cls._meta["index_specs"]:
+            index_spec = cls._meta["index_specs"]
+            for spec in index_spec:
+                spec = spec.copy()
+                fields = spec.pop("fields")
+                cls_indexed = cls_indexed or includes_cls(fields)
+                opts = index_opts.copy()
+                opts.update(spec)
+
+                # we shouldn't pass 'cls' to the collection.ensureIndex options
+                # because of https://jira.mongodb.org/browse/SERVER-769
+                if "cls" in opts:
+                    del opts["cls"]
+
+                collection.create_index(fields, background=background, **opts)
+
+        # If _cls is being used (for polymorphism), it needs an index,
+        # only if another index doesn't begin with _cls
+        if index_cls and not cls_indexed and cls._meta.get("allow_inheritance"):
+            # we shouldn't pass 'cls' to the collection.ensureIndex options
+            # because of https://jira.mongodb.org/browse/SERVER-769
+            if "cls" in index_opts:
+                del index_opts["cls"]
+
+            collection.create_index("_cls", background=background, **index_opts)
 
     @classmethod
-    def _lookup_field(cls, parts):
-        """Given the path to a given field, return a list containing
-        the Field object associated with that field and all of its parent
-        Field objects.
+    def list_indexes(cls):
+        """Lists all indexes that should be created for the Document collection.
+        It includes all the indexes from super- and sub-classes.
 
-        Args:
-            parts (str, list, or tuple) - path to the field. Should be a
-            string for simple fields existing on this document or a list
-            of strings for a field that exists deeper in embedded documents.
+        Note that it will only return the indexes' fields, not the indexes' options
+        """
+        if cls._meta.get("abstract"):
+            return []
+
+        # get all the base classes, subclasses and siblings
+        classes = []
+
+        def get_classes(cls):
+            if cls not in classes and isinstance(cls, TopLevelDocumentMetaclass):
+                classes.append(cls)
+
+            for base_cls in cls.__bases__:
+                if (
+                    isinstance(base_cls, TopLevelDocumentMetaclass)
+                    and base_cls != Document
+                    and not base_cls._meta.get("abstract")
+                    and base_cls._get_collection().full_name
+                    == cls._get_collection().full_name
+                    and base_cls not in classes
+                ):
+                    classes.append(base_cls)
+                    get_classes(base_cls)
+            for subclass in cls.__subclasses__():
+                if (
+                    isinstance(base_cls, TopLevelDocumentMetaclass)
+                    and subclass._get_collection().full_name
+                    == cls._get_collection().full_name
+                    and subclass not in classes
+                ):
+                    classes.append(subclass)
+                    get_classes(subclass)
 
-        Returns:
-            A list of Field instances for fields that were found or
-            strings for sub-fields that weren't.
+        get_classes(cls)
 
-        Example:
-            >>> user._lookup_field('name')
-            [<mongoengine.fields.StringField at 0x1119bff50>]
+        # get the indexes spec for all the gathered classes
+        def get_indexes_spec(cls):
+            indexes = []
 
-            >>> user._lookup_field('roles')
-            [<mongoengine.fields.EmbeddedDocumentListField at 0x1119ec250>]
+            if cls._meta["index_specs"]:
+                index_spec = cls._meta["index_specs"]
+                for spec in index_spec:
+                    spec = spec.copy()
+                    fields = spec.pop("fields")
+                    indexes.append(fields)
+            return indexes
 
-            >>> user._lookup_field(['roles', 'role'])
-            [<mongoengine.fields.EmbeddedDocumentListField at 0x1119ec250>,
-             <mongoengine.fields.StringField at 0x1119ec050>]
+        indexes = []
+        for klass in classes:
+            for index in get_indexes_spec(klass):
+                if index not in indexes:
+                    indexes.append(index)
 
-            >>> user._lookup_field('doesnt_exist')
-            raises LookUpError
+        # finish up by appending { '_id': 1 } and { '_cls': 1 }, if needed
+        if [("_id", 1)] not in indexes:
+            indexes.append([("_id", 1)])
+        if cls._meta.get("index_cls", True) and cls._meta.get("allow_inheritance"):
+            indexes.append([("_cls", 1)])
 
-            >>> user._lookup_field(['roles', 'doesnt_exist'])
-            [<mongoengine.fields.EmbeddedDocumentListField at 0x1119ec250>,
-             'doesnt_exist']
+        return indexes
 
+    @classmethod
+    def compare_indexes(cls):
+        """Compares the indexes defined in MongoEngine with the ones
+        existing in the database. Returns any missing/extra indexes.
         """
-        # TODO this method is WAY too complicated. Simplify it.
-        # TODO don't think returning a string for embedded non-existent fields is desired
 
-        ListField = _import_class("ListField")
-        DynamicField = _import_class("DynamicField")
+        required = cls.list_indexes()
 
-        if not isinstance(parts, (list, tuple)):
-            parts = [parts]
+        existing = []
+        collection = cls._get_collection()
+        for info in collection.index_information().values():
+            if "_fts" in info["key"][0]:
+                # Useful for text indexes (but not only)
+                index_type = info["key"][0][1]
+                text_index_fields = info.get("weights").keys()
+                existing.append([(key, index_type) for key in text_index_fields])
+            else:
+                existing.append(info["key"])
+        missing = [index for index in required if index not in existing]
+        extra = [index for index in existing if index not in required]
+
+        # if { _cls: 1 } is missing, make sure it's *really* necessary
+        if [("_cls", 1)] in missing:
+            cls_obsolete = False
+            for index in existing:
+                if includes_cls(index) and index not in extra:
+                    cls_obsolete = True
+                    break
+            if cls_obsolete:
+                missing.remove([("_cls", 1)])
 
-        fields = []
-        field = None
+        return {"missing": missing, "extra": extra}
 
-        for field_name in parts:
-            # Handle ListField indexing:
-            if field_name.isdigit() and isinstance(field, ListField):
-                fields.append(field_name)
-                continue
 
-            # Look up first field from the document
-            if field is None:
-                if field_name == "pk":
-                    # Deal with "primary key" alias
-                    field_name = cls._meta["id_field"]
-
-                if field_name in cls._fields:
-                    field = cls._fields[field_name]
-                elif cls._dynamic:
-                    field = DynamicField(db_field=field_name)
-                elif cls._meta.get("allow_inheritance") or cls._meta.get(
-                    "abstract", False
-                ):
-                    # 744: in case the field is defined in a subclass
-                    for subcls in cls.__subclasses__():
-                        try:
-                            field = subcls._lookup_field([field_name])[0]
-                        except LookUpError:
-                            continue
-
-                        if field is not None:
-                            break
-                    else:
-                        raise LookUpError('Cannot resolve field "%s"' % field_name)
-                else:
-                    raise LookUpError('Cannot resolve field "%s"' % field_name)
-            else:
-                ReferenceField = _import_class("ReferenceField")
-                GenericReferenceField = _import_class("GenericReferenceField")
-
-                # If previous field was a reference, throw an error (we
-                # cannot look up fields that are on references).
-                if isinstance(field, (ReferenceField, GenericReferenceField)):
-                    raise LookUpError(
-                        "Cannot perform join in mongoDB: %s" % "__".join(parts)
-                    )
-
-                # If the parent field has a "field" attribute which has a
-                # lookup_member method, call it to find the field
-                # corresponding to this iteration.
-                if hasattr(getattr(field, "field", None), "lookup_member"):
-                    new_field = field.field.lookup_member(field_name)
-
-                # If the parent field is a DynamicField or if it's part of
-                # a DynamicDocument, mark current field as a DynamicField
-                # with db_name equal to the field name.
-                elif cls._dynamic and (
-                    isinstance(field, DynamicField)
-                    or getattr(getattr(field, "document_type", None), "_dynamic", None)
-                ):
-                    new_field = DynamicField(db_field=field_name)
+class DynamicDocument(Document, metaclass=TopLevelDocumentMetaclass):
+    """A Dynamic Document class allowing flexible, expandable and uncontrolled
+    schemas.  As a :class:`~mongoengine.Document` subclass, acts in the same
+    way as an ordinary document but has expanded style properties.  Any data
+    passed or set against the :class:`~mongoengine.DynamicDocument` that is
+    not a field is automatically converted into a
+    :class:`~mongoengine.fields.DynamicField` and data can be attributed to that
+    field.
+
+    .. note::
+
+        There is one caveat on Dynamic Documents: undeclared fields cannot start with `_`
+    """
 
-                # Else, try to use the parent field's lookup_member method
-                # to find the subfield.
-                elif hasattr(field, "lookup_member"):
-                    new_field = field.lookup_member(field_name)
+    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
+    my_metaclass = TopLevelDocumentMetaclass
 
-                # Raise a LookUpError if all the other conditions failed.
-                else:
-                    raise LookUpError(
-                        "Cannot resolve subfield or operator {} "
-                        "on the field {}".format(field_name, field.name)
-                    )
+    _dynamic = True
+
+    def __delattr__(self, *args, **kwargs):
+        """Delete the attribute by setting to None and allowing _delta
+        to unset it.
+        """
+        field_name = args[0]
+        if field_name in self._dynamic_fields:
+            setattr(self, field_name, None)
+            self._dynamic_fields[field_name].null = False
+        else:
+            super().__delattr__(*args, **kwargs)
 
-                # If current field still wasn't found and the parent field
-                # is a ComplexBaseField, add the name current field name and
-                # move on.
-                if not new_field and isinstance(field, ComplexBaseField):
-                    fields.append(field_name)
-                    continue
-                elif not new_field:
-                    raise LookUpError('Cannot resolve field "%s"' % field_name)
 
-                field = new_field  # update field to the new field type
+class DynamicEmbeddedDocument(EmbeddedDocument, metaclass=DocumentMetaclass):
+    """A Dynamic Embedded Document class allowing flexible, expandable and
+    uncontrolled schemas. See :class:`~mongoengine.DynamicDocument` for more
+    information about dynamic documents.
+    """
 
-            fields.append(field)
+    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
+    my_metaclass = DocumentMetaclass
 
-        return fields
+    _dynamic = True
 
-    @classmethod
-    def _translate_field_name(cls, field, sep="."):
-        """Translate a field attribute name to a database field name."""
-        parts = field.split(sep)
-        parts = [f.db_field for f in cls._lookup_field(parts)]
-        return ".".join(parts)
-
-    def __set_field_display(self):
-        """For each field that specifies choices, create a
-        get_<field>_display method.
+    def __delattr__(self, *args, **kwargs):
+        """Delete the attribute by setting to None and allowing _delta
+        to unset it.
         """
-        fields_with_choices = [(n, f) for n, f in self._fields.items() if f.choices]
-        for attr_name, field in fields_with_choices:
-            setattr(
-                self,
-                "get_%s_display" % attr_name,
-                partial(self.__get_field_display, field=field),
-            )
+        field_name = args[0]
+        if field_name in self._fields:
+            default = self._fields[field_name].default
+            if callable(default):
+                default = default()
+            setattr(self, field_name, default)
+        else:
+            setattr(self, field_name, None)
+
+
+class MapReduceDocument:
+    """A document returned from a map/reduce query.
+
+    :param collection: An instance of :class:`~pymongo.Collection`
+    :param key: Document/result key, often an instance of
+                :class:`~bson.objectid.ObjectId`. If supplied as
+                an ``ObjectId`` found in the given ``collection``,
+                the object can be accessed via the ``object`` property.
+    :param value: The result(s) for this key.
+    """
+
+    def __init__(self, document, collection, key, value):
+        self._document = document
+        self._collection = collection
+        self.key = key
+        self.value = value
+
+    @property
+    def object(self):
+        """Lazy-load the object referenced by ``self.key``. ``self.key``
+        should be the ``primary_key``.
+        """
+        id_field = self._document()._meta["id_field"]
+        id_field_type = type(id_field)
 
-    def __get_field_display(self, field):
-        """Return the display value for a choice field"""
-        value = getattr(self, field.name)
-        if field.choices and isinstance(field.choices[0], (list, tuple)):
-            if value is None:
-                return None
-            sep = getattr(field, "display_sep", " ")
-            values = (
-                value
-                if field.__class__.__name__ in ("ListField", "SortedListField")
-                else [value]
-            )
-            return sep.join(
-                [str(dict(field.choices).get(val, val)) for val in values or []]
-            )
-        return value
+        if not isinstance(self.key, id_field_type):
+            try:
+                self.key = id_field_type(self.key)
+            except Exception:
+                raise Exception("Could not cast key as %s" % id_field_type.__name__)
+
+        if not hasattr(self, "_key_object"):
+            self._key_object = self._document.objects.with_id(self.key)
+            return self._key_object
+        return self._key_object

From e80437b383f3dfdcf41f41847c851665dae65e39 Mon Sep 17 00:00:00 2001
From: Masoud <m.zaeim@abantether.com>
Date: Sun, 25 Aug 2024 14:13:21 +0330
Subject: [PATCH 1442/1519] feat:mongodb new versions decorator added, unit
 tests added

---
 tests/document/test_timeseries_collection.py | 202 +++++++++++++++++++
 tests/utils.py                               |  12 ++
 2 files changed, 214 insertions(+)
 create mode 100644 tests/document/test_timeseries_collection.py

diff --git a/tests/document/test_timeseries_collection.py b/tests/document/test_timeseries_collection.py
new file mode 100644
index 000000000..c5df2402f
--- /dev/null
+++ b/tests/document/test_timeseries_collection.py
@@ -0,0 +1,202 @@
+import unittest
+from datetime import datetime, timedelta
+
+from mongoengine import (
+    DateTimeField,
+    Document,
+    FloatField,
+    StringField,
+    connect,
+    get_db,
+)
+from mongoengine.connection import disconnect
+from tests.utils import requires_mongodb_gte_50
+
+
+class TestTimeSeriesCollections(unittest.TestCase):
+    def setUp(self):
+        connect(db="mongoenginetest")
+        self.db = get_db()
+
+        class SensorData(Document):
+            timestamp = DateTimeField(required=True)
+            temperature = FloatField()
+
+            meta = {
+                "timeseries": {
+                    "timeField": "timestamp",
+                    "metaField": "temperature",
+                    "granularity": "seconds",
+                    "expireAfterSeconds": 5,
+                },
+                "collection": "sensor_data",
+            }
+
+        self.SensorData = SensorData
+
+    def test_get_db(self):
+        """Ensure that get_db returns the expected db."""
+        db = self.SensorData._get_db()
+        assert self.db == db
+
+    def tearDown(self):
+        for collection_name in self.db.list_collection_names():
+            if not collection_name.startswith("system."):
+                self.db.drop_collection(collection_name)
+        disconnect()
+
+    def test_definition(self):
+        """Ensure that document may be defined using fields."""
+        assert ["id", "temperature", "timestamp"] == sorted(
+            self.SensorData._fields.keys()
+        )
+        assert ["DateTimeField", "FloatField", "ObjectIdField"] == sorted(
+            x.__class__.__name__ for x in self.SensorData._fields.values()
+        )
+
+    @requires_mongodb_gte_50
+    def test_get_collection(self):
+        """Ensure that get_collection returns the expected collection."""
+        collection_name = "sensor_data"
+        collection = self.SensorData._get_collection()
+        assert self.db[collection_name] == collection
+
+    @requires_mongodb_gte_50
+    def test_create_timeseries_collection(self):
+        """Ensure that a time-series collection can be created."""
+        collection_name = self.SensorData._get_collection_name()
+        collection = self.SensorData._get_collection()
+
+        assert collection_name in self.db.list_collection_names()
+
+        options = collection.options()
+
+        assert options.get("timeseries") is not None
+        assert options["timeseries"]["timeField"] == "timestamp"
+        assert options["timeseries"]["granularity"] == "seconds"
+
+    @requires_mongodb_gte_50
+    def test_insert_document_into_timeseries_collection(self):
+        """Ensure that a document can be inserted into a time-series collection."""
+        collection_name = self.SensorData._get_collection_name()
+        collection = self.SensorData._get_collection()
+        assert collection_name in self.db.list_collection_names()
+
+        # Insert a document and ensure it was inserted
+        self.SensorData(timestamp=datetime.utcnow(), temperature=23.4).save()
+        assert collection.count_documents({}) == 1
+
+    @requires_mongodb_gte_50
+    def test_timeseries_expiration(self):
+        """Ensure that documents in a time-series collection expire after the specified time."""
+
+        self.SensorData._meta["timeseries"]["expireAfterSeconds"] = 1
+        self.SensorData._get_collection_name()
+        collection = self.SensorData._get_collection()
+        options = collection.options()
+        assert options.get("timeseries", {}) is not None
+        assert options["expireAfterSeconds"] == 1
+
+        self.SensorData(timestamp=datetime.utcnow(), temperature=23.4).save()
+
+        assert collection.count_documents({}) == 1
+
+        # Wait for more than the expiration time
+        import time
+
+        time.sleep(3)
+        assert collection.count_documents({}) > 0
+
+    @requires_mongodb_gte_50
+    def test_index_creation(self):
+        """Test if the index defined in the meta dictionary is created properly."""
+
+        # Define the Document with indexes
+        class SensorDataWithIndex(Document):
+            timestamp = DateTimeField(required=True)
+            temperature = FloatField()
+            location = StringField()  # Field to be indexed
+
+            meta = {
+                "timeseries": {
+                    "timeField": "timestamp",
+                    "metaField": "temperature",
+                    "granularity": "seconds",
+                    "expireAfterSeconds": 5,
+                },
+                "collection": "sensor_data",
+                "indexes": [
+                    {"fields": ["timestamp"], "name": "timestamp_index"},
+                    {"fields": ["temperature"], "name": "temperature_index"},
+                ],
+            }
+
+        collection = SensorDataWithIndex._get_collection()
+
+        indexes = collection.index_information()
+
+        assert (
+            "timestamp_index" in indexes
+        ), "Index on 'timestamp' field was not created"
+        assert (
+            "temperature_index" in indexes
+        ), "Index on 'temperature' field was not created"
+
+    @requires_mongodb_gte_50
+    def test_timeseries_data_insertion_order(self):
+        """Ensure that data in the time-series collection is inserted and queried in the correct time order."""
+        self.SensorData._get_collection_name()
+        self.SensorData._get_collection()
+
+        # Insert documents out of order
+        now = datetime.utcnow()
+        self.SensorData(timestamp=now, temperature=23.4).save()
+        self.SensorData(timestamp=now - timedelta(seconds=5), temperature=22.0).save()
+        self.SensorData(timestamp=now + timedelta(seconds=5), temperature=24.0).save()
+
+        documents = list(self.SensorData.objects.order_by("timestamp"))
+
+        # Check the insertion order
+        assert len(documents) == 3
+        assert documents[0].temperature == 22.0  # Earliest document
+        assert documents[1].temperature == 23.4  # Middle document
+        assert documents[2].temperature == 24.0  # Latest document
+
+    @requires_mongodb_gte_50
+    def test_timeseries_query_by_time_range(self):
+        """Ensure that data can be queried by a specific time range in the time-series collection."""
+
+        self.SensorData._get_collection_name()
+        self.SensorData._get_collection()
+
+        now = datetime.utcnow()
+        self.SensorData(timestamp=now - timedelta(seconds=10), temperature=22.0).save()
+        self.SensorData(timestamp=now - timedelta(seconds=5), temperature=23.0).save()
+        self.SensorData(timestamp=now, temperature=24.0).save()
+
+        # Query documents within the last 6 seconds
+        start_time = now - timedelta(seconds=6)
+        documents = self.SensorData.objects(timestamp__gte=start_time)
+
+        assert len(documents) == 2
+        assert documents[0].temperature == 23.0
+        assert documents[1].temperature == 24.0
+
+    @requires_mongodb_gte_50
+    def test_timeseries_large_data_volume(self):
+        """Ensure that the time-series collection can handle a large volume of data insertion."""
+
+        self.SensorData._get_collection_name()
+        collection = self.SensorData._get_collection()
+
+        for i in range(10000):
+            self.SensorData(
+                timestamp=datetime.utcnow() - timedelta(seconds=i),
+                temperature=20.0 + i % 5,
+            ).save()
+
+        assert collection.count_documents({}) == 10000
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/utils.py b/tests/utils.py
index 7d0eb33f2..43b8eafc9 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -45,6 +45,18 @@ def requires_mongodb_gte_44(func):
     return _decorated_with_ver_requirement(func, (4, 4), oper=operator.ge)
 
 
+def requires_mongodb_gte_50(func):
+    return _decorated_with_ver_requirement(func, (5, 0), oper=operator.ge)
+
+
+def requires_mongodb_gte_60(func):
+    return _decorated_with_ver_requirement(func, (6, 0), oper=operator.ge)
+
+
+def requires_mongodb_gte_70(func):
+    return _decorated_with_ver_requirement(func, (7, 0), oper=operator.ge)
+
+
 def _decorated_with_ver_requirement(func, mongo_version_req, oper):
     """Return a MongoDB version requirement decorator.
 

From 117664c7b46288047b2de166fd098495f52075f8 Mon Sep 17 00:00:00 2001
From: Masoud <m.zaeim@abantether.com>
Date: Sun, 25 Aug 2024 14:23:56 +0330
Subject: [PATCH 1443/1519] fix: document base conflicts

---
 mongoengine/base/document.py | 2072 ++++++++++++++++++----------------
 mongoengine/document.py      |   23 +
 2 files changed, 1100 insertions(+), 995 deletions(-)

diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index e7a37ab5d..053242234 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -1,1141 +1,1223 @@
-import re
+import copy
+import numbers
+import warnings
+from functools import partial
 
 import pymongo
-from bson.dbref import DBRef
-from pymongo.read_preferences import ReadPreference
+from bson import SON, DBRef, ObjectId, json_util
 
 from mongoengine import signals
-from mongoengine.base import (
+from mongoengine.base.common import get_document
+from mongoengine.base.datastructures import (
     BaseDict,
-    BaseDocument,
     BaseList,
-    DocumentMetaclass,
     EmbeddedDocumentList,
-    TopLevelDocumentMetaclass,
-    get_document,
+    LazyReference,
+    StrictDict,
 )
+from mongoengine.base.fields import ComplexBaseField
 from mongoengine.common import _import_class
-from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
-from mongoengine.context_managers import (
-    set_write_concern,
-    switch_collection,
-    switch_db,
-)
 from mongoengine.errors import (
+    FieldDoesNotExist,
     InvalidDocumentError,
-    InvalidQueryError,
-    SaveConditionError,
-)
-from mongoengine.pymongo_support import list_collection_names
-from mongoengine.queryset import (
-    NotUniqueError,
+    LookUpError,
     OperationError,
-    QuerySet,
-    transform,
+    ValidationError,
 )
+from mongoengine.pymongo_support import LEGACY_JSON_OPTIONS
+
+__all__ = ("BaseDocument", "NON_FIELD_ERRORS")
+
+NON_FIELD_ERRORS = "__all__"
+
+try:
+    GEOHAYSTACK = pymongo.GEOHAYSTACK
+except AttributeError:
+    GEOHAYSTACK = None
+
+
+class BaseDocument:
+    # TODO simplify how `_changed_fields` is used.
+    # Currently, handling of `_changed_fields` seems unnecessarily convoluted:
+    # 1. `BaseDocument` defines `_changed_fields` in its `__slots__`, yet it's
+    #    not setting it to `[]` (or any other value) in `__init__`.
+    # 2. `EmbeddedDocument` sets `_changed_fields` to `[]` it its overloaded
+    #    `__init__`.
+    # 3. `Document` does NOT set `_changed_fields` upon initialization. The
+    #    field is primarily set via `_from_son` or `_clear_changed_fields`,
+    #    though there are also other methods that manipulate it.
+    # 4. The codebase is littered with `hasattr` calls for `_changed_fields`.
+    __slots__ = (
+        "_changed_fields",
+        "_initialised",
+        "_created",
+        "_data",
+        "_dynamic_fields",
+        "_auto_id_field",
+        "_db_field_map",
+        "__weakref__",
+    )
+
+    _dynamic = False
+    _dynamic_lock = True
+    STRICT = False
+
+    def __init__(self, *args, **values):
+        """
+        Initialise a document or an embedded document.
+
+        :param values: A dictionary of keys and values for the document.
+            It may contain additional reserved keywords, e.g. "__auto_convert".
+        :param __auto_convert: If True, supplied values will be converted
+            to Python-type values via each field's `to_python` method.
+        :param _created: Indicates whether this is a brand new document
+            or whether it's already been persisted before. Defaults to true.
+        """
+        self._initialised = False
+        self._created = True
 
-__all__ = (
-    "Document",
-    "EmbeddedDocument",
-    "DynamicDocument",
-    "DynamicEmbeddedDocument",
-    "OperationError",
-    "InvalidCollectionError",
-    "NotUniqueError",
-    "MapReduceDocument",
-)
+        if args:
+            raise TypeError(
+                "Instantiating a document with positional arguments is not "
+                "supported. Please use `field_name=value` keyword arguments."
+            )
 
+        __auto_convert = values.pop("__auto_convert", True)
 
-def includes_cls(fields):
-    """Helper function used for ensuring and comparing indexes."""
-    first_field = None
-    if len(fields):
-        if isinstance(fields[0], str):
-            first_field = fields[0]
-        elif isinstance(fields[0], (list, tuple)) and len(fields[0]):
-            first_field = fields[0][0]
-    return first_field == "_cls"
+        _created = values.pop("_created", True)
 
+        signals.pre_init.send(self.__class__, document=self, values=values)
 
-class InvalidCollectionError(Exception):
-    pass
+        # Check if there are undefined fields supplied to the constructor,
+        # if so raise an Exception.
+        if not self._dynamic and (self._meta.get("strict", True) or _created):
+            _undefined_fields = set(values.keys()) - set(
+                list(self._fields.keys()) + ["id", "pk", "_cls", "_text_score"]
+            )
+            if _undefined_fields:
+                msg = f'The fields "{_undefined_fields}" do not exist on the document "{self._class_name}"'
+                raise FieldDoesNotExist(msg)
 
+        if self.STRICT and not self._dynamic:
+            self._data = StrictDict.create(allowed_keys=self._fields_ordered)()
+        else:
+            self._data = {}
 
-class EmbeddedDocument(BaseDocument, metaclass=DocumentMetaclass):
-    r"""A :class:`~mongoengine.Document` that isn't stored in its own
-    collection.  :class:`~mongoengine.EmbeddedDocument`\ s should be used as
-    fields on :class:`~mongoengine.Document`\ s through the
-    :class:`~mongoengine.EmbeddedDocumentField` field type.
+        self._dynamic_fields = SON()
 
-    A :class:`~mongoengine.EmbeddedDocument` subclass may be itself subclassed,
-    to create a specialised version of the embedded document that will be
-    stored in the same collection. To facilitate this behaviour a `_cls`
-    field is added to documents (hidden though the MongoEngine interface).
-    To enable this behaviour set :attr:`allow_inheritance` to ``True`` in the
-    :attr:`meta` dictionary.
-    """
+        # Assign default values for fields
+        # not set in the constructor
+        for field_name in self._fields:
+            if field_name in values:
+                continue
+            value = getattr(self, field_name, None)
+            setattr(self, field_name, value)
 
-    __slots__ = ("_instance",)
+        if "_cls" not in values:
+            self._cls = self._class_name
 
-    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
-    my_metaclass = DocumentMetaclass
+        # Set actual values
+        dynamic_data = {}
+        FileField = _import_class("FileField")
+        for key, value in values.items():
+            field = self._fields.get(key)
+            if field or key in ("id", "pk", "_cls"):
+                if __auto_convert and value is not None:
+                    if field and not isinstance(field, FileField):
+                        value = field.to_python(value)
+                setattr(self, key, value)
+            else:
+                if self._dynamic:
+                    dynamic_data[key] = value
+                else:
+                    # For strict Document
+                    self._data[key] = value
 
-    # A generic embedded document doesn't have any immutable properties
-    # that describe it uniquely, hence it shouldn't be hashable. You can
-    # define your own __hash__ method on a subclass if you need your
-    # embedded documents to be hashable.
-    __hash__ = None
+        # Set any get_<field>_display methods
+        self.__set_field_display()
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self._instance = None
-        self._changed_fields = []
+        if self._dynamic:
+            self._dynamic_lock = False
+            for key, value in dynamic_data.items():
+                setattr(self, key, value)
 
-    def __eq__(self, other):
-        if isinstance(other, self.__class__):
-            return self._data == other._data
-        return False
+        # Flag initialised
+        self._initialised = True
+        self._created = _created
 
-    def __ne__(self, other):
-        return not self.__eq__(other)
+        signals.post_init.send(self.__class__, document=self)
 
-    def __getstate__(self):
-        data = super().__getstate__()
-        data["_instance"] = None
-        return data
+    def __delattr__(self, *args, **kwargs):
+        """Handle deletions of fields"""
+        field_name = args[0]
+        if field_name in self._fields:
+            default = self._fields[field_name].default
+            if callable(default):
+                default = default()
+            setattr(self, field_name, default)
+        else:
+            super().__delattr__(*args, **kwargs)
 
-    def __setstate__(self, state):
-        super().__setstate__(state)
-        self._instance = state["_instance"]
+    def __setattr__(self, name, value):
+        # Handle dynamic data only if an initialised dynamic document
+        if self._dynamic and not self._dynamic_lock:
+            if name not in self._fields_ordered and not name.startswith("_"):
+                DynamicField = _import_class("DynamicField")
+                field = DynamicField(db_field=name, null=True)
+                field.name = name
+                self._dynamic_fields[name] = field
+                self._fields_ordered += (name,)
+
+            if not name.startswith("_"):
+                value = self.__expand_dynamic_values(name, value)
+
+            # Handle marking data as changed
+            if name in self._dynamic_fields:
+                self._data[name] = value
+                if hasattr(self, "_changed_fields"):
+                    self._mark_as_changed(name)
+        try:
+            self__created = self._created
+        except AttributeError:
+            self__created = True
+
+        if (
+            self._is_document
+            and not self__created
+            and name in self._meta.get("shard_key", tuple())
+            and self._data.get(name) != value
+        ):
+            msg = "Shard Keys are immutable. Tried to update %s" % name
+            raise OperationError(msg)
 
-    def to_mongo(self, *args, **kwargs):
-        data = super().to_mongo(*args, **kwargs)
+        try:
+            self__initialised = self._initialised
+        except AttributeError:
+            self__initialised = False
+
+        # Check if the user has created a new instance of a class
+        if (
+            self._is_document
+            and self__initialised
+            and self__created
+            and name == self._meta.get("id_field")
+        ):
+            # When setting the ID field of an instance already instantiated and that was user-created (i.e not saved in db yet)
+            # Typically this is when calling .save()
+            super().__setattr__("_created", False)
 
-        # remove _id from the SON if it's in it and it's None
-        if "_id" in data and data["_id"] is None:
-            del data["_id"]
+        super().__setattr__(name, value)
 
+    def __getstate__(self):
+        data = {}
+        for k in (
+            "_changed_fields",
+            "_initialised",
+            "_created",
+            "_dynamic_fields",
+            "_fields_ordered",
+        ):
+            if hasattr(self, k):
+                data[k] = getattr(self, k)
+        data["_data"] = self.to_mongo()
         return data
 
+    def __setstate__(self, data):
+        if isinstance(data["_data"], SON):
+            data["_data"] = self.__class__._from_son(data["_data"])._data
+        for k in (
+            "_changed_fields",
+            "_initialised",
+            "_created",
+            "_data",
+            "_dynamic_fields",
+        ):
+            if k in data:
+                setattr(self, k, data[k])
+        if "_fields_ordered" in data:
+            if self._dynamic:
+                self._fields_ordered = data["_fields_ordered"]
+            else:
+                _super_fields_ordered = type(self)._fields_ordered
+                self._fields_ordered = _super_fields_ordered
 
-class Document(BaseDocument, metaclass=TopLevelDocumentMetaclass):
-    """The base class used for defining the structure and properties of
-    collections of documents stored in MongoDB. Inherit from this class, and
-    add fields as class attributes to define a document's structure.
-    Individual documents may then be created by making instances of the
-    :class:`~mongoengine.Document` subclass.
-
-    By default, the MongoDB collection used to store documents created using a
-    :class:`~mongoengine.Document` subclass will be the name of the subclass
-    converted to snake_case. A different collection may be specified by
-    providing :attr:`collection` to the :attr:`meta` dictionary in the class
-    definition.
-
-    A :class:`~mongoengine.Document` subclass may be itself subclassed, to
-    create a specialised version of the document that will be stored in the
-    same collection. To facilitate this behaviour a `_cls`
-    field is added to documents (hidden though the MongoEngine interface).
-    To enable this behaviour set :attr:`allow_inheritance` to ``True`` in the
-    :attr:`meta` dictionary.
-
-    A :class:`~mongoengine.Document` may use a **Capped Collection** by
-    specifying :attr:`max_documents` and :attr:`max_size` in the :attr:`meta`
-    dictionary. :attr:`max_documents` is the maximum number of documents that
-    is allowed to be stored in the collection, and :attr:`max_size` is the
-    maximum size of the collection in bytes. :attr:`max_size` is rounded up
-    to the next multiple of 256 by MongoDB internally and mongoengine before.
-    Use also a multiple of 256 to avoid confusions.  If :attr:`max_size` is not
-    specified and :attr:`max_documents` is, :attr:`max_size` defaults to
-    10485760 bytes (10MB).
-
-    Indexes may be created by specifying :attr:`indexes` in the :attr:`meta`
-    dictionary. The value should be a list of field names or tuples of field
-    names. Index direction may be specified by prefixing the field names with
-    a **+** or **-** sign.
-
-    Automatic index creation can be disabled by specifying
-    :attr:`auto_create_index` in the :attr:`meta` dictionary. If this is set to
-    False then indexes will not be created by MongoEngine.  This is useful in
-    production systems where index creation is performed as part of a
-    deployment system.
-
-    By default, _cls will be added to the start of every index (that
-    doesn't contain a list) if allow_inheritance is True. This can be
-    disabled by either setting cls to False on the specific index or
-    by setting index_cls to False on the meta dictionary for the document.
-
-    By default, any extra attribute existing in stored data but not declared
-    in your model will raise a :class:`~mongoengine.FieldDoesNotExist` error.
-    This can be disabled by setting :attr:`strict` to ``False``
-    in the :attr:`meta` dictionary.
-    """
-
-    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
-    my_metaclass = TopLevelDocumentMetaclass
-
-    __slots__ = ("__objects",)
-
-    @property
-    def pk(self):
-        """Get the primary key."""
-        if "id_field" not in self._meta:
-            return None
-        return getattr(self, self._meta["id_field"])
-
-    @pk.setter
-    def pk(self, value):
-        """Set the primary key."""
-        return setattr(self, self._meta["id_field"], value)
-
-    def __hash__(self):
-        """Return the hash based on the PK of this document. If it's new
-        and doesn't have a PK yet, return the default object hash instead.
-        """
-        if self.pk is None:
-            return super(BaseDocument, self).__hash__()
-
-        return hash(self.pk)
-
-    @classmethod
-    def _get_db(cls):
-        """Some Model using other db_alias"""
-        return get_db(cls._meta.get("db_alias", DEFAULT_CONNECTION_NAME))
+        dynamic_fields = data.get("_dynamic_fields") or SON()
+        for k in dynamic_fields.keys():
+            setattr(self, k, data["_data"].get(k))
 
-    @classmethod
-    def _disconnect(cls):
-        """Detach the Document class from the (cached) database collection"""
-        cls._collection = None
+    def __iter__(self):
+        return iter(self._fields_ordered)
 
-    @classmethod
-    def _get_collection(cls):
-        """Return the PyMongo collection corresponding to this document.
-
-        Upon first call, this method:
-        1. Initializes a :class:`~pymongo.collection.Collection` corresponding
-           to this document.
-        2. Creates indexes defined in this document's :attr:`meta` dictionary.
-           This happens only if `auto_create_index` is True.
-        """
-        if not hasattr(cls, "_collection") or cls._collection is None:
-            # Get the collection, either capped or regular.
-            if cls._meta.get("max_size") or cls._meta.get("max_documents"):
-                cls._collection = cls._get_capped_collection()
-            elif cls._meta.get("timeseries"):
-                cls._collection = cls._get_timeseries_collection()
-            else:
-                db = cls._get_db()
-                collection_name = cls._get_collection_name()
-                cls._collection = db[collection_name]
+    def __getitem__(self, name):
+        """Dictionary-style field access, return a field's value if present."""
+        try:
+            if name in self._fields_ordered:
+                return getattr(self, name)
+        except AttributeError:
+            pass
+        raise KeyError(name)
+
+    def __setitem__(self, name, value):
+        """Dictionary-style field access, set a field's value."""
+        # Ensure that the field exists before settings its value
+        if not self._dynamic and name not in self._fields:
+            raise KeyError(name)
+        return setattr(self, name, value)
+
+    def __contains__(self, name):
+        try:
+            val = getattr(self, name)
+            return val is not None
+        except AttributeError:
+            return False
 
-            # Ensure indexes on the collection unless auto_create_index was
-            # set to False. Plus, there is no need to ensure indexes on slave.
-            db = cls._get_db()
-            if cls._meta.get("auto_create_index", True) and db.client.is_primary:
-                cls.ensure_indexes()
+    def __len__(self):
+        return len(self._data)
 
-        return cls._collection
+    def __repr__(self):
+        try:
+            u = self.__str__()
+        except (UnicodeEncodeError, UnicodeDecodeError):
+            u = "[Bad Unicode data]"
+        repr_type = str if u is None else type(u)
+        return repr_type(f"<{self.__class__.__name__}: {u}>")
+
+    def __str__(self):
+        # TODO this could be simpler?
+        if hasattr(self, "__unicode__"):
+            return self.__unicode__()
+        return "%s object" % self.__class__.__name__
 
-    @classmethod
-    def _get_timeseries_collection(cls):
-        """Create a new or get an existing timeseries PyMongo collection."""
-        db = cls._get_db()
-        collection_name = cls._get_collection_name()
-        timeseries_opts = cls._meta.get("timeseries")
-
-        if collection_name in list_collection_names(
-            db, include_system_collections=True
+    def __eq__(self, other):
+        if (
+            isinstance(other, self.__class__)
+            and hasattr(other, "id")
+            and other.id is not None
         ):
-            collection = db[collection_name]
-            collection.options()
-            return collection
-
-        opts = {"expireAfterSeconds": timeseries_opts.pop("expireAfterSeconds", None)}
-        return db.create_collection(
-            name=collection_name,
-            timeseries=timeseries_opts,
-            **opts,
-        )
+            return self.id == other.id
+        if isinstance(other, DBRef):
+            return (
+                self._get_collection_name() == other.collection and self.id == other.id
+            )
+        if self.id is None:
+            return self is other
+        return False
 
-    @classmethod
-    def _get_capped_collection(cls):
-        """Create a new or get an existing capped PyMongo collection."""
-        db = cls._get_db()
-        collection_name = cls._get_collection_name()
-
-        # Get max document limit and max byte size from meta.
-        max_size = cls._meta.get("max_size") or 10 * 2**20  # 10MB default
-        max_documents = cls._meta.get("max_documents")
-
-        # MongoDB will automatically raise the size to make it a multiple of
-        # 256 bytes. We raise it here ourselves to be able to reliably compare
-        # the options below.
-        if max_size % 256:
-            max_size = (max_size // 256 + 1) * 256
-
-        # If the collection already exists and has different options
-        # (i.e. isn't capped or has different max/size), raise an error.
-        if collection_name in list_collection_names(
-            db, include_system_collections=True
-        ):
-            collection = db[collection_name]
-            options = collection.options()
-            if options.get("max") != max_documents or options.get("size") != max_size:
-                raise InvalidCollectionError(
-                    'Cannot create collection "{}" as a capped '
-                    "collection as it already exists".format(cls._collection)
-                )
+    def __ne__(self, other):
+        return not self.__eq__(other)
 
-            return collection
+    def clean(self):
+        """
+        Hook for doing document level data cleaning (usually validation or assignment)
+        before validation is run.
 
-        # Create a new capped collection.
-        opts = {"capped": True, "size": max_size}
-        if max_documents:
-            opts["max"] = max_documents
+        Any ValidationError raised by this method will not be associated with
+        a particular field; it will have a special-case association with the
+        field defined by NON_FIELD_ERRORS.
+        """
+        pass
 
-        return db.create_collection(collection_name, **opts)
+    def get_text_score(self):
+        """
+        Get text score from text query
+        """
 
-    def to_mongo(self, *args, **kwargs):
-        data = super().to_mongo(*args, **kwargs)
+        if "_text_score" not in self._data:
+            raise InvalidDocumentError(
+                "This document is not originally built from a text query (or text_score was not set on search_text() call)"
+            )
 
-        # If '_id' is None, try and set it from self._data. If that
-        # doesn't exist either, remove '_id' from the SON completely.
-        if data["_id"] is None:
-            if self._data.get("id") is None:
-                del data["_id"]
-            else:
-                data["_id"] = self._data["id"]
+        return self._data["_text_score"]
 
-        return data
+    def to_mongo(self, use_db_field=True, fields=None):
+        """
+        Return as SON data ready for use with MongoDB.
+        """
+        fields = fields or []
 
-    def modify(self, query=None, **update):
-        """Perform an atomic update of the document in the database and reload
-        the document object using updated version.
+        data = SON()
+        data["_id"] = None
+        data["_cls"] = self._class_name
 
-        Returns True if the document has been updated or False if the document
-        in the database doesn't match the query.
+        # only root fields ['test1.a', 'test2'] => ['test1', 'test2']
+        root_fields = {f.split(".")[0] for f in fields}
 
-        .. note:: All unsaved changes that have been made to the document are
-            rejected if the method returns True.
+        for field_name in self:
+            if root_fields and field_name not in root_fields:
+                continue
 
-        :param query: the update will be performed only if the document in the
-            database matches the query
-        :param update: Django-style update keyword arguments
-        """
-        if query is None:
-            query = {}
+            value = self._data.get(field_name, None)
+            field = self._fields.get(field_name)
 
-        if self.pk is None:
-            raise InvalidDocumentError("The document does not have a primary key.")
+            if field is None and self._dynamic:
+                field = self._dynamic_fields.get(field_name)
 
-        id_field = self._meta["id_field"]
-        query = query.copy() if isinstance(query, dict) else query.to_query(self)
+            if value is not None:
+                f_inputs = field.to_mongo.__code__.co_varnames
+                ex_vars = {}
+                if fields and "fields" in f_inputs:
+                    key = "%s." % field_name
+                    embedded_fields = [
+                        i.replace(key, "") for i in fields if i.startswith(key)
+                    ]
 
-        if id_field not in query:
-            query[id_field] = self.pk
-        elif query[id_field] != self.pk:
-            raise InvalidQueryError(
-                "Invalid document modify query: it must modify only this document."
-            )
+                    ex_vars["fields"] = embedded_fields
 
-        # Need to add shard key to query, or you get an error
-        query.update(self._object_key)
+                if "use_db_field" in f_inputs:
+                    ex_vars["use_db_field"] = use_db_field
 
-        updated = self._qs(**query).modify(new=True, **update)
-        if updated is None:
-            return False
+                value = field.to_mongo(value, **ex_vars)
 
-        for field in self._fields_ordered:
-            setattr(self, field, self._reload(field, updated[field]))
-
-        self._changed_fields = updated._changed_fields
-        self._created = False
-
-        return True
-
-    def save(
-        self,
-        force_insert=False,
-        validate=True,
-        clean=True,
-        write_concern=None,
-        cascade=None,
-        cascade_kwargs=None,
-        _refs=None,
-        save_condition=None,
-        signal_kwargs=None,
-        **kwargs,
-    ):
-        """Save the :class:`~mongoengine.Document` to the database. If the
-        document already exists, it will be updated, otherwise it will be
-        created. Returns the saved object instance.
-
-        :param force_insert: only try to create a new document, don't allow
-            updates of existing documents.
-        :param validate: validates the document; set to ``False`` to skip.
-        :param clean: call the document clean method, requires `validate` to be
-            True.
-        :param write_concern: Extra keyword arguments are passed down to
-            :meth:`~pymongo.collection.Collection.save` OR
-            :meth:`~pymongo.collection.Collection.insert`
-            which will be used as options for the resultant
-            ``getLastError`` command.  For example,
-            ``save(..., write_concern={w: 2, fsync: True}, ...)`` will
-            wait until at least two servers have recorded the write and
-            will force an fsync on the primary server.
-        :param cascade: Sets the flag for cascading saves.  You can set a
-            default by setting "cascade" in the document __meta__
-        :param cascade_kwargs: (optional) kwargs dictionary to be passed throw
-            to cascading saves.  Implies ``cascade=True``.
-        :param _refs: A list of processed references used in cascading saves
-        :param save_condition: only perform save if matching record in db
-            satisfies condition(s) (e.g. version number).
-            Raises :class:`OperationError` if the conditions are not satisfied
-        :param signal_kwargs: (optional) kwargs dictionary to be passed to
-            the signal calls.
-
-        .. versionchanged:: 0.5
-            In existing documents it only saves changed fields using
-            set / unset.  Saves are cascaded and any
-            :class:`~bson.dbref.DBRef` objects that have changes are
-            saved as well.
-        .. versionchanged:: 0.6
-            Added cascading saves
-        .. versionchanged:: 0.8
-            Cascade saves are optional and default to False.  If you want
-            fine grain control then you can turn off using document
-            meta['cascade'] = True.  Also you can pass different kwargs to
-            the cascade save using cascade_kwargs which overwrites the
-            existing kwargs with custom values.
-        .. versionchanged:: 0.26
-           save() no longer calls :meth:`~mongoengine.Document.ensure_indexes`
-           unless ``meta['auto_create_index_on_save']`` is set to True.
+            # Handle self generating fields
+            if value is None and field._auto_gen:
+                value = field.generate()
+                self._data[field_name] = value
 
-        """
-        signal_kwargs = signal_kwargs or {}
+            if value is not None or field.null:
+                if use_db_field:
+                    data[field.db_field] = value
+                else:
+                    data[field.name] = value
 
-        if self._meta.get("abstract"):
-            raise InvalidDocumentError("Cannot save an abstract document.")
+        # Only add _cls if allow_inheritance is True
+        if not self._meta.get("allow_inheritance"):
+            data.pop("_cls")
 
-        signals.pre_save.send(self.__class__, document=self, **signal_kwargs)
+        return data
 
-        if validate:
-            self.validate(clean=clean)
+    def validate(self, clean=True):
+        """Ensure that all fields' values are valid and that required fields
+        are present.
 
-        if write_concern is None:
-            write_concern = {}
+        Raises :class:`ValidationError` if any of the fields' values are found
+        to be invalid.
+        """
+        # Ensure that each field is matched to a valid value
+        errors = {}
+        if clean:
+            try:
+                self.clean()
+            except ValidationError as error:
+                errors[NON_FIELD_ERRORS] = error
+
+        # Get a list of tuples of field names and their current values
+        fields = [
+            (
+                self._fields.get(name, self._dynamic_fields.get(name)),
+                self._data.get(name),
+            )
+            for name in self._fields_ordered
+        ]
 
-        doc_id = self.to_mongo(fields=[self._meta["id_field"]])
-        created = "_id" not in doc_id or self._created or force_insert
+        EmbeddedDocumentField = _import_class("EmbeddedDocumentField")
+        GenericEmbeddedDocumentField = _import_class("GenericEmbeddedDocumentField")
 
-        signals.pre_save_post_validation.send(
-            self.__class__, document=self, created=created, **signal_kwargs
-        )
-        # it might be refreshed by the pre_save_post_validation hook, e.g., for etag generation
-        doc = self.to_mongo()
+        for field, value in fields:
+            if value is not None:
+                try:
+                    if isinstance(
+                        field, (EmbeddedDocumentField, GenericEmbeddedDocumentField)
+                    ):
+                        field._validate(value, clean=clean)
+                    else:
+                        field._validate(value)
+                except ValidationError as error:
+                    errors[field.name] = error.errors or error
+                except (ValueError, AttributeError, AssertionError) as error:
+                    errors[field.name] = error
+            elif field.required and not getattr(field, "_auto_gen", False):
+                errors[field.name] = ValidationError(
+                    "Field is required", field_name=field.name
+                )
 
-        # Initialize the Document's underlying pymongo.Collection (+create indexes) if not already initialized
-        # Important to do this here to avoid that the index creation gets wrapped in the try/except block below
-        # and turned into mongoengine.OperationError
-        if self._collection is None:
-            _ = self._get_collection()
-        elif self._meta.get("auto_create_index_on_save", False):
-            # ensure_indexes is called as part of _get_collection so no need to re-call it again here
-            self.ensure_indexes()
+        if errors:
+            pk = "None"
+            if hasattr(self, "pk"):
+                pk = self.pk
+            elif self._instance and hasattr(self._instance, "pk"):
+                pk = self._instance.pk
+            message = f"ValidationError ({self._class_name}:{pk}) "
+            raise ValidationError(message, errors=errors)
+
+    def to_json(self, *args, **kwargs):
+        """Convert this document to JSON.
+
+        :param use_db_field: Serialize field names as they appear in
+            MongoDB (as opposed to attribute names on this document).
+            Defaults to True.
+        """
+        use_db_field = kwargs.pop("use_db_field", True)
+        if "json_options" not in kwargs:
+            warnings.warn(
+                "No 'json_options' are specified! Falling back to "
+                "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
+                "For use with other MongoDB drivers specify the UUID "
+                "representation to use. This will be changed to "
+                "uuid_representation=UNSPECIFIED in a future release.",
+                DeprecationWarning,
+            )
+            kwargs["json_options"] = LEGACY_JSON_OPTIONS
+        return json_util.dumps(self.to_mongo(use_db_field), *args, **kwargs)
 
-        try:
-            # Save a new document or update an existing one
-            if created:
-                object_id = self._save_create(
-                    doc=doc, force_insert=force_insert, write_concern=write_concern
-                )
-            else:
-                object_id, created = self._save_update(
-                    doc, save_condition, write_concern
-                )
+    @classmethod
+    def from_json(cls, json_data, created=False, **kwargs):
+        """Converts json data to a Document instance
+
+        :param str json_data: The json data to load into the Document
+        :param bool created: Boolean defining whether to consider the newly
+            instantiated document as brand new or as persisted already:
+            * If True, consider the document as brand new, no matter what data
+              it's loaded with (i.e. even if an ID is loaded).
+            * If False and an ID is NOT provided, consider the document as
+              brand new.
+            * If False and an ID is provided, assume that the object has
+              already been persisted (this has an impact on the subsequent
+              call to .save()).
+            * Defaults to ``False``.
+        """
+        # TODO should `created` default to False? If the object already exists
+        # in the DB, you would likely retrieve it from MongoDB itself through
+        # a query, not load it from JSON data.
+        if "json_options" not in kwargs:
+            warnings.warn(
+                "No 'json_options' are specified! Falling back to "
+                "LEGACY_JSON_OPTIONS with uuid_representation=PYTHON_LEGACY. "
+                "For use with other MongoDB drivers specify the UUID "
+                "representation to use. This will be changed to "
+                "uuid_representation=UNSPECIFIED in a future release.",
+                DeprecationWarning,
+            )
+            kwargs["json_options"] = LEGACY_JSON_OPTIONS
+        return cls._from_son(json_util.loads(json_data, **kwargs), created=created)
+
+    def __expand_dynamic_values(self, name, value):
+        """Expand any dynamic values to their correct types / values."""
+        if not isinstance(value, (dict, list, tuple)):
+            return value
+
+        # If the value is a dict with '_cls' in it, turn it into a document
+        is_dict = isinstance(value, dict)
+        if is_dict and "_cls" in value:
+            cls = get_document(value["_cls"])
+            return cls(**value)
+
+        if is_dict:
+            value = {k: self.__expand_dynamic_values(k, v) for k, v in value.items()}
+        else:
+            value = [self.__expand_dynamic_values(name, v) for v in value]
 
-            if cascade is None:
-                cascade = self._meta.get("cascade", False) or cascade_kwargs is not None
-
-            if cascade:
-                kwargs = {
-                    "force_insert": force_insert,
-                    "validate": validate,
-                    "write_concern": write_concern,
-                    "cascade": cascade,
-                }
-                if cascade_kwargs:  # Allow granular control over cascades
-                    kwargs.update(cascade_kwargs)
-                kwargs["_refs"] = _refs
-                self.cascade_save(**kwargs)
-
-        except pymongo.errors.DuplicateKeyError as err:
-            message = "Tried to save duplicate unique keys (%s)"
-            raise NotUniqueError(message % err)
-        except pymongo.errors.OperationFailure as err:
-            message = "Could not save document (%s)"
-            if re.match("^E1100[01] duplicate key", str(err)):
-                # E11000 - duplicate key error index
-                # E11001 - duplicate key on update
-                message = "Tried to save duplicate unique keys (%s)"
-                raise NotUniqueError(message % err)
-            raise OperationError(message % err)
-
-        # Make sure we store the PK on this document now that it's saved
-        id_field = self._meta["id_field"]
-        if created or id_field not in self._meta.get("shard_key", []):
-            self[id_field] = self._fields[id_field].to_python(object_id)
-
-        signals.post_save.send(
-            self.__class__, document=self, created=created, **signal_kwargs
-        )
+        # Convert lists / values so we can watch for any changes on them
+        EmbeddedDocumentListField = _import_class("EmbeddedDocumentListField")
+        if isinstance(value, (list, tuple)) and not isinstance(value, BaseList):
+            if issubclass(type(self), EmbeddedDocumentListField):
+                value = EmbeddedDocumentList(value, self, name)
+            else:
+                value = BaseList(value, self, name)
+        elif isinstance(value, dict) and not isinstance(value, BaseDict):
+            value = BaseDict(value, self, name)
 
-        self._clear_changed_fields()
-        self._created = False
+        return value
 
-        return self
+    def _mark_as_changed(self, key):
+        """Mark a key as explicitly changed by the user."""
+        if not hasattr(self, "_changed_fields"):
+            return
 
-    def _save_create(self, doc, force_insert, write_concern):
-        """Save a new document.
+        if "." in key:
+            key, rest = key.split(".", 1)
+            key = self._db_field_map.get(key, key)
+            key = f"{key}.{rest}"
+        else:
+            key = self._db_field_map.get(key, key)
 
-        Helper method, should only be used inside save().
-        """
-        collection = self._get_collection()
-        with set_write_concern(collection, write_concern) as wc_collection:
-            if force_insert:
-                return wc_collection.insert_one(doc).inserted_id
-            # insert_one will provoke UniqueError alongside save does not
-            # therefore, it need to catch and call replace_one.
-            if "_id" in doc:
-                select_dict = {"_id": doc["_id"]}
-                select_dict = self._integrate_shard_key(doc, select_dict)
-                raw_object = wc_collection.find_one_and_replace(select_dict, doc)
-                if raw_object:
-                    return doc["_id"]
-
-            object_id = wc_collection.insert_one(doc).inserted_id
-
-        return object_id
-
-    def _get_update_doc(self):
-        """Return a dict containing all the $set and $unset operations
-        that should be sent to MongoDB based on the changes made to this
-        Document.
+        if key not in self._changed_fields:
+            levels, idx = key.split("."), 1
+            while idx <= len(levels):
+                if ".".join(levels[:idx]) in self._changed_fields:
+                    break
+                idx += 1
+            else:
+                self._changed_fields.append(key)
+                # remove lower level changed fields
+                level = ".".join(levels[:idx]) + "."
+                remove = self._changed_fields.remove
+                for field in self._changed_fields[:]:
+                    if field.startswith(level):
+                        remove(field)
+
+    def _clear_changed_fields(self):
+        """Using _get_changed_fields iterate and remove any fields that
+        are marked as changed.
         """
-        updates, removals = self._delta()
-
-        update_doc = {}
-        if updates:
-            update_doc["$set"] = updates
-        if removals:
-            update_doc["$unset"] = removals
+        ReferenceField = _import_class("ReferenceField")
+        GenericReferenceField = _import_class("GenericReferenceField")
 
-        return update_doc
+        for changed in self._get_changed_fields():
+            parts = changed.split(".")
+            data = self
+            for part in parts:
+                if isinstance(data, list):
+                    try:
+                        data = data[int(part)]
+                    except IndexError:
+                        data = None
+                elif isinstance(data, dict):
+                    data = data.get(part, None)
+                else:
+                    field_name = data._reverse_db_field_map.get(part, part)
+                    data = getattr(data, field_name, None)
+
+                if not isinstance(data, LazyReference) and hasattr(
+                    data, "_changed_fields"
+                ):
+                    if getattr(data, "_is_document", False):
+                        continue
 
-    def _integrate_shard_key(self, doc, select_dict):
-        """Integrates the collection's shard key to the `select_dict`, which will be used for the query.
-        The value from the shard key is taken from the `doc` and finally the select_dict is returned.
-        """
+                    data._changed_fields = []
+                elif isinstance(data, (list, tuple, dict)):
+                    if hasattr(data, "field") and isinstance(
+                        data.field, (ReferenceField, GenericReferenceField)
+                    ):
+                        continue
+                    BaseDocument._nestable_types_clear_changed_fields(data)
 
-        # Need to add shard key to query, or you get an error
-        shard_key = self._meta.get("shard_key", tuple())
-        for k in shard_key:
-            path = self._lookup_field(k.split("."))
-            actual_key = [p.db_field for p in path]
-            val = doc
-            for ak in actual_key:
-                val = val[ak]
-            select_dict[".".join(actual_key)] = val
+        self._changed_fields = []
 
-        return select_dict
+    @staticmethod
+    def _nestable_types_clear_changed_fields(data):
+        """Inspect nested data for changed fields
 
-    def _save_update(self, doc, save_condition, write_concern):
-        """Update an existing document.
+        :param data: data to inspect for changes
+        """
+        Document = _import_class("Document")
 
-        Helper method, should only be used inside save().
+        # Loop list / dict fields as they contain documents
+        # Determine the iterator to use
+        if not hasattr(data, "items"):
+            iterator = enumerate(data)
+        else:
+            iterator = data.items()
+
+        for _index_or_key, value in iterator:
+            if hasattr(value, "_get_changed_fields") and not isinstance(
+                value, Document
+            ):  # don't follow references
+                value._clear_changed_fields()
+            elif isinstance(value, (list, tuple, dict)):
+                BaseDocument._nestable_types_clear_changed_fields(value)
+
+    @staticmethod
+    def _nestable_types_changed_fields(changed_fields, base_key, data):
+        """Inspect nested data for changed fields
+
+        :param changed_fields: Previously collected changed fields
+        :param base_key: The base key that must be used to prepend changes to this data
+        :param data: data to inspect for changes
         """
-        collection = self._get_collection()
-        object_id = doc["_id"]
-        created = False
-
-        select_dict = {}
-        if save_condition is not None:
-            select_dict = transform.query(self.__class__, **save_condition)
-
-        select_dict["_id"] = object_id
-
-        select_dict = self._integrate_shard_key(doc, select_dict)
-
-        update_doc = self._get_update_doc()
-        if update_doc:
-            upsert = save_condition is None
-            with set_write_concern(collection, write_concern) as wc_collection:
-                last_error = wc_collection.update_one(
-                    select_dict, update_doc, upsert=upsert
-                ).raw_result
-            if not upsert and last_error["n"] == 0:
-                raise SaveConditionError(
-                    "Race condition preventing document update detected"
+        # Loop list / dict fields as they contain documents
+        # Determine the iterator to use
+        if not hasattr(data, "items"):
+            iterator = enumerate(data)
+        else:
+            iterator = data.items()
+
+        for index_or_key, value in iterator:
+            item_key = f"{base_key}{index_or_key}."
+            # don't check anything lower if this key is already marked
+            # as changed.
+            if item_key[:-1] in changed_fields:
+                continue
+
+            if hasattr(value, "_get_changed_fields"):
+                changed = value._get_changed_fields()
+                changed_fields += [f"{item_key}{k}" for k in changed if k]
+            elif isinstance(value, (list, tuple, dict)):
+                BaseDocument._nestable_types_changed_fields(
+                    changed_fields, item_key, value
                 )
-            if last_error is not None:
-                updated_existing = last_error.get("updatedExisting")
-                if updated_existing is False:
-                    created = True
-                    # !!! This is bad, means we accidentally created a new,
-                    # potentially corrupted document. See
-                    # https://github.com/MongoEngine/mongoengine/issues/564
-
-        return object_id, created
-
-    def cascade_save(self, **kwargs):
-        """Recursively save any references and generic references on the
-        document.
-        """
-        _refs = kwargs.get("_refs") or []
 
+    def _get_changed_fields(self):
+        """Return a list of all fields that have explicitly been changed."""
+        EmbeddedDocument = _import_class("EmbeddedDocument")
+        LazyReferenceField = _import_class("LazyReferenceField")
         ReferenceField = _import_class("ReferenceField")
+        GenericLazyReferenceField = _import_class("GenericLazyReferenceField")
         GenericReferenceField = _import_class("GenericReferenceField")
+        SortedListField = _import_class("SortedListField")
 
-        for name, cls in self._fields.items():
-            if not isinstance(cls, (ReferenceField, GenericReferenceField)):
-                continue
+        changed_fields = []
+        changed_fields += getattr(self, "_changed_fields", [])
 
-            ref = self._data.get(name)
-            if not ref or isinstance(ref, DBRef):
-                continue
+        for field_name in self._fields_ordered:
+            db_field_name = self._db_field_map.get(field_name, field_name)
+            key = "%s." % db_field_name
+            data = self._data.get(field_name, None)
+            field = self._fields.get(field_name)
 
-            if not getattr(ref, "_changed_fields", True):
+            if db_field_name in changed_fields:
+                # Whole field already marked as changed, no need to go further
                 continue
 
-            ref_id = f"{ref.__class__.__name__},{str(ref._data)}"
-            if ref and ref_id not in _refs:
-                _refs.append(ref_id)
-                kwargs["_refs"] = _refs
-                ref.save(**kwargs)
-                ref._changed_fields = []
-
-    @property
-    def _qs(self):
-        """Return the default queryset corresponding to this document."""
-        if not hasattr(self, "__objects"):
-            queryset_class = self._meta.get("queryset_class", QuerySet)
-            self.__objects = queryset_class(self.__class__, self._get_collection())
-        return self.__objects
-
-    @property
-    def _object_key(self):
-        """Return a query dict that can be used to fetch this document.
-
-        Most of the time the dict is a simple PK lookup, but in case of
-        a sharded collection with a compound shard key, it can contain a more
-        complex query.
-
-        Note that the dict returned by this method uses MongoEngine field
-        names instead of PyMongo field names (e.g. "pk" instead of "_id",
-        "some__nested__field" instead of "some.nested.field", etc.).
-        """
-        select_dict = {"pk": self.pk}
-        shard_key = self.__class__._meta.get("shard_key", tuple())
-        for k in shard_key:
-            val = self
-            field_parts = k.split(".")
-            for part in field_parts:
-                val = getattr(val, part)
-            select_dict["__".join(field_parts)] = val
-        return select_dict
-
-    def update(self, **kwargs):
-        """Performs an update on the :class:`~mongoengine.Document`
-        A convenience wrapper to :meth:`~mongoengine.QuerySet.update`.
-
-        Raises :class:`OperationError` if called on an object that has not yet
-        been saved.
-        """
-        if self.pk is None:
-            if kwargs.get("upsert", False):
-                query = self.to_mongo()
-                if "_cls" in query:
-                    del query["_cls"]
-                return self._qs.filter(**query).update_one(**kwargs)
-            else:
-                raise OperationError("attempt to update a document not yet saved")
-
-        # Need to add shard key to query, or you get an error
-        return self._qs.filter(**self._object_key).update_one(**kwargs)
-
-    def delete(self, signal_kwargs=None, **write_concern):
-        """Delete the :class:`~mongoengine.Document` from the database. This
-        will only take effect if the document has been previously saved.
-
-        :param signal_kwargs: (optional) kwargs dictionary to be passed to
-            the signal calls.
-        :param write_concern: Extra keyword arguments are passed down which
-            will be used as options for the resultant ``getLastError`` command.
-            For example, ``save(..., w: 2, fsync: True)`` will
-            wait until at least two servers have recorded the write and
-            will force an fsync on the primary server.
-        """
-        signal_kwargs = signal_kwargs or {}
-        signals.pre_delete.send(self.__class__, document=self, **signal_kwargs)
-
-        # Delete FileFields separately
-        FileField = _import_class("FileField")
-        for name, field in self._fields.items():
-            if isinstance(field, FileField):
-                getattr(self, name).delete()
-
-        try:
-            self._qs.filter(**self._object_key).delete(
-                write_concern=write_concern, _from_doc_delete=True
-            )
-        except pymongo.errors.OperationFailure as err:
-            message = "Could not delete document (%s)" % err.args
-            raise OperationError(message)
-        signals.post_delete.send(self.__class__, document=self, **signal_kwargs)
+            if isinstance(field, ReferenceField):  # Don't follow referenced documents
+                continue
 
-    def switch_db(self, db_alias, keep_created=True):
+            if isinstance(data, EmbeddedDocument):
+                # Find all embedded fields that have been changed
+                changed = data._get_changed_fields()
+                changed_fields += [f"{key}{k}" for k in changed if k]
+            elif isinstance(data, (list, tuple, dict)):
+                if hasattr(field, "field") and isinstance(
+                    field.field,
+                    (
+                        LazyReferenceField,
+                        ReferenceField,
+                        GenericLazyReferenceField,
+                        GenericReferenceField,
+                    ),
+                ):
+                    continue
+                elif isinstance(field, SortedListField) and field._ordering:
+                    # if ordering is affected whole list is changed
+                    if any(field._ordering in d._changed_fields for d in data):
+                        changed_fields.append(db_field_name)
+                        continue
+
+                self._nestable_types_changed_fields(changed_fields, key, data)
+        return changed_fields
+
+    def _delta(self):
+        """Returns the delta (set, unset) of the changes for a document.
+        Gets any values that have been explicitly changed.
         """
-        Temporarily switch the database for a document instance.
+        # Handles cases where not loaded from_son but has _id
+        doc = self.to_mongo()
 
-        Only really useful for archiving off data and calling `save()`::
+        set_fields = self._get_changed_fields()
+        unset_data = {}
+        if hasattr(self, "_changed_fields"):
+            set_data = {}
+            # Fetch each set item from its path
+            for path in set_fields:
+                parts = path.split(".")
+                d = doc
+                new_path = []
+                for p in parts:
+                    if isinstance(d, (ObjectId, DBRef)):
+                        # Don't dig in the references
+                        break
+                    elif isinstance(d, list) and p.isdigit():
+                        # An item of a list (identified by its index) is updated
+                        d = d[int(p)]
+                    elif hasattr(d, "get"):
+                        # dict-like (dict, embedded document)
+                        d = d.get(p)
+                    new_path.append(p)
+                path = ".".join(new_path)
+                set_data[path] = d
+        else:
+            set_data = doc
+            if "_id" in set_data:
+                del set_data["_id"]
+
+        # Determine if any changed items were actually unset.
+        for path, value in list(set_data.items()):
+            if value or isinstance(
+                value, (numbers.Number, bool)
+            ):  # Account for 0 and True that are truthy
+                continue
 
-            user = User.objects.get(id=user_id)
-            user.switch_db('archive-db')
-            user.save()
+            parts = path.split(".")
 
-        :param str db_alias: The database alias to use for saving the document
+            if self._dynamic and len(parts) and parts[0] in self._dynamic_fields:
+                del set_data[path]
+                unset_data[path] = 1
+                continue
 
-        :param bool keep_created: keep self._created value after switching db, else is reset to True
+            # If we've set a value that ain't the default value don't unset it.
+            default = None
+            if path in self._fields:
+                default = self._fields[path].default
+            else:  # Perform a full lookup for lists / embedded lookups
+                d = self
+                db_field_name = parts.pop()
+                for p in parts:
+                    if isinstance(d, list) and p.isdigit():
+                        d = d[int(p)]
+                    elif hasattr(d, "__getattribute__") and not isinstance(d, dict):
+                        real_path = d._reverse_db_field_map.get(p, p)
+                        d = getattr(d, real_path)
+                    else:
+                        d = d.get(p)
+
+                if hasattr(d, "_fields"):
+                    field_name = d._reverse_db_field_map.get(
+                        db_field_name, db_field_name
+                    )
+                    if field_name in d._fields:
+                        default = d._fields.get(field_name).default
+                    else:
+                        default = None
+
+            if default is not None:
+                default = default() if callable(default) else default
+
+            if value != default:
+                continue
 
+            del set_data[path]
+            unset_data[path] = 1
+        return set_data, unset_data
 
-        .. seealso::
-            Use :class:`~mongoengine.context_managers.switch_collection`
-            if you need to read from another collection
-        """
-        with switch_db(self.__class__, db_alias) as cls:
-            collection = cls._get_collection()
-            db = cls._get_db()
-        self._get_collection = lambda: collection
-        self._get_db = lambda: db
-        self._collection = collection
-        self._created = True if not keep_created else self._created
-        self.__objects = self._qs
-        self.__objects._collection_obj = collection
-        return self
-
-    def switch_collection(self, collection_name, keep_created=True):
+    @classmethod
+    def _get_collection_name(cls):
+        """Return the collection name for this class. None for abstract
+        class.
         """
-        Temporarily switch the collection for a document instance.
+        return cls._meta.get("collection", None)
 
-        Only really useful for archiving off data and calling `save()`::
+    @classmethod
+    def _from_son(cls, son, _auto_dereference=True, created=False):
+        """Create an instance of a Document (subclass) from a PyMongo SON (dict)"""
+        if son and not isinstance(son, dict):
+            raise ValueError(
+                "The source SON object needs to be of type 'dict' but a '%s' was found"
+                % type(son)
+            )
 
-            user = User.objects.get(id=user_id)
-            user.switch_collection('old-users')
-            user.save()
+        # Get the class name from the document, falling back to the given
+        # class if unavailable
+        class_name = son.get("_cls", cls._class_name)
+
+        # Convert SON to a data dict, making sure each key is a string and
+        # corresponds to the right db field.
+        # This is needed as _from_son is currently called both from BaseDocument.__init__
+        # and from EmbeddedDocumentField.to_python
+        data = {}
+        for key, value in son.items():
+            key = str(key)
+            key = cls._db_field_map.get(key, key)
+            data[key] = value
+
+        # Return correct subclass for document type
+        if class_name != cls._class_name:
+            cls = get_document(class_name)
+
+        errors_dict = {}
+
+        fields = cls._fields
+        if not _auto_dereference:
+            fields = copy.deepcopy(fields)
+
+        for field_name, field in fields.items():
+            field._auto_dereference = _auto_dereference
+            if field.db_field in data:
+                value = data[field.db_field]
+                try:
+                    data[field_name] = (
+                        value if value is None else field.to_python(value)
+                    )
+                    if field_name != field.db_field:
+                        del data[field.db_field]
+                except (AttributeError, ValueError) as e:
+                    errors_dict[field_name] = e
+
+        if errors_dict:
+            errors = "\n".join([f"Field '{k}' - {v}" for k, v in errors_dict.items()])
+            msg = "Invalid data to create a `{}` instance.\n{}".format(
+                cls._class_name,
+                errors,
+            )
+            raise InvalidDocumentError(msg)
 
-        :param str collection_name: The database alias to use for saving the
-            document
+        # In STRICT documents, remove any keys that aren't in cls._fields
+        if cls.STRICT:
+            data = {k: v for k, v in data.items() if k in cls._fields}
 
-        :param bool keep_created: keep self._created value after switching collection, else is reset to True
+        obj = cls(__auto_convert=False, _created=created, **data)
+        obj._changed_fields = []
+        if not _auto_dereference:
+            obj._fields = fields
 
+        return obj
 
-        .. seealso::
-            Use :class:`~mongoengine.context_managers.switch_db`
-            if you need to read from another database
-        """
-        with switch_collection(self.__class__, collection_name) as cls:
-            collection = cls._get_collection()
-        self._get_collection = lambda: collection
-        self._collection = collection
-        self._created = True if not keep_created else self._created
-        self.__objects = self._qs
-        self.__objects._collection_obj = collection
-        return self
-
-    def select_related(self, max_depth=1):
-        """Handles dereferencing of :class:`~bson.dbref.DBRef` objects to
-        a maximum depth in order to cut down the number queries to mongodb.
-        """
-        DeReference = _import_class("DeReference")
-        DeReference()([self], max_depth + 1)
-        return self
+    @classmethod
+    def _build_index_specs(cls, meta_indexes):
+        """Generate and merge the full index specs."""
+        geo_indices = cls._geo_indices()
+        unique_indices = cls._unique_with_indexes()
+        index_specs = [cls._build_index_spec(spec) for spec in meta_indexes]
+
+        def merge_index_specs(index_specs, indices):
+            """Helper method for merging index specs."""
+            if not indices:
+                return index_specs
+
+            # Create a map of index fields to index spec. We're converting
+            # the fields from a list to a tuple so that it's hashable.
+            spec_fields = {tuple(index["fields"]): index for index in index_specs}
+
+            # For each new index, if there's an existing index with the same
+            # fields list, update the existing spec with all data from the
+            # new spec.
+            for new_index in indices:
+                candidate = spec_fields.get(tuple(new_index["fields"]))
+                if candidate is None:
+                    index_specs.append(new_index)
+                else:
+                    candidate.update(new_index)
+
+            return index_specs
+
+        # Merge geo indexes and unique_with indexes into the meta index specs.
+        index_specs = merge_index_specs(index_specs, geo_indices)
+        index_specs = merge_index_specs(index_specs, unique_indices)
+        return index_specs
 
-    def reload(self, *fields, **kwargs):
-        """Reloads all attributes from the database.
+    @classmethod
+    def _build_index_spec(cls, spec):
+        """Build a PyMongo index spec from a MongoEngine index spec."""
+        if isinstance(spec, str):
+            spec = {"fields": [spec]}
+        elif isinstance(spec, (list, tuple)):
+            spec = {"fields": list(spec)}
+        elif isinstance(spec, dict):
+            spec = dict(spec)
+
+        index_list = []
+        direction = None
+
+        # Check to see if we need to include _cls
+        allow_inheritance = cls._meta.get("allow_inheritance")
+        include_cls = (
+            allow_inheritance
+            and not spec.get("sparse", False)
+            and spec.get("cls", True)
+            and "_cls" not in spec["fields"]
+        )
 
-        :param fields: (optional) args list of fields to reload
-        :param max_depth: (optional) depth of dereferencing to follow
-        """
-        max_depth = 1
-        if fields and isinstance(fields[0], int):
-            max_depth = fields[0]
-            fields = fields[1:]
-        elif "max_depth" in kwargs:
-            max_depth = kwargs["max_depth"]
-
-        if self.pk is None:
-            raise self.DoesNotExist("Document does not exist")
-
-        obj = (
-            self._qs.read_preference(ReadPreference.PRIMARY)
-            .filter(**self._object_key)
-            .only(*fields)
-            .limit(1)
-            .select_related(max_depth=max_depth)
+        # 733: don't include cls if index_cls is False unless there is an explicit cls with the index
+        include_cls = include_cls and (
+            spec.get("cls", False) or cls._meta.get("index_cls", True)
         )
+        if "cls" in spec:
+            spec.pop("cls")
+        for key in spec["fields"]:
+            # If inherited spec continue
+            if isinstance(key, (list, tuple)):
+                continue
 
-        if obj:
-            obj = obj[0]
-        else:
-            raise self.DoesNotExist("Document does not exist")
-        for field in obj._data:
-            if not fields or field in fields:
+            # ASCENDING from +
+            # DESCENDING from -
+            # TEXT from $
+            # HASHED from #
+            # GEOSPHERE from (
+            # GEOHAYSTACK from )
+            # GEO2D from *
+            direction = pymongo.ASCENDING
+            if key.startswith("-"):
+                direction = pymongo.DESCENDING
+            elif key.startswith("$"):
+                direction = pymongo.TEXT
+            elif key.startswith("#"):
+                direction = pymongo.HASHED
+            elif key.startswith("("):
+                direction = pymongo.GEOSPHERE
+            elif key.startswith(")"):
                 try:
-                    setattr(self, field, self._reload(field, obj[field]))
-                except (KeyError, AttributeError):
+                    direction = pymongo.GEOHAYSTACK
+                except AttributeError:
+                    raise NotImplementedError
+            elif key.startswith("*"):
+                direction = pymongo.GEO2D
+            if key.startswith(("+", "-", "*", "$", "#", "(", ")")):
+                key = key[1:]
+
+            # Use real field name, do it manually because we need field
+            # objects for the next part (list field checking)
+            parts = key.split(".")
+            if parts in (["pk"], ["id"], ["_id"]):
+                key = "_id"
+            else:
+                fields = cls._lookup_field(parts)
+                parts = []
+                for field in fields:
                     try:
-                        # If field is a special field, e.g. items is stored as _reserved_items,
-                        # a KeyError is thrown. So try to retrieve the field from _data
-                        setattr(self, field, self._reload(field, obj._data.get(field)))
-                    except KeyError:
-                        # If field is removed from the database while the object
-                        # is in memory, a reload would cause a KeyError
-                        # i.e. obj.update(unset__field=1) followed by obj.reload()
-                        delattr(self, field)
-
-        self._changed_fields = (
-            list(set(self._changed_fields) - set(fields))
-            if fields
-            else obj._changed_fields
-        )
-        self._created = False
-        return self
-
-    def _reload(self, key, value):
-        """Used by :meth:`~mongoengine.Document.reload` to ensure the
-        correct instance is linked to self.
-        """
-        if isinstance(value, BaseDict):
-            value = [(k, self._reload(k, v)) for k, v in value.items()]
-            value = BaseDict(value, self, key)
-        elif isinstance(value, EmbeddedDocumentList):
-            value = [self._reload(key, v) for v in value]
-            value = EmbeddedDocumentList(value, self, key)
-        elif isinstance(value, BaseList):
-            value = [self._reload(key, v) for v in value]
-            value = BaseList(value, self, key)
-        elif isinstance(value, (EmbeddedDocument, DynamicEmbeddedDocument)):
-            value._instance = None
-            value._changed_fields = []
-        return value
+                        if field != "_id":
+                            field = field.db_field
+                    except AttributeError:
+                        pass
+                    parts.append(field)
+                key = ".".join(parts)
+            index_list.append((key, direction))
+
+        # Don't add cls to a geo index
+        if (
+            include_cls
+            and direction not in (pymongo.GEO2D, pymongo.GEOSPHERE)
+            and (GEOHAYSTACK is None or direction != GEOHAYSTACK)
+        ):
+            index_list.insert(0, ("_cls", 1))
 
-    def to_dbref(self):
-        """Returns an instance of :class:`~bson.dbref.DBRef` useful in
-        `__raw__` queries."""
-        if self.pk is None:
-            msg = "Only saved documents can have a valid dbref"
-            raise OperationError(msg)
-        return DBRef(self.__class__._get_collection_name(), self.pk)
+        if index_list:
+            spec["fields"] = index_list
 
-    @classmethod
-    def register_delete_rule(cls, document_cls, field_name, rule):
-        """This method registers the delete rules to apply when removing this
-        object.
-        """
-        classes = [
-            get_document(class_name)
-            for class_name in cls._subclasses
-            if class_name != cls.__name__
-        ] + [cls]
-        documents = [
-            get_document(class_name)
-            for class_name in document_cls._subclasses
-            if class_name != document_cls.__name__
-        ] + [document_cls]
-
-        for klass in classes:
-            for document_cls in documents:
-                delete_rules = klass._meta.get("delete_rules") or {}
-                delete_rules[(document_cls, field_name)] = rule
-                klass._meta["delete_rules"] = delete_rules
+        return spec
 
     @classmethod
-    def drop_collection(cls):
-        """Drops the entire collection associated with this
-        :class:`~mongoengine.Document` type from the database.
-
-        Raises :class:`OperationError` if the document has no collection set
-        (i.g. if it is `abstract`)
-        """
-        coll_name = cls._get_collection_name()
-        if not coll_name:
-            raise OperationError(
-                "Document %s has no collection defined (is it abstract ?)" % cls
-            )
-        cls._collection = None
-        db = cls._get_db()
-        db.drop_collection(coll_name)
-
-    @classmethod
-    def create_index(cls, keys, background=False, **kwargs):
-        """Creates the given indexes if required.
-
-        :param keys: a single index key or a list of index keys (to
-            construct a multi-field index); keys may be prefixed with a **+**
-            or a **-** to determine the index ordering
-        :param background: Allows index creation in the background
-        """
-        index_spec = cls._build_index_spec(keys)
-        index_spec = index_spec.copy()
-        fields = index_spec.pop("fields")
-        index_spec["background"] = background
-        index_spec.update(kwargs)
-
-        return cls._get_collection().create_index(fields, **index_spec)
+    def _unique_with_indexes(cls, namespace=""):
+        """Find unique indexes in the document schema and return them."""
+        unique_indexes = []
+        for field_name, field in cls._fields.items():
+            sparse = field.sparse
+
+            # Generate a list of indexes needed by uniqueness constraints
+            if field.unique:
+                unique_fields = [field.db_field]
+
+                # Add any unique_with fields to the back of the index spec
+                if field.unique_with:
+                    if isinstance(field.unique_with, str):
+                        field.unique_with = [field.unique_with]
+
+                    # Convert unique_with field names to real field names
+                    unique_with = []
+                    for other_name in field.unique_with:
+                        parts = other_name.split(".")
+
+                        # Lookup real name
+                        parts = cls._lookup_field(parts)
+                        name_parts = [part.db_field for part in parts]
+                        unique_with.append(".".join(name_parts))
+
+                        # Unique field should be required
+                        parts[-1].required = True
+                        sparse = not sparse and parts[-1].name not in cls.__dict__
+
+                    unique_fields += unique_with
+
+                # Add the new index to the list
+                fields = [(f"{namespace}{f}", pymongo.ASCENDING) for f in unique_fields]
+                index = {"fields": fields, "unique": True, "sparse": sparse}
+                unique_indexes.append(index)
+
+            if field.__class__.__name__ in {
+                "EmbeddedDocumentListField",
+                "ListField",
+                "SortedListField",
+            }:
+                field = field.field
+
+            # Grab any embedded document field unique indexes
+            if (
+                field.__class__.__name__ == "EmbeddedDocumentField"
+                and field.document_type != cls
+            ):
+                field_namespace = "%s." % field_name
+                doc_cls = field.document_type
+                unique_indexes += doc_cls._unique_with_indexes(field_namespace)
+
+        return unique_indexes
 
     @classmethod
-    def ensure_indexes(cls):
-        """Checks the document meta data and ensures all the indexes exist.
+    def _geo_indices(cls, inspected=None, parent_field=None):
+        inspected = inspected or []
+        geo_indices = []
+        inspected.append(cls)
+
+        geo_field_type_names = (
+            "EmbeddedDocumentField",
+            "GeoPointField",
+            "PointField",
+            "LineStringField",
+            "PolygonField",
+        )
 
-        Global defaults can be set in the meta - see :doc:`guide/defining-documents`
+        geo_field_types = tuple(_import_class(field) for field in geo_field_type_names)
 
-        By default, this will get called automatically upon first interaction with the
-        Document collection (query, save, etc) so unless you disabled `auto_create_index`, you
-        shouldn't have to call this manually.
+        for field in cls._fields.values():
+            if not isinstance(field, geo_field_types):
+                continue
 
-        This also gets called upon every call to Document.save if `auto_create_index_on_save` is set to True
+            if hasattr(field, "document_type"):
+                field_cls = field.document_type
+                if field_cls in inspected:
+                    continue
 
-        If called multiple times, MongoDB will not re-recreate indexes if they exist already
+                if hasattr(field_cls, "_geo_indices"):
+                    geo_indices += field_cls._geo_indices(
+                        inspected, parent_field=field.db_field
+                    )
+            elif field._geo_index:
+                field_name = field.db_field
+                if parent_field:
+                    field_name = f"{parent_field}.{field_name}"
+                geo_indices.append({"fields": [(field_name, field._geo_index)]})
 
-        .. note:: You can disable automatic index creation by setting
-                  `auto_create_index` to False in the documents meta data
-        """
-        background = cls._meta.get("index_background", False)
-        index_opts = cls._meta.get("index_opts") or {}
-        index_cls = cls._meta.get("index_cls", True)
-
-        collection = cls._get_collection()
-
-        # determine if an index which we are creating includes
-        # _cls as its first field; if so, we can avoid creating
-        # an extra index on _cls, as mongodb will use the existing
-        # index to service queries against _cls
-        cls_indexed = False
-
-        # Ensure document-defined indexes are created
-        if cls._meta["index_specs"]:
-            index_spec = cls._meta["index_specs"]
-            for spec in index_spec:
-                spec = spec.copy()
-                fields = spec.pop("fields")
-                cls_indexed = cls_indexed or includes_cls(fields)
-                opts = index_opts.copy()
-                opts.update(spec)
-
-                # we shouldn't pass 'cls' to the collection.ensureIndex options
-                # because of https://jira.mongodb.org/browse/SERVER-769
-                if "cls" in opts:
-                    del opts["cls"]
-
-                collection.create_index(fields, background=background, **opts)
-
-        # If _cls is being used (for polymorphism), it needs an index,
-        # only if another index doesn't begin with _cls
-        if index_cls and not cls_indexed and cls._meta.get("allow_inheritance"):
-            # we shouldn't pass 'cls' to the collection.ensureIndex options
-            # because of https://jira.mongodb.org/browse/SERVER-769
-            if "cls" in index_opts:
-                del index_opts["cls"]
-
-            collection.create_index("_cls", background=background, **index_opts)
+        return geo_indices
 
     @classmethod
-    def list_indexes(cls):
-        """Lists all indexes that should be created for the Document collection.
-        It includes all the indexes from super- and sub-classes.
+    def _lookup_field(cls, parts):
+        """Given the path to a given field, return a list containing
+        the Field object associated with that field and all of its parent
+        Field objects.
 
-        Note that it will only return the indexes' fields, not the indexes' options
-        """
-        if cls._meta.get("abstract"):
-            return []
-
-        # get all the base classes, subclasses and siblings
-        classes = []
-
-        def get_classes(cls):
-            if cls not in classes and isinstance(cls, TopLevelDocumentMetaclass):
-                classes.append(cls)
-
-            for base_cls in cls.__bases__:
-                if (
-                    isinstance(base_cls, TopLevelDocumentMetaclass)
-                    and base_cls != Document
-                    and not base_cls._meta.get("abstract")
-                    and base_cls._get_collection().full_name
-                    == cls._get_collection().full_name
-                    and base_cls not in classes
-                ):
-                    classes.append(base_cls)
-                    get_classes(base_cls)
-            for subclass in cls.__subclasses__():
-                if (
-                    isinstance(base_cls, TopLevelDocumentMetaclass)
-                    and subclass._get_collection().full_name
-                    == cls._get_collection().full_name
-                    and subclass not in classes
-                ):
-                    classes.append(subclass)
-                    get_classes(subclass)
+        Args:
+            parts (str, list, or tuple) - path to the field. Should be a
+            string for simple fields existing on this document or a list
+            of strings for a field that exists deeper in embedded documents.
 
-        get_classes(cls)
+        Returns:
+            A list of Field instances for fields that were found or
+            strings for sub-fields that weren't.
 
-        # get the indexes spec for all the gathered classes
-        def get_indexes_spec(cls):
-            indexes = []
+        Example:
+            >>> user._lookup_field('name')
+            [<mongoengine.fields.StringField at 0x1119bff50>]
 
-            if cls._meta["index_specs"]:
-                index_spec = cls._meta["index_specs"]
-                for spec in index_spec:
-                    spec = spec.copy()
-                    fields = spec.pop("fields")
-                    indexes.append(fields)
-            return indexes
+            >>> user._lookup_field('roles')
+            [<mongoengine.fields.EmbeddedDocumentListField at 0x1119ec250>]
 
-        indexes = []
-        for klass in classes:
-            for index in get_indexes_spec(klass):
-                if index not in indexes:
-                    indexes.append(index)
+            >>> user._lookup_field(['roles', 'role'])
+            [<mongoengine.fields.EmbeddedDocumentListField at 0x1119ec250>,
+             <mongoengine.fields.StringField at 0x1119ec050>]
 
-        # finish up by appending { '_id': 1 } and { '_cls': 1 }, if needed
-        if [("_id", 1)] not in indexes:
-            indexes.append([("_id", 1)])
-        if cls._meta.get("index_cls", True) and cls._meta.get("allow_inheritance"):
-            indexes.append([("_cls", 1)])
+            >>> user._lookup_field('doesnt_exist')
+            raises LookUpError
 
-        return indexes
+            >>> user._lookup_field(['roles', 'doesnt_exist'])
+            [<mongoengine.fields.EmbeddedDocumentListField at 0x1119ec250>,
+             'doesnt_exist']
 
-    @classmethod
-    def compare_indexes(cls):
-        """Compares the indexes defined in MongoEngine with the ones
-        existing in the database. Returns any missing/extra indexes.
         """
+        # TODO this method is WAY too complicated. Simplify it.
+        # TODO don't think returning a string for embedded non-existent fields is desired
 
-        required = cls.list_indexes()
-
-        existing = []
-        collection = cls._get_collection()
-        for info in collection.index_information().values():
-            if "_fts" in info["key"][0]:
-                # Useful for text indexes (but not only)
-                index_type = info["key"][0][1]
-                text_index_fields = info.get("weights").keys()
-                existing.append([(key, index_type) for key in text_index_fields])
-            else:
-                existing.append(info["key"])
-        missing = [index for index in required if index not in existing]
-        extra = [index for index in existing if index not in required]
-
-        # if { _cls: 1 } is missing, make sure it's *really* necessary
-        if [("_cls", 1)] in missing:
-            cls_obsolete = False
-            for index in existing:
-                if includes_cls(index) and index not in extra:
-                    cls_obsolete = True
-                    break
-            if cls_obsolete:
-                missing.remove([("_cls", 1)])
-
-        return {"missing": missing, "extra": extra}
-
+        ListField = _import_class("ListField")
+        DynamicField = _import_class("DynamicField")
 
-class DynamicDocument(Document, metaclass=TopLevelDocumentMetaclass):
-    """A Dynamic Document class allowing flexible, expandable and uncontrolled
-    schemas.  As a :class:`~mongoengine.Document` subclass, acts in the same
-    way as an ordinary document but has expanded style properties.  Any data
-    passed or set against the :class:`~mongoengine.DynamicDocument` that is
-    not a field is automatically converted into a
-    :class:`~mongoengine.fields.DynamicField` and data can be attributed to that
-    field.
+        if not isinstance(parts, (list, tuple)):
+            parts = [parts]
 
-    .. note::
+        fields = []
+        field = None
 
-        There is one caveat on Dynamic Documents: undeclared fields cannot start with `_`
-    """
+        for field_name in parts:
+            # Handle ListField indexing:
+            if field_name.isdigit() and isinstance(field, ListField):
+                fields.append(field_name)
+                continue
 
-    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
-    my_metaclass = TopLevelDocumentMetaclass
+            # Look up first field from the document
+            if field is None:
+                if field_name == "pk":
+                    # Deal with "primary key" alias
+                    field_name = cls._meta["id_field"]
+
+                if field_name in cls._fields:
+                    field = cls._fields[field_name]
+                elif cls._dynamic:
+                    field = DynamicField(db_field=field_name)
+                elif cls._meta.get("allow_inheritance") or cls._meta.get(
+                    "abstract", False
+                ):
+                    # 744: in case the field is defined in a subclass
+                    for subcls in cls.__subclasses__():
+                        try:
+                            field = subcls._lookup_field([field_name])[0]
+                        except LookUpError:
+                            continue
+
+                        if field is not None:
+                            break
+                    else:
+                        raise LookUpError('Cannot resolve field "%s"' % field_name)
+                else:
+                    raise LookUpError('Cannot resolve field "%s"' % field_name)
+            else:
+                ReferenceField = _import_class("ReferenceField")
+                GenericReferenceField = _import_class("GenericReferenceField")
+
+                # If previous field was a reference, throw an error (we
+                # cannot look up fields that are on references).
+                if isinstance(field, (ReferenceField, GenericReferenceField)):
+                    raise LookUpError(
+                        "Cannot perform join in mongoDB: %s" % "__".join(parts)
+                    )
+
+                # If the parent field has a "field" attribute which has a
+                # lookup_member method, call it to find the field
+                # corresponding to this iteration.
+                if hasattr(getattr(field, "field", None), "lookup_member"):
+                    new_field = field.field.lookup_member(field_name)
+
+                # If the parent field is a DynamicField or if it's part of
+                # a DynamicDocument, mark current field as a DynamicField
+                # with db_name equal to the field name.
+                elif cls._dynamic and (
+                    isinstance(field, DynamicField)
+                    or getattr(getattr(field, "document_type", None), "_dynamic", None)
+                ):
+                    new_field = DynamicField(db_field=field_name)
 
-    _dynamic = True
+                # Else, try to use the parent field's lookup_member method
+                # to find the subfield.
+                elif hasattr(field, "lookup_member"):
+                    new_field = field.lookup_member(field_name)
 
-    def __delattr__(self, *args, **kwargs):
-        """Delete the attribute by setting to None and allowing _delta
-        to unset it.
-        """
-        field_name = args[0]
-        if field_name in self._dynamic_fields:
-            setattr(self, field_name, None)
-            self._dynamic_fields[field_name].null = False
-        else:
-            super().__delattr__(*args, **kwargs)
+                # Raise a LookUpError if all the other conditions failed.
+                else:
+                    raise LookUpError(
+                        "Cannot resolve subfield or operator {} "
+                        "on the field {}".format(field_name, field.name)
+                    )
 
+                # If current field still wasn't found and the parent field
+                # is a ComplexBaseField, add the name current field name and
+                # move on.
+                if not new_field and isinstance(field, ComplexBaseField):
+                    fields.append(field_name)
+                    continue
+                elif not new_field:
+                    raise LookUpError('Cannot resolve field "%s"' % field_name)
 
-class DynamicEmbeddedDocument(EmbeddedDocument, metaclass=DocumentMetaclass):
-    """A Dynamic Embedded Document class allowing flexible, expandable and
-    uncontrolled schemas. See :class:`~mongoengine.DynamicDocument` for more
-    information about dynamic documents.
-    """
+                field = new_field  # update field to the new field type
 
-    # my_metaclass is defined so that metaclass can be queried in Python 2 & 3
-    my_metaclass = DocumentMetaclass
+            fields.append(field)
 
-    _dynamic = True
+        return fields
 
-    def __delattr__(self, *args, **kwargs):
-        """Delete the attribute by setting to None and allowing _delta
-        to unset it.
-        """
-        field_name = args[0]
-        if field_name in self._fields:
-            default = self._fields[field_name].default
-            if callable(default):
-                default = default()
-            setattr(self, field_name, default)
-        else:
-            setattr(self, field_name, None)
-
-
-class MapReduceDocument:
-    """A document returned from a map/reduce query.
-
-    :param collection: An instance of :class:`~pymongo.Collection`
-    :param key: Document/result key, often an instance of
-                :class:`~bson.objectid.ObjectId`. If supplied as
-                an ``ObjectId`` found in the given ``collection``,
-                the object can be accessed via the ``object`` property.
-    :param value: The result(s) for this key.
-    """
-
-    def __init__(self, document, collection, key, value):
-        self._document = document
-        self._collection = collection
-        self.key = key
-        self.value = value
-
-    @property
-    def object(self):
-        """Lazy-load the object referenced by ``self.key``. ``self.key``
-        should be the ``primary_key``.
+    @classmethod
+    def _translate_field_name(cls, field, sep="."):
+        """Translate a field attribute name to a database field name."""
+        parts = field.split(sep)
+        parts = [f.db_field for f in cls._lookup_field(parts)]
+        return ".".join(parts)
+
+    def __set_field_display(self):
+        """For each field that specifies choices, create a
+        get_<field>_display method.
         """
-        id_field = self._document()._meta["id_field"]
-        id_field_type = type(id_field)
+        fields_with_choices = [(n, f) for n, f in self._fields.items() if f.choices]
+        for attr_name, field in fields_with_choices:
+            setattr(
+                self,
+                "get_%s_display" % attr_name,
+                partial(self.__get_field_display, field=field),
+            )
 
-        if not isinstance(self.key, id_field_type):
-            try:
-                self.key = id_field_type(self.key)
-            except Exception:
-                raise Exception("Could not cast key as %s" % id_field_type.__name__)
-
-        if not hasattr(self, "_key_object"):
-            self._key_object = self._document.objects.with_id(self.key)
-            return self._key_object
-        return self._key_object
+    def __get_field_display(self, field):
+        """Return the display value for a choice field"""
+        value = getattr(self, field.name)
+        if field.choices and isinstance(field.choices[0], (list, tuple)):
+            if value is None:
+                return None
+            sep = getattr(field, "display_sep", " ")
+            values = (
+                value
+                if field.__class__.__name__ in ("ListField", "SortedListField")
+                else [value]
+            )
+            return sep.join(
+                [str(dict(field.choices).get(val, val)) for val in values or []]
+            )
+        return value
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 3fddec36d..ad166c9f9 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -220,6 +220,8 @@ def _get_collection(cls):
             # Get the collection, either capped or regular.
             if cls._meta.get("max_size") or cls._meta.get("max_documents"):
                 cls._collection = cls._get_capped_collection()
+            elif cls._meta.get("timeseries"):
+                cls._collection = cls._get_timeseries_collection()
             else:
                 db = cls._get_db()
                 collection_name = cls._get_collection_name()
@@ -271,6 +273,27 @@ def _get_capped_collection(cls):
 
         return db.create_collection(collection_name, **opts)
 
+    @classmethod
+    def _get_timeseries_collection(cls):
+        """Create a new or get an existing timeseries PyMongo collection."""
+        db = cls._get_db()
+        collection_name = cls._get_collection_name()
+        timeseries_opts = cls._meta.get("timeseries")
+
+        if collection_name in list_collection_names(
+            db, include_system_collections=True
+        ):
+            collection = db[collection_name]
+            collection.options()
+            return collection
+
+        opts = {"expireAfterSeconds": timeseries_opts.pop("expireAfterSeconds", None)}
+        return db.create_collection(
+            name=collection_name,
+            timeseries=timeseries_opts,
+            **opts,
+        )
+
     def to_mongo(self, *args, **kwargs):
         data = super().to_mongo(*args, **kwargs)
 

From 889096c45ac6085d7fd0d2c62f702cefd5be2d2c Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 25 Aug 2024 21:38:17 +0200
Subject: [PATCH 1444/1519] Improvements of doc and tests related with recent
 timeseries collection support

---
 docs/changelog.rst                           |  1 +
 docs/guide/defining-documents.rst            | 20 ++++++++++++
 tests/document/test_timeseries_collection.py | 34 ++++----------------
 tests/utils.py                               | 10 +++---
 4 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index af8f2f76c..65aef227d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -9,6 +9,7 @@ Development
 - (Fill this out as you fix issues and develop your features).
 - Allow gt/gte/lt/lte/ne operators to be used with a list as value on ListField #2813
 - Switch tox to use pytest instead of legacy `python setup.py test` #2804
+- Add support for timeseries collection #2661
 
 Changes in 0.28.2
 =================
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index df749ee1e..037847112 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -491,6 +491,26 @@ The following example shows a :class:`Log` document that will be limited to
         ip_address = StringField()
         meta = {'max_documents': 1000, 'max_size': 2000000}
 
+Timeseries collections
+------------------
+A :class:`~mongoengine.Document` may use a **Timeseries Collection** by specifying
+:attr:`timeseries` in the :attr:`meta` dictionary. Timeseries collection were added
+in MongoDB 5.0 (`doc <https://www.mongodb.com/docs/v5.3/core/timeseries-collections/>`_).
+The following example shows a Document class with a basic setup::
+
+    class SensorData(Document):
+        timestamp = DateTimeField(required=True)
+        temperature = FloatField()
+
+        meta = {
+            "timeseries": {
+                "timeField": "timestamp",
+                "metaField": "temperature",
+                "granularity": "seconds",
+                "expireAfterSeconds": 5,
+            },
+        }
+
 .. defining-indexes_
 
 Indexes
diff --git a/tests/document/test_timeseries_collection.py b/tests/document/test_timeseries_collection.py
index c5df2402f..46d209b6a 100644
--- a/tests/document/test_timeseries_collection.py
+++ b/tests/document/test_timeseries_collection.py
@@ -1,3 +1,4 @@
+import time
 import unittest
 from datetime import datetime, timedelta
 
@@ -102,9 +103,7 @@ def test_timeseries_expiration(self):
         assert collection.count_documents({}) == 1
 
         # Wait for more than the expiration time
-        import time
-
-        time.sleep(3)
+        time.sleep(2)
         assert collection.count_documents({}) > 0
 
     @requires_mongodb_gte_50
@@ -135,12 +134,8 @@ class SensorDataWithIndex(Document):
 
         indexes = collection.index_information()
 
-        assert (
-            "timestamp_index" in indexes
-        ), "Index on 'timestamp' field was not created"
-        assert (
-            "temperature_index" in indexes
-        ), "Index on 'temperature' field was not created"
+        assert "timestamp_index" in indexes
+        assert "temperature_index" in indexes
 
     @requires_mongodb_gte_50
     def test_timeseries_data_insertion_order(self):
@@ -158,9 +153,9 @@ def test_timeseries_data_insertion_order(self):
 
         # Check the insertion order
         assert len(documents) == 3
-        assert documents[0].temperature == 22.0  # Earliest document
-        assert documents[1].temperature == 23.4  # Middle document
-        assert documents[2].temperature == 24.0  # Latest document
+        assert documents[0].temperature == 22.0
+        assert documents[1].temperature == 23.4
+        assert documents[2].temperature == 24.0
 
     @requires_mongodb_gte_50
     def test_timeseries_query_by_time_range(self):
@@ -182,21 +177,6 @@ def test_timeseries_query_by_time_range(self):
         assert documents[0].temperature == 23.0
         assert documents[1].temperature == 24.0
 
-    @requires_mongodb_gte_50
-    def test_timeseries_large_data_volume(self):
-        """Ensure that the time-series collection can handle a large volume of data insertion."""
-
-        self.SensorData._get_collection_name()
-        collection = self.SensorData._get_collection()
-
-        for i in range(10000):
-            self.SensorData(
-                timestamp=datetime.utcnow() - timedelta(seconds=i),
-                temperature=20.0 + i % 5,
-            ).save()
-
-        assert collection.count_documents({}) == 10000
-
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/utils.py b/tests/utils.py
index 43b8eafc9..eefe55204 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,3 +1,4 @@
+import functools
 import operator
 import unittest
 
@@ -77,14 +78,13 @@ def requires_mongodb_gte_36(func):
     :param oper: The operator to apply (e.g. operator.ge)
     """
 
+    @functools.wraps(func)
     def _inner(*args, **kwargs):
         mongodb_v = get_mongodb_version()
         if oper(mongodb_v, mongo_version_req):
             return func(*args, **kwargs)
+        else:
+            pretty_version = ".".join(str(n) for n in mongo_version_req)
+            pytest.skip(f"Needs MongoDB {oper.__name__} v{pretty_version}")
 
-        pretty_version = ".".join(str(n) for n in mongo_version_req)
-        pytest.skip(f"Needs MongoDB {oper.__name__} v{pretty_version}")
-
-    _inner.__name__ = func.__name__
-    _inner.__doc__ = func.__doc__
     return _inner

From e844138d9d4448c705b7330da654b44bc31e3692 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 21 Aug 2024 18:51:33 +0200
Subject: [PATCH 1445/1519] Fix no_dereference thread safetyness + force
 ComplexField's field arg to be a BaseField instance + make max_length a
 keyword only arg on ListField

---
 docs/changelog.rst                      |  4 ++
 mongoengine/base/document.py            |  7 +++-
 mongoengine/base/fields.py              | 52 +++++++++++++++++++++++-
 mongoengine/context_managers.py         | 46 +++++++++------------
 mongoengine/fields.py                   | 16 ++++----
 python-mongoengine.spec                 | 54 -------------------------
 tests/fields/test_complex_base_field.py | 10 +++++
 tests/fields/test_dict_field.py         | 54 +++++++++++++++++--------
 tests/fields/test_fields.py             | 35 +++++++++++++++-
 tests/fields/test_reference_field.py    | 20 +++++++++
 tests/queryset/test_queryset.py         |  3 +-
 tests/test_ci.py                        |  2 +-
 tests/test_context_managers.py          | 52 +++++++++++++++++-------
 13 files changed, 228 insertions(+), 127 deletions(-)
 delete mode 100644 python-mongoengine.spec
 create mode 100644 tests/fields/test_complex_base_field.py

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 65aef227d..b8f000174 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,10 @@ Development
 - Allow gt/gte/lt/lte/ne operators to be used with a list as value on ListField #2813
 - Switch tox to use pytest instead of legacy `python setup.py test` #2804
 - Add support for timeseries collection #2661
+- improve ReferenceField wrong usage detection
+- Fix no_dereference thread-safetyness #2830
+- BREAKING CHANGE: max_length in ListField is now keyword only on ListField signature
+- BREAKING CHANGE: Force `field` argument of ListField/DictField to be a field instance (e.g ListField(StringField()) instead of ListField(StringField)
 
 Changes in 0.28.2
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 053242234..595690829 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -806,10 +806,15 @@ def _from_son(cls, son, _auto_dereference=True, created=False):
 
         fields = cls._fields
         if not _auto_dereference:
+            # if auto_deref is turned off, we copy the fields so
+            # we can mutate the auto_dereference of the fields
             fields = copy.deepcopy(fields)
 
+        # Apply field-name / db-field conversion
         for field_name, field in fields.items():
-            field._auto_dereference = _auto_dereference
+            field.set_auto_dereferencing(
+                _auto_dereference
+            )  # align the field's auto-dereferencing with the document's
             if field.db_field in data:
                 value = data[field.db_field]
                 try:
diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 037e916ff..cead14449 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -1,4 +1,6 @@
+import contextlib
 import operator
+import threading
 import weakref
 
 import pymongo
@@ -16,6 +18,19 @@
 __all__ = ("BaseField", "ComplexBaseField", "ObjectIdField", "GeoJsonBaseField")
 
 
+@contextlib.contextmanager
+def _no_dereference_for_fields(*fields):
+    """Context manager for temporarily disabling a Field's auto-dereferencing
+    (meant to be used from no_dereference context manager)"""
+    try:
+        for field in fields:
+            field._incr_no_dereference_context()
+        yield None
+    finally:
+        for field in fields:
+            field._decr_no_dereference_context()
+
+
 class BaseField:
     """A base class for fields in a MongoDB document. Instances of this class
     may be added to subclasses of `Document` to define a document's schema.
@@ -24,7 +39,7 @@ class BaseField:
     name = None  # set in TopLevelDocumentMetaclass
     _geo_index = False
     _auto_gen = False  # Call `generate` to generate a value
-    _auto_dereference = True
+    _thread_local_storage = threading.local()
 
     # These track each time a Field instance is created. Used to retain order.
     # The auto_creation_counter is used for fields that MongoEngine implicitly
@@ -85,6 +100,8 @@ def __init__(
         self.sparse = sparse
         self._owner_document = None
 
+        self.__auto_dereference = True
+
         # Make sure db_field is a string (if it's explicitly defined).
         if self.db_field is not None and not isinstance(self.db_field, str):
             raise TypeError("db_field should be a string.")
@@ -120,6 +137,33 @@ def __init__(
             self.creation_counter = BaseField.creation_counter
             BaseField.creation_counter += 1
 
+    def set_auto_dereferencing(self, value):
+        self.__auto_dereference = value
+
+    @property
+    def _no_dereference_context_local(self):
+        if not hasattr(self._thread_local_storage, "no_dereference_context"):
+            self._thread_local_storage.no_dereference_context = 0
+        return self._thread_local_storage.no_dereference_context
+
+    @property
+    def _no_dereference_context_is_set(self):
+        return self._no_dereference_context_local > 0
+
+    def _incr_no_dereference_context(self):
+        self._thread_local_storage.no_dereference_context = (
+            self._no_dereference_context_local + 1
+        )
+
+    def _decr_no_dereference_context(self):
+        self._thread_local_storage.no_dereference_context = (
+            self._no_dereference_context_local - 1
+        )
+
+    @property
+    def _auto_dereference(self):
+        return self.__auto_dereference and not self._no_dereference_context_is_set
+
     def __get__(self, instance, owner):
         """Descriptor for retrieving a value from a field in a document."""
         if instance is None:
@@ -268,6 +312,10 @@ class ComplexBaseField(BaseField):
     """
 
     def __init__(self, field=None, **kwargs):
+        if field is not None and not isinstance(field, BaseField):
+            raise TypeError(
+                f"field argument must be a Field instance (e.g {self.__class__.__name__}(StringField()))"
+            )
         self.field = field
         super().__init__(**kwargs)
 
@@ -375,7 +423,7 @@ def to_python(self, value):
                 return value
 
         if self.field:
-            self.field._auto_dereference = self._auto_dereference
+            self.field.set_auto_dereferencing(self._auto_dereference)
             value_dict = {
                 key: self.field.to_python(item) for key, item in value.items()
             }
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index f16753eea..e8eee1e38 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,9 +1,11 @@
+import contextlib
 import threading
 from contextlib import contextmanager
 
 from pymongo.read_concern import ReadConcern
 from pymongo.write_concern import WriteConcern
 
+from mongoengine.base.fields import _no_dereference_for_fields
 from mongoengine.common import _import_class
 from mongoengine.connection import DEFAULT_CONNECTION_NAME, get_db
 from mongoengine.pymongo_support import count_documents
@@ -22,6 +24,7 @@
 
 class MyThreadLocals(threading.local):
     def __init__(self):
+        # {DocCls: count} keeping track of classes with an active no_dereference context
         self.no_dereferencing_class = {}
 
 
@@ -126,46 +129,37 @@ def __exit__(self, t, value, traceback):
         self.cls._get_collection_name = self.ori_get_collection_name
 
 
-class no_dereference:
+@contextlib.contextmanager
+def no_dereference(cls):
     """no_dereference context manager.
 
     Turns off all dereferencing in Documents for the duration of the context
     manager::
 
         with no_dereference(Group):
-            Group.objects.find()
+            Group.objects()
     """
-
-    def __init__(self, cls):
-        """Construct the no_dereference context manager.
-
-        :param cls: the class to turn dereferencing off on
-        """
-        self.cls = cls
+    try:
+        cls = cls
 
         ReferenceField = _import_class("ReferenceField")
         GenericReferenceField = _import_class("GenericReferenceField")
         ComplexBaseField = _import_class("ComplexBaseField")
 
-        self.deref_fields = [
-            k
-            for k, v in self.cls._fields.items()
-            if isinstance(v, (ReferenceField, GenericReferenceField, ComplexBaseField))
+        deref_fields = [
+            field
+            for name, field in cls._fields.items()
+            if isinstance(
+                field, (ReferenceField, GenericReferenceField, ComplexBaseField)
+            )
         ]
 
-    def __enter__(self):
-        """Change the objects default and _auto_dereference values."""
-        _register_no_dereferencing_for_class(self.cls)
-
-        for field in self.deref_fields:
-            self.cls._fields[field]._auto_dereference = False
-
-    def __exit__(self, t, value, traceback):
-        """Reset the default and _auto_dereference values."""
-        _unregister_no_dereferencing_for_class(self.cls)
+        _register_no_dereferencing_for_class(cls)
 
-        for field in self.deref_fields:
-            self.cls._fields[field]._auto_dereference = True
+        with _no_dereference_for_fields(*deref_fields):
+            yield None
+    finally:
+        _unregister_no_dereferencing_for_class(cls)
 
 
 class no_sub_classes:
@@ -180,7 +174,7 @@ class no_sub_classes:
     def __init__(self, cls):
         """Construct the no_sub_classes context manager.
 
-        :param cls: the class to turn querying sub classes on
+        :param cls: the class to turn querying subclasses on
         """
         self.cls = cls
         self.cls_initial_subclasses = None
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 27a0826a4..5d8c1395e 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -6,6 +6,7 @@
 import socket
 import time
 import uuid
+from inspect import isclass
 from io import BytesIO
 from operator import itemgetter
 
@@ -707,7 +708,6 @@ class EmbeddedDocumentField(BaseField):
     """
 
     def __init__(self, document_type, **kwargs):
-        # XXX ValidationError raised outside of the "validate" method.
         if not (
             isinstance(document_type, str)
             or issubclass(document_type, EmbeddedDocument)
@@ -910,9 +910,9 @@ class ListField(ComplexBaseField):
         Required means it cannot be empty - as the default for ListFields is []
     """
 
-    def __init__(self, field=None, max_length=None, **kwargs):
+    def __init__(self, field=None, *, max_length=None, **kwargs):
         self.max_length = max_length
-        kwargs.setdefault("default", lambda: [])
+        kwargs.setdefault("default", list)
         super().__init__(field=field, **kwargs)
 
     def __get__(self, instance, owner):
@@ -1035,10 +1035,9 @@ class DictField(ComplexBaseField):
     """
 
     def __init__(self, field=None, *args, **kwargs):
-        self._auto_dereference = False
-
-        kwargs.setdefault("default", lambda: {})
+        kwargs.setdefault("default", dict)
         super().__init__(*args, field=field, **kwargs)
+        self.set_auto_dereferencing(False)
 
     def validate(self, value):
         """Make sure that a list of valid fields is being used."""
@@ -1151,8 +1150,9 @@ def __init__(
             :class:`~pymongo.dbref.DBRef`, regardless of the value of `dbref`.
         """
         # XXX ValidationError raised outside of the "validate" method.
-        if not isinstance(document_type, str) and not issubclass(
-            document_type, Document
+        if not (
+            isinstance(document_type, str)
+            or (isclass(document_type) and issubclass(document_type, Document))
         ):
             self.error(
                 "Argument to ReferenceField constructor must be a "
diff --git a/python-mongoengine.spec b/python-mongoengine.spec
deleted file mode 100644
index 635c779fd..000000000
--- a/python-mongoengine.spec
+++ /dev/null
@@ -1,54 +0,0 @@
-# sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-
-%define srcname mongoengine
-
-Name:           python-%{srcname}
-Version:        0.8.7
-Release:        1%{?dist}
-Summary:        A Python Document-Object Mapper for working with MongoDB
-
-Group:          Development/Libraries
-License:        MIT
-URL:            https://github.com/MongoEngine/mongoengine
-Source0:        %{srcname}-%{version}.tar.bz2
-
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-
-Requires:       mongodb
-Requires:       pymongo
-Requires:       python-blinker
-Requires:       python-imaging
-
-
-%description
-MongoEngine is an ORM-like layer on top of PyMongo.
-
-%prep
-%setup -q -n %{srcname}-%{version}
-
-
-%build
-# Remove CFLAGS=... for noarch packages (unneeded)
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%doc docs AUTHORS LICENSE README.rst
-# For noarch packages: sitelib
- %{python_sitelib}/*
-# For arch-specific packages: sitearch
-# %{python_sitearch}/*
-
-%changelog
-* See: http://docs.mongoengine.org/en/latest/changelog.html
diff --git a/tests/fields/test_complex_base_field.py b/tests/fields/test_complex_base_field.py
new file mode 100644
index 000000000..accda2f78
--- /dev/null
+++ b/tests/fields/test_complex_base_field.py
@@ -0,0 +1,10 @@
+import pytest
+
+from mongoengine.base import ComplexBaseField
+from tests.utils import MongoDBTestCase
+
+
+class TestComplexBaseField(MongoDBTestCase):
+    def test_field_validation(self):
+        with pytest.raises(TypeError, match="field argument must be a Field instance"):
+            ComplexBaseField("test")
diff --git a/tests/fields/test_dict_field.py b/tests/fields/test_dict_field.py
index 4da29d9a3..c2c6ea1fd 100644
--- a/tests/fields/test_dict_field.py
+++ b/tests/fields/test_dict_field.py
@@ -116,39 +116,35 @@ class BlogPost(Document):
         post.reload()
         assert post.info["authors"] == []
 
-    def test_dictfield_dump_document(self):
+    def test_dictfield_dump_document_with_inheritance__cls(self):
         """Ensure a DictField can handle another document's dump."""
 
         class Doc(Document):
             field = DictField()
 
-        class ToEmbed(Document):
-            id = IntField(primary_key=True, default=1)
-            recursive = DictField()
-
         class ToEmbedParent(Document):
-            id = IntField(primary_key=True, default=1)
+            id = IntField(primary_key=True)
             recursive = DictField()
 
             meta = {"allow_inheritance": True}
 
         class ToEmbedChild(ToEmbedParent):
-            pass
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
 
-        to_embed_recursive = ToEmbed(id=1).save()
-        to_embed = ToEmbed(
-            id=2, recursive=to_embed_recursive.to_mongo().to_dict()
-        ).save()
-        doc = Doc(field=to_embed.to_mongo().to_dict())
-        doc.save()
-        assert isinstance(doc.field, dict)
-        assert doc.field == {"_id": 2, "recursive": {"_id": 1, "recursive": {}}}
-        # Same thing with a Document with a _cls field
+        Doc.drop_collection()
+        ToEmbedParent.drop_collection()
+
+        # with a Document with a _cls field
         to_embed_recursive = ToEmbedChild(id=1).save()
         to_embed_child = ToEmbedChild(
             id=2, recursive=to_embed_recursive.to_mongo().to_dict()
         ).save()
-        doc = Doc(field=to_embed_child.to_mongo().to_dict())
+
+        doc_dump_as_dict = to_embed_child.to_mongo().to_dict()
+        doc = Doc(field=doc_dump_as_dict)
+        assert Doc.field._auto_dereference is False
+        assert isinstance(doc.field, dict)  # depends on auto_dereference
         doc.save()
         assert isinstance(doc.field, dict)
         expected = {
@@ -162,6 +158,30 @@ class ToEmbedChild(ToEmbedParent):
         }
         assert doc.field == expected
 
+        # _ = Doc.objects.first()
+        # assert Doc.field._auto_dereference is False   # Fails, bug #2831
+        # doc = Doc(field=doc_dump_as_dict)
+        # assert isinstance(doc.field, dict) # Fails, bug #2831
+
+    def test_dictfield_dump_document_no_inheritance(self):
+        """Ensure a DictField can handle another document's dump."""
+
+        class Doc(Document):
+            field = DictField()
+
+        class ToEmbed(Document):
+            id = IntField(primary_key=True)
+            recursive = DictField()
+
+        to_embed_recursive = ToEmbed(id=1).save()
+        to_embed = ToEmbed(
+            id=2, recursive=to_embed_recursive.to_mongo().to_dict()
+        ).save()
+        doc = Doc(field=to_embed.to_mongo().to_dict())
+        doc.save()
+        assert isinstance(doc.field, dict)
+        assert doc.field == {"_id": 2, "recursive": {"_id": 1, "recursive": {}}}
+
     def test_dictfield_strict(self):
         """Ensure that dict field handles validation if provided a strict field type."""
 
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index d95e2fce0..5655f12e2 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -39,6 +39,7 @@
     EmbeddedDocumentList,
     _document_registry,
 )
+from mongoengine.base.fields import _no_dereference_for_fields
 from mongoengine.errors import DeprecatedError
 from tests.utils import MongoDBTestCase
 
@@ -1373,17 +1374,19 @@ class Bar(Document):
         # Reference is no longer valid
         foo.delete()
         bar = Bar.objects.get()
+
         with pytest.raises(DoesNotExist):
             bar.ref
+
         with pytest.raises(DoesNotExist):
             bar.generic_ref
 
         # When auto_dereference is disabled, there is no trouble returning DBRef
         bar = Bar.objects.get()
         expected = foo.to_dbref()
-        bar._fields["ref"]._auto_dereference = False
+        bar._fields["ref"].set_auto_dereferencing(False)
         assert bar.ref == expected
-        bar._fields["generic_ref"]._auto_dereference = False
+        bar._fields["generic_ref"].set_auto_dereferencing(False)
         assert bar.generic_ref == {"_ref": expected, "_cls": "Foo"}
 
     def test_list_item_dereference(self):
@@ -2732,5 +2735,33 @@ class CustomData(Document):
         assert custom_data["a"] == CustomData.c_field.custom_data["a"]
 
 
+class TestUtils(MongoDBTestCase):
+    def test__no_dereference_for_fields(self):
+        class User(Document):
+            name = StringField()
+
+        class Group(Document):
+            member = ReferenceField(User)
+
+        User.drop_collection()
+        Group.drop_collection()
+
+        user1 = User(name="user1")
+        user1.save()
+
+        group = Group(member=user1)
+        group.save()
+
+        # Test all inside the context mgr, from class field
+        with _no_dereference_for_fields(Group.member):
+            group = Group.objects.first()
+            assert isinstance(group.member, DBRef)
+
+        # Test instance fetched outside context mgr, patch on instance field
+        group = Group.objects.first()
+        with _no_dereference_for_fields(group._fields["member"]):
+            assert isinstance(group.member, DBRef)
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index afbf50045..94869f2ea 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -6,6 +6,26 @@
 
 
 class TestReferenceField(MongoDBTestCase):
+    def test_reference_field_fails_init_wrong_document_type(self):
+        class User(Document):
+            name = StringField()
+
+        ERROR_MSG = "Argument to ReferenceField constructor must be a document class or a string"
+        # fails if given an instance
+        with pytest.raises(ValidationError, match=ERROR_MSG):
+
+            class Test(Document):
+                author = ReferenceField(User())
+
+        class NonDocumentSubClass:
+            pass
+
+        # fails if given an non Document subclass
+        with pytest.raises(ValidationError, match=ERROR_MSG):
+
+            class Test(Document):  # noqa: F811
+                author = ReferenceField(NonDocumentSubClass)
+
     def test_reference_validation(self):
         """Ensure that invalid document objects cannot be assigned to
         reference fields.
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index f5634d77a..7b41a894b 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -5326,7 +5326,8 @@ class User(Document):
 
         assert isinstance(qs.first().organization, Organization)
 
-        assert isinstance(qs.no_dereference().first().organization, DBRef)
+        user = qs.no_dereference().first()
+        assert isinstance(user.organization, DBRef)
 
         assert isinstance(qs_user.organization, Organization)
         assert isinstance(qs.first().organization, Organization)
diff --git a/tests/test_ci.py b/tests/test_ci.py
index 04a800ebf..00068f776 100644
--- a/tests/test_ci.py
+++ b/tests/test_ci.py
@@ -3,7 +3,7 @@ def test_ci_placeholder():
     # setup the tox venv without running the test suite
     # if we simply skip all test with pytest -k=wrong_pattern
     # pytest command would return with exit_code=5 (i.e "no tests run")
-    # making travis fail
+    # making pipeline fail
     # this empty test is the recommended way to handle this
     # as described in https://github.com/pytest-dev/pytest/issues/2393
     pass
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 69c8931dd..287ce7df5 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -172,8 +172,44 @@ class Group(Document):
         assert isinstance(group.ref, User)
         assert isinstance(group.generic, User)
 
+    def test_no_dereference_context_manager_thread_safe(self):
+        """Ensure no_dereference context manager works in threaded condition"""
+
+        class User(Document):
+            name = StringField()
+
+        class Group(Document):
+            ref = ReferenceField(User, dbref=False)
+
+        User.drop_collection()
+        Group.drop_collection()
+
+        user = User(name="user 1").save()
+        Group(ref=user).save()
+
+        def run_in_thread(id):
+            time.sleep(random.uniform(0.1, 0.5))  # Force desync of threads
+            if id % 2 == 0:
+                with no_dereference(Group):
+                    for i in range(20):
+                        time.sleep(random.uniform(0.1, 0.5))
+                        assert Group.ref._auto_dereference is False
+                        group = Group.objects.first()
+                        assert isinstance(group.ref, DBRef)
+            else:
+                for i in range(20):
+                    time.sleep(random.uniform(0.1, 0.5))
+                    assert Group.ref._auto_dereference is True
+                    group = Group.objects.first()
+                    assert isinstance(group.ref, User)
+
+        threads = [
+            TestableThread(target=run_in_thread, args=(id,)) for id in range(100)
+        ]
+        _ = [th.start() for th in threads]
+        _ = [th.join() for th in threads]
+
     def test_no_dereference_context_manager_nested(self):
-        """Ensure that DBRef items in ListFields aren't dereferenced."""
 
         class User(Document):
             name = StringField()
@@ -205,20 +241,6 @@ class Group(Document):
         group = Group.objects.first()
         assert isinstance(group.ref, User)
 
-        def run_in_thread(id):
-            time.sleep(random.uniform(0.1, 0.5))  # Force desync of threads
-            if id % 2 == 0:
-                with no_dereference(Group):
-                    group = Group.objects.first()
-                    assert isinstance(group.ref, DBRef)
-            else:
-                group = Group.objects.first()
-                assert isinstance(group.ref, User)
-
-        threads = [TestableThread(target=run_in_thread, args=(id,)) for id in range(10)]
-        _ = [th.start() for th in threads]
-        _ = [th.join() for th in threads]
-
     def test_no_dereference_context_manager_dbref(self):
         """Ensure that DBRef items in ListFields aren't dereferenced"""
 

From f2fbb9dcc052686f3c4f706caf2eac9f0dd6d7a4 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 25 Aug 2024 22:58:17 +0200
Subject: [PATCH 1446/1519] Fix deprecated version in docker-compose.yml and
 bump mongo to v 5

---
 Dockerfile         | 2 +-
 docker-compose.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ca635498d..882ce03d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mongo:4
+FROM mongo:5
 
 COPY ./entrypoint.sh entrypoint.sh
 RUN chmod u+x entrypoint.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index bb3a1e43f..8b3b36101 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.4'
 services:
   mongoengine:
     build:

From da1677c8c5fb2c68ad044957b4ab817b28756ff2 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 25 Aug 2024 22:17:05 +0200
Subject: [PATCH 1447/1519] upgrade docs deps + fix inconsistencies

---
 .github/workflows/github-actions.yml |  2 +-
 README.rst                           |  2 +-
 docs/Makefile                        | 34 ++--------------------------
 docs/django.rst                      | 15 +-----------
 docs/faq.rst                         |  4 ++--
 docs/guide/connecting.rst            |  2 +-
 docs/guide/defining-documents.rst    | 10 ++++----
 docs/guide/gridfs.rst                |  2 +-
 docs/guide/installing.rst            |  4 ++--
 docs/guide/migration.rst             |  2 +-
 docs/guide/mongomock.rst             |  2 +-
 docs/guide/querying.rst              |  8 +++----
 docs/index.rst                       | 16 ++++---------
 docs/requirements.txt                | 10 ++++----
 mongoengine/base/document.py         |  6 ++---
 mongoengine/context_managers.py      |  2 +-
 mongoengine/fields.py                |  2 +-
 mongoengine/queryset/base.py         | 12 +++++-----
 18 files changed, 42 insertions(+), 93 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 17c204b69..ad601746a 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -123,7 +123,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
-        python-version: 3.7
+        python-version: 3.9
         check-latest: true
     - name: install python dep
       run: |
diff --git a/README.rst b/README.rst
index 92473f351..1e9d5d580 100644
--- a/README.rst
+++ b/README.rst
@@ -48,7 +48,7 @@ You may also have `setuptools <http://peak.telecommunity.com/DevCenter/setuptool
 and thus you can use ``easy_install -U mongoengine``. Another option is
 `pipenv <https://docs.pipenv.org/>`_. You can then use ``pipenv install mongoengine``
 to both create the virtual environment and install the package. Otherwise, you can
-download the source from `GitHub <http://github.com/MongoEngine/mongoengine>`_ and
+download the source from `GitHub <https://github.com/MongoEngine/mongoengine>`_ and
 run ``python setup.py install``.
 
 The support for Python2 was dropped with MongoEngine 0.20.0
diff --git a/docs/Makefile b/docs/Makefile
index 301b44fa8..68149fe5a 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -16,13 +16,10 @@ ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html-readthedocs to simulate an html-build for readthedocs"
 	@echo "  html      to make standalone HTML files"
 	@echo "  dirhtml   to make HTML files named index.html in directories"
-	@echo "  pickle    to make pickle files"
-	@echo "  json      to make JSON files"
 	@echo "  htmlhelp  to make HTML files and a HTML help project"
-	@echo "  qthelp    to make HTML files and a qthelp project"
-	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 	@echo "  changes   to make an overview of all changed/added/deprecated items"
 	@echo "  linkcheck to check all external links for integrity"
 	@echo "  doctest   to run all doctests embedded in the documentation (if enabled)"
@@ -40,47 +37,20 @@ html:
 
 html-readthedocs:
 	$(SPHINXBUILD) -T -E -b readthedocs $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
+	@echo "Open in browser: file://`realpath $(BUILDDIR)/html/index.html`"
 
 dirhtml:
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
 htmlhelp:
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
 	@echo
 	@echo "Build finished; now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(BUILDDIR)/htmlhelp."
 
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/MongoEngine.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/MongoEngine.qhc"
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
-	      "run these through (pdf)latex."
-
 changes:
 	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
 	@echo
diff --git a/docs/django.rst b/docs/django.rst
index d43a205ed..b9986f835 100644
--- a/docs/django.rst
+++ b/docs/django.rst
@@ -3,17 +3,4 @@ Django Support
 ==============
 
 .. note:: Django support has been split from the main MongoEngine
-    repository. The *legacy* Django extension may be found bundled with the
-    0.9 release of MongoEngine.
-
-
-
-Help Wanted!
-------------
-
-The MongoEngine team is looking for help contributing and maintaining a new
-Django extension for MongoEngine! If you have Django experience and would like
-to help contribute to the project, please get in touch on the
-`mailing list <http://groups.google.com/group/mongoengine-users>`_ or by
-simply contributing on
-`GitHub <https://github.com/MongoEngine/django-mongoengine>`_.
+    repository.
diff --git a/docs/faq.rst b/docs/faq.rst
index 49c730235..1c05df748 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -8,5 +8,5 @@ Does MongoEngine support asynchronous drivers (Motor, TxMongo)?
 No, MongoEngine is exclusively based on PyMongo and isn't designed to support other driver.
 If this is a requirement for your project, check the alternative:  `uMongo`_ and `MotorEngine`_.
 
-.. _uMongo: https://umongo.readthedocs.io/
-.. _MotorEngine: https://motorengine.readthedocs.io/
+.. _uMongo: https://umongo.readthedocs.io/en/latest/
+.. _MotorEngine: https://motorengine.readthedocs.io/en/latest/
diff --git a/docs/guide/connecting.rst b/docs/guide/connecting.rst
index 2cbdb4453..78d59f82f 100644
--- a/docs/guide/connecting.rst
+++ b/docs/guide/connecting.rst
@@ -47,7 +47,7 @@ of the MongoDB connection string is for::
     connect(host="mongodb://my_user:my_password@127.0.0.1:27017/my_db?authSource=my_db")
 
 The URI string can also be used to configure advanced parameters like ssl, replicaSet, etc. For more
-information or example about URI string, you can refer to the `official doc <https://docs.mongodb.com/manual/reference/connection-string/>`_::
+information or example about URI string, you can refer to the `official doc <https://www.mongodb.com/docs/manual/reference/connection-string/>`_::
 
     connect(host="mongodb://my_user:my_password@127.0.0.1:27017/my_db?authSource=admin&ssl=true&replicaSet=globaldb")
 
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index 037847112..cc59a8c10 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -29,7 +29,7 @@ documents are serialized based on their field order.
 
 .. _dynamic-document-schemas:
 
-Dynamic document schemas
+Dynamic Document Schemas
 ========================
 One of the benefits of MongoDB is dynamic schemas for a collection, whilst data
 should be planned and organised (after all explicit is better than implicit!)
@@ -260,7 +260,7 @@ document class as the first argument::
     comment2 = Comment(content='Nice article!')
     page = Page(comments=[comment1, comment2])
 
-Embedded documents can also leverage the flexibility of :ref:`dynamic-document-schemas:`
+Embedded documents can also leverage the flexibility of :ref:`dynamic-document-schemas`
 by inheriting :class:`~mongoengine.DynamicEmbeddedDocument`.
 
 Dictionary Fields
@@ -325,7 +325,7 @@ as the constructor's argument::
 .. _many-to-many-with-listfields:
 
 Many to Many with ListFields
-'''''''''''''''''''''''''''
+''''''''''''''''''''''''''''
 
 If you are implementing a many to many relationship via a list of references,
 then the references are stored as DBRefs and to query you need to pass an
@@ -492,7 +492,7 @@ The following example shows a :class:`Log` document that will be limited to
         meta = {'max_documents': 1000, 'max_size': 2000000}
 
 Timeseries collections
-------------------
+----------------------
 A :class:`~mongoengine.Document` may use a **Timeseries Collection** by specifying
 :attr:`timeseries` in the :attr:`meta` dictionary. Timeseries collection were added
 in MongoDB 5.0 (`doc <https://www.mongodb.com/docs/v5.3/core/timeseries-collections/>`_).
@@ -599,7 +599,7 @@ There are a few top level defaults for all indexes that can be set::
 
 
 :attr:`index_opts` (Optional)
-    Set any default index options - see the `full options list <https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/#db.collection.createIndex>`_
+    Set any default index options - see the `full options list <https://www.mongodb.com/docs/manual/reference/method/db.collection.createIndex/>`_
 
 :attr:`index_background` (Optional)
     Set the default value for if an index should be indexed in the background
diff --git a/docs/guide/gridfs.rst b/docs/guide/gridfs.rst
index e6c097ff0..4d1b48377 100644
--- a/docs/guide/gridfs.rst
+++ b/docs/guide/gridfs.rst
@@ -9,7 +9,7 @@ GridFS support comes in the form of the :class:`~mongoengine.fields.FileField` f
 object. This field acts as a file-like object and provides a couple of
 different ways of inserting and retrieving data. Arbitrary metadata such as
 content type can also be stored alongside the files. The object returned when accessing a
-FileField is a proxy to `Pymongo's GridFS <https://api.mongodb.com/python/current/examples/gridfs.html#gridfs-example>`_
+FileField is a proxy to `Pymongo's GridFS <https://pymongo.readthedocs.io/en/stable/examples/gridfs.html#gridfs-example>`_
 In the following example, a document is created to store details about animals, including a photo::
 
     class Animal(Document):
diff --git a/docs/guide/installing.rst b/docs/guide/installing.rst
index 2c962ad90..efdb46fd4 100644
--- a/docs/guide/installing.rst
+++ b/docs/guide/installing.rst
@@ -2,7 +2,7 @@
 Installing MongoEngine
 ======================
 
-To use MongoEngine, you will need to download `MongoDB <http://mongodb.com/>`_
+To use MongoEngine, you will need to download `MongoDB <https://www.mongodb.com/>`_
 and ensure it is running in an accessible location. You will also need
 `PyMongo <http://api.mongodb.org/python>`_ to use MongoEngine, but if you
 install MongoEngine using setuptools, then the dependencies will be handled for
@@ -22,7 +22,7 @@ Alternatively, if you don't have setuptools installed, `download it from PyPi
     $ python setup.py install
 
 To use the bleeding-edge version of MongoEngine, you can get the source from
-`GitHub <http://github.com/mongoengine/mongoengine/>`_ and install it as above:
+`GitHub <https://github.com/MongoEngine/mongoengine/>`_ and install it as above:
 
 .. code-block:: console
 
diff --git a/docs/guide/migration.rst b/docs/guide/migration.rst
index ed982efc3..116910e06 100644
--- a/docs/guide/migration.rst
+++ b/docs/guide/migration.rst
@@ -262,7 +262,7 @@ If you would remove the 'name' field or its index, you would have to call:
     User._get_collection().drop_index('name_1')
 
 .. note:: When adding new fields or new indexes, MongoEngine will take care of creating them
-    (unless `auto_create_index` is disabled) ::
+    (unless `auto_create_index` is disabled)
 
 Recommendations
 ===============
diff --git a/docs/guide/mongomock.rst b/docs/guide/mongomock.rst
index d9232055b..024fda172 100644
--- a/docs/guide/mongomock.rst
+++ b/docs/guide/mongomock.rst
@@ -5,7 +5,7 @@ Use mongomock for testing
 Although we recommend running your tests against a regular MongoDB server, it is sometimes useful to plug
 MongoEngine to alternative implementations (mongomock, montydb, mongita, etc).
 
-`mongomock <https://github.com/vmalloc/mongomock/>`_ is historically the one suggested for MongoEngine and is
+`mongomock <https://github.com/mongomock/mongomock>`_ is historically the one suggested for MongoEngine and is
 a package to do just what the name implies, mocking a mongo database.
 
 To use with mongoengine, simply specify mongomock when connecting with
diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index d5ac70b07..d347806b2 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -241,7 +241,7 @@ Update with Aggregation Pipeline
 It is possible to provide a raw :mod:`PyMongo` aggregation update parameter, which will
 be integrated directly into the update. This is done by using ``__raw__`` keyword argument to the update method
 and provide the pipeline as a list
-`Update with Aggregation Pipeline <https://docs.mongodb.com/manual/reference/method/db.collection.updateMany/#update-with-aggregation->`_
+`Update with Aggregation Pipeline <https://www.mongodb.com/docs/manual/reference/method/db.collection.updateMany/#update-with-aggregation->`_
 ::
 
     # 'tags' field is set to 'coding is fun'
@@ -257,7 +257,7 @@ Update with Array Operator
 It is possible to update specific value in array by use array_filters (arrayFilters) operator.
 This is done by using ``__raw__`` keyword argument to the update method and provide the arrayFilters as a list.
 
-`Update with Array Operator <https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered->`_
+`Update with Array Operator <https://www.mongodb.com/docs/manual/reference/operator/update/positional-filtered/>`_
 ::
 
     # assuming an initial 'tags' field == ['test1', 'test2', 'test3']
@@ -447,7 +447,7 @@ would be generating "tag-clouds"::
 
 MongoDB aggregation API
 -----------------------
-If you need to run aggregation pipelines, MongoEngine provides an entry point to `Pymongo's aggregation framework <https://api.mongodb.com/python/current/examples/aggregation.html#aggregation-framework>`_
+If you need to run aggregation pipelines, MongoEngine provides an entry point to `Pymongo's aggregation framework <https://pymongo.readthedocs.io/en/stable/examples/aggregation.html#aggregation-framework>`_
 through :meth:`~mongoengine.queryset.QuerySet.aggregate`. Check out Pymongo's documentation for the syntax and pipeline.
 An example of its use would be::
 
@@ -661,7 +661,7 @@ to push values with index::
 .. note::
     Currently only top level lists are handled, future versions of mongodb /
     pymongo plan to support nested positional operators.  See `The $ positional
-    operator <https://docs.mongodb.com/manual/tutorial/update-documents/#Updating-The%24positionaloperator>`_.
+    operator <https://www.mongodb.com/docs/manual/tutorial/update-documents/#Updating-The%24positionaloperator>`_.
 
 Server-side javascript execution
 ================================
diff --git a/docs/index.rst b/docs/index.rst
index a42ff8573..e550760ce 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,9 +20,6 @@ MongoDB. To install it, simply run
 :doc:`apireference`
   The complete API documentation --- the innards of documents, querysets and fields.
 
-:doc:`upgrade`
-  How to upgrade MongoEngine.
-
 :doc:`faq`
   Frequently Asked Questions
 
@@ -33,7 +30,7 @@ MongoDB and driver support
 --------------------------
 
 MongoEngine is based on the PyMongo driver and tested against multiple versions of MongoDB.
-For further details, please refer to the `readme <https://github.com/MongoEngine/mongoengine#mongoengine>`_.
+For further details, please refer to the `readme <https://github.com/MongoEngine/mongoengine>`_.
 
 Community
 ---------
@@ -47,22 +44,18 @@ Contributing
 
 **Yes please!**  We are always looking for contributions, additions and improvements.
 
-The source is available on `GitHub <http://github.com/MongoEngine/mongoengine>`_
+The source is available on `GitHub <https://github.com/MongoEngine/mongoengine>`_
 and contributions are always encouraged. Contributions can be as simple as
 minor tweaks to this documentation, the website or the core.
 
 To contribute, fork the project on
-`GitHub <http://github.com/MongoEngine/mongoengine>`_ and send a
+`GitHub <https://github.com/MongoEngine/mongoengine>`_ and send a
 pull request.
 
 Changes
 -------
 
-See the :doc:`changelog` for a full list of changes to MongoEngine and
-:doc:`upgrade` for upgrade information.
-
-.. note::  Always read and test the `upgrade <upgrade>`_ documentation before
-    putting updates live in production **;)**
+See the :doc:`changelog` for a full list of changes to MongoEngine.
 
 Offline Reading
 ---------------
@@ -81,7 +74,6 @@ formats for offline reading.
     guide/index
     apireference
     changelog
-    upgrade
     faq
     django
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 4ecb0127d..4d4be826b 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,5 @@
-Sphinx==3.3.0
-sphinx-rtd-theme==0.5.0
-readthedocs-sphinx-ext==2.1.1
-docutils==0.17.1
-Jinja2<3.1
+Sphinx==7.4.7
+sphinx-rtd-theme==2.1.0rc2
+readthedocs-sphinx-ext==2.2.5
+docutils==0.20.1
+Jinja2==3.1.4
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 595690829..379f5e801 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -461,13 +461,13 @@ def to_json(self, *args, **kwargs):
 
     @classmethod
     def from_json(cls, json_data, created=False, **kwargs):
-        """Converts json data to a Document instance
+        """Converts json data to a Document instance.
 
-        :param str json_data: The json data to load into the Document
+        :param str json_data: The json data to load into the Document.
         :param bool created: Boolean defining whether to consider the newly
             instantiated document as brand new or as persisted already:
             * If True, consider the document as brand new, no matter what data
-              it's loaded with (i.e. even if an ID is loaded).
+              it's loaded with (i.e., even if an ID is loaded).
             * If False and an ID is NOT provided, consider the document as
               brand new.
             * If False and an ID is provided, assume that the object has
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index e8eee1e38..6b987dd30 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -215,7 +215,7 @@ class User(Document):
 
     Be aware that:
 
-    - Iterating over large amount of documents (>101) makes pymongo issue `getmore` queries to fetch the next batch of documents (https://docs.mongodb.com/manual/tutorial/iterate-a-cursor/#cursor-batches)
+    - Iterating over large amount of documents (>101) makes pymongo issue `getmore` queries to fetch the next batch of documents (https://www.mongodb.com/docs/manual/tutorial/iterate-a-cursor/#cursor-batches)
     - Some queries are ignored by default by the counter (killcursors, db.system.indexes)
     """
 
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 5d8c1395e..f1e7d4977 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -2065,7 +2065,7 @@ def __init__(
 
 class SequenceField(BaseField):
     """Provides a sequential counter see:
-     https://docs.mongodb.com/manual/reference/method/ObjectId/#ObjectIDs-SequenceNumbers
+     https://www.mongodb.com/docs/manual/reference/method/ObjectId/#ObjectIDs-SequenceNumbers
 
     .. note::
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 75fab34de..068374f43 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -405,7 +405,7 @@ def count(self, with_limit_and_skip=False):
             getting the count
         """
         # mimic the fact that setting .limit(0) in pymongo sets no limit
-        # https://docs.mongodb.com/manual/reference/method/cursor.limit/#zero-value
+        # https://www.mongodb.com/docs/manual/reference/method/cursor.limit/#zero-value
         if (
             self._limit == 0
             and with_limit_and_skip is False
@@ -963,7 +963,7 @@ def batch_size(self, size):
         """Limit the number of documents returned in a single batch (each
         batch requires a round trip to the server).
 
-        See http://api.mongodb.com/python/current/api/pymongo/cursor.html#pymongo.cursor.Cursor.batch_size
+        See https://pymongo.readthedocs.io/en/stable/api/pymongo/cursor.html#pymongo.cursor.Cursor
         for details.
 
         :param size: desired size of each batch.
@@ -1197,7 +1197,7 @@ def clear_cls_query(self):
     def comment(self, text):
         """Add a comment to the query.
 
-        See https://docs.mongodb.com/manual/reference/method/cursor.comment/#cursor.comment
+        See https://www.mongodb.com/docs/manual/reference/method/cursor.comment/
         for details.
         """
         return self._chainable_method("comment", text)
@@ -1341,7 +1341,7 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
         :param suppl_pipeline: unpacked list of pipeline (added to support deprecation of the old interface)
             parameter will be removed shortly
         :param kwargs: (optional) kwargs dictionary to be passed to pymongo's aggregate call
-            See https://api.mongodb.com/python/current/api/pymongo/collection.html#pymongo.collection.Collection.aggregate
+            See https://pymongo.readthedocs.io/en/stable/api/pymongo/collection.html#pymongo.collection.Collection.aggregate
         """
         using_deprecated_interface = isinstance(pipeline, dict) or bool(suppl_pipeline)
         user_pipeline = [pipeline] if isinstance(pipeline, dict) else list(pipeline)
@@ -1364,7 +1364,7 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
             initial_pipeline.append({"$sort": dict(self._ordering)})
 
         if self._limit is not None:
-            # As per MongoDB Documentation (https://docs.mongodb.com/manual/reference/operator/aggregation/limit/),
+            # As per MongoDB Documentation (https://www.mongodb.com/docs/manual/reference/operator/aggregation/limit/),
             # keeping limit stage right after sort stage is more efficient. But this leads to wrong set of documents
             # for a skip stage that might succeed these. So we need to maintain more documents in memory in such a
             # case (https://stackoverflow.com/a/24161461).
@@ -1401,7 +1401,7 @@ def map_reduce(
                          :class:`~bson.code.Code` or string
         :param output: output collection name, if set to 'inline' will return
            the results inline. This can also be a dictionary containing output options
-           see: http://docs.mongodb.org/manual/reference/command/mapReduce/#dbcmd.mapReduce
+           see: https://www.mongodb.com/docs/manual/reference/command/mapReduce/#mongodb-dbcommand-dbcmd.mapReduce
         :param finalize_f: finalize function, an optional function that
                            performs any post-reduction processing.
         :param scope: values to insert into map/reduce global scope. Optional.

From 4e391db767e21cde1bdfae66ad4fed10968d7f9b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 25 Aug 2024 23:45:04 +0200
Subject: [PATCH 1448/1519] Fix pillow deprecation warning related with LANCZOS
 filter

---
 README.rst            | 2 +-
 docs/changelog.rst    | 1 +
 mongoengine/fields.py | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 1e9d5d580..d7cf6d3d6 100644
--- a/README.rst
+++ b/README.rst
@@ -66,7 +66,7 @@ If you utilize a ``DateTimeField``, you might also use a more flexible date pars
 
 If you need to use an ``ImageField`` or ``ImageGridFsProxy``:
 
-- Pillow>=2.0.0
+- Pillow>=7.0.0
 
 If you need to use signals:
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b8f000174..8a1297195 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Fix pillow deprecation warning related with LANCZOS filter #2824
 - Allow gt/gte/lt/lte/ne operators to be used with a list as value on ListField #2813
 - Switch tox to use pytest instead of legacy `python setup.py test` #2804
 - Add support for timeseries collection #2661
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index f1e7d4977..a5ebba2aa 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -49,8 +49,12 @@
 try:
     from PIL import Image, ImageOps
 
-    LANCZOS = Image.LANCZOS if hasattr(Image, "LANCZOS") else Image.ANTIALIAS
+    if hasattr(Image, "Resampling"):
+        LANCZOS = Image.Resampling.LANCZOS
+    else:
+        LANCZOS = Image.LANCZOS
 except ImportError:
+    # pillow is optional so may not be installed
     Image = None
     ImageOps = None
 

From ad17210ea2102790ca6f40a0f5bdd47b028569be Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 26 Aug 2024 22:59:55 +0200
Subject: [PATCH 1449/1519] Prepare release 0.29.0

---
 docs/changelog.rst      | 7 +++++++
 mongoengine/__init__.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8a1297195..505b9dff2 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,10 +7,17 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+
+Changes in 0.29.0
+=================
+- Fix weakref in EmbeddedDocumentListField (causing brief mem leak in certain circumstances) #2827
 - Fix pillow deprecation warning related with LANCZOS filter #2824
 - Allow gt/gte/lt/lte/ne operators to be used with a list as value on ListField #2813
 - Switch tox to use pytest instead of legacy `python setup.py test` #2804
 - Add support for timeseries collection #2661
+- Add support in tests for MongoDB 7.0, pymongo 4.7 and pymongo 4.8 in the CI #2826
+- Add support for `array_filters` in Queryset.modify #2811
+- Integrate a docker-compose setup for local testing #2555
 - improve ReferenceField wrong usage detection
 - Fix no_dereference thread-safetyness #2830
 - BREAKING CHANGE: max_length in ListField is now keyword only on ListField signature
diff --git a/mongoengine/__init__.py b/mongoengine/__init__.py
index 799dad6f7..3b2a884b6 100644
--- a/mongoengine/__init__.py
+++ b/mongoengine/__init__.py
@@ -29,7 +29,7 @@
 )
 
 
-VERSION = (0, 28, 2)
+VERSION = (0, 29, 0)
 
 
 def get_version():

From 14255ec450528a540b44e45a1fe40b2158b4f995 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 27 Aug 2024 00:11:15 +0200
Subject: [PATCH 1450/1519] bump checkout and python githb actions (fix nodejs
 deprecation warnings)

---
 .github/workflows/github-actions.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index ad601746a..be0a83903 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -42,8 +42,8 @@ jobs:
     # which runs pre-configured linter & autoformatter
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.9'
         check-latest: true
@@ -89,9 +89,9 @@ jobs:
             MONGODB: $MONGODB_7_0
             PYMONGO: $PYMONGO_4_8
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         check-latest: true
@@ -119,9 +119,9 @@ jobs:
     # builds are visible at https://readthedocs.org/projects/mongoengine-odm/builds/
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
         check-latest: true
@@ -138,8 +138,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: [linting, test, build_doc_dryrun]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: 3.9
         check-latest: true
@@ -153,9 +153,9 @@ jobs:
     needs: [linting, test, build_doc_dryrun, build-dryrun]
     if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
         check-latest: true

From 829b3035de74689e68a9daec61f6b36e237158fe Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 3 Sep 2024 21:46:04 +0200
Subject: [PATCH 1451/1519] remove long-warned deprecations (in prevision of
 1.0)

---
 docs/changelog.rst                          |  3 ++
 mongoengine/base/document.py                |  2 +
 mongoengine/base/metaclasses.py             |  2 +-
 mongoengine/connection.py                   |  1 +
 mongoengine/queryset/base.py                | 43 ++++++---------------
 tests/queryset/test_modify.py               |  9 -----
 tests/queryset/test_queryset.py             | 28 ++++++++------
 tests/queryset/test_queryset_aggregation.py | 35 +++++++----------
 tests/test_connection.py                    |  6 ++-
 tests/test_context_managers.py              |  2 +
 10 files changed, 55 insertions(+), 76 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 505b9dff2..474202c51 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,9 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Further to the deprecation warning, remove ability to use an unpacked list to `Queryset.aggregate(*pipeline)`, a plain list must be provided instead `Queryset.aggregate(pipeline)`, as it's closer to pymongo interface
+- Further to the deprecation warning, remove `full_response` from `QuerySet.modify` as it wasn't supported with Pymongo 3+
+- Fixed stacklevel of many warnings (to point places emitting the warning more accurately)
 
 Changes in 0.29.0
 =================
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 379f5e801..00db2c218 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -455,6 +455,7 @@ def to_json(self, *args, **kwargs):
                 "representation to use. This will be changed to "
                 "uuid_representation=UNSPECIFIED in a future release.",
                 DeprecationWarning,
+                stacklevel=2,
             )
             kwargs["json_options"] = LEGACY_JSON_OPTIONS
         return json_util.dumps(self.to_mongo(use_db_field), *args, **kwargs)
@@ -486,6 +487,7 @@ def from_json(cls, json_data, created=False, **kwargs):
                 "representation to use. This will be changed to "
                 "uuid_representation=UNSPECIFIED in a future release.",
                 DeprecationWarning,
+                stacklevel=2,
             )
             kwargs["json_options"] = LEGACY_JSON_OPTIONS
         return cls._from_son(json_util.loads(json_data, **kwargs), created=created)
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index 36ce47c3b..a48bde959 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -307,7 +307,7 @@ def __new__(mcs, name, bases, attrs):
             and not parent_doc_cls._meta.get("abstract", True)
         ):
             msg = "Trying to set a collection on a subclass (%s)" % name
-            warnings.warn(msg, SyntaxWarning)
+            warnings.warn(msg, SyntaxWarning, stacklevel=2)
             del attrs["_meta"]["collection"]
 
         # Ensure abstract documents have abstract bases
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 42a79434e..340d01d8c 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -204,6 +204,7 @@ def _get_connection_settings(
             "older drivers in those languages. This will be changed to "
             "'unspecified' in a future release.",
             DeprecationWarning,
+            stacklevel=3,
         )
         kwargs["uuidRepresentation"] = "pythonLegacy"
 
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 068374f43..461799439 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -671,7 +671,6 @@ def update_one(
     def modify(
         self,
         upsert=False,
-        full_response=False,
         remove=False,
         new=False,
         array_filters=None,
@@ -683,15 +682,7 @@ def modify(
         parameter. If no documents match the query and `upsert` is false,
         returns ``None``. If upserting and `new` is false, returns ``None``.
 
-        If the full_response parameter is ``True``, the return value will be
-        the entire response object from the server, including the 'ok' and
-        'lastErrorObject' fields, rather than just the modified document.
-        This is useful mainly because the 'lastErrorObject' document holds
-        information about the command's execution.
-
         :param upsert: insert if document doesn't exist (default ``False``)
-        :param full_response: return the entire response object from the
-            server (default ``False``, not available for PyMongo 3+)
         :param remove: remove rather than updating (default ``False``)
         :param new: return updated rather than original document
             (default ``False``)
@@ -715,9 +706,6 @@ def modify(
         sort = queryset._ordering
 
         try:
-            if full_response:
-                msg = "With PyMongo 3+, it is not possible anymore to get the full response."
-                warnings.warn(msg, DeprecationWarning)
             if remove:
                 result = queryset._collection.find_one_and_delete(
                     query, sort=sort, **self._cursor_args
@@ -741,12 +729,8 @@ def modify(
         except pymongo.errors.OperationFailure as err:
             raise OperationError("Update failed (%s)" % err)
 
-        if full_response:
-            if result["value"] is not None:
-                result["value"] = self._document._from_son(result["value"])
-        else:
-            if result is not None:
-                result = self._document._from_son(result)
+        if result is not None:
+            result = self._document._from_son(result)
 
         return result
 
@@ -1215,7 +1199,7 @@ def snapshot(self, enabled):
         :param enabled: whether or not snapshot mode is enabled
         """
         msg = "snapshot is deprecated as it has no impact when using PyMongo 3+."
-        warnings.warn(msg, DeprecationWarning)
+        warnings.warn(msg, DeprecationWarning, stacklevel=2)
         queryset = self.clone()
         queryset._snapshot = enabled
         return queryset
@@ -1324,6 +1308,7 @@ def to_json(self, *args, **kwargs):
                 "representation to use. This will be changed to "
                 "uuid_representation=UNSPECIFIED in a future release.",
                 DeprecationWarning,
+                stacklevel=2,
             )
             kwargs["json_options"] = LEGACY_JSON_OPTIONS
         return json_util.dumps(self.as_pymongo(), *args, **kwargs)
@@ -1333,24 +1318,18 @@ def from_json(self, json_data):
         son_data = json_util.loads(json_data)
         return [self._document._from_son(data) for data in son_data]
 
-    def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
+    def aggregate(self, pipeline, **kwargs):
         """Perform an aggregate function based on your queryset params
 
         :param pipeline: list of aggregation commands,
             see: https://www.mongodb.com/docs/manual/core/aggregation-pipeline/
-        :param suppl_pipeline: unpacked list of pipeline (added to support deprecation of the old interface)
-            parameter will be removed shortly
         :param kwargs: (optional) kwargs dictionary to be passed to pymongo's aggregate call
             See https://pymongo.readthedocs.io/en/stable/api/pymongo/collection.html#pymongo.collection.Collection.aggregate
         """
-        using_deprecated_interface = isinstance(pipeline, dict) or bool(suppl_pipeline)
-        user_pipeline = [pipeline] if isinstance(pipeline, dict) else list(pipeline)
-
-        if using_deprecated_interface:
-            msg = "Calling .aggregate() with un unpacked list (*pipeline) is deprecated, it will soon change and will expect a list (similar to pymongo.Collection.aggregate interface), see documentation"
-            warnings.warn(msg, DeprecationWarning)
-
-        user_pipeline += suppl_pipeline
+        if not isinstance(pipeline, (tuple, list)):
+            raise TypeError(
+                f"Starting from 1.0 release pipeline must be a list/tuple, received: {type(pipeline)}"
+            )
 
         initial_pipeline = []
         if self._none or self._empty:
@@ -1373,7 +1352,7 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
         if self._skip is not None:
             initial_pipeline.append({"$skip": self._skip})
 
-        final_pipeline = initial_pipeline + user_pipeline
+        final_pipeline = initial_pipeline + pipeline
 
         collection = self._collection
         if self._read_preference is not None or self._read_concern is not None:
@@ -1679,7 +1658,7 @@ def _cursor_args(self):
         # TODO: evaluate similar possibilities using modifiers
         if self._snapshot:
             msg = "The snapshot option is not anymore available with PyMongo 3+"
-            warnings.warn(msg, DeprecationWarning)
+            warnings.warn(msg, DeprecationWarning, stacklevel=3)
 
         cursor_args = {}
         if not self._timeout:
diff --git a/tests/queryset/test_modify.py b/tests/queryset/test_modify.py
index d5cedb2c1..b96e05e63 100644
--- a/tests/queryset/test_modify.py
+++ b/tests/queryset/test_modify.py
@@ -1,7 +1,5 @@
 import unittest
 
-import pytest
-
 from mongoengine import (
     Document,
     IntField,
@@ -32,13 +30,6 @@ def test_modify(self):
         assert old_doc.to_json() == doc.to_json()
         self._assert_db_equal([{"_id": 0, "value": 0}, {"_id": 1, "value": -1}])
 
-    def test_modify_full_response_raise_value_error_for_recent_mongo(self):
-        Doc(id=0, value=0).save()
-        Doc(id=1, value=1).save()
-
-        with pytest.raises(ValueError):
-            Doc.objects(id=1).modify(set__value=-1, full_response=True)
-
     def test_modify_with_new(self):
         Doc(id=0, value=0).save()
         doc = Doc(id=1, value=1).save()
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 7b41a894b..02b9e497a 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -474,8 +474,7 @@ class A(Document):
 
         A.drop_collection()
 
-        for i in range(100):
-            A.objects.create(s=str(i))
+        A.objects.insert([A(s=str(i)) for i in range(100)], load_bulk=True)
 
         # test iterating over the result set
         cnt = 0
@@ -1283,8 +1282,7 @@ def __repr__(self):
 
         Doc.drop_collection()
 
-        for i in range(1000):
-            Doc(number=i).save()
+        Doc.objects.insert([Doc(number=i) for i in range(1000)], load_bulk=True)
 
         docs = Doc.objects.order_by("number")
 
@@ -5438,8 +5436,9 @@ class Person(Document):
             name = StringField()
 
         Person.drop_collection()
-        for i in range(100):
-            Person(name="No: %s" % i).save()
+
+        persons = [Person(name="No: %s" % i) for i in range(100)]
+        Person.objects.insert(persons, load_bulk=True)
 
         with query_counter() as q:
             assert q == 0
@@ -5469,8 +5468,9 @@ class Person(Document):
             name = StringField()
 
         Person.drop_collection()
-        for i in range(100):
-            Person(name="No: %s" % i).save()
+
+        persons = [Person(name="No: %s" % i) for i in range(100)]
+        Person.objects.insert(persons, load_bulk=True)
 
         with query_counter() as q:
             assert q == 0
@@ -5537,17 +5537,20 @@ def __unicode__(self):
         assert 1 == len(users._result_cache)
 
     def test_no_cache(self):
-        """Ensure you can add meta data to file"""
+        """Ensure you can add metadata to file"""
 
         class Noddy(Document):
             fields = DictField()
 
         Noddy.drop_collection()
+
+        noddies = []
         for i in range(100):
             noddy = Noddy()
             for j in range(20):
                 noddy.fields["key" + str(j)] = "value " + str(j)
-            noddy.save()
+            noddies.append(noddy)
+        Noddy.objects.insert(noddies, load_bulk=True)
 
         docs = Noddy.objects.no_cache()
 
@@ -5766,8 +5769,9 @@ class Person(Document):
             name = StringField()
 
         Person.drop_collection()
-        for i in range(100):
-            Person(name="No: %s" % i).save()
+
+        persons = [Person(name="No: %s" % i) for i in range(100)]
+        Person.objects.insert(persons, load_bulk=True)
 
         with query_counter() as q:
             if Person.objects:
diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index f1d504c0b..44a5531de 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -1,6 +1,6 @@
 import unittest
-import warnings
 
+import pytest
 from pymongo.read_preferences import ReadPreference
 
 from mongoengine import *
@@ -215,7 +215,7 @@ class Person(Document):
 
         assert list(data) == [{"_id": p3.pk, "name": "SANDRA MARA"}]
 
-    def test_queryset_aggregation_deprecated_interface(self):
+    def test_queryset_aggregation_old_interface_not_working(self):
         class Person(Document):
             name = StringField()
 
@@ -226,27 +226,20 @@ class Person(Document):
         p3 = Person(name="Sandra Mara")
         Person.objects.insert([p1, p2, p3])
 
-        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
-
-        # Make sure a warning is emitted
-        with warnings.catch_warnings():
-            warnings.simplefilter("error", DeprecationWarning)
-            with self.assertRaises(DeprecationWarning):
-                Person.objects.order_by("name").limit(2).aggregate(*pipeline)
+        _1_step_pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
 
-        # Make sure old interface works as expected with a 1-step pipeline
-        data = Person.objects.order_by("name").limit(2).aggregate(*pipeline)
+        # Make sure old interface raises an error as we changed it >= 1.0
+        with pytest.raises(TypeError, match="pipeline must be a list/tuple"):
+            Person.objects.order_by("name").limit(2).aggregate(*_1_step_pipeline)
 
-        assert list(data) == [
-            {"_id": p1.pk, "name": "ISABELLA LUANNA"},
-            {"_id": p3.pk, "name": "SANDRA MARA"},
+        _2_step_pipeline = [
+            {"$project": {"name": {"$toUpper": "$name"}}},
+            {"$limit": 1},
         ]
-
-        # Make sure old interface works as expected with a 2-steps pipeline
-        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}, {"$limit": 1}]
-        data = Person.objects.order_by("name").limit(2).aggregate(*pipeline)
-
-        assert list(data) == [{"_id": p1.pk, "name": "ISABELLA LUANNA"}]
+        with pytest.raises(
+            TypeError, match="takes 2 positional arguments but 3 were given"
+        ):
+            Person.objects.order_by("name").limit(2).aggregate(*_2_step_pipeline)
 
     def test_queryset_aggregation_geonear_aggregation_on_pointfield(self):
         """test ensures that $geonear can be used as a 1-stage pipeline and that
@@ -271,7 +264,7 @@ class Aggr(Document):
                 }
             }
         ]
-        assert list(Aggr.objects.aggregate(*pipeline)) == [
+        assert list(Aggr.objects.aggregate(pipeline)) == [
             {"_id": agg1.id, "c": 0.0, "name": "X"},
             {"_id": agg2.id, "c": 0.0, "name": "Y"},
         ]
diff --git a/tests/test_connection.py b/tests/test_connection.py
index c88f87c93..942331058 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -648,7 +648,11 @@ def test_multiple_connection_settings(self):
         mongo_connections["t1"].server_info()
         mongo_connections["t2"].server_info()
         assert mongo_connections["t1"].address[0] == "localhost"
-        assert mongo_connections["t2"].address[0] == "127.0.0.1"
+
+        assert mongo_connections["t2"].address[0] in (
+            "localhost",
+            "127.0.0.1",
+        )  # depends on db setting
 
     def test_connect_2_databases_uses_same_client_if_only_dbname_differs(self):
         c1 = connect(alias="testdb1", db="testdb1")
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 287ce7df5..d1f8b7c1e 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -28,6 +28,8 @@ class TestableThread(Thread):
     REF: https://gist.github.com/sbrugman/59b3535ebcd5aa0e2598293cfa58b6ab
     """
 
+    __test__ = False
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.exc = None

From fe9e42a96aa83a8e3436a0190f246c9417b746bb Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sun, 25 Aug 2024 21:18:49 +0200
Subject: [PATCH 1452/1519] fix minor things and add increase tests cov for tx
 support

---
 docs/changelog.rst             |   1 +
 mongoengine/connection.py      |   2 +-
 mongoengine/pymongo_support.py |   3 +-
 tests/test_connection.py       |   2 +
 tests/test_context_managers.py | 148 ++++++++++++++++++++++++---------
 5 files changed, 114 insertions(+), 42 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 505b9dff2..d0b3e6f90 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Add support for transaction through run_in_transaction #2569
 
 Changes in 0.29.0
 =================
diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 7ed723e54..f64422d28 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -484,7 +484,7 @@ def append(self, session):
 
     def get_current(self):
         if len(self.sessions):
-            return self.sessions[len(self.sessions) - 1]
+            return self.sessions[-1]
 
     def clear_current(self):
         if len(self.sessions):
diff --git a/mongoengine/pymongo_support.py b/mongoengine/pymongo_support.py
index c4f0f8ab6..3c819610f 100644
--- a/mongoengine/pymongo_support.py
+++ b/mongoengine/pymongo_support.py
@@ -40,7 +40,8 @@ def count_documents(
     # count_documents appeared in pymongo 3.7
     if PYMONGO_VERSION >= (3, 7):
         try:
-            if not filter and set(kwargs) <= {"max_time_ms"}:
+            is_active_session = connection._get_session() is not None
+            if not filter and set(kwargs) <= {"max_time_ms"} and not is_active_session:
                 # when no filter is provided, estimated_document_count
                 # is a lot faster as it uses the collection metadata
                 return collection.estimated_document_count(**kwargs)
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 2cf08cf96..42ffea4fe 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -647,6 +647,8 @@ def test_multiple_connection_settings(self):
         # Purposely not catching exception to fail test if thrown.
         mongo_connections["t1"].server_info()
         mongo_connections["t2"].server_info()
+        assert mongo_connections["t1"].address[0] == "localhost"
+        assert mongo_connections["t2"].address[0] == "127.0.0.1"
         assert mongo_connections["t1"] is not mongo_connections["t2"]
 
     def test_connect_2_databases_uses_same_client_if_only_dbname_differs(self):
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index a77588be5..0f24c1037 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -1,5 +1,4 @@
 import random
-import threading
 import time
 import unittest
 from threading import Thread
@@ -21,14 +20,17 @@
     switch_db,
 )
 from mongoengine.pymongo_support import count_documents
-
-from .utils import (
+from tests.utils import (
     MongoDBTestCase,
     requires_mongodb_gte_40,
     requires_mongodb_gte_44,
 )
 
 
+class TestRollbackError(Exception):
+    pass
+
+
 class TestableThread(Thread):
     """
     Wrapper around `threading.Thread` that propagates exceptions.
@@ -525,7 +527,71 @@ class A(Document):
 
         with run_in_transaction():
             a_doc.update(name="b")
-            assert "b" == A.objects.get(id=a_doc.id).name
+            assert A.objects.get(id=a_doc.id).name == "b"
+            assert A.objects.count() == 1
+
+        assert A.objects.count() == 1
+        assert A.objects.get(id=a_doc.id).name == "b"
+
+    @requires_mongodb_gte_40
+    def test_updating_a_document_within_a_transaction_that_fails(self):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        a_doc = A.objects.create(name="a")
+
+        with pytest.raises(TestRollbackError):
+            with run_in_transaction():
+                a_doc.update(name="b")
+                assert A.objects.get(id=a_doc.id).name == "b"
+                raise TestRollbackError()
+
+        assert A.objects.count() == 0
+        assert A.objects.get(id=a_doc.id).name == "a"
+
+    @requires_mongodb_gte_40
+    def test_creating_a_document_within_a_transaction(self):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        with run_in_transaction():
+            a_doc = A.objects.create(name="a")
+            another_doc = A(name="b").save()
+            assert A.objects.get(id=a_doc.id).name == "a"
+            assert A.objects.get(id=another_doc.id).name == "b"
+            assert A.objects.count() == 2
+
+        assert A.objects.count() == 2
+        assert A.objects.get(id=a_doc.id).name == "a"
+        assert A.objects.get(id=another_doc.id).name == "b"
+
+    @requires_mongodb_gte_40
+    def test_creating_a_document_within_a_transaction_that_fails(self):
+        connect("mongoenginetest")
+
+        class A(Document):
+            name = StringField()
+
+        A.drop_collection()
+
+        with pytest.raises(TestRollbackError):
+            with run_in_transaction():
+                a_doc = A.objects.create(name="a")
+                another_doc = A(name="b").save()
+                assert A.objects.get(id=a_doc.id).name == "a"
+                assert A.objects.get(id=another_doc.id).name == "b"
+                assert A.objects.count() == 2
+                raise TestRollbackError()
+
+        assert A.objects.count() == 0
 
     @requires_mongodb_gte_40
     def test_transaction_updates_across_databases(self):
@@ -640,17 +706,23 @@ class B(Document):
         B.drop_collection()
         b_doc = B.objects.create(name="b")
 
-        try:
+        with pytest.raises(TestRollbackError):
             with run_in_transaction():
                 a_doc.update(name="trx-parent")
-                with run_in_transaction():
-                    b_doc.update(name="trx-child")
-                    raise Exception
-        except Exception:
-            pass
+                try:
+                    with run_in_transaction():
+                        b_doc.update(name="trx-child")
+                        raise TestRollbackError()
+                except TestRollbackError as exc:
+                    # at this stage, the parent transaction is still there
+                    assert A.objects.get(id=a_doc.id).name == "trx-parent"
+                    raise exc
+                else:
+                    # makes sure it enters the except above
+                    assert False
 
-        assert "a" == A.objects.get(id=a_doc.id).name
-        assert "b" == B.objects.get(id=b_doc.id).name
+        assert A.objects.get(id=a_doc.id).name == "a"
+        assert B.objects.get(id=b_doc.id).name == "b"
 
     @requires_mongodb_gte_40
     def test_exception_in_parent_of_nested_transaction_after_child_completed_only_rolls_parent_back(
@@ -670,26 +742,25 @@ class B(Document):
         B.drop_collection()
         b_doc = B.objects.create(name="b")
 
-        class TestExc(Exception):
-            pass
-
         def run_tx():
             try:
                 with run_in_transaction():
                     a_doc.update(name="trx-parent")
                     with run_in_transaction():
                         b_doc.update(name="trx-child")
-                    raise TestExc
-            except TestExc:
+
+                    raise TestRollbackError()
+
+            except TestRollbackError:
                 pass
-            except OperationError as op_failure:
-                """
-                See thread safety test below for more details about TransientTransctionError handling
-                """
-                if "TransientTransactionError" in str(op_failure):
-                    run_tx()
-                else:
-                    raise op_failure
+            # except OperationError as op_failure:
+            #     """
+            #     See thread safety test below for more details about TransientTransactionError handling
+            #     """
+            #     if "TransientTransactionError" in str(op_failure):
+            #         run_tx()
+            #     else:
+            #         raise op_failure
 
         run_tx()
         assert "a" == A.objects.get(id=a_doc.id).name
@@ -702,11 +773,12 @@ def test_nested_transactions_create_and_release_sessions_accordingly(self):
             s1 = _get_session()
             with run_in_transaction():
                 s2 = _get_session()
-                assert s1 != s2
+                assert s1 is not s2
                 with run_in_transaction():
                     pass
-                assert s2 == _get_session()
-            assert s1 == _get_session()
+                assert _get_session() is s2
+            assert _get_session() is s1
+
         assert _get_session() is None
 
     @requires_mongodb_gte_40
@@ -740,24 +812,21 @@ class A(Document):
         # Ensure the collection is created
         A.objects.create(i=0)
 
-        class TestExc(Exception):
-            pass
-
         def thread_fn(idx):
             # Open the transaction at some unknown interval
-            time.sleep(random.uniform(0.01, 0.1))
+            time.sleep(random.uniform(0.1, 0.5))
             try:
                 with run_in_transaction():
                     a = A.objects.get(i=idx)
                     a.i = idx * 10
                     # Save at some unknown interval
-                    time.sleep(random.uniform(0.01, 0.1))
+                    time.sleep(random.uniform(0.1, 0.5))
                     a.save()
 
                     # Force roll backs for the even runs...
                     if idx % 2 == 0:
-                        raise TestExc
-            except TestExc:
+                        raise TestRollbackError()
+            except TestRollbackError:
                 pass
             except pymongo.errors.OperationFailure as op_failure:
                 """
@@ -775,7 +844,7 @@ def thread_fn(idx):
                 else:
                     raise op_failure
 
-        for r in range(10):
+        for r in range(5):
             """
             Threads & randomization are tricky - run it multiple times
             """
@@ -784,14 +853,13 @@ def thread_fn(idx):
             A.objects.all().delete()
 
             # Prepopulate the data for reads
-            thread_count = 10
+            thread_count = 20
             for i in range(thread_count):
                 A.objects.create(i=i)
 
             # Prime the threads
             threads = [
-                threading.Thread(target=thread_fn, args=(i,))
-                for i in range(thread_count)
+                TestableThread(target=thread_fn, args=(i,)) for i in range(thread_count)
             ]
             for t in threads:
                 t.start()
@@ -805,7 +873,7 @@ def thread_fn(idx):
                     expected_sum += i
                 else:
                     expected_sum += i * 10
-            assert expected_sum == 270
+            assert expected_sum == 1090
             assert expected_sum == sum(a.i for a in A.objects.all())
 
 

From 059ad14996cca057651dfdda9969e88e6b42c89a Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Mon, 26 Aug 2024 22:40:19 +0200
Subject: [PATCH 1453/1519] Fix recently modified tx tests

---
 mongoengine/queryset/base.py   |  2 +-
 tests/test_connection.py       | 26 +++++++++++++++++++++-----
 tests/test_context_managers.py |  5 +++--
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 37fc3dcb9..049aff22b 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -282,7 +282,7 @@ def get(self, *q_objs, **query):
         except StopIteration:
             return result
 
-        # If we were able to retrieve the 2nd doc, raise the MultipleObjectsReturned exception.
+        # If we were able to retrieve a 2nd doc, raise the MultipleObjectsReturned exception.
         raise queryset._document.MultipleObjectsReturned(
             "2 or more items returned, instead of 1"
         )
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 42ffea4fe..7944d1bd9 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -633,22 +633,38 @@ def test_read_preference_from_parse(self):
         assert conn.read_preference == ReadPreference.SECONDARY_PREFERRED
 
     def test_multiple_connection_settings(self):
-        connect("mongoenginetest", alias="t1", host="localhost")
-
-        connect("mongoenginetest2", alias="t2", host="127.0.0.1")
+        connect(
+            "mongoenginetest",
+            alias="t1",
+            host="localhost",
+            read_preference=ReadPreference.PRIMARY,
+        )
+        connect(
+            "mongoenginetest2",
+            alias="t2",
+            host="127.0.0.1",
+            read_preference=ReadPreference.PRIMARY_PREFERRED,
+        )
 
         mongo_connections = mongoengine.connection._connections
         assert len(mongo_connections.items()) == 2
         assert "t1" in mongo_connections.keys()
         assert "t2" in mongo_connections.keys()
 
-        # Handle PyMongo 3+ Async Connection
+        # Handle PyMongo 3+ Async Connection (lazily established)
         # Ensure we are connected, throws ServerSelectionTimeoutError otherwise.
         # Purposely not catching exception to fail test if thrown.
         mongo_connections["t1"].server_info()
         mongo_connections["t2"].server_info()
+
         assert mongo_connections["t1"].address[0] == "localhost"
-        assert mongo_connections["t2"].address[0] == "127.0.0.1"
+        assert (
+            mongo_connections["t2"].address[0] == "localhost"
+        )  # weird but we have this with replicaset
+        assert mongo_connections["t1"].read_preference == ReadPreference.PRIMARY
+        assert (
+            mongo_connections["t2"].read_preference == ReadPreference.PRIMARY_PREFERRED
+        )
         assert mongo_connections["t1"] is not mongo_connections["t2"]
 
     def test_connect_2_databases_uses_same_client_if_only_dbname_differs(self):
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 0f24c1037..59c7c7785 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -550,7 +550,7 @@ class A(Document):
                 assert A.objects.get(id=a_doc.id).name == "b"
                 raise TestRollbackError()
 
-        assert A.objects.count() == 0
+        assert A.objects.count() == 1
         assert A.objects.get(id=a_doc.id).name == "a"
 
     @requires_mongodb_gte_40
@@ -793,7 +793,7 @@ def test_thread_safety_of_transactions(self):
         of value 0 - 9.
 
         We then spin up 10 threads and attempt to update a target
-        record by multiplying it's integer value by 10. Then, if
+        record by multiplying its integer value by 10. Then, if
         the target record is even, throw an exception, which
         should then roll the transaction back. The odd rows always
         succeed.
@@ -809,6 +809,7 @@ def test_thread_safety_of_transactions(self):
         class A(Document):
             i = IntField()
 
+        A.drop_collection()
         # Ensure the collection is created
         A.objects.create(i=0)
 

From 76cac322c53cef26e114393edf3e2b0a1c0a6d3a Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 27 Aug 2024 00:11:15 +0200
Subject: [PATCH 1454/1519] bump checkout and python githb actions (fix nodejs
 deprecation warnings)

---
 .github/workflows/github-actions.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index ad601746a..be0a83903 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -42,8 +42,8 @@ jobs:
     # which runs pre-configured linter & autoformatter
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.9'
         check-latest: true
@@ -89,9 +89,9 @@ jobs:
             MONGODB: $MONGODB_7_0
             PYMONGO: $PYMONGO_4_8
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         check-latest: true
@@ -119,9 +119,9 @@ jobs:
     # builds are visible at https://readthedocs.org/projects/mongoengine-odm/builds/
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
         check-latest: true
@@ -138,8 +138,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: [linting, test, build_doc_dryrun]
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-python@v4
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: 3.9
         check-latest: true
@@ -153,9 +153,9 @@ jobs:
     needs: [linting, test, build_doc_dryrun, build-dryrun]
     if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
         check-latest: true

From c217cae552e6e97f662bf298f36f80fc4fd286e5 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 4 Sep 2024 17:12:36 +0200
Subject: [PATCH 1455/1519] Fix tests and Improve commit handler so that it
 supports UnknownTransactionCommitResult

---
 mongoengine/context_managers.py | 19 +++++++++++++
 tests/test_connection.py        |  7 +++--
 tests/test_context_managers.py  | 49 +++++++++++++++++----------------
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index ec7b03ea0..52e2fc544 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -2,6 +2,7 @@
 import threading
 from contextlib import contextmanager
 
+from pymongo.errors import ConnectionFailure, OperationFailure
 from pymongo.read_concern import ReadConcern
 from pymongo.write_concern import WriteConcern
 
@@ -321,6 +322,23 @@ def set_read_write_concern(collection, write_concerns, read_concerns):
     )
 
 
+def _commit_with_retry(session):
+    while True:
+        try:
+            # Commit uses write concern set at transaction start.
+            session.commit_transaction()
+            print("Transaction committed.")
+            break
+        except (ConnectionFailure, OperationFailure) as exc:
+            # Can retry commit
+            if exc.has_error_label("UnknownTransactionCommitResult"):
+                print("UnknownTransactionCommitResult, retrying commit operation ...")
+                continue
+            else:
+                print("Error during commit ...")
+                raise
+
+
 @contextmanager
 def run_in_transaction(
     alias=DEFAULT_CONNECTION_NAME, session_kwargs=None, transaction_kwargs=None
@@ -355,5 +373,6 @@ class A(Document):
             try:
                 _set_session(session)
                 yield
+                _commit_with_retry(session)
             finally:
                 _clear_session()
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 7944d1bd9..34ecb331b 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -658,9 +658,10 @@ def test_multiple_connection_settings(self):
         mongo_connections["t2"].server_info()
 
         assert mongo_connections["t1"].address[0] == "localhost"
-        assert (
-            mongo_connections["t2"].address[0] == "localhost"
-        )  # weird but we have this with replicaset
+        assert mongo_connections["t2"].address[0] in (
+            "localhost",
+            "127.0.0.1",
+        )  # weird but there is a discrepancy in the address in replicaset setup
         assert mongo_connections["t1"].read_preference == ReadPreference.PRIMARY
         assert (
             mongo_connections["t2"].read_preference == ReadPreference.PRIMARY_PREFERRED
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 59c7c7785..1ccff2d8f 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -1,3 +1,4 @@
+import logging
 import random
 import time
 import unittest
@@ -28,7 +29,7 @@
 
 
 class TestRollbackError(Exception):
-    pass
+    __test__ = False  # Silence pytest warning
 
 
 class TestableThread(Thread):
@@ -38,6 +39,8 @@ class TestableThread(Thread):
     REF: https://gist.github.com/sbrugman/59b3535ebcd5aa0e2598293cfa58b6ab
     """
 
+    __test__ = False  # Silence pytest warning
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.exc = None
@@ -753,14 +756,15 @@ def run_tx():
 
             except TestRollbackError:
                 pass
-            # except OperationError as op_failure:
-            #     """
-            #     See thread safety test below for more details about TransientTransactionError handling
-            #     """
-            #     if "TransientTransactionError" in str(op_failure):
-            #         run_tx()
-            #     else:
-            #         raise op_failure
+            except OperationError as op_failure:
+                """
+                See thread safety test below for more details about TransientTransactionError handling
+                """
+                if "TransientTransactionError" in str(op_failure):
+                    logging.warning("TransientTransactionError - retrying...")
+                    run_tx()
+                else:
+                    raise op_failure
 
         run_tx()
         assert "a" == A.objects.get(id=a_doc.id).name
@@ -789,10 +793,10 @@ def test_thread_safety_of_transactions(self):
         case, then no amount of runtime variability should have
         an effect on the output.
 
-        This test sets up 10 records, each with an integer field
+        This test sets up e.g 10 records, each with an integer field
         of value 0 - 9.
 
-        We then spin up 10 threads and attempt to update a target
+        We then spin up e.g 10 threads and attempt to update a target
         record by multiplying its integer value by 10. Then, if
         the target record is even, throw an exception, which
         should then roll the transaction back. The odd rows always
@@ -807,11 +811,13 @@ def test_thread_safety_of_transactions(self):
         connect("mongoenginetest")
 
         class A(Document):
-            i = IntField()
+            i = IntField(unique=True)
 
         A.drop_collection()
         # Ensure the collection is created
-        A.objects.create(i=0)
+        _ = A.objects.first()
+
+        thread_count = 20
 
         def thread_fn(idx):
             # Open the transaction at some unknown interval
@@ -819,12 +825,12 @@ def thread_fn(idx):
             try:
                 with run_in_transaction():
                     a = A.objects.get(i=idx)
-                    a.i = idx * 10
+                    a.i = idx * thread_count
                     # Save at some unknown interval
                     time.sleep(random.uniform(0.1, 0.5))
                     a.save()
 
-                    # Force roll backs for the even runs...
+                    # Force rollbacks for the even runs...
                     if idx % 2 == 0:
                         raise TestRollbackError()
             except TestRollbackError:
@@ -841,6 +847,7 @@ def thread_fn(idx):
                 """
                 error_labels = op_failure.details.get("errorLabels", [])
                 if "TransientTransactionError" in error_labels:
+                    logging.warning("TransientTransactionError - retrying...")
                     thread_fn(idx)
                 else:
                     raise op_failure
@@ -854,7 +861,6 @@ def thread_fn(idx):
             A.objects.all().delete()
 
             # Prepopulate the data for reads
-            thread_count = 20
             for i in range(thread_count):
                 A.objects.create(i=i)
 
@@ -868,13 +874,10 @@ def thread_fn(idx):
                 t.join()
 
             # Check the sum
-            expected_sum = 0
-            for i in range(thread_count):
-                if i % 2 == 0:
-                    expected_sum += i
-                else:
-                    expected_sum += i * 10
-            assert expected_sum == 1090
+            expected_sum = sum(
+                i if i % 2 == 0 else i * thread_count for i in range(thread_count)
+            )
+            assert expected_sum == 2090
             assert expected_sum == sum(a.i for a in A.objects.all())
 
 

From 6c91f61e3c5fec197721479b33429b4cf7b8ff96 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 4 Sep 2024 20:59:18 +0200
Subject: [PATCH 1456/1519] revise pymongo version test matrix

---
 .github/workflows/github-actions.yml | 13 ++++---------
 tox.ini                              |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index be0a83903..2d8823c0d 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -20,11 +20,9 @@ env:
   MONGODB_6_0: "6.0"
   MONGODB_7_0: "7.0"
 
-  PYMONGO_3_4: 3.4
-  PYMONGO_3_6: 3.6
-  PYMONGO_3_9: 3.9
   PYMONGO_3_11: 3.11
   PYMONGO_3_12: 3.12
+  PYMONGO_3_13: 3.13
   PYMONGO_4_0: 4.0
   PYMONGO_4_3: 4.3.3
   PYMONGO_4_4: 4.4.1
@@ -61,15 +59,12 @@ jobs:
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
-          - python-version: 3.7
-            MONGODB: $MONGODB_3_6
-            PYMONGO: $PYMONGO_3_9
           - python-version: 3.8
-            MONGODB: $MONGODB_4_4
-            PYMONGO: $PYMONGO_3_11
+            MONGODB: $MONGODB_3_6
+            PYMONGO: $PYMONGO_3_12
           - python-version: 3.9
             MONGODB: $MONGODB_4_4
-            PYMONGO: $PYMONGO_3_12
+            PYMONGO: $PYMONGO_3_13
           - python-version: "3.10"
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_4_0
diff --git a/tox.ini b/tox.ini
index f72861ba4..d29267124 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,9 +7,9 @@ commands =
     pytest tests/ {posargs}
 deps =
     -rrequirements-dev.txt
-    mg39: pymongo>=3.9,<3.10
     mg311: pymongo>=3.11,<3.12
     mg312: pymongo>=3.12,<3.13
+    mg313: pymongo>=3.13,<3.14
     mg4: pymongo>=4.0,<4.1
     mg433: pymongo>=4.3,<4.4
     mg441: pymongo>=4.4,<4.5

From 8feba864eac41e041d0d2620c09da0f63ef5aa44 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 4 Sep 2024 20:06:46 +0200
Subject: [PATCH 1457/1519] Fix for tests (tx with mongodb <= 4.2 requires
 collection to be created outside tx)

---
 Dockerfile                     |  2 +-
 docs/changelog.rst             |  2 +-
 tests/test_context_managers.py | 19 +++++++------------
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 882ce03d9..a91086f3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mongo:5
+FROM mongo:4.0
 
 COPY ./entrypoint.sh entrypoint.sh
 RUN chmod u+x entrypoint.sh
diff --git a/docs/changelog.rst b/docs/changelog.rst
index d0b3e6f90..dd07136cc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,7 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
-- Add support for transaction through run_in_transaction #2569
+- Add support for transaction through run_in_transaction (kudos to juannyG for this) #2569
 
 Changes in 0.29.0
 =================
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 1ccff2d8f..3eb9f43ae 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -519,8 +519,6 @@ def test_query_counter_ignores_particular_queries(self):
 
     @requires_mongodb_gte_40
     def test_updating_a_document_within_a_transaction(self):
-        connect("mongoenginetest")
-
         class A(Document):
             name = StringField()
 
@@ -538,8 +536,6 @@ class A(Document):
 
     @requires_mongodb_gte_40
     def test_updating_a_document_within_a_transaction_that_fails(self):
-        connect("mongoenginetest")
-
         class A(Document):
             name = StringField()
 
@@ -558,13 +554,16 @@ class A(Document):
 
     @requires_mongodb_gte_40
     def test_creating_a_document_within_a_transaction(self):
-        connect("mongoenginetest")
 
         class A(Document):
             name = StringField()
 
         A.drop_collection()
 
+        # ensure collection is created (needed for transaction with MongoDB <= 4.2)
+        A.objects.create(name="test")
+        A.objects.delete()
+
         with run_in_transaction():
             a_doc = A.objects.create(name="a")
             another_doc = A(name="b").save()
@@ -578,12 +577,14 @@ class A(Document):
 
     @requires_mongodb_gte_40
     def test_creating_a_document_within_a_transaction_that_fails(self):
-        connect("mongoenginetest")
 
         class A(Document):
             name = StringField()
 
         A.drop_collection()
+        # ensure collection is created (needed for transaction with MongoDB <= 4.2)
+        A.objects.create(name="test")
+        A.objects.delete()
 
         with pytest.raises(TestRollbackError):
             with run_in_transaction():
@@ -695,8 +696,6 @@ class B(Document):
 
     @requires_mongodb_gte_40
     def test_exception_in_child_of_a_nested_transaction_rolls_parent_back(self):
-        connect("mongoenginetest")
-
         class A(Document):
             name = StringField()
 
@@ -731,8 +730,6 @@ class B(Document):
     def test_exception_in_parent_of_nested_transaction_after_child_completed_only_rolls_parent_back(
         self,
     ):
-        connect("mongoenginetest")
-
         class A(Document):
             name = StringField()
 
@@ -772,7 +769,6 @@ def run_tx():
 
     @requires_mongodb_gte_40
     def test_nested_transactions_create_and_release_sessions_accordingly(self):
-        connect("mongoenginetest")
         with run_in_transaction():
             s1 = _get_session()
             with run_in_transaction():
@@ -808,7 +804,6 @@ def test_thread_safety_of_transactions(self):
 
         0 + 10 + 2 + 30 + 4 + 50 + 6 + 70 + 8 + 90 = 270
         """
-        connect("mongoenginetest")
 
         class A(Document):
             i = IntField(unique=True)

From a81a56830c1f8bbadf94e5f45238647c5b6b2667 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 4 Sep 2024 21:27:42 +0200
Subject: [PATCH 1458/1519] removed prints and improved changelog

---
 docs/changelog.rst              | 4 ++++
 mongoengine/context_managers.py | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index dd07136cc..4beaa4a48 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,6 +8,10 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 - Add support for transaction through run_in_transaction (kudos to juannyG for this) #2569
+  Some considerations:
+    - make sure to read https://www.mongodb.com/docs/manual/core/transactions-in-applications/#callback-api-vs-core-api
+    - run_in_transaction context manager relies on Pymongo coreAPI, it will retry automatically in case of `UnknownTransactionCommitResult` but not `TransientTransactionError` exceptions
+    - Using .count() in a transaction will always use Collection.count_document (as estimated_document_count is not supported in transactions)
 
 Changes in 0.29.0
 =================
diff --git a/mongoengine/context_managers.py b/mongoengine/context_managers.py
index 52e2fc544..e869a9f28 100644
--- a/mongoengine/context_managers.py
+++ b/mongoengine/context_managers.py
@@ -1,4 +1,5 @@
 import contextlib
+import logging
 import threading
 from contextlib import contextmanager
 
@@ -327,15 +328,16 @@ def _commit_with_retry(session):
         try:
             # Commit uses write concern set at transaction start.
             session.commit_transaction()
-            print("Transaction committed.")
             break
         except (ConnectionFailure, OperationFailure) as exc:
             # Can retry commit
             if exc.has_error_label("UnknownTransactionCommitResult"):
-                print("UnknownTransactionCommitResult, retrying commit operation ...")
+                logging.warning(
+                    "UnknownTransactionCommitResult, retrying commit operation ..."
+                )
                 continue
             else:
-                print("Error during commit ...")
+                # Error during commit
                 raise
 
 

From 5e18e18b85720a24866fa984da6377fb2e1fd12e Mon Sep 17 00:00:00 2001
From: Adler Au <adlerau@qnap.com>
Date: Fri, 6 Sep 2024 19:40:00 +0800
Subject: [PATCH 1459/1519] propagate collation, hint, comment to PyMongo
 functions

propagate collation, hint, comment settings to corresponding PyMongo functions in update, delete and aggregate
---
 mongoengine/queryset/base.py | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 049aff22b..964e302f7 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -519,8 +519,20 @@ def delete(self, write_concern=None, _from_doc_delete=False, cascade_refs=None):
                     write_concern=write_concern, **{"pull_all__%s" % field_name: self}
                 )
 
+        kwargs = {}
+        if self._hint not in (-1, None):
+            kwargs["hint"] = self._hint
+        if self._collation:
+            kwargs["collation"] = self._collation
+        if self._comment:
+            kwargs["comment"] = self._comment
+
         with set_write_concern(queryset._collection, write_concern) as collection:
-            result = collection.delete_many(queryset._query, session=_get_session())
+            result = collection.delete_many(
+                queryset._query,
+                session=_get_session(),
+                **kwargs,
+            )
 
             # If we're using an unack'd write concern, we don't really know how
             # many items have been deleted at this point, hence we only return
@@ -582,6 +594,15 @@ def update(
                 update["$set"]["_cls"] = queryset._document._class_name
             else:
                 update["$set"] = {"_cls": queryset._document._class_name}
+
+        kwargs = {}
+        if self._hint not in (-1, None):
+            kwargs["hint"] = self._hint
+        if self._collation:
+            kwargs["collation"] = self._collation
+        if self._comment:
+            kwargs["comment"] = self._comment
+
         try:
             with set_read_write_concern(
                 queryset._collection, write_concern, read_concern
@@ -595,6 +616,7 @@ def update(
                     upsert=upsert,
                     array_filters=array_filters,
                     session=_get_session(),
+                    **kwargs,
                 )
             if full_result:
                 return result
@@ -1388,8 +1410,18 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
                 read_preference=self._read_preference, read_concern=self._read_concern
             )
 
+        if self._hint not in (-1, None):
+            kwargs.setdefault("hint", self._hint)
+        if self._collation:
+            kwargs.setdefault("collation", self._collation)
+        if self._comment:
+            kwargs.setdefault("comment", self._comment)
+
         return collection.aggregate(
-            final_pipeline, cursor={}, session=_get_session(), **kwargs
+            final_pipeline,
+            cursor={},
+            session=_get_session(),
+            **kwargs,
         )
 
     # JS functionality

From ee26243e6b8168d3ebf19f8ab638ca49fb411673 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 11 Sep 2024 18:34:08 -0400
Subject: [PATCH 1460/1519] Address flaky transaction tests

Resolves #2841

* Fix test that was source of most failures
* Update max transaction lock time for local container entrypoint
* Update max transaction lock time for github action

---

The majority of failures appeared to be attributed with the
`test_exception_in_child_of_a_nested_transaction_rolls_parent_back` unit test.

To resolve this test, I borrowed the approach taken by the test just below it:
`test_exception_in_parent_of_nested_transaction_after_child_completed_only_rolls_parent_back`
which was already creating a function for the work under test and simply
trapping the TransientTractionError.

After resolving this, I found that the max transaction lock request timeout
parameter needed to be modified. After doing so and letting the test suite run
indefinitely unless error, test failures appeared to have ceased.
---
 .github/workflows/start_mongo.sh |  9 +++++++-
 entrypoint.sh                    |  2 +-
 tests/test_context_managers.py   | 36 ++++++++++++++++++++------------
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
index ce2eff8e6..023790fc4 100644
--- a/.github/workflows/start_mongo.sh
+++ b/.github/workflows/start_mongo.sh
@@ -6,7 +6,14 @@ mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
 
 mkdir $mongodb_dir/data
 
-$mongodb_dir/bin/mongod --dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork --replSet mongoengine
+$mongodb_dir/bin/mongod \
+ --dbpath $mongodb_dir/data \
+ --logpath $mongodb_dir/mongodb.log \
+ --fork \
+ --replSet \
+ --setParameter maxTransactionLockRequestTimeoutMillis=1000 \
+ mongoengine
+
 if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
 mongo --verbose --eval "rs.initiate()"
 mongo --quiet --eval "rs.status().ok"
diff --git a/entrypoint.sh b/entrypoint.sh
index 7f826ad00..6edb6bb80 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,4 +3,4 @@
 mongod --replSet mongoengine --fork --logpath=/var/log/mongodb.log
 mongo db --eval "rs.initiate()"
 mongod --shutdown
-mongod --replSet mongoengine --bind_ip 0.0.0.0
+mongod --replSet mongoengine --bind_ip 0.0.0.0 --setParameter maxTransactionLockRequestTimeoutMillis=1000
diff --git a/tests/test_context_managers.py b/tests/test_context_managers.py
index 3eb9f43ae..1333f5574 100644
--- a/tests/test_context_managers.py
+++ b/tests/test_context_managers.py
@@ -708,20 +708,30 @@ class B(Document):
         B.drop_collection()
         b_doc = B.objects.create(name="b")
 
-        with pytest.raises(TestRollbackError):
-            with run_in_transaction():
-                a_doc.update(name="trx-parent")
-                try:
-                    with run_in_transaction():
-                        b_doc.update(name="trx-child")
-                        raise TestRollbackError()
-                except TestRollbackError as exc:
-                    # at this stage, the parent transaction is still there
-                    assert A.objects.get(id=a_doc.id).name == "trx-parent"
-                    raise exc
+        def run_tx():
+            try:
+                with run_in_transaction():
+                    a_doc.update(name="trx-parent")
+                    try:
+                        with run_in_transaction():
+                            b_doc.update(name="trx-child")
+                            raise TestRollbackError()
+                    except TestRollbackError as exc:
+                        # at this stage, the parent transaction is still there
+                        assert A.objects.get(id=a_doc.id).name == "trx-parent"
+                        raise exc
+            except OperationError as op_failure:
+                """
+                See thread safety test below for more details about TransientTransactionError handling
+                """
+                if "TransientTransactionError" in str(op_failure):
+                    logging.warning("TransientTransactionError - retrying...")
+                    run_tx()
                 else:
-                    # makes sure it enters the except above
-                    assert False
+                    raise op_failure
+
+        with pytest.raises(TestRollbackError):
+            run_tx()
 
         assert A.objects.get(id=a_doc.id).name == "a"
         assert B.objects.get(id=b_doc.id).name == "b"

From a47ddf0ab08f40076584c521544fadb42da0b132 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 11 Sep 2024 20:18:40 -0400
Subject: [PATCH 1461/1519] Fix param order in start_mongo.sh

---
 .github/workflows/start_mongo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
index 023790fc4..f20119d08 100644
--- a/.github/workflows/start_mongo.sh
+++ b/.github/workflows/start_mongo.sh
@@ -10,8 +10,8 @@ $mongodb_dir/bin/mongod \
  --dbpath $mongodb_dir/data \
  --logpath $mongodb_dir/mongodb.log \
  --fork \
- --replSet \
  --setParameter maxTransactionLockRequestTimeoutMillis=1000 \
+ --replSet \
  mongoengine
 
 if (( $(echo "$MONGODB < 6.0" | bc -l) )); then

From 2bf863eb02bbe0e82191a75254ade4ccab8c4557 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Wed, 11 Sep 2024 20:33:23 -0400
Subject: [PATCH 1462/1519] Mongo3.8 does not support max tx lock param

---
 .github/workflows/start_mongo.sh | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
index f20119d08..6e488292e 100644
--- a/.github/workflows/start_mongo.sh
+++ b/.github/workflows/start_mongo.sh
@@ -6,13 +6,12 @@ mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
 
 mkdir $mongodb_dir/data
 
-$mongodb_dir/bin/mongod \
- --dbpath $mongodb_dir/data \
- --logpath $mongodb_dir/mongodb.log \
- --fork \
- --setParameter maxTransactionLockRequestTimeoutMillis=1000 \
- --replSet \
- mongoengine
+args=(--dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork --replSet mongoengine)
+if (( $(echo "$MONGODB > 3.8" | bc -l) )); then
+    args+=(--setParameter maxTransactionLockRequestTimeoutMillis=1000)
+fi
+
+$mongodb_dir/bin/mongod "${args[@]}"
 
 if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
 mongo --verbose --eval "rs.initiate()"

From b5d9f8c930fa25346c2ed43907c2b45b9d3ab06d Mon Sep 17 00:00:00 2001
From: Elijah Frederickson <elijah.frederickson@gmail.com>
Date: Wed, 18 Sep 2024 19:48:11 -0400
Subject: [PATCH 1463/1519] Update connection.py

Resolve issue where _check_name moved files between pymongo 4.8.0 and 4.9
---
 mongoengine/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index f64422d28..1c0664810 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -4,7 +4,7 @@
 
 from pymongo import MongoClient, ReadPreference, uri_parser
 from pymongo.common import _UUID_REPRESENTATIONS
-from pymongo.database import _check_name
+from pymongo.database_shared import _check_name
 
 # DriverInfo was added in PyMongo 3.7.
 try:

From 6cc901d1e2de06f29d6e51a0388ba9b96edea399 Mon Sep 17 00:00:00 2001
From: Elijah Frederickson <elijah.frederickson@gmail.com>
Date: Wed, 18 Sep 2024 19:54:37 -0400
Subject: [PATCH 1464/1519] Update connection.py

---
 mongoengine/connection.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index 1c0664810..d0b8b6060 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -4,7 +4,10 @@
 
 from pymongo import MongoClient, ReadPreference, uri_parser
 from pymongo.common import _UUID_REPRESENTATIONS
-from pymongo.database_shared import _check_name
+try:
+    from pymongo.database_shared import _check_name
+except ImportError:
+    from pymongo.database import _check_name
 
 # DriverInfo was added in PyMongo 3.7.
 try:

From 1385c5c1ed322c9faf59b7dedc805cefacdcfb1e Mon Sep 17 00:00:00 2001
From: Elijah Frederickson <elijah.frederickson@gmail.com>
Date: Wed, 18 Sep 2024 19:56:57 -0400
Subject: [PATCH 1465/1519] Update github-actions.yml

---
 .github/workflows/github-actions.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 2d8823c0d..df8d6b25b 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -29,6 +29,7 @@ env:
   PYMONGO_4_6: 4.6.2
   PYMONGO_4_7: 4.7.3
   PYMONGO_4_8: 4.8.0
+  PYMONGO_4_9: 4.9
 
   MAIN_PYTHON_VERSION: 3.9
 
@@ -83,6 +84,9 @@ jobs:
           - python-version: "3.11"
             MONGODB: $MONGODB_7_0
             PYMONGO: $PYMONGO_4_8
+          - python-version: "3.11"
+            MONGODB: $MONGODB_7_0
+            PYMONGO: $PYMONGO_4_9
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

From dc6217e9f57f8d73c6b0c200e2adeabaec39cd02 Mon Sep 17 00:00:00 2001
From: Elijah Frederickson <elijah@daementor.me>
Date: Wed, 18 Sep 2024 20:03:03 -0400
Subject: [PATCH 1466/1519] Add missing env

---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index d29267124..0db203642 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4,mg432,mg441,mg462,mg473,mg480}
+envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4,mg432,mg441,mg462,mg473,mg480,mg49}
 skipsdist = True
 
 [testenv]
@@ -16,5 +16,6 @@ deps =
     mg462: pymongo>=4.6,<4.7
     mg473: pymongo>=4.7,<4.8
     mg480: pymongo>=4.8,<4.9
+    mg49: pymongo>=4.9,<5.0
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 641e1df59c43ffc87ffbd0f654d1441d1b59984c Mon Sep 17 00:00:00 2001
From: Elijah Frederickson <elijah@daementor.me>
Date: Wed, 18 Sep 2024 20:03:34 -0400
Subject: [PATCH 1467/1519] Formatting

---
 mongoengine/connection.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mongoengine/connection.py b/mongoengine/connection.py
index d0b8b6060..6a2e754b9 100644
--- a/mongoengine/connection.py
+++ b/mongoengine/connection.py
@@ -4,6 +4,7 @@
 
 from pymongo import MongoClient, ReadPreference, uri_parser
 from pymongo.common import _UUID_REPRESENTATIONS
+
 try:
     from pymongo.database_shared import _check_name
 except ImportError:

From f680685612f668961bff144f5b6823abbb734fb7 Mon Sep 17 00:00:00 2001
From: Elijah Frederickson <elijah@daementor.me>
Date: Wed, 18 Sep 2024 20:32:47 -0400
Subject: [PATCH 1468/1519] The WebIDE will only take you so far

---
 tests/queryset/test_queryset_aggregation.py | 9 +++++----
 tests/test_connection.py                    | 7 ++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index f1d504c0b..ecfa0b6f3 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -19,10 +19,11 @@ class Bar(Document):
         bars = Bar.objects.read_preference(
             ReadPreference.SECONDARY_PREFERRED
         ).aggregate(pipeline)
-        assert (
-            bars._CommandCursor__collection.read_preference
-            == ReadPreference.SECONDARY_PREFERRED
-        )
+        if hasattr(bars, "_CommandCursor__collection"):
+            read_pref = bars._CommandCursor__collection.read_preference
+        else:  # pymongo >= 4.9
+            read_pref = bars._collection.read_preference
+        assert read_pref == ReadPreference.SECONDARY_PREFERRED
 
     def test_queryset_aggregation_framework(self):
         class Person(Document):
diff --git a/tests/test_connection.py b/tests/test_connection.py
index 34ecb331b..87af2b517 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -3,6 +3,8 @@
 import uuid
 
 import pymongo
+import pymongo.database
+import pymongo.mongo_client
 import pytest
 from bson.tz_util import utc
 from pymongo import MongoClient, ReadPreference
@@ -608,7 +610,10 @@ def test_connect_with_replicaset_via_kwargs(self):
         connection kwargs
         """
         c = connect(replicaset="local-rs")
-        assert c._MongoClient__options.replica_set_name == "local-rs"
+        if hasattr(c, "_MongoClient__options"):
+            assert c._MongoClient__options.replica_set_name == "local-rs"
+        else:  # pymongo >= 4.9
+            assert c._options.replica_set_name == "local-rs"
         db = get_db()
         assert isinstance(db, pymongo.database.Database)
         assert db.name == "test"

From a03264d8200071a1e6147ab99be5f4d861fd583b Mon Sep 17 00:00:00 2001
From: Elijah Frederickson <elijah@daementor.me>
Date: Wed, 18 Sep 2024 21:26:27 -0400
Subject: [PATCH 1469/1519] isort to trigger ci

---
 tests/fields/test_datetime_field.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index ced10b1bc..e14acb444 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -2,14 +2,15 @@
 
 import pytest
 
+from mongoengine import *
+from mongoengine import connection
+from tests.utils import MongoDBTestCase, get_as_pymongo
+
 try:
     import dateutil
 except ImportError:
     dateutil = None
 
-from mongoengine import *
-from mongoengine import connection
-from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestDateTimeField(MongoDBTestCase):

From 673b572a8a39e12aab24eb2359469be442fc91d2 Mon Sep 17 00:00:00 2001
From: Elijah Frederickson <elijah@daementor.me>
Date: Wed, 18 Sep 2024 21:28:48 -0400
Subject: [PATCH 1470/1519] trigger ci

---
 tests/fields/test_datetime_field.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/fields/test_datetime_field.py b/tests/fields/test_datetime_field.py
index e14acb444..d04f39b04 100644
--- a/tests/fields/test_datetime_field.py
+++ b/tests/fields/test_datetime_field.py
@@ -12,7 +12,6 @@
     dateutil = None
 
 
-
 class TestDateTimeField(MongoDBTestCase):
     def test_datetime_from_empty_string(self):
         """

From 9b7d7749bf6abb2e2d81111955b1d59ed034c35f Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 25 Sep 2024 15:10:47 +0200
Subject: [PATCH 1471/1519] port test fix from pymongo 4.9 (lost in conflict
 reso)

---
 tests/test_connection.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/test_connection.py b/tests/test_connection.py
index 5522a2b4a..87af2b517 100644
--- a/tests/test_connection.py
+++ b/tests/test_connection.py
@@ -610,7 +610,10 @@ def test_connect_with_replicaset_via_kwargs(self):
         connection kwargs
         """
         c = connect(replicaset="local-rs")
-        assert c._MongoClient__options.replica_set_name == "local-rs"
+        if hasattr(c, "_MongoClient__options"):
+            assert c._MongoClient__options.replica_set_name == "local-rs"
+        else:  # pymongo >= 4.9
+            assert c._options.replica_set_name == "local-rs"
         db = get_db()
         assert isinstance(db, pymongo.database.Database)
         assert db.name == "test"

From ccaa42dd75e88fce54072b060d5dd4870f4c1e05 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 25 Sep 2024 17:04:34 +0200
Subject: [PATCH 1472/1519] add tests for recent propagation of
 comment/hint/collation to delete/update/aggregate

---
 tests/document/test_instance.py             | 49 ++++++++++++++-
 tests/fields/test_binary_field.py           | 49 ++++++++++++++-
 tests/queryset/test_queryset.py             | 10 +--
 tests/queryset/test_queryset_aggregation.py | 68 ++++++++++++++++++++-
 tests/utils.py                              | 10 +++
 5 files changed, 173 insertions(+), 13 deletions(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 54c4bb37d..ae04a1bd5 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -42,7 +42,11 @@
     PickleSignalsTest,
     PickleTest,
 )
-from tests.utils import MongoDBTestCase, get_as_pymongo
+from tests.utils import (
+    MongoDBTestCase,
+    db_ops_tracker,
+    get_as_pymongo,
+)
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
 
@@ -1879,6 +1883,49 @@ def test_delete(self):
         person.delete()
         assert self.Person.objects.count() == 0
 
+    def test_delete_propagates_hint_collation_and_comment(self):
+        """Make sure adding a hint/comment/collation to the query gets added to the query"""
+        mongo_ver = get_mongodb_version()
+
+        base = {"locale": "en", "strength": 2}
+        index_name = "name_1"
+
+        class AggPerson(Document):
+            name = StringField()
+            meta = {
+                "indexes": [{"fields": ["name"], "name": index_name, "collation": base}]
+            }
+
+        AggPerson.drop_collection()
+        _ = AggPerson.objects.first()
+
+        comment = "test_comment"
+
+        with db_ops_tracker() as q:
+            _ = AggPerson.objects().comment(comment).delete()
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+            assert "hint" not in query_op[CMD_QUERY_KEY]
+            assert query_op[CMD_QUERY_KEY]["comment"] == comment
+            assert "collation" not in query_op[CMD_QUERY_KEY]
+
+        with db_ops_tracker() as q:
+            _ = AggPerson.objects.hint(index_name).delete()
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+
+            assert query_op[CMD_QUERY_KEY]["hint"] == {"$hint": index_name}
+            assert "comment" not in query_op[CMD_QUERY_KEY]
+            assert "collation" not in query_op[CMD_QUERY_KEY]
+
+        with db_ops_tracker() as q:
+            _ = AggPerson.objects.collation(base).delete()
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+            assert "hint" not in query_op[CMD_QUERY_KEY]
+            assert "comment" not in query_op[CMD_QUERY_KEY]
+            assert query_op[CMD_QUERY_KEY]["collation"] == base
+
     def test_save_custom_id(self):
         """Ensure that a document may be saved with a custom _id."""
 
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index f81777b5d..9aa0b4894 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -4,7 +4,11 @@
 from bson import Binary
 
 from mongoengine import *
-from tests.utils import MongoDBTestCase
+from mongoengine.mongodb_support import (
+    MONGODB_36,
+    get_mongodb_version,
+)
+from tests.utils import MongoDBTestCase, db_ops_tracker
 
 BIN_VALUE = "\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5".encode(
     "latin-1"
@@ -146,3 +150,46 @@ class MyDocument(Document):
         assert n_updated == 1
         fetched = MyDocument.objects.with_id(doc.id)
         assert fetched.bin_field == BIN_VALUE
+
+    def test_update_propagates_hint_collation_and_comment(self):
+        """Make sure adding a hint/comment/collation to the query gets added to the query"""
+        mongo_ver = get_mongodb_version()
+
+        base = {"locale": "en", "strength": 2}
+        index_name = "name_1"
+
+        class AggPerson(Document):
+            name = StringField()
+            meta = {
+                "indexes": [{"fields": ["name"], "name": index_name, "collation": base}]
+            }
+
+        AggPerson.drop_collection()
+        _ = AggPerson.objects.first()
+
+        comment = "test_comment"
+
+        with db_ops_tracker() as q:
+            _ = AggPerson.objects.comment(comment).update_one(name="something")
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+            assert "hint" not in query_op[CMD_QUERY_KEY]
+            assert query_op[CMD_QUERY_KEY]["comment"] == comment
+            assert "collation" not in query_op[CMD_QUERY_KEY]
+
+        with db_ops_tracker() as q:
+            _ = AggPerson.objects.hint(index_name).update_one(name="something")
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+
+            assert query_op[CMD_QUERY_KEY]["hint"] == {"$hint": index_name}
+            assert "comment" not in query_op[CMD_QUERY_KEY]
+            assert "collation" not in query_op[CMD_QUERY_KEY]
+
+        with db_ops_tracker() as q:
+            _ = AggPerson.objects.collation(base).update_one(name="something")
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+            assert "hint" not in query_op[CMD_QUERY_KEY]
+            assert "comment" not in query_op[CMD_QUERY_KEY]
+            assert query_op[CMD_QUERY_KEY]["collation"] == base
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 7b41a894b..3bcd5ed9c 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -27,21 +27,13 @@
 )
 from mongoengine.queryset.base import BaseQuerySet
 from tests.utils import (
+    db_ops_tracker,
     requires_mongodb_gte_42,
     requires_mongodb_gte_44,
     requires_mongodb_lt_42,
 )
 
 
-class db_ops_tracker(query_counter):
-    def get_ops(self):
-        ignore_query = dict(self._ignored_query)
-        ignore_query["command.count"] = {
-            "$ne": "system.profile"
-        }  # Ignore the query issued by query_counter
-        return list(self.db.system.profile.find(ignore_query))
-
-
 def get_key_compat(mongo_ver):
     ORDER_BY_KEY = "sort"
     CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index ecfa0b6f3..4c2dc0faf 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -3,8 +3,12 @@
 
 from pymongo.read_preferences import ReadPreference
 
-from mongoengine import *
-from tests.utils import MongoDBTestCase
+from mongoengine import Document, IntField, PointField, StringField
+from mongoengine.mongodb_support import (
+    MONGODB_36,
+    get_mongodb_version,
+)
+from tests.utils import MongoDBTestCase, db_ops_tracker
 
 
 class TestQuerysetAggregate(MongoDBTestCase):
@@ -87,6 +91,66 @@ class Person(Document):
             {"_id": p3.pk, "name": "SANDRA MARA"},
         ]
 
+    def test_aggregation_comment(self):
+        """Make sure adding a comment to the query gets added to the query"""
+        mongo_ver = get_mongodb_version()
+
+        class AggPerson(Document):
+            name = StringField()
+
+        AggPerson.drop_collection()
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        comment = "some_comment"
+        with db_ops_tracker() as q:
+            _ = list(AggPerson.objects.comment(comment).aggregate(pipeline))
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+            assert query_op[CMD_QUERY_KEY]["comment"] == comment
+
+    def test_aggregation_propagates_hint_collation_and_comment(self):
+        """Make sure adding a hint/comment/collation to the query gets added to the query"""
+        mongo_ver = get_mongodb_version()
+
+        base = {"locale": "en", "strength": 2}
+        index_name = "name_1"
+
+        class AggPerson(Document):
+            name = StringField()
+            meta = {
+                "indexes": [{"fields": ["name"], "name": index_name, "collation": base}]
+            }
+
+        AggPerson.drop_collection()
+        _ = AggPerson.objects.first()
+
+        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
+        comment = "test_comment"
+
+        with db_ops_tracker() as q:
+            _ = list(AggPerson.objects.comment(comment).aggregate(pipeline))
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+            assert "hint" not in query_op[CMD_QUERY_KEY]
+            assert query_op[CMD_QUERY_KEY]["comment"] == comment
+            assert "collation" not in query_op[CMD_QUERY_KEY]
+
+        with db_ops_tracker() as q:
+            _ = list(AggPerson.objects.hint(index_name).aggregate(pipeline))
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+            assert query_op[CMD_QUERY_KEY]["hint"] == "name_1"
+            assert "comment" not in query_op[CMD_QUERY_KEY]
+            assert "collation" not in query_op[CMD_QUERY_KEY]
+
+        with db_ops_tracker() as q:
+            _ = list(AggPerson.objects.collation(base).aggregate(pipeline))
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+            assert "hint" not in query_op[CMD_QUERY_KEY]
+            assert "comment" not in query_op[CMD_QUERY_KEY]
+            assert query_op[CMD_QUERY_KEY]["collation"] == base
+
     def test_queryset_aggregation_with_limit(self):
         class Person(Document):
             name = StringField()
diff --git a/tests/utils.py b/tests/utils.py
index d5cb2804d..cf68c1c44 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -6,6 +6,7 @@
 
 from mongoengine import connect
 from mongoengine.connection import disconnect_all, get_db
+from mongoengine.context_managers import query_counter
 from mongoengine.mongodb_support import get_mongodb_version
 
 MONGO_TEST_DB = "mongoenginetest"  # standard name for the test database
@@ -92,3 +93,12 @@ def _inner(*args, **kwargs):
             pytest.skip(f"Needs MongoDB {oper.__name__} v{pretty_version}")
 
     return _inner
+
+
+class db_ops_tracker(query_counter):
+    def get_ops(self):
+        ignore_query = dict(self._ignored_query)
+        ignore_query["command.count"] = {
+            "$ne": "system.profile"
+        }  # Ignore the query issued by query_counter
+        return list(self.db.system.profile.find(ignore_query))

From 457276ce7c00b77171bdf1fcd1e1f28116f66a9e Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 25 Sep 2024 17:09:50 +0200
Subject: [PATCH 1473/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d1123d798..2dd68e600 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,6 +15,7 @@ Development
 - Further to the deprecation warning, remove ability to use an unpacked list to `Queryset.aggregate(*pipeline)`, a plain list must be provided instead `Queryset.aggregate(pipeline)`, as it's closer to pymongo interface
 - Further to the deprecation warning, remove `full_response` from `QuerySet.modify` as it wasn't supported with Pymongo 3+
 - Fixed stacklevel of many warnings (to point places emitting the warning more accurately)
+- Add support for collation/hint/comment to delete/update/aggregate #2842
 
 Changes in 0.29.0
 =================

From 7767d2ec727c3563e55f4d5df52f5f7234b50128 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 25 Sep 2024 17:10:45 +0200
Subject: [PATCH 1474/1519] remove dup test

---
 tests/queryset/test_queryset_aggregation.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index 4e32af6cc..15e08698f 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -91,23 +91,6 @@ class Person(Document):
             {"_id": p3.pk, "name": "SANDRA MARA"},
         ]
 
-    def test_aggregation_comment(self):
-        """Make sure adding a comment to the query gets added to the query"""
-        mongo_ver = get_mongodb_version()
-
-        class AggPerson(Document):
-            name = StringField()
-
-        AggPerson.drop_collection()
-
-        pipeline = [{"$project": {"name": {"$toUpper": "$name"}}}]
-        comment = "some_comment"
-        with db_ops_tracker() as q:
-            _ = list(AggPerson.objects.comment(comment).aggregate(pipeline))
-            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
-            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
-            assert query_op[CMD_QUERY_KEY]["comment"] == comment
-
     def test_aggregation_propagates_hint_collation_and_comment(self):
         """Make sure adding a hint/comment/collation to the query gets added to the query"""
         mongo_ver = get_mongodb_version()

From b809090ff2f1b55d9acc79bfa70462b041c13e72 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 25 Sep 2024 18:03:55 +0200
Subject: [PATCH 1475/1519] Fix tests (comment not available on the newly
 updated method before pymongo 4.1)

---
 tests/document/test_instance.py   | 17 ++++++++++-------
 tests/fields/test_binary_field.py | 18 +++++++++++-------
 tests/utils.py                    |  3 +++
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index ae04a1bd5..1e06a346e 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -1901,13 +1901,16 @@ class AggPerson(Document):
 
         comment = "test_comment"
 
-        with db_ops_tracker() as q:
-            _ = AggPerson.objects().comment(comment).delete()
-            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
-            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
-            assert "hint" not in query_op[CMD_QUERY_KEY]
-            assert query_op[CMD_QUERY_KEY]["comment"] == comment
-            assert "collation" not in query_op[CMD_QUERY_KEY]
+        if PYMONGO_VERSION >= (4, 1):
+            with db_ops_tracker() as q:
+                _ = AggPerson.objects().comment(comment).delete()
+                query_op = q.db.system.profile.find(
+                    {"ns": "mongoenginetest.agg_person"}
+                )[0]
+                CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+                assert "hint" not in query_op[CMD_QUERY_KEY]
+                assert query_op[CMD_QUERY_KEY]["comment"] == comment
+                assert "collation" not in query_op[CMD_QUERY_KEY]
 
         with db_ops_tracker() as q:
             _ = AggPerson.objects.hint(index_name).delete()
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index 9aa0b4894..b4d19799c 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -8,6 +8,7 @@
     MONGODB_36,
     get_mongodb_version,
 )
+from mongoengine.pymongo_support import PYMONGO_VERSION
 from tests.utils import MongoDBTestCase, db_ops_tracker
 
 BIN_VALUE = "\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5".encode(
@@ -169,13 +170,16 @@ class AggPerson(Document):
 
         comment = "test_comment"
 
-        with db_ops_tracker() as q:
-            _ = AggPerson.objects.comment(comment).update_one(name="something")
-            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
-            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
-            assert "hint" not in query_op[CMD_QUERY_KEY]
-            assert query_op[CMD_QUERY_KEY]["comment"] == comment
-            assert "collation" not in query_op[CMD_QUERY_KEY]
+        if PYMONGO_VERSION >= (4, 1):
+            with db_ops_tracker() as q:
+                _ = AggPerson.objects.comment(comment).update_one(name="something")
+                query_op = q.db.system.profile.find(
+                    {"ns": "mongoenginetest.agg_person"}
+                )[0]
+                CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+                assert "hint" not in query_op[CMD_QUERY_KEY]
+                assert query_op[CMD_QUERY_KEY]["comment"] == comment
+                assert "collation" not in query_op[CMD_QUERY_KEY]
 
         with db_ops_tracker() as q:
             _ = AggPerson.objects.hint(index_name).update_one(name="something")
diff --git a/tests/utils.py b/tests/utils.py
index cf68c1c44..73623661b 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -2,6 +2,7 @@
 import operator
 import unittest
 
+import pymongo
 import pytest
 
 from mongoengine import connect
@@ -9,6 +10,8 @@
 from mongoengine.context_managers import query_counter
 from mongoengine.mongodb_support import get_mongodb_version
 
+PYMONGO_VERSION = tuple(pymongo.version_tuple[:2])
+
 MONGO_TEST_DB = "mongoenginetest"  # standard name for the test database
 
 

From 1e06d52fd58c6e4d4408f56d740b829a11e3799e Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 25 Sep 2024 18:45:00 +0200
Subject: [PATCH 1476/1519] Skip tests on hint for update/delete for MongoDB <
 4.4

---
 docs/changelog.rst                |  2 +-
 tests/document/test_instance.py   | 49 ++++++++++++++++++++++++++++
 tests/fields/test_binary_field.py | 53 +------------------------------
 3 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 2dd68e600..dbb37bf90 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,7 +15,7 @@ Development
 - Further to the deprecation warning, remove ability to use an unpacked list to `Queryset.aggregate(*pipeline)`, a plain list must be provided instead `Queryset.aggregate(pipeline)`, as it's closer to pymongo interface
 - Further to the deprecation warning, remove `full_response` from `QuerySet.modify` as it wasn't supported with Pymongo 3+
 - Fixed stacklevel of many warnings (to point places emitting the warning more accurately)
-- Add support for collation/hint/comment to delete/update/aggregate #2842
+- Add support for collation/hint/comment to delete/update and aggregate #2842
 
 Changes in 0.29.0
 =================
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 1e06a346e..89645e3ef 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -46,6 +46,7 @@
     MongoDBTestCase,
     db_ops_tracker,
     get_as_pymongo,
+    requires_mongodb_gte_44,
 )
 
 TEST_IMAGE_PATH = os.path.join(os.path.dirname(__file__), "../fields/mongoengine.png")
@@ -1875,6 +1876,53 @@ class User(self.Person):
         person = self.Person.objects.get()
         assert not person.comments_dict["first_post"].published
 
+    @requires_mongodb_gte_44
+    def test_update_propagates_hint_collation_and_comment(self):
+        """Make sure adding a hint/comment/collation to the query gets added to the query"""
+        mongo_ver = get_mongodb_version()
+
+        base = {"locale": "en", "strength": 2}
+        index_name = "name_1"
+
+        class AggPerson(Document):
+            name = StringField()
+            meta = {
+                "indexes": [{"fields": ["name"], "name": index_name, "collation": base}]
+            }
+
+        AggPerson.drop_collection()
+        _ = AggPerson.objects.first()
+
+        comment = "test_comment"
+
+        if PYMONGO_VERSION >= (4, 1):
+            with db_ops_tracker() as q:
+                _ = AggPerson.objects.comment(comment).update_one(name="something")
+                query_op = q.db.system.profile.find(
+                    {"ns": "mongoenginetest.agg_person"}
+                )[0]
+                CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+                assert "hint" not in query_op[CMD_QUERY_KEY]
+                assert query_op[CMD_QUERY_KEY]["comment"] == comment
+                assert "collation" not in query_op[CMD_QUERY_KEY]
+
+        with db_ops_tracker() as q:
+            _ = AggPerson.objects.hint(index_name).update_one(name="something")
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+
+            assert query_op[CMD_QUERY_KEY]["hint"] == {"$hint": index_name}
+            assert "comment" not in query_op[CMD_QUERY_KEY]
+            assert "collation" not in query_op[CMD_QUERY_KEY]
+
+        with db_ops_tracker() as q:
+            _ = AggPerson.objects.collation(base).update_one(name="something")
+            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
+            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
+            assert "hint" not in query_op[CMD_QUERY_KEY]
+            assert "comment" not in query_op[CMD_QUERY_KEY]
+            assert query_op[CMD_QUERY_KEY]["collation"] == base
+
     def test_delete(self):
         """Ensure that document may be deleted using the delete method."""
         person = self.Person(name="Test User", age=30)
@@ -1883,6 +1931,7 @@ def test_delete(self):
         person.delete()
         assert self.Person.objects.count() == 0
 
+    @requires_mongodb_gte_44
     def test_delete_propagates_hint_collation_and_comment(self):
         """Make sure adding a hint/comment/collation to the query gets added to the query"""
         mongo_ver = get_mongodb_version()
diff --git a/tests/fields/test_binary_field.py b/tests/fields/test_binary_field.py
index b4d19799c..f81777b5d 100644
--- a/tests/fields/test_binary_field.py
+++ b/tests/fields/test_binary_field.py
@@ -4,12 +4,7 @@
 from bson import Binary
 
 from mongoengine import *
-from mongoengine.mongodb_support import (
-    MONGODB_36,
-    get_mongodb_version,
-)
-from mongoengine.pymongo_support import PYMONGO_VERSION
-from tests.utils import MongoDBTestCase, db_ops_tracker
+from tests.utils import MongoDBTestCase
 
 BIN_VALUE = "\xa9\xf3\x8d(\xd7\x03\x84\xb4k[\x0f\xe3\xa2\x19\x85p[J\xa3\xd2>\xde\xe6\x87\xb1\x7f\xc6\xe6\xd9r\x18\xf5".encode(
     "latin-1"
@@ -151,49 +146,3 @@ class MyDocument(Document):
         assert n_updated == 1
         fetched = MyDocument.objects.with_id(doc.id)
         assert fetched.bin_field == BIN_VALUE
-
-    def test_update_propagates_hint_collation_and_comment(self):
-        """Make sure adding a hint/comment/collation to the query gets added to the query"""
-        mongo_ver = get_mongodb_version()
-
-        base = {"locale": "en", "strength": 2}
-        index_name = "name_1"
-
-        class AggPerson(Document):
-            name = StringField()
-            meta = {
-                "indexes": [{"fields": ["name"], "name": index_name, "collation": base}]
-            }
-
-        AggPerson.drop_collection()
-        _ = AggPerson.objects.first()
-
-        comment = "test_comment"
-
-        if PYMONGO_VERSION >= (4, 1):
-            with db_ops_tracker() as q:
-                _ = AggPerson.objects.comment(comment).update_one(name="something")
-                query_op = q.db.system.profile.find(
-                    {"ns": "mongoenginetest.agg_person"}
-                )[0]
-                CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
-                assert "hint" not in query_op[CMD_QUERY_KEY]
-                assert query_op[CMD_QUERY_KEY]["comment"] == comment
-                assert "collation" not in query_op[CMD_QUERY_KEY]
-
-        with db_ops_tracker() as q:
-            _ = AggPerson.objects.hint(index_name).update_one(name="something")
-            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
-            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
-
-            assert query_op[CMD_QUERY_KEY]["hint"] == {"$hint": index_name}
-            assert "comment" not in query_op[CMD_QUERY_KEY]
-            assert "collation" not in query_op[CMD_QUERY_KEY]
-
-        with db_ops_tracker() as q:
-            _ = AggPerson.objects.collation(base).update_one(name="something")
-            query_op = q.db.system.profile.find({"ns": "mongoenginetest.agg_person"})[0]
-            CMD_QUERY_KEY = "command" if mongo_ver >= MONGODB_36 else "query"
-            assert "hint" not in query_op[CMD_QUERY_KEY]
-            assert "comment" not in query_op[CMD_QUERY_KEY]
-            assert query_op[CMD_QUERY_KEY]["collation"] == base

From f4598f87f88b79d429877cdc260750fcd9946ee5 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 27 Sep 2024 22:28:37 +0200
Subject: [PATCH 1477/1519] Fix text index on multiple fields , order
 independent (#2612)

---
 docs/changelog.rst             |  1 +
 mongoengine/base/utils.py      | 10 ++++++++++
 mongoengine/document.py        |  7 ++++++-
 tests/document/test_indexes.py | 33 +++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4beaa4a48..669f5b9b9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Fix Document.compare_indexes() not working correctly for text indexes on multiple fields #2612
 - Add support for transaction through run_in_transaction (kudos to juannyG for this) #2569
   Some considerations:
     - make sure to read https://www.mongodb.com/docs/manual/core/transactions-in-applications/#callback-api-vs-core-api
diff --git a/mongoengine/base/utils.py b/mongoengine/base/utils.py
index 7753ad50c..40f917965 100644
--- a/mongoengine/base/utils.py
+++ b/mongoengine/base/utils.py
@@ -20,3 +20,13 @@ def __get__(self, instance, owner):
 
     def __set__(self, instance, value):
         raise AttributeError("Can not set attribute LazyRegexCompiler")
+
+
+class NonOrderedList(list):
+    """Simple utility class to compare lists without considering order (useful in context of indexes)"""
+
+    def __eq__(self, other):
+        if isinstance(other, list):
+            # Compare sorted versions of the lists
+            return sorted(self) == sorted(other)
+        return False
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 26b9fac7e..4907589e9 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -14,6 +14,7 @@
     TopLevelDocumentMetaclass,
     get_document,
 )
+from mongoengine.base.utils import NonOrderedList
 from mongoengine.common import _import_class
 from mongoengine.connection import (
     DEFAULT_CONNECTION_NAME,
@@ -1043,9 +1044,13 @@ def compare_indexes(cls):
                 # Useful for text indexes (but not only)
                 index_type = info["key"][0][1]
                 text_index_fields = info.get("weights").keys()
-                existing.append([(key, index_type) for key in text_index_fields])
+                # Use NonOrderedList to avoid order comparison, see #2612
+                existing.append(
+                    NonOrderedList([(key, index_type) for key in text_index_fields])
+                )
             else:
                 existing.append(info["key"])
+
         missing = [index for index in required if index not in existing]
         extra = [index for index in existing if index not in required]
 
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 7ba18d588..02da590cb 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -66,6 +66,8 @@ class BlogPost(InheritFrom):
         for expected in expected_specs:
             assert expected["fields"] in info
 
+        assert BlogPost.compare_indexes() == {"missing": [], "extra": []}
+
     def _index_test_inheritance(self, InheritFrom):
         class BlogPost(InheritFrom):
             date = DateTimeField(db_field="addDate", default=datetime.now)
@@ -949,6 +951,8 @@ class MyDoc(Document):
         ]["key"]
         assert info["provider_ids.foo_1_provider_ids.bar_1"]["sparse"]
 
+        assert MyDoc.compare_indexes() == {"missing": [], "extra": []}
+
     def test_text_indexes(self):
         class Book(Document):
             title = DictField()
@@ -968,6 +972,8 @@ class Book(Document):
         assert "ref_id_hashed" in indexes
         assert ("ref_id", "hashed") in indexes["ref_id_hashed"]["key"]
 
+        assert Book.compare_indexes() == {"missing": [], "extra": []}
+
     def test_indexes_after_database_drop(self):
         """
         Test to ensure that indexes are not re-created on a collection
@@ -1045,6 +1051,8 @@ class TestChildDoc(TestDoc):
         TestDoc.ensure_indexes()
         TestChildDoc.ensure_indexes()
 
+        assert TestDoc.compare_indexes() == {"missing": [], "extra": []}
+
         index_info = TestDoc._get_collection().index_information()
         for key in index_info:
             del index_info[key][
@@ -1082,9 +1090,34 @@ class TestDoc(Document):
         TestDoc.drop_collection()
         TestDoc.ensure_indexes()
 
+        assert TestDoc.compare_indexes() == {"missing": [], "extra": []}
+
         index_info = TestDoc._get_collection().index_information()
         assert "shard_1_1__cls_1_txt_1_1" in index_info
 
+    def test_compare_indexes_works_with_compound_text_indexes(self):
+        """The order of the fields in case of text indexes don't matter
+        so it's important to ensure that the compare_indexes method works that way
+        https://github.com/MongoEngine/mongoengine/issues/2612
+        """
+
+        class Sample1(Document):
+            a = StringField()
+            b = StringField()
+
+            meta = {"indexes": [{"fields": ["$a", "$b"]}]}
+
+        class Sample2(Document):
+            a = StringField()
+            b = StringField()
+
+            meta = {"indexes": [{"fields": ["$b", "$a"]}]}
+
+        Sample1.drop_collection()
+        Sample2.drop_collection()
+        assert Sample1.compare_indexes() == {"missing": [], "extra": []}
+        assert Sample2.compare_indexes() == {"missing": [], "extra": []}
+
 
 if __name__ == "__main__":
     unittest.main()

From 23059d56bb7e2931174748e867fde0d5021ec1a6 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 27 Sep 2024 23:37:01 +0200
Subject: [PATCH 1478/1519] Use geonear or collstats as first steps and add
 warning in aggregate doc (to emphasize the flaws of current design in case of
 inheritance or skip/limit/etc as our pipeline will have an arbitrary
 ordering)

---
 mongoengine/queryset/base.py                | 21 +++++++++-
 tests/queryset/test_queryset_aggregation.py | 43 +++++++++++++++++++--
 2 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index 049aff22b..718e2c971 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -1343,6 +1343,14 @@ def from_json(self, json_data):
     def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
         """Perform an aggregate function based on your queryset params
 
+        If the queryset contains a query or skip/limit/sort or if the target Document class
+        uses inheritance, this method will add steps prior to the provided pipeline in an arbitrary order.
+        This may affect the performance or outcome of the aggregation, so use it consciously.
+
+        For complex/critical pipelines, we recommended to use the aggregation framework of Pymongo directly,
+        it is available through the collection object (YourDocument._collection.aggregate) and will guarantee
+        that you have full control on the pipeline.
+
         :param pipeline: list of aggregation commands,
             see: https://www.mongodb.com/docs/manual/core/aggregation-pipeline/
         :param suppl_pipeline: unpacked list of pipeline (added to support deprecation of the old interface)
@@ -1380,7 +1388,18 @@ def aggregate(self, pipeline, *suppl_pipeline, **kwargs):
         if self._skip is not None:
             initial_pipeline.append({"$skip": self._skip})
 
-        final_pipeline = initial_pipeline + user_pipeline
+        # geoNear and collStats must be the first stages in the pipeline if present
+        first_step = []
+        new_user_pipeline = []
+        for step_step in user_pipeline:
+            if "$geoNear" in step_step:
+                first_step.append(step_step)
+            elif "$collStats" in step_step:
+                first_step.append(step_step)
+            else:
+                new_user_pipeline.append(step_step)
+
+        final_pipeline = first_step + initial_pipeline + new_user_pipeline
 
         collection = self._collection
         if self._read_preference is not None or self._read_concern is not None:
diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index ecfa0b6f3..040b38dd0 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -1,4 +1,3 @@
-import unittest
 import warnings
 
 from pymongo.read_preferences import ReadPreference
@@ -294,6 +293,44 @@ class Person(Document):
 
         assert list(data) == []
 
+    def test_aggregate_geo_near_used_as_initial_step_before_cls_implicit_step(self):
+        class BaseClass(Document):
+            meta = {"allow_inheritance": True}
 
-if __name__ == "__main__":
-    unittest.main()
+        class Aggr(BaseClass):
+            name = StringField()
+            c = PointField()
+
+        BaseClass.drop_collection()
+
+        x = Aggr(name="X", c=[10.634584, 35.8245029]).save()
+        y = Aggr(name="Y", c=[10.634584, 35.8245029]).save()
+
+        pipeline = [
+            {
+                "$geoNear": {
+                    "near": {"type": "Point", "coordinates": [10.634584, 35.8245029]},
+                    "distanceField": "c",
+                    "spherical": True,
+                }
+            }
+        ]
+        res = list(Aggr.objects.aggregate(*pipeline))
+        assert res == [
+            {"_cls": "BaseClass.Aggr", "_id": x.id, "c": 0.0, "name": "X"},
+            {"_cls": "BaseClass.Aggr", "_id": y.id, "c": 0.0, "name": "Y"},
+        ]
+
+    def test_aggregate_collstats_used_as_initial_step_before_cls_implicit_step(self):
+        class SomeDoc(Document):
+            name = StringField()
+
+        SomeDoc.drop_collection()
+
+        SomeDoc(name="X").save()
+        SomeDoc(name="Y").save()
+
+        pipeline = [{"$collStats": {"count": {}}}]
+        res = list(SomeDoc.objects.aggregate(pipeline))
+        assert len(res) == 1
+        assert res[0]["count"] == 2

From 3b6d437c4f864bf3c5d5fd03838e07a1a17d4389 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Fri, 27 Sep 2024 23:39:17 +0200
Subject: [PATCH 1479/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4beaa4a48..163d89d04 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,6 +12,7 @@ Development
     - make sure to read https://www.mongodb.com/docs/manual/core/transactions-in-applications/#callback-api-vs-core-api
     - run_in_transaction context manager relies on Pymongo coreAPI, it will retry automatically in case of `UnknownTransactionCommitResult` but not `TransientTransactionError` exceptions
     - Using .count() in a transaction will always use Collection.count_document (as estimated_document_count is not supported in transactions)
+- Fix use of $geoNear or $collStats in aggregate #2493
 
 Changes in 0.29.0
 =================

From 25d759d305ea8c9d6acc1af6fdda92eeca387345 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 28 Sep 2024 12:19:09 +0200
Subject: [PATCH 1480/1519] Fix deprecated use of pipeline args

---
 tests/queryset/test_queryset_aggregation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/queryset/test_queryset_aggregation.py b/tests/queryset/test_queryset_aggregation.py
index 789a639aa..7e390e35a 100644
--- a/tests/queryset/test_queryset_aggregation.py
+++ b/tests/queryset/test_queryset_aggregation.py
@@ -354,7 +354,7 @@ class Aggr(BaseClass):
                 }
             }
         ]
-        res = list(Aggr.objects.aggregate(*pipeline))
+        res = list(Aggr.objects.aggregate(pipeline))
         assert res == [
             {"_cls": "BaseClass.Aggr", "_id": x.id, "c": 0.0, "name": "X"},
             {"_cls": "BaseClass.Aggr", "_id": y.id, "c": 0.0, "name": "Y"},

From 9aab9d20c068854e7ec6c11dc04d79d2c3de7389 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 28 Sep 2024 12:36:07 +0200
Subject: [PATCH 1481/1519] add test for #1175

---
 tests/queryset/test_transform.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index 5627597f8..8704187b8 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -5,11 +5,17 @@
 
 from mongoengine import *
 from mongoengine.queryset import Q, transform
+from tests.utils import MongoDBTestCase
 
 
-class TestTransform(unittest.TestCase):
-    def setUp(self):
-        connect(db="mongoenginetest")
+class TestTransform(MongoDBTestCase):
+
+    def test_transform_str_datetime(self):
+        data = {"date": {"$ne": "2015-12-01T00:00:00"}}
+        assert transform.query(**data) == {"date": {"$ne": "2015-12-01T00:00:00"}}
+        assert transform.query(date__ne="2015-12-01T00:00:00") == {
+            "date": {"$ne": "2015-12-01T00:00:00"}
+        }
 
     def test_transform_query(self):
         """Ensure that the _transform_query function operates correctly."""

From 1758d23b46167128e374712f3982f4138618e7c4 Mon Sep 17 00:00:00 2001
From: Juan Gutierrez <juanny.gee@gmail.com>
Date: Sun, 29 Sep 2024 21:06:14 -0400
Subject: [PATCH 1482/1519] Call mark_as_changed_wrapper for `list.clear` on
 ListField

`list.clear` was added in Python 3.3
---
 mongoengine/base/datastructures.py | 1 +
 tests/test_datastructures.py       | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
index a175cd119..dcb8438c7 100644
--- a/mongoengine/base/datastructures.py
+++ b/mongoengine/base/datastructures.py
@@ -177,6 +177,7 @@ def __setitem__(self, key, value):
     remove = mark_as_changed_wrapper(list.remove)
     reverse = mark_as_changed_wrapper(list.reverse)
     sort = mark_as_changed_wrapper(list.sort)
+    clear = mark_as_changed_wrapper(list.clear)
     __delitem__ = mark_as_changed_wrapper(list.__delitem__)
     __iadd__ = mark_as_changed_wrapper(list.__iadd__)
     __imul__ = mark_as_changed_wrapper(list.__imul__)
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 42ce42a1d..eb1417d11 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -185,7 +185,7 @@ def test___iter__(self):
         base_list = BaseList(values, instance=None, name="my_name")
         assert values == list(base_list)
 
-    def test___iter___allow_modification_while_iterating_withou_error(self):
+    def test___iter___allow_modification_while_iterating_without_error(self):
         # regular list allows for this, thus this subclass must comply to that
         base_list = BaseList([True, False, True, False], instance=None, name="my_name")
         for idx, val in enumerate(base_list):
@@ -365,6 +365,11 @@ def test_sort_calls_with_key(self):
         base_list.sort(key=lambda i: str(i))
         assert base_list == [1, 11, 2]
 
+    def test_clear_calls_mark_as_changed(self):
+        base_list = self._get_baselist([True, False])
+        base_list.clear()
+        assert base_list._instance._changed_fields == ["my_name"]
+
 
 class TestStrictDict(unittest.TestCase):
     def setUp(self):

From 458d12e18458a00dafae71e46157808295024a4a Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 1 Oct 2024 09:27:36 +0200
Subject: [PATCH 1483/1519] update changelog with list .clear change

---
 docs/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index dbb37bf90..ddc8cbe45 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -16,6 +16,8 @@ Development
 - Further to the deprecation warning, remove `full_response` from `QuerySet.modify` as it wasn't supported with Pymongo 3+
 - Fixed stacklevel of many warnings (to point places emitting the warning more accurately)
 - Add support for collation/hint/comment to delete/update and aggregate #2842
+- BREAKING CHANGE: Remove LongField as it's equivalent to IntField since we drop support to Python2 long time ago (User should simply switch to IntField) #2309
+- BugFix - Calling .clear on a ListField wasn't being marked as changed (and flushed to db upon .save()) #2858
 
 Changes in 0.29.0
 =================

From 52007edc5647115271ec4f32ed6788217901b85c Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 2 Oct 2024 09:03:59 +0200
Subject: [PATCH 1484/1519] remove longfield

---
 docs/apireference.rst             |  1 -
 docs/changelog.rst                |  4 +-
 docs/guide/defining-documents.rst |  1 -
 mongoengine/fields.py             |  9 ----
 tests/fields/test_int_field.py    | 23 +++++++++++
 tests/fields/test_long_field.py   | 69 -------------------------------
 6 files changed, 25 insertions(+), 82 deletions(-)
 delete mode 100644 tests/fields/test_long_field.py

diff --git a/docs/apireference.rst b/docs/apireference.rst
index 5cc8a2947..4c94a708b 100644
--- a/docs/apireference.rst
+++ b/docs/apireference.rst
@@ -77,7 +77,6 @@ Fields
 .. autoclass:: mongoengine.fields.EmailField
 .. autoclass:: mongoengine.fields.EnumField
 .. autoclass:: mongoengine.fields.IntField
-.. autoclass:: mongoengine.fields.LongField
 .. autoclass:: mongoengine.fields.FloatField
 .. autoclass:: mongoengine.fields.DecimalField
 .. autoclass:: mongoengine.fields.Decimal128Field
diff --git a/docs/changelog.rst b/docs/changelog.rst
index ddc8cbe45..5f2ee95b7 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -12,8 +12,8 @@ Development
     - make sure to read https://www.mongodb.com/docs/manual/core/transactions-in-applications/#callback-api-vs-core-api
     - run_in_transaction context manager relies on Pymongo coreAPI, it will retry automatically in case of `UnknownTransactionCommitResult` but not `TransientTransactionError` exceptions
     - Using .count() in a transaction will always use Collection.count_document (as estimated_document_count is not supported in transactions)
-- Further to the deprecation warning, remove ability to use an unpacked list to `Queryset.aggregate(*pipeline)`, a plain list must be provided instead `Queryset.aggregate(pipeline)`, as it's closer to pymongo interface
-- Further to the deprecation warning, remove `full_response` from `QuerySet.modify` as it wasn't supported with Pymongo 3+
+- BREAKING CHANGE: Further to the deprecation warning, remove ability to use an unpacked list to `Queryset.aggregate(*pipeline)`, a plain list must be provided instead `Queryset.aggregate(pipeline)`, as it's closer to pymongo interface
+- BREAKING CHANGE: Further to the deprecation warning, remove `full_response` from `QuerySet.modify` as it wasn't supported with Pymongo 3+
 - Fixed stacklevel of many warnings (to point places emitting the warning more accurately)
 - Add support for collation/hint/comment to delete/update and aggregate #2842
 - BREAKING CHANGE: Remove LongField as it's equivalent to IntField since we drop support to Python2 long time ago (User should simply switch to IntField) #2309
diff --git a/docs/guide/defining-documents.rst b/docs/guide/defining-documents.rst
index cc59a8c10..c71bc23c1 100644
--- a/docs/guide/defining-documents.rst
+++ b/docs/guide/defining-documents.rst
@@ -88,7 +88,6 @@ are as follows:
 * :class:`~mongoengine.fields.ImageField`
 * :class:`~mongoengine.fields.IntField`
 * :class:`~mongoengine.fields.ListField`
-* :class:`~mongoengine.fields.LongField`
 * :class:`~mongoengine.fields.MapField`
 * :class:`~mongoengine.fields.ObjectIdField`
 * :class:`~mongoengine.fields.ReferenceField`
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index eea7a9d02..c74539691 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -14,7 +14,6 @@
 import pymongo
 from bson import SON, Binary, DBRef, ObjectId
 from bson.decimal128 import Decimal128, create_decimal128_context
-from bson.int64 import Int64
 from pymongo import ReturnDocument
 
 try:
@@ -68,7 +67,6 @@
     "URLField",
     "EmailField",
     "IntField",
-    "LongField",
     "FloatField",
     "DecimalField",
     "BooleanField",
@@ -367,13 +365,6 @@ def prepare_query_value(self, op, value):
         return super().prepare_query_value(op, int(value))
 
 
-class LongField(IntField):
-    """64-bit integer field. (Equivalent to IntField since the support to Python2 was dropped)"""
-
-    def to_mongo(self, value):
-        return Int64(value)
-
-
 class FloatField(BaseField):
     """Floating point number field."""
 
diff --git a/tests/fields/test_int_field.py b/tests/fields/test_int_field.py
index 549356c0d..d673354ce 100644
--- a/tests/fields/test_int_field.py
+++ b/tests/fields/test_int_field.py
@@ -1,4 +1,5 @@
 import pytest
+from bson import Int64
 
 from mongoengine import *
 from tests.utils import MongoDBTestCase
@@ -42,3 +43,25 @@ class TestDocument(Document):
 
         assert 1 == TestDocument.objects(int_fld__ne=None).count()
         assert 1 == TestDocument.objects(int_fld__ne=1).count()
+
+    def test_int_field_long_field_migration(self):
+        class DeprecatedLongField(IntField):
+            """64-bit integer field. (Equivalent to IntField since the support to Python2 was dropped)"""
+
+            def to_mongo(self, value):
+                return Int64(value)
+
+        class TestDocument(Document):
+            long = DeprecatedLongField()
+
+        TestDocument.drop_collection()
+        TestDocument(long=10).save()
+
+        v = TestDocument.objects().first().long
+
+        # simulate a migration to IntField
+        class TestDocument(Document):
+            long = IntField()
+
+        assert TestDocument.objects(long=10).count() == 1
+        assert TestDocument.objects().first().long == v
diff --git a/tests/fields/test_long_field.py b/tests/fields/test_long_field.py
deleted file mode 100644
index 5b73102fe..000000000
--- a/tests/fields/test_long_field.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import pytest
-from bson.int64 import Int64
-
-from mongoengine import *
-from mongoengine.connection import get_db
-from tests.utils import MongoDBTestCase, get_as_pymongo
-
-
-class TestLongField(MongoDBTestCase):
-    def test_storage(self):
-        class Person(Document):
-            value = LongField()
-
-        Person.drop_collection()
-        person = Person(value=5000)
-        person.save()
-        assert get_as_pymongo(person) == {"_id": person.id, "value": 5000}
-
-    def test_construction_does_not_fail_with_invalid_value(self):
-        class Person(Document):
-            value = LongField()
-
-        person = Person(value="not_an_int")
-        assert person.value == "not_an_int"
-
-    def test_long_field_is_considered_as_int64(self):
-        """
-        Tests that long fields are stored as long in mongo, even if long
-        value is small enough to be an int.
-        """
-
-        class TestLongFieldConsideredAsInt64(Document):
-            some_long = LongField()
-
-        doc = TestLongFieldConsideredAsInt64(some_long=42).save()
-        db = get_db()
-        assert isinstance(
-            db.test_long_field_considered_as_int64.find()[0]["some_long"], Int64
-        )
-        assert isinstance(doc.some_long, int)
-
-    def test_long_validation(self):
-        """Ensure that invalid values cannot be assigned to long fields."""
-
-        class TestDocument(Document):
-            value = LongField(min_value=0, max_value=110)
-
-        TestDocument(value=50).validate()
-
-        with pytest.raises(ValidationError):
-            TestDocument(value=-1).validate()
-
-        with pytest.raises(ValidationError):
-            TestDocument(value=120).validate()
-
-        with pytest.raises(ValidationError):
-            TestDocument(value="ten").validate()
-
-    def test_long_ne_operator(self):
-        class TestDocument(Document):
-            long_fld = LongField()
-
-        TestDocument.drop_collection()
-
-        TestDocument(long_fld=None).save()
-        TestDocument(long_fld=1).save()
-
-        assert TestDocument.objects(long_fld__ne=None).count() == 1
-        assert TestDocument.objects(long_fld__ne=1).count() == 1

From f0de61ea194830cf70528b1775e1889a9404a33e Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 2 Oct 2024 22:19:07 +0200
Subject: [PATCH 1485/1519] refactor _document_registry + log a warning when
 user register multiple Document classes with the same name (only flagging
 when this happens in different module)

---
 docs/changelog.rst              |  3 ++
 mongoengine/base/__init__.py    |  3 +-
 mongoengine/base/common.py      | 77 +++++++++++++++++++++++----------
 mongoengine/base/document.py    |  6 +--
 mongoengine/base/metaclasses.py |  4 +-
 mongoengine/dereference.py      | 20 ++++-----
 mongoengine/document.py         |  6 +--
 mongoengine/fields.py           | 20 ++++-----
 mongoengine/queryset/base.py    |  6 ++-
 tests/document/test_instance.py |  8 ++--
 tests/fields/test_fields.py     |  4 +-
 11 files changed, 96 insertions(+), 61 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 01f6c3236..887a67773 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,8 @@ Development
     - make sure to read https://www.mongodb.com/docs/manual/core/transactions-in-applications/#callback-api-vs-core-api
     - run_in_transaction context manager relies on Pymongo coreAPI, it will retry automatically in case of `UnknownTransactionCommitResult` but not `TransientTransactionError` exceptions
     - Using .count() in a transaction will always use Collection.count_document (as estimated_document_count is not supported in transactions)
+- BREAKING CHANGE: wrap _document_registry (normally not used by end users) with _DocumentRegistry which acts as a singleton to access the registry
+- Log a warning in case users creates multiple Document classes with the same name as it can lead to unexpected behavior #1778
 - Fix use of $geoNear or $collStats in aggregate #2493
 - BREAKING CHANGE: Further to the deprecation warning, remove ability to use an unpacked list to `Queryset.aggregate(*pipeline)`, a plain list must be provided instead `Queryset.aggregate(pipeline)`, as it's closer to pymongo interface
 - BREAKING CHANGE: Further to the deprecation warning, remove `full_response` from `QuerySet.modify` as it wasn't supported with Pymongo 3+
@@ -21,6 +23,7 @@ Development
 - BREAKING CHANGE: Remove LongField as it's equivalent to IntField since we drop support to Python2 long time ago (User should simply switch to IntField) #2309
 - BugFix - Calling .clear on a ListField wasn't being marked as changed (and flushed to db upon .save()) #2858
 
+
 Changes in 0.29.0
 =================
 - Fix weakref in EmbeddedDocumentListField (causing brief mem leak in certain circumstances) #2827
diff --git a/mongoengine/base/__init__.py b/mongoengine/base/__init__.py
index dca0c4bb7..a2c88aae6 100644
--- a/mongoengine/base/__init__.py
+++ b/mongoengine/base/__init__.py
@@ -13,8 +13,7 @@
 __all__ = (
     # common
     "UPDATE_OPERATORS",
-    "_document_registry",
-    "get_document",
+    "_DocumentRegistry",
     # datastructures
     "BaseDict",
     "BaseList",
diff --git a/mongoengine/base/common.py b/mongoengine/base/common.py
index 85897324f..fe631a40e 100644
--- a/mongoengine/base/common.py
+++ b/mongoengine/base/common.py
@@ -1,6 +1,8 @@
+import warnings
+
 from mongoengine.errors import NotRegistered
 
-__all__ = ("UPDATE_OPERATORS", "get_document", "_document_registry")
+__all__ = ("UPDATE_OPERATORS", "_DocumentRegistry")
 
 
 UPDATE_OPERATORS = {
@@ -25,28 +27,57 @@
 _document_registry = {}
 
 
-def get_document(name):
-    """Get a registered Document class by name."""
-    doc = _document_registry.get(name, None)
-    if not doc:
-        # Possible old style name
-        single_end = name.split(".")[-1]
-        compound_end = ".%s" % single_end
-        possible_match = [
-            k for k in _document_registry if k.endswith(compound_end) or k == single_end
-        ]
-        if len(possible_match) == 1:
-            doc = _document_registry.get(possible_match.pop(), None)
-    if not doc:
-        raise NotRegistered(
-            """
-            `%s` has not been registered in the document registry.
-            Importing the document class automatically registers it, has it
-            been imported?
-        """.strip()
-            % name
-        )
-    return doc
+class _DocumentRegistry:
+    """Wrapper for the document registry (providing a singleton pattern).
+    This is part of MongoEngine's internals, not meant to be used directly by end-users
+    """
+
+    @staticmethod
+    def get(name):
+        doc = _document_registry.get(name, None)
+        if not doc:
+            # Possible old style name
+            single_end = name.split(".")[-1]
+            compound_end = ".%s" % single_end
+            possible_match = [
+                k
+                for k in _document_registry
+                if k.endswith(compound_end) or k == single_end
+            ]
+            if len(possible_match) == 1:
+                doc = _document_registry.get(possible_match.pop(), None)
+        if not doc:
+            raise NotRegistered(
+                """
+                `%s` has not been registered in the document registry.
+                Importing the document class automatically registers it, has it
+                been imported?
+            """.strip()
+                % name
+            )
+        return doc
+
+    @staticmethod
+    def register(DocCls):
+        ExistingDocCls = _document_registry.get(DocCls._class_name)
+        if (
+            ExistingDocCls is not None
+            and ExistingDocCls.__module__ != DocCls.__module__
+        ):
+            # A sign that a codebase may have named two different classes with the same name accidentally,
+            # this could cause issues with dereferencing because MongoEngine makes the assumption that a Document
+            # class name is unique.
+            warnings.warn(
+                f"Multiple Document classes named `{DocCls._class_name}` were registered, "
+                f"first from: `{ExistingDocCls.__module__}`, then from: `{DocCls.__module__}`. "
+                "this may lead to unexpected behavior during dereferencing.",
+                stacklevel=4,
+            )
+        _document_registry[DocCls._class_name] = DocCls
+
+    @staticmethod
+    def unregister(doc_cls_name):
+        _document_registry.pop(doc_cls_name)
 
 
 def _get_documents_by_db(connection_alias, default_connection_alias):
diff --git a/mongoengine/base/document.py b/mongoengine/base/document.py
index 00db2c218..ea3962ad7 100644
--- a/mongoengine/base/document.py
+++ b/mongoengine/base/document.py
@@ -7,7 +7,7 @@
 from bson import SON, DBRef, ObjectId, json_util
 
 from mongoengine import signals
-from mongoengine.base.common import get_document
+from mongoengine.base.common import _DocumentRegistry
 from mongoengine.base.datastructures import (
     BaseDict,
     BaseList,
@@ -500,7 +500,7 @@ def __expand_dynamic_values(self, name, value):
         # If the value is a dict with '_cls' in it, turn it into a document
         is_dict = isinstance(value, dict)
         if is_dict and "_cls" in value:
-            cls = get_document(value["_cls"])
+            cls = _DocumentRegistry.get(value["_cls"])
             return cls(**value)
 
         if is_dict:
@@ -802,7 +802,7 @@ def _from_son(cls, son, _auto_dereference=True, created=False):
 
         # Return correct subclass for document type
         if class_name != cls._class_name:
-            cls = get_document(class_name)
+            cls = _DocumentRegistry.get(class_name)
 
         errors_dict = {}
 
diff --git a/mongoengine/base/metaclasses.py b/mongoengine/base/metaclasses.py
index a48bde959..a311aa167 100644
--- a/mongoengine/base/metaclasses.py
+++ b/mongoengine/base/metaclasses.py
@@ -1,7 +1,7 @@
 import itertools
 import warnings
 
-from mongoengine.base.common import _document_registry
+from mongoengine.base.common import _DocumentRegistry
 from mongoengine.base.fields import (
     BaseField,
     ComplexBaseField,
@@ -169,7 +169,7 @@ def __new__(mcs, name, bases, attrs):
             new_class._collection = None
 
         # Add class to the _document_registry
-        _document_registry[new_class._class_name] = new_class
+        _DocumentRegistry.register(new_class)
 
         # Handle delete rules
         for field in new_class._fields.values():
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
index 1f4f7594c..38da2e873 100644
--- a/mongoengine/dereference.py
+++ b/mongoengine/dereference.py
@@ -5,7 +5,7 @@
     BaseList,
     EmbeddedDocumentList,
     TopLevelDocumentMetaclass,
-    get_document,
+    _DocumentRegistry,
 )
 from mongoengine.base.datastructures import LazyReference
 from mongoengine.connection import _get_session, get_db
@@ -131,9 +131,9 @@ def _find_references(self, items, depth=0):
                     elif isinstance(v, DBRef):
                         reference_map.setdefault(field.document_type, set()).add(v.id)
                     elif isinstance(v, (dict, SON)) and "_ref" in v:
-                        reference_map.setdefault(get_document(v["_cls"]), set()).add(
-                            v["_ref"].id
-                        )
+                        reference_map.setdefault(
+                            _DocumentRegistry.get(v["_cls"]), set()
+                        ).add(v["_ref"].id)
                     elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                         field_cls = getattr(
                             getattr(field, "field", None), "document_type", None
@@ -151,9 +151,9 @@ def _find_references(self, items, depth=0):
             elif isinstance(item, DBRef):
                 reference_map.setdefault(item.collection, set()).add(item.id)
             elif isinstance(item, (dict, SON)) and "_ref" in item:
-                reference_map.setdefault(get_document(item["_cls"]), set()).add(
-                    item["_ref"].id
-                )
+                reference_map.setdefault(
+                    _DocumentRegistry.get(item["_cls"]), set()
+                ).add(item["_ref"].id)
             elif isinstance(item, (dict, list, tuple)) and depth - 1 <= self.max_depth:
                 references = self._find_references(item, depth - 1)
                 for key, refs in references.items():
@@ -198,9 +198,9 @@ def _fetch_objects(self, doc_type=None):
                     )
                     for ref in references:
                         if "_cls" in ref:
-                            doc = get_document(ref["_cls"])._from_son(ref)
+                            doc = _DocumentRegistry.get(ref["_cls"])._from_son(ref)
                         elif doc_type is None:
-                            doc = get_document(
+                            doc = _DocumentRegistry.get(
                                 "".join(x.capitalize() for x in collection.split("_"))
                             )._from_son(ref)
                         else:
@@ -235,7 +235,7 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                     (items["_ref"].collection, items["_ref"].id), items
                 )
             elif "_cls" in items:
-                doc = get_document(items["_cls"])._from_son(items)
+                doc = _DocumentRegistry.get(items["_cls"])._from_son(items)
                 _cls = doc._data.pop("_cls", None)
                 del items["_cls"]
                 doc._data = self._attach_objects(doc._data, depth, doc, None)
diff --git a/mongoengine/document.py b/mongoengine/document.py
index 4907589e9..829c07135 100644
--- a/mongoengine/document.py
+++ b/mongoengine/document.py
@@ -12,7 +12,7 @@
     DocumentMetaclass,
     EmbeddedDocumentList,
     TopLevelDocumentMetaclass,
-    get_document,
+    _DocumentRegistry,
 )
 from mongoengine.base.utils import NonOrderedList
 from mongoengine.common import _import_class
@@ -851,12 +851,12 @@ def register_delete_rule(cls, document_cls, field_name, rule):
         object.
         """
         classes = [
-            get_document(class_name)
+            _DocumentRegistry.get(class_name)
             for class_name in cls._subclasses
             if class_name != cls.__name__
         ] + [cls]
         documents = [
-            get_document(class_name)
+            _DocumentRegistry.get(class_name)
             for class_name in document_cls._subclasses
             if class_name != document_cls.__name__
         ] + [document_cls]
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index c74539691..e9cf5b817 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -30,7 +30,7 @@
     GeoJsonBaseField,
     LazyReference,
     ObjectIdField,
-    get_document,
+    _DocumentRegistry,
 )
 from mongoengine.base.utils import LazyRegexCompiler
 from mongoengine.common import _import_class
@@ -725,7 +725,7 @@ def document_type(self):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 resolved_document_type = self.owner_document
             else:
-                resolved_document_type = get_document(self.document_type_obj)
+                resolved_document_type = _DocumentRegistry.get(self.document_type_obj)
 
             if not issubclass(resolved_document_type, EmbeddedDocument):
                 # Due to the late resolution of the document_type
@@ -801,7 +801,7 @@ def prepare_query_value(self, op, value):
 
     def to_python(self, value):
         if isinstance(value, dict):
-            doc_cls = get_document(value["_cls"])
+            doc_cls = _DocumentRegistry.get(value["_cls"])
             value = doc_cls._from_son(value)
 
         return value
@@ -879,7 +879,7 @@ def to_mongo(self, value, use_db_field=True, fields=None):
 
     def to_python(self, value):
         if isinstance(value, dict) and "_cls" in value:
-            doc_cls = get_document(value["_cls"])
+            doc_cls = _DocumentRegistry.get(value["_cls"])
             if "_ref" in value:
                 value = doc_cls._get_db().dereference(
                     value["_ref"], session=_get_session()
@@ -1171,7 +1171,7 @@ def document_type(self):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 self.document_type_obj = self.owner_document
             else:
-                self.document_type_obj = get_document(self.document_type_obj)
+                self.document_type_obj = _DocumentRegistry.get(self.document_type_obj)
         return self.document_type_obj
 
     @staticmethod
@@ -1195,7 +1195,7 @@ def __get__(self, instance, owner):
         if auto_dereference and isinstance(ref_value, DBRef):
             if hasattr(ref_value, "cls"):
                 # Dereference using the class type specified in the reference
-                cls = get_document(ref_value.cls)
+                cls = _DocumentRegistry.get(ref_value.cls)
             else:
                 cls = self.document_type
 
@@ -1335,7 +1335,7 @@ def document_type(self):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 self.document_type_obj = self.owner_document
             else:
-                self.document_type_obj = get_document(self.document_type_obj)
+                self.document_type_obj = _DocumentRegistry.get(self.document_type_obj)
         return self.document_type_obj
 
     @staticmethod
@@ -1498,7 +1498,7 @@ def __get__(self, instance, owner):
 
         auto_dereference = instance._fields[self.name]._auto_dereference
         if auto_dereference and isinstance(value, dict):
-            doc_cls = get_document(value["_cls"])
+            doc_cls = _DocumentRegistry.get(value["_cls"])
             instance._data[self.name] = self._lazy_load_ref(doc_cls, value["_ref"])
 
         return super().__get__(instance, owner)
@@ -2443,7 +2443,7 @@ def document_type(self):
             if self.document_type_obj == RECURSIVE_REFERENCE_CONSTANT:
                 self.document_type_obj = self.owner_document
             else:
-                self.document_type_obj = get_document(self.document_type_obj)
+                self.document_type_obj = _DocumentRegistry.get(self.document_type_obj)
         return self.document_type_obj
 
     def build_lazyref(self, value):
@@ -2584,7 +2584,7 @@ def build_lazyref(self, value):
         elif value is not None:
             if isinstance(value, (dict, SON)):
                 value = LazyReference(
-                    get_document(value["_cls"]),
+                    _DocumentRegistry.get(value["_cls"]),
                     value["_ref"].id,
                     passthrough=self.passthrough,
                 )
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index aef996996..f04ef06c5 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -13,7 +13,7 @@
 from pymongo.read_concern import ReadConcern
 
 from mongoengine import signals
-from mongoengine.base import get_document
+from mongoengine.base import _DocumentRegistry
 from mongoengine.common import _import_class
 from mongoengine.connection import _get_session, get_db
 from mongoengine.context_managers import (
@@ -1956,7 +1956,9 @@ def _fields_to_dbfields(self, fields):
         """Translate fields' paths to their db equivalents."""
         subclasses = []
         if self._document._meta["allow_inheritance"]:
-            subclasses = [get_document(x) for x in self._document._subclasses][1:]
+            subclasses = [_DocumentRegistry.get(x) for x in self._document._subclasses][
+                1:
+            ]
 
         db_field_paths = []
         for field in fields:
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index 89645e3ef..c5970420f 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -13,7 +13,7 @@
 
 from mongoengine import *
 from mongoengine import signals
-from mongoengine.base import _document_registry, get_document
+from mongoengine.base import _DocumentRegistry
 from mongoengine.connection import get_db
 from mongoengine.context_managers import query_counter, switch_db
 from mongoengine.errors import (
@@ -392,7 +392,7 @@ class NicePlace(Place):
 
         # Mimic Place and NicePlace definitions being in a different file
         # and the NicePlace model not being imported in at query time.
-        del _document_registry["Place.NicePlace"]
+        _DocumentRegistry.unregister("Place.NicePlace")
 
         with pytest.raises(NotRegistered):
             list(Place.objects.all())
@@ -407,8 +407,8 @@ class Area(Location):
 
         Location.drop_collection()
 
-        assert Area == get_document("Area")
-        assert Area == get_document("Location.Area")
+        assert Area == _DocumentRegistry.get("Area")
+        assert Area == _DocumentRegistry.get("Location.Area")
 
     def test_creation(self):
         """Ensure that document may be created using keyword arguments."""
diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 5655f12e2..8980b6037 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -37,7 +37,7 @@
 from mongoengine.base import (
     BaseField,
     EmbeddedDocumentList,
-    _document_registry,
+    _DocumentRegistry,
 )
 from mongoengine.base.fields import _no_dereference_for_fields
 from mongoengine.errors import DeprecatedError
@@ -1678,7 +1678,7 @@ class User(Document):
 
         # Mimic User and Link definitions being in a different file
         # and the Link model not being imported in the User file.
-        del _document_registry["Link"]
+        _DocumentRegistry.unregister("Link")
 
         user = User.objects.first()
         try:

From 9f9cd0acd5cd1851e71de3dee983075ee2ded99c Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 8 Oct 2024 22:29:31 +0200
Subject: [PATCH 1486/1519] support .where() with modify (previously silently
 ignored)

---
 docs/changelog.rst              |  2 +-
 mongoengine/queryset/base.py    |  5 +++
 tests/queryset/test_queryset.py | 57 ++++++++++++++++++++++++++++++++-
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 887a67773..95aeb3ce0 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -22,7 +22,7 @@ Development
 - Add support for collation/hint/comment to delete/update and aggregate #2842
 - BREAKING CHANGE: Remove LongField as it's equivalent to IntField since we drop support to Python2 long time ago (User should simply switch to IntField) #2309
 - BugFix - Calling .clear on a ListField wasn't being marked as changed (and flushed to db upon .save()) #2858
-
+- BugFix - Take `where()` into account when using `.modify()`, as in MyDocument.objects().where("this[field] >= this[otherfield]").modify(field='new') #2044
 
 Changes in 0.29.0
 =================
diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py
index f04ef06c5..2db97ddb7 100644
--- a/mongoengine/queryset/base.py
+++ b/mongoengine/queryset/base.py
@@ -727,6 +727,11 @@ def modify(
 
         queryset = self.clone()
         query = queryset._query
+
+        if self._where_clause:
+            where_clause = self._sub_js_fields(self._where_clause)
+            query["$where"] = where_clause
+
         if not remove:
             update = transform.update(queryset._document, **update)
         sort = queryset._ordering
diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py
index 0b8773c2b..8386249f2 100644
--- a/tests/queryset/test_queryset.py
+++ b/tests/queryset/test_queryset.py
@@ -28,6 +28,7 @@
 from mongoengine.queryset.base import BaseQuerySet
 from tests.utils import (
     db_ops_tracker,
+    get_as_pymongo,
     requires_mongodb_gte_42,
     requires_mongodb_gte_44,
     requires_mongodb_lt_42,
@@ -4456,7 +4457,7 @@ class Comment(Document):
         ]
         assert ([("_cls", 1), ("message", 1)], False, False) in info
 
-    def test_where(self):
+    def test_where_query(self):
         """Ensure that where clauses work."""
 
         class IntPair(Document):
@@ -4499,6 +4500,60 @@ class IntPair(Document):
         with pytest.raises(TypeError):
             list(IntPair.objects.where(fielda__gte=3))
 
+    def test_where_query_field_name_subs(self):
+        class DomainObj(Document):
+            field_1 = StringField(db_field="field_2")
+
+        DomainObj.drop_collection()
+
+        DomainObj(field_1="test").save()
+
+        obj = DomainObj.objects.where("this[~field_1] == 'NOTMATCHING'")
+        assert not list(obj)
+
+        obj = DomainObj.objects.where("this[~field_1] == 'test'")
+        assert list(obj)
+
+    def test_where_modify(self):
+        class DomainObj(Document):
+            field = StringField()
+
+        DomainObj.drop_collection()
+
+        DomainObj(field="test").save()
+
+        obj = DomainObj.objects.where("this[~field] == 'NOTMATCHING'")
+        assert not list(obj)
+
+        obj = DomainObj.objects.where("this[~field] == 'test'")
+        assert list(obj)
+
+        qs = DomainObj.objects.where("this[~field] == 'NOTMATCHING'").modify(
+            field="new"
+        )
+        assert not qs
+
+        qs = DomainObj.objects.where("this[~field] == 'test'").modify(field="new")
+        assert qs
+
+    def test_where_modify_field_name_subs(self):
+        class DomainObj(Document):
+            field_1 = StringField(db_field="field_2")
+
+        DomainObj.drop_collection()
+
+        DomainObj(field_1="test").save()
+
+        obj = DomainObj.objects.where("this[~field_1] == 'NOTMATCHING'").modify(
+            field_1="new"
+        )
+        assert not obj
+
+        obj = DomainObj.objects.where("this[~field_1] == 'test'").modify(field_1="new")
+        assert obj
+
+        assert get_as_pymongo(obj) == {"_id": obj.id, "field_2": "new"}
+
     def test_scalar(self):
         class Organization(Document):
             name = StringField()

From 4a44eeb1c90982faa5f842fa9fe4d2431eeeaaec Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 8 Oct 2024 22:54:24 +0200
Subject: [PATCH 1487/1519] Improve error message in case a document assigned
 to a ReferenceField wasn't saved yet

---
 docs/changelog.rst                   |  2 +-
 mongoengine/fields.py                | 53 ++++++++++------------------
 tests/fields/test_reference_field.py | 14 +++++---
 3 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 887a67773..014a83991 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -22,7 +22,7 @@ Development
 - Add support for collation/hint/comment to delete/update and aggregate #2842
 - BREAKING CHANGE: Remove LongField as it's equivalent to IntField since we drop support to Python2 long time ago (User should simply switch to IntField) #2309
 - BugFix - Calling .clear on a ListField wasn't being marked as changed (and flushed to db upon .save()) #2858
-
+- Improve error message in case a document assigned to a ReferenceField wasn't saved yet #1955
 
 Changes in 0.29.0
 =================
diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e9cf5b817..980098dfb 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -111,6 +111,14 @@
 RECURSIVE_REFERENCE_CONSTANT = "self"
 
 
+def _unsaved_object_error(document):
+    return (
+        f"The instance of the document '{document}' you are "
+        "trying to reference has an empty 'id'. You can only reference "
+        "documents once they have been saved to the database"
+    )
+
+
 class StringField(BaseField):
     """A unicode string field."""
 
@@ -1215,10 +1223,7 @@ def to_mongo(self, document):
 
             # XXX ValidationError raised outside of the "validate" method.
             if id_ is None:
-                self.error(
-                    "You can only reference documents once they have"
-                    " been saved to the database"
-                )
+                self.error(_unsaved_object_error(document.__class__.__name__))
 
             # Use the attributes from the document instance, so that they
             # override the attributes of this field's document type
@@ -1262,10 +1267,7 @@ def validate(self, value):
             )
 
         if isinstance(value, Document) and value.id is None:
-            self.error(
-                "You can only reference documents once they have been "
-                "saved to the database"
-            )
+            self.error(_unsaved_object_error(value.__class__.__name__))
 
     def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
@@ -1370,10 +1372,7 @@ def to_mongo(self, document, use_db_field=True, fields=None):
             # We need the id from the saved object to create the DBRef
             id_ = document.pk
             if id_ is None:
-                self.error(
-                    "You can only reference documents once they have"
-                    " been saved to the database"
-                )
+                self.error(_unsaved_object_error(document.__class__.__name__))
         else:
             self.error("Only accept a document object")
 
@@ -1394,10 +1393,7 @@ def prepare_query_value(self, op, value):
         # XXX ValidationError raised outside of the "validate" method.
         if isinstance(value, Document):
             if value.pk is None:
-                self.error(
-                    "You can only reference documents once they have"
-                    " been saved to the database"
-                )
+                self.error(_unsaved_object_error(value.__class__.__name__))
             value_dict = {"_id": value.pk}
             for field in self.fields:
                 value_dict.update({field: value[field]})
@@ -1411,10 +1407,7 @@ def validate(self, value):
             self.error("A CachedReferenceField only accepts documents")
 
         if isinstance(value, Document) and value.id is None:
-            self.error(
-                "You can only reference documents once they have been "
-                "saved to the database"
-            )
+            self.error(_unsaved_object_error(value.__class__.__name__))
 
     def lookup_member(self, member_name):
         return self.document_type._fields.get(member_name)
@@ -1513,10 +1506,7 @@ def validate(self, value):
 
         # We need the id from the saved object to create the DBRef
         elif isinstance(value, Document) and value.id is None:
-            self.error(
-                "You can only reference documents once they have been"
-                " saved to the database"
-            )
+            self.error(_unsaved_object_error(value.__class__.__name__))
 
     def to_mongo(self, document):
         if document is None:
@@ -1533,10 +1523,7 @@ def to_mongo(self, document):
             id_ = document.id
             if id_ is None:
                 # XXX ValidationError raised outside of the "validate" method.
-                self.error(
-                    "You can only reference documents once they have"
-                    " been saved to the database"
-                )
+                self.error(_unsaved_object_error(document.__class__.__name__))
         else:
             id_ = document
 
@@ -2535,10 +2522,7 @@ def validate(self, value):
                 )
 
         if pk is None:
-            self.error(
-                "You can only reference documents once they have been "
-                "saved to the database"
-            )
+            self.error(_unsaved_object_error(self.document_type.__name__))
 
     def prepare_query_value(self, op, value):
         if value is None:
@@ -2607,8 +2591,9 @@ def __get__(self, instance, owner):
     def validate(self, value):
         if isinstance(value, LazyReference) and value.pk is None:
             self.error(
-                "You can only reference documents once they have been"
-                " saved to the database"
+                _unsaved_object_error(
+                    self.__class__.__name__
+                )  # Actual class is difficult to predict here
             )
         return super().validate(value)
 
diff --git a/tests/fields/test_reference_field.py b/tests/fields/test_reference_field.py
index 94869f2ea..55ffb6845 100644
--- a/tests/fields/test_reference_field.py
+++ b/tests/fields/test_reference_field.py
@@ -20,7 +20,7 @@ class Test(Document):
         class NonDocumentSubClass:
             pass
 
-        # fails if given an non Document subclass
+        # fails if given a non Document subclass
         with pytest.raises(ValidationError, match=ERROR_MSG):
 
             class Test(Document):  # noqa: F811
@@ -46,12 +46,17 @@ class BlogPost(Document):
         with pytest.raises(ValidationError):
             ReferenceField(EmbeddedDocument)
 
-        user = User(name="Test User")
+        unsaved_user = User(name="Test User")
 
         # Ensure that the referenced object must have been saved
         post1 = BlogPost(content="Chips and gravy taste good.")
-        post1.author = user
-        with pytest.raises(ValidationError):
+        post1.author = unsaved_user
+        expected_error = (
+            "The instance of the document 'User' you are "
+            "trying to reference has an empty 'id'. You can only reference "
+            "documents once they have been saved to the database"
+        )
+        with pytest.raises(ValidationError, match=expected_error):
             post1.save()
 
         # Check that an invalid object type cannot be used
@@ -61,6 +66,7 @@ class BlogPost(Document):
             post1.validate()
 
         # Ensure ObjectID's are accepted as references
+        user = User(name="Test User")
         user_object_id = user.pk
         post3 = BlogPost(content="Chips and curry sauce taste good.")
         post3.author = user_object_id

From 164d66037292dc45766ad576dfc6d608cf8d86d1 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Sat, 19 Oct 2024 11:27:05 +0200
Subject: [PATCH 1488/1519] Add test for deepcopy and regex

---
 tests/document/test_instance.py | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index c5970420f..ae174d0cd 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -1,3 +1,4 @@
+import copy
 import os
 import pickle
 import unittest
@@ -3854,6 +3855,53 @@ class User(Document):
         with pytest.raises(DuplicateKeyError):
             User.objects().select_related()
 
+    def test_deepcopy(self):
+        regex_field = StringField(regex=r"(^ABC\d\d\d\d$)")
+        no_regex_field = StringField()
+        # Copy copied field object
+        copy.deepcopy(copy.deepcopy(regex_field))
+        copy.deepcopy(copy.deepcopy(no_regex_field))
+        # Copy same field object multiple times to make sure we restore __deepcopy__ correctly
+        copy.deepcopy(regex_field)
+        copy.deepcopy(regex_field)
+        copy.deepcopy(no_regex_field)
+        copy.deepcopy(no_regex_field)
+
+    def test_deepcopy_with_reference_itself(self):
+        class User(Document):
+            name = StringField(regex=r"(.*)")
+            other_user = ReferenceField("self")
+
+        user1 = User(name="John").save()
+        User(name="Bob", other_user=user1).save()
+
+        user1.other_user = user1
+        user1.save()
+        for u in User.objects:
+            copied_u = copy.deepcopy(u)
+            assert copied_u is not u
+            assert copied_u._fields["name"] is u._fields["name"]
+            assert (
+                copied_u._fields["name"].regex is u._fields["name"].regex
+            )  # Compiled regex objects are atomic
+
+    def test_from_son_with_auto_dereference_disabled(self):
+        class User(Document):
+            name = StringField(regex=r"(^ABC\d\d\d\d$)")
+
+        data = {"name": "ABC0000"}
+        user_obj = User._from_son(son=data, _auto_dereference=False)
+
+        assert user_obj._fields["name"] is not User.name
+        assert (
+            user_obj._fields["name"].regex is User.name.regex
+        )  # Compiled regex are atomic
+        copied_user = copy.deepcopy(user_obj)
+        assert user_obj._fields["name"] is not copied_user._fields["name"]
+        assert (
+            user_obj._fields["name"].regex is copied_user._fields["name"].regex
+        )  # Compiled regex are atomic
+
     def test_embedded_document_failed_while_loading_instance_when_it_is_not_a_dict(
         self,
     ):

From 7504670c50b5755877ce93f17842cfecf848f0d6 Mon Sep 17 00:00:00 2001
From: Mukund <159029180+MukundSinghRajput@users.noreply.github.com>
Date: Sun, 9 Feb 2025 14:16:02 +0530
Subject: [PATCH 1489/1519] refactor(models): add datetime import and replace
 deprecated utcnow

- Added `import datetime` to ensure datetime functionality is available
- Replaced deprecated `datetime.datetime.utcnow()` with `datetime.datetime.now(datetime.timezone.utc)`
- Used lambda for dynamic evaluation of default datetime in BlogPost.posted field
---
 README.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index d7cf6d3d6..696b0b385 100644
--- a/README.rst
+++ b/README.rst
@@ -77,19 +77,20 @@ Examples
 Some simple examples of what MongoEngine code looks like:
 
 .. code :: python
-
+    import datetime
     from mongoengine import *
+    
     connect('mydb')
-
+    
     class BlogPost(Document):
         title = StringField(required=True, max_length=200)
-        posted = DateTimeField(default=datetime.datetime.utcnow)
+        posted = DateTimeField(default=lambda: datetime.datetime.now(datetime.timezone.utc))
         tags = ListField(StringField(max_length=50))
         meta = {'allow_inheritance': True}
-
+    
     class TextPost(BlogPost):
         content = StringField(required=True)
-
+    
     class LinkPost(BlogPost):
         url = StringField(required=True)
 

From 02b23565842ad554f3f1a06a3867ae1eb09fa0d5 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 11:31:15 +0100
Subject: [PATCH 1490/1519] Add support MongoDB 8.0 and other pymongo versions

---
 .github/workflows/github-actions.yml | 42 ++++++++++++------
 .github/workflows/install_mongo.sh   | 64 +++++++++++++++++++---------
 .github/workflows/install_mongosh.sh | 45 +++++++++++++++++--
 tox.ini                              |  4 +-
 4 files changed, 119 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index df8d6b25b..a8cb4d155 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -15,10 +15,11 @@ on:
 env:
   MONGODB_3_6: 3.6.23
   MONGODB_4_0: 4.0.28
-  MONGODB_4_4: 4.4
-  MONGODB_5_0: "5.0"
-  MONGODB_6_0: "6.0"
-  MONGODB_7_0: "7.0"
+  MONGODB_4_4: 4.4.29
+  MONGODB_5_0: 5.0.31
+  MONGODB_6_0: 6.0.20
+  MONGODB_7_0: 7.0.17
+  MONGODB_8_0: 8.0.5
 
   PYMONGO_3_11: 3.11
   PYMONGO_3_12: 3.12
@@ -29,11 +30,13 @@ env:
   PYMONGO_4_6: 4.6.2
   PYMONGO_4_7: 4.7.3
   PYMONGO_4_8: 4.8.0
-  PYMONGO_4_9: 4.9
+  PYMONGO_4_9: 4.9.2
+  PYMONGO_4_10: 4.10.1
+  PYMONGO_4_11: 4.11.2
 
   MAIN_PYTHON_VERSION: 3.9
 
-  MONGOSH: 2.2.15 # Needed for MongoDB 6.0+
+  MONGOSH: 2.4.2 # Needed for MongoDB 6.0+
 
 jobs:
   linting:
@@ -44,7 +47,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: ${{ env.MAIN_PYTHON_VERSION }}
         check-latest: true
     - run: bash .github/workflows/install_ci_python_dep.sh
     - run: pre-commit run -a
@@ -56,7 +59,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9, pypy3.10]
+        python-version: [3.8, 3.9, 3.10, 3.11, 3.12, 3.13, pypy3.9, pypy3.10]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
@@ -87,6 +90,21 @@ jobs:
           - python-version: "3.11"
             MONGODB: $MONGODB_7_0
             PYMONGO: $PYMONGO_4_9
+          - python-version: "3.12"
+            MONGODB: $MONGODB_7_0
+            PYMONGO: $PYMONGO_4_9
+          - python-version: "3.12"
+            MONGODB: $MONGODB_8_0
+            PYMONGO: $PYMONGO_4_9
+          - python-version: "3.13"
+            MONGODB: $MONGODB_8_0
+            PYMONGO: $PYMONGO_4_9
+          - python-version: "3.13"
+            MONGODB: $MONGODB_8_0
+            PYMONGO: $PYMONGO_4_10
+          - python-version: "3.13"
+            MONGODB: $MONGODB_8_0
+            PYMONGO: $PYMONGO_4_11
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
@@ -122,7 +140,7 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: ${{ env.MAIN_PYTHON_VERSION }}
         check-latest: true
     - name: install python dep
       run: |
@@ -140,7 +158,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: ${{ env.MAIN_PYTHON_VERSION }}
         check-latest: true
     - name: build dummy wheel for test-pypi
       run: |
@@ -153,10 +171,10 @@ jobs:
     if: github.event_name == 'create' && startsWith(github.ref, 'refs/tags/v')
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python 3.9
+    - name: Set up Python ${{ env.MAIN_PYTHON_VERSION }}
       uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: ${{ env.MAIN_PYTHON_VERSION }}
         check-latest: true
     # todo separate build from publish
     # https://stackoverflow.com/questions/59349905/which-properties-does-github-event-in-a-github-workflow-have
diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
index aece5f1e2..f07606bec 100644
--- a/.github/workflows/install_mongo.sh
+++ b/.github/workflows/install_mongo.sh
@@ -1,24 +1,50 @@
 #!/bin/bash
 
-MONGODB=$1
-
-# Mongo > 4.0 follows different name convention for download links
-mongo_build=mongodb-linux-x86_64-${MONGODB}
-
-if [[ "$MONGODB" == *"4.2"* ]]; then
-  mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
-elif [[ "$MONGODB" == *"4.4"* ]]; then
-  mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
-elif [[ "$MONGODB" == *"5.0"* ]]; then
-  mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
-elif [[ "$MONGODB" == *"6.0"* ]]; then
-  mongo_build=mongodb-linux-x86_64-ubuntu1804-v${MONGODB}-latest
-elif [[ "$MONGODB" == *"7.0"* ]]; then
-  mongo_build=mongodb-linux-x86_64-ubuntu2004-v${MONGODB}-latest
+set -e  # Exit immediately if a command exits with a non-zero status
+set -u  # Treat unset variables as an error
+
+if [ "$#" -ne 1 ]; then
+  echo "Usage: $0 <mongodb-version>"
+  echo "Example: $0 8.0.5"
+  exit 1
+fi
+
+MONGODB="$1"
+
+# Determine build name based on version
+if [[ "${MONGODB}" =~ ^(7.0|8.0) ]]; then
+  mongo_build="mongodb-linux-x86_64-ubuntu2004-${MONGODB}"
+elif [[ "${MONGODB}" =~ ^(4.0|4.2|4.4|5.0|6.0) ]]; then
+  mongo_build="mongodb-linux-x86_64-ubuntu1804-${MONGODB}"
+else
+  echo "Error: Unsupported MongoDB version: ${MONGODB}"
+  usage
+fi
+
+download_url="http://fastdl.mongodb.org/linux/$%7Bmongo_build%7D.tgz"
+tarball="${mongo_build}.tgz"
+
+echo "Downloading MongoDB from ${download_url}..."
+if ! wget --quiet "${download_url}"; then
+  echo "Error: Failed to download MongoDB."
+  exit 1
+fi
+
+echo "Extracting ${tarball}..."
+if ! tar xzf "${tarball}"; then
+  echo "Error: Failed to extract ${tarball}"
+  exit 1
+fi
+
+mongodb_dir=$(find "${PWD}/" -type d -name "mongodb-linux-x86_64*" | head -n 1)
+if [ -z "${mongodb_dir}" ]; then
+  echo "Error: Could not find MongoDB directory after extraction."
+  exit 1
 fi
 
-wget http://fastdl.mongodb.org/linux/$mongo_build.tgz
-tar xzf $mongo_build.tgz
+echo "MongoDB installed at: ${mongodb_dir}"
+"${mongodb_dir}/bin/mongod" --version
 
-mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
-$mongodb_dir/bin/mongod --version
+# Cleanup
+echo "Cleaning up..."
+rm -f "${tarball}"
diff --git a/.github/workflows/install_mongosh.sh b/.github/workflows/install_mongosh.sh
index aded1826f..42b08abce 100644
--- a/.github/workflows/install_mongosh.sh
+++ b/.github/workflows/install_mongosh.sh
@@ -1,15 +1,52 @@
 #!/bin/bash
 
+set -e  # Exit immediately if a command exits with a non-zero status
+set -u  # Treat unset variables as an error
+
+if [ $# -lt 2 ]; then
+    echo "Usage: $0 <mongodb_version> <mongosh_version>"
+    echo "Example: $0 8.0.5 2.4.2"
+    exit 1
+fi
+
 MONGODB=$1
 MONGOSH=$2
 
+PLATFORM="linux-x64"
+
 if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
   echo "mongosh is not needed for MongoDB versions less than 6.0"
   exit 0
 fi
 
-wget https://downloads.mongodb.com/compass/mongosh-${MONGOSH}-linux-x64.tgz
-tar xzf mongosh-${MONGOSH}-linux-x64.tgz
+DOWNLOAD_URL="https://downloads.mongodb.com/compass/mongosh-$%7BMONGOSH%7D-$%7BPLATFORM%7D.tgz"
+TARBALL="mongosh-${MONGOSH}-${PLATFORM}.tgz"
+
+echo "Downloading mongosh ${MONGOSH} for ${PLATFORM}..."
+if ! wget -q --show-progress "$DOWNLOAD_URL"; then
+    echo "Failed to download mongosh. Please check the version and your internet connection."
+    exit 1
+fi
+
+echo "Extracting mongosh..."
+if ! tar xzf "$TARBALL"; then
+    echo "Failed to extract mongosh."
+    rm -f "$TARBALL"
+    exit 1
+fi
+
+mongosh_dir=$(find "${PWD}/" -type d -name "mongosh-${MONGOSH}-${PLATFORM}" -print -quit)
+if [ ! -d "$mongosh_dir" ]; then
+    echo "Failed to find extracted mongosh directory."
+    rm -f "$TARBALL"
+    exit 1
+fi
+
+echo "Testing mongosh installation..."
+if ! "$mongosh_dir/bin/mongosh" --version; then
+    echo "Failed to run mongosh."
+    exit 1
+fi
 
-mongosh_dir=$(find ${PWD}/ -type d -name "mongosh-${MONGOSH}-linux-x64")
-$mongosh_dir/bin/mongosh --version
+echo "Cleaning up..."
+rm -f "$TARBALL"
diff --git a/tox.ini b/tox.ini
index 0db203642..b4beaa7b6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg34,mg36,mg39,mg311,mg312,mg4,mg432,mg441,mg462,mg473,mg480,mg49}
+envlist = pypy3-{mg311,mg312,mg313,mg4,mg433,mg441,mg462,mg473,mg480,mg49,mg410,mg411}
 skipsdist = True
 
 [testenv]
@@ -17,5 +17,7 @@ deps =
     mg473: pymongo>=4.7,<4.8
     mg480: pymongo>=4.8,<4.9
     mg49: pymongo>=4.9,<5.0
+    mg410: pymongo>=4.10,<5.0
+    mg411: pymongo>=4.11,<5.0
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 0c2101b467136de140a44e4d40bb573546163946 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 11:36:40 +0100
Subject: [PATCH 1491/1519] Add quotes

---
 .github/workflows/github-actions.yml | 48 ++++++++++++++--------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index a8cb4d155..fc0086649 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -13,30 +13,30 @@ on:
     tags:
       - 'v[0-9]+\.[0-9]+\.[0-9]+*'
 env:
-  MONGODB_3_6: 3.6.23
-  MONGODB_4_0: 4.0.28
-  MONGODB_4_4: 4.4.29
-  MONGODB_5_0: 5.0.31
-  MONGODB_6_0: 6.0.20
-  MONGODB_7_0: 7.0.17
-  MONGODB_8_0: 8.0.5
+  MONGODB_3_6: "3.6.23"
+  MONGODB_4_0: "4.0.28"
+  MONGODB_4_4: "4.4.29"
+  MONGODB_5_0: "5.0.31"
+  MONGODB_6_0: "6.0.20"
+  MONGODB_7_0: "7.0.17"
+  MONGODB_8_0: "8.0.5"
 
-  PYMONGO_3_11: 3.11
-  PYMONGO_3_12: 3.12
-  PYMONGO_3_13: 3.13
-  PYMONGO_4_0: 4.0
-  PYMONGO_4_3: 4.3.3
-  PYMONGO_4_4: 4.4.1
-  PYMONGO_4_6: 4.6.2
-  PYMONGO_4_7: 4.7.3
-  PYMONGO_4_8: 4.8.0
-  PYMONGO_4_9: 4.9.2
-  PYMONGO_4_10: 4.10.1
-  PYMONGO_4_11: 4.11.2
+  PYMONGO_3_11: "3.11.3"
+  PYMONGO_3_12: "3.12.3"
+  PYMONGO_3_13: "3.13.0"
+  PYMONGO_4_0:  "4.0.2"
+  PYMONGO_4_3:  "4.3.3"
+  PYMONGO_4_4:  "4.4.1"
+  PYMONGO_4_6:  "4.6.2"
+  PYMONGO_4_7:  "4.7.3"
+  PYMONGO_4_8:  "4.8.0"
+  PYMONGO_4_9:  "4.9.2"
+  PYMONGO_4_10: "4.10.1"
+  PYMONGO_4_11: "4.11.2"
 
-  MAIN_PYTHON_VERSION: 3.9
+  MAIN_PYTHON_VERSION: "3.9"
 
-  MONGOSH: 2.4.2 # Needed for MongoDB 6.0+
+  MONGOSH: "2.4.2" # Needed for MongoDB 6.0+
 
 jobs:
   linting:
@@ -59,14 +59,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, 3.10, 3.11, 3.12, 3.13, pypy3.9, pypy3.10]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", pypy3.9, pypy3.10]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
-          - python-version: 3.8
+          - python-version: "3.8"
             MONGODB: $MONGODB_3_6
             PYMONGO: $PYMONGO_3_12
-          - python-version: 3.9
+          - python-version: "3.9"
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_13
           - python-version: "3.10"

From 3621b4c83e5adf160b320c020fc6ee0125daa996 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 11:40:56 +0100
Subject: [PATCH 1492/1519] Drop mongodb 3.6 and python 3.8

---
 .github/workflows/github-actions.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index fc0086649..9b7acca5a 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -13,15 +13,14 @@ on:
     tags:
       - 'v[0-9]+\.[0-9]+\.[0-9]+*'
 env:
-  MONGODB_3_6: "3.6.23"
   MONGODB_4_0: "4.0.28"
+  MONGODB_4_2: "4.2.25"
   MONGODB_4_4: "4.4.29"
   MONGODB_5_0: "5.0.31"
   MONGODB_6_0: "6.0.20"
   MONGODB_7_0: "7.0.17"
   MONGODB_8_0: "8.0.5"
 
-  PYMONGO_3_11: "3.11.3"
   PYMONGO_3_12: "3.12.3"
   PYMONGO_3_13: "3.13.0"
   PYMONGO_4_0:  "4.0.2"
@@ -59,13 +58,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", pypy3.9, pypy3.10]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10"]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_11]
         include:
-          - python-version: "3.8"
-            MONGODB: $MONGODB_3_6
-            PYMONGO: $PYMONGO_3_12
           - python-version: "3.9"
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_13

From a20a66d3b2e9c93f2861f2742751184800939880 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 11:48:22 +0100
Subject: [PATCH 1493/1519] Fix default pymongo version

---
 .github/workflows/github-actions.yml |  2 +-
 tox.ini                              | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 9b7acca5a..5a6eec7b0 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10"]
         MONGODB: [$MONGODB_4_0]
-        PYMONGO: [$PYMONGO_3_11]
+        PYMONGO: [$PYMONGO_3_12]
         include:
           - python-version: "3.9"
             MONGODB: $MONGODB_4_4
diff --git a/tox.ini b/tox.ini
index b4beaa7b6..29819f084 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg311,mg312,mg313,mg4,mg433,mg441,mg462,mg473,mg480,mg49,mg410,mg411}
+envlist = pypy3-{mg312,mg313,mg40,mg433,mg441,mg462,mg473,mg480,mg49,mg410,mg411}
 skipsdist = True
 
 [testenv]
@@ -7,17 +7,16 @@ commands =
     pytest tests/ {posargs}
 deps =
     -rrequirements-dev.txt
-    mg311: pymongo>=3.11,<3.12
     mg312: pymongo>=3.12,<3.13
     mg313: pymongo>=3.13,<3.14
-    mg4: pymongo>=4.0,<4.1
+    mg40: pymongo>=4.0,<4.1
     mg433: pymongo>=4.3,<4.4
     mg441: pymongo>=4.4,<4.5
     mg462: pymongo>=4.6,<4.7
     mg473: pymongo>=4.7,<4.8
     mg480: pymongo>=4.8,<4.9
-    mg49: pymongo>=4.9,<5.0
-    mg410: pymongo>=4.10,<5.0
-    mg411: pymongo>=4.11,<5.0
+    mg49: pymongo>=4.9,<4.10
+    mg410: pymongo>=4.10,<4.11
+    mg411: pymongo>=4.11,<4.12
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 05e11ca6dee727192eaf104bf4acbe40539a10cd Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 11:59:47 +0100
Subject: [PATCH 1494/1519] Fix tox config and update setup.py

---
 setup.py |  6 ++++--
 tox.ini  | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/setup.py b/setup.py
index a629d5b12..a19e8cab4 100644
--- a/setup.py
+++ b/setup.py
@@ -33,16 +33,18 @@ def get_version(version_tuple):
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
     "Topic :: Database",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
-install_require = ["pymongo>=3.4,<5.0"]
+install_require = ["pymongo>=3.12,<5.0"]
 tests_require = [
     "pytest",
     "pytest-cov",
diff --git a/tox.ini b/tox.ini
index 29819f084..52c6f3a99 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg312,mg313,mg40,mg433,mg441,mg462,mg473,mg480,mg49,mg410,mg411}
+envlist = pypy3-{mg3.12.3,mg3.13.0,mg4.0.2,mg4.3.3,mg4.4.1,mg4.6.2,mg4.7.3,mg4.8.0,mg4.9.2,mg4.10.1,mg4.11.2}
 skipsdist = True
 
 [testenv]
@@ -7,16 +7,16 @@ commands =
     pytest tests/ {posargs}
 deps =
     -rrequirements-dev.txt
-    mg312: pymongo>=3.12,<3.13
-    mg313: pymongo>=3.13,<3.14
-    mg40: pymongo>=4.0,<4.1
-    mg433: pymongo>=4.3,<4.4
-    mg441: pymongo>=4.4,<4.5
-    mg462: pymongo>=4.6,<4.7
-    mg473: pymongo>=4.7,<4.8
-    mg480: pymongo>=4.8,<4.9
-    mg49: pymongo>=4.9,<4.10
-    mg410: pymongo>=4.10,<4.11
-    mg411: pymongo>=4.11,<4.12
+    mg3.12.3: pymongo>=3.12,<3.13
+    mg3.13.0: pymongo>=3.13,<3.14
+    mg4.0.2: pymongo>=4.0,<4.1
+    mg4.3.3: pymongo>=4.3,<4.4
+    mg4.4.1: pymongo>=4.4,<4.5
+    mg4.6.2: pymongo>=4.6,<4.7
+    mg4.7.3: pymongo>=4.7,<4.8
+    mg4.8.0: pymongo>=4.8,<4.9
+    mg4.9.2: pymongo>=4.9,<4.10
+    mg4.10.1: pymongo>=4.10,<4.11
+    mg4.11.2: pymongo>=4.11,<4.12
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From e09748bce4a289bd25f6c8f3368181cd32dda1bf Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 12:02:37 +0100
Subject: [PATCH 1495/1519] Fix tox again

---
 tox.ini | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tox.ini b/tox.ini
index 52c6f3a99..7228e0333 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg3.12.3,mg3.13.0,mg4.0.2,mg4.3.3,mg4.4.1,mg4.6.2,mg4.7.3,mg4.8.0,mg4.9.2,mg4.10.1,mg4.11.2}
+envlist = pypy3-{mg312,mg313,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg410,mg411}
 skipsdist = True
 
 [testenv]
@@ -7,16 +7,16 @@ commands =
     pytest tests/ {posargs}
 deps =
     -rrequirements-dev.txt
-    mg3.12.3: pymongo>=3.12,<3.13
-    mg3.13.0: pymongo>=3.13,<3.14
-    mg4.0.2: pymongo>=4.0,<4.1
-    mg4.3.3: pymongo>=4.3,<4.4
-    mg4.4.1: pymongo>=4.4,<4.5
-    mg4.6.2: pymongo>=4.6,<4.7
-    mg4.7.3: pymongo>=4.7,<4.8
-    mg4.8.0: pymongo>=4.8,<4.9
-    mg4.9.2: pymongo>=4.9,<4.10
-    mg4.10.1: pymongo>=4.10,<4.11
-    mg4.11.2: pymongo>=4.11,<4.12
+    mg312: pymongo>=3.12,<3.13
+    mg313: pymongo>=3.13,<3.14
+    mg402: pymongo>=4.0,<4.1
+    mg433: pymongo>=4.3,<4.4
+    mg441: pymongo>=4.4,<4.5
+    mg462: pymongo>=4.6,<4.7
+    mg473: pymongo>=4.7,<4.8
+    mg480: pymongo>=4.8,<4.9
+    mg492: pymongo>=4.9,<4.10
+    mg410: pymongo>=4.10,<4.11
+    mg411: pymongo>=4.11,<4.12
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From 012cff5dc4905cc4baea312ccc4eb8481712fa2b Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 12:04:22 +0100
Subject: [PATCH 1496/1519] Fix tox again

---
 tox.ini | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index 7228e0333..695273f97 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pypy3-{mg312,mg313,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg410,mg411}
+envlist = pypy3-{mg3122,mg3130,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg4101,mg4112}
 skipsdist = True
 
 [testenv]
@@ -7,8 +7,8 @@ commands =
     pytest tests/ {posargs}
 deps =
     -rrequirements-dev.txt
-    mg312: pymongo>=3.12,<3.13
-    mg313: pymongo>=3.13,<3.14
+    mg3122: pymongo>=3.12,<3.13
+    mg3130: pymongo>=3.13,<3.14
     mg402: pymongo>=4.0,<4.1
     mg433: pymongo>=4.3,<4.4
     mg441: pymongo>=4.4,<4.5
@@ -16,7 +16,7 @@ deps =
     mg473: pymongo>=4.7,<4.8
     mg480: pymongo>=4.8,<4.9
     mg492: pymongo>=4.9,<4.10
-    mg410: pymongo>=4.10,<4.11
-    mg411: pymongo>=4.11,<4.12
+    mg4101: pymongo>=4.10,<4.11
+    mg4112: pymongo>=4.11,<4.12
 setenv =
     PYTHON_EGG_CACHE = {envdir}/python-eggs

From f49f1d53896377befe8fb9d808242ff4ef79cdc6 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 12:12:30 +0100
Subject: [PATCH 1497/1519] Add py* to tox config

---
 .github/workflows/github-actions.yml | 2 +-
 tox.ini                              | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 5a6eec7b0..43efb96d8 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10", "pypy3.11"]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_12]
         include:
diff --git a/tox.ini b/tox.ini
index 695273f97..828d03c33 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,7 @@
 [tox]
-envlist = pypy3-{mg3122,mg3130,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg4101,mg4112}
+envlist =
+    pypy3-{mg3122,mg3130,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg4101,mg4112}
+    py{39,310,311,312,313}-{mg3122,mg3130,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg4101,mg4112}
 skipsdist = True
 
 [testenv]

From 96037af3397cc66de6945e2959bf588b8922b909 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 12:14:19 +0100
Subject: [PATCH 1498/1519] typo

---
 tox.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 828d03c33..2d0c63945 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    pypy3-{mg3122,mg3130,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg4101,mg4112}
-    py{39,310,311,312,313}-{mg3122,mg3130,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg4101,mg4112}
+    pypy3-{mg3123,mg3130,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg4101,mg4112}
+    py{39,310,311,312,313}-{mg3123,mg3130,mg402,mg433,mg441,mg462,mg473,mg480,mg492,mg4101,mg4112}
 skipsdist = True
 
 [testenv]
@@ -9,7 +9,7 @@ commands =
     pytest tests/ {posargs}
 deps =
     -rrequirements-dev.txt
-    mg3122: pymongo>=3.12,<3.13
+    mg3123: pymongo>=3.12,<3.13
     mg3130: pymongo>=3.13,<3.14
     mg402: pymongo>=4.0,<4.1
     mg433: pymongo>=4.3,<4.4

From bc63ce8ed330d18865184de1f1cc0adadca885e2 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 12:37:31 +0100
Subject: [PATCH 1499/1519] Add support for mongodb 8.0 in the
 test_covered_index test function

---
 .github/workflows/github-actions.yml |  2 +-
 mongoengine/mongodb_support.py       |  1 +
 tests/document/test_indexes.py       | 51 ++++++++++++++++++----------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 43efb96d8..5a6eec7b0 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10", "pypy3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10"]
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_12]
         include:
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index f15a72c96..ad65984f0 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -13,6 +13,7 @@
 MONGODB_50 = (5, 0)
 MONGODB_60 = (6, 0)
 MONGODB_70 = (7, 0)
+MONGODB_80 = (8, 0)
 
 
 def get_mongodb_version():
diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 02da590cb..e4d0c002c 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -9,6 +9,7 @@
 from mongoengine.connection import get_db
 from mongoengine.mongodb_support import (
     MONGODB_42,
+    MONGODB_80,
     get_mongodb_version,
 )
 from mongoengine.pymongo_support import PYMONGO_VERSION
@@ -450,24 +451,40 @@ class Test(Document):
 
         # Need to be explicit about covered indexes as mongoDB doesn't know if
         # the documents returned might have more keys in that here.
-        query_plan = Test.objects(id=obj.id).exclude("a").explain()
-        assert (
-            query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IDHACK"
-        )
-
-        query_plan = Test.objects(id=obj.id).only("id").explain()
-        assert (
-            query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IDHACK"
-        )
-
         mongo_db = get_mongodb_version()
-        query_plan = Test.objects(a=1).only("a").exclude("id").explain()
-        assert (
-            query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IXSCAN"
-        )
-
-        PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
-        assert query_plan["queryPlanner"]["winningPlan"]["stage"] == PROJECTION_STR
+        if mongo_db >= MONGODB_80:
+            query_plan = Test.objects(id=obj.id).exclude("a").explain()
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["stage"] == "EXPRESS_IXSCAN"
+            )
+
+            query_plan = Test.objects(id=obj.id).only("id").explain()
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["stage"] == "EXPRESS_IXSCAN"
+            )
+
+            query_plan = Test.objects(a=1).only("a").exclude("id").explain()
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["stage"] == "EXPRESS_IXSCAN"
+            )
+        elif mongo_db < MONGODB_80:
+            query_plan = Test.objects(id=obj.id).exclude("a").explain()
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IDHACK"
+            )
+
+            query_plan = Test.objects(id=obj.id).only("id").explain()
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IDHACK"
+            )
+
+            query_plan = Test.objects(a=1).only("a").exclude("id").explain()
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IXSCAN"
+            )
+
+            PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
+            assert query_plan["queryPlanner"]["winningPlan"]["stage"] == PROJECTION_STR
 
         query_plan = Test.objects(a=1).explain()
         assert (

From a6f96080297942ab6875eb5d54efa52d68779d69 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 12:43:25 +0100
Subject: [PATCH 1500/1519] format

---
 tests/document/test_indexes.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index e4d0c002c..b2c6a766d 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -470,20 +470,25 @@ class Test(Document):
         elif mongo_db < MONGODB_80:
             query_plan = Test.objects(id=obj.id).exclude("a").explain()
             assert (
-                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IDHACK"
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"]
+                == "IDHACK"
             )
 
             query_plan = Test.objects(id=obj.id).only("id").explain()
             assert (
-                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IDHACK"
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"]
+                == "IDHACK"
             )
 
             query_plan = Test.objects(a=1).only("a").exclude("id").explain()
             assert (
-                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IXSCAN"
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"]
+                == "IXSCAN"
             )
 
-            PROJECTION_STR = "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
+            PROJECTION_STR = (
+                "PROJECTION" if mongo_db < MONGODB_42 else "PROJECTION_COVERED"
+            )
             assert query_plan["queryPlanner"]["winningPlan"]["stage"] == PROJECTION_STR
 
         query_plan = Test.objects(a=1).explain()

From 6e1a575cec2b2570ddfb61235b6078fa42e7571e Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 12:46:03 +0100
Subject: [PATCH 1501/1519] add missing assert

---
 tests/document/test_indexes.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index b2c6a766d..013e545d1 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -467,6 +467,10 @@ class Test(Document):
             assert (
                 query_plan["queryPlanner"]["winningPlan"]["stage"] == "EXPRESS_IXSCAN"
             )
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["stage"]
+                == "PROJECTION_SIMPLE"
+            )
         elif mongo_db < MONGODB_80:
             query_plan = Test.objects(id=obj.id).exclude("a").explain()
             assert (

From a9e1064138694cf52f99a0dbf8d474e22e33c76f Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 13:03:17 +0100
Subject: [PATCH 1502/1519] Fix helper scripts to check the version

---
 .github/workflows/install_mongosh.sh | 12 ++++++++----
 .github/workflows/start_mongo.sh     |  8 ++++++--
 README.rst                           |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/install_mongosh.sh b/.github/workflows/install_mongosh.sh
index 42b08abce..5f2258dc6 100644
--- a/.github/workflows/install_mongosh.sh
+++ b/.github/workflows/install_mongosh.sh
@@ -14,16 +14,20 @@ MONGOSH=$2
 
 PLATFORM="linux-x64"
 
-if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
-  echo "mongosh is not needed for MongoDB versions less than 6.0"
-  exit 0
+# Extract major version explicitly
+MONGODB_MAJOR_VERSION=$(echo "$MONGODB" | cut -d'.' -f1)
+
+# Check if MongoDB major version is greater than or equal to 6
+if [ "$MONGODB_MAJOR_VERSION" -lt 6 ]; then
+    echo "mongosh is not needed for MongoDB versions less than 6.0"
+    exit 0
 fi
 
 DOWNLOAD_URL="https://downloads.mongodb.com/compass/mongosh-$%7BMONGOSH%7D-$%7BPLATFORM%7D.tgz"
 TARBALL="mongosh-${MONGOSH}-${PLATFORM}.tgz"
 
 echo "Downloading mongosh ${MONGOSH} for ${PLATFORM}..."
-if ! wget -q --show-progress "$DOWNLOAD_URL"; then
+if ! wget --quiet "$DOWNLOAD_URL"; then
     echo "Failed to download mongosh. Please check the version and your internet connection."
     exit 1
 fi
diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
index 6e488292e..30c6525df 100644
--- a/.github/workflows/start_mongo.sh
+++ b/.github/workflows/start_mongo.sh
@@ -7,13 +7,17 @@ mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
 mkdir $mongodb_dir/data
 
 args=(--dbpath $mongodb_dir/data --logpath $mongodb_dir/mongodb.log --fork --replSet mongoengine)
-if (( $(echo "$MONGODB > 3.8" | bc -l) )); then
+
+# Parse version components
+MAJOR=$(echo "$MONGODB" | cut -d'.' -f1)
+MINOR=$(echo "$MONGODB" | cut -d'.' -f2)
+if [ "$MAJOR" -gt 3 ] || ([ "$MAJOR" -eq 3 ] && [ "$MINOR" -ge 8 ]); then
     args+=(--setParameter maxTransactionLockRequestTimeoutMillis=1000)
 fi
 
 $mongodb_dir/bin/mongod "${args[@]}"
 
-if (( $(echo "$MONGODB < 6.0" | bc -l) )); then
+if [ "$MAJOR" -lt 6 ]; then
 mongo --verbose --eval "rs.initiate()"
 mongo --quiet --eval "rs.status().ok"
 else
diff --git a/README.rst b/README.rst
index d7cf6d3d6..52d819303 100644
--- a/README.rst
+++ b/README.rst
@@ -58,7 +58,7 @@ Dependencies
 All of the dependencies can easily be installed via `python -m pip <https://pip.pypa.io/>`_.
 At the very least, you'll need these two packages to use MongoEngine:
 
-- pymongo>=3.4
+- pymongo>=3.12
 
 If you utilize a ``DateTimeField``, you might also use a more flexible date parser:
 

From 6e2b9e5472e67d5a8bbe038087ff1356ac754bcc Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 13:16:55 +0100
Subject: [PATCH 1503/1519] Fix test_covered_index

---
 tests/document/test_indexes.py | 36 ++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 013e545d1..ac9d127ae 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -465,12 +465,32 @@ class Test(Document):
 
             query_plan = Test.objects(a=1).only("a").exclude("id").explain()
             assert (
-                query_plan["queryPlanner"]["winningPlan"]["stage"] == "EXPRESS_IXSCAN"
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"]
+                == "FETCH"
+            )
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"][
+                    "inputStage"
+                ]
+                == "IXSCAN"
             )
             assert (
                 query_plan["queryPlanner"]["winningPlan"]["stage"]
                 == "PROJECTION_SIMPLE"
             )
+
+            query_plan = Test.objects(a=1).explain()
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"][
+                    "inputStage"
+                ]
+                == "IXSCAN"
+            )
+
+            assert (
+                query_plan.get("queryPlanner").get("winningPlan").get("stage")
+                == "FETCH"
+            )
         elif mongo_db < MONGODB_80:
             query_plan = Test.objects(id=obj.id).exclude("a").explain()
             assert (
@@ -495,12 +515,16 @@ class Test(Document):
             )
             assert query_plan["queryPlanner"]["winningPlan"]["stage"] == PROJECTION_STR
 
-        query_plan = Test.objects(a=1).explain()
-        assert (
-            query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"] == "IXSCAN"
-        )
+            query_plan = Test.objects(a=1).explain()
+            assert (
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"]
+                == "IXSCAN"
+            )
 
-        assert query_plan.get("queryPlanner").get("winningPlan").get("stage") == "FETCH"
+            assert (
+                query_plan.get("queryPlanner").get("winningPlan").get("stage")
+                == "FETCH"
+            )
 
     def test_index_on_id(self):
         class BlogPost(Document):

From 757bbc88252eaabd71f18e12e906c4473a2fdd0f Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 13:27:00 +0100
Subject: [PATCH 1504/1519] Fix test_covered_index assert

---
 tests/document/test_indexes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index ac9d127ae..8c5e7d9c4 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -469,8 +469,8 @@ class Test(Document):
                 == "FETCH"
             )
             assert (
-                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"][
-                    "inputStage"
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["inputStage"][
+                    "stage"
                 ]
                 == "IXSCAN"
             )

From fc17310e875ae3b227f598442903306fb077290a Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 13:42:16 +0100
Subject: [PATCH 1505/1519] remove unneeded assert

---
 tests/document/test_indexes.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 8c5e7d9c4..079368742 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -466,12 +466,6 @@ class Test(Document):
             query_plan = Test.objects(a=1).only("a").exclude("id").explain()
             assert (
                 query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"]
-                == "FETCH"
-            )
-            assert (
-                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["inputStage"][
-                    "stage"
-                ]
                 == "IXSCAN"
             )
             assert (

From 43fc70ff1c1a507334abc03a63f46eb29b76f93f Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 13:44:43 +0100
Subject: [PATCH 1506/1519] fix assert

---
 tests/document/test_indexes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 079368742..6311117c1 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -470,7 +470,7 @@ class Test(Document):
             )
             assert (
                 query_plan["queryPlanner"]["winningPlan"]["stage"]
-                == "PROJECTION_SIMPLE"
+                == "PROJECTION_COVERED"
             )
 
             query_plan = Test.objects(a=1).explain()

From 69e76b03fec2dc15387800d4ecad91b9c8ecaa98 Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 14:41:23 +0100
Subject: [PATCH 1507/1519] fix assert

---
 tests/document/test_indexes.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/document/test_indexes.py b/tests/document/test_indexes.py
index 6311117c1..927bc7af6 100644
--- a/tests/document/test_indexes.py
+++ b/tests/document/test_indexes.py
@@ -475,9 +475,7 @@ class Test(Document):
 
             query_plan = Test.objects(a=1).explain()
             assert (
-                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"][
-                    "inputStage"
-                ]
+                query_plan["queryPlanner"]["winningPlan"]["inputStage"]["stage"]
                 == "IXSCAN"
             )
 

From d26f923aab2f7afc88bb79c5bfcd2a7ae3d46a9f Mon Sep 17 00:00:00 2001
From: Vicens Juan Tomas Monserrat <vicenc.monserrat@close.com>
Date: Thu, 13 Mar 2025 14:48:26 +0100
Subject: [PATCH 1508/1519] update README

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 52d819303..56beb154b 100644
--- a/README.rst
+++ b/README.rst
@@ -35,7 +35,7 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.4, v5.0, v6.0 and v7.0. Future versions
+MongoEngine is currently tested against MongoDB v4.0, v4.4, v5.0, v6.0, v7.0 and v8.0. Future versions
 should be supported as well, but aren't actively tested at the moment. Make
 sure to open an issue or submit a pull request if you experience any problems
 with a more recent MongoDB versions.

From d32f19786060684904b92e76635c72b1becffebe Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 9 Apr 2025 22:49:41 +0200
Subject: [PATCH 1509/1519] upgrade pc hooks

---
 .pre-commit-config.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 27d1ef1f5..3f44ee04b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,28 +1,28 @@
 fail_fast: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/ambv/black
-    rev: 24.2.0
+    rev: 25.1.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8
-    rev: 7.0.0
+    rev: 7.2.0
     hooks:
       - id: flake8
         additional_dependencies:
           - importlib_metadata<5
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.1
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort

From a5bc2dc32bde3920bf5a06f6ebbcdf6afd1b451e Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 9 Apr 2025 23:06:16 +0200
Subject: [PATCH 1510/1519] bring back 3.6 (want to keep it here)

---
 .github/workflows/github-actions.yml | 4 ++++
 .github/workflows/install_mongo.sh   | 2 ++
 README.rst                           | 2 +-
 mongoengine/mongodb_support.py       | 1 -
 tests/document/test_instance.py      | 8 +-------
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 5a6eec7b0..8ef76d804 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -13,6 +13,7 @@ on:
     tags:
       - 'v[0-9]+\.[0-9]+\.[0-9]+*'
 env:
+  MONGODB_3_6: "3.6.23"
   MONGODB_4_0: "4.0.28"
   MONGODB_4_2: "4.2.25"
   MONGODB_4_4: "4.4.29"
@@ -62,6 +63,9 @@ jobs:
         MONGODB: [$MONGODB_4_0]
         PYMONGO: [$PYMONGO_3_12]
         include:
+          - python-version: "3.9"
+            MONGODB: $MONGODB_3_6
+            PYMONGO: $PYMONGO_3_12
           - python-version: "3.9"
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_13
diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
index f07606bec..b80749a11 100644
--- a/.github/workflows/install_mongo.sh
+++ b/.github/workflows/install_mongo.sh
@@ -16,6 +16,8 @@ if [[ "${MONGODB}" =~ ^(7.0|8.0) ]]; then
   mongo_build="mongodb-linux-x86_64-ubuntu2004-${MONGODB}"
 elif [[ "${MONGODB}" =~ ^(4.0|4.2|4.4|5.0|6.0) ]]; then
   mongo_build="mongodb-linux-x86_64-ubuntu1804-${MONGODB}"
+elif [[ "${MONGODB}" =~ ^3.6$ ]]; then
+  mongo_build="mongodb-linux-x86_64-${MONGODB}"
 else
   echo "Error: Unsupported MongoDB version: ${MONGODB}"
   usage
diff --git a/README.rst b/README.rst
index 56beb154b..46b08b1a8 100644
--- a/README.rst
+++ b/README.rst
@@ -35,7 +35,7 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v4.0, v4.4, v5.0, v6.0, v7.0 and v8.0. Future versions
+MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.4, v5.0, v6.0, v7.0 and v8.0. Future versions
 should be supported as well, but aren't actively tested at the moment. Make
 sure to open an issue or submit a pull request if you experience any problems
 with a more recent MongoDB versions.
diff --git a/mongoengine/mongodb_support.py b/mongoengine/mongodb_support.py
index ad65984f0..557744262 100644
--- a/mongoengine/mongodb_support.py
+++ b/mongoengine/mongodb_support.py
@@ -6,7 +6,6 @@
 
 # Constant that can be used to compare the version retrieved with
 # get_mongodb_version()
-MONGODB_34 = (3, 4)
 MONGODB_36 = (3, 6)
 MONGODB_42 = (4, 2)
 MONGODB_44 = (4, 4)
diff --git a/tests/document/test_instance.py b/tests/document/test_instance.py
index c5970420f..d2f3e35d9 100644
--- a/tests/document/test_instance.py
+++ b/tests/document/test_instance.py
@@ -25,7 +25,6 @@
     SaveConditionError,
 )
 from mongoengine.mongodb_support import (
-    MONGODB_34,
     MONGODB_36,
     get_mongodb_version,
 )
@@ -536,17 +535,12 @@ class Animal(Document):
         doc = Animal(is_mammal=True, name="Dog")
         doc.save()
 
-        mongo_db = get_mongodb_version()
-
         with query_counter() as q:
             doc.name = "Cat"
             doc.save()
             query_op = q.db.system.profile.find({"ns": "mongoenginetest.animal"})[0]
             assert query_op["op"] == "update"
-            if mongo_db <= MONGODB_34:
-                assert set(query_op["query"].keys()) == {"_id", "is_mammal"}
-            else:
-                assert set(query_op["command"]["q"].keys()) == {"_id", "is_mammal"}
+            assert set(query_op["command"]["q"].keys()) == {"_id", "is_mammal"}
 
         Animal.drop_collection()
 

From 661b4548d4fa71a5458461ec36ac16b994feb96d Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 9 Apr 2025 23:11:07 +0200
Subject: [PATCH 1511/1519] Fix mongo3.6 installation

---
 .github/workflows/install_mongo.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
index b80749a11..02ce6635a 100644
--- a/.github/workflows/install_mongo.sh
+++ b/.github/workflows/install_mongo.sh
@@ -16,7 +16,7 @@ if [[ "${MONGODB}" =~ ^(7.0|8.0) ]]; then
   mongo_build="mongodb-linux-x86_64-ubuntu2004-${MONGODB}"
 elif [[ "${MONGODB}" =~ ^(4.0|4.2|4.4|5.0|6.0) ]]; then
   mongo_build="mongodb-linux-x86_64-ubuntu1804-${MONGODB}"
-elif [[ "${MONGODB}" =~ ^3.6$ ]]; then
+elif [[ "${MONGODB}" =~ ^3.6 ]]; then
   mongo_build="mongodb-linux-x86_64-${MONGODB}"
 else
   echo "Error: Unsupported MongoDB version: ${MONGODB}"

From 336d3c0f5529d7e4c683330bca6042d85fd30086 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Wed, 9 Apr 2025 23:44:29 +0200
Subject: [PATCH 1512/1519] run black  on top of MR

---
 README.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 696b0b385..1b9b27c04 100644
--- a/README.rst
+++ b/README.rst
@@ -79,18 +79,18 @@ Some simple examples of what MongoEngine code looks like:
 .. code :: python
     import datetime
     from mongoengine import *
-    
+
     connect('mydb')
-    
+
     class BlogPost(Document):
         title = StringField(required=True, max_length=200)
         posted = DateTimeField(default=lambda: datetime.datetime.now(datetime.timezone.utc))
         tags = ListField(StringField(max_length=50))
         meta = {'allow_inheritance': True}
-    
+
     class TextPost(BlogPost):
         content = StringField(required=True)
-    
+
     class LinkPost(BlogPost):
         url = StringField(required=True)
 

From d5867d6a504322ddc24023bf48c0e95dbae2dd9f Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Wed, 28 May 2025 08:48:22 +0200
Subject: [PATCH 1513/1519] fix CI

---
 .github/workflows/github-actions.yml | 19 ++-----
 .github/workflows/install_mongo.sh   | 84 +++++++++++++++++++---------
 .github/workflows/install_mongosh.sh | 56 -------------------
 .github/workflows/start_mongo.sh     | 15 +++--
 README.rst                           |  8 +--
 5 files changed, 73 insertions(+), 109 deletions(-)
 delete mode 100644 .github/workflows/install_mongosh.sh

diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 8ef76d804..6073bb6cd 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -13,14 +13,11 @@ on:
     tags:
       - 'v[0-9]+\.[0-9]+\.[0-9]+*'
 env:
-  MONGODB_3_6: "3.6.23"
-  MONGODB_4_0: "4.0.28"
-  MONGODB_4_2: "4.2.25"
   MONGODB_4_4: "4.4.29"
   MONGODB_5_0: "5.0.31"
-  MONGODB_6_0: "6.0.20"
-  MONGODB_7_0: "7.0.17"
-  MONGODB_8_0: "8.0.5"
+  MONGODB_6_0: "6.0.22"
+  MONGODB_7_0: "7.0.19"
+  MONGODB_8_0: "8.0.9"
 
   PYMONGO_3_12: "3.12.3"
   PYMONGO_3_13: "3.13.0"
@@ -36,8 +33,6 @@ env:
 
   MAIN_PYTHON_VERSION: "3.9"
 
-  MONGOSH: "2.4.2" # Needed for MongoDB 6.0+
-
 jobs:
   linting:
     # Run pre-commit (https://pre-commit.com/)
@@ -55,17 +50,14 @@ jobs:
   test:
     # Test suite run against recent python versions
     # and against a few combination of MongoDB and pymongo
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy3.9", "pypy3.10"]
-        MONGODB: [$MONGODB_4_0]
+        MONGODB: [$MONGODB_4_4]
         PYMONGO: [$PYMONGO_3_12]
         include:
-          - python-version: "3.9"
-            MONGODB: $MONGODB_3_6
-            PYMONGO: $PYMONGO_3_12
           - python-version: "3.9"
             MONGODB: $MONGODB_4_4
             PYMONGO: $PYMONGO_3_13
@@ -115,7 +107,6 @@ jobs:
     - name: install mongo and ci dependencies
       run: |
         bash .github/workflows/install_mongo.sh ${{ matrix.MONGODB }}
-        bash .github/workflows/install_mongosh.sh ${{ matrix.MONGODB }} ${{ env.MONGOSH }}
         bash .github/workflows/install_ci_python_dep.sh
         bash .github/workflows/start_mongo.sh ${{ matrix.MONGODB }}
     - name: tox dry-run (to pre-install venv)
diff --git a/.github/workflows/install_mongo.sh b/.github/workflows/install_mongo.sh
index 02ce6635a..8b0798db5 100644
--- a/.github/workflows/install_mongo.sh
+++ b/.github/workflows/install_mongo.sh
@@ -4,49 +4,79 @@ set -e  # Exit immediately if a command exits with a non-zero status
 set -u  # Treat unset variables as an error
 
 if [ "$#" -ne 1 ]; then
-  echo "Usage: $0 <mongodb-version>"
-  echo "Example: $0 8.0.5"
+  echo >&2 "Usage: $0 <mongodb-version>"
+  echo >&2 "Example: $0 8.0.5"
   exit 1
 fi
 
 MONGODB="$1"
+MONGOSH=2.5.1
 
 # Determine build name based on version
-if [[ "${MONGODB}" =~ ^(7.0|8.0) ]]; then
-  mongo_build="mongodb-linux-x86_64-ubuntu2004-${MONGODB}"
-elif [[ "${MONGODB}" =~ ^(4.0|4.2|4.4|5.0|6.0) ]]; then
-  mongo_build="mongodb-linux-x86_64-ubuntu1804-${MONGODB}"
-elif [[ "${MONGODB}" =~ ^3.6 ]]; then
-  mongo_build="mongodb-linux-x86_64-${MONGODB}"
+if [[ "$MONGODB" =~ ^(6.0|7.0|8.0) ]]; then
+  mongodb_build="mongodb-linux-x86_64-ubuntu2204-${MONGODB}"
+elif [[ "$MONGODB" =~ ^(4.4|5.0) ]]; then
+  mongodb_build="mongodb-linux-x86_64-ubuntu2004-${MONGODB}"
 else
-  echo "Error: Unsupported MongoDB version: ${MONGODB}"
+  echo >&2 "Error: Unsupported MongoDB version: ${MONGODB}"
   usage
 fi
 
-download_url="http://fastdl.mongodb.org/linux/$%7Bmongo_build%7D.tgz"
-tarball="${mongo_build}.tgz"
+mongodb_tarball="${mongodb_build}.tgz"
+mongodb_download_url="http://fastdl.mongodb.org/linux/$%7Bmongodb_tarball%7D"
 
-echo "Downloading MongoDB from ${download_url}..."
-if ! wget --quiet "${download_url}"; then
-  echo "Error: Failed to download MongoDB."
-  exit 1
-fi
+mongosh_build="mongosh-${MONGOSH}-linux-x64"
+mongosh_tarball="${mongosh_build}.tgz"
+mongosh_download_url="https://github.com/mongodb-js/mongosh/releases/download/v$%7BMONGOSH%7D/$%7Bmongosh_tarball%7D"
+
+set -- \
+  MongoDB "$mongodb_tarball" "$mongodb_download_url" \
+  "MongoDB Shell" "$mongosh_tarball" "$mongosh_download_url"
+
+while (( $# > 0 )) ; do
+  name="$1"
+  tarball="$2"
+  download_url="$3"
+  shift 3
+
+  echo >&2 "Downloading ${name} from ${download_url}..."
+  if ! wget --quiet "$download_url"; then
+    echo >&2 "Error: Failed to download ${name}."
+    exit 1
+  fi
 
-echo "Extracting ${tarball}..."
-if ! tar xzf "${tarball}"; then
-  echo "Error: Failed to extract ${tarball}"
+  echo >&2 "Extracting ${tarball}..."
+  if ! tar xzf "${tarball}"; then
+    echo >&2 "Error: Failed to extract ${tarball}"
+    exit 1
+  fi
+done
+
+mongodb_dir=$(find "${PWD}/" -type d -name "mongodb-linux-x86_64*" -print -quit)
+if [ -z "$mongodb_dir" ]; then
+  echo >&2 "Error: Could not find MongoDB directory after extraction."
   exit 1
 fi
 
-mongodb_dir=$(find "${PWD}/" -type d -name "mongodb-linux-x86_64*" | head -n 1)
-if [ -z "${mongodb_dir}" ]; then
-  echo "Error: Could not find MongoDB directory after extraction."
-  exit 1
+mongosh_dir=$(find "${PWD}/" -type d -name "$mongosh_build" -print -quit)
+if [ ! -d "$mongosh_dir" ]; then
+    echo >&2 "Failed to find extracted mongosh directory."
+    rm -f "$TARBALL"
+    exit 1
 fi
 
-echo "MongoDB installed at: ${mongodb_dir}"
-"${mongodb_dir}/bin/mongod" --version
+echo >&2 "Creating mongo.path"
+echo "export PATH='${mongodb_dir}/bin:${mongosh_dir}/bin:'"'$PATH' \
+  | tee >&2 mongo.path
+
+. mongo.path
+
+echo >&2 "MongoDB is installed at: ${mongodb_dir}"
+mongod >&2 --version
+
+echo >&2 "MongoDB Shell is installed at: ${mongosh_dir}"
+mongosh >&2 --version
 
 # Cleanup
-echo "Cleaning up..."
-rm -f "${tarball}"
+echo >&2 "Cleaning up..."
+rm -f "$mongodb_tarball" "$mongosh_tarball"
diff --git a/.github/workflows/install_mongosh.sh b/.github/workflows/install_mongosh.sh
deleted file mode 100644
index 5f2258dc6..000000000
--- a/.github/workflows/install_mongosh.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-
-set -e  # Exit immediately if a command exits with a non-zero status
-set -u  # Treat unset variables as an error
-
-if [ $# -lt 2 ]; then
-    echo "Usage: $0 <mongodb_version> <mongosh_version>"
-    echo "Example: $0 8.0.5 2.4.2"
-    exit 1
-fi
-
-MONGODB=$1
-MONGOSH=$2
-
-PLATFORM="linux-x64"
-
-# Extract major version explicitly
-MONGODB_MAJOR_VERSION=$(echo "$MONGODB" | cut -d'.' -f1)
-
-# Check if MongoDB major version is greater than or equal to 6
-if [ "$MONGODB_MAJOR_VERSION" -lt 6 ]; then
-    echo "mongosh is not needed for MongoDB versions less than 6.0"
-    exit 0
-fi
-
-DOWNLOAD_URL="https://downloads.mongodb.com/compass/mongosh-$%7BMONGOSH%7D-$%7BPLATFORM%7D.tgz"
-TARBALL="mongosh-${MONGOSH}-${PLATFORM}.tgz"
-
-echo "Downloading mongosh ${MONGOSH} for ${PLATFORM}..."
-if ! wget --quiet "$DOWNLOAD_URL"; then
-    echo "Failed to download mongosh. Please check the version and your internet connection."
-    exit 1
-fi
-
-echo "Extracting mongosh..."
-if ! tar xzf "$TARBALL"; then
-    echo "Failed to extract mongosh."
-    rm -f "$TARBALL"
-    exit 1
-fi
-
-mongosh_dir=$(find "${PWD}/" -type d -name "mongosh-${MONGOSH}-${PLATFORM}" -print -quit)
-if [ ! -d "$mongosh_dir" ]; then
-    echo "Failed to find extracted mongosh directory."
-    rm -f "$TARBALL"
-    exit 1
-fi
-
-echo "Testing mongosh installation..."
-if ! "$mongosh_dir/bin/mongosh" --version; then
-    echo "Failed to run mongosh."
-    exit 1
-fi
-
-echo "Cleaning up..."
-rm -f "$TARBALL"
diff --git a/.github/workflows/start_mongo.sh b/.github/workflows/start_mongo.sh
index 30c6525df..3986065e0 100644
--- a/.github/workflows/start_mongo.sh
+++ b/.github/workflows/start_mongo.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
 
+set -e  # Exit immediately if a command exits with a non-zero status
+set -u  # Treat unset variables as an error
+
+. mongo.path
+
 MONGODB=$1
 
-mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*")
+mongodb_dir=$(find ${PWD}/ -type d -name "mongodb-linux-x86_64*" -print -quit)
 
 mkdir $mongodb_dir/data
 
@@ -15,12 +20,6 @@ if [ "$MAJOR" -gt 3 ] || ([ "$MAJOR" -eq 3 ] && [ "$MINOR" -ge 8 ]); then
     args+=(--setParameter maxTransactionLockRequestTimeoutMillis=1000)
 fi
 
-$mongodb_dir/bin/mongod "${args[@]}"
-
-if [ "$MAJOR" -lt 6 ]; then
-mongo --verbose --eval "rs.initiate()"
-mongo --quiet --eval "rs.status().ok"
-else
+mongod "${args[@]}"
 mongosh --verbose --eval "rs.initiate()"
 mongosh --quiet --eval "rs.status().ok"
-fi
diff --git a/README.rst b/README.rst
index a19bf67fc..672327f66 100644
--- a/README.rst
+++ b/README.rst
@@ -35,10 +35,10 @@ an `API reference <https://mongoengine-odm.readthedocs.io/apireference.html>`_.
 
 Supported MongoDB Versions
 ==========================
-MongoEngine is currently tested against MongoDB v3.6, v4.0, v4.4, v5.0, v6.0, v7.0 and v8.0. Future versions
-should be supported as well, but aren't actively tested at the moment. Make
-sure to open an issue or submit a pull request if you experience any problems
-with a more recent MongoDB versions.
+MongoEngine is currently tested against MongoDB v4.4, v5.0, v6.0, v7.0 and
+v8.0. Future versions should be supported as well, but aren't actively tested
+at the moment. Make sure to open an issue or submit a pull request if you
+experience any problems with a more recent MongoDB versions.
 
 Installation
 ============

From 95d378483fbfd3e561b181b1601038f7892892a6 Mon Sep 17 00:00:00 2001
From: Andrew Yang <anyang@rippling.com>
Date: Wed, 6 Aug 2025 16:38:24 -0700
Subject: [PATCH 1514/1519] Nit: fix minor doc typo

---
 docs/guide/querying.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/querying.rst b/docs/guide/querying.rst
index d347806b2..b9eb6c293 100644
--- a/docs/guide/querying.rst
+++ b/docs/guide/querying.rst
@@ -511,7 +511,7 @@ Getting related data
 When iterating the results of :class:`~mongoengine.fields.ListField` or
 :class:`~mongoengine.fields.DictField` we automatically dereference any
 :class:`~pymongo.dbref.DBRef` objects as efficiently as possible, reducing the
-number the queries to mongo.
+number of queries to mongo.
 
 There are times when that efficiency is not enough, documents that have
 :class:`~mongoengine.fields.ReferenceField` objects or

From 01838b81c175f96be3dc5ed2b6905a410b337a05 Mon Sep 17 00:00:00 2001
From: "Terence D. Honles" <terence@honles.com>
Date: Tue, 27 May 2025 18:20:47 +0200
Subject: [PATCH 1515/1519] fix GenericReference iterable query (i.e. ``__in``)

This change adds the ``_ref`` or ``_ref.$id`` prefix to a query if all
values in an iterable query (i.e. ``__in``) are ``ObjectId``s or
``DBRef``s and raises an error for a mixed query which will only work
for documents. These could possibly be compiled into an ``{$or: ...}``
query, but the automatic expansion can be added as necessary.
---
 mongoengine/queryset/transform.py | 20 ++++++++++++++++++--
 tests/queryset/test_transform.py  | 28 ++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 195bc0b0b..701ca649b 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -129,6 +129,7 @@ def query(_doc_cls=None, **kwargs):
 
             singular_ops = [None, "ne", "gt", "gte", "lt", "lte", "not"]
             singular_ops += STRING_OPERATORS
+            is_iterable = False
             if op in singular_ops:
                 value = field.prepare_query_value(op, value)
 
@@ -136,6 +137,7 @@ def query(_doc_cls=None, **kwargs):
                     value = value["_id"]
 
             elif op in ("in", "nin", "all", "near") and not isinstance(value, dict):
+                is_iterable = True
                 # Raise an error if the in/nin/all/near param is not iterable.
                 value = _prepare_query_for_iterable(field, op, value)
 
@@ -144,10 +146,24 @@ def query(_doc_cls=None, **kwargs):
             # * If the value is a DBRef, the key should be "field_name._ref".
             # * If the value is an ObjectId, the key should be "field_name._ref.$id".
             if isinstance(field, GenericReferenceField):
-                if isinstance(value, DBRef):
+                if isinstance(value, DBRef) or (
+                    is_iterable and all(isinstance(v, DBRef) for v in value)
+                ):
                     parts[-1] += "._ref"
-                elif isinstance(value, ObjectId):
+                elif isinstance(value, ObjectId) or (
+                    is_iterable and all(isinstance(v, ObjectId) for v in value)
+                ):
                     parts[-1] += "._ref.$id"
+                elif (
+                    is_iterable
+                    and any(isinstance(v, DBRef) for v in value)
+                    and any(isinstance(v, ObjectId) for v in value)
+                ):
+                    raise ValueError(
+                        "The `in`, `nin`, `all`, or `near`-operators cannot "
+                        "be applied to mixed queries of DBRef/ObjectId/%s"
+                        % _doc_cls.__name__
+                    )
 
         # if op and op not in COMPARISON_OPERATORS:
         if op:
diff --git a/tests/queryset/test_transform.py b/tests/queryset/test_transform.py
index 8704187b8..8cb8ad426 100644
--- a/tests/queryset/test_transform.py
+++ b/tests/queryset/test_transform.py
@@ -396,6 +396,34 @@ class Shop(Document):
 
         Shop.drop_collection()
 
+    def test_transform_generic_reference_field(self):
+        class Object(Document):
+            field = GenericReferenceField()
+
+        Object.drop_collection()
+        objects = Object.objects.insert([Object() for _ in range(8)])
+        # singular queries
+        assert transform.query(Object, field=objects[0].pk) == {
+            "field._ref.$id": objects[0].pk
+        }
+        assert transform.query(Object, field=objects[1].to_dbref()) == {
+            "field._ref": objects[1].to_dbref()
+        }
+
+        # iterable queries
+        assert transform.query(Object, field__in=[objects[2].pk, objects[3].pk]) == {
+            "field._ref.$id": {"$in": [objects[2].pk, objects[3].pk]}
+        }
+        assert transform.query(
+            Object, field__in=[objects[4].to_dbref(), objects[5].to_dbref()]
+        ) == {"field._ref": {"$in": [objects[4].to_dbref(), objects[5].to_dbref()]}}
+
+        # invalid query
+        with pytest.raises(match="cannot be applied to mixed queries"):
+            transform.query(Object, field__in=[objects[6].pk, objects[7].to_dbref()])
+
+        Object.drop_collection()
+
 
 if __name__ == "__main__":
     unittest.main()

From 4da2264852927d89d41ad06af0073864a99e334e Mon Sep 17 00:00:00 2001
From: Neil Halelamien <neil.halelamien@dronedeploy.com>
Date: Tue, 19 Aug 2025 15:10:45 -0700
Subject: [PATCH 1516/1519] docs: update CI from Travis to GitHub Actions

---
 CONTRIBUTING.rst | 6 +++---
 README.rst       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 5bda87613..887c5f019 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -29,7 +29,7 @@ Python3 codebase
 Since 0.20, the codebase is exclusively Python 3.
 
 Earlier versions were exclusively Python2, and were relying on 2to3 to support Python3 installs.
-Travis runs the tests against the main Python 3.x versions.
+Github Actions runs the tests against the main Python 3.x versions.
 
 
 Style Guide
@@ -65,7 +65,7 @@ You can also run all the checks with ``pre-commit run -a``, this is what is used
 Testing
 -------
 
-All tests are run on `Travis <http://travis-ci.org/MongoEngine/mongoengine>`_
+All tests are run on `Github Actions <https://github.com/MongoEngine/mongoengine/actions>`_
 and any pull requests are automatically tested. Any pull requests without
 tests will take longer to be integrated and might be refused.
 
@@ -87,7 +87,7 @@ General Guidelines
 - Ensure tests pass on all supported Python, PyMongo, and MongoDB versions.
   You can test various Python and PyMongo versions locally by executing
   ``tox``. For different MongoDB versions, you can rely on our automated
-  Travis tests.
+  Github Actions tests.
 - Add enhancements or problematic bug fixes to docs/changelog.rst.
 - Add yourself to AUTHORS :)
 
diff --git a/README.rst b/README.rst
index 672327f66..db15293e2 100644
--- a/README.rst
+++ b/README.rst
@@ -6,8 +6,8 @@ MongoEngine
 :Author: Harry Marr (http://github.com/hmarr)
 :Maintainer: Bastien Gerard (http://github.com/bagerard)
 
-.. image:: https://travis-ci.org/MongoEngine/mongoengine.svg?branch=master
-  :target: https://travis-ci.org/MongoEngine/mongoengine
+.. image:: https://github.com/MongoEngine/mongoengine/actions/workflows/github-actions.yml/badge.svg?branch=master
+  :target: https://github.com/MongoEngine/mongoengine/actions
 
 .. image:: https://coveralls.io/repos/github/MongoEngine/mongoengine/badge.svg?branch=master
   :target: https://coveralls.io/github/MongoEngine/mongoengine?branch=master

From bb8630230f261b3b161a21ed2b95869029f2e341 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 2 Sep 2025 22:07:48 +0200
Subject: [PATCH 1517/1519] Add e2e test for GenericRefField recent fix

---
 tests/fields/test_fields.py                  | 333 +----------------
 tests/fields/test_generic_reference_field.py | 368 +++++++++++++++++++
 2 files changed, 369 insertions(+), 332 deletions(-)
 create mode 100644 tests/fields/test_generic_reference_field.py

diff --git a/tests/fields/test_fields.py b/tests/fields/test_fields.py
index 8980b6037..c58f8a842 100644
--- a/tests/fields/test_fields.py
+++ b/tests/fields/test_fields.py
@@ -1,5 +1,4 @@
 import datetime
-import unittest
 
 import pytest
 from bson import SON, DBRef, ObjectId
@@ -34,11 +33,7 @@
     StringField,
     ValidationError,
 )
-from mongoengine.base import (
-    BaseField,
-    EmbeddedDocumentList,
-    _DocumentRegistry,
-)
+from mongoengine.base import BaseField, EmbeddedDocumentList
 from mongoengine.base.fields import _no_dereference_for_fields
 from mongoengine.errors import DeprecatedError
 from tests.utils import MongoDBTestCase
@@ -1587,328 +1582,6 @@ class Mother(Document):
         with pytest.raises(ValidationError):
             brother.save()
 
-    def test_generic_reference(self):
-        """Ensure that a GenericReferenceField properly dereferences items."""
-
-        class Link(Document):
-            title = StringField()
-            meta = {"allow_inheritance": False}
-
-        class Post(Document):
-            title = StringField()
-
-        class Bookmark(Document):
-            bookmark_object = GenericReferenceField()
-
-        Link.drop_collection()
-        Post.drop_collection()
-        Bookmark.drop_collection()
-
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
-
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
-
-        bm = Bookmark(bookmark_object=post_1)
-        bm.save()
-
-        bm = Bookmark.objects(bookmark_object=post_1).first()
-
-        assert bm.bookmark_object == post_1
-        assert isinstance(bm.bookmark_object, Post)
-
-        bm.bookmark_object = link_1
-        bm.save()
-
-        bm = Bookmark.objects(bookmark_object=link_1).first()
-
-        assert bm.bookmark_object == link_1
-        assert isinstance(bm.bookmark_object, Link)
-
-    def test_generic_reference_list(self):
-        """Ensure that a ListField properly dereferences generic references."""
-
-        class Link(Document):
-            title = StringField()
-
-        class Post(Document):
-            title = StringField()
-
-        class User(Document):
-            bookmarks = ListField(GenericReferenceField())
-
-        Link.drop_collection()
-        Post.drop_collection()
-        User.drop_collection()
-
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
-
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
-
-        user = User(bookmarks=[post_1, link_1])
-        user.save()
-
-        user = User.objects(bookmarks__all=[post_1, link_1]).first()
-
-        assert user.bookmarks[0] == post_1
-        assert user.bookmarks[1] == link_1
-
-    def test_generic_reference_document_not_registered(self):
-        """Ensure dereferencing out of the document registry throws a
-        `NotRegistered` error.
-        """
-
-        class Link(Document):
-            title = StringField()
-
-        class User(Document):
-            bookmarks = ListField(GenericReferenceField())
-
-        Link.drop_collection()
-        User.drop_collection()
-
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
-
-        user = User(bookmarks=[link_1])
-        user.save()
-
-        # Mimic User and Link definitions being in a different file
-        # and the Link model not being imported in the User file.
-        _DocumentRegistry.unregister("Link")
-
-        user = User.objects.first()
-        try:
-            user.bookmarks
-            raise AssertionError("Link was removed from the registry")
-        except NotRegistered:
-            pass
-
-    def test_generic_reference_is_none(self):
-        class Person(Document):
-            name = StringField()
-            city = GenericReferenceField()
-
-        Person.drop_collection()
-
-        Person(name="Wilson Jr").save()
-        assert repr(Person.objects(city=None)) == "[<Person: Person object>]"
-
-    def test_generic_reference_choices(self):
-        """Ensure that a GenericReferenceField can handle choices."""
-
-        class Link(Document):
-            title = StringField()
-
-        class Post(Document):
-            title = StringField()
-
-        class Bookmark(Document):
-            bookmark_object = GenericReferenceField(choices=(Post,))
-
-        Link.drop_collection()
-        Post.drop_collection()
-        Bookmark.drop_collection()
-
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
-
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
-
-        bm = Bookmark(bookmark_object=link_1)
-        with pytest.raises(ValidationError):
-            bm.validate()
-
-        bm = Bookmark(bookmark_object=post_1)
-        bm.save()
-
-        bm = Bookmark.objects.first()
-        assert bm.bookmark_object == post_1
-
-    def test_generic_reference_string_choices(self):
-        """Ensure that a GenericReferenceField can handle choices as strings"""
-
-        class Link(Document):
-            title = StringField()
-
-        class Post(Document):
-            title = StringField()
-
-        class Bookmark(Document):
-            bookmark_object = GenericReferenceField(choices=("Post", Link))
-
-        Link.drop_collection()
-        Post.drop_collection()
-        Bookmark.drop_collection()
-
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
-
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
-
-        bm = Bookmark(bookmark_object=link_1)
-        bm.save()
-
-        bm = Bookmark(bookmark_object=post_1)
-        bm.save()
-
-        bm = Bookmark(bookmark_object=bm)
-        with pytest.raises(ValidationError):
-            bm.validate()
-
-    def test_generic_reference_choices_no_dereference(self):
-        """Ensure that a GenericReferenceField can handle choices on
-        non-derefenreced (i.e. DBRef) elements
-        """
-
-        class Post(Document):
-            title = StringField()
-
-        class Bookmark(Document):
-            bookmark_object = GenericReferenceField(choices=(Post,))
-            other_field = StringField()
-
-        Post.drop_collection()
-        Bookmark.drop_collection()
-
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
-
-        bm = Bookmark(bookmark_object=post_1)
-        bm.save()
-
-        bm = Bookmark.objects.get(id=bm.id)
-        # bookmark_object is now a DBRef
-        bm.other_field = "dummy_change"
-        bm.save()
-
-    def test_generic_reference_list_choices(self):
-        """Ensure that a ListField properly dereferences generic references and
-        respects choices.
-        """
-
-        class Link(Document):
-            title = StringField()
-
-        class Post(Document):
-            title = StringField()
-
-        class User(Document):
-            bookmarks = ListField(GenericReferenceField(choices=(Post,)))
-
-        Link.drop_collection()
-        Post.drop_collection()
-        User.drop_collection()
-
-        link_1 = Link(title="Pitchfork")
-        link_1.save()
-
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
-
-        user = User(bookmarks=[link_1])
-        with pytest.raises(ValidationError):
-            user.validate()
-
-        user = User(bookmarks=[post_1])
-        user.save()
-
-        user = User.objects.first()
-        assert user.bookmarks == [post_1]
-
-    def test_generic_reference_list_item_modification(self):
-        """Ensure that modifications of related documents (through generic reference) don't influence on querying"""
-
-        class Post(Document):
-            title = StringField()
-
-        class User(Document):
-            username = StringField()
-            bookmarks = ListField(GenericReferenceField())
-
-        Post.drop_collection()
-        User.drop_collection()
-
-        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
-        post_1.save()
-
-        user = User(bookmarks=[post_1])
-        user.save()
-
-        post_1.title = "Title was modified"
-        user.username = "New username"
-        user.save()
-
-        user = User.objects(bookmarks__all=[post_1]).first()
-
-        assert user is not None
-        assert user.bookmarks[0] == post_1
-
-    def test_generic_reference_filter_by_dbref(self):
-        """Ensure we can search for a specific generic reference by
-        providing its ObjectId.
-        """
-
-        class Doc(Document):
-            ref = GenericReferenceField()
-
-        Doc.drop_collection()
-
-        doc1 = Doc.objects.create()
-        doc2 = Doc.objects.create(ref=doc1)
-
-        doc = Doc.objects.get(ref=DBRef("doc", doc1.pk))
-        assert doc == doc2
-
-    def test_generic_reference_is_not_tracked_in_parent_doc(self):
-        """Ensure that modifications of related documents (through generic reference) don't influence
-        the owner changed fields (#1934)
-        """
-
-        class Doc1(Document):
-            name = StringField()
-
-        class Doc2(Document):
-            ref = GenericReferenceField()
-            refs = ListField(GenericReferenceField())
-
-        Doc1.drop_collection()
-        Doc2.drop_collection()
-
-        doc1 = Doc1(name="garbage1").save()
-        doc11 = Doc1(name="garbage11").save()
-        doc2 = Doc2(ref=doc1, refs=[doc11]).save()
-
-        doc2.ref.name = "garbage2"
-        assert doc2._get_changed_fields() == []
-
-        doc2.refs[0].name = "garbage3"
-        assert doc2._get_changed_fields() == []
-        assert doc2._delta() == ({}, {})
-
-    def test_generic_reference_field(self):
-        """Ensure we can search for a specific generic reference by
-        providing its DBRef.
-        """
-
-        class Doc(Document):
-            ref = GenericReferenceField()
-
-        Doc.drop_collection()
-
-        doc1 = Doc.objects.create()
-        doc2 = Doc.objects.create(ref=doc1)
-
-        assert isinstance(doc1.pk, ObjectId)
-
-        doc = Doc.objects.get(ref=doc1.pk)
-        assert doc == doc2
-
     def test_choices_allow_using_sets_as_choices(self):
         """Ensure that sets can be used when setting choices"""
 
@@ -2761,7 +2434,3 @@ class Group(Document):
         group = Group.objects.first()
         with _no_dereference_for_fields(group._fields["member"]):
             assert isinstance(group.member, DBRef)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tests/fields/test_generic_reference_field.py b/tests/fields/test_generic_reference_field.py
new file mode 100644
index 000000000..36d856dff
--- /dev/null
+++ b/tests/fields/test_generic_reference_field.py
@@ -0,0 +1,368 @@
+import pytest
+from bson import DBRef, ObjectId
+
+from mongoengine import (
+    Document,
+    GenericReferenceField,
+    ListField,
+    NotRegistered,
+    StringField,
+    ValidationError,
+)
+from mongoengine.base import _DocumentRegistry
+from tests.utils import MongoDBTestCase
+
+
+class TestField(MongoDBTestCase):
+
+    def test_generic_reference(self):
+        """Ensure that a GenericReferenceField properly dereferences items."""
+
+        class Link(Document):
+            title = StringField()
+            meta = {"allow_inheritance": False}
+
+        class Post(Document):
+            title = StringField()
+
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField()
+
+        Link.drop_collection()
+        Post.drop_collection()
+        Bookmark.drop_collection()
+
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
+
+        bm = Bookmark.objects(bookmark_object=post_1).first()
+
+        assert bm.bookmark_object == post_1
+        assert isinstance(bm.bookmark_object, Post)
+
+        bm.bookmark_object = link_1
+        bm.save()
+
+        bm = Bookmark.objects(bookmark_object=link_1).first()
+
+        assert bm.bookmark_object == link_1
+        assert isinstance(bm.bookmark_object, Link)
+
+    def test_generic_reference_works_with_in_operator(self):
+        class SomeObj(Document):
+            pass
+
+        class OtherObj(Document):
+            obj = GenericReferenceField()
+
+        SomeObj.drop_collection()
+        OtherObj.drop_collection()
+
+        s1 = SomeObj().save()
+        OtherObj(obj=s1).save()
+
+        assert OtherObj.objects.as_pymongo().first() == {
+            "_id": OtherObj.objects.first().id,
+            "obj": {
+                "_cls": "SomeObj",
+                "_ref": s1.to_dbref(),
+            },
+        }
+
+        # Query using to_dbref
+        assert OtherObj.objects(obj__in=[s1.to_dbref()]).count() == 1
+
+        # Query using id
+        assert OtherObj.objects(obj__in=[s1.id]).count() == 1
+
+        # Query using document instance
+        assert OtherObj.objects(obj__in=[s1]).count() == 1
+
+    def test_generic_reference_list(self):
+        """Ensure that a ListField properly dereferences generic references."""
+
+        class Link(Document):
+            title = StringField()
+
+        class Post(Document):
+            title = StringField()
+
+        class User(Document):
+            bookmarks = ListField(GenericReferenceField())
+
+        Link.drop_collection()
+        Post.drop_collection()
+        User.drop_collection()
+
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        user = User(bookmarks=[post_1, link_1])
+        user.save()
+
+        user = User.objects(bookmarks__all=[post_1, link_1]).first()
+
+        assert user.bookmarks[0] == post_1
+        assert user.bookmarks[1] == link_1
+
+    def test_generic_reference_document_not_registered(self):
+        """Ensure dereferencing out of the document registry throws a
+        `NotRegistered` error.
+        """
+
+        class Link(Document):
+            title = StringField()
+
+        class User(Document):
+            bookmarks = ListField(GenericReferenceField())
+
+        Link.drop_collection()
+        User.drop_collection()
+
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
+
+        user = User(bookmarks=[link_1])
+        user.save()
+
+        # Mimic User and Link definitions being in a different file
+        # and the Link model not being imported in the User file.
+        _DocumentRegistry.unregister("Link")
+
+        user = User.objects.first()
+        try:
+            user.bookmarks
+            raise AssertionError("Link was removed from the registry")
+        except NotRegistered:
+            pass
+
+    def test_generic_reference_is_none(self):
+        class Person(Document):
+            name = StringField()
+            city = GenericReferenceField()
+
+        Person.drop_collection()
+
+        Person(name="Wilson Jr").save()
+        assert repr(Person.objects(city=None)) == "[<Person: Person object>]"
+
+    def test_generic_reference_choices(self):
+        """Ensure that a GenericReferenceField can handle choices."""
+
+        class Link(Document):
+            title = StringField()
+
+        class Post(Document):
+            title = StringField()
+
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField(choices=(Post,))
+
+        Link.drop_collection()
+        Post.drop_collection()
+        Bookmark.drop_collection()
+
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        bm = Bookmark(bookmark_object=link_1)
+        with pytest.raises(ValidationError):
+            bm.validate()
+
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
+
+        bm = Bookmark.objects.first()
+        assert bm.bookmark_object == post_1
+
+    def test_generic_reference_string_choices(self):
+        """Ensure that a GenericReferenceField can handle choices as strings"""
+
+        class Link(Document):
+            title = StringField()
+
+        class Post(Document):
+            title = StringField()
+
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField(choices=("Post", Link))
+
+        Link.drop_collection()
+        Post.drop_collection()
+        Bookmark.drop_collection()
+
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        bm = Bookmark(bookmark_object=link_1)
+        bm.save()
+
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
+
+        bm = Bookmark(bookmark_object=bm)
+        with pytest.raises(ValidationError):
+            bm.validate()
+
+    def test_generic_reference_choices_no_dereference(self):
+        """Ensure that a GenericReferenceField can handle choices on
+        non-derefenreced (i.e. DBRef) elements
+        """
+
+        class Post(Document):
+            title = StringField()
+
+        class Bookmark(Document):
+            bookmark_object = GenericReferenceField(choices=(Post,))
+            other_field = StringField()
+
+        Post.drop_collection()
+        Bookmark.drop_collection()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        bm = Bookmark(bookmark_object=post_1)
+        bm.save()
+
+        bm = Bookmark.objects.get(id=bm.id)
+        # bookmark_object is now a DBRef
+        bm.other_field = "dummy_change"
+        bm.save()
+
+    def test_generic_reference_list_choices(self):
+        """Ensure that a ListField properly dereferences generic references and
+        respects choices.
+        """
+
+        class Link(Document):
+            title = StringField()
+
+        class Post(Document):
+            title = StringField()
+
+        class User(Document):
+            bookmarks = ListField(GenericReferenceField(choices=(Post,)))
+
+        Link.drop_collection()
+        Post.drop_collection()
+        User.drop_collection()
+
+        link_1 = Link(title="Pitchfork")
+        link_1.save()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        user = User(bookmarks=[link_1])
+        with pytest.raises(ValidationError):
+            user.validate()
+
+        user = User(bookmarks=[post_1])
+        user.save()
+
+        user = User.objects.first()
+        assert user.bookmarks == [post_1]
+
+    def test_generic_reference_list_item_modification(self):
+        """Ensure that modifications of related documents (through generic reference) don't influence on querying"""
+
+        class Post(Document):
+            title = StringField()
+
+        class User(Document):
+            username = StringField()
+            bookmarks = ListField(GenericReferenceField())
+
+        Post.drop_collection()
+        User.drop_collection()
+
+        post_1 = Post(title="Behind the Scenes of the Pavement Reunion")
+        post_1.save()
+
+        user = User(bookmarks=[post_1])
+        user.save()
+
+        post_1.title = "Title was modified"
+        user.username = "New username"
+        user.save()
+
+        user = User.objects(bookmarks__all=[post_1]).first()
+
+        assert user is not None
+        assert user.bookmarks[0] == post_1
+
+    def test_generic_reference_filter_by_dbref(self):
+        """Ensure we can search for a specific generic reference by
+        providing its ObjectId.
+        """
+
+        class Doc(Document):
+            ref = GenericReferenceField()
+
+        Doc.drop_collection()
+
+        doc1 = Doc.objects.create()
+        doc2 = Doc.objects.create(ref=doc1)
+
+        doc = Doc.objects.get(ref=DBRef("doc", doc1.pk))
+        assert doc == doc2
+
+    def test_generic_reference_is_not_tracked_in_parent_doc(self):
+        """Ensure that modifications of related documents (through generic reference) don't influence
+        the owner changed fields (#1934)
+        """
+
+        class Doc1(Document):
+            name = StringField()
+
+        class Doc2(Document):
+            ref = GenericReferenceField()
+            refs = ListField(GenericReferenceField())
+
+        Doc1.drop_collection()
+        Doc2.drop_collection()
+
+        doc1 = Doc1(name="garbage1").save()
+        doc11 = Doc1(name="garbage11").save()
+        doc2 = Doc2(ref=doc1, refs=[doc11]).save()
+
+        doc2.ref.name = "garbage2"
+        assert doc2._get_changed_fields() == []
+
+        doc2.refs[0].name = "garbage3"
+        assert doc2._get_changed_fields() == []
+        assert doc2._delta() == ({}, {})
+
+    def test_generic_reference_field(self):
+        """Ensure we can search for a specific generic reference by
+        providing its DBRef.
+        """
+
+        class Doc(Document):
+            ref = GenericReferenceField()
+
+        Doc.drop_collection()
+
+        doc1 = Doc.objects.create()
+        doc2 = Doc.objects.create(ref=doc1)
+
+        assert isinstance(doc1.pk, ObjectId)
+
+        doc = Doc.objects.get(ref=doc1.pk)
+        assert doc == doc2

From 28175a4126ebc8f7349f2506ceaf56a02dffab1b Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 2 Sep 2025 22:09:13 +0200
Subject: [PATCH 1518/1519] update changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index ff2dd38c1..394c419ba 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,7 @@ Changelog
 Development
 ===========
 - (Fill this out as you fix issues and develop your features).
+- Fix querying GenericReferenceField with __in operator #2886
 - Fix Document.compare_indexes() not working correctly for text indexes on multiple fields #2612
 - Add support for transaction through run_in_transaction (kudos to juannyG for this) #2569
   Some considerations:

From 2156e2c4fbaca0b316898a71fceab485a5d459f8 Mon Sep 17 00:00:00 2001
From: Bastien Gerard <bast.gerard@gmail.com>
Date: Tue, 2 Sep 2025 22:33:07 +0200
Subject: [PATCH 1519/1519] refactoring in tests

---
 tests/fields/test_generic_reference_field.py | 27 ++++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/tests/fields/test_generic_reference_field.py b/tests/fields/test_generic_reference_field.py
index 36d856dff..6609fb32e 100644
--- a/tests/fields/test_generic_reference_field.py
+++ b/tests/fields/test_generic_reference_field.py
@@ -10,12 +10,12 @@
     ValidationError,
 )
 from mongoengine.base import _DocumentRegistry
-from tests.utils import MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestField(MongoDBTestCase):
 
-    def test_generic_reference(self):
+    def test_generic_reference_field_basics(self):
         """Ensure that a GenericReferenceField properly dereferences items."""
 
         class Link(Document):
@@ -42,7 +42,13 @@ class Bookmark(Document):
         bm.save()
 
         bm = Bookmark.objects(bookmark_object=post_1).first()
-
+        assert get_as_pymongo(bm) == {
+            "_id": bm.id,
+            "bookmark_object": {
+                "_cls": "Post",
+                "_ref": post_1.to_dbref(),
+            },
+        }
         assert bm.bookmark_object == post_1
         assert isinstance(bm.bookmark_object, Post)
 
@@ -50,6 +56,13 @@ class Bookmark(Document):
         bm.save()
 
         bm = Bookmark.objects(bookmark_object=link_1).first()
+        assert get_as_pymongo(bm) == {
+            "_id": bm.id,
+            "bookmark_object": {
+                "_cls": "Link",
+                "_ref": link_1.to_dbref(),
+            },
+        }
 
         assert bm.bookmark_object == link_1
         assert isinstance(bm.bookmark_object, Link)
@@ -67,14 +80,6 @@ class OtherObj(Document):
         s1 = SomeObj().save()
         OtherObj(obj=s1).save()
 
-        assert OtherObj.objects.as_pymongo().first() == {
-            "_id": OtherObj.objects.first().id,
-            "obj": {
-                "_cls": "SomeObj",
-                "_ref": s1.to_dbref(),
-            },
-        }
-
         # Query using to_dbref
         assert OtherObj.objects(obj__in=[s1.to_dbref()]).count() == 1